network/filezilla: Updated for version 3.3.1

5 files changed, 55 insertions, 29 deletions

diff --git a/network/filezilla/README b/network/filezilla/README
index 760fa6fd83cb..82657eae899e 100644
--- a/network/filezilla/README
+++ b/network/filezilla/README
@@ -2,4 +2,4 @@ FileZilla Client is a fast and reliable cross-platform FTP, FTPS and
 SFTP client with lots of useful features and an intuitive graphical user
 interface.
 
-FileZilla requires wxGTK or wxPython, which are available at SlackBuilds.org.
+FileZilla requires wxGTK or wxPython.
diff --git a/network/filezilla/doinst.sh b/network/filezilla/doinst.sh
index e4e6459838cb..9830478e8cc7 100644
--- a/network/filezilla/doinst.sh
+++ b/network/filezilla/doinst.sh
@@ -6,3 +6,9 @@ if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/network/filezilla/filezilla.SlackBuild b/network/filezilla/filezilla.SlackBuild
index 53366a01bf70..1be3a3c41b14 100644
--- a/network/filezilla/filezilla.SlackBuild
+++ b/network/filezilla/filezilla.SlackBuild
@@ -1,11 +1,26 @@
 #!/bin/sh
-
 # Slackware build script for filezilla
 
-# Written by Grigorios Bouzakis (grbzks@gmail.com)
+# Copyright 2007-2009 Grigorios Bouzakis <grbzks@xsmail.com>
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without fee is hereby granted, provided that the above copyright
+# notice and this permission notice appear in all copies.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=filezilla
-VERSION=${VERSION:-3.2.3.1}
+VERSION=${VERSION:-3.3.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,11 +31,14 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-   SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
@@ -44,31 +62,31 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
   --disable-manualupdatecheck \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man || exit 1
+( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mv $PKG/usr/share/filezilla/docs/fzdefaults.xml.example $PKG/usr/doc/$PRGNAM-$VERSION
+# remove empty docdir
 rmdir $PKG/usr/share/filezilla/docs
 
 mkdir -p $PKG/install
@@ -76,4 +94,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/filezilla/filezilla.info b/network/filezilla/filezilla.info
index a4d094807755..d6e5058b07e7 100644
--- a/network/filezilla/filezilla.info
+++ b/network/filezilla/filezilla.info
@@ -1,8 +1,10 @@
 PRGNAM="filezilla"
-VERSION="3.2.3.1"
+VERSION="3.3.1"
 HOMEPAGE="http://filezilla-project.org/"
-DOWNLOAD="http://downloads.sourceforge.net/filezilla/FileZilla_3.2.3.1_src.tar.bz2"
-MD5SUM="c9d4b00e10e1a5e0c3928ac6e1fd5873"
+DOWNLOAD="http://downloads.sourceforge.net/filezilla/FileZilla_3.3.1_src.tar.bz2"
+MD5SUM="3454defa3bdb137bf69fc73495231ca1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Grigorios Bouzakis"
-EMAIL="grbzks@gmail.com"
-APPROVED="dsomero"
+EMAIL="grbzks@xsmail.com"
+APPROVED="Erik Hanson"
diff --git a/network/filezilla/slack-desc b/network/filezilla/slack-desc
index 601721f40ad8..5dbb1573e85c 100644
--- a/network/filezilla/slack-desc
+++ b/network/filezilla/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-    |-----handy-ruler------------------------------------------------------|
+         |-----handy-ruler------------------------------------------------------|
 filezilla: filezilla (the free FTP solution)
 filezilla:
-filezilla: filezilla is a fast and reliable cross-platform FTP, FTPS and
-filezilla: SFTP client with lots of useful features and an intuitive
-filezilla: graphical user interface.
-filezilla: 
+filezilla: FileZilla is a fast and reliable cross-platform FTP, FTPS, and SFTP
+filezilla: client with lots of useful features and an intuitive user interface.
+filezilla:
 filezilla: Homepage: http://filezilla-project.org/
-filezilla: 
-filezilla: 
-filezilla: 
-filezilla: 
+filezilla:
+filezilla:
+filezilla:
+filezilla:
+filezilla: