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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics graphics: Use hacks.mk to avoid NetBSD msgfmt...
From: nia <nia%pkgsrc.org@localhost>
Date: Sat, 12 Mar 2022 08:58:43 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8d9694952d7
branches:  trunk
changeset: 375312:e8d9694952d7
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Mar 12 07:06:26 2022 +0000

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

diffstat:

 graphics/cheese/Makefile           |   5 +----
 graphics/cheese/hacks.mk           |  13 +++++++++++++
 graphics/drawing/Makefile          |   9 +--------
 graphics/drawing/hacks.mk          |  13 +++++++++++++
 graphics/eog/Makefile              |   9 +--------
 graphics/eog/hacks.mk              |  13 +++++++++++++
 graphics/gnome-screenshot/Makefile |   9 +--------
 graphics/gnome-screenshot/hacks.mk |  13 +++++++++++++
 graphics/inkscape/Makefile         |   5 +----
 graphics/inkscape/hacks.mk         |  13 +++++++++++++
 graphics/viewnior/Makefile         |   8 +-------
 graphics/viewnior/hacks.mk         |  13 +++++++++++++
 12 files changed, 84 insertions(+), 39 deletions(-)

diffs (231 lines):

diff -r e9723e15f9b2 -r e8d9694952d7 graphics/cheese/Makefile
--- a/graphics/cheese/Makefile  Sat Mar 12 06:07:59 2022 +0000
+++ b/graphics/cheese/Makefile  Sat Mar 12 07:06:26 2022 +0000
@@ -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 @@
 # 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 -r e9723e15f9b2 -r e8d9694952d7 graphics/cheese/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cheese/hacks.mk  Sat Mar 12 07:06:26 2022 +0000
@@ -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 -r e9723e15f9b2 -r e8d9694952d7 graphics/drawing/Makefile
--- a/graphics/drawing/Makefile Sat Mar 12 06:07:59 2022 +0000
+++ b/graphics/drawing/Makefile Sat Mar 12 07:06:26 2022 +0000
@@ -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 @@
 
 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 -r e9723e15f9b2 -r e8d9694952d7 graphics/drawing/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/drawing/hacks.mk Sat Mar 12 07:06:26 2022 +0000
@@ -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 -r e9723e15f9b2 -r e8d9694952d7 graphics/eog/Makefile
--- a/graphics/eog/Makefile     Sat Mar 12 06:07:59 2022 +0000
+++ b/graphics/eog/Makefile     Sat Mar 12 07:06:26 2022 +0000
@@ -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 @@
 
 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 -r e9723e15f9b2 -r e8d9694952d7 graphics/eog/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/eog/hacks.mk     Sat Mar 12 07:06:26 2022 +0000
@@ -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 -r e9723e15f9b2 -r e8d9694952d7 graphics/gnome-screenshot/Makefile
--- a/graphics/gnome-screenshot/Makefile        Sat Mar 12 06:07:59 2022 +0000
+++ b/graphics/gnome-screenshot/Makefile        Sat Mar 12 07:06:26 2022 +0000
@@ -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 @@
 
 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 -r e9723e15f9b2 -r e8d9694952d7 graphics/gnome-screenshot/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gnome-screenshot/hacks.mk        Sat Mar 12 07:06:26 2022 +0000
@@ -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 -r e9723e15f9b2 -r e8d9694952d7 graphics/inkscape/Makefile
--- a/graphics/inkscape/Makefile        Sat Mar 12 06:07:59 2022 +0000
+++ b/graphics/inkscape/Makefile        Sat Mar 12 07:06:26 2022 +0000
@@ -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}-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 -r e9723e15f9b2 -r e8d9694952d7 graphics/inkscape/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/inkscape/hacks.mk        Sat Mar 12 07:06:26 2022 +0000
@@ -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 -r e9723e15f9b2 -r e8d9694952d7 graphics/viewnior/Makefile
--- a/graphics/viewnior/Makefile        Sat Mar 12 06:07:59 2022 +0000
+++ b/graphics/viewnior/Makefile        Sat Mar 12 07:06:26 2022 +0000
@@ -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 @@
 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 -r e9723e15f9b2 -r e8d9694952d7 graphics/viewnior/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/viewnior/hacks.mk        Sat Mar 12 07:06:26 2022 +0000
@@ -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
Prev by Date: [pkgsrc/trunk]: pkgsrc/inputmethod inputmethod: Use hacks.mk to avoid NetBSD ...
Next by Date: [pkgsrc/trunk]: pkgsrc/misc misc: Use hacks.mk to avoid NetBSD msgfmt on NetB...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/inputmethod inputmethod: Use hacks.mk to avoid NetBSD ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/misc misc: Use hacks.mk to avoid NetBSD msgfmt on NetB...
Indexes:
Home | Main Index | Thread Index | Old Index