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.

26 files changed, 52 insertions, 68 deletions

diff --git a/graphics/blinkenthemes/Makefile b/graphics/blinkenthemes/Makefile
index 21498446324..09e3cf58faf 100644
--- a/graphics/blinkenthemes/Makefile
+++ b/graphics/blinkenthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=	blinkenthemes-0.8
@@ -11,8 +11,7 @@ HOMEPAGE=	http://www.blinkenlights.de/
 COMMENT=	Blinkenlights simulator themes
 
 GNU_CONFIGURE=	YES
+USE_TOOLS+=	pkg-config
 
 .include "../../devel/blib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/blinkentools/Makefile b/graphics/blinkentools/Makefile
index a938b5e8db3..7cf220ea82f 100644
--- a/graphics/blinkentools/Makefile
+++ b/graphics/blinkentools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=		blinkentools-2.2
@@ -10,12 +10,12 @@ MAINTAINER=		salo@NetBSD.org
 HOMEPAGE=		http://www.blinkenlights.de/
 COMMENT=		Blinkenlights movies tools collection
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--enable-oldtools
 
 .include "../../devel/blib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index e7e43e6d4b3..9e2b3ac494f 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:17 jlam Exp $
 
 DISTNAME=	cairo-0.5.1
 CATEGORIES=	graphics
@@ -8,6 +8,7 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://cairographics.org/
 COMMENT=	Vector graphics library with cross-device output support
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -20,7 +21,6 @@ BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.5
 BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2
 BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index e1d214a876a..f7ba7b61269 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=	dia-0.94
@@ -14,7 +14,7 @@ DISTINFO_FILE=		${.CURDIR}/../../graphics/dia/distinfo
 PATCHDIR=		${.CURDIR}/../../graphics/dia/patches
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -45,7 +45,6 @@ BUILDLINK_DEPMETHOD.gtk2+=		build
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 67036822d06..9cc082d63fb 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:17 jlam Exp $
 
 DISTNAME=		digikam-0.7.2
 CATEGORIES=		graphics kde
@@ -10,13 +10,12 @@ HOMEPAGE=		http://digikam.sourceforge.net/
 COMMENT=		KDE frontend to gphoto2
 
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../graphics/libkexif/buildlink3.mk"
 .include "../../graphics/libkipi/buildlink3.mk"
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 2f7cc6fc4c4..45cf81310a3 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=	eog-2.10.2
@@ -13,7 +13,7 @@ COMMENT=	Eye of GNOME: an image viewing and cataloging program
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 
@@ -28,7 +28,6 @@ BUILDLINK_DEPENDS.libart2+=	libart2>=2.3.16
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index 11df9471143..f47cf4d656a 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=	exif-0.6.9
@@ -12,6 +12,7 @@ COMMENT=	Grab Exif information from digital camera images
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -20,7 +21,6 @@ LIBS+=		${BUILDLINK_LDADD.iconv}
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 6d2497f864a..816ff02561e 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=		gfract-0.30
@@ -10,7 +10,7 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		http://www.cs.Helsinki.FI/u/salerma/gfract/
 COMMENT=		Gtk-based fractal program
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 BUILD_TARGET=		gfract
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -23,7 +23,6 @@ SUBST_SED.prefix=	-e "s,/usr/local,${PREFIX},g"
 
 INSTALLATION_DIRS=	bin
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index b0961b1bb53..2f01e0d8ce0 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:17 jlam Exp $
 
 DISTNAME=	gimageview-0.2.27
 CATEGORIES=	graphics
@@ -13,7 +13,7 @@ USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
 CONFIGURE_ARGS+=	--disable-xinetest
 CONFIGURE_ARGS+=	--with-gtk2
@@ -26,7 +26,6 @@ LDFLAGS.NetBSD+=	${PTHREAD_LDFLAGS}
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index 705885be4cc..8a37429c373 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/10 19:01:24 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=		ufraw-0.4
@@ -10,13 +10,12 @@ MAINTAINER=		gdt@NetBSD.org
 HOMEPAGE=		http://ufraw.sourceforge.net/
 COMMENT=		GIMP plug-in for raw digicam import
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 BUILD_TARGET=		build
 INSTALL_TARGET=		install-admin
 
 BUILDLINK_TRANSFORM+=	rm:-std=gnu99
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/gimp/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index c970d7937ed..003cf8d2e4f 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2005/08/02 09:54:52 tron Exp $
+# $NetBSD: Makefile,v 1.125 2005/08/10 20:56:17 jlam Exp $
 
 DISTNAME=	gimp-2.2.8
 PKGREVISION=	1
@@ -21,7 +21,7 @@ CONFLICTS+=		gimp<=1.2.3
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
 PKG_SYSCONFSUBDIR=	gimp/2.0
 
@@ -57,7 +57,6 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/aalib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index f08619043fc..faa960e7ba5 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:17 jlam Exp $
 
 DISTNAME=	gphoto2-2.1.6
 CATEGORIES=	graphics
@@ -10,6 +10,7 @@ COMMENT=	Digital camera access command line client
 
 CONFLICTS=	gphoto-[0-9]*
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -29,7 +30,6 @@ CONFIGURE_ARGS+=	--without-readline
 .include "../../devel/cdk/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/aalib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 8a560e7560f..090f996a741 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2005/08/10 20:56:17 jlam Exp $
 
 DISTNAME=	gqview-2.0.1
 CATEGORIES=	graphics x11
@@ -10,12 +10,12 @@ COMMENT=	GTK2-based graphic file viewer
 
 BUILD_USES_MSGFMT=	# defined
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		# defined
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	# defined
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 8456ba84cc5..5033496193a 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2005/08/10 20:56:18 jlam Exp $
 #
 
 DISTNAME=	graphviz-2.2.1
@@ -15,6 +15,7 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 XAW_TYPE=		standard
@@ -40,7 +41,6 @@ pre-build:
 	${TOUCH} ${WRKSRC}/Makefile
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 30b94073b01..9b9df2d1b4d 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:18 jlam Exp $
 
 DISTNAME=		gthumb-2.6.6
 CATEGORIES=		graphics
@@ -8,6 +8,7 @@ MAINTAINER=		minskim@NetBSD.org
 HOMEPAGE=		http://gthumb.sourceforge.net/
 COMMENT=		Image viewer and browser for the GNOME Desktop
 
+USE_TOOLS+=		pkg-config
 USE_DIRS+=		xdg-1.1 gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
@@ -24,7 +25,6 @@ GCONF2_SCHEMAS+=	gthumb.schemas
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index c02c1cef3e4..eb319da4b51 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:18 jlam Exp $
 
 DISTNAME=	gtkglext-1.0.6
 CATEGORIES=	graphics
@@ -10,7 +10,7 @@ HOMEPAGE=	http://gtkglext.sourceforge.net/
 COMMENT=	OpenGL extension to GTK
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	gdkglext.pc.in
@@ -20,7 +20,6 @@ LIBS+=			-lm
 CONFIGURE_ARGS+=        --with-html-dir=${PREFIX}/share/doc/html
 CONFIGURE_ARGS+=        --enable-gtk-doc=no
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index c5932c69764..c9528b55970 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:18 jlam Exp $
 
 DISTNAME=	imlib2-1.2.0
 PKGREVISION=	3
@@ -9,6 +9,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.enlightenment.org/pages/imlib2.html
 COMMENT=	Image manipulation library
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
@@ -20,7 +21,6 @@ LIBS.SunOS=		-lm
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index c4488326536..f61f67a257e 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/28 13:52:10 adam Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:18 jlam Exp $
 
 DISTNAME=	inkscape-0.42
 CATEGORIES=	graphics
@@ -18,14 +18,13 @@ USE_DIRS+=		xdg-1.1
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 
 BUILDLINK_DEPENDS.boehm-gc+=	boehm-gc>=6.4
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index f76463156a1..1d7c0755781 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:18 jlam Exp $
 
 DISTNAME=	kipi-plugins-0.1.0-beta2
 PKGNAME=	kipi-plugins-0.1.0beta2
@@ -14,7 +14,7 @@ DEPENDS+=	dcraw-[0-9]*:../../graphics/dcraw
 DEPENDS+=	bash-[0-9]*:../../shells/bash2
 
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
@@ -30,7 +30,6 @@ pre-build:
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../graphics/libkexif/buildlink3.mk"
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 494a9c44646..7db0fcc033d 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:18 jlam Exp $
 
 DISTNAME=	libexif-gtk-0.3.5
 PKGREVISION=	1
@@ -10,13 +10,13 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://libexif.sourceforge.net/
 COMMENT=	EXIF file library (GTK2 interface)
 
+USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libexif-gtk/libexif-gtk.pc.in
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index 325f5a39694..d6af09c3f69 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/31 19:23:00 recht Exp $
+# $NetBSD: Makefile,v 1.22 2005/08/10 20:56:18 jlam Exp $
 #
 
 DISTNAME=	libgdiplus-1.1.8
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.mono-project.com/
 COMMENT=	Implementation of the GDI+ API
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		autoconf gmake
+USE_TOOLS+=		autoconf gmake pkg-config
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libgdiplus.pc.in
 GNU_CONFIGURE=		yes
@@ -25,7 +25,6 @@ BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
 
 BUILDLINK_TRANSFORM+=		rm:-Werror
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 04b2c9f22d1..be1bd6b60d8 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/10 20:56:18 jlam Exp $
 #
 
 DISTNAME=		libgnomecanvas-2.10.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	libgnomecanvas/libgnomecanvas-2.0.pc.in
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index 4b6a7717c64..6754974f340 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 21:54:06 adam Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:18 jlam Exp $
 
 DISTNAME=	libgnomecanvasmm-2.10.0
 CATEGORIES=	graphics
@@ -12,11 +12,10 @@ COMMENT=	C++ bindings for libgnomecanvas
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgnomecanvas/libgnomecanvasmm-2.6.pc.in
 GNU_CONFIGURE=		yes
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index 825095c6102..ffc7ed430b0 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:18 jlam Exp $
 
 DISTNAME=	libkexif-0.2.1
 CATEGORIES=	graphics
@@ -10,14 +10,13 @@ HOMEPAGE=	http://digikam.sourceforge.net/
 COMMENT=	Image EXIF information library manipulation
 
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 SHLIBTOOL_OVERRIDE=	libtool
 
 .include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common
index be93e8e6db6..e70a437dca7 100644
--- a/graphics/librsvg2/Makefile.common
+++ b/graphics/librsvg2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/08/10 20:56:18 jlam Exp $
 #
 
 DISTNAME=	librsvg-2.9.5
@@ -13,6 +13,7 @@ COMMENT=	SVG library for GNOME2
 DISTINFO_FILE=		${.CURDIR}/../../graphics/librsvg2/distinfo
 PATCHDIR=		${.CURDIR}/../../graphics/librsvg2/patches
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	librsvg-2.0.pc.in
@@ -23,5 +24,4 @@ CONFIGURE_ARGS+=	--with-gimp=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/librsvg2
 CONFIGURE_ARGS+=	--with-tags=
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index cecbca8e7d6..5a66fcc7b16 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:18 jlam Exp $
 #
 
 DISTNAME=	showimg-0.9.4-1
@@ -11,14 +11,13 @@ MAINTAINER=	ianzag@mail.ru
 HOMEPAGE=	http://www.jalix.org/projects/showimg/
 COMMENT=	Feature-rich image viewer for KDE including an image management system
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGE=	c c++
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libkexif/buildlink3.mk"
 .include "../../graphics/libkipi/buildlink3.mk"