From owner-cvs-all@FreeBSD.ORG  Wed Dec 29 07:14:56 2010
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD3621065670;
	Wed, 29 Dec 2010 07:14:56 +0000 (UTC)
	(envelope-from miwi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B3E818FC12;
	Wed, 29 Dec 2010 07:14:56 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id oBT7EuPH051490;
	Wed, 29 Dec 2010 07:14:56 GMT
	(envelope-from miwi@repoman.freebsd.org)
Received: (from miwi@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oBT7Eurb051489;
	Wed, 29 Dec 2010 07:14:56 GMT (envelope-from miwi)
Message-Id: <201012290714.oBT7Eurb051489@repoman.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Wed, 29 Dec 2010 07:14:56 +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/Mk bsd.port.mk
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** 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: Wed, 29 Dec 2010 07:14:57 -0000

miwi        2010-12-29 07:14:56 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.port.mk 
  Log:
  - Fix Conflict handling. At the moment the build conflicts are recorded in
    the packages which is not necessary.
  
  Reported by:    makc@ via cvs-ports@, #bsdports
  Submitted by:   beat@
  
  Revision  Changes    Path
  1.666     +1 -4      ports/Mk/bsd.port.mk