diff options
| author | prlw1 <prlw1@pkgsrc.org> | 2017-10-15 22:31:01 +0000 |
|---|---|---|
| committer | prlw1 <prlw1@pkgsrc.org> | 2017-10-15 22:31:01 +0000 |
| commit | dc19e1efa29f6931569f517da775ff34b4e724d7 (patch) | |
| tree | 5ad1e23e5c8f34e441b2cff3664a986e5739fd7b /devel | |
| parent | b2388283b844acaa7dc436d71cd6a1f825f1d614 (diff) | |
| download | pkgsrc-dc19e1efa29f6931569f517da775ff34b4e724d7.tar.gz | |
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 (limited to 'devel')
| -rw-r--r-- | devel/dconf/Makefile | 4 | ||||
| -rw-r--r-- | devel/glib2/buildtools.mk | 6 | ||||
| -rw-r--r-- | devel/xfce4-conf/Makefile | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index 0eec686e395..4d3d4bff34f 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -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.in 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" diff --git a/devel/glib2/buildtools.mk b/devel/glib2/buildtools.mk index f4425618a3d..ac8de84faf1 100644 --- a/devel/glib2/buildtools.mk +++ b/devel/glib2/buildtools.mk @@ -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 --git a/devel/xfce4-conf/Makefile b/devel/xfce4-conf/Makefile index d14ba11dae0..5f6393c6cb4 100644 --- a/devel/xfce4-conf/Makefile +++ b/devel/xfce4-conf/Makefile @@ -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" |