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

20 files changed, 51 insertions, 47 deletions

diff --git a/graphics/ImageMagick/buildlink.mk b/graphics/ImageMagick/buildlink.mk
index b4e39cfabdf..a6c75f2e1b4 100644
--- a/graphics/ImageMagick/buildlink.mk
+++ b/graphics/ImageMagick/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/09 18:24:09 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:42 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ImageMagick.
 #
@@ -20,7 +20,7 @@ IMAGEMAGICK_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.ImageMagick?=	ImageMagick>=5.2.8
 DEPENDS+=	${BUILDLINK_DEPENDS.ImageMagick}:../../graphics/ImageMagick
 
-BUILDLINK_PREFIX.ImageMagick=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.ImageMagick=ImageMagick
 BUILDLINK_FILES.ImageMagick=	include/Magick++.h
 BUILDLINK_FILES.ImageMagick+=	include/Magick++/*
 BUILDLINK_FILES.ImageMagick+=	include/magick/*
diff --git a/graphics/avifile/buildlink.mk b/graphics/avifile/buildlink.mk
index 4f350ef4e12..dfa4f0edcf8 100644
--- a/graphics/avifile/buildlink.mk
+++ b/graphics/avifile/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:42 jlam Exp $
 #
 # This Makefile fragment is included by packages that use avifile.
 #
@@ -20,7 +20,7 @@ AVIFILE_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.avifile?=	avifile>=0.53.5
 DEPENDS+=	${BUILDLINK_DEPENDS.avifile}:../../graphics/avifile
 
-BUILDLINK_PREFIX.avifile=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.avifile=avifile
 BUILDLINK_FILES.avifile=	lib/libaviplay.*
 BUILDLINK_FILES.avifile+=	include/avifile/*
 BUILDLINK_FILES.avifile+=	include/avifile/wine/*
@@ -29,7 +29,7 @@ BUILDLINK_TARGETS.avifile=	avifile-buildlink
 BUILDLINK_TARGETS.avifile+=	avifile-buildlink-config-wrapper
 BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.avifile}
 
-BUILDLINK_CONFIG.avifile=	${LOCALBASE}/bin/avifile-config
+BUILDLINK_CONFIG.avifile=	${BUILDLINK_PREFIX.avifile}/bin/avifile-config
 BUILDLINK_CONFIG_WRAPPER.avifile=${BUILDLINK_DIR}/bin/avifile-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index c853667a9d4..0ae1e9caeec 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:33:59 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:42 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ClanLib.
 #
@@ -20,7 +20,7 @@ CLANLIB_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.ClanLib?=	ClanLib>=0.4.4
 DEPENDS+=	${BUILDLINK_DEPENDS.ClanLib}:../../graphics/clanlib
 
-BUILDLINK_PREFIX.ClanLib=	${X11BASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.ClanLib=ClanLib
 BUILDLINK_FILES.ClanLib=	lib/libclancore.*
 BUILDLINK_FILES.ClanLib+=	lib/ClanLib/*
 BUILDLINK_FILES.ClanLib+=	include/ClanLib/*.h
@@ -43,7 +43,7 @@ BUILDLINK_TARGETS.ClanLib=	ClanLib-buildlink
 BUILDLINK_TARGETS.ClanLib+=	ClanLib-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.ClanLib}
 
-BUILDLINK_CONFIG.ClanLib=	${LOCALBASE}/bin/clanlib-config
+BUILDLINK_CONFIG.ClanLib=	${BUILDLINK_PREFIX.ClanLib}/bin/clanlib-config
 BUILDLINK_CONFIG_WRAPPER.ClanLib=${BUILDLINK_DIR}/bin/clanlib-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/graphics/fnlib/buildlink.mk b/graphics/fnlib/buildlink.mk
index ff98d845834..51e5ad6e042 100644
--- a/graphics/fnlib/buildlink.mk
+++ b/graphics/fnlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/03 16:30:19 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:43 jlam Exp $
 #
 # This Makefile fragment is included by packages that use fnlib.
 #
@@ -18,7 +18,7 @@ FNLIB_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.fnlib?=	fnlib>=0.5
 DEPENDS+=	${BUILDLINK_DEPENDS.fnlib}:../../graphics/fnlib
 
-BUILDLINK_PREFIX.fnlib=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.fnlib=fnlib
 BUILDLINK_FILES.fnlib=	include/Fnlib*
 BUILDLINK_FILES.fnlib+=	lib/libFnlib.*
 
diff --git a/graphics/freetype-lib/buildlink.mk b/graphics/freetype-lib/buildlink.mk
index 05673b386bb..fa598f8c95b 100644
--- a/graphics/freetype-lib/buildlink.mk
+++ b/graphics/freetype-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:22 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:43 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype.
 #
@@ -20,7 +20,7 @@ FREETYPE_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.freetype?=	freetype-lib>=1.3.1
 DEPENDS+=	${BUILDLINK_DEPENDS.freetype}:../../graphics/freetype-lib
 
-BUILDLINK_PREFIX.freetype=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.freetype=freetype-lib
 BUILDLINK_FILES.freetype=	include/freetype/*
 BUILDLINK_FILES.freetype+=	lib/libttf.*
 
diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk
index d82712df2a9..1868b174c8e 100644
--- a/graphics/freetype2/buildlink.mk
+++ b/graphics/freetype2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/07/14 15:56:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:43 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype2.
 #
@@ -36,7 +36,7 @@ _NEED_FREETYPE2=	NO
 
 .if ${_NEED_FREETYPE2} == "YES"
 DEPENDS+=	${BUILDLINK_DEPENDS.freetype2}:../../graphics/freetype2
-BUILDLINK_PREFIX.freetype2=	${LOCALBASE}
+EVAL_PREFIX+=	BUILDLINK_PREFIX.freetype2=freetype2
 .else
 BUILDLINK_PREFIX.freetype2=	${X11BASE}
 .endif
@@ -54,8 +54,10 @@ BUILDLINK_TARGETS.freetype2=	freetype2-buildlink
 
 .if ${_NEED_FREETYPE2} == "YES"
 BUILDLINK_TARGETS.freetype2+=		freetype2-buildlink-config-wrapper
-BUILDLINK_CONFIG.freetype2=		${LOCALBASE}/bin/freetype-config
-BUILDLINK_CONFIG_WRAPPER.freetype2=	${BUILDLINK_DIR}/bin/freetype-config
+BUILDLINK_CONFIG.freetype2=	\
+			${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
+BUILDLINK_CONFIG_WRAPPER.freetype2=	\
+			${BUILDLINK_DIR}/bin/freetype-config
 
 freetype2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
diff --git a/graphics/gd/buildlink.mk b/graphics/gd/buildlink.mk
index 463d2ef1610..f43864d66a0 100644
--- a/graphics/gd/buildlink.mk
+++ b/graphics/gd/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:22 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gd.
 #
@@ -20,7 +20,7 @@ GD_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.gd?=	gd>=1.8.3
 DEPENDS+=	${BUILDLINK_DEPENDS.gd}:../../graphics/gd
 
-BUILDLINK_PREFIX.gd=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gd=gd
 BUILDLINK_FILES.gd=	include/gd*.h
 BUILDLINK_FILES.gd+=	lib/libgd.*
 
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index 6997520a173..dc5d59ebb6b 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:59 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf.
 #
@@ -20,7 +20,7 @@ GDK_PIXBUF_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.gkd-pixbuf?=	gdk-pixbuf>=0.8.0nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.gkd-pixbuf}:../../graphics/gdk-pixbuf
 
-BUILDLINK_PREFIX.gdk-pixbuf=	${X11PREFIX}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf
 BUILDLINK_FILES.gdk-pixbuf=	include/gdk-pixbuf/*
 BUILDLINK_FILES.gdk-pixbuf+=	lib/libgdk_pixbuf.*
 BUILDLINK_FILES.gdk-pixbuf+=	lib/libgdk_pixbuf_xlib.*
@@ -33,8 +33,10 @@ BUILDLINK_TARGETS.gdk-pixbuf=	gdk-pixbuf-buildlink
 BUILDLINK_TARGETS.gdk-pixbuf+=	gdk-pixbuf-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gdk-pixbuf}
 
-BUILDLINK_CONFIG.gdk-pixbuf=		${X11PREFIX}/bin/gdk-pixbuf-config
-BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf=	${BUILDLINK_DIR}/bin/gdk-pixbuf-config
+BUILDLINK_CONFIG.gdk-pixbuf=	\
+			${BUILDLINK_PREFIX.gdk-pixbuf}/bin/gdk-pixbuf-config
+BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf=	\
+			${BUILDLINK_DIR}/bin/gdk-pixbuf-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 GDK_PIXBUF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}
diff --git a/graphics/hermes/buildlink.mk b/graphics/hermes/buildlink.mk
index 810f7a759d9..bc46654570c 100644
--- a/graphics/hermes/buildlink.mk
+++ b/graphics/hermes/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:23 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Hermes.
 #
@@ -20,7 +20,7 @@ HERMES_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.Hermes?=	Hermes>=1.3.2
 DEPENDS+=	${BUILDLINK_DEPENDS.Hermes}:../../graphics/hermes
 
-BUILDLINK_PREFIX.Hermes=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.Hermes=Hermes
 BUILDLINK_FILES.Hermes=		include/Hermes/*
 BUILDLINK_FILES.Hermes+=	lib/libHermes.*
 
diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk
index 57c23a53049..f6e301d0172 100644
--- a/graphics/imlib/buildlink.mk
+++ b/graphics/imlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:59 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use imlib.
 #
@@ -20,7 +20,7 @@ IMLIB_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.imlib?=	imlib>=1.9.8
 DEPENDS+=	${BUILDLINK_DEPENDS.imlib}:../../graphics/imlib
 
-BUILDLINK_PREFIX.imlib=	${X11PREFIX}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.imlib=imlib
 BUILDLINK_FILES.imlib=	include/gdk_imlib.h
 BUILDLINK_FILES.imlib+=	include/gdk_imlib_private.h
 BUILDLINK_FILES.imlib+=	include/gdk_imlib_types.h
@@ -41,7 +41,7 @@ BUILDLINK_TARGETS.imlib=	imlib-buildlink
 BUILDLINK_TARGETS.imlib+=	imlib-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.imlib}
 
-BUILDLINK_CONFIG.imlib=		${X11PREFIX}/bin/imlib-config
+BUILDLINK_CONFIG.imlib=		${BUILDLINK_PREFIX.imlib}/bin/imlib-config
 BUILDLINK_CONFIG_WRAPPER.imlib=	${BUILDLINK_DIR}/bin/imlib-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/graphics/jpeg/buildlink.mk b/graphics/jpeg/buildlink.mk
index af77b33aff6..99e17592052 100644
--- a/graphics/jpeg/buildlink.mk
+++ b/graphics/jpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:24 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libjpeg.
 #
@@ -20,7 +20,7 @@ JPEG_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.jpeg?=	jpeg-6b
 DEPENDS+=	${BUILDLINK_DEPENDS.jpeg}:../../graphics/jpeg
 
-BUILDLINK_PREFIX.jpeg=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.jpeg=jpeg
 BUILDLINK_FILES.jpeg=	include/jconfig.h
 BUILDLINK_FILES.jpeg+=	include/jpeglib.h
 BUILDLINK_FILES.jpeg+=	include/jmorecfg.h
diff --git a/graphics/lcms/buildlink.mk b/graphics/lcms/buildlink.mk
index 36e41d8f710..43b68bd3d0a 100644
--- a/graphics/lcms/buildlink.mk
+++ b/graphics/lcms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:24 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lcms.
 #
@@ -20,7 +20,7 @@ LCMS_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.lcms?=	lcms>=1.06
 DEPENDS+=	${BUILDLINK_DEPENDS.lcms}:../../graphics/lcms
 
-BUILDLINK_PREFIX.lcms=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.lcms=lcms
 BUILDLINK_FILES.lcms=	include/lcms/*
 BUILDLINK_FILES.lcms+=	lib/liblcms.*
 
diff --git a/graphics/libungif/buildlink.mk b/graphics/libungif/buildlink.mk
index ef6ac61d77e..0f521c77781 100644
--- a/graphics/libungif/buildlink.mk
+++ b/graphics/libungif/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:24 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libungif.
 #
@@ -20,7 +20,7 @@ LIBUNGIF_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libungif?=	libungif>=4.1.0
 DEPENDS+=	${BUILDLINK_DEPENDS.libungif}:../../graphics/libungif
 
-BUILDLINK_PREFIX.libungif=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libungif=libungif
 BUILDLINK_FILES.libungif=	include/gif_lib.h
 BUILDLINK_FILES.libungif+=	lib/libgif.*
 BUILDLINK_FILES.libungif+=	lib/libungif.*
diff --git a/graphics/libwmf/buildlink.mk b/graphics/libwmf/buildlink.mk
index c7f6293733f..63cd414c908 100644
--- a/graphics/libwmf/buildlink.mk
+++ b/graphics/libwmf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/09 18:59:48 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libwmf.
 #
@@ -20,7 +20,7 @@ LIBWMF_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libwmf?=	libwmf>=0.1.21
 DEPENDS+=	${BUILDLINK_DEPENDS.libwmf}:../../graphics/libwmf
 
-BUILDLINK_PREFIX.libwmf=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libwmf=libwmf
 BUILDLINK_FILES.libwmf=		include/libwmf/*.h
 BUILDLINK_FILES.libwmf+=	lib/libXwmf.a
 BUILDLINK_FILES.libwmf+=	lib/libdib.a
diff --git a/graphics/mng/buildlink.mk b/graphics/mng/buildlink.mk
index 402aa494259..b0cf8b4d788 100644
--- a/graphics/mng/buildlink.mk
+++ b/graphics/mng/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:24 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use mng.
 #
@@ -20,7 +20,7 @@ MNG_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.mng?=	mng>=1.0.0
 DEPENDS+=		${BUILDLINK_DEPENDS.mng}:../../graphics/mng
 
-BUILDLINK_PREFIX.mng=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.mng=mng
 BUILDLINK_FILES.mng=	include/libmng.h
 BUILDLINK_FILES.mng+=	include/libmng_conf.h
 BUILDLINK_FILES.mng+=	include/libmng_types.h
diff --git a/graphics/mpeg-lib/buildlink.mk b/graphics/mpeg-lib/buildlink.mk
index fca2829635f..c2dfbdc29c1 100644
--- a/graphics/mpeg-lib/buildlink.mk
+++ b/graphics/mpeg-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:25 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use mpeg.
 #
@@ -20,7 +20,7 @@ MPEG_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.mpeg?=	mpeg>=1.2.1
 DEPENDS+=	${BUILDLINK_DEPENDS.mpeg}:../../graphics/mpeg-lib
 
-BUILDLINK_PREFIX.mpeg=		${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.mpeg=mpeg
 BUILDLINK_FILES.mpeg=		include/mpeg.h
 BUILDLINK_FILES.mpeg+=		lib/libmpeg.*
 
diff --git a/graphics/netpbm/buildlink.mk b/graphics/netpbm/buildlink.mk
index 07c0ffcfc1b..65b6905405f 100644
--- a/graphics/netpbm/buildlink.mk
+++ b/graphics/netpbm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:25 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use netpbm.
 #
@@ -20,7 +20,7 @@ NETPBM_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.netpbm?=	netpbm>=9.7
 DEPENDS+=	${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm
 
-BUILDLINK_PREFIX.netpbm=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.netpbm=netpbm
 BUILDLINK_FILES.netpbm=		include/pbm.h
 BUILDLINK_FILES.netpbm+=	include/pbmplus.h
 BUILDLINK_FILES.netpbm+=	include/pgm.h
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk
index 2e41ea229f0..255ea3a2e9c 100644
--- a/graphics/png/buildlink.mk
+++ b/graphics/png/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:25 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpng.
 #
@@ -20,7 +20,7 @@ PNG_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.png?=	png>=1.0.11
 DEPENDS+=		${BUILDLINK_DEPENDS.png}:../../graphics/png
 
-BUILDLINK_PREFIX.png=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.png=png
 BUILDLINK_FILES.png=	include/png.h
 BUILDLINK_FILES.png+=	include/pngconf.h
 BUILDLINK_FILES.png+=	lib/libpng.*
diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk
index 99040097329..5280d3c84c0 100644
--- a/graphics/tiff/buildlink.mk
+++ b/graphics/tiff/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:26 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libtiff.
 #
@@ -20,7 +20,7 @@ TIFF_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.tiff?=	tiff>=3.5.4
 DEPENDS+=	${BUILDLINK_DEPENDS.tiff}:../../graphics/tiff
 
-BUILDLINK_PREFIX.tiff=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.tiff=tiff
 BUILDLINK_FILES.tiff=	include/tiff.h
 BUILDLINK_FILES.tiff+=	include/tiffconf.h
 BUILDLINK_FILES.tiff+=	include/tiffio.h
diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk
index 5a0f2aafde5..044435fb78b 100644
--- a/graphics/xpm/buildlink.mk
+++ b/graphics/xpm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/07/07 06:24:12 tron Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:47 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xpm.
 #
@@ -35,7 +35,7 @@ _NEED_XPM=		NO
 
 .if ${_NEED_XPM} == "YES"
 DEPENDS+=		${BUILDLINK_DEPENDS.xpm}:../../graphics/xpm
-BUILDLINK_PREFIX.xpm=	${X11PREFIX}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.xpm=xpm
 .else
 BUILDLINK_PREFIX.xpm=	${X11BASE}
 .endif