3 files changed, 23 insertions, 14 deletions
diff --git a/network/ettercap-NG/README b/network/ettercap-NG/README
index e2e420c7162c5..9d9cbdd23bcc8 100644
--- a/network/ettercap-NG/README
+++ b/network/ettercap-NG/README
@@ -1,11 +1,14 @@
-Ettercap is a suite for man in the middle attacks on LAN. It features 
+Ettercap is a suite for man in the middle attacks on LAN. It features
 sniffing of live connections, content filtering on the fly and many other
-interesting tricks. It is capable of intercepting traffic on a network segment, capturing passwords, and conducting man-in-the-middle attacks against a number of common protocols.
+interesting tricks. It is capable of intercepting traffic on a network
+segment, capturing passwords, and conducting man-in-the-middle attacks
+against a number of common protocols.
 
-It supports active and passive dissection of many protocols (even ciphered ones) and includes many feature for network and host analysis.
+It supports active and passive dissection of many protocols (even
+ciphered ones) and includes many feature for network and host analysis.
 
-It is free software, licensed under the terms of the 
+It is free software, licensed under the terms of the
 GNU General Public License.
 
-Ettercap-NG requires libnet. A SlackBuild for this is available at 
+Ettercap-NG requires libnet. A SlackBuild for this is available at
 SlackBuilds.org.
diff --git a/network/ettercap-NG/ettercap-NG.SlackBuild b/network/ettercap-NG/ettercap-NG.SlackBuild
index 7ba51fc5517f5..0e39fce3208ba 100644
--- a/network/ettercap-NG/ettercap-NG.SlackBuild
+++ b/network/ettercap-NG/ettercap-NG.SlackBuild
@@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # exit on most errors.
@@ -53,8 +56,9 @@ chown -R root:root .
 chmod -R u+w,go+r,a-s .
 
 CFLAGS="$SLKCFLAGS" \
-  ./configure \
+./configure \
   --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --enable-plugins \
@@ -64,6 +68,11 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+mkdir -p $PKG/usr/share/applications
+cat $CWD/ettercap.desktop > $PKG/usr/share/applications/ettercap.desktop
+
+mv $PKG/etc/etter.conf $PKG/etc/etter.conf.new
+
 ( cd $PKG
 	find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 	find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -79,14 +88,9 @@ cp -a AUTHORS CHANGELOG INSTALL LICENSE README* THANKS TODO* doc/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/applications
-cat $CWD/ettercap.desktop > $PKG/usr/share/applications/ettercap.desktop
-
-mv $PKG/etc/etter.conf $PKG/etc/etter.conf.new
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $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/ettercap-NG/ettercap-NG.info b/network/ettercap-NG/ettercap-NG.info
index c0c5147e67d66..cbf2a5595a0aa 100644
--- a/network/ettercap-NG/ettercap-NG.info
+++ b/network/ettercap-NG/ettercap-NG.info
@@ -2,7 +2,9 @@ PRGNAM="ettercap-NG"
 VERSION="0.7.3"
 HOMEPAGE="http://ettercap.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/ettercap/ettercap-NG-0.7.3.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="28fb15cd024162c55249888fe1b97820"
+MD5SUM_x86_64=""
 MAINTAINER="meckafett"
 EMAIL="tom.bradish@gmail.com"
 APPROVED="Michiel"