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

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

10 files changed, 10 insertions, 20 deletions

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"