From owner-cvs-ports@FreeBSD.ORG  Wed Dec  1 08:53:56 2010
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90225106564A;
	Wed,  1 Dec 2010 08:53:56 +0000 (UTC)
	(envelope-from makc@freebsd.org)
Received: from mail.issp.ac.ru (mail.issp.ac.ru [77.236.34.3])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D90C8FC1A;
	Wed,  1 Dec 2010 08:53:55 +0000 (UTC)
Received: from lqc.issp.ac.ru [77.236.34.156:48937] (HELO/EHLO lqc.issp.ac.ru,
	authenticated with PLAIN)
	by mail.issp.ac.ru with ESMTP/inet id oB18rqbV081831 (using TLSv1/SSLv3,
	with cipher DHE-RSA-AES256-SHA (256 bits), verified NO)
	Wed, 1 Dec 2010 11:53:52 +0300 (MSK)
From: Max Brazhnikov <makc@freebsd.org>
To: Martin Wilke <miwi@freebsd.org>
Date: Wed, 1 Dec 2010 11:53:53 +0300
User-Agent: KMail/1.13.5 (FreeBSD/8.1-STABLE; KDE/4.5.3; i386; ; )
References: <201012010832.oB18WoDm097939@repoman.freebsd.org>
In-Reply-To: <201012010832.oB18WoDm097939@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Message-Id: <201012011153.54064.makc@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by
	milter-greylist-3.0 (mail.issp.ac.ru [77.236.34.3]);
	Wed, 01 Dec 2010 11:53:52 +0300 (MSK)
Cc: cvs-ports@freebsd.org, beat@freebsd.org, cvs-all@freebsd.org,
	ports-committers@freebsd.org
Subject: Re: cvs commit: ports/Mk bsd.port.mk
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Dec 2010 08:53:56 -0000

On Wed, 1 Dec 2010 08:32:50 +0000 (UTC), Martin Wilke wrote:
> miwi        2010-12-01 08:32:50 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     Mk                   bsd.port.mk
>   Log:
>   - Remove two checks obviated by the removal of _OPTIONSFILE in revision
> 1.596 [1] - Remove Legacy USE_BISON in bsd.port.mk [2]
>   - Remove Legacy 2004 Hack in bsd.port.mk [3]
> 
>   - CONFLICT handling in has been reworked. There are two new variables in
> bsd.ports.mk: - CONFLICTS_BUILDS: Check for conflicts prior to build
>     - CONFLICTS_INSTALL: Check for conflicts prior to installation stage
> 
>       The existing CONFLICTS checks for conflicts prior to build and
> installation stage. Users could defer the conflict check of
> CONFLICTS_BUILDS and CONFLICTS to the installation stage by using
> DEFER_CONFLICTS_CHECK. As already possible with CONFLICTS the new conflict
> checks could be disabled by using DISABLE_CONFLICTS. This patch was
> submitted by beat@

Thanks! One comment on the patch:

 .if defined(CONFLICTS) && !defined(DISABLE_CONFLICTS)
 PKG_ARGS+=		-C "${CONFLICTS}"
 .endif
+.if defined(CONFLICTS_BUILD) && !defined(DISABLE_CONFLICTS)
+PKG_ARGS+=		-C "${CONFLICTS_BUILD}"
+.endif
+.if defined(CONFLICTS_INSTALL) && !defined(DISABLE_CONFLICTS)
+PKG_ARGS+=		-C "${CONFLICTS_INSTALL}"
+.endif
 .endif
 .if defined(PKG_NOCOMPRESS)
 PKG_SUFX?=		.tar

It seems for me that CONFLICTS_BUILD is needless for packages and can be 
removed.

Max