From nobody Fri Jan 14 09:46:44 2022 X-Original-To: dev-commits-ports-main@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 43218196486B; Fri, 14 Jan 2022 09:46:44 +0000 (UTC) (envelope-from gerald@pfeifer.com) Received: from hamza.pair.com (hamza.pair.com [209.68.5.143]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4JZxJz3Pphz3mfQ; Fri, 14 Jan 2022 09:46:43 +0000 (UTC) (envelope-from gerald@pfeifer.com) Received: from hamza.pair.com (localhost [127.0.0.1]) by hamza.pair.com (Postfix) with ESMTP id D0A2633F6C; Fri, 14 Jan 2022 04:46:37 -0500 (EST) Received: from [192.168.1.4] (unknown [46.57.98.167]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by hamza.pair.com (Postfix) with ESMTPSA id 123CC33F6A; Fri, 14 Jan 2022 04:46:36 -0500 (EST) Date: Fri, 14 Jan 2022 10:46:44 +0100 (CET) From: Gerald Pfeifer To: =?ISO-8859-15?Q?Stefan_E=DFer?= 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 In-Reply-To: <202201101516.20AFGNau035475@gitrepo.freebsd.org> Message-ID: References: <202201101516.20AFGNau035475@gitrepo.freebsd.org> List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="8323328-1935303762-1641981611=:18644" X-Rspamd-Queue-Id: 4JZxJz3Pphz3mfQ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of gerald@pfeifer.com designates 209.68.5.143 as permitted sender) smtp.mailfrom=gerald@pfeifer.com X-Spamd-Result: default: False [0.05 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[gerald]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; R_SPF_ALLOW(-0.20)[+a:hamza.pair.com]; DMARC_NA(0.00)[pfeifer.com]; NEURAL_SPAM_MEDIUM(0.41)[0.409]; NEURAL_HAM_LONG(-0.06)[-0.062]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-1.00)[-1.000]; CTYPE_MIXED_BOGUS(1.00)[]; MLMMJ_DEST(0.00)[dev-commits-ports-all,dev-commits-ports-main]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+]; ASN(0.00)[asn:7859, ipnet:209.68.0.0/18, country:US]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[46.57.98.167:received] X-ThisMailContainsUnwantedMimeParts: N This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-1935303762-1641981611=:18644 Content-Type: text/plain; CHARSET=ISO-8859-15 Content-Transfer-Encoding: 8BIT On Mon, 10 Jan 2022, =?utf-8?Q?Stefan E=C3=9Fer?= wrote: > 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 > > 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. Awesome! Thank you, both in general and for simplifying some of my ports. > 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). 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. Gerald --8323328-1935303762-1641981611=:18644--