From b3f78ea1dc65ca87b470169b6f46da18d36bf91b Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 10 Aug 2005 20:56:10 +0000
Subject: 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.
---
 meta-pkgs/xfce4/Makefile.common | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'meta-pkgs')

diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index 28ceeb7f80a..b6e6f953230 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile.common,v 1.26 2005/08/10 20:56:19 jlam Exp $
 
 MASTER_SITES=		http://www.xfce.org/archive/xfce-4.2.2/src/ \
 			http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.2/src/ \
@@ -14,18 +14,15 @@ XFCE4_VERSION=		4.2.2
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
 .if ${MACHINE_ARCH} == "alpha"
 GCC_REQD+=		3.0
 .endif
 
-PKG_CONFIG_PATH=	${BUILDLINK_DIR}/lib/pkgconfig
-
 XFCE4_EGBASE=		${PREFIX}/share/examples/xfce4
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 
 ## # Use the latest GNU tar when the native tar is buggy
-- 
cgit v1.2.3