From owner-freebsd-gecko@FreeBSD.ORG  Thu Apr 30 07:35:46 2009
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 33D69106566B
	for <freebsd-gecko@freebsd.org>; Thu, 30 Apr 2009 07:35:46 +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 BEDFA8FC2F
	for <freebsd-gecko@freebsd.org>; Thu, 30 Apr 2009 07:35:45 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id n3U7Zivu031205
	for <freebsd-gecko@freebsd.org>; Thu, 30 Apr 2009 07:35:44 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id n3U7ZdLo030792
	for freebsd-gecko@freebsd.org; Thu, 30 Apr 2009 07:35:39 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Thu, 30 Apr 2009 07:35:39 GMT
Message-Id: <200904300735.n3U7ZdLo030792@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] r21 - trunk/www/firefox3
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: Thu, 30 Apr 2009 07:35:46 -0000

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