*: Use the tools framework for gdbus-codegen

37 files changed, 91 insertions, 95 deletions

diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile
index dc4efc54cf1..e5fb20cb381 100644
--- a/audio/audacious-plugins/Makefile
+++ b/audio/audacious-plugins/Makefile
@@ -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
diff --git a/audio/audacious/options.mk b/audio/audacious/options.mk
index c27b5c7ca43..893f59a7cbe 100644
--- a/audio/audacious/options.mk
+++ b/audio/audacious/options.mk
@@ -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
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 818249396d2..10c0b6a8253 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -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/Projects/dconf
 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
diff --git a/devel/xfce4-conf/Makefile b/devel/xfce4-conf/Makefile
index 1baa6456722..7fbb09bf799 100644
--- a/devel/xfce4-conf/Makefile
+++ b/devel/xfce4-conf/Makefile
@@ -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/src/xfce/xfconf/${VERSION:R}/
 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"
diff --git a/geography/geoclue/Makefile b/geography/geoclue/Makefile
index 042a8d73c1c..ac5bd7f586e 100644
--- a/geography/geoclue/Makefile
+++ b/geography/geoclue/Makefile
@@ -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/geoclue/geoclue/-/wikis/home
 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
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index dcdbc8b10a1..08b89dae655 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -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
 
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index a43636a10e3..5489503bf03 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -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
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 24f38f59ad2..d38d4702f9f 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -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}
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
index 9a4703d440e..f46f8b20ee4 100644
--- a/mk/tools/bsd.tools.mk
+++ b/mk/tools/bsd.tools.mk
@@ -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"
diff --git a/mk/tools/gdbus-codegen.mk b/mk/tools/gdbus-codegen.mk
new file mode 100644
index 00000000000..5702bcd12e8
--- /dev/null
+++ b/mk/tools/gdbus-codegen.mk
@@ -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}
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index f2929142305..b2740aa6e6e 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -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/Projects/GnomeOnlineAccounts
 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
 
diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile
index 3a938df2b66..a29f61d19f6 100644
--- a/net/grilo-plugins/Makefile
+++ b/net/grilo-plugins/Makefile
@@ -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/Projects/Grilo
 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
 
diff --git a/print/atril/Makefile b/print/atril/Makefile
index 93a6b39cb35..c57d471d92b 100644
--- a/print/atril/Makefile
+++ b/print/atril/Makefile
@@ -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 viewer for the MATE environment
 
 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
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index 10df4b66b73..c54383dd6f4 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -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.org/collaborate/workgroups/openprinting/cu
 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
diff --git a/print/evince3/Makefile.common b/print/evince3/Makefile.common
index 4915d61ad14..84e8dcf983b 100644
--- a/print/evince3/Makefile.common
+++ b/print/evince3/Makefile.common
@@ -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
diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index 3aabbb95d8a..beb66faa9b7 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -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
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index 122ab94a223..12a0ef9939c 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -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
diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index 7f2520af569..2de72df0f14 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -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"
diff --git a/sysutils/caja/Makefile b/sysutils/caja/Makefile
index 78089c7d39d..fe795b5ca87 100644
--- a/sysutils/caja/Makefile
+++ b/sysutils/caja/Makefile
@@ -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
 
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index b5cee159fb1..c24bbf3ffe4 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -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/00-primary.seat		\
 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
 
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 9545508c85e..111e29f871f 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -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/gnome-control-center
 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
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 0d44b94dc9b..5dc7a2dcf67 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -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/gnome-settings-daemon
 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
 
diff --git a/sysutils/gnome-tracker-miners/Makefile b/sysutils/gnome-tracker-miners/Makefile
index 0b28357469e..e5084b9a938 100644
--- a/sysutils/gnome-tracker-miners/Makefile
+++ b/sysutils/gnome-tracker-miners/Makefile
@@ -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 search framework
 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
 
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 7ea7b9e633e..c3039c07a07 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -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/Files
 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
 
diff --git a/time/gnome-calendar/Makefile b/time/gnome-calendar/Makefile
index 81e52efd6d1..ac1ef588821 100644
--- a/time/gnome-calendar/Makefile
+++ b/time/gnome-calendar/Makefile
@@ -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/Calendar/
 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"
 
diff --git a/wm/mutter/Makefile b/wm/mutter/Makefile
index 7b9164b1141..9846f7f70b8 100644
--- a/wm/mutter/Makefile
+++ b/wm/mutter/Makefile
@@ -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"
 
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index d2809a71ff7..bd60922d91a 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -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/Web
 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
 
diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile
index cc9364873bc..272b6e158b6 100644
--- a/x11/gnome-desktop3/Makefile
+++ b/x11/gnome-desktop3/Makefile
@@ -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
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index f03741ff510..1513e3f00be 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -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/GNOME/gnome-session
 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"
 
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 70a1b5b703a..a74daa24dc9 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -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/Projects/GnomeShell
 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
 
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 23dc62883e8..44c585d9096 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -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/Terminal
 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
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index 4caecfaa4d0..ad96b3b5fbe 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -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,
diff --git a/x11/gtk4/Makefile b/x11/gtk4/Makefile
index d6261b4e3d6..71c9b0730c7 100644
--- a/x11/gtk4/Makefile
+++ b/x11/gtk4/Makefile
@@ -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++
 
diff --git a/x11/libgdm/Makefile b/x11/libgdm/Makefile
index 97f37c10fcb..ef514e2d9f0 100644
--- a/x11/libgdm/Makefile
+++ b/x11/libgdm/Makefile
@@ -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++
diff --git a/x11/xfce4-notifyd/Makefile b/x11/xfce4-notifyd/Makefile
index 1f9be64cb47..2118f55c1f7 100644
--- a/x11/xfce4-notifyd/Makefile
+++ b/x11/xfce4-notifyd/Makefile
@@ -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/src/apps/xfce4-notifyd/${VERSION:R}/
 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
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 77345058f12..0cc675b4ee1 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -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/src/xfce/xfce4-panel/4.14/
 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
diff --git a/x11/xfce4-tumbler/Makefile b/x11/xfce4-tumbler/Makefile
index cd52ca848e2..ca370b83709 100644
--- a/x11/xfce4-tumbler/Makefile
+++ b/x11/xfce4-tumbler/Makefile
@@ -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/src/xfce/tumbler/${VERSION:R}/
 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