8 files changed, 88 insertions, 14 deletions

diff --git a/audio/kdemultimedia11/Makefile b/audio/kdemultimedia11/Makefile
index a790c0467e1b..1c38782ba301 100644
--- a/audio/kdemultimedia11/Makefile
+++ b/audio/kdemultimedia11/Makefile
@@ -19,9 +19,19 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-qt-includes=${QTDIR}/include/X11/qt" \
+		"--with-extra-includes=${LOCALBASE}/include" \
+		"--with-extra-libs=${LOCALBASE}/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		QTDIR=${QTDIR}
 USE_GMAKE=	yes
 
+.if defined(PREFIX)
+QTDIR?=		${PREFIX}
+.else
+QTDIR?=		${X11BASE}
+.endif
+
 .include <bsd.port.mk>
diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index cc35f3b09fd4..8e402b4dccec 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -21,7 +21,15 @@ USE_QT=		yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--without-libjpeg --without-libgif \
-		--without-libgdbm --without-libuulib
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555"
+		--without-libgdbm --without-libuulib \
+		--with-qt-includes=${QTDIR}/include/X11/qt
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" \
+		QTDIR=${QTDIR}
+
+.if defined(PREFIX)
+QTDIR?=		${PREFIX}
+.else
+QTDIR?=		${X11BASE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/kdegames11/Makefile b/games/kdegames11/Makefile
index 1bd33c610ed9..3c2ca5e194bf 100644
--- a/games/kdegames11/Makefile
+++ b/games/kdegames11/Makefile
@@ -22,6 +22,16 @@ USE_BZIP2=	yes
 USE_QT=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555"
+CONFIGURE_ARGS=	"--with-qt-includes=${QTDIR}/include/X11/qt" \
+		"--with-extra-includes=${LOCALBASE}/include" \
+		"--with-extra-libs=${LOCALBASE}/lib"
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" \
+		QTDIR=${QTDIR}
+
+.if defined(PREFIX)
+QTDIR?=		${PREFIX}
+.else
+QTDIR?=		${X11BASE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/kdegraphics11/Makefile b/graphics/kdegraphics11/Makefile
index 4df609862a09..0be14747f720 100644
--- a/graphics/kdegraphics11/Makefile
+++ b/graphics/kdegraphics11/Makefile
@@ -20,10 +20,20 @@ LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-qt-includes=${QTDIR}/include/X11/qt" \
+		"--with-extra-includes=${LOCALBASE}/include" \
+		"--with-extra-libs=${LOCALBASE}/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		QTDIR=${QTDIR}
 CFLAGS+=	"-I${PREFIX}/include"
 USE_GMAKE=	yes
 
+.if defined(PREFIX)
+QTDIR?=		${PREFIX}
+.else
+QTDIR?=		${X11BASE}
+.endif
+
 .include <bsd.port.mk>
diff --git a/misc/kdeutils11/Makefile b/misc/kdeutils11/Makefile
index 956b1bb13870..e7c070ac6666 100644
--- a/misc/kdeutils11/Makefile
+++ b/misc/kdeutils11/Makefile
@@ -23,8 +23,16 @@ LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 USE_BZIP2=	yes
 USE_QT=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-extra-includes=$(PREFIX)/include
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555"
+CONFIGURE_ARGS=	--with-extra-includes=$(PREFIX)/include \
+		--with-qt-includes=${QTDIR}/include/X11/qt
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" \
+		QTDIR=${QTDIR}
 USE_GMAKE=	yes
 
+.if defined(PREFIX)
+QTDIR?=		${PREFIX}
+.else
+QTDIR?=		${X11BASE}
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index f263b560cd91..4e2ec6ab2580 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -29,8 +29,18 @@ LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
 USE_BZIP2=	yes
 USE_QT=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555"
+CONFIGURE_ARGS=	"--with-qt-includes=${QTDIR}/include/X11/qt" \
+		"--with-extra-includes=${LOCALBASE}/include" \
+		"--with-extra-libs=${LOCALBASE}/lib"
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" \
+		QTDIR=${QTDIR}
 USE_GMAKE=	yes
 CFLAGS+=	"-I${PREFIX}/include"
 
+.if defined(PREFIX)
+QTDIR?=		${PREFIX}
+.else
+QTDIR?=		${X11BASE}
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 9720f2fd4906..5ca75955bf44 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -28,13 +28,23 @@ USE_BZIP2=	yes
 USE_QT=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-xdmdir=${X11BASE}/lib/X11/xdm
+CONFIGURE_ARGS=	--with-qt-includes=${QTDIR}/include/X11/qt \
+		--with-extra-includes=${LOCALBASE}/include \
+		--with-extra-libs=${LOCALBASE}/lib \
+		--with-xdmdir=${X11BASE}/lib/X11/xdm
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555" PATH="${PATH}:${X11BASE}/bin" \
-		RUN_KAPPFINDER="no"
+		RUN_KAPPFINDER="no" \
+		QTDIR=${QTDIR}
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+.if defined(PREFIX)
+QTDIR?=		${PREFIX}
+.else
+QTDIR?=		${X11BASE}
+.endif
+
 pre-patch:
 	@${CP} ${FILESDIR}/ja.kimap ${WRKSRC}/kikbd/maps
 
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 670f93df94ae..51b02e013e5a 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -34,9 +34,17 @@ INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=
 CONFIGURE_ARGS=	--enable-shared --x-includes="$(X11BASE)/include" \
-		--x-libraries="$(X11BASE)/lib" --disable-static
+		--x-libraries="$(X11BASE)/lib" --disable-static \
+		--with-qt-includes=${QTDIR}/include/X11/qt
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		QTDIR=${QTDIR}
+
+.if defined(PREFIX)
+QTDIR?=		${PREFIX}
+.else
+QTDIR?=		${X11BASE}
+.endif
 
 # generate KDE style mtree
 MTREE_CMD=	${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree