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.

9 files changed, 18 insertions, 26 deletions

diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 01ae524a643..e3eb0fe307f 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/07/28 15:22:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/08/10 20:56:16 jlam Exp $
 
 # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
 ABIWORD_VERSION=	2.2.9
@@ -17,13 +17,12 @@ BUILD_USES_MSGFMT=	yes
 MAKEFILE=		GNUmakefile
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=        --with-libpng=${BUILDLINK_PREFIX.png}
 
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index cb421487e8c..2442a8369a0 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/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=	conglomerate-0.9.0
@@ -16,7 +16,7 @@ DEPENDS+=		docbook-xml>=4.2nb6:../../textproc/docbook-xml
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--enable-printing
@@ -31,7 +31,6 @@ GCONF2_SCHEMAS=		conglomerate.schemas
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/enchant/buildlink3.mk"
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 76369fff128..e8b6af7238e 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:16 jlam Exp $
 #
 
 DISTNAME=	dasher-3.2.15
@@ -12,7 +12,7 @@ COMMENT=	Easy typing without using keyboard
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 
 .include "../../audio/gnome-speech/buildlink3.mk"
@@ -27,7 +27,6 @@ USE_PKGLOCALEDIR=	yes
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
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"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index ab84c65a2ad..a07f8f0189d 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2005/08/10 20:56:16 jlam Exp $
 #
 
 DISTNAME=		gedit-2.10.3
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 USE_LIBTOOL=		YES
 USE_MSGFMT_PLURALS=	YES
 GNU_CONFIGURE=		YES
@@ -35,7 +35,6 @@ BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.4.0
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index 96dc4b94ab6..e0ce84540f8 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:16 jlam Exp $
 #
 
 DISTNAME=		gice-0.6.2
@@ -11,13 +11,12 @@ HOMEPAGE=		http://gice.sourceforge.net/
 COMMENT=		Powerful C text editor with advanced features
 
 WRKSRC=			${WRKDIR}/gice
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		YES
 
 BUILD_TARGET=		gice
 INSTALLATION_DIRS=	bin
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 do-install:
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 547d1be8e68..586a2b4f0eb 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:16 jlam Exp $
 
 DISTNAME=	gtranslator-1.0.2
 CATEGORIES=	editors
@@ -11,7 +11,7 @@ COMMENT=	Gettext po file editor for the GNOME2 desktop environment
 BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 MANCOMPRESSED=		yes
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=	--disable-debug
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index a469475be9a..096b9ddb9e5 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:16 jlam Exp $
 #
 
 DISTNAME=	leafpad-0.7.8
@@ -9,12 +9,12 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://tarot.freeshell.org/leafpad/
 COMMENT=	Simple and light text editor using GTK+
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index c7138fc41ea..9686d3fc8bd 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:16 jlam Exp $
 #
 
 DISTNAME=	mlview-0.7.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -28,7 +28,6 @@ GCONF2_SCHEMAS=		mlview.schemas
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libcroco/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"