CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 19 20:53:36 UTC 2026

Modified Files:
        pkgsrc/lang/rust: Makefile distinfo
Added Files:
        pkgsrc/lang/rust/patches:
            patch-src_tools_cargo_src_bin_cargo_commands_help.rs

Log Message:
rust: fix 'cargo help build' on NetBSD

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.357 -r1.358 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.196 -r1.197 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/rust/patches/patch-src_tools_cargo_src_bin_cargo_commands_help.rs

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

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.357 pkgsrc/lang/rust/Makefile:1.358
--- pkgsrc/lang/rust/Makefile:1.357     Thu Apr  9 09:25:47 2026
+++ pkgsrc/lang/rust/Makefile   Sun Apr 19 20:53:35 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.357 2026/04/09 09:25:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.358 2026/04/19 20:53:35 wiz Exp $
 
 DISTNAME=      rustc-1.94.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  https://static.rust-lang.org/dist/
 

Index: pkgsrc/lang/rust/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.196 pkgsrc/lang/rust/distinfo:1.197
--- pkgsrc/lang/rust/distinfo:1.196     Thu Apr  2 19:06:34 2026
+++ pkgsrc/lang/rust/distinfo   Sun Apr 19 20:53:35 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.196 2026/04/02 19:06:34 wiz Exp $
+$NetBSD: distinfo,v 1.197 2026/04/19 20:53:35 wiz Exp $
 
 BLAKE2s (rust-1.93.1-aarch64-apple-darwin.tar.gz) = 79c7b27c43db89e7dd8165b6aa067944004ab5b3483b5ae39b1390b714a7cf6a
 SHA512 (rust-1.93.1-aarch64-apple-darwin.tar.gz) = a1335f2101121fff361c8f7b4f02242402e26144b745c27ddb774c3831c589cb9b9d987789a3f680ac5e7230aad74d1af12c782c5036f7bdd99b4615620b56fa
@@ -130,6 +130,7 @@ SHA1 (patch-src_llvm-project_llvm_cmake_
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
 SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 75019dcb3dbca6cda33ba329dbe483101dcf48e7
 SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad8f75bf8a16de625135b26bacc15
+SHA1 (patch-src_tools_cargo_src_bin_cargo_commands_help.rs) = 463de040af81f7c760736e0165e1b27537a2a52f
 SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = e1af7fde97416e0a269ee34efd37f4f47fcf7a95
 SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 333ec513b9b94750b2424a7c1b21c809e6ea25b8
 SHA1 (patch-src_tools_rust-installer_install-template.sh) = f222961e0fd4bac2f680f90d34a3e01864e3cebb

Added files:

Index: pkgsrc/lang/rust/patches/patch-src_tools_cargo_src_bin_cargo_commands_help.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-src_tools_cargo_src_bin_cargo_commands_help.rs:1.1
--- /dev/null   Sun Apr 19 20:53:36 2026
+++ pkgsrc/lang/rust/patches/patch-src_tools_cargo_src_bin_cargo_commands_help.rs       Sun Apr 19 20:53:35 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_tools_cargo_src_bin_cargo_commands_help.rs,v 1.1 2026/04/19 20:53:35 wiz Exp $
+
+NetBSD's man(1) command only accepts ./*.[0-9] as man pages.
+
+--- src/tools/cargo/src/bin/cargo/commands/help.rs.orig        2026-04-19 19:43:27.728526123 +0000
++++ src/tools/cargo/src/bin/cargo/commands/help.rs
+@@ -141,7 +141,11 @@ fn write_and_spawn(name: &str, contents: &[u8], comman
+ /// display it.
+ fn write_and_spawn(name: &str, contents: &[u8], command: &str) -> CargoResult<()> {
+     let prefix = format!("cargo-{}.", name);
+-    let mut tmp = tempfile::Builder::new().prefix(&prefix).tempfile()?;
++    let suffix = if command == "man" { ".1" } else { "" };
++    let mut tmp = tempfile::Builder::new()
++        .prefix(&prefix)
++        .suffix(suffix)
++        .tempfile()?;
+     let f = tmp.as_file_mut();
+     f.write_all(contents)?;
+     f.flush()?;