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

8 files changed, 56 insertions, 24 deletions

diff --git a/sysutils/gnome-characters/Makefile b/sysutils/gnome-characters/Makefile
index 3e90e0d448a..d35c491b630 100644
--- a/sysutils/gnome-characters/Makefile
+++ b/sysutils/gnome-characters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/08 16:06:29 adam Exp $
+# $NetBSD: Makefile,v 1.4 2022/03/12 07:37:42 nia Exp $
 
 DISTNAME=	gnome-characters-3.34.0
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -13,9 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	pkg-config msgfmt xgettext
 
-# XXX msgfmt: unknown option -- desktop
-_TOOLS_USE_PKGSRC.msgfmt=	yes
-
 PYTHON_FOR_BUILD_ONLY=	tool
 
 .include "../../devel/meson/build.mk"
diff --git a/sysutils/gnome-characters/hacks.mk b/sysutils/gnome-characters/hacks.mk
new file mode 100644
index 00000000000..6182afd2cc5
--- /dev/null
+++ b/sysutils/gnome-characters/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $
+
+.if !defined(GNOME_CHARACTERS_HACKS_MK)
+GNOME_CHARACTERS_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_CHARACTERS_HACKS_MK
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index c0b7c244b6c..5ff10e29eac 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/12/08 16:06:29 adam Exp $
+# $NetBSD: Makefile,v 1.12 2022/03/12 07:37:42 nia Exp $
 
 DISTNAME=	gnome-control-center-40.0
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -18,13 +18,6 @@ MESON_ARGS+=	-Dcheese=false
 MESON_ARGS+=	-Dtests=false
 MESON_ARGS+=	-Dwayland=false
 
-.include "../../mk/bsd.prefs.mk"
-
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PYTHON_FOR_BUILD_ONLY=	tool
 
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
diff --git a/sysutils/gnome-control-center/hacks.mk b/sysutils/gnome-control-center/hacks.mk
new file mode 100644
index 00000000000..57e32d56b44
--- /dev/null
+++ b/sysutils/gnome-control-center/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $
+
+.if !defined(GNOME_CONTROL_CENTER_HACKS_MK)
+GNOME_CONTROL_CENTER_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_CONTROL_CENTER_HACKS_MK
diff --git a/sysutils/gnome-font-viewer/Makefile b/sysutils/gnome-font-viewer/Makefile
index 8b78abf4c36..db0f6ff8742 100644
--- a/sysutils/gnome-font-viewer/Makefile
+++ b/sysutils/gnome-font-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/03/03 01:11:27 gutteridge Exp $
+# $NetBSD: Makefile,v 1.5 2022/03/12 07:37:42 nia Exp $
 
 DISTNAME=	gnome-font-viewer-3.34.0
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -13,13 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	pkg-config msgfmt xgettext
 
-.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/sysutils/gnome-font-viewer/hacks.mk b/sysutils/gnome-font-viewer/hacks.mk
new file mode 100644
index 00000000000..bd3903eece6
--- /dev/null
+++ b/sysutils/gnome-font-viewer/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $
+
+.if !defined(GNOME_FONT_VIEWER_HACKS_MK)
+GNOME_FONT_VIEWER_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_FONT_VIEWER_HACKS_MK
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 0aef831c8bd..e2f0a1e0613 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2021/12/08 16:06:34 adam Exp $
+# $NetBSD: Makefile,v 1.155 2022/03/12 07:37:42 nia Exp $
 
 DISTNAME=	nautilus-3.38.1
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -16,9 +16,6 @@ USE_TOOLS+=	gdbus-codegen
 
 DEPENDS+=	gnome-tracker-miners-[0-9]*:../../sysutils/gnome-tracker-miners
 
-# XXX msgfmt: unknown option -- desktop
-_TOOLS_USE_PKGSRC.msgfmt=	yes
-
 PYTHON_FOR_BUILD_ONLY=	tool
 
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
diff --git a/sysutils/nautilus/hacks.mk b/sysutils/nautilus/hacks.mk
new file mode 100644
index 00000000000..282d59d441f
--- /dev/null
+++ b/sysutils/nautilus/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $
+
+.if !defined(NAUTILUS_HACKS_MK)
+NAUTILUS_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 # NAUTILUS_HACKS_MK