audio/mpc: Updated for version 0.22.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

4 files changed, 15 insertions, 27 deletions

diff --git a/audio/mpc/README b/audio/mpc/README
index feaa1b1e51..dd31aa1b66 100644
--- a/audio/mpc/README
+++ b/audio/mpc/README
@@ -6,3 +6,5 @@ mpc's documentation directory to ~/.bashrc
 
 You will need to make sure you have set the MPD_HOST and MPD_PORT
 environment variables.
+
+This script depends on libmpdclient which is available at slackbuilds.org
diff --git a/audio/mpc/mpc.SlackBuild b/audio/mpc/mpc.SlackBuild
index 0e5ee138fb..25922cf99f 100644
--- a/audio/mpc/mpc.SlackBuild
+++ b/audio/mpc/mpc.SlackBuild
@@ -1,20 +1,19 @@
 #!/bin/sh
 
 # Slackware build script for mpc
+#
+# Written by meckafett tom[DOT]bradish[AT]gmail.com
 
-# Written by Meckafett thumpadoodle@hotmail.com
 
 PRGNAM=mpc
-VERSION=0.12.1
+VERSION=0.22
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -24,10 +23,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL README 
-      doc/mpc-bashrc doc/mppledit doc/pls-handler.sh
-      doc/m3u-handler.sh"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -38,7 +33,7 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O4"
   LIBDIRSUFFIX=""
 fi
 
@@ -65,22 +60,13 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( 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
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-
-# Remove the documentation wrongly installed in /usr/share/doc
-rm -rf $PKG/usr/share/
-# Remove empty folder /usr/mpc
-rm -rf $PKG/usr/mpc/
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/mpc/mpc.info b/audio/mpc/mpc.info
index cb9f864c71..2f86ab4def 100644
--- a/audio/mpc/mpc.info
+++ b/audio/mpc/mpc.info
@@ -1,10 +1,10 @@
 PRGNAM="mpc"
-VERSION="0.12.1"
+VERSION="0.22"
 HOMEPAGE="http://www.musicpd.org/mpc.shtml"
-DOWNLOAD="http://www.musicpd.org/uploads/files/mpc-0.12.1.tar.gz"
-MD5SUM="0be8cc9ba282f467631ee0b1b8a0c494"
+DOWNLOAD="http://sourceforge.net/projects/musicpd/files/mpc/0.22/mpc-0.22.tar.gz"
+MD5SUM="f96b55f7724adb8e8bb46b815265852c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Meckafett"
 EMAIL="tom.bradish@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/audio/mpc/slack-desc b/audio/mpc/slack-desc
index 94d355b04d..a7adca52ec 100644
--- a/audio/mpc/slack-desc
+++ b/audio/mpc/slack-desc
@@ -7,7 +7,7 @@
 
    |-----handy-ruler------------------------------------------------------|
 mpc: mpc (Music Player Command)
-mpc: 
+mpc:
 mpc: A client for MPD, the Music Player Daemon. mpc connects to a MPD
 mpc: running on a machine via a network.
 mpc: