Re: git: bcaf25a8c804 - main - Fix CONFLICTS entries of multiple ports
Date: Mon, 10 Jan 2022 22:10:31 UTC
On Mon, Jan 10, 2022 at 03:16:23PM +0000, Stefan E??er wrote: > The branch main has been updated by se: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=bcaf25a8c8046b094f6b5ab5bc258333bc326ee1 > > commit bcaf25a8c8046b094f6b5ab5bc258333bc326ee1 > Author: Stefan E??er <se@FreeBSD.org> > AuthorDate: 2022-01-10 14:20:12 +0000 > Commit: Stefan E??er <se@FreeBSD.org> > CommitDate: 2022-01-10 15:15:39 +0000 > > Fix CONFLICTS entries of multiple ports > > There have been lots of missing CONFLICTS_INSTALL entries, either > because conflicting ports were added without updating existing ports, > due to name changes of generated packages, due to mis-understanding > the format and semantics of the conflicts entries, or just due to > typoes in package names. > > This patch is the result of a comparison of all files contained in > the official packages with each other. This comparison was based on > packages built with default options and may therefore have missed > further conflicts with optionally installed files. > > 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 > supresses the pattern match result in that case). > > A few ports that set the conflicts variables depending on complex > conditions (e.g. port options), have been left unmodified, despite > probably containing outdated package names. > > These changes should only affect the installation of locally built > ports, not the package building with poudriere. They should give an > early indication of the install conflict in cases where currently > the pkg command aborts an installation when it detects that an > existing file would be overwritten, > > Approved by: portmgr (implicit) The devel/llvm-devel port change (truncated in the email) contains: +CONFLICTS_INSTALL= llvm-devel This confuses me. Why are we adding a self-conflict? -- Brooks