Fri Mar 11 08:56:02 2022 UTC ()
audio: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.


(nia)
diff -r1.166 -r1.167 pkgsrc/audio/pulseaudio/Makefile
diff -r0 -r1.1 pkgsrc/audio/pulseaudio/hacks.mk
diff -r1.15 -r1.16 pkgsrc/audio/quodlibet/Makefile
diff -r0 -r1.1 pkgsrc/audio/quodlibet/hacks.mk
diff -r1.121 -r1.122 pkgsrc/audio/sound-juicer/Makefile
diff -r0 -r1.1 pkgsrc/audio/sound-juicer/hacks.mk
diff -r1.22 -r1.23 pkgsrc/audio/speech-dispatcher/Makefile
cvs diff -r1.166 -r1.167 pkgsrc/audio/pulseaudio/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/Makefile 2021/12/08 16:01:44 1.166
+++ pkgsrc/audio/pulseaudio/Makefile 2022/03/11 08:56:02 1.167
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.166 2021/12/08 16:01:44 adam Exp $ 1# $NetBSD: Makefile,v 1.167 2022/03/11 08:56:02 nia Exp $
2 2
3DISTNAME= pulseaudio-15.0 3DISTNAME= pulseaudio-15.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/ 6MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.freedesktop.org/wiki/Software/PulseAudio 10HOMEPAGE= https://www.freedesktop.org/wiki/Software/PulseAudio
11COMMENT= Sound server for POSIX and Win32 systems 11COMMENT= Sound server for POSIX and Win32 systems
12LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 12LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
13 13
14NOT_FOR_PLATFORM= DragonFly-*-* 14NOT_FOR_PLATFORM= DragonFly-*-*
@@ -17,29 +17,26 @@ SUBST_CLASSES+= oss @@ -17,29 +17,26 @@ SUBST_CLASSES+= oss
17SUBST_STAGE.oss= pre-configure 17SUBST_STAGE.oss= pre-configure
18SUBST_MESSAGE.oss= Set OSS device node 18SUBST_MESSAGE.oss= Set OSS device node
19SUBST_FILES.oss+= src/modules/oss/module-oss.c 19SUBST_FILES.oss+= src/modules/oss/module-oss.c
20SUBST_FILES.oss+= src/modules/module-detect.c 20SUBST_FILES.oss+= src/modules/module-detect.c
21SUBST_VARS.oss+= DEVOSSAUDIO 21SUBST_VARS.oss+= DEVOSSAUDIO
22 22
23SUBST_CLASSES+= egdir 23SUBST_CLASSES+= egdir
24SUBST_STAGE.egdir= pre-configure 24SUBST_STAGE.egdir= pre-configure
25SUBST_MESSAGE.egdir= Set EGDIR for config file installation for pkgsrc 25SUBST_MESSAGE.egdir= Set EGDIR for config file installation for pkgsrc
26SUBST_FILES.egdir+= src/pulse/meson.build 26SUBST_FILES.egdir+= src/pulse/meson.build
27SUBST_FILES.egdir+= src/daemon/meson.build 27SUBST_FILES.egdir+= src/daemon/meson.build
28SUBST_VARS.egdir+= EGDIR 28SUBST_VARS.egdir+= EGDIR
29 29
30# Requires --desktop in msgfmt. 
31_TOOLS_USE_PKGSRC.msgfmt= yes 
32 
33LIBTOOL_REQD= 2.4 30LIBTOOL_REQD= 2.4
34GCC_REQD+= 4.8 31GCC_REQD+= 4.8
35 32
36USE_LANGUAGES= c c++ 33USE_LANGUAGES= c c++
37USE_LIBTOOL= yes 34USE_LIBTOOL= yes
38USE_PKGLOCALEDIR= yes 35USE_PKGLOCALEDIR= yes
39USE_TOOLS+= bash:run gmake gm4 36USE_TOOLS+= bash:run gmake gm4
40USE_TOOLS+= msgfmt perl:build pkg-config 37USE_TOOLS+= msgfmt perl:build pkg-config
41MESON_ARGS+= -Dtcpwrap=disabled 38MESON_ARGS+= -Dtcpwrap=disabled
42MESON_ARGS+= --localedir=${PKGLOCALEDIR}/locale 39MESON_ARGS+= --localedir=${PKGLOCALEDIR}/locale
43MESON_ARGS+= --localstatedir=${VARBASE} 40MESON_ARGS+= --localstatedir=${VARBASE}
44MESON_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 41MESON_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
45MESON_ARGS+= -Dfftw=disabled 42MESON_ARGS+= -Dfftw=disabled
File Added: pkgsrc/audio/pulseaudio/Attic/hacks.mk
# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:56:02 nia Exp $

.if !defined(PULSEAUDIO_HACKS_MK)
PULSEAUDIO_HACKS_MK:=

.include "../../mk/bsd.fast.prefs.mk"

.if ${OPSYS} == "NetBSD"
# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml.
TOOLS_PLATFORM.msgfmt=	# none
PKG_HACKS+=		avoid-gplv2-msgfmt
.endif
.endif # PULSEAUDIO_HACKS_MK
cvs diff -r1.15 -r1.16 pkgsrc/audio/quodlibet/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/quodlibet/Makefile 2022/01/09 16:18:55 1.15
+++ pkgsrc/audio/quodlibet/Makefile 2022/03/11 08:56:02 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2022/01/09 16:18:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2022/03/11 08:56:02 nia Exp $
2 2
3DISTNAME= quodlibet-4.4.0 3DISTNAME= quodlibet-4.4.0
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=quodlibet/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=quodlibet/}
7GITHUB_PROJECT= quodlibet 7GITHUB_PROJECT= quodlibet
8GITHUB_RELEASE= release-${PKGVERSION_NOREV} 8GITHUB_RELEASE= release-${PKGVERSION_NOREV}
9 9
10MAINTAINER= nia@NetBSD.org 10MAINTAINER= nia@NetBSD.org
11HOMEPAGE= https://quodlibet.readthedocs.io/ 11HOMEPAGE= https://quodlibet.readthedocs.io/
12COMMENT= Ex Falso / Quod Libet - Music Library / Editor / Player 12COMMENT= Ex Falso / Quod Libet - Music Library / Editor / Player
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -26,30 +26,25 @@ DEPENDS+= gst-plugins1-vorbis-[0-9]*:../ @@ -26,30 +26,25 @@ DEPENDS+= gst-plugins1-vorbis-[0-9]*:../
26 26
27.if ${OPSYS} == "Linux" 27.if ${OPSYS} == "Linux"
28DEPENDS+= gst-plugins1-alsa-[0-9]*:../../audio/gst-plugins1-alsa 28DEPENDS+= gst-plugins1-alsa-[0-9]*:../../audio/gst-plugins1-alsa
29.endif 29.endif
30 30
31.if ${OPSYS} != "Linux" && ${OSS_TYPE} != "none" 31.if ${OPSYS} != "Linux" && ${OSS_TYPE} != "none"
32DEPENDS+= gst-plugins1-oss-[0-9]*:../../audio/gst-plugins1-oss 32DEPENDS+= gst-plugins1-oss-[0-9]*:../../audio/gst-plugins1-oss
33.endif 33.endif
34 34
35USE_TOOLS+= msgfmt 35USE_TOOLS+= msgfmt
36 36
37INSTALLATION_DIRS+= ${PKGMANDIR}/man1 37INSTALLATION_DIRS+= ${PKGMANDIR}/man1
38 38
39# msgfmt: unknown option -- desktop 
40.if ${OPSYS} == "NetBSD" 
41TOOLS_PLATFORM.msgfmt= 
42.endif 
43 
44# Requires Python 3.5 or higher 39# Requires Python 3.5 or higher
45PYTHON_VERSIONS_INCOMPATIBLE= 27 40PYTHON_VERSIONS_INCOMPATIBLE= 27
46 41
47post-install: 42post-install:
48 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE} 43 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE}
49 44
50.include "../../lang/python/egg.mk" 45.include "../../lang/python/egg.mk"
51.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 46.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
52.include "../../multimedia/gst-plugins1-good/buildlink3.mk" 47.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
53.include "../../net/libsoup/buildlink3.mk" 48.include "../../net/libsoup/buildlink3.mk"
54.include "../../sysutils/desktop-file-utils/desktopdb.mk" 49.include "../../sysutils/desktop-file-utils/desktopdb.mk"
55.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/audio/quodlibet/Attic/hacks.mk
# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:56:02 nia Exp $

.if !defined(QUODLIBET_HACKS_MK)
QUODLIBET_HACKS_MK:=

.include "../../mk/bsd.fast.prefs.mk"

.if ${OPSYS} == "NetBSD"
# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml.
TOOLS_PLATFORM.msgfmt=	# none
PKG_HACKS+=		avoid-gplv2-msgfmt
.endif
.endif # QUODLIBET_HACKS_MK
cvs diff -r1.121 -r1.122 pkgsrc/audio/sound-juicer/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/sound-juicer/Makefile 2021/12/08 16:03:20 1.121
+++ pkgsrc/audio/sound-juicer/Makefile 2022/03/11 08:56:02 1.122
@@ -1,37 +1,34 @@ @@ -1,37 +1,34 @@
1# $NetBSD: Makefile,v 1.121 2021/12/08 16:03:20 adam Exp $ 1# $NetBSD: Makefile,v 1.122 2022/03/11 08:56:02 nia Exp $
2 2
3DISTNAME= sound-juicer-3.24.0 3DISTNAME= sound-juicer-3.24.0
4PKGREVISION= 12 4PKGREVISION= 12
5CATEGORIES= audio gnome 5CATEGORIES= audio gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/sound-juicer/3.24/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/sound-juicer/3.24/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Apps/SoundJuicer 10HOMEPAGE= https://wiki.gnome.org/Apps/SoundJuicer
11COMMENT= CD ripping tool 11COMMENT= CD ripping tool
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 14TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19USE_TOOLS+= msgfmt msgmerge xgettext itstool 19USE_TOOLS+= msgfmt msgmerge xgettext itstool
20USE_TOOLS+= gmake 20USE_TOOLS+= gmake
21 21
22# XXX fails without GNU msgfmt 
23_TOOLS_USE_PKGSRC.msgfmt= yes 
24 
25.include "../../audio/libcanberra/buildlink3.mk" 22.include "../../audio/libcanberra/buildlink3.mk"
26.include "../../audio/libdiscid/buildlink3.mk" 23.include "../../audio/libdiscid/buildlink3.mk"
27.include "../../audio/libmusicbrainz5/buildlink3.mk" 24.include "../../audio/libmusicbrainz5/buildlink3.mk"
28.include "../../devel/gettext-lib/buildlink3.mk" 25.include "../../devel/gettext-lib/buildlink3.mk"
29.include "../../devel/gobject-introspection/buildlink3.mk" 26.include "../../devel/gobject-introspection/buildlink3.mk"
30.include "../../devel/glib2/schemas.mk" 27.include "../../devel/glib2/schemas.mk"
31.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 28.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
32.include "../../multimedia/gstreamer1/buildlink3.mk" 29.include "../../multimedia/gstreamer1/buildlink3.mk"
33.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 30.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
34.include "../../multimedia/gst-plugins1-good/buildlink3.mk" 31.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
35.include "../../sysutils/brasero/buildlink3.mk" 32.include "../../sysutils/brasero/buildlink3.mk"
36.include "../../sysutils/desktop-file-utils/desktopdb.mk" 33.include "../../sysutils/desktop-file-utils/desktopdb.mk"
37.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 34.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
File Added: pkgsrc/audio/sound-juicer/Attic/hacks.mk
# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:56:02 nia Exp $

.if !defined(SOUND_JUICER_HACKS_MK)
SOUND_JUICER_HACKS_MK:=

.include "../../mk/bsd.fast.prefs.mk"

.if ${OPSYS} == "NetBSD"
# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml.
TOOLS_PLATFORM.msgfmt=	# none
PKG_HACKS+=		avoid-gplv2-msgfmt
.endif
.endif # SOUND_JUICER_HACKS_MK
cvs diff -r1.22 -r1.23 pkgsrc/audio/speech-dispatcher/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/speech-dispatcher/Makefile 2021/12/08 16:01:44 1.22
+++ pkgsrc/audio/speech-dispatcher/Makefile 2022/03/11 08:56:02 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.22 2021/12/08 16:01:44 adam Exp $ 1# $NetBSD: Makefile,v 1.23 2022/03/11 08:56:02 nia Exp $
2 2
3DISTNAME= speech-dispatcher-0.10.2 3DISTNAME= speech-dispatcher-0.10.2
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=brailcom/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=brailcom/}
7GITHUB_PROJECT= speechd 7GITHUB_PROJECT= speechd
8GITHUB_RELEASE= ${PKGVERSION_NOREV} 8GITHUB_RELEASE= ${PKGVERSION_NOREV}
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://devel.freebsoft.org/speechd 11HOMEPAGE= https://devel.freebsoft.org/speechd
12COMMENT= Common interface to speech synthesis library 12COMMENT= Common interface to speech synthesis library
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -25,31 +25,26 @@ PY_PATCHPLIST= yes @@ -25,31 +25,26 @@ PY_PATCHPLIST= yes
25TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man 25TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
26TOOL_DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg 26TOOL_DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
27 27
28# To avoid PLIST complexity, let the libao package select the most 28# To avoid PLIST complexity, let the libao package select the most
29# fitting audio backend for the platform. 29# fitting audio backend for the platform.
30CONFIGURE_ARGS+= --with-libao 30CONFIGURE_ARGS+= --with-libao
31CONFIGURE_ARGS+= --without-alsa 31CONFIGURE_ARGS+= --without-alsa
32CONFIGURE_ARGS+= --without-nas 32CONFIGURE_ARGS+= --without-nas
33CONFIGURE_ARGS+= --without-oss 33CONFIGURE_ARGS+= --without-oss
34CONFIGURE_ARGS+= --without-pulse 34CONFIGURE_ARGS+= --without-pulse
35 35
36.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
37 37
38# msgfmt: unknown option -- desktop 
39.if ${OPSYS} == "NetBSD" 
40TOOLS_PLATFORM.msgfmt= 
41.endif 
42 
43PKGCONFIG_OVERRIDE+= speech-dispatcher.pc.in 38PKGCONFIG_OVERRIDE+= speech-dispatcher.pc.in
44 39
45PKG_SYSCONFSUBDIR= speech-dispatcher 40PKG_SYSCONFSUBDIR= speech-dispatcher
46 41
47OWN_DIRS+= ${PKG_SYSCONFDIR}/clients 42OWN_DIRS+= ${PKG_SYSCONFDIR}/clients
48OWN_DIRS+= ${PKG_SYSCONFDIR}/modules 43OWN_DIRS+= ${PKG_SYSCONFDIR}/modules
49 44
50CONF_FILES+= ${PREFIX}/share/examples/speech-dispatcher/clients/emacs.conf \ 45CONF_FILES+= ${PREFIX}/share/examples/speech-dispatcher/clients/emacs.conf \
51 ${PKG_SYSCONFDIR}/clients/emacs.conf 46 ${PKG_SYSCONFDIR}/clients/emacs.conf
52CONF_FILES+= ${PREFIX}/share/examples/speech-dispatcher/speechd.conf \ 47CONF_FILES+= ${PREFIX}/share/examples/speech-dispatcher/speechd.conf \
53 ${PKG_SYSCONFDIR}/speechd.conf 48 ${PKG_SYSCONFDIR}/speechd.conf
54 49
55PLIST_VARS+= espeak 50PLIST_VARS+= espeak