- 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, 24 insertions, 24 deletions

diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index 122739a91e74..cc1bb506cbd2 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	iconengines
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=0
 CATEGORIES?=	graphics
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -22,31 +22,31 @@ USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build corelib gui svg xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
-		
+
 HAS_CONFIGURE=	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/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'
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}
-CONFIGURE_WRKSRC=${WRKSRC}/../../..
+
+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/testlib \
+		src/tools 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/iconengines/svgiconengine
+CONFIGURE_WRKSRC=${WRKSRC}/../../../..
 
 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
+	${MKDIR} ${WRKSRC}/../../../../mkspecs
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc
 
 .include <bsd.port.mk>
diff --git a/graphics/qt4-iconengines/distinfo b/graphics/qt4-iconengines/distinfo
index 9451a68b5c02..0c630f09baf6 100644
--- a/graphics/qt4-iconengines/distinfo
+++ b/graphics/qt4-iconengines/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/graphics/qt4-iconengines/pkg-plist b/graphics/qt4-iconengines/pkg-plist
index 926993c972f8..e3eafa6f386f 100644
--- a/graphics/qt4-iconengines/pkg-plist
+++ b/graphics/qt4-iconengines/pkg-plist
@@ -1,3 +1,3 @@
-lib/qt4/plugins/iconengines/libqsvg.so
-%%DEBUG%%lib/qt4/plugins/iconengines/libqsvg.so.debug
-@dirrm lib/qt4/plugins/iconengines
+lib/qt4/plugins/iconengines/libqsvgicon.so
+%%DEBUG%%lib/qt4/plugins/iconengines/libqsvgicon.so.debug
+@dirrmtry lib/qt4/plugins/iconengines