[patch] improvements to www/webkit-gtk2 port

Mon Jul 21 11:48:04 UTC 2014

On Mon, Jul 21, 2014 at 01:01:14PM +0200, Guido Falsi wrote:
> On 07/21/14 12:47, Alexey Dokuchaev wrote:
> > please consider attached patch (this is the first draft; ideally i want to
> > fix both webkit-gtk{2,3} ports at once since they are very similar; maybe
> > even turning them into master/slave pair). [...]
> 
> Just something I noticed reding the patch:
> 
> +USES=		bison compiler gettext gmake perl5 pkgconfig tar:xz
> +USE_AUTOTOOLS=	libtool
> 
> I think this should be
> 
> USES=		bison compiler gettext gmake libtool perl5 pkgconfig tar:xz
> USE_AUTOTOOLS=	libtoolize

Nice, it alloed to get rid of another hack in the Makefile.  Updated patch
attached.

./danfe
-------------- next part --------------
Index: Makefile
===================================================================

--- Makefile	(revision 361160)
+++ Makefile	(working copy)
@@ -4,28 +4,24 @@
 
 PORTNAME=	webkit
 PORTVERSION=	1.8.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk2
 
 MAINTAINER=	gnome at FreeBSD.org
-COMMENT=	An opensource browser engine
+COMMENT=	Open source browser engine
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
 		libicutu.so:${PORTSDIR}/devel/icu \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
-USE_XZ=		yes
+USES=		bison compiler gettext gmake libtool perl5 pkgconfig tar:xz
+USE_AUTOTOOLS=	libtoolize
 USE_PYTHON_BUILD=	2
-USE_GSTREAMER=	yes
 USE_XORG=	xt
-USES=		bison gmake pkgconfig gettext perl5
-USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 introspection:build libxslt ltverhack
 USE_SQLITE=	yes
 USE_LDCONFIG=	yes
@@ -34,48 +30,37 @@
 		ZLIB_CFLAGS="-I/usr/include" \
 		ZLIB_LIBS="-L/usr/lib -lz" \
 		ac_cv_path_DOLT_BASH=""
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-gtk=2.0 \
+CONFIGURE_ARGS=	--with-gtk=2.0 --disable-gtk-doc \
 		--enable-svg-fonts \
 		--disable-geolocation \
 		--enable-introspection
 MAKEFILE=	GNUmakefile
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS_powerpc64=	-mminimal-toc
+
 BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
 #_BROWSER_PLUGINS_DIR=	${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
 
-OPTIONS_DEFINE=	WEBGL DEBUG
-OPTIONS_DEFAULT=WEBGL
-WEBGL_DESC=	Enable Web GL support
+OPTIONS_DEFINE=	WEBGL GSTREAMER DEBUG
+OPTIONS_DEFAULT=WEBGL GSTREAMER
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+WEBGL_USE=	GL=gl
+WEBGL_CONFIGURE_OFF=	--disable-webgl
 
-.if ${PORT_OPTIONS:MWEBGL}
-USE_GL=		gl
-CONFIGURE_ARGS+=--enable-webgl
-.else
-CONFIGURE_ARGS+=--disable-webgl
-.endif
+GSTREAMER_USE=	GSTREAMER=yes
+GSTREAMER_CONFIGURE_OFF=	--disable-video
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.else
-CONFIGURE_ARGS+=--disable-debug
-.endif
+DEBUG_CONFIGURE_ON=	--enable-debug
 
-CCISCLANG!=     ${CC} --version
+.include <bsd.port.pre.mk>
 
-.if !empty(CCISCLANG:M*clang*)
+.if ${COMPILER_TYPE} == clang
 CPPFLAGS+=	-Wno-c++11-extensions
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == powerpc64
-CFLAGS+=	-mminimal-toc
-.endif
-
 .if ${PERL_LEVEL} >= 501400
 BUILD_DEPENDS+=	p5-Switch>0:${PORTSDIR}/lang/p5-Switch
 .endif
@@ -85,16 +70,9 @@
 		${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 \
 		${WRKSRC}/Source/WebCore/bindings/scripts/IDLParser.pm
-	@${REINPLACE_CMD} -e 's|"gperf|"${LOCALBASE}/bin/gperf|g' \
-		${WRKSRC}/Source/WebCore/css/makevalues.pl \
-		${WRKSRC}/Source/WebCore/css/makeprop.pl \
-		${WRKSRC}/Source/WebCore/make-hash-tools.pl
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 361160)
+++ pkg-plist	(working copy)
@@ -48,7 +48,7 @@
 include/webkitgtk-1.0/webkit/WebKitDOMHTMLAnchorElement.h
 include/webkitgtk-1.0/webkit/WebKitDOMHTMLAppletElement.h
 include/webkitgtk-1.0/webkit/WebKitDOMHTMLAreaElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLAudioElement.h
+%%GSTREAMER%%include/webkitgtk-1.0/webkit/WebKitDOMHTMLAudioElement.h
 include/webkitgtk-1.0/webkit/WebKitDOMHTMLBRElement.h
 include/webkitgtk-1.0/webkit/WebKitDOMHTMLBaseElement.h
 include/webkitgtk-1.0/webkit/WebKitDOMHTMLBaseFontElement.h
@@ -107,7 +107,7 @@
 include/webkitgtk-1.0/webkit/WebKitDOMHTMLTextAreaElement.h
 include/webkitgtk-1.0/webkit/WebKitDOMHTMLTitleElement.h
 include/webkitgtk-1.0/webkit/WebKitDOMHTMLUListElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLVideoElement.h
+%%GSTREAMER%%include/webkitgtk-1.0/webkit/WebKitDOMHTMLVideoElement.h
 include/webkitgtk-1.0/webkit/WebKitDOMHistory.h
 include/webkitgtk-1.0/webkit/WebKitDOMLocation.h
 include/webkitgtk-1.0/webkit/WebKitDOMMediaError.h
@@ -276,10 +276,8 @@
 include/webkitgtk-1.0/webkit2/webkit2.h
 lib/girepository-1.0/JSCore-1.0.typelib
 lib/girepository-1.0/WebKit-1.0.typelib
-lib/libjavascriptcoregtk-1.0.la
 lib/libjavascriptcoregtk-1.0.so
 lib/libjavascriptcoregtk-1.0.so.0
-lib/libwebkitgtk-1.0.la
 lib/libwebkitgtk-1.0.so
 lib/libwebkitgtk-1.0.so.0
 libdata/pkgconfig/javascriptcoregtk-1.0.pc
