CVS commit: pkgsrc/lang/rust

["Santhosh Raju" <fox%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fox
Date:           Wed Jul 17 11:04:45 UTC 2019

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 pkgsrc/lang/rust/cargo.mk:1.7
--- pkgsrc/lang/rust/cargo.mk:1.6       Tue Nov 27 15:45:23 2018
+++ pkgsrc/lang/rust/cargo.mk   Wed Jul 17 11:04:45 2019
@@ -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 @@ CARGO_VENDOR_DIR=     ${WRKDIR}/vendor
 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