Received: by mail.netbsd.org (Postfix, from userid 605) id E836784D08; Thu, 12 Jan 2023 10:56:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2375A84CFC for ; Thu, 12 Jan 2023 10:56:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id mPAVdf0I6kFI for ; Thu, 12 Jan 2023 10:56:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9D8E184CD8 for ; Thu, 12 Jan 2023 10:56:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 96F36FA90; Thu, 12 Jan 2023 10:56:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1673520972127560" MIME-Version: 1.0 Date: Thu, 12 Jan 2023 10:56:12 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/lang/python To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20230112105612.96F36FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1673520972127560 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Thu Jan 12 10:56:12 UTC 2023 Modified Files: pkgsrc/lang/python: pyversion.mk Log Message: python: teach PYTHON_VERSION_REQD about 3 digit versions (eg py310). To generate a diff of this commit: cvs rdiff -u -r1.145 -r1.146 pkgsrc/lang/python/pyversion.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1673520972127560 Content-Disposition: inline Content-Length: 1516 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.145 pkgsrc/lang/python/pyversion.mk:1.146 --- pkgsrc/lang/python/pyversion.mk:1.145 Thu Dec 1 15:16:28 2022 +++ pkgsrc/lang/python/pyversion.mk Thu Jan 12 10:56:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.145 2022/12/01 15:16:28 gdt Exp $ +# $NetBSD: pyversion.mk,v 1.146 2023/01/12 10:56:12 markd 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 @@ -77,9 +77,15 @@ PYTHON_PYVERSION_MK= defined .if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \ defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*) PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} +.elif defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9][0-9]-*) || \ + defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9][0-9]-*) +PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9][0-9])-.*/\2/} .elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \ defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*) PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} +.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9][0-9]-*) || \ + defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9][0-9]-*) +PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9][0-9])-.*/\2/} .endif .include "../../mk/bsd.prefs.mk" --_----------=_1673520972127560--