CVS commit: pkgsrc/audio/musicpd

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Jul 12 20:16:09 UTC 2022

Modified Files:
        pkgsrc/audio/musicpd: Makefile distinfo
        pkgsrc/audio/musicpd/patches: patch-src_net_IPv6Address.hxx

Log Message:
musicpd: Fix sysconfdir paths


To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 pkgsrc/audio/musicpd/Makefile
cvs rdiff -u -r1.137 -r1.138 pkgsrc/audio/musicpd/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/audio/musicpd/patches/patch-src_net_IPv6Address.hxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/musicpd/Makefile
diff -u pkgsrc/audio/musicpd/Makefile:1.269 pkgsrc/audio/musicpd/Makefile:1.270
--- pkgsrc/audio/musicpd/Makefile:1.269 Mon Jul 11 08:25:59 2022
+++ pkgsrc/audio/musicpd/Makefile       Tue Jul 12 20:16:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.269 2022/07/11 08:25:59 adam Exp $
+# $NetBSD: Makefile,v 1.270 2022/07/12 20:16:08 triaxx Exp $
 
 DISTNAME=      mpd-0.23.8
 PKGNAME=       ${DISTNAME:S/mpd/musicpd/}
@@ -107,6 +107,12 @@ SUBST_FILES.sphinx=        doc/meson.build
 SUBST_MESSAGE.sphinx=  Fixing sphinx binary name.
 SUBST_SED.sphinx+=     -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
 
+SUBST_CLASSES+=                doc
+SUBST_STAGE.doc=       pre-configure
+SUBST_FILES.doc=       doc/mpd.conf.5.rst
+SUBST_MESSAGE.doc=     Fixing sysconfdir path in mpd.conf location.
+SUBST_VARS.doc+=       PKG_SYSCONFDIR
+
 INSTALLATION_DIRS=     ${EGDIR} ${EGDIR}/logrotate.d
 
 PYTHON_FOR_BUILD_ONLY=         tool

Index: pkgsrc/audio/musicpd/distinfo
diff -u pkgsrc/audio/musicpd/distinfo:1.137 pkgsrc/audio/musicpd/distinfo:1.138
--- pkgsrc/audio/musicpd/distinfo:1.137 Mon Jul 11 08:25:59 2022
+++ pkgsrc/audio/musicpd/distinfo       Tue Jul 12 20:16:08 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.137 2022/07/11 08:25:59 adam Exp $
+$NetBSD: distinfo,v 1.138 2022/07/12 20:16:08 triaxx Exp $
 
 BLAKE2s (mpd-0.23.8.tar.xz) = f7573d127356d7e8a2042086abdd4b65eedd9eea85b80505a26277a7a892a898
 SHA512 (mpd-0.23.8.tar.xz) = 62f7571de29a329b8ef1fc6f7c338125e70895e06fca134eb9ade19635498ec13da00511870bfadabc5a9ccb090c44543d3101361ffe109e4fadce66435b37ab
 Size (mpd-0.23.8.tar.xz) = 773280 bytes
-SHA1 (patch-src_net_IPv6Address.hxx) = 3e0ad6e63a970a17d0d8b2403acc538d8b08342e
+SHA1 (patch-doc_mpd.conf.5.rst) = ee22092564075cdf7917e4e66687f6ab98b5817c
+SHA1 (patch-src_net_IPv6Address.hxx) = f89b838ad5e946c5db8d95a6dd560e02bdccae29
 SHA1 (patch-src_util_WStringAPI.hxx) = 92f39096770943c26d8aaae8a7581d4daca2d233

Index: pkgsrc/audio/musicpd/patches/patch-src_net_IPv6Address.hxx
diff -u pkgsrc/audio/musicpd/patches/patch-src_net_IPv6Address.hxx:1.2 pkgsrc/audio/musicpd/patches/patch-src_net_IPv6Address.hxx:1.3
--- pkgsrc/audio/musicpd/patches/patch-src_net_IPv6Address.hxx:1.2      Fri Oct  2 09:47:09 2020
+++ pkgsrc/audio/musicpd/patches/patch-src_net_IPv6Address.hxx  Tue Jul 12 20:16:08 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_net_IPv6Address.hxx,v 1.2 2020/10/02 09:47:09 wiz Exp $
+$NetBSD: patch-src_net_IPv6Address.hxx,v 1.3 2022/07/12 20:16:08 triaxx Exp $
 
 Fixes
 In file included from /usr/include/netinet/in.h:372:0,
@@ -15,7 +15,7 @@ https://github.com/MusicPlayerDaemon/MPD
 
 --- src/net/IPv6Address.hxx.orig       2020-09-23 13:26:51.000000000 +0000
 +++ src/net/IPv6Address.hxx
-@@ -41,6 +41,7 @@
+@@ -40,6 +40,7 @@
  #include <ws2tcpip.h>
  #else
  #include <netinet/in.h>