The FreeBSD KDE team is pleased to announce Qt-4.6.1 for FreeBSD.

15 files changed, 56 insertions, 62 deletions

diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile
index d5a27f01b542..370e4df3da3c 100644
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@@ -9,9 +9,6 @@
 PORTNAME=	qt4-${DB}-plugin
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_QT}
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt IBase/Firebird database plugin
@@ -22,8 +19,8 @@ USE_FIREBIRD=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
-MD5_FILE=	${PORTSDIR}/devel/qt4/distinfo
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
diff --git a/databases/qt4-ibase-plugin/pkg-plist b/databases/qt4-ibase-plugin/pkg-plist
index 0a1084fe0ef5..d0c1a75ae12d 100644
--- a/databases/qt4-ibase-plugin/pkg-plist
+++ b/databases/qt4-ibase-plugin/pkg-plist
@@ -1,2 +1,3 @@
-lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrmtry lib/qt4/plugins/sqldrivers
+%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR_REL%%
diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile
index 7bafc4a92756..1003a7886474 100644
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@@ -9,9 +9,6 @@
 PORTNAME=	qt4-${DB}-plugin
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_QT}
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt MySQL database plugin
@@ -21,8 +18,8 @@ DB=		mysql
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
-MD5_FILE=	${PORTSDIR}/devel/qt4/distinfo
 
 USE_MYSQL=	yes
 DRIVER=		src/sql/drivers/${DB}
diff --git a/databases/qt4-mysql-plugin/pkg-plist b/databases/qt4-mysql-plugin/pkg-plist
index 0a1084fe0ef5..d0c1a75ae12d 100644
--- a/databases/qt4-mysql-plugin/pkg-plist
+++ b/databases/qt4-mysql-plugin/pkg-plist
@@ -1,2 +1,3 @@
-lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrmtry lib/qt4/plugins/sqldrivers
+%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR_REL%%
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index a8cb627ba918..fef28c8cda3b 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -9,22 +9,19 @@
 PORTNAME=	qt4-${DB}-plugin
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_QT}
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt ODBC database plugin
 
 DB=		odbc
 
-LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
 
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
-MD5_FILE=	${PORTSDIR}/devel/qt4/distinfo
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
diff --git a/databases/qt4-odbc-plugin/pkg-plist b/databases/qt4-odbc-plugin/pkg-plist
index 0a1084fe0ef5..d0c1a75ae12d 100644
--- a/databases/qt4-odbc-plugin/pkg-plist
+++ b/databases/qt4-odbc-plugin/pkg-plist
@@ -1,2 +1,3 @@
-lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrmtry lib/qt4/plugins/sqldrivers
+%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR_REL%%
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index a0136b6ce952..be1acceef7d6 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -9,9 +9,6 @@
 PORTNAME=	qt4-${DB}-plugin
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_QT}
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt PostgreSQL database plugin
@@ -21,8 +18,8 @@ DB=		psql
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
-MD5_FILE=	${PORTSDIR}/devel/qt4/distinfo
 
 USE_PGSQL=	yes
 DRIVER=		src/sql/drivers/${DB}
diff --git a/databases/qt4-pgsql-plugin/pkg-plist b/databases/qt4-pgsql-plugin/pkg-plist
index 0a1084fe0ef5..d0c1a75ae12d 100644
--- a/databases/qt4-pgsql-plugin/pkg-plist
+++ b/databases/qt4-pgsql-plugin/pkg-plist
@@ -1,2 +1,3 @@
-lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrmtry lib/qt4/plugins/sqldrivers
+%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR_REL%%
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index f16da4ea5549..23336e26b79d 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	sql
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	0
 CATEGORIES?=	databases
 PKGNAMEPREFIX=	qt4-
 
@@ -19,7 +18,7 @@ USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build corelib
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
-MAKE_JOBS_SAFE= yes
+MAKE_JOBS_SAFE=	yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4
@@ -30,29 +29,34 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 
 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
+		src/activeqt src/dbus src/gui src/multimedia src/network \
+		src/opengl src/openvg src/phonon src/qt3support \
+		src/s60installs src/s60main src/script src/scripttools src/svg \
+		src/testlib src/tools src/winmain src/xml src/xmlpatterns \
+		src/3rdparty/clucene src/3rdparty/freetype \
+		src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \
+		src/3rdparty/libtiff src/3rdparty/phonon 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}/../../
+BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
 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
+
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		-e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
+		-e 's|.*$$(QMAKE).*||g' ${BUILD_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/QtSql.pc
+		${WRKSRC}/lib/pkgconfig/QtSql.pc
 
 .include <bsd.port.mk>
diff --git a/databases/qt4-sql/pkg-descr b/databases/qt4-sql/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/databases/qt4-sql/pkg-descr
+++ b/databases/qt4-sql/pkg-descr
@@ -9,4 +9,4 @@ the application programmer with a single, common API for all operating systems.
 The native C APIs are encapsulated in a set of well-designed, fully
 object-oriented C++ classes. 
 
-WWW: http://www.trolltech.com/products/qt/index.html
+WWW: http://qt.nokia.com/products/qt/index.html
diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist
index dd0cd29bcd9c..6c77bc64fd9a 100644
--- a/databases/qt4-sql/pkg-plist
+++ b/databases/qt4-sql/pkg-plist
@@ -1,14 +1,14 @@
 include/qt4/Qt/QtSql
 include/qt4/Qt/qsql.h
 include/qt4/Qt/qsql_db2.h
-include/qt4/Qt/qsql_oci.h
-include/qt4/Qt/qsql_tds.h
 include/qt4/Qt/qsql_ibase.h
 include/qt4/Qt/qsql_mysql.h
+include/qt4/Qt/qsql_oci.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/qsql_tds.h
 include/qt4/Qt/qsqldatabase.h
 include/qt4/Qt/qsqldriver.h
 include/qt4/Qt/qsqldriverplugin.h
@@ -22,10 +22,14 @@ include/qt4/Qt/qsqlrelationaldelegate.h
 include/qt4/Qt/qsqlrelationaltablemodel.h
 include/qt4/Qt/qsqlresult.h
 include/qt4/Qt/qsqltablemodel.h
+include/qt4/QtSql/QDB2Driver
+include/qt4/QtSql/QDB2Result
 include/qt4/QtSql/QIBaseDriver
 include/qt4/QtSql/QIBaseResult
 include/qt4/QtSql/QMYSQLDriver
 include/qt4/QtSql/QMYSQLResult
+include/qt4/QtSql/QOCIDriver
+include/qt4/QtSql/QOCIResult
 include/qt4/QtSql/QODBCDriver
 include/qt4/QtSql/QODBCResult
 include/qt4/QtSql/QPSQLDriver
@@ -51,23 +55,19 @@ include/qt4/QtSql/QSqlRelationalDelegate
 include/qt4/QtSql/QSqlRelationalTableModel
 include/qt4/QtSql/QSqlResult
 include/qt4/QtSql/QSqlTableModel
+include/qt4/QtSql/QTDSDriver
+include/qt4/QtSql/QTDSResult
 include/qt4/QtSql/QtSql
 include/qt4/QtSql/qsql.h
+include/qt4/QtSql/qsql_db2.h
 include/qt4/QtSql/qsql_ibase.h
 include/qt4/QtSql/qsql_mysql.h
-include/qt4/QtSql/qsql_db2.h
 include/qt4/QtSql/qsql_oci.h
-include/qt4/QtSql/qsql_tds.h
-include/qt4/QtSql/QDB2Result
-include/qt4/QtSql/QDB2Driver
-include/qt4/QtSql/QOCIResult
-include/qt4/QtSql/QOCIDriver
-include/qt4/QtSql/QTDSResult
-include/qt4/QtSql/QTDSDriver
 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/qsql_tds.h
 include/qt4/QtSql/qsqldatabase.h
 include/qt4/QtSql/qsqldriver.h
 include/qt4/QtSql/qsqldriverplugin.h
@@ -89,6 +89,7 @@ lib/qt4/libQtSql.so.%%SHLIB_SHVER%%
 lib/qt4/libQtSql.so.%%SHLIB_VER%%
 %%DEBUG%%lib/qt4/libQtSql.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtSql.pc
+@dirrmtry lib/qt4
 @dirrm include/qt4/QtSql
 @dirrmtry include/qt4/Qt
 @dirrmtry include/qt4
diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile
index 3b02cb98dbdd..78beca184c98 100644
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@@ -9,9 +9,6 @@
 PORTNAME=	qt4-${DB}-plugin
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_QT}
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SQLite 2.x database plugin
@@ -21,10 +18,10 @@ DB=		sqlite2
 LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
 
 USE_QT_VER=	4
-QT_COMPONENTS=  moc_build sql
+QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
-MD5_FILE=	${PORTSDIR}/devel/qt4/distinfo
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
diff --git a/databases/qt4-sqlite-plugin/pkg-plist b/databases/qt4-sqlite-plugin/pkg-plist
index e6aacc20fb20..8a857e2e4422 100644
--- a/databases/qt4-sqlite-plugin/pkg-plist
+++ b/databases/qt4-sqlite-plugin/pkg-plist
@@ -1,2 +1,3 @@
-lib/qt4/plugins/sqldrivers/libq%%DB%%.so
-@dirrmtry lib/qt4/plugins/sqldrivers
+%%QT_PLUGINDIR_REL%%/sqldrivers/libq%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR_REL%%
diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile
index 6b97509e3893..9f7dff7d2d64 100644
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@@ -9,9 +9,6 @@
 PORTNAME=	qt4-${DB}-plugin
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_QT}
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SQLite 3.x database plugin
@@ -24,6 +21,7 @@ LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
 
 DRIVER=		src/sql/drivers/${DB}
diff --git a/databases/qt4-sqlite3-plugin/pkg-plist b/databases/qt4-sqlite3-plugin/pkg-plist
index e6aacc20fb20..8a857e2e4422 100644
--- a/databases/qt4-sqlite3-plugin/pkg-plist
+++ b/databases/qt4-sqlite3-plugin/pkg-plist
@@ -1,2 +1,3 @@
-lib/qt4/plugins/sqldrivers/libq%%DB%%.so
-@dirrmtry lib/qt4/plugins/sqldrivers
+%%QT_PLUGINDIR_REL%%/sqldrivers/libq%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR_REL%%