From owner-freebsd-gecko@FreeBSD.ORG  Tue Sep 27 22:16:58 2011
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
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 D360B1065674
	for <freebsd-gecko@freebsd.org>; Tue, 27 Sep 2011 22:16:58 +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 6AD488FC1F
	for <freebsd-gecko@freebsd.org>; Tue, 27 Sep 2011 22:16:57 +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 p8RMGvhx085560
	for <freebsd-gecko@freebsd.org>; Tue, 27 Sep 2011 22:16:57 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p8RMGqwS084872
	for freebsd-gecko@freebsd.org; Tue, 27 Sep 2011 22:16:52 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Tue, 27 Sep 2011 22:16:52 GMT
Message-Id: <201109272216.p8RMGqwS084872@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] r635 - branches/experimental/mail/thunderbird
	trunk/mail/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 <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2011 22:16:58 -0000

Author: beat
Date: Tue Sep 27 22:16:51 2011
New Revision: 635

Log:
- Sync with ports

Modified:
   branches/experimental/mail/thunderbird/Makefile
   trunk/mail/thunderbird/Makefile

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Tue Sep 27 22:11:22 2011	(r634)
+++ branches/experimental/mail/thunderbird/Makefile	Tue Sep 27 22:16:51 2011	(r635)
@@ -2,7 +2,7 @@
 # Date created:			4 September 2003
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.133 2011/08/25 08:35:58 ale Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.136 2011/09/06 20:15:18 flo Exp $
 #
 
 PORTNAME=	thunderbird
@@ -20,6 +20,8 @@
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		event-1.4:${PORTSDIR}/devel/libevent
 
+CONFLICTS_BUILD=	spidermonkey-*
+
 USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile	Tue Sep 27 22:11:22 2011	(r634)
+++ trunk/mail/thunderbird/Makefile	Tue Sep 27 22:16:51 2011	(r635)
@@ -2,7 +2,7 @@
 # Date created:			4 September 2003
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.133 2011/08/25 08:35:58 ale Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.136 2011/09/06 20:15:18 flo Exp $
 #
 
 PORTNAME=	thunderbird
@@ -20,6 +20,8 @@
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		event-1.4:${PORTSDIR}/devel/libevent
 
+CONFLICTS_BUILD=	spidermonkey-*
+
 USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft