[SVN-Commit] r21 - trunk/www/firefox3

[svn-freebsd-gecko at chruetertee.ch]

Author: miwi
Date: Thu Apr 30 07:35:38 2009
New Revision: 21

Log:
- Fix conflict

Modified:
   trunk/www/firefox3/Makefile

Modified: trunk/www/firefox3/Makefile
==============================================================================
--- trunk/www/firefox3/Makefile	Wed Apr 29 11:27:19 2009	(r20)
+++ trunk/www/firefox3/Makefile	Thu Apr 30 07:35:38 2009	(r21)
@@ -40,7 +40,7 @@
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
-CONFLICTS=      firefox-3.5*
+CONFLICTS=      firefox-3.[1-5]*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png