network/surfraw: Updated for version 1.0.7

network/surfraw/doinst.sh

@@ -1,4 +1,3 @@
-
 config() {
   NEW="$1"
   OLD="`dirname $NEW`/`basename $NEW .new`"

network/surfraw/surfraw.SlackBuild

@@ -24,13 +24,12 @@
 
 # Modified by the SlackBuilds.org project
 
-set -e
-
 PRGNAM=surfraw
 VERSION=1.0.7
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -38,10 +37,17 @@ 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
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -55,10 +61,12 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --infodir=/usr/info
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -79,4 +87,4 @@ for file in $PKG/etc/*; do
 done
 
 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}

network/surfraw/surfraw.info

@@ -2,7 +2,9 @@ PRGNAM="surfraw"
 VERSION="1.0.7"
 HOMEPAGE="http://surfraw.sf.net"
 DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/surfraw-1.0.7.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="0957382bbdebf3d678879fa5d2592c9d"
+MD5SUM_x86_64=""
 MAINTAINER="Martin Lefebvre"
 EMAIL="dadexter@gmail.com"
 APPROVED="rworkman"