From owner-cvs-all@FreeBSD.ORG  Sat Oct 11 21:06:17 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 A038716A4B3; Sat, 11 Oct 2003 21:06:17 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 228F443F85; Sat, 11 Oct 2003 21:06:17 -0700 (PDT)
	(envelope-from perky@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 h9C46GXJ075479;
	Sat, 11 Oct 2003 21:06:16 -0700 (PDT)
	(envelope-from perky@repoman.freebsd.org)
Received: (from perky@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9C46Gnx075478;
	Sat, 11 Oct 2003 21:06:16 -0700 (PDT)
	(envelope-from perky)
Message-Id: <200310120406.h9C46Gnx075478@repoman.freebsd.org>
From: Hye-Shik Chang <perky@FreeBSD.org>
Date: Sat, 11 Oct 2003 21:06:16 -0700 (PDT)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/databases/zodb 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: Sun, 12 Oct 2003 04:06:17 -0000

perky       2003/10/11 21:06:16 PDT

  FreeBSD ports repository

  Modified files:
    databases/zodb       Makefile 
  Log:
  Add a CONFLICT entry against databases/zodb3.
  
  Spotted by:     kris
  
  Revision  Changes    Path
  1.7       +1 -0      ports/databases/zodb/Makefile