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

9 files changed, 26 insertions, 23 deletions

diff --git a/audio/esound/buildlink.mk b/audio/esound/buildlink.mk
index 263a6994d69..fbfac66848e 100644
--- a/audio/esound/buildlink.mk
+++ b/audio/esound/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:32 jlam Exp $
 #
 # This Makefile fragment is included by packages that use esound.
 #
@@ -20,7 +20,7 @@ ESOUND_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.esound?=	esound>=0.2.18
 DEPENDS+=			${BUILDLINK_DEPENDS.esound}:../../audio/esound
 
-BUILDLINK_PREFIX.esound=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.esound=esound
 BUILDLINK_FILES.esound=		include/esd.h
 BUILDLINK_FILES.esound+=	lib/libesd.*
 
@@ -30,7 +30,7 @@ BUILDLINK_TARGETS.esound=	esound-buildlink
 BUILDLINK_TARGETS.esound+=	esound-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.esound}
 
-BUILDLINK_CONFIG.esound=		${LOCALBASE}/bin/esd-config
+BUILDLINK_CONFIG.esound=	${BUILDLINK_PREFIX.esound}/bin/esd-config
 BUILDLINK_CONFIG_WRAPPER.esound=	${BUILDLINK_DIR}/bin/esd-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
diff --git a/audio/gsm/buildlink.mk b/audio/gsm/buildlink.mk
index 58d211dc7f7..c6eb5e218c9 100644
--- a/audio/gsm/buildlink.mk
+++ b/audio/gsm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:09 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:32 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gsm.
 #
@@ -20,7 +20,7 @@ GSM_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.gsm?=	gsm>=1.0.10
 DEPENDS+=	${BUILDLINK_DEPENDS.gsm}:../../audio/gsm
 
-BUILDLINK_PREFIX.gsm=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gsm=gsm
 BUILDLINK_FILES.gsm=	include/gsm.h
 BUILDLINK_FILES.gsm+=	include/gsm/*
 BUILDLINK_FILES.gsm+=	lib/libgsm.*
diff --git a/audio/libaudiofile/buildlink.mk b/audio/libaudiofile/buildlink.mk
index 771cdf90692..69e48f64fb4 100644
--- a/audio/libaudiofile/buildlink.mk
+++ b/audio/libaudiofile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libaudiofile.
 #
@@ -20,7 +20,7 @@ AUDIOFILE_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.audiofile?=	libaudiofile>=0.2.1
 DEPENDS+=	${BUILDLINK_DEPENDS.audiofile}:../../audio/libaudiofile
 
-BUILDLINK_PREFIX.audiofile=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.audiofile=libaudiofile
 BUILDLINK_FILES.audiofile=	include/af_vfs.h
 BUILDLINK_FILES.audiofile+=	include/audiofile.h
 BUILDLINK_FILES.audiofile+=	include/aupvlist.h
@@ -30,9 +30,10 @@ BUILDLINK_TARGETS.audiofile=	audiofile-buildlink
 BUILDLINK_TARGETS.audiofile+=	audiofile-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.audiofile}
 
-BUILDLINK_CONFIG.audiofile=	${LOCALBASE}/bin/audiofile-config
+BUILDLINK_CONFIG.audiofile=	\
+			${BUILDLINK_PREFIX.audiofile}/bin/audiofile-config
 BUILDLINK_CONFIG_WRAPPER.audiofile=	\
-				${BUILDLINK_DIR}/bin/audiofile-config
+			${BUILDLINK_DIR}/bin/audiofile-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 AUDIOFILE_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.audiofile}
diff --git a/audio/libmikmod/buildlink.mk b/audio/libmikmod/buildlink.mk
index 3ffa6933417..c56bbfa774f 100644
--- a/audio/libmikmod/buildlink.mk
+++ b/audio/libmikmod/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmikmod.
 #
@@ -20,7 +20,7 @@ LIBMIKMOD_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libmikmod?=	libmikmod>=3.1.9
 DEPENDS+=	${BUILDLINK_DEPENDS.libmikmod}:../../audio/libmikmod
 
-BUILDLINK_PREFIX.libmikmod=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libmikmod=libmikmod
 BUILDLINK_FILES.libmikmod=	include/mikmod.h
 BUILDLINK_FILES.libmikmod+=	lib/libmikmod.*
 
@@ -28,8 +28,10 @@ BUILDLINK_TARGETS.libmikmod=	libmikmod-buildlink
 BUILDLINK_TARGETS.libmikmod+=	libmikmod-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libmikmod}
 
-BUILDLINK_CONFIG.libmikmod=		${LOCALBASE}/bin/libmikmod-config
-BUILDLINK_CONFIG_WRAPPER.libmikmod=	${BUILDLINK_DIR}/bin/libmikmod-config
+BUILDLINK_CONFIG.libmikmod=	\
+			${BUILDLINK_PREFIX.libmikmod}/bin/libmikmod-config
+BUILDLINK_CONFIG_WRAPPER.libmikmod=	\
+			${BUILDLINK_DIR}/bin/libmikmod-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 LIBMIKMOD_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libmikmod}
diff --git a/audio/libogg/buildlink.mk b/audio/libogg/buildlink.mk
index fdd9fad92f4..fccd94b8d98 100644
--- a/audio/libogg/buildlink.mk
+++ b/audio/libogg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:10 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libogg.
 #
@@ -20,7 +20,7 @@ LIGOGG_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.0.4
 DEPENDS+=	${BUILDLINK_DEPENDS.libogg}:../../audio/libogg
 
-BUILDLINK_PREFIX.libogg=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libogg=libogg
 BUILDLINK_FILES.libogg=		include/ogg/config_types.h
 BUILDLINK_FILES.libogg+=	include/ogg/ogg.h
 BUILDLINK_FILES.libogg+=	include/ogg/os_types.h
diff --git a/audio/libsidplay/buildlink.mk b/audio/libsidplay/buildlink.mk
index e2aaf9f67ec..70eb5599a60 100644
--- a/audio/libsidplay/buildlink.mk
+++ b/audio/libsidplay/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:10 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libsidplay.
 #
@@ -20,7 +20,7 @@ LIBSIDPLAY_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libsidplay?=	libsidplay>=1.36.38
 DEPENDS+=	${BUILDLINK_DEPENDS.libsidplay}:../../audio/libsidplay
 
-BUILDLINK_PREFIX.libsidplay=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libsidplay=libsidplay
 BUILDLINK_FILES.libsidplay=	include/sidplay/*
 BUILDLINK_FILES.libsidplay+=	lib/libsidplay.*
 
diff --git a/audio/libvorbis/buildlink.mk b/audio/libvorbis/buildlink.mk
index 48a403a1932..6526dfc9df1 100644
--- a/audio/libvorbis/buildlink.mk
+++ b/audio/libvorbis/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 23:00:48 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libvorbis.
 #
@@ -20,7 +20,7 @@ LIBVORBIS_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.0.4
 DEPENDS+=	${BUILDLINK_DEPENDS.libvorbis}:../../audio/libvorbis
 
-BUILDLINK_PREFIX.libvorbis=	${LOCALBASE}
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libvorbis=libvorbis
 BUILDLINK_FILES.libvorbis=	include/vorbis/*
 BUILDLINK_FILES.libvorbis+=	lib/libvorbis.*
 BUILDLINK_FILES.libvorbis+=	lib/libvorbisenc.*
diff --git a/audio/nas/buildlink.mk b/audio/nas/buildlink.mk
index d28388aaf93..ea376db76f9 100644
--- a/audio/nas/buildlink.mk
+++ b/audio/nas/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/14 13:40:41 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use nas.
 #
@@ -20,7 +20,7 @@ NAS_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.nas?=	nas>=1.4.2
 DEPENDS+=	${BUILDLINK_DEPENDS.nas}:../../audio/nas
 
-BUILDLINK_PREFIX.nas=	${X11PREFIX}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.nas=nas
 BUILDLINK_FILES.nas=	include/audio/*
 BUILDLINK_FILES.nas+=	lib/libaudio.*
 
diff --git a/audio/rplay/buildlink.mk b/audio/rplay/buildlink.mk
index 93f9349da23..66aba1f36d2 100644
--- a/audio/rplay/buildlink.mk
+++ b/audio/rplay/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:11 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rplay.
 #
@@ -20,7 +20,7 @@ RPLAY_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.rplay?=	rplay>=3.3.2
 DEPENDS+=	${BUILDLINK_DEPENDS.rplay}:../../audio/rplay
 
-BUILDLINK_PREFIX.rplay=	${LOCALBASE}
+EVAL_PREFIX+=		BUILDLINK_PREFIX.rplay=rplay
 BUILDLINK_FILES.rplay=	include/rplay.h
 BUILDLINK_FILES.rplay+=	lib/librplay.*