From owner-cvs-all@FreeBSD.ORG  Sat Jun 19 06:16:17 2004
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 EADB616A4CE; Sat, 19 Jun 2004 06:16:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id CB02443D54; Sat, 19 Jun 2004 06:16:17 +0000 (GMT)
	(envelope-from anholt@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5J6GHFn085228;
	Sat, 19 Jun 2004 06:16:17 GMT
	(envelope-from anholt@repoman.freebsd.org)
Received: (from anholt@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5J6GHCK085227;
	Sat, 19 Jun 2004 06:16:17 GMT
	(envelope-from anholt)
Message-Id: <200406190616.i5J6GHCK085227@repoman.freebsd.org>
From: Eric Anholt <anholt@FreeBSD.org>
Date: Sat, 19 Jun 2004 06:16:17 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/devel/imake-4 Makefile ports/devel/imake-6
 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: Sat, 19 Jun 2004 06:16:18 -0000

anholt      2004-06-19 06:16:17 UTC

  FreeBSD ports repository

  Modified files:
    devel/imake-4        Makefile 
    devel/imake-6        Makefile 
  Log:
  Register CONFLICTS between imake ports.
  
  Revision  Changes    Path
  1.30      +2 -0      ports/devel/imake-4/Makefile
  1.2       +2 -0      ports/devel/imake-6/Makefile