[pkgsrc/trunk]: pkgsrc/editors editors: Use hacks.mk to avoid NetBSD msgfmt o...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e08158f09817
branches:  trunk
changeset: 375273:e08158f09817
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Mar 11 08:59:27 2022 +0000

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

diffstat:

 editors/dasher/Makefile |   9 +--------
 editors/dasher/hacks.mk |  13 +++++++++++++
 editors/gedit/Makefile  |   3 +--
 editors/gedit/hacks.mk  |  13 +++++++++++++
 editors/ghex/Makefile   |   5 +----
 editors/ghex/hacks.mk   |  13 +++++++++++++
 6 files changed, 42 insertions(+), 14 deletions(-)

diffs (110 lines):

diff -r 5bc69cc09bd4 -r e08158f09817 editors/dasher/Makefile
--- a/editors/dasher/Makefile   Fri Mar 11 08:56:02 2022 +0000
+++ b/editors/dasher/Makefile   Fri Mar 11 08:59:27 2022 +0000
@@ -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 @@
 # 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 -r 5bc69cc09bd4 -r e08158f09817 editors/dasher/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/dasher/hacks.mk   Fri Mar 11 08:59:27 2022 +0000
@@ -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 -r 5bc69cc09bd4 -r e08158f09817 editors/gedit/Makefile
--- a/editors/gedit/Makefile    Fri Mar 11 08:56:02 2022 +0000
+++ b/editors/gedit/Makefile    Fri Mar 11 08:59:27 2022 +0000
@@ -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 @@
 
 USE_TOOLS+=                    gettext msgfmt perl pkg-config
 USE_TOOLS+=                    itstool
-_TOOLS_USE_PKGSRC.msgfmt=      yes
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 PY_PATCHPLIST=                 yes
diff -r 5bc69cc09bd4 -r e08158f09817 editors/gedit/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/gedit/hacks.mk    Fri Mar 11 08:59:27 2022 +0000
@@ -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 -r 5bc69cc09bd4 -r e08158f09817 editors/ghex/Makefile
--- a/editors/ghex/Makefile     Fri Mar 11 08:56:02 2022 +0000
+++ b/editors/ghex/Makefile     Fri Mar 11 08:59:27 2022 +0000
@@ -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 @@
 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 -r 5bc69cc09bd4 -r e08158f09817 editors/ghex/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/ghex/hacks.mk     Fri Mar 11 08:59:27 2022 +0000
@@ -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