3 files changed, 34 insertions, 37 deletions
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 20ad04bb88ad..53956275d204 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libQtAssistantClient
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -19,7 +19,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt documentation browser integration library
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build corelib gui network
+QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui network
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
@@ -30,36 +30,33 @@ ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
-	--exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \
-	--exclude '${DISTNAME}/demos' --exclude '${DISTNAME}/examples' \
-	--exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \
-	--exclude '${DISTNAME}/src/sql' --exclude '${DISTNAME}/src/plugins' \
-	--exclude '${DISTNAME}/src/3rdparty' \
-	--exclude '${DISTNAME}/src/tools/moc' --exclude '${DISTNAME}/src/tools/rcc' \
-	--exclude '${DISTNAME}/src/tools/uic' --exclude '${DISTNAME}/src/tools/uic3' \
-	--exclude '${DISTNAME}/tools/designer' \
-	--exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
-	--exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb'
-WRKSRC=		${WRKDIR}/${DISTNAME}/tools/assistant/lib
-CONFIGURE_WRKSRC=${WRKSRC}/../../../
+DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
+		src/dbus src/opengl src/phonon \
+		src/qt3support src/script src/sql src/svg src/testlib \
+		src/tools src/xml src/xmlpatterns src/3rdparty/clucene \
+		src/3rdparty/kdebase src/3rdparty/kdelibs 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/compat/lib
+CONFIGURE_WRKSRC=${WRKSRC}/../../../../
 
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
-	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
-		${WRKSRC}/lib.pro
 	${REINPLACE_CMD} -E -e 's|"(.*)assistant"|"\1assistant-qt4"|g' \
 		${WRKSRC}/qassistantclient.cpp
-	${MKDIR} ${WRKSRC}/../../../mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc
+	${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/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 			-e 's|.*$$(QMAKE).*||g' ${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=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
-		${WRKSRC}/../../../lib/pkgconfig/*Qt*
+		${WRKSRC}/../../../../lib/pkgconfig/QtAssistantClient.pc
 
 .include <bsd.port.mk>
diff --git a/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo
index 9451a68b5c02..0c630f09baf6 100644
--- a/devel/qt4-libqtassistantclient/distinfo
+++ b/devel/qt4-libqtassistantclient/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93
-SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2
-SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710
+MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
+SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
+SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist
index 03f77e2e4e9d..be0fb7f73230 100644
--- a/devel/qt4-libqtassistantclient/pkg-plist
+++ b/devel/qt4-libqtassistantclient/pkg-plist
@@ -1,12 +1,12 @@
-include/QtAssistant/QAssistantClient
-include/QtAssistant/QtAssistant
-include/QtAssistant/qassistantclient.h
-include/QtAssistant/qassistantclient_global.h
-lib/libQtAssistantClient.prl
-lib/libQtAssistantClient.so
-lib/libQtAssistantClient.so.4
-lib/libQtAssistantClient.so.4.3
-lib/libQtAssistantClient.so.4.3.4
-%%DEBUG%%lib/libQtAssistantClient.so.4.3.4.debug
+include/qt4/QtAssistant/QAssistantClient
+include/qt4/QtAssistant/QtAssistant
+include/qt4/QtAssistant/qassistantclient.h
+include/qt4/QtAssistant/qassistantclient_global.h
+lib/qt4/libQtAssistantClient.prl
+lib/qt4/libQtAssistantClient.so
+lib/qt4/libQtAssistantClient.so.4
+lib/qt4/libQtAssistantClient.so.4.4
+lib/qt4/libQtAssistantClient.so.4.4.1
+%%DEBUG%%lib/qt4/libQtAssistantClient.so.4.4.1.debug
 libdata/pkgconfig/QtAssistantClient.pc
-@dirrm include/QtAssistant
+@dirrm include/qt4/QtAssistant