4 files changed, 40 insertions, 14 deletions
diff --git a/audio/mpdscribble/README b/audio/mpdscribble/README
index f806848e51..3c186b4c78 100644
--- a/audio/mpdscribble/README
+++ b/audio/mpdscribble/README
@@ -1,4 +1,4 @@
 mpdscribble is a music player daemon client which submits
 information about tracks being played to audioscrobbler.
 
-Requires mpd and libsoup, available at SlackBuilds.org
+This requires mpd, libmpdclient, and libsoup.
diff --git a/audio/mpdscribble/mpdscribble.SlackBuild b/audio/mpdscribble/mpdscribble.SlackBuild
index ba5f8431ad..a62c539775 100644
--- a/audio/mpdscribble/mpdscribble.SlackBuild
+++ b/audio/mpdscribble/mpdscribble.SlackBuild
@@ -1,9 +1,29 @@
 #!/bin/sh
+
 # Slackware build script for mpdscribble
-# Written by Erik Hanson  erik@slackbuilds.org
+
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpdscribble
-VERSION=0.17
+VERSION=0.19
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -15,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -eu
@@ -39,19 +62,20 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var/lib \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
+# Remove a small glitch?
+sed -i -e "s/f=//g" Makefile
+
 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
-)
+gzip -9 $PKG/usr/man/man?/*.?
 
 # Don't clobber the config file
 mv $PKG/etc/mpdscribble.conf $PKG/etc/mpdscribble.conf.new
@@ -65,4 +89,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/mpdscribble/mpdscribble.info b/audio/mpdscribble/mpdscribble.info
index c9b2f8db4a..36d366c78d 100644
--- a/audio/mpdscribble/mpdscribble.info
+++ b/audio/mpdscribble/mpdscribble.info
@@ -1,8 +1,10 @@
 PRGNAM="mpdscribble"
-VERSION="0.17"
+VERSION="0.19"
 HOMEPAGE="http://mpd.wikia.com/wiki/Client:Mpdscribble"
-DOWNLOAD="http://downloads.sourceforge.net/musicpd/mpdscribble-0.17.tar.gz"
-MD5SUM="ea6a0197f638443366c412cafd0a99ba"
+DOWNLOAD="http://downloads.sourceforge.net/musicpd/mpdscribble-0.19.tar.gz"
+MD5SUM="7091105b0aaf1cd2549099321e3f19f9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="dsomero"
+APPROVED="rworkman,michiel"
diff --git a/audio/mpdscribble/slack-desc b/audio/mpdscribble/slack-desc
index fba110ff19..b538d7b74f 100644
--- a/audio/mpdscribble/slack-desc
+++ b/audio/mpdscribble/slack-desc
@@ -7,11 +7,11 @@
 
            |-----handy-ruler-------------------------------------------------|
 mpdscribble: mpdscribble (audioscrobbler daemon for mpd)
-mpdscribble: 
+mpdscribble:
 mpdscribble: mpdscribble is a music player daemon client which submits
 mpdscribble: information about tracks being played to audioscrobbler.
 mpdscribble:
-mpdscribble: http://www.frob.nl/scribble.html
+mpdscribble: Homepage: http://www.frob.nl/scribble.html
 mpdscribble:
 mpdscribble:
 mpdscribble: