[pkgsrc/trunk]: pkgsrc/lang/rust rust: Modifies the regular expression to fol...

[fox <fox%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7bb45909cdad
branches:  trunk
changeset: 336544:7bb45909cdad
user:      fox <fox%pkgsrc.org@localhost>
date:      Wed Jul 17 11:04:45 2019 +0000

description:
rust: Modifies the regular expression to follow semver specification used by
crates.

Previously, crates with a '-' outside the version and version with semver
pre-release version and semver build metadata were not properly handled.

Improvement suggestion by leot@

Tested all cargo.mk users in pkgsrc.

This also addresses PR/54316.

diffstat:

 lang/rust/cargo.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r de6714914a69 -r 7bb45909cdad lang/rust/cargo.mk
--- a/lang/rust/cargo.mk        Wed Jul 17 10:53:22 2019 +0000
+++ b/lang/rust/cargo.mk        Wed Jul 17 11:04:45 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.6 2018/11/27 15:45:23 adam Exp $
+# $NetBSD: cargo.mk,v 1.7 2019/07/17 11:04:45 fox 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
@@ -28,7 +28,7 @@
 DISTFILES?=    ${DEFAULT_DISTFILES}
 .for _crate in ${CARGO_CRATE_DEPENDS}
 DISTFILES+=    ${_crate}.crate
-SITES.${_crate}.crate+=        -${MASTER_SITE_CRATESIO}${_crate:C/-[0-9.]+$//}/${_crate:C/^.*-([0-9.]+)$/\1/}/download
+SITES.${_crate}.crate+=        -${MASTER_SITE_CRATESIO}${_crate:C/-[0-9]+\.[0-9.]+.*$//}/${_crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download
 EXTRACT_DIR.${_crate}.crate?=  ${CARGO_VENDOR_DIR}
 .endfor