*: Replace per-package msgfmt hacks with msgfmt-desktop.mk

7 files changed, 8 insertions, 43 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 985b3839f90..82064efecff 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2022/03/11 08:56:02 nia Exp $
+# $NetBSD: Makefile,v 1.168 2022/03/12 08:01:48 nia Exp $
 
 DISTNAME=	pulseaudio-15.0
 PKGREVISION=	1
@@ -144,6 +144,7 @@ BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-version-script=${WRKSRC}/src/pulse/map-file
 .include "../../audio/speexdsp/buildlink3.mk"
 .include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/check/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/audio/pulseaudio/hacks.mk b/audio/pulseaudio/hacks.mk
deleted file mode 100644
index b58d936a294..00000000000
--- a/audio/pulseaudio/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $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 --git a/audio/quodlibet/Makefile b/audio/quodlibet/Makefile
index a22858fa4a9..26499bb88c2 100644
--- a/audio/quodlibet/Makefile
+++ b/audio/quodlibet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/03/11 08:56:02 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/03/12 08:01:48 nia Exp $
 
 DISTNAME=	quodlibet-4.4.0
 PKGREVISION=	4
@@ -43,6 +43,7 @@ post-install:
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-good/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
diff --git a/audio/quodlibet/hacks.mk b/audio/quodlibet/hacks.mk
deleted file mode 100644
index f6b55fab112..00000000000
--- a/audio/quodlibet/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $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 --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index bbd1955bff9..b8a9118f09a 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2022/03/11 08:56:02 nia Exp $
+# $NetBSD: Makefile,v 1.123 2022/03/12 08:01:48 nia Exp $
 
 DISTNAME=	sound-juicer-3.24.0
 PKGREVISION=	12
@@ -23,6 +23,7 @@ USE_TOOLS+=	gmake
 .include "../../audio/libdiscid/buildlink3.mk"
 .include "../../audio/libmusicbrainz5/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/audio/sound-juicer/hacks.mk b/audio/sound-juicer/hacks.mk
deleted file mode 100644
index 06bf1701cdb..00000000000
--- a/audio/sound-juicer/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $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 --git a/audio/speech-dispatcher/Makefile b/audio/speech-dispatcher/Makefile
index 0cda435d5c0..464afa58ac2 100644
--- a/audio/speech-dispatcher/Makefile
+++ b/audio/speech-dispatcher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/03/11 08:56:02 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/03/12 08:01:52 nia Exp $
 
 DISTNAME=	speech-dispatcher-0.10.2
 PKGREVISION=	3
@@ -81,6 +81,7 @@ BUILDLINK_API_DEPENDS.glib2	+=	glib2>=2.66.0
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/dotconf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../lang/python/application.mk"