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.

6 files changed, 25 insertions, 14 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index f7ab3747887..99c5ad142d3 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2000/07/14 16:04:24 agc Exp $
+# $NetBSD: Makefile,v 1.29 2000/07/15 20:39:22 agc Exp $
 #
 
 DISTNAME=		ethereal-0.8.10
@@ -13,6 +13,8 @@ BUILD_DEPENDS+=		${LOCALBASE}/bin/perl:../../lang/perl5
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
+
+EVAL_PREFIX+=		GTKDIR=gtk+
+CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index ef85e609a08..a86245dee37 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:24 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:22 agc Exp $
 #
 
 DISTNAME=		gtk-gnutella-0.12
@@ -14,6 +14,8 @@ DEPENDS=		gtk+-1.2.*:../../x11/gtk
 USE_GMAKE=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
+
+EVAL_PREFIX+=		GTKDIR=gtk+
+CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index b0fa7b6ccdf..c07a1153f6c 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2000/07/14 16:04:25 agc Exp $
+# $NetBSD: Makefile,v 1.47 2000/07/15 20:39:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -23,8 +23,9 @@ 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" 
 CONFIGURE_ENV=  	KDEDIR=${PREFIX} \
 			CPPFLAGS="${CPPFLAGS}" \
 			CXXFLAGS="${CFLAGS}" \
diff --git a/net/kmap/Makefile b/net/kmap/Makefile
index 1ad129d90f1..4db5216416a 100644
--- a/net/kmap/Makefile
+++ b/net/kmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/14 16:04:25 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/15 20:39:23 agc Exp $
 #
 
 DISTNAME=	kmap-0.5.6
@@ -13,8 +13,10 @@ DEPENDS+=	nmap-2.12:../../net/nmap
 
 USE_X11BASE=		yes	# To get this near KDE
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=	QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
-CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1
+
+EVAL_PREFIX+=	QT1DIR=qt1
+CONFIGURE_ENV+=	QTDIR=${QT1DIR}/qt1
+CONFIGURE_ARGS+=--with-qt-dir=${QT1DIR}/qt1
 
 post-patch:
 	cd ${WRKSRC}/kmap ; \
diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile
index 8cffe376a62..e0aa2872e27 100644
--- a/net/kxicq/Makefile
+++ b/net/kxicq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:25 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/15 20:39:23 agc Exp $
 
 DISTNAME=		kxicq-03132000
 CATEGORIES=		net kde
@@ -15,12 +15,14 @@ USE_GMAKE=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_LIBTOOL=		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
 CONFIGURE_ENV+=		KDEDIR=${PREFIX} \
 			CPPFLAGS="${CPPFLAGS}" \
 			CXXFLAGS="${CFLAGS}" \
-			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"
+			all_libraries="-Wl,-R${QT1DIR}/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 585549abbcd..887c70066bd 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:25 agc Exp $
+# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:24 agc Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -15,7 +15,9 @@ DEPENDS+=	tiff-*:../../graphics/tiff
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
+
+EVAL_PREFIX+=	GTKDIR=gtk+
+CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}"
 # 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.