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.

14 files changed, 28 insertions, 37 deletions

diff --git a/misc/blccc/Makefile b/misc/blccc/Makefile
index 0540f59b1cd..3aada1a8911 100644
--- a/misc/blccc/Makefile
+++ b/misc/blccc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=		blccc-1.99
@@ -10,6 +10,7 @@ MAINTAINER=		salo@NetBSD.org
 HOMEPAGE=		http://www.blinkenlights.de/
 COMMENT=		Blinkenlights Chaos Control Center
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 SHLIBTOOL_OVERRIDE=	libtool
@@ -17,7 +18,6 @@ SHLIBTOOL_OVERRIDE=	libtool
 EGDIR=			${PREFIX}/share/examples/blccc
 
 .include "../../devel/blib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/misc/gkrellm-flynn/Makefile b/misc/gkrellm-flynn/Makefile
index e09fbb586fa..03b22c935fc 100644
--- a/misc/gkrellm-flynn/Makefile
+++ b/misc/gkrellm-flynn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=	gkrellflynn-0.8
@@ -11,10 +11,9 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://horus.comlab.uni-rostock.de/flynn/
 COMMENT=	GKrellM2 plugin that shows system load with a DooM marine
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 BUILD_TARGET=	gkrellm2
 INSTALL_TARGET=	installgkrellm2
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-launch/Makefile b/misc/gkrellm-launch/Makefile
index f93ac243f7c..ae45d158eb8 100644
--- a/misc/gkrellm-launch/Makefile
+++ b/misc/gkrellm-launch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=	gkrellmlaunch-0.5
@@ -13,11 +13,11 @@ COMMENT=	GKrellM plugin to allow quick launch of applications
 
 BUILD_TARGET=	gkrellmlaunch.so
 
+USE_TOOLS+=		pkg-config
 INSTALLATION_DIRS=	lib/gkrellm2/plugins
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/gkrellmlaunch.so ${PREFIX}/lib/gkrellm2/plugins
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-leds/Makefile b/misc/gkrellm-leds/Makefile
index 710cacd7d97..e0045aed5cc 100644
--- a/misc/gkrellm-leds/Makefile
+++ b/misc/gkrellm-leds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=	gkleds-0.8.2
@@ -10,11 +10,11 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://heim.ifi.uio.no/~oyvinha/gkleds/
 COMMENT=	GKrellM plugin that monitors CapsLock, NumLock and ScrollLock keys
 
+USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/gkrellm2/plugins
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-moon/Makefile b/misc/gkrellm-moon/Makefile
index 44715dbc7df..cdb255380a0 100644
--- a/misc/gkrellm-moon/Makefile
+++ b/misc/gkrellm-moon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=		gkrellmoon-0.6
@@ -11,8 +11,8 @@ MAINTAINER=		cube@NetBSD.org
 HOMEPAGE=		http://gkrellmoon.sourceforge.net/
 COMMENT=		GKrellM2 moonclock plugin
 
+USE_TOOLS+=		pkg-config
 BUILD_TARGET=		gkrellmoon.so
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index 8a9bb642289..e16202c4c58 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:19 jlam Exp $
 
 DISTNAME=       gkrellweather-2.0.6
 PKGNAME=        gkrellm-weather-2.0.6
@@ -14,7 +14,7 @@ COMMENT=	Gkrellm2 weather plugin
 DEPENDS+=       wget>=1.8:../../net/wget
 BUILD_USES_MSGFMT=      YES
 
-USE_TOOLS+=		gmake perl:run
+USE_TOOLS+=		gmake perl:run pkg-config
 USE_PKGLOCALEDIR=	YES
 BUILD_TARGET=		gkrellweather.so
 
@@ -30,7 +30,6 @@ pre-build:
 	${WRKSRC}/GrabWeather.orig > ${WRKSRC}/GrabWeather
 
 .include "../../sysutils/gkrellm/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 9b9ab5d99c4..3bcdab40028 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=		gnome-utils-2.10.1
@@ -12,7 +12,7 @@ COMMENT=		Set of useful GNOME2 utilities and applications
 
 BUILD_USES_MSGFMT=	yes
 
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -34,7 +34,6 @@ BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.4
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 4bc6b6792e5..826cb891762 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=		gok-1.0.3
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME On-Screen Keyboard
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -34,7 +34,6 @@ GCONF2_SCHEMAS=		gok.schemas
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index fb4e1085086..9e2f0bdba6e 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:20 jlam Exp $
 
 DISTNAME=		gperiodic-2.0.8
 CATEGORIES=		misc x11
@@ -12,7 +12,7 @@ BUILD_USES_MSGFMT=	# defined
 
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	# defined
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
@@ -23,6 +23,5 @@ MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 BUILD_TARGET=		gperiodic
 
 .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/misc/gxmame/Makefile b/misc/gxmame/Makefile
index 5c45ab9191e..3bdc4f3b996 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=	gxmame-0.35beta1
@@ -15,11 +15,10 @@ DEPENDS+=               p5-XML-Parser>=2.34:../../textproc/p5-XML-Parser
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile
index 5e12c53aa86..1a7ea4a5b6f 100644
--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=		kanjipad-2.0.0
@@ -10,9 +10,8 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://fishsoup.net/software/kanjipad/
 COMMENT=		Japanese handwriting recognition
 
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 post-install:
diff --git a/misc/kdeaccessibility3/Makefile b/misc/kdeaccessibility3/Makefile
index 374e469ef78..80a9f1c8cbd 100644
--- a/misc/kdeaccessibility3/Makefile
+++ b/misc/kdeaccessibility3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:20 jlam Exp $
 
 DISTNAME=	kdeaccessibility-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -6,6 +6,7 @@ COMMENT=	Accessibility support for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
+USE_TOOLS+=		pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,7 +24,6 @@ PLIST_SUBST+=		HAVE_GST="@comment "
 .endif
 
 .include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index ca4480185f5..5f54a042546 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/09 12:56:18 adam Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:20 jlam Exp $
 
 DISTNAME=	libcdio-0.75
 CATEGORIES=	misc
@@ -12,7 +12,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl:run pkg-config
 PKGCONFIG_OVERRIDE+=	libcdio.pc.in
 PKGCONFIG_OVERRIDE+=	libcdio_cdda.pc.in
 PKGCONFIG_OVERRIDE+=	libcdio_paranoia.pc.in
@@ -30,7 +30,6 @@ pre-patch:
 	${CP} ${FILESDIR}/_cdio_netbsd.c ${WRKSRC}/lib/driver/FreeBSD/freebsd.c
 .endif
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 29da7eac09d..123a1ce1163 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=		yelp-2.10.0
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT=	yes
 BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.4
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -35,7 +35,6 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.yelp
 .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 "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"