pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils
Module Name: pkgsrc
Committed By: nia
Date: Sat Mar 12 07:37:42 UTC 2022
Modified Files:
pkgsrc/sysutils/gnome-characters: Makefile
pkgsrc/sysutils/gnome-control-center: Makefile
pkgsrc/sysutils/gnome-font-viewer: Makefile
pkgsrc/sysutils/nautilus: Makefile
Added Files:
pkgsrc/sysutils/gnome-characters: hacks.mk
pkgsrc/sysutils/gnome-control-center: hacks.mk
pkgsrc/sysutils/gnome-font-viewer: hacks.mk
pkgsrc/sysutils/nautilus: hacks.mk
Log Message:
sysutils: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/gnome-characters/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/gnome-characters/hacks.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/gnome-control-center/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/gnome-control-center/hacks.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/gnome-font-viewer/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/gnome-font-viewer/hacks.mk
cvs rdiff -u -r1.154 -r1.155 pkgsrc/sysutils/nautilus/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/nautilus/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/sysutils/gnome-characters/Makefile
diff -u pkgsrc/sysutils/gnome-characters/Makefile:1.3 pkgsrc/sysutils/gnome-characters/Makefile:1.4
--- pkgsrc/sysutils/gnome-characters/Makefile:1.3 Wed Dec 8 16:06:29 2021
+++ pkgsrc/sysutils/gnome-characters/Makefile Sat Mar 12 07:37:42 2022
@@ -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 @@ LICENSE= gnu-gpl-v2
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"
Index: pkgsrc/sysutils/gnome-control-center/Makefile
diff -u pkgsrc/sysutils/gnome-control-center/Makefile:1.11 pkgsrc/sysutils/gnome-control-center/Makefile:1.12
--- pkgsrc/sysutils/gnome-control-center/Makefile:1.11 Wed Dec 8 16:06:29 2021
+++ pkgsrc/sysutils/gnome-control-center/Makefile Sat Mar 12 07:37:42 2022
@@ -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+= -Dcheese=false
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
Index: pkgsrc/sysutils/gnome-font-viewer/Makefile
diff -u pkgsrc/sysutils/gnome-font-viewer/Makefile:1.4 pkgsrc/sysutils/gnome-font-viewer/Makefile:1.5
--- pkgsrc/sysutils/gnome-font-viewer/Makefile:1.4 Thu Mar 3 01:11:27 2022
+++ pkgsrc/sysutils/gnome-font-viewer/Makefile Sat Mar 12 07:37:42 2022
@@ -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 @@ LICENSE= gnu-gpl-v2
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"
Index: pkgsrc/sysutils/nautilus/Makefile
diff -u pkgsrc/sysutils/nautilus/Makefile:1.154 pkgsrc/sysutils/nautilus/Makefile:1.155
--- pkgsrc/sysutils/nautilus/Makefile:1.154 Wed Dec 8 16:06:34 2021
+++ pkgsrc/sysutils/nautilus/Makefile Sat Mar 12 07:37:42 2022
@@ -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 @@ USE_TOOLS+= gdbus-codegen
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
Added files:
Index: pkgsrc/sysutils/gnome-characters/hacks.mk
diff -u /dev/null pkgsrc/sysutils/gnome-characters/hacks.mk:1.1
--- /dev/null Sat Mar 12 07:37:42 2022
+++ pkgsrc/sysutils/gnome-characters/hacks.mk Sat Mar 12 07:37:42 2022
@@ -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
Index: pkgsrc/sysutils/gnome-control-center/hacks.mk
diff -u /dev/null pkgsrc/sysutils/gnome-control-center/hacks.mk:1.1
--- /dev/null Sat Mar 12 07:37:42 2022
+++ pkgsrc/sysutils/gnome-control-center/hacks.mk Sat Mar 12 07:37:42 2022
@@ -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
Index: pkgsrc/sysutils/gnome-font-viewer/hacks.mk
diff -u /dev/null pkgsrc/sysutils/gnome-font-viewer/hacks.mk:1.1
--- /dev/null Sat Mar 12 07:37:42 2022
+++ pkgsrc/sysutils/gnome-font-viewer/hacks.mk Sat Mar 12 07:37:42 2022
@@ -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
Index: pkgsrc/sysutils/nautilus/hacks.mk
diff -u /dev/null pkgsrc/sysutils/nautilus/hacks.mk:1.1
--- /dev/null Sat Mar 12 07:37:43 2022
+++ pkgsrc/sysutils/nautilus/hacks.mk Sat Mar 12 07:37:42 2022
@@ -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