webkit-gtk: update to 2.20.1.

WebKitGTK+ 2.20.1 released!

    Improve error message when Gigacage cannot allocate virtual memory.
    Add missing WebKitWebProcessEnumTypes.h to webkit-web-extension.h.
    Improve web process memory monitor thresholds.
    Fix a web process crash when the web view is created and destroyed quickly.
    Fix a network process crash when load is cancelled while searching for stored HTTP auth credentials.
    Fix the build when ENABLE_VIDEO, ENABLE_WEB_AUDIO and ENABLE_XSLT are disabled.
    Fix several crashes and rendering issues.
    Translation updates: Brazilian Portuguese, Czech.

WebKitGTK+ 2.20.0 released!

    New API to retrieve and delete cookies with WebKitCookieManager.
    New web process API to detect when form is submitted via JavaScript.
    Several improvements and fixes in the touch/gestures support.
    Support for the “system” CSS font family.
    Complex text rendering improvements and fixes.
    Added a low power mode.
    More complete and spec compliant WebDriver implementation.

10 files changed, 124 insertions, 219 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 9c0d5362caa..20c37f61762 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.135 2018/04/17 22:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2018/04/28 19:10:13 wiz Exp $
 
-DISTNAME=	webkitgtk-2.18.6
+DISTNAME=	webkitgtk-2.20.1
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -29,8 +28,8 @@ GCC_REQD+=	5.0
 CMAKE_ARGS+=	-DUSE_LD_GOLD=OFF
 
 PKGCONFIG_OVERRIDE+=	Source/JavaScriptCore/javascriptcoregtk.pc.in
-PKGCONFIG_OVERRIDE+=	Source/WebKit2/webkit2gtk.pc.in
-PKGCONFIG_OVERRIDE+=	Source/WebKit2/webkit2gtk-web-extension.pc.in
+PKGCONFIG_OVERIDE+=	Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
+PKGCONFIG_OVERIDE+=	Source/WebKit/gtk/webkit2gtk.pc.in
 
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=		-DPORT=GTK
@@ -41,16 +40,107 @@ CMAKE_ARGS+=		-DUSE_GSTREAMER_GL=OFF
 CMAKE_ARGS+=		-DUSE_LIBHYPHEN=OFF
 #CMAKE_ARGS+=		-DUSE_SYSTEM_MALLOC=ON # XXX: needs adjustements for sysinfo() stuffs in Source/WTF/wtf/RAMSize.cpp
 
-REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table \
-		Source/WebCore/bindings/scripts/*.pl \
-		Source/WebCore/bindings/scripts/InFilesCompiler.pm \
-		Source/WebCore/bindings/scripts/InFilesParser.pm \
-		Source/WebCore/css/*.pl \
-		Source/WebCore/dom/*.pl \
-		Source/WebCore/make-hash-tools.pl
-
-REPLACE_PYTHON+=	Tools/gtk/*.py \
-			Tools/gtk/generate-gtkdoc
+REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table
+REPLACE_PERL+=	Source/WebCore/bindings/scripts/*.pl
+REPLACE_PERL+=	Source/WebCore/bindings/scripts/InFilesCompiler.pm
+REPLACE_PERL+=	Source/WebCore/bindings/scripts/InFilesParser.pm
+REPLACE_PERL+=	Source/WebCore/css/*.pl
+REPLACE_PERL+=	Source/WebCore/dom/*.pl
+REPLACE_PERL+=	Source/WebCore/make-hash-tools.pl
+
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/UpdateContents.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_generator.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_model.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/builtins/builtins_templates.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/cssmin.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/generate-combined-inspector-json.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/generate-js-builtins.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/generateYarrUnicodePropertyTables.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/hasher.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/inline-and-minify-stylesheets-and-scripts.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/lazywriter.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/Scripts/make-js-file-arrays.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/generate-bytecode-files
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_js_backend_commands.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generator.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/models.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/wasm/generateWasm.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/wasm/generateWasmB3IRGeneratorInlinesHeader.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/wasm/generateWasmOpsHeader.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/wasm/generateWasmValidateInlinesHeader.py
+REPLACE_PYTHON+=	Source/JavaScriptCore/yarr/create_regex_tables
+REPLACE_PYTHON+=	Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/run_tests.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/scripts/fuse_gtest_files.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/scripts/gen_gtest_pred_impl.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/scripts/pump.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/scripts/upload.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/scripts/upload_gtest.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_break_on_failure_unittest.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_color_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_env_var_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_filter_unittest.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_help_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_list_tests_unittest.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_nc_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_output_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_shuffle_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_test_utils.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_throw_on_failure_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_uninitialized_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_xml_outfiles_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_xml_output_unittest.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/gtest_xml_test_utils.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/test/run_tests_util_test.py
+REPLACE_PYTHON+=	Source/ThirdParty/gtest/xcode/Scripts/versiongenerate.py
+REPLACE_PYTHON+=	Source/WebCore/PAL/AVFoundationSupport.py
+REPLACE_PYTHON+=	Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py
+REPLACE_PYTHON+=	Source/WebCore/css/makeSelectorPseudoElementsMap.py
+REPLACE_PYTHON+=	Source/WebCore/html/parser/create-html-entity-table
+REPLACE_PYTHON+=	Source/WebCore/platform/network/create-http-header-name-table
+REPLACE_PYTHON+=	Source/WebKit/Scripts/generate-message-receiver.py
+REPLACE_PYTHON+=	Source/WebKit/Scripts/generate-messages-header.py
+REPLACE_PYTHON+=	Tools/glib/common.py
+REPLACE_PYTHON+=	Tools/glib/generate-inspector-gresource-manifest.py
+REPLACE_PYTHON+=	Tools/gtk/*.py
+REPLACE_PYTHON+=	Tools/gtk/generate-gtkdoc
+
+SUBST_CLASSES+=		python
+SUBST_FILES.python+=	Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
+SUBST_SED.python+=	-e 's,\(.\)python.;,\1${PYTHONBIN}\1;,'
+SUBST_STAGE.python=	pre-configure
+SUBST_MESSAGE.python=	Fixing path to python binary.
 
 .include "../../lang/ruby/rubyversion.mk"
 BUILD_DEPENDS+=	${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
@@ -78,6 +168,7 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 .include "../../devel/flex/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../fonts/woff2/buildlink3.mk"
 .include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index ec6141207c9..ecb8f4646d1 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2018/04/09 08:33:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.37 2018/04/28 19:10:13 wiz Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -70,6 +70,7 @@ include/webkitgtk-4.0/webkit2/WebKitWebExtensionAutocleanups.h
 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
@@ -197,10 +198,10 @@ ${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
 ${PLIST.introspection}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.6.15
+lib/libjavascriptcoregtk-4.0.so.18.7.9
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.24.9
+lib/libwebkit2gtk-4.0.so.37.28.1
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 00e671dfc68..b6814662530 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,23 +1,17 @@
-$NetBSD: distinfo,v 1.96 2018/04/09 08:33:48 wiz Exp $
+$NetBSD: distinfo,v 1.97 2018/04/28 19:10:13 wiz Exp $
 
-SHA1 (webkitgtk-2.18.6.tar.xz) = fb0daa85142cfe8822de518dfaa7bd5c3cdd6c23
-RMD160 (webkitgtk-2.18.6.tar.xz) = 20a786dee806313e7ff692178160eb0ae40ccf24
-SHA512 (webkitgtk-2.18.6.tar.xz) = 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
-Size (webkitgtk-2.18.6.tar.xz) = 14829316 bytes
-SHA1 (patch-CMakeLists.txt) = 0ecf9070dc387b206b8c8083914c1fa0514a8ecc
-SHA1 (patch-Source_JavaScriptCore_CMakeLists.txt) = 1b3485f72d809b2a1d6ec047b36331a6489fd10d
+SHA1 (webkitgtk-2.20.1.tar.xz) = 317a427a70666ad36ba7f69e3d01ab3edd313a9f
+RMD160 (webkitgtk-2.20.1.tar.xz) = d97d7434c4829c9f4825295538e2fcc793d275d3
+SHA512 (webkitgtk-2.20.1.tar.xz) = 39c174bc56e8f13b4a91f7cac4ea2ecad1c3200a81d46766b99f5e76e07e1ab2fa03facbea4453b4071a27ac0d487e11e83d8a9467bd5cc8b2a4cc7c917e9511
+Size (webkitgtk-2.20.1.tar.xz) = 16619312 bytes
+SHA1 (patch-CMakeLists.txt) = 684aad9e5bcc25b1afc128a1b5df00f34f1208e9
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
 SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 2f20d6aa8f1ec4122bee9f2f95b736ee4496812f
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
-SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 01195978abe07154fbc28de9efc47b3f3105fd89
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 3253f20593d5a92869da74774609a57eb289148b
 SHA1 (patch-Source_WTF_wtf_ThreadSpecific.h) = 38a85e10a72fe38d286a2ce747e090a2955b8791
-SHA1 (patch-Source_WTF_wtf_dtoa_utils.h) = 192bb016ef584f26967de94d29ee5e43db6fb1f0
 SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807e2d2039684a0ec
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
-SHA1 (patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 99192d0551e18f3373324d5be8bbeab00a2f79e8
 SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 9c58253868e06b3dd3cac936651ba7e6a1437fc6
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
-SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 8eb8e9c2c9aeaed86cd95c61c86e0f3786385ac9
 SHA1 (patch-aj) = cd9a280c3bbab82c1a7aeb62a27ee6eb96c67ec2
diff --git a/www/webkit-gtk/patches/patch-CMakeLists.txt b/www/webkit-gtk/patches/patch-CMakeLists.txt
index 859009e8ea1..903af757034 100644
--- a/www/webkit-gtk/patches/patch-CMakeLists.txt
+++ b/www/webkit-gtk/patches/patch-CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2018/04/09 08:33:48 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2018/04/28 19:10:13 wiz Exp $
 
 - Fix support for arm
 - Fix support for ppc and add support for sparc64.
   From FreeBSD and OpenBSD ports.
 
---- CMakeLists.txt.orig	2017-10-17 10:07:00.000000000 +0000
+--- CMakeLists.txt.orig	2018-02-19 07:44:43.000000000 +0000
 +++ CMakeLists.txt
-@@ -78,6 +78,8 @@ else ()
+@@ -85,6 +85,8 @@ else ()
  endif ()
  if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
      set(WTF_CPU_ARM 1)
@@ -14,8 +14,8 @@ $NetBSD: patch-CMakeLists.txt,v 1.3 2018/04/09 08:33:48 wiz Exp $
 +    set(WTF_CPU_ARM 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
      set(WTF_CPU_ARM64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha*")
-@@ -90,7 +92,7 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+@@ -93,11 +95,13 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
      set(WTF_CPU_X86_64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
      set(WTF_CPU_X86 1)
@@ -24,12 +24,9 @@ $NetBSD: patch-CMakeLists.txt,v 1.3 2018/04/09 08:33:48 wiz Exp $
      set(WTF_CPU_PPC 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
      set(WTF_CPU_PPC64 1)
-@@ -102,6 +104,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
-     set(WTF_CPU_S390 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
-     set(WTF_CPU_S390X 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
 +elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
 +    set(WTF_CPU_SPARC64 1)
+     set(WTF_CPU_PPC64LE 1)
  else ()
-     message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'")
- endif ()
+     set(WTF_CPU_UNKNOWN 1)
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt
deleted file mode 100644
index 618f1bc1ade..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_CMakeLists.txt,v 1.1 2018/04/09 08:33:48 wiz Exp $
-
-Add support for sparc64.
-
-From OpenBSD ports.
-
---- Source/JavaScriptCore/CMakeLists.txt.orig	Tue Feb 28 09:34:11 2017
-+++ Source/JavaScriptCore/CMakeLists.txt	Sun Mar 26 13:55:13 2017
-@@ -1481,6 +1481,7 @@ elseif (WTF_CPU_PPC64)
- elseif (WTF_CPU_PPC64LE)
- elseif (WTF_CPU_S390)
- elseif (WTF_CPU_S390X)
-+elseif (WTF_CPU_SPARC64)
- elseif (WTF_CPU_MIPS)
- elseif (WTF_CPU_SH4)
- elseif (WTF_CPU_X86)
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
deleted file mode 100644
index f87b70e1272..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.6 2016/01/21 13:42:33 leot Exp $
-
-Avoid broken section for SunOS/gcc.
-
---- Source/WTF/wtf/MathExtras.h.orig	2016-01-20 12:13:00.000000000 +0000
-+++ Source/WTF/wtf/MathExtras.h
-@@ -75,7 +75,7 @@ const double sqrtOfTwoDouble = M_SQRT2;
- const float sqrtOfTwoFloat = static_cast<float>(M_SQRT2);
- #endif
- 
--#if OS(SOLARIS)
-+#if OS(notSOLARIS)
- 
- namespace std {
- 
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
deleted file mode 100644
index d7d5707dcb0..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.9 2018/04/09 08:33:48 wiz Exp $
-
-Add support for sparc64:
-
- <https://bugs.webkit.org/show_bug.cgi?id=129963>
-
-From OpenBSD ports.
-
---- Source/WTF/wtf/Platform.h.orig	2017-10-16 12:18:56.000000000 +0000
-+++ Source/WTF/wtf/Platform.h
-@@ -155,6 +155,12 @@
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
- 
-+/* CPU(SPARC64) - SPARC V9 */
-+#if defined(__sparc64__)
-+#define WTF_CPU_SPARC64 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+
- /* CPU(X86) - i386 / x86 32-bit */
- #if   defined(__i386__) \
-     || defined(i386)     \
-@@ -353,7 +359,7 @@
- 
- #endif /* ARM */
- 
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA)
-+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) || CPU(SPARC64)
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
- 
-@@ -713,7 +719,8 @@
-     || CPU(S390X) \
-     || CPU(MIPS64) \
-     || CPU(PPC64) \
--    || CPU(PPC64LE)
-+    || CPU(PPC64LE) \
-+    || CPU(SPARC64)
- #define USE_JSVALUE64 1
- #else
- #define USE_JSVALUE32_64 1
-@@ -770,7 +777,7 @@
- 
- #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
- /* Enable the DFG JIT on X86 and X86_64. */
--#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(WINDOWS) || OS(HURD))
-+#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || OS(WINDOWS) || OS(HURD))
- #define ENABLE_DFG_JIT 1
- #endif
- /* Enable the DFG JIT on ARMv7.  Only tested on iOS and Qt/GTK+ Linux. */
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h
deleted file mode 100644
index a79469f3446..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_dtoa_utils.h,v 1.1 2018/04/09 08:33:48 wiz Exp $
-
-Add support for sparc64.
-
-From OpenBSD ports.
-
---- Source/WTF/wtf/dtoa/utils.h.orig	Wed Mar  4 15:25:16 2015
-+++ Source/WTF/wtf/dtoa/utils.h	Fri Mar 27 10:18:18 2015
-@@ -49,7 +49,7 @@
- defined(__ARMEL__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
--#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
-+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(SPARC64)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
- #if defined(_WIN32)
diff --git a/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp b/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp
deleted file mode 100644
index d3b93fc4a9f..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v 1.2 2018/04/09 08:33:48 wiz Exp $
-
-SunOS does not support dirent d_type.
-
---- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig	2017-02-20 16:20:17.000000000 +0000
-+++ Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp
-@@ -52,6 +52,12 @@ namespace NetworkCache {
- 
- static DirectoryEntryType directoryEntryType(uint8_t dtype)
- {
-+#ifndef DT_DIR
-+#define DT_DIR	S_IFDIR
-+#endif
-+#ifndef DT_REG
-+#define DT_REG	S_IFREG
-+#endif
-     switch (dtype) {
-     case DT_DIR:
-         return DirectoryEntryType::Directory;
-@@ -65,12 +71,20 @@ static DirectoryEntryType directoryEntry
- 
- void traverseDirectory(const String& path, const Function<void (const String&, DirectoryEntryType)>& function)
- {
-+#ifdef __sun
-+    struct stat s;
-+#endif
-     DIR* dir = opendir(WebCore::fileSystemRepresentation(path).data());
-     if (!dir)
-         return;
-     dirent* dp;
-     while ((dp = readdir(dir))) {
-+#ifdef __sun
-+        stat(dp->d_name, &s);
-+        if (s.st_mode != S_IFDIR && s.st_mode != S_IFREG)
-+#else
-         if (dp->d_type != DT_DIR && dp->d_type != DT_REG)
-+#endif
-             continue;
-         const char* name = dp->d_name;
-         if (!strcmp(name, ".") || !strcmp(name, ".."))
-@@ -78,7 +92,11 @@ void traverseDirectory(const String& pat
-         auto nameString = String::fromUTF8(name);
-         if (nameString.isNull())
-             continue;
-+#ifdef __sun
-+        function(nameString, directoryEntryType(s.st_mode));
-+#else
-         function(nameString, directoryEntryType(dp->d_type));
-+#endif
-     }
-     closedir(dir);
- }
diff --git a/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake b/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
deleted file mode 100644
index d31d05a40ff..00000000000
--- a/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.13 2018/04/09 08:33:48 wiz Exp $
-
-o Do not conflict with CMAKE_MODULE_PATH during the linking phase of
-  libwebkit2gtk-4.0.so:
-
-   Linking CXX shared library ../../lib/libwebkit2gtk-4.0.so
-   ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: ignoring invalid character `3' in script
-   [...]
-   ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: syntax error in VERSION script
-   Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed
-   [...]
-
-o Do not use --version-script on SunOS
-
---- Source/cmake/OptionsGTK.cmake.orig	2017-10-27 09:31:34.000000000 +0000
-+++ Source/cmake/OptionsGTK.cmake
-@@ -108,8 +108,8 @@ if (DEVELOPER_MODE)
- else ()
-     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF)
-     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
--    if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
--        set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
-+    if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
-+        set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/cmake/gtksymbols.filter")
-     endif ()
- endif ()
-