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.

8 files changed, 16 insertions, 17 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 646cc89b243..b57c811b47f 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/27 17:30:14 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=	gnome-keyring-0.4.3
@@ -12,6 +12,7 @@ COMMENT=	GNOME password and secret manager
 
 BUILD_USES_MSGFMT=	YES
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
@@ -20,6 +21,5 @@ PKGCONFIG_OVERRIDE=	${WRKSRC}/gnome-keyring-1.pc.in
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 576af17b77a..f32e5d4180b 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=	gpa-0.7.0
@@ -10,10 +10,10 @@ MAINTAINER=	pr@alles.prima.de
 HOMEPAGE=	http://www.gnupg.org/gpa.html
 COMMENT=	GUI frontend to gnupg
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index b6ee0bc4615..c1189724d52 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=	gpass-0.4.4
@@ -10,6 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://gpass.sourceforge.net/
 COMMENT=	GNOME Password Manager
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		YES
@@ -18,7 +19,6 @@ USE_PKGLOCALEDIR=	YES
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 571fe678732..f32051beeae 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:23 jlam Exp $
 
 DISTNAME=		gsasl-0.2.5
 CATEGORIES=		security
@@ -11,6 +11,7 @@ COMMENT=		GNU implementation of the Simple Authentication and Security Layer
 
 BUILD_USES_MSGFMT=	yes
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -26,7 +27,6 @@ PKGCONFIG_OVERRIDE+=    libgsasl.pc.in
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/libntlm/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../security/gss/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 
diff --git a/security/gss/Makefile b/security/gss/Makefile
index a00ec63bd08..20e78008b1b 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=		gss-0.0.15
@@ -12,6 +12,7 @@ COMMENT=		GNU Generic Security Service Library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
@@ -19,5 +20,4 @@ PKGCONFIG_OVERRIDE+=    gss.pc.in
 
 INFO_FILES=		gss.info
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 2110dd82cbd..301083d93ca 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME}-src
@@ -12,6 +12,7 @@ COMMENT=	Login password cracker
 
 .include "../../mk/bsd.prefs.mk"
 
+USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	YES
 BUILD_TARGET=	all ssl
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -42,7 +43,6 @@ PKG_SUPPORTED_OPTIONS=	gtkfe
 
 .if !empty(PKG_OPTIONS:Mgtkfe)
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 post-configure:
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 2c52e5b86d9..00081961d12 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:23 jlam Exp $
 
 DISTNAME=	seahorse-0.7.8
 CATEGORIES=	security
@@ -14,7 +14,7 @@ DEPENDS+=		gnupg>=1.2.1:../../security/gnupg
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -32,7 +32,6 @@ BUILDLINK_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index a8ec12faad4..75d38f59564 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:23 jlam Exp $
 #
 
 DISTNAME=		xmlsec1-1.2.6
@@ -10,6 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.aleksey.com/xmlsec/
 COMMENT=		XML signature and encryption library
 
+USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
@@ -21,7 +22,6 @@ GNU_CONFIGURE=		yes
 #CONFIGURE_ARGS+=	--without-openssl
 CONFIGURE_ARGS+=	--without-gnutls
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 #.include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"