Revert buildtool.mk additions for glib-{mkenums,genmarshal} using packages

Add TOOL_DEPENDS+=glib2-tools to glib2/buildlink3.mk

38 files changed, 40 insertions, 75 deletions

diff --git a/chat/telepathy-glib/Makefile b/chat/telepathy-glib/Makefile
index 081cd7b04af..62f9786100d 100644
--- a/chat/telepathy-glib/Makefile
+++ b/chat/telepathy-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2017/10/14 21:20:22 prlw1 Exp $
+# $NetBSD: Makefile,v 1.51 2017/10/15 23:19:10 prlw1 Exp $
 
 DISTNAME=	telepathy-glib-0.24.1
 PKGREVISION=	6
@@ -27,7 +27,6 @@ TEST_TARGET=		check
 
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.36
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=1.30.0
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/GConf-ui/Makefile b/devel/GConf-ui/Makefile
index 0e08921e191..217855bab9f 100644
--- a/devel/GConf-ui/Makefile
+++ b/devel/GConf-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/10/14 21:30:19 prlw1 Exp $
+# $NetBSD: Makefile,v 1.37 2017/10/15 23:19:11 prlw1 Exp $
 #
 
 MAKE_JOBS_SAFE=	no
@@ -24,7 +24,6 @@ do-install:
 		${DESTDIR}${PREFIX}/libexec
 
 .include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 #.include "../../security/policykit/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index bbaad075f56..66031f53582 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2017/10/13 22:54:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.93 2017/10/15 23:19:10 prlw1 Exp $
 
 .include "../../devel/GConf/Makefile.common"
 
@@ -35,6 +35,5 @@ BUILDLINK_ABI_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/glib2/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/at-spi2-core/Makefile b/devel/at-spi2-core/Makefile
index 0766a458616..ffed5945884 100644
--- a/devel/at-spi2-core/Makefile
+++ b/devel/at-spi2-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/10/13 21:51:56 prlw1 Exp $
+# $NetBSD: Makefile,v 1.25 2017/10/15 23:19:11 prlw1 Exp $
 
 DISTNAME=	at-spi2-core-2.25.91
 CATEGORIES=	devel gnome
@@ -45,7 +45,6 @@ CONF_FILES+=	${eg_default_sessiondir}/at-spi-dbus-bus.desktop \
 MAKE_DIRS+=	${default_sessiondir}
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index d712a5eeeae..4c084dcfdbd 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2017/10/13 17:57:08 prlw1 Exp $
+# $NetBSD: Makefile,v 1.98 2017/10/15 23:19:11 prlw1 Exp $
 
 DISTNAME=		atk-2.24.0
 CATEGORIES=		devel gnome
@@ -20,7 +20,6 @@ PKGCONFIG_OVERRIDE=	atk.pc.in
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.31.2
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection:= build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index e208f62fa25..fea2f95e667 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2017/07/03 17:42:45 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2017/10/15 23:19:11 prlw1 Exp $
 
 BUILDLINK_TREE+=	glib2
 
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0
 BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.34.0
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 
+TOOL_DEPENDS+=	glib2-tools-[0-9]*:../../devel/glib2-tools
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index d32b7d7e31f..78c003e4cf8 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2017/10/14 21:37:16 prlw1 Exp $
+# $NetBSD: Makefile,v 1.81 2017/10/15 23:19:11 prlw1 Exp $
 
 DISTNAME=		libbonobo-2.32.0
 PKGREVISION=		11
@@ -32,7 +32,6 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.26.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 0cf66fb654c..d3664ebb09b 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/10/13 23:51:40 prlw1 Exp $
+# $NetBSD: Makefile,v 1.33 2017/10/15 23:19:11 prlw1 Exp $
 
 DISTNAME=	libpeas-1.20.0
 CATEGORIES=	devel gnome
@@ -30,7 +30,6 @@ PKGCONFIG_OVERRIDE+=	data/libpeas-1.0.pc.in
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=1.39.0
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/py-gobject3/buildlink3.mk"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index fd955fd1a9c..9ef1af88c23 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2017/10/13 21:50:48 prlw1 Exp $
+# $NetBSD: Makefile,v 1.208 2017/10/15 23:19:11 prlw1 Exp $
 
 DISTNAME=	pango-1.40.12
 CATEGORIES=	devel fonts
@@ -34,7 +34,6 @@ CHECK_PORTABILITY_SKIP+= docs/check.docs
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.33.12
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection:= build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 9372f500006..73679e90d3f 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2017/10/14 21:12:45 prlw1 Exp $
+# $NetBSD: Makefile,v 1.99 2017/10/15 23:19:11 prlw1 Exp $
 #
 
 DISTNAME=	gucharmap-2.32.1
@@ -27,7 +27,6 @@ GCONF_SCHEMAS+=	gucharmap.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.16.3
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
diff --git a/graphics/cogl/Makefile b/graphics/cogl/Makefile
index c5ab0a78033..6e256043fa4 100644
--- a/graphics/cogl/Makefile
+++ b/graphics/cogl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/10/14 21:16:43 prlw1 Exp $
+# $NetBSD: Makefile,v 1.18 2017/10/15 23:19:11 prlw1 Exp $
 
 DISTNAME=	cogl-1.22.0
 PKGREVISION=	3
@@ -39,7 +39,6 @@ PKGCONFIG_OVERRIDE+=	cogl-path/cogl-path.pc.in
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.32.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.20.0
 .include "../../devel/pango/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.10.0
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 702f5fc997c..5291f3f59ff 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/10/13 21:47:23 prlw1 Exp $
+# $NetBSD: Makefile,v 1.35 2017/10/15 23:19:11 prlw1 Exp $
 
 DISTNAME=	gdk-pixbuf-${PIXBUF2_VERSION}
 PKGNAME=	${DISTNAME:S/pixbuf/pixbuf2/}
@@ -34,7 +34,6 @@ post-install:
 .include "../../databases/shared-mime-info/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection:= build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 141de0388b4..e0681e58640 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2017/10/13 23:45:20 prlw1 Exp $
+# $NetBSD: Makefile,v 1.96 2017/10/15 23:19:11 prlw1 Exp $
 
 DISTNAME=	librsvg-2.40.18
 CATEGORIES=	graphics gnome
@@ -46,7 +46,6 @@ CONFIGURE_ARGS+=	--disable-introspection
 .endif
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff --git a/multimedia/gst-plugins0.10-base/plugins.mk b/multimedia/gst-plugins0.10-base/plugins.mk
index 88d4e6af6bc..aedbb6a63c9 100644
--- a/multimedia/gst-plugins0.10-base/plugins.mk
+++ b/multimedia/gst-plugins0.10-base/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.14 2017/10/14 21:35:33 prlw1 Exp $
+# $NetBSD: plugins.mk,v 1.15 2017/10/15 23:19:12 prlw1 Exp $
 #
 # This file is shared across the gst-plugins-{base,good} packages to
 # simplify their code.  It provides a framework to write simple packages
@@ -91,5 +91,4 @@ SUBST_SED.fix-libtool=		-e 's,--libtool=\"$$(top_builddir)/libtool\",--libtool=\
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
diff --git a/multimedia/gst-plugins1-base/Makefile.common b/multimedia/gst-plugins1-base/Makefile.common
index 05793916393..b4a80a1b5b9 100644
--- a/multimedia/gst-plugins1-base/Makefile.common
+++ b/multimedia/gst-plugins1-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2017/10/13 23:47:56 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.25 2017/10/15 23:19:12 prlw1 Exp $
 #
 # used by audio/gst-plugins1-alsa/Makefile
 # used by audio/gst-plugins1-cdparanoia/Makefile
@@ -34,6 +34,5 @@ LICENSE=		gnu-lgpl-v2
 CONFIGURE_ARGS+=	--disable-${driver}
 .endfor
 
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/orc/buildlink3.mk"
 .include "plugins.mk"
diff --git a/multimedia/gstreamer0.10/Makefile b/multimedia/gstreamer0.10/Makefile
index cdb1b07c2e1..050e6e36eea 100644
--- a/multimedia/gstreamer0.10/Makefile
+++ b/multimedia/gstreamer0.10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2017/10/13 22:03:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.62 2017/10/15 23:19:12 prlw1 Exp $
 #
 
 DISTNAME=		gstreamer-0.10.36
@@ -72,6 +72,5 @@ PLIST.introspection=	yes
 CONFIGURE_ARGS+=	--disable-introspection
 .endif
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index 6b24e2e955b..b50cd7f7091 100644
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2017/10/13 21:56:36 prlw1 Exp $
+# $NetBSD: Makefile,v 1.34 2017/10/15 23:19:12 prlw1 Exp $
 
 DISTNAME=	gstreamer-1.12.2
 PKGNAME=	${DISTNAME:S/gstreamer/gstreamer1/}
@@ -27,5 +27,4 @@ PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-base.pc.in
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index ae28dc2bab4..f0d1c46434f 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2017/10/14 10:47:45 prlw1 Exp $
+# $NetBSD: Makefile,v 1.73 2017/10/15 23:19:12 prlw1 Exp $
 
 DISTNAME=		avahi-0.6.32
 PKGREVISION=		7
@@ -96,7 +96,6 @@ post-install:
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_API_DEPENDS.libdaemon+=	libdaemon>=0.14
 .include "../../devel/libdaemon/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index eb86dcff435..b10abf87872 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2017/10/14 21:45:24 prlw1 Exp $
+# $NetBSD: Makefile,v 1.58 2017/10/15 23:19:12 prlw1 Exp $
 #
 
 DISTNAME=	gtk-vnc-0.5.2
@@ -54,7 +54,6 @@ SUBST_SED.mapfile=	-e '/VERSION_SCRIPT_FLAGS.*GTK_VNC_VERSION_FILE/d'
 #libview
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/zlib/buildlink3.mk"
 # libview is only used for an example which is not installed
 #.include "../../devel/libview/buildlink3.mk"
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index 069b069e2bf..e684af5c3d6 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2017/10/14 21:27:10 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.39 2017/10/15 23:19:12 prlw1 Exp $
 #
 # used by print/evince/Makefile
 # used by print/evince-nautilus/Makefile
@@ -31,7 +31,6 @@ pre-configure:
 .include "../../databases/shared-mime-info/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=   glib2>=2.15.6
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.17.1
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index 1be568eadb9..4e431abd8a5 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2017/10/14 12:15:25 prlw1 Exp $
+# $NetBSD: Makefile,v 1.65 2017/10/15 23:19:12 prlw1 Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -41,7 +41,6 @@ post-install:
 
 BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.41.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/security/policykit-gnome/Makefile b/security/policykit-gnome/Makefile
index c3db3996a99..d2c32d53f4e 100644
--- a/security/policykit-gnome/Makefile
+++ b/security/policykit-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/10/14 21:14:13 prlw1 Exp $
+# $NetBSD: Makefile,v 1.42 2017/10/15 23:19:12 prlw1 Exp $
 #
 
 POLICYKIT_GNOME_VER=	0.9.2
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
 .include "../../devel/GConf/schemas.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../security/policykit/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnome-doc-utils+=	gnome-doc-utils>=0.20.1
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/security/polkit/Makefile b/security/polkit/Makefile
index b5fa19fe15a..cd631724366 100644
--- a/security/polkit/Makefile
+++ b/security/polkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/10/13 22:04:44 prlw1 Exp $
+# $NetBSD: Makefile,v 1.8 2017/10/15 23:19:12 prlw1 Exp $
 #
 
 DISTNAME=	polkit-0.113
@@ -65,6 +65,5 @@ SUBST_SED.paths+=	-e 's,/usr/bin/,${PREFIX}/bin/,g'
 .include "../../lang/spidermonkey17/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dbus-glib/Makefile b/sysutils/dbus-glib/Makefile
index a772861b3e7..898ebc0b027 100644
--- a/sysutils/dbus-glib/Makefile
+++ b/sysutils/dbus-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2017/10/13 21:53:27 prlw1 Exp $
+# $NetBSD: Makefile,v 1.41 2017/10/15 23:19:12 prlw1 Exp $
 
 DISTNAME=	dbus-glib-0.108
 CATEGORIES=	sysutils
@@ -32,7 +32,6 @@ CONFIGURE_ARGS+=	--with-xml=expat
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.32
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_API_DEPENDS.dbus+=	dbus>=1.8
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common
index f32b3742a16..9ade9a21c20 100644
--- a/sysutils/gnome-vfs/Makefile.common
+++ b/sysutils/gnome-vfs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2017/10/14 12:20:12 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.31 2017/10/15 23:19:12 prlw1 Exp $
 #
 # used by audio/gnome-vfs-cdda/Makefile
 # used by net/gnome-vfs-smb/Makefile
@@ -99,7 +99,6 @@ do-install:
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/sysutils/gsettings-desktop-schemas/Makefile b/sysutils/gsettings-desktop-schemas/Makefile
index f3bc1184284..153581032b4 100644
--- a/sysutils/gsettings-desktop-schemas/Makefile
+++ b/sysutils/gsettings-desktop-schemas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/10/14 10:49:26 prlw1 Exp $
+# $NetBSD: Makefile,v 1.11 2017/10/15 23:19:13 prlw1 Exp $
 
 DISTNAME=	gsettings-desktop-schemas-3.24.0
 CATEGORIES=	sysutils gnome
@@ -18,7 +18,6 @@ USE_LANGUAGES=		c
 
 PKGCONFIG_OVERRIDE+=	gsettings-desktop-schemas.pc.in
 
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/glib2/schemas.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection:=	build
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=1.31
diff --git a/sysutils/libnotify/Makefile b/sysutils/libnotify/Makefile
index b26bbf50c46..704c58811e4 100644
--- a/sysutils/libnotify/Makefile
+++ b/sysutils/libnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2017/10/13 22:38:31 prlw1 Exp $
+# $NetBSD: Makefile,v 1.44 2017/10/15 23:19:13 prlw1 Exp $
 
 DISTNAME=	libnotify-0.7.7
 CATEGORIES=	sysutils gnome
@@ -24,7 +24,6 @@ PKGCONFIG_OVERRIDE=	libnotify.pc.in
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.26.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 BUILDLINK_DEPMETHOD.gtk3=	build
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/json-glib/Makefile b/textproc/json-glib/Makefile
index feeb1a4bb01..d445678fe39 100644
--- a/textproc/json-glib/Makefile
+++ b/textproc/json-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/10/14 21:17:54 prlw1 Exp $
+# $NetBSD: Makefile,v 1.27 2017/10/15 23:19:13 prlw1 Exp $
 
 DISTNAME=	json-glib-1.2.8
 CATEGORIES=	textproc gnome
@@ -31,5 +31,4 @@ PRINT_PLIST_AWK+= \
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index f71534d59b9..990fffe4b3b 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.289 2017/10/13 22:52:32 prlw1 Exp $
+# $NetBSD: Makefile,v 1.290 2017/10/15 23:19:13 prlw1 Exp $
 
 DISTNAME=	gtk+-2.24.31
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
@@ -102,7 +102,6 @@ BUILDLINK_API_DEPENDS.atk+=	atk>=1.30.0
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.28.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection:=	build
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.3
diff --git a/x11/gtksourceview2/Makefile b/x11/gtksourceview2/Makefile
index 60e245f3ed3..73267fb8b9c 100644
--- a/x11/gtksourceview2/Makefile
+++ b/x11/gtksourceview2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2017/10/14 21:22:56 prlw1 Exp $
+# $NetBSD: Makefile,v 1.53 2017/10/15 23:19:13 prlw1 Exp $
 
 DISTNAME=	gtksourceview-2.10.5
 PKGNAME=	${DISTNAME:S/-/2-/}
@@ -28,7 +28,6 @@ SUBST_SED.ige-mac=	-e 's,os_osx=yes,os_osx=no,'
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtksourceview3/Makefile b/x11/gtksourceview3/Makefile
index 1fb723f28df..0dd27027eb8 100644
--- a/x11/gtksourceview3/Makefile
+++ b/x11/gtksourceview3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/10/14 10:51:45 prlw1 Exp $
+# $NetBSD: Makefile,v 1.36 2017/10/15 23:19:13 prlw1 Exp $
 
 DISTNAME=	gtksourceview-3.24.3
 PKGNAME=	${DISTNAME:S/gtksourceview/gtksourceview3/}
@@ -32,7 +32,6 @@ BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.48
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .if !empty(PKG_OPTIONS:Mintrospection)
 PLIST.introspection=	yes
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=1.42.0
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index b63e014f4f6..e9b69664bd5 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2017/10/14 21:25:36 prlw1 Exp $
+# $NetBSD: Makefile,v 1.54 2017/10/15 23:19:13 prlw1 Exp $
 #
 
 DISTNAME=	libgnomekbd-2.32.0
@@ -23,7 +23,6 @@ PKGCONFIG_OVERRIDE+=	libgnomekbd.pc.in
 PKGCONFIG_OVERRIDE+=	libgnomekbdui.pc.in
 
 .include "../../devel/GConf/schemas.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=4.0
 .include "../../x11/libxklavier/buildlink3.mk"
diff --git a/x11/libunique/Makefile b/x11/libunique/Makefile
index b32c67693a5..45dbce1f148 100644
--- a/x11/libunique/Makefile
+++ b/x11/libunique/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2017/10/14 21:05:38 prlw1 Exp $
+# $NetBSD: Makefile,v 1.39 2017/10/15 23:19:13 prlw1 Exp $
 
 DISTNAME=	libunique-1.1.6
 PKGREVISION=	24
@@ -41,6 +41,5 @@ CFLAGS+=	-Wno-tautological-compare
 
 .include "options.mk"
 
-.include "../../devel/glib2/buildtools.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 2b9f706e471..14e38946b10 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2017/10/13 23:37:20 prlw1 Exp $
+# $NetBSD: Makefile,v 1.44 2017/10/15 23:19:13 prlw1 Exp $
 
 DISTNAME=	libxklavier-5.4
 PKGREVISION=	2
@@ -35,7 +35,6 @@ TOOLS_NOOP+=	gtkdoc-rebase
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 #.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 94a583751f6..f0480c4fe3f 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2017/10/14 10:45:51 prlw1 Exp $
+# $NetBSD: Makefile,v 1.109 2017/10/15 23:19:13 prlw1 Exp $
 #
 
 .include "Makefile.common"
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+=	--enable-Bsymbolic=auto
 
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.10.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/pango/buildlink3.mk"
 # for FC_WIDTH
 BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.1.93
diff --git a/x11/vte3/Makefile b/x11/vte3/Makefile
index 8a72fc78572..867ed3b2217 100644
--- a/x11/vte3/Makefile
+++ b/x11/vte3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/10/14 13:35:35 prlw1 Exp $
+# $NetBSD: Makefile,v 1.5 2017/10/15 23:19:13 prlw1 Exp $
 #
 
 DISTNAME=	vte-0.38.4
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+=	--enable-Bsymbolic=auto
 CONFIGURE_ARGS+=	--disable-introspection
 CONFIGURE_ARGS+=	--disable-vala
 
-.include "../../devel/glib2/buildtools.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile
index c205c275da6..c80ff9408ea 100644
--- a/x11/xfce4-gtk2-engine/Makefile
+++ b/x11/xfce4-gtk2-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/10/14 10:02:34 prlw1 Exp $
+# $NetBSD: Makefile,v 1.42 2017/10/15 23:19:14 prlw1 Exp $
 
 PKGREVISION= 4
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -16,6 +16,5 @@ MAKE_DIRS+=	${PREFIX}/share/themes/Xfce
 
 CONFIGURE_ARGS+=--enable-gtk3
 
-.include "../../devel/glib2/buildtools.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-tumbler/Makefile b/x11/xfce4-tumbler/Makefile
index e60583ff253..cf4fbbd4bd4 100644
--- a/x11/xfce4-tumbler/Makefile
+++ b/x11/xfce4-tumbler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/10/14 13:36:52 prlw1 Exp $
+# $NetBSD: Makefile,v 1.31 2017/10/15 23:19:14 prlw1 Exp $
 #
 #
 
@@ -36,7 +36,6 @@ CFLAGS+=		-g
 
 .include "options.mk"
 
-.include "../../devel/glib2/buildtools.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"