4 files changed, 16 insertions, 9 deletions
diff --git a/network/kismet/doinst.sh b/network/kismet/doinst.sh
index ad14c9cfab45f..358655b439b60 100644
--- a/network/kismet/doinst.sh
+++ b/network/kismet/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
diff --git a/network/kismet/kismet.SlackBuild b/network/kismet/kismet.SlackBuild
index 18866a7506153..ad2babf0f7c23 100644
--- a/network/kismet/kismet.SlackBuild
+++ b/network/kismet/kismet.SlackBuild
@@ -6,6 +6,7 @@
 
 PRGNAM=kismet
 VERSION=2008_05_R1
+SRCVER=$(echo $VERSION | tr _ -)
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -17,10 +18,13 @@ 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 # Exit on most errors
@@ -28,9 +32,9 @@ set -e # Exit on most errors
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$(echo $VERSION | tr _ -)
-tar xvf $CWD/$PRGNAM-$(echo $VERSION | tr _ -).tar.gz
-cd $PRGNAM-$(echo $VERSION | tr _ -)
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -38,6 +42,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc/kismet \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -47,8 +52,10 @@ make
 make install MANGRP=root DESTDIR=$PKG
 
 ( 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
 )
 
 ( cd $PKG/usr/man
@@ -72,4 +79,4 @@ mv $PKG/etc/kismet/ap_manuf $PKG/etc/kismet/ap_manuf.new
 mv $PKG/etc/kismet/client_manuf $PKG/etc/kismet/client_manuf.new
 
 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/kismet/kismet.info b/network/kismet/kismet.info
index e1174f0d0d736..d66a8e9907156 100644
--- a/network/kismet/kismet.info
+++ b/network/kismet/kismet.info
@@ -2,7 +2,9 @@ PRGNAM="kismet"
 VERSION="2008_05_R1"
 HOMEPAGE="http://kismetwireless.net/"
 DOWNLOAD="http://kismetwireless.net/code/kismet-2008-05-R1.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="6ee365d36354b4dee4945e67f8149294"
+MD5SUM_x86_64=""
 MAINTAINER="Audrius Kazukauskas"
 EMAIL="neobug@tornado.ktu.lt"
 APPROVED="rworkman"
diff --git a/network/kismet/slack-desc b/network/kismet/slack-desc
index ebe0b6e55615b..fbab13af34d30 100644
--- a/network/kismet/slack-desc
+++ b/network/kismet/slack-desc
@@ -13,7 +13,7 @@ kismet: intrusion detection system.  Kismet will work with any wireless card
 kismet: which supports raw monitoring (rfmon) mode, and can sniff 802.11b,
 kismet: 802.11a, and 802.11g traffic.
 kismet:
-kismet: http://kismetwireless.net/
+kismet: Homepage: http://kismetwireless.net/
 kismet:
 kismet:
 kismet: