audio/musicmanager: Updated for version 0.10.0

6 files changed, 46 insertions, 57 deletions

diff --git a/audio/musicmanager/Makefile.patch b/audio/musicmanager/Makefile.patch
new file mode 100644
index 000000000000..80069cd05eed
--- /dev/null
+++ b/audio/musicmanager/Makefile.patch
@@ -0,0 +1,11 @@
+--- 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 16336bd6de2b..e2629f892b71 100644
--- a/audio/musicmanager/README
+++ b/audio/musicmanager/README
@@ -2,31 +2,4 @@ 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.
 
-Features
-
-    * Last-FM audio scrobbler support. (New in v0.9.4)
-    * Fast and light weight. Quick startup, no splash screen needed!
-    * Supports Ogg Vorbis , FLAC, MP3 , MP4 , ASF and Musepack music files.
-    * Support for AlbumArt embedded in tag or as separate file on disk.
-    * Tag editing and file renaming capability (batch). One or more tracks
-       may be edited at the same time.
-    * Smart sorting with user configurable leading word filter to prevent
-       sorting on common words like the, a or an.
-    * Support for play lists. Play lists may be played in a certain
-       configurable order, or browsed through like the main music library.
-    * Export music library and play lists to XSPF,PLS,Extended M3U,M3U and
-       CSV.
-    * Clipboard & DND (drag-and-drop) support to arrange playlists and
-       dragging to and from gnome / kde applications.
-    * Uses xine multimedia library for gapless playback.
-    * Written using FOX, one of the fastest GUI toolkits available. Support
-       for FOX-1.6.x and the latest development version FOX-1.7.x.
-    * Customizable icons. Either use buildin icons or use an existing
-       gnome/kde icon theme.
-    * Configurable user interface from minimalistic to detailed view. Full
-       screen mode available with FOX-1.7.11.
-    * Clean and fast database backend using SQLite 3. 
-
-
-Requires: Sqlite, Fox-toolkit, available at SlackBuilds.org.
-dbus-glib, gtk2, taglib, xine-lib, included in Slackware.
+This requires fox-toolkit.
diff --git a/audio/musicmanager/doinst.sh b/audio/musicmanager/doinst.sh
index 158d743911fc..1f8ff67dedb2 100644
--- a/audio/musicmanager/doinst.sh
+++ b/audio/musicmanager/doinst.sh
@@ -1,8 +1,10 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -x /usr/bin/gtk-update-icon-cache ] \
-  && [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
 fi
+
diff --git a/audio/musicmanager/musicmanager.SlackBuild b/audio/musicmanager/musicmanager.SlackBuild
index ad2d63bf99e1..89ac0d3059f6 100644
--- a/audio/musicmanager/musicmanager.SlackBuild
+++ b/audio/musicmanager/musicmanager.SlackBuild
@@ -2,11 +2,10 @@
 
 # Slackware build script for Goggles Music Manager
 
-# Modified by disturbed1976@gmail.com
-#
+# Writen by disturbed1976@gmail.com
 
 PRGNAM=musicmanager
-VERSION=0.9.15
+VERSION=0.10.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,10 +17,14 @@ 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"
+  SLKLDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
 fi
 
 set -e
@@ -39,26 +42,26 @@ 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
-
-
-# Makefile will attempt to run gtk-update-icon-cache on make install.
-# This will remove that issue.
-
-patch Makefile <<EOF
-194d193
-< 	gtk-update-icon-cache \$(INSTALLDIR)/share/icons/hicolor
-EOF
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --host=$ARCH-slackware-linux \
+  --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
+  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
 )
 
 
diff --git a/audio/musicmanager/musicmanager.info b/audio/musicmanager/musicmanager.info
index 53f43d27e144..73027354933b 100644
--- a/audio/musicmanager/musicmanager.info
+++ b/audio/musicmanager/musicmanager.info
@@ -1,8 +1,8 @@
 PRGNAM="musicmanager"
-VERSION="0.9.15"
+VERSION="0.10.0"
 HOMEPAGE="http://code.google.com/p/gogglesmm/"
-DOWNLOAD="http://gogglesmm.googlecode.com/files/musicmanager-0.9.15.tar.bz2"
-MD5SUM="8dabda9acc1e45859081d66ab032ed19"
+DOWNLOAD="http://gogglesmm.googlecode.com/files/musicmanager-0.10.0.tar.bz2"
+MD5SUM="2a84ad37ec1e1e4aae9d3d4058a9bf1d"
 MAINTAINER="Keith Richie"
 EMAIL="disturbed1976@gmail.com"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="rworkman"
diff --git a/audio/musicmanager/slack-desc b/audio/musicmanager/slack-desc
index 5a6c93327a9d..6218a7d04489 100644
--- a/audio/musicmanager/slack-desc
+++ b/audio/musicmanager/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
             |-----handy-ruler-------------------------------------------------------|
-musicmanager: musicmanage (Goggles Music Manager)
+musicmanager: musicmanager (Goggles Music Manager)
 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: 
-musicmanager: 
-musicmanager: Homepage http://code.google.com/p/gogglesmm/
-musicmanager: 
\ No newline at end of file
+musicmanager: Homepage: http://code.google.com/p/gogglesmm/
+musicmanager:
+musicmanager:
+musicmanager: