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.

11 files changed, 24 insertions, 30 deletions

diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index 5a544deba8a..a8256136549 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=		e16menuedit2-0.0.1
@@ -14,7 +14,7 @@ DEPENDS+=		enlightenment-0.16.*:../../wm/enlightenment
 BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		automake
+USE_TOOLS+=		automake pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 
@@ -23,7 +23,6 @@ pre-configure:
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile
index 470be170f4a..b6c4c5e2a38 100644
--- a/wm/matchbox/Makefile
+++ b/wm/matchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/10 20:56:25 jlam Exp $
 #
 
 DISTNAME=		matchbox-window-manager-0.9.3
@@ -10,6 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://projects.o-hand.com/matchbox/
 COMMENT=		Window manager designed for computers with small displays
 
+USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
@@ -25,7 +26,6 @@ post-install:
 		${PREFIX}/share/examples/matchbox/
 
 .include "../../devel/libmatchbox/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index c1f5f4c2abb..f6ed740d944 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2005/08/10 20:56:25 jlam Exp $
 #
 
 DISTNAME=	metacity-2.10.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 USE_DIRS+=		gnome2-1.5 theme-1.0
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
@@ -31,7 +31,6 @@ CONFIGURE_ARGS+=	--disable-xinerama
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile
index a8f94cfd9de..ecaccc0c49d 100644
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:25 jlam Exp $
 
 DISTNAME=		obconf-1.5
 PKGREVISION=		5
@@ -9,6 +9,7 @@ MAINTAINER=		snj@NetBSD.org
 HOMEPAGE=		http://www.openbox.org/obconf/
 COMMENT=		Tool for configuring the Openbox window manager
 
+USE_TOOLS+=		pkg-config
 USE_DIRS+=		xdg-1.1
 GNU_CONFIGURE=		YES
 
@@ -16,6 +17,5 @@ GNU_CONFIGURE=		YES
 .include "../../wm/openbox/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index fc7b264ec17..d52eeef2792 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:25 jlam Exp $
 
 DISTNAME=	openbox-3.2
 PKGREVISION=	1
@@ -14,7 +14,7 @@ DEPENDS+=		vera-ttf>=1.10:../../fonts/vera-ttf
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
@@ -32,7 +32,6 @@ CONF_FILES+=		${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile
index 2624695b87b..e576d85a9bf 100644
--- a/wm/openbox2/Makefile
+++ b/wm/openbox2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:25 jlam Exp $
 #
 
 DISTNAME=	openbox-2.2.3
@@ -12,11 +12,11 @@ COMMENT=	Window manager based on Blackbox (2.x branch)
 
 DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 
+USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	YES
 
 CPPFLAGS+=	-DHAVE_STRFTIME=1
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/selectwm/Makefile b/wm/selectwm/Makefile
index e041f4ccc20..c337fc2359b 100644
--- a/wm/selectwm/Makefile
+++ b/wm/selectwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/10 20:56:25 jlam Exp $
 #
 
 DISTNAME=     selectwm-0.4.1
@@ -9,9 +9,9 @@ MAINTAINER=   reilles@loria.fr
 HOMEPAGE=     http://ordiluc.net/selectwm/
 COMMENT=      Simple GTK2 application to select window manager
 
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE=    yes
+USE_TOOLS+=		pkg-config
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=    	yes
 
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile
index d5810a823d7..a320ddd08bf 100644
--- a/wm/skippy/Makefile
+++ b/wm/skippy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:25 jlam Exp $
 #
 
 DISTNAME=	skippy-0.5.0
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://thegraveyard.org/skippy.php
 COMMENT=	Fullscreen task switcher for X11	
 
-
+USE_TOOLS+=		pkg-config
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
 INSTALLATION_DIRS=	share/examples/${PKGBASE}
@@ -18,7 +18,6 @@ INSTALLATION_DIRS=	share/examples/${PKGBASE}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/skippyrc-default ${EGDIR}/skippyrc
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 11f4d189ed1..7ed4a00623c 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:25 jlam Exp $
 #
 
 DISTNAME=	waimea-0.4.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.waimea.org/
 COMMENT=	Fast and highly customizable virtual window manager
 
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake perl:run
+USE_TOOLS+=	gmake perl:run pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -34,7 +34,6 @@ REPLACE_PERL = \
 	data/scripts/procinfo.pl \
 	data/scripts/stylesdir.pl.in
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index 429387eaa32..55d9b512f0f 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:25 jlam Exp $
 #
 
 DISTNAME=	windowlab-1.12
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.nickgravgaard.com/windowlab/
 COMMENT=	Small and simple window manager
 
 USE_PKGINSTALL=	YES
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 
 PKG_SYSCONFSUBDIR=	windowlab
 
@@ -23,7 +23,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/menurc.sample ${EGDIR}/menurc.default
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmctrl/Makefile b/wm/wmctrl/Makefile
index 65a6b81bca2..1d9572f80aa 100644
--- a/wm/wmctrl/Makefile
+++ b/wm/wmctrl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:25 jlam Exp $
 
 DISTNAME=		wmctrl-1.05
 PKGREVISION=	1
@@ -9,11 +9,11 @@ MAINTAINER=		snj@NetBSD.org
 HOMEPAGE=		http://sweb.cz/tripie/utils/wmctrl/
 COMMENT=		Command line interface to an EWMH-compliant WM
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"