From owner-cvs-all@FreeBSD.ORG Wed Dec 1 09:09:07 2010 Return-Path: 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 03EA9106567A for ; Wed, 1 Dec 2010 09:09:07 +0000 (UTC) (envelope-from pav@FreeBSD.org) Received: from raven.customer.vol.cz (raven.customer.vol.cz [195.250.144.108]) by mx1.freebsd.org (Postfix) with ESMTP id 506F18FC13 for ; Wed, 1 Dec 2010 09:09:06 +0000 (UTC) Received: from pav.hide.vol.cz (nat-application.b1.lan.prg.vol.cz [195.122.204.152]) (authenticated bits=0) by raven.customer.vol.cz (8.14.3/8.14.3) with ESMTP id oB198vCX041092 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Wed, 1 Dec 2010 10:08:59 +0100 (CET) (envelope-from pav@FreeBSD.org) Message-ID: <4CF610A9.7030102@FreeBSD.org> Date: Wed, 01 Dec 2010 10:08:57 +0100 From: Pav Lucistnik User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.2.12) Gecko/20101124 Thunderbird/3.1.6 MIME-Version: 1.0 To: Max Brazhnikov References: <201012010832.oB18WoDm097939@repoman.freebsd.org> <201012011153.54064.makc@freebsd.org> In-Reply-To: <201012011153.54064.makc@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 195.250.144.108 X-Milter: Spamilter (Reciever: raven.customer.vol.cz; Sender-ip: 195.122.204.152; Sender-helo: pav.hide.vol.cz; ) Cc: cvs-ports@FreeBSD.org, ports-committers@FreeBSD.org, beat@FreeBSD.org, cvs-all@FreeBSD.org, Martin Wilke Subject: Re: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2010 09:09:07 -0000 On 2010/12/01 09:53, Max Brazhnikov wrote: > 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. Don't think so. CONFLICTS_BUILD just changes the moment the check is performed, but the meaning remains. -- Pav Lucistnik