1 files changed, 20 insertions, 8 deletions
diff --git a/source/d/strace/strace.SlackBuild b/source/d/strace/strace.SlackBuild
index 18affdaa..97b08183 100755
--- a/source/d/strace/strace.SlackBuild
+++ b/source/d/strace/strace.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,17 +20,30 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=4.5.18
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=strace
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 CWD=$(pwd)
@@ -53,7 +66,7 @@ find . \
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-   --prefix=/usr \
+  --prefix=/usr \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
@@ -64,12 +77,11 @@ strip $PKG/usr/bin/strace
 
 mkdir -p $PKG/usr/doc/strace-$VERSION
 cp -a \
-  COPYRIGHT CREDITS NEWS PORTING \
-  README README-CVS README-freebsd README-linux README-sunos4 README-svr4 TODO \
+  COPYRIGHT CREDITS NEWS PORTING README* TODO \
   $PKG/usr/doc/strace-$VERSION
 chmod 644 $PKG/usr/doc/strace-$VERSION/*
 
-gzip -9 $PKG/usr/man/man1/strace.1
+gzip -9 $PKG/usr/man/man1/*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc