4 files changed, 15 insertions, 18 deletions
diff --git a/network/iftop/README b/network/iftop/README
index ee9c228c7b..01115e3d75 100644
--- a/network/iftop/README
+++ b/network/iftop/README
@@ -2,5 +2,3 @@ iftop does for network usage what top(1) does for CPU usage. It listens
 to network traffic on a named interface and displays a table of current
 bandwidth usage by pairs of hosts. Handy for answering the question
 "why is our ADSL link so slow?".
-
-
diff --git a/network/iftop/iftop.SlackBuild b/network/iftop/iftop.SlackBuild
index a2f48a185e..5eeb5dfb5d 100644
--- a/network/iftop/iftop.SlackBuild
+++ b/network/iftop/iftop.SlackBuild
@@ -5,16 +5,14 @@
 # http://slackbuilds.org/template.SlackBuild
 
 PRGNAM=iftop
-VERSION=${VERSION:-0.17pre3}
+VERSION=${VERSION:-0.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -24,8 +22,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -40,12 +36,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -zxvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -56,10 +54,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
-make || exit
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
 gzip -9 $PKG/usr/man/man?/*
 
diff --git a/network/iftop/iftop.info b/network/iftop/iftop.info
index c7c969c2cb..fea02f9741 100644
--- a/network/iftop/iftop.info
+++ b/network/iftop/iftop.info
@@ -1,10 +1,10 @@
 PRGNAM="iftop"
-VERSION="0.17pre3"
+VERSION="0.17"
 HOMEPAGE="http://www.ex-parrot.com/~pdw/iftop/"
-DOWNLOAD="http://www.ex-parrot.com/~pdw/iftop/download/iftop-0.17pre3.tar.gz"
-MD5SUM="6d80885e0ff642222c96bb7bd3e83f96"
+DOWNLOAD="http://www.ex-parrot.com/~pdw/iftop/download/iftop-0.17.tar.gz"
+MD5SUM="062bc8fb3856580319857326e0b8752d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="chopp"
 EMAIL="nix4me@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/network/iftop/slack-desc b/network/iftop/slack-desc
index a6edf5e4c5..f1cf49c3ea 100644
--- a/network/iftop/slack-desc
+++ b/network/iftop/slack-desc
@@ -13,7 +13,7 @@ iftop: It listens to network traffic on a named interface and displays
 iftop: a table of current bandwidth usage by pairs of hosts. 
 iftop: Handy for answering the question "why is our ADSL link so slow?".
 iftop:
-iftop:
 iftop: Homepage: http://www.ex-parrot.com/~pdw/iftop/
 iftop:
 iftop:
+iftop: