Mon Apr 18 18:13:55 2022 UTC ()
musicpd: Fix build on illumos.


(nia)
diff -r1.259 -r1.260 pkgsrc/audio/musicpd/Makefile
diff -r1.134 -r1.135 pkgsrc/audio/musicpd/distinfo
diff -r0 -r1.1 pkgsrc/audio/musicpd/patches/patch-src_util_WStringAPI.hxx
cvs diff -r1.259 -r1.260 pkgsrc/audio/musicpd/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/Makefile 2022/03/28 10:43:37 1.259
+++ pkgsrc/audio/musicpd/Makefile 2022/04/18 18:13:55 1.260
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.259 2022/03/28 10:43:37 tnn Exp $ 1# $NetBSD: Makefile,v 1.260 2022/04/18 18:13:55 nia Exp $
2 2
3DISTNAME= mpd-0.23.6 3DISTNAME= mpd-0.23.6
4PKGNAME= ${DISTNAME:S/mpd/musicpd/} 4PKGNAME= ${DISTNAME:S/mpd/musicpd/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= https://www.musicpd.org/download/mpd/${PKGVERSION_NOREV:R}/ 7MASTER_SITES= https://www.musicpd.org/download/mpd/${PKGVERSION_NOREV:R}/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.musicpd.org/ 11HOMEPAGE= https://www.musicpd.org/
12COMMENT= Remote controllable audio player 12COMMENT= Remote controllable audio player
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -78,26 +78,27 @@ FILES_SUBST+= MPD_GROUP=${MPD_GROUP:Q} @@ -78,26 +78,27 @@ FILES_SUBST+= MPD_GROUP=${MPD_GROUP:Q}
78FILES_SUBST+= VARBASE=${VARBASE} 78FILES_SUBST+= VARBASE=${VARBASE}
79 79
80BUILD_DEFS+= VARBASE 80BUILD_DEFS+= VARBASE
81 81
82OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd \ 82OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd \
83 ${MPD_USER} ${MPD_GROUP} 0755 83 ${MPD_USER} ${MPD_GROUP} 0755
84 84
85OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd/music \ 85OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd/music \
86 ${MPD_USER} ${MPD_GROUP} 0755 86 ${MPD_USER} ${MPD_GROUP} 0755
87 87
88OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd/playlists \ 88OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd/playlists \
89 ${MPD_USER} ${MPD_GROUP} 0755 89 ${MPD_USER} ${MPD_GROUP} 0755
90 90
 91LDFLAGS.SunOS+= -lnsl -lsocket
91CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ 92CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
92 93
93.include "options.mk" 94.include "options.mk"
94 95
95SUBST_CLASSES+= conf 96SUBST_CLASSES+= conf
96SUBST_STAGE.conf= pre-configure 97SUBST_STAGE.conf= pre-configure
97SUBST_FILES.conf= mpd.conf 98SUBST_FILES.conf= mpd.conf
98SUBST_MESSAGE.conf= Setting variables in the configuration file. 99SUBST_MESSAGE.conf= Setting variables in the configuration file.
99SUBST_VARS.conf+= VARBASE 100SUBST_VARS.conf+= VARBASE
100SUBST_VARS.conf+= MPD_USER 101SUBST_VARS.conf+= MPD_USER
101 102
102SUBST_CLASSES+= sphinx 103SUBST_CLASSES+= sphinx
103SUBST_STAGE.sphinx= pre-configure 104SUBST_STAGE.sphinx= pre-configure
cvs diff -r1.134 -r1.135 pkgsrc/audio/musicpd/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/distinfo 2022/03/20 08:25:06 1.134
+++ pkgsrc/audio/musicpd/distinfo 2022/04/18 18:13:55 1.135
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.134 2022/03/20 08:25:06 wiz Exp $ 1$NetBSD: distinfo,v 1.135 2022/04/18 18:13:55 nia Exp $
2 2
3BLAKE2s (mpd-0.23.6.tar.xz) = 804b2600782b47177bb9ef35c5f927bd4b33f76345faf244b0335628e49e2953 3BLAKE2s (mpd-0.23.6.tar.xz) = 804b2600782b47177bb9ef35c5f927bd4b33f76345faf244b0335628e49e2953
4SHA512 (mpd-0.23.6.tar.xz) = 1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d 4SHA512 (mpd-0.23.6.tar.xz) = 1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d
5Size (mpd-0.23.6.tar.xz) = 770812 bytes 5Size (mpd-0.23.6.tar.xz) = 770812 bytes
6SHA1 (patch-src_net_IPv6Address.hxx) = 3e0ad6e63a970a17d0d8b2403acc538d8b08342e 6SHA1 (patch-src_net_IPv6Address.hxx) = 3e0ad6e63a970a17d0d8b2403acc538d8b08342e
 7SHA1 (patch-src_util_WStringAPI.hxx) = 92f39096770943c26d8aaae8a7581d4daca2d233
File Added: pkgsrc/audio/musicpd/patches/patch-src_util_WStringAPI.hxx
$NetBSD: patch-src_util_WStringAPI.hxx,v 1.1 2022/04/18 18:13:55 nia Exp $

std::wcpcpy is undefined on illumos, whereas wcpcpy isn't,
so the __sun specifics are actively harmful.

--- src/util/WStringAPI.hxx.orig	2022-03-14 17:55:47.000000000 +0000
+++ src/util/WStringAPI.hxx
@@ -125,8 +125,6 @@ UnsafeCopyStringP(wchar_t *dest, const w
 	/* emulate wcpcpy() */
 	UnsafeCopyString(dest, src);
 	return dest + StringLength(dest);
-#elif defined(__sun) && defined (__SVR4)
-	return std::wcpcpy(dest, src);
 #else
 	return wcpcpy(dest, src);
 #endif
@@ -203,11 +201,7 @@ StringCollate(const wchar_t *a, const wc
 static inline wchar_t *
 DuplicateString(const wchar_t *p) noexcept
 {
-#if defined(__sun) && defined (__SVR4)
-	return std::wcsdup(p);
-#else
 	return wcsdup(p);
-#endif
 }
 
 #endif