diff --git a/network/filezilla/configure.patch b/network/filezilla/configure.patch deleted file mode 100644 index a1dfa62e29..0000000000 --- a/network/filezilla/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- FileZilla3/trunk/configure.in 2011/05/23 21:41:42 4047 -+++ FileZilla3/trunk/configure.in 2011/05/24 06:15:19 4048 -@@ -464,7 +464,7 @@ - # SQLite3 - # ------- - -- PKG_CHECK_MODULES(LIBSQLITE3, sqdlite3 >= 3.7,, [ -+ PKG_CHECK_MODULES(LIBSQLITE3, sqlite3 >= 3.7,, [ - - AC_CHECK_HEADER(sqlite3.h,, - [ diff --git a/network/filezilla/filezilla.SlackBuild b/network/filezilla/filezilla.SlackBuild index fa48f4be09..78e00f3782 100644 --- a/network/filezilla/filezilla.SlackBuild +++ b/network/filezilla/filezilla.SlackBuild @@ -1,5 +1,4 @@ #!/bin/sh - # Slackware build script for filezilla # Copyright 2007-2009 Grigorios Bouzakis @@ -22,7 +21,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=filezilla -VERSION=${VERSION:-3.5.0} +VERSION=${VERSION:-3.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +61,6 @@ else tinyxml="--with-tinyxml=builtin" fi - set -e rm -rf $PKG @@ -71,7 +69,6 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/FileZilla_${VERSION}_src.tar.bz2 cd $PRGNAM-$VERSION - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -79,15 +76,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix a little typo -# This is only needed for 3.5.0 -# Future version will have this included, so no longer needed for 3.5.1+ -patch -p2 < $CWD/configure.patch - -# Re-Run autogen.sh after applying the patch -./autogen.sh - -# Added LDFLAGS to make it compileable, thanks to LQ +# Added LDFLAGS to make it compileable, thanks to LQ # http://www.linuxquestions.org/questions/slackware-14/libsndfile-from-slackbuilds-org-fails-to-build-695456/ LDFLAGS="-ldl" \ CFLAGS="$SLKCFLAGS" \ @@ -103,8 +92,8 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-manualupdatecheck \ --disable-autoupdatecheck \ --enable-locales \ - --build=$ARCH-slackware-linux \ - $tinyxml + $tinyxml \ + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG @@ -119,7 +108,8 @@ 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 -rmdir $PKG/usr/share/filezilla/docs # remove empty docdir +# remove empty docdir +rmdir $PKG/usr/share/filezilla/docs mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/filezilla/filezilla.info b/network/filezilla/filezilla.info index c03ef7bed5..5d6dc885d5 100644 --- a/network/filezilla/filezilla.info +++ b/network/filezilla/filezilla.info @@ -1,10 +1,10 @@ PRGNAM="filezilla" -VERSION="3.5.0" +VERSION="3.5.1" HOMEPAGE="http://filezilla-project.org/" -DOWNLOAD="http://downloads.sourceforge.net/filezilla/FileZilla_3.5.0_src.tar.bz2" -MD5SUM="6a83c3afe99c2679d5a3aa73607d80a7" +DOWNLOAD="http://downloads.sourceforge.net/filezilla/FileZilla_3.5.1_src.tar.bz2" +MD5SUM="8afb7aee4ba72b6363dcfe469bc7fbef" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackware-id.org" -APPROVED="rworkman" +APPROVED="dsomero"