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.

9 files changed, 18 insertions, 27 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index d7de5857d55..0e3a0585b1c 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:19 jlam Exp $
 
 DISTNAME=	balsa-2.2.6
 PKGREVISION=	2
@@ -18,7 +18,7 @@ USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl pkg-config
 
 CONFIGURE_ARGS=		--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
 CONFIGURE_ARGS+=	--disable-more-warnings
@@ -48,7 +48,6 @@ BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.9
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mail/gmime/buildlink3.mk"
 .include "../../mail/libesmtp/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index c5d9590c796..2dd67dbb936 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/08/08 11:10:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/10 20:56:19 jlam Exp $
 
 DISTNAME=	dspam-3.4.9
 CATEGORIES=	mail
@@ -11,7 +11,7 @@ COMMENT=	Extremely scalable, statistical-hybrid anti-spam filter
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl:run pkg-config
 REPLACE_PERL=		tools/dspam_genaliases.in			\
 			tools/dspam_corpus.in				\
 			cgi/*.cgi cgi/configure.pl.in
@@ -67,7 +67,6 @@ CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}			\
 			--sysconfdir=${PKG_SYSCONFDIR}
 
 .include "options.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 DOCDIR=		${PREFIX}/share/doc/dspam
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 7b79b261078..55b58e88e5a 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=	evolution-data-server-1.2.3
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.3
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		bison gmake
+USE_TOOLS+=		bison gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -68,7 +68,6 @@ BUILDLINK_TRANSFORM+=	rm:-ldl
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 2611d123f1b..0b3b8c68ed0 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2005/08/10 20:56:19 jlam Exp $
 
 DISTNAME=		evolution-2.2.2
 PKGREVISION=		1
@@ -29,7 +29,7 @@ PKG_FAIL_REASON=	"Kerberos support conflicts with SSL"
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		bison gmake
+USE_TOOLS+=		bison gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -121,7 +121,6 @@ LDFLAGS+=	-lsemaphore
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
diff --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile
index 582b493f2a5..8c93115f579 100644
--- a/mail/evolution14/Makefile
+++ b/mail/evolution14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:19 jlam Exp $
 
 DISTNAME=		evolution-1.4.6
 PKGNAME=		${DISTNAME:S/evolution/evolution14/}
@@ -28,7 +28,7 @@ BUILDLINK_DEPENDS.db3=		db3-3.11.2{,nb*}
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		bison gmake
+USE_TOOLS+=		bison gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -50,7 +50,6 @@ CONFIGURE_ARGS+=	--enable-openssl=yes
 CONFIGURE_ARGS+=	--with-krb5=/usr --with-krb4=/usr
 CONFIGURE_ARGS+=	--with-db3-includes=${LOCALBASE}/include/db3
 CONFIGURE_ARGS+=	--with-db3-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
 
 PKGCONFIG_OVERRIDE=	camel.pc.in
 PKGCONFIG_OVERRIDE+=	evolution-shell.pc.in
@@ -78,7 +77,6 @@ LDFLAGS+=	-lsemaphore
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 8fdc3776553..4f095f61033 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=	gmime-2.1.9
@@ -11,7 +11,7 @@ COMMENT=	Library for the creation and parsing of MIME messages
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
@@ -21,6 +21,5 @@ PKGCONFIG_OVERRIDE+=	gmime-2.0.pc.in
 .include "options.mk"
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 67851966780..2bb299eeccf 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=	mail-notification-1.0
@@ -12,7 +12,7 @@ COMMENT=	Status icon that provides new mail notifications
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -57,7 +57,6 @@ CONFIGURE_ARGS+=	--disable-ssl
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/mail/sylpheed-claws-ghostscript-viewer/Makefile b/mail/sylpheed-claws-ghostscript-viewer/Makefile
index 973443f6c60..8b404b4c0d4 100644
--- a/mail/sylpheed-claws-ghostscript-viewer/Makefile
+++ b/mail/sylpheed-claws-ghostscript-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=	ghostscript-viewer-0.6
@@ -12,6 +12,7 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://reboot.animeirc.de/sylpheed/ghostscript_viewer/
 COMMENT=	Plugin to make Sylpheed-claws display PostScript and PDF attachments
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
@@ -19,7 +20,6 @@ PLIST_SRC=	${.CURDIR}/../../mail/sylpheed-claws/PLIST.plugins
 PLIST_SUBST+=	PLUGIN_NAME=ghostscript_viewer
 MESSAGE_SRC+=	${.CURDIR}/../../mail/sylpheed-claws/MESSAGE.plugins
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mail/sylpheed-claws/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
diff --git a/mail/ximian-connector/Makefile b/mail/ximian-connector/Makefile
index 0ae283f41a8..d32adb1ebe5 100644
--- a/mail/ximian-connector/Makefile
+++ b/mail/ximian-connector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=	ximian-connector-2.2.2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.novell.com/products/evolution/
 COMMENT=	Adds support for Microsoft Exchange 2000 and 2003 to Evolution
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/ximian-connector
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../mail/evolution/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"