Date: Sat, 24 Apr 2010 10:26:26 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r306 - in branches/experimental/www: firefox firefox3 firefox3-devel firefox35 Message-ID: <201004241026.o3OAQQii067313@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sat Apr 24 10:26:26 2010
New Revision: 306
Log:
- Update CONFLICTS for Firefox 3.7
Modified:
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox3-devel/Makefile
branches/experimental/www/firefox3/Makefile
branches/experimental/www/firefox35/Makefile
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Sat Apr 24 10:20:26 2010 (r305)
+++ branches/experimental/www/firefox/Makefile Sat Apr 24 10:26:26 2010 (r306)
@@ -39,7 +39,7 @@
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.[0,5].*
+CONFLICTS= firefox-3.[0,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 Sat Apr 24 10:20:26 2010 (r305)
+++ branches/experimental/www/firefox3-devel/Makefile Sat Apr 24 10:26:26 2010 (r306)
@@ -41,7 +41,7 @@
USE_GL= gl
MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.[0,5].*
+CONFLICTS= firefox-3.[0,5,6].*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
Modified: branches/experimental/www/firefox3/Makefile
==============================================================================
--- branches/experimental/www/firefox3/Makefile Sat Apr 24 10:20:26 2010 (r305)
+++ branches/experimental/www/firefox3/Makefile Sat Apr 24 10:26:26 2010 (r306)
@@ -22,7 +22,7 @@
DEPRECATED= Upstream support dropped. Please consider using www/firefox or www/firefox35 instead
LATEST_LINK= firefox3
USE_GECKO= gecko
-CONFLICTS= firefox-3.[1-6]*
+CONFLICTS= firefox-3.[1-7]*
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -png -nss -dbm -jpeg
MOZILLA_NAME= Firefox${MOZILLA_SUFX}
Modified: branches/experimental/www/firefox35/Makefile
==============================================================================
--- branches/experimental/www/firefox35/Makefile Sat Apr 24 10:20:26 2010 (r305)
+++ branches/experimental/www/firefox35/Makefile Sat Apr 24 10:26:26 2010 (r306)
@@ -40,7 +40,7 @@
USE_BZIP2= yes
USE_GMAKE= yes
NO_MOZPKGINSTALL=yes
-CONFLICTS= firefox-3.0.* firefox-3.6*
+CONFLICTS= firefox-3.[0,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?201004241026.o3OAQQii067313>