summaryrefslogtreecommitdiff
path: root/Mk/Uses/cargo.mk
diff options
context:
space:
mode:
authorTobias Kortkamp <tobik@FreeBSD.org>2019-07-15 08:46:13 +0000
committerTobias Kortkamp <tobik@FreeBSD.org>2019-07-15 08:46:13 +0000
commitfbe6dc595d34fab04a65220fe297e7eaf390daa3 (patch)
tree61f63c5dc89dfe54dd5822753a59e9cc41c78abd /Mk/Uses/cargo.mk
parentMark BROKEN: unfetchable (diff)
Mk/Uses/cargo.mk: Handle distfile group names properly
Crates like openssl-src-111.3.0+1.1.1c have characters not in [a-zA-Z0-9]. Use the complement of [a-zA-Z0-9] instead of adding + to the list of chars [-.] we currently handle.
Notes
Notes: svn path=/head/; revision=506644
Diffstat (limited to 'Mk/Uses/cargo.mk')
-rw-r--r--Mk/Uses/cargo.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index f6f64eb554bd..b000545e1163 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -35,8 +35,8 @@ CARGO_DIST_SUBDIR?= rust/crates
# Generate list of DISTFILES.
.for _crate in ${CARGO_CRATES}
-MASTER_SITES+= CRATESIO/${_crate:C/^(.*)-[0-9].*/\1/}/${_crate:C/^.*-([0-9].*)/\1/}:cargo_${_crate:S/-//g:S/.//g}
-DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:S/-//g:S/.//g}
+MASTER_SITES+= CRATESIO/${_crate:C/^(.*)-[0-9].*/\1/}/${_crate:C/^.*-([0-9].*)/\1/}:cargo_${_crate:C/[^a-zA-Z0-9_]//g}
+DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:C/[^a-zA-Z0-9_]//g}
.endfor
# Build dependencies.