From owner-freebsd-gecko@FreeBSD.ORG Thu Oct 28 08:49:49 2010 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 F065A106566C for ; Thu, 28 Oct 2010 08:49:49 +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 6B25E8FC19 for ; Thu, 28 Oct 2010 08:49:48 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id o9S8nlEw004563 for ; Thu, 28 Oct 2010 08:49:47 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id o9S8ngLv003807 for freebsd-gecko@freebsd.org; Thu, 28 Oct 2010 08:49:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 28 Oct 2010 08:49:42 GMT Message-Id: <201010280849.o9S8ngLv003807@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] r421 - branches/experimental/deskutils/lightning branches/experimental/deskutils/lightning-thunderbird trunk/deskutils/lightning trunk/deskutils/lightning-thunderbird 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: Thu, 28 Oct 2010 08:49:50 -0000 Author: beat Date: Thu Oct 28 08:49:42 2010 New Revision: 421 Log: - Add CONFLICT with spidermonkey PR: ports/149638 Submitted by: Jimmie James Modified: branches/experimental/deskutils/lightning-thunderbird/Makefile branches/experimental/deskutils/lightning/Makefile trunk/deskutils/lightning-thunderbird/Makefile trunk/deskutils/lightning/Makefile Modified: branches/experimental/deskutils/lightning-thunderbird/Makefile ============================================================================== --- branches/experimental/deskutils/lightning-thunderbird/Makefile Wed Oct 27 12:04:05 2010 (r420) +++ branches/experimental/deskutils/lightning-thunderbird/Makefile Thu Oct 28 08:49:42 2010 (r421) @@ -18,6 +18,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird +CONFLICTS= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf:213 libtool:22 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} Modified: branches/experimental/deskutils/lightning/Makefile ============================================================================== --- branches/experimental/deskutils/lightning/Makefile Wed Oct 27 12:04:05 2010 (r420) +++ branches/experimental/deskutils/lightning/Makefile Thu Oct 28 08:49:42 2010 (r421) @@ -18,6 +18,7 @@ OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \ SEAMONKEY "Install SeaMonkey 2.0" off +CONFLICTS= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf:213 libtool:22 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} Modified: trunk/deskutils/lightning-thunderbird/Makefile ============================================================================== --- trunk/deskutils/lightning-thunderbird/Makefile Wed Oct 27 12:04:05 2010 (r420) +++ trunk/deskutils/lightning-thunderbird/Makefile Thu Oct 28 08:49:42 2010 (r421) @@ -18,6 +18,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird +CONFLICTS= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf:213 libtool:22 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} Modified: trunk/deskutils/lightning/Makefile ============================================================================== --- trunk/deskutils/lightning/Makefile Wed Oct 27 12:04:05 2010 (r420) +++ trunk/deskutils/lightning/Makefile Thu Oct 28 08:49:42 2010 (r421) @@ -18,6 +18,7 @@ OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \ SEAMONKEY "Install SeaMonkey 2.0" off +CONFLICTS= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf:213 libtool:22 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE}