Author: beat
Date: Sun Dec 5 15:54:35 2010
New Revision: 461
Log:
- Remove CONFLICTS with Firefox 3.0 which has been removed in June.
- Replace CONFLICTS with CONFLICTS_INSTALL.
Modified:
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox35/Makefile
trunk/www/firefox/Makefile
trunk/www/firefox35/Makefile
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Sun Dec 5 09:51:22 2010
(r460)
+++ branches/experimental/www/firefox/Makefile Sun Dec 5 15:54:35 2010
(r461)
@@ -40,7 +40,7 @@
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.[0,5].*
+CONFLICTS_INSTALL= firefox-3.5.*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC=
${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
Modified: branches/experimental/www/firefox35/Makefile
==============================================================================
--- branches/experimental/www/firefox35/Makefile Sun Dec 5 09:51:22
2010 (r460)
+++ branches/experimental/www/firefox35/Makefile Sun Dec 5 15:54:35
2010 (r461)
@@ -40,7 +40,7 @@
USE_BZIP2= yes
USE_GMAKE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.0.* firefox-3.6*
+CONFLICTS_INSTALL= firefox-3.6*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC=
${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Sun Dec 5 09:51:22 2010 (r460)
+++ trunk/www/firefox/Makefile Sun Dec 5 15:54:35 2010 (r461)
@@ -40,7 +40,7 @@
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.[0,5].*
+CONFLICTS_INSTALL= firefox-3.5.*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC=
${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
Modified: trunk/www/firefox35/Makefile
==============================================================================
--- trunk/www/firefox35/Makefile Sun Dec 5 09:51:22 2010 (r460)
+++ trunk/www/firefox35/Makefile Sun Dec 5 15:54:35 2010 (r461)
@@ -40,7 +40,7 @@
USE_BZIP2= yes
USE_GMAKE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.0.* firefox-3.6*
+CONFLICTS_INSTALL= firefox-3.6*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC=
${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
