Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id DE13E1A9239 for ; Sat, 12 Mar 2022 07:48:55 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0E64784EC5; Sat, 12 Mar 2022 07:48:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 479AD84EAF for ; Sat, 12 Mar 2022 07:48:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id PpJZ5jRrxQxp for ; Sat, 12 Mar 2022 07:48:53 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7024684D44 for ; Sat, 12 Mar 2022 07:48:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6331BFB24; Sat, 12 Mar 2022 07:48:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1647071333234450" MIME-Version: 1.0 Date: Sat, 12 Mar 2022 07:48:53 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/x11 To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20220312074853.6331BFB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1647071333234450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Mar 12 07:48:53 UTC 2022 Modified Files: pkgsrc/x11/gnome-session: Makefile pkgsrc/x11/gnome-shell: Makefile pkgsrc/x11/gnome-terminal: Makefile pkgsrc/x11/xfce4-whiskermenu-plugin: Makefile Added Files: pkgsrc/x11/gnome-session: hacks.mk pkgsrc/x11/gnome-shell: hacks.mk pkgsrc/x11/gnome-terminal: hacks.mk pkgsrc/x11/xfce4-whiskermenu-plugin: hacks.mk Log Message: x11: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only. To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.207 pkgsrc/x11/gnome-session/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gnome-session/hacks.mk cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/gnome-shell/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gnome-shell/hacks.mk cvs rdiff -u -r1.98 -r1.99 pkgsrc/x11/gnome-terminal/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gnome-terminal/hacks.mk cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xfce4-whiskermenu-plugin/hacks.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1647071333234450 Content-Disposition: inline Content-Length: 5779 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/gnome-session/Makefile diff -u pkgsrc/x11/gnome-session/Makefile:1.206 pkgsrc/x11/gnome-session/Makefile:1.207 --- pkgsrc/x11/gnome-session/Makefile:1.206 Wed Dec 8 16:07:04 2021 +++ pkgsrc/x11/gnome-session/Makefile Sat Mar 12 07:48:52 2022 @@ -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 @@ TOOL_DEPENDS+= xmlto-[0-9]*:../../textp 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 Index: pkgsrc/x11/gnome-shell/Makefile diff -u pkgsrc/x11/gnome-shell/Makefile:1.15 pkgsrc/x11/gnome-shell/Makefile:1.16 --- pkgsrc/x11/gnome-shell/Makefile:1.15 Mon Jan 3 08:23:59 2022 +++ pkgsrc/x11/gnome-shell/Makefile Sat Mar 12 07:48:52 2022 @@ -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 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX 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: Index: pkgsrc/x11/gnome-terminal/Makefile diff -u pkgsrc/x11/gnome-terminal/Makefile:1.98 pkgsrc/x11/gnome-terminal/Makefile:1.99 --- pkgsrc/x11/gnome-terminal/Makefile:1.98 Wed Dec 8 16:07:04 2021 +++ pkgsrc/x11/gnome-terminal/Makefile Sat Mar 12 07:48:53 2022 @@ -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 @@ USE_TOOLS+= gdbus-codegen 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 Index: pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile diff -u pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile:1.41 pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile:1.42 --- pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile:1.41 Thu Dec 16 01:04:38 2021 +++ pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile Sat Mar 12 07:48:53 2022 @@ -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_CMAKE= yes 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" Added files: Index: pkgsrc/x11/gnome-session/hacks.mk diff -u /dev/null pkgsrc/x11/gnome-session/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:48:53 2022 +++ pkgsrc/x11/gnome-session/hacks.mk Sat Mar 12 07:48:52 2022 @@ -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 Index: pkgsrc/x11/gnome-shell/hacks.mk diff -u /dev/null pkgsrc/x11/gnome-shell/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:48:53 2022 +++ pkgsrc/x11/gnome-shell/hacks.mk Sat Mar 12 07:48:52 2022 @@ -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 Index: pkgsrc/x11/gnome-terminal/hacks.mk diff -u /dev/null pkgsrc/x11/gnome-terminal/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:48:53 2022 +++ pkgsrc/x11/gnome-terminal/hacks.mk Sat Mar 12 07:48:53 2022 @@ -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 Index: pkgsrc/x11/xfce4-whiskermenu-plugin/hacks.mk diff -u /dev/null pkgsrc/x11/xfce4-whiskermenu-plugin/hacks.mk:1.1 --- /dev/null Sat Mar 12 07:48:53 2022 +++ pkgsrc/x11/xfce4-whiskermenu-plugin/hacks.mk Sat Mar 12 07:48:53 2022 @@ -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 --_----------=_1647071333234450--