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.

5 files changed, 10 insertions, 14 deletions

diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 6d796aa4aa1..f2caabad779 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=		calcoo-1.3.16
@@ -10,7 +10,7 @@ HOMEPAGE=		http://calcoo.sourceforge.net/
 COMMENT=		Scientific calculator
 
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 880739381ee..3a438f0970d 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:19 jlam Exp $
 
 DISTNAME=	cln-1.1.9
 CATEGORIES=	math
@@ -11,7 +11,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.ginac.de/CLN/
 COMMENT=	CLN Class Library for Numbers
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
@@ -19,5 +19,4 @@ PKGCONFIG_OVERRIDE=	${WRKSRC}/cln.pc.in
 
 INFO_FILES=	cln.info
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index 34fb43ab866..d4c881db7d7 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=		galculator-1.2.5
@@ -11,9 +11,8 @@ COMMENT=		Desktop calculator with scientific / RPN modes
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 82ed254dfa3..9da8e10470c 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=		gcalctool-5.5.42
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		HAVE_YACC=yes
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		bison gmake
+USE_TOOLS+=		bison gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 
 GCONF2_SCHEMAS=		gcalctool.schemas
@@ -34,7 +34,6 @@ post-wrapper:
 .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 "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile
index 305ccbe68de..7b8e429e722 100644
--- a/math/gnumeric14/Makefile
+++ b/math/gnumeric14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:19 jlam Exp $
 #
 
 DISTNAME=		gnumeric-1.4.3
@@ -13,7 +13,7 @@ COMMENT=		Spreadsheet program from the GNOME project
 BUILD_USES_MSGFMT=	YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake perl:run
+USE_TOOLS+=		gmake perl:run pkg-config
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
@@ -40,7 +40,6 @@ BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.11.1
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 # guile is currently not supported in gnumeric
 #.include "../../lang/guile/buildlink3.mk"