4 files changed, 66 insertions, 61 deletions
diff --git a/audio/gmpc-plugins/README b/audio/gmpc-plugins/README
index 7aa3eb7bf2..a83356e680 100644
--- a/audio/gmpc-plugins/README
+++ b/audio/gmpc-plugins/README
@@ -1,24 +1,12 @@
-This is all the available plugins for GMPC.
+This is a re-bundle of the gmpc-plugins tarball available here:
+http://download.sarine.nl/Programs/gmpc/0.17.0/gmpc-plugins-0.17.0.tar.gz
 
-- autoplaylist
-- avahi (disabled)
-- coveramazon
-- extraplaylist
-- favorites
-- last.fm
-- libnotify (disabled)
-- lyrics
-- magnatune
-- mdcover
-- mserver
-- osd (disabled)
-- qosd (disabled)
-- random-playlist
-- serverstats
-- shout
-- stopbutton
-- wikipedia
+I've bundled it to include the following missing plugins:
+	lastfmradio libnotify playlistsort tagedit
+No other changes were made.
 
-Optional dependencies are avahi, libnotify, and xosd. They are
-available at SlackBuilds.org. If you wish to enable them, you
-will need to edit the PLUGINS variable in the SlackBuild.
+Requires gmpc, gob2, json-glib, and optionally several others:
+avahi, xosd, lastfm, libnotify, and lirc.  If you have any of these,
+you can run the script with VARIABLE=yes -- for example, if you have
+both avahi and libnotify installed, you would do this:
+	AVAHI=yes LIBNOTIFY=yes ./gmpc-plugins.SlackBuild
diff --git a/audio/gmpc-plugins/gmpc-plugins.SlackBuild b/audio/gmpc-plugins/gmpc-plugins.SlackBuild
index 95b3aa84e5..c0917b3ab7 100644
--- a/audio/gmpc-plugins/gmpc-plugins.SlackBuild
+++ b/audio/gmpc-plugins/gmpc-plugins.SlackBuild
@@ -3,29 +3,23 @@
 # Slackware build script for gmpc-plugins
 # Written by Erik Hanson  erik@slackbuilds.org
 
-set -eu
-
 PRGNAM=gmpc-plugins
-VERSION=${VERSION:-0.15.5.0}
+VERSION=${VERSION:-0.17.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CWD=`pwd`
+AVAHI=${AVAHI:-no}		# avahi
+XOSD=${XOSD:-no} 		# xosd
+LASTFM=${LASTFM:-no}	 	# lastfm
+LIBNOTIFY=${LIBNOTIFY:-no} 	# libnotify
+LIRC=${LIRC:-no} 		# lirc
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Available Plugins:
-#PLUGINS="autoplaylist avahi coveramazon extraplaylist favorites \
-#last.fm libnotify lyrics magnatune mdcover mserver osd qosd \
-#random-playlist serverstats shout stopbutton wikipedia"
-
-# Plugins to build:
-PLUGINS="autoplaylist coveramazon extraplaylist favorites \
-last.fm lyrics magnatune mdcover mserver random-playlist \
-serverstats shout stopbutton wikipedia"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -34,6 +28,8 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -47,25 +43,38 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-for plugin in $PLUGINS ; do
-  cd gmpc-${plugin}-${VERSION}
-
-  CFLAGS="$SLKCFLAGS" \
-    ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var/lib \
-    --disable-static
+CFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --localstatedir=/var/lib \
+  --disable-static \
+  --enable-coveramazon \
+  --enable-lyricwiki \
+  --enable-mdcover \
+  --enable-serverstats \
+  --enable-lyrics \
+  --enable-extraplaylist \
+  --enable-alarm \
+  --enable-jamendo \
+  --enable-magnatune \
+  --enable-tagedit \
+  --enable-shout \
+  --enable-avahi=$AVAHI \
+  --enable-osd=$XOSD \
+  --enable-lastfm=$LASTFM \
+  --enable-lastfmradio=$LASTFM \
+  --enable-libnotify=$LIBNOTIFY \
+  --enable-lirc=$LIRC \
+  --build=$ARCH-slackware-linux
 
-  make
-  make install-strip DESTDIR=$PKG
+make
+make install-strip DESTDIR=$PKG
 
-  cd -
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/audio/gmpc-plugins/gmpc-plugins.info b/audio/gmpc-plugins/gmpc-plugins.info
index 29631346f6..c282d06cee 100644
--- a/audio/gmpc-plugins/gmpc-plugins.info
+++ b/audio/gmpc-plugins/gmpc-plugins.info
@@ -1,8 +1,8 @@
 PRGNAM="gmpc-plugins"
-VERSION="0.15.5.0"
+VERSION="0.17.0"
 HOMEPAGE="http://www.sarine.nl/gmpc-plugins-downloads"
-DOWNLOAD="http://slackbuilds.org/sources/12.1/gmpc-plugins-0.15.5.0.tar.bz2"
-MD5SUM="bc0e7b0147690651d20736cfd6e70ed2"
+DOWNLOAD="http://slackbuilds.org/sources/12.2/gmpc-plugins-0.17.0.tar.bz2"
+MD5SUM="daa640a47dcf2255b997580eda9625d6"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="David Somero"
+APPROVED="rworkman"
diff --git a/audio/gmpc-plugins/slack-desc b/audio/gmpc-plugins/slack-desc
index 47f4e667fd..d3b26845b7 100644
--- a/audio/gmpc-plugins/slack-desc
+++ b/audio/gmpc-plugins/slack-desc
@@ -1,11 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+            |-----handy-ruler-------------------------------------------------|
 gmpc-plugins: gmpc-plugins (extra plugins for GMPC)
 gmpc-plugins: 
-gmpc-plugins: This is a bundle of the plugins for GMPC:
-gmpc-plugins: autoplaylist avahi coveramazon extraplaylist favorites
-gmpc-plugins: last.fm libnotify lyrics magnatune mdcover mserver osd qosd
-gmpc-plugins: random-playlist serverstats shout stopbutton wikipedia
+gmpc-plugins: This is a bundle of the plugins for GMPC.
+gmpc-plugins:
+gmpc-plugins: http://www.sarine.nl/gmpc-plugins-downloads
+gmpc-plugins:
+gmpc-plugins:
 gmpc-plugins:
 gmpc-plugins:
 gmpc-plugins:
-gmpc-plugins: http://www.sarine.nl/gmpc-plugins-downloads
 gmpc-plugins: