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.

20 files changed, 40 insertions, 52 deletions

diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index 50251bcf3e8..9cdcfd5cfdd 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:23 jlam Exp $
 #
 
 # XXX Do not update to 0.30 or above yet.  The API in the 0.2x series is
@@ -18,7 +18,7 @@ DISTINFO_FILE=	${.CURDIR}/../../sysutils/dbus/distinfo
 PATCHDIR=	${.CURDIR}/../../sysutils/dbus/patches
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 
@@ -78,5 +78,4 @@ BUILDLINK_DEPENDS.dbus+=	dbus>=${DBUS_VERSION}
 .  include "../../sysutils/dbus/buildlink3.mk"
 .endif
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile
index 97b189a61da..5c677865ed1 100644
--- a/sysutils/desktop-file-utils/Makefile
+++ b/sysutils/desktop-file-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=	desktop-file-utils-0.10
@@ -9,6 +9,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.freedesktop.org/Software/desktop-file-utils
 COMMENT=	Utilities to manage desktop entries
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		YES
@@ -29,6 +30,5 @@ PRINT_PLIST_AWK+=	/^share\/applications\/mimeinfo.cache$$/ \
 				  next; }
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile
index 96b8e95de5a..d615d126bc5 100644
--- a/sysutils/gkrellm-server/Makefile
+++ b/sysutils/gkrellm-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:23 jlam Exp $
 .include "../../sysutils/gkrellm/Makefile.common"
 
 PKGREVISION=		# empty1
@@ -7,6 +7,7 @@ GKRELLM_PKGBASE=	gkrellm-server
 COMMENT=		Monitoring daemon remotely accessible by a GKrellM client
 DEPENDS+=		gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
 
+USE_TOOLS+=		pkg-config
 USE_PKGINSTALL=		YES
 PTHREAD_OPTS=		require
 RCD_SCRIPTS=		gkrellmd
@@ -43,6 +44,5 @@ MAKE_ENV+=		USE_GLIB12=yes
 .else
 .include "../../devel/glib2/buildlink3.mk"
 .endif
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 6d163dd696b..6455a72d385 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/10 20:56:23 jlam Exp $
 .include "Makefile.common"
 
 PKGREVISION=		# empty1
@@ -11,6 +11,7 @@ COMMENT=		GTK2 based system monitor
 DEPENDS+=		gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
 
 USE_PKGINSTALL=		YES
+USE_TOOLS+=		pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -35,7 +36,6 @@ post-install:
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index b8ca0ac9414..12530a5cfc8 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=	gnome-menus-2.10.1
@@ -13,7 +13,7 @@ COMMENT=	Implementation of the desktop menu specification for GNOME
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.2
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -41,7 +41,6 @@ BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index f0f5c580614..3ee1765d1b7 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=	gnome-pkgview-1.0.6
@@ -12,6 +12,7 @@ COMMENT=	Displays the version of GNOME components installed
 
 BUILD_USES_MSGFMT=	yes
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
@@ -22,7 +23,6 @@ GCONF2_SCHEMAS=		gnome-pkgview.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index e655cfd840a..db36c981791 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2005/08/10 20:56:23 jlam Exp $
 
 DISTNAME=		gnome-vfs-1.0.5
 PKGREVISION=		8
@@ -14,7 +14,7 @@ BUILDLINK_DEPENDS.gnome-mime-data=	gnome-mime-data>=2.0.1
 
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
@@ -27,7 +27,6 @@ CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=yes
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index 3861588d9b3..dca88d4b603 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=		gnome-vfs-2.10.1
@@ -19,7 +19,7 @@ PATCHDIR=		${.CURDIR}/../../sysutils/gnome-vfs2/patches
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 
@@ -88,5 +88,4 @@ do-install:
 			${PREFIX}/lib/gnome-vfs-2.0/modules
 .endif
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile
index 3ca827e8e14..9fb1e0ffb56 100644
--- a/sysutils/gnome-vfsmm/Makefile
+++ b/sysutils/gnome-vfsmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 21:47:36 adam Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:24 jlam Exp $
 
 DISTNAME=	gnome-vfsmm-2.10.0
 CATEGORIES=	sysutils
@@ -12,11 +12,10 @@ COMMENT=	C++ bindings for gnome-vfs
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgnomevfs/gnome-vfsmm-2.6.pc.in
 GNU_CONFIGURE=		yes
 
 .include "../../devel/glibmm/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index 3ac27089a97..921d1a579f2 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.10.1
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT=	yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		autoconf gmake
+USE_TOOLS+=		autoconf gmake pkg-config
 
 LIBS+=			-lutil
 GCONF2_SCHEMAS+=	gnome-system-monitor.schemas
@@ -30,7 +30,6 @@ pre-configure:
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/libgtop2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile
index 03171910a9c..badabff29b3 100644
--- a/sysutils/gtk-send-pr/Makefile
+++ b/sysutils/gtk-send-pr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=		gtk-send-pr-0.4.5
@@ -10,8 +10,8 @@ MAINTAINER=		flynn@energyhq.es.eu.org
 HOMEPAGE=		http://www.energyhq.es.eu.org/gtk-send-pr.html
 COMMENT=		GTK+ based problem report tool
 
+USE_TOOLS+=		pkg-config
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mail/libesmtp/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index 14549562bb7..2871778f3ef 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=	idesk-0.7.2
@@ -11,7 +11,7 @@ COMMENT=	Lightweight desktop icons handler
 
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
 CONFIGURE_ARGS+=	--enable-libsn
 
@@ -19,7 +19,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/idesk
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/idesk
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index 114f61b0a19..9f8094bf876 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/08/10 20:56:24 jlam Exp $
 
 DISTNAME=		libgtop-2.10.1
 PKGNAME=		${DISTNAME:S/-/2-/}
@@ -16,7 +16,7 @@ OSVERSION_SPECIFIC=	YES
 USE_MSGFMT_PLURALS=	YES
 
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libgtop-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	support/gnome-support-2.0.pc.in
@@ -98,6 +98,5 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 0a4a050af81..33b166f9398 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2005/08/04 21:11:48 rillig Exp $
+# $NetBSD: Makefile,v 1.63 2005/08/10 20:56:24 jlam Exp $
 
 DISTNAME=	mc-4.6.1
 CATEGORIES=	sysutils
@@ -9,6 +9,7 @@ MAINTAINER=	pavel.arnost@clnet.cz
 HOMEPAGE=	http://www.ibiblio.org/mc/
 COMMENT=	User-friendly file manager and visual shell
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -39,5 +40,4 @@ PLIST_SRC+=  	${PKGDIR}/PLIST
 PLIST_SRC+=	${PKGDIR}/PLIST.end
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index c2d47765f95..52a0cf8729c 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.10.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 USE_MSGFMT_PLURALS=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
@@ -42,7 +42,6 @@ GCONF2_SCHEMAS=		ncb.schemas
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 9b975694b9a..7298437ffec 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=		nautilus-2.10.1
@@ -12,7 +12,7 @@ COMMENT=		Nautilus file manager for GNOME2
 
 USE_PKGLOCALEDIR=	yes
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
@@ -37,7 +37,6 @@ BUILDLINK_DEPENDS.startup-notification+=	startup-notification>=0.8
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile
index 5f7a4e824a3..faaa420ff6f 100644
--- a/sysutils/rox-session/Makefile
+++ b/sysutils/rox-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=	ROX-Session-0.1.14
@@ -17,11 +17,11 @@ DEPENDS+=	rox>=1.2.0nb2:../../sysutils/rox
 WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Session/src
 DIST_SUBDIR=	rox
 
+USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	libexec/rox share/rox
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index cbc0086b092..47e971535d0 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=	rox-2.2.0
@@ -17,6 +17,7 @@ CONFLICTS=	rox-base-[0-9]*
 WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Filer/src
 DIST_SUBDIR=	rox
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		APP_DIR=${WRKDIR}/${DISTNAME}/ROX-Filer
 CONFIGURE_ARGS+=	--enable-rox --with-platform=${OPSYS}-${MACHINE_ARCH}
@@ -52,7 +53,6 @@ do-install:
 			${PREFIX}/share/mime/packages
 
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index 50be338cec1..0a8ef8c0e8f 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=	vcdimager-0.7.22
@@ -9,7 +9,7 @@ MAINTAINER=	ben@NetBSD.org
 HOMEPAGE=	http://www.vcdimager.org/
 COMMENT=	Mastering suite for Video CDs
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
 INFO_FILES=	vcd-info.info vcdimager.info vcdxrip.info
@@ -22,7 +22,6 @@ BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=libvcdinfo.la.ver
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 5e49e00d500..197b0753080 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:24 jlam Exp $
 
 DISTNAME=	xcdroast-0.98alpha15
 PKGNAME=	xcdroast-0.98a15
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 DEPENDS+=		cdrecord-xcdroast-0.98a15.*:../../sysutils/cdrecord-xcdroast
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -51,7 +51,6 @@ post-install:
 	done)
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"