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

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

8 files changed, 10 insertions, 15 deletions

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"