Update to 2.0.3.

This will need clang and libc++ from ports (not yet committed) to work
on 9.1-stable and 9.x. This will not work on 9.1-R due to missing
libc function that libc++ needs.

Don't commit the -gtk2 port yet because that would impose the same limitations.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18618 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 76 insertions, 16 deletions

diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 187c5b235..9136f9212 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,32 +3,40 @@
 #   $MCom$
 
 PORTNAME=	webkit
-PORTVERSION=	1.8.3
+PORTVERSION=	2.0.3
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk3
+DISTNAME=	${PORTNAME}gtk-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An opensource browser engine
+COMMENT=	Opensource browser engine using the GTK+ 3 toolkit
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc
 LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
+		secret-1:${PORTSDIR}/security/libsecret \
 		icutu:${PORTSDIR}/devel/icu \
+		harfbuzz:${PORTSDIR}/print/harfbuzz \
+		webp:${PORTSDIR}/graphics/webp \
 		curl:${PORTSDIR}/ftp/curl \
 		soup-2.4:${PORTSDIR}/devel/libsoup
 
+LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
+
 USE_XZ=		yes
-USE_GSTREAMER=	yes
+USE_GSTREAMER1=	yes
 MAKE_JOBS_SAFE=	yes
-USE_XORG=	xt
-USES=		bison gettext pkgconfig
+USE_XORG=	xt xdamage xcomposite
+USES=		bison gettext pkgconfig shebangfix
+USE_RUBY=	yes
+RUBY_NO_RUN_DEPENDS=yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	gtk30 libxslt ltverhack introspection:build
-USE_SQLITE=	yes
-USE_PERL5=	yes
+USE_GNOME=	cairo gnomehier gtk20 gtk30 introspection:build \
+		libxslt:build
+USE_SQLITE=	3
+USE_PERL5_BUILD=yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
@@ -43,14 +51,36 @@ CONFIGURE_ARGS=	--with-gtk=3.0 \
 		--enable-introspection
 MAKEFILE=	GNUmakefile
 
+#CONFIGURE_ARGS+=--disable-silent-rules
+CONFIGURE_ARGS+=--disable-egl \
+		--disable-gles2
+#		--with-acceleration-backend=opengl # clutter broken?
+# opengl, clutter, none (clutter unsupported)
+
+SHEBANG_FILES=	\
+	Source/JavaScriptCore/create_hash_table \
+	Source/WebCore/css/*.pl \
+	Source/WebCore/dom/*.pl \
+	Source/WebCore/inspector/xxd.pl \
+	Source/WebCore/make-hash-tools.pl \
+	Source/WebCore/page/make_settings.pl \
+	Source/WebCore/platform/text/mac/make-charset-table.pl \
+	Source/WebKit2/Scripts/generate-forwarding-headers.pl \
+	Source/WebCore/bindings/scripts/*.p[lm] \
+	Source/JavaScriptCore/create_hash_table \
+	Tools/Scripts/webkit-build-directory
+
 BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3
 #_BROWSER_PLUGINS_DIR=	${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
 
-OPTIONS_DEFINE=	WEBGL DEBUG
-OPTIONS_DEFAULT=WEBGL
+OPTIONS_DEFINE=	WEBGL WEBAUDIO DEBUG FULLDEBUG
+OPTIONS_DEFAULT=WEBGL WEBAUDIO
+WEBAUDIO_DESC=	Web audio support
 WEBGL_DESC=	Enable Web GL support
+DEBUG_DESC=	Just enable debug symbols
+FULLDEBUG_DESC=	Enable asserts and other debug support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWEBGL}
 USE_GL=		gl
@@ -59,16 +89,45 @@ CONFIGURE_ARGS+=--enable-webgl
 CONFIGURE_ARGS+=--disable-webgl
 .endif
 
-.if ${PORT_OPTIONS:MDEBUG}
+.if ${PORT_OPTIONS:MWEBAUDIO}
+CONFIGURE_ARGS+=--enable-web-audio
+.else
+CONFIGURE_ARGS+=--disable-web-audio
+.endif
+
+.if ${PORT_OPTIONS:MFULLDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .else
 CONFIGURE_ARGS+=--disable-debug
 .endif
 
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=--enable-debug-symbols=yes
+.endif
+
+# We need clang + libc++ or gcc 4.7+. gcc has libstdc++ conflict between
+# gcc port and base. This originates from icu
+# gtest to use <tr1/tuple,> while libc++ only has <tuple>
+CPPFLAGS+=	-DGTEST_USE_OWN_TR1_TUPLE
+CXXFLAGS+=	-Wno-c++11-extensions -Qunused-arguments -stdlib=libc++
+LDFLAGS+=	-stdlib=libc++
+.if ${OSVERSION}<1000019
+LDFLAGS+=	-Wl,-Bstatic -licu
+BUILD_DEPENDS+=	clang33:${PORTSDIR}/lang/clang33 \
+		libc++>=0:${PORTSDIR}/devel/libc++
+RUN_DEPENDS+=	libc++>=0:${PORTSDIR}/devel/libc++
+CC=		clang33
+CXX=		clang++33
+CPP=		clang-cpp33
+CONFIGURE_ENV+=	CC=${CC} CXX=${CXX} CPP=${CPP}
+.endif
+
 .if ${ARCH} == powerpc64
 CFLAGS+=	-mminimal-toc
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if ${PERL_LEVEL} >= 501400
 BUILD_DEPENDS+=	p5-Switch>0:${PORTSDIR}/lang/p5-Switch
 .endif
@@ -78,9 +137,6 @@ post-patch:
 		${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
 	@${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-# disable static library.
-	@${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|' \
-		${WRKDIR}/gnome-libtool
 	@${REINPLACE_CMD} -e 's|/usr/bin/gcc|${CC}|' \
 		${WRKSRC}/Source/WebCore/dom/make_names.pl \
 		${WRKSRC}/Source/WebCore/css/make-css-file-arrays.pl \
@@ -90,4 +146,8 @@ post-patch:
 		${WRKSRC}/Source/WebCore/css/makeprop.pl \
 		${WRKSRC}/Source/WebCore/make-hash-tools.pl
 
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \
+		${PREFIX}/bin/GtkLauncher-3
+
 .include <bsd.port.post.mk>