Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 519ED84E9D for ; Thu, 20 Jul 2023 13:24:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id wTmRfIqawwES for ; Thu, 20 Jul 2023 13:24:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A158484C86 for ; Thu, 20 Jul 2023 13:24:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9AB86FBDB; Thu, 20 Jul 2023 13:24:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1689859478180690" MIME-Version: 1.0 Date: Thu, 20 Jul 2023 13:24:38 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/lang/python To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20230720132438.9AB86FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1689859478180690 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Thu Jul 20 13:24:38 UTC 2023 Modified Files: pkgsrc/lang/python: pyversion.mk Log Message: pyversion.mk: Clarify PYTHON_SELF_CONFLICT The CONFLICTS generated by PYTHON_SELF_CONFLICT are not only across python versions but also across major versions of the package; this is often correct but can be overbroad. To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 pkgsrc/lang/python/pyversion.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1689859478180690 Content-Disposition: inline Content-Length: 968 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python/pyversion.mk diff -u pkgsrc/lang/python/pyversion.mk:1.152 pkgsrc/lang/python/pyversion.mk:1.153 --- pkgsrc/lang/python/pyversion.mk:1.152 Tue Jun 27 10:35:57 2023 +++ pkgsrc/lang/python/pyversion.mk Thu Jul 20 13:24:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.152 2023/06/27 10:35:57 riastradh Exp $ +# $NetBSD: pyversion.mk,v 1.153 2023/07/20 13:24:38 gdt Exp $ # This file should be included by packages as a way to depend on # python when none of the other methods are appropriate, e.g. a @@ -47,7 +47,10 @@ # # PYTHON_SELF_CONFLICT # If set to "yes", additional CONFLICTS entries are added for -# registering a conflict between pyNN- packages. +# registering a conflict between pyNN- packages, +# covering all versions. (Expressing CONFLICTS that are limited +# to some versions must be done with a hand-written CONFLICTS +# entry.) # # Possible values: yes no # Default: no --_----------=_1689859478180690--