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, 22 insertions, 32 deletions

diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index 12aa8997e0d..0151792901e 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/08/02 15:22:30 tonio Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:13 jlam Exp $
 #
 
 DISTNAME=		bitlbee-0.92
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.bitlbee.org/
 COMMENT=		IRC to other chat networks gateway
 
 HAS_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGINSTALL=		yes
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
@@ -58,6 +58,5 @@ CONFIGURE_ARGS+=	--ipv6=1
 
 .include "../../converters/libiconv/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/chat/ekg/Makefile b/chat/ekg/Makefile
index a488899e462..6220081b412 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/10 20:56:13 jlam Exp $
 
 DISTNAME=	ekg-1.6rc3
 PKGNAME=	ekg-1.6
@@ -14,7 +14,7 @@ COMMENT=	Experimental Gadu-Gadu Client (Polish instant messaging system)
 USE_GNU_READLINE=	yes
 USE_LIBTOOL=		yes
 USE_NCURSES=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	lib/libgadu.pc.in
 CONFIGURE_ARGS+=	--enable-ui-ncurses
@@ -30,7 +30,6 @@ CONFIGURE_ARGS+=	--with-pthread
 .endif
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 7d4b5fae442..4c0457e2d68 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2005/08/10 16:13:33 salo Exp $
+# $NetBSD: Makefile,v 1.95 2005/08/10 20:56:13 jlam Exp $
 
 DISTNAME=	gaim-1.4.0
 PKGREVISION=	2
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 CONFLICTS+=		gaim-gnome-[0-9]*
 
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -47,7 +47,6 @@ CONFIGURE_ARGS+=	--disable-screensaver
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/silc-toolkit/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index a533e175d8a..7f6e8c77373 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:13 jlam Exp $
 
 DISTNAME=	gg2-2.2.6
 CATEGORIES=	chat
@@ -10,7 +10,7 @@ COMMENT=	Instant messenger software for Poland; Jabber plugin included
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 LIBS+=			-lm
 PKGCONFIG_OVERRIDE+=	lib/gg2_core.pc.in
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+=	--without-update
 .include "../../chat/ekg/buildlink3.mk"
 .include "../../chat/libtlen/buildlink3.mk"
 .include "../../chat/loudmouth/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 2a7f09ac6a5..f3a5b699000 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/08/10 20:56:13 jlam Exp $
 
 DISTNAME=	gnomeicu-0.99.5
 CATEGORIES=	chat gnome
@@ -11,7 +11,7 @@ COMMENT=	GNOME ICQ client
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -29,7 +29,6 @@ GCONF2_SCHEMAS=		gnomeicu.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 90109378983..05d0bb2bb65 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:13 jlam Exp $
 #
 
 DISTNAME=	gossip-0.8
@@ -14,7 +14,7 @@ BUILD_DEPENDS=		p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
 BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=       yes
 GNU_CONFIGURE=		yes
@@ -26,6 +26,5 @@ GCONF2_SCHEMAS=		gossip.schemas
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/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/chat/irssi/Makefile b/chat/irssi/Makefile
index e2bcdb86334..71a5a9852da 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/08/06 06:19:04 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/10 20:56:13 jlam Exp $
 
 DISTNAME=		${IRSSI_DISTNAME}
 PKGREVISION=		6
@@ -15,6 +15,7 @@ COMMENT=                Secure and modular IRC client with text mode user interf
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
+USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS+=	--with-terminfo \
 			--with-proxy \
@@ -30,7 +31,6 @@ CONF_FILES=	${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
 .include "options.mk"
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/config.h ${IRSSI_CONFIG_H}
diff --git a/chat/loudmouth/Makefile b/chat/loudmouth/Makefile
index 56f7536e4e0..dc129f96ee6 100644
--- a/chat/loudmouth/Makefile
+++ b/chat/loudmouth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:13 jlam Exp $
 
 DISTNAME=	loudmouth-0.17.2
 PKGREVISION=	1
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://loudmouth.imendio.org/
 COMMENT=	Lightweight Jabber client library
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
@@ -24,6 +24,5 @@ BUILDLINK_DEPENDS.gnutls+=	gnutls>=1.2.0
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile
index c0aea4777b6..05c2ae2cb8d 100644
--- a/chat/mu-conference/Makefile
+++ b/chat/mu-conference/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:13 jlam Exp $
 #
 
 DISTNAME=		mu-conference-0.6.0
@@ -17,7 +17,7 @@ WRKSRC=			${WRKDIR}/jcr-0.1.2
 SUBWRKSRC=		${WRKSRC}/${DISTNAME}/src
 XMLCONFIG=		${WRKDIR}/${DISTNAME}/muc-jcr.xml
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGINSTALL=		yes
 
 PKG_SYSCONFSUBDIR=      jabberd
@@ -55,6 +55,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}/muc-jcr.xml ${EGDIR}
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile
index 5fa5ff0042c..ed0ace539e9 100644
--- a/chat/xchat-systray-integration/Makefile
+++ b/chat/xchat-systray-integration/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:13 jlam Exp $
 
 DISTNAME=	xchat-systray-integration-2.4.5-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -12,13 +12,12 @@ COMMENT=	Systray icon plugin for X-Chat
 DEPENDS=	xchat>=2.0:../../chat/xchat
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 
 # We build a shared object, so ensure that the object files are PIC.
 CFLAGS+=	-fPIC
 
 MAKE_ENV+=	prefix=${PREFIX}
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 8cce2f012f9..36896f6f730 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile.common,v 1.43 2005/08/10 20:56:13 jlam Exp $
 #
 # Please do not merge this file into "Makefile" because it is used by
 # packages in "pkgsrc-wip".
@@ -15,7 +15,6 @@ DISTINFO_FILE=	${.CURDIR}/../../chat/xchat/distinfo
 
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"