textproc/bat: re-enable BROKEN architectures

Remove sys-info dependency, that is broken on non-64bit archs
Fixed BROKEN architectures. Bump portrevision

5 files changed, 49 insertions, 6 deletions

diff --git a/textproc/bat/Makefile b/textproc/bat/Makefile
index 6628a4854013..d8058a192c62 100644
--- a/textproc/bat/Makefile
+++ b/textproc/bat/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.18.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	pizzamig@FreeBSD.org
@@ -12,8 +12,6 @@ LICENSE=	APACHE20
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libonig.so:devel/oniguruma
 
-BROKEN_i386=	sys-info dependency crate won't build on FreeBSD
-BROKEN_powerpc=	sys-info dependency crate won't build on FreeBSD
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	sharkdp
@@ -141,7 +139,6 @@ CARGO_CRATES=	adler-1.0.2 \
 		strsim-0.8.0 \
 		syn-1.0.72 \
 		syntect-4.5.0 \
-		sys-info-0.9.0 \
 		tempfile-3.2.0 \
 		term_size-0.3.2 \
 		termcolor-1.1.2 \
diff --git a/textproc/bat/distinfo b/textproc/bat/distinfo
index 8f043daee3fc..48a41b921fe2 100644
--- a/textproc/bat/distinfo
+++ b/textproc/bat/distinfo
@@ -237,8 +237,6 @@ SHA256 (rust/crates/syn-1.0.72.crate) = a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7
 SIZE (rust/crates/syn-1.0.72.crate) = 232500
 SHA256 (rust/crates/syntect-4.5.0.crate) = 2bfac2b23b4d049dc9a89353b4e06bbc85a8f42020cccbe5409a115cf19031e5
 SIZE (rust/crates/syntect-4.5.0.crate) = 752883
-SHA256 (rust/crates/sys-info-0.9.0.crate) = 33fcecee49339531cf6bd84ecf3ed94f9c8ef4a7e700f2a1cac9cc1ca485383a
-SIZE (rust/crates/sys-info-0.9.0.crate) = 20287
 SHA256 (rust/crates/tempfile-3.2.0.crate) = dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22
 SIZE (rust/crates/tempfile-3.2.0.crate) = 25892
 SHA256 (rust/crates/term_size-0.3.2.crate) = 1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9
diff --git a/textproc/bat/files/patch-Cargo.lock b/textproc/bat/files/patch-Cargo.lock
new file mode 100644
index 000000000000..cde1c7661c77
--- /dev/null
+++ b/textproc/bat/files/patch-Cargo.lock
@@ -0,0 +1,27 @@
+--- Cargo.lock.orig	2021-07-19 20:46:52 UTC
++++ Cargo.lock
+@@ -165,7 +165,6 @@ checksum = "a0e97e538864a7c95d33accbf64c8d354018ba3b6e
+ dependencies = [
+  "git-version",
+  "shell-escape",
+- "sys-info",
+ ]
+ 
+ [[package]]
+@@ -1127,16 +1126,6 @@ dependencies = [
+  "serde_json",
+  "walkdir",
+  "yaml-rust",
+-]
+-
+-[[package]]
+-name = "sys-info"
+-version = "0.9.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "33fcecee49339531cf6bd84ecf3ed94f9c8ef4a7e700f2a1cac9cc1ca485383a"
+-dependencies = [
+- "cc",
+- "libc",
+ ]
+ 
+ [[package]]
diff --git a/textproc/bat/files/patch-Cargo.toml b/textproc/bat/files/patch-Cargo.toml
new file mode 100644
index 000000000000..04ccda97664c
--- /dev/null
+++ b/textproc/bat/files/patch-Cargo.toml
@@ -0,0 +1,11 @@
+--- Cargo.toml.orig	2021-07-19 20:34:49 UTC
++++ Cargo.toml
+@@ -49,7 +49,7 @@ serde_yaml = "0.8"
+ semver = "0.11"
+ path_abs = { version = "0.5", default-features = false }
+ clircle = "0.3"
+-bugreport = "0.4"
++bugreport = { version = "0.4", default-features = false, features = ["git_hash", "format_markdown"]}
+ dirs-next = { version = "2.0.0", optional = true }
+ grep-cli = "0.1.6"
+ 
diff --git a/textproc/bat/files/patch-src_bin_bat_main.rs b/textproc/bat/files/patch-src_bin_bat_main.rs
new file mode 100644
index 000000000000..6cad625a605b
--- /dev/null
+++ b/textproc/bat/files/patch-src_bin_bat_main.rs
@@ -0,0 +1,10 @@
+--- src/bin/bat/main.rs.orig	2021-07-19 20:42:50 UTC
++++ src/bin/bat/main.rs
+@@ -233,7 +233,6 @@ fn run() -> Result<bool> {
+ 
+         let report = bugreport!()
+             .info(SoftwareVersion::default())
+-            .info(OperatingSystem::default())
+             .info(CommandLine::default())
+             .info(EnvironmentVariables::list(&[
+                 "SHELL",