From 94ab93443ccdec7963cb006fa52b6ffd38776fab Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Fri, 21 May 2010 01:43:50 -0500
Subject: audio/mpd: Miscellaneous cleanups.

---
 audio/mpd/README         |  4 ++--
 audio/mpd/mpd.SlackBuild | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'audio/mpd')

diff --git a/audio/mpd/README b/audio/mpd/README
index df3bc5b9d7..0932d0a9ea 100644
--- a/audio/mpd/README
+++ b/audio/mpd/README
@@ -5,8 +5,8 @@ provides control for music playback over a local network. It also makes
 a great desktop music player, especially if you are a console junkie, 
 like frontend options, or restart X often.
 
-Some optional dependencies include libshout, libmms, libsamplerate,
-libmpcdec, lame, faac, faad2, ffmpeg, and jack.  
+Some optional dependencies include libshout, libmms, libmpcdec, lame, 
+faac, faad2, ffmpeg, and jack.  
 
 NOTE:  You will have to create the ~/.mpd/playlists directory manually.
 Also be sure to edit the config file (/etc/mpd.conf) if needed before 
diff --git a/audio/mpd/mpd.SlackBuild b/audio/mpd/mpd.SlackBuild
index c2e3620004..769e5832cc 100644
--- a/audio/mpd/mpd.SlackBuild
+++ b/audio/mpd/mpd.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=mpd
 VERSION=0.15.9
-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-mpd
@@ -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
@@ -73,10 +85,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Use sample config, without overwriting
 install -D -m 644 doc/mpdconf.example $PKG/etc/mpd.conf.new
 
-( cd $PKG/usr/man || exit 1
-  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 {} \;
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-- 
cgit v1.2.3