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.

4 files changed, 8 insertions, 11 deletions

diff --git a/time/evolution-webcal/Makefile b/time/evolution-webcal/Makefile
index 2ff17d17b2b..155e9a67c77 100644
--- a/time/evolution-webcal/Makefile
+++ b/time/evolution-webcal/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:24 jlam Exp $
 #
 
 DISTNAME=	evolution-webcal-2.2.1
@@ -12,7 +12,7 @@ COMMENT=	GNOME URL handler for web-published iCal calendar files
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	YES
 
 GCONF2_SCHEMAS=		evolution-webcal.schemas
@@ -20,7 +20,6 @@ GCONF2_SCHEMAS=		evolution-webcal.schemas
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 6eac6cfa9b2..a6c7745cf67 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/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:24 jlam Exp $
 
 DISTNAME=	gnotime-2.2.1
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	Time tracker for GNOME2
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -23,7 +23,6 @@ GCONF2_SCHEMAS=		gnotime.schemas
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/time/gtodo-applet/Makefile b/time/gtodo-applet/Makefile
index b1f4369472e..aab62a244e1 100644
--- a/time/gtodo-applet/Makefile
+++ b/time/gtodo-applet/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:24 jlam Exp $
 #
 
 DISTNAME=	gtodo-applet-0.1
@@ -12,6 +12,7 @@ COMMENT=	GNOME applet for the gtodo application
 
 DEPENDS+=		gtodo>=0.14:../../time/gtodo
 
+USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		YES
@@ -19,6 +20,5 @@ USE_LIBTOOL=		YES
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gtodo/Makefile b/time/gtodo/Makefile
index 6625edf54be..af8fb59aa48 100644
--- a/time/gtodo/Makefile
+++ b/time/gtodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:24 jlam Exp $
 #
 
 DISTNAME=	gtodo-0.14
@@ -12,7 +12,7 @@ COMMENT=	To-do list manager for the GNOME desktop
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	YES
 
 GCONF2_SCHEMAS=		gtodo.schemas
@@ -20,7 +20,6 @@ GCONF2_SCHEMAS=		gtodo.schemas
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"