Move gdbus-codegen users to py-glib2-tools by including glib2/buildtools.mk

11 files changed, 23 insertions, 27 deletions

diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile
index 75c70790539..fd3973bedb8 100644
--- a/audio/audacious-plugins/Makefile
+++ b/audio/audacious-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2017/10/04 11:29:37 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2017/10/13 16:36:03 prlw1 Exp $
 
 DISTNAME=	audacious-plugins-3.5.2
 PKGREVISION=	16
@@ -11,8 +11,6 @@ HOMEPAGE=	http://audacious-media-player.org/
 COMMENT=	Plugins for Audacious media player
 LICENSE=	2-clause-bsd
 
-BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake intltool pkg-config msgfmt
 GNU_CONFIGURE=		yes
@@ -92,6 +90,7 @@ PLIST.oss=	yes
 .include "../../audio/wavpack/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/libbinio/buildlink3.mk"
+.include "../../devel/glib2/buildtools.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../misc/libcdio-paranoia/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index baf5af87708..9a6840b5078 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2017/02/12 06:24:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2017/10/13 16:36:03 prlw1 Exp $
 
 DISTNAME=	audacious-3.5.2
 PKGREVISION=	5
@@ -18,14 +18,13 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-chardet
 PKGCONFIG_OVERRIDE+=	audacious.pc.in
 
-BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
 # XXX does not solve linking problem completely
 LDFLAGS.Darwin+=	-flat_namespace -undefined suppress
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 4cb729880a9..0eec686e395 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/10/11 09:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2017/10/13 16:36:03 prlw1 Exp $
 
 DISTNAME=	dconf-0.26.1
 CATEGORIES=	devel gnome
@@ -36,7 +36,6 @@ SUBST_FILES.libname+=	gsettings/Makefile.in
 SUBST_SED.libname=	-e "s|-Wl,-soname=|-install_name ${PREFIX}/lib/|g"
 SUBST_SED.libname+=	-e "/^libdconfsettings_so_LDFLAGS/s,$$, -install_name ${PREFIX}/lib/gio/modules/libdconfsettings.so,g"
 
-BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
@@ -44,5 +43,6 @@ BUILDLINK_DEPMETHOD.vala=	build
 BUILDLINK_API_DEPENDS.vala+=	vala>=0.18.0
 .include "../../lang/vala/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.44.0
+.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/glib2/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/xfce4-conf/Makefile b/devel/xfce4-conf/Makefile
index 7c56a7da8e1..d14ba11dae0 100644
--- a/devel/xfce4-conf/Makefile
+++ b/devel/xfce4-conf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2017/06/20 16:11:05 youri Exp $
+# $NetBSD: Makefile,v 1.10 2017/10/13 16:36:03 prlw1 Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 VERSION=	4.12.1
+PKGREVISION=	1
 DISTNAME=	xfconf-${VERSION}
 PKGNAME=	xfce4-conf-${VERSION}
 CATEGORIES=	devel
@@ -20,8 +21,7 @@ MAKE_DIRS+=	${PREFIX}/include/xfce4
 BUILDLINK_API_DEPENDS.dbus+=		dbus>=1.0.0
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.72
 
-DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
+.include "../../devel/glib2/buildtools.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/libxfce4util/buildlink3.mk"
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index 4f691f83e2c..1e4ff7fcab8 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/09/18 09:53:30 maya Exp $
+# $NetBSD: Makefile,v 1.14 2017/10/13 16:36:03 prlw1 Exp $
 
 DISTNAME=	gnome-online-accounts-3.16.3
 PKGREVISION=	11
@@ -12,7 +12,6 @@ COMMENT=	Service that allows online accounts to be used with GNOME
 LICENSE=	gnu-gpl-v2
 
 BUILD_DEPENDS+=	gtk-doc>=1.3:../../textproc/gtk-doc
-BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
@@ -21,6 +20,7 @@ USE_TOOLS+=		gmake intltool pkg-config msgfmt
 
 .include "../../chat/telepathy-glib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index 5146aba40f6..760a6b4ea41 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2017/09/07 11:24:29 prlw1 Exp $
+# $NetBSD: Makefile,v 1.80 2017/10/13 16:36:03 prlw1 Exp $
 
 DISTNAME=	cups-filters-1.17.2
 PKGREVISION=	3
@@ -16,7 +16,6 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	bash:run pkg-config gmake
 USE_LANGUAGES=	c c++11
 
-BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
 
 PKGCONFIG_OVERRIDE+=	libcupsfilters.pc.in
@@ -73,6 +72,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cups-browsed-daemonize.sh ${DESTDIR}${PREFIX}/libexec/cups-browsed
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/print/evince3/Makefile.common b/print/evince3/Makefile.common
index 93ea2143b10..e9283cd8e44 100644
--- a/print/evince3/Makefile.common
+++ b/print/evince3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2017/08/27 16:08:06 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.18 2017/10/13 16:36:03 prlw1 Exp $
 #
 # used by print/evince3/Makefile
 # would probably be used by print/evince3-nautilus/Makefile if that existed
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+=	--disable-browser-plugin
 # Disable thumbnail cache
 CONFIGURE_ARGS+=	--disable-libgnome-desktop
 
-BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 BUILD_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
 
 # XXX fake for "configure" to allow build w/o a gs installed
@@ -39,6 +38,7 @@ pre-configure:
 .include "../../databases/shared-mime-info/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.36.0
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_API_DEPENDS.adwaita-icon-theme+=	adwaita-icon-theme>=2.17.1
 .include "../../graphics/adwaita-icon-theme/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index b770efe81ba..ac729a1c7d9 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/10/02 15:38:05 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/10/13 16:36:04 prlw1 Exp $
 
 DISTNAME=	libsecret-0.18.5
 CATEGORIES=	security gnome
@@ -12,7 +12,6 @@ LICENSE=	gnu-lgpl-v2.1
 
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -23,6 +22,7 @@ PKGCONFIG_OVERRIDE+=	libsecret/libsecret.pc.in
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/buildtools.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/caja/Makefile b/sysutils/caja/Makefile
index d0be9606668..d76683c9fd0 100644
--- a/sysutils/caja/Makefile
+++ b/sysutils/caja/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/06/23 17:06:33 youri Exp $
+# $NetBSD: Makefile,v 1.7 2017/10/13 16:36:04 prlw1 Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
@@ -8,12 +8,11 @@ MASTER_SITES+=	http://pub.mate-desktop.org/releases/${VERSION:R}/
 
 COMMENT=	File manager for the MATE desktop
 
-BUILD_DEPENDS+=		gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
 PKGCONFIG_OVERRIDE+=	libcaja-extension/libcaja-extension.pc.in
 
 .include "options.mk"
 
+.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/glib2/schemas.mk"
 
 .include "../../x11/mate-desktop/buildlink3.mk"
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index b1c81cfdbe5..5ab03e46356 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2016/07/09 06:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2017/10/13 16:36:04 prlw1 Exp $
 
 CONSOLEKIT_VER=	1.0.2
 DISTNAME=	ConsoleKit2-1.0.2
@@ -61,8 +61,7 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/50-shutdown.rules	\
 	${DESTDIR}${RULESDIR}/50-shutdown.rules
 
-BUILD_DEPENDS+=		gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
+.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/polkit/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index 5d03dc179be..419f3456e5a 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2017/09/30 14:15:07 adam Exp $
+# $NetBSD: Makefile,v 1.101 2017/10/13 16:36:04 prlw1 Exp $
 
 DISTNAME=	gtk+-3.22.21
 PKGNAME=	${DISTNAME:S/gtk/gtk3/}
@@ -16,7 +16,6 @@ USE_TOOLS+=		gmake perl pkg-config bash xgettext msgmerge
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 PTHREAD_AUTO_VARS=	yes
-BUILD_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,
 # and we do need it to be compiled with Glade support.
@@ -82,6 +81,7 @@ BUILDLINK_API_DEPENDS.atk+=	atk>=2.15.1
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.49.4
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.30.0
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection:=	build