Update to 2.8.4, from Leonardo Taccari via wip.

pkgsrc changes:
 o Convert the osabi dependency to NOT_FOR_PLATFORM.
 o Add LICENSE information (like www/webkit24-gtk)

Changes:
WebKitGTK+  2.8.4
=================
  - Make WebSQL work by using a default quota instead of always failing in openDatabase with
    DOM Exception 18.
  - Improve detection and usage of GL/GLES/EGL libraries.
  - Fix a crash on memory allocation using bmalloc on 32bit systems.
  - Fix DOCUMENT_VIEWER cache model to actually disable the memory cache.
  - Fix a WebProcess crash after too many redirect error when there's an active NPAPI plugin.
  - Fix a WebProcess crash when gtk-font-name setting is empty.
  - Ensure Math.abs() doesn't return negative.
  - Correctly restore accelerated compositing after a WebProcess crash.
  - Respect X-Frame-Options headers when loading from application cache.
  - Several crashes and rendering issues fixed.
  - Fix the MIPS N64 detection.
  - Fix several memory leaks.
  - Translation updates: Catalan.

WebKitGTK+  2.8.3
=================
  - Fixed a regression introduced in 2.8.2 that broke downloads when using the network
    process.
  - Fix the build with Netscape plugins disabled.
  - Fix XPixamps leaked by GLContext when using EGL on X11.

WebKitGTK+  2.8.2
=================
  - Fix network redirection to a non HTTP destination.
  - Use a webkit subdirectory for the disk cache to avoid conflicts with other
    files in the cache directory when the disk cache is cleaned up.
  - Do not preserve the Origin header on on cross-origin redirects.
  - Prevent WorkQueue objects from being leaked and ensure its worker thread
    always exits.

4 files changed, 25 insertions, 17 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 85792cd6240..50ba63f5c6f 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2015/07/12 00:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2015/07/12 21:50:12 wiz Exp $
 
 .include "Makefile.common"
 
@@ -9,9 +9,7 @@ COMMENT=	GTK port of the WebKit browser engine
 BUILD_DEPENDS+=	gettext-tools>=0.18:../../devel/gettext-tools
 
 # shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
-.if !empty(MACHINE_PLATFORM:MNetBSD-*)
-DEPENDS+=       osabi-NetBSD>=7.0:../../pkgtools/osabi
-.endif
+NOT_FOR_PLATFORM=	NetBSD-[1-6]*-*
 
 #introspection support
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.24.17nb3
diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common
index e12b9314015..8b16c593f36 100644
--- a/www/webkit-gtk/Makefile.common
+++ b/www/webkit-gtk/Makefile.common
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile.common,v 1.46 2015/07/12 00:44:46 wiz Exp $
-# used by wip/webkit-gtk/Makefile
+# $NetBSD: Makefile.common,v 1.47 2015/07/12 21:50:12 wiz Exp $
+# used by www/webkit-gtk/Makefile
 
-DISTNAME=	webkitgtk-2.8.1
+DISTNAME=	webkitgtk-2.8.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.webkitgtk.org/releases/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.webkitgtk.org/
+LICENSE=	2-clause-bsd AND gnu-lgpl-v2
 
 DISTINFO_FILE=		${.CURDIR}/../../www/webkit-gtk/distinfo
 PATCHDIR=		${.CURDIR}/../../www/webkit-gtk/patches
@@ -55,10 +56,18 @@ CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHONBIN}
 # XXX: Turning -O options with gcc-4.8.4 does not work on NetBSD. Disable
 # optimization, according to the gcc(1) manual page:
 #
-#  «If you use multiple -O options, with or without level numbers, the
-#   last such option is the one that is effective.»
+#  If you use multiple -O options, with or without level numbers, the
+#  last such option is the one that is effective.
 #
-# ...this XXX abuse this feature.
+# Fixes build problem on NetBSD of this type:
+# Linking CXX shared library ../../lib/libjavascriptcoregtk-4.0.so
+# CMakeFiles/JavaScriptCore.dir/runtime/FunctionExecutableDump.cpp.o: In function `JSC::FunctionExecutableDump::dump(WTF::PrintStream&) const':
+# FunctionExecutableDump.cpp:(.text+0x61): undefined reference to `JSC::JSCell::inherits(JSC::ClassInfo const*) const'
+# CMakeFiles/JavaScriptCore.dir/llint/LLIntEntrypoint.cpp.o: In function `JSC::LLInt::setEntrypoint(JSC::VM&, JSC::CodeBlock*)':
+# LLIntEntrypoint.cpp:(.text+0x9d): undefined reference to `JSC::JSCell::inherits(JSC::ClassInfo const*) const'
+# Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/build.make:13652: recipe for target 'lib/libjavascriptcoregtk-4.0.so.18.1.11' failed
+#
+# last checked for 2.8.4.
 CFLAGS+=	-O0
 
 CXXFLAGS.SunOS+=	-fpermissive
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index 0f3671aa000..68c3fc404c0 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2015/07/12 00:44:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2015/07/12 21:50:12 wiz Exp $
 bin/MiniBrowser
 bin/jsc
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
@@ -274,10 +274,10 @@ 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.1.8
+lib/libjavascriptcoregtk-4.0.so.18.1.11
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.6.4
+lib/libwebkit2gtk-4.0.so.37.6.7
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
@@ -292,6 +292,7 @@ share/gir-1.0/WebKit2WebExtension-4.0.gir
 share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo
+share/locale/ca/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/cs/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/de/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/el/LC_MESSAGES/WebKit2GTK-4.0.mo
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 751ffaf298f..906e13ff72f 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.76 2015/07/12 00:44:46 wiz Exp $
+$NetBSD: distinfo,v 1.77 2015/07/12 21:50:12 wiz Exp $
 
-SHA1 (webkitgtk-2.8.1.tar.xz) = 56dc2d15e86829d0854ddf29cd841ee83fce30a2
-RMD160 (webkitgtk-2.8.1.tar.xz) = c8ec5815fda1948b38538101e333d64d9cbb8ea0
-Size (webkitgtk-2.8.1.tar.xz) = 10435512 bytes
+SHA1 (webkitgtk-2.8.4.tar.xz) = 127ee45bab6bbd9da1a9f63ec070d8cc06b40652
+RMD160 (webkitgtk-2.8.4.tar.xz) = 4ad3b443a44275cac65d812ef3e53a355847f890
+Size (webkitgtk-2.8.4.tar.xz) = 10446180 bytes
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1f4a4be3593f9aa9ae6b41a2be8ae9d8bb27dcbb
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 2b7e69b8e6aff9bd5f65190f8eb1afdbb993857f
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092