CVS commit: pkgsrc/lang/python

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Oct  5 19:08:13 UTC 2021

Modified Files:
        pkgsrc/lang/python: plist-python.awk pyversion.mk

Log Message:
Add support for Python 3.10


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/python/plist-python.awk
cvs rdiff -u -r1.137 -r1.138 pkgsrc/lang/python/pyversion.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python/plist-python.awk
diff -u pkgsrc/lang/python/plist-python.awk:1.2 pkgsrc/lang/python/plist-python.awk:1.3
--- pkgsrc/lang/python/plist-python.awk:1.2     Sat Dec  5 17:12:13 2015
+++ pkgsrc/lang/python/plist-python.awk Tue Oct  5 19:08:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: plist-python.awk,v 1.2 2015/12/05 17:12:13 adam Exp $
+# $NetBSD: plist-python.awk,v 1.3 2021/10/05 19:08:13 adam Exp $
 #
 # Copyright (c) 2012 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -45,7 +45,7 @@ BEGIN {
 /^[^@]/ && /[^\/]+\.py[co]$/ {
        sub(/[^\/]+\.py[co]$/, "__pycache__/&")
        sub(/\.py[co]$/, ".cpython-" PYVERS "&")
-       if (PYVERS ~ /^3[5-9]$/ && $0 ~ /\.pyo$/) {
+       if (PYVERS ~ /^3[0-9]+$/ && $0 ~ /\.pyo$/) {
                sub(/\.pyo$/, ".opt-1.pyc")
        }
 }

Index: pkgsrc/lang/python/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.137 pkgsrc/lang/python/pyversion.mk:1.138
--- pkgsrc/lang/python/pyversion.mk:1.137       Fri Oct  1 12:27:47 2021
+++ pkgsrc/lang/python/pyversion.mk     Tue Oct  5 19:08:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.137 2021/10/01 12:27:47 nia Exp $
+# $NetBSD: pyversion.mk,v 1.138 2021/10/05 19:08:13 adam Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -8,7 +8,7 @@
 # PYTHON_VERSION_DEFAULT
 #      The preferred Python version to use.
 #
-#      Possible values: 27 36 37 38 39
+#      Possible values: 27 36 37 38 39 310
 #      Default: 39
 #
 # === Infrastructure variables ===
@@ -27,13 +27,13 @@
 #      order of the entries matters, since earlier entries are
 #      preferred over later ones.
 #
-#      Possible values: 39 38 37 36 27
-#      Default: 39 38 37 36 27
+#      Possible values: 310 39 38 37 36 27
+#      Default: 310 39 38 37 36 27
 #
 # PYTHON_VERSIONS_INCOMPATIBLE
 #      The Python versions that are NOT acceptable for the package.
 #
-#      Possible values: 27 36 37 38 39
+#      Possible values: 27 36 37 38 39 310
 #      Default: (empty)
 #
 # PYTHON_FOR_BUILD_ONLY
@@ -85,7 +85,7 @@ BUILD_DEFS+=          PYTHON_VERSION_DEFAULT
 BUILD_DEFS_EFFECTS+=   PYPACKAGE
 
 PYTHON_VERSION_DEFAULT?=               39
-PYTHON_VERSIONS_ACCEPTED?=             39 38 37 36 27
+PYTHON_VERSIONS_ACCEPTED?=             310 39 38 37 36 27
 PYTHON_VERSIONS_INCOMPATIBLE?=         # empty by default
 
 # transform the list into individual variables