From owner-cvs-all@FreeBSD.ORG  Thu Sep 22 17:03:13 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: 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 C949916A41F;
	Thu, 22 Sep 2005 17:03:13 +0000 (GMT) (envelope-from jmz@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 892BE43D48;
	Thu, 22 Sep 2005 17:03:13 +0000 (GMT) (envelope-from jmz@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8MH3Dtc092529;
	Thu, 22 Sep 2005 17:03:13 GMT (envelope-from jmz@repoman.freebsd.org)
Received: (from jmz@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8MH3D28092528;
	Thu, 22 Sep 2005 17:03:13 GMT (envelope-from jmz)
Message-Id: <200509221703.j8MH3D28092528@repoman.freebsd.org>
From: Jean-Marc Zucconi <jmz@FreeBSD.org>
Date: Thu, 22 Sep 2005 17:03:13 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/emulators/hfs Makefile ports/emulators/hfsutils
 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 22 Sep 2005 17:03:14 -0000

jmz         2005-09-22 17:03:13 UTC

  FreeBSD ports repository

  Modified files:
    emulators/hfs        Makefile 
    emulators/hfsutils   Makefile 
  Log:
  set CONFLICTS
  
  Revision  Changes    Path
  1.17      +2 -0      ports/emulators/hfs/Makefile
  1.25      +2 -0      ports/emulators/hfsutils/Makefile