4 files changed, 39 insertions, 15 deletions
diff --git a/source/tcl/expect/expect.SlackBuild b/source/tcl/expect/expect.SlackBuild
index 27562037b..eb4806861 100755
--- a/source/tcl/expect/expect.SlackBuild
+++ b/source/tcl/expect/expect.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,21 @@
 
 
 PKGNAM=expect
-VERSION=5.44.1.11
-TCLVER=8.5.7
-ARCH=${ARCH:-x86_64}
+VERSION=5.44.1.15
+TCLVER=8.5.8
+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 "}
-BUILD=${BUILD:-4}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -43,6 +53,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 if [ ! -d $TMP/tcl${TCLVER} ]; then
diff --git a/source/tcl/hfsutils/hfsutils.SlackBuild b/source/tcl/hfsutils/hfsutils.SlackBuild
index 7a813e99e..5ab0f11dd 100755
--- a/source/tcl/hfsutils/hfsutils.SlackBuild
+++ b/source/tcl/hfsutils/hfsutils.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
@@ -23,10 +23,19 @@
 
 PKGNAM=hfsutils
 VERSION=${VERSION:-3.2.6}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-4}
 
+# 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}
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 cd $TMP
diff --git a/source/tcl/tcl/tcl.SlackBuild b/source/tcl/tcl/tcl.SlackBuild
index 596305f0b..03d51ca32 100755
--- a/source/tcl/tcl/tcl.SlackBuild
+++ b/source/tcl/tcl/tcl.SlackBuild
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-8.5.8}
+VERSION=${VERSION:-8.5.9}
 # See also version number 8.5 in the symlinks below...)
-BUILD=1
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -38,8 +38,6 @@ fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tcl
-rm -rf $PKG
-mkdir -p $TMP $PKG
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -63,6 +61,8 @@ elif [ "$ARCH" = "armel" ]; then
   CONFARGS=""
 fi
 
+rm -rf $PKG
+mkdir -p $TMP $PKG
 cd $TMP
 rm -rf tcl$VERSION
 tar xvf $CWD/tcl$VERSION-src.tar.?z* || exit 1
diff --git a/source/tcl/tk/tk.SlackBuild b/source/tcl/tk/tk.SlackBuild
index 32a183d3c..a100a8a29 100755
--- a/source/tcl/tk/tk.SlackBuild
+++ b/source/tcl/tk/tk.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-8.5.8}
+VERSION=${VERSION:-8.5.9}
 # See also version number 8.5 in the symlinks below...)
 BUILD=${BUILD:-1}
 
@@ -57,9 +57,9 @@ fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-tk
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
-
 cd $TMP
 rm -rf tk$VERSION
 tar xvf $CWD/tk$VERSION-src.tar.?z* || exit 1
@@ -78,7 +78,6 @@ mkdir -p $PKG/usr/doc/tk$VERSION
 cp -a README license.terms $PKG/usr/doc/tk$VERSION
 
 cd unix
-make clean
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \