diff --git a/security/rsaref/buildlink.mk b/security/rsaref/buildlink.mk
index ef79d4321b9c..e37725705149 100644
--- a/security/rsaref/buildlink.mk
+++ b/security/rsaref/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:29 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 rsaref.
 #
@@ -20,7 +20,7 @@ RSAREF_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.rsaref?=	rsaref-2.0p3
 DEPENDS+=	${BUILDLINK_DEPENDS.rsaref}:../../security/rsaref
 
-BUILDLINK_PREFIX.rsaref=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.rsaref=rsaref
 BUILDLINK_FILES.rsaref=		include/rsaref.h
 BUILDLINK_FILES.rsaref+=	lib/librsaref.*
 
diff --git a/security/tcp_wrappers/buildlink.mk b/security/tcp_wrappers/buildlink.mk
index 24aabc8fcb67..d0dedd8406e4 100644
--- a/security/tcp_wrappers/buildlink.mk
+++ b/security/tcp_wrappers/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:29 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:51 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tcp_wrappers.
 #
@@ -27,7 +27,7 @@ _NEED_TCP_WRAPPERS=	YES
 
 .if ${_NEED_TCP_WRAPPERS} == "YES"
 DEPENDS+=	${BUILDLINK_DEPENDS.tcp_wrappers}:../../security/tcp_wrappers
-BUILDLINK_PREFIX.tcp_wrappers=	${LOCALBASE}
+EVAL_PREFIX+=	BUILDLINK_PREFIX.tcp_wrappers=tcp_wrappers
 .else
 BUILDLINK_PREFIX.tcp_wrappers=	/usr
 .endif
diff --git a/textproc/jade/buildlink.mk b/textproc/jade/buildlink.mk
index edff4e8b65ab..91372d0cae9c 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 327b9f7739ae..9ccd54c3fbf2 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 f1e89f11fcfd..97943d8a7e07 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 e086dfb9d529..db657f249b8b 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.*
diff --git a/wm/windowmaker/buildlink.mk b/wm/windowmaker/buildlink.mk
index 9e8cf5ff8bbe..52d0553438c6 100644
--- a/wm/windowmaker/buildlink.mk
+++ b/wm/windowmaker/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/15 14:24:04 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 windowmaker.
 #
@@ -20,7 +20,7 @@ WINDOWMAKER_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.windowmaker?=	windowmaker>=0.65.0
 DEPENDS+=	${BUILDLINK_DEPENDS.windowmaker}:../../wm/windowmaker
 
-BUILDLINK_PREFIX.windowmaker=	${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.windowmaker=windowmaker
 BUILDLINK_FILES.windowmaker=	include/WINGs/*
 BUILDLINK_FILES.windowmaker+=	include/WMaker.h
 BUILDLINK_FILES.windowmaker+=	include/wraster.h
@@ -44,13 +44,13 @@ BUILDLINK_TARGETS.windowmaker+=	wm-wutil-buildlink-config-wrapper
 BUILDLINK_TARGETS.windowmaker+=	wm-wraster-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.windowmaker}
 
-BUILDLINK_CONFIG.wm-wings=		${X11PREFIX}/bin/get-wings-flags
+BUILDLINK_CONFIG.wm-wings=		${BUILDLINK_PREFIX.windowmaker}/bin/get-wings-flags
 BUILDLINK_CONFIG_WRAPPER.wm-wings=	${BUILDLINK_DIR}/bin/get-wings-flags
 
-BUILDLINK_CONFIG.wm-wutil=		${X11PREFIX}/bin/get-wutil-flags
+BUILDLINK_CONFIG.wm-wutil=		${BUILDLINK_PREFIX.windowmaker}/bin/get-wutil-flags
 BUILDLINK_CONFIG_WRAPPER.wm-wutil=	${BUILDLINK_DIR}/bin/get-wutil-flags
 
-BUILDLINK_CONFIG.wm-wraster=		${X11PREFIX}/bin/get-wraster-flags
+BUILDLINK_CONFIG.wm-wraster=		${BUILDLINK_PREFIX.windowmaker}/bin/get-wraster-flags
 BUILDLINK_CONFIG_WRAPPER.wm-wraster=	${BUILDLINK_DIR}/bin/get-wraster-flags
 
 .if defined(USE_CONFIG_WRAPPER)
diff --git a/www/libghttp/buildlink.mk b/www/libghttp/buildlink.mk
index 949dc7dc5f60..de2d09540e7a 100644
--- a/www/libghttp/buildlink.mk
+++ b/www/libghttp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:31 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 libghttp.
 #
@@ -20,7 +20,7 @@ LIBGHTTP_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libghttp?=	libghttp>=1.0.9
 DEPENDS+=	${BUILDLINK_DEPENDS.libghttp}:../../www/libghttp
 
-BUILDLINK_PREFIX.libghttp=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libghttp=libghttp
 BUILDLINK_FILES.libghttp=	include/ghttp*
 BUILDLINK_FILES.libghttp+=	lib/libghttp.*
 
diff --git a/www/libwww/buildlink.mk b/www/libwww/buildlink.mk
index 7551fcb1d771..033bc2b3b30f 100644
--- a/www/libwww/buildlink.mk
+++ b/www/libwww/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:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libwww.
 #
@@ -20,7 +20,7 @@ LIBWWW_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libwww?=	libwww>=5.3.2
 DEPENDS+=	${BUILDLINK_DEPENDS.libwww}:../../www/libwww
 
-BUILDLINK_PREFIX.libwww=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libwww=libwww
 BUILDLINK_FILES.libwww=		include/wwwconf.h
 BUILDLINK_FILES.libwww+=	include/w3c-libwww/*
 BUILDLINK_FILES.libwww+=	lib/libmd5.*
@@ -55,8 +55,8 @@ BUILDLINK_TARGETS.libwww=	libwww-buildlink
 BUILDLINK_TARGETS.libwww+=	libwww-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libwww}
 
-BUILDLINK_CONFIG.libwww=		${LOCALBASE}/bin/libwww-config
-BUILDLINK_CONFIG_WRAPPER.libwww=	${BUILDLINK_DIR}/bin/libwww-config
+BUILDLINK_CONFIG.libwww=	${BUILDLINK_PREFIX.libwww}/bin/libwww-config
+BUILDLINK_CONFIG_WRAPPER.libwww=${BUILDLINK_DIR}/bin/libwww-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 LIBWWW_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libwww}
diff --git a/x11/Xaw3d/buildlink.mk b/x11/Xaw3d/buildlink.mk
index 438f53787a6a..6e65d35d0e29 100644
--- a/x11/Xaw3d/buildlink.mk
+++ b/x11/Xaw3d/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Xaw3d.
 #
@@ -20,12 +20,12 @@ XAW3D_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.Xaw3d?=	Xaw3d-1.5
 DEPENDS+=	${BUILDLINK_DEPENDS.Xaw3d}:../../x11/Xaw3d
 
-BUILDLINK_PREFIX.Xaw3d=		${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.Xaw3d=Xaw3d
 BUILDLINK_FILES.Xaw3d=		include/X11/X11/Xaw3d/*	# for OpenWindows
 BUILDLINK_FILES.Xaw3d+=		include/X11/Xaw3d/*
 BUILDLINK_FILES.Xaw3d+=		lib/libXaw3d.*
 
-BUILDLINK_PREFIX.Xaw3d-libXaw=		${X11PREFIX}
+BUILDLINK_PREFIX.Xaw3d-libXaw=		${BUILDLINK_PREFIX.Xaw3d}
 BUILDLINK_FILES.Xaw3d-libXaw=		lib/libXaw3d.*
 BUILDLINK_TRANSFORM.Xaw3d-libXaw=	-e "s|libXaw3d\.|libXaw.|g"
 
diff --git a/x11/fltk/buildlink.mk b/x11/fltk/buildlink.mk
index 9e216e3fb596..0ed48be40ac7 100644
--- a/x11/fltk/buildlink.mk
+++ b/x11/fltk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use FLTK.
 #
@@ -20,7 +20,7 @@ FLTK_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.fltk?=	fltk>=1.0.9
 DEPENDS+=	${BUILDLINK_DEPENDS.fltk}:../../x11/fltk
 
-BUILDLINK_PREFIX.fltk=	${X11PREFIX}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.fltk=fltk
 BUILDLINK_FILES.fltk=	include/FL/*
 BUILDLINK_FILES.fltk+=	lib/libfltk.*
 
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index f6161ecf847e..8aa0690c6ff9 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/02 14:22:21 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
@@ -20,7 +20,7 @@ GNOME_LIBS_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.gnome-libs?=	gnome-libs>=1.0.53
 DEPENDS+=	${BUILDLINK_DEPENDS.gnome-libs}:../../x11/gnome-libs
 
-BUILDLINK_PREFIX.gnome-libs=	${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-libs=gnome-libs
 BUILDLINK_FILES.gnome-libs=	include/gnome.h
 BUILDLINK_FILES.gnome-libs+=	include/gtk-xmhtml/*
 BUILDLINK_FILES.gnome-libs+=	include/libart_lgpl/*
@@ -40,9 +40,9 @@ BUILDLINK_FILES.gnome-libs+=	lib/libgtkxmhtml.*
 BUILDLINK_FILES.gnome-libs+=	lib/libzvt.*
 
 REPLACE_BUILDLINK_SED+=	\
-	-e "s|-I${BUILDLINK_DIR}/\(lib/gnome-libs/\)|-I${X11PREFIX}/\1|g"
+	-e "s|-I${BUILDLINK_DIR}/\(lib/gnome-libs/\)|-I${BUILDLINK_PREFIX.gnome-libs}/\1|g"
 BUILDLINK_CONFIG_WRAPPER_SED+=	\
-	-e "s|-I${X11PREFIX}/\(lib/gnome-libs/\)|-I${BUILDLINK_DIR}/\1|g"
+	-e "s|-I${BUILDLINK_PREFIX.gnome-libs}/\(lib/gnome-libs/\)|-I${BUILDLINK_DIR}/\1|g"
 
 .include "../../audio/esound/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
@@ -56,7 +56,7 @@ BUILDLINK_TARGETS.gnome-libs+=	gnome-libs-buildlink-config-wrapper
 BUILDLINK_TARGETS.gnome-libs+=	libart-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gnome-libs}
 
-BUILDLINK_CONFIG.gnome-libs=		${X11PREFIX}/bin/gnome-config
+BUILDLINK_CONFIG.gnome-libs=		${BUILDLINK_PREFIX.gnome-libs}/bin/gnome-config
 BUILDLINK_CONFIG_WRAPPER.gnome-libs=	${BUILDLINK_DIR}/bin/gnome-config
 BUILDLINK_CONFIG_WRAPPER.libart=	${BUILDLINK_DIR}/bin/libart-config
 
diff --git a/x11/gtk/buildlink.mk b/x11/gtk/buildlink.mk
index 1b058ad6f84e..3fc3bf09231c 100644
--- a/x11/gtk/buildlink.mk
+++ b/x11/gtk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/13 05:42:05 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gtk.
 #
@@ -20,7 +20,7 @@ GTK_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.gtk?=	gtk+>=1.2.8
 DEPENDS+=		${BUILDLINK_DEPENDS.gtk}:../../x11/gtk
 
-BUILDLINK_PREFIX.gtk=	${X11PREFIX}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gtk=gtk
 BUILDLINK_FILES.gtk=	include/gdk/*
 BUILDLINK_FILES.gtk+=	include/gtk/*
 BUILDLINK_FILES.gtk+=	include/gtk-*/*/*
@@ -28,9 +28,9 @@ BUILDLINK_FILES.gtk+=	lib/libgdk.*
 BUILDLINK_FILES.gtk+=	lib/libgtk.*
 
 REPLACE_BUILDLINK_SED+=	\
-	-e "s|-I${BUILDLINK_DIR}/\(include/gtk-[^/]*/\)|-I${X11PREFIX}/\1|g"
+	-e "s|-I${BUILDLINK_DIR}/\(include/gtk-[^/]*/\)|-I${BUILDLINK_PREFIX.gtk}/\1|g"
 BUILDLINK_CONFIG_WRAPPER_SED+=	\
-	-e "s|-I${X11PREFIX}/\(include/gtk-[^/]*/\)|-I${BUILDLINK_DIR}/\1|g"
+	-e "s|-I${BUILDLINK_PREFIX.gtk}/\(include/gtk-[^/]*/\)|-I${BUILDLINK_DIR}/\1|g"
 
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/glib/buildlink.mk"
@@ -39,7 +39,7 @@ BUILDLINK_TARGETS.gtk=	gtk-buildlink
 BUILDLINK_TARGETS.gtk+=	gtk-buildlink-config-wrapper
 BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gtk}
 
-BUILDLINK_CONFIG.gtk=		${X11PREFIX}/bin/gtk-config
+BUILDLINK_CONFIG.gtk=		${BUILDLINK_PREFIX.gtk}/bin/gtk-config
 BUILDLINK_CONFIG_WRAPPER.gtk=	${BUILDLINK_DIR}/bin/gtk-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/x11/kdebase2/buildlink.mk b/x11/kdebase2/buildlink.mk
index ee58e063caad..c09e88a1e726 100644
--- a/x11/kdebase2/buildlink.mk
+++ b/x11/kdebase2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/06 06:46:51 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kdebase2.
 #
@@ -22,7 +22,7 @@ DEPENDS+=	${BUILDLINK_DEPENDS.kdebase2}:../../x11/kdebase2
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILDLINK_PREFIX.kdebase2=	${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.kdebase2=kdebase
 BUILDLINK_FILES.kdebase2!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdebase2/pkg/PLIST
 
 .include "../../x11/kdelibs2/buildlink.mk"
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
index 256e8d3fc5b9..fae7b4822bef 100644
--- a/x11/kdelibs2/buildlink.mk
+++ b/x11/kdelibs2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/15 11:06:10 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kdelibs2.
 #
@@ -22,7 +22,7 @@ DEPENDS+=	${BUILDLINK_DEPENDS.kdelibs2}:../../x11/kdelibs2
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILDLINK_PREFIX.kdelibs2=	${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.kdelibs2=kdelibs
 BUILDLINK_FILES.kdelibs2!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdelibs2/pkg/PLIST
 BUILDLINK_FILES.kdelibs2+=	bin/dcopserver
 
@@ -42,10 +42,10 @@ BUILDLINK_TARGETS.kdelibs2+=	kdelibs2-buildlink-config-wrapper
 BUILDLINK_TARGETS.kdelibs2+=	kdelibs2-artsc-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.kdelibs2}
 
-BUILDLINK_CONFIG.kdelibs2=		${X11PREFIX}/bin/kde-config
+BUILDLINK_CONFIG.kdelibs2=		${BUILDLINK_PREFIX.kdelibs2}/bin/kde-config
 BUILDLINK_CONFIG_WRAPPER.kdelibs2=	${BUILDLINK_DIR}/bin/kde-config
 
-BUILDLINK_CONFIG.kdelibs2-artsc=	 ${X11PREFIX}/bin/artsc-config
+BUILDLINK_CONFIG.kdelibs2-artsc=	 ${BUILDLINK_PREFIX.kdelibs2}/bin/artsc-config
 BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc= ${BUILDLINK_DIR}/bin/artsc-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/x11/lesstif/buildlink.mk b/x11/lesstif/buildlink.mk
index 28429b126d4c..00085c0e4dda 100644
--- a/x11/lesstif/buildlink.mk
+++ b/x11/lesstif/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/02 21:11:46 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lesstif.
 #
@@ -50,7 +50,7 @@ MOTIFBASE?=	${X11BASE}
 .endif
 .endif
 
-BUILDLINK_PREFIX.lesstif=	${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.lesstif=lesstif
 BUILDLINK_FILES.lesstif=	include/Mrm/*
 BUILDLINK_FILES.lesstif+=	include/Xm/*
 BUILDLINK_FILES.lesstif+=	include/uil/*
diff --git a/x11/lesstif12/buildlink.mk b/x11/lesstif12/buildlink.mk
index 89991a289e34..62c5b30372b4 100644
--- a/x11/lesstif12/buildlink.mk
+++ b/x11/lesstif12/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lesstif12.
 #
@@ -56,7 +56,7 @@ MOTIFBASE?=	${X11BASE}
 .endif
 .endif
 
-BUILDLINK_PREFIX.lesstif12=	${MOTIFBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.lesstif12=lesstif12
 BUILDLINK_FILES.lesstif12=	include/Mrm/*
 BUILDLINK_FILES.lesstif12+=	include/Xm/*
 BUILDLINK_FILES.lesstif12+=	include/Xm/*
diff --git a/x11/qt2-designer/buildlink.mk b/x11/qt2-designer/buildlink.mk
index d53f16ee102f..efc80c5b8b5f 100644
--- a/x11/qt2-designer/buildlink.mk
+++ b/x11/qt2-designer/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/15 20:16:48 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use qt2-designer.
 #
@@ -21,7 +21,7 @@ BUILDLINK_DEPENDS.qt2-designer?= \
 		{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
 DEPENDS+=	${BUILDLINK_DEPENDS.qt2-designer}:../../x11/qt2-designer
 
-BUILDLINK_PREFIX.qt2-designer=	${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.qt2-designer=qt2-designer
 BUILDLINK_FILES.qt2-designer=	qt2/bin/designer
 BUILDLINK_FILES.qt2-designer=	qt2/bin/uic
 BUILDLINK_FILES.qt2-designer+=	qt2/lib/libqutil.*
diff --git a/x11/qt2-libs/buildlink.mk b/x11/qt2-libs/buildlink.mk
index 04fe5ce8ac98..2d68e8aaa957 100644
--- a/x11/qt2-libs/buildlink.mk
+++ b/x11/qt2-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/02 04:40:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use qt2-libs.
 #
@@ -20,13 +20,13 @@ QT2_LIBS_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.qt2-libs?=	qt2-libs>=2.2.4
 DEPENDS+=	${BUILDLINK_DEPENDS.qt2-libs}:../../x11/qt2-libs
 
-BUILDLINK_PREFIX.qt2-libs=	${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.qt2-libs=qt2-libs
 BUILDLINK_FILES.qt2-libs=	qt2/bin/moc
 BUILDLINK_FILES.qt2-libs+=	qt2/include/*.h
 BUILDLINK_FILES.qt2-libs+=	qt2/lib/libqt.*
 
 BUILDLINK_QTDIR=		${BUILDLINK_DIR}/qt2
-QTDIR=				${X11PREFIX}/qt2
+QTDIR=				${BUILDLINK_PREFIX.qt2-libs}/qt2
 REPLACE_BUILDLINK_SED+=		-e "s|-I${BUILDLINK_QTDIR}/|-I${QTDIR}/|g"
 REPLACE_BUILDLINK_SED+=		-e "s|-L${BUILDLINK_QTDIR}/|-L${QTDIR}/|g"
 BUILDLINK_CONFIG_WRAPPER_SED+=	-e "s|-I${QTDIR}/|-I${BUILDLINK_QTDIR}/|g"
diff --git a/x11/tk/buildlink.mk b/x11/tk/buildlink.mk
index 0345e2a43419..db2cbee17114 100644
--- a/x11/tk/buildlink.mk
+++ b/x11/tk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tk.
 #
@@ -20,7 +20,7 @@ TK_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.tk?=	tk>=8.3.2
 DEPENDS+=		${BUILDLINK_DEPENDS.tk}:../../x11/tk
 
-BUILDLINK_PREFIX.tk=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.tk=tk
 BUILDLINK_FILES.tk=	include/tk.h
 BUILDLINK_FILES.tk+=	include/tkInt.h
 BUILDLINK_FILES.tk+=	include/tkDecls.h
@@ -44,9 +44,9 @@ tkConfig-buildlink:
 	if [ ! -f $${cookie} ]; then					\
 		file=lib/tkConfig.sh;					\
 		${ECHO_MSG} "Creating script ${BUILDLINK_DIR}/$${file}."; \
-		${SED}	-e "s|-L${LOCALBASE}/lib|-L${BUILDLINK_DIR}/lib|g" \
-			-e "s|${LOCALBASE}/lib/libtkstub|-L${BUILDLINK_DIR}/lib/libtkstub|g" \
-			${LOCALBASE}/$${file} > ${BUILDLINK_DIR}/$${file}; \
+		${SED}	-e "s|-L${BUILDLINK_PREFIX.tk}/lib|-L${BUILDLINK_DIR}/lib|g" \
+			-e "s|${BUILDLINK_PREFIX.tk}/lib/libtkstub|-L${BUILDLINK_DIR}/lib/libtkstub|g" \
+			${BUILDLINK_PREFIX.tk}/$${file} > ${BUILDLINK_DIR}/$${file}; \
 		${CHMOD} +x ${BUILDLINK_DIR}/$${file};			\
 		${TOUCH} ${TOUCH_FLAGS} $${cookie};			\
 	fi
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk
index 6508670d20a5..9ddb190297fa 100644
--- a/x11/wxGTK/buildlink.mk
+++ b/x11/wxGTK/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:34:01 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:56 jlam Exp $
 #
 # This Makefile fragment is included by packages that use wxGTK.
 #
@@ -20,18 +20,18 @@ WXGTK_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.2.2
 DEPENDS+=			${BUILDLINK_DEPENDS.wxGTK}:../../x11/wxGTK
 
-BUILDLINK_PREFIX.wxGTK=		${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.wxGTK=wxGTK
 BUILDLINK_FILES.wxGTK=		include/wx/*
 BUILDLINK_FILES.wxGTK+=		include/wx/*/*
 BUILDLINK_FILES.wxGTK+=		lib/wx/include/wx/gtk/*
 BUILDLINK_FILES.wxGTK+=		lib/libwx_gtk.*
 
 REPLACE_BUILDLINK_SED+=	\
-	-e "s|-I${BUILDLINK_DIR}/\(include/wx/\)|${X11PREFIX}/\1|g"	\
-	-e "s|-I${BUILDLINK_DIR}/\(lib/wx/include/\)|${X11PREFIX}/\1|g"
+	-e "s|-I${BUILDLINK_DIR}/\(include/wx/\)|${BUILDLINK_PREFIX.wxGTK}/\1|g"	\
+	-e "s|-I${BUILDLINK_DIR}/\(lib/wx/include/\)|${BUILDLINK_PREFIX.wxGTK}/\1|g"
 BUILDLINK_CONFIG_WRAPPER_SED+=	\
-	-e "s|-I${X11PREFIX}/\(include/wx/\)|-I${BUILDLINK_DIR}/\1|g"	\
-	-e "s|-I${X11PREFIX}/\(lib/wx/include/\)|-I${BUILDLINK_DIR}/\1|g"
+	-e "s|-I${BUILDLINK_PREFIX.wxGTK}/\(include/wx/\)|-I${BUILDLINK_DIR}/\1|g"	\
+	-e "s|-I${BUILDLINK_PREFIX.wxGTK}/\(lib/wx/include/\)|-I${BUILDLINK_DIR}/\1|g"
 
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
@@ -43,8 +43,8 @@ BUILDLINK_TARGETS.wxGTK+=	wxGTK-1-buildlink-config-wrapper
 BUILDLINK_TARGETS.wxGTK+=	wxGTK-2-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.wxGTK}
 
-BUILDLINK_CONFIG.wxGTK-1=		${X11PREFIX}/bin/wx-config
-BUILDLINK_CONFIG.wxGTK-2=		${X11PREFIX}/bin/wxgtk-config
+BUILDLINK_CONFIG.wxGTK-1=		${BUILDLINK_PREFIX.wxGTK}/bin/wx-config
+BUILDLINK_CONFIG.wxGTK-2=		${BUILDLINK_PREFIX.wxGTK}/bin/wxgtk-config
 BUILDLINK_CONFIG_WRAPPER.wxGTK-1=	${BUILDLINK_DIR}/bin/wx-config
 BUILDLINK_CONFIG_WRAPPER.wxGTK-2=	${BUILDLINK_DIR}/bin/wxgtk-config
 
diff --git a/x11/xforms/buildlink.mk b/x11/xforms/buildlink.mk
index 4cc9577a3c7a..2a4399de5937 100644
--- a/x11/xforms/buildlink.mk
+++ b/x11/xforms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/03 21:29:56 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:56 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xforms.
 #
@@ -20,7 +20,7 @@ XFORMS_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.xforms?=	xforms>=0.88nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.xforms}:../../x11/xforms
 
-BUILDLINK_PREFIX.xforms=	${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.xforms=xforms
 BUILDLINK_FILES.xforms=		include/X11/forms.h
 BUILDLINK_FILES.xforms+=	lib/libforms.*
 BUILDLINK_FILES.xforms+=	lib/libxforms.*