25 files changed, 34 insertions, 59 deletions

diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index d3a9d405b51b..56ebc46ce23b 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	choqok
 DISTVERSION=	1.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION:R}/src
 DIST_SUBDIR=	KDE/${PORTNAME}
diff --git a/www/cutelyst/Makefile b/www/cutelyst/Makefile
index 74a97e83e021..5b886d8f7523 100644
--- a/www/cutelyst/Makefile
+++ b/www/cutelyst/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	cutelyst
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/www/falkon/Makefile b/www/falkon/Makefile
index 6605954f8b8c..5fb04b66ad66 100644
--- a/www/falkon/Makefile
+++ b/www/falkon/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	falkon
 DISTVERSION=	3.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	KDE/stable/falkon/${DISTVERSION:R}/src/
 
diff --git a/www/kf5-kdewebkit/Makefile b/www/kf5-kdewebkit/Makefile
index b6398400679d..c0c1827fb4bd 100644
--- a/www/kf5-kdewebkit/Makefile
+++ b/www/kf5-kdewebkit/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdewebkit
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/kf5-khtml/Makefile b/www/kf5-khtml/Makefile
index 4b1dc7ede6a1..fa7347e2fdb8 100644
--- a/www/kf5-khtml/Makefile
+++ b/www/kf5-khtml/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	khtml
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/kf5-kjs/Makefile b/www/kf5-kjs/Makefile
index fbbd06e68c7d..79942815cb7d 100644
--- a/www/kf5-kjs/Makefile
+++ b/www/kf5-kjs/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kjs
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/kf5-kjsembed/Makefile b/www/kf5-kjsembed/Makefile
index e65bc68113cc..8f3281a9743b 100644
--- a/www/kf5-kjsembed/Makefile
+++ b/www/kf5-kjsembed/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kjsembed
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/onionshare/Makefile b/www/onionshare/Makefile
index d864954b7111..44e388a1a970 100644
--- a/www/onionshare/Makefile
+++ b/www/onionshare/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	onionshare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python security
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
index 96c8243f900e..aa1c53c8fd96 100644
--- a/www/otter-browser/Makefile
+++ b/www/otter-browser/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	otter-browser
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.01
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/plasma5-plasma-browser-integration/Makefile b/www/plasma5-plasma-browser-integration/Makefile
index e53e960a53e3..dbf3abf346bf 100644
--- a/www/plasma5-plasma-browser-integration/Makefile
+++ b/www/plasma5-plasma-browser-integration/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	plasma-browser-integration
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/py-qt5-webchannel/Makefile b/www/py-qt5-webchannel/Makefile
index 713969849a8e..c45abea51dac 100644
--- a/www/py-qt5-webchannel/Makefile
+++ b/www/py-qt5-webchannel/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	webchannel
+PORTREVISION=	1
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/py-qt5-webengine/Makefile b/www/py-qt5-webengine/Makefile
index 443f5a0f7f19..d4fb4ec164aa 100644
--- a/www/py-qt5-webengine/Makefile
+++ b/www/py-qt5-webengine/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	webengine
+PORTREVISION=	1
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/py-qt5-webkit/Makefile b/www/py-qt5-webkit/Makefile
index 841db25d2def..9328d00379e6 100644
--- a/www/py-qt5-webkit/Makefile
+++ b/www/py-qt5-webkit/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkit
+PORTREVISION=	1
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/py-qt5-webkitwidgets/Makefile b/www/py-qt5-webkitwidgets/Makefile
index d252ce56c9f0..f68565296924 100644
--- a/www/py-qt5-webkitwidgets/Makefile
+++ b/www/py-qt5-webkitwidgets/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkitwidgets
+PORTREVISION=	1
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/qhttpengine/Makefile b/www/qhttpengine/Makefile
index db537a1872aa..2d5a821b8431 100644
--- a/www/qhttpengine/Makefile
+++ b/www/qhttpengine/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qhttpengine
 DISTVERSION=	1.0.1-5
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g43f55df
 CATEGORIES=	www
 
diff --git a/www/qt5-webchannel/Makefile b/www/qt5-webchannel/Makefile
index 3c03268016da..45c240462efe 100644
--- a/www/qt5-webchannel/Makefile
+++ b/www/qt5-webchannel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	webchannel
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile
index 00d7304b6729..269d2538f6ce 100644
--- a/www/qt5-webengine/Makefile
+++ b/www/qt5-webengine/Makefile
@@ -20,7 +20,7 @@
 
 PORTNAME=	webengine
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 
diff --git a/www/qt5-webengine/files/patch-src_core_api_core_api.pro b/www/qt5-webengine/files/patch-src_core_api_core_api.pro
new file mode 100644
index 000000000000..a5126d0478f1
--- /dev/null
+++ b/www/qt5-webengine/files/patch-src_core_api_core_api.pro
@@ -0,0 +1,11 @@
+--- src/core/api/core_api.pro.orig	2018-04-10 14:50:39 UTC
++++ src/core/api/core_api.pro
+@@ -53,7 +53,7 @@ SOURCES = \
+     qwebengineurlschemehandler.cpp
+ 
+ ### Qt6 Remove this workaround
+-unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static {
++linux:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static {
+     SOURCES += qtbug-60565.cpp \
+                qtbug-61521.cpp
+ }
diff --git a/www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp b/www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp
deleted file mode 100644
index bcb247bbbc30..000000000000
--- a/www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-malloc.h does not exist on FreeBSD, and neither do memalign(3) and pvalloc(3).
---- src/core/api/qtbug-61521.cpp
-+++ src/core/api/qtbug-61521.cpp
-@@ -38,7 +38,7 @@
- ****************************************************************************/
- 
- #include <stdlib.h>
--#include <malloc.h>
-+#include <unistd.h>
- 
- #define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn)))
- #define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5")
-@@ -66,18 +66,10 @@ SHIM_SYMBOL_VERSION(cfree);
- void __cfree(void* ptr)
-     SHIM_ALIAS_SYMBOL(ShimCFree);
- 
--SHIM_SYMBOL_VERSION(memalign);
--void* __memalign(size_t align, size_t s)
--    SHIM_ALIAS_SYMBOL(ShimMemalign);
--
- SHIM_SYMBOL_VERSION(valloc);
- void* __valloc(size_t size)
-     SHIM_ALIAS_SYMBOL(ShimValloc);
- 
--SHIM_SYMBOL_VERSION(pvalloc);
--void* __pvalloc(size_t size)
--    SHIM_ALIAS_SYMBOL(ShimPvalloc);
--
- SHIM_SYMBOL_VERSION(posix_memalign);
- int __posix_memalign(void** r, size_t a, size_t s)
-     SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
-@@ -102,18 +94,10 @@ SHIM_HIDDEN void ShimCFree(void* ptr) {
-     free(ptr);
- }
- 
--SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
--    return memalign(align,s);
--}
--
- SHIM_HIDDEN void* ShimValloc(size_t size) {
-     return  valloc(size);
- }
- 
--SHIM_HIDDEN void* ShimPvalloc(size_t size) {
--    return pvalloc(size);
--}
--
- SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
-     return posix_memalign(r,a,s);
- }
diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile
index 6f77fd101f9a..47ff5259a0b0 100644
--- a/www/qt5-webkit/Makefile
+++ b/www/qt5-webkit/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=		webkit
 DISTVERSION=		5.212.0-alpha2
-PORTREVISION=		17
+PORTREVISION=	18
 CATEGORIES=		www
 MASTER_SITES=		https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/
 PKGNAMEPREFIX=		qt5-
diff --git a/www/qt5-websockets-qml/Makefile b/www/qt5-websockets-qml/Makefile
index dc6bfdae1292..ab5167ee2883 100644
--- a/www/qt5-websockets-qml/Makefile
+++ b/www/qt5-websockets-qml/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	websockets-qml
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 
diff --git a/www/qt5-websockets/Makefile b/www/qt5-websockets/Makefile
index 71ee92b07082..8f5c6012ac03 100644
--- a/www/qt5-websockets/Makefile
+++ b/www/qt5-websockets/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	websockets
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 
diff --git a/www/qt5-webview/Makefile b/www/qt5-webview/Makefile
index 0a2f6d6bc02a..63c6d7909fdf 100644
--- a/www/qt5-webview/Makefile
+++ b/www/qt5-webview/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	webview
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 
diff --git a/www/qupzilla-qt5/Makefile b/www/qupzilla-qt5/Makefile
index 5513d2bc4100..8d32f4045347 100644
--- a/www/qupzilla-qt5/Makefile
+++ b/www/qupzilla-qt5/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qupzilla
 PORTVERSION=	1.8.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	-qt5
diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile
index c7ff1ec0efd2..2ae326b9ece9 100644
--- a/www/qutebrowser/Makefile
+++ b/www/qutebrowser/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qutebrowser
 DISTVERSION=	1.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	CHEESESHOP