pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/python python: teach PYTHON_VERSION_REQD about 3 ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd8d90eba8aa
branches:  trunk
changeset: 391687:bd8d90eba8aa
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jan 12 10:56:12 2023 +0000

description:
python: teach PYTHON_VERSION_REQD about 3 digit versions (eg py310).

diffstat:

 lang/python/pyversion.mk |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 05b8104aad0b -r bd8d90eba8aa lang/python/pyversion.mk
--- a/lang/python/pyversion.mk  Thu Jan 12 10:50:50 2023 +0000
+++ b/lang/python/pyversion.mk  Thu Jan 12 10:56:12 2023 +0000
@@ -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 @@
 .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"



Home | Main Index | Thread Index | Old Index