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.

18 files changed, 36 insertions, 48 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 2756e1b3840..59b1d58d589 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=	avidemux-2.0.40
@@ -13,7 +13,7 @@ GCC_REQD=		3.0
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
 CPPFLAGS+=		-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 LDFLAGS+=		${LIBOSSAUDIO}
@@ -46,7 +46,6 @@ post-configure:
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../multimedia/mjpegtools/buildlink3.mk"
 .include "../../multimedia/xvidcore/buildlink3.mk"
diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile
index 73a5927aed0..837e2cb680c 100644
--- a/multimedia/dirac/Makefile
+++ b/multimedia/dirac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=		Dirac-0.2.0
@@ -10,10 +10,10 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://dirac.sourceforge.net/
 COMMENT=		Open-source video codec designed at the BBC
 
+USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	dirac.pc.in
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 5e1f4cd573b..299fdf0ddda 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/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=	gmencoder-0.1.0
@@ -17,7 +17,7 @@ DEPENDS+=       	mplayer>=0.90:../../multimedia/mplayer
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=       	gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -36,6 +36,5 @@ post-install:
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index c4b8c448251..5482ea8d444 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:20 jlam Exp $
 
 DISTNAME=		gnome-media-2.10.2
 CATEGORIES=		multimedia gnome
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
@@ -44,7 +44,6 @@ GCONF2_SCHEMAS+=	gnome-sound-recorder.schemas
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../multimedia/gst-plugins/buildlink3.mk"
 .include "../../multimedia/gstreamer/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index d6694ad6a39..41f9bc8e0ca 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=		gst-plugins-0.8.9
@@ -18,7 +18,7 @@ PATCHDIR=		${.CURDIR}/../../multimedia/gst-plugins/patches
 BUILD_DEPENDS+=		nasm>=0.98.38:../../devel/nasm
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -166,5 +166,4 @@ BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.9.1
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../multimedia/gstreamer/plugins.mk"
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index caccc72669e..214f3b3a4b9 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/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:20 jlam Exp $
 #
 
 DISTNAME=		gstreamer-0.8.10
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 
 CONFIGURE_ARGS+=	--disable-plugin-builddir
 CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/libdata/gstreamer-0.8
@@ -42,7 +42,6 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb1
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../lang/python/application.mk"
 _GSTREAMER_NO_DEPEND=		# defined
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 10c33ec536f..de93226325e 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2005/08/10 20:56:20 jlam Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
 CATEGORIES=	multimedia
@@ -8,6 +8,7 @@ COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
 DEPENDS+=	xine-arts>=1rc0a:../../audio/xine-arts
 
+USE_TOOLS+=		pkg-config
 USE_DIRS+=		xdg-1.2
 USE_PKGINSTALL=		YES
 
@@ -52,7 +53,6 @@ UNLIMIT_RESOURCES+=	datasize
 .include "../../audio/musicbrainz/buildlink3.mk"
 .include "../../audio/tunepimp/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index d930e22cf75..228c2d526a8 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/25 12:49:08 markd Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=	kmplayer-0.9.0a
@@ -16,7 +16,7 @@ DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
 DEPENDS+=		xine-arts>=1rc0a:../../audio/xine-arts
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
@@ -30,7 +30,6 @@ SUBST_STAGE.desktop=	pre-configure
 SUBST_FILES.desktop=	src/kmplayer.desktop
 SUBST_SED.desktop=	-e 's|@PREFIX@|${PREFIX}|g'
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile
index 010b89b882d..746ee68b953 100644
--- a/multimedia/libassetml/Makefile
+++ b/multimedia/libassetml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=		libassetml-1.2.1
@@ -12,7 +12,7 @@ COMMENT=		Library for sharing image and audio files between projects
 BUILD_DEPENDS+=	texi2html-[0-9]*:../../textproc/texi2html
 
 USE_DIRS+=		gnome2-1.5	# share/gnome/help
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
@@ -21,7 +21,6 @@ GNU_CONFIGURE=		yes
 INFO_FILES=		libassetml.info
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdv/Makefile.common b/multimedia/libdv/Makefile.common
index 0da05f145ba..7bae949de61 100644
--- a/multimedia/libdv/Makefile.common
+++ b/multimedia/libdv/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/08/10 20:56:20 jlam Exp $
 
 DISTNAME=	libdv-0.104
 CATEGORIES=	multimedia
@@ -11,6 +11,7 @@ COMMENT=	DV video codec library
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/libdv/distinfo
 PATCHDIR=		${.CURDIR}/../../multimedia/libdv/patches
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -32,7 +33,6 @@ LIBS+=		${LIBOSSAUDIO}
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index c496ee8e583..096f7e8a2bb 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:20 jlam Exp $
 
 DISTNAME=	mpeg2dec-0.4.0b
 PKGNAME=	libmpeg2-0.4.0b
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}/mpeg2dec-0.4.0
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 USE_LIBTOOL=	yes
 
 PKGCONFIG_OVERRIDE+=    libmpeg2/convert/libmpeg2convert.pc.in
@@ -25,5 +25,4 @@ PKGCONFIG_OVERRIDE+=    libmpeg2/libmpeg2.pc.in
 CONFIGURE_ARGS+=	--enable-shared
 
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libogg/Makefile b/multimedia/libogg/Makefile
index 14afba5705c..4048807f1d3 100644
--- a/multimedia/libogg/Makefile
+++ b/multimedia/libogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=	libogg-1.1.2
@@ -12,6 +12,7 @@ COMMENT=	Ogg project codecs library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
@@ -23,6 +24,5 @@ PKGCONFIG_OVERRIDE+=	ogg.pc.in
 
 TEST_TARGET=	check
 
-.include "../../devel/pkg-config/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index 643307b43a9..c9ce766aeda 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=		mplayerplug-in-2.70
@@ -14,7 +14,7 @@ DEPENDS+=		mplayer>=0.92:../../multimedia/mplayer
 
 WRKSRC=			${WRKDIR}/mplayerplug-in
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES+=		c++
 USE_PKGINSTALL=		yes
 
@@ -65,6 +65,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.xpt	\
 		${PREFIX}/lib/${BROWSER}/plugins
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index e19e265afd8..6d8fc19f78d 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:20 jlam Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}-src
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.openquicktime.org/
 COMMENT=		Portable library for handling QuickTime(TM) media files
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV+=		my_cv_comment=""
@@ -25,6 +25,5 @@ pre-configure:
 	${CHMOD} +x ${BUILDLINK_DIR}/bin/glib-config-2.0
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/swfdec/Makefile.common b/multimedia/swfdec/Makefile.common
index 095e114e322..cded6a94a66 100644
--- a/multimedia/swfdec/Makefile.common
+++ b/multimedia/swfdec/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=		swfdec-0.2.2
@@ -12,6 +12,7 @@ COMMENT=		Library for rendering Flash(R) animations and games
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/swfdec/distinfo
 PATCHDIR=		${.CURDIR}/../../multimedia/swfdec/patches
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -24,4 +25,3 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 pre-install:
 	${ECHO} "install:" >${WRKSRC}/plugin/Makefile
 
-.include "../../devel/pkg-config/buildlink3.mk"
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index edc070f4928..9456f715e8a 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=	totem-1.0.2
@@ -15,7 +15,7 @@ PLIST_SRC=	${.CURDIR}/../../multimedia/totem/PLIST
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -32,7 +32,6 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 403595e6276..f99685a2f20 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/07/29 16:09:11 drochner Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/08/10 20:56:21 jlam Exp $
 #
 
 DISTNAME=		xine-lib-1.0.2
@@ -20,7 +20,7 @@ USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
-USE_TOOLS+=		autoconf gmake
+USE_TOOLS+=		autoconf gmake pkg-config
 
 CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
 CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest
@@ -42,7 +42,6 @@ pre-configure:
 	cd ${WRKSRC} && autoconf
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile
index 47559b21ee1..67626a249c7 100644
--- a/multimedia/xvid4conf/Makefile
+++ b/multimedia/xvid4conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:21 jlam Exp $
 
 DISTNAME=	xvid4conf-1.12
 PKGREVISION=	1
@@ -9,8 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://zebra.fh-weingarten.de/~transcode/
 COMMENT=	XviD Configuration Panel
 
+USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	YES
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"