Received: by mail.netbsd.org (Postfix, from userid 605) id 97BAD84D73; Sun, 2 May 2021 11:06:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CFA6784D4C for ; Sun, 2 May 2021 11:06:19 +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 5lNKZrbYXplG for ; Sun, 2 May 2021 11:06:17 +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 6E24F84CF1 for ; Sun, 2 May 2021 11:06:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5AAADFA95; Sun, 2 May 2021 11:06:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1619953577192210" MIME-Version: 1.0 Date: Sun, 2 May 2021 11:06:17 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210502110617.5AAADFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1619953577192210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun May 2 11:06:16 UTC 2021 Modified Files: pkgsrc/audio/audacious: options.mk pkgsrc/audio/audacious-plugins: Makefile pkgsrc/devel/dconf: Makefile pkgsrc/devel/xfce4-conf: Makefile pkgsrc/geography/geoclue: Makefile pkgsrc/graphics/gimp: Makefile pkgsrc/mail/evolution: Makefile pkgsrc/mail/evolution-data-server: Makefile pkgsrc/mk/tools: bsd.tools.mk pkgsrc/net/gnome-online-accounts: Makefile pkgsrc/net/grilo-plugins: Makefile pkgsrc/print/atril: Makefile pkgsrc/print/cups-filters: Makefile pkgsrc/print/evince3: Makefile.common pkgsrc/security/gcr: Makefile pkgsrc/security/libsecret: Makefile pkgsrc/sysutils/accountsservice: Makefile pkgsrc/sysutils/caja: Makefile pkgsrc/sysutils/consolekit: Makefile pkgsrc/sysutils/gnome-control-center: Makefile pkgsrc/sysutils/gnome-settings-daemon: Makefile pkgsrc/sysutils/gnome-tracker-miners: Makefile pkgsrc/sysutils/nautilus: Makefile pkgsrc/time/gnome-calendar: Makefile pkgsrc/wm/mutter: Makefile pkgsrc/www/epiphany: Makefile pkgsrc/x11/gnome-desktop3: Makefile pkgsrc/x11/gnome-session: Makefile pkgsrc/x11/gnome-shell: Makefile pkgsrc/x11/gnome-terminal: Makefile pkgsrc/x11/gtk3: Makefile pkgsrc/x11/gtk4: Makefile pkgsrc/x11/libgdm: Makefile pkgsrc/x11/xfce4-notifyd: Makefile pkgsrc/x11/xfce4-panel: Makefile pkgsrc/x11/xfce4-tumbler: Makefile Added Files: pkgsrc/mk/tools: gdbus-codegen.mk Log Message: *: Use the tools framework for gdbus-codegen To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/audacious/options.mk cvs rdiff -u -r1.122 -r1.123 pkgsrc/audio/audacious-plugins/Makefile cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/dconf/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/xfce4-conf/Makefile cvs rdiff -u -r1.33 -r1.34 pkgsrc/geography/geoclue/Makefile cvs rdiff -u -r1.342 -r1.343 pkgsrc/graphics/gimp/Makefile cvs rdiff -u -r1.255 -r1.256 pkgsrc/mail/evolution/Makefile cvs rdiff -u -r1.202 -r1.203 pkgsrc/mail/evolution-data-server/Makefile cvs rdiff -u -r1.63 -r1.64 pkgsrc/mk/tools/bsd.tools.mk cvs rdiff -u -r0 -r1.1 pkgsrc/mk/tools/gdbus-codegen.mk cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/gnome-online-accounts/Makefile cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/grilo-plugins/Makefile cvs rdiff -u -r1.67 -r1.68 pkgsrc/print/atril/Makefile cvs rdiff -u -r1.152 -r1.153 pkgsrc/print/cups-filters/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/evince3/Makefile.common cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/gcr/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/libsecret/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/accountsservice/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/caja/Makefile cvs rdiff -u -r1.49 -r1.50 pkgsrc/sysutils/consolekit/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/gnome-control-center/Makefile cvs rdiff -u -r1.80 -r1.81 pkgsrc/sysutils/gnome-settings-daemon/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/gnome-tracker-miners/Makefile cvs rdiff -u -r1.151 -r1.152 pkgsrc/sysutils/nautilus/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/time/gnome-calendar/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/mutter/Makefile cvs rdiff -u -r1.203 -r1.204 pkgsrc/www/epiphany/Makefile cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/gnome-desktop3/Makefile cvs rdiff -u -r1.204 -r1.205 pkgsrc/x11/gnome-session/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/gnome-shell/Makefile cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/gnome-terminal/Makefile cvs rdiff -u -r1.163 -r1.164 pkgsrc/x11/gtk3/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/gtk4/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libgdm/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/xfce4-notifyd/Makefile cvs rdiff -u -r1.89 -r1.90 pkgsrc/x11/xfce4-panel/Makefile cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/xfce4-tumbler/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1619953577192210 Content-Disposition: inline Content-Length: 31910 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/audacious/options.mk diff -u pkgsrc/audio/audacious/options.mk:1.2 pkgsrc/audio/audacious/options.mk:1.3 --- pkgsrc/audio/audacious/options.mk:1.2 Sun Mar 22 08:39:48 2020 +++ pkgsrc/audio/audacious/options.mk Sun May 2 11:06:12 2021 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2020/03/22 08:39:48 nia Exp $ +# $NetBSD: options.mk,v 1.3 2021/05/02 11:06:12 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.audacious PKG_SUPPORTED_OPTIONS+= dbus @@ -10,7 +10,7 @@ PLIST_VARS+= dbus .if !empty(PKG_OPTIONS:Mdbus) PLIST.dbus= yes -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen +USE_TOOLS+= gdbus-codegen .include "../../sysutils/dbus/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-dbus Index: pkgsrc/audio/audacious-plugins/Makefile diff -u pkgsrc/audio/audacious-plugins/Makefile:1.122 pkgsrc/audio/audacious-plugins/Makefile:1.123 --- pkgsrc/audio/audacious-plugins/Makefile:1.122 Wed Apr 21 13:24:20 2021 +++ pkgsrc/audio/audacious-plugins/Makefile Sun May 2 11:06:12 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.122 2021/04/21 13:24:20 adam Exp $ +# $NetBSD: Makefile,v 1.123 2021/05/02 11:06:12 nia Exp $ DISTNAME= audacious-plugins-4.1 PKGREVISION= 4 @@ -48,7 +48,7 @@ PLIST_VARS+= dbus .include "options.mk" .include "../../audio/audacious/buildlink3.mk" .if ${PKG_BUILD_OPTIONS.audacious:Mdbus} -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen +USE_TOOLS+= gdbus-codegen PLIST.dbus= yes .else CONFIGURE_ARGS+= --disable-mpris2 Index: pkgsrc/devel/dconf/Makefile diff -u pkgsrc/devel/dconf/Makefile:1.62 pkgsrc/devel/dconf/Makefile:1.63 --- pkgsrc/devel/dconf/Makefile:1.62 Wed Apr 14 07:28:17 2021 +++ pkgsrc/devel/dconf/Makefile Sun May 2 11:06:12 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2021/04/14 07:28:17 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2021/05/02 11:06:12 nia Exp $ DISTNAME= dconf-0.36.0 PKGREVISION= 5 @@ -11,12 +11,11 @@ HOMEPAGE= https://wiki.gnome.org/Project COMMENT= Backend for gsettings LICENSE= gnu-lgpl-v2.1 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl USE_LANGUAGES= c99 -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config gdbus-codegen PYTHON_FOR_BUILD_ONLY= tool REPLACE_PYTHON+= *.py Index: pkgsrc/devel/xfce4-conf/Makefile diff -u pkgsrc/devel/xfce4-conf/Makefile:1.31 pkgsrc/devel/xfce4-conf/Makefile:1.32 --- pkgsrc/devel/xfce4-conf/Makefile:1.31 Mon Aug 31 18:09:22 2020 +++ pkgsrc/devel/xfce4-conf/Makefile Sun May 2 11:06:12 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2020/08/31 18:09:22 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2021/05/02 11:06:12 nia Exp $ PKGREVISION= 2 .include "../../meta-pkgs/xfce4/Makefile.common" @@ -12,6 +12,8 @@ MASTER_SITES= https://archive.xfce.org/s HOMEPAGE= https://docs.xfce.org/xfce/xfconf/start COMMENT= Xfce client-server configuration storage and query system +USE_TOOLS+= gdbus-codegen + PKGCONFIG_OVERRIDE= xfconf/libxfconf-0.pc.in CONFIGURE_ARGS+= --disable-perl-bindings @@ -23,8 +25,6 @@ CHECK_PORTABILITY_SKIP= test-driver BUILDLINK_API_DEPENDS.dbus+= dbus>=1.0.0 BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.72 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" Index: pkgsrc/geography/geoclue/Makefile diff -u pkgsrc/geography/geoclue/Makefile:1.33 pkgsrc/geography/geoclue/Makefile:1.34 --- pkgsrc/geography/geoclue/Makefile:1.33 Wed Apr 21 11:41:48 2021 +++ pkgsrc/geography/geoclue/Makefile Sun May 2 11:06:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2021/04/21 11:41:48 adam Exp $ +# $NetBSD: Makefile,v 1.34 2021/05/02 11:06:13 nia Exp $ DISTNAME= geoclue-2.5.6 PKGREVISION= 3 @@ -10,11 +10,10 @@ HOMEPAGE= https://gitlab.freedesktop.org COMMENT= Geoinformation service API and base providers LICENSE= gnu-lgpl-v2 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt -USE_TOOLS+= pkg-config msgfmt +USE_TOOLS+= pkg-config msgfmt gdbus-codegen MESON_ARGS+= -D3g-source=false MESON_ARGS+= -Dcdma-source=false Index: pkgsrc/graphics/gimp/Makefile diff -u pkgsrc/graphics/gimp/Makefile:1.342 pkgsrc/graphics/gimp/Makefile:1.343 --- pkgsrc/graphics/gimp/Makefile:1.342 Wed Apr 21 11:40:24 2021 +++ pkgsrc/graphics/gimp/Makefile Sun May 2 11:06:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.342 2021/04/21 11:40:24 adam Exp $ +# $NetBSD: Makefile,v 1.343 2021/05/02 11:06:13 nia Exp $ DISTNAME= gimp-2.10.24 PKGREVISION= 5 @@ -11,7 +11,6 @@ HOMEPAGE= https://www.gimp.org/ COMMENT= The GNU image manipulation program LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3 -BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen BUILD_DEPENDS+= gettext-tools>=0.19:../../devel/gettext-tools DEPENDS+= glib-networking>=2.36.2:../../net/glib-networking CONFLICTS+= gimp<=1.2.3 @@ -22,6 +21,7 @@ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config perl USE_TOOLS+= intltool msgfmt msgmerge xgettext +USE_TOOLS+= gdbus-codegen GNU_CONFIGURE= yes Index: pkgsrc/mail/evolution/Makefile diff -u pkgsrc/mail/evolution/Makefile:1.255 pkgsrc/mail/evolution/Makefile:1.256 --- pkgsrc/mail/evolution/Makefile:1.255 Sun May 2 10:24:49 2021 +++ pkgsrc/mail/evolution/Makefile Sun May 2 11:06:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.255 2021/05/02 10:24:49 nia Exp $ +# $NetBSD: Makefile,v 1.256 2021/05/02 11:06:13 nia Exp $ DISTNAME= evolution-3.34.1 PKGREVISION= 10 @@ -14,11 +14,10 @@ LICENSE= gnu-gpl-v2 USE_CMAKE= yes USE_TOOLS+= pkg-config itstool USE_TOOLS+= intltool msgfmt msgmerge xgettext +USE_TOOLS+= gdbus-codegen DEPENDS+= highlight-[0-9]*:../../textproc/highlight -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/evolution CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR} Index: pkgsrc/mail/evolution-data-server/Makefile diff -u pkgsrc/mail/evolution-data-server/Makefile:1.202 pkgsrc/mail/evolution-data-server/Makefile:1.203 --- pkgsrc/mail/evolution-data-server/Makefile:1.202 Wed Apr 28 12:21:50 2021 +++ pkgsrc/mail/evolution-data-server/Makefile Sun May 2 11:06:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.202 2021/04/28 12:21:50 cirnatdan Exp $ +# $NetBSD: Makefile,v 1.203 2021/05/02 11:06:13 nia Exp $ DISTNAME= evolution-data-server-3.35.1 PKGREVISION= 15 @@ -14,13 +14,12 @@ LICENSE= gnu-gpl-v2 USE_CMAKE= yes USE_TOOLS+= pkg-config perl:run USE_TOOLS+= intltool msgfmt msgmerge xgettext +USE_TOOLS+= gdbus-codegen USE_LANGUAGES= c c++14 # C++14 GCC_REQD+= 5 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - CMAKE_ARGS+= -DWITH_LIBDB=OFF CMAKE_ARGS+= -DENABLE_GOA=OFF CMAKE_ARGS+= -DENABLE_WEATHER=OFF Index: pkgsrc/mk/tools/bsd.tools.mk diff -u pkgsrc/mk/tools/bsd.tools.mk:1.63 pkgsrc/mk/tools/bsd.tools.mk:1.64 --- pkgsrc/mk/tools/bsd.tools.mk:1.63 Sun May 2 10:24:50 2021 +++ pkgsrc/mk/tools/bsd.tools.mk Sun May 2 11:06:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.tools.mk,v 1.63 2021/05/02 10:24:50 nia Exp $ +# $NetBSD: bsd.tools.mk,v 1.64 2021/05/02 11:06:13 nia Exp $ # # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -154,6 +154,7 @@ post-tools: .include "cmake.mk" .include "imake.mk" .include "itstool.mk" +.include "gdbus-codegen.mk" .include "zip.mk" .include "replace.mk" .include "perl.mk" Index: pkgsrc/net/gnome-online-accounts/Makefile diff -u pkgsrc/net/gnome-online-accounts/Makefile:1.40 pkgsrc/net/gnome-online-accounts/Makefile:1.41 --- pkgsrc/net/gnome-online-accounts/Makefile:1.40 Wed Apr 21 11:42:24 2021 +++ pkgsrc/net/gnome-online-accounts/Makefile Sun May 2 11:06:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2021/04/21 11:42:24 adam Exp $ +# $NetBSD: Makefile,v 1.41 2021/05/02 11:06:13 nia Exp $ DISTNAME= gnome-online-accounts-3.36.0 PKGREVISION= 3 @@ -11,12 +11,11 @@ HOMEPAGE= https://wiki.gnome.org/Project COMMENT= Service that allows online accounts to be used with GNOME LICENSE= gnu-lgpl-v2 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake USE_TOOLS+= msgfmt msgmerge xgettext +USE_TOOLS+= gdbus-codegen CONFIGURE_ENV+= GLIB_COMPILE_SCHEMAS=glib-compile-schemas Index: pkgsrc/net/grilo-plugins/Makefile diff -u pkgsrc/net/grilo-plugins/Makefile:1.42 pkgsrc/net/grilo-plugins/Makefile:1.43 --- pkgsrc/net/grilo-plugins/Makefile:1.42 Sun May 2 10:24:51 2021 +++ pkgsrc/net/grilo-plugins/Makefile Sun May 2 11:06:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2021/05/02 10:24:51 nia Exp $ +# $NetBSD: Makefile,v 1.43 2021/05/02 11:06:13 nia Exp $ DISTNAME= grilo-plugins-0.3.10 PKGREVISION= 8 @@ -11,9 +11,8 @@ HOMEPAGE= https://wiki.gnome.org/Project COMMENT= Plugins for grilo media browser LICENSE= gnu-lgpl-v2 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - USE_TOOLS+= pkg-config xgettext itstool +USE_TOOLS+= gdbus-codegen PYTHON_FOR_BUILD_ONLY= tool Index: pkgsrc/print/atril/Makefile diff -u pkgsrc/print/atril/Makefile:1.67 pkgsrc/print/atril/Makefile:1.68 --- pkgsrc/print/atril/Makefile:1.67 Wed Apr 21 11:42:32 2021 +++ pkgsrc/print/atril/Makefile Sun May 2 11:06:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2021/04/21 11:42:32 adam Exp $ +# $NetBSD: Makefile,v 1.68 2021/05/02 11:06:13 nia Exp $ PKGREVISION= 9 .include "../../meta-pkgs/mate/Makefile.common" @@ -10,7 +10,7 @@ COMMENT= Simple multi-page document view USE_LANGUAGES= c c++ -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen +USE_TOOLS+= gdbus-codegen PKGCONFIG_OVERRIDE+= atril-document.pc.in PKGCONFIG_OVERRIDE+= atril-view.pc.in Index: pkgsrc/print/cups-filters/Makefile diff -u pkgsrc/print/cups-filters/Makefile:1.152 pkgsrc/print/cups-filters/Makefile:1.153 --- pkgsrc/print/cups-filters/Makefile:1.152 Wed Apr 21 13:24:14 2021 +++ pkgsrc/print/cups-filters/Makefile Sun May 2 11:06:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.152 2021/04/21 13:24:14 adam Exp $ +# $NetBSD: Makefile,v 1.153 2021/05/02 11:06:14 nia Exp $ DISTNAME= cups-filters-1.28.8 PKGREVISION= 1 @@ -11,13 +11,12 @@ HOMEPAGE= https://www.linuxfoundation.or COMMENT= Backends, filters, and other software for cups LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND mit -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils USE_LANGUAGES= c c++11 USE_LIBTOOL= yes -USE_TOOLS+= bash:run pkg-config gmake +USE_TOOLS+= bash:run pkg-config gmake gdbus-codegen GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --disable-braille Index: pkgsrc/print/evince3/Makefile.common diff -u pkgsrc/print/evince3/Makefile.common:1.22 pkgsrc/print/evince3/Makefile.common:1.23 --- pkgsrc/print/evince3/Makefile.common:1.22 Sun May 2 10:24:51 2021 +++ pkgsrc/print/evince3/Makefile.common Sun May 2 11:06:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2021/05/02 10:24:51 nia Exp $ +# $NetBSD: Makefile.common,v 1.23 2021/05/02 11:06:14 nia Exp $ # # used by print/evince3/Makefile # would probably be used by print/evince3-nautilus/Makefile if that existed @@ -20,6 +20,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake intltool msgfmt pkg-config itstool +USE_TOOLS+= gdbus-codegen USE_LANGUAGES= c c++ # Requires --desktop in msgfmt. @@ -30,8 +31,6 @@ CONFIGURE_ARGS+= --without-gspell # Disable thumbnail cache CONFIGURE_ARGS+= --disable-libgnome-desktop -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - # XXX fake for "configure" to allow build w/o a gs installed # (avoid hard dependency on a specific version) CONFIGURE_ARGS+= --with-gs=${PREFIX}/bin/gs Index: pkgsrc/security/gcr/Makefile diff -u pkgsrc/security/gcr/Makefile:1.15 pkgsrc/security/gcr/Makefile:1.16 --- pkgsrc/security/gcr/Makefile:1.15 Wed Apr 14 07:28:20 2021 +++ pkgsrc/security/gcr/Makefile Sun May 2 11:06:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2021/04/14 07:28:20 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2021/05/02 11:06:14 nia Exp $ DISTNAME= gcr-3.38.0 PKGREVISION= 1 @@ -11,13 +11,13 @@ HOMEPAGE= https://www.gnome.org/ COMMENT= Library for crypto UI and related tasks LICENSE= gnu-gpl-v2 -BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake intltool msgfmt perl pkg-config USE_TOOLS+= aclocal autoconf automake autopoint +USE_TOOLS+= gdbus-codegen CONFIGURE_ARGS+= --enable-vala CONFIGURE_ARGS+= --enable-gtk-doc Index: pkgsrc/security/libsecret/Makefile diff -u pkgsrc/security/libsecret/Makefile:1.24 pkgsrc/security/libsecret/Makefile:1.25 --- pkgsrc/security/libsecret/Makefile:1.24 Wed Apr 14 07:28:20 2021 +++ pkgsrc/security/libsecret/Makefile Sun May 2 11:06:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2021/04/14 07:28:20 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2021/05/02 11:06:14 nia Exp $ DISTNAME= libsecret-0.20.4 PKGREVISION= 1 @@ -13,12 +13,12 @@ LICENSE= gnu-lgpl-v2.1 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config gsed USE_TOOLS+= msgfmt msgmerge xgettext +USE_TOOLS+= gdbus-codegen PKGCONFIG_OVERRIDE+= libsecret/libsecret-unstable.pc.in PKGCONFIG_OVERRIDE+= libsecret/libsecret.pc.in Index: pkgsrc/sysutils/accountsservice/Makefile diff -u pkgsrc/sysutils/accountsservice/Makefile:1.6 pkgsrc/sysutils/accountsservice/Makefile:1.7 --- pkgsrc/sysutils/accountsservice/Makefile:1.6 Fri Dec 4 04:56:13 2020 +++ pkgsrc/sysutils/accountsservice/Makefile Sun May 2 11:06:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/12/04 04:56:13 riastradh Exp $ +# $NetBSD: Makefile,v 1.7 2021/05/02 11:06:14 nia Exp $ DISTNAME= accountsservice-0.6.42 PKGREVISION= 2 @@ -14,6 +14,7 @@ LICENSE= gnu-gpl-v3 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config intltool gmake autoconf autoreconf automake msgfmt +USE_TOOLS+= gdbus-codegen EGDIR= ${PREFIX}/share/examples/accountsservice @@ -39,8 +40,6 @@ SUBST_FILES.gdm= src/daemon.c SUBST_STAGE.gdm= pre-configure SUBST_SED.gdm= -e 's,/etc/gdm/custom.conf,${PKG_SYSCONFDIR}/gdm/custom.conf,g' -BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - .include "../../devel/gobject-introspection/buildlink3.mk" .include "../../security/polkit/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" Index: pkgsrc/sysutils/caja/Makefile diff -u pkgsrc/sysutils/caja/Makefile:1.31 pkgsrc/sysutils/caja/Makefile:1.32 --- pkgsrc/sysutils/caja/Makefile:1.31 Wed Apr 21 11:42:39 2021 +++ pkgsrc/sysutils/caja/Makefile Sun May 2 11:06:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2021/04/21 11:42:39 adam Exp $ +# $NetBSD: Makefile,v 1.32 2021/05/02 11:06:14 nia Exp $ PKGREVISION= 5 .include "../../meta-pkgs/mate/Makefile.common" @@ -8,7 +8,7 @@ CATEGORIES= sysutils COMMENT= File manager for the MATE desktop -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen +USE_TOOLS+= gdbus-codegen PKGCONFIG_OVERRIDE+= libcaja-extension/libcaja-extension.pc.in Index: pkgsrc/sysutils/consolekit/Makefile diff -u pkgsrc/sysutils/consolekit/Makefile:1.49 pkgsrc/sysutils/consolekit/Makefile:1.50 --- pkgsrc/sysutils/consolekit/Makefile:1.49 Sat Jan 30 10:23:16 2021 +++ pkgsrc/sysutils/consolekit/Makefile Sun May 2 11:06:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2021/01/30 10:23:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.50 2021/05/02 11:06:14 nia Exp $ CONSOLEKIT_VER= 1.2.2 DISTNAME= ConsoleKit2-${CONSOLEKIT_VER} @@ -42,6 +42,7 @@ CONF_FILES+= ${EGDIR}/ConsoleKit/seats.d GNU_CONFIGURE= YES USE_TOOLS+= gmake intltool msgfmt perl pkg-config USE_TOOLS+= autoconf automake autoreconf autopoint +USE_TOOLS+= gdbus-codegen USE_LIBTOOL= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} \ @@ -61,8 +62,6 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/50-shutdown.rules \ ${DESTDIR}${RULESDIR}/50-shutdown.rules -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - pre-configure: cd ${WRKSRC} && NOCONFIGURE=1 ${SH} autogen.sh Index: pkgsrc/sysutils/gnome-control-center/Makefile diff -u pkgsrc/sysutils/gnome-control-center/Makefile:1.6 pkgsrc/sysutils/gnome-control-center/Makefile:1.7 --- pkgsrc/sysutils/gnome-control-center/Makefile:1.6 Wed Apr 21 13:25:22 2021 +++ pkgsrc/sysutils/gnome-control-center/Makefile Sun May 2 11:06:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2021/04/21 13:25:22 adam Exp $ +# $NetBSD: Makefile,v 1.7 2021/05/02 11:06:14 nia Exp $ DISTNAME= gnome-control-center-3.38.1 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} @@ -11,9 +11,8 @@ HOMEPAGE= https://gitlab.gnome.org/GNOME COMMENT= Interface to configure various aspects of the GNOME desktop LICENSE= gnu-gpl-v2 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - USE_TOOLS+= pkg-config msgfmt xgettext +USE_TOOLS+= gdbus-codegen MESON_ARGS+= -Dcheese=false MESON_ARGS+= -Dtests=false Index: pkgsrc/sysutils/gnome-settings-daemon/Makefile diff -u pkgsrc/sysutils/gnome-settings-daemon/Makefile:1.80 pkgsrc/sysutils/gnome-settings-daemon/Makefile:1.81 --- pkgsrc/sysutils/gnome-settings-daemon/Makefile:1.80 Wed Apr 21 13:25:22 2021 +++ pkgsrc/sysutils/gnome-settings-daemon/Makefile Sun May 2 11:06:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2021/04/21 13:25:22 adam Exp $ +# $NetBSD: Makefile,v 1.81 2021/05/02 11:06:14 nia Exp $ DISTNAME= gnome-settings-daemon-3.38.1 PKGREVISION= 5 @@ -11,10 +11,10 @@ HOMEPAGE= https://gitlab.gnome.org/GNOME COMMENT= GNOME settings daemon LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl USE_TOOLS+= pkg-config msgfmt xgettext perl +USE_TOOLS+= gdbus-codegen CONFLICTS+= gnome-control-center<2.22.0 Index: pkgsrc/sysutils/gnome-tracker-miners/Makefile diff -u pkgsrc/sysutils/gnome-tracker-miners/Makefile:1.10 pkgsrc/sysutils/gnome-tracker-miners/Makefile:1.11 --- pkgsrc/sysutils/gnome-tracker-miners/Makefile:1.10 Wed Apr 21 11:42:41 2021 +++ pkgsrc/sysutils/gnome-tracker-miners/Makefile Sun May 2 11:06:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2021/04/21 11:42:41 adam Exp $ +# $NetBSD: Makefile,v 1.11 2021/05/02 11:06:15 nia Exp $ DISTNAME= tracker-miners-3.0.1 PKGNAME= gnome-${DISTNAME} @@ -13,9 +13,8 @@ COMMENT= Desktop-neutral metadata-based LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen -USE_TOOLS+= pkg-config xgettext +USE_TOOLS+= pkg-config xgettext gdbus-codegen LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/tracker-miners-3.0 Index: pkgsrc/sysutils/nautilus/Makefile diff -u pkgsrc/sysutils/nautilus/Makefile:1.151 pkgsrc/sysutils/nautilus/Makefile:1.152 --- pkgsrc/sysutils/nautilus/Makefile:1.151 Wed Apr 21 11:42:43 2021 +++ pkgsrc/sysutils/nautilus/Makefile Sun May 2 11:06:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.151 2021/04/21 11:42:43 adam Exp $ +# $NetBSD: Makefile,v 1.152 2021/05/02 11:06:15 nia Exp $ DISTNAME= nautilus-3.38.1 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} @@ -11,9 +11,8 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Fi COMMENT= Simple file manager for GNOME LICENSE= gnu-gpl-v2 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - USE_TOOLS+= pkg-config msgfmt xgettext +USE_TOOLS+= gdbus-codegen DEPENDS+= gnome-tracker-miners-[0-9]*:../../sysutils/gnome-tracker-miners Index: pkgsrc/time/gnome-calendar/Makefile diff -u pkgsrc/time/gnome-calendar/Makefile:1.8 pkgsrc/time/gnome-calendar/Makefile:1.9 --- pkgsrc/time/gnome-calendar/Makefile:1.8 Wed Apr 21 11:42:50 2021 +++ pkgsrc/time/gnome-calendar/Makefile Sun May 2 11:06:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2021/04/21 11:42:50 adam Exp $ +# $NetBSD: Makefile,v 1.9 2021/05/02 11:06:15 nia Exp $ DISTNAME= gnome-calendar-40.0 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} @@ -11,9 +11,8 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Ca COMMENT= Calendar application for GNOME LICENSE= gnu-gpl-v3 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - USE_TOOLS+= pkg-config msgfmt xgettext +USE_TOOLS+= gdbus-codegen .include "../../mk/bsd.prefs.mk" Index: pkgsrc/wm/mutter/Makefile diff -u pkgsrc/wm/mutter/Makefile:1.6 pkgsrc/wm/mutter/Makefile:1.7 --- pkgsrc/wm/mutter/Makefile:1.6 Mon Apr 12 13:05:09 2021 +++ pkgsrc/wm/mutter/Makefile Sun May 2 11:06:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2021/04/12 13:05:09 nia Exp $ +# $NetBSD: Makefile,v 1.7 2021/05/02 11:06:15 nia Exp $ DISTNAME= mutter-3.38.1 CATEGORIES= wm gnome @@ -11,7 +11,7 @@ COMMENT= GNOME window manager LICENSE= gnu-gpl-v2 USE_TOOLS+= msgfmt pkg-config -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen +USE_TOOLS+= gdbus-codegen .include "../../graphics/MesaLib/features.mk" Index: pkgsrc/www/epiphany/Makefile diff -u pkgsrc/www/epiphany/Makefile:1.203 pkgsrc/www/epiphany/Makefile:1.204 --- pkgsrc/www/epiphany/Makefile:1.203 Sun May 2 10:24:52 2021 +++ pkgsrc/www/epiphany/Makefile Sun May 2 11:06:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.203 2021/05/02 10:24:52 nia Exp $ +# $NetBSD: Makefile,v 1.204 2021/05/02 11:06:15 nia Exp $ DISTNAME= epiphany-3.36.2 PKGREVISION= 3 @@ -11,9 +11,8 @@ HOMEPAGE= https://wiki.gnome.org/Apps/We COMMENT= Web browser for the GNOME desktop LICENSE= gnu-gpl-v2 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - USE_TOOLS+= pkg-config msgfmt xgettext itstool +USE_TOOLS+= gdbus-codegen MESON_ARGS+= -Dunit_tests=disabled Index: pkgsrc/x11/gnome-desktop3/Makefile diff -u pkgsrc/x11/gnome-desktop3/Makefile:1.46 pkgsrc/x11/gnome-desktop3/Makefile:1.47 --- pkgsrc/x11/gnome-desktop3/Makefile:1.46 Tue Apr 13 17:35:45 2021 +++ pkgsrc/x11/gnome-desktop3/Makefile Sun May 2 11:06:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2021/04/13 17:35:45 cirnatdan Exp $ +# $NetBSD: Makefile,v 1.47 2021/05/02 11:06:15 nia Exp $ DISTNAME= gnome-desktop-40.0 PKGNAME= ${DISTNAME:S/desktop/desktop3/} @@ -11,9 +11,8 @@ HOMEPAGE= https://www.gnome.org/ COMMENT= GNOME3 desktop-wide documents and libgnome-desktop library LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.1 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen +USE_TOOLS+= pkg-config xgettext gdbus-codegen -USE_TOOLS+= pkg-config xgettext PKGCONFIG_OVERRIDE+= libgnome-desktop/gnome-desktop-3.0.pc.in MESON_ARGS+= -Dsystemd=disabled Index: pkgsrc/x11/gnome-session/Makefile diff -u pkgsrc/x11/gnome-session/Makefile:1.204 pkgsrc/x11/gnome-session/Makefile:1.205 --- pkgsrc/x11/gnome-session/Makefile:1.204 Thu Apr 29 09:57:26 2021 +++ pkgsrc/x11/gnome-session/Makefile Sun May 2 11:06:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.204 2021/04/29 09:57:26 cirnatdan Exp $ +# $NetBSD: Makefile,v 1.205 2021/05/02 11:06:15 nia Exp $ DISTNAME= gnome-session-40.1.1 CATEGORIES= x11 gnome @@ -10,11 +10,11 @@ HOMEPAGE= https://gitlab.gnome.org/GNOM COMMENT= GNOME3 session management utilities LICENSE= gnu-gpl-v2 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto USE_TOOLS+= pkg-config msgfmt xgettext +USE_TOOLS+= gdbus-codegen .include "../../mk/bsd.prefs.mk" Index: pkgsrc/x11/gnome-shell/Makefile diff -u pkgsrc/x11/gnome-shell/Makefile:1.8 pkgsrc/x11/gnome-shell/Makefile:1.9 --- pkgsrc/x11/gnome-shell/Makefile:1.8 Wed Apr 21 11:42:57 2021 +++ pkgsrc/x11/gnome-shell/Makefile Sun May 2 11:06:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2021/04/21 11:42:57 adam Exp $ +# $NetBSD: Makefile,v 1.9 2021/05/02 11:06:15 nia Exp $ DISTNAME= gnome-shell-3.38.1 PKGREVISION= 6 @@ -11,7 +11,7 @@ HOMEPAGE= https://wiki.gnome.org/Project COMMENT= Next generation GNOME shell LICENSE= gnu-gpl-v2 -USE_TOOLS+= pkg-config perl msgfmt xgettext +USE_TOOLS+= pkg-config perl msgfmt xgettext gdbus-codegen MESON_ARGS+= -Dnetworkmanager=false MESON_ARGS+= -Dsystemd=false @@ -20,7 +20,6 @@ MESON_ARGS+= -Dextensions_tool=false TOOL_DEPENDS+= sassc>=3.6:../../www/sassc TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc -TOOL_DEPENDS+= gdbus-codegen>=2.64:../../devel/gdbus-codegen DEPENDS+= libgdm>=40.0:../../x11/libgdm Index: pkgsrc/x11/gnome-terminal/Makefile diff -u pkgsrc/x11/gnome-terminal/Makefile:1.96 pkgsrc/x11/gnome-terminal/Makefile:1.97 --- pkgsrc/x11/gnome-terminal/Makefile:1.96 Sun May 2 10:24:52 2021 +++ pkgsrc/x11/gnome-terminal/Makefile Sun May 2 11:06:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2021/05/02 10:24:52 nia Exp $ +# $NetBSD: Makefile,v 1.97 2021/05/02 11:06:16 nia Exp $ DISTNAME= gnome-terminal-3.36.2 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/${PKGVERSION_NOREV:R}/} @@ -11,13 +11,13 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Te COMMENT= Terminal emulator for GNOME LICENSE= gnu-gpl-v3 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 GNU_CONFIGURE= yes USE_TOOLS+= pkg-config gmake itstool USE_TOOLS+= msgfmt msgmerge xgettext +USE_TOOLS+= gdbus-codegen CONFIGURE_ARGS+= --disable-search-provider CONFIGURE_ARGS+= --without-nautilus-extension Index: pkgsrc/x11/gtk3/Makefile diff -u pkgsrc/x11/gtk3/Makefile:1.163 pkgsrc/x11/gtk3/Makefile:1.164 --- pkgsrc/x11/gtk3/Makefile:1.163 Wed Apr 28 22:49:29 2021 +++ pkgsrc/x11/gtk3/Makefile Sun May 2 11:06:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.163 2021/04/28 22:49:29 leot Exp $ +# $NetBSD: Makefile,v 1.164 2021/05/02 11:06:16 nia Exp $ DISTNAME= gtk+-3.24.29 PKGNAME= ${DISTNAME:S/gtk/gtk3/} @@ -16,9 +16,10 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge +USE_TOOLS+= gdbus-codegen GNU_CONFIGURE= yes PTHREAD_AUTO_VARS= yes -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen + TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools # There is no logic in gettext.mk to detect the native version of xgettext, Index: pkgsrc/x11/gtk4/Makefile diff -u pkgsrc/x11/gtk4/Makefile:1.6 pkgsrc/x11/gtk4/Makefile:1.7 --- pkgsrc/x11/gtk4/Makefile:1.6 Wed Apr 21 13:25:32 2021 +++ pkgsrc/x11/gtk4/Makefile Sun May 2 11:06:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2021/04/21 13:25:32 adam Exp $ +# $NetBSD: Makefile,v 1.7 2021/05/02 11:06:16 nia Exp $ DISTNAME= gtk-4.0.3 PKGNAME= ${DISTNAME:S/gtk/gtk4/} @@ -12,14 +12,12 @@ HOMEPAGE= https://www.gtk.org/ COMMENT= Multi-platform toolkit for creating GUIs, version 4 LICENSE= gnu-lgpl-v2.1 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - # This package invokes python3 command. PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "options.mk" -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config gdbus-codegen USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ Index: pkgsrc/x11/libgdm/Makefile diff -u pkgsrc/x11/libgdm/Makefile:1.3 pkgsrc/x11/libgdm/Makefile:1.4 --- pkgsrc/x11/libgdm/Makefile:1.3 Mon Apr 19 15:31:53 2021 +++ pkgsrc/x11/libgdm/Makefile Sun May 2 11:06:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2021/04/19 15:31:53 nia Exp $ +# $NetBSD: Makefile,v 1.4 2021/05/02 11:06:16 nia Exp $ DISTNAME= gdm-40.0 PKGNAME= lib${DISTNAME} @@ -11,14 +11,12 @@ HOMEPAGE= https://www.gnome.org/ COMMENT= Gnome Display Manager - client library LICENSE= gnu-gpl-v2 -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - DEPENDS+= zenity>=3.32.0:../../x11/zenity USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_TOOLS+= msgfmt pkg-config +USE_TOOLS+= msgfmt pkg-config gdbus-codegen BUILD_DEFS+= VARBASE USE_LANGUAGES= c c++ Index: pkgsrc/x11/xfce4-notifyd/Makefile diff -u pkgsrc/x11/xfce4-notifyd/Makefile:1.30 pkgsrc/x11/xfce4-notifyd/Makefile:1.31 --- pkgsrc/x11/xfce4-notifyd/Makefile:1.30 Tue Dec 22 00:28:13 2020 +++ pkgsrc/x11/xfce4-notifyd/Makefile Sun May 2 11:06:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2020/12/22 00:28:13 gutteridge Exp $ +# $NetBSD: Makefile,v 1.31 2021/05/02 11:06:16 nia Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -11,7 +11,7 @@ MASTER_SITES= https://archive.xfce.org/s HOMEPAGE= https://goodies.xfce.org/projects/applications/xfce4-notifyd COMMENT= Xfce Notify daemon -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen +USE_TOOLS+= gdbus-codegen DESKTOP_FILE= xfce4-notifyd.desktop EGDIR= share/examples/xfce4-notifyd Index: pkgsrc/x11/xfce4-panel/Makefile diff -u pkgsrc/x11/xfce4-panel/Makefile:1.89 pkgsrc/x11/xfce4-panel/Makefile:1.90 --- pkgsrc/x11/xfce4-panel/Makefile:1.89 Mon Aug 31 18:13:27 2020 +++ pkgsrc/x11/xfce4-panel/Makefile Sun May 2 11:06:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2020/08/31 18:13:27 wiz Exp $ +# $NetBSD: Makefile,v 1.90 2021/05/02 11:06:16 nia Exp $ PKGREVISION= 2 .include "../../meta-pkgs/xfce4/Makefile.common" @@ -10,7 +10,7 @@ MASTER_SITES+= https://archive.xfce.org HOMEPAGE= https://docs.xfce.org/xfce/xfce4-panel/start COMMENT= Xfce panel -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen +USE_TOOLS+= gdbus-codegen PKGCONFIG_OVERRIDE= libxfce4panel/libxfce4panel-1.0.pc.in PTHREAD_AUTO_VARS= yes Index: pkgsrc/x11/xfce4-tumbler/Makefile diff -u pkgsrc/x11/xfce4-tumbler/Makefile:1.96 pkgsrc/x11/xfce4-tumbler/Makefile:1.97 --- pkgsrc/x11/xfce4-tumbler/Makefile:1.96 Wed Apr 21 13:25:33 2021 +++ pkgsrc/x11/xfce4-tumbler/Makefile Sun May 2 11:06:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2021/04/21 13:25:33 adam Exp $ +# $NetBSD: Makefile,v 1.97 2021/05/02 11:06:16 nia Exp $ PKGREVISION= 8 .include "../../meta-pkgs/xfce4/Makefile.common" @@ -12,11 +12,9 @@ MASTER_SITES= https://archive.xfce.org/s HOMEPAGE= https://docs.xfce.org/xfce/thunar/tumbler COMMENT= D-Bus thumbnailing service -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen - GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config gdbus-codegen CONFIGURE_ARGS= --disable-raw-thumbnailer \ --disable-gstreamer-thumbnailer Added files: Index: pkgsrc/mk/tools/gdbus-codegen.mk diff -u /dev/null pkgsrc/mk/tools/gdbus-codegen.mk:1.1 --- /dev/null Sun May 2 11:06:17 2021 +++ pkgsrc/mk/tools/gdbus-codegen.mk Sun May 2 11:06:13 2021 @@ -0,0 +1,17 @@ +# $NetBSD: gdbus-codegen.mk,v 1.1 2021/05/02 11:06:13 nia Exp $ + +.if !empty(USE_TOOLS:Mgdbus-codegen) +TOOLS_CREATE+= gdbus-codegen +TOOLS_DEPENDS.gdbus-codegen?= gdbus-codegen-[0-9]*:../../textproc/gdbus-codegen +TOOLS_PATH.gdbus-codegen= ${PREFIX}/bin/gdbus-codegen +.else +# +# If a package doesn't explicitly say it uses gdbus-codegen, then create a "broken" +# gdbus-codegen in the tools directory. +# +TOOLS_FAIL+= gdbus-codegen +TOOLS_PATH.gdbus-codegen= ${TOOLS_CMD.gdbus-codegen} +.endif + +CONFIGURE_ENV+= GDBUS_CODEGEN=${TOOLS_CMD.gdbus-codegen:Q} +MAKE_ENV+= GDBUS_CODEGEN=${TOOLS_CMD.gdbus-codegen:Q} --_----------=_1619953577192210--