diff --git a/devel/cargo-c/Makefile b/devel/cargo-c/Makefile
index a72719d0206c..1194f0493233 100644
--- a/devel/cargo-c/Makefile
+++ b/devel/cargo-c/Makefile
@@ -1,169 +1,170 @@
 PORTNAME=	cargo-c
 DISTVERSION=	0.9.4
 DISTVERSIONSUFFIX=	+cargo-0.56
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 # XXX Teach USES=cargo to have proper default
 DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Cargo C-ABI helpers
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libcurl.so:ftp/curl \
 		libssh2.so:security/libssh2
 
 USES=		cargo ssl
 PLIST_FILES=	bin/cargo-capi \
 		bin/cargo-cbuild \
 		bin/cargo-cinstall \
 		bin/cargo-ctest \
 		${NULL}
 
 CARGO_CRATES=	adler-1.0.2 \
 		aho-corasick-0.7.18 \
 		ansi_term-0.11.0 \
 		anyhow-1.0.44 \
 		arrayvec-0.5.2 \
 		atty-0.2.14 \
 		autocfg-1.0.1 \
 		bitflags-1.3.2 \
 		bitmaps-2.1.0 \
 		bstr-0.2.17 \
 		bytesize-1.1.0 \
 		cargo-0.56.0 \
 		cargo-platform-0.1.2 \
 		cargo-util-0.1.1 \
 		cbindgen-0.20.0 \
 		cc-1.0.70 \
 		cfg-if-1.0.0 \
 		clap-2.33.3 \
 		commoncrypto-0.2.0 \
 		commoncrypto-sys-0.2.0 \
 		core-foundation-0.9.1 \
 		core-foundation-sys-0.8.2 \
 		crates-io-0.33.0 \
 		crc32fast-1.2.1 \
 		crossbeam-utils-0.8.5 \
 		crypto-hash-0.3.4 \
 		curl-0.4.38 \
 		curl-sys-0.4.48+curl-7.79.1 \
 		either-1.6.1 \
 		env_logger-0.9.0 \
 		filetime-0.2.15 \
 		flate2-1.0.22 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		form_urlencoded-1.0.1 \
 		fwdansi-1.1.0 \
 		getrandom-0.2.3 \
 		git2-0.13.22 \
 		git2-curl-0.14.1 \
 		glob-0.3.0 \
 		globset-0.4.8 \
 		hashbrown-0.11.2 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		hex-0.3.2 \
 		hex-0.4.3 \
 		home-0.5.3 \
 		humantime-2.1.0 \
 		idna-0.2.3 \
 		ignore-0.4.18 \
 		im-rc-15.0.0 \
 		indexmap-1.7.0 \
 		itertools-0.10.1 \
 		itoa-0.4.8 \
 		jobserver-0.1.24 \
 		lazy_static-1.4.0 \
 		lazycell-1.3.0 \
 		libc-0.2.102 \
 		libgit2-sys-0.12.23+1.2.0 \
 		libnghttp2-sys-0.1.7+1.45.0 \
 		libssh2-sys-0.2.21 \
 		libz-sys-1.1.3 \
 		log-0.4.14 \
 		matches-0.1.9 \
 		memchr-2.4.1 \
 		miniz_oxide-0.4.4 \
 		miow-0.3.7 \
 		num_cpus-1.13.0 \
 		once_cell-1.8.0 \
 		opener-0.5.0 \
 		openssl-0.10.36 \
 		openssl-probe-0.1.4 \
 		openssl-src-111.16.0+1.1.1l \
 		openssl-sys-0.9.67 \
 		percent-encoding-2.1.0 \
 		pkg-config-0.3.19 \
 		ppv-lite86-0.2.10 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
 		proc-macro2-1.0.29 \
 		quote-1.0.9 \
 		rand-0.8.4 \
 		rand_chacha-0.3.1 \
 		rand_core-0.5.1 \
 		rand_core-0.6.3 \
 		rand_hc-0.3.1 \
 		rand_xoshiro-0.4.0 \
 		redox_syscall-0.2.10 \
 		regex-1.5.4 \
 		regex-automata-0.1.10 \
 		regex-syntax-0.6.25 \
 		remove_dir_all-0.5.3 \
 		rustc-workspace-hack-1.0.0 \
 		rustfix-0.6.0 \
 		ryu-1.0.5 \
 		same-file-1.0.6 \
 		schannel-0.1.19 \
 		semver-1.0.4 \
 		serde-1.0.130 \
 		serde_derive-1.0.130 \
 		serde_ignored-0.1.2 \
 		serde_json-1.0.68 \
 		shell-escape-0.1.5 \
 		sized-chunks-0.6.5 \
 		socket2-0.4.2 \
 		strip-ansi-escapes-0.1.1 \
 		strsim-0.8.0 \
 		structopt-0.3.23 \
 		structopt-derive-0.4.16 \
 		syn-1.0.76 \
 		tar-0.4.37 \
 		tempfile-3.2.0 \
 		termcolor-1.1.2 \
 		textwrap-0.11.0 \
 		thread_local-1.1.3 \
 		tinyvec-1.4.0 \
 		tinyvec_macros-0.1.0 \
 		toml-0.5.8 \
 		typenum-1.14.0 \
 		unicode-bidi-0.3.6 \
 		unicode-normalization-0.1.19 \
 		unicode-segmentation-1.8.0 \
 		unicode-width-0.1.9 \
 		unicode-xid-0.2.2 \
 		url-2.2.2 \
 		utf8parse-0.2.0 \
 		vcpkg-0.2.15 \
 		vec_map-0.8.2 \
 		version_check-0.9.3 \
 		vte-0.10.1 \
 		vte_generate_state_changes-0.1.1 \
 		walkdir-2.3.2 \
 		wasi-0.10.2+wasi-snapshot-preview1 \
 		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,libdir.join("pkgconfig,prefix.join("libdata/pkgconfig,' \
 		${WRKSRC}/src/install.rs
 
 .include <bsd.port.mk>
diff --git a/devel/cargo-c/files/patch-rust-1.56.0 b/devel/cargo-c/files/patch-rust-1.56.0
new file mode 100644
index 000000000000..054f0e6756d0
--- /dev/null
+++ b/devel/cargo-c/files/patch-rust-1.56.0
@@ -0,0 +1,51 @@
+https://github.com/rust-lang/cargo/commit/1e0d564ff01f
+
+--- cargo-crates/cargo-0.56.0/src/cargo/core/features.rs.orig	1970-01-01 00:00:00 UTC
++++ cargo-crates/cargo-0.56.0/src/cargo/core/features.rs
+@@ -645,7 +645,6 @@ unstable_cli_options!(
+     panic_abort_tests: bool = ("Enable support to run tests with -Cpanic=abort"),
+     host_config: bool = ("Enable the [host] section in the .cargo/config.toml file"),
+     target_applies_to_host: bool = ("Enable the `target-applies-to-host` key in the .cargo/config.toml file"),
+-    patch_in_config: bool = ("Allow `[patch]` sections in .cargo/config.toml files"),
+     rustdoc_map: bool = ("Allow passing external documentation mappings to rustdoc"),
+     separate_nightlies: bool = (HIDDEN),
+     terminal_width: Option<Option<usize>>  = ("Provide a terminal width to rustc for error truncation"),
+@@ -689,6 +688,8 @@ const STABILIZED_FEATURES: &str = "The new feature res
+     See https://doc.rust-lang.org/nightly/cargo/reference/features.html#feature-resolver-version-2 \
+     for more information.";
+ 
++const STABILIZED_PATCH_IN_CONFIG: &str = "The patch-in-config feature is now always enabled.";
++
+ fn deserialize_build_std<'de, D>(deserializer: D) -> Result<Option<Vec<String>>, D::Error>
+ where
+     D: serde::Deserializer<'de>,
+@@ -834,7 +835,6 @@ impl CliUnstable {
+             "configurable-env" => self.configurable_env = parse_empty(k, v)?,
+             "host-config" => self.host_config = parse_empty(k, v)?,
+             "target-applies-to-host" => self.target_applies_to_host = parse_empty(k, v)?,
+-            "patch-in-config" => self.patch_in_config = parse_empty(k, v)?,
+             "features" => {
+                 // For now this is still allowed (there are still some
+                 // unstable options like "compare"). This should be removed at
+@@ -869,6 +869,7 @@ impl CliUnstable {
+             "config-profile" => stabilized_warn(k, "1.43", STABILIZED_CONFIG_PROFILE),
+             "crate-versions" => stabilized_warn(k, "1.47", STABILIZED_CRATE_VERSIONS),
+             "package-features" => stabilized_warn(k, "1.51", STABILIZED_PACKAGE_FEATURES),
++            "patch-in-config" => stabilized_warn(k, "1.56", STABILIZED_PATCH_IN_CONFIG),
+             "future-incompat-report" => self.future_incompat_report = parse_empty(k, v)?,
+             _ => bail!("unknown `-Z` flag specified: {}", k),
+         }
+--- cargo-crates/cargo-0.56.0/src/cargo/core/workspace.rs.orig	1970-01-01 00:00:00 UTC
++++ cargo-crates/cargo-0.56.0/src/cargo/core/workspace.rs
+@@ -362,11 +362,6 @@ impl<'cfg> Workspace<'cfg> {
+             BTreeMap<String, BTreeMap<String, TomlDependency<ConfigRelativePath>>>,
+         > = self.config.get("patch")?;
+ 
+-        if config_patch.is_some() && !self.config.cli_unstable().patch_in_config {
+-            self.config.shell().warn("`[patch]` in cargo config was ignored, the -Zpatch-in-config command-line flag is required".to_owned())?;
+-            return Ok(HashMap::new());
+-        }
+-
+         let source = SourceId::for_path(self.root())?;
+ 
+         let mut warnings = Vec::new();