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.

5 files changed, 10 insertions, 12 deletions

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 86335d49a59..1f40b764563 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=		enchant-1.1.6
@@ -9,6 +9,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.abisource.com/enchant/
 COMMENT=		Generic spell checking library
 
+USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	enchant.pc.in
@@ -16,6 +17,5 @@ GNU_CONFIGURE=		yes
 CFLAGS.SunOS+=		-D__EXTENSIONS__
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index fed9f85b02d..81a2cd26b13 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=	gnome-doc-utils-0.2.0
@@ -13,6 +13,7 @@ COMMENT=	Documentation utilities for the GNOME project
 DEPENDS+=	${PYPKGPREFIX}-libxml2>=2.6.16:../../textproc/py-libxml2
 DEPENDS+=	${PYPKGPREFIX}-libxslt>=1.1.12:../../textproc/py-libxslt
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		# empty
 USE_PKGLOCALEDIR=	YES
@@ -30,7 +31,6 @@ PYTHON_PATCH_SCRIPTS+=	xml2po/xml2po.py
 BUILDLINK_DEPMETHOD.libxslt?=	build
 BUILDLINK_DEPMETHOD.libxml2?=	build
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 390cb00fc44..9f1d5dbd175 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:24 jlam Exp $
 
 DISTNAME=	gnome-spell-1.0.6
 CATEGORIES=	textproc gnome
@@ -12,7 +12,7 @@ COMMENT=	Spell checking as you type like gtkspell
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.3
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 
 BUILDLINK_DEPENDS.libgnomeui+=	libgnomeui>=2.8.0nb3
@@ -22,7 +22,6 @@ BUILDLINK_DEPENDS.libgnomeui+=	libgnomeui>=2.8.0nb3
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index d3e6b83dab7..e717c1cbb38 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/28 12:43:13 adam Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:24 jlam Exp $
 
 DISTNAME=	gtkspell-2.0.11
 CATEGORIES=	textproc devel
@@ -8,6 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gtkspell.sourceforge.net/
 COMMENT=	Spell checking GtkTextView widget
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -20,7 +21,6 @@ SUBST_FILES.subdir=	Makefile.in
 SUBST_SED.subdir=	-e 's|SUBDIRS = gtkspell examples docs|SUBDIRS = gtkspell|'
 
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 0ccc5aba200..eb921d1434c 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=	libcroco-0.6.0
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.freespiders.org/projects/libcroco/
 COMMENT=	Toolkit to parse and manipulate CSS (Cascading Style Sheets)
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
@@ -23,6 +23,5 @@ CONFIGURE_ARGS+=	--enable-layeng=yes
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"