Date: Wed, 4 Aug 2010 14:38:41 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r369 - in branches/experimental/www: firefox firefox-devel firefox3-devel firefox35 Message-ID: <201008041438.o74EcfGa097807@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Wed Aug 4 14:38:40 2010
New Revision: 369
Log:
- Update CONFLICTS between the Firefox ports. Firefox 4 no longer
conflicts with the different Firefox 3 versions.
Reminded by: jsa@
Modified:
branches/experimental/www/firefox-devel/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox3-devel/Makefile
branches/experimental/www/firefox35/Makefile
Modified: branches/experimental/www/firefox-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox-devel/Makefile Wed Aug 4 06:31:37 2010 (r368)
+++ branches/experimental/www/firefox-devel/Makefile Wed Aug 4 14:38:40 2010 (r369)
@@ -38,7 +38,6 @@
USE_GL= gl
MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.[5,6,7].*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Wed Aug 4 06:31:37 2010 (r368)
+++ branches/experimental/www/firefox/Makefile Wed Aug 4 14:38:40 2010 (r369)
@@ -39,7 +39,7 @@
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.[0,5].*
+CONFLICTS= firefox-3.[5,7].*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
Modified: branches/experimental/www/firefox3-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox3-devel/Makefile Wed Aug 4 06:31:37 2010 (r368)
+++ branches/experimental/www/firefox3-devel/Makefile Wed Aug 4 14:38:40 2010 (r369)
@@ -41,7 +41,7 @@
USE_GL= gl
MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.[0,5,6].*
+CONFLICTS= firefox-3.[5,6].*
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 Wed Aug 4 06:31:37 2010 (r368)
+++ branches/experimental/www/firefox35/Makefile Wed Aug 4 14:38:40 2010 (r369)
@@ -40,7 +40,7 @@
USE_BZIP2= yes
USE_GMAKE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.[0,6,7].*
+CONFLICTS= firefox-3.[6,7].*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008041438.o74EcfGa097807>