pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio audio: Use hacks.mk to avoid NetBSD msgfmt on Ne...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5bc69cc09bd4
branches:  trunk
changeset: 375272:5bc69cc09bd4
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Mar 11 08:56:02 2022 +0000

description:
audio: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.

diffstat:

 audio/pulseaudio/Makefile        |   5 +----
 audio/pulseaudio/hacks.mk        |  13 +++++++++++++
 audio/quodlibet/Makefile         |   7 +------
 audio/quodlibet/hacks.mk         |  13 +++++++++++++
 audio/sound-juicer/Makefile      |   5 +----
 audio/sound-juicer/hacks.mk      |  13 +++++++++++++
 audio/speech-dispatcher/Makefile |   7 +------
 7 files changed, 43 insertions(+), 20 deletions(-)

diffs (131 lines):

diff -r 7d22506670a2 -r 5bc69cc09bd4 audio/pulseaudio/Makefile
--- a/audio/pulseaudio/Makefile Fri Mar 11 07:45:02 2022 +0000
+++ b/audio/pulseaudio/Makefile Fri Mar 11 08:56:02 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2021/12/08 16:01:44 adam Exp $
+# $NetBSD: Makefile,v 1.167 2022/03/11 08:56:02 nia Exp $
 
 DISTNAME=      pulseaudio-15.0
 PKGREVISION=   1
@@ -27,9 +27,6 @@
 SUBST_FILES.egdir+=    src/daemon/meson.build
 SUBST_VARS.egdir+=     EGDIR
 
-# Requires --desktop in msgfmt.
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 LIBTOOL_REQD=  2.4
 GCC_REQD+=     4.8
 
diff -r 7d22506670a2 -r 5bc69cc09bd4 audio/pulseaudio/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/pulseaudio/hacks.mk Fri Mar 11 08:56:02 2022 +0000
@@ -0,0 +1,13 @@
+# $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
diff -r 7d22506670a2 -r 5bc69cc09bd4 audio/quodlibet/Makefile
--- a/audio/quodlibet/Makefile  Fri Mar 11 07:45:02 2022 +0000
+++ b/audio/quodlibet/Makefile  Fri Mar 11 08:56:02 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/01/09 16:18:55 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/03/11 08:56:02 nia Exp $
 
 DISTNAME=      quodlibet-4.4.0
 PKGREVISION=   4
@@ -36,11 +36,6 @@
 
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 # Requires Python 3.5 or higher
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
diff -r 7d22506670a2 -r 5bc69cc09bd4 audio/quodlibet/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/quodlibet/hacks.mk  Fri Mar 11 08:56:02 2022 +0000
@@ -0,0 +1,13 @@
+# $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
diff -r 7d22506670a2 -r 5bc69cc09bd4 audio/sound-juicer/Makefile
--- a/audio/sound-juicer/Makefile       Fri Mar 11 07:45:02 2022 +0000
+++ b/audio/sound-juicer/Makefile       Fri Mar 11 08:56:02 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2021/12/08 16:03:20 adam Exp $
+# $NetBSD: Makefile,v 1.122 2022/03/11 08:56:02 nia Exp $
 
 DISTNAME=      sound-juicer-3.24.0
 PKGREVISION=   12
@@ -19,9 +19,6 @@
 USE_TOOLS+=    msgfmt msgmerge xgettext itstool
 USE_TOOLS+=    gmake
 
-# XXX fails without GNU msgfmt
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../audio/libdiscid/buildlink3.mk"
 .include "../../audio/libmusicbrainz5/buildlink3.mk"
diff -r 7d22506670a2 -r 5bc69cc09bd4 audio/sound-juicer/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/sound-juicer/hacks.mk       Fri Mar 11 08:56:02 2022 +0000
@@ -0,0 +1,13 @@
+# $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
diff -r 7d22506670a2 -r 5bc69cc09bd4 audio/speech-dispatcher/Makefile
--- a/audio/speech-dispatcher/Makefile  Fri Mar 11 07:45:02 2022 +0000
+++ b/audio/speech-dispatcher/Makefile  Fri Mar 11 08:56:02 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/12/08 16:01:44 adam Exp $
+# $NetBSD: Makefile,v 1.23 2022/03/11 08:56:02 nia Exp $
 
 DISTNAME=      speech-dispatcher-0.10.2
 PKGREVISION=   3
@@ -35,11 +35,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PKGCONFIG_OVERRIDE+=   speech-dispatcher.pc.in
 
 PKG_SYSCONFSUBDIR=     speech-dispatcher



Home | Main Index | Thread Index | Old Index