musicpd: update to 0.21.3.

ver 0.21.3 (2018/11/16)
* output
  - alsa: fix crash bug
  - alsa: fix stuttering at start of playback
  - alsa: fix discarded samples at end of song
  - alsa: clear error after reopening device
* log: default to journal if MPD was started as systemd service

ver 0.21.2 (2018/11/12)
* protocol
  - operator "=~" matches a regular expression
  - operator "contains" matches substrings
* decoder
  - ffmpeg: require FFmpeg 3.1 or later
  - ffmpeg: fix broken sound with certain codecs
* output
  - alsa: fix high CPU usage with dmix
  - httpd: fix three crash bugs
* mixer
  - alsa: fix more rounding errors
* fix zlib support

ver 0.21.1 (2018/11/04)
* protocol
  - allow escaping quotes in filter expressions
  - operator "==" never searches substrings in filter expressions
* decoder
  - ffmpeg: fix build failure with non-standard FFmpeg installation path
  - flac: fix linker failure when building without FLAC support
* encoder
  - vorbis: fix linker failure when building without Vorbis decoder
* fix build failure on Linux-PowerPC
* fix build failure on FreeBSD
* eliminate DLL dependencies on Windows
* add warning about buggy Boost version 1.67
* require Meson 0.47.2 because a Meson 0.47.1 bug breaks our build

ver 0.21 (2018/10/31)
* configuration
  - add "include" directive, allows including config files
  - incremental "metadata_to_use" setting
* protocol
  - "tagtypes" can be used to hide tags
  - "find" and "search" can sort
  - "outputs" prints the plugin name
  - "outputset" sets runtime attributes
  - close connection when client sends HTTP request
  - new filter syntax for "find"/"search" etc. with negation
* database
  - simple: scan audio formats
  - proxy: require libmpdclient 2.9
  - proxy: forward `sort` and `window` to server
* player
  - hard-code "buffer_before_play" to 1 second, independent of audio format
  - "one-shot" single mode
* input
  - curl: download to buffer instead of throttling transfer
  - qobuz: new plugin to play Qobuz streams
  - tidal: new plugin to play Tidal streams
* tags
  - new tags "OriginalDate", "MUSICBRAINZ_WORKID"
* decoder
  - ffmpeg: require at least version 11.12
  - gme: try loading m3u sidecar files
  - hybrid_dsd: new decoder plugin
  - mad: move "gapless_mp3_playback" setting to "decoder" block
  - mikmod: require at least version 3.2
  - pcm: support audio/L24 (RFC 3190)
  - sidplay: support basic and kernal rom (libsidplayfp)
* resampler
  - soxr: flush resampler at end of song
* output
  - alsa: non-blocking mode
  - alsa: change "dop" and "allowed_formats" settings at runtime
  - ao: fix crash bug due to partial frames
  - shout: support the Shine encoder plugin
  - sndio: remove support for the broken RoarAudio sndio emulation
  - osx: initial support for DSD over PCM
  - roar: removed
  - httpd_output: support for unix sockets
* mixer
  - sndio: new mixer plugin
* encoder
  - opus: support for sending metadata using ogg stream chaining
* listen on $XDG_RUNTIME_DIR/mpd/socket by default
* append hostname to Zeroconf service name
* systemd watchdog support
* require GCC 6
* build with Meson instead of autotools
* use GTest instead of cppunit

ver 0.20.23 (2018/10/29)
* protocol
  - emit "player" idle event when restarting the current song
* fix broken float to s32 conversion
* new clang crash bug workaround

ver 0.20.22 (2018/10/23)
* protocol
  - add tag fallbacks for AlbumArtistSort, ArtistSort
  - fix empty string filter on fallback tags
  - "count group ..." can print an empty group
  - fix broken command "list ... group"
* storage
  - curl: URL-encode paths
* decoder
  - fluidsynth: adapt to API change in version 2.0
* Android
  - now runs as a service
  - add button to start/stop MPD
  - add option to auto-start on boot
* work around clang bug leading to crash
* install the SVG icon

6 files changed, 118 insertions, 131 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 31e5554c546..faa9bda38f9 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.176 2018/12/09 18:52:16 adam Exp $
+# $NetBSD: Makefile,v 1.177 2018/12/11 10:37:20 wiz Exp $
 
-DISTNAME=		mpd-0.20.21
+DISTNAME=		mpd-0.21.3
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=		4
 CATEGORIES=		audio
-MASTER_SITES=		http://www.musicpd.org/download/mpd/0.20/
+MASTER_SITES=		http://www.musicpd.org/download/mpd/0.21/
 #MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 EXTRACT_SUFX=		.tar.xz
 
@@ -13,19 +12,17 @@ HOMEPAGE=		http://musicpd.org/
 COMMENT=		Remote controllable audio player
 LICENSE=		gnu-gpl-v2
 
+TOOL_DEPENDS+=		${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+
 CONFLICTS=		mpd-[0-9]*
 
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
+MESON_ARGS+=		-Ddocumentation=true
 
 # c++14
 GCC_REQD+=		4.9
 
-# MacOS X audio output is no longer enabled by default.
-CONFIGURE_ARGS.Darwin+=	--enable-osx
-
 CPPFLAGS.SunOS+=	-std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 
 .include "options.mk"
@@ -39,8 +36,15 @@ FILES_SUBST+=		DEVOSSAUDIO=${DEVOSSAUDIO:Q}
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	mpd.conf
+SUBST_MESSAGE.paths=	Fixing path to sound device in example config.
 SUBST_SED.paths=	-e 's,@DEVOSSAUDIO@,${DEVOSSAUDIO},'
 
+SUBST_CLASSES+=		sphinx
+SUBST_STAGE.sphinx=	pre-configure
+SUBST_FILES.sphinx=	doc/meson.build
+SUBST_MESSAGE.sphinx=	Fixing sphinx binary name.
+SUBST_SED.sphinx+=	-e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
+
 LDFLAGS+=		${LIBOSSAUDIO}
 
 INSTALLATION_DIRS=	${EGDIR}
@@ -50,10 +54,13 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/mpd.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${DESTDIR}${EGDIR}
 
+.include "../../devel/py-meson/build.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicpd/PLIST b/audio/musicpd/PLIST
index 3596cf80df8..4084776bbf1 100644
--- a/audio/musicpd/PLIST
+++ b/audio/musicpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/01/16 11:53:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/12/11 10:37:20 wiz Exp $
 bin/mpd
 man/man1/mpd.1
 man/man5/mpd.conf.5
@@ -6,5 +6,44 @@ share/doc/mpd/AUTHORS
 share/doc/mpd/COPYING
 share/doc/mpd/NEWS
 share/doc/mpd/README.md
-share/doc/mpd/mpdconf.example
+share/doc/mpd/html/.buildinfo
+share/doc/mpd/html/_sources/developer.rst.txt
+share/doc/mpd/html/_sources/index.rst.txt
+share/doc/mpd/html/_sources/plugins.rst.txt
+share/doc/mpd/html/_sources/protocol.rst.txt
+share/doc/mpd/html/_sources/user.rst.txt
+share/doc/mpd/html/_static/ajax-loader.gif
+share/doc/mpd/html/_static/basic.css
+share/doc/mpd/html/_static/classic.css
+share/doc/mpd/html/_static/comment-bright.png
+share/doc/mpd/html/_static/comment-close.png
+share/doc/mpd/html/_static/comment.png
+share/doc/mpd/html/_static/doctools.js
+share/doc/mpd/html/_static/documentation_options.js
+share/doc/mpd/html/_static/down-pressed.png
+share/doc/mpd/html/_static/down.png
+share/doc/mpd/html/_static/file.png
+share/doc/mpd/html/_static/jquery-3.2.1.js
+share/doc/mpd/html/_static/jquery.js
+share/doc/mpd/html/_static/minus.png
+share/doc/mpd/html/_static/plus.png
+share/doc/mpd/html/_static/pygments.css
+share/doc/mpd/html/_static/searchtools.js
+share/doc/mpd/html/_static/sidebar.js
+share/doc/mpd/html/_static/underscore-1.3.1.js
+share/doc/mpd/html/_static/underscore.js
+share/doc/mpd/html/_static/up-pressed.png
+share/doc/mpd/html/_static/up.png
+share/doc/mpd/html/_static/websupport.js
+share/doc/mpd/html/developer.html
+share/doc/mpd/html/genindex.html
+share/doc/mpd/html/index.html
+share/doc/mpd/html/objects.inv
+share/doc/mpd/html/plugins.html
+share/doc/mpd/html/protocol.html
+share/doc/mpd/html/search.html
+share/doc/mpd/html/searchindex.js
+share/doc/mpd/html/user.html
 share/examples/mpd/mpd.conf
+share/examples/mpd/mpdconf.example
+share/icons/hicolor/scalable/apps/mpd.svg
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index a34d82cd01b..df8ae14bba4 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.91 2018/08/19 17:31:43 wiz Exp $
+$NetBSD: distinfo,v 1.92 2018/12/11 10:37:20 wiz Exp $
 
-SHA1 (mpd-0.20.21.tar.xz) = 568b99ff87552a9f16a48cc620149b6f88a4fcb0
-RMD160 (mpd-0.20.21.tar.xz) = 9999090c99e7a0b55ea2b3a5bd8e3e6d8ceb1b9a
-SHA512 (mpd-0.20.21.tar.xz) = d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
-Size (mpd-0.20.21.tar.xz) = 800476 bytes
+SHA1 (mpd-0.21.3.tar.xz) = 271cb468f2a1dd63b2daa2db19a03ad19b4ad425
+RMD160 (mpd-0.21.3.tar.xz) = cf95848b219733726e38ab945965b3236185b2a7
+SHA512 (mpd-0.21.3.tar.xz) = c6ce513ea641d026594cd7ae6e9051bd0060e45f5839d89b350ba144cc9094a8e1490052df4d024cbc92d88680ee8e8bae14fc8037431394771018a75c3ee3d7
+Size (mpd-0.21.3.tar.xz) = 664992 bytes
+SHA1 (patch-src_client_ClientNew.cxx) = 8f42af7515fc81f00647b3b4b2e5749a852ff699
+SHA1 (patch-src_net_IPv6Address.hxx) = c9e9a5676451e6834fcef359266d37fc15f079e6
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index c1ca9d3c25e..1302aff7b62 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,74 +1,46 @@
-# $NetBSD: options.mk,v 1.30 2018/04/29 09:58:21 wiz Exp $
+# $NetBSD: options.mk,v 1.31 2018/12/11 10:37:20 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS=	adplug audiofile avahi bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libmpdclient libwildmidi mikmod modplug mpg123 musepack musicpd-soundcloud openal opus pulseaudio shout sqlite3 tremor twolame vorbis wavpack zziplib
+PKG_SUPPORTED_OPTIONS=	adplug audiofile avahi bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libmpdclient libsoxr libwildmidi mikmod modplug mpg123 musepack musicpd-soundcloud openal opus pulseaudio shine shout sqlite3 tremor twolame vorbis wavpack zziplib
 PKG_SUGGESTED_OPTIONS=	audiofile curl faad flac id3 inet6 libao musepack vorbis
 
-# TODO:
-# shine
-# libsoxr
-
 PKG_OPTIONS_OPTIONAL_GROUPS=	vorbis
 PKG_OPTIONS_GROUP.vorbis=	tremor vorbis
 
-PKG_OPTIONS_LEGACY_OPTS=	ogg:vorbis
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Madplug)
 .  include "../../audio/adplug/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-adplug
-.else
-CONFIGURE_ARGS+=	--disable-adplug
 .endif
 
 .if !empty(PKG_OPTIONS:Maudiofile)
 BUILDLINK_API_DEPENDS.libaudiofile+=	libaudiofile>=0.3
 .  include "../../audio/libaudiofile/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-audiofile
-.else
-CONFIGURE_ARGS+=	--disable-audiofile
 .endif
 
 .if !empty(PKG_OPTIONS:Mavahi)
 .  include "../../net/avahi/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-zeroconf=avahi
 .endif
 
 .if !empty(PKG_OPTIONS:Mbzip2)
 .  include "../../archivers/bzip2/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-bzip2
-.else
-CONFIGURE_ARGS+=	--disable-bzip2
 .endif
 
 # wants a different version of the library than we have in pkgsrc
 #.if !empty(PKG_OPTIONS:Mcdparanoia)
 #.  include "../../audio/cdparanoia/buildlink3.mk"
-#CONFIGURE_ARGS+=	--enable-cdio-paranoia
-#.else
-#CONFIGURE_ARGS+=	--enable-cdio-paranoia
 #.endif
 
 .if !empty(PKG_OPTIONS:Mcurl)
 .  include "../../www/curl/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-curl
-.else
-CONFIGURE_ARGS+=	--disable-curl
 .endif
 
 .if !empty(PKG_OPTIONS:Mfaad)
 .  include "../../audio/faad2/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-aac
-.else
-CONFIGURE_ARGS+=	--disable-aac
 .endif
 
 .if !empty(PKG_OPTIONS:Mffmpeg)
 .  include "../../multimedia/ffmpeg4/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-ffmpeg
-.else
-CONFIGURE_ARGS+=	--disable-ffmpeg
 .endif
 
 .if !empty(PKG_OPTIONS:Mflac)
@@ -77,201 +49,124 @@ BUILDLINK_ABI_DEPENDS.flac+=	flac>=1.2
 # XXX whole album flac files can appearently be parsed without libcue,
 # so I've yet to find out what libcue is good for
 #.  include "../../audio/libcue/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-flac
-.else
-CONFIGURE_ARGS+=	--disable-flac
 .endif
 
 .if !empty(PKG_OPTIONS:Mfluidsynth)
 .  include "../../audio/fluidsynth/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-fluidsynth
-.else
-CONFIGURE_ARGS+=	--disable-fluidsynth
 .endif
 
 # needs to be imported from wip first
 #.if !empty(PKG_OPTIONS:Mgme)
 #.  include "../../wip/libgme/buildlink3.mk"
-#CONFIGURE_ARGS+=	--enable-gme
-#.else
-#CONFIGURE_ARGS+=	--disable-gme
 #.endif
 
 .if !empty(PKG_OPTIONS:Mid3)
 .  include "../../audio/libid3tag/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-id3
-.else
-CONFIGURE_ARGS+=	--disable-id3
 .endif
 
 .if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Mjack)
 .  include "../../audio/jack/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-jack
-.else
-CONFIGURE_ARGS+=	--disable-jack
 .endif
 
 .if !empty(PKG_OPTIONS:Mlame)
 .  include "../../audio/lame/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-lame-encoder
-.else
-CONFIGURE_ARGS+=	--disable-lame-encoder
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibao)
 .  include "../../audio/libao/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-ao
-.else
-CONFIGURE_ARGS+=	--disable-ao
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibmms)
 .  include "../../net/libmms/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-mms
-.else
-CONFIGURE_ARGS+=	--disable-mms
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibmpdclient)
 .  include "../../audio/libmpdclient/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-libmpdclient
-.else
-CONFIGURE_ARGS+=	--disable-libmpdclient
 .endif
 
 # does not find libresid-builder
 #.if !empty(PKG_OPTIONS:Mlibsidplay2)
 #.  include "../../audio/libsidplay2/buildlink3.mk"
-#CONFIGURE_ARGS+=	--enable-sidplay
-#.else
-#CONFIGURE_ARGS+=	--disable-sidplay
 #.endif
 
+.if !empty(PKG_OPTIONS:Mlibsoxr)
+.  include "../../audio/libsoxr/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mlibwildmidi)
 .  include "../../audio/libwildmidi/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-wildmidi
-.else
-CONFIGURE_ARGS+=	--disable-wildmidi
 .endif
 
 .if !empty(PKG_OPTIONS:Mmikmod)
 .  include "../../audio/libmikmod/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-mikmod
-.else
-CONFIGURE_ARGS+=	--disable-mikmod
 .endif
 
 .if !empty(PKG_OPTIONS:Mmodplug)
 .  include "../../audio/libmodplug/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-modplug
-.else
-CONFIGURE_ARGS+=	--disable-modplug
 .endif
 
 .if !empty(PKG_OPTIONS:Mmpg123)
 .  include "../../audio/mpg123/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-mpg123
-.else
-CONFIGURE_ARGS+=	--disable-mpg123
 .endif
 
 .if !empty(PKG_OPTIONS:Mmusepack)
 .  include "../../audio/musepack/buildlink3.mk"
-CONFIGURE_ENV+=		mpcdec_prefix=${BUILDLINK_PREFIX.musepack}
-CONFIGURE_ARGS+=	--enable-mpc
-.else
-CONFIGURE_ARGS+=	--disable-mpc
 .endif
 
 .if !empty(PKG_OPTIONS:Mmusicpd-soundcloud)
 BUILDLINK_API_DEPENDS.yajl+=	yajl>=2.1
 .  include "../../devel/yajl/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-soundcloud
-.else
-CONFIGURE_ARGS+=	--disable-soundcloud
 .endif
 
 .if !empty(PKG_OPTIONS:Mopenal)
 .  include "../../audio/openal-soft/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-openal
-.else
-CONFIGURE_ARGS+=	--disable-openal
 .endif
 
 .if !empty(PKG_OPTIONS:Mopus)
 .  include "../../audio/libopus/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-opus
-.else
-CONFIGURE_ARGS+=	--disable-opus
 .endif
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .  include "../../audio/pulseaudio/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-pulse
-.else
-CONFIGURE_ARGS+=	--disable-pulse
+.endif
+
+.if !empty(PKG_OPTIONS:Mshine)
+.  include "../../audio/shine/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mshout)
 .  include "../../audio/libshout/buildlink3.mk"
 .  include "../../audio/lame/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-shout
-.else
-CONFIGURE_ARGS+=	--disable-shout
 .endif
 
 # needs libresid-builder or libsidutils, both not packaged yet
 #.if !empty(PKG_OPTIONS:Msidplay)
 #.  include "../../audio/libsidplay2/buildlink3.mk"
-#CONFIGURE_ARGS+=	--enable-sidplay
-#.else
-#CONFIGURE_ARGS+=	--disable-sidplay
 #.endif
 
 .if !empty(PKG_OPTIONS:Msqlite3)
 .  include "../../databases/sqlite3/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-sqlite
-.else
-CONFIGURE_ARGS+=	--disable-sqlite
 .endif
 
 .if !empty(PKG_OPTIONS:Mtremor)
 .  include "../../audio/tremor/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-tremor=${BUILDLINK_PREFIX.tremor}
-.else
-CONFIGURE_ARGS+=	--without-tremor
 .endif
 
 .if !empty(PKG_OPTIONS:Mtwolame)
 .  include "../../audio/twolame/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-twolame-encoder
-.else
-CONFIGURE_ARGS+=	--disable-twolame-encoder
 .endif
 
 .if !empty(PKG_OPTIONS:Mvorbis)
 .  include "../../audio/libvorbis/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-vorbis
-.else
-CONFIGURE_ARGS+=	--disable-vorbis
 .endif
 
 .if !empty(PKG_OPTIONS:Mwavpack)
 .  include "../../audio/wavpack/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-wavpack
-.else
-CONFIGURE_ARGS+=	--disable-wavpack
 .endif
 
 .if !empty(PKG_OPTIONS:Mzziplib)
 .  include "../../archivers/zziplib/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-zzip
-.else
-CONFIGURE_ARGS+=	--disable-zzip
 .endif
diff --git a/audio/musicpd/patches/patch-src_client_ClientNew.cxx b/audio/musicpd/patches/patch-src_client_ClientNew.cxx
new file mode 100644
index 00000000000..c20a076466c
--- /dev/null
+++ b/audio/musicpd/patches/patch-src_client_ClientNew.cxx
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_client_ClientNew.cxx,v 1.1 2018/12/11 10:37:20 wiz Exp $
+
+Fixes
+/usr/lib/libwrap.so: undefined reference to `allow_severity'
+/usr/lib/libwrap.so: undefined reference to `deny_severity'
+
+https://github.com/MusicPlayerDaemon/MPD/issues/437
+
+--- src/client/ClientNew.cxx.orig	2018-11-16 12:27:58.000000000 +0000
++++ src/client/ClientNew.cxx
+@@ -37,6 +37,8 @@
+ 
+ #ifdef HAVE_LIBWRAP
+ #include <tcpd.h>
++#include <syslog.h>
++int allow_severity = LOG_INFO, deny_severity = LOG_INFO;
+ #endif
+ 
+ static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";
diff --git a/audio/musicpd/patches/patch-src_net_IPv6Address.hxx b/audio/musicpd/patches/patch-src_net_IPv6Address.hxx
new file mode 100644
index 00000000000..93f3398d410
--- /dev/null
+++ b/audio/musicpd/patches/patch-src_net_IPv6Address.hxx
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_net_IPv6Address.hxx,v 1.1 2018/12/11 10:37:20 wiz Exp $
+
+Fixes
+In file included from /usr/include/netinet/in.h:372:0,
+                 from ../src/net/IPv4Address.hxx:42,
+                 from ../src/event/ServerSocket.cxx:22:
+../src/net/IPv6Address.hxx: In member function 'bool IPv6Address::IsV4Mapped() const':
+../src/net/IPv6Address.hxx:175:10: error: 'ntohl' was not declared in this scope
+   return IN6_IS_ADDR_V4MAPPED(&address.sin6_addr);
+          ^
+before this commit:
+https://mail-index.netbsd.org/source-changes/2018/12/10/msg101328.html
+
+https://github.com/MusicPlayerDaemon/MPD/issues/438
+
+--- src/net/IPv6Address.hxx.orig	2018-11-16 12:27:58.000000000 +0000
++++ src/net/IPv6Address.hxx
+@@ -41,6 +41,7 @@
+ #include <ws2tcpip.h>
+ #else
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #endif
+ 
+ /**