pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bae139719c1c
branches:  trunk
changeset: 375321:bae139719c1c
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Mar 12 07:37:42 2022 +0000

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

diffstat:

 sysutils/gnome-characters/Makefile     |   5 +----
 sysutils/gnome-characters/hacks.mk     |  13 +++++++++++++
 sysutils/gnome-control-center/Makefile |   9 +--------
 sysutils/gnome-control-center/hacks.mk |  13 +++++++++++++
 sysutils/gnome-font-viewer/Makefile    |   9 +--------
 sysutils/gnome-font-viewer/hacks.mk    |  13 +++++++++++++
 sysutils/nautilus/Makefile             |   5 +----
 sysutils/nautilus/hacks.mk             |  13 +++++++++++++
 8 files changed, 56 insertions(+), 24 deletions(-)

diffs (152 lines):

diff -r 456eba81f425 -r bae139719c1c sysutils/gnome-characters/Makefile
--- a/sysutils/gnome-characters/Makefile        Sat Mar 12 07:34:00 2022 +0000
+++ b/sysutils/gnome-characters/Makefile        Sat Mar 12 07:37:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/08 16:06:29 adam Exp $
+# $NetBSD: Makefile,v 1.4 2022/03/12 07:37:42 nia Exp $
 
 DISTNAME=      gnome-characters-3.34.0
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -13,9 +13,6 @@
 
 USE_TOOLS+=    pkg-config msgfmt xgettext
 
-# XXX msgfmt: unknown option -- desktop
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../devel/meson/build.mk"
diff -r 456eba81f425 -r bae139719c1c sysutils/gnome-characters/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-characters/hacks.mk        Sat Mar 12 07:37:42 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $
+
+.if !defined(GNOME_CHARACTERS_HACKS_MK)
+GNOME_CHARACTERS_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_CHARACTERS_HACKS_MK
diff -r 456eba81f425 -r bae139719c1c sysutils/gnome-control-center/Makefile
--- a/sysutils/gnome-control-center/Makefile    Sat Mar 12 07:34:00 2022 +0000
+++ b/sysutils/gnome-control-center/Makefile    Sat Mar 12 07:37:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/12/08 16:06:29 adam Exp $
+# $NetBSD: Makefile,v 1.12 2022/03/12 07:37:42 nia Exp $
 
 DISTNAME=      gnome-control-center-40.0
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -18,13 +18,6 @@
 MESON_ARGS+=   -Dtests=false
 MESON_ARGS+=   -Dwayland=false
 
-.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 456eba81f425 -r bae139719c1c sysutils/gnome-control-center/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-control-center/hacks.mk    Sat Mar 12 07:37:42 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $
+
+.if !defined(GNOME_CONTROL_CENTER_HACKS_MK)
+GNOME_CONTROL_CENTER_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_CONTROL_CENTER_HACKS_MK
diff -r 456eba81f425 -r bae139719c1c sysutils/gnome-font-viewer/Makefile
--- a/sysutils/gnome-font-viewer/Makefile       Sat Mar 12 07:34:00 2022 +0000
+++ b/sysutils/gnome-font-viewer/Makefile       Sat Mar 12 07:37:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/03/03 01:11:27 gutteridge Exp $
+# $NetBSD: Makefile,v 1.5 2022/03/12 07:37:42 nia Exp $
 
 DISTNAME=      gnome-font-viewer-3.34.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 -- xml
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../devel/meson/build.mk"
diff -r 456eba81f425 -r bae139719c1c sysutils/gnome-font-viewer/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-font-viewer/hacks.mk       Sat Mar 12 07:37:42 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $
+
+.if !defined(GNOME_FONT_VIEWER_HACKS_MK)
+GNOME_FONT_VIEWER_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_FONT_VIEWER_HACKS_MK
diff -r 456eba81f425 -r bae139719c1c sysutils/nautilus/Makefile
--- a/sysutils/nautilus/Makefile        Sat Mar 12 07:34:00 2022 +0000
+++ b/sysutils/nautilus/Makefile        Sat Mar 12 07:37:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2021/12/08 16:06:34 adam Exp $
+# $NetBSD: Makefile,v 1.155 2022/03/12 07:37:42 nia Exp $
 
 DISTNAME=      nautilus-3.38.1
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -16,9 +16,6 @@
 
 DEPENDS+=      gnome-tracker-miners-[0-9]*:../../sysutils/gnome-tracker-miners
 
-# XXX msgfmt: unknown option -- desktop
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 PYTHON_FOR_BUILD_ONLY= tool
 
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
diff -r 456eba81f425 -r bae139719c1c sysutils/nautilus/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/nautilus/hacks.mk        Sat Mar 12 07:37:42 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $
+
+.if !defined(NAUTILUS_HACKS_MK)
+NAUTILUS_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 # NAUTILUS_HACKS_MK



Home | Main Index | Thread Index | Old Index