svn commit: r492793 - in head: Mk/Uses accessibility/qt5-speech comms/qt5-connectivity comms/qt5-sensors comms/qt5-serialbus comms/qt5-serialport databases/qt5-sql databases/qt5-sqldrivers-ibase da...

Tobias C. Berner tcberner at FreeBSD.org
Tue Feb 12 17:43:14 UTC 2019 

Author: tcberner
Date: Tue Feb 12 17:43:00 2019
New Revision: 492793
URL: https://svnweb.freebsd.org/changeset/ports/492793

Log:
  Update Qt5 to 5.12.1
  
  Release announcement:
    https://blog.qt.io/blog/2019/02/01/qt-5-12-1-released/
  Changelog:
    https://wiki.qt.io/Qt_5.12.1_Change_Files
  
  - A change was required to qt-dist.mk to always pass LOCALBASE to qmake,
    as Qt5 has been installed to a prefix for some time now, there should
    not be any harm in that, with respect to it picking up installed versions
    of itself during build.
  
  PR:		235622
  Exp-run by:	antoine

Added:
  head/devel/qt5-location/files/patch-src_plugins_position_position.pro   (contents, props changed)
  head/emulators/qmc2/files/patch-qmc2_imagechecker.cpp   (contents, props changed)
  head/multimedia/phonon/files/
  head/multimedia/phonon/files/patch-git_qt5-5.12.1   (contents, props changed)
Modified:
  head/Mk/Uses/qt-dist.mk
  head/Mk/Uses/qt.mk
  head/accessibility/qt5-speech/Makefile
  head/comms/qt5-connectivity/Makefile
  head/comms/qt5-sensors/Makefile
  head/comms/qt5-serialbus/Makefile
  head/comms/qt5-serialport/Makefile
  head/databases/qt5-sql/Makefile
  head/databases/qt5-sqldrivers-ibase/Makefile
  head/databases/qt5-sqldrivers-mysql/Makefile
  head/databases/qt5-sqldrivers-odbc/Makefile
  head/databases/qt5-sqldrivers-pgsql/Makefile
  head/databases/qt5-sqldrivers-sqlite2/Makefile
  head/databases/qt5-sqldrivers-sqlite3/Makefile
  head/databases/qt5-sqldrivers-tds/Makefile
  head/devel/qt5-assistant/Makefile
  head/devel/qt5-assistant/files/patch-src__src.pro
  head/devel/qt5-buildtools/Makefile
  head/devel/qt5-concurrent/Makefile
  head/devel/qt5-core/Makefile
  head/devel/qt5-dbus/Makefile
  head/devel/qt5-designer/Makefile
  head/devel/qt5-designer/files/patch-src__src.pro
  head/devel/qt5-help/Makefile
  head/devel/qt5-help/files/patch-src__assistant__assistant.pro
  head/devel/qt5-help/files/patch-src__src.pro
  head/devel/qt5-linguist/Makefile
  head/devel/qt5-linguist/files/patch-src__src.pro
  head/devel/qt5-linguisttools/Makefile
  head/devel/qt5-linguisttools/files/patch-src__src.pro
  head/devel/qt5-location/Makefile
  head/devel/qt5-location/pkg-plist
  head/devel/qt5-qdbus/Makefile
  head/devel/qt5-qdbus/files/patch-src_src.pro
  head/devel/qt5-qdbusviewer/Makefile
  head/devel/qt5-qdbusviewer/files/patch-src__src.pro
  head/devel/qt5-qdoc/Makefile
  head/devel/qt5-qdoc/files/patch-src_src.pro
  head/devel/qt5-qmake/Makefile
  head/devel/qt5-qmake/pkg-plist
  head/devel/qt5-remoteobjects/Makefile
  head/devel/qt5-script/Makefile
  head/devel/qt5-script/pkg-plist
  head/devel/qt5-scripttools/Makefile
  head/devel/qt5-scxml/Makefile
  head/devel/qt5-testlib/Makefile
  head/devel/qt5-uitools/Makefile
  head/devel/qt5-uitools/files/patch-src__src.pro
  head/devel/qt5/distinfo
  head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf
  head/graphics/qt5-3d/Makefile
  head/graphics/qt5-graphicaleffects/Makefile
  head/graphics/qt5-imageformats/Makefile
  head/graphics/qt5-opengl/Makefile
  head/graphics/qt5-pixeltool/Makefile
  head/graphics/qt5-pixeltool/files/patch-src__src.pro
  head/graphics/qt5-svg/Makefile
  head/graphics/qt5-wayland/Makefile
  head/graphics/qt5-wayland/pkg-plist
  head/misc/qt5-doc/Makefile
  head/misc/qt5-doc/distinfo
  head/misc/qt5-doc/pkg-plist
  head/misc/qt5-examples/distinfo
  head/misc/qt5-examples/pkg-plist
  head/misc/qt5-l10n/Makefile
  head/misc/qt5-l10n/pkg-plist
  head/multimedia/phonon/Makefile
  head/multimedia/qt5-multimedia/Makefile
  head/net/qt5-network/Makefile
  head/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp
  head/net/qt5-networkauth/Makefile
  head/print/qt5-printsupport/Makefile
  head/sysutils/qt5-qtdiag/Makefile
  head/sysutils/qt5-qtpaths/Makefile
  head/sysutils/qt5-qtplugininfo/Makefile
  head/textproc/qt5-xml/Makefile
  head/textproc/qt5-xmlpatterns/Makefile
  head/www/qt5-webchannel/Makefile
  head/www/qt5-webengine/Makefile
  head/www/qt5-webkit/Makefile
  head/www/qt5-websockets-qml/Makefile
  head/www/qt5-websockets/Makefile
  head/www/qt5-webview/Makefile
  head/x11-toolkits/qt5-canvas3d/Makefile
  head/x11-toolkits/qt5-charts/Makefile
  head/x11-toolkits/qt5-datavis3d/Makefile
  head/x11-toolkits/qt5-declarative/Makefile
  head/x11-toolkits/qt5-gamepad/Makefile
  head/x11-toolkits/qt5-gui/Makefile
  head/x11-toolkits/qt5-gui/pkg-plist
  head/x11-toolkits/qt5-quickcontrols/Makefile
  head/x11-toolkits/qt5-quickcontrols2/Makefile
  head/x11-toolkits/qt5-uiplugin/Makefile
  head/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro
  head/x11-toolkits/qt5-virtualkeyboard/Makefile
  head/x11-toolkits/qt5-widgets/Makefile
  head/x11/qt5-qev/Makefile
  head/x11/qt5-x11extras/Makefile

Modified: head/Mk/Uses/qt-dist.mk
==============================================================================
--- head/Mk/Uses/qt-dist.mk	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/Mk/Uses/qt-dist.mk	Tue Feb 12 17:43:00 2019	(r492793)
@@ -318,8 +318,8 @@ qtbase-pre-configure:
 # ports/194088.
 post-patch: qtbase-post-patch
 qtbase-post-patch:
-	${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \
-		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}//mkspecs/common/bsd/bsd.conf
 
 .      if ${PORTNAME} != "qmake"
 _QMAKE=			${CONFIGURE_WRKSRC}/bin/qmake
@@ -348,6 +348,8 @@ qt5-pre-configure:
 # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
 # See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
 	${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
+	${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS = ${LOCALBASE}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
+	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS = ${LOCALBASE}/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
 
 post-install: qt-post-install
 qt-post-install:

Modified: head/Mk/Uses/qt.mk
==============================================================================
--- head/Mk/Uses/qt.mk	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/Mk/Uses/qt.mk	Tue Feb 12 17:43:00 2019	(r492793)
@@ -30,7 +30,7 @@ _QT_MK_INCLUDED=	qt.mk
 # Qt versions currently supported by the framework.
 _QT_SUPPORTED?=		4 5
 QT4_VERSION?=		4.8.7
-QT5_VERSION?=		5.12.0
+QT5_VERSION?=		5.12.1
 
 # We accept the Qt version to be passed by either or all of the three mk files.
 .  if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)

Modified: head/accessibility/qt5-speech/Makefile
==============================================================================
--- head/accessibility/qt5-speech/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/accessibility/qt5-speech/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	speech
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	accessibility
 PKGNAMEPREFIX=	qt5-
 

Modified: head/comms/qt5-connectivity/Makefile
==============================================================================
--- head/comms/qt5-connectivity/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/comms/qt5-connectivity/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	connectivity
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt5-
 

Modified: head/comms/qt5-sensors/Makefile
==============================================================================
--- head/comms/qt5-sensors/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/comms/qt5-sensors/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	sensors
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt5-
 

Modified: head/comms/qt5-serialbus/Makefile
==============================================================================
--- head/comms/qt5-serialbus/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/comms/qt5-serialbus/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	serialbus
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt5-
 

Modified: head/comms/qt5-serialport/Makefile
==============================================================================
--- head/comms/qt5-serialport/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/comms/qt5-serialport/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	serialport
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt5-
 

Modified: head/databases/qt5-sql/Makefile
==============================================================================
--- head/databases/qt5-sql/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/databases/qt5-sql/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	sql
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	databases
 PKGNAMEPREFIX=	qt5-
 

Modified: head/databases/qt5-sqldrivers-ibase/Makefile
==============================================================================
--- head/databases/qt5-sqldrivers-ibase/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/databases/qt5-sqldrivers-ibase/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	1
 
 DB=		IBase
 DB_DESC=	InterBase/Firebird

Modified: head/databases/qt5-sqldrivers-mysql/Makefile
==============================================================================
--- head/databases/qt5-sqldrivers-mysql/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/databases/qt5-sqldrivers-mysql/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	1
 
 DB=		MYSQL
 DB_DESC=	MySQL

Modified: head/databases/qt5-sqldrivers-odbc/Makefile
==============================================================================
--- head/databases/qt5-sqldrivers-odbc/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/databases/qt5-sqldrivers-odbc/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	1
 
 COMMENT=	Qt ${DB_DESC} plugin
 

Modified: head/databases/qt5-sqldrivers-pgsql/Makefile
==============================================================================
--- head/databases/qt5-sqldrivers-pgsql/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/databases/qt5-sqldrivers-pgsql/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	pgsql
-PORTREVISION=	1
 
 DB=		PSQL
 DB_DESC=	PostgreSQL

Modified: head/databases/qt5-sqldrivers-sqlite2/Makefile
==============================================================================
--- head/databases/qt5-sqldrivers-sqlite2/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/databases/qt5-sqldrivers-sqlite2/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	1
 
 DB=		SQLite2
 DB_DESC=	SQLite 2

Modified: head/databases/qt5-sqldrivers-sqlite3/Makefile
==============================================================================
--- head/databases/qt5-sqldrivers-sqlite3/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/databases/qt5-sqldrivers-sqlite3/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	sqlite3
-PORTREVISION=	1
 
 DB=		SQLite
 DB_DESC=	SQLite 3

Modified: head/databases/qt5-sqldrivers-tds/Makefile
==============================================================================
--- head/databases/qt5-sqldrivers-tds/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/databases/qt5-sqldrivers-tds/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	1
 
 DB=		TDS
 DB_DESC=	TDS Database Connectivity

Modified: head/devel/qt5-assistant/Makefile
==============================================================================
--- head/devel/qt5-assistant/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-assistant/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	assistant
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-assistant/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-assistant/files/patch-src__src.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-assistant/files/patch-src__src.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2018-10-16 20:19:26 UTC
+--- src/src.pro.orig	2019-02-08 21:21:18 UTC
 +++ src/src.pro
-@@ -1,52 +1,3 @@
+@@ -1,54 +1,3 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -29,7 +29,9 @@ missing dependencies.
 -    !android|android_app: SUBDIRS += qtplugininfo
 -}
 -
--config_clang: qtConfig(thread): SUBDIRS += qdoc
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
 -
 -!android|android_app: SUBDIRS += qtpaths
 -

Modified: head/devel/qt5-buildtools/Makefile
==============================================================================
--- head/devel/qt5-buildtools/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-buildtools/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	buildtools
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-concurrent/Makefile
==============================================================================
--- head/devel/qt5-concurrent/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-concurrent/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	concurrent
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-core/Makefile
==============================================================================
--- head/devel/qt5-core/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-core/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	core
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-dbus/Makefile
==============================================================================
--- head/devel/qt5-dbus/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-dbus/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	dbus
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-designer/Makefile
==============================================================================
--- head/devel/qt5-designer/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-designer/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	designer
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-designer/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-designer/files/patch-src__src.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-designer/files/patch-src__src.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2018-10-16 20:21:44 UTC
+--- src/src.pro.orig	2019-02-08 21:28:33 UTC
 +++ src/src.pro
-@@ -1,52 +1,3 @@
+@@ -1,54 +1,3 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -29,7 +29,9 @@ missing dependencies.
 -    !android|android_app: SUBDIRS += qtplugininfo
 -}
 -
--config_clang: qtConfig(thread): SUBDIRS += qdoc
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
 -
 -!android|android_app: SUBDIRS += qtpaths
 -

Modified: head/devel/qt5-help/Makefile
==============================================================================
--- head/devel/qt5-help/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-help/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	help
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
@@ -16,11 +15,5 @@ USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 BUILD_WRKSRC=	${WRKSRC}/src/assistant
 INSTALL_WRKSRC=	${WRKSRC}/src/assistant
-
-post-install:
-# qcollectiongenerator was integrated into qhelpgenerator.
-# Instead of fixing 20 ports, simply provide it.
-	${RLN} ${STAGEDIR}${QT_BINDIR}/qhelpgenerator \
-		${STAGEDIR}${QT_BINDIR}/qcollectiongenerator
 
 .include <bsd.port.mk>

Modified: head/devel/qt5-help/files/patch-src__assistant__assistant.pro
==============================================================================
--- head/devel/qt5-help/files/patch-src__assistant__assistant.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-help/files/patch-src__assistant__assistant.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -3,19 +3,21 @@ missing dependencies.
 
 assistant/ is built in devel/qt5-assistant.
 
---- src/assistant/assistant.pro.orig	2018-10-12 10:07:26 UTC
+--- src/assistant/assistant.pro.orig	2019-01-15 05:20:10 UTC
 +++ src/assistant/assistant.pro
-@@ -3,13 +3,11 @@ TEMPLATE = subdirs
+@@ -3,7 +3,6 @@ TEMPLATE = subdirs
  
  SUBDIRS += \
             help \
 -           assistant \
-            qhelpgenerator
+            qhelpgenerator \
+            qcollectiongenerator
  
- assistant.depends = help
+@@ -11,7 +10,6 @@ assistant.depends = help
  qhelpgenerator.depends = help
  
  qtNomakeTools( \
 -    assistant \
      qhelpgenerator \
+     qcollectiongenerator \
  )

Modified: head/devel/qt5-help/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-help/files/patch-src__src.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-help/files/patch-src__src.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2018-10-16 20:12:43 UTC
+--- src/src.pro.orig	2019-02-08 21:08:58 UTC
 +++ src/src.pro
-@@ -1,52 +1,3 @@
+@@ -1,54 +1,3 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -29,7 +29,9 @@ missing dependencies.
 -    !android|android_app: SUBDIRS += qtplugininfo
 -}
 -
--config_clang: qtConfig(thread): SUBDIRS += qdoc
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
 -
 -!android|android_app: SUBDIRS += qtpaths
 -

Modified: head/devel/qt5-linguist/Makefile
==============================================================================
--- head/devel/qt5-linguist/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-linguist/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	linguist
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-linguist/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-linguist/files/patch-src__src.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-linguist/files/patch-src__src.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2018-10-16 20:23:55 UTC
+--- src/src.pro.orig	2019-02-08 21:36:50 UTC
 +++ src/src.pro
-@@ -1,52 +1,3 @@
+@@ -1,54 +1,3 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -29,7 +29,9 @@ missing dependencies.
 -    !android|android_app: SUBDIRS += qtplugininfo
 -}
 -
--config_clang: qtConfig(thread): SUBDIRS += qdoc
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
 -
 -!android|android_app: SUBDIRS += qtpaths
 -

Modified: head/devel/qt5-linguisttools/Makefile
==============================================================================
--- head/devel/qt5-linguisttools/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-linguisttools/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	linguisttools
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-linguisttools/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-linguisttools/files/patch-src__src.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-linguisttools/files/patch-src__src.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2018-10-16 20:06:18 UTC
+--- src/src.pro.orig	2019-02-08 21:14:29 UTC
 +++ src/src.pro
-@@ -1,52 +1,3 @@
+@@ -1,54 +1,3 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -29,7 +29,9 @@ missing dependencies.
 -    !android|android_app: SUBDIRS += qtplugininfo
 -}
 -
--config_clang: qtConfig(thread): SUBDIRS += qdoc
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
 -
 -!android|android_app: SUBDIRS += qtpaths
 -
@@ -56,4 +58,4 @@ missing dependencies.
 -    winrtrunner.depends += qtattributionsscanner
 -    linguist.depends += qtattributionsscanner
 -}
-+SUBDIRS += linguist
++SUBDIRS += linguist \

Modified: head/devel/qt5-location/Makefile
==============================================================================
--- head/devel/qt5-location/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-location/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	location
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
@@ -10,7 +9,8 @@ MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Qt location module
 
 USES=		compiler:c++11-lang qmake:norecursive qt-dist:5,location
-USE_QT=		concurrent core dbus declarative gui network buildtools_build
+USE_QT=		concurrent core dbus declarative gui network serialport \
+		buildtools_build
 
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 

Added: head/devel/qt5-location/files/patch-src_plugins_position_position.pro
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/qt5-location/files/patch-src_plugins_position_position.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -0,0 +1,13 @@
+--- src/plugins/position/position.pro.orig	2019-02-08 20:56:53 UTC
++++ src/plugins/position/position.pro
+@@ -2,8 +2,8 @@ TEMPLATE = subdirs
+ 
+ QT_FOR_CONFIG += positioning-private
+ 
+-linux:qtHaveModule(dbus):SUBDIRS += geoclue
+-linux:qtHaveModule(dbus):SUBDIRS += geoclue2
++linux|freebsd:qtHaveModule(dbus):SUBDIRS += geoclue
++linux|freebsd:qtHaveModule(dbus):SUBDIRS += geoclue2
+ qtConfig(gypsy):SUBDIRS += gypsy
+ qtConfig(winrt_geolocation):SUBDIRS += winrt
+ qtHaveModule(simulator):SUBDIRS += simulator

Modified: head/devel/qt5-location/pkg-plist
==============================================================================
--- head/devel/qt5-location/pkg-plist	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-location/pkg-plist	Tue Feb 12 17:43:00 2019	(r492793)
@@ -44,6 +44,7 @@
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameracapabilities_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameradata_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameratiles_p.h
+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameratiles_p_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodereply_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanager_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanagerengine_p.h
@@ -82,6 +83,7 @@
 %%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/qgeotiledmapscene_p_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
@@ -302,6 +304,7 @@
 %%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
 %%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue2.cmake
 %%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake
+%%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactorySerialNmea.cmake
 %%QT_CMAKEDIR%%/Qt5PositioningQuick/Qt5PositioningQuickConfig.cmake
 %%QT_CMAKEDIR%%/Qt5PositioningQuick/Qt5PositioningQuickConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5Location.prl
@@ -344,6 +347,8 @@
 %%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_geoclue2.so.debug
 %%QT_PLUGINDIR%%/position/libqtposition_positionpoll.so
 %%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_positionpoll.so.debug
+%%QT_PLUGINDIR%%/position/libqtposition_serialnmea.so
+%%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_serialnmea.so.debug
 %%QT_QMLDIR%%/Qt/labs/location/liblocationlabsplugin.so
 %%DEBUG%%%%QT_QMLDIR%%/Qt/labs/location/liblocationlabsplugin.so.debug
 %%QT_QMLDIR%%/Qt/labs/location/plugins.qmltypes

Modified: head/devel/qt5-qdbus/Makefile
==============================================================================
--- head/devel/qt5-qdbus/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-qdbus/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	qdbus
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-qdbus/files/patch-src_src.pro
==============================================================================
--- head/devel/qt5-qdbus/files/patch-src_src.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-qdbus/files/patch-src_src.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
-missing dependencies.
+missing dependencies
 
---- src/src.pro.orig	2018-10-16 19:57:17 UTC
+--- src/src.pro.orig	2019-02-07 05:50:19 UTC
 +++ src/src.pro
-@@ -1,52 +1,3 @@
+@@ -1,54 +1,3 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -29,7 +29,9 @@ missing dependencies.
 -    !android|android_app: SUBDIRS += qtplugininfo
 -}
 -
--config_clang: qtConfig(thread): SUBDIRS += qdoc
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
 -
 -!android|android_app: SUBDIRS += qtpaths
 -

Modified: head/devel/qt5-qdbusviewer/Makefile
==============================================================================
--- head/devel/qt5-qdbusviewer/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-qdbusviewer/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	qdbusviewer
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-qdbusviewer/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-qdbusviewer/files/patch-src__src.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-qdbusviewer/files/patch-src__src.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2018-10-16 20:13:51 UTC
+--- src/src.pro.orig	2019-02-08 21:10:39 UTC
 +++ src/src.pro
-@@ -1,52 +1,3 @@
+@@ -1,54 +1,3 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -29,7 +29,9 @@ missing dependencies.
 -    !android|android_app: SUBDIRS += qtplugininfo
 -}
 -
--config_clang: qtConfig(thread): SUBDIRS += qdoc
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
 -
 -!android|android_app: SUBDIRS += qtpaths
 -

Modified: head/devel/qt5-qdoc/Makefile
==============================================================================
--- head/devel/qt5-qdoc/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-qdoc/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	qdoc
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel textproc
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-qdoc/files/patch-src_src.pro
==============================================================================
--- head/devel/qt5-qdoc/files/patch-src_src.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-qdoc/files/patch-src_src.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2018-10-16 20:05:35 UTC
+--- src/src.pro.orig	2019-02-08 21:19:15 UTC
 +++ src/src.pro
-@@ -1,52 +1,3 @@
+@@ -1,54 +1,5 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -29,7 +29,9 @@ missing dependencies.
 -    !android|android_app: SUBDIRS += qtplugininfo
 -}
 -
- config_clang: qtConfig(thread): SUBDIRS += qdoc
+ include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+ QT_FOR_CONFIG += qdoc-private
+ qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
 -
 -!android|android_app: SUBDIRS += qtpaths
 -

Modified: head/devel/qt5-qmake/Makefile
==============================================================================
--- head/devel/qt5-qmake/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-qmake/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	qmake
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-qmake/pkg-plist
==============================================================================
--- head/devel/qt5-qmake/pkg-plist	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-qmake/pkg-plist	Tue Feb 12 17:43:00 2019	(r492793)
@@ -38,6 +38,7 @@
 %%QT_MKSPECDIR%%/common/mac.conf
 %%QT_MKSPECDIR%%/common/mac/qplatformdefs.h
 %%QT_MKSPECDIR%%/common/macx.conf
+%%QT_MKSPECDIR%%/common/msvc-based-version.conf
 %%QT_MKSPECDIR%%/common/msvc-desktop.conf
 %%QT_MKSPECDIR%%/common/msvc-version.conf
 %%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf
@@ -178,6 +179,7 @@
 %%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in
 %%QT_MKSPECDIR%%/features/data/configure.json
 %%QT_MKSPECDIR%%/features/data/dummy.cpp
+%%QT_MKSPECDIR%%/features/data/dumpvcvars.bat
 %%QT_MKSPECDIR%%/features/data/mac/objc_namespace.sh
 %%QT_MKSPECDIR%%/features/data/macros.cpp
 %%QT_MKSPECDIR%%/features/data/unix/findclasslist.pl
@@ -222,8 +224,6 @@
 %%QT_MKSPECDIR%%/features/qgltf.prf
 %%QT_MKSPECDIR%%/features/qlalr.prf
 %%QT_MKSPECDIR%%/features/qmake_use.prf
-%%QT_MKSPECDIR%%/features/qml1_module.prf
-%%QT_MKSPECDIR%%/features/qml1_plugin.prf
 %%QT_MKSPECDIR%%/features/qml_debug.prf
 %%QT_MKSPECDIR%%/features/qml_module.prf
 %%QT_MKSPECDIR%%/features/qml_plugin.prf
@@ -299,7 +299,6 @@
 %%QT_MKSPECDIR%%/features/vxworks.prf
 %%QT_MKSPECDIR%%/features/warn_off.prf
 %%QT_MKSPECDIR%%/features/warn_on.prf
-%%QT_MKSPECDIR%%/features/wasm/qt.prf
 %%QT_MKSPECDIR%%/features/wasm/wasm.prf
 %%QT_MKSPECDIR%%/features/wayland-scanner.prf
 %%QT_MKSPECDIR%%/features/win32/console.prf
@@ -451,6 +450,8 @@
 %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/wasm-emscripten/qmake.conf
 %%QT_MKSPECDIR%%/wasm-emscripten/qplatformdefs.h
+%%QT_MKSPECDIR%%/win32-arm64-msvc2017/qmake.conf
+%%QT_MKSPECDIR%%/win32-arm64-msvc2017/qplatformdefs.h
 %%QT_MKSPECDIR%%/win32-clang-g++/qmake.conf
 %%QT_MKSPECDIR%%/win32-clang-g++/qplatformdefs.h
 %%QT_MKSPECDIR%%/win32-clang-msvc/qmake.conf

Modified: head/devel/qt5-remoteobjects/Makefile
==============================================================================
--- head/devel/qt5-remoteobjects/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-remoteobjects/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	remoteobjects
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-script/Makefile
==============================================================================
--- head/devel/qt5-script/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-script/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	script
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-script/pkg-plist
==============================================================================
--- head/devel/qt5-script/pkg-plist	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-script/pkg-plist	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,3 +1,4 @@
+%%QT_INCDIR%%/QtScript/%%FULLVER%%/QtScript/private/qtscript-config_p.h
 %%QT_INCDIR%%/QtScript/%%FULLVER%%/QtScript/private/qscriptable_p.h
 %%QT_INCDIR%%/QtScript/%%FULLVER%%/QtScript/private/qscriptactivationobject_p.h
 %%QT_INCDIR%%/QtScript/%%FULLVER%%/QtScript/private/qscriptast_p.h
@@ -41,6 +42,7 @@
 %%QT_INCDIR%%/QtScript/QtScript
 %%QT_INCDIR%%/QtScript/QtScriptDepends
 %%QT_INCDIR%%/QtScript/QtScriptVersion
+%%QT_INCDIR%%/QtScript/qtscript-config.h
 %%QT_INCDIR%%/QtScript/qscriptable.h
 %%QT_INCDIR%%/QtScript/qscriptclass.h
 %%QT_INCDIR%%/QtScript/qscriptclasspropertyiterator.h

Modified: head/devel/qt5-scripttools/Makefile
==============================================================================
--- head/devel/qt5-scripttools/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-scripttools/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	scripttools
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-scxml/Makefile
==============================================================================
--- head/devel/qt5-scxml/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-scxml/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	scxml
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-testlib/Makefile
==============================================================================
--- head/devel/qt5-testlib/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-testlib/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	testlib
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-uitools/Makefile
==============================================================================
--- head/devel/qt5-uitools/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-uitools/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	uitools
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: head/devel/qt5-uitools/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-uitools/files/patch-src__src.pro	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5-uitools/files/patch-src__src.pro	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2018-10-16 20:20:18 UTC
+--- src/src.pro.orig	2019-02-08 21:08:17 UTC
 +++ src/src.pro
-@@ -1,52 +1,3 @@
+@@ -1,54 +1,3 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -29,7 +29,9 @@ missing dependencies.
 -    !android|android_app: SUBDIRS += qtplugininfo
 -}
 -
--config_clang: qtConfig(thread): SUBDIRS += qdoc
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
 -
 -!android|android_app: SUBDIRS += qtpaths
 -

Modified: head/devel/qt5/distinfo
==============================================================================
--- head/devel/qt5/distinfo	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5/distinfo	Tue Feb 12 17:43:00 2019	(r492793)
@@ -1,79 +1,79 @@
-TIMESTAMP = 1544129524
-SHA256 (KDE/Qt/5.12.0/qt3d-everywhere-src-5.12.0.tar.xz) = a12adc9c14ffa18ff5c4951efb41914d4840a0c2a88486eb8d39a4833e4631da
-SIZE (KDE/Qt/5.12.0/qt3d-everywhere-src-5.12.0.tar.xz) = 84949704
-SHA256 (KDE/Qt/5.12.0/qtactiveqt-everywhere-src-5.12.0.tar.xz) = a22876b4243cb433042e7f4812974eac05935872f39cc880a3587bc3eae86d3e
-SIZE (KDE/Qt/5.12.0/qtactiveqt-everywhere-src-5.12.0.tar.xz) = 261880
-SHA256 (KDE/Qt/5.12.0/qtandroidextras-everywhere-src-5.12.0.tar.xz) = f5a9a13bf8b8999250b27fd68c1ed4287f333d1cebed05ae9d0b29bf9f1d0868
-SIZE (KDE/Qt/5.12.0/qtandroidextras-everywhere-src-5.12.0.tar.xz) = 104620
-SHA256 (KDE/Qt/5.12.0/qtbase-everywhere-src-5.12.0.tar.xz) = 5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb
-SIZE (KDE/Qt/5.12.0/qtbase-everywhere-src-5.12.0.tar.xz) = 48288896
-SHA256 (KDE/Qt/5.12.0/qtcanvas3d-everywhere-src-5.12.0.tar.xz) = b21b9f01c498d0e51e3db4c54344147fb901c0f40ec8b3135609905b55f9c128
-SIZE (KDE/Qt/5.12.0/qtcanvas3d-everywhere-src-5.12.0.tar.xz) = 10914876
-SHA256 (KDE/Qt/5.12.0/qtcharts-everywhere-src-5.12.0.tar.xz) = 9cd71c4a4c10611083ce8f16992c59666d51b5275cc1a79f324ee18579ced450
-SIZE (KDE/Qt/5.12.0/qtcharts-everywhere-src-5.12.0.tar.xz) = 4242288
-SHA256 (KDE/Qt/5.12.0/qtconnectivity-everywhere-src-5.12.0.tar.xz) = 8ebca1ba859ebb5b0e8e6fffff1f8131dd84f9e44448df6ac58c8be32b5122a4
-SIZE (KDE/Qt/5.12.0/qtconnectivity-everywhere-src-5.12.0.tar.xz) = 2740124
-SHA256 (KDE/Qt/5.12.0/qtdatavis3d-everywhere-src-5.12.0.tar.xz) = 4eda7e352b5d7d58a19611f76a906e952f6a86451740a80a3759b8871090f433
-SIZE (KDE/Qt/5.12.0/qtdatavis3d-everywhere-src-5.12.0.tar.xz) = 5201308
-SHA256 (KDE/Qt/5.12.0/qtdeclarative-everywhere-src-5.12.0.tar.xz) = 4ffd58102b5714ae058f91cc31511f1c928978f77f01652beb9ce2352a4c227b
-SIZE (KDE/Qt/5.12.0/qtdeclarative-everywhere-src-5.12.0.tar.xz) = 20436712
-SHA256 (KDE/Qt/5.12.0/qtdoc-everywhere-src-5.12.0.tar.xz) = 306576d717ffd37eafe10914dfa5a51301f3d5c701ef2416cc36b16a83520ccd
-SIZE (KDE/Qt/5.12.0/qtdoc-everywhere-src-5.12.0.tar.xz) = 5588676
-SHA256 (KDE/Qt/5.12.0/qtgamepad-everywhere-src-5.12.0.tar.xz) = 4c1900b9917dc18584b2287cd7382f0668d71237ef8e71e3feb4d457c2b56091
-SIZE (KDE/Qt/5.12.0/qtgamepad-everywhere-src-5.12.0.tar.xz) = 385484
-SHA256 (KDE/Qt/5.12.0/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz) = 81058fb12d4dd019bed6bb196a13ea5d308a390d72a1468da11171f8c3003455
-SIZE (KDE/Qt/5.12.0/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz) = 14270812
-SHA256 (KDE/Qt/5.12.0/qtimageformats-everywhere-src-5.12.0.tar.xz) = 5f907de96d3db6276816f321b7e11cba7beb1fcc81bcb3f1729cde3b7599732e
-SIZE (KDE/Qt/5.12.0/qtimageformats-everywhere-src-5.12.0.tar.xz) = 1774820
-SHA256 (KDE/Qt/5.12.0/qtlocation-everywhere-src-5.12.0.tar.xz) = b0a3134df3a00f6045405d3c12e0ea3ae7e640feaf38e238873df85424674449
-SIZE (KDE/Qt/5.12.0/qtlocation-everywhere-src-5.12.0.tar.xz) = 5898856
-SHA256 (KDE/Qt/5.12.0/qtmacextras-everywhere-src-5.12.0.tar.xz) = d90a7ba25543503ed40f6c248780b6859254536735d8f87fe5598f688c9cb003
-SIZE (KDE/Qt/5.12.0/qtmacextras-everywhere-src-5.12.0.tar.xz) = 68592
-SHA256 (KDE/Qt/5.12.0/qtmultimedia-everywhere-src-5.12.0.tar.xz) = 5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9
-SIZE (KDE/Qt/5.12.0/qtmultimedia-everywhere-src-5.12.0.tar.xz) = 3716764
-SHA256 (KDE/Qt/5.12.0/qtnetworkauth-everywhere-src-5.12.0.tar.xz) = 41111946f40ee110b789f365a398c3f27bc4fd6c0f9a8b1a72b79c81543e0775
-SIZE (KDE/Qt/5.12.0/qtnetworkauth-everywhere-src-5.12.0.tar.xz) = 139012
-SHA256 (KDE/Qt/5.12.0/qtpurchasing-everywhere-src-5.12.0.tar.xz) = d90bed1ec3e937255246873831f035684723f54fe91124ed7239ec43c46d60da
-SIZE (KDE/Qt/5.12.0/qtpurchasing-everywhere-src-5.12.0.tar.xz) = 207680
-SHA256 (KDE/Qt/5.12.0/qtquickcontrols2-everywhere-src-5.12.0.tar.xz) = 89777e2ee89a08d203e0e394be0c47dc52008ea58506f4b3bdf1a696c5907dc6
-SIZE (KDE/Qt/5.12.0/qtquickcontrols2-everywhere-src-5.12.0.tar.xz) = 9279804
-SHA256 (KDE/Qt/5.12.0/qtquickcontrols-everywhere-src-5.12.0.tar.xz) = 2bfb63240beed6926be429310e91b33df836fe38bcaf9de6883d5e781511cd73
-SIZE (KDE/Qt/5.12.0/qtquickcontrols-everywhere-src-5.12.0.tar.xz) = 6054956
-SHA256 (KDE/Qt/5.12.0/qtremoteobjects-everywhere-src-5.12.0.tar.xz) = 0940d0a4a961b64f38c52a2e5638c2b3341fe46bd6bd88d1c638707f42159d5f
-SIZE (KDE/Qt/5.12.0/qtremoteobjects-everywhere-src-5.12.0.tar.xz) = 335472
-SHA256 (KDE/Qt/5.12.0/qtscript-everywhere-src-5.12.0.tar.xz) = 97fe1a22e5d0e89d3850546c0771fe41707d4c40062dc16fae8e21bf6f8cffa8
-SIZE (KDE/Qt/5.12.0/qtscript-everywhere-src-5.12.0.tar.xz) = 2674336
-SHA256 (KDE/Qt/5.12.0/qtscxml-everywhere-src-5.12.0.tar.xz) = dc6ece52669976836844b0d9bcf4910bca7b5d2c446c6755d7b9f79bfa1add6b
-SIZE (KDE/Qt/5.12.0/qtscxml-everywhere-src-5.12.0.tar.xz) = 433896
-SHA256 (KDE/Qt/5.12.0/qtsensors-everywhere-src-5.12.0.tar.xz) = c53132847a1f70d5a4c5fe689a9943d8afae3f3648bf5b0d824015093addc5a6
-SIZE (KDE/Qt/5.12.0/qtsensors-everywhere-src-5.12.0.tar.xz) = 2031092
-SHA256 (KDE/Qt/5.12.0/qtserialbus-everywhere-src-5.12.0.tar.xz) = 6b9286c9762341a48c636da62fecb7b76168a4634e44508b42c19eb0058a359a
-SIZE (KDE/Qt/5.12.0/qtserialbus-everywhere-src-5.12.0.tar.xz) = 324680
-SHA256 (KDE/Qt/5.12.0/qtserialport-everywhere-src-5.12.0.tar.xz) = 59d4005695089c6b50fc5123094125d9224c1715655128640158a2404075a9bb
-SIZE (KDE/Qt/5.12.0/qtserialport-everywhere-src-5.12.0.tar.xz) = 298892
-SHA256 (KDE/Qt/5.12.0/qtspeech-everywhere-src-5.12.0.tar.xz) = 1939a2ece528b115e4682dba7fa7138c132c62bb88db7d1f3552c543a1e2a4fb
-SIZE (KDE/Qt/5.12.0/qtspeech-everywhere-src-5.12.0.tar.xz) = 99696
-SHA256 (KDE/Qt/5.12.0/qtsvg-everywhere-src-5.12.0.tar.xz) = ebe68d8ad73b6b8d8eabac81edcbf395838caf4d498d6b047c74b57341c3fbce
-SIZE (KDE/Qt/5.12.0/qtsvg-everywhere-src-5.12.0.tar.xz) = 1845656
-SHA256 (KDE/Qt/5.12.0/qttools-everywhere-src-5.12.0.tar.xz) = 574ce34b6e5bcd5dce4020a3947730f3c2223eee65d0396a311099223364dac3
-SIZE (KDE/Qt/5.12.0/qttools-everywhere-src-5.12.0.tar.xz) = 9775520
-SHA256 (KDE/Qt/5.12.0/qttranslations-everywhere-src-5.12.0.tar.xz) = 5b4f186e0b96703041319b5b131393b6aa829ea74e067697ede548d936327508
-SIZE (KDE/Qt/5.12.0/qttranslations-everywhere-src-5.12.0.tar.xz) = 1424236
-SHA256 (KDE/Qt/5.12.0/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz) = db93b89ba13ec1a688850f456be9f10037033cebf7b4deb151ed9f5322d0d6da
-SIZE (KDE/Qt/5.12.0/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz) = 10913328
-SHA256 (KDE/Qt/5.12.0/qtwayland-everywhere-src-5.12.0.tar.xz) = 555c2d1b31733735d94c228f5f9183ea8216d61f85e30af08044763639d97ed7
-SIZE (KDE/Qt/5.12.0/qtwayland-everywhere-src-5.12.0.tar.xz) = 427640
-SHA256 (KDE/Qt/5.12.0/qtwebchannel-everywhere-src-5.12.0.tar.xz) = 851af30ab951c7543c82640f46686227b244331ebf9235f963edcb7e5a184bf0
-SIZE (KDE/Qt/5.12.0/qtwebchannel-everywhere-src-5.12.0.tar.xz) = 177328
-SHA256 (KDE/Qt/5.12.0/qtwebengine-everywhere-src-5.12.0.tar.xz) = bd581e390a30e0f74d41b0e3334b3cf612dd4af23de36a3bf5931d5b4453687c
-SIZE (KDE/Qt/5.12.0/qtwebengine-everywhere-src-5.12.0.tar.xz) = 252044400
-SHA256 (KDE/Qt/5.12.0/qtwebsockets-everywhere-src-5.12.0.tar.xz) = 444da1c1d32910738a01b8251c1ccc3ffe4df148f125bb4af532b247ad74fc3f
-SIZE (KDE/Qt/5.12.0/qtwebsockets-everywhere-src-5.12.0.tar.xz) = 230980
-SHA256 (KDE/Qt/5.12.0/qtwebview-everywhere-src-5.12.0.tar.xz) = b7a82cc4edf9361d64155f0ec7848b37c947e0cfe9a9f03efe8af515c6326185
-SIZE (KDE/Qt/5.12.0/qtwebview-everywhere-src-5.12.0.tar.xz) = 130676
-SHA256 (KDE/Qt/5.12.0/qtwinextras-everywhere-src-5.12.0.tar.xz) = c64f5acde4d73d4bf45fab377cf3db7f4cf7044fb8854bb24aabbbbc0109dad0
-SIZE (KDE/Qt/5.12.0/qtwinextras-everywhere-src-5.12.0.tar.xz) = 759912
-SHA256 (KDE/Qt/5.12.0/qtx11extras-everywhere-src-5.12.0.tar.xz) = 06d4b4e9868d206f07ae4e884c46d46a5540172a85ce67d829fdb1fba7228b84
-SIZE (KDE/Qt/5.12.0/qtx11extras-everywhere-src-5.12.0.tar.xz) = 109676
-SHA256 (KDE/Qt/5.12.0/qtxmlpatterns-everywhere-src-5.12.0.tar.xz) = f36279bcafb8052a0b60edd473e1d341b4733a43eb26239848b4382303679375
-SIZE (KDE/Qt/5.12.0/qtxmlpatterns-everywhere-src-5.12.0.tar.xz) = 1389248
+TIMESTAMP = 1549515795
+SHA256 (KDE/Qt/5.12.1/qt3d-everywhere-src-5.12.1.tar.xz) = ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1
+SIZE (KDE/Qt/5.12.1/qt3d-everywhere-src-5.12.1.tar.xz) = 84953112
+SHA256 (KDE/Qt/5.12.1/qtactiveqt-everywhere-src-5.12.1.tar.xz) = a56fbd9aa018b9b91a1de6018db6538f4bc4309bfbdd86c52d437e7297983c45
+SIZE (KDE/Qt/5.12.1/qtactiveqt-everywhere-src-5.12.1.tar.xz) = 261984
+SHA256 (KDE/Qt/5.12.1/qtandroidextras-everywhere-src-5.12.1.tar.xz) = 17d0bfe13e75b1a28de2f35dc81670741fd227664aa155170453dc34c82e071e
+SIZE (KDE/Qt/5.12.1/qtandroidextras-everywhere-src-5.12.1.tar.xz) = 104620
+SHA256 (KDE/Qt/5.12.1/qtbase-everywhere-src-5.12.1.tar.xz) = 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049
+SIZE (KDE/Qt/5.12.1/qtbase-everywhere-src-5.12.1.tar.xz) = 48239912
+SHA256 (KDE/Qt/5.12.1/qtcanvas3d-everywhere-src-5.12.1.tar.xz) = c7c940a06062b1e5078fd697e1da0cdaeaa315b6fcea81de15308a9d3f8ac254
+SIZE (KDE/Qt/5.12.1/qtcanvas3d-everywhere-src-5.12.1.tar.xz) = 10915000
+SHA256 (KDE/Qt/5.12.1/qtcharts-everywhere-src-5.12.1.tar.xz) = 142eb2b87a0bc2220a9f12e56bf390b846968c201d135b1a2a2338545692fdc0
+SIZE (KDE/Qt/5.12.1/qtcharts-everywhere-src-5.12.1.tar.xz) = 4242664
+SHA256 (KDE/Qt/5.12.1/qtconnectivity-everywhere-src-5.12.1.tar.xz) = 0edd0bd784a71809540dc23d24a842bd88dee2cdb5394b69c9e704f7e1ac8d6c
+SIZE (KDE/Qt/5.12.1/qtconnectivity-everywhere-src-5.12.1.tar.xz) = 2748888
+SHA256 (KDE/Qt/5.12.1/qtdatavis3d-everywhere-src-5.12.1.tar.xz) = 8ebb94459e5eb5b978dcdac1d2d6503a7763d790ce74b03f78388beb480436a0
+SIZE (KDE/Qt/5.12.1/qtdatavis3d-everywhere-src-5.12.1.tar.xz) = 5199768
+SHA256 (KDE/Qt/5.12.1/qtdeclarative-everywhere-src-5.12.1.tar.xz) = a384a734d94f28a98aa74e076d50fa6b9724af83526feb6c371945545d8cb409
+SIZE (KDE/Qt/5.12.1/qtdeclarative-everywhere-src-5.12.1.tar.xz) = 20486428
+SHA256 (KDE/Qt/5.12.1/qtdoc-everywhere-src-5.12.1.tar.xz) = 7d4204e6ef5d9307975337cd18ffdc0b04e2d851c368eb36a48b9331377deadd
+SIZE (KDE/Qt/5.12.1/qtdoc-everywhere-src-5.12.1.tar.xz) = 5588248
+SHA256 (KDE/Qt/5.12.1/qtgamepad-everywhere-src-5.12.1.tar.xz) = 717c11f8fba4e23c0096fcf3161d43223956038e866fcd7a18d2255755415d62
+SIZE (KDE/Qt/5.12.1/qtgamepad-everywhere-src-5.12.1.tar.xz) = 385492
+SHA256 (KDE/Qt/5.12.1/qtgraphicaleffects-everywhere-src-5.12.1.tar.xz) = 2e63abf6b02b86461b73b317eba00b6721601a9469c22da28e3f4ea1d5df68d7
+SIZE (KDE/Qt/5.12.1/qtgraphicaleffects-everywhere-src-5.12.1.tar.xz) = 14270888
+SHA256 (KDE/Qt/5.12.1/qtimageformats-everywhere-src-5.12.1.tar.xz) = 0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421
+SIZE (KDE/Qt/5.12.1/qtimageformats-everywhere-src-5.12.1.tar.xz) = 1782660
+SHA256 (KDE/Qt/5.12.1/qtlocation-everywhere-src-5.12.1.tar.xz) = 8b922373e6eefd1b0e2a993dbf3d0b3f3df777bc720d40cad3ccb46e1936bc50
+SIZE (KDE/Qt/5.12.1/qtlocation-everywhere-src-5.12.1.tar.xz) = 5902336
+SHA256 (KDE/Qt/5.12.1/qtmacextras-everywhere-src-5.12.1.tar.xz) = af6449c052aea19d100deb2b7f558835b8b88862d6bfdae3c510b60c80bc64c3
+SIZE (KDE/Qt/5.12.1/qtmacextras-everywhere-src-5.12.1.tar.xz) = 68680
+SHA256 (KDE/Qt/5.12.1/qtmultimedia-everywhere-src-5.12.1.tar.xz) = 9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18
+SIZE (KDE/Qt/5.12.1/qtmultimedia-everywhere-src-5.12.1.tar.xz) = 3740192
+SHA256 (KDE/Qt/5.12.1/qtnetworkauth-everywhere-src-5.12.1.tar.xz) = 090fbb6be35b2f2edf7cc4cb32f0f9c27a9a66defa06f6d23e1397836e31d44c
+SIZE (KDE/Qt/5.12.1/qtnetworkauth-everywhere-src-5.12.1.tar.xz) = 139024
+SHA256 (KDE/Qt/5.12.1/qtpurchasing-everywhere-src-5.12.1.tar.xz) = 80485095ab64f48951b27795c72e7ed7c13e1ab3db2670c061548834584b1d19
+SIZE (KDE/Qt/5.12.1/qtpurchasing-everywhere-src-5.12.1.tar.xz) = 207812
+SHA256 (KDE/Qt/5.12.1/qtquickcontrols2-everywhere-src-5.12.1.tar.xz) = caa47b6d771b11c65d595fdd0f0942c3d78cda2884d318e3b1da8ec67155a8e7
+SIZE (KDE/Qt/5.12.1/qtquickcontrols2-everywhere-src-5.12.1.tar.xz) = 9289452
+SHA256 (KDE/Qt/5.12.1/qtquickcontrols-everywhere-src-5.12.1.tar.xz) = 15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c
+SIZE (KDE/Qt/5.12.1/qtquickcontrols-everywhere-src-5.12.1.tar.xz) = 6055248
+SHA256 (KDE/Qt/5.12.1/qtremoteobjects-everywhere-src-5.12.1.tar.xz) = f18cfde8d060d76f5f56ffb701a27f6e0c39b5abdae3dbac933dbb41d191f740
+SIZE (KDE/Qt/5.12.1/qtremoteobjects-everywhere-src-5.12.1.tar.xz) = 335956
+SHA256 (KDE/Qt/5.12.1/qtscript-everywhere-src-5.12.1.tar.xz) = e5c158fb85799404d20d1ec5dd33a25d5f5736807e1008ce626f666a52c80624
+SIZE (KDE/Qt/5.12.1/qtscript-everywhere-src-5.12.1.tar.xz) = 2674208
+SHA256 (KDE/Qt/5.12.1/qtscxml-everywhere-src-5.12.1.tar.xz) = 59a2aa1000fe03b0a3eff6fddd21f782e305408fcdd7af1f564a382331cb20b7
+SIZE (KDE/Qt/5.12.1/qtscxml-everywhere-src-5.12.1.tar.xz) = 434112
+SHA256 (KDE/Qt/5.12.1/qtsensors-everywhere-src-5.12.1.tar.xz) = ebc8b4bcfacf10c3bea3f400da7bf3fc7f44f90fa9eb0320c3b87f17307a63e4
+SIZE (KDE/Qt/5.12.1/qtsensors-everywhere-src-5.12.1.tar.xz) = 2036116
+SHA256 (KDE/Qt/5.12.1/qtserialbus-everywhere-src-5.12.1.tar.xz) = 97f0c690c77b0e19a8c90e376ecc94d59b21adb20a90179700d1c514a4c50d74
+SIZE (KDE/Qt/5.12.1/qtserialbus-everywhere-src-5.12.1.tar.xz) = 328608
+SHA256 (KDE/Qt/5.12.1/qtserialport-everywhere-src-5.12.1.tar.xz) = 243b2502283c45f5163d68c3f23c787d46eb0e3ba58f3d9a0560dc7968a6ce19
+SIZE (KDE/Qt/5.12.1/qtserialport-everywhere-src-5.12.1.tar.xz) = 302656
+SHA256 (KDE/Qt/5.12.1/qtspeech-everywhere-src-5.12.1.tar.xz) = 147524ba6f97c76784beb315ee939614b7a3b4eb1a6417cc0beea662cf0d9121
+SIZE (KDE/Qt/5.12.1/qtspeech-everywhere-src-5.12.1.tar.xz) = 99716
+SHA256 (KDE/Qt/5.12.1/qtsvg-everywhere-src-5.12.1.tar.xz) = 5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8
+SIZE (KDE/Qt/5.12.1/qtsvg-everywhere-src-5.12.1.tar.xz) = 1859248
+SHA256 (KDE/Qt/5.12.1/qttools-everywhere-src-5.12.1.tar.xz) = ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3
+SIZE (KDE/Qt/5.12.1/qttools-everywhere-src-5.12.1.tar.xz) = 9818060
+SHA256 (KDE/Qt/5.12.1/qttranslations-everywhere-src-5.12.1.tar.xz) = 7443d70d8572321e810c52fbdd096666e61510e07e17437f1910f0b800cca6a7
+SIZE (KDE/Qt/5.12.1/qttranslations-everywhere-src-5.12.1.tar.xz) = 1372812
+SHA256 (KDE/Qt/5.12.1/qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz) = a9e3ed4786d603314144c7ad29a9fdeb6e5c3f2ea5a27f6545cc9777244cd683
+SIZE (KDE/Qt/5.12.1/qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz) = 10917704
+SHA256 (KDE/Qt/5.12.1/qtwayland-everywhere-src-5.12.1.tar.xz) = 88f0507628b3697b0d59349d27b5e60a313a3138927722d6cf981089fff02553
+SIZE (KDE/Qt/5.12.1/qtwayland-everywhere-src-5.12.1.tar.xz) = 430032
+SHA256 (KDE/Qt/5.12.1/qtwebchannel-everywhere-src-5.12.1.tar.xz) = 40c3e74347c67a9864d0d54f14120555860e4ce529746407325b3cd6e9aeb5bf
+SIZE (KDE/Qt/5.12.1/qtwebchannel-everywhere-src-5.12.1.tar.xz) = 182060
+SHA256 (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0
+SIZE (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 249191844
+SHA256 (KDE/Qt/5.12.1/qtwebsockets-everywhere-src-5.12.1.tar.xz) = 2fd0627916d817599c5f855a97156113ed3625b90b350603be6f668762abfc79
+SIZE (KDE/Qt/5.12.1/qtwebsockets-everywhere-src-5.12.1.tar.xz) = 235360
+SHA256 (KDE/Qt/5.12.1/qtwebview-everywhere-src-5.12.1.tar.xz) = 092624ba45913f6c90f7311c96bb5c3e97f2c2b427d834d3669434f97234bc97
+SIZE (KDE/Qt/5.12.1/qtwebview-everywhere-src-5.12.1.tar.xz) = 130712
+SHA256 (KDE/Qt/5.12.1/qtwinextras-everywhere-src-5.12.1.tar.xz) = 8d312155a7da329df41cc2ea5d265eb632be7dd9cbd789fa3bc0206b4022f557
+SIZE (KDE/Qt/5.12.1/qtwinextras-everywhere-src-5.12.1.tar.xz) = 759900
+SHA256 (KDE/Qt/5.12.1/qtx11extras-everywhere-src-5.12.1.tar.xz) = 08fb1c40e1562d43087368a5efa39569fa1ad52b72d2360f9fc1fe18b00da366
+SIZE (KDE/Qt/5.12.1/qtx11extras-everywhere-src-5.12.1.tar.xz) = 115964
+SHA256 (KDE/Qt/5.12.1/qtxmlpatterns-everywhere-src-5.12.1.tar.xz) = 76988ca9a7a184b9013b8a5864dad150e4603890c7eb7aecad4baad071802ecb
+SIZE (KDE/Qt/5.12.1/qtxmlpatterns-everywhere-src-5.12.1.tar.xz) = 1389136

Modified: head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf
==============================================================================
--- head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf	Tue Feb 12 17:43:00 2019	(r492793)
@@ -4,24 +4,24 @@
  QMAKE_LIBS_OPENGL       = -lGL
  QMAKE_LIBS_THREAD       =
 
-+QMAKE_INCDIR_X11        = $$PREFIX/include
-+QMAKE_LIBDIR_X11        = $$PREFIX/lib
-+QMAKE_INCDIR_OPENGL     = $$PREFIX/include
-+QMAKE_LIBDIR_OPENGL     = $$PREFIX/lib
++QMAKE_INCDIR_X11        = %%LOCALBASE%%/include
++QMAKE_LIBDIR_X11        = %%LOCALBASE%%/lib
++QMAKE_INCDIR_OPENGL     = %%LOCALBASE%%/include
++QMAKE_LIBDIR_OPENGL     = %%LOCALBASE%%/lib
 +QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
 +QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-+QMAKE_INCDIR_EGL        = $$PREFIX/include
-+QMAKE_LIBDIR_EGL        = $$PREFIX/lib
++QMAKE_INCDIR_EGL        = %%LOCALBASE%%/include
++QMAKE_LIBDIR_EGL        = %%LOCALBASE%%/lib
 +
 +QMAKE_LIBS_EGL          = -lEGL
 +QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
 +QMAKE_LIBS_LIBUDEV      = -ludev
 +
 +QMAKE_CFLAGS_WAYLAND    =
-+QMAKE_INCDIR_WAYLAND    = $$PREFIX/include
++QMAKE_INCDIR_WAYLAND    = %%LOCALBASE%%/include
 +QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client
 +QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server
-+QMAKE_LIBDIR_WAYLAND    = $$PREFIX/lib
++QMAKE_LIBDIR_WAYLAND    = %%LOCALBASE%%/lib
 +QMAKE_DEFINES_WAYLAND   =
 +QMAKE_WAYLAND_SCANNER   = wayland-scanner
 +

Added: head/emulators/qmc2/files/patch-qmc2_imagechecker.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qmc2/files/patch-qmc2_imagechecker.cpp	Tue Feb 12 17:43:00 2019	(r492793)
@@ -0,0 +1,9 @@
+Workaround where the LZMA headers #define False 0, while
+parts of QtCore (the new qcborflags?) use False as an identifier.
+--- qmc2/imagechecker.cpp.orig	2016-09-04 14:08:00 UTC
++++ qmc2/imagechecker.cpp
+@@ -1,3 +1,4 @@
++#include <QtCore/QtCore>
+ #include <QFileDialog>
+ #include <QTest>
+ #include <QMap>

Modified: head/graphics/qt5-3d/Makefile
==============================================================================
--- head/graphics/qt5-3d/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/graphics/qt5-3d/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	3d
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt5-
 

Modified: head/graphics/qt5-graphicaleffects/Makefile
==============================================================================
--- head/graphics/qt5-graphicaleffects/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/graphics/qt5-graphicaleffects/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	graphicaleffects
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt5-
 

Modified: head/graphics/qt5-imageformats/Makefile
==============================================================================
--- head/graphics/qt5-imageformats/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/graphics/qt5-imageformats/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	imageformats
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt5-
 

Modified: head/graphics/qt5-opengl/Makefile
==============================================================================
--- head/graphics/qt5-opengl/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/graphics/qt5-opengl/Makefile	Tue Feb 12 17:43:00 2019	(r492793)
@@ -2,7 +2,6 @@
 
 PORTNAME=	opengl
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt5-
 

Modified: head/graphics/qt5-pixeltool/Makefile
==============================================================================
--- head/graphics/qt5-pixeltool/Makefile	Tue Feb 12 16:56:47 2019	(r492792)
+++ head/graphics/qt5-pixeltool/Makefile	Tue Feb 12 17:43:00 2019	(r492793)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list