Attachment 164961 Details for Bug 205805 – patch

[patch] patch

qt-5.5.1.patch (text/plain), 138.25 KB, created by Yuri Victorovich on 2016-01-02 16:18:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2016-01-02 16:18:13 UTC

Size: 138.25 KB

patch

obsolete

>Index: Mk/bsd.qt.mk
>===================================================================
>--- Mk/bsd.qt.mk	(revision 404968)
>+++ Mk/bsd.qt.mk	(working copy)
>@@ -27,7 +27,7 @@
> # Qt versions currently supported by the framework.
> _QT_SUPPORTED?=	4 5
> QT4_VERSION?=	4.8.7
>-QT5_VERSION?=	5.4.1
>+QT5_VERSION?=	5.5.1
> 
> QT_PREFIX?=		${LOCALBASE}
> 
>@@ -96,7 +96,7 @@
> # devel/qt*/distinfo for every port.
> QT_DIST=		base declarative doc graphicaleffects imageformats \
> 				multimedia quick1 quickcontrols script serialport svg tools \
>-				translations webchannel webkit webkit-examples websockets x11extras xmlpatterns
>+				translations webchannel webengine webkit webkit-examples websockets x11extras xmlpatterns
> .  endif
> 
> .  if ${QT_DIST} == "base" && ${PORTNAME} != "qmake"
>@@ -177,6 +177,9 @@
> EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
> 		${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \
> 		${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
>+		${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-qstorageinfo_unix.cpp \
>+		${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-forkfd_qt.cpp \
>+		${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-pcre.pro \
> 		${_EXTRA_PATCHES_QT4}
> . endif
> 
>Index: comms/qt5-serialport/pkg-plist
>===================================================================
>--- comms/qt5-serialport/pkg-plist	(revision 404968)
>+++ comms/qt5-serialport/pkg-plist	(working copy)
>@@ -1,27 +1,15 @@
>-%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qcore_mac_p.h
>-%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qcore_unix_p.h
>-%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qlockfile_p.h
>-%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qringbuffer_p.h
> %%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_p.h
>-%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_symbian_p.h
>-%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_unix_p.h
>-%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_win_p.h
>-%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_wince_p.h
> %%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialportinfo_p.h
> %%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtudev_p.h
>-%%QT_INCDIR%%/QtSerialPort/QLockFile
> %%QT_INCDIR%%/QtSerialPort/QSerialPort
> %%QT_INCDIR%%/QtSerialPort/QSerialPortInfo
>-%%QT_INCDIR%%/QtSerialPort/QWinEventNotifier
> %%QT_INCDIR%%/QtSerialPort/QtSerialPort
> %%QT_INCDIR%%/QtSerialPort/QtSerialPortDepends
> %%QT_INCDIR%%/QtSerialPort/QtSerialPortVersion
>-%%QT_INCDIR%%/QtSerialPort/qlockfile.h
> %%QT_INCDIR%%/QtSerialPort/qserialport.h
> %%QT_INCDIR%%/QtSerialPort/qserialportglobal.h
> %%QT_INCDIR%%/QtSerialPort/qserialportinfo.h
> %%QT_INCDIR%%/QtSerialPort/qtserialportversion.h
>-%%QT_INCDIR%%/QtSerialPort/qwineventnotifier.h
> %%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake
> %%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake
> %%QT_LIBDIR%%/libQt5SerialPort.prl
>Index: devel/qmake5/Makefile
>===================================================================
>--- devel/qmake5/Makefile	(revision 404968)
>+++ devel/qmake5/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	qmake
> DISTVERSION=	${QT5_VERSION}
>-PORTREVISION=	4
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt5-
> 
>Index: devel/qmake5/pkg-plist
>===================================================================
>--- devel/qmake5/pkg-plist	(revision 404968)
>+++ devel/qmake5/pkg-plist	(working copy)
>@@ -11,8 +11,6 @@
> %%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-armv7le-qcc/qmake.conf
>-%%QT_MKSPECDIR%%/blackberry-armv7le-qcc/qplatformdefs.h
> %%QT_MKSPECDIR%%/blackberry-x86-qcc/qmake.conf
> %%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h
> %%QT_MKSPECDIR%%/common/aix/qplatformdefs.h
>@@ -39,33 +37,34 @@
> %%QT_MKSPECDIR%%/common/mac.conf
> %%QT_MKSPECDIR%%/common/mac/qplatformdefs.h
> %%QT_MKSPECDIR%%/common/macx.conf
>+%%QT_MKSPECDIR%%/common/msvc-desktop.conf
> %%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf
> %%QT_MKSPECDIR%%/common/nacl/g++-nacl64.conf
> %%QT_MKSPECDIR%%/common/nacl/nacl-base.conf
> %%QT_MKSPECDIR%%/common/nacl/qplatformdefs.h
> %%QT_MKSPECDIR%%/common/posix/qplatformdefs.h
>-%%QT_MKSPECDIR%%/common/qcc-base-qnx-armv7le.conf
>+%%QT_MKSPECDIR%%/common/qcc-base-qnx-armle-v7.conf
> %%QT_MKSPECDIR%%/common/qcc-base-qnx-x86.conf
> %%QT_MKSPECDIR%%/common/qcc-base-qnx.conf
> %%QT_MKSPECDIR%%/common/qcc-base.conf
> %%QT_MKSPECDIR%%/common/qnx/qplatformdefs.h
>+%%QT_MKSPECDIR%%/common/sanitize.conf
> %%QT_MKSPECDIR%%/common/shell-unix.conf
> %%QT_MKSPECDIR%%/common/shell-win32.conf
> %%QT_MKSPECDIR%%/common/unix.conf
> %%QT_MKSPECDIR%%/common/wince/qmake.conf
> %%QT_MKSPECDIR%%/common/wince/qplatformdefs.h
>+%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_150x150.png
>+%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_30x30.png
>+%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_310x150.png
>+%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_310x310.png
> %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_44x44.png
> %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_480x800.png
>+%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_620x300.png
>+%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_70x70.png
> %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_71x71.png
>-%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_large.png
>-%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_medium.png
>-%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_small.png
>-%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_splash.png
> %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_store.png
>-%%QT_MKSPECDIR%%/common/winrt_winphone/assets/tile_iconic_medium.png
>-%%QT_MKSPECDIR%%/common/winrt_winphone/assets/tile_iconic_small.png
>-%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
>-%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in
>+%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
> %%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
> %%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in
> %%QT_MKSPECDIR%%/common/winrt_winphone/qmake.conf
>@@ -74,12 +73,6 @@
> %%QT_MKSPECDIR%%/cygwin-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/darwin-g++/qmake.conf
> %%QT_MKSPECDIR%%/darwin-g++/qplatformdefs.h
>-%%QT_MKSPECDIR%%/devices/blackberry-playbook-armle-v7-qcc/qmake.conf
>-%%QT_MKSPECDIR%%/devices/blackberry-playbook-armle-v7-qcc/qplatformdefs.h
>-%%QT_MKSPECDIR%%/devices/blackberry-playbook-armv7le-qcc/qmake.conf
>-%%QT_MKSPECDIR%%/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h
>-%%QT_MKSPECDIR%%/devices/blackberry-playbook-x86-qcc/qmake.conf
>-%%QT_MKSPECDIR%%/devices/blackberry-playbook-x86-qcc/qplatformdefs.h
> %%QT_MKSPECDIR%%/devices/common/linux_arm_device_post.conf
> %%QT_MKSPECDIR%%/devices/common/linux_device_post.conf
> %%QT_MKSPECDIR%%/devices/common/linux_device_pre.conf
>@@ -88,7 +81,6 @@
> %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp
> %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qmake.conf
> %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h
>-%%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qeglfshooks_hix5hd2.cpp
> %%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf
> %%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qmake.conf
>@@ -97,15 +89,17 @@
> %%QT_MKSPECDIR%%/devices/linux-beagleboard-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++/qeglfshooks_imx6.cpp
> %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qmake.conf
> %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp
> %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
> %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h
>-%%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
>+%%QT_MKSPECDIR%%/devices/linux-odroid-xu3-g++/qmake.conf
>+%%QT_MKSPECDIR%%/devices/linux-odroid-xu3-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qmake.conf
> %%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qplatformdefs.h
>+%%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qmake.conf
>+%%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
> %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
>@@ -130,7 +124,7 @@
> %%QT_MKSPECDIR%%/features/data/cmake/Qt5BasicConfig.cmake.in
> %%QT_MKSPECDIR%%/features/data/cmake/Qt5ConfigVersion.cmake.in
> %%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in
>-%%QT_MKSPECDIR%%/features/data/headersclean/tst_headersclean.cpp.in
>+%%QT_MKSPECDIR%%/features/data/dummy.cpp
> %%QT_MKSPECDIR%%/features/dbusadaptors.prf
> %%QT_MKSPECDIR%%/features/dbuscommon.pri
> %%QT_MKSPECDIR%%/features/dbusinterfaces.prf
>@@ -149,8 +143,8 @@
> %%QT_MKSPECDIR%%/features/incredibuild_xge.prf
> %%QT_MKSPECDIR%%/features/java.prf
> %%QT_MKSPECDIR%%/features/lex.prf
>+%%QT_MKSPECDIR%%/features/link_ltcg.prf
> %%QT_MKSPECDIR%%/features/link_pkgconfig.prf
>-%%QT_MKSPECDIR%%/features/link_ltcg.prf
> %%QT_MKSPECDIR%%/features/ltcg.prf
> %%QT_MKSPECDIR%%/features/mac/default_post.prf
> %%QT_MKSPECDIR%%/features/mac/default_pre.prf
>@@ -181,8 +175,7 @@
> %%QT_MKSPECDIR%%/features/qt_docs_targets.prf
> %%QT_MKSPECDIR%%/features/qt_example_installs.prf
> %%QT_MKSPECDIR%%/features/qt_functions.prf
>-%%QT_MKSPECDIR%%/features/qt_headersclean.prf
>-%%QT_MKSPECDIR%%/features/qt_helper_lib.prf
>+%%QT_MKSPECDIR%%/features/qt_helper_%%QT_LIBDIR%%.prf
> %%QT_MKSPECDIR%%/features/qt_installs.prf
> %%QT_MKSPECDIR%%/features/qt_module.prf
> %%QT_MKSPECDIR%%/features/qt_module_headers.prf
>@@ -194,17 +187,19 @@
> %%QT_MKSPECDIR%%/features/resolve_config.prf
> %%QT_MKSPECDIR%%/features/resolve_target.prf
> %%QT_MKSPECDIR%%/features/resources.prf
>+%%QT_MKSPECDIR%%/features/sanitizer.prf
> %%QT_MKSPECDIR%%/features/silent.prf
> %%QT_MKSPECDIR%%/features/simd.prf
> %%QT_MKSPECDIR%%/features/spec_post.prf
> %%QT_MKSPECDIR%%/features/spec_pre.prf
>+%%QT_MKSPECDIR%%/features/static_runtime.prf
> %%QT_MKSPECDIR%%/features/testcase.prf
> %%QT_MKSPECDIR%%/features/testcase_targets.prf
> %%QT_MKSPECDIR%%/features/testcocoon.prf
>-%%QT_MKSPECDIR%%/features/testlib_defines.prf
>+%%QT_MKSPECDIR%%/features/test%%QT_LIBDIR%%_defines.prf
> %%QT_MKSPECDIR%%/features/uic.prf
> %%QT_MKSPECDIR%%/features/unix/bsymbolic_functions.prf
>-%%QT_MKSPECDIR%%/features/unix/dylib.prf
>+%%QT_MKSPECDIR%%/features/unix/dy%%QT_LIBDIR%%.prf
> %%QT_MKSPECDIR%%/features/unix/hide_symbols.prf
> %%QT_MKSPECDIR%%/features/unix/largefile.prf
> %%QT_MKSPECDIR%%/features/unix/opengl.prf
>@@ -213,7 +208,7 @@
> %%QT_MKSPECDIR%%/features/unix/thread.prf
> %%QT_MKSPECDIR%%/features/unix/x11.prf
> %%QT_MKSPECDIR%%/features/unix/x11inc.prf
>-%%QT_MKSPECDIR%%/features/unix/x11lib.prf
>+%%QT_MKSPECDIR%%/features/unix/x11%%QT_LIBDIR%%.prf
> %%QT_MKSPECDIR%%/features/unix/x11sm.prf
> %%QT_MKSPECDIR%%/features/use_c_linker.prf
> %%QT_MKSPECDIR%%/features/vxworks.prf
>@@ -236,8 +231,10 @@
> %%QT_MKSPECDIR%%/features/win32/windeployqt.prf
> %%QT_MKSPECDIR%%/features/win32/windows.prf
> %%QT_MKSPECDIR%%/features/winrt/console.prf
>+%%QT_MKSPECDIR%%/features/winrt/default_pre.prf
> %%QT_MKSPECDIR%%/features/winrt/font_deployment.prf
> %%QT_MKSPECDIR%%/features/winrt/package_manifest.prf
>+%%QT_MKSPECDIR%%/features/xctest.prf
> %%QT_MKSPECDIR%%/features/yacc.prf
> %%QT_MKSPECDIR%%/freebsd-clang/qmake.conf
> %%QT_MKSPECDIR%%/freebsd-clang/qplatformdefs.h
>@@ -245,6 +242,8 @@
> %%QT_MKSPECDIR%%/freebsd-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/freebsd-icc/qmake.conf
> %%QT_MKSPECDIR%%/freebsd-icc/qplatformdefs.h
>+%%QT_MKSPECDIR%%/haiku-g++/qmake.conf
>+%%QT_MKSPECDIR%%/haiku-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/hpux-acc-64/qmake.conf
> %%QT_MKSPECDIR%%/hpux-acc-64/qplatformdefs.h
> %%QT_MKSPECDIR%%/hpux-acc-o64/qmake.conf
>@@ -273,8 +272,8 @@
> %%QT_MKSPECDIR%%/irix-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/linux-arm-gnueabi-g++/qmake.conf
> %%QT_MKSPECDIR%%/linux-arm-gnueabi-g++/qplatformdefs.h
>-%%QT_MKSPECDIR%%/linux-clang-libc++/qmake.conf
>-%%QT_MKSPECDIR%%/linux-clang-libc++/qplatformdefs.h
>+%%QT_MKSPECDIR%%/linux-clang-%%QT_LIBDIR%%c++/qmake.conf
>+%%QT_MKSPECDIR%%/linux-clang-%%QT_LIBDIR%%c++/qplatformdefs.h
> %%QT_MKSPECDIR%%/linux-clang/qmake.conf
> %%QT_MKSPECDIR%%/linux-clang/qplatformdefs.h
> %%QT_MKSPECDIR%%/linux-cxx/qmake.conf
>@@ -302,36 +301,36 @@
> %%QT_MKSPECDIR%%/lynxos-g++/qmake.conf
> %%QT_MKSPECDIR%%/lynxos-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/macx-clang-32/Info.plist.app
>-%%QT_MKSPECDIR%%/macx-clang-32/Info.plist.lib
>+%%QT_MKSPECDIR%%/macx-clang-32/Info.plist.%%QT_LIBDIR%%
> %%QT_MKSPECDIR%%/macx-clang-32/qmake.conf
> %%QT_MKSPECDIR%%/macx-clang-32/qplatformdefs.h
> %%QT_MKSPECDIR%%/macx-clang/Info.plist.app
>-%%QT_MKSPECDIR%%/macx-clang/Info.plist.lib
>+%%QT_MKSPECDIR%%/macx-clang/Info.plist.%%QT_LIBDIR%%
> %%QT_MKSPECDIR%%/macx-clang/qmake.conf
> %%QT_MKSPECDIR%%/macx-clang/qplatformdefs.h
> %%QT_MKSPECDIR%%/macx-g++-32/Info.plist.app
>-%%QT_MKSPECDIR%%/macx-g++-32/Info.plist.lib
>+%%QT_MKSPECDIR%%/macx-g++-32/Info.plist.%%QT_LIBDIR%%
> %%QT_MKSPECDIR%%/macx-g++-32/qmake.conf
> %%QT_MKSPECDIR%%/macx-g++-32/qplatformdefs.h
> %%QT_MKSPECDIR%%/macx-g++/Info.plist.app
>-%%QT_MKSPECDIR%%/macx-g++/Info.plist.lib
>+%%QT_MKSPECDIR%%/macx-g++/Info.plist.%%QT_LIBDIR%%
> %%QT_MKSPECDIR%%/macx-g++/qmake.conf
> %%QT_MKSPECDIR%%/macx-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/macx-g++40/Info.plist.app
>-%%QT_MKSPECDIR%%/macx-g++40/Info.plist.lib
>+%%QT_MKSPECDIR%%/macx-g++40/Info.plist.%%QT_LIBDIR%%
> %%QT_MKSPECDIR%%/macx-g++40/qmake.conf
> %%QT_MKSPECDIR%%/macx-g++40/qplatformdefs.h
> %%QT_MKSPECDIR%%/macx-g++42/Info.plist.app
>-%%QT_MKSPECDIR%%/macx-g++42/Info.plist.lib
>+%%QT_MKSPECDIR%%/macx-g++42/Info.plist.%%QT_LIBDIR%%
> %%QT_MKSPECDIR%%/macx-g++42/qmake.conf
> %%QT_MKSPECDIR%%/macx-g++42/qplatformdefs.h
> %%QT_MKSPECDIR%%/macx-icc/Info.plist.app
>-%%QT_MKSPECDIR%%/macx-icc/Info.plist.lib
>+%%QT_MKSPECDIR%%/macx-icc/Info.plist.%%QT_LIBDIR%%
> %%QT_MKSPECDIR%%/macx-icc/qmake.conf
> %%QT_MKSPECDIR%%/macx-icc/qplatformdefs.h
> %%QT_MKSPECDIR%%/macx-ios-clang/Default-568h@2x.png
> %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app
>-%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib
>+%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.%%QT_LIBDIR%%
> %%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.xib
> %%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf
> %%QT_MKSPECDIR%%/macx-ios-clang/features/default_pre.prf
>@@ -343,9 +342,12 @@
> %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h
> %%QT_MKSPECDIR%%/macx-ios-clang/rename_main.sh
> %%QT_MKSPECDIR%%/macx-llvm/Info.plist.app
>-%%QT_MKSPECDIR%%/macx-llvm/Info.plist.lib
>+%%QT_MKSPECDIR%%/macx-llvm/Info.plist.%%QT_LIBDIR%%
> %%QT_MKSPECDIR%%/macx-llvm/qmake.conf
> %%QT_MKSPECDIR%%/macx-llvm/qplatformdefs.h
>+%%QT_MKSPECDIR%%/macx-xcode/QtTest.plist
>+%%QT_MKSPECDIR%%/macx-xcode/WorkspaceSettings.xcsettings
>+%%QT_MKSPECDIR%%/macx-xcode/default.xcscheme
> %%QT_MKSPECDIR%%/macx-xcode/qmake.conf
> %%QT_MKSPECDIR%%/macx-xcode/qplatformdefs.h
> %%QT_MKSPECDIR%%/netbsd-g++/qmake.conf
>@@ -358,8 +360,6 @@
> %%QT_MKSPECDIR%%/qmodule.pri
> %%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qmake.conf
> %%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qplatformdefs.h
>-%%QT_MKSPECDIR%%/qnx-armv7le-qcc/qmake.conf
>-%%QT_MKSPECDIR%%/qnx-armv7le-qcc/qplatformdefs.h
> %%QT_MKSPECDIR%%/qnx-x86-qcc/qmake.conf
> %%QT_MKSPECDIR%%/qnx-x86-qcc/qplatformdefs.h
> %%QT_MKSPECDIR%%/sco-cc/qmake.conf
>@@ -389,8 +389,6 @@
> %%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/integrity-ghs/qmake.conf
>-%%QT_MKSPECDIR%%/unsupported/integrity-ghs/qplatformdefs.h
> %%QT_MKSPECDIR%%/unsupported/linux-armcc/qmake.conf
> %%QT_MKSPECDIR%%/unsupported/linux-armcc/qplatformdefs.h
> %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf
>@@ -411,8 +409,6 @@
> %%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%%/unsupported/win32-msvc2003/qmake.conf
>-%%QT_MKSPECDIR%%/unsupported/win32-msvc2003/qplatformdefs.h
> %%QT_MKSPECDIR%%/win32-g++/qmake.conf
> %%QT_MKSPECDIR%%/win32-g++/qplatformdefs.h
> %%QT_MKSPECDIR%%/win32-icc/qmake.conf
>@@ -427,6 +423,8 @@
> %%QT_MKSPECDIR%%/win32-msvc2012/qplatformdefs.h
> %%QT_MKSPECDIR%%/win32-msvc2013/qmake.conf
> %%QT_MKSPECDIR%%/win32-msvc2013/qplatformdefs.h
>+%%QT_MKSPECDIR%%/win32-msvc2015/qmake.conf
>+%%QT_MKSPECDIR%%/win32-msvc2015/qplatformdefs.h
> %%QT_MKSPECDIR%%/wince60standard-armv4i-msvc2005/qmake.conf
> %%QT_MKSPECDIR%%/wince60standard-armv4i-msvc2005/qplatformdefs.h
> %%QT_MKSPECDIR%%/wince60standard-x86-msvc2005/qmake.conf
>@@ -435,23 +433,21 @@
> %%QT_MKSPECDIR%%/wince70embedded-armv4i-msvc2008/qplatformdefs.h
> %%QT_MKSPECDIR%%/wince70embedded-x86-msvc2008/qmake.conf
> %%QT_MKSPECDIR%%/wince70embedded-x86-msvc2008/qplatformdefs.h
>-%%QT_MKSPECDIR%%/winphone-arm-msvc2012/qmake.conf
>-%%QT_MKSPECDIR%%/winphone-arm-msvc2012/qplatformdefs.h
>+%%QT_MKSPECDIR%%/wince80co%%QT_LIBDIR%%ri-armv7-msvc2012/qmake.conf
>+%%QT_MKSPECDIR%%/wince80co%%QT_LIBDIR%%ri-armv7-msvc2012/qplatformdefs.h
> %%QT_MKSPECDIR%%/winphone-arm-msvc2013/qmake.conf
> %%QT_MKSPECDIR%%/winphone-arm-msvc2013/qplatformdefs.h
>-%%QT_MKSPECDIR%%/winphone-x86-msvc2012/qmake.conf
>-%%QT_MKSPECDIR%%/winphone-x86-msvc2012/qplatformdefs.h
> %%QT_MKSPECDIR%%/winphone-x86-msvc2013/qmake.conf
> %%QT_MKSPECDIR%%/winphone-x86-msvc2013/qplatformdefs.h
>-%%QT_MKSPECDIR%%/winrt-arm-msvc2012/qmake.conf
>-%%QT_MKSPECDIR%%/winrt-arm-msvc2012/qplatformdefs.h
> %%QT_MKSPECDIR%%/winrt-arm-msvc2013/qmake.conf
> %%QT_MKSPECDIR%%/winrt-arm-msvc2013/qplatformdefs.h
>-%%QT_MKSPECDIR%%/winrt-x64-msvc2012/qmake.conf
>-%%QT_MKSPECDIR%%/winrt-x64-msvc2012/qplatformdefs.h
>+%%QT_MKSPECDIR%%/winrt-arm-msvc2015/qmake.conf
>+%%QT_MKSPECDIR%%/winrt-arm-msvc2015/qplatformdefs.h
> %%QT_MKSPECDIR%%/winrt-x64-msvc2013/qmake.conf
> %%QT_MKSPECDIR%%/winrt-x64-msvc2013/qplatformdefs.h
>-%%QT_MKSPECDIR%%/winrt-x86-msvc2012/qmake.conf
>-%%QT_MKSPECDIR%%/winrt-x86-msvc2012/qplatformdefs.h
>+%%QT_MKSPECDIR%%/winrt-x64-msvc2015/qmake.conf
>+%%QT_MKSPECDIR%%/winrt-x64-msvc2015/qplatformdefs.h
> %%QT_MKSPECDIR%%/winrt-x86-msvc2013/qmake.conf
> %%QT_MKSPECDIR%%/winrt-x86-msvc2013/qplatformdefs.h
>+%%QT_MKSPECDIR%%/winrt-x86-msvc2015/qmake.conf
>+%%QT_MKSPECDIR%%/winrt-x86-msvc2015/qplatformdefs.h
>Index: devel/qt5/distinfo
>===================================================================
>--- devel/qt5/distinfo	(revision 404968)
>+++ devel/qt5/distinfo	(working copy)
>@@ -1,38 +1,40 @@
>-SHA256 (KDE/Qt/5.4.1/qtbase-opensource-src-5.4.1.tar.xz) = 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7
>-SIZE (KDE/Qt/5.4.1/qtbase-opensource-src-5.4.1.tar.xz) = 46132220
>-SHA256 (KDE/Qt/5.4.1/qtdeclarative-opensource-src-5.4.1.tar.xz) = 15124e242a8a4a8fc5bedd32910b3b0b372b6c2b63f99572c4a2427e668d4417
>-SIZE (KDE/Qt/5.4.1/qtdeclarative-opensource-src-5.4.1.tar.xz) = 18406948
>-SHA256 (KDE/Qt/5.4.1/qtdoc-opensource-src-5.4.1.tar.xz) = 18b1229234aaba204870cea7c06b99d4c6b9a1f689a1a204c010bfee3b15cfa9
>-SIZE (KDE/Qt/5.4.1/qtdoc-opensource-src-5.4.1.tar.xz) = 16050812
>-SHA256 (KDE/Qt/5.4.1/qtgraphicaleffects-opensource-src-5.4.1.tar.xz) = bae2f0e8120f0b4e6e1b56a486713821615d0af7c69fb4ecdcbabc22b8f8351c
>-SIZE (KDE/Qt/5.4.1/qtgraphicaleffects-opensource-src-5.4.1.tar.xz) = 14323700
>-SHA256 (KDE/Qt/5.4.1/qtimageformats-opensource-src-5.4.1.tar.xz) = 3f6c5bb568ebbee24700c439a60b2e512026dfee5be896c846e4f289cc5b846f
>-SIZE (KDE/Qt/5.4.1/qtimageformats-opensource-src-5.4.1.tar.xz) = 2108976
>-SHA256 (KDE/Qt/5.4.1/qtmultimedia-opensource-src-5.4.1.tar.xz) = 3830dd4a11727cc4a3ab32dc10e4cd016739d0b1b0c59685512853e10f1e534e
>-SIZE (KDE/Qt/5.4.1/qtmultimedia-opensource-src-5.4.1.tar.xz) = 3184784
>-SHA256 (KDE/Qt/5.4.1/qtquick1-opensource-src-5.4.1.tar.xz) = eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d
>-SIZE (KDE/Qt/5.4.1/qtquick1-opensource-src-5.4.1.tar.xz) = 15983524
>-SHA256 (KDE/Qt/5.4.1/qtquickcontrols-opensource-src-5.4.1.tar.xz) = fe0852c510b7ab9111310d6880d1b1f34908274099aefa5a14316173b25cfbc2
>-SIZE (KDE/Qt/5.4.1/qtquickcontrols-opensource-src-5.4.1.tar.xz) = 945324
>-SHA256 (KDE/Qt/5.4.1/qtscript-opensource-src-5.4.1.tar.xz) = f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf
>-SIZE (KDE/Qt/5.4.1/qtscript-opensource-src-5.4.1.tar.xz) = 2581684
>-SHA256 (KDE/Qt/5.4.1/qtserialport-opensource-src-5.4.1.tar.xz) = 79d99e826bf49e469a651cdc2d499d8b54e52bb8aaa279719a3afa03eba5d0ff
>-SIZE (KDE/Qt/5.4.1/qtserialport-opensource-src-5.4.1.tar.xz) = 255120
>-SHA256 (KDE/Qt/5.4.1/qtsvg-opensource-src-5.4.1.tar.xz) = be8a90ccce2e873d3489a416d1748089f46e329519acb990cf851d6c9f9de12c
>-SIZE (KDE/Qt/5.4.1/qtsvg-opensource-src-5.4.1.tar.xz) = 1758812
>-SHA256 (KDE/Qt/5.4.1/qttools-opensource-src-5.4.1.tar.xz) = 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72
>-SIZE (KDE/Qt/5.4.1/qttools-opensource-src-5.4.1.tar.xz) = 9262024
>-SHA256 (KDE/Qt/5.4.1/qttranslations-opensource-src-5.4.1.tar.xz) = 3c4d045f974bc9ee76bb85d319737cf182b8697c4ba72d2c075d3609cfaf9041
>-SIZE (KDE/Qt/5.4.1/qttranslations-opensource-src-5.4.1.tar.xz) = 1071784
>-SHA256 (KDE/Qt/5.4.1/qtwebchannel-opensource-src-5.4.1.tar.xz) = c4acb9ec9886fca6d0c2adc5b45970347ae1b3e4b5e0055ab370540faef7b251
>-SIZE (KDE/Qt/5.4.1/qtwebchannel-opensource-src-5.4.1.tar.xz) = 84636
>-SHA256 (KDE/Qt/5.4.1/qtwebkit-opensource-src-5.4.1.tar.xz) = 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf
>-SIZE (KDE/Qt/5.4.1/qtwebkit-opensource-src-5.4.1.tar.xz) = 33457544
>-SHA256 (KDE/Qt/5.4.1/qtwebkit-examples-opensource-src-5.4.1.tar.xz) = 19187bb31c349c67f90c92df896f14f9167b982bdef5187e83fd68407826720a
>-SIZE (KDE/Qt/5.4.1/qtwebkit-examples-opensource-src-5.4.1.tar.xz) = 3419316
>-SHA256 (KDE/Qt/5.4.1/qtwebsockets-opensource-src-5.4.1.tar.xz) = daf56f98c5e267253bd2d2e421472fc02faa1703a9063cc14cf8afce6967ab44
>-SIZE (KDE/Qt/5.4.1/qtwebsockets-opensource-src-5.4.1.tar.xz) = 74784
>-SHA256 (KDE/Qt/5.4.1/qtx11extras-opensource-src-5.4.1.tar.xz) = 20a61cdb9f925e9ab959bed1e7aeb1855b721619d5dc5f3691b8c1ce186e8c2e
>-SIZE (KDE/Qt/5.4.1/qtx11extras-opensource-src-5.4.1.tar.xz) = 25460
>-SHA256 (KDE/Qt/5.4.1/qtxmlpatterns-opensource-src-5.4.1.tar.xz) = f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318
>-SIZE (KDE/Qt/5.4.1/qtxmlpatterns-opensource-src-5.4.1.tar.xz) = 1307228
>+SHA256 (KDE/Qt/5.5.1/qtbase-opensource-src-5.5.1.tar.xz) = dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916
>+SIZE (KDE/Qt/5.5.1/qtbase-opensource-src-5.5.1.tar.xz) = 46389212
>+SHA256 (KDE/Qt/5.5.1/qtdeclarative-opensource-src-5.5.1.tar.xz) = 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791
>+SIZE (KDE/Qt/5.5.1/qtdeclarative-opensource-src-5.5.1.tar.xz) = 18627840
>+SHA256 (KDE/Qt/5.5.1/qtdoc-opensource-src-5.5.1.tar.xz) = 9f0daf55a1765f637b5d8096a195842281a49adc5a82e7ddc75e541c62e00f86
>+SIZE (KDE/Qt/5.5.1/qtdoc-opensource-src-5.5.1.tar.xz) = 2669772
>+SHA256 (KDE/Qt/5.5.1/qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47
>+SIZE (KDE/Qt/5.5.1/qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 14329444
>+SHA256 (KDE/Qt/5.5.1/qtimageformats-opensource-src-5.5.1.tar.xz) = c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5
>+SIZE (KDE/Qt/5.5.1/qtimageformats-opensource-src-5.5.1.tar.xz) = 1892820
>+SHA256 (KDE/Qt/5.5.1/qtmultimedia-opensource-src-5.5.1.tar.xz) = 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f
>+SIZE (KDE/Qt/5.5.1/qtmultimedia-opensource-src-5.5.1.tar.xz) = 3464340
>+SHA256 (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c
>+SIZE (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = 16028732
>+SHA256 (KDE/Qt/5.5.1/qtquickcontrols-opensource-src-5.5.1.tar.xz) = 1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0
>+SIZE (KDE/Qt/5.5.1/qtquickcontrols-opensource-src-5.5.1.tar.xz) = 5976316
>+SHA256 (KDE/Qt/5.5.1/qtscript-opensource-src-5.5.1.tar.xz) = cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd
>+SIZE (KDE/Qt/5.5.1/qtscript-opensource-src-5.5.1.tar.xz) = 2604884
>+SHA256 (KDE/Qt/5.5.1/qtserialport-opensource-src-5.5.1.tar.xz) = a034dbfb023db1b9b9de54390f7e76a48c1d1eb12533b0ffd574505c99968f7a
>+SIZE (KDE/Qt/5.5.1/qtserialport-opensource-src-5.5.1.tar.xz) = 260984
>+SHA256 (KDE/Qt/5.5.1/qtsvg-opensource-src-5.5.1.tar.xz) = f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7
>+SIZE (KDE/Qt/5.5.1/qtsvg-opensource-src-5.5.1.tar.xz) = 1802880
>+SHA256 (KDE/Qt/5.5.1/qttools-opensource-src-5.5.1.tar.xz) = 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd
>+SIZE (KDE/Qt/5.5.1/qttools-opensource-src-5.5.1.tar.xz) = 9327100
>+SHA256 (KDE/Qt/5.5.1/qttranslations-opensource-src-5.5.1.tar.xz) = 41f800710f0bc6ca263f1e54f1fa22be7043962999304e73ce9887ebefc7a4c6
>+SIZE (KDE/Qt/5.5.1/qttranslations-opensource-src-5.5.1.tar.xz) = 1153132
>+SHA256 (KDE/Qt/5.5.1/qtwebchannel-opensource-src-5.5.1.tar.xz) = 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0
>+SIZE (KDE/Qt/5.5.1/qtwebchannel-opensource-src-5.5.1.tar.xz) = 96684
>+SHA256 (KDE/Qt/5.5.1/qtwebengine-opensource-src-5.5.1.tar.xz) = 7c4d328dd305991aaf0c3450615f4a8e5d80152194bee6f5925bd8d3477e2b90
>+SIZE (KDE/Qt/5.5.1/qtwebengine-opensource-src-5.5.1.tar.xz) = 122819856
>+SHA256 (KDE/Qt/5.5.1/qtwebkit-opensource-src-5.5.1.tar.xz) = 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69
>+SIZE (KDE/Qt/5.5.1/qtwebkit-opensource-src-5.5.1.tar.xz) = 33489924
>+SHA256 (KDE/Qt/5.5.1/qtwebkit-examples-opensource-src-5.5.1.tar.xz) = 098935b42d6d249027d1a635e4e70edc3d2969dd860f825b36aec06fc72e46c6
>+SIZE (KDE/Qt/5.5.1/qtwebkit-examples-opensource-src-5.5.1.tar.xz) = 3428204
>+SHA256 (KDE/Qt/5.5.1/qtwebsockets-opensource-src-5.5.1.tar.xz) = cf4e834a867b90337188be504ef20184c52666370f721e704952988f8cb12deb
>+SIZE (KDE/Qt/5.5.1/qtwebsockets-opensource-src-5.5.1.tar.xz) = 170440
>+SHA256 (KDE/Qt/5.5.1/qtx11extras-opensource-src-5.5.1.tar.xz) = 6387a01d972b62e1ad39e5a25e07d0492200f62fc87cf4366122085aeeebeb65
>+SIZE (KDE/Qt/5.5.1/qtx11extras-opensource-src-5.5.1.tar.xz) = 33416
>+SHA256 (KDE/Qt/5.5.1/qtxmlpatterns-opensource-src-5.5.1.tar.xz) = b537eb0252988e3805a32a16c65038973371d647baf246fdf703bde725d0e8ec
>+SIZE (KDE/Qt/5.5.1/qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 1323560
>Index: devel/qt5/files/extrapatch-config.tests-unix-compile.test
>===================================================================
>--- devel/qt5/files/extrapatch-config.tests-unix-compile.test	(revision 404968)
>+++ devel/qt5/files/extrapatch-config.tests-unix-compile.test	(working copy)
>@@ -1,5 +1,5 @@
>---- config.tests/unix/compile.test.orig
>-+++ config.tests/unix/compile.test
>+--- config.tests/unix/compile.test.orig	2015-12-31 20:29:34.906808000 -0800
>++++ config.tests/unix/compile.test	2015-12-31 20:29:43.235759000 -0800
> @@ -13,7 +13,7 @@
>  shift 7
>  LFLAGS="$SYSROOT_FLAG"
>Index: devel/qt5/files/extrapatch-configure
>===================================================================
>--- devel/qt5/files/extrapatch-configure	(revision 404968)
>+++ devel/qt5/files/extrapatch-configure	(working copy)
>@@ -1,24 +1,6 @@
>-* The "build qmake" chunk is required for qtbase ports other than devel/qmake5
>-  to use the already built qmake instead of always building their own copy.
>-
>-* All the other chunks are part of the changes required to avoid ports/194088.
>-
>-  We want to avoid passing -I${LOCALBASE}/include and -L${LOCALBASE}/lib to the
>-  compiler since in Qt5 at least for the Qt ports themselves those parameters
>-  will be passed before the build directories, and consequently an older
>-  installed version will be used when building a new Qt port and cause
>-  problems. See QTBUG-40825 for a discussion we have started upstream.
>-
>-  This part of the solution comprises both filtering the output of the
>-  pkg-config calls so it does not contain those parameters as well as
>-  changing the default value of DEFAULT_LIBDIRS in bsd.qt.mk (in the
>-  qtbase-post-patch target). It is used in the pkg-config filtering as well
>-  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
>-+++ configure
>-@@ -3683,7 +3683,7 @@ setBootstrapVariable()
>+--- configure.orig	2015-12-31 20:55:26.355468000 -0800
>++++ configure	2015-12-31 21:00:15.797144000 -0800
>+@@ -3910,7 +3910,7 @@
>  }
>  
>  # build qmake
>@@ -27,7 +9,7 @@
>      echo "Creating qmake..."
>  
>      mkdir -p "$outpath/qmake" || exit
>-@@ -4542,8 +4542,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
>+@@ -4834,8 +4834,8 @@
>                  SQLITE_AUTODETECT_FAILED="no"
>                  if [ "$CFG_SQLITE" = "system" ]; then
>                      if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then
>@@ -34,22 +16,22 @@
> -                        QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
> -                        QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
> +                        QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null | filterIncludeOptions`
>-+                        QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null | filterLibraryOptions`
>++                        QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null | filterIncludeOptions`
>                      else
>                          QT_CFLAGS_SQLITE=
>                          QT_LFLAGS_SQLITE="-lsqlite3 -lz"
>-@@ -4643,8 +4643,8 @@ fi
>- # auto-detect libdbus-1 support
>+@@ -4938,8 +4938,8 @@
>+ fi
>  if [ "$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`
> +        QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null | filterIncludeOptions`
>-+        QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null | filterLibraryOptions`
>++        QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null | filterIncludeOptions`
>      else
>          QT_LIBS_DBUS="-ldbus-1"
>      fi
>-@@ -4672,8 +4672,8 @@ fi
>+@@ -4985,8 +4985,8 @@
>  # auto-detect Glib support
>  if [ "$CFG_GLIB" != "no" ]; then
>      if [ -n "$PKG_CONFIG" ]; then
>@@ -56,11 +38,11 @@
> -        QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null`
> -        QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null`
> +        QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null | filterIncludeOptions`
>-+        QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null | filterLibraryOptions`
>++        QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null | filterIncludeOptions`
>      fi
>      if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then
>          CFG_GLIB=yes
>-@@ -4696,9 +4696,9 @@ fi
>+@@ -5009,9 +5009,9 @@
>  # auto-detect GTK style support
>  if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then
>      if [ -n "$PKG_CONFIG" ]; then
>@@ -68,12 +50,12 @@
> -        QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.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_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null | filterLibraryOptions`
>++        QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null | filterIncludeOptions`
>++        QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null | filterIncludeOptions`
>      fi
>      if [ -n "$QT_CFLAGS_QGTK2" ] ; then
>          CFG_QGTKSTYLE=yes
>-@@ -4745,8 +4745,8 @@ fi
>+@@ -5058,8 +5058,8 @@
>  # Auto-detect PulseAudio support
>  if [ "$CFG_PULSEAUDIO" != "no" ]; then
>      if [ -n "$PKG_CONFIG" ]; then
>@@ -80,26 +62,11 @@
> -        QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null`
> -        QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null`
> +        QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterIncludeOptions`
>-+        QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterLibraryOptions`
>++        QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterIncludeOptions`
>      fi
>      if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then
>          CFG_PULSEAUDIO=yes
>-@@ -4870,10 +4870,10 @@ if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
>- elif [ "$CFG_OPENGL" = "es2" ]; then
>-     #OpenGL ES 2.0
>-     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then
>--        QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
>--        QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'`
>--        QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null`
>--        QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null`
>-+        QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'`
>-+        QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | filterLibraryOptions | sed -e 's,^-L,,g' -e 's, -L, ,g'`
>-+        QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null | filterLibraryOptions`
>-+        QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null | filterIncludeOptions`
>-         QMakeVar set QMAKE_INCDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_INCDIR_OPENGL_ES2"`"
>-         QMakeVar set QMAKE_LIBDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBDIR_OPENGL_ES2"`"
>-         QMakeVar set QMAKE_LIBS_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBS_OPENGL_ES2"`"
>-@@ -4918,8 +4918,8 @@ fi
>+@@ -5222,8 +5222,8 @@
>  # auto-detect FontConfig support
>  if [ "$CFG_FONTCONFIG" != "no" ]; then
>      if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then
>@@ -106,11 +73,11 @@
> -        QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null`
> -        QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null`
> +        QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null | filterIncludeOptions`
>-+        QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null | filterLibraryOptions`
>++        QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null | filterIncludeOptions`
>      else
>          QT_CFLAGS_FONTCONFIG=
>          QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"
>-@@ -4945,9 +4945,9 @@ ORIG_CFG_KMS="$CFG_KMS"
>+@@ -5249,9 +5249,9 @@
>  
>  if [ "$CFG_LIBUDEV" != "no" ]; then
>      if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists libudev 2>/dev/null; then
>@@ -118,12 +85,12 @@
> -        QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null`
> -        QMAKE_CFLAGS_LIBUDEV=`$PKG_CONFIG --cflags libudev 2>/dev/null`
> +        QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'`
>-+        QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null | filterLibraryOptions`
>++        QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null | filterIncludeOptions`
> +        QMAKE_CFLAGS_LIBUDEV=`$PKG_CONFIG --cflags libudev 2>/dev/null | filterIncludeOptions`
>          QMakeVar set QMAKE_INCDIR_LIBUDEV "$QMAKE_INCDIR_LIBUDEV"
>          QMakeVar set QMAKE_LIBS_LIBUDEV "$QMAKE_LIBS_LIBUDEV"
>      fi
>-@@ -5036,8 +5036,8 @@ fi
>+@@ -5398,8 +5398,8 @@
>  
>  if [ "$CFG_XCB" != "no" ]; then
>      if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
>@@ -130,11 +97,11 @@
> -        QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`"
> -        QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`"
> +        QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null | filterIncludeOptions`"
>-+        QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null | filterLibraryOptions`"
>++        QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null | filterIncludeOptions`"
>      fi
>      if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then
>          QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
>-@@ -5056,16 +5056,16 @@ if [ "$CFG_XCB" != "no" ]; then
>+@@ -5418,16 +5418,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"
>@@ -141,7 +108,7 @@
> -                QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`"
> -                QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`"
> +                QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null | filterIncludeOptions`"
>-+                QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null | filterLibraryOptions`"
>++                QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null | filterIncludeOptions`"
>              fi
>  
>              # libxcb version 1.10 was the first version that enables xcb-xkb by default,
>@@ -150,12 +117,12 @@
>              if $PKG_CONFIG --exists "xcb-xkb >= 1.10" 2>/dev/null; then
> -                QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null`"
> -                QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null`"
>-+                QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null` | filterIncludeOptions"
>-+                QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null` | filterLibraryOptions"
>++                QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null | filterIncludeOptions`"
>++                QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null | filterIncludeOptions`"
>                  if compileTest qpa/xcb-xkb "xcb-xkb" $QMAKE_CFLAGS_XKB $QMAKE_LIBS_XKB; then
>                      CFG_XKB=yes
>                  fi
>-@@ -5119,8 +5119,8 @@ fi
>+@@ -5481,8 +5481,8 @@
>  
>  if [ "$CFG_DIRECTFB" != "no" ]; then
>      if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then
>@@ -162,11 +129,11 @@
> -        QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null`
> -        QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null`
> +        QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null | filterIncludeOptions`
>-+        QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null | filterLibraryOptions`
>++        QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null | filterIncludeOptions`
>          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
>-@@ -5173,8 +5173,8 @@ if [ "$CFG_XCB" != "no" ]; then
>+@@ -5535,8 +5535,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
>@@ -173,11 +140,11 @@
> -            QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null`"
> -            QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null`"
> +            QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null | filterIncludeOptions`"
>-+            QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null | filterLibraryOptions`"
>++            QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null | filterIncludeOptions`"
>  
>              QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON"
>              QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON"
>-@@ -5227,9 +5227,9 @@ if [ "$CFG_EGL" != "no" ]; then
>+@@ -5589,9 +5589,9 @@
>      fi
>  
>      if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then
>@@ -185,7 +152,7 @@
> -        QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null`
> -        QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null`
> +        QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'`
>-+        QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null | filterLibraryOptions`
>++        QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null | filterIncludeOptions`
> +        QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null | filterIncludeOptions`
>          QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
>          QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
>Index: devel/qt5/files/extrapatch-forkfd_qt.cpp
>===================================================================
>--- devel/qt5/files/extrapatch-forkfd_qt.cpp	(nonexistent)
>+++ devel/qt5/files/extrapatch-forkfd_qt.cpp	(working copy)
>@@ -0,0 +1,9 @@
>+--- src/corelib/io/forkfd_qt.cpp.orig	2015-10-12 21:35:31.000000000 -0700
>++++ src/corelib/io/forkfd_qt.cpp	2015-12-31 17:01:35.086730000 -0800
>+@@ -77,5 +77,6 @@
>+ QT_END_NAMESPACE
>+ 
>+ extern "C" {
>++int pipe2(int fildes[2], int flags);
>+ #include "../../3rdparty/forkfd/forkfd.c"
>+ }
>
>Property changes on: devel/qt5/files/extrapatch-forkfd_qt.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/qt5/files/extrapatch-libtool
>===================================================================
>--- devel/qt5/files/extrapatch-libtool	(revision 404968)
>+++ devel/qt5/files/extrapatch-libtool	(working copy)
>@@ -1,11 +1,11 @@
>---- mkspecs/features/qt_module.prf.orig
>-+++ mkspecs/features/qt_module.prf
>-@@ -189,7 +189,7 @@
>-     QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
>+--- mkspecs/features/qt_module.prf.orig	2015-10-12 21:35:32.000000000 -0700
>++++ mkspecs/features/qt_module.prf	2015-12-31 17:45:38.602059000 -0800
>+@@ -215,7 +215,7 @@
>+     QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
>  
>      unix {
> -        CONFIG += create_libtool explicitlib
> +        CONFIG += explicitlib
>-         QMAKE_LIBTOOL_LIBDIR = $$qt_libdir
>-         QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace
>-     }
>+         host_build: \
>+             QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
>+         else: \
>Index: devel/qt5/files/extrapatch-pcre.pro
>===================================================================
>--- devel/qt5/files/extrapatch-pcre.pro	(nonexistent)
>+++ devel/qt5/files/extrapatch-pcre.pro	(working copy)
>@@ -0,0 +1,8 @@
>+--- config.tests/unix/pcre/pcre.pro.orig	2015-12-31 20:45:35.898772000 -0800
>++++ config.tests/unix/pcre/pcre.pro	2015-12-31 20:47:10.058996000 -0800
>+@@ -1,3 +1,4 @@
>+ SOURCES = pcre.cpp
>+ CONFIG -= qt dylib
>+-LIBS += -lpcre16
>++INCLUDEPATH += -I${LOCALBASE}/include
>++LIBS += -L${LOCALBASE}/lib -lpcre16
>
>Property changes on: devel/qt5/files/extrapatch-pcre.pro
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/qt5/files/extrapatch-qstorageinfo_unix.cpp
>===================================================================
>--- devel/qt5/files/extrapatch-qstorageinfo_unix.cpp	(nonexistent)
>+++ devel/qt5/files/extrapatch-qstorageinfo_unix.cpp	(working copy)
>@@ -0,0 +1,15 @@
>+--- src/corelib/io/qstorageinfo_unix.cpp.orig	2015-12-31 18:25:19.963852000 -0800
>++++ src/corelib/io/qstorageinfo_unix.cpp	2015-12-31 18:25:35.869224000 -0800
>+@@ -506,9 +506,9 @@
>+         valid = true;
>+         ready = true;
>+ 
>+-        bytesTotal = statfs_buf.f_blocks * statfs_buf.f_frsize;
>+-        bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize;
>+-        bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize;
>++        bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize;
>++        bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize;
>++        bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize;
>+ #if defined(Q_OS_ANDROID) || defined (Q_OS_BSD4)
>+ #if defined(_STATFS_F_FLAGS)
>+         readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0;
>
>Property changes on: devel/qt5/files/extrapatch-qstorageinfo_unix.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/qt5-assistant/files/patch-src__src.pro
>===================================================================
>--- devel/qt5-assistant/files/patch-src__src.pro	(revision 404968)
>+++ devel/qt5-assistant/files/patch-src__src.pro	(working copy)
>@@ -1,9 +1,9 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/src.pro
>+--- src/src.pro.orig	2015-10-13 04:38:15 UTC
> +++ src/src.pro
>-@@ -1,38 +1,2 @@
>+@@ -1,37 +1,2 @@
>  TEMPLATE = subdirs
> -
> -qtHaveModule(widgets) {
>@@ -14,13 +14,13 @@
> -                  pixeltool \
> -                  qtestlib \
> -                  designer
>--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
> -
> -        linguist.depends = designer
> -    }
> -}
> -
>--SUBDIRS += linguist
>+-SUBDIRS += linguist \
>+-    qtplugininfo
> -if(!android|android_app):!ios: SUBDIRS += qtpaths
> -
> -mac {
>@@ -39,7 +39,6 @@
> -
> -qtNomakeTools( \
> -    pixeltool \
>--    qtconfig \
> -    macdeployqt \
> -)
> +SUBDIRS = assistant
>Index: devel/qt5-core/Makefile
>===================================================================
>--- devel/qt5-core/Makefile	(revision 404968)
>+++ devel/qt5-core/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	core
> DISTVERSION=	${QT5_VERSION}
>-PORTREVISION=	2
>+#PORTREVISION=	2
> CATEGORIES=	devel
> PKGNAMEPREFIX=	qt5-
> 
>@@ -10,9 +10,10 @@
> COMMENT=	Qt core non-graphical module
> 
> LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu \
>+		libproxy.so:${PORTSDIR}/net/libproxy \
> 		libpcre.so:${PORTSDIR}/devel/pcre
> 
>-USES=		execinfo
>+USES=		execinfo gettext
> USE_GNOME=	glib20
> USE_QT5=	qmake_build buildtools_build
> QT_DIST=	base
>@@ -26,7 +27,8 @@
> 		-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-xkbcommon -no-xrender -no-xshape -no-xsync -no-xvideo \
>+		-no-xkbcommon -no-xrender -no-xshape -system-pcre -v -I/usr/local/include -L/usr/local/lib
> USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
> 
> BUILD_WRKSRC=	${WRKSRC}/src/corelib
>Index: devel/qt5-core/pkg-plist
>===================================================================
>--- devel/qt5-core/pkg-plist	(revision 404968)
>+++ devel/qt5-core/pkg-plist	(working copy)
>@@ -20,6 +20,7 @@
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdataurl_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetime_p.h
> %%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/qelfparser_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h
>@@ -120,6 +121,7 @@
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstate_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstatemachine_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstorageinfo_p.h
>+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringalgorithms_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringiterator_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemerror_p.h
> %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemlibrary_p.h
>Index: devel/qt5-designer/Makefile
>===================================================================
>--- devel/qt5-designer/Makefile	(revision 404968)
>+++ devel/qt5-designer/Makefile	(working copy)
>@@ -8,7 +8,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt 5 graphical user interface designer
> 
>-USE_QT5=	assistant_run core gui network printsupport webkit \
>+USE_QT5=	assistant_run core gui network printsupport qml quick webkit \
> 		widgets xml buildtools_build
> QT_DIST=	tools
> USES=		qmake
>Index: devel/qt5-designer/files/patch-src__src.pro
>===================================================================
>--- devel/qt5-designer/files/patch-src__src.pro	(revision 404968)
>+++ devel/qt5-designer/files/patch-src__src.pro	(working copy)
>@@ -1,9 +1,9 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/src.pro
>+--- src/src.pro.orig	2016-01-01 09:29:04 UTC
> +++ src/src.pro
>-@@ -1,38 +1,2 @@
>+@@ -1,37 +1,2 @@
>  TEMPLATE = subdirs
> -
> -qtHaveModule(widgets) {
>@@ -14,13 +14,13 @@
> -                  pixeltool \
> -                  qtestlib \
> -                  designer
>--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
> -
> -        linguist.depends = designer
> -    }
> -}
> -
>--SUBDIRS += linguist
>+-SUBDIRS += linguist \
>+-    qtplugininfo
> -if(!android|android_app):!ios: SUBDIRS += qtpaths
> -
> -mac {
>@@ -39,7 +39,6 @@
> -
> -qtNomakeTools( \
> -    pixeltool \
>--    qtconfig \
> -    macdeployqt \
> -)
> +SUBDIRS = designer
>Index: devel/qt5-designer/pkg-plist
>===================================================================
>--- devel/qt5-designer/pkg-plist	(revision 404968)
>+++ devel/qt5-designer/pkg-plist	(working copy)
>@@ -174,10 +174,21 @@
> %%QT_INCDIR%%/QtDesignerComponents/QtDesignerComponentsDepends
> %%QT_INCDIR%%/QtDesignerComponents/QtDesignerComponentsVersion
> %%QT_INCDIR%%/QtDesignerComponents/qtdesignercomponentsversion.h
>+%%QT_INCDIR%%/QtUiPlugin/QDesignerCustomWidgetCollectionInterface
>+%%QT_INCDIR%%/QtUiPlugin/QDesignerCustomWidgetInterface
>+%%QT_INCDIR%%/QtUiPlugin/QDesignerExportWidget
>+%%QT_INCDIR%%/QtUiPlugin/QtUiPlugin
>+%%QT_INCDIR%%/QtUiPlugin/QtUiPluginDepends
>+%%QT_INCDIR%%/QtUiPlugin/QtUiPluginVersion
>+%%QT_INCDIR%%/QtUiPlugin/customwidget.h
>+%%QT_INCDIR%%/QtUiPlugin/qdesignerexportwidget.h
>+%%QT_INCDIR%%/QtUiPlugin/qtuipluginversion.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_LIBDIR%%/cmake/Qt5UiPlugin/Qt5UiPluginConfig.cmake
>+%%QT_LIBDIR%%/cmake/Qt5UiPlugin/Qt5UiPluginConfigVersion.cmake
> %%QT_LIBDIR%%/libQt5Designer.prl
> %%QT_LIBDIR%%/libQt5Designer.so
> %%QT_LIBDIR%%/libQt5Designer.so.5
>@@ -194,9 +205,10 @@
> %%QT_MKSPECDIR%%/modules/qt_lib_designer.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_designer_private.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_designercomponents_private.pri
>-%%QT_PLUGINDIR%%/designer/libqwebview.so
>+%%QT_MKSPECDIR%%/modules/qt_lib_uiplugin.pri
> %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug
> %%QT_PLUGINDIR%%/designer/libqquickwidget.so
>+%%QT_PLUGINDIR%%/designer/libqwebview.so
> %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqquickwidget.so.debug
> libdata/pkgconfig/Qt5Designer.pc
> libdata/pkgconfig/Qt5DesignerComponents.pc
>Index: devel/qt5-help/Makefile
>===================================================================
>--- devel/qt5-help/Makefile	(revision 404968)
>+++ devel/qt5-help/Makefile	(working copy)
>@@ -8,6 +8,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt online help integration module
> 
>+USE_GL=		gl
> USE_QT5=	clucene core gui network sql widgets buildtools_build
> QT_DIST=	tools
> USES=		qmake
>Index: devel/qt5-help/files/patch-src__assistant__assistant.pro
>===================================================================
>--- devel/qt5-help/files/patch-src__assistant__assistant.pro	(revision 404968)
>+++ devel/qt5-help/files/patch-src__assistant__assistant.pro	(working copy)
>@@ -4,7 +4,7 @@
> clucene/ is built in textproc/clucene-qt5, assistant/ is built in
> devel/qt5-assistant.
> 
>---- src/assistant/assistant.pro
>+--- src/assistant/assistant.pro.orig	2015-10-13 04:38:14 UTC
> +++ src/assistant/assistant.pro
> @@ -1,20 +1,15 @@
>  TEMPLATE = subdirs
>Index: devel/qt5-help/files/patch-src__src.pro
>===================================================================
>--- devel/qt5-help/files/patch-src__src.pro	(revision 404968)
>+++ devel/qt5-help/files/patch-src__src.pro	(working copy)
>@@ -1,9 +1,9 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/src.pro
>+--- src/src.pro.orig	2016-01-01 06:32:37 UTC
> +++ src/src.pro
>-@@ -1,38 +1,2 @@
>+@@ -1,37 +1,2 @@
>  TEMPLATE = subdirs
> -
> -qtHaveModule(widgets) {
>@@ -14,13 +14,13 @@
> -                  pixeltool \
> -                  qtestlib \
> -                  designer
>--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
> -
> -        linguist.depends = designer
> -    }
> -}
> -
>--SUBDIRS += linguist
>+-SUBDIRS += linguist \
>+-    qtplugininfo
> -if(!android|android_app):!ios: SUBDIRS += qtpaths
> -
> -mac {
>@@ -39,7 +39,6 @@
> -
> -qtNomakeTools( \
> -    pixeltool \
>--    qtconfig \
> -    macdeployqt \
> -)
> +SUBDIRS = assistant
>Index: devel/qt5-linguist/Makefile
>===================================================================
>--- devel/qt5-linguist/Makefile	(revision 404968)
>+++ devel/qt5-linguist/Makefile	(working copy)
>@@ -8,8 +8,8 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt 5 translation tool
> 
>-USE_QT5=	assistant_run core linguisttools_run printsupport \
>-		uitools_build widgets xml buildtools_build
>+USE_QT5=	assistant_run core gui linguisttools_run printsupport \
>+		designer uitools_build widgets xml buildtools_build
> QT_DIST=	tools
> USES=		qmake
> 
>Index: devel/qt5-linguist/files/patch-src__src.pro
>===================================================================
>--- devel/qt5-linguist/files/patch-src__src.pro	(revision 404968)
>+++ devel/qt5-linguist/files/patch-src__src.pro	(working copy)
>@@ -1,11 +1,12 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/src.pro
>+--- src/src.pro.orig	2016-01-01 05:08:00 UTC
> +++ src/src.pro
>-@@ -1,38 +1,2 @@
>+@@ -1,37 +1,3 @@
>  TEMPLATE = subdirs
>--
>++SUBDIRS = linguist
>+ 
> -qtHaveModule(widgets) {
> -    no-png {
> -        message("Some graphics-related tools are unavailable without PNG support")
>@@ -14,13 +15,13 @@
> -                  pixeltool \
> -                  qtestlib \
> -                  designer
>--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
> -
> -        linguist.depends = designer
> -    }
> -}
> -
>--SUBDIRS += linguist
>+-SUBDIRS += linguist \
>+-    qtplugininfo
> -if(!android|android_app):!ios: SUBDIRS += qtpaths
> -
> -mac {
>@@ -39,7 +40,5 @@
> -
> -qtNomakeTools( \
> -    pixeltool \
>--    qtconfig \
> -    macdeployqt \
> -)
>-+SUBDIRS = linguist
>Index: devel/qt5-linguisttools/files/patch-src__src.pro
>===================================================================
>--- devel/qt5-linguisttools/files/patch-src__src.pro	(revision 404968)
>+++ devel/qt5-linguisttools/files/patch-src__src.pro	(working copy)
>@@ -1,11 +1,11 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/src.pro
>+--- src/src.pro.orig	2016-01-01 04:34:50 UTC
> +++ src/src.pro
>-@@ -1,38 +1,2 @@
>+@@ -1,37 +1,4 @@
>  TEMPLATE = subdirs
>--
>+ 
> -qtHaveModule(widgets) {
> -    no-png {
> -        message("Some graphics-related tools are unavailable without PNG support")
>@@ -14,13 +14,13 @@
> -                  pixeltool \
> -                  qtestlib \
> -                  designer
>--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
> -
> -        linguist.depends = designer
> -    }
> -}
> -
>--SUBDIRS += linguist
>+ SUBDIRS += linguist \
>+     qtplugininfo
> -if(!android|android_app):!ios: SUBDIRS += qtpaths
> -
> -mac {
>@@ -39,7 +39,5 @@
> -
> -qtNomakeTools( \
> -    pixeltool \
>--    qtconfig \
> -    macdeployqt \
> -)
>-+SUBDIRS = linguist
>Index: devel/qt5-qdbusviewer/Makefile
>===================================================================
>--- devel/qt5-qdbusviewer/Makefile	(revision 404968)
>+++ devel/qt5-qdbusviewer/Makefile	(working copy)
>@@ -8,7 +8,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt 5 graphical interface to D-Bus
> 
>-USE_QT5=	core dbus widgets xml buildtools_build
>+USE_QT5=	core dbus gui widgets xml buildtools_build
> QT_DIST=	tools
> USES=		qmake
> 
>Index: devel/qt5-qdbusviewer/files/patch-src__src.pro
>===================================================================
>--- devel/qt5-qdbusviewer/files/patch-src__src.pro	(revision 404968)
>+++ devel/qt5-qdbusviewer/files/patch-src__src.pro	(working copy)
>@@ -1,11 +1,11 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/src.pro
>+--- src/src.pro.orig	2015-10-13 04:38:15 UTC
> +++ src/src.pro
>-@@ -1,38 +1,3 @@
>+@@ -1,37 +1,2 @@
>  TEMPLATE = subdirs
>- 
>+-
> -qtHaveModule(widgets) {
> -    no-png {
> -        message("Some graphics-related tools are unavailable without PNG support")
>@@ -14,13 +14,13 @@
> -                  pixeltool \
> -                  qtestlib \
> -                  designer
>--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
> -
> -        linguist.depends = designer
> -    }
> -}
> -
>--SUBDIRS += linguist
>+-SUBDIRS += linguist \
>+-    qtplugininfo
> -if(!android|android_app):!ios: SUBDIRS += qtpaths
> -
> -mac {
>@@ -39,6 +39,5 @@
> -
> -qtNomakeTools( \
> -    pixeltool \
>--    qtconfig \
> -    macdeployqt \
> -)
>Index: devel/qt5-testlib/pkg-plist
>===================================================================
>--- devel/qt5-testlib/pkg-plist	(revision 404968)
>+++ devel/qt5-testlib/pkg-plist	(working copy)
>@@ -20,6 +20,7 @@
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestxunitstreamer_p.h
>+%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxunittestlogger_p.h
> %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/valgrind_p.h
>Index: devel/qt5-uitools/Makefile
>===================================================================
>--- devel/qt5-uitools/Makefile	(revision 404968)
>+++ devel/qt5-uitools/Makefile	(working copy)
>@@ -8,7 +8,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt Designer UI forms support module
> 
>-USE_QT5=	core widgets buildtools_build
>+USE_QT5=	core network widgets xml buildtools_build
> QT_DIST=	tools
> USES=		qmake
> USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
>Index: devel/qt5-uitools/files/patch-src__designer__src__src.pro
>===================================================================
>--- devel/qt5-uitools/files/patch-src__designer__src__src.pro	(revision 404968)
>+++ devel/qt5-uitools/files/patch-src__designer__src__src.pro	(nonexistent)
>@@ -1,27 +0,0 @@
>-Only enter the directories we want to build, otherwise we might fail due to
>-missing dependencies.
>-
>---- src/designer/src/src.pro
>-+++ src/designer/src/src.pro
>-@@ -1,20 +1,4 @@
>- TEMPLATE = subdirs
>- 
>- SUBDIRS = \
>--    uitools \
>--    lib \
>--    components \
>--    designer
>--
>--contains(QT_CONFIG, shared): SUBDIRS += plugins
>--
>--components.depends = lib
>--designer.depends = components
>--plugins.depends = lib
>--
>--qtNomakeTools( \
>--    lib \
>--    components \
>--    designer \
>--    plugins \
>--)
>-+    uitools
>
>Property changes on: devel/qt5-uitools/files/patch-src__designer__src__src.pro
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/qt5-uitools/files/patch-src__src.pro
>===================================================================
>--- devel/qt5-uitools/files/patch-src__src.pro	(revision 404968)
>+++ devel/qt5-uitools/files/patch-src__src.pro	(working copy)
>@@ -1,9 +1,9 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/src.pro
>+--- src/src.pro.orig	2016-01-01 05:13:31 UTC
> +++ src/src.pro
>-@@ -1,38 +1,2 @@
>+@@ -1,37 +1,2 @@
>  TEMPLATE = subdirs
> -
> -qtHaveModule(widgets) {
>@@ -14,13 +14,13 @@
> -                  pixeltool \
> -                  qtestlib \
> -                  designer
>--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
> -
> -        linguist.depends = designer
> -    }
> -}
> -
>--SUBDIRS += linguist
>+-SUBDIRS += linguist \
>+-    qtplugininfo
> -if(!android|android_app):!ios: SUBDIRS += qtpaths
> -
> -mac {
>@@ -39,7 +39,6 @@
> -
> -qtNomakeTools( \
> -    pixeltool \
>--    qtconfig \
> -    macdeployqt \
> -)
>-+SUBDIRS = designer
>++SUBDIRS += designer
>Index: graphics/qt5-pixeltool/Makefile
>===================================================================
>--- graphics/qt5-pixeltool/Makefile	(revision 404968)
>+++ graphics/qt5-pixeltool/Makefile	(working copy)
>@@ -8,7 +8,8 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt 5 screen magnifier
> 
>-USE_QT5=	core network widgets buildtools_build
>+USE_GL=		gl
>+USE_QT5=	core gui network uitools widgets buildtools_build
> QT_DIST=	tools
> USES=		qmake
> 
>Index: graphics/qt5-pixeltool/files/patch-src__src.pro
>===================================================================
>--- graphics/qt5-pixeltool/files/patch-src__src.pro	(revision 404968)
>+++ graphics/qt5-pixeltool/files/patch-src__src.pro	(working copy)
>@@ -1,9 +1,9 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/src.pro
>+--- src/src.pro.orig	2015-10-13 04:38:15 UTC
> +++ src/src.pro
>-@@ -1,38 +1,2 @@
>+@@ -1,37 +1,2 @@
>  TEMPLATE = subdirs
> -
> -qtHaveModule(widgets) {
>@@ -14,13 +14,13 @@
> -                  pixeltool \
> -                  qtestlib \
> -                  designer
>--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
> -
> -        linguist.depends = designer
> -    }
> -}
> -
>--SUBDIRS += linguist
>+-SUBDIRS += linguist \
>+-    qtplugininfo
> -if(!android|android_app):!ios: SUBDIRS += qtpaths
> -
> -mac {
>@@ -39,7 +39,6 @@
> -
> -qtNomakeTools( \
> -    pixeltool \
>--    qtconfig \
> -    macdeployqt \
> -)
> +SUBDIRS = pixeltool
>Index: graphics/qt5-svg/Makefile
>===================================================================
>--- graphics/qt5-svg/Makefile	(revision 404968)
>+++ graphics/qt5-svg/Makefile	(working copy)
>@@ -8,6 +8,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt SVG support module
> 
>+USE_GL=		gl
> USE_QT5=	core gui widgets xml buildtools_build
> QT_DIST=	${PORTNAME}
> USES=		qmake
>Index: lang/qt5-qml/files/patch-git_cf6e9711
>===================================================================
>--- lang/qt5-qml/files/patch-git_cf6e9711	(revision 404968)
>+++ lang/qt5-qml/files/patch-git_cf6e9711	(nonexistent)
>@@ -1,26 +0,0 @@
>-commit cf6e97119df5bf17b4a952b257d05d43b7d6ca26
>-Author: Alex Richardson <arichardson.kde@gmail.com>
>-Date:   Wed Jan 21 09:10:01 2015 +0000
>-
>-    Don't crash on FreeBSD when computing stack limits
>-    
>-    On FreeBSD pthread_attr_t is a pointer and is dereferenced when calling
>-    pthread_attr_get_np() so if we don't initialize it will probably crash.
>-    This is not a problem on glibc systems since there pthread_attr_t is an
>-    opaque union an doesn't need to be allocated using malloc().
>-    
>-    Change-Id: I227685ddf9981974ade08aee8917f7262c301787
>-    Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
>-
>---- src/qml/jsruntime/qv4engine.cpp
>-+++ src/qml/jsruntime/qv4engine.cpp
>-@@ -112,7 +112,8 @@ quintptr getStackLimit()
>-     void* stackBottom = 0;
>-     pthread_attr_t attr;
>- #if HAVE(PTHREAD_NP_H) && OS(FREEBSD)
>--    if (pthread_attr_get_np(pthread_self(), &attr) == 0) {
>-+    // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes
>-+    if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) {
>- #else
>-     if (pthread_getattr_np(pthread_self(), &attr) == 0) {
>- #endif
>
>Property changes on: lang/qt5-qml/files/patch-git_cf6e9711
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: lang/qt5-qml/pkg-plist
>===================================================================
>--- lang/qt5-qml/pkg-plist	(revision 404968)
>+++ lang/qt5-qml/pkg-plist	(working copy)
>@@ -30,7 +30,6 @@
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignal_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignalexpressionpointer_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbuiltinfunctions_p.h
>-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbundle_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlchangeset_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcleanup_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcompiler_p.h
>@@ -87,9 +86,10 @@
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllocale_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmemoryprofiler_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatype_p.h
>+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelindexvaluetype_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelsmodule_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnotifier_p.h
>-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnullablevalue_p_p.h
>+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnullablevalue_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectcreator_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectmodel_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlopenmetaobject_p.h
>@@ -107,7 +107,6 @@
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlthread_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltimer_p.h
>-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltrace_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypecompiler_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloader_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenamecache_p.h
>@@ -128,6 +127,7 @@
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlglobal_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4alloca_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4argumentsobject_p.h
>+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraybuffer_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraydata_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arrayobject_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4assembler_p.h
>@@ -137,6 +137,7 @@
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compileddata_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compiler_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4context_p.h
>+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dataview_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dateobject_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4debugging_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4debugservice_p.h
>@@ -190,6 +191,7 @@
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4string_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringobject_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4targetplatform_p.h
>+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4typedarray_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4unop_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4util_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_inl_p.h
>@@ -196,7 +198,6 @@
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4variantobject_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vme_moth_p.h
>-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8debug_p.h
> %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8engine_p.h
> %%QT_INCDIR%%/QtQml/QJSEngine
> %%QT_INCDIR%%/QtQml/QJSValue
>@@ -261,6 +262,102 @@
> %%QT_INCDIR%%/QtQml/qqmlscriptstring.h
> %%QT_INCDIR%%/QtQml/qtqmlglobal.h
> %%QT_INCDIR%%/QtQml/qtqmlversion.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qbitfield_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qdeletewatcher_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qfieldlist_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qfinitestack_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qflagpointer_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qhashedstring_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qhashfield_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qintrusivelist_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qlazilyallocated_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qpodvector_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qpointervaluepair_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlirbuilder_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsast_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsastfwd_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsastvisitor_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsengine_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsglobal_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsgrammar_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljskeywords_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljslexer_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsmemorypool_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsparser_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlnullablevalue_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlpool_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlrefcount_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlthread_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmltypecompiler_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qrecursionwatcher_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qrecyclepool_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qtqmldevtoolsglobal_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4alloca_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4argumentsobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4arraybuffer_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4arraydata_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4arrayobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4booleanobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4codegen_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4compileddata_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4compiler_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4context_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4dataview_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4dateobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4debugging_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4engine_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4errorobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4executableallocator_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4function_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4functionobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4global_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4globalobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4identifier_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4identifiertable_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4include_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4instr_moth_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4internalclass_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4isel_moth_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4isel_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4isel_util_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4jsir_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4jsonobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4lookup_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4managed_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4math_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4mathobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4memberdata_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4mm_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4numberobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4object_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4objectiterator_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4objectproto_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4persistent_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4profiling_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4property_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4qmlextensions_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4qobjectwrapper_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4regexp_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4regexpobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4runtime_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4scopedvalue_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4script_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4sequenceobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4serialize_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4sparsearray_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4ssa_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4string_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4stringobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4typedarray_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4util_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4value_inl_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4value_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4variantobject_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4vme_moth_p.h
>+%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevTools
>+%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevToolsDepends
>+%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevToolsVersion
>+%%QT_INCDIR%%/QtQmlDevTools/qtqmldevtoolsversion.h
> %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5QmlConfig.cmake
> %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake
> %%QT_LIBDIR%%/libQt5Qml.prl
>Index: multimedia/qt5-multimedia/Makefile
>===================================================================
>--- multimedia/qt5-multimedia/Makefile	(revision 405043)
>+++ multimedia/qt5-multimedia/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	multimedia
> DISTVERSION=	${QT5_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	multimedia
> PKGNAMEPREFIX=	qt5-
> 
>@@ -19,7 +18,7 @@
> QT_DEFINES=	XVIDEO
> QT_CONFIG=	xlib
> 
>-OPTIONS_DEFINE=			AUDIOPLUGIN GSTREAMER OPENAL
>+OPTIONS_DEFINE=			GSTREAMER OPENAL
> OPTIONS_DEFAULT=		GSTREAMER
> OPTIONS_RADIO=			AUDIOPLUGIN
> OPTIONS_RADIO_AUDIOPLUGIN=	ALSA PULSEAUDIO
>@@ -28,7 +27,8 @@
> 
> ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
> GSTREAMER_BUILD_DEPENDS=${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
>-GSTREAMER_USE=		GSTREAMER=yes,bad
>+GSTREAMER_USE=		GSTREAMER=yes,bad GNOME=libxml2,glib20
>+GSTREAMER_USES=		gettext
> OPENAL_USES=		openal
> PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
> 
>@@ -45,9 +45,9 @@
> 
> .if ${PORT_OPTIONS:MGSTREAMER}
> QT_DEFINES+=	GSTREAMER
>-QT_CONFIG+=	gstreamer
>+QT_CONFIG+=	gstreamer-0.10
> .else
>-TBR_DEPENDS+=	gstreamer
>+TBR_DEPENDS+=	gstreamer GST_VERSION linux_v4l BRACKET
> QT_DEFINES+=	-GSTREAMER
> QT_CONFIG+=	-gstreamer
> .endif
>@@ -67,8 +67,15 @@
> 
> post-patch:
> .for d in ${TBR_DEPENDS}
>+.  if ${d} != "BRACKET"
> 	@${REINPLACE_CMD} -e '/${d}/ d' \
> 		${WRKSRC}/qtmultimedia.pro
>+.  else
>+	@${REINPLACE_CMD} -e '/  }/ d' \
>+		${WRKSRC}/qtmultimedia.pro
>+	@${REINPLACE_CMD} -e '/directshow/ d' -e '/wshellitem/ d' \
>+		${WRKSRC}/qtmultimedia.pro
>+.  endif
> .endfor
> 	@${REINPLACE_CMD} -e 's|<linux/types.h>|<sys/types.h>|' \
> 		${WRKSRC}/src/plugins/v4l/radio/v4lradiocontrol.h
>Index: multimedia/qt5-multimedia/pkg-plist
>===================================================================
>--- multimedia/qt5-multimedia/pkg-plist	(revision 405043)
>+++ multimedia/qt5-multimedia/pkg-plist	(working copy)
>@@ -12,10 +12,13 @@
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstcodecsinfo_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreameraudioinputselector_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreameraudioprobecontrol_p.h
>+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamerbufferprobe_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamerbushelper_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamergltexturerenderer_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamermessage_p.h
>+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamermirtexturerenderer_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h
>+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideooverlay_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideoprobecontrol_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideorenderer_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideorendererinterface_p.h
>@@ -23,6 +26,8 @@
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideowindow_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstutils_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideobuffer_p.h
>+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideorendererplugin_p.h
>+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideorenderersink_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediacontrol_p.h
> %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmedianetworkplaylistprovider_p.h
>@@ -55,7 +60,9 @@
> %%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo
> %%QT_INCDIR%%/QtMultimedia/QAbstractAudioInput
> %%QT_INCDIR%%/QtMultimedia/QAbstractAudioOutput
>+%%QT_INCDIR%%/QtMultimedia/QAbstractPlanarVideoBuffer
> %%QT_INCDIR%%/QtMultimedia/QAbstractVideoBuffer
>+%%QT_INCDIR%%/QtMultimedia/QAbstractVideoFilter
> %%QT_INCDIR%%/QtMultimedia/QAbstractVideoSurface
> %%QT_INCDIR%%/QtMultimedia/QAudio
> %%QT_INCDIR%%/QtMultimedia/QAudioBuffer
>@@ -69,7 +76,6 @@
> %%QT_INCDIR%%/QtMultimedia/QAudioInputSelectorControl
> %%QT_INCDIR%%/QtMultimedia/QAudioOutput
> %%QT_INCDIR%%/QtMultimedia/QAudioOutputSelectorControl
>-%%QT_INCDIR%%/QtMultimedia/QAbstractPlanarVideoBuffer
> %%QT_INCDIR%%/QtMultimedia/QAudioProbe
> %%QT_INCDIR%%/QtMultimedia/QAudioRecorder
> %%QT_INCDIR%%/QtMultimedia/QAudioSystemFactoryInterface
>@@ -93,7 +99,9 @@
> %%QT_INCDIR%%/QtMultimedia/QCameraInfo
> %%QT_INCDIR%%/QtMultimedia/QCameraInfoControl
> %%QT_INCDIR%%/QtMultimedia/QCameraLocksControl
>+%%QT_INCDIR%%/QtMultimedia/QCameraViewfinderSettings
> %%QT_INCDIR%%/QtMultimedia/QCameraViewfinderSettingsControl
>+%%QT_INCDIR%%/QtMultimedia/QCameraViewfinderSettingsControl2
> %%QT_INCDIR%%/QtMultimedia/QCameraZoomControl
> %%QT_INCDIR%%/QtMultimedia/QImageEncoderControl
> %%QT_INCDIR%%/QtMultimedia/QImageEncoderSettings
>@@ -139,6 +147,7 @@
> %%QT_INCDIR%%/QtMultimedia/QVideoDeviceSelectorControl
> %%QT_INCDIR%%/QtMultimedia/QVideoEncoderSettings
> %%QT_INCDIR%%/QtMultimedia/QVideoEncoderSettingsControl
>+%%QT_INCDIR%%/QtMultimedia/QVideoFilterRunnable
> %%QT_INCDIR%%/QtMultimedia/QVideoFrame
> %%QT_INCDIR%%/QtMultimedia/QVideoProbe
> %%QT_INCDIR%%/QtMultimedia/QVideoRendererControl
>@@ -148,6 +157,7 @@
> %%QT_INCDIR%%/QtMultimedia/QtMultimediaDepends
> %%QT_INCDIR%%/QtMultimedia/QtMultimediaVersion
> %%QT_INCDIR%%/QtMultimedia/qabstractvideobuffer.h
>+%%QT_INCDIR%%/QtMultimedia/qabstractvideofilter.h
> %%QT_INCDIR%%/QtMultimedia/qabstractvideosurface.h
> %%QT_INCDIR%%/QtMultimedia/qaudio.h
> %%QT_INCDIR%%/QtMultimedia/qaudiobuffer.h
>@@ -181,6 +191,7 @@
> %%QT_INCDIR%%/QtMultimedia/qcamerainfo.h
> %%QT_INCDIR%%/QtMultimedia/qcamerainfocontrol.h
> %%QT_INCDIR%%/QtMultimedia/qcameralockscontrol.h
>+%%QT_INCDIR%%/QtMultimedia/qcameraviewfindersettings.h
> %%QT_INCDIR%%/QtMultimedia/qcameraviewfindersettingscontrol.h
> %%QT_INCDIR%%/QtMultimedia/qcamerazoomcontrol.h
> %%QT_INCDIR%%/QtMultimedia/qimageencodercontrol.h
>@@ -227,19 +238,19 @@
> %%QT_INCDIR%%/QtMultimedia/qvideowindowcontrol.h
> %%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h
> %%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h
>-%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_p
>-%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pDepends
>-%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pVersion
>-%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_I420
> %%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB
> %%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture
>-%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_I420
>+%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_YUV
> %%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_RGB
> %%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_Texture
>-%%QT_INCDIR%%/QtMultimediaQuick_p/qtmultimediaquick_pversion.h
>-%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_i420.h
>+%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_YUV
>+%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_p
>+%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pDepends
>+%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pVersion
> %%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_rgb.h
> %%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_texture.h
>+%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_yuv.h
>+%%QT_INCDIR%%/QtMultimediaQuick_p/qtmultimediaquick_pversion.h
> %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h
> %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qpaintervideosurface_p.h
> %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qvideowidget_p.h
>Index: net/qt5-network/Makefile
>===================================================================
>--- net/qt5-network/Makefile	(revision 404968)
>+++ net/qt5-network/Makefile	(working copy)
>@@ -9,6 +9,7 @@
> COMMENT=	Qt network module
> 
> RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
>+LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
> 
> USE_OPENSSL=	yes
> USE_QT5=	core qmake_build buildtools_build
>Index: net/qt5-network/pkg-plist
>===================================================================
>--- net/qt5-network/pkg-plist	(revision 404968)
>+++ net/qt5-network/pkg-plist	(working copy)
>@@ -58,10 +58,13 @@
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslconfiguration_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcontext_openssl_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h
>+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslpresharedkeyauthenticator_p.h
>+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_mac_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h
>+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpserver_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpsocket_p.h
> %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qurlinfo_p.h
> %%QT_INCDIR%%/QtNetwork/QAbstractNetworkCache
>@@ -100,8 +103,10 @@
> %%QT_INCDIR%%/QtNetwork/QSslCertificateExtension
> %%QT_INCDIR%%/QtNetwork/QSslCipher
> %%QT_INCDIR%%/QtNetwork/QSslConfiguration
>+%%QT_INCDIR%%/QtNetwork/QSslEllipticCurve
> %%QT_INCDIR%%/QtNetwork/QSslError
> %%QT_INCDIR%%/QtNetwork/QSslKey
>+%%QT_INCDIR%%/QtNetwork/QSslPreSharedKeyAuthenticator
> %%QT_INCDIR%%/QtNetwork/QSslSocket
> %%QT_INCDIR%%/QtNetwork/QTcpServer
> %%QT_INCDIR%%/QtNetwork/QTcpSocket
>@@ -136,8 +141,10 @@
> %%QT_INCDIR%%/QtNetwork/qsslcertificateextension.h
> %%QT_INCDIR%%/QtNetwork/qsslcipher.h
> %%QT_INCDIR%%/QtNetwork/qsslconfiguration.h
>+%%QT_INCDIR%%/QtNetwork/qsslellipticcurve.h
> %%QT_INCDIR%%/QtNetwork/qsslerror.h
> %%QT_INCDIR%%/QtNetwork/qsslkey.h
>+%%QT_INCDIR%%/QtNetwork/qsslpresharedkeyauthenticator.h
> %%QT_INCDIR%%/QtNetwork/qsslsocket.h
> %%QT_INCDIR%%/QtNetwork/qtcpserver.h
> %%QT_INCDIR%%/QtNetwork/qtcpsocket.h
>Index: print/qt5-printsupport/Makefile
>===================================================================
>--- print/qt5-printsupport/Makefile	(revision 404968)
>+++ print/qt5-printsupport/Makefile	(working copy)
>@@ -8,6 +8,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt print support module
> 
>+USE_GL=		gl
> USE_QT5=	core gui widgets qmake_build buildtools_build
> QT_DIST=	base
> HAS_CONFIGURE=	yes
>@@ -16,6 +17,8 @@
> BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
> INSTALL_WRKSRC=	${BUILD_WRKSRC}
> 
>+CUPS_LIB_DEPENDS+=libcups.so:${PORTSDIR}/print/cups-client
>+
> OPTIONS_DEFINE=	CUPS
> OPTIONS_DEFAULT=CUPS
> OPTIONS_SUB=	yes
>Index: textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp
>===================================================================
>--- textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp	(revision 404968)
>+++ textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
>-+++ src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
>-@@ -11,6 +11,8 @@
>- CL_NS_USE(index)
>- CL_NS_DEF(search)
>- 
>-+using ::wcschr;
>-+
>- FieldCacheImpl::FieldCacheImpl():
>-     cache(false,true){
>- }
>
>Property changes on: textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: textproc/clucene-qt5/files/patch-src__assistant__assistant.pro
>===================================================================
>--- textproc/clucene-qt5/files/patch-src__assistant__assistant.pro	(revision 404968)
>+++ textproc/clucene-qt5/files/patch-src__assistant__assistant.pro	(working copy)
>@@ -1,7 +1,7 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/assistant/assistant.pro
>+--- src/assistant/assistant.pro.orig	2015-10-13 04:38:14 UTC
> +++ src/assistant/assistant.pro
> @@ -1,21 +1,3 @@
>  TEMPLATE = subdirs
>Index: textproc/clucene-qt5/files/patch-src__src.pro
>===================================================================
>--- textproc/clucene-qt5/files/patch-src__src.pro	(revision 404968)
>+++ textproc/clucene-qt5/files/patch-src__src.pro	(working copy)
>@@ -1,9 +1,9 @@
> Only enter the directories we want to build, otherwise we might fail due to
> missing dependencies.
> 
>---- src/src.pro
>+--- src/src.pro.orig	2015-10-13 04:38:15 UTC
> +++ src/src.pro
>-@@ -1,38 +1,2 @@
>+@@ -1,37 +1,2 @@
>  TEMPLATE = subdirs
> -
> -qtHaveModule(widgets) {
>@@ -14,13 +14,13 @@
> -                  pixeltool \
> -                  qtestlib \
> -                  designer
>--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
> -
> -        linguist.depends = designer
> -    }
> -}
> -
>--SUBDIRS += linguist
>+-SUBDIRS += linguist \
>+-    qtplugininfo
> -if(!android|android_app):!ios: SUBDIRS += qtpaths
> -
> -mac {
>@@ -39,7 +39,6 @@
> -
> -qtNomakeTools( \
> -    pixeltool \
>--    qtconfig \
> -    macdeployqt \
> -)
> +SUBDIRS = assistant
>Index: textproc/qt5-xmlpatterns/pkg-plist
>===================================================================
>--- textproc/qt5-xmlpatterns/pkg-plist	(revision 404968)
>+++ textproc/qt5-xmlpatterns/pkg-plist	(working copy)
>@@ -102,7 +102,6 @@
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdatetimefns_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdatetimefns_tpl_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdaytimeduration_p.h
>-%%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdebug_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdecimal_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdeduplicateiterator_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdeepequalfn_p.h
>@@ -275,6 +274,7 @@
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtokenizer_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtokenrevealer_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtokensource_p.h
>+%%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtokenvalue_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtracefn_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtreatas_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtriplecontainer_p.h
>@@ -303,6 +303,7 @@
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qvariableloader_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qvariablereference_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qwithparam_p.h
>+%%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qxmldebug_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qxmlpatternistcli_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qxmlquery_p.h
> %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qxmlresultitems_p.h
>Index: www/qt5-webchannel/Makefile
>===================================================================
>--- www/qt5-webchannel/Makefile	(revision 404968)
>+++ www/qt5-webchannel/Makefile	(working copy)
>@@ -8,8 +8,9 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt 5 library for integration of C++/QML with HTML/js clients
> 
>-USE_QT5=	buildtools_build core qml quick
>+USE_QT5=	buildtools_build core gui network qml quick
> QT_DIST=	${PORTNAME}
>+USE_GL=		gl
> USES=		qmake
> USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
> 
>Index: www/qt5-websockets/pkg-plist
>===================================================================
>--- www/qt5-websockets/pkg-plist	(revision 404968)
>+++ www/qt5-websockets/pkg-plist	(working copy)
>@@ -32,8 +32,9 @@
> %%DEBUG%%%%QT_LIBDIR%%/libQt5WebSockets.so.%%FULLVER%%.debug
> %%QT_MKSPECDIR%%/modules/qt_lib_websockets.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_websockets_private.pri
>-%%QT_QMLDIR%%/Qt/WebSockets/libdeclarative_qmlwebsockets.so
> %%DEBUG%%%%QT_QMLDIR%%/Qt/WebSockets/libdeclarative_qmlwebsockets.so.debug
>-%%QT_QMLDIR%%/Qt/WebSockets/plugins.qmltypes
> %%QT_QMLDIR%%/Qt/WebSockets/qmldir
>+%%QT_QMLDIR%%/QtWebSockets/libdeclarative_qmlwebsockets.so
>+%%QT_QMLDIR%%/QtWebSockets/plugins.qmltypes
>+%%QT_QMLDIR%%/QtWebSockets/qmldir
> libdata/pkgconfig/Qt5WebSockets.pc
>Index: www/webkit-qt5/Makefile
>===================================================================
>--- www/webkit-qt5/Makefile	(revision 404968)
>+++ www/webkit-qt5/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	webkit
> DISTVERSION=	${QT5_VERSION}
>-PORTREVISION=	2
> CATEGORIES=	www
> PKGNAMEPREFIX=	qt5-
> 
>@@ -12,7 +11,8 @@
> LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
> 		libicui18n.so:${PORTSDIR}/devel/icu \
> 		libpng.so:${PORTSDIR}/graphics/png \
>-		libwebp.so:${PORTSDIR}/graphics/webp
>+		libwebp.so:${PORTSDIR}/graphics/webp \
>+		libgstreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer
> BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
> 
> USE_GL=		gl
>@@ -19,13 +19,13 @@
> USE_GNOME=	libxml2 libxslt
> USE_PERL5=	build
> USE_QT5=	core gui network opengl printsupport qml quick sql \
>-		testlib widgets buildtools_build
>+		testlib webchannel widgets buildtools_build
> QT_DIST=	${PORTNAME}
> USE_RUBY=	yes
> RUBY_NO_RUN_DEPENDS=	yes
> USE_SQLITE=	3
>-USE_XORG=	x11 xcomposite xrender
>-USES=		bison gmake gperf jpeg perl5 pkgconfig python:build qmake:outsource
>+USE_XORG=	x11 xcomposite xext xrender
>+USES=		bison gettext gmake gperf jpeg perl5 pkgconfig python:build qmake:outsource
> # Use flex(1) from ports.
> MAKE_ENV=	PATH="${LOCALBASE}/bin:${PATH}"
> # "all" builds many more targets. The default one is called "first" in
>Index: www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp
>===================================================================
>--- www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp	(revision 404968)
>+++ www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp	(nonexistent)
>@@ -1,221 +0,0 @@
>-GMutexLocker was added to glib in 2.44. Make sure we use the version from
>-WebCore.
>-
>---- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig	2015-03-22 17:02:03.015319000 +0100
>-+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-03-22 17:04:05.587550000 +0100
>-@@ -354,7 +354,7 @@
>- 
>-     switch (propID) {
>-     case PROP_IRADIO_MODE: {
>--        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-         priv->iradioMode = g_value_get_boolean(value);
>-         break;
>-     }
>-@@ -376,7 +376,7 @@
>-     WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
>-     WebKitWebSrcPrivate* priv = src->priv;
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     switch (propID) {
>-     case PROP_IRADIO_MODE:
>-         g_value_set_boolean(value, priv->iradioMode);
>-@@ -429,7 +429,7 @@
>- 
>-     ASSERT(isMainThread());
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>- 
>-     bool seeking = priv->seekID;
>- 
>-@@ -493,7 +493,7 @@
>- 
>-     ASSERT(isMainThread());
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>- 
>-     priv->startID = 0;
>- 
>-@@ -584,7 +584,7 @@
>-         return ret;
>-     }
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     switch (transition) {
>-     case GST_STATE_CHANGE_READY_TO_PAUSED:
>-         GST_DEBUG_OBJECT(src, "READY->PAUSED");
>-@@ -615,7 +615,7 @@
>-         gst_query_parse_duration(query, &format, NULL);
>- 
>-         GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
>--        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-         if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
>-             gst_query_set_duration(query, format, src->priv->size);
>-             result = TRUE;
>-@@ -623,7 +623,7 @@
>-         break;
>-     }
>-     case GST_QUERY_URI: {
>--        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-         gst_query_set_uri(query, src->priv->uri);
>-         result = TRUE;
>-         break;
>-@@ -668,7 +668,7 @@
>-     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
>-     gchar* ret;
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     ret = g_strdup(src->priv->uri);
>-     return ret;
>- }
>-@@ -683,7 +683,7 @@
>-         return FALSE;
>-     }
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>- 
>-     g_free(priv->uri);
>-     priv->uri = 0;
>-@@ -719,7 +719,7 @@
>-     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
>-     gchar* ret;
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     ret = g_strdup(src->priv->uri);
>-     return ret;
>- }
>-@@ -734,7 +734,7 @@
>-         return FALSE;
>-     }
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>- 
>-     g_free(priv->uri);
>-     priv->uri = 0;
>-@@ -772,7 +772,7 @@
>- 
>-     ASSERT(isMainThread());
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     // already stopped
>-     if (!priv->needDataID)
>-         return FALSE;
>-@@ -793,7 +793,7 @@
>- 
>-     GST_DEBUG_OBJECT(src, "Need more data: %u", length);
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     if (priv->needDataID || !priv->paused) {
>-         return;
>-     }
>-@@ -807,7 +807,7 @@
>- 
>-     ASSERT(isMainThread());
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     // already stopped
>-     if (!priv->enoughDataID)
>-         return FALSE;
>-@@ -828,7 +828,7 @@
>- 
>-     GST_DEBUG_OBJECT(src, "Have enough data");
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     if (priv->enoughDataID || priv->paused) {
>-         return;
>-     }
>-@@ -842,7 +842,7 @@
>- 
>-     ASSERT(isMainThread());
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     // already stopped
>-     if (!priv->seekID)
>-         return FALSE;
>-@@ -860,7 +860,7 @@
>-     WebKitWebSrcPrivate* priv = src->priv;
>- 
>-     GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     if (offset == priv->offset && priv->requestedOffset == priv->offset)
>-         return TRUE;
>- 
>-@@ -879,7 +879,7 @@
>- void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
>- {
>-     ASSERT(player);
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     src->priv->player = player;
>-     s_cachedResourceLoader = player->cachedResourceLoader();
>- }
>-@@ -906,7 +906,7 @@
>-     mapGstBuffer(buffer);
>- #endif
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     priv->buffer = adoptGRef(buffer);
>-     locker.unlock();
>- 
>-@@ -921,7 +921,7 @@
>- 
>-     GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode());
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>- 
>-     // If we seeked we need 206 == PARTIAL_CONTENT
>-     if (priv->requestedOffset && response.httpStatusCode() != 206) {
>-@@ -1020,7 +1020,7 @@
>-     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
>-     WebKitWebSrcPrivate* priv = src->priv;
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>- 
>-     GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length);
>- 
>-@@ -1074,7 +1074,7 @@
>- 
>-     GST_DEBUG_OBJECT(src, "Have EOS");
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     if (!priv->seekID) {
>-         locker.unlock();
>-         gst_app_src_end_of_stream(priv->appsrc);
>-@@ -1210,7 +1210,7 @@
>- 
>-     GST_ERROR_OBJECT(src, "Request was blocked");
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     uri.set(g_strdup(src->priv->uri));
>-     locker.unlock();
>- 
>-@@ -1224,7 +1224,7 @@
>- 
>-     GST_ERROR_OBJECT(src, "Cannot show URL");
>- 
>--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
>-     uri.set(g_strdup(src->priv->uri));
>-     locker.unlock();
>- 
>
>Property changes on: www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: x11/qt5-qev/Makefile
>===================================================================
>--- x11/qt5-qev/Makefile	(revision 404968)
>+++ x11/qt5-qev/Makefile	(working copy)
>@@ -8,7 +8,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt QWidget events introspection tool
> 
>-USE_QT5=	core widgets
>+USE_QT5=	core gui widgets
> QT_DIST=	tools
> USES=		qmake
> 
>Index: x11-toolkits/qt5-declarative/Makefile
>===================================================================
>--- x11-toolkits/qt5-declarative/Makefile	(revision 404968)
>+++ x11-toolkits/qt5-declarative/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	declarative
> DISTVERSION=	${QT5_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	x11-toolkits
> PKGNAMEPREFIX=	qt5-
> 
>Index: x11-toolkits/qt5-gui/Makefile
>===================================================================
>--- x11-toolkits/qt5-gui/Makefile	(revision 404968)
>+++ x11-toolkits/qt5-gui/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	gui
> DISTVERSION=	${QT5_VERSION}
>-PORTREVISION=	3
> CATEGORIES=	x11-toolkits graphics
> PKGNAMEPREFIX=	qt5-
> 
>@@ -22,12 +21,12 @@
> 		libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon
> RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
> 
>-USES=		jpeg
>+USES=		gettext jpeg
> USE_GL=		gl
> USE_GNOME=	glib20
> USE_QT5=	core dbus qmake_build buildtools_build
> QT_DIST=	base
>-USE_XORG=	x11 xi xrender
>+USE_XORG=	ice sm x11 xext xi xrender
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	-no-eglfs \
> 		-no-evdev \
>@@ -65,6 +64,12 @@
> 
> CFLAGS_powerpc64=	-mminimal-toc
> 
>+post-patch:
>+	${REINPLACE_CMD} -i "" \
>+		-e 's|(qEnvironmentVariableIsSet("QT_XKB_CONFIG_ROOT"))|(true)|' \
>+		-e 's|QByteArray(qgetenv("QT_XKB_CONFIG_ROOT"))|QString("${LOCALBASE}/share/X11/xkb").toLatin1()|' \
>+		${WRKSRC}/src/plugins/platforms/xcb/qxcbkeyboard.cpp
>+
> post-build:
> .for d in ${MORE_WRKSRCS}
> 	@cd ${WRKSRC}/${d} && \
>Index: x11-toolkits/qt5-gui/files/patch-CVE-2015-0295
>===================================================================
>--- x11-toolkits/qt5-gui/files/patch-CVE-2015-0295	(revision 404968)
>+++ x11-toolkits/qt5-gui/files/patch-CVE-2015-0295	(nonexistent)
>@@ -1,37 +0,0 @@
>-commit 661f6bfd032dacc62841037732816a583640e187
>-Author: Richard J. Moore <rich@kde.org>
>-Date:   Sat Feb 21 17:43:21 2015 +0000
>-
>-    Fix a division by zero when processing malformed BMP files.
>-    
>-    This fixes a division by 0 when processing a maliciously crafted BMP
>-    file. No impact beyond DoS.
>-    
>-    Task-number: QTBUG-44547
>-    Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973
>-    Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
>-    Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
>-
>---- src/gui/image/qbmphandler.cpp
>-+++ src/gui/image/qbmphandler.cpp
>-@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
>-         }
>-     } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
>-         red_shift = calc_shift(red_mask);
>-+        if (((red_mask >> red_shift) + 1) == 0)
>-+            return false;
>-         red_scale = 256 / ((red_mask >> red_shift) + 1);
>-         green_shift = calc_shift(green_mask);
>-+        if (((green_mask >> green_shift) + 1) == 0)
>-+            return false;
>-         green_scale = 256 / ((green_mask >> green_shift) + 1);
>-         blue_shift = calc_shift(blue_mask);
>-+        if (((blue_mask >> blue_shift) + 1) == 0)
>-+            return false;
>-         blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
>-         alpha_shift = calc_shift(alpha_mask);
>-+        if (((alpha_mask >> alpha_shift) + 1) == 0)
>-+            return false;
>-         alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1);
>-     } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
>-         blue_mask = 0x000000ff;
>
>Property changes on: x11-toolkits/qt5-gui/files/patch-CVE-2015-0295
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: x11-toolkits/qt5-gui/files/patch-CVE-2015-1858
>===================================================================
>--- x11-toolkits/qt5-gui/files/patch-CVE-2015-1858	(revision 404968)
>+++ x11-toolkits/qt5-gui/files/patch-CVE-2015-1858	(nonexistent)
>@@ -1,23 +0,0 @@
>-commit d3048a29797ee2d80d84bbda26bb3c954584f332
>-Author: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
>-Date:   Wed Mar 11 09:00:41 2015 +0100
>-
>-    Fixes crash in gif image decoder
>-    
>-    Fuzzing test revealed that for certain malformed gif files,
>-    qgifhandler would segfault.
>-    
>-    Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1
>-    Reviewed-by: Richard J. Moore <rich@kde.org>
>-
>---- src/gui/image/qgifhandler.cpp
>-+++ src/gui/image/qgifhandler.cpp
>-@@ -936,6 +936,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co
>- 
>- void QGIFFormat::nextY(unsigned char *bits, int bpl)
>- {
>-+    if (out_of_bounds)
>-+        return;
>-     int my;
>-     switch (interlace) {
>-     case 0: // Non-interlaced
>
>Property changes on: x11-toolkits/qt5-gui/files/patch-CVE-2015-1858
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: x11-toolkits/qt5-gui/files/patch-CVE-2015-1859
>===================================================================
>--- x11-toolkits/qt5-gui/files/patch-CVE-2015-1859	(revision 404968)
>+++ x11-toolkits/qt5-gui/files/patch-CVE-2015-1859	(nonexistent)
>@@ -1,52 +0,0 @@
>-commit 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe
>-Author: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
>-Date:   Wed Mar 11 13:34:01 2015 +0100
>-
>-    Fixes crash in bmp and ico image decoding
>-    
>-    Fuzzing test revealed that for certain malformed bmp and ico files,
>-    the handler would segfault.
>-    
>-    Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe
>-    Reviewed-by: Lars Knoll <lars.knoll@digia.com>
>-
>---- src/gui/image/qbmphandler.cpp
>-+++ src/gui/image/qbmphandler.cpp
>-@@ -484,12 +484,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
>-                             p = data + (h-y-1)*bpl;
>-                             break;
>-                         case 2:                        // delta (jump)
>--                            // Protection
>--                            if ((uint)x >= (uint)w)
>--                                x = w-1;
>--                            if ((uint)y >= (uint)h)
>--                                y = h-1;
>--
>-                             {
>-                                 quint8 tmp;
>-                                 d->getChar((char *)&tmp);
>-@@ -497,6 +491,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
>-                                 d->getChar((char *)&tmp);
>-                                 y += tmp;
>-                             }
>-+
>-+                            // Protection
>-+                            if ((uint)x >= (uint)w)
>-+                                x = w-1;
>-+                            if ((uint)y >= (uint)h)
>-+                                y = h-1;
>-+
>-                             p = data + (h-y-1)*bpl + x;
>-                             break;
>-                         default:                // absolute mode
>---- src/plugins/imageformats/ico/qicohandler.cpp
>-+++ src/plugins/imageformats/ico/qicohandler.cpp
>-@@ -567,7 +567,7 @@ QImage ICOReader::iconAt(int index)
>-                 QImage::Format format = QImage::Format_ARGB32;
>-                 if (icoAttrib.nbits == 24)
>-                     format = QImage::Format_RGB32;
>--                else if (icoAttrib.ncolors == 2)
>-+                else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1)
>-                     format = QImage::Format_Mono;
>-                 else if (icoAttrib.ncolors > 0)
>-                     format = QImage::Format_Indexed8;
>
>Property changes on: x11-toolkits/qt5-gui/files/patch-CVE-2015-1859
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp
>===================================================================
>--- x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp	(revision 404968)
>+++ x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp	(nonexistent)
>@@ -1,23 +0,0 @@
>---- src/plugins/platforms/xcb/qxcbwindow.cpp.orig	2015-01-29 15:05:03.094563565 -0500
>-+++ src/plugins/platforms/xcb/qxcbwindow.cpp	2015-01-29 15:08:10.219554046 -0500
>-@@ -701,6 +701,9 @@
>-     if (connection()->time() != XCB_TIME_CURRENT_TIME)
>-         updateNetWmUserTime(connection()->time());
>- 
>-+    if (window()->objectName() == QLatin1String("QSystemTrayIconSysWindow"))
>-+	return; // defer showing until XEMBED_EMBEDDED_NOTIFY
>-+
>-     Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window));
>- 
>-     if (QGuiApplication::modalWindow() == window())
>-@@ -2130,7 +2133,10 @@
>-     switch (event->data.data32[1]) {
>-     case XEMBED_WINDOW_ACTIVATE:
>-     case XEMBED_WINDOW_DEACTIVATE:
>-+	break;
>-     case XEMBED_EMBEDDED_NOTIFY:
>-+	Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window));
>-+	m_screen->windowShown(this);
>-         break;
>-     case XEMBED_FOCUS_IN:
>-         Qt::FocusReason reason;
>
>Property changes on: x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: x11-toolkits/qt5-gui/pkg-plist
>===================================================================
>--- x11-toolkits/qt5-gui/pkg-plist	(revision 404968)
>+++ x11-toolkits/qt5-gui/pkg-plist	(working copy)
>@@ -16,7 +16,6 @@
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_mips_dsp_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_neon_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_p.h
>-%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_sse_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_x86_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawingprimitive_sse2_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qemulationpaintengine_p.h
>@@ -41,6 +40,8 @@
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimage_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagepixmapcleanuphooks_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagescale_p.h
>+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputdevicemanager_p.h
>+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputdevicemanager_p_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputmethod_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qjpeghandler_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qkeymapper_p.h
>@@ -72,7 +73,6 @@
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglvertexarrayobject_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qoutlinemapper_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpagedpaintdevice_p.h
>-%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintbuffer_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintdevicewindow_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_blitter_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_p.h
>@@ -134,6 +134,8 @@
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformdialoghelper.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformdrag.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformfontdatabase.h
>+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformgraphicsbuffer.h
>+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformgraphicsbufferhelper.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatforminputcontext.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatforminputcontext_p.h
> %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatforminputcontextfactory_p.h
>@@ -291,6 +293,10 @@
> %%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_2_Core
> %%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_3_Compatibility
> %%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_3_Core
>+%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_4_Compatibility
>+%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_4_Core
>+%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_5_Compatibility
>+%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_5_Core
> %%QT_INCDIR%%/QtGui/QOpenGLFunctions_ES2
> %%QT_INCDIR%%/QtGui/QOpenGLPaintDevice
> %%QT_INCDIR%%/QtGui/QOpenGLPixelTransferOptions
>@@ -323,6 +329,7 @@
> %%QT_INCDIR%%/QtGui/QPixelFormat
> %%QT_INCDIR%%/QtGui/QPixmap
> %%QT_INCDIR%%/QtGui/QPixmapCache
>+%%QT_INCDIR%%/QtGui/QPlatformSurfaceEvent
> %%QT_INCDIR%%/QtGui/QPolygon
> %%QT_INCDIR%%/QtGui/QPolygonF
> %%QT_INCDIR%%/QtGui/QQuaternion
>@@ -465,6 +472,10 @@
> %%QT_INCDIR%%/QtGui/qopenglfunctions_4_2_core.h
> %%QT_INCDIR%%/QtGui/qopenglfunctions_4_3_compatibility.h
> %%QT_INCDIR%%/QtGui/qopenglfunctions_4_3_core.h
>+%%QT_INCDIR%%/QtGui/qopenglfunctions_4_4_compatibility.h
>+%%QT_INCDIR%%/QtGui/qopenglfunctions_4_4_core.h
>+%%QT_INCDIR%%/QtGui/qopenglfunctions_4_5_compatibility.h
>+%%QT_INCDIR%%/QtGui/qopenglfunctions_4_5_core.h
> %%QT_INCDIR%%/QtGui/qopenglfunctions_es2.h
> %%QT_INCDIR%%/QtGui/qopenglpaintdevice.h
> %%QT_INCDIR%%/QtGui/qopenglpixeltransferoptions.h
>@@ -535,14 +546,18 @@
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qbasicfontdatabase_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcfsocketnotifier_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcoretextfontdatabase_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenuadaptor_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenuconnection_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenutypes_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusplatformmenu_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbustrayicon_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbustraytypes_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_dummy_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_static_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_udev_p.h
>-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglcompositor_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglconvenience_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglpbuffer_p.h
>-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformbackingstore_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcontext_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcursor_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformintegration_p.h
>@@ -554,7 +569,8 @@
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevmousehandler_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevmousemanager_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtablet_p.h
>-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouch_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouchhandler_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouchmanager_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeventdispatcher_cf_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeventdispatcher_glib_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbbackingstore_p.h
>@@ -570,8 +586,17 @@
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qgenericunixservices_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qgenericunixthemes_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qglxconvenience_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputhandler_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputkeyboard_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputpointer_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputtouch_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qmacmime_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qopenglcompositor_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qopenglcompositorbackingstore_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qstatusnotifieritemadaptor_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qtslib_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h
>+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qxdgnotificationproxy_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qxlibeglintegration_p.h
> %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/struct_marshallers_p.h
> %%QT_INCDIR%%/QtPlatformSupport/QtPlatformSupport
>@@ -588,6 +613,8 @@
> %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
> %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
> %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
>+%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
>+%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
> %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
> %%QT_LIBDIR%%/libQt5Gui.prl
> %%QT_LIBDIR%%/libQt5Gui.so
>@@ -597,9 +624,15 @@
> %%DEBUG%%%%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%%.debug
> %%QT_LIBDIR%%/libQt5PlatformSupport.a
> %%QT_LIBDIR%%/libQt5PlatformSupport.prl
>+%%QT_LIBDIR%%/libQt5XcbQpa.prl
>+%%QT_LIBDIR%%/libQt5XcbQpa.so
>+%%QT_LIBDIR%%/libQt5XcbQpa.so.5
>+%%QT_LIBDIR%%/libQt5XcbQpa.so.%%SHORTVER%%
>+%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%%
> %%QT_MKSPECDIR%%/modules/qt_lib_gui.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_gui_private.pri
> %%QT_MKSPECDIR%%/modules/qt_lib_platformsupport_private.pri
>+%%QT_MKSPECDIR%%/modules/qt_lib_xcb_qpa_lib_private.pri
> %%QT_PLUGINDIR%%/imageformats/libqgif.so
> %%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqgif.so.debug
> %%QT_PLUGINDIR%%/imageformats/libqico.so
>@@ -615,6 +648,9 @@
> %%QT_PLUGINDIR%%/platforms/libqoffscreen.so
> %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqoffscreen.so.debug
> %%QT_PLUGINDIR%%/platforms/libqxcb.so
>+%%QT_PLUGINDIR%%/xcbglintegrations/%%QT_LIBDIR%%qxcb-egl-integration.so
>+%%QT_PLUGINDIR%%/xcbglintegrations/%%QT_LIBDIR%%qxcb-glx-integration.so
> %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqxcb.so.debug
> libdata/pkgconfig/Qt5Gui.pc
> libdata/pkgconfig/Qt5PlatformSupport.pc
>+libdata/pkgconfig/Qt5XcbQpa.pc
>Index: x11-toolkits/qt5-quick/Makefile
>===================================================================
>--- x11-toolkits/qt5-quick/Makefile	(revision 404968)
>+++ x11-toolkits/qt5-quick/Makefile	(working copy)
>@@ -11,6 +11,7 @@
> USE_QT5=	core gui network qml sql testlib \
> 		widgets xmlpatterns buildtools_build
> QT_DIST=	declarative
>+USE_GL=		gl
> USES=		qmake
> USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
> 
>Index: x11-toolkits/qt5-quick/pkg-plist
>===================================================================
>--- x11-toolkits/qt5-quick/pkg-plist	(revision 404968)
>+++ x11-toolkits/qt5-quick/pkg-plist	(working copy)
>@@ -1,7 +1,6 @@
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/designerwindowmanager_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickitem_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickview_p.h
>-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qqmlaccessible_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessibleattached_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessiblefactory_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickanchors_p.h
>@@ -83,6 +82,7 @@
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectmesh_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectnode_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectsource_p.h
>+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshortcut_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksmoothedanimation_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksmoothedanimation_p_p.h
> %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickspringanimation_p.h
>@@ -303,7 +303,6 @@
> %%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%
> %%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug
> %%QT_BINDIR%%/qml
>-%%QT_BINDIR%%/qmlbundle
> %%QT_BINDIR%%/qmleasing
> %%QT_BINDIR%%/qmlimportscanner
> %%QT_BINDIR%%/qmllint
>@@ -333,6 +332,7 @@
> %%QT_QMLDIR%%/Qt/labs/settings/qmldir
> %%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so
> %%DEBUG%%%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so.debug
>+%%QT_QMLDIR%%/QtQml/Models.2/plugins.qmltypes
> %%QT_QMLDIR%%/QtQml/Models.2/qmldir
> %%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so
> %%DEBUG%%%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so.debug
>Index: x11-toolkits/qt5-quickcontrols/Makefile
>===================================================================
>--- x11-toolkits/qt5-quickcontrols/Makefile	(revision 404968)
>+++ x11-toolkits/qt5-quickcontrols/Makefile	(working copy)
>@@ -8,7 +8,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Set of controls for building complete interfaces in Qt Quick
> 
>-USE_QT5=	core gui qml quick testlib widgets \
>+USE_QT5=	core gui qml quick network testlib widgets \
> 		buildtools_build
> QT_DIST=	quickcontrols
> USES=		qmake
>Index: x11-toolkits/qt5-quickcontrols/pkg-plist
>===================================================================
>--- x11-toolkits/qt5-quickcontrols/pkg-plist	(revision 404968)
>+++ x11-toolkits/qt5-quickcontrols/pkg-plist	(working copy)
>@@ -10,6 +10,7 @@
> %%QT_QMLDIR%%/QtQuick/Controls/MenuBar.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/AbstractCheckable.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/BasicButton.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Private/BasicTableView.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/CalendarHeaderModel.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/CalendarUtils.js
> %%QT_QMLDIR%%/QtQuick/Controls/Private/ColumnMenuContent.qml
>@@ -33,11 +34,13 @@
> %%QT_QMLDIR%%/QtQuick/Controls/Private/Style.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/SystemPaletteSingleton.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/TabBar.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Private/TableViewItemDelegateLoader.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/TableViewSelection.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/TextHandle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/TextInputWithHandles.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/TextSingleton.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/ToolMenuButton.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Private/qmldir
> %%QT_QMLDIR%%/QtQuick/Controls/Private/style.js
> %%QT_QMLDIR%%/QtQuick/Controls/ProgressBar.qml
>@@ -51,15 +54,26 @@
> %%QT_QMLDIR%%/QtQuick/Controls/StackViewTransition.qml
> %%QT_QMLDIR%%/QtQuick/Controls/StatusBar.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ApplicationWindowStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/BusyIndicatorStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ButtonStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CalendarStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CheckBoxStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CircularButtonStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CircularGaugeStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ComboBoxStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CommonStyleHelper.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/DelayButtonStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/DialStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/FocusFrameStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/GaugeStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/GroupBoxStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/HandleStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/HandleStyleHelper.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/MenuBarStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/MenuStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/PieMenuStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ProgressBarStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/RadioButtonStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ScrollViewStyle.qml
>@@ -66,13 +80,17 @@
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/SliderStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/SpinBoxStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/StatusBarStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/SwitchStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TabViewStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TableViewStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TextAreaStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TextFieldStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ToolBarStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ToolButtonStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TreeViewStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TumblerStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/arrow-down.png
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/arrow-down@2x.png
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/arrow-left.png
>@@ -89,7 +107,9 @@
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/focusframe.png
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/groupbox.png
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/header.png
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/knob.png
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/leftanglearrow.png
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/needle.png
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/progress-indeterminate.png
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/rightanglearrow.png
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/scrollbar-handle-horizontal.png
>@@ -126,7 +146,10 @@
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/TextFieldStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ToolBarStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ToolButtonStyle.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/qmldir
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/%%QT_LIBDIR%%qtquickextrasflatplugin.so
>+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/qmldir
> %%QT_QMLDIR%%/QtQuick/Controls/Styles/qmldir
> %%QT_QMLDIR%%/QtQuick/Controls/Switch.qml
> %%QT_QMLDIR%%/QtQuick/Controls/Tab.qml
>@@ -137,43 +160,48 @@
> %%QT_QMLDIR%%/QtQuick/Controls/TextField.qml
> %%QT_QMLDIR%%/QtQuick/Controls/ToolBar.qml
> %%QT_QMLDIR%%/QtQuick/Controls/ToolButton.qml
>+%%QT_QMLDIR%%/QtQuick/Controls/TreeView.qml
> %%QT_QMLDIR%%/QtQuick/Controls/libqtquickcontrolsplugin.so
> %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls/libqtquickcontrolsplugin.so.debug
> %%QT_QMLDIR%%/QtQuick/Controls/plugins.qmltypes
> %%QT_QMLDIR%%/QtQuick/Controls/qmldir
>-%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so
> %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so.debug
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultColorDialog.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultDialogWrapper.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultFileDialog.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultFontDialog.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultMessageDialog.qml
> %%QT_QMLDIR%%/QtQuick/Dialogs/Private/libdialogsprivateplugin.so
> %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/Private/libdialogsprivateplugin.so.debug
> %%QT_QMLDIR%%/QtQuick/Dialogs/Private/qmldir
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetColorDialog.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetFileDialog.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetFontDialog.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetMessageDialog.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/checkers.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/checkmark.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/copy.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/critical.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/crosshairs.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/information.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/question.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/slider_handle.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/sunken_frame.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/warning.png
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/window_border.png
>+%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so
> %%QT_QMLDIR%%/QtQuick/Dialogs/plugins.qmltypes
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/ColorSlider.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/IconButtonStyle.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/IconGlyph.qml
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/icons.ttf
>-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/qmldir
> %%QT_QMLDIR%%/QtQuick/Dialogs/qmldir
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/CircularGaugeSpecifics.qml
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/DelayButtonSpecifics.qml
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/DialSpecifics.qml
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/GaugeSpecifics.qml
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/PictureSpecifics.qml
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/PieMenuSpecifics.qml
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/StatusIndicatorSpecifics.qml
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/ToggleButtonSpecifics.qml
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/circulargauge-icon.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/circulargauge-icon16.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/delaybutton-icon.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/delaybutton-icon16.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/dial-icon.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/dial-icon16.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/gauge-icon.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/gauge-icon16.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/picture-icon.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/picture-icon16.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/piemenu-icon.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/piemenu-icon16.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/statusindicator-icon.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/statusindicator-icon16.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/togglebutton-icon.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/togglebutton-icon16.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/tumbler-icon.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/tumbler-icon16.png
>+%%QT_QMLDIR%%/QtQuick/Extras/designer/qtquickextras.metainfo
>+%%QT_QMLDIR%%/QtQuick/Extras/%%QT_LIBDIR%%qtquickextrasplugin.so
>+%%QT_QMLDIR%%/QtQuick/Extras/plugins.qmltypes
>+%%QT_QMLDIR%%/QtQuick/Extras/qmldir
> %%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so
> %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so.debug
> %%QT_QMLDIR%%/QtQuick/Layouts/plugins.qmltypes
>Index: x11-toolkits/qt5-widgets/pkg-plist
>===================================================================
>--- x11-toolkits/qt5-widgets/pkg-plist	(revision 404968)
>+++ x11-toolkits/qt5-widgets/pkg-plist	(working copy)
>@@ -1,9 +1,14 @@
>+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/complexwidgets_p.h
>+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/itemviews_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractbutton_p.h
>+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractitemdelegate_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractitemview_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractscrollarea_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractslider_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractspinbox_p.h
>+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblemenu_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblewidgetfactory_p.h
>+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblewidgets_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaction_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qandroidstyle_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qapplication_p.h
>@@ -128,6 +133,8 @@
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowsxpstyle_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowsxpstyle_p_p.h
> %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwizard_win_p.h
>+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/rangecontrols_p.h
>+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/simplewidgets_p.h
> %%QT_INCDIR%%/QtWidgets/QAbstractButton
> %%QT_INCDIR%%/QtWidgets/QAbstractGraphicsShapeItem
> %%QT_INCDIR%%/QtWidgets/QAbstractItemDelegate
>@@ -135,45 +142,7 @@
> %%QT_INCDIR%%/QtWidgets/QAbstractScrollArea
> %%QT_INCDIR%%/QtWidgets/QAbstractSlider
> %%QT_INCDIR%%/QtWidgets/QAbstractSpinBox
>-%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractScrollArea
>-%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSlider
>-%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSpinBox
>-%%QT_INCDIR%%/QtWidgets/QAccessibleButton
>-%%QT_INCDIR%%/QtWidgets/QAccessibleCalendarWidget
>-%%QT_INCDIR%%/QtWidgets/QAccessibleComboBox
>-%%QT_INCDIR%%/QtWidgets/QAccessibleDial
>-%%QT_INCDIR%%/QtWidgets/QAccessibleDialogButtonBox
>-%%QT_INCDIR%%/QtWidgets/QAccessibleDisplay
>-%%QT_INCDIR%%/QtWidgets/QAccessibleDockWidget
>-%%QT_INCDIR%%/QtWidgets/QAccessibleDoubleSpinBox
>-%%QT_INCDIR%%/QtWidgets/QAccessibleGroupBox
>-%%QT_INCDIR%%/QtWidgets/QAccessibleLineEdit
>-%%QT_INCDIR%%/QtWidgets/QAccessibleMainWindow
>-%%QT_INCDIR%%/QtWidgets/QAccessibleMdiArea
>-%%QT_INCDIR%%/QtWidgets/QAccessibleMdiSubWindow
>-%%QT_INCDIR%%/QtWidgets/QAccessibleMenu
>-%%QT_INCDIR%%/QtWidgets/QAccessibleMenuBar
>-%%QT_INCDIR%%/QtWidgets/QAccessibleMenuItem
>-%%QT_INCDIR%%/QtWidgets/QAccessiblePlainTextEdit
>-%%QT_INCDIR%%/QtWidgets/QAccessibleProgressBar
>-%%QT_INCDIR%%/QtWidgets/QAccessibleScrollArea
>-%%QT_INCDIR%%/QtWidgets/QAccessibleScrollBar
>-%%QT_INCDIR%%/QtWidgets/QAccessibleSlider
>-%%QT_INCDIR%%/QtWidgets/QAccessibleSpinBox
>-%%QT_INCDIR%%/QtWidgets/QAccessibleStackedWidget
>-%%QT_INCDIR%%/QtWidgets/QAccessibleTabBar
>-%%QT_INCDIR%%/QtWidgets/QAccessibleTable
>-%%QT_INCDIR%%/QtWidgets/QAccessibleTableCell
>-%%QT_INCDIR%%/QtWidgets/QAccessibleTableCornerButton
>-%%QT_INCDIR%%/QtWidgets/QAccessibleTableHeaderCell
>-%%QT_INCDIR%%/QtWidgets/QAccessibleTextBrowser
>-%%QT_INCDIR%%/QtWidgets/QAccessibleTextEdit
>-%%QT_INCDIR%%/QtWidgets/QAccessibleTextWidget
>-%%QT_INCDIR%%/QtWidgets/QAccessibleToolBox
>-%%QT_INCDIR%%/QtWidgets/QAccessibleToolButton
>-%%QT_INCDIR%%/QtWidgets/QAccessibleTree
> %%QT_INCDIR%%/QtWidgets/QAccessibleWidget
>-%%QT_INCDIR%%/QtWidgets/QAccessibleWindowContainer
> %%QT_INCDIR%%/QtWidgets/QAction
> %%QT_INCDIR%%/QtWidgets/QActionGroup
> %%QT_INCDIR%%/QtWidgets/QApplication
>@@ -387,8 +356,6 @@
> %%QT_INCDIR%%/QtWidgets/QtWidgets
> %%QT_INCDIR%%/QtWidgets/QtWidgetsDepends
> %%QT_INCDIR%%/QtWidgets/QtWidgetsVersion
>-%%QT_INCDIR%%/QtWidgets/complexwidgets.h
>-%%QT_INCDIR%%/QtWidgets/itemviews.h
> %%QT_INCDIR%%/QtWidgets/qabstractbutton.h
> %%QT_INCDIR%%/QtWidgets/qabstractitemdelegate.h
> %%QT_INCDIR%%/QtWidgets/qabstractitemview.h
>@@ -395,9 +362,7 @@
> %%QT_INCDIR%%/QtWidgets/qabstractscrollarea.h
> %%QT_INCDIR%%/QtWidgets/qabstractslider.h
> %%QT_INCDIR%%/QtWidgets/qabstractspinbox.h
>-%%QT_INCDIR%%/QtWidgets/qaccessiblemenu.h
> %%QT_INCDIR%%/QtWidgets/qaccessiblewidget.h
>-%%QT_INCDIR%%/QtWidgets/qaccessiblewidgets.h
> %%QT_INCDIR%%/QtWidgets/qaction.h
> %%QT_INCDIR%%/QtWidgets/qactiongroup.h
> %%QT_INCDIR%%/QtWidgets/qapplication.h
>@@ -521,8 +486,6 @@
> %%QT_INCDIR%%/QtWidgets/qwidgetaction.h
> %%QT_INCDIR%%/QtWidgets/qwidgetsfunctions_wince.h
> %%QT_INCDIR%%/QtWidgets/qwizard.h
>-%%QT_INCDIR%%/QtWidgets/rangecontrols.h
>-%%QT_INCDIR%%/QtWidgets/simplewidgets.h
> %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake
> %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
> %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake

Actions: View | Diff

Attachments on bug 205805: 164961 | 164962 | 164963