Fixed $S and mpdconf.patch

(Portage version: 2.2_rc30/cvs/Linux x86_64)

3 files changed, 81 insertions, 0 deletions

diff --git a/media-sound/mpd/files/mpdconf.patch b/media-sound/mpd/files/0.13.2-mpdconf.patch
index d37f629d5cac..d37f629d5cac 100644
--- a/media-sound/mpd/files/mpdconf.patch
+++ b/media-sound/mpd/files/0.13.2-mpdconf.patch
diff --git a/media-sound/mpd/files/mpdconf1.patch b/media-sound/mpd/files/0.14.2-mpdconf.patch
index 6b0b4639327f..6b0b4639327f 100644
--- a/media-sound/mpd/files/mpdconf1.patch
+++ b/media-sound/mpd/files/0.14.2-mpdconf.patch
diff --git a/media-sound/mpd/files/0.15_alpha1-mpdconf.patch b/media-sound/mpd/files/0.15_alpha1-mpdconf.patch
new file mode 100644
index 000000000000..8407f79135bd
--- /dev/null
+++ b/media-sound/mpd/files/0.15_alpha1-mpdconf.patch
@@ -0,0 +1,81 @@
+diff --git a/doc/mpdconf.example b/doc/mpdconf.example
+index e231296..77f6d11 100644
+--- a/doc/mpdconf.example
++++ b/doc/mpdconf.example
+@@ -1,4 +1,4 @@
+-# An example configuration file for MPD
++# A default Gentoo configuration file for MPD
+ # See the mpd.conf man page for a more detailed description of each parameter.
+ 
+ 
+@@ -10,14 +10,14 @@
+ # be disabled and audio files will only be accepted over ipc socket (using
+ # file:// protocol) or streaming files over an accepted protocol.
+ #
+-#music_directory		"~/music"
++music_directory			"/var/lib/mpd/music"
+ #
+ # This setting sets the MPD internal playlist directory. The purpose of this
+ # directory is storage for playlists created by MPD. The server will use 
+ # playlist files not created by the server but only if they are in the MPD
+ # format. This setting defaults to playlist saving being disabled.
+ #
+-#playlist_directory		"~/.mpd/playlists"
++playlist_directory		"/var/lib/mpd/playlists"
+ #
+ # This setting sets the location of the MPD database. This file is used to
+ # load the database at server start up and store the database while the 
+@@ -25,7 +25,7 @@
+ # MPD to accept files over ipc socket (using file:// protocol) or streaming
+ # files over an accepted protocol.
+ #
+-#db_file			"~/.mpd/database"
++db_file				"/var/lib/mpd/database"
+ # 
+ # These settings are the locations for the daemon log files for the daemon.
+ # These logs are great for troubleshooting, depending on your log_level
+@@ -34,20 +34,20 @@
+ # The special value "syslog" makes MPD use the local syslog daemon. This
+ # setting defaults to logging to syslog, otherwise logging is disabled.
+ #
+-#log_file			"~/.mpd/log"
++log_file			"/var/log/mpd/mpd.log"
+ #
+ # This setting sets the location of the file which stores the process ID
+ # for use of mpd --kill and some init scripts. This setting is disabled by
+ # default and the pid file will not be stored.
+ #
+-#pid_file			"~/.mpd/pid"
++pid_file			"/var/run/mpd/mpd.pid"
+ #
+ # This setting sets the location of the file which contains information about
+ # most variables to get MPD back into the same general shape it was in before
+ # it was brought down. This setting is disabled by default and the server 
+ # state will be reset on server start up.
+ #
+-#state_file			"~/.mpd/state"
++state_file			"/var/lib/mpd/state"
+ #
+ ###############################################################################
+ 
+@@ -59,17 +59,17 @@
+ # initialization. This setting is disabled by default and MPD is run as the
+ # current user.
+ #
+-#user				"nobody"
++user				"mpd"
+ #
+ # This setting sets the address for the daemon to listen on. Careful attention
+ # should be paid if this is assigned to anything other then the default, any.
+ # This setting can deny access to control of the daemon.
+ #
+ # For network
+-#bind_to_address		"any"
++bind_to_address			"localhost"
+ #
+ # And for Unix Socket
+-#bind_to_address		"~/.mpd/socket"
++bind_to_address			"/var/lib/mpd/socket"
+ #
+ # This setting is the TCP port that is desired for the daemon to get assigned
+ # to.