4 files changed, 15 insertions, 100 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index f8a67aa1c84c..427d2c16ab9a 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	musicpd
-PORTVERSION=	0.15.15
+PORTVERSION=	0.16.1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
 DISTNAME=	mpd-${PORTVERSION}
@@ -227,6 +227,12 @@ CONFIGURE_ARGS+=--enable-lsr
 post-patch:
 	@${REINPLACE_CMD} -e "s/%%MPDDIR%%/${PREFIX:C/\//\\\//g}\/${MPDDIR:C/\//\\\//g}/g" -e "s/%%MPDUSER%%/${MPDUSER}/g" \
 		${WRKSRC}/doc/mpdconf.example
+.if (${OSVERSION} < 800000)
+	${REINPLACE_CMD} -e 's/nan[f]\{0,1\}(\"\")/NAN/g' \
+		${WRKSRC}/src/crossfade.c \
+		${WRKSRC}/src/player_thread.c \
+		${WRKSRC}/src/player_control.c
+.endif
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|install-docDATA ||' \
 		${WRKSRC}/Makefile.in
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 28a87a23c8bc..85098c51c548 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.15.15.tar.bz2) = db6dc242722e3178bcbff6b67ced8caccbb8dcddf867b8ab6bab42d6e55982ab
-SIZE (mpd-0.15.15.tar.bz2) = 391688
+SHA256 (mpd-0.16.1.tar.bz2) = b85ca840e31aea2249ad8e9c5c36f6533fc0f88d357a7441817ccacb1e31df57
+SIZE (mpd-0.16.1.tar.bz2) = 480244
diff --git a/audio/musicpd/files/patch-doc_mpdconf.example b/audio/musicpd/files/patch-doc_mpdconf.example
deleted file mode 100644
index 5146c90eb7f5..000000000000
--- a/audio/musicpd/files/patch-doc_mpdconf.example
+++ /dev/null
@@ -1,90 +0,0 @@
---- doc/mpdconf.example.orig	2009-12-27 17:05:54.000000000 +0100
-+++ doc/mpdconf.example	2010-01-17 00:14:50.000000000 +0100
-@@ -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		"%%MPDDIR%%/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		"%%MPDDIR%%/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			"%%MPDDIR%%/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,21 @@
- # 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			"%%MPDDIR%%/log"
-+error_file		"%%MPDDIR%%/error-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			"%%MPDDIR%%/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			"%%MPDDIR%%/state"
- #
- ###############################################################################
- 
-@@ -59,7 +60,7 @@
- # 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.
-@@ -69,7 +70,7 @@
- #bind_to_address		"any"
- #
- # And for Unix Socket
--#bind_to_address		"~/.mpd/socket"
-+#bind_to_address		"%%MPDDIR%%/socket"
- #
- # This setting is the TCP port that is desired for the daemon to get assigned
- # to.
-@@ -172,18 +173,6 @@
- # See <http://mpd.wikia.com/wiki/Configuration#Audio_Outputs> for examples of 
- # other audio outputs.
- #
--# An example of an ALSA output:
--#
--#audio_output {
--#	type		"alsa"
--#	name		"My ALSA Device"
--##	device		"hw:0,0"	# optional
--##	format		"44100:16:2"	# optional
--##	mixer_device	"default"	# optional
--##	mixer_control	"PCM"		# optional
--##	mixer_index	"0"		# optional
--#}
--#
- # An example of an OSS output:
- #
- #audio_output {
diff --git a/audio/musicpd/files/patch-src_output_ao__plugin.c b/audio/musicpd/files/patch-src_output_ao__plugin.c
index 70a3c967d53a..77a75d12d1c4 100644
--- a/audio/musicpd/files/patch-src_output_ao__plugin.c
+++ b/audio/musicpd/files/patch-src_output_ao__plugin.c
@@ -1,13 +1,12 @@
-
 $FreeBSD$
 
---- src/output/ao_plugin.c.orig
-+++ src/output/ao_plugin.c
-@@ -175,6 +175,7 @@
- 	if (audio_format->bits > 16)
- 		audio_format->bits = 16;
+--- src/output/ao_plugin.c.orig	2011-02-05 21:03:39.032765668 +0000
++++ src/output/ao_plugin.c	2011-02-05 21:04:11.006777588 +0000
+@@ -188,6 +188,7 @@
+ 		break;
+ 	}
  
 +	memset(&format, 0, sizeof(format));
- 	format.bits = audio_format->bits;
  	format.rate = audio_format->sample_rate;
  	format.byte_format = AO_FMT_NATIVE;
+ 	format.channels = audio_format->channels;