3 files changed, 25 insertions, 51 deletions
diff --git a/network/fdm/GNUmakefile.patch b/network/fdm/GNUmakefile.patch
deleted file mode 100644
index ef9de2f6eb..0000000000
--- a/network/fdm/GNUmakefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- fdm-1,6/GNUmakefile	2008-12-22 21:50:05.000000000 +0530
-+++ fdm-1.6/GNUmakefile	2009-05-09 19:07:21.000000000 +0530
-@@ -8,10 +8,7 @@
- 
- #DEBUG= 1
- 
--PREFIX?= /usr/local
--
--BIN_OWNER= bin
--BIN_GROUP= root
-+PREFIX?= /usr
- 
- CC= gcc
- 
-@@ -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 \
-@@ -72,7 +69,7 @@
- endif
- 
- OBJS= $(patsubst %.c,%.o,$(SRCS))
--CPPFLAGS+= $(DEFS) -I. -I- $(INCDIRS)
-+CPPFLAGS+= $(DEFS) -I. -iquote. $(INCDIRS)
- ifdef DEBUG
- CFLAGS+= -g -ggdb -DDEBUG
- LDFLAGS+= -rdynamic
diff --git a/network/fdm/fdm.SlackBuild b/network/fdm/fdm.SlackBuild
index 86a7b1d76f..988d684182 100644
--- a/network/fdm/fdm.SlackBuild
+++ b/network/fdm/fdm.SlackBuild
@@ -21,8 +21,8 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fdm
-VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -52,7 +52,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="CHANGES MANUAL README TODO examples"
+DOCS="CHANGES README TODO examples"
 
 set -e
 
@@ -63,16 +63,24 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-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 {} \;
-
-patch -p1 < $CWD/GNUmakefile.patch
-
-make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" LDFLAGS="-lcrypto"
-make install DESTDIR=$PKG
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+make PREFIX=/usr MANDIR=/usr/man
+make PREFIX=/usr MANDIR=/usr/man install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/network/fdm/fdm.info b/network/fdm/fdm.info
index c563f0b9fc..3c27ec60f0 100644
--- a/network/fdm/fdm.info
+++ b/network/fdm/fdm.info
@@ -1,10 +1,10 @@
 PRGNAM="fdm"
-VERSION="1.6"
+VERSION="1.7"
 HOMEPAGE="http://fdm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/fdm/fdm-1.6.tar.gz"
-MD5SUM="b2b9bfe95217b290142bde1621eb9a37"
+DOWNLOAD="http://downloads.sourceforge.net/fdm/fdm-1.7.tar.gz"
+MD5SUM="aea0421571e8f3ec8f747a5d72c84348"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="tdb"
 MAINTAINER="Grigorios Bouzakis"
 EMAIL="grbzks@xsmail.com"