[pkgsrc/trunk]: pkgsrc Put gdbus-codgen back into operation

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Put gdbus-codgen back into operation
From: prlw1 <prlw1%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 08:07:51 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae19d40795fd
branches:  trunk
changeset: 370339:ae19d40795fd
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Sun Oct 15 22:31:01 2017 +0000

description:
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

diffstat:

 audio/audacious-plugins/Makefile   |  5 +++--
 audio/audacious/Makefile           |  5 +++--
 devel/dconf/Makefile               |  4 ++--
 devel/glib2/buildtools.mk          |  6 ++----
 devel/xfce4-conf/Makefile          |  5 +++--
 net/gnome-online-accounts/Makefile |  4 ++--
 print/cups-filters/Makefile        |  4 ++--
 print/evince3/Makefile.common      |  4 ++--
 security/libsecret/Makefile        |  4 ++--
 sysutils/caja/Makefile             |  5 +++--
 sysutils/consolekit/Makefile       |  5 +++--
 x11/gtk3/Makefile                  |  4 ++--
 12 files changed, 29 insertions(+), 26 deletions(-)

diffs (272 lines):

diff -r ff93d4c6ec7e -r ae19d40795fd audio/audacious-plugins/Makefile
--- a/audio/audacious-plugins/Makefile  Sun Oct 15 20:49:56 2017 +0000
+++ b/audio/audacious-plugins/Makefile  Sun Oct 15 22:31:01 2017 +0000
@@ -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 @@
 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 @@
 .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"
diff -r ff93d4c6ec7e -r ae19d40795fd audio/audacious/Makefile
--- a/audio/audacious/Makefile  Sun Oct 15 20:49:56 2017 +0000
+++ b/audio/audacious/Makefile  Sun Oct 15 22:31:01 2017 +0000
@@ -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 @@
 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"
diff -r ff93d4c6ec7e -r ae19d40795fd devel/dconf/Makefile
--- a/devel/dconf/Makefile      Sun Oct 15 20:49:56 2017 +0000
+++ b/devel/dconf/Makefile      Sun Oct 15 22:31:01 2017 +0000
@@ -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_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_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"
diff -r ff93d4c6ec7e -r ae19d40795fd devel/glib2/buildtools.mk
--- a/devel/glib2/buildtools.mk Sun Oct 15 20:49:56 2017 +0000
+++ b/devel/glib2/buildtools.mk Sun Oct 15 22:31:01 2017 +0000
@@ -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
diff -r ff93d4c6ec7e -r ae19d40795fd devel/xfce4-conf/Makefile
--- a/devel/xfce4-conf/Makefile Sun Oct 15 20:49:56 2017 +0000
+++ b/devel/xfce4-conf/Makefile Sun Oct 15 22:31:01 2017 +0000
@@ -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 @@
 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"
diff -r ff93d4c6ec7e -r ae19d40795fd net/gnome-online-accounts/Makefile
--- a/net/gnome-online-accounts/Makefile        Sun Oct 15 20:49:56 2017 +0000
+++ b/net/gnome-online-accounts/Makefile        Sun Oct 15 22:31:01 2017 +0000
@@ -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 @@
 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 @@
 
 .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"
diff -r ff93d4c6ec7e -r ae19d40795fd print/cups-filters/Makefile
--- a/print/cups-filters/Makefile       Sun Oct 15 20:49:56 2017 +0000
+++ b/print/cups-filters/Makefile       Sun Oct 15 22:31:01 2017 +0000
@@ -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_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 @@
        ${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"
diff -r ff93d4c6ec7e -r ae19d40795fd print/evince3/Makefile.common
--- a/print/evince3/Makefile.common     Sun Oct 15 20:49:56 2017 +0000
+++ b/print/evince3/Makefile.common     Sun Oct 15 22:31:01 2017 +0000
@@ -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 @@
 # 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 @@
 .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"
diff -r ff93d4c6ec7e -r ae19d40795fd security/libsecret/Makefile
--- a/security/libsecret/Makefile       Sun Oct 15 20:49:56 2017 +0000
+++ b/security/libsecret/Makefile       Sun Oct 15 22:31:01 2017 +0000
@@ -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 @@
 
 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 @@
 
 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"
diff -r ff93d4c6ec7e -r ae19d40795fd sysutils/caja/Makefile
--- a/sysutils/caja/Makefile    Sun Oct 15 20:49:56 2017 +0000
+++ b/sysutils/caja/Makefile    Sun Oct 15 22:31:01 2017 +0000
@@ -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 @@
 
 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"
diff -r ff93d4c6ec7e -r ae19d40795fd sysutils/consolekit/Makefile
--- a/sysutils/consolekit/Makefile      Sun Oct 15 20:49:56 2017 +0000
+++ b/sysutils/consolekit/Makefile      Sun Oct 15 22:31:01 2017 +0000
@@ -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 @@
        ${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"
diff -r ff93d4c6ec7e -r ae19d40795fd x11/gtk3/Makefile
--- a/x11/gtk3/Makefile Sun Oct 15 20:49:56 2017 +0000
+++ b/x11/gtk3/Makefile Sun Oct 15 22:31:01 2017 +0000
@@ -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_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 @@
 .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
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/glib2 glib2: needs python to generate gdbus-daem...
Next by Date: [pkgsrc/trunk]: pkgsrc Revert buildtool.mk additions for glib-{mkenums, genmar...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/glib2 glib2: needs python to generate gdbus-daem...
Next by Thread: [pkgsrc/trunk]: pkgsrc Revert buildtool.mk additions for glib-{mkenums, genmar...
Indexes:
Home | Main Index | Thread Index | Old Index