3 files changed, 23 insertions, 13 deletions
diff --git a/misc/rlwrap/rlwrap.SlackBuild b/misc/rlwrap/rlwrap.SlackBuild
index 5814ac461885b..201ef8a841f5f 100644
--- a/misc/rlwrap/rlwrap.SlackBuild
+++ b/misc/rlwrap/rlwrap.SlackBuild
@@ -5,7 +5,7 @@
 # Released under the WTFPL
 
 PRGNAM=rlwrap
-VERSION=0.30
+VERSION=${VERSION:-0.32}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -17,8 +17,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
@@ -40,19 +45,22 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 make
 make DESTDIR=$PKG install-strip
 
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [ABCINRT]* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS ChangeLog COPYING INSTALL NEWS PLEA README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/misc/rlwrap/rlwrap.info b/misc/rlwrap/rlwrap.info
index de94cd94ebc77..ced80b2fb23aa 100644
--- a/misc/rlwrap/rlwrap.info
+++ b/misc/rlwrap/rlwrap.info
@@ -1,8 +1,10 @@
 PRGNAM="rlwrap"
-VERSION="0.30"
+VERSION="0.32"
 HOMEPAGE="http://utopia.knoware.nl/~hlub/uck/rlwrap/"
-DOWNLOAD="http://utopia.knoware.nl/~hlub/uck/rlwrap/rlwrap-0.30.tar.gz"
-MD5SUM="03d8bd4996945ea32d3c7d5dc38c956e"
+DOWNLOAD="http://utopia.knoware.nl/~hlub/uck/rlwrap/rlwrap-0.32.tar.gz"
+MD5SUM="441282a9a65c1d516c1c9a6821184539"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="slakmagik"
 EMAIL="jsun@freeshell.org"
 APPROVED="rworkman"
diff --git a/misc/rlwrap/slack-desc b/misc/rlwrap/slack-desc
index 885ae17ba0ef4..0a52c9ea26aa5 100644
--- a/misc/rlwrap/slack-desc
+++ b/misc/rlwrap/slack-desc
@@ -7,13 +7,13 @@
 
       |-----handy-ruler------------------------------------------------------|
 rlwrap: rlwrap (readline wrapper)
-rlwrap: 
+rlwrap:
 rlwrap: rlwrap is a 'readline wrapper' that uses the GNU readline library
 rlwrap: to allow the editing of keyboard input for any other command. Input
 rlwrap: history is remembered across invocations, separately for each command;
 rlwrap: history completion and search work as in bash and completion word
 rlwrap: lists can be specified on the command line.
-rlwrap: 
+rlwrap:
 rlwrap: Homepage: http://utopia.knoware.nl/~hlub/uck/rlwrap/
-rlwrap: 
-rlwrap: 
+rlwrap:
+rlwrap: