- 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, 99 insertions, 103 deletions

diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index af800eee17bf..fe9c32bb47aa 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sql
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -24,43 +24,37 @@ QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/lib/qt4
 
 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/gui' --exclude '${DISTNAME}/src/network' \
-	--exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \
-	--exclude '${DISTNAME}/src/xml' --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/designer' \
-	--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/gui src/network src/opengl src/phonon \
+		src/qt3support src/script 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/QtSql.pc
 
 .include <bsd.port.mk>
diff --git a/databases/qt4-sql/distinfo b/databases/qt4-sql/distinfo
index 9451a68b5c02..0c630f09baf6 100644
--- a/databases/qt4-sql/distinfo
+++ b/databases/qt4-sql/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/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist
index 54c496b96932..39fce8fa8c93 100644
--- a/databases/qt4-sql/pkg-plist
+++ b/databases/qt4-sql/pkg-plist
@@ -1,80 +1,82 @@
-include/Qt/QtSql
-include/Qt/qsql.h
-include/Qt/qsql_ibase.h
-include/Qt/qsql_mysql.h
-include/Qt/qsql_odbc.h
-include/Qt/qsql_psql.h
-include/Qt/qsql_sqlite.h
-include/Qt/qsql_sqlite2.h
-include/Qt/qsqldatabase.h
-include/Qt/qsqldriver.h
-include/Qt/qsqldriverplugin.h
-include/Qt/qsqlerror.h
-include/Qt/qsqlfield.h
-include/Qt/qsqlindex.h
-include/Qt/qsqlquery.h
-include/Qt/qsqlquerymodel.h
-include/Qt/qsqlrecord.h
-include/Qt/qsqlrelationaldelegate.h
-include/Qt/qsqlrelationaltablemodel.h
-include/Qt/qsqlresult.h
-include/Qt/qsqltablemodel.h
-include/QtSql/QIBaseDriver
-include/QtSql/QIBaseResult
-include/QtSql/QMYSQLDriver
-include/QtSql/QMYSQLResult
-include/QtSql/QODBCDriver
-include/QtSql/QODBCResult
-include/QtSql/QPSQLDriver
-include/QtSql/QPSQLResult
-include/QtSql/QSQLite2Driver
-include/QtSql/QSQLite2Result
-include/QtSql/QSQLiteDriver
-include/QtSql/QSQLiteResult
-include/QtSql/QSqlDatabase
-include/QtSql/QSqlDriver
-include/QtSql/QSqlDriverCreator
-include/QtSql/QSqlDriverCreatorBase
-include/QtSql/QSqlDriverFactoryInterface
-include/QtSql/QSqlDriverPlugin
-include/QtSql/QSqlError
-include/QtSql/QSqlField
-include/QtSql/QSqlIndex
-include/QtSql/QSqlQuery
-include/QtSql/QSqlQueryModel
-include/QtSql/QSqlRecord
-include/QtSql/QSqlRelation
-include/QtSql/QSqlRelationalDelegate
-include/QtSql/QSqlRelationalTableModel
-include/QtSql/QSqlResult
-include/QtSql/QSqlTableModel
-include/QtSql/QtSql
-include/QtSql/qsql.h
-include/QtSql/qsql_ibase.h
-include/QtSql/qsql_mysql.h
-include/QtSql/qsql_odbc.h
-include/QtSql/qsql_psql.h
-include/QtSql/qsql_sqlite.h
-include/QtSql/qsql_sqlite2.h
-include/QtSql/qsqldatabase.h
-include/QtSql/qsqldriver.h
-include/QtSql/qsqldriverplugin.h
-include/QtSql/qsqlerror.h
-include/QtSql/qsqlfield.h
-include/QtSql/qsqlindex.h
-include/QtSql/qsqlquery.h
-include/QtSql/qsqlquerymodel.h
-include/QtSql/qsqlrecord.h
-include/QtSql/qsqlrelationaldelegate.h
-include/QtSql/qsqlrelationaltablemodel.h
-include/QtSql/qsqlresult.h
-include/QtSql/qsqltablemodel.h
-lib/libQtSql.la
-lib/libQtSql.prl
-lib/libQtSql.so
-lib/libQtSql.so.4
-lib/libQtSql.so.4.3
-lib/libQtSql.so.4.3.4
-%%DEBUG%%lib/libQtSql.so.4.3.4.debug
+include/qt4/Qt/QtSql
+include/qt4/Qt/qsql.h
+include/qt4/Qt/qsql_ibase.h
+include/qt4/Qt/qsql_mysql.h
+include/qt4/Qt/qsql_odbc.h
+include/qt4/Qt/qsql_psql.h
+include/qt4/Qt/qsql_sqlite.h
+include/qt4/Qt/qsql_sqlite2.h
+include/qt4/Qt/qsqldatabase.h
+include/qt4/Qt/qsqldriver.h
+include/qt4/Qt/qsqldriverplugin.h
+include/qt4/Qt/qsqlerror.h
+include/qt4/Qt/qsqlfield.h
+include/qt4/Qt/qsqlindex.h
+include/qt4/Qt/qsqlquery.h
+include/qt4/Qt/qsqlquerymodel.h
+include/qt4/Qt/qsqlrecord.h
+include/qt4/Qt/qsqlrelationaldelegate.h
+include/qt4/Qt/qsqlrelationaltablemodel.h
+include/qt4/Qt/qsqlresult.h
+include/qt4/Qt/qsqltablemodel.h
+include/qt4/QtSql/QIBaseDriver
+include/qt4/QtSql/QIBaseResult
+include/qt4/QtSql/QMYSQLDriver
+include/qt4/QtSql/QMYSQLResult
+include/qt4/QtSql/QODBCDriver
+include/qt4/QtSql/QODBCResult
+include/qt4/QtSql/QPSQLDriver
+include/qt4/QtSql/QPSQLResult
+include/qt4/QtSql/QSQLite2Driver
+include/qt4/QtSql/QSQLite2Result
+include/qt4/QtSql/QSQLiteDriver
+include/qt4/QtSql/QSQLiteResult
+include/qt4/QtSql/QSqlDatabase
+include/qt4/QtSql/QSqlDriver
+include/qt4/QtSql/QSqlDriverCreator
+include/qt4/QtSql/QSqlDriverCreatorBase
+include/qt4/QtSql/QSqlDriverFactoryInterface
+include/qt4/QtSql/QSqlDriverPlugin
+include/qt4/QtSql/QSqlError
+include/qt4/QtSql/QSqlField
+include/qt4/QtSql/QSqlIndex
+include/qt4/QtSql/QSqlQuery
+include/qt4/QtSql/QSqlQueryModel
+include/qt4/QtSql/QSqlRecord
+include/qt4/QtSql/QSqlRelation
+include/qt4/QtSql/QSqlRelationalDelegate
+include/qt4/QtSql/QSqlRelationalTableModel
+include/qt4/QtSql/QSqlResult
+include/qt4/QtSql/QSqlTableModel
+include/qt4/QtSql/QtSql
+include/qt4/QtSql/qsql.h
+include/qt4/QtSql/qsql_ibase.h
+include/qt4/QtSql/qsql_mysql.h
+include/qt4/QtSql/qsql_odbc.h
+include/qt4/QtSql/qsql_psql.h
+include/qt4/QtSql/qsql_sqlite.h
+include/qt4/QtSql/qsql_sqlite2.h
+include/qt4/QtSql/qsqldatabase.h
+include/qt4/QtSql/qsqldriver.h
+include/qt4/QtSql/qsqldriverplugin.h
+include/qt4/QtSql/qsqlerror.h
+include/qt4/QtSql/qsqlfield.h
+include/qt4/QtSql/qsqlindex.h
+include/qt4/QtSql/qsqlquery.h
+include/qt4/QtSql/qsqlquerymodel.h
+include/qt4/QtSql/qsqlrecord.h
+include/qt4/QtSql/qsqlrelationaldelegate.h
+include/qt4/QtSql/qsqlrelationaltablemodel.h
+include/qt4/QtSql/qsqlresult.h
+include/qt4/QtSql/qsqltablemodel.h
+lib/qt4/libQtSql.la
+lib/qt4/libQtSql.prl
+lib/qt4/libQtSql.so
+lib/qt4/libQtSql.so.4
+lib/qt4/libQtSql.so.4.4
+lib/qt4/libQtSql.so.4.4.1
+%%DEBUG%%lib/qt4/libQtSql.so.4.4.1.debug
 libdata/pkgconfig/QtSql.pc
-@dirrm include/QtSql
+@dirrm include/qt4/QtSql
+@dirrmtry include/qt4/Qt
+@dirrmtry include/qt4