network/xtables-addons: Updated for version 1.18

4 files changed, 24 insertions, 20 deletions

diff --git a/network/xtables-addons/README b/network/xtables-addons/README
index c21a7cf2b1b51..5cd17a5da5a81 100644
--- a/network/xtables-addons/README
+++ b/network/xtables-addons/README
@@ -6,7 +6,3 @@ including TARPIT and SYSRQ.
 
 This package builds some kernel modules, so it will need to be
 rebuilt any time you change kernels.
-
-Don't write to the maintainer asking for this to be updated;
-version 1.12 is the last version that will build on Slackware 12.2
-due to the version of iptables (1.4.2) that it shipped.
diff --git a/network/xtables-addons/slack-desc b/network/xtables-addons/slack-desc
index e367f470b2995..77ce21d071b13 100644
--- a/network/xtables-addons/slack-desc
+++ b/network/xtables-addons/slack-desc
@@ -7,13 +7,13 @@
 
               |-----handy-ruler----------------------------------------------|
 xtables-addons: xtables-addons (additions for iptables/xtables)
-xtables-addons: 
+xtables-addons:
 xtables-addons: Xtables-addons is the proclaimed successor to 
 xtables-addons: patch-o-matic(-ng). It contains extensions that
 xtables-addons: were not accepted in the main Xtables package.
-xtables-addons: 
+xtables-addons:
 xtables-addons: Homepage: http://jengelh.medozas.de/projects/xtables/
-xtables-addons: 
-xtables-addons: 
-xtables-addons: 
-xtables-addons: 
+xtables-addons:
+xtables-addons:
+xtables-addons:
+xtables-addons:
diff --git a/network/xtables-addons/xtables-addons.SlackBuild b/network/xtables-addons/xtables-addons.SlackBuild
index 28bdd7ac65209..b3d5cccdb1b80 100644
--- a/network/xtables-addons/xtables-addons.SlackBuild
+++ b/network/xtables-addons/xtables-addons.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xtables-addons
-VERSION=1.12
+VERSION=1.18
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -37,10 +37,16 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+  SRCARCH=x86
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  SRCARCH=x86
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  SRCARCH=x86
 fi
 
 set -e
@@ -61,14 +67,15 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-kbuild=/lib/modules/${KERNEL}/build \
   --with-ksource=/lib/modules/${KERNEL}/source \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || true
 
-make
-make install DESTDIR=$PKG
+make SRCARCH=$SRCARCH
+make install DESTDIR=$PKG SRCARCH=$SRCARCH
 
 # Hrm, we don't want to install these
 rm -f $PKG/lib/modules/${KERNEL}/modules.*
@@ -80,13 +87,12 @@ rm -f $PKG/lib/modules/${KERNEL}/modules.*
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-# Compress man pages
 ( 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
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -95,4 +101,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s/@KERNEL@/$KERNEL/" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/xtables-addons/xtables-addons.info b/network/xtables-addons/xtables-addons.info
index 33d30abe19328..891b69e39b5b2 100644
--- a/network/xtables-addons/xtables-addons.info
+++ b/network/xtables-addons/xtables-addons.info
@@ -1,8 +1,10 @@
 PRGNAM="xtables-addons"
-VERSION="1.12"
+VERSION="1.18"
 HOMEPAGE="http://xtables-addons.sf.net/"
-DOWNLOAD="http://downloads.sf.net/xtables-addons/xtables-addons-1.12.tar.bz2"
-MD5SUM="e1544d87bbae03a02874c6598daa111d"
+DOWNLOAD="http://downloads.sourceforge.net/xtables-addons/xtables-addons-1.18.tar.bz2"
+MD5SUM="5a8d2edbf5a3470bba58d6a60c350805"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="dsomero"