From owner-freebsd-gecko@FreeBSD.ORG  Fri Nov  6 17:20:56 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 A6C76106566B
	for <freebsd-gecko@freebsd.org>; Fri,  6 Nov 2009 17:20:56 +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 3B7018FC1A
	for <freebsd-gecko@freebsd.org>; Fri,  6 Nov 2009 17:20:55 +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 nA6HKsp4095088
	for <freebsd-gecko@freebsd.org>; Fri, 6 Nov 2009 17:20:54 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id nA6HKniW094401
	for freebsd-gecko@freebsd.org; Fri, 6 Nov 2009 17:20:49 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Fri, 6 Nov 2009 17:20:49 GMT
Message-Id: <200911061720.nA6HKniW094401@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] r154 - branches/experimental/www/seamonkey-devel
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: Fri, 06 Nov 2009 17:20:56 -0000

Author: beat
Date: Fri Nov  6 17:20:48 2009
New Revision: 154

Log:
- Add conflict with spidermonkey

Reported by:	Dan Nelson <dnelson AT allantgroup.com>

Modified:
   branches/experimental/www/seamonkey-devel/Makefile

Modified: branches/experimental/www/seamonkey-devel/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-devel/Makefile	Thu Nov  5 15:44:55 2009	(r153)
+++ branches/experimental/www/seamonkey-devel/Makefile	Fri Nov  6 17:20:48 2009	(r154)
@@ -15,7 +15,7 @@
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-CONFLICTS=	seamonkey-1*
+CONFLICTS=	seamonkey-1* spidermonkey-1.[0-7]*
 LATEST_LINK=	seamonkey-devel
 USE_BZIP2=	yes
 USE_GMAKE=	yes