[pkgsrc/trunk]: pkgsrc Revert buildtool.mk additions for glib-{mkenums, genmar...

[prlw1 <prlw1%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9391e748f129
branches:  trunk
changeset: 370340:9391e748f129
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Sun Oct 15 23:19:10 2017 +0000

description:
Revert buildtool.mk additions for glib-{mkenums,genmarshal} using packages
Add TOOL_DEPENDS+=glib2-tools to glib2/buildlink3.mk

diffstat:

 chat/telepathy-glib/Makefile                 |  3 +--
 devel/GConf-ui/Makefile                      |  3 +--
 devel/GConf/Makefile                         |  3 +--
 devel/at-spi2-core/Makefile                  |  3 +--
 devel/atk/Makefile                           |  3 +--
 devel/glib2/buildlink3.mk                    |  4 +++-
 devel/libbonobo/Makefile                     |  3 +--
 devel/libpeas/Makefile                       |  3 +--
 devel/pango/Makefile                         |  3 +--
 fonts/gucharmap/Makefile                     |  3 +--
 graphics/cogl/Makefile                       |  3 +--
 graphics/gdk-pixbuf2/Makefile                |  3 +--
 graphics/librsvg/Makefile                    |  3 +--
 multimedia/gst-plugins0.10-base/plugins.mk   |  3 +--
 multimedia/gst-plugins1-base/Makefile.common |  3 +--
 multimedia/gstreamer0.10/Makefile            |  3 +--
 multimedia/gstreamer1/Makefile               |  3 +--
 net/avahi/Makefile                           |  3 +--
 net/gtk-vnc/Makefile                         |  3 +--
 print/evince/Makefile.common                 |  3 +--
 print/poppler-glib/Makefile                  |  3 +--
 security/policykit-gnome/Makefile            |  3 +--
 security/polkit/Makefile                     |  3 +--
 sysutils/dbus-glib/Makefile                  |  3 +--
 sysutils/gnome-vfs/Makefile.common           |  3 +--
 sysutils/gsettings-desktop-schemas/Makefile  |  3 +--
 sysutils/libnotify/Makefile                  |  3 +--
 textproc/json-glib/Makefile                  |  3 +--
 x11/gtk2/Makefile                            |  3 +--
 x11/gtksourceview2/Makefile                  |  3 +--
 x11/gtksourceview3/Makefile                  |  3 +--
 x11/libgnomekbd/Makefile                     |  3 +--
 x11/libunique/Makefile                       |  3 +--
 x11/libxklavier/Makefile                     |  3 +--
 x11/vte/Makefile                             |  3 +--
 x11/vte3/Makefile                            |  3 +--
 x11/xfce4-gtk2-engine/Makefile               |  3 +--
 x11/xfce4-tumbler/Makefile                   |  3 +--
 38 files changed, 40 insertions(+), 75 deletions(-)

diffs (truncated from 635 to 300 lines):

diff -r ae19d40795fd -r 9391e748f129 chat/telepathy-glib/Makefile
--- a/chat/telepathy-glib/Makefile      Sun Oct 15 22:31:01 2017 +0000
+++ b/chat/telepathy-glib/Makefile      Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 
 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 -r ae19d40795fd -r 9391e748f129 devel/GConf-ui/Makefile
--- a/devel/GConf-ui/Makefile   Sun Oct 15 22:31:01 2017 +0000
+++ b/devel/GConf-ui/Makefile   Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
                ${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 -r ae19d40795fd -r 9391e748f129 devel/GConf/Makefile
--- a/devel/GConf/Makefile      Sun Oct 15 22:31:01 2017 +0000
+++ b/devel/GConf/Makefile      Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 .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 -r ae19d40795fd -r 9391e748f129 devel/at-spi2-core/Makefile
--- a/devel/at-spi2-core/Makefile       Sun Oct 15 22:31:01 2017 +0000
+++ b/devel/at-spi2-core/Makefile       Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 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 -r ae19d40795fd -r 9391e748f129 devel/atk/Makefile
--- a/devel/atk/Makefile        Sun Oct 15 22:31:01 2017 +0000
+++ b/devel/atk/Makefile        Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 .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 -r ae19d40795fd -r 9391e748f129 devel/glib2/buildlink3.mk
--- a/devel/glib2/buildlink3.mk Sun Oct 15 22:31:01 2017 +0000
+++ b/devel/glib2/buildlink3.mk Sun Oct 15 23:19:10 2017 +0000
@@ -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_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 -r ae19d40795fd -r 9391e748f129 devel/libbonobo/Makefile
--- a/devel/libbonobo/Makefile  Sun Oct 15 22:31:01 2017 +0000
+++ b/devel/libbonobo/Makefile  Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 
 .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 -r ae19d40795fd -r 9391e748f129 devel/libpeas/Makefile
--- a/devel/libpeas/Makefile    Sun Oct 15 22:31:01 2017 +0000
+++ b/devel/libpeas/Makefile    Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 
 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 -r ae19d40795fd -r 9391e748f129 devel/pango/Makefile
--- a/devel/pango/Makefile      Sun Oct 15 22:31:01 2017 +0000
+++ b/devel/pango/Makefile      Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 
 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 -r ae19d40795fd -r 9391e748f129 fonts/gucharmap/Makefile
--- a/fonts/gucharmap/Makefile  Sun Oct 15 22:31:01 2017 +0000
+++ b/fonts/gucharmap/Makefile  Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 .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 -r ae19d40795fd -r 9391e748f129 graphics/cogl/Makefile
--- a/graphics/cogl/Makefile    Sun Oct 15 22:31:01 2017 +0000
+++ b/graphics/cogl/Makefile    Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 .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 -r ae19d40795fd -r 9391e748f129 graphics/gdk-pixbuf2/Makefile
--- a/graphics/gdk-pixbuf2/Makefile     Sun Oct 15 22:31:01 2017 +0000
+++ b/graphics/gdk-pixbuf2/Makefile     Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 .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 -r ae19d40795fd -r 9391e748f129 graphics/librsvg/Makefile
--- a/graphics/librsvg/Makefile Sun Oct 15 22:31:01 2017 +0000
+++ b/graphics/librsvg/Makefile Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 .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 -r ae19d40795fd -r 9391e748f129 multimedia/gst-plugins0.10-base/plugins.mk
--- a/multimedia/gst-plugins0.10-base/plugins.mk        Sun Oct 15 22:31:01 2017 +0000
+++ b/multimedia/gst-plugins0.10-base/plugins.mk        Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 .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 -r ae19d40795fd -r 9391e748f129 multimedia/gst-plugins1-base/Makefile.common
--- a/multimedia/gst-plugins1-base/Makefile.common      Sun Oct 15 22:31:01 2017 +0000
+++ b/multimedia/gst-plugins1-base/Makefile.common      Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 CONFIGURE_ARGS+=       --disable-${driver}
 .endfor
 
-.include "../../devel/glib2/buildtools.mk"
 .include "../../devel/orc/buildlink3.mk"
 .include "plugins.mk"
diff -r ae19d40795fd -r 9391e748f129 multimedia/gstreamer0.10/Makefile
--- a/multimedia/gstreamer0.10/Makefile Sun Oct 15 22:31:01 2017 +0000
+++ b/multimedia/gstreamer0.10/Makefile Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 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 -r ae19d40795fd -r 9391e748f129 multimedia/gstreamer1/Makefile
--- a/multimedia/gstreamer1/Makefile    Sun Oct 15 22:31:01 2017 +0000
+++ b/multimedia/gstreamer1/Makefile    Sun Oct 15 23:19:10 2017 +0000
@@ -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-base.pc.in
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/glib2/buildtools.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ae19d40795fd -r 9391e748f129 net/avahi/Makefile
--- a/net/avahi/Makefile        Sun Oct 15 22:31:01 2017 +0000
+++ b/net/avahi/Makefile        Sun Oct 15 23:19:10 2017 +0000
@@ -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 @@
 
 .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"