Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 audio-players/mpd/DEPENDS    |   18 ++++++++++++++----
 audio-players/mpd/HISTORY    |    5 ++++-
 audio-players/mpd/PRE_BUILD  |    7 -------
 audio-players/mpd/init.d/mpd |    4 ++--
 4 files changed, 20 insertions(+), 14 deletions(-)

New commits:
commit 4e64d05dd7f303800c5b072c5ce1325e19dd4509
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    mpd: post-update fixes

diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index d34b180..8fdd391 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -70,6 +70,11 @@ optional_depends libsamplerate \
                  "--disable-lsr" \
                  "for libsamplerate support" &&
 
+optional_depends libshout \
+                 "--enable-shout" \
+                 "--disable-shout" \
+                 "for shoutcast streaming output support" &&
+
 optional_depends wavpack \
                  "--enable-wavpack" \
                  "--disable-wavpack" \
@@ -95,7 +100,12 @@ optional_depends LIBAVCODEC \
                  "--disable-ffmpeg" \
                  "for FFMPEG support" &&
 
-optional_depends avahi                                    \
-                '--with-zeroconf=avahi'                   \
-                '--with-zeroconf=no'                      \
-                'for Zeroconf service discovery support'
+optional_depends libmms \
+                 "--enable-mms" \
+                 "--disable-mms" \
+                 "for MMS protocol support" &&
+
+optional_depends avahi \
+                 "--with-zeroconf=avahi" \
+                 "--with-zeroconf=no" \
+                 "for Zeroconf service discovery support"
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index ee4ad6b..d98a981 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,6 +1,9 @@
 2009-06-25 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.15
-       * DEPENDS: corrected flags, added sqlite dep
+       * DEPENDS: corrected flags, added sqlite, libmodplug, libshout, libmms
+         deps; cleaned up
+       * PRE_BUILD: removed, removed dirty hacks
+       * init.d/mpd: added arg for the config; fixed db file path
 
 2009-03-02 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Optionally depends on avahi
diff --git a/audio-players/mpd/PRE_BUILD b/audio-players/mpd/PRE_BUILD
deleted file mode 100755
index c410252..0000000
--- a/audio-players/mpd/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $INIT_INSTALLED ]]; then
-  create_account musicdaemon &&
-  sed -i "s:/etc/mpd.conf:/etc/sysconfig/mpd:g" src/main.c
-fi
diff --git a/audio-players/mpd/init.d/mpd b/audio-players/mpd/init.d/mpd
index 55030b5..251e79d 100644
--- a/audio-players/mpd/init.d/mpd
+++ b/audio-players/mpd/init.d/mpd
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 PROGRAM=/usr/bin/mpd
-ARGS=""
+ARGS="/etc/sysconfig/mpd"
 RUNLEVEL=3
 NEEDS=""
-MPD_DB="$(grep music_directory /etc/sysconfig/mpd | cut -d \" -f 2)/mpd.db"
+MPD_DB="$(grep db_file /etc/sysconfig/mpd | cut -d \" -f 2)"
 
 [[ -z $MPD_DB ]] && ARGS="$ARGS --create-db"