2 files changed, 29 insertions, 13 deletions
diff --git a/network/tunctl/tunctl.SlackBuild b/network/tunctl/tunctl.SlackBuild
index c17d39a8cf..4d5be15bd5 100644
--- a/network/tunctl/tunctl.SlackBuild
+++ b/network/tunctl/tunctl.SlackBuild
@@ -7,7 +7,7 @@
 PRGNAM=tunctl
 VERSION=${VERSION:-1.5}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -15,6 +15,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 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
@@ -30,27 +41,30 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-make
+make CFLAGS="$SLKCFLAGS" 
 make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 # Fix up the manpages
-mv $PKG/usr/share/man $PKG/usr/man
+mv $PKG/usr/share/man $PKG/usr/man ; rmdir $PKG/usr/share
 
 ( 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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
 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/tunctl/tunctl.info b/network/tunctl/tunctl.info
index d1443d9c6f..4c1aef0933 100644
--- a/network/tunctl/tunctl.info
+++ b/network/tunctl/tunctl.info
@@ -3,6 +3,8 @@ VERSION="1.5"
 HOMEPAGE="http://tunctl.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/tunctl/tunctl-1.5.tar.gz"
 MD5SUM="fdbedc263b3e85bb0e087cd567414607"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Murat D. Kadirov"
 EMAIL="banderols@gmail.com"
-APPROVED="David Somero"
+APPROVED="dsomero"