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.

6 files changed, 17 insertions, 17 deletions

diff --git a/games/amor/Makefile b/games/amor/Makefile
index 7af3f4b7a27..a985a96ca26 100644
--- a/games/amor/Makefile
+++ b/games/amor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:16 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:39 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=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
-CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
+CONFIGURE_ENV+=	QTDIR=`${MAKE} show-qt1-prefix`/qt1
+CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 05584ba1b4c..778d685f908 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/07/10 13:29:38 agc Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:40 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=`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`
+CONFIGURE_ARGS+=	--with-gtk-prefix=`${MAKE} show-gtk+-prefix`
 CONFIGURE_ARGS+=	--without-included-gettext
-CONFIGURE_ENV+=	GTK_CONFIG="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`/bin/gtk-config"
+CONFIGURE_ENV+=	GTK_CONFIG="`${MAKE} show-gtk+-prefix`/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 80e776a03a5..5c02eb85368 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2000/07/10 15:08:17 agc Exp $
+# $NetBSD: Makefile,v 1.38 2000/07/11 14:53:40 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=`${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/games/kdetoys/Makefile b/games/kdetoys/Makefile
index 04d8adadcdb..6bb35579958 100644
--- a/games/kdetoys/Makefile
+++ b/games/kdetoys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:17 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:40 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=`${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${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 714171a96e7..486c2427865 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/07/10 16:03:48 agc Exp $
+# $NetBSD: Makefile,v 1.17 2000/07/11 14:53:41 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=   		`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2/bin:$$PATH
-MAKE_ENV+=		GTYPE=-qt QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2
+PATH=   		`${MAKE} show-qt2-prefix`/qt2/bin:$$PATH
+MAKE_ENV+=		GTYPE=-qt QTDIR=`${MAKE} show-qt2-prefix`/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 0d78d4feb8a..d6e1610d13c 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/10 13:29:39 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:41 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=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'` \
-		--with-gtk-prefix=`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'` \
+CONFIGURE_ARGS+=--with-xpm-prefix=`${MAKE} show-xpm-prefix` \
+		--with-gtk-prefix=`${MAKE} show-gtk+-prefix` \
 		--with-esd-prefix=${LOCALBASE}
 
 .include "../../mk/bsd.prefs.mk"