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

6 files changed, 6 insertions, 42 deletions

diff --git a/multimedia/gnome-video-effects/Makefile b/multimedia/gnome-video-effects/Makefile
index f641dba1155..b0b5042a5ea 100644
--- a/multimedia/gnome-video-effects/Makefile
+++ b/multimedia/gnome-video-effects/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/03/12 07:17:19 nia Exp $
+# $NetBSD: Makefile,v 1.4 2022/03/12 08:01:50 nia Exp $
 
 DISTNAME=	gnome-video-effects-0.5.0
 PKGREVISION=	1
@@ -18,5 +18,6 @@ PYTHON_FOR_BUILD_ONLY=	tool
 PKGCONFIG_OVERRIDE+=	gnome-video-effects.pc.in
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../multimedia/frei0r/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnome-video-effects/hacks.mk b/multimedia/gnome-video-effects/hacks.mk
deleted file mode 100644
index 74b0fe83d21..00000000000
--- a/multimedia/gnome-video-effects/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:17:19 nia Exp $
-
-.if !defined(GNOME_VIDEO_EFFECTS_HACKS_MK)
-GNOME_VIDEO_EFFECTS_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 # GNOME_VIDEO_EFFECTS_HACKS_MK
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index c1e91209ae0..0e0297f1eb7 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2022/03/12 07:17:19 nia Exp $
+# $NetBSD: Makefile,v 1.74 2022/03/12 08:01:50 nia Exp $
 #
 
 DISTNAME=	HandBrake-1.3.3-source
@@ -85,6 +85,7 @@ post-extract:
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/libass/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
diff --git a/multimedia/handbrake/hacks.mk b/multimedia/handbrake/hacks.mk
deleted file mode 100644
index 55f136929d5..00000000000
--- a/multimedia/handbrake/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:17:19 nia Exp $
-
-.if !defined(HANDBRAKE_HACKS_MK)
-HANDBRAKE_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 # HANDBRAKE_HACKS_MK
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 9eefb0e0c9c..6d7547da5d8 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2022/03/12 07:17:19 nia Exp $
+# $NetBSD: Makefile,v 1.122 2022/03/12 08:01:50 nia Exp $
 
 DISTNAME=	totem-3.34.1
 PKGREVISION=	13
@@ -25,6 +25,7 @@ PKGCONFIG_OVERRIDE+=	data/totem.pc.in
 MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/src
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/libpeas/buildlink3.mk"
 .include "../../graphics/clutter-gtk/buildlink3.mk"
diff --git a/multimedia/totem/hacks.mk b/multimedia/totem/hacks.mk
deleted file mode 100644
index f4032904fd4..00000000000
--- a/multimedia/totem/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:17:19 nia Exp $
-
-.if !defined(TOTEM_HACKS_MK)
-TOTEM_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 # TOTEM_HACKS_MK