From b837134d659f35235d0198d6bcc6fa7098f3668c Mon Sep 17 00:00:00 2001
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sat, 6 Apr 2019 06:43:53 +0000
Subject: [PATCH] MFH: r498056

Update to upstream release 0.21.7

Details:
- Mostly bug fixes, see upstream changelog:
  https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.7/NEWS
- Add NFS support via libnfs as non-default OPTION

Approved by:	ports-secteam (riggs)
---
 audio/musicpd/Makefile                        | 14 ++++++++------
 audio/musicpd/distinfo                        |  6 +++---
 .../musicpd/files/patch-src_lib_nfs_Error.cxx | 19 +++++++++++++++++++
 3 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 audio/musicpd/files/patch-src_lib_nfs_Error.cxx

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 2aadf7be13de..855876e7b82a 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	musicpd
-PORTVERSION=	0.21.6
-PORTREVISION=	1
+PORTVERSION=	0.21.7
 CATEGORIES=	audio ipv6
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
@@ -54,7 +53,8 @@ OPTIONS_MULTI_FILE_FORMAT=	\
 
 OPTIONS_GROUP=	ACCESS PLAYBACK
 
-OPTIONS_GROUP_ACCESS=	CDPARANOIA CURL MMS PLAYLISTS QOBUZ SMB SOUNDCLOUD TIDAL YAJL
+OPTIONS_GROUP_ACCESS=	CDPARANOIA CURL MMS NFS PLAYLISTS QOBUZ \
+			SMB SOUNDCLOUD TIDAL YAJL
 
 OPTIONS_GROUP_PLAYBACK=	AO JACK OPENAL PULSEAUDIO \
 			SHOUTCAST SNDIO
@@ -76,8 +76,8 @@ WILDMIDI_DESC=	WildMIDI support (MIDI files)
 YAJL_DESC=	JSON support via libyajl
 ZZIP_DESC=	Support for zzip archives
 
-OPTIONS_DEFAULT=AUDIOFILE CURL FFMPEG FLAC ID3TAG MAD PLAYLISTS SNDFILE \
-		VORBIS VORBISENC
+OPTIONS_DEFAULT=AUDIOFILE CURL FFMPEG FLAC ID3TAG MAD \
+		PLAYLISTS SNDFILE VORBIS VORBISENC
 
 # Decoder plugins
 ADPLUG_MESON_ENABLED=	adplug
@@ -106,7 +106,9 @@ MPG123_MESON_ENABLED=	mpg123
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MUSEPACK_MESON_ENABLED=	mpcdec
 MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack
-OPUS_MESON_ENABLED=		opus
+NFS_MESON_ENABLED=	nfs
+NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
+OPUS_MESON_ENABLED=	opus
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus \
 			libogg.so:audio/libogg
 PLAYLISTS_MESON_ENABLED=expat
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index c95b8f4bfac6..89822bcaaf81 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553120841
-SHA256 (mpd-0.21.6.tar.xz) = 8d4d116acc069872ba68741016d284885e93f8558a88d0c7ed246b8e1f40e59f
-SIZE (mpd-0.21.6.tar.xz) = 669272
+TIMESTAMP = 1554477669
+SHA256 (mpd-0.21.7.tar.xz) = 512062bc529bee04d4ccfaa2c6e720afc85bb071e49850a096b5ed518b3b412c
+SIZE (mpd-0.21.7.tar.xz) = 670268
diff --git a/audio/musicpd/files/patch-src_lib_nfs_Error.cxx b/audio/musicpd/files/patch-src_lib_nfs_Error.cxx
new file mode 100644
index 000000000000..df1ff5fb0037
--- /dev/null
+++ b/audio/musicpd/files/patch-src_lib_nfs_Error.cxx
@@ -0,0 +1,19 @@
+--- src/lib/nfs/Error.cxx.orig	2019-04-03 10:23:57 UTC
++++ src/lib/nfs/Error.cxx
+@@ -33,12 +33,13 @@
+ #include "Error.hxx"
+ #include "util/StringFormat.hxx"
+ 
++#include <assert.h>
++#include <string.h>
++#include <sys/time.h>
++
+ extern "C" {
+ #include <nfsc/libnfs.h>
+ }
+-
+-#include <assert.h>
+-#include <string.h>
+ 
+ static StringBuffer<256>
+ FormatNfsClientError(struct nfs_context *nfs, const char *msg) noexcept