svn commit: r466598 - in head: audio/nuvolaplayer databases/evolution-data-server deskutils/gnome-documents deskutils/osmo deskutils/showdown devel/devhelp editors/emacs-devel graphics/atril graphi...

Thu Apr 5 20:13:53 UTC 2018

Author: tobik
Date: Thu Apr  5 20:13:48 2018
New Revision: 466598
URL: https://svnweb.freebsd.org/changeset/ports/466598

Log:
  www/webkit2-gtk3: Update to 2.20.0
  
  - Add WAYLAND option
  - Bump PORTREVISION of dependents
  - Fix build of epiphany 3.24.2 with newer WebKit versions
  
  PR:		223733
  Submitted by:	Greg V <greg at unrelenting.technology> (initial update to 2.18.3)
  Reviewed by:	Ting-Wei Lan <lantw44 at gmail.com>
  Approved by:	gnome (maintainer timeout, too long)
  Security:	1ce95bc7-3278-11e8-b527-00012e582166
  MFH:		2018Q2
  Differential Revision:	https://reviews.freebsd.org/D14872

Added:
  head/www/epiphany/files/
  head/www/epiphany/files/patch-src_ephy-window.c   (contents, props changed)
  head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.h   (contents, props changed)
  head/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake   (contents, props changed)
Deleted:
  head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_PlatformGTK.cmake
  head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h
  head/www/webkit2-gtk3/files/patch-Source_WebKit2_PlatformGTK.cmake
  head/www/webkit2-gtk3/files/patch-Source_WebKit2_Shared_Plugins_unix_PluginSearchPath.cpp
Modified:
  head/audio/nuvolaplayer/Makefile
  head/databases/evolution-data-server/Makefile
  head/deskutils/gnome-documents/Makefile
  head/deskutils/osmo/Makefile
  head/deskutils/showdown/Makefile
  head/devel/devhelp/Makefile
  head/editors/emacs-devel/Makefile
  head/graphics/atril/Makefile
  head/graphics/gthumb/Makefile
  head/graphics/shotwell/Makefile
  head/mail/evolution-ews/Makefile
  head/mail/evolution/Makefile
  head/mail/geary/Makefile
  head/multimedia/quodlibet/Makefile
  head/net-im/empathy/Makefile
  head/net/gnome-online-accounts/Makefile
  head/net/liferea/Makefile
  head/textproc/libgepub/Makefile
  head/www/epiphany/Makefile
  head/www/luakit/Makefile
  head/www/surf/Makefile
  head/www/webkit2-gtk3/Makefile
  head/www/webkit2-gtk3/distinfo
  head/www/webkit2-gtk3/files/patch-CMakeLists.txt
  head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
  head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp
  head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h
  head/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake
  head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
  head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp
  head/www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h
  head/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h
  head/www/webkit2-gtk3/pkg-plist
  head/x11-fm/sushi/Makefile
  head/x11/yelp/Makefile

Modified: head/audio/nuvolaplayer/Makefile
==============================================================================

--- head/audio/nuvolaplayer/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/audio/nuvolaplayer/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -2,6 +2,7 @@
 
 PORTNAME=	nuvolaplayer
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 CATEGORIES=	audio www
 
 MAINTAINER=	avilla at FreeBSD.org

Modified: head/databases/evolution-data-server/Makefile
==============================================================================
--- head/databases/evolution-data-server/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/databases/evolution-data-server/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,7 +3,7 @@
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	3.24.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/deskutils/gnome-documents/Makefile
==============================================================================
--- head/deskutils/gnome-documents/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/deskutils/gnome-documents/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-documents
 PORTVERSION=	3.18.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/deskutils/osmo/Makefile
==============================================================================
--- head/deskutils/osmo/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/deskutils/osmo/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,7 +3,7 @@
 
 PORTNAME=	osmo
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}
 

Modified: head/deskutils/showdown/Makefile
==============================================================================
--- head/deskutils/showdown/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/deskutils/showdown/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -2,6 +2,7 @@
 
 PORTNAME=	showdown
 DISTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	dg at syrec.org

Modified: head/devel/devhelp/Makefile
==============================================================================
--- head/devel/devhelp/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/devel/devhelp/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,7 +3,7 @@
 
 PORTNAME=	devhelp
 PORTVERSION=	3.24.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/editors/emacs-devel/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,6 +3,7 @@
 
 PORTNAME=	emacs
 DISTVERSION=	${EMACS_VER}.${EMACS_REV}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 PKGNAMESUFFIX=	-devel

Modified: head/graphics/atril/Makefile
==============================================================================
--- head/graphics/atril/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/graphics/atril/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -5,7 +5,7 @@
 
 PORTNAME=	atril
 PORTVERSION=	1.18.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics print mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate

Modified: head/graphics/gthumb/Makefile
==============================================================================
--- head/graphics/gthumb/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/graphics/gthumb/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -4,6 +4,7 @@
 
 PORTNAME=	gthumb
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/graphics/shotwell/Makefile
==============================================================================
--- head/graphics/shotwell/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/graphics/shotwell/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,6 +3,7 @@
 
 PORTNAME=	shotwell
 PORTVERSION=	0.28.0
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}
 

Modified: head/mail/evolution-ews/Makefile
==============================================================================
--- head/mail/evolution-ews/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/mail/evolution-ews/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,7 +3,7 @@
 
 PORTNAME=	evolution-ews
 PORTVERSION=	3.24.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/mail/evolution/Makefile
==============================================================================
--- head/mail/evolution/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/mail/evolution/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,7 +3,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	3.24.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/mail/geary/Makefile
==============================================================================
--- head/mail/geary/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/mail/geary/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -4,6 +4,7 @@
 
 PORTNAME=	geary
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/multimedia/quodlibet/Makefile
==============================================================================
--- head/multimedia/quodlibet/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/multimedia/quodlibet/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,7 +3,7 @@
 
 PORTNAME=	quodlibet
 PORTVERSION=	3.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia audio python gnome
 MASTER_SITES=	http://bitbucket.org/lazka/${PORTNAME}-files/raw/default/releases/
 

Modified: head/net-im/empathy/Makefile
==============================================================================
--- head/net-im/empathy/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/net-im/empathy/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,6 +3,7 @@
 
 PORTNAME=	empathy
 PORTVERSION=	3.12.14
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 

Modified: head/net/gnome-online-accounts/Makefile
==============================================================================
--- head/net/gnome-online-accounts/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/net/gnome-online-accounts/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-online-accounts
 PORTVERSION=	3.24.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 

Modified: head/net/liferea/Makefile
==============================================================================
--- head/net/liferea/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/net/liferea/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,6 +3,7 @@
 
 PORTNAME=	liferea
 DISTVERSION=	1.12-rc3
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	https://github.com/lwindolf/liferea/releases/download/v${PORTVERSION:S/.r/-rc/}/
 

Modified: head/textproc/libgepub/Makefile
==============================================================================
--- head/textproc/libgepub/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/textproc/libgepub/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libgepub
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	GNOME
 

Modified: head/www/epiphany/Makefile
==============================================================================
--- head/www/epiphany/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/epiphany/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,7 +3,7 @@
 
 PORTNAME=	epiphany
 PORTVERSION=	3.24.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Added: head/www/epiphany/files/patch-src_ephy-window.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/epiphany/files/patch-src_ephy-window.c	Thu Apr  5 20:13:48 2018	(r466598)
@@ -0,0 +1,25 @@
+--- src/ephy-window.c.orig	2018-03-27 15:41:00 UTC
++++ src/ephy-window.c
+@@ -1301,13 +1301,6 @@ webkit_context_menu_item_new_from_gaction_with_paramet
+ #pragma GCC diagnostic pop
+ }
+ 
+-static WebKitContextMenuItem *
+-webkit_context_menu_item_new_from_gaction (GAction    *action,
+-                                           const char *label)
+-{
+-  return webkit_context_menu_item_new_from_gaction_with_parameter (action, label, NULL);
+-}
+-
+ static char *
+ ellipsize_string (const char *string,
+                   glong       max_length)
+@@ -1380,7 +1373,7 @@ add_action_to_context_menu (WebKitContextMenu *context
+   action = g_action_map_lookup_action (G_ACTION_MAP (action_group), name);
+   label = g_hash_table_lookup (window->action_labels, name);
+   if (strcmp (label, "search-selection-placeholder") != 0) {
+-    webkit_context_menu_append (context_menu, webkit_context_menu_item_new_from_gaction (action, _(label)));
++    webkit_context_menu_append (context_menu, webkit_context_menu_item_new_from_gaction_with_parameter (action, _(label), NULL));
+   } else {
+     search_term = g_variant_get_string (target, NULL);
+     search_label = format_search_label (search_term);

Modified: head/www/luakit/Makefile
==============================================================================
--- head/www/luakit/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/luakit/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,6 +3,7 @@
 
 PORTNAME=	luakit
 PORTVERSION=	2017.08.10
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	ports at textmail.me

Modified: head/www/surf/Makefile
==============================================================================
--- head/www/surf/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/surf/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,6 +3,7 @@
 
 PORTNAME=	surf
 DISTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://dl.suckless.org/${PORTNAME}/
 PKGNAMESUFFIX=	-browser

Modified: head/www/webkit2-gtk3/Makefile
==============================================================================
--- head/www/webkit2-gtk3/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkit
-PORTVERSION=	2.16.6
-PORTREVISION=	3
+PORTVERSION=	2.20.0
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
@@ -28,82 +27,78 @@ LIB_DEPENDS=	libenchant.so:textproc/enchant \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libsoup-2.4.so:devel/libsoup \
 		libgcrypt.so:security/libgcrypt \
-		libgnutls.so:security/gnutls
+		libgnutls.so:security/gnutls \
+		libtasn1.so:security/libtasn1 \
+		libwoff2dec.so:devel/woff2
 
 PORTSCOUT=	limitw:1,even
 
-USE_GSTREAMER1=	bad gl
-USE_XORG=	x11 xcomposite xdamage xext xrender xt ice
-USES=		bison cmake compiler:c++14-lang gettext gnome gperf \
-		jpeg perl5 pkgconfig python:2.7,build sqlite tar:xz
-USE_RUBY=	yes
-RUBY_NO_RUN_DEPENDS=yes
+USES=		bison cmake:outsource compiler:c++14-lang gettext gnome gperf \
+		jpeg localbase:ldflags perl5 pkgconfig python:2.7,build \
+		sqlite tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
-USE_GL=		gl egl
-USE_PERL5=	build
+USE_GL=		gl egl glesv2
+USE_GSTREAMER1=	bad gl
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install
+USE_PERL5=	build
+USE_RUBY=	yes
+RUBY_NO_RUN_DEPENDS=	yes
+USE_XORG=	x11 xcomposite xdamage xext xrender xt ice
 
-CMAKE_ARGS+=	-DPORT=GTK \
-		-DENABLE_WAYLAND_TARGET:BOOL=OFF \
-		-DENABLE_MINIBROWSER:BOOL=ON \
-		-DENABLE_GLES2:BOOL=OFF \
-		-DENABLE_ACCELERATED_2D_CANVAS=ON \
-		-DUSE_LD_GOLD:BOOL=OFF \
-		-DENABLE_WEBKIT:BOOL=OFF
-CONFIGURE_ENV+=	XDG_CACHE_HOME=${WRKDIR}
+BINARY_ALIAS=		python=${PYTHON_CMD}
+CXXFLAGS+=		-DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32
+CXXFLAGS_powerpc=	-DENABLE_YARR_JIT=0
+CXXFLAGS_powerpc64=	-DENABLE_YARR_JIT=0 \
+			-mminimal-toc
+CMAKE_ARGS=		-DPORT=GTK
+CMAKE_OFF=		USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U}
+CMAKE_ON=		ENABLE_GLES2 ENABLE_MINIBROWSER
+CMAKE_OFF_armv6=	ENABLE_JIT
+CMAKE_OFF_armv7=	ENABLE_JIT
+CMAKE_OFF_powerpc=	ENABLE_JIT
+CMAKE_OFF_powerpc64=	ENABLE_JIT
+CONFIGURE_ENV=		XDG_CACHE_HOME=${WRKDIR}
+INSTALL_TARGET=		install
 
 BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3
-#_BROWSER_PLUGINS_DIR=	${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
 
-OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	DEBUG GEOIP NPAPI
-OPTIONS_DEFAULT=GEOIP
+OPTIONS_DEFINE=		DEBUG GEOIP NPAPI WAYLAND
+OPTIONS_DEFAULT=	GEOIP
 OPTIONS_DEFAULT_i386=	NPAPI
 OPTIONS_DEFAULT_amd64=	NPAPI
+OPTIONS_SUB=		yes
 
+NPAPI_DESC=		Support gtk2 (NPAPI) based plugins (like flash)
+
+# Building WebKit with debugging symbols requires ar and ld with
+# support for thin archives.  Also see
+# https://bugs.webkit.org/show_bug.cgi?id=140384
 DEBUG_BUILD_DEPENDS=	binutils>=0:devel/binutils
-DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug \
-			-DCMAKE_AR=${LOCALBASE}/bin/ar \
+DEBUG_CMAKE_ON=		-DCMAKE_AR=${LOCALBASE}/bin/ar \
 			-DCMAKE_RANLIB=${LOCALBASE}/bin/ranlib \
 			-DCMAKE_LINKER=${LOCALBASE}/bin/ld
 DEBUG_CXXFLAGS=		-B${LOCALBASE}/bin
 
-DEBUG_CMAKE_OFF=	-DCMAKE_BUILD_TYPE:STRING=Release \
-			-DCMAKE_AR=/usr/bin/ar \
+DEBUG_CMAKE_OFF=	-DCMAKE_AR=/usr/bin/ar \
 			-DCMAKE_RANLIB=/usr/bin/ranlib \
 			-DCMAKE_LINKER=/usr/bin/ld
 DEBUG_CXXFLAGS_OFF=	-B/usr/bin
 DEBUG_CFLAGS_OFF=	-DNDEBUG
 
 GEOIP_CMAKE_BOOL=	ENABLE_GEOLOCATION
-GEOIP_BUILD_DEPENDS+=	geoclue>=2.4.3:net/geoclue
-GEOIP_RUN_DEPENDS+=	geoclue>=2.4.3:net/geoclue
+GEOIP_BUILD_DEPENDS=	geoclue>=2.4.3:net/geoclue
+GEOIP_RUN_DEPENDS=	geoclue>=2.4.3:net/geoclue
 
-NPAPI_DESC=	Support gtk2 (NPAPI) based plugins (like flash)
 NPAPI_CMAKE_BOOL=	ENABLE_PLUGIN_PROCESS_GTK2
-NPAPI_USE=	GNOME=gtk20
+NPAPI_USE=		GNOME=gtk20
 
-.include <bsd.port.options.mk>
+WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
+			libwayland-egl.so:graphics/mesa-libs
 
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-CMAKE_ARGS+=	-DENABLE_JIT:BOOL=OFF
-.endif
-
-.if ${ARCH} == powerpc || ${ARCH} == powerpc64
-CMAKE_ARGS+=	-DENABLE_JIT:BOOL=OFF
-CFLAGS+=	-DENABLE_YARR_JIT=0
-.endif
-
-.if ${ARCH} == powerpc64
-CFLAGS+=	-mminimal-toc
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
-		${WRKSRC}/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp
+	@${REINPLACE_CMD} -e 's|/usr/lib/browser/plugins|${BROWSER_PLUGINS_DIR}|' \
+		${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
 
 pre-configure:
 # .if !exists() evaluates too early before cairo has a chance to be installed
@@ -113,10 +108,13 @@ pre-configure:
 	fi
 
 post-install:
-	@${LN} -sf ../libexec/webkit2gtk-4.0/jsc ${STAGEDIR}${PREFIX}/bin/jsc-4
-	@${LN} -sf ../libexec/webkit2gtk-4.0/MiniBrowser ${STAGEDIR}${PREFIX}/bin/MiniBrowser-4
+	@${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/jsc \
+		${STAGEDIR}${PREFIX}/bin/jsc-4
+	@${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/MiniBrowser \
+		${STAGEDIR}${PREFIX}/bin/MiniBrowser-4
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-4.0/injected-bundle/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver
 
 .include <bsd.port.mk>

Modified: head/www/webkit2-gtk3/distinfo
==============================================================================
--- head/www/webkit2-gtk3/distinfo	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/distinfo	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500907942
-SHA256 (webkitgtk-2.16.6.tar.xz) = fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21
-SIZE (webkitgtk-2.16.6.tar.xz) = 14658120
+TIMESTAMP = 1522145820
+SHA256 (webkitgtk-2.20.0.tar.xz) = 57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c
+SIZE (webkitgtk-2.20.0.tar.xz) = 16617492

Modified: head/www/webkit2-gtk3/files/patch-CMakeLists.txt
==============================================================================
--- head/www/webkit2-gtk3/files/patch-CMakeLists.txt	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/files/patch-CMakeLists.txt	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-05-06 21:35:44.417942000 +0200
-+++ CMakeLists.txt	2017-05-06 21:36:47.317895000 +0200
-@@ -60,9 +60,9 @@
+--- CMakeLists.txt.orig	2018-02-19 07:44:43 UTC
++++ CMakeLists.txt
+@@ -93,9 +93,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
      set(WTF_CPU_X86_64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
      set(WTF_CPU_X86 1)

Modified: head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
==============================================================================
--- head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,6 +1,6 @@
---- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2015-08-06 08:21:27 UTC
+--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2018-03-05 09:28:05 UTC
 +++ Source/JavaScriptCore/assembler/ARM64Assembler.h
-@@ -2862,6 +2862,8 @@ public:
+@@ -2856,6 +2856,8 @@ class ARM64Assembler { (public)
      {
  #if OS(IOS)
          sys_cache_control(kCacheFunctionPrepareForExecution, code, size);

Modified: head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp
==============================================================================
--- head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,10 +1,10 @@
---- Source/WTF/wtf/NumberOfCores.cpp.orig	2017-04-11 20:08:02.949675000 +0200
-+++ Source/WTF/wtf/NumberOfCores.cpp	2017-04-11 20:08:43.723709000 +0200
-@@ -33,6 +33,7 @@
+--- Source/WTF/wtf/NumberOfCores.cpp.orig	2018-02-19 07:45:30 UTC
++++ Source/WTF/wtf/NumberOfCores.cpp
+@@ -35,6 +35,7 @@
  #include <sys/types.h>
  #include <sys/sysctl.h>
- #elif OS(LINUX) || OS(AIX) || OS(SOLARIS) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD)
-+#include <stdio.h> // sscanf()
+ #elif OS(LINUX) || OS(AIX) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD)
++#include <stdio.h> // sscanf
  #include <unistd.h>
  #elif OS(WINDOWS)
  #include <windows.h>

Modified: head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h
==============================================================================
--- head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,6 +1,6 @@
---- Source/WTF/wtf/Platform.h.orig	2016-07-20 UTC
+--- Source/WTF/wtf/Platform.h.orig	2018-02-20 09:12:50 UTC
 +++ Source/WTF/wtf/Platform.h
-@@ -218,6 +218,7 @@
+@@ -182,6 +182,7 @@
  #elif defined(__ARM_ARCH_6__) \
      || defined(__ARM_ARCH_6J__) \
      || defined(__ARM_ARCH_6K__) \
@@ -8,7 +8,7 @@
      || defined(__ARM_ARCH_6Z__) \
      || defined(__ARM_ARCH_6ZK__) \
      || defined(__ARM_ARCH_6T2__) \
-@@ -264,6 +265,7 @@
+@@ -229,6 +230,7 @@
  
  #elif defined(__ARM_ARCH_6J__) \
      || defined(__ARM_ARCH_6K__) \

Modified: head/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake
==============================================================================
--- head/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,10 +1,9 @@
---- Source/WebCore/PAL/pal/PlatformGTK.cmake.orig	2017-04-17 15:36:57.688080000 +0200
-+++ Source/WebCore/PAL/pal/PlatformGTK.cmake	2017-04-17 15:39:47.928689000 +0200
-@@ -1,3 +1,11 @@
- list(APPEND PAL_SOURCES
-     crypto/gcrypt/CryptoDigestGCrypt.cpp
+--- Source/WebCore/PAL/pal/PlatformGTK.cmake.orig	2018-02-19 07:45:31 UTC
++++ Source/WebCore/PAL/pal/PlatformGTK.cmake
+@@ -12,6 +12,13 @@ list(APPEND PAL_SOURCES
+     unix/LoggingUnix.cpp
  )
-+
+ 
 +list(APPEND PAL_INCLUDE_DIRECTORIES
 +    ${LIBGCRYPT_INCLUDE_DIRS}
 +)
@@ -12,3 +11,6 @@
 +    ${LIBGCRYPT_LIBRARIES}
 +)
 +
+ if (ENABLE_SUBTLE_CRYPTO)
+     list(APPEND PAL_SOURCES
+         crypto/tasn1/Utilities.cpp

Modified: head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
==============================================================================
--- head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,4 +1,4 @@
---- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig	2016-04-10 06:48:37 UTC
+--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig	2018-02-19 07:45:32 UTC
 +++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
 @@ -403,7 +403,7 @@ TOSTRING(neonDrawLighting) ":" NL
      "vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL

Added: head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.h	Thu Apr  5 20:13:48 2018	(r466598)
@@ -0,0 +1,15 @@
+--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h.orig	2018-02-19 07:45:32 UTC
++++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
+@@ -144,9 +144,9 @@ inline void FELighting::platformApplyNeon(const Lighti
+             neonData.flags |= FLAG_CONE_EXPONENT_IS_1;
+     } else {
+         ASSERT(m_lightSource->type() == LS_DISTANT);
+-        floatArguments.lightX = paintingData.lightVector.x();
+-        floatArguments.lightY = paintingData.lightVector.y();
+-        floatArguments.lightZ = paintingData.lightVector.z();
++        floatArguments.lightX = paintingData.initialLightingData.lightVector.x();
++        floatArguments.lightY = paintingData.initialLightingData.lightVector.y();
++        floatArguments.lightZ = paintingData.initialLightingData.lightVector.z();
+         floatArguments.padding2 = 1;
+     }
+ 

Modified: head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp
==============================================================================
--- head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,7 +1,7 @@
---- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp.orig	2015-07-10 13:10:10.413595000 +0200
-+++ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp	2015-07-10 13:10:48.159246000 +0200
-@@ -42,6 +42,8 @@
- #endif
+--- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp.orig	2018-02-19 07:45:32 UTC
++++ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
+@@ -44,6 +44,8 @@
+ #include "OpenGLShims.h"
  #endif
  
 +#include <X11/Xlib.h>

Added: head/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake	Thu Apr  5 20:13:48 2018	(r466598)
@@ -0,0 +1,10 @@
+--- Source/WebDriver/PlatformGTK.cmake.orig	2018-02-19 07:45:32 UTC
++++ Source/WebDriver/PlatformGTK.cmake
+@@ -5,6 +5,7 @@ add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIB
+ list(APPEND WebDriver_SYSTEM_INCLUDE_DIRECTORIES
+     "${GLIB_INCLUDE_DIRS}"
+     "${LIBSOUP_INCLUDE_DIRS}"
++    "${ICU_INCLUDE_DIRS}"
+ )
+ 
+ list(APPEND WebDriver_SOURCES

Modified: head/www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h
==============================================================================
--- head/www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,6 +1,6 @@
---- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2014-12-02 14:49:22.000000000 +0100
-+++ Source/JavaScriptCore/assembler/ARMAssembler.h	2014-12-26 10:35:15.394821543 +0100
-@@ -1104,6 +1104,8 @@
+--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2018-02-19 07:45:14 UTC
++++ Source/JavaScriptCore/assembler/ARMAssembler.h
+@@ -1202,6 +1202,8 @@ namespace JSC {
                  linuxPageFlush(current, current + page);
  
              linuxPageFlush(current, end);

Modified: head/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h
==============================================================================
--- head/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,6 +1,6 @@
---- Source/bmalloc/bmalloc/BPlatform.h.orig	2017-05-24 07:01:14 UTC
+--- Source/bmalloc/bmalloc/BPlatform.h.orig	2018-02-19 08:53:21 UTC
 +++ Source/bmalloc/bmalloc/BPlatform.h
-@@ -108,6 +108,7 @@
+@@ -139,6 +139,7 @@
  #elif defined(__ARM_ARCH_6__) \
  || defined(__ARM_ARCH_6J__) \
  || defined(__ARM_ARCH_6K__) \

Modified: head/www/webkit2-gtk3/pkg-plist
==============================================================================
--- head/www/webkit2-gtk3/pkg-plist	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/www/webkit2-gtk3/pkg-plist	Thu Apr  5 20:13:48 2018	(r466598)
@@ -1,4 +1,5 @@
 bin/MiniBrowser-4
+bin/WebKitWebDriver
 bin/jsc-4
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -8,8 +9,10 @@ include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h
 include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
 include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
 include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
+include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h
 include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
 include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
+include/webkitgtk-4.0/webkit2/WebKitAutomationSession.h
 include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
 include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
 include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
@@ -41,6 +44,8 @@ include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDe
 include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h
 include/webkitgtk-4.0/webkit2/WebKitNotification.h
 include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
+include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h
+include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h
 include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitPlugin.h
 include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
@@ -66,6 +71,7 @@ include/webkitgtk-4.0/webkit2/WebKitWebExtensionAutocl
 include/webkitgtk-4.0/webkit2/WebKitWebHitTestResult.h
 include/webkitgtk-4.0/webkit2/WebKitWebInspector.h
 include/webkitgtk-4.0/webkit2/WebKitWebPage.h
+include/webkitgtk-4.0/webkit2/WebKitWebProcessEnumTypes.h
 include/webkitgtk-4.0/webkit2/WebKitWebResource.h
 include/webkitgtk-4.0/webkit2/WebKitWebView.h
 include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h
@@ -84,6 +90,8 @@ include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleDecla
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleSheet.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSValue.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterData.h
+include/webkitgtk-4.0/webkitdom/WebKitDOMClientRect.h
+include/webkitgtk-4.0/webkitdom/WebKitDOMClientRectList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMComment.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCustom.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCustomUnstable.h
@@ -191,19 +199,19 @@ lib/girepository-1.0/WebKit2-4.0.typelib
 lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.5.13
+lib/libjavascriptcoregtk-4.0.so.18.7.8
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.19.9
+lib/libwebkit2gtk-4.0.so.37.28.0
 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 libdata/pkgconfig/javascriptcoregtk-4.0.pc
 libdata/pkgconfig/webkit2gtk-4.0.pc
 libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
 libexec/webkit2gtk-4.0/MiniBrowser
-libexec/webkit2gtk-4.0/WebKitDatabaseProcess
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
 libexec/webkit2gtk-4.0/WebKitPluginProcess
 %%NPAPI%%libexec/webkit2gtk-4.0/WebKitPluginProcess2
+libexec/webkit2gtk-4.0/WebKitStorageProcess
 libexec/webkit2gtk-4.0/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
 share/gir-1.0/JavaScriptCore-4.0.gir

Modified: head/x11-fm/sushi/Makefile
==============================================================================
--- head/x11-fm/sushi/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/x11-fm/sushi/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sushi
 PORTVERSION=	3.18.0
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/x11/yelp/Makefile
==============================================================================
--- head/x11/yelp/Makefile	Thu Apr  5 20:13:33 2018	(r466597)
+++ head/x11/yelp/Makefile	Thu Apr  5 20:13:48 2018	(r466598)
@@ -3,6 +3,7 @@
 
 PORTNAME=	yelp
 PORTVERSION=	3.22.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
