The previous method of using a make target for finding a prerequisite

package's prefix would not work as part of the environment specification
via MAKE_ENV (as it would not be executed in the correct directory).

Fix this by invoking pkg_info(1) directly, not via an intermediate make(1)
step - this is not as clean, but more effective (i.e. it works).

49 files changed, 133 insertions, 141 deletions

diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile
index 258d371816b..34d955bdc36 100644
--- a/audio/kdemultimedia/Makefile
+++ b/audio/kdemultimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:35 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:19 agc Exp $
 
 DISTNAME=	kdemultimedia-1.1.2
 CATEGORIES=	audio kde
@@ -15,7 +15,7 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1"
+		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 1d49a9e363f..8d84b64bbd4 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:36 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:19 agc Exp $
 
 DISTNAME=	musicbox-1.01p2
 CATEGORIES=	audio
@@ -14,7 +14,7 @@ USE_X11=	yes
 
 WRKSRC=		${WRKDIR}/musicbox-1.01
 
-PATH=	`${MAKE} show-qt1-prefix`/qt1/bin:$$PATH
+PATH=	`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index f6c19c53886..bc6000cfc10 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:37 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:19 agc Exp $
 # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
 #
 
@@ -19,10 +19,10 @@ CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
 USE_GMAKE=	yes
 USE_X11BASE=	yes
 
-CONFIGURE_ARGS+=	"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1"
+CONFIGURE_ARGS+=	"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
 
-CONFIGURE_ENV+=	"QTDIR=`${MAKE} show-qt1-prefix`/qt1"
-CONFIGURE_ENV+=	"MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc"
+CONFIGURE_ENV+=	"QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+CONFIGURE_ENV+=	"MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc"
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 5e011eac0de..2a05bd1183a 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:37 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:19 agc Exp $
 #
 
 DISTNAME=	xsidplay-1_3_9
@@ -20,12 +20,12 @@ USE_GMAKE=	yes
 
 CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \
 		--with-sidplay-library=${LOCALBASE}/lib \
-		--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1/lib
+		--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib
 
-LDFLAGS+=	-Wl,-R`${MAKE} show-qt1-prefix`/qt1/lib
+LDFLAGS+=	-Wl,-R`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ENV+=	"MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc"
+CONFIGURE_ENV+=	"MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc"
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index bee33aafcce..682ba0651d3 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/07/11 14:53:37 agc Exp $
+# $NetBSD: Makefile,v 1.14 2000/07/14 16:04:20 agc Exp $
 #
 
 DISTNAME=	vipec-2.0.1
@@ -14,9 +14,9 @@ GNU_CONFIGURE=	yes
 USE_PKGLIBTOOL=	yes
 USE_X11=	yes
 
-CONFIGURE_ENV+=	"QTDIR=`${MAKE} show-qt2-prefix`/qt2" \
+CONFIGURE_ENV+=	"QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2" \
 		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS+=	"--with-qt-dir=`${MAKE} show-qt2-prefix`/qt2"
+CONFIGURE_ARGS+=	"--with-qt-dir=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2"
 
 post-extract:
 	${MV} -f ${WRKSRC}/bin/start_vipec_help ${WRKSRC}/bin/start_vipec_help.in
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index ff74dac20fb..0bb6a2a4e04 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:38 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:20 agc Exp $
 #
 
 DISTNAME=		jpilot-0.98.1
@@ -16,7 +16,7 @@ USE_LIBTOOL=		YES
 USE_X11=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${MAKE} show-gtk+-prefix`"
+CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
 CONFIGURE_ARGS+=	--with-pilot-prefix=${LOCALBASE}
 
 post-install:
diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 152965dc6b8..27090cb382b 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2000/07/11 14:53:38 agc Exp $
+# $NetBSD: Makefile,v 1.31 2000/07/14 16:04:20 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
 #
 
@@ -19,6 +19,6 @@ CONFIGURE_ARGS=	"--without-gnu-ld" \
 		"--without-libgdbm" \
 		"--without-libuulib" \
 		"--without-sprite-field" \
-		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" 
+		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" 
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index 1376cb3b29c..7e8f236f9bc 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:38 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:20 agc Exp $
 #
 
 DISTNAME=	cervisia-0.5.0
@@ -14,9 +14,9 @@ DEPENDS+=	cvs-1.10:../../devel/cvs
 
 USE_X11BASE=		yes	# To get this near KDE
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=	"QTDIR=`${MAKE} show-qt1-prefix`/qt1"
-CONFIGURE_ARGS+=--with-qt-includes=`${MAKE} show-qt1-prefix`/qt1/include \
-		--with-qt-libraries=`${MAKE} show-qt1-prefix`/qt1/lib \
+CONFIGURE_ENV+=	"QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+CONFIGURE_ARGS+=--with-qt-includes=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/include \
+		--with-qt-libraries=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib \
 		--with-extra-includes=${LOCALBASE}/include \
 		--with-extra-libs=${LOCALBASE}/lib
 
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index f05580517dc..e9ee74ae46a 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:39 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:21 agc Exp $
 
 DISTNAME=	kdbg-1.0.1
 CATEGORIES=	devel kde
@@ -18,8 +18,8 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \
-		--with-qt-includes=`${MAKE} show-qt1-prefix`/qt1/include \
+CONFIGURE_ARGS=	--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
+		--with-qt-includes=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/include \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index d2ad6b16ed2..18770158ec1 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/07/11 14:53:39 agc Exp $
+# $NetBSD: Makefile,v 1.16 2000/07/14 16:04:21 agc Exp $
 
 DISTNAME=	kdevelop-1.2
 CATEGORIES=	devel kde
@@ -22,9 +22,9 @@ USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-extra-includes=${LOCALBASE}/include \
 		--with-extra-libs=${LOCALBASE}/lib \
-		--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1
+		--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
 
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	"KDEDIR=${PREFIX} QTDIR=`${MAKE} show-qt1-prefix`/qt1"
+CONFIGURE_ENV=	"KDEDIR=${PREFIX} QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/amor/Makefile b/games/amor/Makefile
index a985a96ca26..3af880869cc 100644
--- a/games/amor/Makefile
+++ b/games/amor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:39 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:21 agc Exp $
 #
 
 DISTNAME=	amor-0.6
@@ -13,7 +13,7 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 
 USE_X11BASE=		yes	# To get this near KDE
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=	QTDIR=`${MAKE} show-qt1-prefix`/qt1
-CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1
+CONFIGURE_ENV+=	QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
+CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 778d685f908..eece64e67ce 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:40 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:21 agc Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -11,9 +11,9 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-gtk-prefix=`${MAKE} show-gtk+-prefix`
+CONFIGURE_ARGS+=	--with-gtk-prefix=`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`
 CONFIGURE_ARGS+=	--without-included-gettext
-CONFIGURE_ENV+=	GTK_CONFIG="`${MAKE} show-gtk+-prefix`/bin/gtk-config"
+CONFIGURE_ENV+=	GTK_CONFIG="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/gtk-config"
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index 5c02eb85368..18eb093e268 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2000/07/11 14:53:40 agc Exp $
+# $NetBSD: Makefile,v 1.39 2000/07/14 16:04:21 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
 #
 
@@ -18,7 +18,7 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" 
+		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile
index 6bb35579958..994cace7e86 100644
--- a/games/kdetoys/Makefile
+++ b/games/kdetoys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:40 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:21 agc Exp $
 
 DISTNAME=	kdetoys-1.1.2
 CATEGORIES=	games kde
@@ -17,10 +17,10 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1"
+		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${MAKE} show-qt1-prefix`/qt1 \
+		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
 
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 486c2427865..c672d483983 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/07/11 14:53:41 agc Exp $
+# $NetBSD: Makefile,v 1.18 2000/07/14 16:04:22 agc Exp $
 #
 
 DISTNAME=		nethack-3.3.0
@@ -21,8 +21,8 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		x11tiles nethack
 INSTALL_TARGET=		binfiles
-PATH=   		`${MAKE} show-qt2-prefix`/qt2/bin:$$PATH
-MAKE_ENV+=		GTYPE=-qt QTDIR=`${MAKE} show-qt2-prefix`/qt2
+PATH=   		`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2/bin:$$PATH
+MAKE_ENV+=		GTYPE=-qt QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2
 
 PATCHFILES+=		${PKGSRCDIR}/games/nethack-lib/patches/patch-*
 ALLFILES=		${DISTFILES}	# don't checksum shared patches
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index d6e1610d13c..b74fd53630c 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:41 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:22 agc Exp $
 #
 
 DISTNAME=	xarchon-0.50
@@ -14,8 +14,8 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	esound-*:../../audio/esound
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-xpm-prefix=`${MAKE} show-xpm-prefix` \
-		--with-gtk-prefix=`${MAKE} show-gtk+-prefix` \
+CONFIGURE_ARGS+=--with-xpm-prefix=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}` \
+		--with-gtk-prefix=`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}` \
 		--with-esd-prefix=${LOCALBASE}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index 87720e5fe0b..d7148d7b648 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/07/11 14:53:41 agc Exp $
+# $NetBSD: Makefile,v 1.21 2000/07/14 16:04:22 agc Exp $
 
 DISTNAME=		gimp-1.1.24
 CATEGORIES=		graphics
@@ -23,7 +23,7 @@ USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \
+CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \
 			--disable-perl \
 			--disable-python
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \
diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile
index 2059ae32f0f..06db44bd5ce 100644
--- a/graphics/gimp-helpbrowser/Makefile
+++ b/graphics/gimp-helpbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:41 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:22 agc Exp $
 
 DISTNAME=		gimp-1.1.24
 PKGNAME=		${DISTNAME:S/-/-helpbrowser-/}
@@ -18,7 +18,7 @@ USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_PKGLIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \
+CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \
 			--disable-perl \
 			--disable-python
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 4809998fd7f..53c7be519dd 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2000/07/11 14:53:42 agc Exp $
+# $NetBSD: Makefile,v 1.55 2000/07/14 16:04:22 agc Exp $
 
 DISTNAME=		gimp-1.0.4
 CATEGORIES=		graphics
@@ -28,7 +28,7 @@ USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_PKGLIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${MAKE} show-gtk+-prefix`"
+CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}"
 
 INFO_FILES=		pdb.info
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 112a8b2d6ea..61508433cc0 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/07/11 14:53:42 agc Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/14 16:04:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
 
 DISTNAME=	Giram-0.1.2
@@ -17,7 +17,7 @@ DEPENDS+=	povray-*:../../graphics/povray
 USE_X11=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="`${MAKE} show-gtk+-prefix`/bin/gtk-config" \
+CONFIGURE_ENV=	GTK_CONFIG="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/gtk-config" \
 		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 
 ALL_TARGET=	install-strip
diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile
index 7f876580111..b4417ecba24 100644
--- a/graphics/kdegraphics/Makefile
+++ b/graphics/kdegraphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2000/07/11 14:53:42 agc Exp $
+# $NetBSD: Makefile,v 1.30 2000/07/14 16:04:23 agc Exp $
 #
 
 DISTNAME=	kdegraphics-1.1.2
@@ -16,7 +16,7 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" 
+		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=  KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index f4e110edd32..d61fb4409c7 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:42 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:23 agc Exp $
 #
 
 DISTNAME=		libwmf-0.1.17
@@ -22,7 +22,7 @@ USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-png="${LOCALBASE}"
 CONFIGURE_ARGS+=	--with-ttf="${LOCALBASE}"
-CONFIGURE_ARGS+=	--with-xpm="`${MAKE} show-xpm-prefix`"
+CONFIGURE_ARGS+=	--with-xpm="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`"
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=		-I${LOCALBASE}/include -I${X11BASE}/include
 
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 397c7941d17..7f4a333f2cd 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2000/07/11 14:53:43 agc Exp $
+# $NetBSD: Makefile,v 1.39 2000/07/14 16:04:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
 #
 
@@ -16,7 +16,7 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" 
+CONFIGURE_ARGS=	"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index ed9a784b937..d65c1fee1bc 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.503 2000/07/14 06:55:26 rh Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.504 2000/07/14 16:04:24 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -1182,16 +1182,8 @@ show-downlevel:
 .endif
 .endif
 
-show-gtk+-prefix: _SHOW_PREFIX_USE
-show-imlib-prefix: _SHOW_PREFIX_USE
-show-kdebase-prefix: _SHOW_PREFIX_USE
-show-qt1-prefix: _SHOW_PREFIX_USE
-show-qt2-prefix: _SHOW_PREFIX_USE
-show-xpm-prefix: _SHOW_PREFIX_USE
-
-_SHOW_PREFIX_USE: .USE
-	@${PKG_INFO} -qp ${.TARGET:S/^show-//:S/-prefix//} 2>/dev/null | \
-		 ${AWK} 'BEGIN { p="${X11PREFIX}" } { p = $$2 } END { printf("%s\n", p) }'
+SHOW_PREFIX1=	${PKG_INFO} -qp 
+SHOW_PREFIX2=	2>/dev/null | ${AWK} 'BEGIN { p="${X11PREFIX}" } { p = $$2 } END { printf("%s\n", p) }'
 
 .if !target(show-pkgsrc-dir)
 show-pkgsrc-dir:
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 575f24b0146..f7ab3747887 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2000/07/11 14:53:43 agc Exp $
+# $NetBSD: Makefile,v 1.28 2000/07/14 16:04:24 agc Exp $
 #
 
 DISTNAME=		ethereal-0.8.10
@@ -13,6 +13,6 @@ BUILD_DEPENDS+=		${LOCALBASE}/bin/perl:../../lang/perl5
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${MAKE} show-gtk+-prefix`"
+CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 460c956cfe8..ef85e609a08 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:44 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:24 agc Exp $
 #
 
 DISTNAME=		gtk-gnutella-0.12
@@ -14,6 +14,6 @@ DEPENDS=		gtk+-1.2.*:../../x11/gtk
 USE_GMAKE=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${MAKE} show-gtk+-prefix`"
+CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index d6b329b0399..b0fa7b6ccdf 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2000/07/11 14:53:44 agc Exp $
+# $NetBSD: Makefile,v 1.46 2000/07/14 16:04:25 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -24,7 +24,7 @@ USE_PKGLIBTOOL=		yes
 LIBTOOL_FLAGS=		--cplusplus --install-la
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		"--datadir=${PREFIX}/share/kde" \
-			"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" 
+			"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" 
 CONFIGURE_ENV=  	KDEDIR=${PREFIX} \
 			CPPFLAGS="${CPPFLAGS}" \
 			CXXFLAGS="${CFLAGS}" \
diff --git a/net/kmap/Makefile b/net/kmap/Makefile
index 1749ea4c7cd..1ad129d90f1 100644
--- a/net/kmap/Makefile
+++ b/net/kmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/11 14:53:44 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/14 16:04:25 agc Exp $
 #
 
 DISTNAME=	kmap-0.5.6
@@ -13,8 +13,8 @@ DEPENDS+=	nmap-2.12:../../net/nmap
 
 USE_X11BASE=		yes	# To get this near KDE
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=	QTDIR=`${MAKE} show-qt1-prefix`/qt1
-CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1
+CONFIGURE_ENV+=	QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
+CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
 
 post-patch:
 	cd ${WRKSRC}/kmap ; \
diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile
index 1271c37ae15..8cffe376a62 100644
--- a/net/kxicq/Makefile
+++ b/net/kxicq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:44 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:25 agc Exp $
 
 DISTNAME=		kxicq-03132000
 CATEGORIES=		net kde
@@ -16,11 +16,11 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/kde \
-			--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1
+			--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
 CONFIGURE_ENV+=		KDEDIR=${PREFIX} \
 			CPPFLAGS="${CPPFLAGS}" \
 			CXXFLAGS="${CFLAGS}" \
-			all_libraries="-Wl,-R`${MAKE} show-qt1-prefix`/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz"
+			all_libraries="-Wl,-R`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz"
 
 post-extract:
 	@${RM} -fr ${WRKSRC}/kxicq/ltdl
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 2f32eaf987c..585549abbcd 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:45 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:25 agc Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -15,7 +15,7 @@ DEPENDS+=	tiff-*:../../graphics/tiff
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`"
+CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
 # XXX Actually, Mesa's in X11PREFIX too, but as our tiff is in LOCALBASE
 # and xtraceroute doesn't have a switch to tell it so (yet?), we abuse
 # the --with-GL-prefix switch for this.
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 14fec8b451e..543846d97d2 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:45 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:25 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp
 #
 
@@ -21,7 +21,7 @@ GNU_CONFIGURE=		yes
 USE_X11=		yes
 CONFIGURE_ARGS+=	--disable-jpeg	# there actually is no JPEG support
 CONFIGURE_ARGS+=	--with-xpm \
-			--with-xpm-includes="`${MAKE} show-xpm-prefix`/include" \
-			--with-xpm-library="`${MAKE} show-xpm-prefix`/lib"
+			--with-xpm-includes="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include" \
+			--with-xpm-library="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile
index 16052331400..7ad61c9319b 100644
--- a/sysutils/kapm/Makefile
+++ b/sysutils/kapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:45 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $
 #
 
 DISTNAME=	kapm-0.3.1
@@ -16,8 +16,8 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 
 USE_X11BASE=	YES	# to get things near KDE
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	QTDIR=`${MAKE} show-qt1-prefix`/qt1
-CONFIGURE_ENV+= MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc
-CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1
+CONFIGURE_ENV+=	QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
+CONFIGURE_ENV+= MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc
+CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 6b2ae5543c4..3e687b7cfb8 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:45 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $
 #
 
 DISTNAME=	kdf-0.5.1
@@ -14,13 +14,13 @@ DEPENDS+=	kde-1.1.2:../../x11/kde
 
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--datadir=`${MAKE} show-kdebase-prefix`/share/kde \
-		--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \
+CONFIGURE_ARGS+=--datadir=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`/share/kde \
+		--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
 		--enable-path-check
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${MAKE} show-qt1-prefix`/qt1 \
-		MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \
+		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
+		MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
 
diff --git a/x11/asclock-gtk/Makefile b/x11/asclock-gtk/Makefile
index db0908e5c92..91b92055b5e 100644
--- a/x11/asclock-gtk/Makefile
+++ b/x11/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:45 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:26 agc Exp $
 #
 
 DISTNAME=	asclock-gtk-2.1.10beta
@@ -18,7 +18,7 @@ PLIST_SRC=	${PKGDIR}/PLIST \
 		${PKGDIR}/PLIST.themes
 
 ALL_TARGET=	asclock
-MAKE_ENV+=	CONFIG_PATH="`${MAKE} show-gtk+-prefix`/bin/"	# for gtk-config
+MAKE_ENV+=	CONFIG_PATH="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/"	# for gtk-config
 
 pre-configure:
 	cd ${WRKSRC}; ${LN} -sf themes/classic default_theme
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index 43fcb7039b7..5bb88016a36 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:46 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:26 agc Exp $
 #
 
 DISTNAME=	ebuilder-0.56c
@@ -13,7 +13,7 @@ DEPENDS+=	qt2-*:../../x11/qt
 DEPENDS+=	png-*:../../graphics/png
 
 USE_X11=	yes
-MAKE_ENV=	QTDIR=`${MAKE} show-qt2-prefix`/qt2
+MAKE_ENV=	QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index deeecb11848..edf8462dd71 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/07/11 14:53:46 agc Exp $
+# $NetBSD: Makefile,v 1.25 2000/07/14 16:04:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-extras
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
-CONFIGURE_ARGS+=	--with-xpm-includes=`${MAKE} show-xpm-prefix`/include
+CONFIGURE_ARGS+=	--with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include
 CONFIGURE_ARGS+=	--with-readline-includes=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-rplay-includes=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index f0d0f7402e1..82b61a5f9fa 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:46 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:27 agc Exp $
 
 DISTNAME=	gdm-2.0beta4
 PKGNAME=	gdm-2.0b4
@@ -62,7 +62,7 @@ post-build:
 	cd ${WRKSRC}/config;						\
 	${RM} -f KDE Xsession;						\
 	${ECHO} '#! ${SH}' >KDE;					\
-	${ECHO} "export KDEDIR=`${MAKE} show-kdebase-prefix`" >>KDE; \
+	${ECHO} "export KDEDIR=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`" >>KDE; \
 	${ECHO} 'exec $${KDEDIR}/bin/startkde $$@' >>KDE;		\
 	${ECHO} '#! ${SH}' >Xsession;					\
 	${ECHO} 'exec ${X11BASE}/lib/X11/xdm/Xsession $$@' >>Xsession;	\
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index fbc9fb06a33..5fbaca68a7c 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/07/11 14:53:46 agc Exp $
+# $NetBSD: Makefile,v 1.18 2000/07/14 16:04:27 agc Exp $
 
 DISTNAME=		gtkglarea-1.2.1
 CATEGORIES=		x11 graphics
@@ -15,7 +15,7 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${MAKE} show-gtk+-prefix`"
+CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
 CONFIGURE_ARGS+=	--with-GL-prefix=${X11BASE}
 CONFIGURE_ARGS+=	--with-lib-MesaGL
 
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 411ec5ba3c3..89c9122083d 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2000/07/11 14:53:46 agc Exp $
+# $NetBSD: Makefile,v 1.66 2000/07/14 16:04:27 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -25,7 +25,7 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1"
+		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 29f61622722..d6ef2d9ca76 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2000/07/11 14:53:47 agc Exp $
+# $NetBSD: Makefile,v 1.49 2000/07/14 16:04:27 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -22,7 +22,7 @@ USE_PKGLIBTOOL=	yes
 LIBTOOL_FLAGS=	--cplusplus --install-la
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1"
+		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index 8912853fc3d..7ccf865d813 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:47 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:27 agc Exp $
 #
 
 DISTNAME=	khostchooser-0.3
@@ -19,11 +19,11 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/kde \
-		--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 
+		--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${MAKE} show-qt1-prefix`/qt1 \
-		MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \
+		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
+		MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
 
diff --git a/x11/korganizer/Makefile b/x11/korganizer/Makefile
index 974d824639c..a576bd6a655 100644
--- a/x11/korganizer/Makefile
+++ b/x11/korganizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:47 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:28 agc Exp $
 
 DISTNAME=	korganizer-1.1.2
 CATEGORIES=	kde
@@ -15,10 +15,10 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" 
+		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${MAKE} show-qt1-prefix`/qt1 \
+		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
 
diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile
index afca386c00c..72f2c24ec51 100644
--- a/x11/kworldwatch/Makefile
+++ b/x11/kworldwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/07/11 14:53:47 agc Exp $
+# $NetBSD: Makefile,v 1.10 2000/07/14 16:04:28 agc Exp $
 #
 
 DISTNAME=	kworldwatch-0.6
@@ -15,14 +15,14 @@ CONFLICTS+=	kdetoys-*
 
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--datadir=`${MAKE} show-kdebase-prefix`/share/kde \
-		--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \
-		--with-qt-libraries='`${MAKE} show-qt1-prefix`/qt1/lib -L${LOCALBASE}/lib' \
+CONFIGURE_ARGS+=--datadir=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`/share/kde \
+		--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
+		--with-qt-libraries='`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib -L${LOCALBASE}/lib' \
 		--enable-path-check
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	KDEDIR=`${MAKE} show-kdebase-prefix` \
-		MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \
-		QTDIR=`${MAKE} show-qt1-prefix`/qt1 \
+CONFIGURE_ENV=	KDEDIR=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}` \
+		MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \
+		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
 
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index e3f59feb406..2d49b43438e 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:47 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:28 agc Exp $
 #
 
 DISTNAME=	qtarch-2.0-1
@@ -16,7 +16,7 @@ DEPENDS+=	png-*:../../graphics/png
 USE_X11=	yes
 USE_GMAKE=	yes
 
-MAKE_ENV=	QTDIR=`${MAKE} show-qt2-prefix`/qt2
+MAKE_ENV=	QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2
 PATH=		${QTDIR}/bin:$$PATH
 
 do-install:
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index c79943c187b..99376efa014 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:48 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:28 agc Exp $
 
 DISTNAME=	QwSpriteField1.6
 PKGNAME=	qwspritefield-1.6
@@ -18,14 +18,14 @@ WRKSRC=		${WRKDIR}/QwSpriteField
 
 QW_INCLUDES=	Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
 
-PATH=		`${MAKE} show-qt1-prefix`/qt1/bin:$$PATH
+PATH=		`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH
 
-MAKE_ENV+=	"QTDIR=`${MAKE} show-qt1-prefix`/qt1"
+MAKE_ENV+=	"QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
 
 do-install:
 	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \
 	  ${PREFIX}/lib
-	@qt1dir=`${MAKE} show-qt1-prefix`;		\
+	@qt1dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`;		\
 	for file in ${QW_INCLUDES}; do					\
 		${INSTALL_DATA} ${WRKSRC}/${FILE} $$qt1dir/qt1/include;	\
 	done
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index d1726239673..55e37f5acab 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/07/11 14:53:48 agc Exp $
+# $NetBSD: Makefile,v 1.16 2000/07/14 16:04:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--enable-utmp \
 			--enable-frills \
 			--enable-keepscrolling \
 			--enable-mousewheel \
-			--with-xpm-includes=`${MAKE} show-xpm-prefix`/include/X11 \
-			--with-xpm-library=`${MAKE} show-xpm-prefix`/lib
+			--with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include/X11 \
+			--with-xpm-library=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile
index d02a4870658..0a60402a557 100644
--- a/x11/scwm/Makefile
+++ b/x11/scwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:48 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:30 agc Exp $
 #
 
 DISTNAME=	scwm-0.9
@@ -15,7 +15,7 @@ DEPENDS+=	readline-4.0:../../devel/readline
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
 CONFIGURE_ARGS+=	--with-guile-prefix=${LOCALBASE}	\
-			--with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \
+			--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \
 			--enable-multibyte
 
 USE_X11BASE=	yes
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 4c9ee39803b..83e9b302bca 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/07/11 14:53:48 agc Exp $
+# $NetBSD: Makefile,v 1.9 2000/07/14 16:04:30 agc Exp $
 
 DISTNAME=	xfce-3.3.1
 CATEGORIES=	x11
@@ -18,8 +18,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	XFCE_LOCALE_DIR=${PREFIX}/share/locale
 CONFIGURE_ARGS+=--without-included-gettext \
 		--datadir=${PREFIX}/share \
-		--with-imlib=`${MAKE} show-imlib-prefix` \
-		--with-xpm=`${MAKE} show-xpm-prefix`
+		--with-imlib=`${SHOW_PREFIX1} imlib ${SHOW_PREFIX2}` \
+		--with-xpm=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`
 USE_GMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 5815bd7bce3..444c6c1e298 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/07/11 14:53:48 agc Exp $
+# $NetBSD: Makefile,v 1.14 2000/07/14 16:04:30 agc Exp $
 #
 
 DISTNAME=	xglobe-0.5
@@ -24,7 +24,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_X11BASE=	YES
 USE_GMAKE=	YES
-MAKE_ENV+=	QTDIR=`${MAKE} show-qt1-prefix`/qt1
+MAKE_ENV+=	QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
 
 post-install:
 	${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe