4 files changed, 35 insertions, 20 deletions
diff --git a/network/fdm/README b/network/fdm/README
index b0fc48f4de..ee90ca66d3 100644
--- a/network/fdm/README
+++ b/network/fdm/README
@@ -1,11 +1,14 @@
 fdm is a program to fetch mail and deliver it in various ways depending on a
-user-supplied ruleset. Mail may be fetched from stdin, IMAP or POP3 servers, or
-from local maildirs, and filtered based on whether it matches a regexp, its
-size or age, or the output of a shell command. It can be rewritten by an
-external process, dropped, left on the server or delivered into maildirs,
+user-supplied ruleset. Mail may be fetched from stdin, IMAP or POP3 servers,
+or from local maildirs, and filtered based on whether it matches a regexp,
+its size or age, or the output of a shell command. It can be rewritten by
+an external process, dropped, left on the server or delivered into maildirs,
 mboxes, to a file or pipe, or any combination.
 
 fdm is designed to be lightweight but powerful, with a compact but clear
 configuration syntax. It is primarily designed for single-user uses but may
-also be configured to deliver mail in a multi-user setup. In this case, it uses
-privilege separation to minimise the amount of code running as the root user.
+also be configured to deliver mail in a multi-user setup. In this case,
+it uses privilege separation to minimise the amount of code running as
+the root user.
+
+NOTE: fdm requires tdb which is also available on SlackBuilds.org.
diff --git a/network/fdm/fdm.SlackBuild b/network/fdm/fdm.SlackBuild
index 6d0490ac0b..5692214cee 100644
--- a/network/fdm/fdm.SlackBuild
+++ b/network/fdm/fdm.SlackBuild
@@ -3,13 +3,13 @@
 # Slackware build script for fdm
 
 # Written by Grigorios Bouzakis (grbzks@gmail.com)
-set -e
 
 PRGNAM=fdm
-VERSION=1.2
+VERSION=${VERSION:-1.5}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -19,32 +19,44 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+DOCS="CHANGES MANUAL README TODO examples"
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 make
 make PREFIX=$PKG/usr install
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  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
 )
 
 ( 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
+  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 CHANGES MANUAL README TODO examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/fdm/fdm.info b/network/fdm/fdm.info
index 05016e8750..5680989bb6 100644
--- a/network/fdm/fdm.info
+++ b/network/fdm/fdm.info
@@ -1,8 +1,8 @@
 PRGNAM="fdm"
-VERSION="1.2"
+VERSION="1.5"
 HOMEPAGE="http://fdm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/fdm/fdm-1.2.tar.gz"
-MD5SUM="e2ae2c34364daef98528ce826ae006c9"
+DOWNLOAD="http://downloads.sourceforge.net/fdm/fdm-1.5.tar.gz"
+MD5SUM="fab768e35b41743f2c718b6a2c9e9c70"
 MAINTAINER="Grigorios Bouzakis"
 EMAIL="grbzks@gmail.com"
-APPROVED="BP{k}"
+APPROVED="David Somero"
diff --git a/network/fdm/slack-desc b/network/fdm/slack-desc
index 1bcc2e70a4..4d82d6994e 100644
--- a/network/fdm/slack-desc
+++ b/network/fdm/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-fdm: fdm (Simple, lightweight replacement for fetc/getmail type programs)
+fdm: fdm (simple, lightweight replacement for fetch/getmail type programs)
 fdm:
 fdm: fdm is a program to fetch mail and deliver it in various ways 
 fdm: depending on a user-supplied ruleset. Mail may be fetched from stdin, 
@@ -15,5 +15,5 @@ fdm: whether it matches a regexp, its ize or age, or the output of a shell
 fdm: command.It can be rewritten by an external process, dropped, left on 
 fdm: the server or delivered into maildirs, mboxes, to a file or pipe, or 
 fdm: any combination.
-fdm: homepage: fdm: http://fdm.sourceforge.net/
-fdm:
+fdm: 
+fdm: Homepage: http://fdm.sourceforge.net/