[SVN-Commit] r333 - branches/experimental/mail/thunderbird branches/experimental/mail/thunderbird3 branches/experimental/mail/thunderbird3-devel trunk/deskutils/lightning trunk/mail/thunderbird trunk/mail/thunderbird3

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Fri Jun 25 11:01:49 2010
New Revision: 333

Log:
- Move Thunderbird 3.1 to mail/thunderbird
- Update trunk to reflect upcoming ports layout
- Update LATEST_LINK and CONFLICTS in thunderbird ports

Added:
   branches/experimental/mail/thunderbird/
      - copied from r331, branches/experimental/mail/thunderbird3-devel/
   trunk/deskutils/lightning/
      - copied from r331, branches/experimental/deskutils/lightning/
   trunk/mail/thunderbird/
      - copied from r331, branches/experimental/mail/thunderbird3-devel/
Deleted:
   branches/experimental/mail/thunderbird3-devel/
Modified:
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/mail/thunderbird3/Makefile
   trunk/mail/thunderbird/Makefile
   trunk/mail/thunderbird3/Makefile

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3-devel/Makefile	Fri Jun 25 10:27:11 2010	(r331)
+++ branches/experimental/mail/thunderbird/Makefile	Fri Jun 25 11:01:49 2010	(r333)
@@ -18,9 +18,8 @@
 BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
 
 USE_AUTOTOOLS=	autoconf:213
-LATEST_LINK=	thunderbird3-devel
 USE_GECKO=	gecko
-CONFLICTS=	thunderbird-2* thunderbird-3.0* lightning-0.[0-9]*
+CONFLICTS=	thunderbird-3.0*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 

Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile	Fri Jun 25 10:53:33 2010	(r332)
+++ branches/experimental/mail/thunderbird3/Makefile	Fri Jun 25 11:01:49 2010	(r333)
@@ -20,7 +20,7 @@
 USE_AUTOTOOLS=	autoconf:213
 LATEST_LINK=	thunderbird3
 USE_GECKO=	gecko
-CONFLICTS=	thunderbird-2* lightning-0.[0-9]*
+CONFLICTS=	thunderbird-3.1*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3-devel/Makefile	Fri Jun 25 10:27:11 2010	(r331)
+++ trunk/mail/thunderbird/Makefile	Fri Jun 25 11:01:49 2010	(r333)
@@ -18,9 +18,8 @@
 BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
 
 USE_AUTOTOOLS=	autoconf:213
-LATEST_LINK=	thunderbird3-devel
 USE_GECKO=	gecko
-CONFLICTS=	thunderbird-2* thunderbird-3.0* lightning-0.[0-9]*
+CONFLICTS=	thunderbird-3.0*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 

Modified: trunk/mail/thunderbird3/Makefile
==============================================================================
--- trunk/mail/thunderbird3/Makefile	Fri Jun 25 10:53:33 2010	(r332)
+++ trunk/mail/thunderbird3/Makefile	Fri Jun 25 11:01:49 2010	(r333)
@@ -20,7 +20,7 @@
 USE_AUTOTOOLS=	autoconf:213
 LATEST_LINK=	thunderbird3
 USE_GECKO=	gecko
-CONFLICTS=	thunderbird-2* lightning-0.[0-9]*
+CONFLICTS=	thunderbird-3.1*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2