security: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.

6 files changed, 42 insertions, 20 deletions

diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index 78039cb617a..6a4b2fe2d6e 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/01/13 08:02:29 adam Exp $
+# $NetBSD: Makefile,v 1.22 2022/03/12 07:28:19 nia Exp $
 
 DISTNAME=	gcr-3.38.1
 CATEGORIES=	security
@@ -20,13 +20,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-gtk-doc
 CONFIGURE_ARGS+=	--enable-vala
 
-.include "../../mk/bsd.prefs.mk"
-
-# To avoid msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PKGCONFIG_OVERRIDE+=	gck-1.pc.in
 PKGCONFIG_OVERRIDE+=	gcr-base-3.pc.in
 PKGCONFIG_OVERRIDE+=	gcr-ui.pc.in
diff --git a/security/gcr/hacks.mk b/security/gcr/hacks.mk
new file mode 100644
index 00000000000..e1a885f789f
--- /dev/null
+++ b/security/gcr/hacks.mk
@@ -0,0 +1,13 @@
+# $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 b16f1f49d83..43f435f25f2 100644
--- a/security/polkit/Makefile
+++ b/security/polkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/01/25 19:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2022/03/12 07:28:19 nia Exp $
 
 DISTNAME=	polkit-0.120
 PKGREVISION=	2
@@ -28,9 +28,6 @@ USE_TOOLS+=		pkg-config gmake perl
 USE_TOOLS+=		intltool msgfmt msgmerge xgettext
 USE_TOOLS+=		autoconf autoreconf automake
 
-# XXX msgfmt: unknown option -- xml
-_TOOLS_USE_PKGSRC.msgfmt=	yes
-
 # configure: error: *** A compiler with support for C++17 language features is required.
 GCC_REQD+=	7
 
diff --git a/security/polkit/hacks.mk b/security/polkit/hacks.mk
new file mode 100644
index 00000000000..700da6e6ddf
--- /dev/null
+++ b/security/polkit/hacks.mk
@@ -0,0 +1,13 @@
+# $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 860b20dafa4..f689176c395 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2021/12/08 16:06:24 adam Exp $
+# $NetBSD: Makefile,v 1.170 2022/03/12 07:28:19 nia Exp $
 
 DISTNAME=	seahorse-3.38.0.1
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/3.38/}
@@ -17,13 +17,6 @@ USE_TOOLS+=	gdbus-codegen
 # Why does it want specific point releases?
 MESON_ARGS+=	-Dcheck-compatible-gpg=false
 
-.include "../../mk/bsd.prefs.mk"
-
-# msgfmt: unknown option -- xml
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PYTHON_FOR_BUILD_ONLY=	tool
 
 .include "../../devel/meson/build.mk"
diff --git a/security/seahorse/hacks.mk b/security/seahorse/hacks.mk
new file mode 100644
index 00000000000..ef75e3367d7
--- /dev/null
+++ b/security/seahorse/hacks.mk
@@ -0,0 +1,13 @@
+# $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