From f3e6135fae02c571126fe6a282389d74394eb8d0 Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Thu, 20 May 2010 00:10:22 -0500
Subject: audio/rosegarden: Miscellaneous cleanups.

---
 audio/rosegarden/README                |  2 +-
 audio/rosegarden/rosegarden.SlackBuild | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'audio/rosegarden')

diff --git a/audio/rosegarden/README b/audio/rosegarden/README
index 45fd0513cd..ea703d64d9 100644
--- a/audio/rosegarden/README
+++ b/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.
diff --git a/audio/rosegarden/rosegarden.SlackBuild b/audio/rosegarden/rosegarden.SlackBuild
index 545cf6d28d..bb7bbcecb2 100644
--- a/audio/rosegarden/rosegarden.SlackBuild
+++ b/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
-- 
cgit v1.2.3