Improve qt5 build structure, from Niclas Rosenvik:

Allow multiple BUILD_DIRS (but Makefile.common must be included later)
Adds installation of some cmake files and gets rid of many manual
installation rules.
Bump PKGREVISION where PLIST changed.

26 files changed, 83 insertions, 118 deletions

diff --git a/x11/qt5-dbus/Makefile b/x11/qt5-dbus/Makefile
index 75279e10d79..6800b782d65 100644
--- a/x11/qt5-dbus/Makefile
+++ b/x11/qt5-dbus/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2014/10/07 16:47:16 adam Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:13 wiz Exp $
 
 PKGNAME=	qt5-dbus-${QTVERSION}
 PKGREVISION=	2
 COMMENT=	Qt5 DBus support plugin
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 BUILD_DIRS=		qtbase/src/dbus
+BUILD_DIRS+=		qtbase/src/tools/qdbuscpp2xml
+BUILD_DIRS+=		qtbase/src/tools/qdbusxml2cpp
+
+.include "../../x11/qt5-qtbase/Makefile.common"
 
 CFLAGS+=		-I${BUILDLINK_PREFIX.dbus}/include/dbus-1.0
 CFLAGS+=		-I${BUILDLINK_PREFIX.dbus}/lib/dbus-1.0/include/dbus
@@ -14,28 +16,17 @@ CFLAGS+=		-I${BUILDLINK_PREFIX.qt5-qtbase}/qt5/include
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
-INSTALLATION_DIRS=	${QTPREFIX}/bin lib/pkgconfig
+INSTALLATION_DIRS=	lib/pkgconfig
 
 PC_FILES=		Qt5DBus.pc
 
-# XXX: this is an ugly hack
-# qdbuscpp2xml and qdbusxml2cpp should be built and installed, because
-# they are referenced from Qt5DBusConfigExtras.cmake, and cmake
-# fails to find qtdbus if they are not installed
-# I didn't manage to build them though, and the only customers so far
-# didn't need their functionality -- wiz 20140501
-post-build:
-	${ECHO} '#!/bin/sh' > ${WRKSRC}/dummy
-	${ECHO} 'false' >> ${WRKSRC}/dummy
-
 post-install:
 .for i in ${PC_FILES}
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
 		cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
 		${LN} -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/dummy ${DESTDIR}${PREFIX}/qt5/bin/qdbuscpp2xml
-	${INSTALL_SCRIPT} ${WRKSRC}/dummy ${DESTDIR}${PREFIX}/qt5/bin/qdbusxml2cpp
+
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 # Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
diff --git a/x11/qt5-mysql/Makefile b/x11/qt5-mysql/Makefile
index 076115074cc..ed66cac9318 100644
--- a/x11/qt5-mysql/Makefile
+++ b/x11/qt5-mysql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:31 adam Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:13 wiz Exp $
 
 PKGNAME=	qt5-mysql-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	Qt5 MySQL plugin
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -14,17 +13,13 @@ BUILD_DIRS=		qtbase/src/plugins/sqldrivers
 MAKE_ENV+=		QTDIR=${QTDIR}
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
-INSTALLATION_DIRS+=	qt5/plugins/sqldrivers
+
+.include "../../x11/qt5-qtbase/Makefile.common"
 
 post-configure:
 	cd ${WRKSRC}/${BUILD_DIRS} && \
 		${QTDIR}/bin/qmake "sql-plugins=mysql" -o Makefile
 
-do-install:
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/qtbase/plugins/sqldrivers/libqsqlmysql.la \
-		${DESTDIR}${QTPREFIX}/plugins/sqldrivers
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/mysql.buildlink3.mk"
diff --git a/x11/qt5-mysql/PLIST b/x11/qt5-mysql/PLIST
index 46bca5a8a55..9a620bc20ca 100644
--- a/x11/qt5-mysql/PLIST
+++ b/x11/qt5-mysql/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:35 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/12/25 13:51:13 wiz Exp $
+qt5/lib/cmake/Qt5Sql/Qt5Sql_QMYSQLDriverPlugin.cmake
 qt5/plugins/sqldrivers/libqsqlmysql.la
diff --git a/x11/qt5-odbc/Makefile b/x11/qt5-odbc/Makefile
index e7e07c7340e..cd20fd19048 100644
--- a/x11/qt5-odbc/Makefile
+++ b/x11/qt5-odbc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2014/04/23 07:05:31 adam Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/25 13:51:13 wiz Exp $
 
 PKGNAME=	qt5-odbc-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	Qt5 odbc plugin
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 CONFIGURE_ARGS+=	-no-dbus
@@ -16,20 +15,17 @@ BUILD_DIRS=		qtbase/src/plugins/sqldrivers
 MAKE_ENV+=		QTDIR=${QTDIR}
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
-INSTALLATION_DIRS+=	qt5/plugins/sqldrivers
 
 LIBS+=			-lltdl
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 qmake-odbc-configure:
 	cd ${WRKSRC}/${BUILD_DIRS} && \
 		${QTDIR}/bin/qmake "sql-plugins=odbc" -o Makefile
 
 post-configure: qmake-odbc-configure
 
-do-install:
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/qtbase/plugins/sqldrivers/libqsqlodbc.la \
-		${DESTDIR}${QTPREFIX}/plugins/sqldrivers
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
diff --git a/x11/qt5-odbc/PLIST b/x11/qt5-odbc/PLIST
index 0a8cbe626a4..fc736dfcdc1 100644
--- a/x11/qt5-odbc/PLIST
+++ b/x11/qt5-odbc/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:35 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/12/25 13:51:13 wiz Exp $
+qt5/lib/cmake/Qt5Sql/Qt5Sql_QODBCDriverPlugin.cmake
 qt5/plugins/sqldrivers/libqsqlodbc.la
diff --git a/x11/qt5-psql/Makefile b/x11/qt5-psql/Makefile
index 96fcbbfff07..7664184c7b5 100644
--- a/x11/qt5-psql/Makefile
+++ b/x11/qt5-psql/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/10/07 16:47:16 adam Exp $
+# $NetBSD: Makefile,v 1.9 2014/12/25 13:51:13 wiz Exp $
 
 PKGNAME=	qt5-psql-${QTVERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Qt5 PostgreSQL plugin
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 CONFIGURE_ARGS+=	-no-dbus
@@ -19,16 +17,13 @@ BUILD_DIRS=		qtbase/src/plugins/sqldrivers
 MAKE_ENV+=		QTDIR=${QTDIR}
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
-INSTALLATION_DIRS+=	qt5/plugins/sqldrivers
+
+.include "../../x11/qt5-qtbase/Makefile.common"
 
 post-configure:
 	cd ${WRKSRC}/${BUILD_DIRS} && \
 		${QTDIR}/bin/qmake "sql-plugins=psql" -o Makefile
 
-do-install:
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/qtbase/plugins/sqldrivers/libqsqlpsql.la \
-		${DESTDIR}${QTPREFIX}/plugins/sqldrivers
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/x11/qt5-psql/PLIST b/x11/qt5-psql/PLIST
index b5d2ad9924f..1635453f7b0 100644
--- a/x11/qt5-psql/PLIST
+++ b/x11/qt5-psql/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:35 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/12/25 13:51:13 wiz Exp $
+qt5/lib/cmake/Qt5Sql/Qt5Sql_QPSQLDriverPlugin.cmake
 qt5/plugins/sqldrivers/libqsqlpsql.la
diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common
index 189a1641df1..c110703847d 100644
--- a/x11/qt5-qtbase/Makefile.common
+++ b/x11/qt5-qtbase/Makefile.common
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.common,v 1.11 2014/08/28 10:58:19 jperkin Exp $
+
+
+# $NetBSD: Makefile.common,v 1.12 2014/12/25 13:51:13 wiz Exp $
 # used by x11/qt5-dbus/Makefile
 # used by x11/qt5-mysql/Makefile
 # used by x11/qt5-odbc/Makefile
@@ -191,8 +193,10 @@ pre-configure: remove-3rdparty-libs set-qmake-conf
 	&& empty(PKGPATH:Mx11/qt5-mysql) && empty(PKGPATH:Mx11/qt5-psql) \
 	&& empty(PKGPATH:Mx11/qt5-odbc)
 post-configure:
-	cd ${WRKSRC}/${BUILD_DIRS} && \
+.for d in ${BUILD_DIRS}
+	cd ${WRKSRC}/${d} && \
 	${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} ${QTPREFIX}/bin/qmake -o Makefile
+.endfor
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/x11/qt5-qtdeclarative/Makefile b/x11/qt5-qtdeclarative/Makefile
index 2afc5771d2f..921f884b116 100644
--- a/x11/qt5-qtdeclarative/Makefile
+++ b/x11/qt5-qtdeclarative/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/10/07 16:47:16 adam Exp $
+# $NetBSD: Makefile,v 1.9 2014/12/25 13:51:13 wiz Exp $
 
 PKGNAME=	qt5-qtdeclarative-${QTVERSION}
 PKGREVISION=	2
 COMMENT=	Qt5 module for declarative framework
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -14,15 +12,9 @@ BUILD_TARGET=		sub-tools
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
-QTPROG_BIN=		qmlbundle qmlmin qmlplugindump qmlprofiler \
-			qmlscene qmltestrunner
+.include "../../x11/qt5-qtbase/Makefile.common"
 
 post-install:
-.for prog in ${QTPROG_BIN}
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/${BUILD_DIRS}/bin/${prog} \
-		${DESTDIR}${QTPREFIX}/bin/${prog}
-.endfor
 .for i in Qt5Qml.pc Qt5QmlDevTools.pc Qt5Quick.pc Qt5QuickParticles.pc \
 		Qt5QuickTest.pc
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
diff --git a/x11/qt5-qtdoc/Makefile b/x11/qt5-qtdoc/Makefile
index 7c4e02b7b15..b3e9baeafcc 100644
--- a/x11/qt5-qtdoc/Makefile
+++ b/x11/qt5-qtdoc/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:31 adam Exp $
-
-.include "../../x11/qt5-qtbase/Makefile.common"
+# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:13 wiz Exp $
 
 PKGNAME=	qt5-qtdoc-${QTVERSION}
 COMMENT=	Qt5 documentations
@@ -15,5 +13,7 @@ INSTALL_TARGET=		install_docs
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt5-qtgraphicaleffects/Makefile b/x11/qt5-qtgraphicaleffects/Makefile
index 022585eaa41..1fa83def36a 100644
--- a/x11/qt5-qtgraphicaleffects/Makefile
+++ b/x11/qt5-qtgraphicaleffects/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:31 adam Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtgraphicaleffects-${QTVERSION}
 COMMENT=	Qt5 module for Graphics effects
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -14,5 +12,7 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt5-qtimageformats/Makefile b/x11/qt5-qtimageformats/Makefile
index 425c3a59dc1..b3143a21c79 100644
--- a/x11/qt5-qtimageformats/Makefile
+++ b/x11/qt5-qtimageformats/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $
-
-.include "../../x11/qt5-qtbase/Makefile.common"
+# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtimageformats-${QTVERSION}
 COMMENT=	Qt5 module for Image formats
@@ -15,6 +13,8 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/x11/qt5-qtlocation/Makefile b/x11/qt5-qtlocation/Makefile
index b18a9a786d0..eb55174c768 100644
--- a/x11/qt5-qtlocation/Makefile
+++ b/x11/qt5-qtlocation/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtlocation-${QTVERSION}
 COMMENT=	Qt5 module for qtlocation
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -17,6 +15,8 @@ INSTALLATION_DIRS+=	lib/pkgconfig
 
 PC_FILES=		Qt5Positioning.pc
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-install:
 .for i in ${PC_FILES}
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
diff --git a/x11/qt5-qtmultimedia/Makefile b/x11/qt5-qtmultimedia/Makefile
index 489fa31b534..c5dde9989df 100644
--- a/x11/qt5-qtmultimedia/Makefile
+++ b/x11/qt5-qtmultimedia/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:32 adam Exp $
-
-.include "../../x11/qt5-qtbase/Makefile.common"
+# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtmultimedia-${QTVERSION}
 COMMENT=	Qt5 module for multimedia
@@ -15,6 +13,8 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-install:
 .for i in Qt5Multimedia.pc Qt5MultimediaQuick_p.pc Qt5MultimediaWidgets.pc
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
diff --git a/x11/qt5-qtquick1/Makefile b/x11/qt5-qtquick1/Makefile
index 0f4e4638d5e..63c07d84de7 100644
--- a/x11/qt5-qtquick1/Makefile
+++ b/x11/qt5-qtquick1/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2014/10/07 16:47:16 adam Exp $
+# $NetBSD: Makefile,v 1.12 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtquick1-${QTVERSION}
 PKGREVISION=	2
 COMMENT=	Qt5 module for Quick1
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -15,6 +13,8 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-install:
 .for i in Qt5Declarative.pc
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
diff --git a/x11/qt5-qtquickcontrols/Makefile b/x11/qt5-qtquickcontrols/Makefile
index d10c5bbf4d4..f9f2c860d2e 100644
--- a/x11/qt5-qtquickcontrols/Makefile
+++ b/x11/qt5-qtquickcontrols/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $
-
-.include "../../x11/qt5-qtbase/Makefile.common"
+# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtquickcontrols-${QTVERSION}
 COMMENT=	Qt5 module for QuickControls
@@ -14,5 +12,7 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt5-qtscript/Makefile b/x11/qt5-qtscript/Makefile
index 448754ec764..845aa71f369 100644
--- a/x11/qt5-qtscript/Makefile
+++ b/x11/qt5-qtscript/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:32 adam Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtscript-${QTVERSION}
 COMMENT=	Qt5 module for script
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -15,6 +13,8 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-install:
 .for i in Qt5Script.pc Qt5ScriptTools.pc
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
diff --git a/x11/qt5-qtsensors/Makefile b/x11/qt5-qtsensors/Makefile
index 44001508e3c..f44135dd712 100644
--- a/x11/qt5-qtsensors/Makefile
+++ b/x11/qt5-qtsensors/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2014/04/23 07:05:32 adam Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtsensors-${QTVERSION}
 COMMENT=	Qt5 module for Sensors
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -14,6 +12,8 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-install:
 .for i in Qt5Sensors.pc
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
diff --git a/x11/qt5-qtserialport/Makefile b/x11/qt5-qtserialport/Makefile
index 319d569ec37..751e5ee3f17 100644
--- a/x11/qt5-qtserialport/Makefile
+++ b/x11/qt5-qtserialport/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtserialport-${QTVERSION}
 COMMENT=	Qt5 module for Serial Port
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -14,6 +12,8 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-install:
 .for i in Qt5SerialPort.pc
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
diff --git a/x11/qt5-qtsvg/Makefile b/x11/qt5-qtsvg/Makefile
index d9f3d93c41d..13c22550c58 100644
--- a/x11/qt5-qtsvg/Makefile
+++ b/x11/qt5-qtsvg/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $
-
-.include "../../x11/qt5-qtbase/Makefile.common"
+# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtsvg-${QTVERSION}
 COMMENT=	Qt5 module for SVG
@@ -15,6 +13,8 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-install:
 .for i in Qt5Svg.pc
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
diff --git a/x11/qt5-qttranslations/Makefile b/x11/qt5-qttranslations/Makefile
index 8d0675f0c34..0b31b298785 100644
--- a/x11/qt5-qttranslations/Makefile
+++ b/x11/qt5-qttranslations/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:32 adam Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qttranslations-${QTVERSION}
 COMMENT=	Qt5 translations
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -12,7 +10,8 @@ BUILD_DIRS=		qttranslations
 MAKE_ENV+=		QTDIR=${QTDIR}
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
-INSTALLATION_DIRS+=	lib/pkgconfig
+
+.include "../../x11/qt5-qtbase/Makefile.common"
 
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt5-qtwebkit/Makefile b/x11/qt5-qtwebkit/Makefile
index 782b796c4be..4cd7f5303c8 100644
--- a/x11/qt5-qtwebkit/Makefile
+++ b/x11/qt5-qtwebkit/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2014/12/01 11:30:41 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtwebkit-${QTVERSION}
 PKGREVISION=	4
 COMMENT=	Qt5 WebView module
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 BUILD_DEPENDS+=		gperf-[0-9]*:../../devel/gperf
 
 USE_LIBTOOL=		yes
@@ -30,6 +28,8 @@ BROKEN_FILES+=		qt5/lib/pkgconfig/Qt5WebKit.pc \
 			qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.la \
 			qt5/qml/QtWebKit/libqmlwebkitplugin.la
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-install:
 # Fix broken files
 .for i in ${BROKEN_FILES}
diff --git a/x11/qt5-qtx11extras/Makefile b/x11/qt5-qtx11extras/Makefile
index 65e9eb664b7..ab9f126ac07 100644
--- a/x11/qt5-qtx11extras/Makefile
+++ b/x11/qt5-qtx11extras/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $
 
 PKGNAME=	qt5-qtx11extras-${QTVERSION}
 COMMENT=	Qt5 module for X11 extras
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -13,6 +11,8 @@ BUILD_DIRS=		qtx11extras
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-install:
 .for i in Qt5X11Extras.pc
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
diff --git a/x11/qt5-qtxmlpatterns/Makefile b/x11/qt5-qtxmlpatterns/Makefile
index 3c16c2dffdc..5f3e48df1ce 100644
--- a/x11/qt5-qtxmlpatterns/Makefile
+++ b/x11/qt5-qtxmlpatterns/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $
+# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:15 wiz Exp $
 
 PKGNAME=	qt5-qtxmlpatterns-${QTVERSION}
 COMMENT=	Qt5 module for XML Patterns
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -14,14 +12,9 @@ BUILD_TARGET=		sub-tools
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
-QTPROG_BIN=		xmlpatterns xmlpatternsvalidator
+.include "../../x11/qt5-qtbase/Makefile.common"
 
 post-install:
-.for prog in ${QTPROG_BIN}
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/${BUILD_DIRS}/bin/${prog} \
-		${DESTDIR}${QTPREFIX}/bin/${prog}
-.endfor
 .for i in Qt5XmlPatterns.pc
 	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
 		cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
diff --git a/x11/qt5-sqlite3/Makefile b/x11/qt5-sqlite3/Makefile
index f1254439e4b..c4d47649ec7 100644
--- a/x11/qt5-sqlite3/Makefile
+++ b/x11/qt5-sqlite3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2014/07/14 10:41:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/25 13:51:15 wiz Exp $
 
 PKGNAME=	qt5-sqlite3-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	Qt5 SQLite3 plugin
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
@@ -12,18 +11,15 @@ BUILD_DIRS=		qtbase/src/plugins/sqldrivers
 MAKE_ENV+=		QTDIR=${QTDIR}
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
-INSTALLATION_DIRS+=	lib/pkgconfig qt5/plugins/sqldrivers
 
 CFLAGS.SunOS+=	-D__EXTENSIONS__	# posix_fallocate()
 
+.include "../../x11/qt5-qtbase/Makefile.common"
+
 post-configure:
 	cd ${WRKSRC}/${BUILD_DIRS} && \
 		${QTDIR}/bin/qmake "sql-plugins=sqlite" -o Makefile
 
-do-install:
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/qtbase/plugins/sqldrivers/libqsqlite.la \
-		${DESTDIR}${QTPREFIX}/plugins/sqldrivers
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/x11/qt5-sqlite3/PLIST b/x11/qt5-sqlite3/PLIST
index c4e7d8f494e..f9e82986d79 100644
--- a/x11/qt5-sqlite3/PLIST
+++ b/x11/qt5-sqlite3/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:36 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/12/25 13:51:15 wiz Exp $
+qt5/lib/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake
 qt5/plugins/sqldrivers/libqsqlite.la