CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 18 15:05:11 UTC 2025

Modified Files:
        pkgsrc/lang/python: versioned_dependencies.mk
Added Files:
        pkgsrc/security/py-bcrypt: dependency.mk

Log Message:
py-bcrypt: Support versioned dependencies.

Allows the older py-bcrypt3 package to be used as a dependency for
platforms that do not support Rust.

>From Jonathan Perkin <jperkin%smartos.org@localhost>
via drecklypkg commit 974f071270b80e53e8cdafee4c570282f870a985


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/lang/python/versioned_dependencies.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/security/py-bcrypt/dependency.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/versioned_dependencies.mk
diff -u pkgsrc/lang/python/versioned_dependencies.mk:1.115 pkgsrc/lang/python/versioned_dependencies.mk:1.116
--- pkgsrc/lang/python/versioned_dependencies.mk:1.115  Fri May 10 12:11:34 2024
+++ pkgsrc/lang/python/versioned_dependencies.mk        Tue Feb 18 15:05:10 2025
@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.115 2024/05/10 12:11:34 wiz Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.116 2025/02/18 15:05:10 wiz Exp $
 #
 # This file determines which separate distribution of a Python package
 # is used as dependency, depending on if Rust or C should be used.
@@ -10,13 +10,14 @@
 # PYTHON_VERSIONED_DEPENDENCIES
 #       The Python package which should be added as a dependency.
 #
-#       Possible values: OpenSSL cryptography
+#       Possible values: OpenSSL bcrypt cryptography
 #       Default: (nothing)
 #
 
 .include "../../lang/python/pyversion.mk"
 
 _PY_VERS_PKG.OpenSSL=          security/py-OpenSSL
+_PY_VERS_PKG.bcrypt=           security/py-bcrypt
 _PY_VERS_PKG.cryptography=     security/py-cryptography
 
 .for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}

Added files:

Index: pkgsrc/security/py-bcrypt/dependency.mk
diff -u /dev/null pkgsrc/security/py-bcrypt/dependency.mk:1.1
--- /dev/null   Tue Feb 18 15:05:11 2025
+++ pkgsrc/security/py-bcrypt/dependency.mk     Tue Feb 18 15:05:11 2025
@@ -0,0 +1,39 @@
+#
+# Not for public use - use through versioned_dependencies.mk.
+#
+# User-settable variables:
+#
+# PYBCRYPT_TYPE
+#      Type of py-bcrypt implementation used.
+#
+#      Possible values: c rust
+#      Default: rust on platforms were Rust is supported
+#
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.include "../../lang/rust/platform.mk"
+.if ${PLATFORM_SUPPORTS_RUST:tl} == "yes"
+PYBCRYPT_TYPE?=        rust
+.else
+PYBCRYPT_TYPE?=        c
+.endif
+
+.include "../../lang/python/pyversion.mk"
+.if ${PYBCRYPT_TYPE:tl} == "rust"
+PYBCRYPT_VERSION?=     bcrypt>=4
+PYBCRYPT_DIR?=         security/py-bcrypt
+.else
+PYBCRYPT_VERSION?=     bcrypt>=3<4
+PYBCRYPT_DIR?=         security/py-bcrypt3
+.endif
+
+.if "${type}" == ":build"
+TOOL_DEPENDS:= ${TOOL_DEPENDS} ${PYPKGPREFIX}-${PYBCRYPT_VERSION}:../../${PYBCRYPT_DIR}
+.elif "${type}" == ":test"
+TEST_DEPENDS:= ${TEST_DEPENDS} ${PYPKGPREFIX}-${PYBCRYPT_VERSION}:../../${PYBCRYPT_DIR}
+.elif "${type}" == ":tool"
+TOOL_DEPENDS:= ${TOOL_DEPENDS} ${PYPKGPREFIX}-${PYBCRYPT_VERSION}:../../${PYBCRYPT_DIR}
+.else
+DEPENDS:=      ${DEPENDS} ${PYPKGPREFIX}-${PYBCRYPT_VERSION}:../../${PYBCRYPT_DIR}
+.endif