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.

24 files changed, 52 insertions, 62 deletions

diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 90c1e63f852..478ef2a30cb 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=		ORBit2-2.12.2
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
 
 CONFLICTS=		linc>=1.1
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
@@ -33,7 +33,6 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/idl$$/ \
 				  " 2>/dev/null || $${TRUE}"; next; }
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/amule/Makefile b/net/amule/Makefile
index c70721de8ed..5151d86a293 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/08/07 11:30:49 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=		aMule-1.2.8
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT=	yes
 CONFLICTS=		xmule-[0-9]*
 
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -28,7 +28,6 @@ LIBS+=			-lm
 UNLIMIT_RESOURCES+=	datasize
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 60b4274c10e..691eeca25e4 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=		bug-buddy-2.10.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 
 GCONF2_SCHEMAS=		bug-buddy.schemas
@@ -29,7 +29,6 @@ GCONF2_SCHEMAS=		bug-buddy.schemas
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 4bbba28e2b5..9ed935c81ca 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=	dc_gui2-0.75
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--enable-manual-db-detect
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
 UNLIMIT_RESOURCES+=	datasize
 
@@ -35,5 +35,4 @@ post-configure:
 .include "../../databases/db4/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index 005209dec7d..bda29b4e47f 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:21 jlam Exp $
 
 DISTNAME=		ed2k-gtk-gui-0.6.3
 PKGREVISION=		1
@@ -9,6 +9,7 @@ MAINTAINER=		minskim@NetBSD.org
 HOMEPAGE=		http://ed2k-gtk-gui.sourceforge.net/
 COMMENT=		GUI for the eDonkey2000 and Overnet
 
+USE_TOOLS+=		pkg-config
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -23,7 +24,6 @@ SUBST_SED.shell=	-e 's,/bin/bash,/bin/sh,g'
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/gnet/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index ad445bb6033..dc1cf5039ec 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:21 jlam Exp $
 
 DISTNAME=	etherape-0.9.1
 PKGREVISION=	1
@@ -9,7 +9,7 @@ MAINTAINER=	damon@NetBSD.org
 HOMEPAGE=	http://etherape.sourceforge.net/
 COMMENT=	Graphical network monitor
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_DIRS+=		xdg-1.1
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
@@ -32,5 +32,4 @@ post-install:
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index d40a3b5021d..1d58e2fa4cf 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2005/07/27 16:44:43 drochner Exp $
+# $NetBSD: Makefile,v 1.114 2005/08/10 20:56:21 jlam Exp $
 
 DISTNAME=		ethereal-0.10.12
 CATEGORIES=		net
@@ -21,7 +21,7 @@ MAINTAINER=		frueauf@NetBSD.org
 HOMEPAGE=		http://www.ethereal.com/
 COMMENT=		Network protocol analyzer
 
-USE_TOOLS+=		perl
+USE_TOOLS+=		perl pkg-config
 
 USE_LIBTOOL=		YES
 SHLIBTOOL_OVERRIDE=	libtool
@@ -52,7 +52,6 @@ pre-build:
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
diff --git a/net/gift/Makefile b/net/gift/Makefile
index 9c84beec965..2bca37727a8 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=	gift-0.11.8.1
@@ -10,6 +10,7 @@ MAINTAINER=	alex@catbull.com
 HOMEPAGE=	http://gift.sourceforge.net/
 COMMENT=	Modular daemon that abstracts filesharing protocols
 
+USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -19,6 +20,5 @@ PKGCONFIG_OVERRIDE+=    ${WRKSRC}/lib/libgift.pc.in
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile
index 88156ed6e4a..dbeb1050083 100644
--- a/net/gkrellm-multiping/Makefile
+++ b/net/gkrellm-multiping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=	gkrellm-multiping-2.0.8
@@ -14,6 +14,8 @@ COMMENT=	Pings several machines and prints out stats
 USE_PKGINSTALL=	YES
 SPECIAL_PERMS+=	${PREFIX}/lib/gkrellm2/plugins/pinger ${SETUID_ROOT_PERMS}
 
+USE_TOOLS+=		pkg-config
+
 PTHREAD_OPTS=		require
 PTHREAD_AUTO_VARS=	yes
 
@@ -21,7 +23,6 @@ post-patch:
 	${SED} -e s,@@PREFIX@@,${PREFIX}, ${WRKSRC}/multiping.c > ${WRKSRC}/multiping.c.sed
 	${CP} ${WRKSRC}/multiping.c.sed ${WRKSRC}/multiping.c
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gkrellm-snmp/Makefile b/net/gkrellm-snmp/Makefile
index 8e04e57c926..9f062400913 100644
--- a/net/gkrellm-snmp/Makefile
+++ b/net/gkrellm-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=	gkrellm_snmp-0.21
@@ -11,8 +11,8 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://triq.net/gkrellm_snmp.html
 COMMENT=	GKrellM plugin to display values collected from a SNMP agent
 
+USE_TOOLS+=		pkg-config
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index bf3a8d132de..5a8846d95e2 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:22 jlam Exp $
 
 DISTNAME=		gkrellmwireless-2.0.3
 PKGNAME=		${DISTNAME:S/gkrellm/gkrellm-/}
@@ -13,9 +13,8 @@ COMMENT=		Wavelan signal strength monitor for gkrellm
 ONLY_FOR_PLATFORM=	*BSD-*-* Linux-*-*
 
 WRKSRC=			${WRKDIR}/gkrellmwireless
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index cd590fa2de3..ddef1db46bf 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=		gnet-2.0.7
@@ -10,6 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnetlibrary.org/
 COMMENT=		Simple network library
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	gnet-2.0.pc.in
 GNU_CONFIGURE=		YES
@@ -18,5 +19,4 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 TEST_TARGET=		check
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile
index 3248b7b3bfd..a4aa1eec523 100644
--- a/net/gnet1/Makefile
+++ b/net/gnet1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=		gnet-1.1.8
@@ -13,6 +13,7 @@ COMMENT=		Simple network library (older version)
 
 CONFLICTS=		gnet<=1.1.8
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	gnet.pc.in
 GNU_CONFIGURE=		YES
@@ -20,5 +21,4 @@ CONFIGURE_ARGS=		--enable-glib2
 TEST_TARGET=		check
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 828db220e6c..6d83b3762d8 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=	gnome-netstatus-2.10.0
@@ -12,7 +12,7 @@ COMMENT=	Network status applet for the GNOME panel
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -23,7 +23,6 @@ GCONF2_SCHEMAS=		netstatus.schemas
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/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/net/howl/Makefile b/net/howl/Makefile
index 43640bf1fb0..ad80c406065 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:22 jlam Exp $
 
 DISTNAME=		howl-0.9.10
 CATEGORIES=		net
@@ -8,6 +8,7 @@ MAINTAINER=		nathanw@NetBSD.org
 HOMEPAGE=		http://www.porchdogsoft.com/products/howl/
 COMMENT=		Zeroconf (Rendezvous) implementation
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
@@ -17,6 +18,5 @@ RCD_SCRIPTS=		howl
 PKG_GROUPS+=		howl
 PKG_USERS+=		howl:howl::Zeroconf\\ user
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/jigdo/Makefile b/net/jigdo/Makefile
index ce44e364fee..4acabe40f34 100644
--- a/net/jigdo/Makefile
+++ b/net/jigdo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:22 jlam Exp $
 
 DISTNAME=		jigdo-0.7.1
 CATEGORIES=		net
@@ -9,13 +9,13 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://atterer.net/jigdo/
 COMMENT=		Tool to ease downloading of large files from the Internet
 
-CONFIGURE_ARGS+=	--without-libdb
-GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-libdb
 
 #.include "../../databases/db3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../www/libwww/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index 75689301f3d..ed5a84dc633 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=		libIDL-0.8.5
@@ -13,7 +13,7 @@ COMMENT=		CORBA Interface Definition Language parser
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		bison flex
+USE_TOOLS+=		bison flex pkg-config
 CONFIGURE_ENV+=		HAVE_YACC=yes
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libIDL-2.0.pc.in
@@ -30,7 +30,6 @@ CONFIGURE_ENV.SunOS+=	CPP=/usr/lib/cpp
 CONFIGURE_ENV+=		F77=${FALSE}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libsoup-devel/Makefile b/net/libsoup-devel/Makefile
index 74311a7a282..f2e57b735b7 100644
--- a/net/libsoup-devel/Makefile
+++ b/net/libsoup-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=		libsoup-2.2.3
@@ -11,6 +11,7 @@ MAINTAINER=		recht@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		HTTP library implementation in C (dev. Version)
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
@@ -20,7 +21,6 @@ PKGCONFIG_OVERRIDE+=    libsoup-2.2.pc.in
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile
index 963ed55465e..6afecd4eb07 100644
--- a/net/libsoup/Makefile
+++ b/net/libsoup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=		libsoup-1.99.28
@@ -11,6 +11,7 @@ MAINTAINER=		recht@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		HTTP library implementation in C
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
@@ -19,7 +20,6 @@ PKGCONFIG_OVERRIDE+=    soup-2.0.pc.in
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 9fc19d086bb..2985c126680 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=		linc-1.1.1
@@ -13,6 +13,7 @@ COMMENT=		Network client/server library
 
 CONFLICTS=		ORBit2>=2.8
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
@@ -23,7 +24,6 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 CONFIGURE_ARGS+=	--with-openssl
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index d3d8c69c19f..14c6e00bbcd 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=	pyorbit-2.0.1
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Python bindings for ORBit2
 
 PY_PATCHPLIST=	YES
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 USE_LIBTOOL=	YES
 PKGCONFIG_OVERRIDE+=	pyorbit-2.pc.in
 GNU_CONFIGURE=	YES
@@ -21,7 +21,6 @@ CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
 BUILDLINK_DEPENDS.python22=	python22>=2.2.2nb2
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index baf64045882..5f5de7cd461 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=		tsclient-0.132
@@ -15,12 +15,11 @@ DEPENDS+=       	vncviewer-[0-9]*:../../net/vncviewer
 BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake perl:run
+USE_TOOLS+=		gmake perl:run pkg-config
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vino/Makefile b/net/vino/Makefile
index d3cbf4ffeb5..0e10e8bd2a8 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:22 jlam Exp $
 #
 
 DISTNAME=	vino-2.10.0
@@ -12,7 +12,7 @@ COMMENT=	VNC server for GNOME
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 
@@ -25,7 +25,6 @@ GCONF2_SCHEMAS=		vino-server.schemas
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/net/wistumbler2-gtk/Makefile b/net/wistumbler2-gtk/Makefile
index b138dcb22b0..da4b9de0129 100644
--- a/net/wistumbler2-gtk/Makefile
+++ b/net/wistumbler2-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:22 jlam Exp $
 #
 
 .include "../../net/wistumbler2/Makefile.common"
@@ -7,6 +7,7 @@ PKGNAME=		${DISTNAME:S/wistumbler2-/wistumbler2-gtk-/}
 
 CONFLICTS+=		wistumbler2-[0-9]*
 
-.include "../../devel/pkg-config/buildlink3.mk"
+USE_TOOLS+=		pkg-config
+
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"