CVS commit: pkgsrc/lang/python

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 10 10:31:29 UTC 2024

Modified Files:
        pkgsrc/lang/python: pyversion.mk versioned_dependencies.mk

Log Message:
python: remove dns from versioned_dependencies


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 pkgsrc/lang/python/pyversion.mk
cvs rdiff -u -r1.113 -r1.114 pkgsrc/lang/python/versioned_dependencies.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/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.157 pkgsrc/lang/python/pyversion.mk:1.158
--- pkgsrc/lang/python/pyversion.mk:1.157       Tue Nov  7 11:36:57 2023
+++ pkgsrc/lang/python/pyversion.mk     Fri May 10 10:31:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.157 2023/11/07 11:36:57 nia Exp $
+# $NetBSD: pyversion.mk,v 1.158 2024/05/10 10:31:29 wiz 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
@@ -31,7 +31,7 @@
 #      preferred over later ones.
 #
 #      Possible values: 312 311 310 39 38 27
-#      Default: 312 311 310 39 38 27
+#      Default: 312 311 310 39 38
 #
 # PYTHON_VERSIONS_INCOMPATIBLE
 #      The Python versions that are NOT acceptable for the package.
@@ -108,6 +108,9 @@ PYTHON_VERSION_DEFAULT?=            311
 PYTHON_VERSION_DEFAULT?=               310
 .endif
 PYTHON_VERSIONS_ACCEPTED?=             312 311 310 39 38 27
+.if defined(PYTHON_27_ACCEPTED)
+#PYTHON_VERSIONS_ACCEPTED+=            27
+.endif
 PYTHON_VERSIONS_INCOMPATIBLE?=         # empty by default
 
 # transform the list into individual variables

Index: pkgsrc/lang/python/versioned_dependencies.mk
diff -u pkgsrc/lang/python/versioned_dependencies.mk:1.113 pkgsrc/lang/python/versioned_dependencies.mk:1.114
--- pkgsrc/lang/python/versioned_dependencies.mk:1.113  Fri May 10 10:24:49 2024
+++ pkgsrc/lang/python/versioned_dependencies.mk        Fri May 10 10:31:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.113 2024/05/10 10:24:49 wiz Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.114 2024/05/10 10:31:29 wiz Exp $
 #
 # This file determines which separate distribution of a Python
 # package is used as dependency, depending on the Python version
@@ -9,7 +9,7 @@
 # PYTHON_VERSIONED_DEPENDENCIES
 #       The Python package which should be added as a dependency.
 #
-#       Possible values: OpenSSL cryptography dns
+#       Possible values: OpenSSL cryptography
 #       Default: (nothing)
 #
 
@@ -31,9 +31,6 @@ _PY_VERS_PKG.dependency.OpenSSL=      yes
 _PY_VERS_PKG.default.cryptography=     security/py-cryptography
 _PY_VERS_PKG.dependency.cryptography=  yes
 
-_PY_VERS_PKG.default.dns=      net/py-dns
-_PY_VERS_PKG.27.dns=           net/py-dns1
-
 .for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
 pkg:=  ${pattern:C/:.*//}
 type:= ${pattern:C/[^:]*//}