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, 23 insertions, 12 deletions

diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index d7148d7b648..8c761673bb9 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2000/07/14 16:04:22 agc Exp $
+# $NetBSD: Makefile,v 1.22 2000/07/15 20:39:19 agc Exp $
 
 DISTNAME=		gimp-1.1.24
 CATEGORIES=		graphics
@@ -23,7 +23,8 @@ USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \
+EVAL_PREFIX+=		GTKDIR=gtk+
+CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}" \
 			--disable-perl \
 			--disable-python
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \
diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile
index 06db44bd5ce..9d5aa539035 100644
--- a/graphics/gimp-helpbrowser/Makefile
+++ b/graphics/gimp-helpbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:22 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:19 agc Exp $
 
 DISTNAME=		gimp-1.1.24
 PKGNAME=		${DISTNAME:S/-/-helpbrowser-/}
@@ -18,7 +18,9 @@ USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_PKGLIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \
+
+EVAL_PREFIX+=		GTKDIR=gtk+
+CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}" \
 			--disable-perl \
 			--disable-python
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 53c7be519dd..edeb0014078 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2000/07/14 16:04:22 agc Exp $
+# $NetBSD: Makefile,v 1.56 2000/07/15 20:39:20 agc Exp $
 
 DISTNAME=		gimp-1.0.4
 CATEGORIES=		graphics
@@ -28,7 +28,9 @@ USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_PKGLIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`"
+
+EVAL_PREFIX+=		GTKDIR=gtk+
+CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}"
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}"
 
 INFO_FILES=		pdb.info
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 61508433cc0..094a7c1e115 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/14 16:04:23 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/07/15 20:39:20 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,9 @@ DEPENDS+=	povray-*:../../graphics/povray
 USE_X11=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/gtk-config" \
+
+EVAL_PREFIX+=	GTKDIR=gtk+
+CONFIGURE_ENV=	GTK_CONFIG="${GTKDIR}/bin/gtk-config" \
 		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 
 ALL_TARGET=	install-strip
diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile
index b4417ecba24..f1e6d27576a 100644
--- a/graphics/kdegraphics/Makefile
+++ b/graphics/kdegraphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2000/07/14 16:04:23 agc Exp $
+# $NetBSD: Makefile,v 1.31 2000/07/15 20:39:20 agc Exp $
 #
 
 DISTNAME=	kdegraphics-1.1.2
@@ -15,8 +15,10 @@ 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} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index d61fb4409c7..5ceda2dd9c2 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:23 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:21 agc Exp $
 #
 
 DISTNAME=		libwmf-0.1.17
@@ -20,9 +20,11 @@ WRKSRC=			${WRKDIR}/libwmf
 USE_X11=		YES
 
 GNU_CONFIGURE=		YES
+
+EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--with-png="${LOCALBASE}"
 CONFIGURE_ARGS+=	--with-ttf="${LOCALBASE}"
-CONFIGURE_ARGS+=	--with-xpm="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`"
+CONFIGURE_ARGS+=	--with-xpm="${XPMDIR}"
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=		-I${LOCALBASE}/include -I${X11BASE}/include