Update to upstream release 0.20.4

Details:
- Minor bugfix release
- Build fixes have been upstreamed

8 files changed, 4 insertions, 218 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index e8f97de8839b..c95c700fc383 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	musicpd
-PORTVERSION=	0.20.3
+PORTVERSION=	0.20.4
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 00eb774f63a6..7aa61e620036 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485595393
-SHA256 (mpd-0.20.3.tar.xz) = 2238c1233f5318800ede7c37eeaf705c04920315de572dc666aff6ca682eb0f9
-SIZE (mpd-0.20.3.tar.xz) = 770568
+TIMESTAMP = 1486630981
+SHA256 (mpd-0.20.4.tar.xz) = 712b25351c12616630c580204e1c3dcba3ae2993a56cff1c346c87e334d69728
+SIZE (mpd-0.20.4.tar.xz) = 770132
diff --git a/audio/musicpd/files/patch-src_db_Count.cxx b/audio/musicpd/files/patch-src_db_Count.cxx
deleted file mode 100644
index 7607a3e3ce90..000000000000
--- a/audio/musicpd/files/patch-src_db_Count.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/db/Count.cxx.orig	2017-01-03 19:47:53 UTC
-+++ src/db/Count.cxx
-@@ -62,7 +62,7 @@ Print(Response &r, TagType group, const 
- 	}
- }
- 
--static bool
-+static void
- stats_visitor_song(SearchStats &stats, const LightSong &song)
- {
- 	stats.n_songs++;
-@@ -70,8 +70,6 @@ stats_visitor_song(SearchStats &stats, c
- 	const auto duration = song.GetDuration();
- 	if (!duration.IsNegative())
- 		stats.total_duration += duration;
--
--	return true;
- }
- 
- static bool
-@@ -94,7 +92,7 @@ CollectGroupCounts(TagCountMap &map, Tag
- 	return found;
- }
- 
--static bool
-+static void
- GroupCountVisitor(TagCountMap &map, TagType group, const LightSong &song)
- {
- 	assert(song.tag != nullptr);
-@@ -103,8 +101,6 @@ GroupCountVisitor(TagCountMap &map, TagT
- 	if (!CollectGroupCounts(map, group, tag) && group == TAG_ALBUM_ARTIST)
- 		/* fall back to "Artist" if no "AlbumArtist" was found */
- 		CollectGroupCounts(map, TAG_ARTIST, tag);
--
--	return true;
- }
- 
- void
diff --git a/audio/musicpd/files/patch-src_db_DatabasePlaylist.cxx b/audio/musicpd/files/patch-src_db_DatabasePlaylist.cxx
deleted file mode 100644
index bd11bfcae094..000000000000
--- a/audio/musicpd/files/patch-src_db_DatabasePlaylist.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/db/DatabasePlaylist.cxx.orig	2017-01-03 19:47:53 UTC
-+++ src/db/DatabasePlaylist.cxx
-@@ -27,13 +27,12 @@
- 
- #include <functional>
- 
--static bool
-+static void
- AddSong(const Storage &storage, const char *playlist_path_utf8,
- 	const LightSong &song)
- {
- 	spl_append_song(playlist_path_utf8,
- 			DatabaseDetachSong(storage, song));
--	return true;
- }
- 
- void
diff --git a/audio/musicpd/files/patch-src_db_DatabasePrint.cxx b/audio/musicpd/files/patch-src_db_DatabasePrint.cxx
deleted file mode 100644
index 10436a5ee6d0..000000000000
--- a/audio/musicpd/files/patch-src_db_DatabasePrint.cxx
+++ /dev/null
@@ -1,112 +0,0 @@
---- src/db/DatabasePrint.cxx.orig	2017-01-03 19:47:53 UTC
-+++ src/db/DatabasePrint.cxx
-@@ -49,16 +49,14 @@ PrintDirectoryURI(Response &r, bool base
- 		 ApplyBaseFlag(directory.GetPath(), base));
- }
- 
--static bool
-+static void
- PrintDirectoryBrief(Response &r, bool base, const LightDirectory &directory)
- {
- 	if (!directory.IsRoot())
- 		PrintDirectoryURI(r, base, directory);
--
--	return true;
- }
- 
--static bool
-+static void
- PrintDirectoryFull(Response &r, bool base, const LightDirectory &directory)
- {
- 	if (!directory.IsRoot()) {
-@@ -67,8 +65,6 @@ PrintDirectoryFull(Response &r, bool bas
- 		if (directory.mtime > 0)
- 			time_print(r, "Last-Modified", directory.mtime);
- 	}
--
--	return true;
- }
- 
- static void
-@@ -96,7 +92,7 @@ print_playlist_in_directory(Response &r,
- 			 directory->GetPath(), name_utf8);
- }
- 
--static bool
-+static void
- PrintSongBrief(Response &r, Partition &partition,
- 	       bool base, const LightSong &song)
- {
-@@ -106,11 +102,9 @@ PrintSongBrief(Response &r, Partition &p
- 		/* this song file has an embedded CUE sheet */
- 		print_playlist_in_directory(r, base,
- 					    song.directory, song.uri);
--
--	return true;
- }
- 
--static bool
-+static void
- PrintSongFull(Response &r, Partition &partition,
- 	      bool base, const LightSong &song)
- {
-@@ -120,21 +114,18 @@ PrintSongFull(Response &r, Partition &pa
- 		/* this song file has an embedded CUE sheet */
- 		print_playlist_in_directory(r, base,
- 					    song.directory, song.uri);
--
--	return true;
- }
- 
--static bool
-+static void
- PrintPlaylistBrief(Response &r, bool base,
- 		   const PlaylistInfo &playlist,
- 		   const LightDirectory &directory)
- {
- 	print_playlist_in_directory(r, base,
- 				    &directory, playlist.name.c_str());
--	return true;
- }
- 
--static bool
-+static void
- PrintPlaylistFull(Response &r, bool base,
- 		  const PlaylistInfo &playlist,
- 		  const LightDirectory &directory)
-@@ -144,8 +135,6 @@ PrintPlaylistFull(Response &r, bool base
- 
- 	if (playlist.mtime > 0)
- 		time_print(r, "Last-Modified", playlist.mtime);
--
--	return true;
- }
- 
- void
-@@ -191,15 +180,13 @@ db_selection_print(Response &r, Partitio
- 			   0, std::numeric_limits<int>::max());
- }
- 
--static bool
-+static void
- PrintSongURIVisitor(Response &r, Partition &partition, const LightSong &song)
- {
- 	song_print_uri(r, partition, song);
--
--	return true;
- }
- 
--static bool
-+static void
- PrintUniqueTag(Response &r, TagType tag_type,
- 	       const Tag &tag)
- {
-@@ -211,8 +198,6 @@ PrintUniqueTag(Response &r, TagType tag_
- 		if (item.type != tag_type)
- 			r.Format("%s: %s\n",
- 				 tag_item_names[item.type], item.value);
--
--	return true;
- }
- 
- void
diff --git a/audio/musicpd/files/patch-src_db_DatabaseQueue.cxx b/audio/musicpd/files/patch-src_db_DatabaseQueue.cxx
deleted file mode 100644
index 2d96ea8a49b9..000000000000
--- a/audio/musicpd/files/patch-src_db_DatabaseQueue.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/db/DatabaseQueue.cxx.orig	2017-01-03 19:47:53 UTC
-+++ src/db/DatabaseQueue.cxx
-@@ -27,14 +27,13 @@
- 
- #include <functional>
- 
--static bool
-+static void
- AddToQueue(Partition &partition, const LightSong &song)
- {
- 	const Storage &storage = *partition.instance.storage;
- 	partition.playlist.AppendSong(partition.pc,
- 				      DatabaseDetachSong(storage,
- 							 song));
--	return true;
- }
- 
- void
diff --git a/audio/musicpd/files/patch-src_db_Helpers.cxx b/audio/musicpd/files/patch-src_db_Helpers.cxx
deleted file mode 100644
index c518151c41b3..000000000000
--- a/audio/musicpd/files/patch-src_db_Helpers.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/db/Helpers.cxx.orig	2017-01-03 19:47:53 UTC
-+++ src/db/Helpers.cxx
-@@ -67,15 +67,13 @@ StatsVisitTag(DatabaseStats &stats, Stri
- 	}
- }
- 
--static bool
-+static void
- StatsVisitSong(DatabaseStats &stats, StringSet &artists, StringSet &albums,
- 	       const LightSong &song)
- {
- 	++stats.song_count;
- 
- 	StatsVisitTag(stats, artists, albums, *song.tag);
--
--	return true;
- }
- 
- DatabaseStats
diff --git a/audio/musicpd/files/patch-src_util_VarSize.hxx b/audio/musicpd/files/patch-src_util_VarSize.hxx
deleted file mode 100644
index fb09799d5bf9..000000000000
--- a/audio/musicpd/files/patch-src_util_VarSize.hxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/util/VarSize.hxx.orig	2015-03-17 11:18:04 UTC
-+++ src/util/VarSize.hxx
-@@ -36,6 +36,7 @@
- #include <type_traits>
- #include <utility>
- #include <new>
-+#include <cstdlib>
- 
- /**
-  * Allocate and construct a variable-size object.  That is useful for