Re: git: bcaf25a8c804 - main - Fix CONFLICTS entries of multiple ports

Am 14.01.22 um 10:46 schrieb Gerald Pfeifer:
> On Mon, 10 Jan 2022, Stefan Eßer wrote:
>>     Where possible, version numbers in conflicts entries have been
>>     generalized, some times taking advantage of the fact that a port
>>     cannot conflict with itself (due to logic in bsd.port.mk that
>>     suppresses the pattern match result in that case).
> 
> Indeed, the "a port cannot conflict with itself" part is one I did
> fail to understand in the past, unless you and me chatted a bit. ;-)
> 
> I believe it would be helpful if
>   https://docs.freebsd.org/en/books/porters-handbook/book/#conflicts
> had an explicit note that a package does not conflict with itself.

Yes, we had discussed this point before, and I do agree that the
description in the handbook is easily mis-understood, leading to
unnecessarily complex CONFLICTS entries.

There are two reviews that I have prepared to fix the conflicts checks
in bsd.port.mk to not ignore conflicts for the same port directory
(including all FLAVORs of a port), but only for the same package base
name:

  https://reviews.freebsd.org/D31151 (for all pkg versions)

  https://reviews.freebsd.org/D32694 (for pkg>=1.17.2 only)

I have only now noticed that bapt@ has accepted the latter review, but
I did not want to commit it until pkg-1.17.2 (released 2021-09-21) can
be assumed to be installed on all relevant systems.

Since these commits will change the details of CONFLICTS processing,
I'll wait with an update of the documentation until either of these
reviews has been accepted.

But I can prepare a review of the planned documentation change, now ...

Regards, STefan