Update Qt5 to 5.7.1, and unify the Qt4 and Qt5 ports some more

* Update Qt5 to 5.7.1 * Move Qt4 binaries to lib/qt4/bin * Move Qt5 libraries to lib/qt5/lib By moving the libraries we should finally be able to get rid of the inplace upgrade bug (see ports bugs 194088, 195105 and 198720): when Qt5's libraries were lying in /usr/local/lib, which would often get added by pkgconfig to the linker paths via dependencies, the already installed libraries were linked against, instead of the ones that were being built. This forced us to make sure, that -L${WRKSRC}/lib was always coming before -L/usr/local/lib in the linker flags. With this change this should no longer be the case. * Rename some ports to match the rest (foo-qtX -> qtX-foo) * Depend on new port misc/qtchooser [see UPDATING & CHANGES] There are several new Qt5 ports which all have been created by Marie Loise Nolden <nolden@kde.org>. Thanks again. PR: 216797 Exp-Run by: antoine Reviewed by: rakuco, mat, groot_kde.org Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D9213
svn path=/head/; revision=434380
2017-02-18 19:48:05 +00:00 · 2017-02-18 19:48:05 +00:00 · f3c180c343 · 2021-03-31 03:12:20 +00:00
commit f3c180c343
parent 748a0f2465
228 changed files with 6307 additions and 3438 deletions
--- a/23
+++ b/23
@ -10,6 +10,29 @@ in the release notes and/or placed into UPDATING.

 All ports committers are allowed to commit to this file.

+20170218:
+AUTHOR: kde@FreeBSD.org
+
+  * Qt 4's binaries have been moved to lib/qt4/bin to match what is already done
+    to Qt 5's binaries. Since these binaries are no longer in ${LOCALBASE}/bin,
+    they also do not have the -qt4 suffix in their names any more.
+
+  * Consequently, there are no Qt 4 or Qt 5 binaries in the default $PATH, and
+    misc/qtchooser is now used to select the actual Qt binaries. In other
+    words, calling "qmake" or "moc" now goes through qtchooser, which prefers
+    Qt 5 binaries by default.
+
+    The ports framework handles this automatically. The UPDATING entry covers
+    this in more detail.
+
+  * Qt 5.7.1 requires a C++11-capable compiler to be used. qmake and CMake pass
+    the appropriate flags to the compiler (such as -std=c++11) automatically,
+    but if your port fetches Qt's build flags via pkg-config (which can be the
+    case for autotools-based ports), you might need to take care of this
+    manually by setting USE_CXXSTD in your Makefile:
+
+      USE_CXXSTD=	c++11
+
 20160116:
 AUTHOR: mat@FreeBSD.org

--- a/9
+++ b/9
@ -5329,8 +5329,6 @@ devel/py-gevent-zeromq|devel/py-pyzmq|2014-01-06|Has expired: devel/py-pyzmq has
 net/erlyvideo||2014-01-06|Has expired: Development of erlyvideo is abandoned upstream. Use flussonic instead
 devel/qt4-declarative|x11-toolkits/qt4-declarative|2014-01-06|Moved to unify with Qt 5
 devel/qt4-qtestlib|devel/qt4-testlib|2014-01-06|Renamed to unify with Qt 5
-textproc/qt4-clucene|textproc/clucene-qt4|2014-01-06|Renamed to unify with Qt 5
-www/qt4-webkit|www/webkit-qt4|2014-01-06|Renamed to unify with Qt 5
 x11/qt4-opengl|graphics/qt4-opengl|2014-01-06|Moved to unify with Qt 5
 graphics/wings-devel|graphics/wings|2014-01-07|Obsoleted by the main port
 devel/llvm|devel/llvm32|2014-01-08|Has expired: Migrate to devel/llvm32 or newer
@ -9075,3 +9073,10 @@ lang/libjit||2017-02-14|Has expired: This version is severely out of date and it
 databases/php56-redis|databases/pecl-redis|2017-02-15|Merged with latest codebase that supports all php versions
 databases/php70-redis|databases/pecl-redis|2017-02-15|Merged with latest codebase that supports all php versions
 databases/php71-redis|databases/pecl-redis|2017-02-15|Merged with latest codebase that supports all php versions
+devel/dbus-qt4|devel/qt4-dbus|2017-02-18|Renamed to match other Qt ports
+devel/dbus-qt5|devel/qt5-dbus|2017-02-18|Renamed to match other Qt ports
+devel/qmake4|devel/qt4-qmake|2017-02-18|Renamed to match other Qt ports
+devel/qmake5|devel/qt5-qmake|2017-02-18|Renamed to match other Qt ports
+textproc/clucene-qt4|textproc/qt4-clucene|2017-02-18|Renamed to match other Qt ports
+www/webkit-qt4|www/qt4-webkit|2017-02-18|Renamed to match other Qt ports
+www/webkit-qt5|www/qt5-webkit|2017-02-18|Renamed to match other Qt ports
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@ -27,7 +27,7 @@ Qt_Pre_Include=	bsd.qt.mk
 # Qt versions currently supported by the framework.
 _QT_SUPPORTED?=	4 5
 QT4_VERSION?=	4.8.7
-QT5_VERSION?=	5.6.2
+QT5_VERSION?=	5.7.1

 _QT_RELNAME=	qt${_QT_VERSION:R:R}
 _QT_VERSION=	# empty
@ -51,9 +51,6 @@ IGNORE?=		can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SU
 QT_NONSTANDARD=	yes

 MASTER_SITES=	${MASTER_SITE_QT}
-# Useless, as it must be defined before including bsd.port.pre.mk (at least
-# because of bsd.options.mk).
-#PKGNAMEPREFIX?=	${_QT_RELNAME}-
 DISTINFO_FILE?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo

 LICENSE?=		LGPL21
@ -91,9 +88,12 @@ LDFLAGS+=		-Wl,--as-needed
 # Ensure that the "makesum" target (with its inner "fetch" one) uses
 # devel/qt*/distinfo for every port.
 .		if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME}
-QT_DIST=		3d base canvas3d connectivity declarative graphicaleffects imageformats \
-				location multimedia quickcontrols quickcontrols2 script sensors serialbus serialport svg tools \
-				translations webchannel websockets x11extras xmlpatterns
+QT_DIST=		3d base canvas3d charts connectivity datavis3d declarative \
+				declarative-render2d gamepad graphicaleffects imageformats \
+				location multimedia quickcontrols quickcontrols2 script scxml \
+				sensors serialbus serialport svg tools translations \
+				virtualkeyboard webchannel webkit websockets x11extras \
+				xmlpatterns
 .		endif
 .  endif

@ -147,6 +147,7 @@ CONFIGURE_ARGS+=-nomake examples -nomake tests \
 .  if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
 CONFIGURE_ARGS+=-no-sse2
 .  endif
+
 . endif

 . if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
@ -173,7 +174,7 @@ CONFIGURE_ARGS+=-verbose
 _EXTRA_PATCHES_QT4=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
 					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool
 .  else
-_EXTRA_PATCHES_QT5=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \
+_EXTRA_PATCHES_QT5=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
 					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf
 .  endif
 EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
@ -205,22 +206,24 @@ QMAKE_ARGS+=	QT_CONFIG+="${QT_CONFIG:N-*:O:u}"
 QMAKE_ARGS+=	QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
 . endif

+# Add a RUN_DEPENDS on misc/qtchooser to select the binaries.
+# The binaries of both supported Qt versions are installed to
+# ${LOCALBASE}/lib/qt[45]/bin. The port misc/qtchooser installs
+# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct
+# one depending on the value of QT_SELECT (which we pass to both
+# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports
+# RUN_DEPEND on it.
+RUN_DEPENDS+=	qtchooser:misc/qtchooser
+
 PLIST_SUB+=		SHORTVER=${DISTVERSION:R} \
 				FULLVER=${DISTVERSION:C/-.*//}
 .endif # defined(QT_DIST)

-.if ${_QT_VERSION:M4*}
-QT_BINDIR_REL?=	bin
-QT_LIBDIR_REL?=	lib/${_QT_RELNAME}
-QT_PLUGINDIR_REL?=	${QT_LIBDIR_REL}/plugins
-QT_IMPORTDIR_REL?=	${QT_LIBDIR_REL}/imports
-.endif
-
 # A wrapper (qtchooser) is used to invoke binaries.
 QT_BINDIR_REL?=	${QT_ARCHDIR_REL}/bin
 QT_INCDIR_REL?=	include/${_QT_RELNAME}
-QT_LIBDIR_REL?=	lib
-QT_ARCHDIR_REL?=${QT_LIBDIR_REL}/${_QT_RELNAME}
+QT_LIBDIR_REL?=	lib/${_QT_RELNAME}
+QT_ARCHDIR_REL?=${QT_LIBDIR_REL}
 QT_PLUGINDIR_REL?=	${QT_ARCHDIR_REL}/plugins
 QT_LIBEXECDIR_REL?=	libexec/${_QT_RELNAME}
 QT_IMPORTDIR_REL?=	${QT_ARCHDIR_REL}/imports
@ -231,26 +234,26 @@ QT_L10NDIR_REL?=${QT_DATADIR_REL}/translations
 QT_ETCDIR_REL?=	etc/xdg
 QT_EXAMPLEDIR_REL?=	share/examples/${_QT_RELNAME}
 QT_TESTDIR_REL?=${QT_DATADIR_REL}/tests
+QT_CMAKEDIR_REL?=	lib/cmake
+QT_QTCHOOSERDIR_REL?=	${QT_ETCDIR_REL}/qtchooser

 # Not customizable.
 .if ${_QT_VERSION:M4*}
 QT_MKSPECDIR_REL=	${QT_DATADIR_REL}/mkspecs

 _QT_LIBVER=		# empty
-_QT_BINSUFX=	-${_QT_RELNAME}
 .else
 QT_MKSPECDIR_REL=	${QT_ARCHDIR_REL}/mkspecs

 _QT_LIBVER=		${_QT_VERSION:R:R}
-_QT_BINSUFX=	# empty
 .endif

-LRELEASE?=		${QT_BINDIR}/lrelease${_QT_BINSUFX}
-LUPDATE?=		${QT_BINDIR}/lupdate${_QT_BINSUFX}
-MOC?=			${QT_BINDIR}/moc${_QT_BINSUFX}
+LRELEASE?=		${QT_BINDIR}/lrelease
+LUPDATE?=		${QT_BINDIR}/lupdate
+MOC?=			${QT_BINDIR}/moc
 RCC?=			${QT_BINDIR}/rcc
-UIC?=			${QT_BINDIR}/uic${_QT_BINSUFX}
-QMAKE?=			${QT_BINDIR}/qmake${_QT_BINSUFX}
+UIC?=			${QT_BINDIR}/uic
+QMAKE?=			${QT_BINDIR}/qmake
 # Needed to redefine the qmake target for internal Qt configuration.
 _QMAKE?=		${QMAKE}
 QMAKESPEC?=		${QT_MKSPECDIR}/freebsd-${QMAKE_COMPILER}
@ -264,19 +267,21 @@ QMAKE_COMPILER=	$$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo
 # Import QMAKE_ENV and QMAKE_ARGS definitions.
 USES+=			qmake:_env

-.for dir in INC ARCH PLUGIN LIBEXEC IMPORT \
-	QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC
+.for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
+	QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
+	CMAKE QTCHOOSER
 QT_${dir}DIR=	${PREFIX}/${QT_${dir}DIR_REL}
+# Export all directories to the plist substituion for QT_DIST ports.
+# For the others, exclude QT_CMAKEDIR and QT_ETCDIR.
+.  if (${dir:NCMAKE} && ${dir:NETC}) || defined(QT_DIST)
 PLIST_SUB+=		QT_${dir}DIR="${QT_${dir}DIR_REL}"
-.endfor
-
-.for dir in BIN LIB
-QT_${dir}DIR=        ${PREFIX}/${QT_${dir}DIR_REL}
-.  if defined(QT_DIST)
-PLIST_SUB+=                QT_${dir}DIR="${QT_${dir}DIR_REL}"
 .  endif
 .endfor

+# Pass the chosen Qt version to the environment for qtchooser.
+CONFIGURE_ENV+=	QT_SELECT=${_QT_RELNAME}
+MAKE_ENV+=	QT_SELECT=${_QT_RELNAME}
+
 .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)

 .if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
@ -284,7 +289,7 @@ PLIST_SUB+=                QT_${dir}DIR="${QT_${dir}DIR_REL}"
 Qt_Post_Include=	bsd.qt.mk

 .if !defined(QT_NONSTANDARD)
-CONFIGURE_ENV+=	QTDIR="${PREFIX}" QMAKE="${QMAKE}" \
+CONFIGURE_ENV+=	QTDIR="${QT_ARCHDIR}" QMAKE="${QMAKE}" \
 				MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
 				QMAKESPEC="${QMAKESPEC}"
 CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
@ -306,11 +311,13 @@ _USE_QT4_ONLY=	accessible assistant-adp assistantclient clucene codecs-cn codecs
 				phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
 				qtestlib qvfb rcc uic uic3 xmlpatterns-tool

-_USE_QT5_ONLY=	3d buildtools canvas3d concurrent connectivity core \
-				examples graphicaleffects location paths phonon4 \
-				printsupport qdbus qdoc qdoc-data qev qml quick quickcontrols \
-				quickcontrols2 sensors serialbus serialport sql-tds \
-				uiplugin uitools webchannel websockets widgets x11extras
+_USE_QT5_ONLY=	3d buildtools canvas3d charts concurrent connectivity \
+				core datavis3d declarative-render2d examples gamepad \
+				graphicaleffects location paths phonon4 printsupport \
+				qdbus qdoc qdoc-data qev qml quick quickcontrols \
+				quickcontrols2 scxml sensors serialbus serialport \
+				sql-tds uiplugin uitools virtualkeyboard webchannel \
+				websockets widgets x11extras

 3d_PORT=		graphics/${_QT_RELNAME}-3d
 3d_LIB=		libQt${_QT_LIBVER}3DCore.so
@ -319,10 +326,10 @@ accessible_PORT=	accessibility/${_QT_RELNAME}-accessible
 accessible_PATH=	${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so

 assistant_PORT=		devel/${_QT_RELNAME}-assistant
-assistant_PATH=		${QT_BINDIR}/assistant${_QT_BINSUFX}
+assistant_PATH=		${QT_BINDIR}/assistant

 assistant-adp_PORT=	devel/${_QT_RELNAME}-assistant-adp
-assistant-adp_PATH=	${QT_BINDIR}/assistant_adp
+assistant-adp_PATH=	${PREFIX}/bin/assistant_adp

 assistantclient_PORT=	devel/${_QT_RELNAME}-libqtassistantclient
 assistantclient_LIB=	libQt${_QT_LIBVER}AssistantClient.so
@ -333,7 +340,10 @@ buildtools_PATH=	${MOC}
 canvas3d_PORT=		x11-toolkits/${_QT_RELNAME}-canvas3d
 canvas3d_PATH=		${QT_QMLDIR}/QtCanvas3D/qmldir

-clucene_PORT=		textproc/clucene-${_QT_RELNAME}
+charts_PORT=		x11-toolkits/${_QT_RELNAME}-charts
+charts_LIB=		libQt${_QT_LIBVER}Charts.so
+
+clucene_PORT=		textproc/${_QT_RELNAME}-clucene
 clucene_LIB=		libQt${_QT_LIBVER}CLucene.so

 codecs-cn_PORT=		chinese/${_QT_RELNAME}-codecs-cn
@ -360,17 +370,23 @@ core_LIB=			libQt${_QT_LIBVER}Core.so
 corelib_PORT=		devel/${_QT_RELNAME}-corelib
 corelib_LIB=		${core_LIB}

-dbus_PORT=			devel/dbus-${_QT_RELNAME}
+datavis3d_PORT=		x11-toolkits/${_QT_RELNAME}-datavis3d
+datavis3d_LIB=		libQt${_QT_LIBVER}DataVisualization.so
+
+dbus_PORT=			devel/${_QT_RELNAME}-dbus
 dbus_LIB=			libQt${_QT_LIBVER}DBus.so

 declarative_PORT=	x11-toolkits/${_QT_RELNAME}-declarative
 declarative_LIB=	libQt${_QT_LIBVER}Declarative.so

+declarative-render2d_PORT=	x11-toolkits/${_QT_RELNAME}-declarative-render2d
+declarative-render2d_PATH=	${QT_PLUGINDIR}/scenegraph/libsoftwarecontext.so
+
 demo_PORT=			misc/${_QT_RELNAME}-qtdemo
 demo_PATH=			${QT_BINDIR}/qtdemo

 designer_PORT=		devel/${_QT_RELNAME}-designer
-designer_PATH=		${QT_BINDIR}/designer${_QT_BINSUFX}
+designer_PATH=		${QT_BINDIR}/designer

 doc_PORT=			misc/${_QT_RELNAME}-doc
 doc_PATH=			${_QT_RELNAME}-doc>=${_QT_VERSION:R:R}
@ -378,6 +394,9 @@ doc_PATH=			${_QT_RELNAME}-doc>=${_QT_VERSION:R:R}
 examples_PORT=		misc/${_QT_RELNAME}-examples
 examples_PATH=		${_QT_RELNAME}-examples>=${_QT_VERSION:R:R}

+gamepad_PORT=		x11-toolkits/${_QT_RELNAME}-gamepad
+gamepad_LIB=		libQt${_QT_LIBVER}Gamepad.so
+
 graphicaleffects_PORT=	graphics/${_QT_RELNAME}-graphicaleffects
 graphicaleffects_PATH=	${QT_QMLDIR}/QtGraphicalEffects/qmldir

@ -403,7 +422,7 @@ inputmethods_PORT=	x11/${_QT_RELNAME}-inputmethods
 inputmethods_PATH=	${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so

 linguist_PORT=		devel/${_QT_RELNAME}-linguist
-linguist_PATH=		${QT_BINDIR}/linguist${_QT_BINSUFX}
+linguist_PATH=		${QT_BINDIR}/linguist

 linguisttools_PORT=	devel/${_QT_RELNAME}-linguisttools
 linguisttools_PATH=	${LRELEASE}
@ -415,7 +434,7 @@ l10n_PORT=			misc/${_QT_RELNAME}-l10n
 l10n_PATH=			${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R}

 makeqpf_PORT=		devel/${_QT_RELNAME}-makeqpf
-makeqpf_PATH=		${QT_BINDIR}/makeqpf${_QT_BINSUFX}
+makeqpf_PATH=		${QT_BINDIR}/makeqpf

 moc_PORT=			devel/${_QT_RELNAME}-moc
 moc_PATH=			${MOC}
@ -468,7 +487,7 @@ qdoc3_PATH=			${QT_BINDIR}/qdoc3
 qev_PORT=			x11/${_QT_RELNAME}-qev
 qev_PATH=			${QT_BINDIR}/qev

-qmake_PORT=			devel/qmake${_QT_VERSION:R:R}
+qmake_PORT=			devel/${_QT_RELNAME}-qmake
 qmake_PATH=			${QMAKE}

 qml_PORT=			lang/${_QT_RELNAME}-qml
@ -481,7 +500,7 @@ qt3support_PORT=	devel/${_QT_RELNAME}-qt3support
 qt3support_LIB=		libQt${_QT_LIBVER}3Support.so

 qtconfig_PORT=		misc/${_QT_RELNAME}-qtconfig
-qtconfig_PATH=		${QT_BINDIR}/qtconfig${_QT_BINSUFX}
+qtconfig_PATH=		${QT_BINDIR}/qtconfig

 qtestlib_PORT=		${testlib_PORT}
 qtestlib_LIB=		${testlib_LIB}
@ -493,10 +512,10 @@ quickcontrols_PORT=	x11-toolkits/${_QT_RELNAME}-quickcontrols
 quickcontrols_PATH=	${QT_QMLDIR}/QtQuick/Controls/qmldir

 quickcontrols2_PORT=	x11-toolkits/${_QT_RELNAME}-quickcontrols2
-quickcontrols2_LIB=	libQt${_QT_LIBVER}LabsTemplates.so
+quickcontrols2_LIB=	libQt${_QT_LIBVER}QuickControls2.so

 qvfb_PORT=			devel/${_QT_RELNAME}-qvfb
-qvfb_PATH=			${QT_BINDIR}/qvfb${_QT_BINSUFX}
+qvfb_PATH=			${QT_BINDIR}/qvfb

 rcc_PORT=			devel/${_QT_RELNAME}-rcc
 rcc_PATH=			${RCC}
@ -510,6 +529,9 @@ script_LIB=		libQt${_QT_LIBVER}Script.so
 scripttools_PORT=	devel/${_QT_RELNAME}-scripttools
 scripttools_LIB=	libQt${_QT_LIBVER}ScriptTools.so

+scxml_PORT=		devel/${_QT_RELNAME}-scxml
+scxml_LIB=		libQt${_QT_LIBVER}Scxml.so
+
 serialbus_PORT=		comms/${_QT_RELNAME}-serialbus
 serialbus_LIB=		libQt${_QT_LIBVER}SerialBus.so

@ -554,13 +576,16 @@ uiplugin_PATH=		${QT_INCDIR}/QtUiPlugin/QtUiPlugin
 uitools_PORT=		devel/${_QT_RELNAME}-uitools
 uitools_PATH=		${QT_LIBDIR}/libQt${_QT_LIBVER}UiTools.a

+virtualkeyboard_PORT=	x11-toolkits/${_QT_RELNAME}-virtualkeyboard
+virtualkeyboard_PATH=	${QT_PLUGINDIR}/platforminputcontexts/libqtvirtualkeyboardplugin.so
+
 webchannel_PORT=	www/${_QT_RELNAME}-webchannel
 webchannel_LIB=	libQt${_QT_LIBVER}WebChannel.so

 websockets_PORT=	www/${_QT_RELNAME}-websockets
 websockets_LIB=	libQt${_QT_LIBVER}WebSockets.so

-webkit_PORT=		www/webkit-${_QT_RELNAME}
+webkit_PORT=		www/${_QT_RELNAME}-webkit
 webkit_LIB=	libQt${_QT_LIBVER}WebKit.so

 widgets_PORT=		x11-toolkits/${_QT_RELNAME}-widgets
@ -639,6 +664,10 @@ _QT_TOOLS+=		qdbuscpp2xml qdbusxml2cpp
 _QT_TOOLS+=		${UIC}
 .  endif

+# The list of QtBase components that need to be linked into WRKSRC/lib for
+# other QtBase ports. See below.
+_QT5_BASE=			core dbus gui network sql widgets
+
 pre-configure: qtbase-pre-configure
 qtbase-pre-configure:
 .  for tool in ${_QT_TOOLS}
@ -647,6 +676,28 @@ qtbase-pre-configure:
 		${TRUE}
 .  endfor

+# The following is a fix for the inplace upgrade problem we faced (see
+# QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously,
+# which previously was adressed by making sure, that ${LOCALBASE}/lib, which
+# would often gets added by pkgconf for the dependencies, was passed after
+# ${WRKSRC}/lib.
+# * We fix the inplace upgrade problem by moving the Qt5 libraries into
+#   ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore.
+# * However, this means, that the ports belonging to the split up QtBase package
+#   now no longer can find their depending QtBase libraries. We fix this by
+#   linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends
+#   on them.
+.  if ${QT_DIST:Mbase}
+.    for basedep in ${_QT5_BASE}
+.      if ${USE_QT5:M${basedep}}
+	${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib
+.      endif
+.    endfor
+.  endif
+
+#
+# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
+#
 # Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out
 # certain paths from pkg-config calls (see the explanation in
 # devel/qt5/files/patch-configure) as well as for setting
@ -674,6 +725,9 @@ qt5-pre-configure:
 # value through to the configure script in qtbase).
 	${MKDIR} ${CONFIGURE_WRKSRC}
 	${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache
+#
+# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
+#
 # We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
 # the linker before -L/usr/local/lib. By default, the opposite happens, which
 # is a problem when a Qt port is being upgraded, since an existing library
--- a/20
+++ b/20
@ -5,6 +5,26 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20170218:
+  AFFECTS: users of Qt 4 and Qt 5
+  AUTHOR: kde@FreeBSD.org
+
+  Following what is already done in Qt 5, the Qt 4 ports no longer install
+  their binaries into ${LOCALBASE}/bin (which is "/usr/local/bin" in most
+  cases). Additionally, the "-qt4" suffix has been dropped from the file names
+  of the binaries that had it, such as "qmake-qt4".
+
+  The new misc/qtchooser port is now used to choose whether a Qt 4 or Qt 5
+  version of a binary such as "moc", "qmake" or "designer" will be used. By
+  default, the Qt 5 versions are preferred, but that can be changed by setting
+  the QT_SELECT environment variable to "qt4".
+
+  qtchooser also allows one to seamlessly use other Qt installations for those
+  binaries, which is particularly beneficial to people working on Qt itself or
+  who need their own checkouts.
+
+  See qtchooser(1) for more information on how to configure qtchooser.
+
 20170213:
  AFFECTS: users of www/node*
  AUTHOR: bradleythughes@fastmail.fm
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	accessible
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility
 PKGNAMEPREFIX=	qt4-

--- a/astro/xglobe/files/patch-Makefile
+++ b/astro/xglobe/files/patch-Makefile
@ -31,7 +31,7 @@
 +CXX    ?= c++
 +CPP     = ${CXX}
 +LINK    = ${CXX}
-+MOC     = moc-qt4
+MOC     = moc
 INSTALL = install

 ####### compile and link options
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@ -34,8 +34,6 @@ DEBUG_QMAKE_ON=	CONFIG+=debug

 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
-		-e 's|lupdate|lupdate-qt4|' \
-		-e 's|lrelease|lrelease-qt4|' \
 		${WRKSRC}/${PORTNAME}.pro
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
 		${WRKSRC}/src/notifications_dbus.cpp
--- a/cad/klayout/files/patch-build.sh
+++ b/cad/klayout/files/patch-build.sh
@ -28,20 +28,6 @@
 if [ "$gcc_path" = "" ]; then
   echo "*** ERROR: unable to locate gcc in path"
   exit 1
-@@ -398,11 +401,11 @@ mac-*)
-   ;;
- esac
- 
-if [ ! -r $QTBIN/moc ]; then
-+if [ ! -r $QTBIN/moc-qt4 ]; then
-   echo "*** ERROR: unable to locate Qt MOC in $QTBIN"
-   exit 1
- fi
-if [ ! -r $QTBIN/uic ]; then
-+if [ ! -r $QTBIN/uic-qt4 ]; then
-   echo "*** ERROR: unable to locate Qt UIC in $QTBIN"
-   exit 1
- fi
@@ -463,11 +466,7 @@ else
   cd $CURR_DIR
 fi
--- a/cad/klayout/files/patch-src-Makefile.rules
+++ b/cad/klayout/files/patch-src-Makefile.rules
@ -1,13 +0,0 @@
--- src/Makefile.rules.orig	2016-06-19 16:35:32 UTC
-+++ src/Makefile.rules
-@@ -73,8 +73,8 @@ ifeq ($(LOPT_TEST),)
-   LOPT_TEST=$(LOPT)
- endif
- 
-MOC=$(QTBIN)/moc
-UIC=$(QTBIN)/uic
-+MOC=$(QTBIN)/moc-qt4
-+UIC=$(QTBIN)/uic-qt4
- RCC=$(QTBIN)/rcc
- 
- TESTSRC=$(TOP_SOURCE)/..
--- a/chinese/qt4-codecs-cn/Makefile
+++ b/chinese/qt4-codecs-cn/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	codecs
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	chinese
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-cn
--- a/chinese/qt4-codecs-tw/Makefile
+++ b/chinese/qt4-codecs-tw/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	codecs
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	chinese
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-tw
--- a/comms/hamfax/files/patch-Makefile.in
+++ b/comms/hamfax/files/patch-Makefile.in
@ -1,11 +0,0 @@
--- Makefile.in.orig	2012-12-05 23:08:33.000000000 +1100
-+++ Makefile.in	2012-12-05 23:08:50.000000000 +1100
-@@ -1613,7 +1613,7 @@
- 
- 
- moc_%.cpp: %.hpp
-	moc $< -o $@
-+	moc-qt4 $< -o $@
- 
- # helper target for updating translation files
- @USE_LRELEASE_TRUE@lupdate: $(hamfax_SOURCES)
--- a/comms/qt5-connectivity/pkg-plist
+++ b/comms/qt5-connectivity/pkg-plist
@ -4,7 +4,6 @@
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/androidbroadcastreceiver_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez5_helper_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez_data_p.h
-%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/corebluetoothwrapper_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device1_bluez5_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h
@ -12,6 +11,7 @@
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/hcimanager_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/inputstreamthread_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/jni_android_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/lecmaccalculator_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/localdevicebroadcastreceiver_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/lowenergynotificationhub_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/manager_p.h
@ -23,6 +23,7 @@
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_transfer1_bluez5_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_transfer_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/objectmanager_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbluetooth_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtcentralmanager_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtchanneldelegate_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtconnectionmonitor_p.h
@ -55,6 +56,7 @@
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_osx_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferrequest_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qleadvertiser_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_osx_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h
 %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergyserviceprivate_p.h
@ -77,11 +79,17 @@
 %%QT_INCDIR%%/QtBluetooth/QBluetoothTransferReply
 %%QT_INCDIR%%/QtBluetooth/QBluetoothTransferRequest
 %%QT_INCDIR%%/QtBluetooth/QBluetoothUuid
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyAdvertisingData
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyAdvertisingParameters
 %%QT_INCDIR%%/QtBluetooth/QLowEnergyCharacteristic
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyCharacteristicData
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyConnectionParameters
 %%QT_INCDIR%%/QtBluetooth/QLowEnergyController
 %%QT_INCDIR%%/QtBluetooth/QLowEnergyDescriptor
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyDescriptorData
 %%QT_INCDIR%%/QtBluetooth/QLowEnergyHandle
 %%QT_INCDIR%%/QtBluetooth/QLowEnergyService
+%%QT_INCDIR%%/QtBluetooth/QLowEnergyServiceData
 %%QT_INCDIR%%/QtBluetooth/QtBluetooth
 %%QT_INCDIR%%/QtBluetooth/QtBluetoothDepends
 %%QT_INCDIR%%/QtBluetooth/QtBluetoothVersion
@ -100,10 +108,16 @@
 %%QT_INCDIR%%/QtBluetooth/qbluetoothtransferreply.h
 %%QT_INCDIR%%/QtBluetooth/qbluetoothtransferrequest.h
 %%QT_INCDIR%%/QtBluetooth/qbluetoothuuid.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergyadvertisingdata.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergyadvertisingparameters.h
 %%QT_INCDIR%%/QtBluetooth/qlowenergycharacteristic.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergycharacteristicdata.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergyconnectionparameters.h
 %%QT_INCDIR%%/QtBluetooth/qlowenergycontroller.h
 %%QT_INCDIR%%/QtBluetooth/qlowenergydescriptor.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergydescriptordata.h
 %%QT_INCDIR%%/QtBluetooth/qlowenergyservice.h
+%%QT_INCDIR%%/QtBluetooth/qlowenergyservicedata.h
 %%QT_INCDIR%%/QtBluetooth/qtbluetoothversion.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/adapter_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/agent_p.h
@ -116,18 +130,15 @@
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_android_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_p_p.h
-%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_simulator_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_android_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_p_p.h
-%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_simulator_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefnfcsmartposterrecord_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefrecord_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_android_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_emulator_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_neard_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_p.h
-%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_simulator_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanagerimpl_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanagervirtualbase_p.h
 %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharemanager_p.h
@ -173,10 +184,10 @@
 %%QT_INCDIR%%/QtNfc/qnfcglobal.h
 %%QT_INCDIR%%/QtNfc/qqmlndefrecord.h
 %%QT_INCDIR%%/QtNfc/qtnfcversion.h
-%%QT_LIBDIR%%/cmake/Qt5Bluetooth/Qt5BluetoothConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Bluetooth/Qt5BluetoothConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Nfc/Qt5NfcConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Nfc/Qt5NfcConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Bluetooth/Qt5BluetoothConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Bluetooth/Qt5BluetoothConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Nfc/Qt5NfcConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Nfc/Qt5NfcConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5Bluetooth.prl
 %%QT_LIBDIR%%/libQt5Bluetooth.so
 %%QT_LIBDIR%%/libQt5Bluetooth.so.5
--- a/comms/qt5-sensors/pkg-plist
+++ b/comms/qt5-sensors/pkg-plist
@ -114,11 +114,11 @@
 %%QT_INCDIR%%/QtSensors/qtapsensor.h
 %%QT_INCDIR%%/QtSensors/qtiltsensor.h
 %%QT_INCDIR%%/QtSensors/qtsensorsversion.h
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5SensorsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5SensorsConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5Sensors_QShakeSensorGesturePlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5Sensors_QtSensorGesturePlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5Sensors_genericSensorPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5SensorsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5SensorsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5Sensors_QShakeSensorGesturePlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5Sensors_QtSensorGesturePlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Sensors/Qt5Sensors_genericSensorPlugin.cmake
 %%QT_LIBDIR%%/libQt5Sensors.prl
 %%QT_LIBDIR%%/libQt5Sensors.so
 %%QT_LIBDIR%%/libQt5Sensors.so.5
--- a/comms/qt5-serialbus/pkg-plist
+++ b/comms/qt5-serialbus/pkg-plist
@ -17,6 +17,7 @@
 %%QT_INCDIR%%/QtSerialBus/QModbusDataUnit
 %%QT_INCDIR%%/QtSerialBus/QModbusDataUnitMap
 %%QT_INCDIR%%/QtSerialBus/QModbusDevice
+%%QT_INCDIR%%/QtSerialBus/QModbusDeviceIdentification
 %%QT_INCDIR%%/QtSerialBus/QModbusExceptionResponse
 %%QT_INCDIR%%/QtSerialBus/QModbusPdu
 %%QT_INCDIR%%/QtSerialBus/QModbusReply
@ -37,6 +38,7 @@
 %%QT_INCDIR%%/QtSerialBus/qmodbusclient.h
 %%QT_INCDIR%%/QtSerialBus/qmodbusdataunit.h
 %%QT_INCDIR%%/QtSerialBus/qmodbusdevice.h
+%%QT_INCDIR%%/QtSerialBus/qmodbusdeviceidentification.h
 %%QT_INCDIR%%/QtSerialBus/qmodbuspdu.h
 %%QT_INCDIR%%/QtSerialBus/qmodbusreply.h
 %%QT_INCDIR%%/QtSerialBus/qmodbusrtuserialmaster.h
@ -46,8 +48,8 @@
 %%QT_INCDIR%%/QtSerialBus/qmodbustcpserver.h
 %%QT_INCDIR%%/QtSerialBus/qserialbusglobal.h
 %%QT_INCDIR%%/QtSerialBus/qtserialbusversion.h
-%%QT_LIBDIR%%/cmake/Qt5SerialBus/Qt5SerialBusConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5SerialBus/Qt5SerialBusConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfig.cmake
+%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5SerialBus.prl
 %%QT_LIBDIR%%/libQt5SerialBus.so
 %%QT_LIBDIR%%/libQt5SerialBus.so.5
--- a/comms/qt5-serialport/pkg-plist
+++ b/comms/qt5-serialport/pkg-plist
@ -10,8 +10,8 @@
 %%QT_INCDIR%%/QtSerialPort/qserialportglobal.h
 %%QT_INCDIR%%/QtSerialPort/qserialportinfo.h
 %%QT_INCDIR%%/QtSerialPort/qtserialportversion.h
-%%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5SerialPort/Qt5SerialPortConfig.cmake
+%%QT_CMAKEDIR%%/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5SerialPort.prl
 %%QT_LIBDIR%%/libQt5SerialPort.so
 %%QT_LIBDIR%%/libQt5SerialPort.so.5
--- a/comms/xcwcp/Makefile
+++ b/comms/xcwcp/Makefile
@ -14,6 +14,8 @@ MASTERDIR=	${.CURDIR}/../unixcw
 PLIST=		${.CURDIR}/pkg-plist
 USE_QT5=	buildtools gui widgets qmake_build
 USES=		gettext
+# Qt from 5.7.0 on requires c++11.
+USE_CXXSTD=	c++11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-xcwcp
 XCWCP=		yes
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@ -1,7 +1,7 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	2

 COMMENT=	Qt InterBase/Firebird database plugin
 DB=		ibase
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@ -1,7 +1,7 @@
 # Created by: Kay Lehmann <kay_lehmann@web.de>
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	2

 COMMENT=	Qt MySQL database plugin
 DB=		mysql
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@ -1,7 +1,7 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$

-PORTREVISION=	2
+PORTREVISION=	3

 DB=		odbc
 COMMENT=	Qt Open Database Connectivity plugin
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@ -1,7 +1,7 @@
 # Created by: Lauri Watts <lauri@kde.org>
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	2

 COMMENT=	Qt PostgreSQL database plugin
 DB=		psql
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	sql
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMEPREFIX=	qt4-

--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@ -1,7 +1,7 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	2

 COMMENT=	Qt SQLite 2 database plugin
 DB=		sqlite2
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@ -1,7 +1,7 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$

-PORTREVISION=	2
+PORTREVISION=	3

 COMMENT=	Qt SQLite 3 database plugin
 DB=		sqlite
--- a/databases/qt5-sql/pkg-plist
+++ b/databases/qt5-sql/pkg-plist
@ -48,8 +48,8 @@
 %%QT_INCDIR%%/QtSql/qsqlresult.h
 %%QT_INCDIR%%/QtSql/qsqltablemodel.h
 %%QT_INCDIR%%/QtSql/qtsqlversion.h
-%%QT_LIBDIR%%/cmake/Qt5Sql/Qt5SqlConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Sql/Qt5SqlConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Sql/Qt5SqlConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Sql/Qt5SqlConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5Sql.prl
 %%QT_LIBDIR%%/libQt5Sql.so
 %%QT_LIBDIR%%/libQt5Sql.so.5
--- a/deskutils/fbreader/files/patch-makefiles_arch_desktop.mk
+++ b/deskutils/fbreader/files/patch-makefiles_arch_desktop.mk
@ -0,0 +1,11 @@
+--- makefiles/arch/desktop.mk.orig	2017-01-18 21:42:48 UTC
+++ makefiles/arch/desktop.mk
+@@ -17,7 +17,7 @@ ifeq "$(UI_TYPE)" "qt"
+   MOC = moc-qt3
+   QTINCLUDE = -I /usr/include/qt3
+ else
+-  MOC = moc-qt4
+  MOC = moc
+   QTINCLUDE = -I /usr/include/qt4
+ endif
+ 
--- a/devel/Makefile
+++ b/devel/Makefile
@ -384,8 +384,6 @@
    SUBDIR += dbus
    SUBDIR += dbus-c++
    SUBDIR += dbus-glib
-    SUBDIR += dbus-qt4
-    SUBDIR += dbus-qt5
    SUBDIR += dbus-sharp
    SUBDIR += dbus-sharp-glib
    SUBDIR += dbus-tcl
@ -4941,8 +4939,6 @@
    SUBDIR += qjson
    SUBDIR += qjson-qt5
    SUBDIR += qmake
-    SUBDIR += qmake4
-    SUBDIR += qmake5
    SUBDIR += qprog
    SUBDIR += qross
    SUBDIR += qscintilla2
@ -4954,6 +4950,7 @@
    SUBDIR += qt4-assistant
    SUBDIR += qt4-assistant-adp
    SUBDIR += qt4-corelib
+    SUBDIR += qt4-dbus
    SUBDIR += qt4-designer
    SUBDIR += qt4-help
    SUBDIR += qt4-help-tools
@ -4965,6 +4962,7 @@
    SUBDIR += qt4-porting
    SUBDIR += qt4-qdbusviewer
    SUBDIR += qt4-qdoc3
+    SUBDIR += qt4-qmake
    SUBDIR += qt4-qmlviewer
    SUBDIR += qt4-qt3support
    SUBDIR += qt4-qtsolutions-singleapplication
@ -4981,6 +4979,7 @@
    SUBDIR += qt5-buildtools
    SUBDIR += qt5-concurrent
    SUBDIR += qt5-core
+    SUBDIR += qt5-dbus
    SUBDIR += qt5-designer
    SUBDIR += qt5-help
    SUBDIR += qt5-linguist
@ -4990,8 +4989,10 @@
    SUBDIR += qt5-qdbusviewer
    SUBDIR += qt5-qdoc
    SUBDIR += qt5-qdoc-data
+    SUBDIR += qt5-qmake
    SUBDIR += qt5-script
    SUBDIR += qt5-scripttools
+    SUBDIR += qt5-scxml
    SUBDIR += qt5-testlib
    SUBDIR += qt5-uitools
    SUBDIR += qtcreator
--- a/devel/qmake5/files/patch-mkspecsfeaturesqt_functions.prf
+++ b/devel/qmake5/files/patch-mkspecsfeaturesqt_functions.prf
@ -1,16 +0,0 @@
-To setup a tool, qtPrepareTool() doesn't fallback anymore (compared to Qt4) to
-the build directory (/get paths), but relies instead on QT_TOOL.* variables set
-before in the configure stage, which our split configuration doesn't generate.
-With this patch, it's back to the previous behavior (which, by the way, has no
-effect on anything but Qt builds).
--- ./mkspecs/features/qt_functions.prf.orig	2013-10-22 01:49:28.000000000 -0700
-+++ ./mkspecs/features/qt_functions.prf	2013-11-04 07:50:44.835414343 -0800
-@@ -193,7 +193,7 @@
- defineTest(qtPrepareTool) {
-     cmd = $$eval(QT_TOOL.$${2}.binary)
-     isEmpty(cmd) {
-        cmd = $$[QT_HOST_BINS]/$$2
-+        cmd = $$[QT_HOST_BINS/get]/$$2
-         exists($${cmd}.pl) {
-             cmd = perl -w $$system_path($${cmd}.pl)
-         } else: contains(QMAKE_HOST.os, Windows) {
--- a/devel/qscintilla2-qt5/pkg-plist
+++ b/devel/qscintilla2-qt5/pkg-plist
@ -48,10 +48,10 @@
 %%QT_INCDIR%%/Qsci/qsciscintillabase.h
 %%QT_INCDIR%%/Qsci/qscistyle.h
 %%QT_INCDIR%%/Qsci/qscistyledtext.h
-lib/libqscintilla2-qt5.so
-lib/libqscintilla2-qt5.so.12
-lib/libqscintilla2-qt5.so.12.0
-lib/libqscintilla2-qt5.so.12.0.1
+%%QT_LIBDIR%%/libqscintilla2-qt5.so
+%%QT_LIBDIR%%/libqscintilla2-qt5.so.12
+%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0
+%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0.1
 %%QT_MKSPECDIR%%/features/qscintilla2.prf
 %%QT_DATADIR%%/qsci/api/python/Python-2.4.api
 %%QT_DATADIR%%/qsci/api/python/Python-2.5.api
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	assistant
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-assistant/pkg-plist
+++ b/devel/qt4-assistant/pkg-plist
@ -1,3 +1,3 @@
-%%QT_BINDIR%%/assistant-qt4
-%%DEBUG%%%%QT_BINDIR%%/assistant-qt4.debug
+%%QT_BINDIR%%/assistant
+%%DEBUG%%%%QT_BINDIR%%/assistant.debug
 share/pixmaps/assistant-qt4.png
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	corelib
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-dbus/Makefile
+++ b/devel/qt4-dbus/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	dbus
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-dbus/files/patch-toolsqdbusqdbusqdbus.cpp
+++ b/devel/qt4-dbus/files/patch-toolsqdbusqdbusqdbus.cpp
--- a/devel/qt4-dbus/pkg-plist
+++ b/devel/qt4-dbus/pkg-plist
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	designer
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@ -1,5 +1,5 @@
-%%QT_BINDIR%%/designer-qt4
-%%DEBUG%%%%QT_BINDIR%%/designer-qt4.debug
+%%QT_BINDIR%%/designer
+%%DEBUG%%%%QT_BINDIR%%/designer.debug
 %%QT_INCDIR%%/QtDesigner/QAbstractExtensionFactory
 %%QT_INCDIR%%/QtDesigner/QAbstractExtensionManager
 %%QT_INCDIR%%/QtDesigner/QAbstractFormBuilder
--- a/devel/qt4-help-tools/Makefile
+++ b/devel/qt4-help-tools/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	help
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-tools
--- a/devel/qt4-help/Makefile
+++ b/devel/qt4-help/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	help
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	linguist
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-linguist/pkg-plist
+++ b/devel/qt4-linguist/pkg-plist
@ -1,5 +1,5 @@
-%%QT_BINDIR%%/linguist-qt4
-%%DEBUG%%%%QT_BINDIR%%/linguist-qt4.debug
+%%QT_BINDIR%%/linguist
+%%DEBUG%%%%QT_BINDIR%%/linguist.debug
 share/pixmaps/linguist-qt4.png
 %%QT_DATADIR%%/phrasebooks/danish.qph
 %%QT_DATADIR%%/phrasebooks/dutch.qph
--- a/devel/qt4-linguisttools/Makefile
+++ b/devel/qt4-linguisttools/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	linguisttools
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-linguisttools/pkg-plist
+++ b/devel/qt4-linguisttools/pkg-plist
@ -1,6 +1,6 @@
 %%QT_BINDIR%%/lconvert
 %%DEBUG%%%%QT_BINDIR%%/lconvert.debug
-%%QT_BINDIR%%/lrelease-qt4
-%%DEBUG%%%%QT_BINDIR%%/lrelease-qt4.debug
-%%QT_BINDIR%%/lupdate-qt4
-%%DEBUG%%%%QT_BINDIR%%/lupdate-qt4.debug
+%%QT_BINDIR%%/lrelease
+%%DEBUG%%%%QT_BINDIR%%/lrelease.debug
+%%QT_BINDIR%%/lupdate
+%%DEBUG%%%%QT_BINDIR%%/lupdate.debug
--- a/devel/qt4-makeqpf/Makefile
+++ b/devel/qt4-makeqpf/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	makeqpf
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-makeqpf/pkg-plist
+++ b/devel/qt4-makeqpf/pkg-plist
@ -1,2 +1,2 @@
-%%QT_BINDIR%%/makeqpf-qt4
-%%DEBUG%%%%QT_BINDIR%%/makeqpf-qt4.debug
+%%QT_BINDIR%%/makeqpf
+%%DEBUG%%%%QT_BINDIR%%/makeqpf.debug
--- a/devel/qt4-moc/Makefile
+++ b/devel/qt4-moc/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	moc
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-moc/pkg-plist
+++ b/devel/qt4-moc/pkg-plist
@ -1,2 +1,2 @@
-%%QT_BINDIR%%/moc-qt4
-%%DEBUG%%%%QT_BINDIR%%/moc-qt4.debug
+%%QT_BINDIR%%/moc
+%%DEBUG%%%%QT_BINDIR%%/moc.debug
--- a/devel/qt4-porting/Makefile
+++ b/devel/qt4-porting/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	porting
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-qdbusviewer/Makefile
+++ b/devel/qt4-qdbusviewer/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qdbusviewer
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-qdoc3/Makefile
+++ b/devel/qt4-qdoc3/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qdoc3
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel textproc
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-qmake/Makefile
+++ b/devel/qt4-qmake/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qmake
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

@ -72,6 +73,7 @@ do-configure: apply-slist
 	${LN} ${WRKSRC}/qconfig.h ${WRKSRC:H}/src/corelib/global/qconfig.h

 do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}
 	${INSTALL_PROGRAM} ${WRKSRC}/${QMAKE:T} ${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL:H} && \
 	cd ${WRKSRC}/.. && ${COPYTREE_SHARE} mkspecs ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL:H}
--- a/devel/qt4-qmake/files/Makefile.bsd
+++ b/devel/qt4-qmake/files/Makefile.bsd
--- a/devel/qt4-qmake/files/patch-mkspecscommonclang-unix.conf
+++ b/devel/qt4-qmake/files/patch-mkspecscommonclang-unix.conf
--- a/devel/qt4-qmake/files/patch-mkspecscommonfreebsd.conf
+++ b/devel/qt4-qmake/files/patch-mkspecscommonfreebsd.conf
--- a/devel/qt4-qmake/files/patch-mkspecsfreebsd-g++qmake.conf
+++ b/devel/qt4-qmake/files/patch-mkspecsfreebsd-g++qmake.conf
--- a/devel/qt4-qmake/files/patch-option.cpp
+++ b/devel/qt4-qmake/files/patch-option.cpp
--- a/devel/qt4-qmake/files/qconfig.cpp.in
+++ b/devel/qt4-qmake/files/qconfig.cpp.in
--- a/devel/qt4-qmake/pkg-plist
+++ b/devel/qt4-qmake/pkg-plist
@ -1,4 +1,4 @@
-%%QT_BINDIR%%/qmake-qt4
+%%QT_BINDIR%%/qmake
 %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf
 %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h
 %%QT_MKSPECDIR%%/aix-g++/qmake.conf
--- a/devel/qt4-qmlviewer/Makefile
+++ b/devel/qt4-qmlviewer/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qmlviewer
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qt3support
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qvfb
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-qvfb/pkg-plist
+++ b/devel/qt4-qvfb/pkg-plist
@ -1,3 +1,3 @@
-%%QT_BINDIR%%/qvfb-qt4
-%%DEBUG%%%%QT_BINDIR%%/qvfb-qt4.debug
+%%QT_BINDIR%%/qvfb
+%%DEBUG%%%%QT_BINDIR%%/qvfb.debug
 share/pixmaps/qvfb-qt4.png
--- a/devel/qt4-rcc/Makefile
+++ b/devel/qt4-rcc/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	rcc
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-script/Makefile
+++ b/devel/qt4-script/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	script
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-scripttools/Makefile
+++ b/devel/qt4-scripttools/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	scripttools
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-testlib/Makefile
+++ b/devel/qt4-testlib/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	testlib
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-uic/Makefile
+++ b/devel/qt4-uic/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	uic
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt4-uic/pkg-plist
+++ b/devel/qt4-uic/pkg-plist
@ -1,2 +1,2 @@
-%%QT_BINDIR%%/uic-qt4
-%%DEBUG%%%%QT_BINDIR%%/uic-qt4.debug
+%%QT_BINDIR%%/uic
+%%DEBUG%%%%QT_BINDIR%%/uic.debug
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	uic3
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

--- a/devel/qt5-concurrent/pkg-plist
+++ b/devel/qt5-concurrent/pkg-plist
@ -20,8 +20,8 @@
 %%QT_INCDIR%%/QtConcurrent/qtconcurrentstoredfunctioncall.h
 %%QT_INCDIR%%/QtConcurrent/qtconcurrentthreadengine.h
 %%QT_INCDIR%%/QtConcurrent/qtconcurrentversion.h
-%%QT_LIBDIR%%/cmake/Qt5Concurrent/Qt5ConcurrentConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Concurrent/Qt5ConcurrentConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Concurrent/Qt5ConcurrentConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Concurrent/Qt5ConcurrentConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5Concurrent.prl
 %%QT_LIBDIR%%/libQt5Concurrent.so
 %%QT_LIBDIR%%/libQt5Concurrent.so.5
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@ -2,7 +2,6 @@

 PORTNAME=	core
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-

@ -22,11 +21,11 @@ HAS_CONFIGURE=	yes
 # that need to be detected).
 CONFIGURE_ARGS=	-no-accessibility -no-gif -no-libpng -no-libjpeg \
 		-no-openssl -no-gui -no-widgets -no-cups \
-		-no-iconv -no-dbus -no-xcb -no-opengl \
+		-no-iconv -no-dbus -no-opengl \
 		-no-alsa -no-egl -no-evdev -no-feature-concurrent \
-		-no-fontconfig -no-freetype -no-gtkstyle -no-harfbuzz \
-		-no-libudev -no-pulseaudio -no-xcb -no-xinput -no-xkb \
-		-no-xkbcommon -no-xrender -no-xshape -no-xsync -no-xvideo
+		-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \
+		-no-libudev -no-pulseaudio -no-xcb -no-xinput2 -no-xkb -no-xcb-xlib \
+		-no-xkbcommon -no-xrender -no-xshape -no-xsync -no-libinput
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

 BUILD_WRKSRC=	${WRKSRC}/src/corelib
--- a/devel/qt5-core/files/patch-git_ea9a8672
+++ b/devel/qt5-core/files/patch-git_ea9a8672
@ -0,0 +1,25 @@
+From ea9a8672a19588e89c0bda8e0c31424687c1e05f Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Thu, 3 Nov 2016 12:14:56 -0700
+Subject: [PATCH] Fix build with ICC on macOS: <atomic> is properly supported
+
+I'm guess I introduced the regression in the commit
+18ed6f20ad4327fa2ffbb687ac2f3ca7429c4348, which I wasn't sure about.
+
+Change-Id: Ic46ff326a6ba46bc877cfffd14839f84fdf796e7
+Reviewed-by: Jake Petroules <jake.petroules@qt.io>
+--- src/corelib/global/qcompilerdetection.h.orig	2017-02-10 22:14:51 UTC
+++ src/corelib/global/qcompilerdetection.h
+@@ -1066,12 +1066,6 @@
+ #  ifndef _HAS_VARIADIC_TEMPLATES
+ #   undef Q_COMPILER_VARIADIC_TEMPLATES
+ #  endif
+-# elif defined(_LIBCPP_VERSION)
+-// libc++ uses __has_feature(cxx_atomic), so disable the feature if the compiler
+-// doesn't support it. That's required for the Intel compiler 14.x or earlier on OS X, for example.
+-#  if !__has_feature(cxx_atomic)
+-#   undef Q_COMPILER_ATOMICS
+-#  endif
+ # endif
+ # if defined(Q_COMPILER_THREADSAFE_STATICS) && defined(Q_OS_MAC)
+ // Apple's low-level implementation of the C++ support library
--- a/devel/qt5-core/files/patch-src_corelib_corelib.pro
+++ b/devel/qt5-core/files/patch-src_corelib_corelib.pro
@ -0,0 +1,32 @@
+As we moved the libraries of Qt5 from /usr/local/lib to  /usr/local/lib/qt5 the
+cmake files would get installed into /usr/local/lib/qt5/cmake. This however is
+not really convenient for use with other applications depending on Qt via cmake.
+
+For ports we could modify cmake.mk to always append /usr/local/lib/qt5 to the
+search path. This would however still break applications outside of the ports
+tree that users want to compile via cmake. An other option would be to patch
+devel/cmake to add /usr/local/lib/qt5/cmake to the default search paths.
+
+We chose the third option. To patch qmake's internal cmake generation function
+to fix up the paths so that cmake files still land in the the "correct" location
+in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
+
+
+
+--- src/corelib/corelib.pro.orig	2017-02-04 18:51:27 UTC
+++ src/corelib/corelib.pro
+@@ -113,12 +113,12 @@ cmake_extras_mkspec_dir_for_install.inpu
+ cmake_extras_mkspec_dir_for_install.output = $$DESTDIR/cmake/install/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
+
+ cmake_qt5_umbrella_module_files.files = $$cmake_umbrella_config_file.output $$cmake_umbrella_config_version_file.output
+-cmake_qt5_umbrella_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5
+cmake_qt5_umbrella_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5
+
+ QMAKE_SUBSTITUTES += ctest_macros_file cmake_umbrella_config_file cmake_umbrella_config_version_file cmake_extras_mkspec_dir cmake_extras_mkspec_dir_for_install
+
+ ctest_qt5_module_files.files += $$ctest_macros_file.output $$cmake_extras_mkspec_dir_for_install.output
+
+-ctest_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5Core
+ctest_qt5_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5Core
+
+ INSTALLS += ctest_qt5_module_files cmake_qt5_umbrella_module_files
--- a/devel/qt5-core/pkg-plist
+++ b/devel/qt5-core/pkg-plist
@ -24,10 +24,10 @@
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetimeparser_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeuckrcodec_p.h
-%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_blackberry_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_cf_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_glib_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_unix_p.h
@ -103,6 +103,7 @@
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qorderedmutexlocker_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qparallelanimationgroup_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpodlist_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpoll_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsattribute_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsattributeprivate_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsobject_p.h
@ -176,7 +177,6 @@
 %%QT_INCDIR%%/QtCore/QAtomicInt
 %%QT_INCDIR%%/QtCore/QAtomicInteger
 %%QT_INCDIR%%/QtCore/QAtomicPointer
-%%QT_INCDIR%%/QtCore/QBBSystemLocaleData
 %%QT_INCDIR%%/QtCore/QBasicMutex
 %%QT_INCDIR%%/QtCore/QBasicTimer
 %%QT_INCDIR%%/QtCore/QBitArray
@ -197,6 +197,7 @@
 %%QT_INCDIR%%/QtCore/QCollatorSortKey
 %%QT_INCDIR%%/QtCore/QCommandLineOption
 %%QT_INCDIR%%/QtCore/QCommandLineParser
+%%QT_INCDIR%%/QtCore/QConstOverload
 %%QT_INCDIR%%/QtCore/QContiguousCache
 %%QT_INCDIR%%/QtCore/QContiguousCacheData
 %%QT_INCDIR%%/QtCore/QContiguousCacheTypedData
@ -319,6 +320,7 @@
 %%QT_INCDIR%%/QtCore/QMutex
 %%QT_INCDIR%%/QtCore/QMutexLocker
 %%QT_INCDIR%%/QtCore/QNoDebug
+%%QT_INCDIR%%/QtCore/QNonConstOverload
 %%QT_INCDIR%%/QtCore/QObject
 %%QT_INCDIR%%/QtCore/QObjectCleanupHandler
 %%QT_INCDIR%%/QtCore/QObjectData
@ -448,6 +450,8 @@
 %%QT_INCDIR%%/QtCore/QXmlStreamStringRef
 %%QT_INCDIR%%/QtCore/QXmlStreamWriter
 %%QT_INCDIR%%/QtCore/Q_PID
+%%QT_INCDIR%%/QtCore/Q_SECURITY_ATTRIBUTES
+%%QT_INCDIR%%/QtCore/Q_STARTUPINFO
 %%QT_INCDIR%%/QtCore/Qt
 %%QT_INCDIR%%/QtCore/QtAlgorithms
 %%QT_INCDIR%%/QtCore/QtCleanUpFunction
@ -479,16 +483,9 @@
 %%QT_INCDIR%%/QtCore/qarraydataops.h
 %%QT_INCDIR%%/QtCore/qarraydatapointer.h
 %%QT_INCDIR%%/QtCore/qatomic.h
-%%QT_INCDIR%%/QtCore/qatomic_armv5.h
-%%QT_INCDIR%%/QtCore/qatomic_armv6.h
-%%QT_INCDIR%%/QtCore/qatomic_armv7.h
 %%QT_INCDIR%%/QtCore/qatomic_bootstrap.h
 %%QT_INCDIR%%/QtCore/qatomic_cxx11.h
-%%QT_INCDIR%%/QtCore/qatomic_gcc.h
-%%QT_INCDIR%%/QtCore/qatomic_ia64.h
 %%QT_INCDIR%%/QtCore/qatomic_msvc.h
-%%QT_INCDIR%%/QtCore/qatomic_unix.h
-%%QT_INCDIR%%/QtCore/qatomic_x86.h
 %%QT_INCDIR%%/QtCore/qbasicatomic.h
 %%QT_INCDIR%%/QtCore/qbasictimer.h
 %%QT_INCDIR%%/QtCore/qbitarray.h
@ -563,7 +560,6 @@
 %%QT_INCDIR%%/QtCore/qlinkedlist.h
 %%QT_INCDIR%%/QtCore/qlist.h
 %%QT_INCDIR%%/QtCore/qlocale.h
-%%QT_INCDIR%%/QtCore/qlocale_blackberry.h
 %%QT_INCDIR%%/QtCore/qlockfile.h
 %%QT_INCDIR%%/QtCore/qlogging.h
 %%QT_INCDIR%%/QtCore/qloggingcategory.h
@ -660,14 +656,14 @@
 %%QT_INCDIR%%/QtCore/qwaitcondition.h
 %%QT_INCDIR%%/QtCore/qwineventnotifier.h
 %%QT_INCDIR%%/QtCore/qxmlstream.h
-%%QT_LIBDIR%%/cmake/Qt5/Qt5Config.cmake
-%%QT_LIBDIR%%/cmake/Qt5/Qt5ConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CTestMacros.cmake
-%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
-%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
-%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreMacros.cmake
+%%QT_CMAKEDIR%%/Qt5/Qt5Config.cmake
+%%QT_CMAKEDIR%%/Qt5/Qt5ConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Core/Qt5CTestMacros.cmake
+%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigExtras.cmake
+%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
+%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreMacros.cmake
 %%QT_LIBDIR%%/libQt5Core.prl
 %%QT_LIBDIR%%/libQt5Core.so
 %%QT_LIBDIR%%/libQt5Core.so.5
@ -677,5 +673,3 @@
 %%QT_MKSPECDIR%%/modules/qt_lib_core.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_core_private.pri
 libdata/pkgconfig/Qt5Core.pc
-@comment Ensure that a (even empty) qconfig-modules.h exists.
-@exec touch %%QT_INCDIR%%/QtCore/qconfig-modules.h
--- a/devel/qt5-dbus/Makefile
+++ b/devel/qt5-dbus/Makefile
--- a/devel/qt5-dbus/pkg-plist
+++ b/devel/qt5-dbus/pkg-plist
@ -62,10 +62,10 @@
 %%QT_INCDIR%%/QtDBus/qdbusunixfiledescriptor.h
 %%QT_INCDIR%%/QtDBus/qdbusvirtualobject.h
 %%QT_INCDIR%%/QtDBus/qtdbusversion.h
-%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake
-%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusMacros.cmake
+%%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfig.cmake
+%%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfigExtras.cmake
+%%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusMacros.cmake
 %%QT_LIBDIR%%/libQt5DBus.prl
 %%QT_LIBDIR%%/libQt5DBus.so
 %%QT_LIBDIR%%/libQt5DBus.so.5
--- a/devel/qt5-designer/pkg-plist
+++ b/devel/qt5-designer/pkg-plist
@ -174,10 +174,11 @@
 %%QT_INCDIR%%/QtDesignerComponents/QtDesignerComponentsDepends
 %%QT_INCDIR%%/QtDesignerComponents/QtDesignerComponentsVersion
 %%QT_INCDIR%%/QtDesignerComponents/qtdesignercomponentsversion.h
-%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5DesignerConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5DesignerConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
+%%QT_BINDIR%%/designer
 %%QT_LIBDIR%%/libQt5Designer.prl
 %%QT_LIBDIR%%/libQt5Designer.so
 %%QT_LIBDIR%%/libQt5Designer.so.5
@ -190,7 +191,6 @@
 %%QT_LIBDIR%%/libQt5DesignerComponents.so.%%SHORTVER%%
 %%QT_LIBDIR%%/libQt5DesignerComponents.so.%%FULLVER%%
 %%DEBUG%%%%QT_LIBDIR%%/libQt5DesignerComponents.so.%%FULLVER%%.debug
-%%QT_BINDIR%%/designer
 %%QT_MKSPECDIR%%/modules/qt_lib_designer.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_designer_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_designercomponents_private.pri
--- a/devel/qt5-help/Makefile
+++ b/devel/qt5-help/Makefile
@ -2,7 +2,6 @@

 PORTNAME=	help
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-

--- a/devel/qt5-help/files/patch-srcassistantassistant.pro
+++ b/devel/qt5-help/files/patch-srcassistantassistant.pro
@ -1,10 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.

-clucene/ is built in textproc/clucene-qt5, assistant/ is built in
-devel/qt5-assistant.
+assistant/ is built in devel/qt5-assistant.

--- src/assistant/assistant.pro.orig	2016-08-31 07:07:13 UTC
+--- src/assistant/assistant.pro.orig	2016-06-10 14:46:48 UTC
 +++ src/assistant/assistant.pro
@@ -2,19 +2,16 @@ TEMPLATE = subdirs
 
--- a/devel/qt5-help/pkg-plist
+++ b/devel/qt5-help/pkg-plist
@ -57,15 +57,16 @@
 %%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h
 %%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h
 %%QT_INCDIR%%/QtHelp/qthelpversion.h
-%%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfigExtras.cmake
-%%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Help/Qt5HelpConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Help/Qt5HelpConfigExtras.cmake
+%%QT_CMAKEDIR%%/Qt5Help/Qt5HelpConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5CLucene.prl
 %%QT_LIBDIR%%/libQt5CLucene.so
 %%QT_LIBDIR%%/libQt5CLucene.so.5
 %%QT_LIBDIR%%/libQt5CLucene.so.%%SHORTVER%%
 %%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%
 %%DEBUG%%%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%.debug
+%%QT_MKSPECDIR%%/modules/qt_lib_clucene_private.pri
 %%QT_LIBDIR%%/libQt5Help.prl
 %%QT_LIBDIR%%/libQt5Help.so
 %%QT_LIBDIR%%/libQt5Help.so.5
@ -75,7 +76,6 @@
 %%QT_BINDIR%%/qcollectiongenerator
 %%QT_BINDIR%%/qhelpconverter
 %%QT_BINDIR%%/qhelpgenerator
-%%QT_MKSPECDIR%%/modules/qt_lib_clucene_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_help.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
 libdata/pkgconfig/Qt5Help.pc
--- a/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro
+++ b/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro
@ -0,0 +1,41 @@
+As we moved the libraries of Qt5 from /usr/local/lib to  /usr/local/lib/qt5 the
+cmake files would get installed into /usr/local/lib/qt5/cmake. This howeever is
+not really convenient for use with other applications depending on Qt via cmake.
+
+For ports we could modify cmake.mk to always append /usr/local/lib/qt5 to the
+search path. This would however still break applications outside of the ports
+tree that users want to compile via cmake. An other option would be to patch
+devel/cmake to add /usr/local/lib/qt5/cmake to the default search paths.
+
+We chose the third option. To patch qmake's internal cmake generation function
+to fix up the paths so that cmake files still land in the the "correct" location
+in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
+
+--- src/linguist/linguist.pro.orig	2016-06-03 17:47:52 UTC
+++ src/linguist/linguist.pro
+@@ -17,7 +17,7 @@ CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPa
+ contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
+ 
+ CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
+-!contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
+!contains(CMAKE_LIB_DIR,"^\\.\\./.*")|freebsd {
+     CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])
+     # We need to go up another two levels because the CMake files are
+     # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}
+@@ -27,7 +27,7 @@ CMAKE_LIB_DIR = $$cmakeRelativePath($$[Q
+ }
+ 
+ CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
+-contains(CMAKE_BIN_DIR, "^\\.\\./.*") {
+contains(CMAKE_BIN_DIR, "^\\.\\./.*")|freebsd {
+     CMAKE_BIN_DIR = $$[QT_HOST_BINS]/
+     CMAKE_BIN_DIR_IS_ABSOLUTE = True
+ }
+@@ -45,6 +45,6 @@ cmake_linguist_macros_file.CONFIG = verb
+ QMAKE_SUBSTITUTES += cmake_linguist_config_file cmake_linguist_config_version_file cmake_linguist_macros_file
+ 
+ cmake_linguist_tools_files.files += $$cmake_linguist_config_file.output $$cmake_linguist_config_version_file.output $$cmake_linguist_macros_file.output
+-cmake_linguist_tools_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5LinguistTools
+cmake_linguist_tools_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5LinguistTools
+ cmake_linguist_tools_files.CONFIG = no_check_exists
+ INSTALLS += cmake_linguist_tools_files
--- a/devel/qt5-linguisttools/pkg-plist
+++ b/devel/qt5-linguisttools/pkg-plist
@ -1,6 +1,6 @@
-%%QT_LIBDIR%%/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
+%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
 %%QT_BINDIR%%/lconvert
 %%QT_BINDIR%%/lrelease
 %%QT_BINDIR%%/lupdate
--- a/devel/qt5-location/pkg-plist
+++ b/devel/qt5-location/pkg-plist
@ -10,15 +10,17 @@
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaneuver_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p_p.h
-%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomapcontroller_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanager_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanager_p_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanagerengine_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanagerengine_p_p.h
-%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomapscene_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaptype_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaptype_p_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroute_p.h
+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparser_p.h
+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparser_p_p.h
+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparserosrmv4_p.h
+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparserosrmv5_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutereply_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouterequest_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutesegment_p.h
@ -31,6 +33,7 @@
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapreply_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapreply_p_p.h
+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapscene_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilefetcher_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilefetcher_p_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilerequestmanager_p.h
@ -190,15 +193,15 @@
 %%QT_INCDIR%%/QtPositioning/qnmeapositioninfosource.h
 %%QT_INCDIR%%/QtPositioning/qpositioningglobal.h
 %%QT_INCDIR%%/QtPositioning/qtpositioningversion.h
-%%QT_LIBDIR%%/cmake/Qt5Location/Qt5LocationConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Location/Qt5LocationConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapbox.cmake
-%%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake
-%%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake
-%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5PositioningConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
-%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake
+%%QT_CMAKEDIR%%/Qt5Location/Qt5LocationConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Location/Qt5LocationConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapbox.cmake
+%%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake
+%%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake
+%%QT_CMAKEDIR%%/Qt5Positioning/Qt5PositioningConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Positioning/Qt5PositioningConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
+%%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake
 %%QT_LIBDIR%%/libQt5Location.prl
 %%QT_LIBDIR%%/libQt5Location.so
 %%QT_LIBDIR%%/libQt5Location.so.5
--- a/devel/qt5-qmake/Makefile
+++ b/devel/qt5-qmake/Makefile
@ -2,7 +2,6 @@

 PORTNAME=	qmake
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-

@ -10,7 +9,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt Makefile generator

 USE_QT5=	# empty
-USES=		pkgconfig shebangfix
+USES=		compiler:c++11-lib pkgconfig shebangfix
 SHEBANG_FILES=	util/harfbuzz/update-harfbuzz \
 		util/unicode/x11/makeencodings \
 		src/3rdparty/freetype/src/tools/afblue.pl
@ -21,14 +20,14 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-no-accessibility -no-openssl -no-gui -no-cups \
 		-no-iconv -no-icu -no-dbus -no-xcb -no-opengl \
 		-no-glib -no-audio-backend -no-fontconfig \
-		-no-gtkstyle -no-xinput2 -no-xrender \
+		-no-gtk -no-xinput2 -no-xrender \
 		-no-evdev -no-xkbcommon -no-alsa \
 		-no-freetype -no-gif -no-harfbuzz -no-libjpeg \
 		-no-libpng -no-pulseaudio -no-widgets
 # Features yet to be removed from qconfig.pri.
 TBR_CONFIG=	concurrent|inotify|xlib
 QMAKESPEC=	${WRKSRC}/mkspecs/freebsd-${QMAKE_COMPILER}
-INSTALL_TARGET=	install_qmake install_mkspecs
+INSTALL_TARGET=	sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs

 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}

@ -36,6 +35,7 @@ post-patch:
 # Prevent qconfig.pri from being module dependent.
 	@${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \
 		${WRKSRC}/configure
+# Clean up files created by patching
 	@${RM} ${WRKSRC}/mkspecs/*/*.orig

 post-build:
--- a/devel/qt5-qmake/files/patch-configure
+++ b/devel/qt5-qmake/files/patch-configure
@ -1,9 +1,6 @@
-Make sure only qmake is built, as the rest of Qt is built
-in other ports.
-
--- configure.orig	2016-08-24 08:18:37 UTC
+--- configure.orig	2016-02-24 19:25:11 UTC
 +++ configure
-@@ -4115,11 +4115,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then
+@@ -4108,11 +4108,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then
         echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile"
         echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile"
         echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile"
@ -18,7 +15,7 @@ in other ports.
         echo "EXEEXT = $EXEEXT" >> "$mkfile"
         echo "RM_F = rm -f" >> "$mkfile"
         echo "RM_RF = rm -rf" >> "$mkfile"
-@@ -4138,6 +4138,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then
+@@ -4131,6 +4131,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then
             fi
         fi
     done
--- a/devel/qt5-qmake/files/patch-mkspecscommonfreebsd.conf
+++ b/devel/qt5-qmake/files/patch-mkspecscommonfreebsd.conf
@ -0,0 +1,43 @@
+--- ./mkspecs/common/freebsd.conf.orig	2013-12-05 17:36:29.064198097 +0000
+++ ./mkspecs/common/freebsd.conf	2013-12-05 17:38:34.413200492 +0000
+@@ -0,0 +1,40 @@
+#
+# qmake configuration for FreeBSD
+#
+
+MAKEFILE_GENERATOR      = UNIX
+QMAKE_PLATFORM          = freebsd bsd
+
+QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
+
+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
+
+# Addon software goes into /usr/local on the BSDs, by default we will look there
+QMAKE_INCDIR            = %%LOCALBASE%%/include
+QMAKE_LIBDIR            = %%LOCALBASE%%/lib
+
+# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h.
+QMAKE_INCDIR_OPENGL     = %%LOCALBASE%%/include
+QMAKE_LIBDIR_OPENGL     = %%LOCALBASE%%/lib
+
+QMAKE_LFLAGS_NOUNDEF    = -Wl,--no-undefined
+QMAKE_LFLAGS_THREAD     = -pthread
+
+QMAKE_LIBS              =
+QMAKE_LIBS_DYNLOAD      =
+QMAKE_LIBS_EXECINFO     = -lexecinfo
+QMAKE_LIBS_X11          = -lXext -lX11 -lm
+QMAKE_LIBS_OPENGL       = -lGL
+QMAKE_LIBS_THREAD       =
+
+QMAKE_AR                = ar cqs
+QMAKE_OBJCOPY           = objcopy
+QMAKE_NM                = nm -P
+QMAKE_RANLIB            =
+
+QMAKE_STRIP             = strip
+QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
+QMAKE_INSTALL_FILE      = install -m 644 -p
+QMAKE_INSTALL_PROGRAM   = install -m 755 -p
+
+include(unix.conf)
--- a/devel/qt5-qmake/pkg-plist
+++ b/devel/qt5-qmake/pkg-plist
@ -11,10 +11,6 @@
 %%QT_MKSPECDIR%%/android-clang/qplatformdefs.h
 %%QT_MKSPECDIR%%/android-g++/qmake.conf
 %%QT_MKSPECDIR%%/android-g++/qplatformdefs.h
-%%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qmake.conf
-%%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qplatformdefs.h
-%%QT_MKSPECDIR%%/blackberry-x86-qcc/qmake.conf
-%%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h
 %%QT_MKSPECDIR%%/common/aix/qplatformdefs.h
 %%QT_MKSPECDIR%%/common/android-base-head.conf
 %%QT_MKSPECDIR%%/common/android-base-tail.conf
@ -25,6 +21,7 @@
 %%QT_MKSPECDIR%%/common/c89/qplatformdefs.h
 %%QT_MKSPECDIR%%/common/clang-mac.conf
 %%QT_MKSPECDIR%%/common/clang.conf
+%%QT_MKSPECDIR%%/common/freebsd.conf
 %%QT_MKSPECDIR%%/common/g++-base.conf
 %%QT_MKSPECDIR%%/common/g++-macx.conf
 %%QT_MKSPECDIR%%/common/g++-unix.conf
@ -32,6 +29,10 @@
 %%QT_MKSPECDIR%%/common/gcc-base-mac.conf
 %%QT_MKSPECDIR%%/common/gcc-base-unix.conf
 %%QT_MKSPECDIR%%/common/gcc-base.conf
+%%QT_MKSPECDIR%%/common/ghs-base.conf
+%%QT_MKSPECDIR%%/common/ghs-integrity-armv7.conf
+%%QT_MKSPECDIR%%/common/ghs-integrity-x86.conf
+%%QT_MKSPECDIR%%/common/integrity/qplatformdefs.h
 %%QT_MKSPECDIR%%/common/ios.conf
 %%QT_MKSPECDIR%%/common/ios/GLES2/gl2.h
 %%QT_MKSPECDIR%%/common/ios/clang.conf
@ -97,10 +98,16 @@
 %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qmake.conf
 %%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qplatformdefs.h
+%%QT_MKSPECDIR%%/devices/linux-drive-cx-g++/qmake.conf
+%%QT_MKSPECDIR%%/devices/linux-drive-cx-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qmake.conf
 %%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qmake.conf
 %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h
+%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qmake.conf
+%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qplatformdefs.h
+%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qmake.conf
+%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qmake.conf
 %%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp
@ -128,6 +135,7 @@
 %%QT_MKSPECDIR%%/devices/linux-tegra2-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/features/android/android.prf
 %%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf
+%%QT_MKSPECDIR%%/features/android/sdk.prf
 %%QT_MKSPECDIR%%/features/benchmark.prf
 %%QT_MKSPECDIR%%/features/build_pass.prf
 %%QT_MKSPECDIR%%/features/cmake_functions.prf
@ -166,11 +174,13 @@
 %%QT_MKSPECDIR%%/features/link_ltcg.prf
 %%QT_MKSPECDIR%%/features/link_pkgconfig.prf
 %%QT_MKSPECDIR%%/features/ltcg.prf
+%%QT_MKSPECDIR%%/features/mac/asset_catalogs.prf
 %%QT_MKSPECDIR%%/features/mac/default_post.prf
 %%QT_MKSPECDIR%%/features/mac/default_pre.prf
 %%QT_MKSPECDIR%%/features/mac/objective_c.prf
 %%QT_MKSPECDIR%%/features/mac/rez.prf
 %%QT_MKSPECDIR%%/features/mac/sdk.prf
+%%QT_MKSPECDIR%%/features/mac/toolchain.prf
 %%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf
 %%QT_MKSPECDIR%%/features/moc.prf
 %%QT_MKSPECDIR%%/features/no_debug_info.prf
@ -222,6 +232,7 @@
 %%QT_MKSPECDIR%%/features/testcase_targets.prf
 %%QT_MKSPECDIR%%/features/testcocoon.prf
 %%QT_MKSPECDIR%%/features/testlib_defines.prf
+%%QT_MKSPECDIR%%/features/toolchain.prf
 %%QT_MKSPECDIR%%/features/uic.prf
 %%QT_MKSPECDIR%%/features/unix/bsymbolic_functions.prf
 %%QT_MKSPECDIR%%/features/unix/hide_symbols.prf
@ -284,6 +295,12 @@
 %%QT_MKSPECDIR%%/hpuxi-g++-64/qplatformdefs.h
 %%QT_MKSPECDIR%%/hurd-g++/qmake.conf
 %%QT_MKSPECDIR%%/hurd-g++/qplatformdefs.h
+%%QT_MKSPECDIR%%/integrity-armv7-imx6/qmake.conf
+%%QT_MKSPECDIR%%/integrity-armv7-imx6/qplatformdefs.h
+%%QT_MKSPECDIR%%/integrity-armv7/qmake.conf
+%%QT_MKSPECDIR%%/integrity-armv7/qplatformdefs.h
+%%QT_MKSPECDIR%%/integrity-x86/qmake.conf
+%%QT_MKSPECDIR%%/integrity-x86/qplatformdefs.h
 %%QT_MKSPECDIR%%/irix-cc-64/qmake.conf
 %%QT_MKSPECDIR%%/irix-cc-64/qplatformdefs.h
 %%QT_MKSPECDIR%%/irix-cc/qmake.conf
@ -395,6 +412,7 @@
 %%QT_MKSPECDIR%%/qconfig.pri
 %%QT_MKSPECDIR%%/qdevice.pri
 %%QT_MKSPECDIR%%/qfeatures.pri
+%%QT_MKSPECDIR%%/qhost.pri
 %%QT_MKSPECDIR%%/qmodule.pri
 %%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qmake.conf
 %%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qplatformdefs.h
@ -428,9 +446,6 @@
 %%QT_MKSPECDIR%%/unixware-cc/qplatformdefs.h
 %%QT_MKSPECDIR%%/unixware-g++/qmake.conf
 %%QT_MKSPECDIR%%/unixware-g++/qplatformdefs.h
-%%QT_MKSPECDIR%%/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp
-%%QT_MKSPECDIR%%/unsupported/android-g++/qmake.conf
-%%QT_MKSPECDIR%%/unsupported/android-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf
 %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qmake.conf
@ -449,6 +464,8 @@
 %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
 %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qmake.conf
 %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qplatformdefs.h
+%%QT_MKSPECDIR%%/win32-clang-msvc2015/qmake.conf
+%%QT_MKSPECDIR%%/win32-clang-msvc2015/qplatformdefs.h
 %%QT_MKSPECDIR%%/win32-g++/qmake.conf
 %%QT_MKSPECDIR%%/win32-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/win32-icc/qmake.conf
--- a/devel/qt5-script/pkg-plist
+++ b/devel/qt5-script/pkg-plist
@ -56,8 +56,8 @@
 %%QT_INCDIR%%/QtScript/qscriptvalueiterator.h
 %%QT_INCDIR%%/QtScript/qtscriptglobal.h
 %%QT_INCDIR%%/QtScript/qtscriptversion.h
-%%QT_LIBDIR%%/cmake/Qt5Script/Qt5ScriptConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Script/Qt5ScriptConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Script/Qt5ScriptConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Script/Qt5ScriptConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5Script.prl
 %%QT_LIBDIR%%/libQt5Script.so
 %%QT_LIBDIR%%/libQt5Script.so.5
--- a/devel/qt5-scripttools/pkg-plist
+++ b/devel/qt5-scripttools/pkg-plist
@ -88,8 +88,8 @@
 %%QT_INCDIR%%/QtScriptTools/QtScriptToolsVersion
 %%QT_INCDIR%%/QtScriptTools/qscriptenginedebugger.h
 %%QT_INCDIR%%/QtScriptTools/qtscripttoolsversion.h
-%%QT_LIBDIR%%/cmake/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5ScriptTools/Qt5ScriptToolsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5ScriptTools/Qt5ScriptToolsConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5ScriptTools.prl
 %%QT_LIBDIR%%/libQt5ScriptTools.so
 %%QT_LIBDIR%%/libQt5ScriptTools.so.5
--- a/devel/qt5-scxml/Makefile
+++ b/devel/qt5-scxml/Makefile
@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME=	scxml
+DISTVERSION=	${QT5_VERSION}
+CATEGORIES=	devel
+PKGNAMEPREFIX=	qt5-
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Qt5 SXCML module
+
+USE_QT5=	core network qml buildtools_build
+QT_DIST=	${PORTNAME}
+USES=		qmake
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
+
+.include <bsd.port.mk>
--- a/devel/qt5-scxml/pkg-plist
+++ b/devel/qt5-scxml/pkg-plist
@ -0,0 +1,63 @@
+%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlcppdatamodel_p.h
+%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmldatamodel_p.h
+%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlecmascriptplatformproperties_p.h
+%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlevent_p.h
+%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlexecutablecontent_p.h
+%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlglobals_p.h
+%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlparser_p.h
+%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlqstates_p.h
+%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlstatemachine_p.h
+%%QT_INCDIR%%/QtScxml/QScxmlBaseTransition
+%%QT_INCDIR%%/QtScxml/QScxmlCppDataModel
+%%QT_INCDIR%%/QtScxml/QScxmlDataModel
+%%QT_INCDIR%%/QtScxml/QScxmlEcmaScriptDataModel
+%%QT_INCDIR%%/QtScxml/QScxmlError
+%%QT_INCDIR%%/QtScxml/QScxmlEvent
+%%QT_INCDIR%%/QtScxml/QScxmlEventFilter
+%%QT_INCDIR%%/QtScxml/QScxmlFinalState
+%%QT_INCDIR%%/QtScxml/QScxmlHistoryState
+%%QT_INCDIR%%/QtScxml/QScxmlInvokableScxml
+%%QT_INCDIR%%/QtScxml/QScxmlInvokableScxmlServiceFactory
+%%QT_INCDIR%%/QtScxml/QScxmlInvokableService
+%%QT_INCDIR%%/QtScxml/QScxmlInvokableServiceFactory
+%%QT_INCDIR%%/QtScxml/QScxmlInvokeScxmlFactory
+%%QT_INCDIR%%/QtScxml/QScxmlNullDataModel
+%%QT_INCDIR%%/QtScxml/QScxmlParser
+%%QT_INCDIR%%/QtScxml/QScxmlState
+%%QT_INCDIR%%/QtScxml/QScxmlStateMachine
+%%QT_INCDIR%%/QtScxml/QScxmlTableData
+%%QT_INCDIR%%/QtScxml/QScxmlTransition
+%%QT_INCDIR%%/QtScxml/QtScxml
+%%QT_INCDIR%%/QtScxml/QtScxmlDepends
+%%QT_INCDIR%%/QtScxml/QtScxmlVersion
+%%QT_INCDIR%%/QtScxml/qscxmlcppdatamodel.h
+%%QT_INCDIR%%/QtScxml/qscxmldatamodel.h
+%%QT_INCDIR%%/QtScxml/qscxmlecmascriptdatamodel.h
+%%QT_INCDIR%%/QtScxml/qscxmlerror.h
+%%QT_INCDIR%%/QtScxml/qscxmlevent.h
+%%QT_INCDIR%%/QtScxml/qscxmlexecutablecontent.h
+%%QT_INCDIR%%/QtScxml/qscxmlglobals.h
+%%QT_INCDIR%%/QtScxml/qscxmlinvokableservice.h
+%%QT_INCDIR%%/QtScxml/qscxmlnulldatamodel.h
+%%QT_INCDIR%%/QtScxml/qscxmlparser.h
+%%QT_INCDIR%%/QtScxml/qscxmlqstates.h
+%%QT_INCDIR%%/QtScxml/qscxmlstatemachine.h
+%%QT_INCDIR%%/QtScxml/qscxmltabledata.h
+%%QT_INCDIR%%/QtScxml/qtscxmlversion.h
+%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigVersion.cmake
+%%QT_BINDIR%%/qscxmlc
+%%QT_LIBDIR%%/libQt5Scxml.prl
+%%QT_LIBDIR%%/libQt5Scxml.so
+%%QT_LIBDIR%%/libQt5Scxml.so.5
+%%QT_LIBDIR%%/libQt5Scxml.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5Scxml.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5Scxml.so.%%FULLVER%%.debug
+%%QT_MKSPECDIR%%/features/qscxmlc.prf
+%%QT_MKSPECDIR%%/modules/qt_lib_scxml.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_scxml_private.pri
+%%QT_QMLDIR%%/QtScxml/libdeclarative_scxml.so
+%%DEBUG%%%%QT_QMLDIR%%/QtScxml/libdeclarative_scxml.so.debug
+%%QT_QMLDIR%%/QtScxml/plugins.qmltypes
+%%QT_QMLDIR%%/QtScxml/qmldir
+libdata/pkgconfig/Qt5Scxml.pc
--- a/devel/qt5-testlib/pkg-plist
+++ b/devel/qt5-testlib/pkg-plist
@ -11,6 +11,7 @@
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qsignaldumper_p.h
+%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qteamcitylogger_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h
@ -62,9 +63,9 @@
 %%QT_INCDIR%%/QtTest/qtestsystem.h
 %%QT_INCDIR%%/QtTest/qtesttouch.h
 %%QT_INCDIR%%/QtTest/qttestversion.h
-%%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfigExtras.cmake
-%%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Test/Qt5TestConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Test/Qt5TestConfigExtras.cmake
+%%QT_CMAKEDIR%%/Qt5Test/Qt5TestConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5Test.prl
 %%QT_LIBDIR%%/libQt5Test.so
 %%QT_LIBDIR%%/libQt5Test.so.5
--- a/devel/qt5-uitools/pkg-plist
+++ b/devel/qt5-uitools/pkg-plist
@ -5,8 +5,8 @@
 %%QT_INCDIR%%/QtUiTools/QtUiToolsVersion
 %%QT_INCDIR%%/QtUiTools/qtuitoolsversion.h
 %%QT_INCDIR%%/QtUiTools/quiloader.h
-%%QT_LIBDIR%%/cmake/Qt5UiTools/Qt5UiToolsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5UiTools/Qt5UiToolsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5UiTools/Qt5UiToolsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5UiTools/Qt5UiToolsConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5UiTools.a
 %%QT_LIBDIR%%/libQt5UiTools.prl
 %%QT_MKSPECDIR%%/modules/qt_lib_uitools.pri
--- a/devel/qt5/Makefile.sqldrivers
+++ b/devel/qt5/Makefile.sqldrivers
@ -16,7 +16,7 @@ CONFIGURE_ARGS+=-no-gui -no-xcb
 BUILD_WRKSRC?=	${WRKSRC}/src/plugins/sqldrivers/${DB:tl}
 INSTALL_WRKSRC?=${BUILD_WRKSRC}

-PLIST_FILES+=	${QT_LIBDIR_REL}/cmake/Qt5Sql/Qt5Sql_Q${DB}DriverPlugin.cmake \
+PLIST_FILES+=	${QT_CMAKEDIR_REL}/Qt5Sql/Qt5Sql_Q${DB}DriverPlugin.cmake \
 		${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so \
 		%%DEBUG%%${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so.debug

--- a/devel/qt5/distinfo
+++ b/devel/qt5/distinfo
@ -1,45 +1,59 @@
-TIMESTAMP = 1476003740
-SHA256 (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941
-SIZE (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = 19763124
-SHA256 (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787
-SIZE (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 46825164
-SHA256 (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad
-SIZE (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = 10836672
-SHA256 (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9
-SIZE (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 2639772
-SHA256 (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da
-SIZE (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 18813016
-SHA256 (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e
-SIZE (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 14751100
-SHA256 (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4
-SIZE (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 1909556
-SHA256 (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a
-SIZE (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 3148448
-SHA256 (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf
-SIZE (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = 3492628
-SHA256 (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c
-SIZE (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5952696
-SHA256 (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1
-SIZE (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 882160
-SHA256 (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e
-SIZE (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = 2587484
-SHA256 (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427
-SIZE (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = 1973888
-SHA256 (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826
-SIZE (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = 234612
-SHA256 (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376
-SIZE (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = 256852
-SHA256 (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e
-SIZE (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = 1723056
-SHA256 (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7
-SIZE (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = 9794512
-SHA256 (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421
-SIZE (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 1204148
-SHA256 (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52
-SIZE (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 119792
-SHA256 (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35
-SIZE (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 171004
-SHA256 (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced
-SIZE (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 33640
-SHA256 (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc
-SIZE (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 1323576
+TIMESTAMP = 1484477552
+SHA256 (KDE/Qt/5.7.1/qt3d-opensource-src-5.7.1.tar.xz) = 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea
+SIZE (KDE/Qt/5.7.1/qt3d-opensource-src-5.7.1.tar.xz) = 19474848
+SHA256 (KDE/Qt/5.7.1/qtbase-opensource-src-5.7.1.tar.xz) = edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e
+SIZE (KDE/Qt/5.7.1/qtbase-opensource-src-5.7.1.tar.xz) = 44992616
+SHA256 (KDE/Qt/5.7.1/qtcanvas3d-opensource-src-5.7.1.tar.xz) = a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4
+SIZE (KDE/Qt/5.7.1/qtcanvas3d-opensource-src-5.7.1.tar.xz) = 10851540
+SHA256 (KDE/Qt/5.7.1/qtcharts-opensource-src-5.7.1.tar.xz) = 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3
+SIZE (KDE/Qt/5.7.1/qtcharts-opensource-src-5.7.1.tar.xz) = 4086256
+SHA256 (KDE/Qt/5.7.1/qtconnectivity-opensource-src-5.7.1.tar.xz) = b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966
+SIZE (KDE/Qt/5.7.1/qtconnectivity-opensource-src-5.7.1.tar.xz) = 2690688
+SHA256 (KDE/Qt/5.7.1/qtdatavis3d-opensource-src-5.7.1.tar.xz) = 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8
+SIZE (KDE/Qt/5.7.1/qtdatavis3d-opensource-src-5.7.1.tar.xz) = 5155740
+SHA256 (KDE/Qt/5.7.1/qtdeclarative-opensource-src-5.7.1.tar.xz) = fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56
+SIZE (KDE/Qt/5.7.1/qtdeclarative-opensource-src-5.7.1.tar.xz) = 18976920
+SHA256 (KDE/Qt/5.7.1/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz) = 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f
+SIZE (KDE/Qt/5.7.1/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz) = 74340
+SHA256 (KDE/Qt/5.7.1/qtgamepad-opensource-src-5.7.1.tar.xz) = bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182
+SIZE (KDE/Qt/5.7.1/qtgamepad-opensource-src-5.7.1.tar.xz) = 360940
+SHA256 (KDE/Qt/5.7.1/qtgraphicaleffects-opensource-src-5.7.1.tar.xz) = 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8
+SIZE (KDE/Qt/5.7.1/qtgraphicaleffects-opensource-src-5.7.1.tar.xz) = 14486948
+SHA256 (KDE/Qt/5.7.1/qtimageformats-opensource-src-5.7.1.tar.xz) = 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4
+SIZE (KDE/Qt/5.7.1/qtimageformats-opensource-src-5.7.1.tar.xz) = 2004376
+SHA256 (KDE/Qt/5.7.1/qtlocation-opensource-src-5.7.1.tar.xz) = f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f
+SIZE (KDE/Qt/5.7.1/qtlocation-opensource-src-5.7.1.tar.xz) = 3194112
+SHA256 (KDE/Qt/5.7.1/qtmultimedia-opensource-src-5.7.1.tar.xz) = a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def
+SIZE (KDE/Qt/5.7.1/qtmultimedia-opensource-src-5.7.1.tar.xz) = 3563676
+SHA256 (KDE/Qt/5.7.1/qtquickcontrols-opensource-src-5.7.1.tar.xz) = 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d
+SIZE (KDE/Qt/5.7.1/qtquickcontrols-opensource-src-5.7.1.tar.xz) = 5943024
+SHA256 (KDE/Qt/5.7.1/qtquickcontrols2-opensource-src-5.7.1.tar.xz) = f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec
+SIZE (KDE/Qt/5.7.1/qtquickcontrols2-opensource-src-5.7.1.tar.xz) = 2212812
+SHA256 (KDE/Qt/5.7.1/qtscript-opensource-src-5.7.1.tar.xz) = 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426
+SIZE (KDE/Qt/5.7.1/qtscript-opensource-src-5.7.1.tar.xz) = 2608180
+SHA256 (KDE/Qt/5.7.1/qtscxml-opensource-src-5.7.1.tar.xz) = 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c
+SIZE (KDE/Qt/5.7.1/qtscxml-opensource-src-5.7.1.tar.xz) = 346948
+SHA256 (KDE/Qt/5.7.1/qtsensors-opensource-src-5.7.1.tar.xz) = ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10
+SIZE (KDE/Qt/5.7.1/qtsensors-opensource-src-5.7.1.tar.xz) = 1987144
+SHA256 (KDE/Qt/5.7.1/qtserialbus-opensource-src-5.7.1.tar.xz) = 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157
+SIZE (KDE/Qt/5.7.1/qtserialbus-opensource-src-5.7.1.tar.xz) = 239676
+SHA256 (KDE/Qt/5.7.1/qtserialport-opensource-src-5.7.1.tar.xz) = 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26
+SIZE (KDE/Qt/5.7.1/qtserialport-opensource-src-5.7.1.tar.xz) = 265616
+SHA256 (KDE/Qt/5.7.1/qtsvg-opensource-src-5.7.1.tar.xz) = b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947
+SIZE (KDE/Qt/5.7.1/qtsvg-opensource-src-5.7.1.tar.xz) = 1751536
+SHA256 (KDE/Qt/5.7.1/qttools-opensource-src-5.7.1.tar.xz) = 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac
+SIZE (KDE/Qt/5.7.1/qttools-opensource-src-5.7.1.tar.xz) = 10011108
+SHA256 (KDE/Qt/5.7.1/qttranslations-opensource-src-5.7.1.tar.xz) = 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7
+SIZE (KDE/Qt/5.7.1/qttranslations-opensource-src-5.7.1.tar.xz) = 1206116
+SHA256 (KDE/Qt/5.7.1/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz) = b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add
+SIZE (KDE/Qt/5.7.1/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz) = 10014088
+SHA256 (KDE/Qt/5.7.1/qtwebchannel-opensource-src-5.7.1.tar.xz) = 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b
+SIZE (KDE/Qt/5.7.1/qtwebchannel-opensource-src-5.7.1.tar.xz) = 122436
+SHA256 (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03
+SIZE (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = 35298736
+SHA256 (KDE/Qt/5.7.1/qtwebsockets-opensource-src-5.7.1.tar.xz) = 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1
+SIZE (KDE/Qt/5.7.1/qtwebsockets-opensource-src-5.7.1.tar.xz) = 193204
+SHA256 (KDE/Qt/5.7.1/qtx11extras-opensource-src-5.7.1.tar.xz) = 5f5a0c2cc66ec01c2f2f31eff32fea26bd0bc03741a5dfd803b13870aa4ce427
+SIZE (KDE/Qt/5.7.1/qtx11extras-opensource-src-5.7.1.tar.xz) = 59656
+SHA256 (KDE/Qt/5.7.1/qtxmlpatterns-opensource-src-5.7.1.tar.xz) = a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5
+SIZE (KDE/Qt/5.7.1/qtxmlpatterns-opensource-src-5.7.1.tar.xz) = 1352472
--- a/devel/qt5/files/extrapatch-configure
+++ b/devel/qt5/files/extrapatch-configure
@ -16,9 +16,9 @@
  as the value of QMAKE_DEFAULT_LIBDIRS in mkspecs/qconfig.pri (which qmake
  uses to filter out those same paths when processing .pro files).

--- configure.orig	2015-03-16 17:16:10.000000000 +0100
-+++ configure	2015-05-01 09:35:38.595937000 +0200
-@@ -3853,7 +3853,7 @@
+--- configure.orig      2015-03-16 17:16:10.000000000 +0100
+++ configure           2016-04-18 12:35:38.595937000 +0200
+@@ -3878,7 +3878,7 @@
 }

 # build qmake
@ -27,7 +27,7 @@
     echo "Creating qmake..."

     mkdir -p "$outpath/qmake" || exit
-@@ -4777,8 +4777,8 @@
+@@ -5045,8 +5045,8 @@
                 SQLITE_AUTODETECT_FAILED="no"
                 if [ "$CFG_SQLITE" = "system" ]; then
                     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then
@ -38,9 +38,9 @@
                     else
                         QT_CFLAGS_SQLITE=
                         QT_LFLAGS_SQLITE="-lsqlite3 -lz"
-@@ -4881,8 +4881,8 @@
- fi
- if [ "$CFG_DBUS" = "linked" ]; then
+@@ -5149,8 +5149,8 @@
+ # runtime: no detection (cannot fail), load libdbus-1 at runtime
+ if [ "$CFG_DBUS" = "auto" ] || [ "$CFG_DBUS" = "linked" ]; then
     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then
 -        QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null`
 -        QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null`
@ -49,7 +49,7 @@
     else
         QT_LIBS_DBUS="-ldbus-1"
     fi
-@@ -4928,8 +4928,8 @@
+@@ -5201,8 +5201,8 @@
 # auto-detect Glib support
 if [ "$CFG_GLIB" != "no" ]; then
     if [ -n "$PKG_CONFIG" ]; then
@ -60,20 +60,20 @@
     fi
     if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then
         CFG_GLIB=yes
-@@ -4952,9 +4952,9 @@
+@@ -5225,9 +5225,9 @@
 # auto-detect GTK style support
- if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then
+ if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "no" ]; then
     if [ -n "$PKG_CONFIG" ]; then
-        QT_CFLAGS_QGTK2=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.18 atk 2>/dev/null`
-        QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null`
+-        QT_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null`
+-        QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null`
 -        QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null`
-+        QT_CFLAGS_QGTK2=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.18 atk 2>/dev/null | filterIncludeOptions`
-+        QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null | filterLibraryOptions`
+        QT_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null | filterIncludeOptions`
+        QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null | filterLibraryOptions`
 +        QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null | filterLibraryOptions`
     fi
-     if [ -n "$QT_CFLAGS_QGTK2" ] ; then
-         CFG_QGTKSTYLE=yes
-@@ -5001,8 +5001,8 @@
+     if [ -n "$QT_CFLAGS_QGTK3" ] ; then
+         CFG_GTK=yes
+@@ -5272,8 +5272,8 @@
 # Auto-detect PulseAudio support
 if [ "$CFG_PULSEAUDIO" != "no" ]; then
     if [ -n "$PKG_CONFIG" ]; then
@ -84,7 +84,7 @@
     fi
     if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then
         CFG_PULSEAUDIO=yes
-@@ -5165,8 +5165,8 @@
+@@ -5436,8 +5436,8 @@
 # auto-detect FontConfig support
 if [ "$CFG_FONTCONFIG" != "no" ]; then
     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then
@ -119,7 +119,7 @@
     fi
     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then
         QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
-@@ -5353,16 +5353,16 @@
+@@ -5631,16 +5631,16 @@
             CFG_XCB="system"
             if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
                 XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape"
@ -151,7 +151,7 @@
         if compileTest qpa/directfb "DirectFB" $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then
             CFG_DIRECTFB=yes
         elif [ "$CFG_DIRECTFB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
-@@ -5470,8 +5470,8 @@
+@@ -5776,8 +5776,8 @@
     if [ "$CFG_XKBCOMMON" != "no" ] && [ "$CFG_XKBCOMMON" != "qt" ]; then
         # Check if there is a suitable system-wide xkbcommon
         if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then
@ -162,7 +162,7 @@

             QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON"
             QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON"
-@@ -5524,9 +5524,9 @@
+@@ -5830,9 +5830,9 @@
     fi

     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then
--- a/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf
+++ b/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf
@ -0,0 +1,77 @@
+As we moved the libraries of Qt5 from /usr/local/lib to  /usr/local/lib/qt5 the
+cmake files would get installed into /usr/local/lib/qt5/cmake. This however is
+not really convenient for use with other applications depending on Qt via cmake.
+
+For ports we could modify cmake.mk to always append /usr/local/lib/qt5 to the
+search path. This would however still break applications outside of the ports
+tree that users want to compile via cmake. An other option would be to patch
+devel/cmake to add /usr/local/lib/qt5/cmake to the default search paths.
+
+We chose the third option. To patch qmake's internal cmake generation function
+to fix up the paths so that cmake files still land in the the "correct" location
+in /usr/local/lib/cmake -- as this seemed to be the least intrusive method.
+
+
+
+--- mkspecs/features/create_cmake.prf.orig	2016-05-11 09:21:02.000000000 +0200
+++ mkspecs/features/create_cmake.prf	2016-06-03 18:21:42.389363000 +0200
+@@ -48,7 +52,7 @@
+ }
+
+ CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])
+-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") {
+contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*")|freebsd {
+     CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/
+     CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
+ }
+@@ -56,7 +60,7 @@
+ !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true
+
+ CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
+-contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
+contains(CMAKE_LIB_DIR,"^\\.\\./.*")|freebsd {
+     CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
+     CMAKE_LIB_DIR_IS_ABSOLUTE = True
+ } else {
+@@ -67,20 +71,20 @@
+ }
+
+ CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
+-contains(CMAKE_BIN_DIR, "^\\.\\./.*") {
+contains(CMAKE_BIN_DIR, "^\\.\\./.*")|freebsd {
+     CMAKE_BIN_DIR = $$[QT_HOST_BINS]/
+     CMAKE_BIN_DIR_IS_ABSOLUTE = True
+ }
+
+ CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX])
+-contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") {
+contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*")|freebsd {
+     CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/
+     CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
+ }
+
+ win32:!wince:!static:!staticlib {
+     CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX])
+-    contains(CMAKE_DLL_DIR, "^\\.\\./.*") {
+    contains(CMAKE_DLL_DIR, "^\\.\\./.*")|freebsd {
+         CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/
+         CMAKE_DLL_DIR_IS_ABSOLUTE = True
+     }
+@@ -167,7 +171,7 @@
+       cmake_target_file
+
+     cmake_qt5_plugin_file.files = $$cmake_target_file.output
+-    cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
+    cmake_qt5_plugin_file.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME}
+     INSTALLS += cmake_qt5_plugin_file
+
+     return()
+@@ -314,7 +318,7 @@
+     cmake_qt5_module_files.files += $$cmake_macros_file.output
+ }
+
+-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
+cmake_qt5_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME}
+
+ # We are generating cmake files. Most developers of Qt are not aware of cmake,
+ # so we require automatic tests to be available. The only module which should
--- a/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf
+++ b/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf
@ -1,7 +1,7 @@
 The first hunk fixes the install location of the pkconfig files:
  FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig
-  qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR
-  respectively as absolute path.
+  qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR.
+  As this is now '${PREFIX}/lib/qt5' we need to go up two levels.

 The second hunk stops qmake from generating la files.

@ -12,7 +12,7 @@ The second hunk stops qmake from generating la files.
 !internal_module:!lib_bundle:if(unix|mingw) {
     CONFIG += create_pc
 -    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-+    QMAKE_PKGCONFIG_DESTDIR = ../libdata/pkgconfig
+    QMAKE_PKGCONFIG_DESTDIR = ../../libdata/pkgconfig
     host_build: \
         QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
     else: \
--- a/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h
+++ b/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h
@ -1,31 +0,0 @@
--- src/corelib/global/qcompilerdetection.h.orig	2015-10-13 04:35:31 UTC
-+++ src/corelib/global/qcompilerdetection.h
-@@ -941,13 +941,26 @@
- #    undef Q_COMPILER_CONSTEXPR
- #  endif
- # endif // Q_OS_QNX
-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
-    && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
-+# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && !defined(_LIBCPP_VERSION)
- // Apple has not updated libstdc++ since 2007, which means it does not have
- // <initializer_list> or std::move. Let's disable these features
-+// The same applies to FreeBSD's base libstdc++ version used in FreeBSD 9.x.
- #  undef Q_COMPILER_INITIALIZER_LISTS
- #  undef Q_COMPILER_RVALUE_REFS
- #  undef Q_COMPILER_REF_QUALIFIERS
-+// FreeBSD's base libstdc++ does not support std::u{16,32}string.
-+#  undef Q_COMPILER_UNICODE_STRINGS
-+// FreeBSD's base libstdc++ does not support std::declval, which is used in
-+// together with noexcept in some headers such as qpair.h (as of Qt 5.5).
-+// Since there is no macro checking for std::declval, just disable noexcept
-+// altogether.
-+#  undef Q_COMPILER_NOEXCEPT
-+// FreeBSD's base libstdc++ is missing constexpr keywords on important
-+// functions like std::numeric_limits<>::min(). Disable constexpr even if clang
-+// advertises support for it.
-+#  undef Q_COMPILER_CONSTEXPR
-+// FreeBSD's base libstdc++ does not support std::nullptr_t.
-+#  undef Q_COMPILER_NULLPTR
- // Also disable <atomic>, since it's clearly not there
- #  undef Q_COMPILER_ATOMICS
- # endif
--- a/devel/subcommander2/files/patch-configure.ac
+++ b/devel/subcommander2/files/patch-configure.ac
@ -149,7 +149,7 @@
   [
     AC_MSG_RESULT([yes])
     AC_DEFINE([SC_HAVE_BDB],[1],[berkeley db])
-@@ -635,11 +624,11 @@
+@@ -635,7 +624,7 @@
 
   QT_BIN="$qt_path/bin"
   QT_PATH="$qt_path"
@ -158,11 +158,6 @@
 
   # extract version numbers of qt
   
-  QT_VERSION=`$QT_BIN/moc -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"`
-+  QT_VERSION=`$QT_BIN/moc-qt4 -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"`
-   QT_MAJOR=`echo $QT_VERSION | sed "s/\(.*\)[[.]].*[[.]].*/\1/"`
-   QT_MINOR=`echo $QT_VERSION | sed "s/.*[[.]]\(.*\)[[.]].*/\1/"`
- 
@@ -669,7 +658,7 @@
     *)
       # any other Unix platform directly link with the libs
--- a/Show More
+++ b/Show More