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>.

21 files changed, 49 insertions, 49 deletions

diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index 18eecc06d6d..f6d0c665de1 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/14 15:51:47 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL.
 #
@@ -20,7 +20,7 @@ SDL_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.SDL?=	SDL>=1.2.0
 DEPENDS+=		${BUILDLINK_DEPENDS.SDL}:../../devel/SDL
 
-BUILDLINK_PREFIX.SDL=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.SDL=SDL
 BUILDLINK_FILES.SDL=	include/SDL/*
 BUILDLINK_FILES.SDL+=	lib/libSDL.*
 BUILDLINK_FILES.SDL+=	lib/libSDLmain.*
@@ -41,7 +41,7 @@ BUILDLINK_TARGETS.SDL=		SDL-buildlink
 BUILDLINK_TARGETS.SDL+=		SDL-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.SDL}
 
-BUILDLINK_CONFIG.SDL=		${LOCALBASE}/bin/sdl-config
+BUILDLINK_CONFIG.SDL=		${BUILDLINK_PREFIX.SDL}/bin/sdl-config
 BUILDLINK_CONFIG_WRAPPER.SDL=	${BUILDLINK_DIR}/bin/sdl-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/devel/SDL_ttf/buildlink.mk b/devel/SDL_ttf/buildlink.mk
index 9d022b515e1..4692321a5be 100644
--- a/devel/SDL_ttf/buildlink.mk
+++ b/devel/SDL_ttf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/14 15:59:17 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL_ttf.
 #
@@ -20,7 +20,7 @@ SDL_ttf_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.SDL_ttf?=	SDL_ttf>=2.0.3
 DEPENDS+=	${BUILDLINK_DEPENDS.SDL_ttf}:../../devel/SDL_ttf
 
-BUILDLINK_PREFIX.SDL_ttf=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.SDL_ttf=SDL_ttf
 BUILDLINK_FILES.SDL_ttf=	include/SDL/SDL_ttf.h
 BUILDLINK_FILES.SDL_ttf+=	lib/libSDL_ttf-*
 BUILDLINK_FILES.SDL_ttf+=	lib/libSDL_ttf.*
diff --git a/devel/gettext-lib/buildlink.mk b/devel/gettext-lib/buildlink.mk
index 9762ba6988e..a2c55a77743 100644
--- a/devel/gettext-lib/buildlink.mk
+++ b/devel/gettext-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/07/01 22:59:15 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gettext.
 #
@@ -29,7 +29,7 @@ _NEED_GNU_GETTEXT=	YES
 
 .if ${_NEED_GNU_GETTEXT} == "YES"
 DEPENDS+=	${BUILDLINK_DEPENDS.gettext}:../../devel/gettext-lib
-BUILDLINK_PREFIX.gettext=	${LOCALBASE}
+EVAL_PREFIX+=	BUILDLINK_PREFIX.gettext=gettext-lib
 .else
 BUILDLINK_PREFIX.gettext=	/usr
 .endif
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index add516da6e9..138eacac089 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/07/13 23:23:39 dogcow Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
@@ -20,7 +20,7 @@ GLIB_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.glib?=	glib>=1.2.8
 DEPENDS+=	${BUILDLINK_DEPENDS.glib}:../../devel/glib
 
-BUILDLINK_PREFIX.glib=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.glib=glib
 BUILDLINK_FILES.glib=	include/glib/*/*
 BUILDLINK_FILES.glib+=	include/glib/*
 BUILDLINK_FILES.glib+=	lib/glib/*/*
@@ -37,7 +37,7 @@ BUILDLINK_TARGETS.glib=		glib-buildlink
 BUILDLINK_TARGETS.glib+=	glib-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.glib}
 
-BUILDLINK_CONFIG.glib=		${LOCALBASE}/bin/glib-config
+BUILDLINK_CONFIG.glib=		${BUILDLINK_PREFIX.glib}/bin/glib-config
 BUILDLINK_CONFIG_WRAPPER.glib=	${BUILDLINK_DIR}/bin/glib-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk
index c71fd421bfe..1f9c600df45 100644
--- a/devel/gmp/buildlink.mk
+++ b/devel/gmp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:15 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gmp.
 #
@@ -20,7 +20,7 @@ GMP_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.gmp?=	gmp>=3.0
 DEPENDS+=		${BUILDLINK_DEPENDS.gmp}:../../devel/gmp
 
-BUILDLINK_PREFIX.gmp=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gmp=gmp
 BUILDLINK_FILES.gmp=	include/gmp.h
 BUILDLINK_FILES.gmp+=	lib/libgmp.*
 
diff --git a/devel/libdockapp/buildlink.mk b/devel/libdockapp/buildlink.mk
index a273b80e2f1..a1667f0301f 100644
--- a/devel/libdockapp/buildlink.mk
+++ b/devel/libdockapp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:16 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libdockapp.
 #
@@ -20,7 +20,7 @@ LIBDOCKAPP_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libdockapp?=	libdockapp>=0.4.0
 DEPENDS+=	${BUILDLINK_DEPENDS.libdockapp}:../../devel/libdockapp
 
-BUILDLINK_PREFIX.libdockapp=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libdockapp=libdockapp
 BUILDLINK_FILES.libdockapp=	include/dockapp.h
 BUILDLINK_FILES.libdockapp+=	lib/libdockapp.*
 
diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk
index 130b94c320a..7a57326214b 100644
--- a/devel/libgetopt/buildlink.mk
+++ b/devel/libgetopt/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2001/07/01 22:59:16 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2001/07/20 01:54:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use getopt_long().
 #
@@ -23,7 +23,7 @@ BUILDLINK_PREFIX.getopt=	/usr
 BUILDLINK_FILES.getopt=		include/getopt.h
 .else
 DEPENDS+=	${BUILDLINK_DEPENDS.getopt}:../../devel/libgetopt
-BUILDLINK_PREFIX.getopt=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.getopt=libgetopt
 BUILDLINK_FILES.getopt=		include/getopt.h
 BUILDLINK_FILES.getopt+=	lib/libgetopt.*
 BUILDLINK_FILES.getopt+=	lib/libgetopt_pic.a
diff --git a/devel/libnet/buildlink.mk b/devel/libnet/buildlink.mk
index 0401337bbab..5ef7e8b6d38 100644
--- a/devel/libnet/buildlink.mk
+++ b/devel/libnet/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/14 16:41:38 sakamoto Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libnet.
 #
@@ -20,7 +20,7 @@ LIBNET_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libnet?=	libnet-*
 DEPENDS+=	${BUILDLINK_DEPENDS.libnet}:../../devel/libnet
 
-BUILDLINK_PREFIX.libnet=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libnet=libnet
 BUILDLINK_FILES.libnet=		include/libnet.h
 BUILDLINK_FILES.libnet+=	include/libnet/*
 BUILDLINK_FILES.libnet+=	lib/libnet.*
diff --git a/devel/libproplist/buildlink.mk b/devel/libproplist/buildlink.mk
index 593f2db59db..3547cdbe348 100644
--- a/devel/libproplist/buildlink.mk
+++ b/devel/libproplist/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:16 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libproplist.
 #
@@ -20,7 +20,7 @@ LIBPROPLIST_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libproplist?=	libproplist>=0.10.1
 DEPENDS+=	${BUILDLINK_DEPENDS.libproplist}:../../devel/libproplist
 
-BUILDLINK_PREFIX.libproplist=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libproplist=libproplist
 BUILDLINK_FILES.libproplist=	include/proplist.h
 BUILDLINK_FILES.libproplist+=	lib/libPropList.*
 
diff --git a/devel/libslang/buildlink.mk b/devel/libslang/buildlink.mk
index 0f4cb1f61d0..b3cf48475b0 100644
--- a/devel/libslang/buildlink.mk
+++ b/devel/libslang/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:17 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:39 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libslang.
 #
@@ -20,7 +20,7 @@ LIBSLANG_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libslang?=	libslang>=1.4.4
 DEPENDS+=	${BUILDLINK_DEPENDS.libslang}:../../devel/libslang
 
-BUILDLINK_PREFIX.libslang=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libslang=libslang
 BUILDLINK_FILES.libslang=	include/slcurses.h
 BUILDLINK_FILES.libslang+=	include/slang.h
 BUILDLINK_FILES.libslang+=	lib/libslang.*
diff --git a/devel/libtool/buildlink.mk b/devel/libtool/buildlink.mk
index 18abf44a730..aeda690ce9b 100644
--- a/devel/libtool/buildlink.mk
+++ b/devel/libtool/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:17 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:39 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ltdl.
 #
@@ -18,7 +18,7 @@ LTDL_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.ltdl?=	libtool>=${LIBTOOL_REQD}
 DEPENDS+=	${BUILDLINK_DEPENDS.ltdl}:../../devel/libtool
 
-BUILDLINK_PREFIX.ltdl=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.ltdl=libtool
 BUILDLINK_FILES.ltdl=	include/ltdl.h
 BUILDLINK_FILES.ltdl+=	lib/libltdl.*
 
diff --git a/devel/lwp/buildlink.mk b/devel/lwp/buildlink.mk
index 93ba7f49fc5..1dbe7c80877 100644
--- a/devel/lwp/buildlink.mk
+++ b/devel/lwp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:17 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:39 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lwp.
 #
@@ -20,7 +20,7 @@ LWP_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.lwp?=	lwp>=1.6
 DEPENDS+=		${BUILDLINK_DEPENDS.lwp}:../../devel/lwp
 
-BUILDLINK_PREFIX.lwp=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.lwp=lwp
 BUILDLINK_FILES.lwp=	include/lwp/*
 BUILDLINK_FILES.lwp+=	lib/liblwp.*
 
diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk
index 9f0c00b02b2..72459960195 100644
--- a/devel/ncurses/buildlink.mk
+++ b/devel/ncurses/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/10 15:27:25 tron Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:39 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ncurses.
 #
@@ -39,7 +39,7 @@ _NEED_NCURSES=		YES
 .endif
 
 .if ${_NEED_NCURSES} == "YES"
-BUILDLINK_PREFIX.ncurses=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.ncurses=ncurses
 BUILDLINK_FILES.ncurses=	include/cursesapp.h
 BUILDLINK_FILES.ncurses+=	include/cursesf.h
 BUILDLINK_FILES.ncurses+=	include/cursesm.h
diff --git a/devel/pcre/buildlink.mk b/devel/pcre/buildlink.mk
index 37f50253564..3d805d30ce0 100644
--- a/devel/pcre/buildlink.mk
+++ b/devel/pcre/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:33:58 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:40 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pcre.
 #
@@ -20,7 +20,7 @@ PCRE_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.pcre?=	pcre>=3.4
 DEPENDS+=	${BUILDLINK_DEPENDS.pcre}:../../devel/pcre
 
-BUILDLINK_PREFIX.pcre=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.pcre=pcre
 BUILDLINK_FILES.pcre=	include/pcre.h
 BUILDLINK_FILES.pcre+=	include/pcreposix.h
 BUILDLINK_FILES.pcre+=	lib/libpcre.*
@@ -30,7 +30,7 @@ BUILDLINK_TARGETS.pcre=		pcre-buildlink
 BUILDLINK_TARGETS.pcre+=	pcre-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.pcre}
 
-BUILDLINK_CONFIG.pcre=		${LOCALBASE}/bin/pcre-config
+BUILDLINK_CONFIG.pcre=		${BUILDLINK_PREFIX.pcre}/bin/pcre-config
 BUILDLINK_CONFIG_WRAPPER.pcre=	${BUILDLINK_DIR}/bin/pcre-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk
index 3ec7164d41c..5b63289701e 100644
--- a/devel/pth/buildlink.mk
+++ b/devel/pth/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:32:41 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:40 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pth.
 #
@@ -20,7 +20,7 @@ PTH_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.pth?=	pth>=1.3.2
 DEPENDS+=		${BUILDLINK_DEPENDS.pth}:../../devel/pth
 
-BUILDLINK_PREFIX.pth=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.pth=pth
 BUILDLINK_FILES.pth=	include/pth.h
 BUILDLINK_FILES.pth+=	include/pthread.h
 BUILDLINK_FILES.pth+=	lib/libpth.*
@@ -31,10 +31,10 @@ BUILDLINK_TARGETS.pth+=	pth-buildlink-config-wrapper
 BUILDLINK_TARGETS.pth+=	pth-pthread-buildlink-config-wrapper
 BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.pth}
 
-BUILDLINK_CONFIG.pth=			${LOCALBASE}/bin/pth-config
+BUILDLINK_CONFIG.pth=			${BUILDLINK_PREFIX.pth}/bin/pth-config
 BUILDLINK_CONFIG_WRAPPER.pth=		${BUILDLINK_DIR}/bin/pth-config
 
-BUILDLINK_CONFIG.pth-pthread=		${LOCALBASE}/bin/pthread-config
+BUILDLINK_CONFIG.pth-pthread=		${BUILDLINK_PREFIX.pth}/bin/pthread-config
 BUILDLINK_CONFIG_WRAPPER.pth-pthread=	${BUILDLINK_DIR}/bin/pthread-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk
index 3617897ca7d..15ace60b5a0 100644
--- a/devel/readline/buildlink.mk
+++ b/devel/readline/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.13 2001/07/01 22:59:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.14 2001/07/20 01:54:40 jlam Exp $
 #
 # This Makefile fragment is included by packages that use readline().
 #
@@ -33,11 +33,11 @@ _NEED_GNU_READLINE=	YES
 
 .if ${_NEED_GNU_READLINE} == "YES"
 DEPENDS+=			${BUILDLINK_DEPENDS.readline}:../../devel/readline
-BUILDLINK_PREFIX.readline=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.readline=readline
 BUILDLINK_FILES.readline=	include/readline/*
 BUILDLINK_FILES.readline+=	lib/libreadline.*
 
-BUILDLINK_PREFIX.history=	${LOCALBASE}
+BUILDLINK_PREFIX.history=	${BUILDLINK_PREFIX.readline}
 BUILDLINK_FILES.history+=	lib/libhistory.*
 .else
 .if exists(/usr/include/readline.h)
diff --git a/devel/rpc2/buildlink.mk b/devel/rpc2/buildlink.mk
index 4293e6d719e..6f00a916016 100644
--- a/devel/rpc2/buildlink.mk
+++ b/devel/rpc2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:40 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rpc2.
 #
@@ -20,7 +20,7 @@ RPC2_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.rpc2?=	rpc2>=1.10
 DEPENDS+=			${BUILDLINK_DEPENDS.rpc2}:../../devel/rpc2
 
-BUILDLINK_PREFIX.rpc2=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.rpc2=rpc2
 BUILDLINK_FILES.rpc2=	include/rpc2/*
 BUILDLINK_FILES.rpc2+=	lib/libfail.*
 BUILDLINK_FILES.rpc2+=	lib/librpc2.*
diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk
index 91a73d6535d..e463a514b5e 100644
--- a/devel/rvm/buildlink.mk
+++ b/devel/rvm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:41 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rvm.
 #
@@ -20,7 +20,7 @@ RVM_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.rvm?=	rvm>=1.3
 DEPENDS+=		${BUILDLINK_DEPENDS.rvm}:../../devel/rvm
 
-BUILDLINK_PREFIX.rvm=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.rvm=rvm
 BUILDLINK_FILES.rvm=	include/rvm/*
 BUILDLINK_FILES.rvm+=	lib/librds.*
 BUILDLINK_FILES.rvm+=	lib/librdslwp.*
diff --git a/devel/rx/buildlink.mk b/devel/rx/buildlink.mk
index dc36d506c15..b9b6f2531ce 100644
--- a/devel/rx/buildlink.mk
+++ b/devel/rx/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:41 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rx.
 #
@@ -20,7 +20,7 @@ RX_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.rx?=	rx>=1.5
 DEPENDS+=	${BUILDLINK_DEPENDS.rx}:../../devel/rx
 
-BUILDLINK_PREFIX.rx=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.rx=rx
 BUILDLINK_FILES.rx=	include/rxposix.h
 BUILDLINK_FILES.rx+=	lib/librx.*
 
diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk
index b15db7b05eb..6706b605516 100644
--- a/devel/smpeg/buildlink.mk
+++ b/devel/smpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:58 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:41 jlam Exp $
 #
 # This Makefile fragment is included by packages that use smpeg.
 #
@@ -20,7 +20,7 @@ SMPEG_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.smpeg?=	smpeg>=0.4.3
 DEPENDS+=	${BUILDLINK_DEPENDS.smpeg}:../../devel/smpeg
 
-BUILDLINK_PREFIX.smpeg=		${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.smpeg=smpeg
 BUILDLINK_FILES.smpeg=		include/smpeg/*
 BUILDLINK_FILES.smpeg+=		lib/libsmpeg-*
 BUILDLINK_FILES.smpeg+=		lib/libsmpeg.*
@@ -31,7 +31,7 @@ BUILDLINK_TARGETS.smpeg=	smpeg-buildlink
 BUILDLINK_TARGETS.smpeg+=	smpeg-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.smpeg}
 
-BUILDLINK_CONFIG.smpeg=		${LOCALBASE}/bin/smpeg-config
+BUILDLINK_CONFIG.smpeg=		${BUILDLINK_PREFIX.smpeg}/bin/smpeg-config
 BUILDLINK_CONFIG_WRAPPER.smpeg=	${BUILDLINK_DIR}/bin/smpeg-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk
index 61786b89818..e9974eef992 100644
--- a/devel/zlib/buildlink.mk
+++ b/devel/zlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:41 jlam Exp $
 #
 # This Makefile fragment is included by packages that use zlib. 
 #
@@ -27,7 +27,7 @@ _NEED_ZLIB=		YES
 
 .if ${_NEED_ZLIB} == "YES"
 DEPENDS+=		${BUILDLINK_DEPENDS.zlib}:../../devel/zlib
-BUILDLINK_PREFIX.zlib=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.zlib=zlib
 .else
 BUILDLINK_PREFIX.zlib=	/usr
 .endif