Index: Mk/Uses/cargo.mk
===================================================================
--- Mk/Uses/cargo.mk
+++ Mk/Uses/cargo.mk
@@ -30,15 +30,12 @@
 CARGO_CARGOTOML?=	${WRKSRC}/Cargo.toml
 CARGO_CARGOLOCK?=	${WRKSRC}/Cargo.lock
 
-# Define MASTER_SITES_CRATESIO for crates.io
-MASTER_SITES_CRATESIO=	https://crates.io/api/v1/crates
-
 # Save crates inside ${DISTDIR}/rust/crates by default.
 CARGO_DIST_SUBDIR?=	rust/crates
 
 # Generate list of DISTFILES.
 .for _crate in ${CARGO_CRATES}
-MASTER_SITES+=	${MASTER_SITES_CRATESIO}/${_crate:C/^(.*)-[0-9].*/\1/}/${_crate:C/^.*-([0-9].*)/\1/}/download?dummy=/:cargo_${_crate:S/-//g:S/.//g}
+MASTER_SITES+=	CRATESIO/${_crate:C/^(.*)-[0-9].*/\1/}/${_crate:C/^.*-([0-9].*)/\1/}:cargo_${_crate:S/-//g:S/.//g}
 DISTFILES+=	${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:S/-//g:S/.//g}
 .endfor
 
Index: Mk/bsd.sites.mk
===================================================================
--- Mk/bsd.sites.mk
+++ Mk/bsd.sites.mk
@@ -130,6 +130,10 @@
 MASTER_SITE_CRAN_ARCHIVE+= ${MASTER_SITE_CRAN:S,$,Archive/${PORTNAME}/,}
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_CRATESIO)
+MASTER_SITE_CRATESIO+=	https://crates.io/api/v1/crates/%SUBDIR%/download?dummy=/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_DEBIAN)
 MASTER_SITE_DEBIAN+= \
 	http://cdn.debian.net/debian/%SUBDIR%/ \
@@ -1240,6 +1244,7 @@
 			APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
 			BERLIOS:${PORTNAME:tl}.berlios \
 			CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:S/-${DISTVERSIONFULL}$//} \
+			CRATESIO:${PORTNAME}/${DISTVERSIONFULL} \
 			DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
 			FARSIGHT:${PORTNAME} \
 			FESTIVAL:${PORTVERSION} \
Index: devel/tokei/Makefile
===================================================================
--- devel/tokei/Makefile
+++ devel/tokei/Makefile
@@ -1,10 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	tokei
-DISTVERSIONPREFIX=	v
 DISTVERSION=	9.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
+MASTER_SITES=	CRATESIO
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Display statistics about your code
@@ -15,8 +16,6 @@
 LICENSE_FILE_MIT=	${WRKSRC}/LICENCE-MIT
 
 USES=		cargo
-USE_GITHUB=	yes
-GH_ACCOUNT=	Aaronepower
 
 CARGO_CRATES=	aho-corasick-0.6.9 \
 		ansi_term-0.11.0 \
Index: devel/tokei/distinfo
===================================================================
--- devel/tokei/distinfo
+++ devel/tokei/distinfo
@@ -1,4 +1,6 @@
-TIMESTAMP = 1547463641
+TIMESTAMP = 1549625261
+SHA256 (tokei-9.0.0.tar.gz) = aaa764e533440c271a962b338d126a36dea64a108a1f1f1a053c56a51cdcdf67
+SIZE (tokei-9.0.0.tar.gz) = 24117
 SHA256 (rust/crates/aho-corasick-0.6.9.tar.gz) = 1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e
 SIZE (rust/crates/aho-corasick-0.6.9.tar.gz) = 25979
 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
@@ -257,5 +259,3 @@
 SIZE (rust/crates/wincolor-1.0.1.tar.gz) = 4737
 SHA256 (rust/crates/yaml-rust-0.4.2.tar.gz) = 95acf0db5515d07da9965ec0e0ba6cc2d825e2caeb7303b66ca441729801254e
 SIZE (rust/crates/yaml-rust-0.4.2.tar.gz) = 45338
-SHA256 (Aaronepower-tokei-v9.0.0_GH0.tar.gz) = f0d4f7008946bd77482871b8c48c0570f059d697f3eb59934505a40ce1922a5a
-SIZE (Aaronepower-tokei-v9.0.0_GH0.tar.gz) = 74965