Re: git: 15d43d187799 - main - databases/redisjson: Chase USES=cargo's new git source support

Hi Tobias,

thanks for the update of the port.

This new approach looks unclear to me, why it's better than GH_TUPLE?
So long line in the CARGO_CRATES list with the branch name, commit
and an escape symbol looks not so convenient to me.

Does that how the `make cargo-crates` generates CARGO_CRATES from now?

Thanks.

-- 
Sergey Osokin

On Mon, Oct 25, 2021 at 08:57:04AM +0000, Tobias Kortkamp wrote:
> The branch main has been updated by tobik:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=15d43d187799cc8c11bca0d209111f91599064ed
> 
> commit 15d43d187799cc8c11bca0d209111f91599064ed
> Author:     Tobias Kortkamp <tobik@FreeBSD.org>
> AuthorDate: 2021-10-07 14:47:11 +0000
> Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
> CommitDate: 2021-10-25 08:49:08 +0000
> 
>     databases/redisjson: Chase USES=cargo's new git source support
>     
>     Fix USE_GITHUB usage while here.
>     
>     PR:             256581
> ---
>  databases/redisjson/Makefile | 16 ++++++----------
>  databases/redisjson/distinfo |  4 ++--
>  2 files changed, 8 insertions(+), 12 deletions(-)
> 
> diff --git a/databases/redisjson/Makefile b/databases/redisjson/Makefile
> index 80645f194c9f..3a5d84d84ce8 100644
> --- a/databases/redisjson/Makefile
> +++ b/databases/redisjson/Makefile
> @@ -15,11 +15,10 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
>  BUILD_DEPENDS=	${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libclang.so:devel/llvm${LLVM_DEFAULT}
>  
>  USES=		cargo
> -
> -USE_GITHUB=	nodefault
> -GH_COMMIT=	f6d450f
> -GH_TUPLE=	RedisJSON:redisjson:${GH_COMMIT}:redisjson \
> -		RedisJSON:jsonpath:14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a:jsonpath_lib
> +USE_GITHUB=	yes
> +GH_ACCOUNT=	RedisJSON
> +GH_PROJECT=	RedisJSON
> +GH_TAGNAME=	f6d450f
>  
>  CARGO_CRATES=	aho-corasick-0.7.15 \
>  		ansi_term-0.11.0 \
> @@ -102,11 +101,8 @@ CARGO_CRATES=	aho-corasick-0.7.15 \
>  		winapi-i686-pc-windows-gnu-0.4.0 \
>  		winapi-util-0.1.5 \
>  		winapi-x86_64-pc-windows-gnu-0.4.0 \
> -		wyz-0.2.0
> -
> -CARGO_USE_GITHUB=	yes
> -
> -WRKSRC=		${WRKDIR}/RedisJSON-${GH_COMMIT}
> +		wyz-0.2.0 \
> +		jsonpath_lib@git+https://github.com/RedisJSON/jsonpath.git?branch=generic_json_path\#14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a
>  
>  PLIST_FILES=	lib/librejson.so
>  
> diff --git a/databases/redisjson/distinfo b/databases/redisjson/distinfo
> index 27e544c2d64a..f093e98eb563 100644
> --- a/databases/redisjson/distinfo
> +++ b/databases/redisjson/distinfo
> @@ -163,7 +163,7 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1
>  SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
>  SHA256 (rust/crates/wyz-0.2.0.crate) = 85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214
>  SIZE (rust/crates/wyz-0.2.0.crate) = 12926
> -SHA256 (RedisJSON-redisjson-f6d450f_GH0.tar.gz) = eb46d86bad1f26939ef11df12733456e9328cf381828fca61a913cfaac14beef
> -SIZE (RedisJSON-redisjson-f6d450f_GH0.tar.gz) = 593735
>  SHA256 (RedisJSON-jsonpath-14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a_GH0.tar.gz) = 1d3e33b0211b36b9a35ce3a4cd3da8d4109fcceb751131e1dd4e7fc00bb4e347
>  SIZE (RedisJSON-jsonpath-14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a_GH0.tar.gz) = 448708
> +SHA256 (RedisJSON-RedisJSON-0.0.0.0.2021.10.20.01-f6d450f_GH0.tar.gz) = eb46d86bad1f26939ef11df12733456e9328cf381828fca61a913cfaac14beef
> +SIZE (RedisJSON-RedisJSON-0.0.0.0.2021.10.20.01-f6d450f_GH0.tar.gz) = 593735