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, 22 deletions

diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile
index a385026a488..d53d6a79cc7 100644
--- a/databases/dbh/Makefile
+++ b/databases/dbh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $
 
 DISTNAME=	dbh-1.0.24
 CATEGORIES=	databases
@@ -10,6 +10,7 @@ COMMENT=	Library to create disk based Hashtables
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
@@ -22,5 +23,4 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} doc/dbh-hash-tables.html \
 		${PREFIX}/share/doc/dbh/html
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index a555f562bcf..d7bd2fd7c7a 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:13 jlam Exp $
 #
 
 DISTNAME=	gq-1.0beta1
@@ -13,6 +13,7 @@ COMMENT=	GTK-based LDAP client
 USE_DIRS+=		gnome2-1.5
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS+=	--enable-browser-dnd
 CONFIGURE_ARGS+=	--with-ssl-prefix=${BUILDLINK_PREFIX.openssl}
@@ -20,7 +21,6 @@ CONFIGURE_ARGS+=	--enable-cache
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../databases/openldap/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index b1d697ab346..66c560a3f7f 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $
 #
 
 DISTNAME=		gramps-1.0.11
@@ -18,6 +18,7 @@ BUILD_DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
 # i18n support with other python versions appears to not work
@@ -25,7 +26,6 @@ PYTHON_VERSION_REQD=	23
 
 MESSAGE_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../graphics/py-imaging/buildlink3.mk"
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 44f662b4dbb..d8b1957b155 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:14 jlam Exp $
 #
 
 DISTNAME=		gramps-2.0.5
@@ -16,6 +16,7 @@ BUILD_DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
 .endif
 #BUILD_USES_MSGFMT=	yes
 
+USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 # disable gconf schema and mime type processing
@@ -28,7 +29,6 @@ PYTHON_VERSIONS_ACCEPTED=	24 23
 MESSAGE_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 GCONF2_SCHEMAS+=	gramps.schemas
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../databases/py-bsddb3/buildlink3.mk"
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 01967445a24..5685a6897d8 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33 2005/08/10 20:56:14 jlam Exp $
 #
 
 DISTNAME=		libgda-1.2.2
@@ -13,7 +13,7 @@ COMMENT=		GNU database access library
 DISTINFO_FILE=		${.CURDIR}/../../databases/libgda/distinfo
 PATCHDIR=		${.CURDIR}/../../databases/libgda/patches
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
@@ -45,7 +45,6 @@ SUBST_SED.libs+=	-e 's|$$(top_builddir)/libgda/libgda-2.la|${BUILDLINK_PREFIX.li
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 5f0e38769ea..808b319733c 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:14 jlam Exp $
 #
 
 DISTNAME=		libgnomedb-1.2.2
@@ -12,7 +12,7 @@ COMMENT=		GNOME2 database library
 
 BUILD_USES_MSGFMT=	yes
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
@@ -31,7 +31,6 @@ GCONF2_SCHEMAS=		libgnomedb.schemas
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 3b9e755ce2b..602a4dadd99 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/08/10 20:56:14 jlam Exp $
 #
 
 DISTNAME=		mergeant-0.52
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.gnome-db.org/
 COMMENT=		GNOME2 GNOME-DB database front-end
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-gtk-doc
@@ -24,7 +24,6 @@ USE_LIBTOOL=		YES
 .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/libxml2/buildlink3.mk"
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 4e4423a9932..a7ae0f2a2bf 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/08/08 18:13:13 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/08/10 20:56:14 jlam Exp $
 #
 
 DISTNAME=	rrdtool-1.2.11
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 			NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 
@@ -32,7 +32,6 @@ RRDDOCDIR=		${PREFIX}/share/doc/rrdtool
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../www/cgilib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
index 0e911b8193e..d5835d8476b 100644
--- a/databases/shared-mime-info/Makefile
+++ b/databases/shared-mime-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:14 jlam Exp $
 #
 
 DISTNAME=	shared-mime-info-0.16
@@ -15,6 +15,7 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
+USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS+=	--disable-update-mimedb
 
@@ -33,7 +34,6 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/mime/ { next; }
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"