- Update to qt 4.4.1

Note:
	With this update several ports specific problems
	have been fixed. Qt4 headers and libraries have
	been moved to include/qt4 and lib/qt4. bsd.qt.mk
	defines QT_INCDIR and QT_LIBDIR now, which could
	be used in qt4-dependent ports if required.

Thanks to:	Max Brazhnikov Danny Pansters

3 files changed, 15 insertions, 79 deletions

diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index 2bb8d432a1b4..0e7befad627b 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qvfb
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -29,18 +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/opengl' \
-	--exclude '${DISTNAME}/src/sql' --exclude '${DISTNAME}/src/plugins' \
-	--exclude '${DISTNAME}/src/3rdparty' --exclude '${DISTNAME}/src/xml' \
-	--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/designer' \
-	--exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
-	--exclude '${DISTNAME}/tools/qtconfig'
+
+DO_NOT_EXTRACT=	demos doc examples mkspecs qmake 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}/tools/${PORTNAME}
 CONFIGURE_WRKSRC=${WRKSRC}/../../
 
@@ -54,8 +53,4 @@ pre-configure:
 	${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc
 
-post-install:
-	${MKDIR} ${DATADIR}
-	${CP} -Rf ${WRKSRC}/*.skin ${WRKSRC}/pda* ${DATADIR}
-
 .include <bsd.port.mk>
diff --git a/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo
index 9451a68b5c02..0c630f09baf6 100644
--- a/devel/qt4-qvfb/distinfo
+++ b/devel/qt4-qvfb/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-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist
index 49b49c2c6ecb..a57af5d2626f 100644
--- a/devel/qt4-qvfb/pkg-plist
+++ b/devel/qt4-qvfb/pkg-plist
@@ -1,61 +1,2 @@
 bin/qvfb-qt4
 %%DEBUG%%bin/qvfb-qt4.debug
-share/qvfb/ClamshellPhone.skin/ClamshellPhone.skin
-share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
-share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png
-share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5.png
-share/qvfb/ClamshellPhone.skin/defaultbuttons.conf
-share/qvfb/DualScreenPhone.skin/DualScreen-pressed.png
-share/qvfb/DualScreenPhone.skin/DualScreen.png
-share/qvfb/DualScreenPhone.skin/DualScreenPhone.skin
-share/qvfb/DualScreenPhone.skin/defaultbuttons.conf
-share/qvfb/PDAPhone.skin/PDAPhone.skin
-share/qvfb/PDAPhone.skin/defaultbuttons.conf
-share/qvfb/PDAPhone.skin/finger.png
-share/qvfb/PDAPhone.skin/pda_down.png
-share/qvfb/PDAPhone.skin/pda_up.png
-share/qvfb/PortableMedia.skin/PortableMedia.skin
-share/qvfb/PortableMedia.skin/defaultbuttons.conf
-share/qvfb/PortableMedia.skin/portablemedia-pressed.png
-share/qvfb/PortableMedia.skin/portablemedia.png
-share/qvfb/PortableMedia.skin/portablemedia.xcf
-share/qvfb/SmartPhone.skin/SmartPhone-pressed.png
-share/qvfb/SmartPhone.skin/SmartPhone.png
-share/qvfb/SmartPhone.skin/SmartPhone.skin
-share/qvfb/SmartPhone.skin/defaultbuttons.conf
-share/qvfb/SmartPhone2.skin/SmartPhone2-pressed.png
-share/qvfb/SmartPhone2.skin/SmartPhone2.png
-share/qvfb/SmartPhone2.skin/SmartPhone2.skin
-share/qvfb/SmartPhone2.skin/defaultbuttons.conf
-share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png
-share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png
-share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin
-share/qvfb/SmartPhoneWithButtons.skin/defaultbuttons.conf
-share/qvfb/TouchscreenPhone.skin/TouchscreenPhone-pressed.png
-share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.png
-share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.skin
-share/qvfb/TouchscreenPhone.skin/defaultbuttons.conf
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-down.png
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.png
-share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.skin
-share/qvfb/Trolltech-Keypad.skin/defaultbuttons.conf
-share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png
-share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png
-share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin
-share/qvfb/Trolltech-Touchscreen.skin/defaultbuttons.conf
-share/qvfb/pda.qrc
-share/qvfb/pda.skin
-share/qvfb/pda_down.png
-share/qvfb/pda_up.png
-@dirrm share/qvfb/Trolltech-Touchscreen.skin
-@dirrm share/qvfb/Trolltech-Keypad.skin
-@dirrm share/qvfb/TouchscreenPhone.skin
-@dirrm share/qvfb/SmartPhoneWithButtons.skin
-@dirrm share/qvfb/SmartPhone2.skin
-@dirrm share/qvfb/SmartPhone.skin
-@dirrm share/qvfb/PortableMedia.skin
-@dirrm share/qvfb/PDAPhone.skin
-@dirrm share/qvfb/DualScreenPhone.skin
-@dirrm share/qvfb/ClamshellPhone.skin
-@dirrm share/qvfb