diff --git a/devel/rust-bindgen/Makefile b/devel/rust-bindgen/Makefile
index f9841f043136..690854c423d7 100644
--- a/devel/rust-bindgen/Makefile
+++ b/devel/rust-bindgen/Makefile
@@ -1,78 +1,25 @@
 PORTNAME=	bindgen
 DISTVERSION=	0.60.1
 PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 PKGNAMEPREFIX=	rust-
 # XXX Teach USES=cargo to have proper default
 DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Generate Rust bindings from C (and some C++) code
 WWW=		https://github.com/rust-lang/rust-bindgen
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cargo llvm:run
 PLIST_FILES=	bin/${PORTNAME}
 
-CARGO_CRATES=	aho-corasick-0.7.15 \
-		atty-0.2.14 \
-		autocfg-1.0.1 \
-		bitflags-1.2.1 \
-		cexpr-0.6.0 \
-		cfg-if-1.0.0 \
-		clang-sys-1.3.3 \
-		clap-3.0.4 \
-		diff-0.1.12 \
-		either-1.6.1 \
-		env_logger-0.9.0 \
-		getrandom-0.2.3 \
-		glob-0.3.0 \
-		hashbrown-0.11.2 \
-		hermit-abi-0.1.19 \
-		humantime-2.1.0 \
-		indexmap-1.7.0 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		libc-0.2.98 \
-		libloading-0.7.0 \
-		log-0.4.14 \
-		memchr-2.4.1 \
-		minimal-lexical-0.1.4 \
-		nom-7.0.0 \
-		os_str_bytes-6.0.0 \
-		peeking_take_while-0.1.2 \
-		ppv-lite86-0.2.10 \
-		proc-macro2-1.0.28 \
-		quote-1.0.9 \
-		rand-0.8.4 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.3 \
-		rand_hc-0.3.1 \
-		redox_syscall-0.2.9 \
-		regex-1.4.6 \
-		regex-syntax-0.6.25 \
-		remove_dir_all-0.5.3 \
-		rustc-hash-1.1.0 \
-		shlex-1.0.0 \
-		strsim-0.10.0 \
-		tempfile-3.2.0 \
-		termcolor-1.1.2 \
-		textwrap-0.14.2 \
-		unicode-xid-0.2.2 \
-		version_check-0.9.3 \
-		wasi-0.10.2+wasi-snapshot-preview1 \
-		which-4.2.2 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,"llvm-config,"${LLVM_CONFIG},' \
 		${WRKSRC}/cargo-crates/clang-sys-*/build/common.rs \
 		${WRKSRC}/cargo-crates/clang-sys-*/src/support.rs
 
 .include <bsd.port.mk>
diff --git a/devel/rust-bindgen/Makefile b/devel/rust-bindgen/Makefile.crates
similarity index 61%
copy from devel/rust-bindgen/Makefile
copy to devel/rust-bindgen/Makefile.crates
index f9841f043136..b98ce97595a8 100644
--- a/devel/rust-bindgen/Makefile
+++ b/devel/rust-bindgen/Makefile.crates
@@ -1,78 +1,52 @@
-PORTNAME=	bindgen
-DISTVERSION=	0.60.1
-PORTREVISION=	6
-CATEGORIES=	devel
-MASTER_SITES=	CRATESIO
-PKGNAMEPREFIX=	rust-
-# XXX Teach USES=cargo to have proper default
-DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
-
-MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Generate Rust bindings from C (and some C++) code
-WWW=		https://github.com/rust-lang/rust-bindgen
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-USES=		cargo llvm:run
-PLIST_FILES=	bin/${PORTNAME}
-
 CARGO_CRATES=	aho-corasick-0.7.15 \
 		atty-0.2.14 \
 		autocfg-1.0.1 \
 		bitflags-1.2.1 \
 		cexpr-0.6.0 \
 		cfg-if-1.0.0 \
 		clang-sys-1.3.3 \
 		clap-3.0.4 \
 		diff-0.1.12 \
 		either-1.6.1 \
 		env_logger-0.9.0 \
 		getrandom-0.2.3 \
 		glob-0.3.0 \
 		hashbrown-0.11.2 \
 		hermit-abi-0.1.19 \
 		humantime-2.1.0 \
 		indexmap-1.7.0 \
 		lazy_static-1.4.0 \
 		lazycell-1.3.0 \
 		libc-0.2.98 \
 		libloading-0.7.0 \
 		log-0.4.14 \
 		memchr-2.4.1 \
 		minimal-lexical-0.1.4 \
 		nom-7.0.0 \
 		os_str_bytes-6.0.0 \
 		peeking_take_while-0.1.2 \
 		ppv-lite86-0.2.10 \
 		proc-macro2-1.0.28 \
 		quote-1.0.9 \
 		rand-0.8.4 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.3 \
 		rand_hc-0.3.1 \
 		redox_syscall-0.2.9 \
 		regex-1.4.6 \
 		regex-syntax-0.6.25 \
 		remove_dir_all-0.5.3 \
 		rustc-hash-1.1.0 \
 		shlex-1.0.0 \
 		strsim-0.10.0 \
 		tempfile-3.2.0 \
 		termcolor-1.1.2 \
 		textwrap-0.14.2 \
 		unicode-xid-0.2.2 \
 		version_check-0.9.3 \
 		wasi-0.10.2+wasi-snapshot-preview1 \
 		which-4.2.2 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,"llvm-config,"${LLVM_CONFIG},' \
-		${WRKSRC}/cargo-crates/clang-sys-*/build/common.rs \
-		${WRKSRC}/cargo-crates/clang-sys-*/src/support.rs
-
-.include <bsd.port.mk>