From 73bec45e9906f490f858ee5e71950b2537ef4405 Mon Sep 17 00:00:00 2001
From: Yalla-One <yallaone@gmail.com>
Date: Wed, 12 May 2010 17:42:55 +0200
Subject: network/GeoIP: Updated for version 1.4.5

---
 network/GeoIP/GeoIP.SlackBuild | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'network/GeoIP/GeoIP.SlackBuild')

diff --git a/network/GeoIP/GeoIP.SlackBuild b/network/GeoIP/GeoIP.SlackBuild
index f2aa36c572..f4201c08af 100644
--- a/network/GeoIP/GeoIP.SlackBuild
+++ b/network/GeoIP/GeoIP.SlackBuild
@@ -4,10 +4,11 @@
 # Written by Yalla-One <yallaone@gmail.com>
 
 PRGNAM=GeoIP
-VERSION=1.4.3
+VERSION=1.4.5
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -19,6 +20,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -27,7 +30,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -38,13 +41,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --datadir=/usr/share \
-  --localstatedir=/var
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 # Let's not clobber config files
-mv $PKG/etc/GeoIP.conf.default $PKG/etc/GeoIP.conf.default.new
 mv $PKG/etc/GeoIP.conf $PKG/etc/GeoIP.conf.new
 
 ( cd $PKG
@@ -52,7 +57,7 @@ mv $PKG/etc/GeoIP.conf $PKG/etc/GeoIP.conf.new
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
-( cd $PKG/usr/man
+( cd $PKG/usr/man || exit 1
   find . -type f -exec gzip -9 {} \;
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
-- 
cgit v1.2.3