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

12 files changed, 84 insertions, 39 deletions

diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile
index 77f649e5e2c..404d9c029a9 100644
--- a/graphics/cheese/Makefile
+++ b/graphics/cheese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2021/12/08 16:04:49 adam Exp $
+# $NetBSD: Makefile,v 1.101 2022/03/12 07:06:26 nia Exp $
 
 DISTNAME=	cheese-3.34.0
 PKGREVISION=	9
@@ -26,9 +26,6 @@ PYTHON_FOR_BUILD_ONLY=	tool
 # https://gitlab.gnome.org/GNOME/json-glib/issues/35
 MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libcheese
 
-# XXX msgfmt: unknown option -- desktop
-_TOOLS_USE_PKGSRC.msgfmt=	yes
-
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
 PKGCONFIG_OVERRIDE+=		output/meson-private/cheese.pc
 PKGCONFIG_OVERRIDE+=		output/meson-private/cheese-gtk.pc
diff --git a/graphics/cheese/hacks.mk b/graphics/cheese/hacks.mk
new file mode 100644
index 00000000000..cdd107ae271
--- /dev/null
+++ b/graphics/cheese/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $
+
+.if !defined(CHEESE_HACKS_MK)
+CHEESE_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 # CHEESE_HACKS_MK
diff --git a/graphics/drawing/Makefile b/graphics/drawing/Makefile
index cbce0c769b4..bad54f8bc4b 100644
--- a/graphics/drawing/Makefile
+++ b/graphics/drawing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/08/13 12:08:58 nia Exp $
+# $NetBSD: Makefile,v 1.6 2022/03/12 07:06:26 nia Exp $
 
 DISTNAME=	drawing-0.8.3
 CATEGORIES=	graphics gnome
@@ -15,13 +15,6 @@ DEPENDS+=	gtk3+-[0-9]*:../../x11/gtk3
 
 USE_TOOLS+=	pkg-config msgfmt xgettext
 
-.include "../../mk/bsd.prefs.mk"
-
-# XXX: msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 # Uses python3 command
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
diff --git a/graphics/drawing/hacks.mk b/graphics/drawing/hacks.mk
new file mode 100644
index 00000000000..7a6a68c43ec
--- /dev/null
+++ b/graphics/drawing/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $
+
+.if !defined(DRAWING_HACKS_MK)
+DRAWING_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 # DRAWING_HACKS_MK
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 076c266078e..2ad6b8ebe49 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2022/03/08 09:12:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.114 2022/03/12 07:06:26 nia Exp $
 
 DISTNAME=	eog-40.3
 CATEGORIES=	graphics gnome
@@ -19,13 +19,6 @@ MESON_ARGS+=	-Dlibportal=false
 
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/eog
 
-.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/graphics/eog/hacks.mk b/graphics/eog/hacks.mk
new file mode 100644
index 00000000000..d7f2e832d49
--- /dev/null
+++ b/graphics/eog/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $
+
+.if !defined(EOG_HACKS_MK)
+EOG_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 # EOG_HACKS_MK
diff --git a/graphics/gnome-screenshot/Makefile b/graphics/gnome-screenshot/Makefile
index 68e77b7359e..03e90480257 100644
--- a/graphics/gnome-screenshot/Makefile
+++ b/graphics/gnome-screenshot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/12/08 16:04:55 adam Exp $
+# $NetBSD: Makefile,v 1.3 2022/03/12 07:06:26 nia Exp $
 
 DISTNAME=	gnome-screenshot-3.38.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 -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PYTHON_FOR_BUILD_ONLY=	tool
 
 .include "../../devel/meson/build.mk"
diff --git a/graphics/gnome-screenshot/hacks.mk b/graphics/gnome-screenshot/hacks.mk
new file mode 100644
index 00000000000..d7333b1d463
--- /dev/null
+++ b/graphics/gnome-screenshot/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $
+
+.if !defined(GNOME_SCREENSHOT_HACKS_MK)
+GNOME_SCREENSHOT_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_SCREENSHOT_HACKS_MK
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 042abd01f03..e5de6c96b99 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.244 2022/03/02 02:28:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.245 2022/03/12 07:06:26 nia Exp $
 
 DISTNAME=	inkscape-1.1.2
 CATEGORIES=	graphics
@@ -19,9 +19,6 @@ DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+=		${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=		${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial
 DEPENDS+=		${PYPKGPREFIX}-scour-[0-9]*:../../graphics/py-scour
-# for desktop
-TOOL_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
-TOOLS_PLATFORM.msgfmt=	# empty
 
 WRKSRC=		${WRKDIR}/inkscape-1.1.2_2022-02-04_0a00cf5339
 
diff --git a/graphics/inkscape/hacks.mk b/graphics/inkscape/hacks.mk
new file mode 100644
index 00000000000..40e8e0be50c
--- /dev/null
+++ b/graphics/inkscape/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $
+
+.if !defined(INKSCAPE_HACKS_MK)
+INKSCAPE_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 # INKSCAPE_HACKS_MK
diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile
index aff7fc1577f..2e6d8875c63 100644
--- a/graphics/viewnior/Makefile
+++ b/graphics/viewnior/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/12/08 16:05:07 adam Exp $
+# $NetBSD: Makefile,v 1.36 2022/03/12 07:06:26 nia Exp $
 
 DISTNAME=	viewnior-1.7
 PKGREVISION=	2
@@ -17,12 +17,6 @@ WRKSRC=		${WRKDIR}/Viewnior-${DISTNAME}
 USE_TOOLS+=	pkg-config msgfmt xgettext
 USE_LANGUAGES=	c c++
 
-.include "../../mk/bsd.prefs.mk"
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PYTHON_FOR_BUILD_ONLY=	tool
 
 .include "../../devel/meson/build.mk"
diff --git a/graphics/viewnior/hacks.mk b/graphics/viewnior/hacks.mk
new file mode 100644
index 00000000000..ee746213633
--- /dev/null
+++ b/graphics/viewnior/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $
+
+.if !defined(VIEWNIOR_HACKS_MK)
+VIEWNIOR_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 # VIEWNIOR_HACKS_MK