Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Apr 2021 05:34:02 GMT
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 9bcb1fb8c461 - 2021Q2 - Fix ports that pull main distfile from CRATESIO (D29760)
Message-ID:  <202104280534.13S5Y2ph046735@gitrepo.freebsd.org>

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

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

commit 9bcb1fb8c4611a17e662f2444253c74f6f70ac2d
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-17 05:33:03 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-28 05:32:48 +0000

    Fix ports that pull main distfile from CRATESIO (D29760)
    
    - Put distfiles into CARGO_DIST_SUBDIR where they were not
    - Use correct crate file extension
    
    MFH:            2021Q2 (to ease future cherry picks)
    (cherry picked from commit 89c1633d112b9cd8562ba37665ca958e89dbf075)
---
 devel/cargo-c/Makefile       | 2 +-
 devel/desed/Makefile         | 2 +-
 devel/gbump/Makefile         | 2 +-
 devel/racer/Makefile         | 2 +-
 devel/rust-bindgen/Makefile  | 2 +-
 devel/rust-cbindgen/Makefile | 2 +-
 dns/doh-proxy/Makefile       | 2 +-
 dns/doh-proxy/distinfo       | 4 ++--
 graphics/dssim/Makefile      | 2 +-
 multimedia/termplay/Makefile | 2 +-
 multimedia/termplay/distinfo | 4 ++--
 shells/starship/Makefile     | 2 +-
 shells/starship/distinfo     | 4 ++--
 sysutils/flowgger/Makefile   | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/devel/cargo-c/Makefile b/devel/cargo-c/Makefile
index f0f88df0b916..9d2e1029e8b6 100644
--- a/devel/cargo-c/Makefile
+++ b/devel/cargo-c/Makefile
@@ -5,7 +5,7 @@ DISTVERSIONSUFFIX=	+cargo-0.51
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 # XXX Teach USES=cargo to have proper default
-DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Cargo C-ABI helpers
diff --git a/devel/desed/Makefile b/devel/desed/Makefile
index b77cf294440f..52060e511ade 100644
--- a/devel/desed/Makefile
+++ b/devel/desed/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	1.2.0
 PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
-DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Demystify and debug sed scripts from the comfort of your terminal
diff --git a/devel/gbump/Makefile b/devel/gbump/Makefile
index 1d3595850edb..138c913360a4 100644
--- a/devel/gbump/Makefile
+++ b/devel/gbump/Makefile
@@ -4,7 +4,7 @@ PORTVERSION=	1.0.1
 PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
-DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	nbari@tequila.io
 COMMENT=	Git tag semantic version bumper
diff --git a/devel/racer/Makefile b/devel/racer/Makefile
index d883da8fd5cc..994504065fed 100644
--- a/devel/racer/Makefile
+++ b/devel/racer/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	racer
 DISTVERSION=	2.1.44
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
-DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	rust@FreeBSD.org
 COMMENT=	Rust code completion helper
diff --git a/devel/rust-bindgen/Makefile b/devel/rust-bindgen/Makefile
index e643b4706b24..133c71c3a6a4 100644
--- a/devel/rust-bindgen/Makefile
+++ b/devel/rust-bindgen/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 PKGNAMEPREFIX=	rust-
 # XXX Teach USES=cargo to have proper default
-DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Generate Rust bindings from C (and some C++) code
diff --git a/devel/rust-cbindgen/Makefile b/devel/rust-cbindgen/Makefile
index 4ba1211169a4..a5ad4f22d706 100644
--- a/devel/rust-cbindgen/Makefile
+++ b/devel/rust-cbindgen/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 PKGNAMEPREFIX=	rust-
 # XXX Teach USES=cargo to have proper default
-DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Generate C bindings from Rust code
diff --git a/dns/doh-proxy/Makefile b/dns/doh-proxy/Makefile
index 0a8b2a2260fc..0b792b6033e8 100644
--- a/dns/doh-proxy/Makefile
+++ b/dns/doh-proxy/Makefile
@@ -5,7 +5,7 @@ DISTVERSION=	0.3.8
 PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	CRATESIO
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	DNS-over-HTTP server proxy
diff --git a/dns/doh-proxy/distinfo b/dns/doh-proxy/distinfo
index 980ea6387eb0..6be72894f339 100644
--- a/dns/doh-proxy/distinfo
+++ b/dns/doh-proxy/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1614607864
-SHA256 (doh-proxy-0.3.8.tar.gz) = a92c4c48f6fdc42e8248669677b7378655a3f6629b23d086a18735879b638740
-SIZE (doh-proxy-0.3.8.tar.gz) = 16999
+SHA256 (rust/crates/doh-proxy-0.3.8.tar.gz) = a92c4c48f6fdc42e8248669677b7378655a3f6629b23d086a18735879b638740
+SIZE (rust/crates/doh-proxy-0.3.8.tar.gz) = 16999
 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
 SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
 SHA256 (rust/crates/anyhow-1.0.38.tar.gz) = afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1
diff --git a/graphics/dssim/Makefile b/graphics/dssim/Makefile
index fe790bbccd02..f13dc68112c2 100644
--- a/graphics/dssim/Makefile
+++ b/graphics/dssim/Makefile
@@ -5,7 +5,7 @@ PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	CRATESIO
 # XXX Teach USES=cargo to have proper default
-DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Image similarity comparison simulating human perception
diff --git a/multimedia/termplay/Makefile b/multimedia/termplay/Makefile
index 63e43b232943..3c62654e8072 100644
--- a/multimedia/termplay/Makefile
+++ b/multimedia/termplay/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	2.0.6
 PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	CRATESIO
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tool that converts images to ANSI sequences, plays videos in terminals
diff --git a/multimedia/termplay/distinfo b/multimedia/termplay/distinfo
index 0ba9161e4d30..b51d3993666e 100644
--- a/multimedia/termplay/distinfo
+++ b/multimedia/termplay/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1596611248
-SHA256 (termplay-2.0.6.tar.gz) = 996343049484d479e980aad3659d096ad2665b8e8e7795332a431a99b97a67da
-SIZE (termplay-2.0.6.tar.gz) = 20023
+SHA256 (rust/crates/termplay-2.0.6.tar.gz) = 996343049484d479e980aad3659d096ad2665b8e8e7795332a431a99b97a67da
+SIZE (rust/crates/termplay-2.0.6.tar.gz) = 20023
 SHA256 (rust/crates/adler32-1.0.4.tar.gz) = 5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2
 SIZE (rust/crates/adler32-1.0.4.tar.gz) = 5105
 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
diff --git a/shells/starship/Makefile b/shells/starship/Makefile
index dd4a2092251e..d98a98b8dcc1 100644
--- a/shells/starship/Makefile
+++ b/shells/starship/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	0.51.0
 PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	CRATESIO
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cross-shell prompt for astronauts
diff --git a/shells/starship/distinfo b/shells/starship/distinfo
index 763e3a81b8b5..db83808d78a4 100644
--- a/shells/starship/distinfo
+++ b/shells/starship/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1617081533
-SHA256 (starship-0.51.0.tar.gz) = f4d57fdd6c201a3115dd6122e0efc638388dea4d02634b92534513a2e7668b10
-SIZE (starship-0.51.0.tar.gz) = 160148
+SHA256 (rust/crates/starship-0.51.0.tar.gz) = f4d57fdd6c201a3115dd6122e0efc638388dea4d02634b92534513a2e7668b10
+SIZE (rust/crates/starship-0.51.0.tar.gz) = 160148
 SHA256 (rust/crates/ahash-0.4.7.tar.gz) = 739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e
 SIZE (rust/crates/ahash-0.4.7.tar.gz) = 51474
 SHA256 (rust/crates/aho-corasick-0.7.15.tar.gz) = 7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5
diff --git a/sysutils/flowgger/Makefile b/sysutils/flowgger/Makefile
index f6ccfaba30aa..c4d0043afdcc 100644
--- a/sysutils/flowgger/Makefile
+++ b/sysutils/flowgger/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	0.2.10
 PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	CRATESIO
-DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Fast data collector



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