Substitute the real config script for the config wrapper script in

installed files.  We don't want buildlink references to escape into the
install directory.

38 files changed, 136 insertions, 40 deletions

diff --git a/audio/SDL-mixer/buildlink.mk b/audio/SDL-mixer/buildlink.mk
index a06cbc0717b..ad8528867b9 100644
--- a/audio/SDL-mixer/buildlink.mk
+++ b/audio/SDL-mixer/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2001/09/24 15:00:25 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:40 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL_mixer.
 #
@@ -33,6 +33,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.SDL_mixer}
 
 BUILDLINK_CONFIG.SDL_mixer=		${LOCALBASE}/bin/SDL_mixer-config
 BUILDLINK_CONFIG_WRAPPER.SDL_mixer=	${BUILDLINK_DIR}/bin/SDL_mixer-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.SDL_mixer}|${BUILDLINK_CONFIG.SDL_mixer}|g"
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 SDL_MIXER_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.SDL_mixer}
diff --git a/audio/esound/buildlink.mk b/audio/esound/buildlink.mk
index f2033372e0a..05be624acc8 100644
--- a/audio/esound/buildlink.mk
+++ b/audio/esound/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:00 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:41 jlam Exp $
 #
 # This Makefile fragment is included by packages that use esound.
 #
@@ -33,6 +33,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.esound}
 
 BUILDLINK_CONFIG.esound=	${BUILDLINK_PREFIX.esound}/bin/esd-config
 BUILDLINK_CONFIG_WRAPPER.esound=	${BUILDLINK_DIR}/bin/esd-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.esound}|${BUILDLINK_CONFIG.esound}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 ESD_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.esound}
diff --git a/audio/libaudiofile/buildlink.mk b/audio/libaudiofile/buildlink.mk
index 004d7c4cbee..bbb99f83937 100644
--- a/audio/libaudiofile/buildlink.mk
+++ b/audio/libaudiofile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:01 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:41 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libaudiofile.
 #
@@ -35,6 +35,8 @@ BUILDLINK_CONFIG.audiofile=	\
 			${BUILDLINK_PREFIX.audiofile}/bin/audiofile-config
 BUILDLINK_CONFIG_WRAPPER.audiofile=	\
 			${BUILDLINK_DIR}/bin/audiofile-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.audiofile}|${BUILDLINK_CONFIG.audiofile}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 AUDIOFILE_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.audiofile}
diff --git a/audio/libmikmod/buildlink.mk b/audio/libmikmod/buildlink.mk
index 88b472b70de..eaba346c7f0 100644
--- a/audio/libmikmod/buildlink.mk
+++ b/audio/libmikmod/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:02 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:42 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmikmod.
 #
@@ -33,6 +33,8 @@ BUILDLINK_CONFIG.libmikmod=	\
 			${BUILDLINK_PREFIX.libmikmod}/bin/libmikmod-config
 BUILDLINK_CONFIG_WRAPPER.libmikmod=	\
 			${BUILDLINK_DIR}/bin/libmikmod-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libmikmod}|${BUILDLINK_CONFIG.libmikmod}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBMIKMOD_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libmikmod}
diff --git a/audio/wsoundserver/buildlink.mk b/audio/wsoundserver/buildlink.mk
index a6d5a3be8b0..5976d6d8960 100644
--- a/audio/wsoundserver/buildlink.mk
+++ b/audio/wsoundserver/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/24 10:51:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:42 jlam Exp $
 #
 # This Makefile fragment is included by packages that use wsound.
 #
@@ -35,6 +35,8 @@ BUILDLINK_CONFIG.wsound=	\
 	${BUILDLINK_PREFIX.wsound}/bin/get-wsound-flags
 BUILDLINK_CONFIG_WRAPPER.wsound=	\
 	${BUILDLINK_DIR}/bin/get-wsound-flags
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.wsound}|${BUILDLINK_CONFIG.wsound}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GET_WSOUND_FLAGS?=	${BUILDLINK_CONFIG_WRAPPER.wsound}
diff --git a/audio/xmms/buildlink.mk b/audio/xmms/buildlink.mk
index b7721de35e4..f40d8bb9538 100644
--- a/audio/xmms/buildlink.mk
+++ b/audio/xmms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/08/23 14:16:10 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/10/03 20:56:43 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xmms.
 #
@@ -33,6 +33,8 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.xmms}
 
 BUILDLINK_CONFIG.xmms=		${BUILDLINK_PREFIX.xmms}/bin/xmms-config
 BUILDLINK_CONFIG_WRAPPER.xmms=	${BUILDLINK_DIR}/bin/xmms-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.xmms}|${BUILDLINK_CONFIG.xmms}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 XMMS_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.xmms}
diff --git a/devel/GConf/buildlink.mk b/devel/GConf/buildlink.mk
index 842951d74df..0a854ccefd1 100644
--- a/devel/GConf/buildlink.mk
+++ b/devel/GConf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/01 11:57:11 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:43 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gconf.
 #
@@ -36,6 +36,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gconf}
 
 BUILDLINK_CONFIG.gconf=	${BUILDLINK_PREFIX.gconf}/bin/gconf-config
 BUILDLINK_CONFIG_WRAPPER.gconf=${BUILDLINK_DIR}/bin/gconf-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gconf}|${BUILDLINK_CONFIG.gconf}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GCONF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gconf}
diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index ab7a215b889..b5cabbe2991 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2001/08/17 21:14:03 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2001/10/03 20:56:43 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL.
 #
@@ -44,6 +44,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.SDL}
 
 BUILDLINK_CONFIG.SDL=		${BUILDLINK_PREFIX.SDL}/bin/sdl-config
 BUILDLINK_CONFIG_WRAPPER.SDL=	${BUILDLINK_DIR}/bin/sdl-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.SDL}|${BUILDLINK_CONFIG.SDL}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 SDL_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.SDL}
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index 78c074340a0..3a63bf7cf52 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2001/08/17 21:14:04 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.12 2001/10/03 20:56:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
@@ -40,6 +40,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.glib}
 
 BUILDLINK_CONFIG.glib=		${BUILDLINK_PREFIX.glib}/bin/glib-config
 BUILDLINK_CONFIG_WRAPPER.glib=	${BUILDLINK_DIR}/bin/glib-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.glib}|${BUILDLINK_CONFIG.glib}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.glib}
diff --git a/devel/libnet/buildlink.mk b/devel/libnet/buildlink.mk
index 05f34791f76..cc9f3ad2f9f 100644
--- a/devel/libnet/buildlink.mk
+++ b/devel/libnet/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/08/17 21:14:05 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/10/03 20:56:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libnet.
 #
@@ -35,6 +35,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libnet}
 
 BUILDLINK_CONFIG.libnet=	${BUILDLINK_PREFIX.libnet}/bin/libnet-config
 BUILDLINK_CONFIG_WRAPPER.libnet=${BUILDLINK_DIR}/bin/libnet-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libnet}|${BUILDLINK_CONFIG.libnet}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBNET_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libnet}
diff --git a/devel/libole2/buildlink.mk b/devel/libole2/buildlink.mk
index eb776303627..0dc470bdfa4 100644
--- a/devel/libole2/buildlink.mk
+++ b/devel/libole2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/01 13:34:49 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libole2.
 #
@@ -31,8 +31,10 @@ BUILDLINK_TARGETS.libole2=	libole2-buildlink
 BUILDLINK_TARGETS.libole2+=	libole2-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libole2}
 
-BUILDLINK_CONFIG.libole2=		${BUILDLINK_PREFIX.libole2}/lib/libole2Conf.sh
+BUILDLINK_CONFIG.libole2=	${BUILDLINK_PREFIX.libole2}/lib/libole2Conf.sh
 BUILDLINK_CONFIG_WRAPPER.libole2=	${BUILDLINK_DIR}/lib/libole2Conf.sh
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libole2}|${BUILDLINK_CONFIG.libole2}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBOLE2_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libole2}
diff --git a/devel/libusb/buildlink.mk b/devel/libusb/buildlink.mk
index 93bec549453..bceb5474e28 100644
--- a/devel/libusb/buildlink.mk
+++ b/devel/libusb/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/08/17 21:14:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/10/03 20:56:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libusb.
 #
@@ -32,7 +32,9 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libusb}
 BUILDLINK_CONFIG.libusb=	\
 			${BUILDLINK_PREFIX.libusb}/bin/libusb-config
 BUILDLINK_CONFIG_WRAPPER.libusb=	\
-			${BUILDLINK_DIR}/bin/libusb-config
+	 		${BUILDLINK_DIR}/bin/libusb-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libusb}|${BUILDLINK_CONFIG.libusb}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBUSB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libusb}
diff --git a/devel/oaf/buildlink.mk b/devel/oaf/buildlink.mk
index f35fea0dd01..d5483e464b0 100644
--- a/devel/oaf/buildlink.mk
+++ b/devel/oaf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/01 12:03:42 rh Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/10/03 20:56:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use oaf.
 #
@@ -35,6 +35,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.oaf}
 
 BUILDLINK_CONFIG.oaf=	${BUILDLINK_PREFIX.oaf}/bin/oaf-config
 BUILDLINK_CONFIG_WRAPPER.oaf=${BUILDLINK_DIR}/bin/oaf-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.oaf}|${BUILDLINK_CONFIG.oaf}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 OAF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.oaf}
diff --git a/devel/pcre/buildlink.mk b/devel/pcre/buildlink.mk
index 5869a8a1954..317e2d0b612 100644
--- a/devel/pcre/buildlink.mk
+++ b/devel/pcre/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pcre.
 #
@@ -33,6 +33,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.pcre}
 
 BUILDLINK_CONFIG.pcre=		${BUILDLINK_PREFIX.pcre}/bin/pcre-config
 BUILDLINK_CONFIG_WRAPPER.pcre=	${BUILDLINK_DIR}/bin/pcre-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.pcre}|${BUILDLINK_CONFIG.pcre}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 PCRE_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.pcre}
diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk
index 23518822976..016b6fc95b4 100644
--- a/devel/pth/buildlink.mk
+++ b/devel/pth/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:07 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pth.
 #
@@ -34,9 +34,13 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.pth}
 
 BUILDLINK_CONFIG.pth=			${BUILDLINK_PREFIX.pth}/bin/pth-config
 BUILDLINK_CONFIG_WRAPPER.pth=		${BUILDLINK_DIR}/bin/pth-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.pth}|${BUILDLINK_CONFIG.pth}|g"
 
 BUILDLINK_CONFIG.pth-pthread=		${BUILDLINK_PREFIX.pth}/bin/pthread-config
 BUILDLINK_CONFIG_WRAPPER.pth-pthread=	${BUILDLINK_DIR}/bin/pthread-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.pthread}|${BUILDLINK_CONFIG.pthread}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 PTH_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.pth}
diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk
index cdf300fc3ca..383aeac87af 100644
--- a/devel/smpeg/buildlink.mk
+++ b/devel/smpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:08 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use smpeg.
 #
@@ -34,6 +34,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.smpeg}
 
 BUILDLINK_CONFIG.smpeg=		${BUILDLINK_PREFIX.smpeg}/bin/smpeg-config
 BUILDLINK_CONFIG_WRAPPER.smpeg=	${BUILDLINK_DIR}/bin/smpeg-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.smpeg}|${BUILDLINK_CONFIG.smpeg}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 SMPEG_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.smpeg}
diff --git a/graphics/ImageMagick/buildlink.mk b/graphics/ImageMagick/buildlink.mk
index 15639638210..9ca5440b434 100644
--- a/graphics/ImageMagick/buildlink.mk
+++ b/graphics/ImageMagick/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/08/23 21:32:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:47 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ImageMagick.
 #
@@ -42,10 +42,15 @@ BUILDLINK_CONFIG.magick=	\
 	${BUILDLINK_PREFIX.ImageMagick}/bin/Magick-config
 BUILDLINK_CONFIG_WRAPPER.magick=	\
 	${BUILDLINK_DIR}/bin/Magick-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.magick}|${BUILDLINK_CONFIG.magick}|g"
+
 BUILDLINK_CONFIG.magickpp=	\
 	${BUILDLINK_PREFIX.ImageMagick}/bin/Magick++-config
 BUILDLINK_CONFIG_WRAPPER.magickpp=	\
 	${BUILDLINK_DIR}/bin/Magick++-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.magickpp}|${BUILDLINK_CONFIG.magickpp}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 MAGICK_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.magick}
diff --git a/graphics/avifile-devel/buildlink.mk b/graphics/avifile-devel/buildlink.mk
index b7328aef98e..5d961d10fda 100644
--- a/graphics/avifile-devel/buildlink.mk
+++ b/graphics/avifile-devel/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/08/24 03:51:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:47 jlam Exp $
 #
 # This Makefile fragment is included by packages that use avifile-devel.
 #
@@ -33,6 +33,8 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.avifile}
 
 BUILDLINK_CONFIG.avifile=	${BUILDLINK_PREFIX.avifile}/bin/avifile-config
 BUILDLINK_CONFIG_WRAPPER.avifile=${BUILDLINK_DIR}/bin/avifile-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.avifile}|${BUILDLINK_CONFIG.avifile}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 AVIFILE_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.avifile}
diff --git a/graphics/avifile/buildlink.mk b/graphics/avifile/buildlink.mk
index 308cca66aef..7e0fbedf699 100644
--- a/graphics/avifile/buildlink.mk
+++ b/graphics/avifile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:09 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:48 jlam Exp $
 #
 # This Makefile fragment is included by packages that use avifile.
 #
@@ -32,6 +32,8 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.avifile}
 
 BUILDLINK_CONFIG.avifile=	${BUILDLINK_PREFIX.avifile}/bin/avifile-config
 BUILDLINK_CONFIG_WRAPPER.avifile=${BUILDLINK_DIR}/bin/avifile-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.avifile}|${BUILDLINK_CONFIG.avifile}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 AVIFILE_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.avifile}
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index a6f14e19057..c0277b9a946 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/23 20:22:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:48 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ClanLib.
 #
@@ -46,6 +46,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.ClanLib}
 
 BUILDLINK_CONFIG.ClanLib=	${BUILDLINK_PREFIX.ClanLib}/bin/clanlib-config
 BUILDLINK_CONFIG_WRAPPER.ClanLib=${BUILDLINK_DIR}/bin/clanlib-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.ClanLib}|${BUILDLINK_CONFIG.ClanLib}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 CLANLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.ClanLib}
diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk
index 19f80e2c58f..9fba134a929 100644
--- a/graphics/freetype2/buildlink.mk
+++ b/graphics/freetype2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2001/08/17 21:14:11 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.12 2001/10/03 20:56:49 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype2.
 #
@@ -82,6 +82,9 @@ freetype2-buildlink-config:
 	fi
 .endif	# _NEED_FREETYPE2
 
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.freetype2}|${BUILDLINK_CONFIG.freetype2}|g"
+
 .if defined(USE_CONFIG_WRAPPER)
 FREETYPE_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.freetype2}
 CONFIGURE_ENV+=		FREETYPE_CONFIG="${FREETYPE_CONFIG}"
diff --git a/graphics/gdk-pixbuf-gnome/buildlink.mk b/graphics/gdk-pixbuf-gnome/buildlink.mk
index f334048af5e..f4743686bfe 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/01 06:57:25 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:49 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf-gnome.
 #
@@ -36,6 +36,8 @@ BUILDLINK_CONFIG.gdk-pixbuf-gnome=	\
 			${BUILDLINK_PREFIX.gdk-pixbuf-gnome}/lib/gnomecanvaspixbufConf.sh
 BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gnome=	\
 			${BUILDLINK_DIR}/lib/gnomecanvaspixbufConf.sh
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gnome}|${BUILDLINK_CONFIG.gdk-pixbuf-gnome}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GDK_PIXBUF_GNOME_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gnome}
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index da46cae504f..b48d4df187c 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2001/09/22 18:41:26 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2001/10/03 20:56:50 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf.
 #
@@ -39,6 +39,8 @@ BUILDLINK_CONFIG.gdk-pixbuf=	\
 			${BUILDLINK_PREFIX.gdk-pixbuf}/bin/gdk-pixbuf-config
 BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf=	\
 			${BUILDLINK_DIR}/bin/gdk-pixbuf-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}|${BUILDLINK_CONFIG.gdk-pixbuf}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GDK_PIXBUF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}
diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk
index caa9bd9db48..f41abd1162c 100644
--- a/graphics/imlib/buildlink.mk
+++ b/graphics/imlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:12 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:50 jlam Exp $
 #
 # This Makefile fragment is included by packages that use imlib.
 #
@@ -44,6 +44,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.imlib}
 
 BUILDLINK_CONFIG.imlib=		${BUILDLINK_PREFIX.imlib}/bin/imlib-config
 BUILDLINK_CONFIG_WRAPPER.imlib=	${BUILDLINK_DIR}/bin/imlib-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.imlib}|${BUILDLINK_CONFIG.imlib}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 IMLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.imlib}
diff --git a/graphics/imlib2/buildlink.mk b/graphics/imlib2/buildlink.mk
index 73864db9384..72b6a4661b1 100644
--- a/graphics/imlib2/buildlink.mk
+++ b/graphics/imlib2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2001/08/16 10:49:52 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:50 jlam Exp $
 #
 # This Makefile fragment is included by packages that use imlib2.
 #
@@ -41,6 +41,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.imlib2}
 
 BUILDLINK_CONFIG.imlib2=		${BUILDLINK_PREFIX.imlib2}/bin/imlib2-config
 BUILDLINK_CONFIG_WRAPPER.imlib2=	${BUILDLINK_DIR}/bin/imlib2-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.imlib2}|${BUILDLINK_CONFIG.imlib2}|g"
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 IMLIB2_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.imlib2}
diff --git a/japanese/chasen/buildlink.mk b/japanese/chasen/buildlink.mk
index 494c8911e31..fead577c26a 100644
--- a/japanese/chasen/buildlink.mk
+++ b/japanese/chasen/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/09/09 05:30:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:51 jlam Exp $
 #
 # This Makefile fragment is included by packages that use chasen.
 #
@@ -33,6 +33,8 @@ BUILDLINK_CONFIG.chasen=	\
 	${BUILDLINK_PREFIX.chasen}/bin/chasen-config
 BUILDLINK_CONFIG_WRAPPER.chasen=	\
 	${BUILDLINK_DIR}/bin/chasen-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.chasen}|${BUILDLINK_CONFIG.chasen}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 CHASEN_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.chasen}
diff --git a/lang/gb/buildlink.mk b/lang/gb/buildlink.mk
index b2fc0ae2b8b..57fed03f988 100644
--- a/lang/gb/buildlink.mk
+++ b/lang/gb/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/01 07:34:04 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:51 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gb.
 #
@@ -34,6 +34,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gb}
 
 BUILDLINK_CONFIG.gb=		${BUILDLINK_PREFIX.gb}/lib/gbConf.sh
 BUILDLINK_CONFIG_WRAPPER.gb=	${BUILDLINK_DIR}/lib/gbConf.sh
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gb}|${BUILDLINK_CONFIG.gb}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GB_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.gb}
diff --git a/net/ORBit/buildlink.mk b/net/ORBit/buildlink.mk
index 968a7cbce8c..692614af300 100644
--- a/net/ORBit/buildlink.mk
+++ b/net/ORBit/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:13 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:52 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ORBit.
 #
@@ -48,9 +48,13 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.ORBit}
 
 BUILDLINK_CONFIG.libIDL=	${BUILDLINK_PREFIX.ORBit}/bin/libIDL-config
 BUILDLINK_CONFIG_WRAPPER.libIDL=${BUILDLINK_DIR}/bin/libIDL-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libIDL}|${BUILDLINK_CONFIG.libIDL}|g"
 
 BUILDLINK_CONFIG.orbit=		${BUILDLINK_PREFIX.ORBit}/bin/orbit-config
 BUILDLINK_CONFIG_WRAPPER.orbit=	${BUILDLINK_DIR}/bin/orbit-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.orbit}|${BUILDLINK_CONFIG.orbit}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBIDL_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libIDL}
diff --git a/print/gnome-print/buildlink.mk b/print/gnome-print/buildlink.mk
index 113530de704..b70a0e1ca0d 100644
--- a/print/gnome-print/buildlink.mk
+++ b/print/gnome-print/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/01 07:08:09 rh Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/10/03 20:56:52 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-print.
 #
@@ -34,6 +34,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gnome-print}
 
 BUILDLINK_CONFIG.gnome-print=		${BUILDLINK_PREFIX.gnome-print}/lib/printConf.sh
 BUILDLINK_CONFIG_WRAPPER.gnome-print=	${BUILDLINK_DIR}/lib/printConf.sh
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gnome-print}|${BUILDLINK_CONFIG.gnome-print}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GNOME_PRINT_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.gnome-print}
diff --git a/print/pdflib/buildlink.mk b/print/pdflib/buildlink.mk
index 055689c020b..95e5935a0a4 100644
--- a/print/pdflib/buildlink.mk
+++ b/print/pdflib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/08/17 21:14:14 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/10/03 20:56:52 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pdflib.
 #
@@ -34,6 +34,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.pdflib}
 
 BUILDLINK_CONFIG.pdflib=	${BUILDLINK_PREFIX.pdflib}/bin/pdflib-config
 BUILDLINK_CONFIG_WRAPPER.pdflib=	${BUILDLINK_DIR}/bin/pdflib-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.pdflib}|${BUILDLINK_CONFIG.pdflib}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 PDFLIB_CONFIG?=			${BUILDLINK_CONFIG_WRAPPER.pdflib}
diff --git a/textproc/libxml/buildlink.mk b/textproc/libxml/buildlink.mk
index 5c17755a3ad..34ea7539ef3 100644
--- a/textproc/libxml/buildlink.mk
+++ b/textproc/libxml/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:14 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml.
 #
@@ -34,6 +34,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libxml}
 
 BUILDLINK_CONFIG.libxml=	${BUILDLINK_PREFIX.libxml}/bin/xml-config
 BUILDLINK_CONFIG_WRAPPER.libxml=${BUILDLINK_DIR}/bin/xml-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libxml}|${BUILDLINK_CONFIG.libxml}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 XML_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libxml}
diff --git a/textproc/libxml2/buildlink.mk b/textproc/libxml2/buildlink.mk
index 0c07c1bfbe4..f9684e89a94 100644
--- a/textproc/libxml2/buildlink.mk
+++ b/textproc/libxml2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/09/14 06:53:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2001/10/03 20:56:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml2.
 #
@@ -42,6 +42,8 @@ BUILDLINK_CONFIG.libxml2=	\
 		${BUILDLINK_PREFIX.libxml2}/bin/xml2-config
 BUILDLINK_CONFIG_WRAPPER.libxml2=	\
 		${BUILDLINK_DIR}/bin/xml2-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libxml2}|${BUILDLINK_CONFIG.libxml2}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 XML2_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libxml2}
diff --git a/wm/windowmaker/buildlink.mk b/wm/windowmaker/buildlink.mk
index c51108b711c..d1868e74d76 100644
--- a/wm/windowmaker/buildlink.mk
+++ b/wm/windowmaker/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/10/03 20:56:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use windowmaker.
 #
@@ -48,12 +48,18 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.windowmaker}
 
 BUILDLINK_CONFIG.wm-wings=		${BUILDLINK_PREFIX.windowmaker}/bin/get-wings-flags
 BUILDLINK_CONFIG_WRAPPER.wm-wings=	${BUILDLINK_DIR}/bin/get-wings-flags
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.wm-wings}|${BUILDLINK_CONFIG.wm-wings}|g"
 
 BUILDLINK_CONFIG.wm-wutil=		${BUILDLINK_PREFIX.windowmaker}/bin/get-wutil-flags
 BUILDLINK_CONFIG_WRAPPER.wm-wutil=	${BUILDLINK_DIR}/bin/get-wutil-flags
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.wm-wutil}|${BUILDLINK_CONFIG.wm-wutil}|g"
 
 BUILDLINK_CONFIG.wm-wraster=		${BUILDLINK_PREFIX.windowmaker}/bin/get-wraster-flags
 BUILDLINK_CONFIG_WRAPPER.wm-wraster=	${BUILDLINK_DIR}/bin/get-wraster-flags
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.wm-wraster}|${BUILDLINK_CONFIG.wm-wraster}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GET_WINGS_FLAGS?=	${BUILDLINK_CONFIG_WRAPPER.wm-wings}
diff --git a/www/libwww/buildlink.mk b/www/libwww/buildlink.mk
index 6f308a4acc5..15ee7e78fed 100644
--- a/www/libwww/buildlink.mk
+++ b/www/libwww/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:15 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libwww.
 #
@@ -58,6 +58,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libwww}
 
 BUILDLINK_CONFIG.libwww=	${BUILDLINK_PREFIX.libwww}/bin/libwww-config
 BUILDLINK_CONFIG_WRAPPER.libwww=${BUILDLINK_DIR}/bin/libwww-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libwww}|${BUILDLINK_CONFIG.libwww}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBWWW_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libwww}
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index c08dfe0419b..104e11c04e8 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2001/08/26 01:44:33 mjl Exp $
+# $NetBSD: buildlink.mk,v 1.12 2001/10/03 20:56:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
@@ -59,8 +59,13 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gnome-libs}
 
 BUILDLINK_CONFIG.gnome-libs=		${BUILDLINK_PREFIX.gnome-libs}/bin/gnome-config
 BUILDLINK_CONFIG_WRAPPER.gnome-libs=	${BUILDLINK_DIR}/bin/gnome-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gnome-libs}|${BUILDLINK_CONFIG.gnome-libs}|g"
+
 BUILDLINK_CONFIG.libart=		${BUILDLINK_PREFIX.gnome-libs}/bin/libart-config
 BUILDLINK_CONFIG_WRAPPER.libart=	${BUILDLINK_DIR}/bin/libart-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libart}|${BUILDLINK_CONFIG.libart}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GNOME_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gnome-libs}
diff --git a/x11/gtk/buildlink.mk b/x11/gtk/buildlink.mk
index 3ecdcd97243..d3b883ffd7a 100644
--- a/x11/gtk/buildlink.mk
+++ b/x11/gtk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2001/08/17 21:14:16 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2001/10/03 20:56:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gtk.
 #
@@ -42,6 +42,8 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gtk}
 
 BUILDLINK_CONFIG.gtk=		${BUILDLINK_PREFIX.gtk}/bin/gtk-config
 BUILDLINK_CONFIG_WRAPPER.gtk=	${BUILDLINK_DIR}/bin/gtk-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gtk}|${BUILDLINK_CONFIG.gtk}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GTK_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gtk}
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
index 7fbe88633bc..692a8cad46f 100644
--- a/x11/kdelibs2/buildlink.mk
+++ b/x11/kdelibs2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/09/21 20:16:19 jdolecek Exp $
+# $NetBSD: buildlink.mk,v 1.10 2001/10/03 20:56:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kdelibs2.
 #
@@ -46,9 +46,13 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.kdelibs2}
 
 BUILDLINK_CONFIG.kdelibs2=		${BUILDLINK_PREFIX.kdelibs2}/bin/kde-config
 BUILDLINK_CONFIG_WRAPPER.kdelibs2=	${BUILDLINK_DIR}/bin/kde-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.kdelibs2}|${BUILDLINK_CONFIG.kdelibs2}|g"
 
 BUILDLINK_CONFIG.kdelibs2-artsc=	 ${BUILDLINK_PREFIX.kdelibs2}/bin/artsc-config
 BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc= ${BUILDLINK_DIR}/bin/artsc-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc}|${BUILDLINK_CONFIG.kdelibs2-artsc}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 ARTSCCONFIG?=		${BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc}
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk
index c6a063451d2..57b8f4cbc26 100644
--- a/x11/wxGTK/buildlink.mk
+++ b/x11/wxGTK/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use wxGTK.
 #
@@ -46,8 +46,13 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.wxGTK}
 
 BUILDLINK_CONFIG.wxGTK-1=		${BUILDLINK_PREFIX.wxGTK}/bin/wx-config
 BUILDLINK_CONFIG.wxGTK-2=		${BUILDLINK_PREFIX.wxGTK}/bin/wxgtk-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.wxGTK-1}|${BUILDLINK_CONFIG.wxGTK-1}|g"
+
 BUILDLINK_CONFIG_WRAPPER.wxGTK-1=	${BUILDLINK_DIR}/bin/wx-config
 BUILDLINK_CONFIG_WRAPPER.wxGTK-2=	${BUILDLINK_DIR}/bin/wxgtk-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.wxGTK-2}|${BUILDLINK_CONFIG.wxGTK-2}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 WX_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.wxGTK-1}