5 files changed, 65 insertions, 70 deletions

diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index 9923e0697621..bf080ba6cd91 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	inputmethods
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=0
 CATEGORIES?=	x11
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -29,17 +29,17 @@ 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/network' --exclude '${DISTNAME}/src/xml' \
-	--exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \
-	--exclude '${DISTNAME}/src/sql' \
-	--exclude '${DISTNAME}/src/tools/moc' --exclude '${DISTNAME}/src/tools/uic' \
-	--exclude '${DISTNAME}/src/tools/rcc' --exclude '${DISTNAME}/src/tools/uic3' \
-	--exclude '${DISTNAME}/tools/assistant' \
-	--exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
-	--exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb'
+
+DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
+		src/dbus src/network 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}/src/plugins/${PORTNAME}
 CONFIGURE_WRKSRC=${WRKSRC}/../../..
 
diff --git a/x11/qt4-inputmethods/distinfo b/x11/qt4-inputmethods/distinfo
index 9451a68b5c02..0c630f09baf6 100644
--- a/x11/qt4-inputmethods/distinfo
+++ b/x11/qt4-inputmethods/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/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 78d56ee2f85c..84e331eacf00 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
+PORTREVISION=0
 CATEGORIES?=	x11
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -24,46 +24,39 @@ QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GL=		glu
-USE_XORG=	x11
+USE_LDCONFIG=	${PREFIX}/lib/qt4
+USE_GL=		yes
+USE_XLIB=	yes
 
 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/network' \
-	--exclude '${DISTNAME}/src/xml' --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/assistant' \
-	--exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
-	--exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb'
+
+DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
+		src/dbus src/network 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}/src/${PORTNAME}
 CONFIGURE_WRKSRC=${WRKSRC}/../../
 
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
-	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
-		-e 's|flat_headers.path.*|flat_headers.path=${PREFIX}/include/Qt|g' \
-		-e 's|targ_headers.path.*|targ_headers.path=${PREFIX}/include/$$$$TARGET|g' \
-		${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/../qt_install.pri
 	${MKDIR} ${WRKSRC}/../../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
 
 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' \
-			-E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \
-		${WRKSRC}/../../lib/pkgconfig/*Qt*
+		${WRKSRC}/../../lib/pkgconfig/QtOpenGL.pc
 
 .include <bsd.port.mk>
diff --git a/x11/qt4-opengl/distinfo b/x11/qt4-opengl/distinfo
index 9451a68b5c02..0c630f09baf6 100644
--- a/x11/qt4-opengl/distinfo
+++ b/x11/qt4-opengl/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/x11/qt4-opengl/pkg-plist b/x11/qt4-opengl/pkg-plist
index cf8b3a55dfc7..74667e264349 100644
--- a/x11/qt4-opengl/pkg-plist
+++ b/x11/qt4-opengl/pkg-plist
@@ -1,29 +1,31 @@
-include/Qt/QtOpenGL
-include/Qt/qgl.h
-include/Qt/qglcolormap.h
-include/Qt/qglframebufferobject.h
-include/Qt/qglpixelbuffer.h
-include/QtOpenGL/QGLColormap
-include/QtOpenGL/QGLContext
-include/QtOpenGL/QGLFormat
-include/QtOpenGL/QGLFramebufferObject
-include/QtOpenGL/QMacGLCompatTypes
-include/QtOpenGL/QMacCompatGLint
-include/QtOpenGL/QMacCompatGLuint
-include/QtOpenGL/QMacCompatGLenum
-include/QtOpenGL/QGLPixelBuffer
-include/QtOpenGL/QGLWidget
-include/QtOpenGL/QtOpenGL
-include/QtOpenGL/qgl.h
-include/QtOpenGL/qglcolormap.h
-include/QtOpenGL/qglframebufferobject.h
-include/QtOpenGL/qglpixelbuffer.h
-lib/libQtOpenGL.la
-lib/libQtOpenGL.prl
-lib/libQtOpenGL.so
-lib/libQtOpenGL.so.4
-lib/libQtOpenGL.so.4.3
-lib/libQtOpenGL.so.4.3.4
-%%DEBUG%%lib/libQtOpenGL.so.4.3.4.debug
+include/qt4/Qt/QtOpenGL
+include/qt4/Qt/qgl.h
+include/qt4/Qt/qglcolormap.h
+include/qt4/Qt/qglframebufferobject.h
+include/qt4/Qt/qglpixelbuffer.h
+include/qt4/QtOpenGL/QGLColormap
+include/qt4/QtOpenGL/QGLContext
+include/qt4/QtOpenGL/QGLFormat
+include/qt4/QtOpenGL/QGLFramebufferObject
+include/qt4/QtOpenGL/QGLPixelBuffer
+include/qt4/QtOpenGL/QGLWidget
+include/qt4/QtOpenGL/QMacCompatGLenum
+include/qt4/QtOpenGL/QMacCompatGLint
+include/qt4/QtOpenGL/QMacCompatGLuint
+include/qt4/QtOpenGL/QMacGLCompatTypes
+include/qt4/QtOpenGL/QtOpenGL
+include/qt4/QtOpenGL/qgl.h
+include/qt4/QtOpenGL/qglcolormap.h
+include/qt4/QtOpenGL/qglframebufferobject.h
+include/qt4/QtOpenGL/qglpixelbuffer.h
+lib/qt4/libQtOpenGL.la
+lib/qt4/libQtOpenGL.prl
+lib/qt4/libQtOpenGL.so
+lib/qt4/libQtOpenGL.so.4
+lib/qt4/libQtOpenGL.so.4.4
+lib/qt4/libQtOpenGL.so.4.4.1
+%%DEBUG%%lib/qt4/libQtOpenGL.so.4.4.1.debug
 libdata/pkgconfig/QtOpenGL.pc
-@dirrm include/QtOpenGL
+@dirrm include/qt4/QtOpenGL
+@dirrmtry include/qt4/Qt
+@dirrmtry include/qt4