network/netstat-nat: Updated for version 1.4.9

3 files changed, 36 insertions, 24 deletions

diff --git a/network/netstat-nat/netstat-nat.SlackBuild b/network/netstat-nat/netstat-nat.SlackBuild
index 49527d63ac..352d668279 100644
--- a/network/netstat-nat/netstat-nat.SlackBuild
+++ b/network/netstat-nat/netstat-nat.SlackBuild
@@ -22,13 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-set -e
-
 PRGNAM=netstat-nat
-VERSION=1.4.7
+VERSION=1.4.9
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -36,34 +35,45 @@ 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
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvzf $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 .
 
 CFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr || exit 1
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
 
 # Fix documentation directory in the Makefile
-sed -i s#'docdir = $(prefix)/share/doc'#'docdir = $(prefix)/doc'# Makefile || exit 1
+#sed -i s#'docdir = $(prefix)/share/doc'#'docdir = $(prefix)/doc'# Makefile || exit 1
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make docdir=/usr/doc/$PRGNAM-$VERSION
+make docdir=/usr/doc/$PRGNAM-$VERSION install-strip DESTDIR=$PKG
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+gzip -9 $PKG/usr/man/man?/*.?
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-gzip -9 $PKG/usr/man/man?/*
-
 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/network/netstat-nat/netstat-nat.info b/network/netstat-nat/netstat-nat.info
index e01d01e239..a8fc510de1 100644
--- a/network/netstat-nat/netstat-nat.info
+++ b/network/netstat-nat/netstat-nat.info
@@ -1,8 +1,10 @@
 PRGNAM="netstat-nat"
-VERSION="1.4.7"
+VERSION="1.4.9"
 HOMEPAGE="http://www.tweegy.nl/projects/netstat-nat/index.html"
-DOWNLOAD="http://www.tweegy.nl/download/netstat-nat-1.4.7.tar.gz"
-MD5SUM="46bccc302288da7ebd4f0f3dadf1fad9"
-MAINTAINER="Ricardson Williams"
-EMAIL="ricardsonwilliams@yahoo.com.br"
-APPROVED="Alan_Hicks,rworkman"
+DOWNLOAD="http://www.tweegy.nl/download/netstat-nat-1.4.9.tar.gz"
+MD5SUM="45e8d0f47623f619c22a6b894cd03cbc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="David Somero"
+EMAIL="xgizzmo@slackbuilds.org"
+APPROVED="rworkman"
diff --git a/network/netstat-nat/slack-desc b/network/netstat-nat/slack-desc
index 11fc360fcf..7adcf59e84 100644
--- a/network/netstat-nat/slack-desc
+++ b/network/netstat-nat/slack-desc
@@ -10,10 +10,10 @@ netstat-nat: Netstat-nat (displays NAT connections)
 netstat-nat:
 netstat-nat: Netstat-nat is a small program written in C. It displays NAT 
 netstat-nat: connections, managed by netfilter/iptables.
-netstat-nat: 
+netstat-nat:
 netstat-nat: Homepage: http://tweegy.demon.nl/projects/netstat-nat/index.html
-netstat-nat:  
 netstat-nat:
-netstat-nat: 
-netstat-nat: 
-netstat-nat: 
+netstat-nat:
+netstat-nat:
+netstat-nat:
+netstat-nat: