*: Use the tools framework for gdbus-codegen

10 files changed, 21 insertions, 28 deletions

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