Date: Wed, 29 Apr 2009 11:27:20 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r20 - in trunk/www: firefox3 firefox3-devel Message-ID: <200904291127.n3TBRJaU023075@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Wed Apr 29 11:27:19 2009
New Revision: 20
Log:
- Register conflicts for firefox3 and firefox3-devel
Modified:
trunk/www/firefox3-devel/Makefile
trunk/www/firefox3/Makefile
Modified: trunk/www/firefox3-devel/Makefile
==============================================================================
--- trunk/www/firefox3-devel/Makefile Tue Apr 28 17:33:44 2009 (r19)
+++ trunk/www/firefox3-devel/Makefile Wed Apr 29 11:27:19 2009 (r20)
@@ -40,6 +40,7 @@
USE_BZIP2= yes
USE_GMAKE= yes
NO_MOZPKGINSTALL=yes
+CONFLICTS= firefox-3.0.*
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
Modified: trunk/www/firefox3/Makefile
==============================================================================
--- trunk/www/firefox3/Makefile Tue Apr 28 17:33:44 2009 (r19)
+++ trunk/www/firefox3/Makefile Wed Apr 29 11:27:19 2009 (r20)
@@ -40,6 +40,7 @@
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
NO_MOZPKGINSTALL=yes
+CONFLICTS= firefox-3.5*
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?200904291127.n3TBRJaU023075>