From nobody Mon Oct 25 08:57:15 2021 X-Original-To: dev-commits-ports-all@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 8519D1810CFC; Mon, 25 Oct 2021 08:57:19 +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 4Hd83L1qbDz4mNM; Mon, 25 Oct 2021 08:57:17 +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 5DCAE255EB; Mon, 25 Oct 2021 08:57:15 +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 19P8vFfq099274; Mon, 25 Oct 2021 08:57:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19P8vF9f099273; Mon, 25 Oct 2021 08:57:15 GMT (envelope-from git) Date: Mon, 25 Oct 2021 08:57:15 GMT Message-Id: <202110250857.19P8vF9f099273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: f5a860a89662 - main - net-im/conduit: Chase USES=cargo's new git source support List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: f5a860a89662f0f18da2d67d09a305e7a6bdece1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5a860a89662f0f18da2d67d09a305e7a6bdece1 commit f5a860a89662f0f18da2d67d09a305e7a6bdece1 Author: Tobias Kortkamp AuthorDate: 2021-10-07 14:47:27 +0000 Commit: Tobias Kortkamp CommitDate: 2021-10-25 08:49:12 +0000 net-im/conduit: Chase USES=cargo's new git source support PR: 256581 --- net-im/conduit/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net-im/conduit/Makefile b/net-im/conduit/Makefile index 2e753f3d898a..1fac9946cad3 100644 --- a/net-im/conduit/Makefile +++ b/net-im/conduit/Makefile @@ -27,8 +27,6 @@ DBDIR= /var/db/${PORTNAME} USE_GITLAB= yes GL_ACCOUNT= famedly GL_COMMIT= 0d6ae2e1e74ee33fbc8dfcec01a8902e0a4d65d3 -USE_GITHUB= nodefault -GH_TUPLE= timokoesters:heed:f6f825da7fb2c758867e05ad973ef800a6fe1d5d:heed CARGO_CRATES= adler32-1.2.0 \ ahash-0.7.4 \ aho-corasick-0.7.18 \ @@ -361,12 +359,10 @@ CARGO_CRATES= adler32-1.2.0 \ zeroize_derive-1.1.0 \ zstd-0.5.4+zstd.1.4.7 \ zstd-safe-2.0.6+zstd.1.4.7 \ - zstd-sys-1.4.18+zstd.1.4.7 -CARGO_USE_GITHUB= yes + zstd-sys-1.4.18+zstd.1.4.7 \ + heed,heed-traits,heed-types@git+https://github.com/timokoesters/heed.git?rev=f6f825da7fb2c758867e05ad973ef800a6fe1d5d\#f6f825da7fb2c758867e05ad973ef800a6fe1d5d post-patch: - @${REINPLACE_CMD} -E -e '/^heed = /s,(path = "[^"]+),\1/heed,' \ - ${CARGO_CARGOTOML} @${REINPLACE_CMD} -e 's,/etc/conduit.toml,${PREFIX}/etc/conduit.toml,' \ ${WRKSRC}/src/main.rs @${REINPLACE_CMD} -e 's,/var/lib/conduit,${DBDIR},' \