From owner-svn-ports-head@FreeBSD.ORG Sat Aug 9 06:17:30 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 735B4A24 for ; Sat, 9 Aug 2014 06:17:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3766122E1 for ; Sat, 9 Aug 2014 06:17:30 +0000 (UTC) Received: from olivierd (uid 1294) (envelope-from olivierd@FreeBSD.org) id 2362 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sat, 09 Aug 2014 06:17:29 +0000 From: Olivier Duchateau Date: Sat, 9 Aug 2014 06:17:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364399 - head/www/midori X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e5bcfa.2362.2ce3f569@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Aug 2014 06:17:30 -0000 Author: olivierd Date: Sat Aug 9 06:17:29 2014 New Revision: 364399 URL: http://svnweb.freebsd.org/changeset/ports/364399 QAT: https://qat.redports.org/buildarchive/r364399/ Log: - GObject Introspection Repository (GIR) files are only build, when GTK2 is set - Fix pkg-plist with the new WebKit2 API (some extensions are not yet ported) - Bump PORTREVISION Obtained from: Xfce dev repo Modified: head/www/midori/Makefile head/www/midori/pkg-plist Modified: head/www/midori/Makefile ============================================================================== --- head/www/midori/Makefile Sat Aug 9 05:36:00 2014 (r364398) +++ head/www/midori/Makefile Sat Aug 9 06:17:29 2014 (r364399) @@ -3,7 +3,7 @@ PORTNAME= midori PORTVERSION= 0.5.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www xfce MASTER_SITES= http://www.midori-browser.org/downloads/ DISTNAME= ${PORTNAME}_${PORTVERSION}_all_ @@ -50,6 +50,7 @@ ZEITGEIST_DESC= User logs activities LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 USE_GNOME+= gtk20 CMAKE_ARGS+= -DUSE_GTK3:BOOL=OFF +PLIST_SUB+= ONLY_WEBKIT1="" .endif .if ${PORT_OPTIONS:MGTK3} @@ -60,8 +61,11 @@ CMAKE_ARGS+= -DUSE_GTK3:BOOL=ON # Support the new WebKit2 API (>= 1.11.91) .if exists(${LOCALBASE}/libdata/pkgconfig/webkit2gtk-3.0.pc) CMAKE_ARGS+= -DHALF_BRO_INCOM_WEBKIT2:BOOL=ON +# Some extensions are not yet ported to the new API (WebKit2) +PLIST_SUB+= ONLY_WEBKIT1="@comment " .else CMAKE_ARGS+= -DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF +PLIST_SUB+= ONLY_WEBKIT1="" .endif .if ${PORT_OPTIONS:MGRANITE} @@ -88,7 +92,7 @@ CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=ON CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=OFF .endif -.if ${PORT_OPTIONS:MGIR} +.if ${PORT_OPTIONS:MGIR} && ${PORT_OPTIONS:MGTK2} USE_GNOME+= introspection:build CMAKE_ARGS+= -DUSE_GIR:BOOL=ON PLIST_SUB+= GIR="" Modified: head/www/midori/pkg-plist ============================================================================== --- head/www/midori/pkg-plist Sat Aug 9 05:36:00 2014 (r364398) +++ head/www/midori/pkg-plist Sat Aug 9 06:17:29 2014 (r364399) @@ -5,24 +5,24 @@ lib/libmidori-core.so lib/libmidori-core.so.0.0.0 lib/libmidori-core.so.1 lib/midori/libadblock.so -lib/midori/libaddons.so +%%ONLY_WEBKIT1%%lib/midori/libaddons.so lib/midori/libapps.so lib/midori/libcolorful-tabs.so lib/midori/libcookie-manager.so -lib/midori/libcookie-permissions.so +%%ONLY_WEBKIT1%%lib/midori/libcookie-permissions.so lib/midori/libcopy-tabs.so lib/midori/libdelayed-load.so lib/midori/libdevpet.so lib/midori/libdomain-keys.so -lib/midori/libexternal-download-manager.so +%%ONLY_WEBKIT1%%lib/midori/libexternal-download-manager.so lib/midori/libfeed-panel.so lib/midori/libflummi.so -lib/midori/libformhistory.so +%%ONLY_WEBKIT1%%lib/midori/libformhistory.so lib/midori/libhistory-list.so lib/midori/libmouse-gestures.so -lib/midori/libnojs.so +%%ONLY_WEBKIT1%%lib/midori/libnojs.so lib/midori/libnotes.so -lib/midori/libnsplugin-manager.so +%%ONLY_WEBKIT1%%lib/midori/libnsplugin-manager.so lib/midori/libopen-with.so lib/midori/libshortcuts.so lib/midori/libstatus-clock.so