Index: head/www/webkit2-gtk3/Makefile
===================================================================
--- head/www/webkit2-gtk3/Makefile	(revision 394758)
+++ head/www/webkit2-gtk3/Makefile	(revision 394759)
@@ -1,105 +1,85 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	webkit
 PORTVERSION=	2.8.5
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
 DISTNAME=	${PORTNAME}gtk-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Opensource browser engine using the GTK+ 3 toolkit
 
 BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
 LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libwebp.so:${PORTSDIR}/graphics/webp \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libsecret-1.so:${PORTSDIR}/security/libsecret \
 		libicutu.so:${PORTSDIR}/devel/icu \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue 
 
 PORTSCOUT=	limitw:1,even
 
 USE_GSTREAMER1=	yes
 USE_XORG=	x11 xext ice
-# when it USES=cmake safe
-USES=		bison compiler:c++11-lib gettext gmake gperf jpeg perl5 \
+USES=		bison cmake compiler:c++11-lib gettext gmake gperf jpeg perl5 \
 		pkgconfig python:2 tar:xz
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=yes
 USE_GNOME=	cairo gtk20 gtk30 introspection:build libxml2 libxslt
 USE_GL=		gl egl
 USE_SQLITE=	3
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
-#USES=cmake is not used because it triggers:
-#Linking CXX executable ../../../bin/jsc
-#../../../lib/libjavascriptcoregtk-4.0.so.18.0.8: undefined reference to `JSC::JSCell::inherits(JSC::ClassInfo const*) const'
-#../../../lib/libjavascriptcoregtk-4.0.so.18.0.8: undefined reference to `JSC::JSCell::structure() const'
-#c++: error: linker command failed with exit code 1 (use -v to see invocation)
-#Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/build.make:94: recipe for target 'bin/jsc' failed
-# there is something in CONFIGURE_ENV that cause this ... but what.
+CMAKE_ARGS+=	-DPORT=GTK \
+		-DUSE_LD_GOLD:BOOL=0
+CONFIGURE_ENV+=	XDG_CACHE_HOME=${WRKDIR}
 
-CMAKE_ARGS+=	-DPORT=GTK
-CONFIGURE_ENV+=	XDG_CACHE_HOME=${WRKDIR} \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="${CC}" CXX="${CXX}" CPP="${CPP}"
-
-#CMAKE_ARGS+=	-GNinja -DUSE_LD_GOLD:BOOL=0
-#CMAKE_ARGS+=	-DCMAKE_VERBOSE_MAKEFILE=1
-#MAKE_ARGS+=	V=1 VERBOSE=1
-
 BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3
 #_BROWSER_PLUGINS_DIR=	${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
 
 OPTIONS_DEFINE=	DEBUG FULLDEBUG
 DEBUG_DESC=	Just enable debug symbols
 FULLDEBUG_DESC=	Enable asserts and other debug support
 
 FULLDEBUG_CONFIGURE_ENABLE=	debug
 DEBUG_CMAKE_OFF=	-DCMAKE_BUILD_TYPE=Release
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 CFLAGS+=	-mminimal-toc
 .endif
 
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	flex>=0:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV+=	FLEX_PATH="${LOCALBASE}/bin/flex"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
 		${WRKSRC}/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
 
 pre-configure:
 .if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-egl.pc)
 	@${ECHO_CMD} "${PKGNAME}: Needs cairo with OPENGL support enabled."
 	@${FALSE}
 .endif
-
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" \
-		${CONFIGURE_ENV} cmake -DPORT=GTK ${CMAKE_ARGS}
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/jsc \
 		${STAGEDIR}/${PREFIX}/bin/jsc-4
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-4.0/injected-bundle/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jsc-4
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/WebKit*
 
 .include <bsd.port.mk>
Index: head/www/webkit2-gtk3/files/patch-bug147816
===================================================================
--- head/www/webkit2-gtk3/files/patch-bug147816	(nonexistent)
+++ head/www/webkit2-gtk3/files/patch-bug147816	(revision 394759)
@@ -0,0 +1,32 @@
+https://bugs.webkit.org/show_bug.cgi?id=147816
+
+--- Source/JavaScriptCore/llint/LLIntEntrypoint.cpp	
++++ Source/JavaScriptCore/llint/LLIntEntrypoint.cpp	
+@@ -28,6 +28,7 @@ 
+ #include "CodeBlock.h"
+ #include "HeapInlines.h"
+ #include "JITCode.h"
++#include "JSCellInlines.h"
+ #include "JSObject.h"
+ #include "LLIntThunks.h"
+ #include "LowLevelInterpreter.h"
+--- Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp	
++++ Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp	
+@@ -25,6 +25,7 @@ 
+ 
+ #include "config.h"
+ #include "FunctionExecutableDump.h"
++#include "JSCellInlines.h"
+ 
+ #include "CodeBlock.h"
+ 
+--- Source/WebCore/editing/InsertNodeBeforeCommand.cpp.orig	2015-08-06 10:21:28.000000000 +0200
++++ Source/WebCore/editing/InsertNodeBeforeCommand.cpp	2015-08-18 16:48:41.950995000 +0200
+@@ -29,6 +29,7 @@
+ #include "AXObjectCache.h"
+ #include "Document.h"
+ #include "ExceptionCodePlaceholder.h"
++#include "RenderElement.h"
+ #include "htmlediting.h"
+ 
+ namespace WebCore {

Property changes on: head/www/webkit2-gtk3/files/patch-bug147816
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property