4 files changed, 56 insertions, 14 deletions
diff --git a/network/fdm/README b/network/fdm/README
index ee90ca66d3..e04c410099 100644
--- a/network/fdm/README
+++ b/network/fdm/README
@@ -10,5 +10,3 @@ 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.
-
-NOTE: fdm requires tdb which is also available on SlackBuilds.org.
diff --git a/network/fdm/fdm.SlackBuild b/network/fdm/fdm.SlackBuild
index 5692214cee..08041e8d25 100644
--- a/network/fdm/fdm.SlackBuild
+++ b/network/fdm/fdm.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Grigorios Bouzakis (grbzks@gmail.com)
 
 PRGNAM=fdm
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.6}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -23,8 +23,6 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
 fi
 
-DOCS="CHANGES MANUAL README TODO examples"
-
 set -e
 
 rm -rf $PKG
@@ -40,10 +38,16 @@ find . \
  \( -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
+# Fix up the Makefiles to not explicity declare owner and group when installing
+patch -p1 < $CWD/fix_Makefiles.patch
+
+make \
+  PREFIX=/usr \
+  CFLAGS+="$SLKCFLAGS" \
+  CXXFLAGS+="$SLKCFLAGS"
+make install \
+  PREFIX=/usr \
+  DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -56,7 +60,9 @@ make PREFIX=$PKG/usr install
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGES MANUAL README TODO examples \
+    $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 5680989bb6..e2f51a43fe 100644
--- a/network/fdm/fdm.info
+++ b/network/fdm/fdm.info
@@ -1,8 +1,8 @@
 PRGNAM="fdm"
-VERSION="1.5"
+VERSION="1.6"
 HOMEPAGE="http://fdm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/fdm/fdm-1.5.tar.gz"
-MD5SUM="fab768e35b41743f2c718b6a2c9e9c70"
+DOWNLOAD="http://downloads.sourceforge.net/fdm/fdm-1.6.tar.gz"
+MD5SUM="b2b9bfe95217b290142bde1621eb9a37"
 MAINTAINER="Grigorios Bouzakis"
 EMAIL="grbzks@gmail.com"
-APPROVED="David Somero"
+APPROVED="rworkman"
diff --git a/network/fdm/fix_Makefiles.patch b/network/fdm/fix_Makefiles.patch
new file mode 100644
index 0000000000..0cf287c23e
--- /dev/null
+++ b/network/fdm/fix_Makefiles.patch
@@ -0,0 +1,38 @@
+diff -Nur fdm-1.6.orig/GNUmakefile fdm-1.6/GNUmakefile
+--- fdm-1.6.orig/GNUmakefile	2008-12-22 10:20:05.000000000 -0600
++++ fdm-1.6/GNUmakefile	2009-01-16 23:57:52.922462755 -0600
+@@ -10,9 +10,6 @@
+ 
+ PREFIX?= /usr/local
+ 
+-BIN_OWNER= bin
+-BIN_GROUP= root
+-
+ CC= gcc
+ 
+ INCDIRS= -I$(PREFIX)/include
+@@ -27,8 +24,8 @@
+ endif
+ 
+ INSTALLDIR= install -d
+-INSTALLBIN= install -g $(BIN_OWNER) -o $(BIN_GROUP) -m 555
+-INSTALLMAN= install -g $(BIN_OWNER) -o $(BIN_GROUP) -m 444
++INSTALLBIN= install -m 0755
++INSTALLMAN= install -m 0644
+ 
+ SRCS= fdm.c \
+       attach.c buffer.c cleanup.c command.c connect.c io.c log.c netrc.c \
+diff -Nur fdm-1.6.orig/Makefile fdm-1.6/Makefile
+--- fdm-1.6.orig/Makefile	2008-12-22 10:20:05.000000000 -0600
++++ fdm-1.6/Makefile	2009-01-16 23:57:12.893462354 -0600
+@@ -94,8 +94,8 @@
+ 
+ PREFIX?= /usr/local
+ INSTALLDIR= install -d
+-INSTALLBIN= install -g bin -o root -m 555
+-INSTALLMAN= install -g bin -o root -m 444
++INSTALLBIN= install -m 0755
++INSTALLMAN= install -m 0644
+ 
+ LDFLAGS+= -L/usr/local/lib
+ .ifdef PROFILE