Mechanical changes to buildlink.mk files to use EVAL_PREFIX to set

BUILDLINK_PREFIX.<pkgname>.  This allows buildlink to find X11BASE packages
regardless of whether they were installed before or after xpkgwedge was
installed.  Idea by Alistair Crooks <agc@pkgsrc.org>.

4 files changed, 14 insertions, 12 deletions

diff --git a/textproc/jade/buildlink.mk b/textproc/jade/buildlink.mk
index edff4e8b65a..91372d0cae9 100644
--- a/textproc/jade/buildlink.mk
+++ b/textproc/jade/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:51 jlam Exp $
 #
 # This Makefile fragment is included by packages that use jade.
 #
@@ -20,7 +20,7 @@ JADE_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.jade?=	jade>=1.2.1
 DEPENDS+=	${BUILDLINK_DEPENDS.jade}:../../textproc/jade
 
-BUILDLINK_PREFIX.jade=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.jade=jade
 BUILDLINK_FILES.jade=	include/sp/*
 BUILDLINK_FILES.jade+=	lib/libgrove.*
 BUILDLINK_FILES.jade+=	lib/libsp.*
diff --git a/textproc/libxml/buildlink.mk b/textproc/libxml/buildlink.mk
index 327b9f7739a..9ccd54c3fbf 100644
--- a/textproc/libxml/buildlink.mk
+++ b/textproc/libxml/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:34:00 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:52 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml.
 #
@@ -20,7 +20,7 @@ LIBXML_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libxml?=	libxml>=1.8.11
 DEPENDS+=	${BUILDLINK_DEPENDS.libxml}:../../textproc/libxml
 
-BUILDLINK_PREFIX.libxml=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libxml=libxml
 BUILDLINK_FILES.libxml=		include/gnome-xml/*
 BUILDLINK_FILES.libxml+=	lib/libxml.*
 BUILDLINK_FILES.libxml+=	lib/xmlConf.sh
@@ -31,8 +31,8 @@ BUILDLINK_TARGETS.libxml=	libxml-buildlink
 BUILDLINK_TARGETS.libxml+=	libxml-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libxml}
 
-BUILDLINK_CONFIG.libxml=		${LOCALBASE}/bin/xml-config
-BUILDLINK_CONFIG_WRAPPER.libxml=	${BUILDLINK_DIR}/bin/xml-config
+BUILDLINK_CONFIG.libxml=	${BUILDLINK_PREFIX.libxml}/bin/xml-config
+BUILDLINK_CONFIG_WRAPPER.libxml=${BUILDLINK_DIR}/bin/xml-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 XML_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libxml}
diff --git a/textproc/libxml2/buildlink.mk b/textproc/libxml2/buildlink.mk
index f1e89f11fcf..97943d8a7e0 100644
--- a/textproc/libxml2/buildlink.mk
+++ b/textproc/libxml2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:34:00 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:52 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml2.
 #
@@ -20,7 +20,7 @@ LIBXML2_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.3.12
 DEPENDS+=	${BUILDLINK_DEPENDS.libxml2}:../../textproc/libxml2
 
-BUILDLINK_PREFIX.libxml2=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libxml2=libxml2
 BUILDLINK_FILES.libxml2=	include/libxml2/libxml/*
 BUILDLINK_FILES.libxml2+=	lib/libxml2.*
 BUILDLINK_FILES.libxml2+=	lib/xml2Conf.sh
@@ -32,8 +32,10 @@ BUILDLINK_TARGETS.libxml2=	libxml2-buildlink
 BUILDLINK_TARGETS.libxml2+=	libxml2-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libxml2}
 
-BUILDLINK_CONFIG.libxml2=		${LOCALBASE}/bin/xml2-config
-BUILDLINK_CONFIG_WRAPPER.libxml2=	${BUILDLINK_DIR}/bin/xml2-config
+BUILDLINK_CONFIG.libxml2=	\
+		${BUILDLINK_PREFIX.libxml2}/bin/xml2-config
+BUILDLINK_CONFIG_WRAPPER.libxml2=	\
+		${BUILDLINK_DIR}/bin/xml2-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 XML2_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libxml2}
diff --git a/textproc/t1lib/buildlink.mk b/textproc/t1lib/buildlink.mk
index e086dfb9d52..db657f249b8 100644
--- a/textproc/t1lib/buildlink.mk
+++ b/textproc/t1lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:52 jlam Exp $
 #
 # This Makefile fragment is included by packages that use t1lib.
 #
@@ -20,7 +20,7 @@ T1LIB_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.t1lib?=	t1lib>=1.0.1
 DEPENDS+=	${BUILDLINK_DEPENDS.t1lib}:../../textproc/t1lib
 
-BUILDLINK_PREFIX.t1lib=		${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.t1lib=t1lib
 BUILDLINK_FILES.t1lib=		include/t1lib.h
 BUILDLINK_FILES.t1lib+=		include/t1libx.h
 BUILDLINK_FILES.t1lib+=		lib/libt1.*