audio/rosegarden: Miscellaneous cleanups.

audio/rosegarden/README

@@ -3,6 +3,6 @@ notation editor, and general-purpose music composition and editing
 application for Unix and Linux.
 
 Rosegarden requires jack-audio-connection-kit, ladspa_sdk, dssi, liblo,
-lirc, liblrdf, lilypond, libsamplerate and libsndfile.
+lirc, liblrdf, lilypond, and libsndfile.
 
 rosegarden can also make use of perl-xml-twig at runtime.

audio/rosegarden/rosegarden.SlackBuild

@@ -27,10 +27,19 @@
 
 PRGNAM=rosegarden
 VERSION=10.04.1
-ARCH=${ARCH:-i486}
 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
@@ -45,6 +54,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e