[pkgsrc/trunk]: pkgsrc/audio/musicpd musicpd: Update to 0.21.16

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e58939857a4e
branches:  trunk
changeset: 416392:e58939857a4e
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Oct 24 21:23:13 2019 +0000

description:
musicpd: Update to 0.21.16

ver 0.21.16 (2019/10/16)
* queue
  - fix relative destination offset when moving a range
* storage
  - curl: request the "resourcetype" property to fix database update
  - curl: URL-encode more paths
  - curl: follow redirects for collections without trailing slash
* update
  - fix crash when music_directory is not a directory
* fix build with iconv() instead of ICU

diffstat:

 audio/musicpd/Makefile |  64 +++++++++++++++++++++++++------------------------
 audio/musicpd/distinfo |  10 +++---
 2 files changed, 38 insertions(+), 36 deletions(-)

diffs (123 lines):

diff -r 20cf1ea1ec71 -r e58939857a4e audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Thu Oct 24 20:47:14 2019 +0000
+++ b/audio/musicpd/Makefile    Thu Oct 24 21:23:13 2019 +0000
@@ -1,50 +1,53 @@
-# $NetBSD: Makefile,v 1.198 2019/10/21 22:15:10 adam Exp $
+# $NetBSD: Makefile,v 1.199 2019/10/24 21:23:13 nia Exp $
 
-DISTNAME=              mpd-0.21.15
-PKGNAME=               ${DISTNAME:S/mpd/musicpd/}
-CATEGORIES=            audio
-MASTER_SITES=          https://www.musicpd.org/download/mpd/0.21/
-EXTRACT_SUFX=          .tar.xz
+DISTNAME=      mpd-0.21.16
+PKGNAME=       ${DISTNAME:S/mpd/musicpd/}
+CATEGORIES=    audio
+MASTER_SITES=  https://www.musicpd.org/download/mpd/0.21/
+EXTRACT_SUFX=  .tar.xz
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              https://www.musicpd.org/
-COMMENT=               Remote controllable audio player
-LICENSE=               gnu-gpl-v2
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://www.musicpd.org/
+COMMENT=       Remote controllable audio player
+LICENSE=       gnu-gpl-v2
 
-PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
+CONFLICTS=     mpd-[0-9]*
 
-CONFLICTS=             mpd-[0-9]*
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
-USE_TOOLS+=            pkg-config
-USE_LANGUAGES=         c99 c++14
-MESON_ARGS+=           -Ddocumentation=true
+USE_TOOLS+=    pkg-config
+USE_LANGUAGES= c99 c++14
+MESON_ARGS+=   -Ddocumentation=true
 
 # worrying libraries with limited maintainance:
 # - audiofile, many CVEs, no activity since 2016
 #   using sndfile instead
 # - mad, no release since 2004
 #   using mpg123 instead
-MESON_ARGS+=           -Dmad=disabled
-MESON_ARGS+=           -Daudiofile=disabled
+MESON_ARGS+=   -Dmad=disabled
+MESON_ARGS+=   -Daudiofile=disabled
 
 # not available in pkgsrc?
-MESON_ARGS+=           -Dnfs=disabled
-MESON_ARGS+=           -Diso9660=disabled
-MESON_ARGS+=           -Dsndio=disabled
+MESON_ARGS+=   -Dnfs=disabled
+MESON_ARGS+=   -Diso9660=disabled
+MESON_ARGS+=   -Dsndio=disabled
 
 # c++14
-GCC_REQD+=             6
+GCC_REQD+=     6
+
+.include "../../mk/oss.buildlink3.mk"
+
+LDFLAGS+=      ${LIBOSSAUDIO}
+FILES_SUBST+=  DEVOSSAUDIO=${DEVOSSAUDIO}
+
+EGDIR=         ${PREFIX}/share/examples/mpd
+CONF_FILES=    ${EGDIR}/mpd.conf ${PKG_SYSCONFDIR}/mpd.conf
+RCD_SCRIPTS=   mpd
 
 CPPFLAGS.SunOS+=       -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 
 .include "options.mk"
 
-EGDIR=                 ${PREFIX}/share/examples/mpd
-CONF_FILES=            ${EGDIR}/mpd.conf ${PKG_SYSCONFDIR}/mpd.conf
-RCD_SCRIPTS=           mpd
-
-FILES_SUBST+=          DEVOSSAUDIO=${DEVOSSAUDIO}
-
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     mpd.conf
@@ -55,12 +58,12 @@
 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}
+SUBST_SED.sphinx+=     -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
 
 INSTALLATION_DIRS=     ${EGDIR}
 
+PYTHON_FOR_BUILD_ONLY= tool
+
 post-extract:
        ${CP} ${FILESDIR}/mpd.conf ${WRKSRC}/mpd.conf
 
@@ -81,6 +84,5 @@
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 20cf1ea1ec71 -r e58939857a4e audio/musicpd/distinfo
--- a/audio/musicpd/distinfo    Thu Oct 24 20:47:14 2019 +0000
+++ b/audio/musicpd/distinfo    Thu Oct 24 21:23:13 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.104 2019/10/01 13:55:53 nia Exp $
+$NetBSD: distinfo,v 1.105 2019/10/24 21:23:13 nia Exp $
 
-SHA1 (mpd-0.21.15.tar.xz) = 5d7491d7e5e1260b4f3c23a1b27e4edfe87b8cee
-RMD160 (mpd-0.21.15.tar.xz) = d58713956452a59cb28c8ffc743bc8701c770183
-SHA512 (mpd-0.21.15.tar.xz) = c67ebdb7609b36b4b8504ce0751ca2dcc38a2fba03a5b8419185e8be64bce7e19560347a600773b65f55ba0a3cedeff051117071db8e7fe0a90c9771de8bd37e
-Size (mpd-0.21.15.tar.xz) = 673056 bytes
+SHA1 (mpd-0.21.16.tar.xz) = 389023117eba5963a03222289f20f007b2afd3c0
+RMD160 (mpd-0.21.16.tar.xz) = 457ef719afd9296c94321501fc10d5e44e2eae71
+SHA512 (mpd-0.21.16.tar.xz) = bb7587acd03d675ae3127ab4e196d549170551ac643e5134baa2bccaf8d7c9bba6c9a9edec9bcb61a2ec3a6ce26f4d77190323ef0329033d0cd8c1f8964be05c
+Size (mpd-0.21.16.tar.xz) = 673732 bytes
 SHA1 (patch-src_net_IPv6Address.hxx) = c9e9a5676451e6834fcef359266d37fc15f079e6