From b18244f79b6720f7c9c1116935c02b0a252eafbd Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Fri, 21 May 2010 01:39:50 -0500
Subject: [PATCH] audio/fluidsynth: Miscellaneous cleanups.

  Removed notes about pulseaudio from README since pa is gone.
---
 audio/fluidsynth/README                | 17 +++++++----------
 audio/fluidsynth/fluidsynth.SlackBuild | 19 ++++++++++++++-----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/audio/fluidsynth/README b/audio/fluidsynth/README
index 44ccdb72f5..117705de45 100644
--- a/audio/fluidsynth/README
+++ b/audio/fluidsynth/README
@@ -1,12 +1,9 @@
-FluidSynth is a software real-time synthesizer based on the
-Soundfont 2 specifications. FluidSynth reads and handles MIDI
-events from the MIDI input device. It is the software analogue
-of a MIDI synthesizer. FluidSynth can also play midifiles
-using a Soundfont.
+FluidSynth is a software real-time synthesizer based on the Soundfont 2 
+specifications. FluidSynth reads and handles MIDI events from the MIDI 
+input device. It is the software analogue of a MIDI synthesizer. 
+FluidSynth can also play midifiles using a Soundfont.
 
-If you want support for ladspa plugins you have to pass LADSPA=yes
-to the script. This requires ladspa_sdk
+If you want support for ladspa plugins you have to pass LADSPA=yes to 
+the script - this requires ladspa_sdk to build.
 
-Additionally fluidsynth may use libsndfile, lash, pulseaudio,
-portaudio and jack-audio-connection-kit. All of which are available
-from SlackBuilds.org
+Optional deps are libsndfile, lash, portaudio, and jack-audio-connection-kit. 
diff --git a/audio/fluidsynth/fluidsynth.SlackBuild b/audio/fluidsynth/fluidsynth.SlackBuild
index 7255c34e9e..8c4eaeb381 100644
--- a/audio/fluidsynth/fluidsynth.SlackBuild
+++ b/audio/fluidsynth/fluidsynth.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=fluidsynth
 VERSION=1.1.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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -70,10 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-( 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 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO \