svn commit: r440549 - head/www/webkit2-gtk3

[Koop Mast]

Author: kwm
Date: Wed May 10 09:04:54 2017
New Revision: 440549
URL: https://svnweb.freebsd.org/changeset/ports/440549

Log:
  Update webkit2-gtk3 to 2.14.7.
  
   * Add option for NPAPI support (flash etc). Only enable it on i386
     and amd64 by default.

Modified:
  head/www/webkit2-gtk3/Makefile
  head/www/webkit2-gtk3/distinfo
  head/www/webkit2-gtk3/pkg-plist

Modified: head/www/webkit2-gtk3/Makefile
==============================================================================
--- head/www/webkit2-gtk3/Makefile	Wed May 10 09:00:26 2017	(r440548)
+++ head/www/webkit2-gtk3/Makefile	Wed May 10 09:04:54 2017	(r440549)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkit
-PORTVERSION=	2.14.6
+PORTVERSION=	2.14.7
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
@@ -37,7 +37,7 @@ USES=		bison cmake compiler:c++14-lang g
 		jpeg perl5 pkgconfig python:2.7,build sqlite tar:xz
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=yes
-USE_GNOME=	cairo gdkpixbuf2 gtk20 gtk30 introspection:build libxml2 libxslt
+USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
 USE_GL=		gl egl
 USE_PERL5=	build
 USE_LDCONFIG=	yes
@@ -57,8 +57,11 @@ CONFIGURE_ENV+=	XDG_CACHE_HOME=${WRKDIR}
 BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3
 #_BROWSER_PLUGINS_DIR=	${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
 
-OPTIONS_DEFINE=	DEBUG GEOIP
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	DEBUG GEOIP NPAPI
 OPTIONS_DEFAULT=GEOIP
+OPTIONS_DEFAULT_i386=	NPAPI
+OPTIONS_DEFAULT_amd64=	NPAPI
 
 DEBUG_BUILD_DEPENDS=	binutils>=0:devel/binutils
 DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug \
@@ -73,6 +76,10 @@ GEOIP_CMAKE_BOOL=	ENABLE_GEOLOCATION
 GEOIP_BUILD_DEPENDS+=	geoclue>=0:net/geoclue
 GEOIP_RUN_DEPENDS+=	geoclue>=0:net/geoclue
 
+NPAPI_DESC=	Support gtk2 (NPAPI) based plugins (like flash)
+NPAPI_CMAKE_BOOL=	ENABLE_PLUGIN_PROCESS_GTK2
+NPAPI_USE=	GNOME=gtk20
+
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == armv6

Modified: head/www/webkit2-gtk3/distinfo
==============================================================================
--- head/www/webkit2-gtk3/distinfo	Wed May 10 09:00:26 2017	(r440548)
+++ head/www/webkit2-gtk3/distinfo	Wed May 10 09:04:54 2017	(r440549)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492716019
-SHA256 (webkitgtk-2.14.6.tar.xz) = a54c91e34fe1ade4d77524a1148fcb3d22b129a0b0e3f5ddc72dc46390241b31
-SIZE (webkitgtk-2.14.6.tar.xz) = 13961468
+TIMESTAMP = 1494353634
+SHA256 (webkitgtk-2.14.7.tar.xz) = 87bcfb96ac2b14df6e764c40c9d74ae3e8409f9cecb242ebe1dbb41c181c0b6d
+SIZE (webkitgtk-2.14.7.tar.xz) = 13962448

Modified: head/www/webkit2-gtk3/pkg-plist
==============================================================================
--- head/www/webkit2-gtk3/pkg-plist	Wed May 10 09:00:26 2017	(r440548)
+++ head/www/webkit2-gtk3/pkg-plist	Wed May 10 09:04:54 2017	(r440549)
@@ -284,10 +284,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.4.13
+lib/libjavascriptcoregtk-4.0.so.18.4.14
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.14.13
+lib/libwebkit2gtk-4.0.so.37.14.14
 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 libdata/pkgconfig/javascriptcoregtk-4.0.pc
 libdata/pkgconfig/webkit2gtk-4.0.pc
@@ -296,7 +296,7 @@ libexec/webkit2gtk-4.0/MiniBrowser
 libexec/webkit2gtk-4.0/WebKitDatabaseProcess
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
 libexec/webkit2gtk-4.0/WebKitPluginProcess
-libexec/webkit2gtk-4.0/WebKitPluginProcess2
+%%NPAPI%%libexec/webkit2gtk-4.0/WebKitPluginProcess2
 libexec/webkit2gtk-4.0/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
 share/gir-1.0/JavaScriptCore-4.0.gir