Index: head/databases/qt4-ibase-plugin/Makefile
===================================================================
--- head/databases/qt4-ibase-plugin/Makefile	(revision 362833)
+++ head/databases/qt4-ibase-plugin/Makefile	(revision 362834)
@@ -1,37 +1,38 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt InterBase/Firebird database plugin
 
 DB=		ibase
 
 USE_FIREBIRD=	yes
 USE_QT4=	moc_build sql
 QT_DIST=	yes
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
 EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \
 			${DISTNAME}/include/QtSql \
+			${DISTNAME}/src/corelib \
 			${DISTNAME}/src/sql/kernel
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 EXTRA_PATCHES=	# empty
 
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
 	${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
 
 .include <bsd.port.mk>
Index: head/databases/qt4-mysql-plugin/Makefile
===================================================================
--- head/databases/qt4-mysql-plugin/Makefile	(revision 362833)
+++ head/databases/qt4-mysql-plugin/Makefile	(revision 362834)
@@ -1,36 +1,37 @@
 # Created by: Kay Lehmann <kay_lehmann@web.de>
 # $FreeBSD$
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt MySQL database plugin
 
 DB=		mysql
 
 USE_QT4=	moc_build sql
 QT_DIST=	yes
 
 USE_MYSQL=	yes
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
 EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} \
+			${DISTNAME}/src/corelib \
 			${DISTNAME}/${PLUGIN}
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 EXTRA_PATCHES=	# empty
 
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
 	${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
 
 .include <bsd.port.mk>
Index: head/databases/qt4-odbc-plugin/Makefile
===================================================================
--- head/databases/qt4-odbc-plugin/Makefile	(revision 362833)
+++ head/databases/qt4-odbc-plugin/Makefile	(revision 362834)
@@ -1,38 +1,39 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
 PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt Open Database Connectivity plugin
 
 DB=		odbc
 
 LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 
 USE_QT4=	moc_build sql
 QT_DIST=	yes
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
 EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} \
+			${DISTNAME}/src/corelib \
 			${DISTNAME}/${PLUGIN}
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 EXTRA_PATCHES=	# empty
 
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
 	${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
 
 .include <bsd.port.mk>
Index: head/databases/qt4-pgsql-plugin/Makefile
===================================================================
--- head/databases/qt4-pgsql-plugin/Makefile	(revision 362833)
+++ head/databases/qt4-pgsql-plugin/Makefile	(revision 362834)
@@ -1,36 +1,37 @@
 # Created by: Lauri Watts <lauri@kde.org>
 # $FreeBSD$
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt PostgreSQL database plugin
 
 DB=		psql
 
 USE_QT4=	moc_build sql
 QT_DIST=	yes
 
 USE_PGSQL=	yes
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
 EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} \
+			${DISTNAME}/src/corelib \
 			${DISTNAME}/${PLUGIN}
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 EXTRA_PATCHES=	# empty
 
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
 	${INSTALL_LIB} ${WRKSRC}/libqsql${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
 
 .include <bsd.port.mk>
Index: head/databases/qt4-sqlite-plugin/Makefile
===================================================================
--- head/databases/qt4-sqlite-plugin/Makefile	(revision 362833)
+++ head/databases/qt4-sqlite-plugin/Makefile	(revision 362834)
@@ -1,37 +1,38 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SQLite 2 database plugin
 
 DB=		sqlite2
 
 USE_QT4=	moc_build sql
 QT_DIST=	yes
 USE_SQLITE=	2
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
 EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \
 			${DISTNAME}/include/QtSql \
+			${DISTNAME}/src/corelib \
 			${DISTNAME}/src/sql/kernel
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 EXTRA_PATCHES=	# empty
 
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
 	${INSTALL_LIB} ${WRKSRC}/libq${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
 
 .include <bsd.port.mk>
Index: head/databases/qt4-sqlite3-plugin/Makefile
===================================================================
--- head/databases/qt4-sqlite3-plugin/Makefile	(revision 362833)
+++ head/databases/qt4-sqlite3-plugin/Makefile	(revision 362834)
@@ -1,38 +1,39 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
 PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SQLite 3 database plugin
 
 DB=		sqlite
 
 USE_QT4=	moc_build sql
 QT_DIST=	yes
 USE_SQLITE=	3
 
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
 EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \
 			${DISTNAME}/include/QtSql \
+			${DISTNAME}/src/corelib \
 			${DISTNAME}/src/sql/kernel
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}
 
 EXTRA_PATCHES=	# empty
 
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SQL_PLUGINDIR}
 	${INSTALL_LIB} ${WRKSRC}/libq${DB}.so ${STAGEDIR}${SQL_PLUGINDIR}
 
 .include <bsd.port.mk>
Index: head/misc/qt4-l10n/Makefile
===================================================================
--- head/misc/qt4-l10n/Makefile	(revision 362833)
+++ head/misc/qt4-l10n/Makefile	(revision 362834)
@@ -1,25 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	l10n
 DISTVERSION=	${QT4_VERSION}
 CATEGORIES=	misc
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt localized messages
 
 USE_QT4=	linguist_build
 QT_DIST=	yes
 
-EXTRACT_AFTER_ARGS+=	--include '${DISTNAME}/translations'
+EXTRACT_AFTER_ARGS+=	--include '${DISTNAME}/src/corelib' \
+			'${DISTNAME}/translations'
 
 EXTRA_PATCHES=	# empty
 
 do-build:
 	${QT_BINDIR}/lrelease${_QT_BINSUFX} ${WRKSRC}/translations/*.ts
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_L10NDIR_REL}
 	${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${STAGEDIR}${PREFIX}/${QT_L10NDIR_REL}
 
 .include <bsd.port.mk>