From 7820875fff0afd6ebe69c1b4bdbb85e3952a0f1f Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 10 Aug 2005 20:56:10 +0000 Subject: Remove the abuse of buildlink that was pkg-config/buildlink3.mk. That file's sole purpose was to provide a dependency on pkg-config and set some environment variables. Instead, turn pkg-config into a "tool" in the tools framework, where the pkg-config wrapper automatically adds PKG_CONFIG_LIBDIR to the environment before invoking the real pkg-config. For all package Makefiles that included pkg-config/buildlink3.mk, remove that inclusion and replace it with USE_TOOLS+=pkg-config. --- editors/gconf-editor/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'editors/gconf-editor') diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile index 310f79c0b57..ad5ec6e062d 100644 --- a/editors/gconf-editor/Makefile +++ b/editors/gconf-editor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:49 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:16 jlam Exp $ # DISTNAME= gconf-editor-2.10.0 @@ -16,7 +16,7 @@ GNU_CONFIGURE= YES USE_DIRS+= xdg-1.1 gnome2-1.5 USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE} CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g} @@ -30,7 +30,6 @@ BUILDLINK_DEPENDS.GConf2+= GConf2>=2.10.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -- cgit v1.2.3