[SVN-Commit] r1359 - trunk/www/firefox

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Tue Sep 17 22:02:53 2013
New Revision: 1359

Log:
don't conflict with 24 until -esr port is based on esr24

Modified:
   trunk/www/firefox/Makefile

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Tue Sep 17 17:41:23 2013	(r1358)
+++ trunk/www/firefox/Makefile	Tue Sep 17 22:02:53 2013	(r1359)
@@ -25,7 +25,7 @@
 USE_PYTHON_BUILD=-2.7
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
-CONFLICTS=	firefox-24.* firefox-1[07].* firefox-esr-17.*
+CONFLICTS=	firefox-esr-24.* firefox-esr-17.* firefox-1[07].*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	# empty
 MOZILLA_NAME=	Firefox