Date: Wed, 1 Dec 2010 11:53:53 +0300 From: Max Brazhnikov <makc@freebsd.org> To: Martin Wilke <miwi@freebsd.org> 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 Message-ID: <201012011153.54064.makc@freebsd.org> In-Reply-To: <201012010832.oB18WoDm097939@repoman.freebsd.org> References: <201012010832.oB18WoDm097939@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012011153.54064.makc>