[SVN-Commit] r421 - branches/experimental/deskutils/lightning branches/experimental/deskutils/lightning-thunderbird trunk/deskutils/lightning trunk/deskutils/lightning-thunderbird

[svn-freebsd-gecko at chruetertee.ch]

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 <jimmiejaz AT gmail.com>

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}