From owner-freebsd-gecko@FreeBSD.ORG Mon Mar 17 07:32:17 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 791234F2 for ; Mon, 17 Mar 2014 07:32:17 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E75D9CBA for ; Mon, 17 Mar 2014 07:32:16 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s2H7WDCG085919 for ; Mon, 17 Mar 2014 07:32:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s2H7W8pv085665 for freebsd-gecko@freebsd.org; Mon, 17 Mar 2014 07:32:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 17 Mar 2014 07:32:08 GMT Message-Id: <201403170732.s2H7W8pv085665@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1556 - trunk/Mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Mar 2014 07:32:17 -0000 Author: jbeich Date: Mon Mar 17 07:32:08 2014 New Revision: 1556 Log: allow partial merge until new system deps land in ports repo www/firefox, www/firefox-esr and mail/thunderbird could be merged without waiting for (often lagging) www/seamonkey release. Reported by: AN Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sun Mar 16 16:53:21 2014 (r1555) +++ trunk/Mk/bsd.gecko.mk Mon Mar 17 07:32:08 2014 (r1556) @@ -561,10 +561,12 @@ ffi_MOZ_OPTIONS= --enable-system-ffi ffi_EXTRACT_AFTER_ARGS= --exclude mozilla*/js/src/ctypes/libffi +.if exists(${FILESDIR}/patch-bug847568) || exists(${FILESDIR}/patch-z-bug847568) harfbuzz_LIB_DEPENDS= libharfbuzz.so:${PORTSDIR}/print/harfbuzz harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz --with-system-graphite2 harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz \ --exclude mozilla*/gfx/graphite2 +.endif hunspell_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell hunspell_MOZ_OPTIONS= --enable-system-hunspell @@ -588,9 +590,11 @@ --exclude mozilla*/security/coreconf \ --exclude mozilla*/security/nss +.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) opus_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus opus_MOZ_OPTIONS= --with-system-opus opus_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libopus +.endif pixman_LIB_DEPENDS= libpixman-1.so:${PORTSDIR}/x11/pixman pixman_MOZ_OPTIONS= --enable-system-pixman @@ -604,10 +608,12 @@ sqlite_MOZ_OPTIONS= --enable-system-sqlite sqlite_EXTRACT_AFTER_ARGS= --exclude mozilla*/db/sqlite3 +.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) vorbis_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis vorbis_MOZ_OPTIONS= --with-system-vorbis --with-system-ogg vorbis_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvorbis \ --exclude mozilla*/media/libogg +.endif -vpx_BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm vpx_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx