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.

34 files changed, 70 insertions, 84 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 5dc2c70232b..4424984033c 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:10 jlam Exp $
 
 DISTNAME=		amarok-1.2.4
 CATEGORIES=		audio kde
@@ -10,7 +10,7 @@ HOMEPAGE=		http://amarok.kde.org/
 COMMENT=		KDE audio player
 
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
@@ -29,7 +29,6 @@ BUILDLINK_DEPENDS.arts+=	arts>=1.2
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../audio/tunepimp/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../multimedia/gst-plugins/buildlink3.mk"
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index a47a61214f9..226ed071d6d 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/07/30 10:56:13 markd Exp $
+# $NetBSD: Makefile,v 1.46 2005/08/10 20:56:10 jlam Exp $
 
 DISTNAME=	arts-1.4.2
 CATEGORIES=	audio
@@ -9,7 +9,7 @@ COMMENT=	Analog Real-Time Synthesizer
 
 CONFLICTS+=	kdelibs-2*
 
-USE_TOOLS+=	perl
+USE_TOOLS+=	perl pkg-config
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
@@ -22,7 +22,6 @@ _IN_ARTS_BUILD=		yes
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile
index a13e7691228..23d639ad646 100644
--- a/audio/aumix-gtk/Makefile
+++ b/audio/aumix-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/10 20:56:10 jlam Exp $
 
 .include "../../audio/aumix/Makefile.common"
 
@@ -8,8 +8,9 @@ COMMENT+=	(ncurses and GTK+ 2.0 interfaces)
 
 CONFLICTS=	aumix-[0-9]*
 
+USE_TOOLS+=	pkg-config
+
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/^--without-gtk$//}
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index b802ad3fe10..a1e89c7eb9a 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:11 jlam Exp $
 #
 
 DISTNAME=		bmp-musepack-1.1
@@ -10,9 +10,9 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.musepack.net/
 COMMENT=		BMP plugin for Musepack (mpc) files
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 
 .include "../../audio/bmp/buildlink3.mk"
 .include "../../audio/libmusepack/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 1614bea0b7d..4c9a2108069 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/08/01 00:09:35 rillig Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/08/10 20:56:11 jlam Exp $
 #
 
 DISTNAME=	bmp-0.9.7
@@ -17,6 +17,7 @@ GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS+=	--disable-alsa
 CONFIGURE_ARGS+=	--disable-esd
@@ -77,7 +78,6 @@ post-patch:
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 666fadedee8..29b0c18b409 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:11 jlam Exp $
 
 DISTNAME=	gkrellm-volume-2.1.13
 CATEGORIES=	audio
@@ -10,14 +10,13 @@ COMMENT=	Gkrellm2 volume mixer plugin
 
 BUILD_USES_MSGFMT=	YES
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	YES
 WRKSRC=			${WRKDIR}/gkrellm-volume
 
 MAKE_ENV+=	LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
 		enable_nls=1
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 9e41760aab9..85a79231de0 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:11 jlam Exp $
 #
 
 DISTNAME=	gkrellmms-2.1.20
@@ -11,7 +11,7 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmms.phtml
 COMMENT=	GKrellM2 plugin to remotely control XMMS
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	YES
 BUILD_USES_MSGFMT=	YES
 
@@ -21,7 +21,6 @@ WRKSRC=		${WRKDIR}/gkrellmms
 MAKE_ENV+=	LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
 		enable_nls=1
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index adcc02c3b6d..5534e74816e 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:11 jlam Exp $
 #
 
 DISTNAME=		gmpc-0.11.2
@@ -11,10 +11,10 @@ COMMENT=		GNOME client for the Music Player Daemon
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 
 USE_DIRS+=		xdg-1.1
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
index d84e4e0fa76..382a3f59cf0 100644
--- a/audio/gnome-speech/Makefile
+++ b/audio/gnome-speech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:11 jlam Exp $
 #
 
 DISTNAME=	gnome-speech-0.3.6
@@ -14,7 +14,7 @@ DIST_SUBDIR=	gnome-speech-0.3.6v2
 
 BUILD_USES_MSGFMT=	yes
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -28,7 +28,6 @@ PKGCONFIG_OVERRIDE+=    gnome-speech-1.0.pc.in
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/goom/Makefile b/audio/goom/Makefile
index 66fa821b9a9..36184aa450b 100644
--- a/audio/goom/Makefile
+++ b/audio/goom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:11 jlam Exp $
 #
 
 DISTNAME=		goom-2k4-0-src
@@ -16,7 +16,7 @@ USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgoom2.pc.in
 GNU_CONFIGURE=		yes
 GCC_REQD+=		3.3
+USE_TOOLS+=		pkg-config
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 4b21e68d0f3..5bcdedd73f5 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:11 jlam Exp $
 
 DISTNAME=		gqmpeg-0.91.1
 PKGREVISION=		2
@@ -14,6 +14,7 @@ DEPENDS+=		mpg123{,-esound,-nas}>=0.59.18:../../audio/mpg123
 DEPENDS+=		vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
 DEPENDS+=		xmp>=2.0.2:../../audio/xmp
 
+USE_TOOLS+=		pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_DIRS+=		xdg-1.2
 USE_PKGINSTALL=		YES
@@ -28,7 +29,6 @@ DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 .include "options.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/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 4e3cf68b1d5..2936eb7a9c6 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/08/10 20:56:11 jlam Exp $
 
 DISTNAME=	libao-0.8.6
 CATEGORIES=	audio devel
@@ -12,7 +12,7 @@ DISTINFO_FILE=	${.CURDIR}/../../audio/libao/distinfo
 PATCHDIR=	${.CURDIR}/../../audio/libao/patches
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE+=	ao.pc.in
@@ -32,6 +32,5 @@ CONFIGURE_ARGS+=	ENABLE_SOLARIS=no
 
 MAKE_ENV+=		DLLIB=${BUILDLINK_LDADD.dl}
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 0fefeaad618..8416864b339 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:11 jlam Exp $
 
 DISTNAME=	libcdaudio-0.99.12
 PKGREVISION=	1
@@ -11,9 +11,9 @@ COMMENT=	Multi-platform CD player development library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	libcdaudio.pc.in
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index 54adc331c1c..8bb666ff543 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/08/08 08:41:44 adam Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/10 20:56:11 jlam Exp $
 
 DISTNAME=	libcddb-1.2.1
 CATEGORIES=	audio
@@ -17,9 +17,9 @@ PKGCONFIG_OVERRIDE+=	libcddb.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-cdio
 GCC_REQD+=		2.95
+USE_TOOLS+=		pkg-config
 
 TEST_TARGET=		check
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index 53d34999011..c8dac1b1764 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:11 jlam Exp $
 #
 
 DISTNAME=	libid3tag-0.15.1b
@@ -17,6 +17,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
+USE_TOOLS+=		pkg-config
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
@@ -31,6 +32,5 @@ post-build:
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/id3tag.pc ${PREFIX}/lib/pkgconfig
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index d6b748b1d40..6014e43a698 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:11 jlam Exp $
 #
 
 DISTNAME=	libmad-0.15.1b
@@ -17,6 +17,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
+USE_TOOLS+=		pkg-config
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
@@ -31,5 +32,4 @@ post-build:
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mad.pc ${PREFIX}/lib/pkgconfig
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile
index e481a1d29b8..eecb0124274 100644
--- a/audio/libopendaap/Makefile
+++ b/audio/libopendaap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/05 12:53:08 tonio Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:11 jlam Exp $
 
 DISTNAME=	libopendaap-0.4.0
 CATEGORIES=	audio
@@ -12,8 +12,7 @@ COMMENT=	DAAP client library
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-.include "../../devel/pkg-config/buildlink3.mk"
+USE_TOOLS+=		pkg-config
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual-bmp/Makefile b/audio/libvisual-bmp/Makefile
index 750232a2924..6017a1360fe 100644
--- a/audio/libvisual-bmp/Makefile
+++ b/audio/libvisual-bmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=		libvisual-bmp-0.2.0
@@ -13,6 +13,7 @@ COMMENT=		Libvisual Beep Media Player plugin
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 
 post-extract:
 	${MV} ${WRKSRC}/pixmaps/libvisual-xmms-vis.bmp \
@@ -23,7 +24,6 @@ post-extract:
 .include "../../audio/bmp/buildlink3.mk"
 .include "../../audio/libvisual/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
diff --git a/audio/libvisual-plugins/Makefile b/audio/libvisual-plugins/Makefile
index 327fbc6641a..ba47939a1ba 100644
--- a/audio/libvisual-plugins/Makefile
+++ b/audio/libvisual-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=		libvisual-plugins-0.2.0
@@ -15,12 +15,12 @@ CONFLICTS=		libvisual-nebulus-[0-9]* libvisual-gforce-[0-9]*
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 
 # sigsegfaults in 0.2.0 because of:
 # sorry, but the bug with strtof has come, please report..
 CONFIGURE_ARGS+=	--disable-dancingparticles
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../audio/goom/buildlink3.mk"
 .include "../../audio/libvisual/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
diff --git a/audio/libvisual-xmms/Makefile b/audio/libvisual-xmms/Makefile
index 7fcf019d75a..dbb86c75a73 100644
--- a/audio/libvisual-xmms/Makefile
+++ b/audio/libvisual-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=		libvisual-xmms-0.2.0
@@ -13,11 +13,11 @@ COMMENT=		XMMS plugin for libvisual
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 
 .include "../../audio/libvisual/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile
index 2ea5d1b1439..d22e07881ed 100644
--- a/audio/libvisual/Makefile
+++ b/audio/libvisual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:11 jlam Exp $
 #
 
 DISTNAME=		libvisual-0.2.0
@@ -12,7 +12,7 @@ COMMENT=		Abstraction library between applications and audio visualisation plugi
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libvisual.pc.in
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index dcf92dbde30..8ba923dc02b 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:12 jlam Exp $
 
 DISTNAME=	liteamp-0.2.4.2
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	Light-weight Music Player for GNOME2
 
 USE_DIRS+=		gnome2-1.5
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 
@@ -23,7 +23,6 @@ CPPFLAGS+=		-UGTK_DISABLE_DEPRECATED
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 851fedb6e88..0a76bf8ab66 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=	MuSE-0.9
@@ -13,8 +13,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://muse.dyne.org/
 COMMENT=	Multiple Streaming Engine
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--disable-ncurses
@@ -33,7 +33,6 @@ SUBST_MESSAGE.dsp=	"Fixing hardcoded audio device."
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile
index 241f042eafa..59616554f48 100644
--- a/audio/musicbrainz/Makefile
+++ b/audio/musicbrainz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:12 jlam Exp $
 
 DISTNAME=	libmusicbrainz-2.1.1
 PKGNAME=	${DISTNAME:S/lib//}
@@ -12,7 +12,7 @@ COMMENT=	Second generation incarnation of the CD Index
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
@@ -21,5 +21,4 @@ PKGCONFIG_OVERRIDE=	libmusicbrainz.pc.in
 CONFIGURE_ARGS+=	--enable-cpp-headers
 
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index eba29c2d575..9b9ccb09d48 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:12 jlam Exp $
 
 DISTNAME=		ncmpc-0.11.1
 CATEGORIES=		audio
@@ -12,12 +12,11 @@ COMMENT=		Curses client for Music Player Daemon
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
 
 INCOMPAT_CURSES=	NetBSD-1.4*-* NetBSD-1.5*-*
 INCOMPAT_CURSES+=	NetBSD-1.6.*-* NetBSD-1.6_*-*
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 16100db760f..4d05b4a5ef9 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=	rhythmbox-0.8.8
@@ -21,7 +21,7 @@ BUILDLINK_DEPENDS.gst-plugins+=	gst-plugins>=0.8.1
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -37,7 +37,6 @@ GCONF2_SCHEMAS=		rhythmbox.schemas
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../multimedia/gstreamer/buildlink3.mk"
 .include "../../multimedia/gst-plugins/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 8acdfcc4e4b..c31f41df9d0 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=	speex-1.0.5
@@ -12,6 +12,7 @@ COMMENT=	Open-source, patent-free voice codec
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	speex.pc.in
+USE_TOOLS+=		pkg-config
 
 # previous versions of the package were called Speex
 CONFLICTS=	Speex-[0-9]*
@@ -24,7 +25,6 @@ CONFIGURE_ENV+=         F77=${FALSE}
 BUILDLINK_TRANSFORM+=	l:gnugetopt:getopt
 
 .include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 28391bd5e0e..43ece1018f1 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=	streamtuner-0.99
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=	hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
 BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -23,7 +23,6 @@ GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	extras/streamtuner.pc.in
 
 .include "../../audio/taglib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 6badb5994da..58f8db80f3e 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=	sweep-0.8.3
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 USE_DIRS+=		gnome1-1.5
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	YES
 
 GNU_CONFIGURE=		YES
@@ -32,7 +32,6 @@ MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS}
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index fe277ebe2f6..82f0749b455 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/05 12:58:49 tonio Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=		tunesbrowser-0.3.0
@@ -13,6 +13,7 @@ COMMENT=		Front-end for DAAP client
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/tunesbrowser
 DEPENDS+=		gst-plugins-esound>=0.8.1:../../audio/gst-plugins-esound
@@ -23,7 +24,6 @@ BUILDLINK_DEPENDS.libopendaap+=	libopendaap>=0.4.0
 .include "../../multimedia/gst-plugins/buildlink3.mk"
 .include "../../audio/libopendaap/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../multimedia/gstreamer/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/gst-plugins-gnomevfs/buildlink3.mk"
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 549d57af8ad..8cc1923b88f 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:12 jlam Exp $
 
 DISTNAME=		faad2-2.0
 PKGNAME=		xmms-faad-2.0
@@ -14,7 +14,7 @@ COMMENT=		XMMS plugin for faad
 #NO_BIN_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/faad2
-USE_TOOLS+=		automake14 gmake
+USE_TOOLS+=		automake14 gmake pkg-config
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 SHLIBTOOL_OVERRIDE=	libtool
@@ -49,6 +49,5 @@ do-install:
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/id3lib/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index 575d92b106f..cf4b08daedb 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=		xmms-mad-0.5.5
@@ -11,12 +11,12 @@ HOMEPAGE=		http://sourceforge.net/projects/xmms-mad/
 COMMENT=		Input plugin for XMMS that uses libmad
 
 GNU_CONFIGURE=		YES
+USE_TOOLS+=		pkg-config
 
 CPPFLAGS.NetBSD+=	-DHAVE_NANOSLEEP=1
 
 BUILDLINK_DEPENDS.libmad=	libmad>=0.15.0bnb1
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 7f43381e1e1..bf62e132874 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=		modplugxmms-2.05
@@ -17,6 +17,7 @@ LDFLAGS+=		-lm ${LIBOSSAUDIO}
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool-disable-static
+USE_TOOLS+=		pkg-config
 
 CFLAGS+=		-DDEVICE_NAME="\"${DEVOSSSOUND}\""
 USE_LANGUAGES=		c c++
@@ -25,7 +26,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../audio/libmodplug/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index 752d06b29c3..4999b012487 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:12 jlam Exp $
 #
 
 DISTNAME=		xmms-musepack-1.1
@@ -12,10 +12,10 @@ COMMENT=		XMMS plugin for musepack (mpc) files
 
 USE_LANGUAGES=		c++
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 
 .include "../../audio/libmusepack/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"