1 files changed, 21 insertions, 11 deletions
diff --git a/source/x/scim-m17n/scim-m17n.SlackBuild b/source/x/scim-m17n/scim-m17n.SlackBuild
index e624ca806..cf0602216 100755
--- a/source/x/scim-m17n/scim-m17n.SlackBuild
+++ b/source/x/scim-m17n/scim-m17n.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,11 +33,21 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=scim-m17n
-VERSION=${VERSION:-0.2.3}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-m17n
+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) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -59,14 +69,14 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -91,10 +101,10 @@ make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
@@ -119,5 +129,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz