Thu Jul 29 01:45:40 UTC 2010

a/aaa_terminfo-5.7-x86_64-2.txz:  Rebuilt.
a/dialog-1.1_20100428-x86_64-1.txz:  Upgraded.
a/ed-1.4-x86_64-1.txz:  Upgraded.
a/grep-2.6.3-x86_64-1.txz:  Upgraded.
a/hdparm-9.29-x86_64-1.txz:  Upgraded.
a/mtx-1.3.12-x86_64-1.txz:  Upgraded.
a/ncompress-4.2.4.3-x86_64-1.txz:  Upgraded.
a/patch-2.6.1-x86_64-1.txz:  Upgraded.
a/procps-3.2.8-x86_64-1.txz:  Upgraded.
a/sharutils-4.9-x86_64-1.txz:  Upgraded.
a/tcsh-6.17.00-x86_64-1.txz:  Upgraded.
a/tree-1.5.3-x86_64-1.txz:  Upgraded.
a/utempter-1.1.5-x86_64-1.txz:  Upgraded.
a/zoo-2.10_22-x86_64-1.txz:  Upgraded.
ap/a2ps-4.14-x86_64-5.txz:  Rebuilt.
ap/acct-6.5.4-x86_64-1.txz:  Upgraded.
ap/at-3.1.12-x86_64-1.txz:  Upgraded.
ap/aumix-2.9.1-x86_64-1.txz:  Upgraded.
ap/cdrdao-1.2.3-x86_64-1.txz:  Upgraded.
ap/diffstat-1.53-x86_64-1.txz:  Upgraded.
ap/enscript-1.6.5.2-x86_64-1.txz:  Upgraded.
ap/groff-1.20.1-x86_64-2.txz:  Rebuilt.
  Patched a bug in doc.tmac.  Thanks to Willy Sudiarto Raharjo.
ap/joe-3.7-x86_64-1.txz:  Upgraded.
ap/jove-4.16.0.73-x86_64-1.txz:  Upgraded.
ap/ksh93-2010_06_21-x86_64-1.txz:  Upgraded.
ap/linuxdoc-tools-0.9.66-x86_64-3.txz:  Rebuilt.
ap/lsscsi-0.24b1-x86_64-1.txz:  Upgraded.
ap/sc-7.16-x86_64-3.txz:  Rebuilt.
ap/texinfo-4.13a-x86_64-4.txz:  Rebuilt.
ap/sox-14.3.1-x86_64-1.txz:  Upgraded.
ap/vorbis-tools-1.4.0-x86_64-1.txz:  Upgraded.
ap/workbone-2.40-x86_64-4.txz:  Rebuilt.
d/gperf-3.0.4-x86_64-1.txz:  Upgraded.
d/make-3.82-x86_64-1.txz:  Upgraded.
d/pkg-config-0.25-x86_64-1.txz:  Upgraded.
d/strace-4.5.20-x86_64-1.txz:  Upgraded.
l/jre-6u21-x86_64-1.txz:  Upgraded.
  Upgraded to Java(TM) 2 Platform Standard Edition Runtime Environment
  Version 6.0 update 20.
l/libao-1.0.0-x86_64-1.txz:  Upgraded.
l/libvorbis-1.3.1-x86_64-1.txz:  Upgraded.
l/libogg-1.2.0-x86_64-1.txz:  Upgraded.
n/samba-3.5.4-x86_64-1.txz:  Upgraded.
extra/jdk-6/jdk-6u21-x86_64-1.txz:  Upgraded.
  Upgraded to Java(TM) 2 Platform Standard Edition Development Kit
  Version 6.0 update 21.

87 files changed, 757 insertions, 175 deletions

diff --git a/slackware64-current/source/a/aaa_terminfo/aaa_terminfo.SlackBuild b/slackware64-current/source/a/aaa_terminfo/aaa_terminfo.SlackBuild
index a1e7d288f..1c0d2fb6a 100755
--- a/slackware64-current/source/a/aaa_terminfo/aaa_terminfo.SlackBuild
+++ b/slackware64-current/source/a/aaa_terminfo/aaa_terminfo.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,17 @@
 PKGNAM=aaa_terminfo
 # Note the version of ncurses in use:
 VERSION=${VERSION:-5.7}
-ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
+
+# 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" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
diff --git a/slackware64-current/source/a/acl/acl.SlackBuild b/slackware64-current/source/a/acl/acl.SlackBuild
index 7ad70d045..d04294da6 100755
--- a/slackware64-current/source/a/acl/acl.SlackBuild
+++ b/slackware64-current/source/a/acl/acl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.2.47-1
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-acl
diff --git a/slackware64-current/source/a/apmd/apmd.SlackBuild b/slackware64-current/source/a/apmd/apmd.SlackBuild
index 13e472735..22be661c2 100755
--- a/slackware64-current/source/a/apmd/apmd.SlackBuild
+++ b/slackware64-current/source/a/apmd/apmd.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,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-3.2.2}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-2}
 
+# 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 "}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-apmd
diff --git a/slackware64-current/source/a/attr/attr.SlackBuild b/slackware64-current/source/a/attr/attr.SlackBuild
index 9c16a8d60..34781ea47 100755
--- a/slackware64-current/source/a/attr/attr.SlackBuild
+++ b/slackware64-current/source/a/attr/attr.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.4.43-1
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-attr
diff --git a/slackware64-current/source/a/bin/bin.SlackBuild b/slackware64-current/source/a/bin/bin.SlackBuild
index 69995accc..415e558ea 100755
--- a/slackware64-current/source/a/bin/bin.SlackBuild
+++ b/slackware64-current/source/a/bin/bin.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=11.1
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-bin
diff --git a/slackware64-current/source/a/bzip2/bzip2.SlackBuild b/slackware64-current/source/a/bzip2/bzip2.SlackBuild
index 465f75e07..c18c5c8db 100755
--- a/slackware64-current/source/a/bzip2/bzip2.SlackBuild
+++ b/slackware64-current/source/a/bzip2/bzip2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 VERSION=1.0.5
 SOLIB=1.0.4
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-bzip2
diff --git a/slackware64-current/source/a/cpio/cpio.SlackBuild b/slackware64-current/source/a/cpio/cpio.SlackBuild
index 9cb6054bc..28b45fe92 100755
--- a/slackware64-current/source/a/cpio/cpio.SlackBuild
+++ b/slackware64-current/source/a/cpio/cpio.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 PKGNAM=cpio
 VERSION=${VERSION:-2.9}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# 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 "}
 
 CWD=$(pwd)
diff --git a/slackware64-current/source/a/dialog/dialog-1.1-20080819.tar.bz2 b/slackware64-current/source/a/dialog/dialog-1.1-20080819.tar.bz2
deleted file mode 100644
index a8fc1144b..000000000
--- a/slackware64-current/source/a/dialog/dialog-1.1-20080819.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-d036326b77a11f4535b9bcfe2ef8926621bd5a3a
diff --git a/slackware64-current/source/a/dialog/dialog-1.1-20100428.tar.xz b/slackware64-current/source/a/dialog/dialog-1.1-20100428.tar.xz
new file mode 100644
index 000000000..8f2877235
--- /dev/null
+++ b/slackware64-current/source/a/dialog/dialog-1.1-20100428.tar.xz
@@ -0,0 +1 @@
+f032db02b9256ea1a66d092e55c504a69c29a011
diff --git a/slackware64-current/source/a/dialog/dialog.SlackBuild b/slackware64-current/source/a/dialog/dialog.SlackBuild
index 9c9bd3f65..9c06346f1 100755
--- a/slackware64-current/source/a/dialog/dialog.SlackBuild
+++ b/slackware64-current/source/a/dialog/dialog.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 
 
 PKGNAM=dialog
-VERSION=${VERSION:-1.1-20080819}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1,2 -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
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -49,7 +58,7 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || exit 1
diff --git a/slackware64-current/source/a/dosfstools/dosfstools.SlackBuild b/slackware64-current/source/a/dosfstools/dosfstools.SlackBuild
index ebe99c68b..1a1391993 100755
--- a/slackware64-current/source/a/dosfstools/dosfstools.SlackBuild
+++ b/slackware64-current/source/a/dosfstools/dosfstools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2007-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=2.11
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-dosfstools
diff --git a/slackware64-current/source/a/ed/ed-1.3.tar.bz2 b/slackware64-current/source/a/ed/ed-1.3.tar.bz2
deleted file mode 100644
index a7e8cde75..000000000
--- a/slackware64-current/source/a/ed/ed-1.3.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-49dca95428e21cdb9568dbcff77eafbbfa1c3de3
diff --git a/slackware64-current/source/a/ed/ed-1.4.tar.xz b/slackware64-current/source/a/ed/ed-1.4.tar.xz
new file mode 100644
index 000000000..737cad4b1
--- /dev/null
+++ b/slackware64-current/source/a/ed/ed-1.4.tar.xz
@@ -0,0 +1 @@
+1ecb753aaadb8cc30aa7c56b99151c83659f417c
diff --git a/slackware64-current/source/a/ed/ed.SlackBuild b/slackware64-current/source/a/ed/ed.SlackBuild
index 534ca116d..72f47141e 100755
--- a/slackware64-current/source/a/ed/ed.SlackBuild
+++ b/slackware64-current/source/a/ed/ed.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
 
 
 PKGNAM=ed
-VERSION=${VERSION:-1.3}
-ARCH=${ARCH:-x86_64}
+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 "}
 
 CWD=$(pwd)
@@ -36,7 +45,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -104,9 +113,17 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS README TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/slackware64-current/source/a/findutils/findutils.SlackBuild b/slackware64-current/source/a/findutils/findutils.SlackBuild
index aca93a0cc..5aef7e739 100755
--- a/slackware64-current/source/a/findutils/findutils.SlackBuild
+++ b/slackware64-current/source/a/findutils/findutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=4.4.2
-ARCH=${ARCH:-x86_64}
 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:--j6}
 
 CWD=$(pwd)
diff --git a/slackware64-current/source/a/floppy/floppy.SlackBuild b/slackware64-current/source/a/floppy/floppy.SlackBuild
index 38a5cc86f..04966d1ca 100755
--- a/slackware64-current/source/a/floppy/floppy.SlackBuild
+++ b/slackware64-current/source/a/floppy/floppy.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
@@ -22,9 +22,18 @@
 
 VERSION=5.4
 MTOOLS=3.9.8
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-3}
 
+# 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" = "x86_64" ]; then
   SLKCFLAGS="-O -fPIC"
   LIBDIRSUFFIX="64"
diff --git a/slackware64-current/source/a/genpower/genpower.SlackBuild b/slackware64-current/source/a/genpower/genpower.SlackBuild
index 03f15675c..bcf40786e 100755
--- a/slackware64-current/source/a/genpower/genpower.SlackBuild
+++ b/slackware64-current/source/a/genpower/genpower.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,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=${VERSION:-1.0.5}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-genpower
diff --git a/slackware64-current/source/a/getty-ps/getty-ps.SlackBuild b/slackware64-current/source/a/getty-ps/getty-ps.SlackBuild
index 76e4012dd..fb1a49f8b 100755
--- a/slackware64-current/source/a/getty-ps/getty-ps.SlackBuild
+++ b/slackware64-current/source/a/getty-ps/getty-ps.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
@@ -22,9 +22,18 @@
 
 
 VERSION=2.1.0b
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-getty-ps
diff --git a/slackware64-current/source/a/gpm/gpm.SlackBuild b/slackware64-current/source/a/gpm/gpm.SlackBuild
index b0352fe89..a79ce2b6c 100755
--- a/slackware64-current/source/a/gpm/gpm.SlackBuild
+++ b/slackware64-current/source/a/gpm/gpm.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
@@ -23,9 +23,18 @@
 # by: volkerdi@slackware.com
 
 VERSION=1.20.1
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-5}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-gpm
diff --git a/slackware64-current/source/a/grep/grep-2.5.4.tar.bz2 b/slackware64-current/source/a/grep/grep-2.5.4.tar.bz2
deleted file mode 100644
index 80bf6b73e..000000000
--- a/slackware64-current/source/a/grep/grep-2.5.4.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-9bbd4f02b18bb264e0fcb17293b6f0445c8694d2
diff --git a/slackware64-current/source/a/grep/grep-2.6.3.tar.xz b/slackware64-current/source/a/grep/grep-2.6.3.tar.xz
new file mode 100644
index 000000000..fa1e7d275
--- /dev/null
+++ b/slackware64-current/source/a/grep/grep-2.6.3.tar.xz
@@ -0,0 +1 @@
+9e31f6b99123cdbfac12dfc28705a3ccb814e47b
diff --git a/slackware64-current/source/a/grep/grep-2.6.3.tar.xz.sig b/slackware64-current/source/a/grep/grep-2.6.3.tar.xz.sig
new file mode 100644
index 000000000..c175628e1
--- /dev/null
+++ b/slackware64-current/source/a/grep/grep-2.6.3.tar.xz.sig
@@ -0,0 +1 @@
+84e481574fd6d27e491e4621c433627abdd67455
diff --git a/slackware64-current/source/a/grep/grep.SlackBuild b/slackware64-current/source/a/grep/grep.SlackBuild
index 1b2ac8e7e..0d182dac4 100755
--- a/slackware64-current/source/a/grep/grep.SlackBuild
+++ b/slackware64-current/source/a/grep/grep.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,12 +20,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-2.5.4}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-2.6.3}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-grep
@@ -39,13 +48,16 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf grep-$VERSION
-tar xvf $CWD/grep-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/grep-$VERSION.tar.xz || exit 1
 cd grep-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -60,6 +72,7 @@ CFLAGS="$SLKCFLAGS" \
   --bindir=/bin \
   --mandir=/usr/man \
   --infodir=/usr/info \
+  --docdir=/usr/doc/grep-$VERSION \
   --disable-perl-regexp \
   --build=$ARCH-slackware-linux
 
@@ -69,15 +82,6 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-# ****************************************************************************
-# Makefile installs different binaries for each of grep, egrep, and fgrep
-# This is how we used to do it...
-#( cd $PKG/bin
-#  rm -f egrep ; ln -sf grep egrep
-#  rm -f fgrep ; ln -sf grep fgrep
-#)
-# ****************************************************************************
-
 # Make symlinks in /usr/bin:
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin
@@ -98,9 +102,17 @@ gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/grep-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
   $PKG/usr/doc/grep-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/slackware64-current/source/a/hdparm/hdparm-9.27.tar.bz2 b/slackware64-current/source/a/hdparm/hdparm-9.27.tar.bz2
deleted file mode 100644
index 811ac1165..000000000
--- a/slackware64-current/source/a/hdparm/hdparm-9.27.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-7d7efaaf7e901b3308356476bd07e2339fe6ec58
diff --git a/slackware64-current/source/a/hdparm/hdparm-9.29.tar.xz b/slackware64-current/source/a/hdparm/hdparm-9.29.tar.xz
new file mode 100644
index 000000000..aef51ec4c
--- /dev/null
+++ b/slackware64-current/source/a/hdparm/hdparm-9.29.tar.xz
@@ -0,0 +1 @@
+95fb1002e291a8857fae573ac024a4fce98f1aa0
diff --git a/slackware64-current/source/a/hdparm/hdparm.SlackBuild b/slackware64-current/source/a/hdparm/hdparm.SlackBuild
index fbb2a2f71..951436d16 100755
--- a/slackware64-current/source/a/hdparm/hdparm.SlackBuild
+++ b/slackware64-current/source/a/hdparm/hdparm.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,9 +20,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-9.27}
-ARCH=${ARCH:-x86_64}
+PKGNAM=hdparm
+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}
 
 CWD=$(pwd)
@@ -34,7 +45,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf hdparm-$VERSION
-tar xvf $CWD/hdparm-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/hdparm-$VERSION.tar.?z* || exit 1
 cd hdparm-$VERSION || exit 1
 chown -R root:root .
 make $NUMJOBS || make || exit 1
@@ -54,6 +65,14 @@ cp -a \
 # I'm also not sure why I'm putting a binary in the docs, but...
 rm -f $PKG/usr/doc/hdparm-$VERSION/contrib/fix_standby.c
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/slackware64-current/source/a/infozip/infozip.SlackBuild b/slackware64-current/source/a/infozip/infozip.SlackBuild
index 900c4f95d..5ac456d10 100755
--- a/slackware64-current/source/a/infozip/infozip.SlackBuild
+++ b/slackware64-current/source/a/infozip/infozip.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
@@ -22,9 +22,18 @@
 
 VERSION=6.0
 ZIP=3.0
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-infozip
diff --git a/slackware64-current/source/a/isapnptools/isapnptools-1.26.lsm b/slackware64-current/source/a/isapnptools/isapnptools-1.26.lsm
new file mode 100644
index 000000000..f2c2af404
--- /dev/null
+++ b/slackware64-current/source/a/isapnptools/isapnptools-1.26.lsm
@@ -0,0 +1,25 @@
+Begin3
+Title:          isapnptools
+Version:        1.26
+Entered-date:   2001-05-08
+Description:    ISA plug and play configuration utility
+	Two programs - one allows the dumping of resource data and generation
+	of a skeleton configuration file, the other configures ISA PnP hardware
+	using a configuration file.
+	See http://www.roestock.demon.co.uk/isapnptools/ for latest information.
+Keywords:       ISA PnP Configuration Hardware
+Author:         fox@roestock.demon.co.uk (Peter Fox)
+Maintained-by:  fox@roestock.demon.co.uk (Peter Fox)
+Primary-site:   MetaLab.unc.edu /pub/Linux/system/hardware
+	227k isapnptools-1.26.tgz
+	384k isapnptools-1.26.bin.tgz
+Alternate-site: tsx-11.mit.edu /pub/linux/sources/sbin
+	227k isapnptools-1.26.src.tar.gz
+Alternate-site: tsx-11.mit.edu /pub/linux/binaries/sbin
+	384k isapnptools-1.26.bin.tar.gz
+Alternate-site: ftp.lmh.ox.ac.uk /pub/linux/pnp
+	227k isapnptools-1.26.tgz
+Original-site:  ftp.demon.co.uk /pub/unix/linux/utils
+	227k isapnptools-1.26.tgz
+Copying-policy: GNU
+End
diff --git a/slackware64-current/source/a/isapnptools/isapnptools-1.26.tar.gz b/slackware64-current/source/a/isapnptools/isapnptools-1.26.tar.gz
new file mode 100644
index 000000000..5aabcba66
--- /dev/null
+++ b/slackware64-current/source/a/isapnptools/isapnptools-1.26.tar.gz
@@ -0,0 +1 @@
+0b12b06ed60abe8d836fa8d4c1e20bd4b033d76c
diff --git a/slackware64-current/source/a/isapnptools/isapnptools.SlackBuild b/slackware64-current/source/a/isapnptools/isapnptools.SlackBuild
new file mode 100755
index 000000000..9e1224e80
--- /dev/null
+++ b/slackware64-current/source/a/isapnptools/isapnptools.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+CWD=`pwd`
+TMP=/tmp
+PKG=$TMP/package-isapnptools
+rm -rf $PKG
+mkdir -p $PKG
+cd $TMP
+
+# sanity check
+if [ "$( uname -m )" = "x86_64" ]; then
+  echo "isapnptools is not supported on x86_64"
+  exit 1
+fi
+
+VERSION=${VERSION:-1.26}
+ARCH=${ARCH:-i486}
+BUILD=${BUILD:-2}
+
+tar xzvf $CWD/isapnptools-$VERSION.tar.gz || exit 1
+cd isapnptools-$VERSION
+
+zcat $CWD/isapnptools_1.26-5.diff.gz | patch -p1 --verbose || exit 1
+
+chown -R root:root .
+find . -perm 666 -exec chmod 644 {} \;
+find . -perm 664 -exec chmod 644 {} \;
+find . -perm 600 -exec chmod 644 {} \;
+find . -perm 444 -exec chmod 644 {} \;
+find . -perm 400 -exec chmod 644 {} \;
+find . -perm 440 -exec chmod 644 {} \;
+find . -perm 777 -exec chmod 755 {} \;
+find . -perm 775 -exec chmod 755 {} \;
+find . -perm 511 -exec chmod 755 {} \;
+find . -perm 711 -exec chmod 755 {} \;
+find . -perm 555 -exec chmod 755 {} \;
+
+./configure --prefix=/usr
+make -j4 || exit 1
+( cd src
+  strip isapnp pnpdump
+  mkdir -p $PKG/sbin
+  cat isapnp > $PKG/sbin/isapnp
+  cat pnpdump > $PKG/sbin/pnpdump
+  chmod 755 $PKG/sbin/* )
+mkdir -p $PKG/etc
+( cd etc
+  mkdir -p $PKG/etc
+  cat isapnp.conf > $PKG/etc/isapnp.conf.sample
+  cat isapnp.gone > $PKG/etc/isapnp.gone.sample )
+( cd doc
+  mkdir -p $PKG/usr/man/man5
+  cat isapnp.conf.5 | gzip -9c > $PKG/usr/man/man5/isapnp.conf.5.gz
+  mkdir -p $PKG/usr/man/man8
+  cat isapnp.8 | gzip -9c > $PKG/usr/man/man8/isapnp.8.gz
+  cat pnpdump.8 | gzip -9c > $PKG/usr/man/man8/pnpdump.8.gz ) 
+mkdir -p $PKG/usr/doc/isapnptools-$VERSION
+cp -a AUTHORS CHANGES COPYING INSTALL README isapnp.lsm doc/isapnpfaq.txt doc/README.ide doc/README.initrd $PKG/usr/doc/isapnptools-$VERSION
+chown -R root:root $PKG/usr/doc/isapnptools-$VERSION
+chmod 644 $PKG/usr/doc/isapnptools-$VERSION/*
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -c n -l y $TMP/isapnptools-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/slackware64-current/source/a/isapnptools/isapnptools.url b/slackware64-current/source/a/isapnptools/isapnptools.url
new file mode 100644
index 000000000..e4a66ad56
--- /dev/null
+++ b/slackware64-current/source/a/isapnptools/isapnptools.url
@@ -0,0 +1 @@
+http://www.roestock.demon.co.uk/isapnptools/
diff --git a/slackware64-current/source/a/isapnptools/isapnptools_1.26-5.diff.gz b/slackware64-current/source/a/isapnptools/isapnptools_1.26-5.diff.gz
new file mode 100644
index 000000000..0bcc510c1
--- /dev/null
+++ b/slackware64-current/source/a/isapnptools/isapnptools_1.26-5.diff.gz
@@ -0,0 +1 @@
+87278256aa30356c1ab3dad5055af8c54fd35503
diff --git a/slackware64-current/source/a/isapnptools/slack-desc b/slackware64-current/source/a/isapnptools/slack-desc
new file mode 100644
index 000000000..8646def6e
--- /dev/null
+++ b/slackware64-current/source/a/isapnptools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+isapnptools: isapnptools (ISA Plug-And-Play tools)
+isapnptools:
+isapnptools: These programs allow ISA Plug-And-Play devices to be configured
+isapnptools: on a Linux machine.
+isapnptools:
+isapnptools:
+isapnptools:
+isapnptools:
+isapnptools:
+isapnptools:
+isapnptools:
diff --git a/slackware64-current/source/a/jfsutils/jfsutils.SlackBuild b/slackware64-current/source/a/jfsutils/jfsutils.SlackBuild
index d97ebcb62..b179ba7bb 100755
--- a/slackware64-current/source/a/jfsutils/jfsutils.SlackBuild
+++ b/slackware64-current/source/a/jfsutils/jfsutils.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
@@ -22,9 +22,18 @@
 
 
 VERSION=${VERSION:-1.1.14}
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-jfsutils
@@ -80,9 +89,17 @@ done
 
 mkdir -p $PKG/usr/doc/jfsutils-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog NEWS README \
+  AUTHORS COPYING* NEWS README \
   $PKG/usr/doc/jfsutils-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/slackware64-current/source/a/lha/lha.SlackBuild b/slackware64-current/source/a/lha/lha.SlackBuild
index fb333362f..fffdab687 100755
--- a/slackware64-current/source/a/lha/lha.SlackBuild
+++ b/slackware64-current/source/a/lha/lha.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
@@ -22,9 +22,18 @@
 
 
 VERSION=114i
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-lha
diff --git a/slackware64-current/source/a/mt-st/mt-st.SlackBuild b/slackware64-current/source/a/mt-st/mt-st.SlackBuild
index cbf44ec2f..a906438df 100755
--- a/slackware64-current/source/a/mt-st/mt-st.SlackBuild
+++ b/slackware64-current/source/a/mt-st/mt-st.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
@@ -22,9 +22,18 @@
 
 
 VERSION=${VERSION:-0.9b}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mt-st
diff --git a/slackware64-current/source/a/mtx/mtx-1.3.12.tar.gz b/slackware64-current/source/a/mtx/mtx-1.3.12.tar.gz
new file mode 100644
index 000000000..157662066
--- /dev/null
+++ b/slackware64-current/source/a/mtx/mtx-1.3.12.tar.gz
@@ -0,0 +1 @@
+9823426934261c9186ed5954f67068e44d3f7cf3
diff --git a/slackware64-current/source/a/mtx/mtx-1.3.9.tar.gz b/slackware64-current/source/a/mtx/mtx-1.3.9.tar.gz
deleted file mode 100644
index 1548906a2..000000000
--- a/slackware64-current/source/a/mtx/mtx-1.3.9.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-91287b6e7d4ac3a73521687b90e5e922e64bbc29
diff --git a/slackware64-current/source/a/mtx/mtx.SlackBuild b/slackware64-current/source/a/mtx/mtx.SlackBuild
index c17d11769..6e648f039 100755
--- a/slackware64-current/source/a/mtx/mtx.SlackBuild
+++ b/slackware64-current/source/a/mtx/mtx.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,9 +27,18 @@
 # ftp://ftp.badtux.net/pub/storage/mtx
  
 PACKAGE=mtx
-VERSION=1.3.9
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+VERSION=1.3.12
+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
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/slackware64-current/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch.gz b/slackware64-current/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch.gz
deleted file mode 100644
index 05775cd8e..000000000
--- a/slackware64-current/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch.gz
+++ /dev/null
@@ -1 +0,0 @@
-8aa2e43e96446b3840693cbe9b43f87b3f9a8317
diff --git a/slackware64-current/source/a/ncompress/ncompress-4.2.4-endians.patch.gz b/slackware64-current/source/a/ncompress/ncompress-4.2.4-endians.patch.gz
deleted file mode 100644
index ff76ef4d1..000000000
--- a/slackware64-current/source/a/ncompress/ncompress-4.2.4-endians.patch.gz
+++ /dev/null
@@ -1 +0,0 @@
-ba82ce2da2282001075b5d81eb263bce3989733e
diff --git a/slackware64-current/source/a/ncompress/ncompress-4.2.4.3.tar.gz b/slackware64-current/source/a/ncompress/ncompress-4.2.4.3.tar.gz
new file mode 100644
index 000000000..365d85f98
--- /dev/null
+++ b/slackware64-current/source/a/ncompress/ncompress-4.2.4.3.tar.gz
@@ -0,0 +1 @@
+6c891a173d17c1fa78402048bee8f24700148c12
diff --git a/slackware64-current/source/a/ncompress/ncompress-4.2.4.tar.gz b/slackware64-current/source/a/ncompress/ncompress-4.2.4.tar.gz
deleted file mode 100644
index f7dfe4766..000000000
--- a/slackware64-current/source/a/ncompress/ncompress-4.2.4.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-ebcee7c2cc3d7036ee6186168007ae61124fca10
diff --git a/slackware64-current/source/a/ncompress/ncompress.2GB.diff.gz b/slackware64-current/source/a/ncompress/ncompress.2GB.diff.gz
deleted file mode 100644
index e491726e0..000000000
--- a/slackware64-current/source/a/ncompress/ncompress.2GB.diff.gz
+++ /dev/null
@@ -1 +0,0 @@
-4a4b53bfec5a9bba520e4a065fbfbd9d305719c7
diff --git a/slackware64-current/source/a/ncompress/ncompress.SlackBuild b/slackware64-current/source/a/ncompress/ncompress.SlackBuild
index e8b1c68fa..ba6f38d5c 100755
--- a/slackware64-current/source/a/ncompress/ncompress.SlackBuild
+++ b/slackware64-current/source/a/ncompress/ncompress.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=4.2.4
-ARCH=${ARCH:-x86_64}
+VERSION=4.2.4.3
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-ncompress
@@ -42,14 +51,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/ncompress.make.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/ncompress.lfs2.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/ncompress.filenamelen.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/ncompress.2GB.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/ncompress.zerobyteforce.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/ncompress-${VERSION}-bssUnderflow.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/ncompress-${VERSION}-endians.patch.gz | patch -p1 --verbose || exit 1
-
 make ENDIAN=4321 || exit 1
 mkdir -p $PKG/usr/bin
 cat compress > $PKG/usr/bin/compress
diff --git a/slackware64-current/source/a/ncompress/ncompress.filenamelen.diff.gz b/slackware64-current/source/a/ncompress/ncompress.filenamelen.diff.gz
deleted file mode 100644
index 2b431cad0..000000000
--- a/slackware64-current/source/a/ncompress/ncompress.filenamelen.diff.gz
+++ /dev/null
@@ -1 +0,0 @@
-722f82a7dd9b4ac2cfefbaeb18578e59fd1a1199
diff --git a/slackware64-current/source/a/ncompress/ncompress.lfs2.diff.gz b/slackware64-current/source/a/ncompress/ncompress.lfs2.diff.gz
deleted file mode 100644
index f8e69e9d5..000000000
--- a/slackware64-current/source/a/ncompress/ncompress.lfs2.diff.gz
+++ /dev/null
@@ -1 +0,0 @@
-366dd5eb825290603343fa9f55c3f5545fbb1463
diff --git a/slackware64-current/source/a/ncompress/ncompress.make.diff.gz b/slackware64-current/source/a/ncompress/ncompress.make.diff.gz
deleted file mode 100644
index 319c2eae1..000000000
--- a/slackware64-current/source/a/ncompress/ncompress.make.diff.gz
+++ /dev/null
@@ -1 +0,0 @@
-68c10ced5275ad8099c3ae8f428c1f9a6373ccf0
diff --git a/slackware64-current/source/a/ncompress/ncompress.zerobyteforce.diff.gz b/slackware64-current/source/a/ncompress/ncompress.zerobyteforce.diff.gz
deleted file mode 100644
index 2c4b7f2c7..000000000
--- a/slackware64-current/source/a/ncompress/ncompress.zerobyteforce.diff.gz
+++ /dev/null
@@ -1 +0,0 @@
-9fa243fe69b43a0be05e320de3d7888cbfb2fca0
diff --git a/slackware64-current/source/a/patch/patch-2.5.4.tar.gz b/slackware64-current/source/a/patch/patch-2.5.4.tar.gz
deleted file mode 100644
index 002111132..000000000
--- a/slackware64-current/source/a/patch/patch-2.5.4.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-a12d520eba0dc35d1c4d50ec75b7684451a40de9
diff --git a/slackware64-current/source/a/patch/patch-2.6.1.tar.xz b/slackware64-current/source/a/patch/patch-2.6.1.tar.xz
new file mode 100644
index 000000000..e2ab8972c
--- /dev/null
+++ b/slackware64-current/source/a/patch/patch-2.6.1.tar.xz
@@ -0,0 +1 @@
+8cc3485aa433b8feb70f6783efb766554230fee8
diff --git a/slackware64-current/source/a/patch/patch-2.6.1.tar.xz.sig b/slackware64-current/source/a/patch/patch-2.6.1.tar.xz.sig
new file mode 100644
index 000000000..a32025ea9
--- /dev/null
+++ b/slackware64-current/source/a/patch/patch-2.6.1.tar.xz.sig
@@ -0,0 +1 @@
+4b4451083146d86a3dd01658d136b49b824568b6
diff --git a/slackware64-current/source/a/patch/patch.SlackBuild b/slackware64-current/source/a/patch/patch.SlackBuild
index fb0c06d98..1175620b6 100755
--- a/slackware64-current/source/a/patch/patch.SlackBuild
+++ b/slackware64-current/source/a/patch/patch.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.5.4
-ARCH=${ARCH:-x86_64}
+VERSION=2.6.1
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-patch
@@ -31,23 +40,35 @@ PKG=$TMP/package-patch
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
+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
+
 cd $TMP
 rm -rf patch-${VERSION}
-tar xzvf $CWD/patch-${VERSION}.tar.gz
+tar xvf $CWD/patch-${VERSION}.tar.xz || exit 1
 cd patch-${VERSION}
 chown -R root:root .
-mkdir -p $PKG/usr/doc/patch-${VERSION}
-cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/patch-${VERSION}
-chmod 644 $PKG/usr/doc/patch-${VERSION}/*
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  $ARCH-slackware-linux
-make CFLAGS=-O2  || exit 1
-mkdir -p $PKG/usr/bin
-cat patch > $PKG/usr/bin/patch
-chmod 755 $PKG/usr/bin/patch
-mkdir -p $PKG/usr/man/man1
-cat patch.man  | gzip -9c > $PKG/usr/man/man1/patch.1.gz
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make -j4 || make || exit 1
+make install DESTDIR=$PKG
 
 # Strip everything for good measure:
 ( cd $PKG
@@ -55,6 +76,34 @@ cat patch.man  | gzip -9c > $PKG/usr/man/man1/patch.1.gz
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/patch-${VERSION}
+cp -a \
+  AUTHORS COPYING* NEWS README* \
+  $PKG/usr/doc/patch-${VERSION}
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/slackware64-current/source/a/pcmciautils/pcmciautils.SlackBuild b/slackware64-current/source/a/pcmciautils/pcmciautils.SlackBuild
index dcf70895a..2cfb6e942 100755
--- a/slackware64-current/source/a/pcmciautils/pcmciautils.SlackBuild
+++ b/slackware64-current/source/a/pcmciautils/pcmciautils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pcmciautils
 
-# 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
@@ -24,10 +24,20 @@
 
 
 VERSION=${VERSION:-015}
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+
+# 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
+
 # parallel build will cause an error building ccdv:
 NUMJOBS=${NUMJOBS:-" -j1 "}
-BUILD=${BUILD:-2}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/slackware64-current/source/a/procps/procps-3.2.7.tar.gz b/slackware64-current/source/a/procps/procps-3.2.7.tar.gz
deleted file mode 100644
index 832f305cd..000000000
--- a/slackware64-current/source/a/procps/procps-3.2.7.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-b60567cc6263167fa1a4ff6a5bea26db86022c10
diff --git a/slackware64-current/source/a/procps/procps-3.2.8.tar.gz b/slackware64-current/source/a/procps/procps-3.2.8.tar.gz
new file mode 100644
index 000000000..dec2c9d20
--- /dev/null
+++ b/slackware64-current/source/a/procps/procps-3.2.8.tar.gz
@@ -0,0 +1 @@
+a0c86790569dec26b5d9037e8868ca907acc9829
diff --git a/slackware64-current/source/a/procps/procps.SlackBuild b/slackware64-current/source/a/procps/procps.SlackBuild
index a5163bbc2..befa28738 100755
--- a/slackware64-current/source/a/procps/procps.SlackBuild
+++ b/slackware64-current/source/a/procps/procps.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,12 +21,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=3.2.7
+VERSION=3.2.8
 # Sometimes this number lags behind...
-SOVER=3.2.7
+SOVER=3.2.8
 PSMISCVER=22.3
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
+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
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -62,9 +71,10 @@ find . \
   -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/doc/procps-$VERSION
-cp -a BUGS COPYING COPYING.LIB NEWS TODO $PKG/usr/doc/procps-$VERSION
+cp -a BUGS COPYING* NEWS TODO $PKG/usr/doc/procps-$VERSION
 chown root:root $PKG/usr/doc/procps-$VERSION/*
 chmod 644 $PKG/usr/doc/procps-$VERSION/*
+
 # While I don't agree this is a harmful patch, I will defer to the
 # maintainer's judgement on this one.  Besides, I quit using the '-'
 # with ps years ago.  It wasn't that hard to change.
diff --git a/slackware64-current/source/a/quota/quota.SlackBuild b/slackware64-current/source/a/quota/quota.SlackBuild
index 0ae450b90..67717b11b 100755
--- a/slackware64-current/source/a/quota/quota.SlackBuild
+++ b/slackware64-current/source/a/quota/quota.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
@@ -22,9 +22,18 @@
 
 
 VERSION=3.17
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-quota
diff --git a/slackware64-current/source/a/reiserfsprogs/reiserfsprogs.SlackBuild b/slackware64-current/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
index 583188e86..fc38990da 100755
--- a/slackware64-current/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
+++ b/slackware64-current/source/a/reiserfsprogs/reiserfsprogs.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
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=3.6.21
-ARCH=${ARCH:-x86_64}
 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 "}
 
 CWD=$(pwd)
diff --git a/slackware64-current/source/a/sharutils/sharutils-4.7.tar.bz2 b/slackware64-current/source/a/sharutils/sharutils-4.7.tar.bz2
deleted file mode 100644
index f349bdf70..000000000
--- a/slackware64-current/source/a/sharutils/sharutils-4.7.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-0b8c1d54fdcf97a93aba079d342d1873a8fc423b
diff --git a/slackware64-current/source/a/sharutils/sharutils-4.7.tar.bz2.sig b/slackware64-current/source/a/sharutils/sharutils-4.7.tar.bz2.sig
deleted file mode 100644
index eb4253af4..000000000
--- a/slackware64-current/source/a/sharutils/sharutils-4.7.tar.bz2.sig
+++ /dev/null
@@ -1 +0,0 @@
-49c357373a0646e0a78bd045812eb00f78117007
diff --git a/slackware64-current/source/a/sharutils/sharutils-4.9.tar.xz b/slackware64-current/source/a/sharutils/sharutils-4.9.tar.xz
new file mode 100644
index 000000000..fe37bc03b
--- /dev/null
+++ b/slackware64-current/source/a/sharutils/sharutils-4.9.tar.xz
@@ -0,0 +1 @@
+f43e6ec19e7d8f3df2b1920c58dffd9b76c01f4c
diff --git a/slackware64-current/source/a/sharutils/sharutils.SlackBuild b/slackware64-current/source/a/sharutils/sharutils.SlackBuild
index 0d8bd6f07..fdd0ecd4d 100755
--- a/slackware64-current/source/a/sharutils/sharutils.SlackBuild
+++ b/slackware64-current/source/a/sharutils/sharutils.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,10 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=4.7
-ARCH=${ARCH:-x86_64}
+VERSION=4.9
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-sharutils
@@ -45,8 +54,8 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf sharutils-$VERSION
-tar xjvf $CWD/sharutils-$VERSION.tar.bz2
-cd sharutils-$VERSION
+tar xvf $CWD/sharutils-$VERSION.tar.xz || exit 1
+cd sharutils-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -54,15 +63,17 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  $ARCH-slackware-linux
-make -j3
-make install DESTDIR=$PKG
-make install-man DESTDIR=$PKG
+  --build=$ARCH-slackware-linux
+
+make -j3 || make || exit 1
+make install DESTDIR=$PKG || exit 1
+make install-man DESTDIR=$PKG || exit 1
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/* $PKG/usr/man/man?/*.?
@@ -74,9 +85,17 @@ gzip -9 $PKG/usr/info/* $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/sharutils-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README README-alpha THANKS TODO \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
   $PKG/usr/doc/sharutils-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/slackware64-current/source/a/slocate/slocate.SlackBuild b/slackware64-current/source/a/slocate/slocate.SlackBuild
index 3fec40f26..eef2fd1f6 100755
--- a/slackware64-current/source/a/slocate/slocate.SlackBuild
+++ b/slackware64-current/source/a/slocate/slocate.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
@@ -22,9 +22,18 @@
 
 
 VERSION=3.1
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-3}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-slocate
diff --git a/slackware64-current/source/a/splitvt/splitvt.SlackBuild b/slackware64-current/source/a/splitvt/splitvt.SlackBuild
index f643a825c..79a628aff 100755
--- a/slackware64-current/source/a/splitvt/splitvt.SlackBuild
+++ b/slackware64-current/source/a/splitvt/splitvt.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
@@ -22,9 +22,18 @@
 
 
 VERSION=1.6.5
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-splitvt
diff --git a/slackware64-current/source/a/sysfsutils/sysfsutils.SlackBuild b/slackware64-current/source/a/sysfsutils/sysfsutils.SlackBuild
index 0534b3e29..4d1822ecf 100755
--- a/slackware64-current/source/a/sysfsutils/sysfsutils.SlackBuild
+++ b/slackware64-current/source/a/sysfsutils/sysfsutils.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
@@ -22,9 +22,18 @@
 
 
 VERSION=2.1.0
-ARCH=${ARCH:-x86_64}
 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" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
diff --git a/slackware64-current/source/a/sysklogd/sysklogd.SlackBuild b/slackware64-current/source/a/sysklogd/sysklogd.SlackBuild
index 110659e4c..237226f67 100755
--- a/slackware64-current/source/a/sysklogd/sysklogd.SlackBuild
+++ b/slackware64-current/source/a/sysklogd/sysklogd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=1.4.1
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-10}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-sysklogd
diff --git a/slackware64-current/source/a/sysvinit-functions/sysvinit-functions.SlackBuild b/slackware64-current/source/a/sysvinit-functions/sysvinit-functions.SlackBuild
index 9af7f9ec3..909f8320e 100755
--- a/slackware64-current/source/a/sysvinit-functions/sysvinit-functions.SlackBuild
+++ b/slackware64-current/source/a/sysvinit-functions/sysvinit-functions.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=${VERSION:-8.53}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-2}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-sysvinit-functions
diff --git a/slackware64-current/source/a/sysvinit/sysvinit.SlackBuild b/slackware64-current/source/a/sysvinit/sysvinit.SlackBuild
index 4916e695e..194ebf144 100755
--- a/slackware64-current/source/a/sysvinit/sysvinit.SlackBuild
+++ b/slackware64-current/source/a/sysvinit/sysvinit.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
 
 
 VERSION=${VERSION:-2.86}
-ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-6}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-sysvinit
diff --git a/slackware64-current/source/a/tar/tar.SlackBuild b/slackware64-current/source/a/tar/tar.SlackBuild
index a91a17076..a8c432eab 100755
--- a/slackware64-current/source/a/tar/tar.SlackBuild
+++ b/slackware64-current/source/a/tar/tar.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/slackware64-current/source/a/tcsh/tcsh-6.15.00.tar.bz2 b/slackware64-current/source/a/tcsh/tcsh-6.15.00.tar.bz2
deleted file mode 100644
index de429f495..000000000
--- a/slackware64-current/source/a/tcsh/tcsh-6.15.00.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-171f596e55e5b78fcef3f3cae8ec64c1d70f36e6
diff --git a/slackware64-current/source/a/tcsh/tcsh-6.17.00.tar.xz b/slackware64-current/source/a/tcsh/tcsh-6.17.00.tar.xz
new file mode 100644
index 000000000..9a705f2ad
--- /dev/null
+++ b/slackware64-current/source/a/tcsh/tcsh-6.17.00.tar.xz
@@ -0,0 +1 @@
+8c280d19ede2e284c0fd67f6e06f5fca90198bc8
diff --git a/slackware64-current/source/a/tcsh/tcsh.SlackBuild b/slackware64-current/source/a/tcsh/tcsh.SlackBuild
index 653964787..8cf4feb47 100755
--- a/slackware64-current/source/a/tcsh/tcsh.SlackBuild
+++ b/slackware64-current/source/a/tcsh/tcsh.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,10 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=6.15.00
-ARCH=${ARCH:-x86_64}
+VERSION=6.17.00
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tcsh
@@ -41,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf tcsh-$VERSION
-tar xjvf $CWD/tcsh-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/tcsh-$VERSION.tar.?z* || exit 1
 cd tcsh-$VERSION
 
 # The LS_COLORS variable shared by tcsh has new options in recent
diff --git a/slackware64-current/source/a/time/time.SlackBuild b/slackware64-current/source/a/time/time.SlackBuild
index 108e7a8b6..f095088e1 100755
--- a/slackware64-current/source/a/time/time.SlackBuild
+++ b/slackware64-current/source/a/time/time.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
@@ -22,9 +22,18 @@
 
 
 VERSION=1.7
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-time
diff --git a/slackware64-current/source/a/tree/tree-1.5.2.2.tar.bz2 b/slackware64-current/source/a/tree/tree-1.5.2.2.tar.bz2
deleted file mode 100644
index 105110b08..000000000
--- a/slackware64-current/source/a/tree/tree-1.5.2.2.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-ad12b68a1d15333f41de024f88b4db91df34c43c
diff --git a/slackware64-current/source/a/tree/tree-1.5.3.tar.bz2 b/slackware64-current/source/a/tree/tree-1.5.3.tar.bz2
new file mode 100644
index 000000000..242f681f9
--- /dev/null
+++ b/slackware64-current/source/a/tree/tree-1.5.3.tar.bz2
@@ -0,0 +1 @@
+9e5176a23d20d5ececde4e2e0261ec147c2bf5a8
diff --git a/slackware64-current/source/a/tree/tree.SlackBuild b/slackware64-current/source/a/tree/tree.SlackBuild
index d20c3c1eb..540b20472 100755
--- a/slackware64-current/source/a/tree/tree.SlackBuild
+++ b/slackware64-current/source/a/tree/tree.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2007-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2007-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.5.2.2
-ARCH=${ARCH:-x86_64}
+VERSION=1.5.3
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tree
@@ -50,7 +59,7 @@ mkdir -p $PKG/usr/man/man1
 cat man/tree.1 | gzip -9c > $PKG/usr/man/man1/tree.1.gz
 mkdir -p $PKG/usr/doc/tree-$VERSION
 cp -a \
-  CHANGES LICENSE README \
+  CHANGES LICENSE README* \
   $PKG/usr/doc/tree-$VERSION
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/slackware64-current/source/a/unarj/unarj.SlackBuild b/slackware64-current/source/a/unarj/unarj.SlackBuild
index 56097eb2c..2444052e6 100755
--- a/slackware64-current/source/a/unarj/unarj.SlackBuild
+++ b/slackware64-current/source/a/unarj/unarj.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
@@ -22,9 +22,18 @@
 
 
 VERSION=265
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-unarj
diff --git a/slackware64-current/source/a/utempter/libutempter-1.1.4.tar.bz2 b/slackware64-current/source/a/utempter/libutempter-1.1.4.tar.bz2
deleted file mode 100644
index bcebf2a87..000000000
--- a/slackware64-current/source/a/utempter/libutempter-1.1.4.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-d35839d669e614e6259d51bc8db04ae0776fc583
diff --git a/slackware64-current/source/a/utempter/libutempter-1.1.4.tar.bz2.asc b/slackware64-current/source/a/utempter/libutempter-1.1.4.tar.bz2.asc
deleted file mode 100644
index 721abbbeb..000000000
--- a/slackware64-current/source/a/utempter/libutempter-1.1.4.tar.bz2.asc
+++ /dev/null
@@ -1 +0,0 @@
-a5a6cecfd378824ba38a67f3a2c7c436614fee5d
diff --git a/slackware64-current/source/a/utempter/libutempter-1.1.5.tar.bz2 b/slackware64-current/source/a/utempter/libutempter-1.1.5.tar.bz2
new file mode 100644
index 000000000..edcfa5994
--- /dev/null
+++ b/slackware64-current/source/a/utempter/libutempter-1.1.5.tar.bz2
@@ -0,0 +1 @@
+fd250c317c92a300508365593bf68fbd5f2b9e9a
diff --git a/slackware64-current/source/a/utempter/libutempter-1.1.5.tar.bz2.asc b/slackware64-current/source/a/utempter/libutempter-1.1.5.tar.bz2.asc
new file mode 100644
index 000000000..6f6f8a9a7
--- /dev/null
+++ b/slackware64-current/source/a/utempter/libutempter-1.1.5.tar.bz2.asc
@@ -0,0 +1 @@
+5d50fa1c4d0620db24431a7e7bb508587fbb6216
diff --git a/slackware64-current/source/a/utempter/utempter.SlackBuild b/slackware64-current/source/a/utempter/utempter.SlackBuild
index 7d0d24b75..5d6f054f0 100755
--- a/slackware64-current/source/a/utempter/utempter.SlackBuild
+++ b/slackware64-current/source/a/utempter/utempter.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,10 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.1.4
-ARCH=${ARCH:-x86_64}
+VERSION=1.1.5
 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" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
diff --git a/slackware64-current/source/a/which/which.SlackBuild b/slackware64-current/source/a/which/which.SlackBuild
index f86fd1da8..08ae4616c 100755
--- a/slackware64-current/source/a/which/which.SlackBuild
+++ b/slackware64-current/source/a/which/which.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
@@ -22,9 +22,18 @@
 
 
 VERSION=2.20
-ARCH=${ARCH:-x86_64}
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-which
diff --git a/slackware64-current/source/a/zoo/zoo.SlackBuild b/slackware64-current/source/a/zoo/zoo.SlackBuild
index c667b076e..177ac4a8b 100755
--- a/slackware64-current/source/a/zoo/zoo.SlackBuild
+++ b/slackware64-current/source/a/zoo/zoo.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
@@ -22,10 +22,19 @@
 
 
 VERSION=2.10
-DEBPATCH=18
-ARCH=${ARCH:-x86_64}
+DEBPATCH=22
 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-zoo
@@ -45,10 +54,11 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/zoo_${VERSION}-${DEBPATCH}.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1
-for diff in debian/patches/*.dpatch ; do
+tar xf $CWD/zoo_${VERSION}-${DEBPATCH}.debian.tar.gz
+for diff in debian/patches/*patch ; do
   cat $diff | patch -p1 --verbose --backup --suffix=.orig || exit 1
 done
+
 make linux || exit 1
 mkdir -p $PKG/usr/bin
 cat fiz > $PKG/usr/bin/fiz
@@ -74,5 +84,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-makepkg -l y -c n $TMP/zoo-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/zoo-${VERSION}_${DEBPATCH}-$ARCH-$BUILD.txz
 
diff --git a/slackware64-current/source/a/zoo/zoo_2.10-18.diff.gz b/slackware64-current/source/a/zoo/zoo_2.10-18.diff.gz
deleted file mode 100644
index 6b7705b5e..000000000
--- a/slackware64-current/source/a/zoo/zoo_2.10-18.diff.gz
+++ /dev/null
@@ -1 +0,0 @@
-fbf51d6653cd395fa08b4841ef11e0e1c1742876
diff --git a/slackware64-current/source/a/zoo/zoo_2.10-22.debian.tar.gz b/slackware64-current/source/a/zoo/zoo_2.10-22.debian.tar.gz
new file mode 100644
index 000000000..642bbff0d
--- /dev/null
+++ b/slackware64-current/source/a/zoo/zoo_2.10-22.debian.tar.gz
@@ -0,0 +1 @@
+bf563a2da730482fecfa2dd0ba3633ebe0c796f9