Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715343094199110"
MIME-Version: 1.0
Date: Fri, 10 May 2024 12:11:34 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/lang/python
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240510121134.E8A7CFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715343094199110
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri May 10 12:11:34 UTC 2024

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

Log Message:
python: reduce code in versioned_dependencies

This is now just used for deciding between Rust and C versions
of py-cryptography and py-OpenSSL, so it doesn't need most of its code.

XXX: we should consider directly using the dependency.mk files of these
two packages.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 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.


--_----------=_1715343094199110
Content-Disposition: inline
Content-Length: 2802
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/python/versioned_dependencies.mk
diff -u pkgsrc/lang/python/versioned_dependencies.mk:1.114 pkgsrc/lang/python/versioned_dependencies.mk:1.115
--- pkgsrc/lang/python/versioned_dependencies.mk:1.114	Fri May 10 10:31:29 2024
+++ pkgsrc/lang/python/versioned_dependencies.mk	Fri May 10 12:11:34 2024
@@ -1,10 +1,11 @@
-# $NetBSD: versioned_dependencies.mk,v 1.114 2024/05/10 10:31:29 wiz Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.115 2024/05/10 12:11:34 wiz Exp $
 #
-# This file determines which separate distribution of a Python
-# package is used as dependency, depending on the Python version
-# used.
+# This file determines which separate distribution of a Python package
+# is used as dependency, depending on if Rust or C should be used.
+# The C versions are old and unmaintained but on some platforms it is
+# harder to get Rust running.
 #
-# === User-settable variables ===
+# === Package-settable variables ===
 #
 # PYTHON_VERSIONED_DEPENDENCIES
 #       The Python package which should be added as a dependency.
@@ -15,42 +16,11 @@
 
 .include "../../lang/python/pyversion.mk"
 
-# _PY_VERS_PKG.${PYTHON_VERSION}.${pkg} is the path used for the dependency
-# for a specific Python version. This can be "missing", if this Python
-# version is not supported for this package.
-#
-# _PY_VERS_PKG.default.${pkg} is the fallback version if a specific version
-# isn't known.
-#
-# _PY_VERS_PKG.dependency.${PKG} flags packages that need Rust-specific
-# handling.
-
-_PY_VERS_PKG.default.OpenSSL=	security/py-OpenSSL
-_PY_VERS_PKG.dependency.OpenSSL=	yes
-
-_PY_VERS_PKG.default.cryptography=	security/py-cryptography
-_PY_VERS_PKG.dependency.cryptography=	yes
+_PY_VERS_PKG.OpenSSL=		security/py-OpenSSL
+_PY_VERS_PKG.cryptography=	security/py-cryptography
 
 .for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
 pkg:=	${pattern:C/:.*//}
 type:=	${pattern:C/[^:]*//}
-dir:=	${_PY_VERS_PKG.${_PYTHON_VERSION}.${pkg}:U${_PY_VERS_PKG.default.${pkg}:Umissing}}
-.  if ${dir} == "missing"
-PKG_FAIL_REASON+=	"${pkg} unsupported in PYTHON_VERSIONED_DEPENDENCIES"
-.  else
-.    if ${_PY_VERS_PKG.dependency.${pkg}:Uno} == "yes"
-.      include "../../${_PY_VERS_PKG.default.${pkg}}/dependency.mk"
-.    endif
-.    if "${type}" == ":link"
-.include "../../${dir}/buildlink3.mk"
-.    elif "${type}" == ":build"
-TOOL_DEPENDS:=	${TOOL_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
-.    elif "${type}" == ":test"
-TEST_DEPENDS:=	${TEST_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
-.    elif "${type}" == ":tool"
-TOOL_DEPENDS:=	${TOOL_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
-.    else
-DEPENDS:=	${DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
-.    endif
-.  endif
+.  include "../../${_PY_VERS_PKG.${pkg}}/dependency.mk"
 .endfor


--_----------=_1715343094199110--