system/fdupes: Updated for version 1.40

4 files changed, 25 insertions, 17 deletions

diff --git a/system/fdupes/README b/system/fdupes/README
index 9aa0e81f2c..ad2b1c4d06 100644
--- a/system/fdupes/README
+++ b/system/fdupes/README
@@ -1,9 +1,2 @@
 FDUPES is a program for identifying or deleting duplicate files residing
 within specified directories.
-
-The current version of fdupes is distributed as fdupes-1.40.tar.gz. No
-later version has been officially released. Users should get this version,
-as it's presumably the most reliable. Developers and beta testers should
-look at the versions below.
-
-http://netdial.caribe.net/~adrian2/fdupes.html
diff --git a/system/fdupes/fdupes.SlackBuild b/system/fdupes/fdupes.SlackBuild
index cbc26afc2b..15815e2139 100644
--- a/system/fdupes/fdupes.SlackBuild
+++ b/system/fdupes/fdupes.SlackBuild
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # Slackware build script for duplicate file finder fdupes
-# 
+ 
 # 17/12/2008 - Original script.
 # 28/05/2009 - Updated for Slackware64 and general tidy up.
-#
+
 # Copyright 2008, 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
 # All rights reserved.
 #
@@ -24,7 +24,6 @@
 # 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=fdupes
 VERSION=1.40
@@ -39,10 +38,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -56,6 +58,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Use our CFLAGS
+sed -i "s%-Wall%-Wall $SLKCFLAGS%" Makefile
+
 # make the program directories since the Makefile doesn't
 mkdir -p $PKG/usr/man/man1 $PKG/usr/bin
 
@@ -81,4 +86,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/system/fdupes/fdupes.info b/system/fdupes/fdupes.info
index 9af960580d..893e4a75f0 100644
--- a/system/fdupes/fdupes.info
+++ b/system/fdupes/fdupes.info
@@ -3,6 +3,8 @@ VERSION="1.40"
 HOMEPAGE="http://netdial.caribe.net/~adrian2/fdupes.html"
 DOWNLOAD="http://netdial.caribe.net/~adrian2/programs/fdupes-1.40.tar.gz"
 MD5SUM="11de9ab4466089b6acbb62816b30b189"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave {at} gmail {dot} com"
 APPROVED="dsomero"
diff --git a/system/fdupes/slack-desc b/system/fdupes/slack-desc
index 1f5ea2ee94..d4e388a2f5 100644
--- a/system/fdupes/slack-desc
+++ b/system/fdupes/slack-desc
@@ -1,11 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
 fdupes: FDUPES (program for identifying or deleting duplicate files)
 fdupes:
 fdupes: FDUPES is a program for identifying or deleting duplicate files 
 fdupes: residing within specified directories.
 fdupes: 
-fdupes: The current version of fdupes is distributed as 
-fdupes: fdupes-1.40.tar.gz. No later version has been officially released. 
-fdupes: Users should get this version, as it's presumably the most reliable. 
-fdupes: 
-fdupes: http://premium.caribe.net/~adrian2/fdupes.html
-fdupes:
\ No newline at end of file
+fdupes: Homepage: http://premium.caribe.net/~adrian2/fdupes.html
+fdupes:
+fdupes:
+fdupes:
+fdupes:
+fdupes: