Make the determination of the pre-req package's installed directory be

a bit more user-friendly.

Introduce a show-{gtk+,imlib,kdebase,qt1,qt2,xpm}-prefix target in
bsd.pkg.mk, and use "${MAKE} show-*-prefix" in package Makefiles.

16 files changed, 44 insertions, 44 deletions

diff --git a/x11/asclock-gtk/Makefile b/x11/asclock-gtk/Makefile
index 28d699f59ab..db0908e5c92 100644
--- a/x11/asclock-gtk/Makefile
+++ b/x11/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/11 10:19:37 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:45 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="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`/bin/"	# for gtk-config
+MAKE_ENV+=	CONFIG_PATH="`${MAKE} show-gtk+-prefix`/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 45911500e2d..43fcb7039b7 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/10 16:03:49 agc Exp $
+# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:46 agc Exp $
 #
 
 DISTNAME=	ebuilder-0.56c
@@ -13,7 +13,7 @@ DEPENDS+=	qt2-*:../../x11/qt
 DEPENDS+=	png-*:../../graphics/png
 
 USE_X11=	yes
-MAKE_ENV=	QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2
+MAKE_ENV=	QTDIR=`${MAKE} show-qt2-prefix`/qt2
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index 728419b612f..deeecb11848 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/07/11 09:31:33 agc Exp $
+# $NetBSD: Makefile,v 1.24 2000/07/11 14:53:46 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=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include
+CONFIGURE_ARGS+=	--with-xpm-includes=`${MAKE} show-xpm-prefix`/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 4ebe8b2daa5..f0d0f7402e1 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/07/11 10:30:43 agc Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:46 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=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'`" >>KDE; \
+	${ECHO} "export KDEDIR=`${MAKE} show-kdebase-prefix`" >>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 2a070e6c4a5..fbc9fb06a33 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/07/10 10:40:42 agc Exp $
+# $NetBSD: Makefile,v 1.17 2000/07/11 14:53:46 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="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`"
+CONFIGURE_ARGS+=	--with-gtk-prefix="`${MAKE} show-gtk+-prefix`"
 CONFIGURE_ARGS+=	--with-GL-prefix=${X11BASE}
 CONFIGURE_ARGS+=	--with-lib-MesaGL
 
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 515af565e76..411ec5ba3c3 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2000/07/10 15:08:19 agc Exp $
+# $NetBSD: Makefile,v 1.65 2000/07/11 14:53:46 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=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
+		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 4945474b650..29f61622722 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2000/07/10 15:08:19 agc Exp $
+# $NetBSD: Makefile,v 1.48 2000/07/11 14:53:47 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=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
+		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index be2dcf52b9a..8912853fc3d 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:20 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:47 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=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 
+		--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
-		MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \
+		QTDIR=`${MAKE} show-qt1-prefix`/qt1 \
+		MOC=`${MAKE} show-qt1-prefix`/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 9f7b0c8deeb..974d824639c 100644
--- a/x11/korganizer/Makefile
+++ b/x11/korganizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:20 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:47 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=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" 
+		"--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
+		QTDIR=`${MAKE} show-qt1-prefix`/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 7891f2f0f38..afca386c00c 100644
--- a/x11/kworldwatch/Makefile
+++ b/x11/kworldwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/07/11 10:58:34 agc Exp $
+# $NetBSD: Makefile,v 1.9 2000/07/11 14:53:47 agc Exp $
 #
 
 DISTNAME=	kworldwatch-0.6
@@ -15,14 +15,14 @@ CONFLICTS+=	kdetoys-*
 
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--datadir=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'`/share/kde \
-		--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
-		--with-qt-libraries='`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib -L${LOCALBASE}/lib' \
+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' \
 		--enable-path-check
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	KDEDIR=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'` \
-		MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \
-		QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
+CONFIGURE_ENV=	KDEDIR=`${MAKE} show-kdebase-prefix` \
+		MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \
+		QTDIR=`${MAKE} show-qt1-prefix`/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 163d0fdc2af..e3f59feb406 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/10 16:03:49 agc Exp $
+# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:47 agc Exp $
 #
 
 DISTNAME=	qtarch-2.0-1
@@ -16,7 +16,7 @@ DEPENDS+=	png-*:../../graphics/png
 USE_X11=	yes
 USE_GMAKE=	yes
 
-MAKE_ENV=	QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2
+MAKE_ENV=	QTDIR=`${MAKE} show-qt2-prefix`/qt2
 PATH=		${QTDIR}/bin:$$PATH
 
 do-install:
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index c30ff5b9fa6..c79943c187b 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:21 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:48 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=		`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin:$$PATH
+PATH=		`${MAKE} show-qt1-prefix`/qt1/bin:$$PATH
 
-MAKE_ENV+=	"QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
+MAKE_ENV+=	"QTDIR=`${MAKE} show-qt1-prefix`/qt1"
 
 do-install:
 	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \
 	  ${PREFIX}/lib
-	@qt1dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`;		\
+	@qt1dir=`${MAKE} show-qt1-prefix`;		\
 	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 eddb999c514..d1726239673 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/07/11 09:31:33 agc Exp $
+# $NetBSD: Makefile,v 1.15 2000/07/11 14:53:48 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=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include/X11 \
-			--with-xpm-library=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/lib
+			--with-xpm-includes=`${MAKE} show-xpm-prefix`/include/X11 \
+			--with-xpm-library=`${MAKE} show-xpm-prefix`/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile
index 34993044714..d02a4870658 100644
--- a/x11/scwm/Makefile
+++ b/x11/scwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/07/10 10:40:43 agc Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:48 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="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \
+			--with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \
 			--enable-multibyte
 
 USE_X11BASE=	yes
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index c02271a6342..4c9ee39803b 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 10:39:05 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/11 14:53:48 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=`${PKG_INFO} -qp imlib | ${AWK} '{print $$2}'` \
-		--with-xpm=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`
+		--with-imlib=`${MAKE} show-imlib-prefix` \
+		--with-xpm=`${MAKE} show-xpm-prefix`
 USE_GMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index a57e27ef7fa..5815bd7bce3 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/11 10:40:27 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/07/11 14:53:48 agc Exp $
 #
 
 DISTNAME=	xglobe-0.5
@@ -24,7 +24,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_X11BASE=	YES
 USE_GMAKE=	YES
-MAKE_ENV+=	QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
+MAKE_ENV+=	QTDIR=`${MAKE} show-qt1-prefix`/qt1
 
 post-install:
 	${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe