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

* Update Qt5 to 5.7.1
* Move Qt4 binaries to lib/qt4/bin
* Move Qt5 libraries to lib/qt5/lib
  By moving the libraries we should finally be able to get rid of the inplace
  upgrade bug (see ports bugs 194088, 195105 and 198720):  when Qt5's libraries
  were lying in /usr/local/lib, which would often get added by pkgconfig to the
  linker paths via dependencies, the already installed libraries were linked
  against, instead of the ones that were being built. This forced us to make
  sure, that -L${WRKSRC}/lib was always coming before -L/usr/local/lib in the
  linker flags. With this change this should no longer be the case.
* Rename some ports to match the rest (foo-qtX -> qtX-foo)
* Depend on new port misc/qtchooser [see UPDATING & CHANGES]

There are several new Qt5 ports which all have been created by Marie Loise Nolden
<nolden@kde.org>. Thanks again.

PR:		216797
Exp-Run by:	antoine
Reviewed by:	rakuco, mat, groot_kde.org
Approved by:	rakuco (mentor)
Differential Revision:	https://reviews.freebsd.org/D9213

28 files changed, 14 insertions, 29 deletions

diff --git a/www/Makefile b/www/Makefile
index fec269ad4747..d302b1ec9898 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1871,6 +1871,8 @@
     SUBDIR += pyweblib
     SUBDIR += qdecoder
     SUBDIR += qooxdoo
+    SUBDIR += qt4-webkit
+    SUBDIR += qt5-webkit
     SUBDIR += qt5-webchannel
     SUBDIR += qt5-websockets
     SUBDIR += quickie
@@ -2340,8 +2342,6 @@
     SUBDIR += webinject
     SUBDIR += webkit-gtk2
     SUBDIR += webkit-gtk3
-    SUBDIR += webkit-qt4
-    SUBDIR += webkit-qt5
     SUBDIR += webkit-sharp
     SUBDIR += webkit2-gtk3
     SUBDIR += weblint
diff --git a/www/webkit-qt4/Makefile b/www/qt4-webkit/Makefile
index eb15c2f1f213..e44a40736f12 100644
--- a/www/webkit-qt4/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	webkit
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt4-
 
diff --git a/www/webkit-qt4/files/patch-libcxx b/www/qt4-webkit/files/patch-libcxx
index ab695126e9fc..ab695126e9fc 100644
--- a/www/webkit-qt4/files/patch-libcxx
+++ b/www/qt4-webkit/files/patch-libcxx
diff --git a/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp b/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp
index bfff55a7a1b6..bfff55a7a1b6 100644
--- a/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp
+++ b/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp
diff --git a/www/webkit-qt4/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp b/www/qt4-webkit/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp
index f68753f622ae..f68753f622ae 100644
--- a/www/webkit-qt4/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp
+++ b/www/qt4-webkit/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp
diff --git a/www/webkit-qt4/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h
index e2b4f74d54ac..e2b4f74d54ac 100644
--- a/www/webkit-qt4/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h
+++ b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h
diff --git a/www/webkit-qt4/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h
index 4fc6d3251ea5..4fc6d3251ea5 100644
--- a/www/webkit-qt4/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h
+++ b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h
diff --git a/www/webkit-qt4/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro
index 994adda65917..994adda65917 100644
--- a/www/webkit-qt4/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro
+++ b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro
diff --git a/www/webkit-qt4/pkg-plist b/www/qt4-webkit/pkg-plist
index 18c5c3ccf694..18c5c3ccf694 100644
--- a/www/webkit-qt4/pkg-plist
+++ b/www/qt4-webkit/pkg-plist
diff --git a/www/qt5-webchannel/pkg-plist b/www/qt5-webchannel/pkg-plist
index f6aa4fc925fe..05549094efc6 100644
--- a/www/qt5-webchannel/pkg-plist
+++ b/www/qt5-webchannel/pkg-plist
@@ -14,8 +14,8 @@
 %%QT_INCDIR%%/QtWebChannel/qwebchannel.h
 %%QT_INCDIR%%/QtWebChannel/qwebchannelabstracttransport.h
 %%QT_INCDIR%%/QtWebChannel/qwebchannelglobal.h
-%%QT_LIBDIR%%/cmake/Qt5WebChannel/Qt5WebChannelConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5WebChannel/Qt5WebChannelConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5WebChannel/Qt5WebChannelConfig.cmake
+%%QT_CMAKEDIR%%/Qt5WebChannel/Qt5WebChannelConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5WebChannel.prl
 %%QT_LIBDIR%%/libQt5WebChannel.so
 %%QT_LIBDIR%%/libQt5WebChannel.so.5
diff --git a/www/webkit-qt5/Makefile b/www/qt5-webkit/Makefile
index ee7d0df402c9..e161fd4ea7cd 100644
--- a/www/webkit-qt5/Makefile
+++ b/www/qt5-webkit/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	webkit
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	community_releases/${QT5_VERSION:R}/${QT5_VERSION}/
 PKGNAMEPREFIX=	qt5-
diff --git a/www/qt5-webkit/distinfo b/www/qt5-webkit/distinfo
new file mode 100644
index 000000000000..33fca814c613
--- /dev/null
+++ b/www/qt5-webkit/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1484659684
+SHA256 (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03
+SIZE (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = 35298736
diff --git a/www/webkit-qt5/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h b/www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
index 22c0b902bf5b..22c0b902bf5b 100644
--- a/www/webkit-qt5/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
+++ b/www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
diff --git a/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp b/www/qt5-webkit/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp
index 5fc1906719fa..5fc1906719fa 100644
--- a/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp
+++ b/www/qt5-webkit/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp
diff --git a/www/webkit-qt5/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h b/www/qt5-webkit/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h
index 44b68255a214..44b68255a214 100644
--- a/www/webkit-qt5/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h
+++ b/www/qt5-webkit/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h
diff --git a/www/webkit-qt5/files/patch-Source__QtWebKit.pro b/www/qt5-webkit/files/patch-Source__QtWebKit.pro
index b2afeae43ceb..b2afeae43ceb 100644
--- a/www/webkit-qt5/files/patch-Source__QtWebKit.pro
+++ b/www/qt5-webkit/files/patch-Source__QtWebKit.pro
diff --git a/www/webkit-qt5/files/patch-Source__WebCore__page__NavigatorBase.cpp b/www/qt5-webkit/files/patch-Source__WebCore__page__NavigatorBase.cpp
index a784ca85189d..a784ca85189d 100644
--- a/www/webkit-qt5/files/patch-Source__WebCore__page__NavigatorBase.cpp
+++ b/www/qt5-webkit/files/patch-Source__WebCore__page__NavigatorBase.cpp
diff --git a/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h b/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h
index 184b5e202b0e..184b5e202b0e 100644
--- a/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h
+++ b/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h
diff --git a/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h b/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h
index bca58b6be1e2..bca58b6be1e2 100644
--- a/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h
+++ b/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h
diff --git a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro
index 118e22fd29ab..118e22fd29ab 100644
--- a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro
diff --git a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp
index 9fba722665b9..9fba722665b9 100644
--- a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp
diff --git a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro
index e161588d8b06..e161588d8b06 100644
--- a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro
diff --git a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro
index fbd6975e7b8b..fbd6975e7b8b 100644
--- a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro
diff --git a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro
index bc725c8f2220..bc725c8f2220 100644
--- a/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro
diff --git a/www/webkit-qt5/pkg-plist b/www/qt5-webkit/pkg-plist
index 3ad3300a55dc..6e28fab83d41 100644
--- a/www/webkit-qt5/pkg-plist
+++ b/www/qt5-webkit/pkg-plist
@@ -81,10 +81,10 @@
 %%QT_INCDIR%%/QtWebKitWidgets/qwebinspector.h
 %%QT_INCDIR%%/QtWebKitWidgets/qwebpage.h
 %%QT_INCDIR%%/QtWebKitWidgets/qwebview.h
-%%QT_LIBDIR%%/cmake/Qt5WebKit/Qt5WebKitConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5WebKit/Qt5WebKitConfig.cmake
+%%QT_CMAKEDIR%%/Qt5WebKit/Qt5WebKitConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5WebKit.prl
 %%QT_LIBDIR%%/libQt5WebKit.so
 %%QT_LIBDIR%%/libQt5WebKit.so.5
diff --git a/www/qt5-websockets/pkg-plist b/www/qt5-websockets/pkg-plist
index 73a5840bc8c5..cd0517f99a05 100644
--- a/www/qt5-websockets/pkg-plist
+++ b/www/qt5-websockets/pkg-plist
@@ -22,8 +22,8 @@
 %%QT_INCDIR%%/QtWebSockets/qwebsocketprotocol.h
 %%QT_INCDIR%%/QtWebSockets/qwebsockets_global.h
 %%QT_INCDIR%%/QtWebSockets/qwebsocketserver.h
-%%QT_LIBDIR%%/cmake/Qt5WebSockets/Qt5WebSocketsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5WebSockets/Qt5WebSocketsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5WebSockets/Qt5WebSocketsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5WebSockets/Qt5WebSocketsConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5WebSockets.prl
 %%QT_LIBDIR%%/libQt5WebSockets.so
 %%QT_LIBDIR%%/libQt5WebSockets.so.5
diff --git a/www/webkit-qt5/distinfo b/www/webkit-qt5/distinfo
deleted file mode 100644
index 855708e09d12..000000000000
--- a/www/webkit-qt5/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1476277006
-SHA256 (KDE/Qt/5.6.2/qtwebkit-opensource-src-5.6.2.tar.xz) = 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966
-SIZE (KDE/Qt/5.6.2/qtwebkit-opensource-src-5.6.2.tar.xz) = 35306252
diff --git a/www/webkit-qt5/files/patch-Source_JavaScriptCore_disassembler_udis86_ud_opcode.py b/www/webkit-qt5/files/patch-Source_JavaScriptCore_disassembler_udis86_ud_opcode.py
deleted file mode 100644
index c7a061c8e7a0..000000000000
--- a/www/webkit-qt5/files/patch-Source_JavaScriptCore_disassembler_udis86_ud_opcode.py
+++ /dev/null
@@ -1,15 +0,0 @@
---- Source/JavaScriptCore/disassembler/udis86/ud_opcode.py.bak	2016-09-09 23:35:32.000000000 +1000
-+++ Source/JavaScriptCore/disassembler/udis86/ud_opcode.py	2016-12-24 18:52:06.065571000 +1000
-@@ -115,9 +115,9 @@
-             '/mod'   : lambda v: '00' if v == '!11' else '01',
-             # Mode extensions:
-             # (16, 32, 64) => (00, 01, 02)
--            '/o'     : lambda v: "%02x" % (int(v) / 32),
--            '/a'     : lambda v: "%02x" % (int(v) / 32),
--            '/m'     : lambda v: "%02x" % (int(v) / 32),
-+            '/o'     : lambda v: "%02x" % (int(v) // 32),
-+            '/a'     : lambda v: "%02x" % (int(v) // 32),
-+            '/m'     : lambda v: "%02x" % (int(v) // 32),
-             '/sse'   : lambda v: UdOpcodeTables.OpcExtIndex['sse'][v]
-         }
-