Update to 0.17.4, provided by Takeshi Nakayama in PR 47844.

While here, add comments to patch-aa, patch-ad from cvs logs.

Changes:
ver 0.17.4 (2013/04/08)
* protocol:
  - allow to omit END in ranges (START:END)
  - don't emit IDLE_PLAYER before audio format is known
* decoder:
  - ffmpeg: support float planar audio (ffmpeg 1.1)
  - ffmpeg: fix AVFrame allocation
* player:
  - implement missing "idle" events on output errors
* clock: fix build failure


ver 0.17.3 (2013/01/06)
* output:
  - osx: fix pops during playback
  - recorder: fix I/O error check
  - shout: fix memory leak in error handler
  - recorder, shout: support Ogg packets that span more than one page
* decoder:
  - ffmpeg: ignore negative time stamps
  - ffmpeg: support planar audio
* playlist:
  - cue: fix memory leak
  - cue: fix CUE files with only one track

ver 0.17.2 (2012/09/30)
* protocol:
  - fix crash in local file check
* decoder:
  - fluidsynth: remove throttle (requires libfluidsynth 1.1)
  - fluidsynth: stop playback at end of file
  - fluidsynth: check MIDI file format while scanning
  - fluidsynth: add sample rate setting
  - wavpack: support all APEv2 tags
* output:
  - httpd: use monotonic clock, avoid hiccups after system clock adjustment
  - httpd: fix throttling bug after resuming playback
* playlist:
  - cue: map "PERFORMER" to "artist" or "album artist"
* mapper: fix non-UTF8 music directory name
* mapper: fix potential crash in file permission check
* playlist: fix use-after-free bug
* playlist: fix memory leak
* state_file: save song priorities
* player: disable cross-fading in "single" mode
* update: fix unsafe readlink() usage
* configure.ac:
  - don't auto-detect the vorbis encoder when Tremor is enabled

ver 0.17.1 (2012/07/31)
* protocol:
  - require appropriate permissions for searchadd{,pl}
* tags:
  - aiff: support the AIFC format
  - ape: check for ID3 if no usable APE tag was found
* playlist:
  - cue: support file types "MP3", "AIFF"
* output:
  - fix noisy playback with conversion and software volume

ver 0.17 (2012/06/27)
* protocol:
  - support client-to-client communication
  - "update" and "rescan" need only "CONTROL" permission
  - new command "seekcur" for simpler seeking within current song
  - new command "config" dumps location of music directory
  - add range parameter to command "load"
  - print extra "playlist" object for embedded CUE sheets
  - new commands "searchadd", "searchaddpl"
* input:
  - cdio_paranoia: new input plugin to play audio CDs
  - curl: enable CURLOPT_NETRC
  - curl: non-blocking I/O
  - soup: new input plugin based on libsoup
* tags:
  - RVA2: support separate album/track replay gain
* decoder:
  - mpg123: implement seeking
  - ffmpeg: drop support for pre-0.5 ffmpeg
  - ffmpeg: support WebM
  - oggflac: delete this obsolete plugin
  - dsdiff: new decoder plugin
* output:
  - alsa: support DSD-over-USB (dCS suggested standard)
  - httpd: support for streaming to a DLNA client
  - openal: improve buffer cancellation
  - osx: allow user to specify other audio devices
  - osx: implement 32 bit playback
  - shout: add possibility to set url
  - roar: new output plugin for RoarAudio
  - winmm: fail if wrong device specified instead of using default device
* mixer:
  - alsa: listen for external volume changes
* playlist:
  - allow references to songs outside the music directory
  - new CUE parser, without libcue
  - soundcloud: new plugin for accessing soundcloud.com
* state_file: add option "restore_paused"
* cue: show CUE track numbers
* allow port specification in "bind_to_address" settings
* support floating point samples
* systemd socket activation
* improve --version output
* WIN32: fix renaming of stored playlists with non-ASCII names


ver 0.16.8 (2012/04/04)
* fix for libsamplerate assertion failure
* decoder:
  - vorbis (and others): fix seeking at startup
  - ffmpeg: read the "year" tag
* encoder:
  - vorbis: generate end-of-stream packet before tag
  - vorbis: generate end-of-stream packet when playback ends
* output:
  - jack: check for connection failure before starting playback
  - jack: workaround for libjack1 crash bug
  - osx: fix stuttering due to buffering bug
* fix endless loop in text file reader
* update: skip symlinks in path that is to be updated


ver 0.16.7 (2012/02/04)
* input:
  - ffmpeg: support libavformat 0.7
* decoder:
  - ffmpeg: support libavformat 0.8, libavcodec 0.9
  - ffmpeg: support all MPD tags
* output:
  - httpd: fix excessive buffering
  - openal: force 16 bit playback, as 8 bit doesn't work
  - osx: remove sleep call from render callback
  - osx: clear render buffer when there's not enough data
* fix moving after current song

8 files changed, 26 insertions, 98 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 1369db34255..05009ede373 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.69 2013/05/09 07:39:27 adam Exp $
+# $NetBSD: Makefile,v 1.70 2013/05/26 18:37:39 wiz Exp $
 
-DISTNAME=		mpd-0.16.6
+DISTNAME=		mpd-0.17.4
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=		12
 CATEGORIES=		audio
-#MASTER_SITES=		http://musicpd.org/uploads/files/
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=		http://www.musicpd.org/download/mpd/0.17/
+#MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 8fe7fc3676b..ccf3424a4c0 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.35 2012/01/16 20:57:32 drochner Exp $
+$NetBSD: distinfo,v 1.36 2013/05/26 18:37:39 wiz Exp $
 
-SHA1 (mpd-0.16.6.tar.bz2) = 235e34a27cfa5fbf5849eb1be32e441d34c3a139
-RMD160 (mpd-0.16.6.tar.bz2) = 5a54c17f7fae46b7e30afefdcc68c1b23b23f511
-Size (mpd-0.16.6.tar.bz2) = 486442 bytes
-SHA1 (patch-aa) = 4ac387b87c793014f2001e4cc2ba8242eaaa05e5
-SHA1 (patch-ab) = b0879896541d220300c105a0b2a94b53d62203cc
-SHA1 (patch-ac) = 08cb6ce7a7ca6e2c56d19d9d5487944dbba66c91
-SHA1 (patch-ad) = 0a836d2ca10143eb1472560d97769c367e42aea6
-SHA1 (patch-ae) = dfc4ca455ef606baf56cb2513e5471f6c16385dc
-SHA1 (patch-src_decoder_audiofile__decoder__plugin.c) = 1d87dace0d129e40849738f4f705c29688ce51a4
+SHA1 (mpd-0.17.4.tar.bz2) = e3a16b5d784c3699b151e72cfa58d0ea54a49b13
+RMD160 (mpd-0.17.4.tar.bz2) = bc54ccaccd91df3af9debc1b96848ed84c9badbd
+Size (mpd-0.17.4.tar.bz2) = 582579 bytes
+SHA1 (patch-aa) = 2c6c0390101d8587268121ac7c2738491aab500e
+SHA1 (patch-ad) = 17c7aee04e7ea0b15f81c5e1edfa8e567d610610
+SHA1 (patch-src_decoder_audiofile__decoder__plugin.c) = 14ab61bae4dc6626177490cc47403870581bc4cd
diff --git a/audio/musicpd/patches/patch-aa b/audio/musicpd/patches/patch-aa
index 5ad215c6601..2febea924c2 100644
--- a/audio/musicpd/patches/patch-aa
+++ b/audio/musicpd/patches/patch-aa
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.11 2011/04/14 17:55:43 drochner Exp $
+$NetBSD: patch-aa,v 1.12 2013/05/26 18:37:39 wiz Exp $
 
---- src/conf.c.orig	2011-03-19 00:41:52.000000000 +0000
+fix misuse of "bool", should fix build with some compilers, from
+Pouya D. Tafti per pkgsrc-users
+
+--- src/conf.c.orig	2012-08-13 14:55:06.000000000 +0900
 +++ src/conf.c
-@@ -283,7 +283,7 @@ config_read_block(FILE *fp, int *count, 
+@@ -317,7 +317,7 @@ config_read_block(FILE *fp, int *count, 
  				g_set_error(error_r, config_quark(), 0,
  					    "line %i: Unknown tokens after '}'",
  					    *count);
@@ -11,12 +14,3 @@ $NetBSD: patch-aa,v 1.11 2011/04/14 17:55:43 drochner Exp $
  			}
  
  			return ret;
-@@ -325,7 +325,7 @@ config_read_block(FILE *fp, int *count, 
- 						 error_r);
- 		if (!success) {
- 			config_param_free(ret);
--			return false;
-+			return NULL;
- 		}
- 	}
- }
diff --git a/audio/musicpd/patches/patch-ab b/audio/musicpd/patches/patch-ab
deleted file mode 100644
index 8307df91ce6..00000000000
--- a/audio/musicpd/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2011/04/14 17:55:43 drochner Exp $
-
---- src/input_stream.c.orig	2011-03-19 00:41:53.000000000 +0000
-+++ src/input_stream.c
-@@ -64,7 +64,7 @@ input_stream_open(const char *url, GErro
- 	}
- 
- 	g_set_error(error_r, input_quark(), 0, "Unrecognized URI");
--	return false;
-+	return NULL;
- }
- 
- bool
diff --git a/audio/musicpd/patches/patch-ac b/audio/musicpd/patches/patch-ac
deleted file mode 100644
index ae4c0d357d2..00000000000
--- a/audio/musicpd/patches/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2011/04/14 17:55:43 drochner Exp $
-
---- src/input/file_input_plugin.c.orig	2011-03-19 00:41:53.000000000 +0000
-+++ src/input/file_input_plugin.c
-@@ -52,7 +52,7 @@ input_file_open(const char *filename, GE
- 	struct file_input_stream *fis;
- 
- 	if (!g_path_is_absolute(filename))
--		return false;
-+		return NULL;
- 
- 	fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0);
- 	if (fd < 0) {
-@@ -60,7 +60,7 @@ input_file_open(const char *filename, GE
- 			g_set_error(error_r, file_quark(), errno,
- 				    "Failed to open \"%s\": %s",
- 				    filename, g_strerror(errno));
--		return false;
-+		return NULL;
- 	}
- 
- 	ret = fstat(fd, &st);
-@@ -69,14 +69,14 @@ input_file_open(const char *filename, GE
- 			    "Failed to stat \"%s\": %s",
- 			    filename, g_strerror(errno));
- 		close(fd);
--		return false;
-+		return NULL;
- 	}
- 
- 	if (!S_ISREG(st.st_mode)) {
- 		g_set_error(error_r, file_quark(), 0,
- 			    "Not a regular file: %s", filename);
- 		close(fd);
--		return false;
-+		return NULL;
- 	}
- 
- #ifdef POSIX_FADV_SEQUENTIAL
diff --git a/audio/musicpd/patches/patch-ad b/audio/musicpd/patches/patch-ad
index ca5b109e92b..a22bb34c627 100644
--- a/audio/musicpd/patches/patch-ad
+++ b/audio/musicpd/patches/patch-ad
@@ -1,8 +1,11 @@
-$NetBSD: patch-ad,v 1.3 2011/04/14 17:55:43 drochner Exp $
+$NetBSD: patch-ad,v 1.4 2013/05/26 18:37:39 wiz Exp $
 
---- src/song_update.c.orig	2011-03-19 00:41:54.000000000 +0000
+fix misuse of "bool", should fix build with some compilers, from
+Pouya D. Tafti per pkgsrc-users
+
+--- src/song_update.c.orig	2012-06-28 00:46:58.000000000 +0900
 +++ src/song_update.c
-@@ -182,7 +182,7 @@ song_file_update_inarchive(struct song *
+@@ -187,7 +187,7 @@ song_file_update_inarchive(struct song *
  	if (suffix == NULL)
  		return false;
  
diff --git a/audio/musicpd/patches/patch-ae b/audio/musicpd/patches/patch-ae
deleted file mode 100644
index 186cfc49499..00000000000
--- a/audio/musicpd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2011/04/14 17:55:43 drochner Exp $
-
---- src/update_walk.c.orig	2011-03-19 00:41:54.000000000 +0000
-+++ src/update_walk.c
-@@ -590,7 +590,7 @@ update_regular_file(struct directory *di
- 	if (suffix == NULL)
- 		return;
- 
--	if ((plugin = decoder_plugin_from_suffix(suffix, false)) != NULL)
-+	if ((plugin = decoder_plugin_from_suffix(suffix, NULL)) != NULL)
- 	{
- 		struct song* song = songvec_find(&directory->songs, name);
- 
diff --git a/audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c b/audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c
index c9d07e60502..70518b33025 100644
--- a/audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c
+++ b/audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_decoder_audiofile__decoder__plugin.c,v 1.2 2012/01/16 20:57:32 drochner Exp $
+$NetBSD: patch-src_decoder_audiofile__decoder__plugin.c,v 1.3 2013/05/26 18:37:39 wiz Exp $
 
 Include unistd.h for SEEK_CUR, SEEK_SET.
 
---- src/decoder/audiofile_decoder_plugin.c.orig	2011-12-01 13:44:01.000000000 +0000
+--- src/decoder/audiofile_decoder_plugin.c.orig	2012-06-28 00:46:58.000000000 +0900
 +++ src/decoder/audiofile_decoder_plugin.c
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
  #include <assert.h>
  #include <glib.h>
  #include <stdio.h>