svn commit: r513030 - head/Mk/Uses
Tobias Kortkamp
tobik at FreeBSD.org
Fri Sep 27 12:51:20 UTC 2019
Author: tobik
Date: Fri Sep 27 12:51:19 2019
New Revision: 513030
URL: https://svnweb.freebsd.org/changeset/ports/513030
Log:
Mk/Uses/cargo.mk: Handle git URLs that end with /
Fix CARGO_USE_GIT{HU,LA}B when Cargo.toml has URLs that end with
/. This is needed for audio/spotifyd 0.2.16 which has an entry
like
structopt = { git = "https://github.com/TeXitoi/structopt/", rev = "..." }
Modified:
head/Mk/Uses/cargo.mk
Modified: head/Mk/Uses/cargo.mk
==============================================================================
--- head/Mk/Uses/cargo.mk Fri Sep 27 12:48:06 2019 (r513029)
+++ head/Mk/Uses/cargo.mk Fri Sep 27 12:51:19 2019 (r513030)
@@ -213,13 +213,13 @@ _CARGO_GIT_PATCH_CARGOTOML=
.if ${CARGO_USE_GITHUB:tl} == "yes"
. for _group in ${GH_TUPLE:C@^[^:]*:[^:]*:[^:]*:(([^:/]*)?)((/.*)?)@\2@}
_CARGO_GIT_PATCH_CARGOTOML:= ${_CARGO_GIT_PATCH_CARGOTOML} \
- -e 's at git = "(https|http|git)://github.com/${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}(\.git)?"@path = "${WRKSRC_${_group}}"@'
+ -e 's at git = "(https|http|git)://github.com/${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}(\.git)?/?"@path = "${WRKSRC_${_group}}"@'
. endfor
.endif
.if ${CARGO_USE_GITLAB:tl} == "yes"
. for _group in ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\8@:S/^://}
_CARGO_GIT_PATCH_CARGOTOML:= ${_CARGO_GIT_PATCH_CARGOTOML} \
- -e 's at git = "${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}(\.git)?"@path = "${WRKSRC_${_group}}"@'
+ -e 's at git = "${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}(\.git)?/?"@path = "${WRKSRC_${_group}}"@'
. endfor
.endif
More information about the svn-ports-head
mailing list