3 files changed, 16 insertions, 8 deletions
diff --git a/network/GeoIP/GeoIP.SlackBuild b/network/GeoIP/GeoIP.SlackBuild
index f4201c08af25..dfa33cb87d4e 100644
--- a/network/GeoIP/GeoIP.SlackBuild
+++ b/network/GeoIP/GeoIP.SlackBuild
@@ -14,14 +14,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCUMENTATION="AUTHORS COPYING ChangeLog INSTALL README TODO"
-
 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
@@ -39,6 +40,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --datadir=/usr/share \
   --localstatedir=/var \
@@ -53,8 +55,10 @@ make install DESTDIR=$PKG
 mv $PKG/etc/GeoIP.conf $PKG/etc/GeoIP.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
+  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
 )
 
 ( cd $PKG/usr/man || exit 1
@@ -63,7 +67,9 @@ mv $PKG/etc/GeoIP.conf $PKG/etc/GeoIP.conf.new
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCUMENTATION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -71,4 +77,4 @@ 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/GeoIP/GeoIP.info b/network/GeoIP/GeoIP.info
index b441ce3c3b73..11833609e5c9 100644
--- a/network/GeoIP/GeoIP.info
+++ b/network/GeoIP/GeoIP.info
@@ -3,6 +3,8 @@ VERSION="1.4.5"
 HOMEPAGE="http://www.maxmind.com/app/c"
 DOWNLOAD="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.5.tar.gz"
 MD5SUM="d95c34cf8ebd48e357b1812db5d75cf1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Yalla-One"
 EMAIL="yallaone@gmail.com"
 APPROVED="rworkman"
diff --git a/network/GeoIP/slack-desc b/network/GeoIP/slack-desc
index 22d60aa30a8b..2c45768954b1 100644
--- a/network/GeoIP/slack-desc
+++ b/network/GeoIP/slack-desc
@@ -14,6 +14,6 @@ GeoIP: non-invasive way to determine geographical and other information
 GeoIP: about their Internet visitors in real-time.
 GeoIP: To name a few applications, GeoIP can be used for delivering
 GeoIP: customized content, targeted ads and web log statistics
-GeoIP: 
+GeoIP:
 GeoIP: Homepage: http://www.maxmind.com/download/geoip/api/c/
-GeoIP: 
+GeoIP: