rust196 & beta: follow pkgsrc main

[pin (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Wed Jun 3 18:40:17 2026 +0200
Changeset:	00a5e636654355aa9b64f0e749497773a2dee091

Modified Files:
	rust-beta/cargo.mk
	rust196/cargo.mk

Log Message:
rust196 & beta: follow pkgsrc main

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=00a5e636654355aa9b64f0e749497773a2dee091

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

diffstat:
 rust-beta/cargo.mk | 12 +++---------
 rust196/cargo.mk   | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diffs:
diff --git a/rust-beta/cargo.mk b/rust-beta/cargo.mk
index 05cdf7b4c6..dac26e10bb 100644
--- a/rust-beta/cargo.mk
+++ b/rust-beta/cargo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.46 2026/05/03 13:55:03 wiz Exp $
+# $NetBSD: cargo.mk,v 1.47 2026/06/03 09:06:11 adam 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
@@ -31,7 +31,7 @@
 #
 # will fetch https://github.com/foo/bar/ revision 12345
 
-MASTER_SITES?=	-${MASTER_SITE_CRATESIO}${PKGBASE}/${PKGVERSION_NOREV}/download
+MASTER_SITES?=	${MASTER_SITE_CRATESIO}${PKGBASE}/
 
 CHECK_SSP_SUPPORTED=	no
 
@@ -58,13 +58,7 @@ SUBST_SED.gitcrate+=		-E -e 's!git.*github.com/${user}/${name}.*${hash}(.)!path
 
 .for crate in ${CARGO_CRATE_DEPENDS}
 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.]+.*\+.*)$/\1/}/download
-.  else
-SITES.${crate}.crate+=		-${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download
-.  endif
+SITES.${crate}.crate+=		-${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate}.crate
 EXTRACT_DIR.${crate}.crate?=	${CARGO_VENDOR_DIR}
 .endfor
 
diff --git a/rust196/cargo.mk b/rust196/cargo.mk
index 05cdf7b4c6..dac26e10bb 100644
--- a/rust196/cargo.mk
+++ b/rust196/cargo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.46 2026/05/03 13:55:03 wiz Exp $
+# $NetBSD: cargo.mk,v 1.47 2026/06/03 09:06:11 adam 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
@@ -31,7 +31,7 @@
 #
 # will fetch https://github.com/foo/bar/ revision 12345
 
-MASTER_SITES?=	-${MASTER_SITE_CRATESIO}${PKGBASE}/${PKGVERSION_NOREV}/download
+MASTER_SITES?=	${MASTER_SITE_CRATESIO}${PKGBASE}/
 
 CHECK_SSP_SUPPORTED=	no
 
@@ -58,13 +58,7 @@ SUBST_SED.gitcrate+=		-E -e 's!git.*github.com/${user}/${name}.*${hash}(.)!path
 
 .for crate in ${CARGO_CRATE_DEPENDS}
 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.]+.*\+.*)$/\1/}/download
-.  else
-SITES.${crate}.crate+=		-${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download
-.  endif
+SITES.${crate}.crate+=		-${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate}.crate
 EXTRACT_DIR.${crate}.crate?=	${CARGO_VENDOR_DIR}
 .endfor