From: Stuart Henderson <stu@spacehopper.org>
Subject: switch ruff to MODPY_PYBUILD
To: Laurent Cheylus <foxy@free.fr>
Cc: ports <ports@openbsd.org>
Date: Sun, 22 Mar 2026 13:40:33 +0000

this provides the python module which is needed for some things which
want to use ruff (I noticed it while running tests for trio).

ok?

tests aren't ideal (result in things building again), but do run.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ruff/Makefile,v
diff -u -p -r1.8 Makefile
--- Makefile	11 Mar 2026 11:04:02 -0000	1.8
+++ Makefile	22 Mar 2026 13:29:52 -0000
@@ -3,9 +3,11 @@ NOT_FOR_ARCHS =	sparc64
 
 COMMENT =	Python linter and code formatter
 
+MODPY_DISTV =	0.15.5
+REVISION =	0
 GH_ACCOUNT =	astral-sh
 GH_PROJECT =	ruff
-GH_TAGNAME =	0.15.5
+GH_TAGNAME =	${MODPY_DISTV}
 
 # Rust crates downloaded via git
 LSPTYPES =	e15db0593f0ecbbd80599c3f5880e4bf5da1ca0c
@@ -29,26 +31,17 @@ WANTLIB +=	${MODCARGO_WANTLIB} m zstd
 LIB_DEPENDS +=	archivers/zstd
 TEST_DEPENDS+=	${LIB_DEPENDS}
 
-MODULES =	devel/cargo
-
-CONFIGURE_STYLE =	cargo
+MODULES =	lang/python
+MODPY_PYBUILD =	maturin
 
+MODCARGO_CARGOTOML =	${WRKSRC}/crates/ruff/Cargo.toml
 MODCARGO_RUSTFLAGS +=	-L${LOCALBASE}/lib
 
-SEPARATE_BUILD=	Yes
-
 # Generate shell completions
-pre-install:
-	${MODCARGO_TARGET_DIR}/release/ruff generate-shell-completion bash \
-		> ${WRKSRC}/ruff.bash
-	${MODCARGO_TARGET_DIR}/release/ruff generate-shell-completion fish \
-		> ${WRKSRC}/ruff.fish
-	${MODCARGO_TARGET_DIR}/release/ruff generate-shell-completion zsh \
-		> ${WRKSRC}/ruff.zsh
-
-do-install:
-	${INSTALL_PROGRAM} ${MODCARGO_TARGET_DIR}/release/ruff ${PREFIX}/bin/
-
+post-install:
+.for i in bash fish zsh
+	${PREFIX}/bin/ruff generate-shell-completion $i > ${WRKSRC}/ruff.$i
+.endfor
 	${INSTALL_DATA_DIR} \
 		${PREFIX}/share/bash-completion/completions \
 		${PREFIX}/share/fish/vendor_completions.d \
@@ -62,6 +55,9 @@ do-install:
 
 # Skip tests with errors (generate_json_schema, idx)
 MODCARGO_TEST_ARGS +=	-- --skip generate_json_schema --skip idx
+
+do-test:
+	@${MODCARGO_TEST_TARGET:S/maturin/cargo/}
 
 # TODO: fix tests
 # test commands::format::tests::error_diagnostics ... FAILED
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ruff/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST	19 Oct 2025 12:34:49 -0000	1.1.1.1
+++ pkg/PLIST	22 Mar 2026 13:29:52 -0000
@@ -1,4 +1,21 @@
 @bin bin/ruff
+lib/python${MODPY_VERSION}/site-packages/ruff/
+lib/python${MODPY_VERSION}/site-packages/ruff-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ruff-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ruff-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ruff-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ruff-${MODPY_DISTV}.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/ruff-${MODPY_DISTV}.dist-info/licenses/LICENSE
+lib/python${MODPY_VERSION}/site-packages/ruff/__init__.py
+lib/python${MODPY_VERSION}/site-packages/ruff/__main__.py
+lib/python${MODPY_VERSION}/site-packages/ruff/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ruff/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ruff/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ruff/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ruff/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ruff/${MODPY_PYCACHE}_find_ruff.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ruff/${MODPY_PYCACHE}_find_ruff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ruff/_find_ruff.py
 share/bash-completion/
 share/bash-completion/completions/
 share/bash-completion/completions/ruff