Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Oct 2021 08:57:15 GMT
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f5a860a89662 - main - net-im/conduit: Chase USES=cargo's new git source support
Message-ID:  <202110250857.19P8vF9f099273@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik:

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

commit f5a860a89662f0f18da2d67d09a305e7a6bdece1
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-10-07 14:47:27 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
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},' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110250857.19P8vF9f099273>