From owner-freebsd-gecko@FreeBSD.ORG  Sat Apr 24 11:34:31 2010
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC35A106566C
	for <freebsd-gecko@freebsd.org>; Sat, 24 Apr 2010 11:34:31 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 75A678FC18
	for <freebsd-gecko@freebsd.org>; Sat, 24 Apr 2010 11:34:31 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id o3OBYUjr050642
	for <freebsd-gecko@freebsd.org>; Sat, 24 Apr 2010 11:34:30 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id o3OBYPTq049633
	for freebsd-gecko@freebsd.org; Sat, 24 Apr 2010 11:34:25 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sat, 24 Apr 2010 11:34:25 GMT
Message-Id: <201004241134.o3OBYPTq049633@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
	svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r310 - in trunk/www: . firefox firefox3 firefox35
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Apr 2010 11:34:31 -0000

Author: beat
Date: Sat Apr 24 11:34:24 2010
New Revision: 310

Log:
MFExp:
- Update CONFLICTS for Firefox 3.7

Modified:
   trunk/www/   (props changed)
   trunk/www/firefox/Makefile
   trunk/www/firefox3/Makefile
   trunk/www/firefox35/Makefile

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Sat Apr 24 11:29:50 2010	(r309)
+++ trunk/www/firefox/Makefile	Sat Apr 24 11:34:24 2010	(r310)
@@ -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: trunk/www/firefox3/Makefile
==============================================================================
--- trunk/www/firefox3/Makefile	Sat Apr 24 11:29:50 2010	(r309)
+++ trunk/www/firefox3/Makefile	Sat Apr 24 11:34:24 2010	(r310)
@@ -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: trunk/www/firefox35/Makefile
==============================================================================
--- trunk/www/firefox35/Makefile	Sat Apr 24 11:29:50 2010	(r309)
+++ trunk/www/firefox35/Makefile	Sat Apr 24 11:34:24 2010	(r310)
@@ -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