Find qt1 prefix via pkg_info(1), rather than hardcoding it as ${X11BASE}.

Pointed out by Dave Sainty <dave@dtsp.co.nz>, munged slightly by me.

24 files changed, 73 insertions, 71 deletions

diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile
index bbe0d45631e..4a104fc64ee 100644
--- a/audio/kdemultimedia/Makefile
+++ b/audio/kdemultimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/23 15:28:06 kim Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:13 agc Exp $
 
 DISTNAME=	kdemultimedia-1.1.2
 CATEGORIES=	audio kde
@@ -15,7 +15,7 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=${PREFIX}/qt1"
+		"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 02755b2b04f..f55c15d58f1 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/03/28 00:09:20 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:14 agc Exp $
 
 DISTNAME=	musicbox-1.01p2
 CATEGORIES=	audio
@@ -14,7 +14,7 @@ USE_X11=	yes
 
 WRKSRC=		${WRKDIR}/musicbox-1.01
 
-PATH=	${X11BASE}/qt1/bin:$$PATH
+PATH=	`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin:$$PATH
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 65e970e5311..29442ea6842 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2000/07/10 15:08:14 agc Exp $
 # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
 #
 
@@ -19,10 +19,10 @@ CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
 USE_GMAKE=	yes
 USE_X11BASE=	yes
 
-CONFIGURE_ARGS+=	"--with-qt-dir=${X11BASE}/qt1" \
+CONFIGURE_ARGS+=	"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" \
 
-CONFIGURE_ENV+=	"QTDIR=${X11BASE}/qt1"
-CONFIGURE_ENV+=	"MOC=${X11BASE}/qt1/bin/moc"
+CONFIGURE_ENV+=	"QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
+CONFIGURE_ENV+=	"MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc"
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 6729f7ed849..23643a2c21a 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/06/20 21:13:59 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2000/07/10 15:08:14 agc Exp $
 #
 
 DISTNAME=	xsidplay-1_3_9
@@ -20,13 +20,13 @@ USE_GMAKE=	yes
 
 CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \
 		--with-sidplay-library=${LOCALBASE}/lib \
-		--with-qt-dir=${LOCALBASE}/qt1/lib \
+		--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib \
 		--with-qt-dir=${X11BASE}/qt1
 
 LDFLAGS+=	-Wl,-R${LOCALBASE}/qt1/lib -Wl,-R${X11BASE}/qt1/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ENV+=	"MOC=${PREFIX}/qt1/bin/moc"
+CONFIGURE_ENV+=	"MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc"
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index e8946729124..03610e5e55c 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2000/06/01 11:23:17 rh Exp $
+# $NetBSD: Makefile,v 1.29 2000/07/10 15:08:15 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
 #
 
@@ -19,6 +19,6 @@ CONFIGURE_ARGS=	"--without-gnu-ld" \
 		"--without-libgdbm" \
 		"--without-libuulib" \
 		"--without-sprite-field" \
-		"--with-qt-dir=${X11BASE}/qt1" 
+		"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" 
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index aa95f82df76..eca198a13c7 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/12 21:54:04 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:15 agc Exp $
 #
 
 DISTNAME=	cervisia-0.5.0
@@ -14,9 +14,9 @@ DEPENDS+=	cvs-1.10:../../devel/cvs
 
 USE_X11BASE=		yes	# To get this near KDE
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=	"QTDIR=${X11BASE}/qt1"
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/qt1/include \
-		--with-qt-libraries=${X11BASE}/qt1/lib \
+CONFIGURE_ENV+=	"QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
+CONFIGURE_ARGS+=--with-qt-includes=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/include \
+		--with-qt-libraries=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib \
 		--with-extra-includes=${LOCALBASE}/include \
 		--with-extra-libs=${LOCALBASE}/lib
 
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 5ccf9836297..bcc339301c2 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/06/01 11:23:21 rh Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/10 15:08:16 agc Exp $
 
 DISTNAME=	kdbg-1.0.1
 CATEGORIES=	devel kde
@@ -18,8 +18,8 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-qt-dir=${PREFIX}/qt1 \
-		--with-qt-includes=${PREFIX}/qt1/include \
+CONFIGURE_ARGS=	--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
+		--with-qt-includes=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/include \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 84e6a3e19de..692b53e57a1 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/06/01 11:23:21 rh Exp $
+# $NetBSD: Makefile,v 1.14 2000/07/10 15:08:16 agc Exp $
 
 DISTNAME=	kdevelop-1.2
 CATEGORIES=	devel kde
@@ -22,9 +22,9 @@ USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-extra-includes=${LOCALBASE}/include \
 		--with-extra-libs=${LOCALBASE}/lib \
-		--with-qt-dir=${X11BASE}/qt1
+		--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
 
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	"KDEDIR=${PREFIX} QTDIR=${X11BASE}/qt1"
+CONFIGURE_ENV=	"KDEDIR=${PREFIX} QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/amor/Makefile b/games/amor/Makefile
index 7ebf382c294..7af3f4b7a27 100644
--- a/games/amor/Makefile
+++ b/games/amor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/12 22:08:59 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:16 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=${X11BASE}/qt1
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}/qt1
+CONFIGURE_ENV+=	QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
+CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index 5c456e4b6b6..80e776a03a5 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2000/03/28 00:12:30 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.37 2000/07/10 15:08:17 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=${X11BASE}/qt1" 
+		"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile
index c1399904ccb..04d8adadcdb 100644
--- a/games/kdetoys/Makefile
+++ b/games/kdetoys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/24 14:14:12 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:17 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=${X11BASE}/qt1"
+		"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=${X11BASE}/qt1 \
+		QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
 
diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile
index ccc7dc509ba..a3439ffff8d 100644
--- a/graphics/kdegraphics/Makefile
+++ b/graphics/kdegraphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2000/03/28 00:12:30 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.28 2000/07/10 15:08:17 agc Exp $
 #
 
 DISTNAME=	kdegraphics-1.1.2
@@ -16,7 +16,7 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=${X11BASE}/qt1" 
+		"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=  KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 374ae9a6e8f..e8dc30aeaa0 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2000/03/28 00:12:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.37 2000/07/10 15:08:18 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
 #
 
@@ -16,7 +16,7 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--with-qt-dir=${X11BASE}/qt1" 
+CONFIGURE_ARGS=	"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index c0793fe36ab..a74c8c6db29 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2000/06/13 10:40:27 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2000/07/10 15:08:18 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -24,7 +24,7 @@ USE_PKGLIBTOOL=		yes
 LIBTOOL_FLAGS=		--cplusplus --install-la
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		"--datadir=${PREFIX}/share/kde" \
-			"--with-qt-dir=${X11BASE}/qt1" 
+			"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" 
 CONFIGURE_ENV=  	KDEDIR=${PREFIX} \
 			CPPFLAGS="${CPPFLAGS}" \
 			CXXFLAGS="${CFLAGS}" \
diff --git a/net/kmap/Makefile b/net/kmap/Makefile
index 643c91962eb..bdfdbb24e98 100644
--- a/net/kmap/Makefile
+++ b/net/kmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/04/12 23:09:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2000/07/10 15:08:18 agc Exp $
 #
 
 DISTNAME=	kmap-0.5.6
@@ -13,8 +13,8 @@ DEPENDS+=	nmap-2.12:../../net/nmap
 
 USE_X11BASE=		yes	# To get this near KDE
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=	QTDIR=${X11BASE}/qt1
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}/qt1
+CONFIGURE_ENV+=	QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
+CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
 
 post-patch:
 	cd ${WRKSRC}/kmap ; \
diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile
index c855e3410d5..e3c0ec19980 100644
--- a/sysutils/kapm/Makefile
+++ b/sysutils/kapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/06 21:09:40 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:18 agc Exp $
 #
 
 DISTNAME=	kapm-0.3.1
@@ -16,7 +16,8 @@ DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 
 USE_X11BASE=	YES	# to get things near KDE
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	QTDIR=${X11BASE}/qt1 MOC=${X11BASE}/qt1/bin/moc
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}/qt1
+CONFIGURE_ENV+=	QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
+CONFIGURE_ENV+= MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc
+CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 86bde4ad01f..abb50ba14c8 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/12 23:55:47 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:19 agc Exp $
 #
 
 DISTNAME=	kdf-0.5.1
@@ -15,12 +15,12 @@ DEPENDS+=	kde-1.1.2:../../x11/kde
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--datadir=${X11BASE}/share/kde \
-		--with-qt-dir=${X11BASE}/qt1 \
+		--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
 		--enable-path-check
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=${X11BASE}/qt1 \
-		MOC=${X11BASE}/qt1/bin/moc \
+		QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
+		MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
 
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index c9e07cddde1..515af565e76 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2000/03/28 00:12:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.64 2000/07/10 15:08:19 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=${X11BASE}/qt1"
+		"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 3b34f86fbfd..4945474b650 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2000/06/01 11:23:46 rh Exp $
+# $NetBSD: Makefile,v 1.47 2000/07/10 15:08:19 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=${PREFIX}/qt1"
+		"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index e7a573a38ed..be2dcf52b9a 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/04/13 00:20:38 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:20 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=${X11BASE}/qt1 
+		--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=${X11BASE}/qt1 \
-		MOC=${X11BASE}/qt1/bin/moc \
+		QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
+		MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/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 e79ff83ab91..9f7b0c8deeb 100644
--- a/x11/korganizer/Makefile
+++ b/x11/korganizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/13 00:43:17 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:20 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=${X11BASE}/qt1" 
+		"--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		QTDIR=${X11BASE}/qt1 \
+		QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/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 45c3f7c6c37..57c1f962786 100644
--- a/x11/kworldwatch/Makefile
+++ b/x11/kworldwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/04/24 14:14:13 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/10 15:08:21 agc Exp $
 #
 
 DISTNAME=	kworldwatch-0.6
@@ -16,13 +16,13 @@ CONFLICTS+=	kdetoys-*
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--datadir=${X11BASE}/share/kde \
-		--with-qt-dir=${X11BASE}/qt1 \
-		--with-qt-libraries='${X11BASE}/qt1/lib -L${LOCALBASE}/lib' \
+		--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' \
 		--enable-path-check
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		MOC=${X11BASE}/qt1/bin/moc \
-		QTDIR=${X11BASE}/qt1 \
+		MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \
+		QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \
 		CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
 
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 7e6b5636101..c30ff5b9fa6 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:47 rh Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:21 agc Exp $
 
 DISTNAME=	QwSpriteField1.6
 PKGNAME=	qwspritefield-1.6
@@ -18,15 +18,16 @@ WRKSRC=		${WRKDIR}/QwSpriteField
 
 QW_INCLUDES=	Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
 
-PATH=		${X11BASE}/qt1/bin:$$PATH
+PATH=		`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin:$$PATH
 
-MAKE_ENV+=	"QTDIR=${X11BASE}/qt1"
+MAKE_ENV+=	"QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1"
 
 do-install:
 	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \
 	  ${PREFIX}/lib
-.for FILE in ${QW_INCLUDES}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/qt1/include
-.endfor
+	@qt1dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`;		\
+	for file in ${QW_INCLUDES}; do					\
+		${INSTALL_DATA} ${WRKSRC}/${FILE} $$qt1dir/qt1/include;	\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 0af164819b5..4770687eb0d 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/04/03 03:24:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/10 15:08:21 agc Exp $
 #
 
 DISTNAME=	xglobe-0.5
@@ -24,7 +24,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_X11BASE=	YES
 USE_GMAKE=	YES
-MAKE_ENV+=	QTDIR=${X11BASE}/qt1
+MAKE_ENV+=	QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1
 
 post-install:
 	${INSTALL_DATA_DIR} ${X11BASE}/lib/xglobe