22 files changed, 87 insertions, 72 deletions

diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile
index d19f3495a5d2..269f3f2786cc 100644
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@@ -22,6 +22,7 @@ USE_FIREBIRD=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+MAKE_JOBS_SAFE=	yes
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
@@ -33,7 +34,9 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		QT_INCDIR="${QT_INCDIR}" \
+		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 .include <bsd.port.mk>
diff --git a/databases/qt4-ibase-plugin/distinfo b/databases/qt4-ibase-plugin/distinfo
index 1756af8b04d9..27b0949354e8 100644
--- a/databases/qt4-ibase-plugin/distinfo
+++ b/databases/qt4-ibase-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
-SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
-SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
+MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
+SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/databases/qt4-ibase-plugin/files/Makefile.bsd b/databases/qt4-ibase-plugin/files/Makefile.bsd
index 386176f80cd8..4b914de42cf9 100644
--- a/databases/qt4-ibase-plugin/files/Makefile.bsd
+++ b/databases/qt4-ibase-plugin/files/Makefile.bsd
@@ -2,14 +2,15 @@ SHLIB_NAME=	libqsql${DB}.so
 
 VPATH=		${PLUGIN}:${DRIVER}
 CXXFLAGS+=	-I${DRIVER} -Iinclude \
-		-I${PREFIX}/include/qt4 \
-		-I${PREFIX}/include/qt4/Qt \
+		-I${QT_INCDIR} \
+		-I${QT_INCDIR}/Qt \
+		-I${QT_INCDIR}/QtCore \
 		-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
 		-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
 		-D_LARGEFILE_SOURCE -DQT_SHARED
 MOC?=		${LOCALBASE}/bin/moc-qt4
-LDADD=		-L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lgds
+LDADD=		-L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lgds
 SRCS=		main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
 
 LIBDIR=		${PREFIX}/lib/qt4/plugins/sqldrivers
diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile
index 786e5919713b..3ed443b2d405 100644
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@@ -21,6 +21,7 @@ DB=		mysql
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+MAKE_JOBS_SAFE=	yes
 
 USE_MYSQL=	yes
 DRIVER=		src/sql/drivers/${DB}
@@ -32,7 +33,9 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		QT_INCDIR="${QT_INCDIR}" \
+		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 .include <bsd.port.mk>
diff --git a/databases/qt4-mysql-plugin/distinfo b/databases/qt4-mysql-plugin/distinfo
index 1756af8b04d9..27b0949354e8 100644
--- a/databases/qt4-mysql-plugin/distinfo
+++ b/databases/qt4-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
-SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
-SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
+MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
+SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/databases/qt4-mysql-plugin/files/Makefile.bsd b/databases/qt4-mysql-plugin/files/Makefile.bsd
index eb565d0992f9..09c2a81bab7b 100644
--- a/databases/qt4-mysql-plugin/files/Makefile.bsd
+++ b/databases/qt4-mysql-plugin/files/Makefile.bsd
@@ -2,15 +2,15 @@ SHLIB_NAME=	libqsql${DB}.so
 
 VPATH=		${PLUGIN}:${DRIVER}
 CXXFLAGS+=	-I${DRIVER} \
-		-I${PREFIX}/include/qt4 \
-		-I${PREFIX}/include/qt4/Qt \
+		-I${QT_INCDIR} \
+		-I${QT_INCDIR}/Qt \
 		-I${LOCALBASE}/include/mysql \
 		-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_PLUGIN \
 		-DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED
-LDADD=		-L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient_r 
+LDADD=		-L${QT_LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient_r 
 MOC?=		${LOCALBASE}/bin/moc-qt4
-SRCS=		main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
+SRCS=		main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp qsql_${DB}.moc
 
 LIBDIR=		${PREFIX}/lib/qt4/plugins/sqldrivers
 
@@ -20,6 +20,9 @@ ${LIBDIR}:
 moc_qsql_${DB}.cpp: qsql_${DB}.h
 	$(MOC) $(.ALLSRC) -o $(.TARGET)
 
+qsql_${DB}.moc: qsql_${DB}.cpp
+	$(MOC) $(.ALLSRC) -o ${DRIVER}/$(.TARGET)
+
 beforeinstall:	${LIBDIR}
 
 .include <bsd.lib.mk>
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index 8e698e6e0c07..9d36ac6fc363 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	qt4-${DB}-plugin
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
@@ -20,11 +19,11 @@ COMMENT=	Qt ODBC database plugin
 DB=		odbc
 
 LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
-BUILD_DEPENDS=	unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
 
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+MAKE_JOBS_SAFE=	yes
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
@@ -35,7 +34,9 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		QT_INCDIR="${QT_INCDIR}" \
+		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 .include <bsd.port.mk>
diff --git a/databases/qt4-odbc-plugin/distinfo b/databases/qt4-odbc-plugin/distinfo
index 1756af8b04d9..27b0949354e8 100644
--- a/databases/qt4-odbc-plugin/distinfo
+++ b/databases/qt4-odbc-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
-SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
-SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
+MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
+SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/databases/qt4-odbc-plugin/files/Makefile.bsd b/databases/qt4-odbc-plugin/files/Makefile.bsd
index 40f018c8a8c4..0c73245937a5 100644
--- a/databases/qt4-odbc-plugin/files/Makefile.bsd
+++ b/databases/qt4-odbc-plugin/files/Makefile.bsd
@@ -2,13 +2,15 @@ SHLIB_NAME=	libqsql${DB}.so
 
 VPATH=		${PLUGIN}:${DRIVER}
 CXXFLAGS+=	-I${DRIVER} \
-		-I${PREFIX}/include/qt4 \
-		-I${PREFIX}/include/qt4/Qt \
+		-I${QT_INCDIR} \
+		-I${QT_INCDIR}/Qt \
+		-I${QT_INCDIR}/QtCore \
+		-I${QT_INCDIR}/QtSql \
 		-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
 		-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
 		-D_LARGEFILE_SOURCE -DQT_SHARED
-LDADD=		-L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc
+LDADD=		-L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc
 MOC?=		${LOCALBASE}/bin/moc-qt4
 SRCS=		main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
 
diff --git a/databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp b/databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp
deleted file mode 100644
index 9f1d284aa97a..000000000000
--- a/databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-01-27 00:11:47.000000000 +0600
-+++ src/sql/drivers/odbc/qsql_odbc.cpp	2009-01-27 00:12:12.000000000 +0600
-@@ -64,17 +64,8 @@
- #endif
- 
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#if defined(SQLLEN) || defined(Q_OS_WIN64)
- # define QSQLLEN SQLLEN
--#else
--# define QSQLLEN SQLINTEGER
--#endif
--
--#if defined(SQLULEN) || defined(Q_OS_WIN64)
- # define QSQLULEN SQLULEN
--#else
--# define QSQLULEN SQLUINTEGER
--#endif
- 
- static const int COLNAMESIZE = 256;
- //Map Qt parameter types to ODBC types
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index b2acc142aa20..3126f98522c2 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -21,6 +21,7 @@ DB=		psql
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+MAKE_JOBS_SAFE=	yes
 
 USE_PGSQL=	yes
 DRIVER=		src/sql/drivers/${DB}
@@ -32,7 +33,9 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		QT_INCDIR="${QT_INCDIR}" \
+		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 .include <bsd.port.mk>
diff --git a/databases/qt4-pgsql-plugin/distinfo b/databases/qt4-pgsql-plugin/distinfo
index 1756af8b04d9..27b0949354e8 100644
--- a/databases/qt4-pgsql-plugin/distinfo
+++ b/databases/qt4-pgsql-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
-SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
-SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
+MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
+SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/databases/qt4-pgsql-plugin/files/Makefile.bsd b/databases/qt4-pgsql-plugin/files/Makefile.bsd
index 545a2eee5ad1..9506edf39bec 100644
--- a/databases/qt4-pgsql-plugin/files/Makefile.bsd
+++ b/databases/qt4-pgsql-plugin/files/Makefile.bsd
@@ -2,15 +2,15 @@ SHLIB_NAME=	libqsql${DB}.so
 
 VPATH=		${PLUGIN}:${DRIVER}
 CXXFLAGS+=	-I${DRIVER} \
-		-I${PREFIX}/include/qt4 \
-		-I${PREFIX}/include/qt4/Qt \
+		-I${QT_INCDIR} \
+		-I${QT_INCDIR}/Qt \
 		-I${LOCALBASE}/include/postgresql/server \
 		-I${LOCALBASE}/include -I${X11BASE}/include \
 		${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
 		-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
 		-D_LARGEFILE_SOURCE -DQT_SHARED
 MOC?=		${LOCALBASE}/bin/moc-qt4
-LDADD=		-L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq
+LDADD=		-L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq
 SRCS=		main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
 
 LIBDIR=		${PREFIX}/lib/qt4/plugins/sqldrivers
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index fe9c32bb47aa..a12aecd55721 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -22,6 +22,7 @@ USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build corelib
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
+MAKE_JOBS_SAVE= yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4
diff --git a/databases/qt4-sql/distinfo b/databases/qt4-sql/distinfo
index 1756af8b04d9..27b0949354e8 100644
--- a/databases/qt4-sql/distinfo
+++ b/databases/qt4-sql/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
-SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
-SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
+MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
+SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist
index c6a83f9f5715..910d43aecc41 100644
--- a/databases/qt4-sql/pkg-plist
+++ b/databases/qt4-sql/pkg-plist
@@ -1,5 +1,8 @@
 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_odbc.h
@@ -52,6 +55,15 @@ 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_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
@@ -73,9 +85,9 @@ 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.3
-%%DEBUG%%lib/qt4/libQtSql.so.4.4.3.debug
+lib/qt4/libQtSql.so.4.5
+lib/qt4/libQtSql.so.4.5.2
+%%DEBUG%%lib/qt4/libQtSql.so.4.5.2.debug
 libdata/pkgconfig/QtSql.pc
 @dirrm include/qt4/QtSql
 @dirrmtry include/qt4/Qt
diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile
index 81e5df5adbe3..7dda02b71008 100644
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
 USE_QT_VER=	4
 QT_COMPONENTS=  moc_build sql
 QT_NONSTANDARD=	yes
+MAKE_JOBS_SAFE=	yes
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
@@ -34,7 +35,9 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		QT_INCDIR="${QT_INCDIR}" \
+		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 .include <bsd.port.mk>
diff --git a/databases/qt4-sqlite-plugin/distinfo b/databases/qt4-sqlite-plugin/distinfo
index 1756af8b04d9..27b0949354e8 100644
--- a/databases/qt4-sqlite-plugin/distinfo
+++ b/databases/qt4-sqlite-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
-SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
-SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
+MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
+SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/databases/qt4-sqlite-plugin/files/Makefile.bsd b/databases/qt4-sqlite-plugin/files/Makefile.bsd
index 8b6871981c70..8ce538749a95 100644
--- a/databases/qt4-sqlite-plugin/files/Makefile.bsd
+++ b/databases/qt4-sqlite-plugin/files/Makefile.bsd
@@ -2,14 +2,14 @@ SHLIB_NAME=	libq${DB}.so
 
 VPATH=		${PLUGIN}:${DRIVER}
 CXXFLAGS+=	-I${DRIVER} -Iinclude \
-		-I${PREFIX}/include/qt4 \
-		-I${PREFIX}/include/qt4/Qt \
+		-I${QT_INCDIR} \
+		-I${QT_INCDIR}/Qt \
 		-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
 		-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
 		-D_LARGEFILE_SOURCE -DQT_SHARED
-MOC?=		${PREFIX}/bin/moc-qt4
-LDADD=		-L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite
+MOC?=		${LOCALBASE}/bin/moc-qt4
+LDADD=		-L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite
 SRCS=		smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
 
 LIBDIR=		${PREFIX}/lib/qt4/plugins/sqldrivers
diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile
index ddbe338211ff..0a0389442dde 100644
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
+MAKE_JOBS_SAFE=	yes
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
@@ -34,7 +35,9 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		QT_INCDIR="${QT_INCDIR}" \
+		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 .include <bsd.port.mk>
diff --git a/databases/qt4-sqlite3-plugin/distinfo b/databases/qt4-sqlite3-plugin/distinfo
index 1756af8b04d9..27b0949354e8 100644
--- a/databases/qt4-sqlite3-plugin/distinfo
+++ b/databases/qt4-sqlite3-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
-SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
-SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
+MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
+SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/databases/qt4-sqlite3-plugin/files/Makefile.bsd b/databases/qt4-sqlite3-plugin/files/Makefile.bsd
index f3b0e7bd4749..293786a04b1d 100644
--- a/databases/qt4-sqlite3-plugin/files/Makefile.bsd
+++ b/databases/qt4-sqlite3-plugin/files/Makefile.bsd
@@ -2,14 +2,14 @@ SHLIB_NAME=	libq${DB}.so
 
 VPATH=		${PLUGIN}:${DRIVER}
 CXXFLAGS+=	-I${DRIVER} -Iinclude \
-		-I${PREFIX}/include/qt4 \
-		-I${PREFIX}/include/qt4/Qt \
+		-I${QT_INCDIR} \
+		-I${QT_INCDIR}/Qt \
 		-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
 		-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
 		-D_LARGEFILE_SOURCE -DQT_SHARED
 MOC?=		${LOCALBASE}/bin/moc-qt4
-LDADD=		-L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite3
+LDADD=		-L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite3
 SRCS=		smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
 
 LIBDIR=		${PREFIX}/lib/qt4/plugins/sqldrivers