From owner-cvs-all@FreeBSD.ORG  Thu May 17 22:07:19 2012
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1CB97106566B;
	Thu, 17 May 2012 22:07:19 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E39B28FC1B;
	Thu, 17 May 2012 22:07:18 +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 q4HM7IWA070479;
	Thu, 17 May 2012 22:07:18 GMT
	(envelope-from bapt@repoman.freebsd.org)
Received: (from bapt@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q4HM7IWC070478;
	Thu, 17 May 2012 22:07:18 GMT (envelope-from bapt)
Message-Id: <201205172207.q4HM7IWC070478@repoman.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 17 May 2012 22:07:18 +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.pkgng.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: Thu, 17 May 2012 22:07:19 -0000

bapt        2012-05-17 22:07:18 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.pkgng.mk 
  Log:
  Fix conflict handling when pkgng is used.
  
  Submitted by:   Garrett Cooper <yanegomi@gmail.com>
  
  Revision  Changes    Path
  1.4       +13 -13    ports/Mk/bsd.pkgng.mk