From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 17:46:31 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6969B106566C for ; Mon, 9 Jul 2012 17:46:31 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id E94F38FC0C for ; Mon, 9 Jul 2012 17:46:30 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q69HkTcS056487 for ; Mon, 9 Jul 2012 17:46:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q69HkOYH055955 for freebsd-gecko@freebsd.org; Mon, 9 Jul 2012 17:46:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 9 Jul 2012 17:46:24 GMT Message-Id: <201207091746.q69HkOYH055955@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r864 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Jul 2012 17:46:31 -0000 Author: jbeich Date: Mon Jul 9 17:46:24 2012 New Revision: 864 Log: stop USE_MOZILLA from clashing with bsd.gstreamer.mk Reported by: flo Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:16 2012 (r863) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:24 2012 (r864) @@ -614,7 +614,8 @@ vpx_MOZ_OPTIONS= --with-system-libvpx #vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx -zip_DEPENDS= zip:${PORTSDIR}/archivers/zip +zip_BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip +zip_RUN_DEPENDS= ${zip_BUILD_DEPENDS} .for use in ${USE_MOZILLA} ${use:S/-/_WITHOUT_/}= ${TRUE} @@ -622,9 +623,9 @@ .for dep in ${_ALL_DEPENDS} .if !defined(_WITHOUT_${dep}) -BUILD_DEPENDS+= ${${dep}_DEPENDS} +BUILD_DEPENDS+= ${${dep}_BUILD_DEPENDS} LIB_DEPENDS+= ${${dep}_LIB_DEPENDS} -RUN_DEPENDS+= ${${dep}_DEPENDS} +RUN_DEPENDS+= ${${dep}_RUN_DEPENDS} MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS} EXTRACT_AFTER_ARGS+= ${${dep}_EXTRACT_AFTER_ARGS} CPPFLAGS+= ${${dep}_CPPFLAGS}