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

6 files changed, 6 insertions, 42 deletions

diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index 6a4b2fe2d6e..ed4e283c2b9 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2022/03/12 07:28:19 nia Exp $
+# $NetBSD: Makefile,v 1.23 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=	gcr-3.38.1
 CATEGORIES=	security
@@ -30,6 +30,7 @@ TEST_TARGET=		check
 pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
 
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
diff --git a/security/gcr/hacks.mk b/security/gcr/hacks.mk
deleted file mode 100644
index e1a885f789f..00000000000
--- a/security/gcr/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:28:19 nia Exp $
-
-.if !defined(GCR_HACKS_MK)
-GCR_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 # GCR_HACKS_MK
diff --git a/security/polkit/Makefile b/security/polkit/Makefile
index 43f435f25f2..27a7067363b 100644
--- a/security/polkit/Makefile
+++ b/security/polkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2022/03/12 07:28:19 nia Exp $
+# $NetBSD: Makefile,v 1.41 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=	polkit-0.120
 PKGREVISION=	2
@@ -82,6 +82,7 @@ pre-configure:
 
 .include "../../lang/libduktape/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/polkit/hacks.mk b/security/polkit/hacks.mk
deleted file mode 100644
index 700da6e6ddf..00000000000
--- a/security/polkit/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:28:19 nia Exp $
-
-.if !defined(POLKIT_HACKS_MK)
-POLKIT_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 # POLKIT_HACKS_MK
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index f689176c395..d2dacf3a26a 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.170 2022/03/12 07:28:19 nia Exp $
+# $NetBSD: Makefile,v 1.171 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=	seahorse-3.38.0.1
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/3.38/}
@@ -20,6 +20,7 @@ MESON_ARGS+=	-Dcheck-compatible-gpg=false
 PYTHON_FOR_BUILD_ONLY=	tool
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libhandy1/buildlink3.mk"
diff --git a/security/seahorse/hacks.mk b/security/seahorse/hacks.mk
deleted file mode 100644
index ef75e3367d7..00000000000
--- a/security/seahorse/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:28:19 nia Exp $
-
-.if !defined(SEAHORSE_HACKS_MK)
-SEAHORSE_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 # SEAHORSE_HACKS_MK