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, 12 insertions, 12 deletions

diff --git a/net/ORBit/buildlink.mk b/net/ORBit/buildlink.mk
index 563b03a767a..47780da5b1b 100644
--- a/net/ORBit/buildlink.mk
+++ b/net/ORBit/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:49 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ORBit.
 #
@@ -20,7 +20,7 @@ ORBIT_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.ORBit?=	ORBit>=0.5.1
 DEPENDS+=	${BUILDLINK_DEPENDS.ORBit}:../../net/ORBit
 
-BUILDLINK_PREFIX.ORBit=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.ORBit=ORBit
 BUILDLINK_FILES.ORBit=	include/IIOP/*
 BUILDLINK_FILES.ORBit+=	include/ORBitservices/*
 BUILDLINK_FILES.ORBit+=	include/ORBitutil/*
@@ -45,11 +45,11 @@ BUILDLINK_TARGETS.ORBit+=	libIDL-buildlink-config-wrapper
 BUILDLINK_TARGETS.ORBit+=	orbit-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.ORBit}
 
-BUILDLINK_CONFIG.libIDL=		${LOCALBASE}/bin/libIDL-config
-BUILDLINK_CONFIG_WRAPPER.libIDL=	${BUILDLINK_DIR}/bin/libIDL-config
+BUILDLINK_CONFIG.libIDL=	${BUILDLINK_PREFIX.ORBit}/bin/libIDL-config
+BUILDLINK_CONFIG_WRAPPER.libIDL=${BUILDLINK_DIR}/bin/libIDL-config
 
-BUILDLINK_CONFIG.orbit=			${LOCALBASE}/bin/orbit-config
-BUILDLINK_CONFIG_WRAPPER.orbit=		${BUILDLINK_DIR}/bin/orbit-config
+BUILDLINK_CONFIG.orbit=		${BUILDLINK_PREFIX.ORBit}/bin/orbit-config
+BUILDLINK_CONFIG_WRAPPER.orbit=	${BUILDLINK_DIR}/bin/orbit-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 LIBIDL_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libIDL}
diff --git a/net/SDL_net/buildlink.mk b/net/SDL_net/buildlink.mk
index c87bd28a753..7c1eaa9cff7 100644
--- a/net/SDL_net/buildlink.mk
+++ b/net/SDL_net/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2001/07/10 09:05:28 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:49 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL_net.
 #
@@ -20,7 +20,7 @@ SDL_NET_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.SDL_net?=	SDL_net>=1.2.0
 DEPENDS+=	${BUILDLINK_DEPENDS.SDL_net}:../../net/SDL_net
 
-BUILDLINK_PREFIX.SDL_net=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.SDL_net=SDL_net
 BUILDLINK_FILES.SDL_net=	include/SDL/SDL_net.h
 BUILDLINK_FILES.SDL_net+=	lib/libSDL_net-*
 BUILDLINK_FILES.SDL_net+=	lib/libSDL_net.*
diff --git a/net/socks4/buildlink.mk b/net/socks4/buildlink.mk
index cd79be98be0..1c1eca27099 100644
--- a/net/socks4/buildlink.mk
+++ b/net/socks4/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/15 12:18:04 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:49 jlam Exp $
 #
 # This Makefile fragment is included by packages that use socks4.
 #
@@ -20,7 +20,7 @@ SOCKS4_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.socks4?=	socks4>=2.2
 DEPENDS+=	${BUILDLINK_DEPENDS.socks4}:../../net/socks4
 
-BUILDLINK_PREFIX.socks4=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.socks4=socks4
 BUILDLINK_FILES.socks4=		lib/libsocks4.*
 
 BUILDLINK_TARGETS.socks4=	socks4-buildlink
diff --git a/net/socks5/buildlink.mk b/net/socks5/buildlink.mk
index 147571f1da4..16c50948193 100644
--- a/net/socks5/buildlink.mk
+++ b/net/socks5/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:50 jlam Exp $
 #
 # This Makefile fragment is included by packages that use socks5.
 #
@@ -20,7 +20,7 @@ SOCKS5_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.socks5?=	socks5>=1.0.2
 DEPENDS+=	${BUILDLINK_DEPENDS.socks5}:../../net/socks5
 
-BUILDLINK_PREFIX.socks5=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.socks5=socks5
 BUILDLINK_FILES.socks5=		include/socks.h
 BUILDLINK_FILES.socks5+=	lib/libsocks5.a
 BUILDLINK_FILES.socks5+=	lib/libsocks5_sh.*