Instead of the clunky SHOW_PKG_PREFIX, introduce an EVAL_PREFIX definition,

which takes entries of the format <make-definition-name>=<pkgname>. This
has not been added to MAKEFLAGS because (a) premature optimisation is the
root of all evil, and (b) because the .for loop used to implement this
shows the wrong results when multiple prefices are evaluated.

Modify all the package Makefiles to use EVAL_PREFIX, thereby simplifying
them considerably.

ALso simplify the logic to calculate the prefix as well.

16 files changed, 71 insertions, 44 deletions

diff --git a/x11/asclock-gtk/Makefile b/x11/asclock-gtk/Makefile
index 91b92055b5e..a65c7280f71 100644
--- a/x11/asclock-gtk/Makefile
+++ b/x11/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:26 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/15 20:39:25 agc Exp $
 #
 
 DISTNAME=	asclock-gtk-2.1.10beta
@@ -18,7 +18,9 @@ PLIST_SRC=	${PKGDIR}/PLIST \
 		${PKGDIR}/PLIST.themes
 
 ALL_TARGET=	asclock
-MAKE_ENV+=	CONFIG_PATH="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/"	# for gtk-config
+
+EVAL_PREFIX+=	GTKDIR=gtk+
+MAKE_ENV+=	CONFIG_PATH="${GTKDIR}/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 5bb88016a36..75d8e1ac4f4 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:26 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/15 20:39:25 agc Exp $
 #
 
 DISTNAME=	ebuilder-0.56c
@@ -13,7 +13,9 @@ DEPENDS+=	qt2-*:../../x11/qt
 DEPENDS+=	png-*:../../graphics/png
 
 USE_X11=	yes
-MAKE_ENV=	QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2
+
+EVAL_PREFIX+=	QT2DIR=qt2
+MAKE_ENV=	QTDIR=${QT2DIR}/qt2
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index edf8462dd71..531d3beb981 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/07/14 16:04:26 agc Exp $
+# $NetBSD: Makefile,v 1.26 2000/07/15 20:39:25 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -22,10 +22,12 @@ CONFLICTS=	fvwm-2.*
 
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
+
+EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--enable-extras
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
-CONFIGURE_ARGS+=	--with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include
+CONFIGURE_ARGS+=	--with-xpm-includes=${XPMDIR}/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 82b61a5f9fa..859c9abb71a 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:27 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:25 agc Exp $
 
 DISTNAME=	gdm-2.0beta4
 PKGNAME=	gdm-2.0b4
@@ -20,6 +20,8 @@ USE_X11BASE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LIBS=		-lintl
 LOCALSTATEDIR=	/var/gnome
+
+EVAL_PREFIX+=	KDEBASEDIR=kdebase
 CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR}
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LIBS="${LIBS}" \
 		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
@@ -62,7 +64,7 @@ post-build:
 	cd ${WRKSRC}/config;						\
 	${RM} -f KDE Xsession;						\
 	${ECHO} '#! ${SH}' >KDE;					\
-	${ECHO} "export KDEDIR=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`" >>KDE; \
+	${ECHO} "export KDEDIR=${KDEBASEDIR}" >>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 5fbaca68a7c..8663271c1a0 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/07/14 16:04:27 agc Exp $
+# $NetBSD: Makefile,v 1.19 2000/07/15 20:39:26 agc Exp $
 
 DISTNAME=		gtkglarea-1.2.1
 CATEGORIES=		x11 graphics
@@ -15,7 +15,8 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
+EVAL_PREFIX+=		GTKDIR=gtk+
+CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}"
 CONFIGURE_ARGS+=	--with-GL-prefix=${X11BASE}
 CONFIGURE_ARGS+=	--with-lib-MesaGL
 
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 89c9122083d..ff206376e33 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2000/07/14 16:04:27 agc Exp $
+# $NetBSD: Makefile,v 1.67 2000/07/15 20:39:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -24,8 +24,10 @@ DEPENDS+=	libungif-*:../../graphics/libungif
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+
+EVAL_PREFIX+=	QT1DIR=qt1
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+		"--with-qt-dir=${QT1DIR}/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index d6ef2d9ca76..fca979d0d1f 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2000/07/14 16:04:27 agc Exp $
+# $NetBSD: Makefile,v 1.50 2000/07/15 20:39:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -21,8 +21,10 @@ USE_GMAKE=	yes
 USE_PKGLIBTOOL=	yes
 LIBTOOL_FLAGS=	--cplusplus --install-la
 GNU_CONFIGURE=	yes
+
+EVAL_PREFIX+=	QT1DIR=qt1
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+		"--with-qt-dir=${QT1DIR}/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index 7ccf865d813..6db51437510 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:27 agc Exp $
+# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:26 agc Exp $
 #
 
 DISTNAME=	khostchooser-0.3
@@ -18,12 +18,14 @@ WRKSRC=		${WRKDIR}/khostchooser
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+
+EVAL_PREFIX+=	QT1DIR=qt1
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/kde \
-		--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 
+		--with-qt-dir=${QT1DIR}/qt1 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
-		MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \
+		QTDIR=${QT1DIR}/qt1 \
+		MOC=${QT1DIR}/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 a576bd6a655..3c2c5acaf38 100644
--- a/x11/korganizer/Makefile
+++ b/x11/korganizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:28 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:27 agc Exp $
 
 DISTNAME=	korganizer-1.1.2
 CATEGORIES=	kde
@@ -14,11 +14,13 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+
+EVAL_PREFIX+=	QT1DIR=qt1
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" 
+		"--with-qt-dir=${QT1DIR}/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
+		QTDIR=${QT1DIR}/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 72f2c24ec51..024b136b4f6 100644
--- a/x11/kworldwatch/Makefile
+++ b/x11/kworldwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/07/14 16:04:28 agc Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/15 20:39:27 agc Exp $
 #
 
 DISTNAME=	kworldwatch-0.6
@@ -15,14 +15,16 @@ CONFLICTS+=	kdetoys-*
 
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
-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' \
+
+EVAL_PREFIX+=	QT1DIR=qt1 KDEBASEDIR=kdebase
+CONFIGURE_ARGS+=--datadir=${KDEBASEDIR}/share/kde \
+		--with-qt-dir=${QT1DIR}/qt1 \
+		--with-qt-libraries='${QT1DIR}/qt1/lib -L${LOCALBASE}/lib' \
 		--enable-path-check
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	KDEDIR=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}` \
-		MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \
-		QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \
+CONFIGURE_ENV=	KDEDIR=${KDEBASEDIR} \
+		MOC=${QT1DIR}/qt1/bin/moc \
+		QTDIR=${QT1DIR}/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 2d49b43438e..c0a12be879c 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:28 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/15 20:39:27 agc Exp $
 #
 
 DISTNAME=	qtarch-2.0-1
@@ -16,7 +16,8 @@ DEPENDS+=	png-*:../../graphics/png
 USE_X11=	yes
 USE_GMAKE=	yes
 
-MAKE_ENV=	QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2
+EVAL_PREFIX+=	QT2DIR=qt2
+MAKE_ENV=	QTDIR=${QT2DIR}/qt2
 PATH=		${QTDIR}/bin:$$PATH
 
 do-install:
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 99376efa014..0f8d030899f 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:28 agc Exp $
+# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:27 agc Exp $
 
 DISTNAME=	QwSpriteField1.6
 PKGNAME=	qwspritefield-1.6
@@ -18,14 +18,15 @@ WRKSRC=		${WRKDIR}/QwSpriteField
 
 QW_INCLUDES=	Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
 
-PATH=		`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH
+EVAL_PREFIX+=	QT1DIR=qt1
+PATH=		${QT1DIR}/qt1/bin:$$PATH
 
-MAKE_ENV+=	"QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+MAKE_ENV+=	"QTDIR=${QT1DIR}/qt1"
 
 do-install:
 	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \
 	  ${PREFIX}/lib
-	@qt1dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`;		\
+	@qt1dir=${QT1DIR};		\
 	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 55e37f5acab..c33a138446b 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/07/14 16:04:28 agc Exp $
+# $NetBSD: Makefile,v 1.17 2000/07/15 20:39:27 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
@@ -15,6 +15,8 @@ DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
+
+EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--enable-utmp \
 			--enable-wtmp \
 			--enable-lastlog \
@@ -32,7 +34,7 @@ CONFIGURE_ARGS+=	--enable-utmp \
 			--enable-frills \
 			--enable-keepscrolling \
 			--enable-mousewheel \
-			--with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include/X11 \
-			--with-xpm-library=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/lib
+			--with-xpm-includes=${XPMDIR}/include/X11 \
+			--with-xpm-library=${XPMDIR}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile
index 37a582dc941..2b47ad4e3a5 100644
--- a/x11/scwm/Makefile
+++ b/x11/scwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/07/15 02:36:45 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:28 agc Exp $
 #
 
 DISTNAME=	scwm-0.9
@@ -14,8 +14,9 @@ DEPENDS+=	gtar-1.12:../../archivers/gtar
 DEPENDS+=	readline-4.0:../../devel/readline
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
+EVAL_PREFIX+=	GTKDIR=gtk+
 CONFIGURE_ARGS+=	--with-guile-prefix=${LOCALBASE}	\
-			--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \
+			--with-gtk-prefix="${GTKDIR}"		\
 			--enable-multibyte
 
 USE_X11BASE=	yes
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 83e9b302bca..dfd6b006eb1 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/07/14 16:04:30 agc Exp $
+# $NetBSD: Makefile,v 1.10 2000/07/15 20:39:28 agc Exp $
 
 DISTNAME=	xfce-3.3.1
 CATEGORIES=	x11
@@ -16,10 +16,12 @@ USE_X11=	yes
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	XFCE_LOCALE_DIR=${PREFIX}/share/locale
+
+EVAL_PREFIX+=	IMLIBDIR=imlib XPMDIR=xpm
 CONFIGURE_ARGS+=--without-included-gettext \
 		--datadir=${PREFIX}/share \
-		--with-imlib=`${SHOW_PREFIX1} imlib ${SHOW_PREFIX2}` \
-		--with-xpm=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`
+		--with-imlib=${IMLIBDIR} \
+		--with-xpm=${XPMDIR}
 USE_GMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 444c6c1e298..77a647f1bec 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/07/14 16:04:30 agc Exp $
+# $NetBSD: Makefile,v 1.15 2000/07/15 20:39:28 agc Exp $
 #
 
 DISTNAME=	xglobe-0.5
@@ -24,7 +24,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_X11BASE=	YES
 USE_GMAKE=	YES
-MAKE_ENV+=	QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
+EVAL_PREFIX+=	QT1DIR=qt1
+MAKE_ENV+=	QTDIR=${QT1DIR}/qt1
 
 post-install:
 	${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe