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

6 files changed, 42 insertions, 14 deletions

diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 106fcd41ed9..efba0cf9c9b 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2021/12/08 16:04:09 adam Exp $
+# $NetBSD: Makefile,v 1.109 2022/03/11 08:59:27 nia Exp $
 
 DISTNAME=	dasher-5.0.0.b20200225
 PKGREVISION=	2
@@ -23,13 +23,6 @@ USE_TOOLS+=	pkg-config
 # Workaround for glib2-2.68.0 c++ fallout.
 CXXFLAGS+=	-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
 
-.include "../../mk/bsd.prefs.mk"
-
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 pre-configure:
 	# tries to invoke git for something, probably fetching the ref
 	${ECHO} "true" > ${WRKSRC}/build-aux/mkversion
diff --git a/editors/dasher/hacks.mk b/editors/dasher/hacks.mk
new file mode 100644
index 00000000000..2607c31fdba
--- /dev/null
+++ b/editors/dasher/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:59:27 nia Exp $
+
+.if !defined(DASHER_HACKS_MK)
+DASHER_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 # DASHER_HACKS_MK
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 4f36e857c23..4787b207743 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2021/12/08 16:04:10 adam Exp $
+# $NetBSD: Makefile,v 1.164 2022/03/11 08:59:27 nia Exp $
 
 DISTNAME=	gedit-3.36.2
 PKGREVISION=	7
@@ -15,7 +15,6 @@ PREV_PKGPATH=	editors/gedit3
 
 USE_TOOLS+=			gettext msgfmt perl pkg-config
 USE_TOOLS+=			itstool
-_TOOLS_USE_PKGSRC.msgfmt=	yes
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 PY_PATCHPLIST=			yes
diff --git a/editors/gedit/hacks.mk b/editors/gedit/hacks.mk
new file mode 100644
index 00000000000..7b46608d072
--- /dev/null
+++ b/editors/gedit/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:59:27 nia Exp $
+
+.if !defined(GEDIT_HACKS_MK)
+GEDIT_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 # GEDIT_HACKS_MK
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index c2c22e9e39f..398a491a68b 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2021/12/08 16:04:10 adam Exp $
+# $NetBSD: Makefile,v 1.64 2022/03/11 08:59:27 nia Exp $
 
 DISTNAME=	ghex-3.18.4
 PKGREVISION=	4
@@ -18,9 +18,6 @@ PYTHON_FOR_BUILD_ONLY=	tool
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
 PKGCONFIG_OVERRIDE+=		output/data/gtkhex-3.pc
 
-# XXX msgfmt: unknown option -- xml
-_TOOLS_USE_PKGSRC.msgfmt=	yes
-
 .include "../../devel/meson/build.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/editors/ghex/hacks.mk b/editors/ghex/hacks.mk
new file mode 100644
index 00000000000..e29d7eb81e7
--- /dev/null
+++ b/editors/ghex/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:59:27 nia Exp $
+
+.if !defined(GHEX_HACKS_MK)
+GHEX_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 # GHEX_HACKS_MK