CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Wed, 13 Nov 2024 13:32:26 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 13 13:32:26 UTC 2024

Modified Files:
        pkgsrc/archivers/py-cramjam: Makefile
        pkgsrc/devel/py-cddl: Makefile
        pkgsrc/devel/py-pydantic-core: Makefile
        pkgsrc/devel/py-rpds-py: Makefile
        pkgsrc/devel/py-ruff: Makefile
        pkgsrc/misc/py-watchfiles: Makefile
        pkgsrc/net/py-mitmproxy_rs: Makefile
        pkgsrc/security/py-cryptography: Makefile
        pkgsrc/textproc/py-jellyfish: Makefile
        pkgsrc/textproc/py-orjson: Makefile
        pkgsrc/www/py-nh3: Makefile

Log Message:
*: Switch to py-maturin's tool.mk


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/py-cramjam/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-cddl/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/py-pydantic-core/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-rpds-py/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/py-ruff/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/py-watchfiles/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-mitmproxy_rs/Makefile
cvs rdiff -u -r1.121 -r1.122 pkgsrc/security/py-cryptography/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/py-jellyfish/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/py-orjson/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/py-nh3/Makefile

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

Modified files:

Index: pkgsrc/archivers/py-cramjam/Makefile
diff -u pkgsrc/archivers/py-cramjam/Makefile:1.4 pkgsrc/archivers/py-cramjam/Makefile:1.5
--- pkgsrc/archivers/py-cramjam/Makefile:1.4    Wed Oct 23 21:33:42 2024
+++ pkgsrc/archivers/py-cramjam/Makefile        Wed Nov 13 13:32:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/10/23 21:33:42 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/11/13 13:32:25 jperkin Exp $
 
 DISTNAME=      cramjam-2.8.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@ HOMEPAGE=     https://github.com/milesgrange
 COMMENT=       Extremely thin Python bindings to de/compression algorithms in Rust
 LICENSE=       mit
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=0.14:../../devel/py-maturin
 TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
 TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm
 TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
@@ -24,6 +23,7 @@ USE_LIBTOOL=  yes
 
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-cddl/Makefile
diff -u pkgsrc/devel/py-cddl/Makefile:1.4 pkgsrc/devel/py-cddl/Makefile:1.5
--- pkgsrc/devel/py-cddl/Makefile:1.4   Mon Aug 12 17:52:42 2024
+++ pkgsrc/devel/py-cddl/Makefile       Wed Nov 13 13:32:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/08/12 17:52:42 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/11/13 13:32:25 jperkin Exp $
 
 DISTNAME=      pycddl-0.6.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,7 +10,6 @@ HOMEPAGE=     https://pypi.org/project/pycdd
 COMMENT=       Deserialize CBOR and/or do CDDL schema validation
 LICENSE=       mit
 
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-maturin>=1:../../devel/py-maturin
 TEST_DEPENDS+=         ${PYPKGPREFIX}-cbor2>=0:../../devel/py-cbor2
 TEST_DEPENDS+=         ${PYPKGPREFIX}-hypothesis>=0:../../devel/py-hypothesis
 TEST_DEPENDS+=         ${PYPKGPREFIX}-psutil>=0:../../sysutils/py-psutil
@@ -23,6 +22,7 @@ USE_LANGUAGES+=               c
 
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-pydantic-core/Makefile
diff -u pkgsrc/devel/py-pydantic-core/Makefile:1.21 pkgsrc/devel/py-pydantic-core/Makefile:1.22
--- pkgsrc/devel/py-pydantic-core/Makefile:1.21 Mon Nov 11 09:06:10 2024
+++ pkgsrc/devel/py-pydantic-core/Makefile      Wed Nov 13 13:32:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/11/11 09:06:10 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2024/11/13 13:32:25 jperkin Exp $
 
 DISTNAME=      pydantic_core-2.26.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -10,7 +10,6 @@ HOMEPAGE=     https://github.com/pydantic/py
 COMMENT=       Core functionality for pydantic
 LICENSE=       mit
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=1.7.1:../../devel/py-maturin
 DEPENDS+=      ${PYPKGPREFIX}-typing-extensions>=4.6.0:../../devel/py-typing-extensions
 TEST_DEPENDS+= ${PYPKGPREFIX}-dirty-equals>=0.7.1.post0:../../devel/py-dirty-equals
 TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=6.92.9:../../devel/py-hypothesis
@@ -24,6 +23,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-inline-sna
 
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-rpds-py/Makefile
diff -u pkgsrc/devel/py-rpds-py/Makefile:1.19 pkgsrc/devel/py-rpds-py/Makefile:1.20
--- pkgsrc/devel/py-rpds-py/Makefile:1.19       Tue Nov 12 13:19:18 2024
+++ pkgsrc/devel/py-rpds-py/Makefile    Wed Nov 13 13:32:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/11/12 13:19:18 adam Exp $
+# $NetBSD: Makefile,v 1.20 2024/11/13 13:32:25 jperkin Exp $
 
 DISTNAME=      rpds_py-0.21.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -10,10 +10,9 @@ HOMEPAGE=    https://github.com/crate-py/rp
 COMMENT=       Python bindings to Rust's persistent data structures (rpds)
 LICENSE=       mit
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=1.2:../../devel/py-maturin
-
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-ruff/Makefile
diff -u pkgsrc/devel/py-ruff/Makefile:1.42 pkgsrc/devel/py-ruff/Makefile:1.43
--- pkgsrc/devel/py-ruff/Makefile:1.42  Mon Nov 11 08:03:47 2024
+++ pkgsrc/devel/py-ruff/Makefile       Wed Nov 13 13:32:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2024/11/11 08:03:47 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2024/11/13 13:32:25 jperkin Exp $
 
 DISTNAME=      ruff-0.7.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,6 @@ HOMEPAGE=     https://github.com/astral-sh/r
 COMMENT=       Extremely fast Python linter, written in Rust
 LICENSE=       mit
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=1.7.1:../../devel/py-maturin
-
 USE_LANGUAGES= c c++
 
 # for tikv-jemalloc-sys
@@ -35,6 +33,7 @@ post-install:
 
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/py-watchfiles/Makefile
diff -u pkgsrc/misc/py-watchfiles/Makefile:1.5 pkgsrc/misc/py-watchfiles/Makefile:1.6
--- pkgsrc/misc/py-watchfiles/Makefile:1.5      Mon Oct 21 13:06:31 2024
+++ pkgsrc/misc/py-watchfiles/Makefile  Wed Nov 13 13:32:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2024/10/21 13:06:31 adam Exp $
+# $NetBSD: Makefile,v 1.6 2024/11/13 13:32:25 jperkin Exp $
 
 DISTNAME=      watchfiles-0.24.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@ HOMEPAGE=     https://github.com/samuelcolvi
 COMMENT=       Simple, modern and high performance file watching and code reload
 LICENSE=       mit
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=0.14.16:../../devel/py-maturin
 DEPENDS+=      ${PYPKGPREFIX}-anyio>=3.0.0:../../devel/py-anyio
 
 # Depends on an unpublished crate. Can't use cargo.mk to fetch it.
@@ -26,6 +25,7 @@ post-install:
 
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-mitmproxy_rs/Makefile
diff -u pkgsrc/net/py-mitmproxy_rs/Makefile:1.4 pkgsrc/net/py-mitmproxy_rs/Makefile:1.5
--- pkgsrc/net/py-mitmproxy_rs/Makefile:1.4     Mon Oct 14 06:45:55 2024
+++ pkgsrc/net/py-mitmproxy_rs/Makefile Wed Nov 13 13:32:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/10/14 06:45:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/11/13 13:32:25 jperkin Exp $
 
 DISTNAME=      mitmproxy_rs-0.5.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,14 +10,13 @@ HOMEPAGE=   https://github.com/mitmproxy/m
 COMMENT=       Mitmproxy's Rust bits
 LICENSE=       mit
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=1:../../devel/py-maturin
-
 MAKE_ENV+=     CARGO_NET_OFFLINE=true
 
 PYTHON_VERSIONS_INCOMPATIBLE=  39
 
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-cryptography/Makefile
diff -u pkgsrc/security/py-cryptography/Makefile:1.121 pkgsrc/security/py-cryptography/Makefile:1.122
--- pkgsrc/security/py-cryptography/Makefile:1.121      Mon Nov 11 07:28:54 2024
+++ pkgsrc/security/py-cryptography/Makefile    Wed Nov 13 13:32:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2024/11/11 07:28:54 wiz Exp $
+# $NetBSD: Makefile,v 1.122 2024/11/13 13:32:26 jperkin Exp $
 
 DISTNAME=      cryptography-43.0.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ LICENSE=      apache-2.0 OR modified-bsd
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=61.0.0:../../devel/py-setuptools
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-rust>=1.7.0:../../devel/py-setuptools-rust
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=1.7.1:../../devel/py-maturin
 DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.12:../../devel/py-cffi
 TEST_DEPENDS+= ${PYPKGPREFIX}-cryptography_vectors-${PKGVERSION_NOREV}:../../security/py-cryptography_vectors
 TEST_DEPENDS+= ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
@@ -32,6 +31,7 @@ pre-build:
 
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/textproc/py-jellyfish/Makefile
diff -u pkgsrc/textproc/py-jellyfish/Makefile:1.9 pkgsrc/textproc/py-jellyfish/Makefile:1.10
--- pkgsrc/textproc/py-jellyfish/Makefile:1.9   Tue Aug 20 13:01:42 2024
+++ pkgsrc/textproc/py-jellyfish/Makefile       Wed Nov 13 13:32:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/08/20 13:01:42 adam Exp $
+# $NetBSD: Makefile,v 1.10 2024/11/13 13:32:26 jperkin Exp $
 
 DISTNAME=      jellyfish-1.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,10 +10,9 @@ HOMEPAGE=    https://github.com/jamesturk/j
 COMMENT=       Python library for doing approximate and phonetic matching of strings
 LICENSE=       2-clause-bsd
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=0.14:../../devel/py-maturin
-
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-orjson/Makefile
diff -u pkgsrc/textproc/py-orjson/Makefile:1.10 pkgsrc/textproc/py-orjson/Makefile:1.11
--- pkgsrc/textproc/py-orjson/Makefile:1.10     Sun Nov  3 19:19:52 2024
+++ pkgsrc/textproc/py-orjson/Makefile  Wed Nov 13 13:32:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2024/11/03 19:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.11 2024/11/13 13:32:26 jperkin Exp $
 
 DISTNAME=      orjson-3.10.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,10 +10,9 @@ HOMEPAGE=    https://github.com/ijl/orjson
 COMMENT=       Fast, correct Python JSON library
 LICENSE=       apache-2.0 OR mit
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin>=1.7.1:../../devel/py-maturin
-
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-nh3/Makefile
diff -u pkgsrc/www/py-nh3/Makefile:1.5 pkgsrc/www/py-nh3/Makefile:1.6
--- pkgsrc/www/py-nh3/Makefile:1.5      Sun Jul 14 13:08:07 2024
+++ pkgsrc/www/py-nh3/Makefile  Wed Nov 13 13:32:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2024/07/14 13:08:07 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2024/11/13 13:32:26 jperkin Exp $
 
 DISTNAME=      nh3-0.2.18
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,14 +10,13 @@ HOMEPAGE=   https://github.com/messense/nh
 COMMENT=       Python bindings for Ammonia HTML cleaner
 LICENSE=       mit
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin-[0-9]*:../../devel/py-maturin
-
 USE_LANGUAGES=         c
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "cargo-depends.mk"
 
+.include "../../devel/py-maturin/tool.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Prev by Date: CVS commit: pkgsrc/devel/py-maturin
Next by Date: CVS commit: pkgsrc/net/termscp
Previous by Thread: CVS commit: pkgsrc/devel/py-maturin
Next by Thread: CVS commit: pkgsrc/net/termscp
Indexes:

Home | Main Index | Thread Index | Old Index