CVS commit: pkgsrc/lang/rust

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Thu Apr 10 10:01:34 UTC 2025

Modified Files:
        pkgsrc/lang/rust: cargo.mk

Log Message:
lang/rust: Allow arbitrary + sub-versions in rust crates

From: Taylor R Campbell <riastradh%NetBSD.org@localhost>

Before, a crate name like wasi-0.11.0+wasi-snapshop-preview1.crate
(which has non-numeric/dot characters after the + delimiter) would be
mapped to the URL:

https://crates.io/api/v1/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1/download

when the correct URL is:

https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download

Extension of the fix discussed on tech-pkg@ at:
https://mail-index.NetBSD.org/tech-pkg/2025/03/16/msg030612.html


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/rust/cargo.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/rust/cargo.mk
diff -u pkgsrc/lang/rust/cargo.mk:1.41 pkgsrc/lang/rust/cargo.mk:1.42
--- pkgsrc/lang/rust/cargo.mk:1.41      Fri Apr  4 21:29:22 2025
+++ pkgsrc/lang/rust/cargo.mk   Thu Apr 10 10:01:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.41 2025/04/04 21:29:22 riastradh Exp $
+# $NetBSD: cargo.mk,v 1.42 2025/04/10 10:01:34 pin Exp $
 #
 # Common logic that can be used by packages that depend on cargo crates
 # from crates.io. This lets existing pkgsrc infrastructure fetch and verify
@@ -36,7 +36,7 @@ DISTFILES+=                   ${crate}.crate
 .  if ${crate:M*+*}
 # E.g., for `curl-sys-0.4.75+curl-8.10.0', we use the URL:
 # https://crates.io/api/v1/crates/curl-sys/0.4.77+curl-8.10.1/download
-SITES.${crate}.crate+=         -${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*\+.*-[0-9]+\.[0-9]+.*)$/\1/}/download
+SITES.${crate}.crate+=         -${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*\+.*)$/\1/}/download
 .  else
 SITES.${crate}.crate+=         -${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download
 .  endif