3 files changed, 21 insertions, 17 deletions

diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile
index 5434bdec1aab..ce0f55d9d9f3 100644
--- a/devel/qt4-help/Makefile
+++ b/devel/qt4-help/Makefile
@@ -14,13 +14,12 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QtHelp module provides QHelpEngine API and is used by Assistant
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build corelib clucene gui sql xml network
+QT_COMPONENTS=	qmake_build moc_build rcc_build corelib clucene \
+		gui sql sql-sqlite3_run xml network
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
 
-RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin
-
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4
 
@@ -30,33 +29,37 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
-		src/dbus src/opengl src/phonon \
-		src/qt3support src/script src/svg src/testlib \
-		src/tools src/xmlpatterns src/3rdparty/clucene \
-		src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit
+		src/activeqt src/dbus src/multimedia src/opengl src/openvg \
+		src/phonon src/qt3support src/s60installs src/s60main \
+		src/script src/scripttools src/svg src/testlib src/tools \
+		src/winmain src/xmlpatterns src/3rdparty/clucene \
+		src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \
+		src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \
+		src/3rdparty/webkit
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 .for dne in ${DO_NOT_EXTRACT}
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/tools/assistant/lib
-CONFIGURE_WRKSRC=${WRKSRC}/../../../
+BUILD_WRKSRC=	${WRKSRC}/tools/assistant/lib
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
 pre-configure:
-	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
-	${MKDIR} ${WRKSRC}/../../../mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc
-	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../bin/rcc
+	${MKDIR} ${WRKSRC}/mkspecs
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
+	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
 
 post-configure:
 	${REINPLACE_CMD} \
 		-e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		-e 's|.*$$(QMAKE).*||g' \
-		${WRKSRC}/Makefile
+		${BUILD_WRKSRC}/Makefile
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
 			-E -e 's|(.*location=).*rcc|\1${PREFIX}/bin/rcc|g' \
-		${WRKSRC}/../../../lib/pkgconfig/QtHelp.pc
+		${WRKSRC}/lib/pkgconfig/QtHelp.pc
 
 .include <bsd.port.mk>
diff --git a/devel/qt4-help/pkg-descr b/devel/qt4-help/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/devel/qt4-help/pkg-descr
+++ b/devel/qt4-help/pkg-descr
@@ -9,4 +9,4 @@ the application programmer with a single, common API for all operating systems.
 The native C APIs are encapsulated in a set of well-designed, fully
 object-oriented C++ classes. 
 
-WWW: http://www.trolltech.com/products/qt/index.html
+WWW: http://qt.nokia.com/products/qt/index.html
diff --git a/devel/qt4-help/pkg-plist b/devel/qt4-help/pkg-plist
index 99d0afd3e555..b5e9bef36ef3 100644
--- a/devel/qt4-help/pkg-plist
+++ b/devel/qt4-help/pkg-plist
@@ -36,6 +36,7 @@ lib/qt4/libQtHelp.so.%%SHLIB_SHVER%%
 lib/qt4/libQtHelp.so.%%SHLIB_VER%%
 %%DEBUG%%lib/qt4/libQtHelp.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtHelp.pc
+@dirrmtry lib/qt4
 @dirrm include/qt4/QtHelp
 @dirrmtry include/qt4/Qt
 @dirrmtry include/qt4