From nobody Mon Jan 10 22:10:31 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C26FE1937DC1; Mon, 10 Jan 2022 22:10:37 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXp1956mrz4gyh; Mon, 10 Jan 2022 22:10:37 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 783D13C0199; Mon, 10 Jan 2022 22:10:31 +0000 (UTC) Date: Mon, 10 Jan 2022 22:10:31 +0000 From: Brooks Davis To: Stefan E??er Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: bcaf25a8c804 - main - Fix CONFLICTS entries of multiple ports Message-ID: <20220110221031.GA98055@spindle.one-eyed-alien.net> References: <202201101516.20AFGNau035475@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7JfCtLOvnd9MIVvH" Content-Disposition: inline In-Reply-To: <202201101516.20AFGNau035475@gitrepo.freebsd.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4JXp1956mrz4gyh X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 10, 2022 at 03:16:23PM +0000, Stefan E??er wrote: > The branch main has been updated by se: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Dbcaf25a8c8046b094f6b5ab5= bc258333bc326ee1 >=20 > commit bcaf25a8c8046b094f6b5ab5bc258333bc326ee1 > Author: Stefan E??er > AuthorDate: 2022-01-10 14:20:12 +0000 > Commit: Stefan E??er > CommitDate: 2022-01-10 15:15:39 +0000 >=20 > Fix CONFLICTS entries of multiple ports > =20 > 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. > =20 > 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. > =20 > 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). > =20 > 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. > =20 > 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, > =20 > Approved by: portmgr (implicit) The devel/llvm-devel port change (truncated in the email) contains: +CONFLICTS_INSTALL=3D llvm-devel This confuses me. Why are we adding a self-conflict? -- Brooks --7JfCtLOvnd9MIVvH Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJh3K7WAAoJEKzQXbSebgfAMLoH/25OHxgJpuR0b52YNKmqKa3k OJbtIhJcUMAhu0o+KEnXBhpuswjQx9WlGQuY16EFVHbuhpqdpXyaJkejx0UkIlf8 toRFmB6QBGpzuwsjjJ7iFrLUtJup11QEpUqZN5OzdECwETRn4ZSXhOxmpR5nRTRm LF+owUgqtr5DE2GoI6JbFBMIn+6qrmNqGx9U2EBejBj913ZD52dL+FB7cjUPVSRY lGwRBpNuTjOWWdgUigGadG0R7GB8VZniZ3ox6MtovoKM372b6MWsQCNVW0P88I38 TJ8cWTx2pDGu8A6FDjcVzou1iQvozcXJCjr+m01su1PMtiJfFtq2fJs73533gus= =ezsB -----END PGP SIGNATURE----- --7JfCtLOvnd9MIVvH--