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.

12 files changed, 24 insertions, 31 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index 7d8214edca5..1e1bcd6a0ab 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/22 11:25:02 adam Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:16 jlam Exp $
 
 DISTNAME=	asc-source+music-1.16.1.0
 PKGNAME=	${DISTNAME:S/-source+music//}
@@ -13,7 +13,7 @@ COMMENT=	Turn based strategy game
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CPPFLAGS.NetBSD+=	-D_UNICODE_BROKEN_
 
@@ -25,7 +25,6 @@ UNLIMIT_RESOURCES=	datasize
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDLmm/buildlink3.mk"
 .include "../../devel/libsigc++/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../x11/paragui/buildlink3.mk"
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index 8412fe384c8..5e7e407148f 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/22 22:13:25 adam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:16 jlam Exp $
 
 DISTNAME=	ccgo-0.3.6.2
 CATEGORIES=	games
@@ -11,6 +11,7 @@ COMMENT=	Go board with IGS and gnugo interface
 DEPENDS+=	gnugo>=3.4:../../games/gnugo
 BUILD_USES_MSGFMT=	yes
 
+USE_TOOLS+=		pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -28,5 +29,4 @@ PREFIX.gnugo_DEFAULT=	${LOCALBASE}
 .include "../../devel/gconfmm/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index f325e8de733..0fd69e22650 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:16 jlam Exp $
 
 DISTNAME=	crack-attack-1.1.14
 CATEGORIES=	games
@@ -10,13 +10,13 @@ COMMENT=	Tetris Attack inspired game
 
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/html/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.jpg ${PREFIX}/share/doc/html/${PKGBASE}
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/games/freeciv-client-gtk2/Makefile b/games/freeciv-client-gtk2/Makefile
index f5b61eea558..2f4dd938668 100644
--- a/games/freeciv-client-gtk2/Makefile
+++ b/games/freeciv-client-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:17 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-gtk2-/}
 COMMENT=	Freeciv client with GTK+ interface
@@ -6,6 +6,7 @@ COMMENT=	Freeciv client with GTK+ interface
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
 DEPENDS+=	freeciv-sounds>=2.0:../../games/freeciv-sounds
 
+USE_TOOLS+=	pkg-config
 
 CONFIGURE_ARGS+=	--disable-server --disable-make-data
 CONFIGURE_ARGS+=	--enable-client=gtk2
@@ -18,7 +19,6 @@ do-install:
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index a9f433c43d6..1acad86395e 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=	gnocatan-0.8.1.16
@@ -12,12 +12,11 @@ COMMENT=	GNOME version of the Settlers of Catan board game
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 2eb582b0c3d..f8d3a962fc8 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2005/08/10 20:56:17 jlam Exp $
 
 DISTNAME=		gnome-games-2.10.1
 CATEGORIES=		games gnome
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_CONFIG_WRAPPER=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -74,7 +74,6 @@ BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.10.0
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index dbef48ca3d6..2440a24e6f4 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=	grhino-0.15.0
@@ -9,12 +9,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://rhino.sourceforge.net/
 COMMENT=	Othello (Reversi) engine
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index c2712cfbc08..73e96606605 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=	gtetrinet-0.7.7
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	YES
 
 BUILD_DEFS+=		USE_INET6
@@ -33,6 +33,5 @@ GCONF2_SCHEMAS=		gtetrinet.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gtkmagnetic/Makefile b/games/gtkmagnetic/Makefile
index 4bcacf6446e..a2d162a66a0 100644
--- a/games/gtkmagnetic/Makefile
+++ b/games/gtkmagnetic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=		Magnetic22Src
@@ -12,7 +12,7 @@ MAINTAINER=		dillo@NetBSD.org
 HOMEPAGE=		http://www.if-legends.org/~msmemorial/magnetic.htm
 COMMENT=		Interpreter for text adventures from Magnetic Scrolls
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 BUILD_TARGET=		gtkmagnetic
 WRKSRC=			${WRKDIR}/Gtk
 
@@ -24,7 +24,6 @@ LIBS.SunOS+=		-lCrun
 
 INSTALLATION_DIRS=	bin
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 0021262d37b..7b1f8a1c158 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=		gturing-0.1.1
@@ -15,14 +15,13 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 
 BUILDLINK_TRANSFORM+=	rm:-D.*_DISABLE_DEPRECATED
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index 8658d5578a6..7a40a15c840 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:17 jlam Exp $
 #
 
 DISTNAME=	sirius-0.8.0
@@ -14,14 +14,13 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 27e9ae4e201..8fe02753bab 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/09 16:26:52 adam Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:17 jlam Exp $
 
 DISTNAME=	wesnoth-0.9.5
 CATEGORIES=	games
@@ -8,6 +8,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.wesnoth.org/
 COMMENT=	Fantasy turn-based strategy game
 
+USE_TOOLS+=		pkg-config
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
@@ -22,7 +23,6 @@ BUILDLINK_DEPENDS.SDL_mixer=	SDL_mixer>=1.2.5nb3
 # use included SDL_ttf library
 #.include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"