[SVN-Commit] r635 - branches/experimental/mail/thunderbird trunk/mail/thunderbird

[svn-freebsd-gecko at chruetertee.ch]

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 at 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 at 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