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

12 files changed, 173 insertions, 0 deletions

diff --git a/www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h b/www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
new file mode 100644
index 000000000000..22c0b902bf5b
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
@@ -0,0 +1,11 @@
+--- Source/JavaScriptCore/assembler/ARMAssembler.h
++++ Source/JavaScriptCore/assembler/ARMAssembler.h
+@@ -1064,6 +1064,8 @@
+             linuxPageFlush(current, end);
+ #elif OS(WINCE)
+             CacheRangeFlush(code, size, CACHE_SYNC_ALL);
++#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG)
++            __clear_cache(code, reinterpret_cast<char*>(code) + size);
+ #elif OS(QNX) && ENABLE(ASSEMBLER_WX_EXCLUSIVE)
+             UNUSED_PARAM(code);
+             UNUSED_PARAM(size);
diff --git a/www/qt5-webkit/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp b/www/qt5-webkit/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp
new file mode 100644
index 000000000000..5fc1906719fa
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp
@@ -0,0 +1,13 @@
+databases/leveldb installs the memenv.h header into a different location.
+
+--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp.orig	2016-09-26 15:03:55 UTC
++++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+@@ -38,7 +38,7 @@
+ #include <leveldb/comparator.h>
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <memenv/memenv.h>
+ #include <leveldb/slice.h>
+ #include <string>
+ #include <wtf/PassOwnPtr.h>
diff --git a/www/qt5-webkit/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h b/www/qt5-webkit/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h
new file mode 100644
index 000000000000..44b68255a214
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h
@@ -0,0 +1,26 @@
+--- ./Source/JavaScriptCore/runtime/JSCJSValueInlines.h.orig	2013-10-22 01:49:45.000000000 -0700
++++ ./Source/JavaScriptCore/runtime/JSCJSValueInlines.h	2013-11-08 00:51:34.238960064 -0800
+@@ -198,7 +198,11 @@
+         u.asBits.tag = CellTag;
+     else
+         u.asBits.tag = EmptyValueTag;
++#if defined(__sparc64__)
++    u.asBits.payload = reinterpret_cast<int64_t>(ptr);
++#else
+     u.asBits.payload = reinterpret_cast<int32_t>(ptr);
++#endif
+ }
+ 
+ inline JSValue::JSValue(const JSCell* ptr)
+@@ -207,7 +211,11 @@
+         u.asBits.tag = CellTag;
+     else
+         u.asBits.tag = EmptyValueTag;
++#if defined(__sparc64__)
++    u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr));
++#else
+     u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
++#endif
+ }
+ 
+ inline JSValue::operator bool() const
diff --git a/www/qt5-webkit/files/patch-Source__QtWebKit.pro b/www/qt5-webkit/files/patch-Source__QtWebKit.pro
new file mode 100644
index 000000000000..b2afeae43ceb
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Source__QtWebKit.pro
@@ -0,0 +1,17 @@
+Do not go into the examples/ directory, which contains only platformplugin/.
+
+Even though it is not part of the default target, it is included in `make
+install', and platformplugin's .pro file has a DESTDIR setting that causes the
+file system to be touched even though there is nothing to build or install.
+--- Source/QtWebKit.pro
++++ Source/QtWebKit.pro
+@@ -38,9 +38,4 @@ build?(webkit1) {
+         tests.file = tests.pri
+         SUBDIRS += tests
+     }
+-
+-    examples.file = WebKit/qt/examples/examples.pro
+-    examples.CONFIG += no_default_target
+-    examples.makefile = Makefile
+-    SUBDIRS += examples
+ }
diff --git a/www/qt5-webkit/files/patch-Source__WebCore__page__NavigatorBase.cpp b/www/qt5-webkit/files/patch-Source__WebCore__page__NavigatorBase.cpp
new file mode 100644
index 000000000000..a784ca85189d
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Source__WebCore__page__NavigatorBase.cpp
@@ -0,0 +1,20 @@
+--- ./Source/WebCore/page/NavigatorBase.cpp.orig	2012-12-18 20:04:33.000000000 +0100
++++ ./Source/WebCore/page/NavigatorBase.cpp	2013-01-07 04:01:53.177339022 +0100
+@@ -30,7 +30,7 @@
+ #include "NetworkStateNotifier.h"
+ #include <wtf/text/WTFString.h>
+ 
+-#if OS(LINUX)
++#if OS(LINUX) || OS(FREEBSD)
+ #include "sys/utsname.h"
+ #include <wtf/StdLibExtras.h>
+ #endif
+@@ -86,7 +86,7 @@
+ 
+ String NavigatorBase::platform() const
+ {
+-#if OS(LINUX)
++#if OS(LINUX) || OS(FREEBSD)
+     if (!String(WEBCORE_NAVIGATOR_PLATFORM).isEmpty())
+         return WEBCORE_NAVIGATOR_PLATFORM;
+     struct utsname osname;
diff --git a/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h b/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h
new file mode 100644
index 000000000000..184b5e202b0e
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h
@@ -0,0 +1,11 @@
+--- ./Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h.orig	2012-12-18 20:04:31.000000000 +0100
++++ ./Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h	2012-12-28 13:00:05.846909692 +0100
+@@ -36,7 +36,7 @@
+ typedef IOSurfaceRef PlatformGraphicsSurface;
+ #endif
+ 
+-#if OS(LINUX)
++#if OS(LINUX) || OS(FREEBSD)
+ typedef uint32_t PlatformGraphicsSurface;
+ #endif
+ 
diff --git a/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h b/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h
new file mode 100644
index 000000000000..bca58b6be1e2
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h
@@ -0,0 +1,11 @@
+--- ./Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig	2012-12-18 20:04:31.000000000 +0100
++++ ./Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h	2012-12-28 13:02:03.566975217 +0100
+@@ -35,7 +35,7 @@
+ 
+ #if OS(DARWIN)
+     typedef mach_port_t BufferHandle;
+-#elif OS(LINUX)
++#elif OS(LINUX) || OS(FREEBSD)
+     typedef uint32_t BufferHandle;
+ #elif OS(WINDOWS)
+     typedef HANDLE BufferHandle;
diff --git a/www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro
new file mode 100644
index 000000000000..118e22fd29ab
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro
@@ -0,0 +1,13 @@
+Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of
+the directories make tries to enter in case it exists (because of .OBJDIR).
+Since qmake will create it because of OBJECTS_DIR, make will invoke the
+compiler from there and fail because it's trying to pass "-o obj/foo.o" while
+already in obj/.
+
+--- Tools/qmake/config.tests/glx/glx.pro.orig	2016-09-26 14:56:31 UTC
++++ Tools/qmake/config.tests/glx/glx.pro
+@@ -1,4 +1,3 @@
+ SOURCES = glx.cpp
+-OBJECTS_DIR = obj
+ LIBS += -lX11 -lGL
+ 
diff --git a/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp
new file mode 100644
index 000000000000..9fba722665b9
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp
@@ -0,0 +1,13 @@
+databases/leveldb installs the memenv.h header into a different location.
+
+--- Tools/qmake/config.tests/leveldb/leveldb.cpp.orig	2016-09-26 15:03:32 UTC
++++ Tools/qmake/config.tests/leveldb/leveldb.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <memenv/memenv.h>
+ 
+ int main(int, char**)
+ {
diff --git a/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro
new file mode 100644
index 000000000000..e161588d8b06
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro
@@ -0,0 +1,14 @@
+Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of
+the directories make tries to enter in case it exists (because of .OBJDIR).
+Since qmake will create it because of OBJECTS_DIR, make will invoke the
+compiler from there and fail because it's trying to pass "-o obj/foo.o" while
+already in obj/.
+
+--- Tools/qmake/config.tests/leveldb/leveldb.pro.orig	2016-09-26 14:57:15 UTC
++++ Tools/qmake/config.tests/leveldb/leveldb.pro
+@@ -1,5 +1,4 @@
+ SOURCES = leveldb.cpp
+-OBJECTS_DIR = obj
+ LIBS += -lleveldb -lmemenv
+ 
+ load(qt_build_config)
diff --git a/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro
new file mode 100644
index 000000000000..fbd6975e7b8b
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro
@@ -0,0 +1,12 @@
+Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of
+the directories make tries to enter in case it exists (because of .OBJDIR).
+Since qmake will create it because of OBJECTS_DIR, make will invoke the
+compiler from there and fail because it's trying to pass "-o obj/foo.o" while
+already in obj/.
+
+--- Tools/qmake/config.tests/libXcomposite/libXcomposite.pro.orig	2016-09-26 14:56:58 UTC
++++ Tools/qmake/config.tests/libXcomposite/libXcomposite.pro
+@@ -1,3 +1,2 @@
+ SOURCES = libXcomposite.cpp
+-OBJECTS_DIR = obj
+ LIBS += -lXcomposite -lX11
diff --git a/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro
new file mode 100644
index 000000000000..bc725c8f2220
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro
@@ -0,0 +1,12 @@
+Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of
+the directories make tries to enter in case it exists (because of .OBJDIR).
+Since qmake will create it because of OBJECTS_DIR, make will invoke the
+compiler from there and fail because it's trying to pass "-o obj/foo.o" while
+already in obj/.
+
+--- Tools/qmake/config.tests/libXrender/libXrender.pro.orig	2016-09-26 14:56:47 UTC
++++ Tools/qmake/config.tests/libXrender/libXrender.pro
+@@ -1,3 +1,2 @@
+ SOURCES = libXrender.cpp
+-OBJECTS_DIR = obj
+ LIBS += -lXrender -lX11