Date: Mon, 15 Jul 2019 08:46:14 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506644 - head/Mk/Uses Message-ID: <201907150846.x6F8kErP001479@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Jul 15 08:46:13 2019 New Revision: 506644 URL: https://svnweb.freebsd.org/changeset/ports/506644 Log: 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. Modified: head/Mk/Uses/cargo.mk Modified: head/Mk/Uses/cargo.mk ============================================================================== --- head/Mk/Uses/cargo.mk Mon Jul 15 06:26:25 2019 (r506643) +++ head/Mk/Uses/cargo.mk Mon Jul 15 08:46:13 2019 (r506644) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907150846.x6F8kErP001479>