From nobody Mon Oct 25 08:57:23 2021
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3FFF718113C1;
	Mon, 25 Oct 2021 08:57:35 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4Hd83f2txsz4mZv;
	Mon, 25 Oct 2021 08:57:34 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E471259C5;
	Mon, 25 Oct 2021 08:57:23 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19P8vNiK099448;
	Mon, 25 Oct 2021 08:57:23 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19P8vN2F099447;
	Mon, 25 Oct 2021 08:57:23 GMT
	(envelope-from git)
Date: Mon, 25 Oct 2021 08:57:23 GMT
Message-Id: <202110250857.19P8vN2F099447@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
        dev-commits-ports-main@FreeBSD.org
From: Tobias Kortkamp <tobik@FreeBSD.org>
Subject: git: bee1e3224e35 - main - security/vaultwarden: Chase USES=cargo's new git source support
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tobik
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: bee1e3224e35d339ad8c62a7f00a4d41c6b3bd3f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bee1e3224e35d339ad8c62a7f00a4d41c6b3bd3f

commit bee1e3224e35d339ad8c62a7f00a4d41c6b3bd3f
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-10-07 14:47:39 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-10-25 08:49:14 +0000

    security/vaultwarden: Chase USES=cargo's new git source support
    
    PR:             256581
---
 security/vaultwarden/Makefile | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile
index 18fb57631061..699269e0328c 100644
--- a/security/vaultwarden/Makefile
+++ b/security/vaultwarden/Makefile
@@ -33,16 +33,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	dani-garcia
 CARGO_FEATURES=	postgresql sqlite mysql #vendored_openssl
 CARGO_ENV+=	RUSTC_BOOTSTRAP=1
-CARGO_GIT_SUBDIR+=	dataurl:data-url:data-url
-CARGO_GIT_SUBDIR+=	devise:devise:lib
-CARGO_GIT_SUBDIR+=	rocket:rocket:core/lib
-CARGO_GIT_SUBDIR+=	rocket:rocket_contrib:contrib/lib
 
 # make cargo-crates
-GH_TUPLE=	servo:rust-url:eb7330b5296c0d43816d1346211b74182bb4ae37:dataurl \
-		SergioBenitez:Devise:e58b3ac9afc3b6ff10a8aaf02a3e768a8f530089:devise \
-		jjlin:job_scheduler:ee023418dbba2bfe1e30a5fd7d937f9e33739806:job_scheduler \
-		SergioBenitez:Rocket:263e39b5b429de1913ce7e3036575a7b4d88b6d7:rocket
 CARGO_CRATES=	addr2line-0.15.2 \
 		adler-1.0.2 \
 		aho-corasick-0.7.18 \
@@ -387,8 +379,11 @@ CARGO_CRATES=	addr2line-0.15.2 \
 		wyz-0.2.0 \
 		xml5ever-0.16.1 \
 		yansi-0.5.0 \
-		yubico-0.10.0
-CARGO_USE_GITHUB=	yes
+		yubico-0.10.0 \
+		devise,devise_codegen,devise_core@git+https://github.com/SergioBenitez/Devise.git?rev=e58b3ac9a\#e58b3ac9afc3b6ff10a8aaf02a3e768a8f530089 \
+		rocket,rocket_codegen,rocket_contrib,rocket_http@git+https://github.com/SergioBenitez/Rocket?rev=263e39b5b429de1913ce7e3036575a7b4d88b6d7\#263e39b5b429de1913ce7e3036575a7b4d88b6d7 \
+		data-url@git+https://github.com/servo/rust-url?rev=eb7330b5296c0d43816d1346211b74182bb4ae37\#eb7330b5296c0d43816d1346211b74182bb4ae37 \
+		job_scheduler@git+https://github.com/jjlin/job_scheduler?rev=ee023418dbba2bfe1e30a5fd7d937f9e33739806\#ee023418dbba2bfe1e30a5fd7d937f9e33739806
 
 post-install:
 	${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d