2 files changed, 21 insertions, 9 deletions
diff --git a/misc/dwdiff/dwdiff.SlackBuild b/misc/dwdiff/dwdiff.SlackBuild
index b345400363268..172f66b1b0006 100644
--- a/misc/dwdiff/dwdiff.SlackBuild
+++ b/misc/dwdiff/dwdiff.SlackBuild
@@ -5,11 +5,20 @@
 # Released under the WTFPL
 
 PRGNAM=dwdiff
-VERSION=${VERSION:-1.6.1}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# 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/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 if [[ -z $UNICODE ]]; then
@@ -66,10 +78,10 @@ fi
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l); do
+    ln -s $(readlink $i ).gz $i.gz; rm $i
+done
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/misc/dwdiff/dwdiff.info b/misc/dwdiff/dwdiff.info
index 610183caa68ae..ae546099ce9ea 100644
--- a/misc/dwdiff/dwdiff.info
+++ b/misc/dwdiff/dwdiff.info
@@ -1,8 +1,8 @@
 PRGNAM="dwdiff"
-VERSION="1.6.1"
+VERSION="1.7"
 HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-DOWNLOAD="http://os.ghalkes.nl/dist/dwdiff-1.6.1.tgz"
-MD5SUM="e7bf94f579ce764c2070c17cc5a24332"
+DOWNLOAD="http://os.ghalkes.nl/dist/dwdiff-1.7.tgz"
+MD5SUM="c88714707d755c5202a4a7fd74e815fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="slakmagik"