From owner-cvs-all@FreeBSD.ORG  Tue Oct 14 00:15:39 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D27FD16A4B3; Tue, 14 Oct 2003 00:15:39 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5393C43F3F; Tue, 14 Oct 2003 00:15:39 -0700 (PDT)
	(envelope-from edwin@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9E7FdXJ020815;
	Tue, 14 Oct 2003 00:15:39 -0700 (PDT)
	(envelope-from edwin@repoman.freebsd.org)
Received: (from edwin@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9E7FdGv020814;
	Tue, 14 Oct 2003 00:15:39 -0700 (PDT)
	(envelope-from edwin)
Message-Id: <200310140715.h9E7FdGv020814@repoman.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Tue, 14 Oct 2003 00:15:39 -0700 (PDT)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/lang/spidermonkey Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Oct 2003 07:15:40 -0000

edwin       2003/10/14 00:15:39 PDT

  FreeBSD ports repository

  Modified files:
    lang/spidermonkey    Makefile 
  Log:
  Add CONFLICT for lang/njs (njs-*)
  
  PR:             ports/57972 (initial)
  Submitted by:   Thierry Thomas <thierry@pompo.net>
  
  Revision  Changes    Path
  1.3       +2 -0      ports/lang/spidermonkey/Makefile