3 files changed, 14 insertions, 11 deletions
diff --git a/games/bsnes/README b/games/bsnes/README
index 0e0f35a4fc9e0..724a924188588 100644
--- a/games/bsnes/README
+++ b/games/bsnes/README
@@ -6,12 +6,4 @@ The emulator does not focus on things that would hinder accuracy.
 This includes speed and game-specific hacks for compatibility. As
 a result, the minimum system requirements for bsnes are very high.
 
-bsnes requires OpenAL.
-
-Optional build requirement is pulseaudio.  By default pulseaudio
-is turned off.  To build bsnes with pulseaudio support pass
-USE_PULSE="yes" to the slackbuild.
-
-If you happen to use a version of Slackware that is less then 13.0
-and you have Qt >= 4.5.0 then you need to pass OLD_SLACK="yes" to
-the slackbuild.
+This requires OpenAL.
diff --git a/games/bsnes/bsnes.SlackBuild b/games/bsnes/bsnes.SlackBuild
index 4306b15aab1db..dabf64c9bde7c 100644
--- a/games/bsnes/bsnes.SlackBuild
+++ b/games/bsnes/bsnes.SlackBuild
@@ -7,10 +7,19 @@
 PRGNAM=bsnes
 VERSION=${VERSION:-0.058}
 SRCVER=${VERSION:2}
-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
@@ -27,6 +36,8 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 set -e
diff --git a/games/bsnes/slack-desc b/games/bsnes/slack-desc
index a9d0917896c72..de8921d17b9f0 100644
--- a/games/bsnes/slack-desc
+++ b/games/bsnes/slack-desc
@@ -6,7 +6,7 @@
 # leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-bsnes: bsnes
+bsnes: bsnes (SNES Emulator)
 bsnes: 
 bsnes: bsnes is an emulator that began development on 2004-10-14. The purpose
 bsnes: of this emulator is a bit different from others: it focuses on