5 files changed, 34 insertions, 31 deletions
diff --git a/audio/musicmanager/Makefile.patch b/audio/musicmanager/Makefile.patch
deleted file mode 100644
index 80069cd05eeda..0000000000000
--- a/audio/musicmanager/Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.org	2009-05-31 10:17:52.000000000 -0400
-+++ Makefile	2009-05-31 16:52:00.959195506 -0400
-@@ -185,8 +185,6 @@
-   	$(INSTALL) -m 644 -D po/$$tr.mo -T $(INSTALLDIR)/share/locale/$$tr/LC_MESSAGES/gogglesmm.mo ; \
- 	done;
- endif
--	@echo "    Updating the icon cache ..."
--	@gtk-update-icon-cache -t $(INSTALLDIR)/share/icons/hicolor
- 
- # Clean
- #----------------------------------------------------------
diff --git a/audio/musicmanager/README b/audio/musicmanager/README
index e2629f892b71f..b6f86ee022203 100644
--- a/audio/musicmanager/README
+++ b/audio/musicmanager/README
@@ -1,5 +1,5 @@
-Goggles Music Manager is a music collection manager and player that
-automatically categorizes your music files based on genre, artist, album,
+Goggles Music Manager is a music collection manager and player that 
+automatically categorizes your music files based on genre, artist, album, 
 and song. It supports gapless playback and features easy tag editing.
 
 This requires fox-toolkit.
diff --git a/audio/musicmanager/musicmanager.SlackBuild b/audio/musicmanager/musicmanager.SlackBuild
index 89ac0d3059f65..5e56144e00807 100644
--- a/audio/musicmanager/musicmanager.SlackBuild
+++ b/audio/musicmanager/musicmanager.SlackBuild
@@ -2,10 +2,28 @@
 
 # Slackware build script for Goggles Music Manager
 
-# Writen by disturbed1976@gmail.com
+# Written by Keith Richie < disturbed1976@gmail.com >
+#
+# 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=musicmanager
-VERSION=0.10.0
+VERSION=0.10.14
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -24,7 +42,6 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  SLKLDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
 fi
 
 set -e
@@ -33,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvjf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root.root .
 find . \
@@ -42,29 +59,24 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-
-patch < $CWD/Makefile.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --host=$ARCH-slackware-linux \
+  --with-taglib-extras \
   --build=$ARCH-slackware-linux
 
-make 
+make
 make install DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -75,4 +87,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/musicmanager/musicmanager.info b/audio/musicmanager/musicmanager.info
index 73027354933bb..84a8463876b4e 100644
--- a/audio/musicmanager/musicmanager.info
+++ b/audio/musicmanager/musicmanager.info
@@ -1,8 +1,10 @@
 PRGNAM="musicmanager"
-VERSION="0.10.0"
+VERSION="0.10.14"
 HOMEPAGE="http://code.google.com/p/gogglesmm/"
-DOWNLOAD="http://gogglesmm.googlecode.com/files/musicmanager-0.10.0.tar.bz2"
-MD5SUM="2a84ad37ec1e1e4aae9d3d4058a9bf1d"
+DOWNLOAD="http://gogglesmm.googlecode.com/files/musicmanager-0.10.14.tar.bz2"
+MD5SUM="f7c2f89d99f8a04353805cb1d87da4a1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Keith Richie"
 EMAIL="disturbed1976@gmail.com"
 APPROVED="rworkman"
diff --git a/audio/musicmanager/slack-desc b/audio/musicmanager/slack-desc
index 6218a7d04489f..b670e863a2c40 100644
--- a/audio/musicmanager/slack-desc
+++ b/audio/musicmanager/slack-desc
@@ -7,13 +7,13 @@
 
             |-----handy-ruler-------------------------------------------------------|
 musicmanager: musicmanager (Goggles Music Manager)
-musicmanager: 
+musicmanager:
 musicmanager: Goggles Music Manager is a music collection manager and player that 
 musicmanager: automatically categorizes your music files based on genre, artist, 
 musicmanager: album, and song. It supports gapless playback and features easy 
 musicmanager: tag editing.
 musicmanager:
-musicmanager: Homepage: http://code.google.com/p/gogglesmm/
+musicmanager: Homepage http://code.google.com/p/gogglesmm/
 musicmanager:
 musicmanager:
 musicmanager: