1 files changed, 19 insertions, 8 deletions
diff --git a/source/ap/at/at.SlackBuild b/source/ap/at/at.SlackBuild
index 2751bfc9..02082e75 100755
--- a/source/ap/at/at.SlackBuild
+++ b/source/ap/at/at.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,16 +21,28 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-3.1.10}
-ARCH=${ARCH:-x86_64}
+PKGNAM=at
+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
+
 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)
@@ -42,7 +54,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf at-$VERSION
-tar xvf $CWD/at-${VERSION}.tar.bz2 || exit 1
+tar xvf $CWD/at-${VERSION}.tar.?z* || exit 1
 cd at-$VERSION
 
 chown -R root:root .
@@ -59,7 +71,8 @@ chown daemon:daemon /var/spool/at{jobs,spool}
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-  $ARCH-slackware-linux
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 # Does not like parallel builds:
 make || exit 1
@@ -88,10 +101,8 @@ fi
 rm -rf $PKG/usr/doc/at
 mkdir -p $PKG/usr/doc/at-$VERSION
 cp -a \
-  COPYING ChangeLog debian/copyright Problems README timespec \
+  COPYING* ChangeLog Copyright Problems README* timespec \
   $PKG/usr/doc/at-$VERSION
-mv $PKG/usr/doc/at-$VERSION/copyright $PKG/usr/doc/at-$VERSION/Copyright
-chmod 644 $PKG/usr/doc/at-$VERSION/Copyright
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc