pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 x11: Use hacks.mk to avoid NetBSD msgfmt on NetBSD...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f5efb93fc73f
branches: trunk
changeset: 375325:f5efb93fc73f
user: nia <nia%pkgsrc.org@localhost>
date: Sat Mar 12 07:48:52 2022 +0000
description:
x11: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.
diffstat:
x11/gnome-session/Makefile | 9 +--------
x11/gnome-session/hacks.mk | 13 +++++++++++++
x11/gnome-shell/Makefile | 9 +--------
x11/gnome-shell/hacks.mk | 13 +++++++++++++
x11/gnome-terminal/Makefile | 6 +-----
x11/gnome-terminal/hacks.mk | 13 +++++++++++++
x11/xfce4-whiskermenu-plugin/Makefile | 5 +----
x11/xfce4-whiskermenu-plugin/hacks.mk | 13 +++++++++++++
8 files changed, 56 insertions(+), 25 deletions(-)
diffs (153 lines):
diff -r 7221f02c3764 -r f5efb93fc73f x11/gnome-session/Makefile
--- a/x11/gnome-session/Makefile Sat Mar 12 07:44:12 2022 +0000
+++ b/x11/gnome-session/Makefile Sat Mar 12 07:48:52 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2021/12/08 16:07:04 adam Exp $
+# $NetBSD: Makefile,v 1.207 2022/03/12 07:48:52 nia Exp $
DISTNAME= gnome-session-40.1.1
PKGREVISION= 1
@@ -17,13 +17,6 @@
USE_TOOLS+= pkg-config msgfmt xgettext
USE_TOOLS+= gdbus-codegen
-.include "../../mk/bsd.prefs.mk"
-
-# msgfmt: unknown option -- xml
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
.include "../../graphics/MesaLib/features.mk"
PLIST_VARS+= gles2
diff -r 7221f02c3764 -r f5efb93fc73f x11/gnome-session/hacks.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-session/hacks.mk Sat Mar 12 07:48:52 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:48:52 nia Exp $
+
+.if !defined(GNOME_SESSION_HACKS_MK)
+GNOME_SESSION_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_SESSION_HACKS_MK
diff -r 7221f02c3764 -r f5efb93fc73f x11/gnome-shell/Makefile
--- a/x11/gnome-shell/Makefile Sat Mar 12 07:44:12 2022 +0000
+++ b/x11/gnome-shell/Makefile Sat Mar 12 07:48:52 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/01/03 08:23:59 cirnatdan Exp $
+# $NetBSD: Makefile,v 1.16 2022/03/12 07:48:52 nia Exp $
DISTNAME= gnome-shell-40.2
PKGREVISION= 4
@@ -31,13 +31,6 @@
CONF_FILES+= ${PREFIX}/share/examples/xdg/autostart/gnome-shell-overrides-migration.desktop \
${PKG_SYSCONFDIR}/xdg/autostart/gnome-shell-overrides-migration.desktop
-.include "../../mk/bsd.prefs.mk"
-
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
PYTHON_FOR_BUILD_ONLY= tool
post-extract:
diff -r 7221f02c3764 -r f5efb93fc73f x11/gnome-shell/hacks.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-shell/hacks.mk Sat Mar 12 07:48:52 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:48:52 nia Exp $
+
+.if !defined(GNOME_SHELL_HACKS_MK)
+GNOME_SHELL_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_SHELL_HACKS_MK
diff -r 7221f02c3764 -r f5efb93fc73f x11/gnome-terminal/Makefile
--- a/x11/gnome-terminal/Makefile Sat Mar 12 07:44:12 2022 +0000
+++ b/x11/gnome-terminal/Makefile Sat Mar 12 07:48:52 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2021/12/08 16:07:04 adam Exp $
+# $NetBSD: Makefile,v 1.99 2022/03/12 07:48:53 nia Exp $
DISTNAME= gnome-terminal-3.36.2
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/${PKGVERSION_NOREV:R}/}
@@ -22,10 +22,6 @@
CONFIGURE_ARGS+= --disable-search-provider
CONFIGURE_ARGS+= --without-nautilus-extension
-# XXX msgfmt: unknown option -- desktop
-# XXX msgfmt: unknown option -- xml
-_TOOLS_USE_PKGSRC.msgfmt= yes
-
post-install:
${RM} -f ${DESTDIR}${PREFIX}/lib/systemd/user/gnome-terminal-server.service
diff -r 7221f02c3764 -r f5efb93fc73f x11/gnome-terminal/hacks.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-terminal/hacks.mk Sat Mar 12 07:48:52 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:48:53 nia Exp $
+
+.if !defined(GNOME_TERMINAL_HACKS_MK)
+GNOME_TERMINAL_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_TERMINAL_HACKS_MK
diff -r 7221f02c3764 -r f5efb93fc73f x11/xfce4-whiskermenu-plugin/Makefile
--- a/x11/xfce4-whiskermenu-plugin/Makefile Sat Mar 12 07:44:12 2022 +0000
+++ b/x11/xfce4-whiskermenu-plugin/Makefile Sat Mar 12 07:48:52 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2021/12/16 01:04:38 gutteridge Exp $
+# $NetBSD: Makefile,v 1.42 2022/03/12 07:48:53 nia Exp $
VERSION= 2.7.1
DISTNAME= xfce4-whiskermenu-plugin-${VERSION}
@@ -15,9 +15,6 @@
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config msgfmt perl intltool
-# Fails without GNU msgfmt, requires --desktop
-_TOOLS_USE_PKGSRC.msgfmt= yes
-
.include "../../x11/xfce4-garcon/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../x11/xfce4-exo/buildlink3.mk"
diff -r 7221f02c3764 -r f5efb93fc73f x11/xfce4-whiskermenu-plugin/hacks.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce4-whiskermenu-plugin/hacks.mk Sat Mar 12 07:48:52 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:48:53 nia Exp $
+
+.if !defined(XFCE4_WHISKERMENU_PLUGIN_HACKS_MK)
+XFCE4_WHISKERMENU_PLUGIN_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 # XFCE4_WHISKERMENU_PLUGIN_HACKS_MK
Home |
Main Index |
Thread Index |
Old Index