CVS commit: pkgsrc

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Sun Oct 15 22:31:02 UTC 2017

Modified Files:
        pkgsrc/audio/audacious: Makefile
        pkgsrc/audio/audacious-plugins: Makefile
        pkgsrc/devel/dconf: Makefile
        pkgsrc/devel/glib2: buildtools.mk
        pkgsrc/devel/xfce4-conf: Makefile
        pkgsrc/net/gnome-online-accounts: Makefile
        pkgsrc/print/cups-filters: Makefile
        pkgsrc/print/evince3: Makefile.common
        pkgsrc/security/libsecret: Makefile
        pkgsrc/sysutils/caja: Makefile
        pkgsrc/sysutils/consolekit: Makefile
        pkgsrc/x11/gtk3: Makefile

Log Message:
Put gdbus-codgen back into operation

- Revert "Move gdbus-codegen users to py-glib2-tools by including
  glib2/buildtools.mk" 1f764df
- while here change to TOOL_DEPENDS
- switch from py-glib2-tools to glib2-tools


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/audio/audacious/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/audio/audacious-plugins/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/dconf/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/glib2/buildtools.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/xfce4-conf/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/gnome-online-accounts/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/print/cups-filters/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/evince3/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/libsecret/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/caja/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/sysutils/consolekit/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/x11/gtk3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/audacious/Makefile
diff -u pkgsrc/audio/audacious/Makefile:1.47 pkgsrc/audio/audacious/Makefile:1.48
--- pkgsrc/audio/audacious/Makefile:1.47        Fri Oct 13 16:36:03 2017
+++ pkgsrc/audio/audacious/Makefile     Sun Oct 15 22:31:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2017/10/13 16:36:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.48 2017/10/15 22:31:01 prlw1 Exp $
 
 DISTNAME=      audacious-3.5.2
 PKGREVISION=   5
@@ -18,13 +18,14 @@ GNU_CONFIGURE=              yes
 CONFIGURE_ARGS+=       --disable-chardet
 PKGCONFIG_OVERRIDE+=   audacious.pc.in
 
+TOOL_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"

Index: pkgsrc/audio/audacious-plugins/Makefile
diff -u pkgsrc/audio/audacious-plugins/Makefile:1.77 pkgsrc/audio/audacious-plugins/Makefile:1.78
--- pkgsrc/audio/audacious-plugins/Makefile:1.77        Fri Oct 13 16:36:03 2017
+++ pkgsrc/audio/audacious-plugins/Makefile     Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2017/10/13 16:36:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.78 2017/10/15 22:31:02 prlw1 Exp $
 
 DISTNAME=      audacious-plugins-3.5.2
 PKGREVISION=   16
@@ -11,6 +11,8 @@ HOMEPAGE=     http://audacious-media-player.
 COMMENT=       Plugins for Audacious media player
 LICENSE=       2-clause-bsd
 
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake intltool pkg-config msgfmt
 GNU_CONFIGURE=         yes
@@ -90,7 +92,6 @@ 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"

Index: pkgsrc/devel/dconf/Makefile
diff -u pkgsrc/devel/dconf/Makefile:1.37 pkgsrc/devel/dconf/Makefile:1.38
--- pkgsrc/devel/dconf/Makefile:1.37    Fri Oct 13 16:36:03 2017
+++ pkgsrc/devel/dconf/Makefile Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2017/10/13 16:36:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.38 2017/10/15 22:31:02 prlw1 Exp $
 
 DISTNAME=      dconf-0.26.1
 CATEGORIES=    devel gnome
@@ -36,6 +36,7 @@ SUBST_FILES.libname+= gsettings/Makefile
 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"
 
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=        docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
@@ -43,6 +44,5 @@ 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"

Index: pkgsrc/devel/glib2/buildtools.mk
diff -u pkgsrc/devel/glib2/buildtools.mk:1.2 pkgsrc/devel/glib2/buildtools.mk:1.3
--- pkgsrc/devel/glib2/buildtools.mk:1.2        Fri Oct 13 15:49:55 2017
+++ pkgsrc/devel/glib2/buildtools.mk    Sun Oct 15 22:31:02 2017
@@ -1,5 +1,3 @@
-# $NetBSD: buildtools.mk,v 1.2 2017/10/13 15:49:55 prlw1 Exp $
+# $NetBSD: buildtools.mk,v 1.3 2017/10/15 22:31:02 prlw1 Exp $
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-glib2-tools-[0-9]*:../../devel/py-glib2-tools
-PYTHON_FOR_BUILD_ONLY?=yes
-.include "../../lang/python/pyversion.mk"
+TOOL_DEPENDS+= glib2-tools-[0-9]*:../../devel/glib2-tools

Index: pkgsrc/devel/xfce4-conf/Makefile
diff -u pkgsrc/devel/xfce4-conf/Makefile:1.10 pkgsrc/devel/xfce4-conf/Makefile:1.11
--- pkgsrc/devel/xfce4-conf/Makefile:1.10       Fri Oct 13 16:36:03 2017
+++ pkgsrc/devel/xfce4-conf/Makefile    Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/10/13 16:36:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.11 2017/10/15 22:31:02 prlw1 Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -21,7 +21,8 @@ MAKE_DIRS+=   ${PREFIX}/include/xfce4
 BUILDLINK_API_DEPENDS.dbus+=           dbus>=1.0.0
 BUILDLINK_API_DEPENDS.dbus-glib+=      dbus-glib>=0.72
 
-.include "../../devel/glib2/buildtools.mk"
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/libxfce4util/buildlink3.mk"

Index: pkgsrc/net/gnome-online-accounts/Makefile
diff -u pkgsrc/net/gnome-online-accounts/Makefile:1.14 pkgsrc/net/gnome-online-accounts/Makefile:1.15
--- pkgsrc/net/gnome-online-accounts/Makefile:1.14      Fri Oct 13 16:36:03 2017
+++ pkgsrc/net/gnome-online-accounts/Makefile   Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/10/13 16:36:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.15 2017/10/15 22:31:02 prlw1 Exp $
 
 DISTNAME=      gnome-online-accounts-3.16.3
 PKGREVISION=   11
@@ -12,6 +12,7 @@ COMMENT=      Service that allows online acco
 LICENSE=       gnu-gpl-v2
 
 BUILD_DEPENDS+=        gtk-doc>=1.3:../../textproc/gtk-doc
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
@@ -20,7 +21,6 @@ USE_TOOLS+=           gmake intltool pkg-config m
 
 .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"

Index: pkgsrc/print/cups-filters/Makefile
diff -u pkgsrc/print/cups-filters/Makefile:1.80 pkgsrc/print/cups-filters/Makefile:1.81
--- pkgsrc/print/cups-filters/Makefile:1.80     Fri Oct 13 16:36:03 2017
+++ pkgsrc/print/cups-filters/Makefile  Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2017/10/13 16:36:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.81 2017/10/15 22:31:02 prlw1 Exp $
 
 DISTNAME=      cups-filters-1.17.2
 PKGREVISION=   3
@@ -16,6 +16,7 @@ USE_LIBTOOL=  yes
 USE_TOOLS+=    bash:run pkg-config gmake
 USE_LANGUAGES= c c++11
 
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 DEPENDS+=      poppler-utils-[0-9]*:../../print/poppler-utils
 
 PKGCONFIG_OVERRIDE+=   libcupsfilters.pc.in
@@ -72,7 +73,6 @@ 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"

Index: pkgsrc/print/evince3/Makefile.common
diff -u pkgsrc/print/evince3/Makefile.common:1.18 pkgsrc/print/evince3/Makefile.common:1.19
--- pkgsrc/print/evince3/Makefile.common:1.18   Fri Oct 13 16:36:03 2017
+++ pkgsrc/print/evince3/Makefile.common        Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2017/10/13 16:36:03 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.19 2017/10/15 22:31:02 prlw1 Exp $
 #
 # used by print/evince3/Makefile
 # would probably be used by print/evince3-nautilus/Makefile if that existed
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+=      --disable-browser-plugi
 # Disable thumbnail cache
 CONFIGURE_ARGS+=       --disable-libgnome-desktop
 
+TOOL_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
@@ -38,7 +39,6 @@ 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"

Index: pkgsrc/security/libsecret/Makefile
diff -u pkgsrc/security/libsecret/Makefile:1.12 pkgsrc/security/libsecret/Makefile:1.13
--- pkgsrc/security/libsecret/Makefile:1.12     Fri Oct 13 16:36:04 2017
+++ pkgsrc/security/libsecret/Makefile  Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/10/13 16:36:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.13 2017/10/15 22:31:02 prlw1 Exp $
 
 DISTNAME=      libsecret-0.18.5
 CATEGORIES=    security gnome
@@ -12,6 +12,7 @@ LICENSE=      gnu-lgpl-v2.1
 
 BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=        docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
@@ -22,7 +23,6 @@ PKGCONFIG_OVERRIDE+=  libsecret/libsecret
 
 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"

Index: pkgsrc/sysutils/caja/Makefile
diff -u pkgsrc/sysutils/caja/Makefile:1.7 pkgsrc/sysutils/caja/Makefile:1.8
--- pkgsrc/sysutils/caja/Makefile:1.7   Fri Oct 13 16:36:04 2017
+++ pkgsrc/sysutils/caja/Makefile       Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/10/13 16:36:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.8 2017/10/15 22:31:02 prlw1 Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
@@ -8,11 +8,12 @@ MASTER_SITES+=        http://pub.mate-desktop.o
 
 COMMENT=       File manager for the MATE desktop
 
+TOOL_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"

Index: pkgsrc/sysutils/consolekit/Makefile
diff -u pkgsrc/sysutils/consolekit/Makefile:1.35 pkgsrc/sysutils/consolekit/Makefile:1.36
--- pkgsrc/sysutils/consolekit/Makefile:1.35    Fri Oct 13 16:36:04 2017
+++ pkgsrc/sysutils/consolekit/Makefile Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/10/13 16:36:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.36 2017/10/15 22:31:02 prlw1 Exp $
 
 CONSOLEKIT_VER=        1.0.2
 DISTNAME=      ConsoleKit2-1.0.2
@@ -61,7 +61,8 @@ post-install:
        ${INSTALL_DATA} ${FILESDIR}/50-shutdown.rules   \
        ${DESTDIR}${RULESDIR}/50-shutdown.rules
 
-.include "../../devel/glib2/buildtools.mk"
+TOOL_DEPENDS+=         gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/polkit/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"

Index: pkgsrc/x11/gtk3/Makefile
diff -u pkgsrc/x11/gtk3/Makefile:1.101 pkgsrc/x11/gtk3/Makefile:1.102
--- pkgsrc/x11/gtk3/Makefile:1.101      Fri Oct 13 16:36:04 2017
+++ pkgsrc/x11/gtk3/Makefile    Sun Oct 15 22:31:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2017/10/13 16:36:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.102 2017/10/15 22:31:02 prlw1 Exp $
 
 DISTNAME=      gtk+-3.22.21
 PKGNAME=       ${DISTNAME:S/gtk/gtk3/}
@@ -16,6 +16,7 @@ USE_TOOLS+=           gmake perl pkg-config bash 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 PTHREAD_AUTO_VARS=     yes
+TOOL_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.
@@ -81,7 +82,6 @@ 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