CVS commit: pkgsrc/editors

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar 11 08:59:27 UTC 2022

Modified Files:
        pkgsrc/editors/dasher: Makefile
        pkgsrc/editors/gedit: Makefile
        pkgsrc/editors/ghex: Makefile
Added Files:
        pkgsrc/editors/dasher: hacks.mk
        pkgsrc/editors/gedit: hacks.mk
        pkgsrc/editors/ghex: hacks.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/editors/dasher/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/dasher/hacks.mk
cvs rdiff -u -r1.163 -r1.164 pkgsrc/editors/gedit/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/gedit/hacks.mk
cvs rdiff -u -r1.63 -r1.64 pkgsrc/editors/ghex/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/ghex/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/dasher/Makefile
diff -u pkgsrc/editors/dasher/Makefile:1.108 pkgsrc/editors/dasher/Makefile:1.109
--- pkgsrc/editors/dasher/Makefile:1.108        Wed Dec  8 16:04:09 2021
+++ pkgsrc/editors/dasher/Makefile      Fri Mar 11 08:59:27 2022
@@ -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

Index: pkgsrc/editors/gedit/Makefile
diff -u pkgsrc/editors/gedit/Makefile:1.163 pkgsrc/editors/gedit/Makefile:1.164
--- pkgsrc/editors/gedit/Makefile:1.163 Wed Dec  8 16:04:10 2021
+++ pkgsrc/editors/gedit/Makefile       Fri Mar 11 08:59:27 2022
@@ -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

Index: pkgsrc/editors/ghex/Makefile
diff -u pkgsrc/editors/ghex/Makefile:1.63 pkgsrc/editors/ghex/Makefile:1.64
--- pkgsrc/editors/ghex/Makefile:1.63   Wed Dec  8 16:04:10 2021
+++ pkgsrc/editors/ghex/Makefile        Fri Mar 11 08:59:27 2022
@@ -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"

Added files:

Index: pkgsrc/editors/dasher/hacks.mk
diff -u /dev/null pkgsrc/editors/dasher/hacks.mk:1.1
--- /dev/null   Fri Mar 11 08:59:27 2022
+++ pkgsrc/editors/dasher/hacks.mk      Fri Mar 11 08:59:27 2022
@@ -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

Index: pkgsrc/editors/gedit/hacks.mk
diff -u /dev/null pkgsrc/editors/gedit/hacks.mk:1.1
--- /dev/null   Fri Mar 11 08:59:27 2022
+++ pkgsrc/editors/gedit/hacks.mk       Fri Mar 11 08:59:27 2022
@@ -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

Index: pkgsrc/editors/ghex/hacks.mk
diff -u /dev/null pkgsrc/editors/ghex/hacks.mk:1.1
--- /dev/null   Fri Mar 11 08:59:27 2022
+++ pkgsrc/editors/ghex/hacks.mk        Fri Mar 11 08:59:27 2022
@@ -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