Date: Sun, 5 Dec 2010 15:56:09 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r462 - branches/experimental/deskutils/lightning branches/experimental/deskutils/lightning-thunderbird branches/experimental/mail/thunderbird branches/experimental/mail/thunderbird-devel branches/experimental/mail/thunderbird3 branches/experimental/www/seamonkey branches/experimental/www/seamonkey2 branches/experimental/www/seamonkey2-devel trunk/deskutils/lightning trunk/deskutils/lightning-thunderbird trunk/mail/thunderbird trunk/mail/thunderbird3 trunk/www/seamonkey trunk/www/seamonkey2 Message-ID: <201012051556.oB5Fu9QL093032@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sun Dec 5 15:56:09 2010
New Revision: 462
Log:
- Replace CONFLICTS with CONFLICTS_BUILD/CONFLICTS_INSTALL
Modified:
branches/experimental/deskutils/lightning-thunderbird/Makefile
branches/experimental/deskutils/lightning/Makefile
branches/experimental/mail/thunderbird-devel/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/www/seamonkey/Makefile
branches/experimental/www/seamonkey2-devel/Makefile
branches/experimental/www/seamonkey2/Makefile
trunk/deskutils/lightning-thunderbird/Makefile
trunk/deskutils/lightning/Makefile
trunk/mail/thunderbird/Makefile
trunk/mail/thunderbird3/Makefile
trunk/www/seamonkey/Makefile
trunk/www/seamonkey2/Makefile
Modified: branches/experimental/deskutils/lightning-thunderbird/Makefile
==============================================================================
--- branches/experimental/deskutils/lightning-thunderbird/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ branches/experimental/deskutils/lightning-thunderbird/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -18,7 +18,7 @@
RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird
-CONFLICTS= spidermonkey-1.[0-7]*
+CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
Modified: branches/experimental/deskutils/lightning/Makefile
==============================================================================
--- branches/experimental/deskutils/lightning/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ branches/experimental/deskutils/lightning/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -18,7 +18,7 @@
OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \
SEAMONKEY "Install SeaMonkey 2.0" off
-CONFLICTS= spidermonkey-1.[0-7]*
+CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
Modified: branches/experimental/mail/thunderbird-devel/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-devel/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ branches/experimental/mail/thunderbird-devel/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -20,7 +20,7 @@
USE_AUTOTOOLS= autoconf:213
LATEST_LINK= thunderbird33
USE_GECKO= gecko
-CONFLICTS= thunderbird-3.0* thunderbird-3.1*
+CONFLICTS_INSTALL= thunderbird-3.0* thunderbird-3.1*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ branches/experimental/mail/thunderbird/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -19,7 +19,7 @@
USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
-CONFLICTS= thunderbird-3.0*
+CONFLICTS_INSTALL= 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 Sun Dec 5 15:54:35 2010 (r461)
+++ branches/experimental/mail/thunderbird3/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -20,7 +20,7 @@
USE_AUTOTOOLS= autoconf213
LATEST_LINK= thunderbird3
USE_GECKO= gecko
-CONFLICTS= thunderbird-3.1*
+CONFLICTS_INSTALL= thunderbird-3.1*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ branches/experimental/www/seamonkey/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -16,7 +16,7 @@
COMMENT= The open source, standards compliant web browser
DEPRECATED= Upstream support dropped. Please consider using www/seamonkey2 instead.
-CONFLICTS= seamonkey-2*
+CONFLICTS_INSTALL= seamonkey-2*
USE_BZIP2= yes
USE_GMAKE= yes
USE_GECKO= gecko
Modified: branches/experimental/www/seamonkey2-devel/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2-devel/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ branches/experimental/www/seamonkey2-devel/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -15,7 +15,8 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser
-CONFLICTS= seamonkey-1* seamonkey-2.0* spidermonkey-1.[0-7]*
+CONFLICTS_BUILD= spidermonkey-1.[0-7]*
+CONFLICTS_INSTALL= seamonkey-1* seamonkey-2.0*
LATEST_LINK= seamonkey2-devel
USE_BZIP2= yes
USE_GMAKE= yes
Modified: branches/experimental/www/seamonkey2/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ branches/experimental/www/seamonkey2/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -16,7 +16,8 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser
-CONFLICTS= seamonkey-1* spidermonkey-1.[0-7]*
+CONFLICTS_BUILD= spidermonkey-1.[0-7]*
+CONFLICTS_INSTALL= seamonkey-1*
LATEST_LINK= seamonkey2
USE_BZIP2= yes
USE_GMAKE= yes
Modified: trunk/deskutils/lightning-thunderbird/Makefile
==============================================================================
--- trunk/deskutils/lightning-thunderbird/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ trunk/deskutils/lightning-thunderbird/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -18,7 +18,7 @@
RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird
-CONFLICTS= spidermonkey-1.[0-7]*
+CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
Modified: trunk/deskutils/lightning/Makefile
==============================================================================
--- trunk/deskutils/lightning/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ trunk/deskutils/lightning/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -18,7 +18,7 @@
OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \
SEAMONKEY "Install SeaMonkey 2.0" off
-CONFLICTS= spidermonkey-1.[0-7]*
+CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ trunk/mail/thunderbird/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -19,7 +19,7 @@
USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
-CONFLICTS= thunderbird-3.0*
+CONFLICTS_INSTALL= thunderbird-3.0*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2
Modified: trunk/mail/thunderbird3/Makefile
==============================================================================
--- trunk/mail/thunderbird3/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ trunk/mail/thunderbird3/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -20,7 +20,7 @@
USE_AUTOTOOLS= autoconf213
LATEST_LINK= thunderbird3
USE_GECKO= gecko
-CONFLICTS= thunderbird-3.1*
+CONFLICTS_INSTALL= thunderbird-3.1*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ trunk/www/seamonkey/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -17,7 +17,7 @@
COMMENT= The open source, standards compliant web browser
DEPRECATED= Upstream support dropped. Please consider using www/seamonkey2 instead.
-CONFLICTS= seamonkey-2*
+CONFLICTS_INSTALL= seamonkey-2*
USE_BZIP2= yes
USE_GMAKE= yes
USE_GECKO= gecko
Modified: trunk/www/seamonkey2/Makefile
==============================================================================
--- trunk/www/seamonkey2/Makefile Sun Dec 5 15:54:35 2010 (r461)
+++ trunk/www/seamonkey2/Makefile Sun Dec 5 15:56:09 2010 (r462)
@@ -16,7 +16,8 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser
-CONFLICTS= seamonkey-1* spidermonkey-1.[0-7]*
+CONFLICTS_BUILD= spidermonkey-1.[0-7]*
+CONFLICTS_INSTALL= seamonkey-1*
LATEST_LINK= seamonkey2
USE_BZIP2= yes
USE_GMAKE= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012051556.oB5Fu9QL093032>