sysutils/macchina: update to 1.1.3

As of version 1.0.0 macchina uses google-speech to support text-to-speech.
I've disabled this feature, please let me know if you think this should be on.

v1.1.4
-Fix NetBSD build.

v1.1.3
-macOS: manually look for config in $HOME/.config/ (#138)

v1.1.2
-readme: Fix Linux benchmark table formatting

v1.1.1
-misc: Remove X11 feature from codebase after having replaced it with a built-in
resolution parser (#135)
-misc: Bump all dependencies' versions
-config: Fallback to original naming for some ReadoutKeys
-readme: Remove saythanks badge
-readme: benchmarks: disclose the environment/processor
-readme: Nix's installation section now mentions all channels
-actions: Bring back netbsd workflow after having removed all X11 code
-libmacchina: Bump from v0.8.1 to v1.0.1
	-[*nix only] Implement a new readout, disk_space() which for now returns the
	used bytes of the root partition
	-Add macOS resolution (#56)
	-Address a panic caused by too much output in the resolution readout (#132)
	-src/macos/mach_ffi.rs: Remove useless CGError typedef
	-src/macos/mod.rs: Search for "brew" rather than "homebrew" before getting
	package count
-src/data/mods.rs: Significantly improve shell readout logic
-macchina.toml: Be more specific in small_ascii description
-src/cli.rs: Be more specific in small_ascii description

v1.1.0
Bug fixes:
-Address an issue that causes text to overflow when the terminal
is reduced beyond its original size
-Address an issue that causes terminal information to be incorrect
when in a nested shell situation

Features:
-Added the commit hash to --version
-Added an option to toggle between displaying the current or default shell

Misc:
-Added macOS Monterey to list of macOS versions
-Removed many build dependencies (breaking shell auto-completion)
-Removed many annoying conflict checks in the configuration file
-No longer capitalize shell output
-Bumped most dependencies' versions

sysutils/macchina/Makefile

@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2021/09/11 21:14:31 pin Exp $
+# $NetBSD: Makefile,v 1.31 2021/09/15 13:35:55 pin Exp $
 
-DISTNAME=	macchina-0.9.2
-# Newer versions depend on vergen crate, which fails to build
-# on NetBSD. Discussion on-going with upstream.
+DISTNAME=	macchina-1.1.4
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Macchina-CLI/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -14,17 +12,10 @@ LICENSE=	mit
 
 .include "cargo-depends.mk"
 
-USE_LANGUAGES+=	c c++
-USE_TOOLS+=	pkg-config
-
 INSTALLATION_DIRS=	bin share/examples/macchina
 
-RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
-RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
-RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXdmcp}/lib
-RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXau}/lib
-
-BUILDLINK_TRANSFORM+=	opt:-pie:-fPIC
+CARGO_NO_DEFAULT_FEATURES=	YES
+CARGO_FEATURES+=		openwrt
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/macchina ${DESTDIR}${PREFIX}/bin
@@ -33,8 +24,4 @@ do-install:
 DEPENDS+=	wmctrl-[0-9]*:../../wm/wmctrl
 
 .include "../../lang/rust/cargo.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libxcb/buildlink3.mk"
-.include "../../x11/libXdmcp/buildlink3.mk"
-.include "../../x11/libXau/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

sysutils/macchina/cargo-depends.mk

@@ -1,88 +1,142 @@
-# $NetBSD: cargo-depends.mk,v 1.17 2021/06/08 10:21:55 pin Exp $
+# $NetBSD: cargo-depends.mk,v 1.18 2021/09/15 13:35:55 pin Exp $
 
 CARGO_CRATE_DEPENDS+=	aho-corasick-0.7.18
-CARGO_CRATE_DEPENDS+=	ansi-to-tui-0.1.9
+CARGO_CRATE_DEPENDS+=	ansi-to-tui-0.4.0
 CARGO_CRATE_DEPENDS+=	ansi_term-0.11.0
+CARGO_CRATE_DEPENDS+=	anyhow-1.0.42
+CARGO_CRATE_DEPENDS+=	aparato-6.0.2
 CARGO_CRATE_DEPENDS+=	atty-0.2.14
+CARGO_CRATE_DEPENDS+=	autocfg-1.0.1
 CARGO_CRATE_DEPENDS+=	bitflags-1.2.1
+CARGO_CRATE_DEPENDS+=	byte-unit-4.0.12
 CARGO_CRATE_DEPENDS+=	byteorder-1.4.3
-CARGO_CRATE_DEPENDS+=	bytesize-1.0.1
+CARGO_CRATE_DEPENDS+=	bytesize-1.1.0
 CARGO_CRATE_DEPENDS+=	cassowary-0.3.0
-CARGO_CRATE_DEPENDS+=	cc-1.0.67
+CARGO_CRATE_DEPENDS+=	cc-1.0.69
 CARGO_CRATE_DEPENDS+=	cfg-if-1.0.0
+CARGO_CRATE_DEPENDS+=	chrono-0.4.19
 CARGO_CRATE_DEPENDS+=	clap-2.33.3
 CARGO_CRATE_DEPENDS+=	colored-2.0.0
 CARGO_CRATE_DEPENDS+=	const-sha1-0.2.0
 CARGO_CRATE_DEPENDS+=	core-foundation-0.9.1
 CARGO_CRATE_DEPENDS+=	core-foundation-sys-0.8.2
-CARGO_CRATE_DEPENDS+=	crossterm-0.18.2
-CARGO_CRATE_DEPENDS+=	crossterm_winapi-0.6.2
+CARGO_CRATE_DEPENDS+=	core-graphics-0.22.2
+CARGO_CRATE_DEPENDS+=	core-graphics-types-0.1.1
+CARGO_CRATE_DEPENDS+=	crossterm-0.20.0
+CARGO_CRATE_DEPENDS+=	crossterm_winapi-0.8.0
+CARGO_CRATE_DEPENDS+=	ctor-0.1.20
 CARGO_CRATE_DEPENDS+=	dirs-3.0.2
 CARGO_CRATE_DEPENDS+=	dirs-sys-0.3.6
+CARGO_CRATE_DEPENDS+=	doc-comment-0.3.3
 CARGO_CRATE_DEPENDS+=	either-1.6.1
-CARGO_CRATE_DEPENDS+=	getrandom-0.2.2
-CARGO_CRATE_DEPENDS+=	heck-0.3.2
-CARGO_CRATE_DEPENDS+=	hermit-abi-0.1.18
-CARGO_CRATE_DEPENDS+=	instant-0.1.9
-CARGO_CRATE_DEPENDS+=	itertools-0.10.0
+CARGO_CRATE_DEPENDS+=	enum-iterator-0.7.0
+CARGO_CRATE_DEPENDS+=	enum-iterator-derive-0.7.0
+CARGO_CRATE_DEPENDS+=	foreign-types-0.3.2
+CARGO_CRATE_DEPENDS+=	foreign-types-shared-0.1.1
+CARGO_CRATE_DEPENDS+=	form_urlencoded-1.0.1
+CARGO_CRATE_DEPENDS+=	getrandom-0.2.3
+CARGO_CRATE_DEPENDS+=	getset-0.1.1
+CARGO_CRATE_DEPENDS+=	ghost-0.1.2
+CARGO_CRATE_DEPENDS+=	git2-0.13.21
+CARGO_CRATE_DEPENDS+=	google_speech-0.1.0
+CARGO_CRATE_DEPENDS+=	heck-0.3.3
+CARGO_CRATE_DEPENDS+=	hermit-abi-0.1.19
+CARGO_CRATE_DEPENDS+=	hex-0.4.3
+CARGO_CRATE_DEPENDS+=	idna-0.2.3
+CARGO_CRATE_DEPENDS+=	indoc-0.3.6
+CARGO_CRATE_DEPENDS+=	indoc-impl-0.3.6
+CARGO_CRATE_DEPENDS+=	instant-0.1.10
+CARGO_CRATE_DEPENDS+=	inventory-0.1.10
+CARGO_CRATE_DEPENDS+=	inventory-impl-0.1.10
+CARGO_CRATE_DEPENDS+=	itertools-0.10.1
 CARGO_CRATE_DEPENDS+=	itoa-0.4.7
+CARGO_CRATE_DEPENDS+=	jobserver-0.1.23
 CARGO_CRATE_DEPENDS+=	lazy_static-1.4.0
-CARGO_CRATE_DEPENDS+=	libc-0.2.94
-CARGO_CRATE_DEPENDS+=	libmacchina-0.4.10
+CARGO_CRATE_DEPENDS+=	libc-0.2.101
+CARGO_CRATE_DEPENDS+=	libgit2-sys-0.12.22+1.1.0
+CARGO_CRATE_DEPENDS+=	libmacchina-1.0.4
+CARGO_CRATE_DEPENDS+=	libz-sys-1.1.3
 CARGO_CRATE_DEPENDS+=	local_ipaddress-0.1.3
 CARGO_CRATE_DEPENDS+=	lock_api-0.4.4
 CARGO_CRATE_DEPENDS+=	log-0.4.14
 CARGO_CRATE_DEPENDS+=	mach-0.3.2
+CARGO_CRATE_DEPENDS+=	matches-0.1.9
 CARGO_CRATE_DEPENDS+=	memchr-2.4.0
-CARGO_CRATE_DEPENDS+=	mio-0.7.11
+CARGO_CRATE_DEPENDS+=	memoffset-0.6.4
+CARGO_CRATE_DEPENDS+=	mio-0.7.13
 CARGO_CRATE_DEPENDS+=	miow-0.3.7
-CARGO_CRATE_DEPENDS+=	nix-0.20.0
+CARGO_CRATE_DEPENDS+=	nix-0.22.1
 CARGO_CRATE_DEPENDS+=	ntapi-0.3.6
+CARGO_CRATE_DEPENDS+=	num-integer-0.1.44
+CARGO_CRATE_DEPENDS+=	num-traits-0.2.14
 CARGO_CRATE_DEPENDS+=	num_cpus-1.13.0
+CARGO_CRATE_DEPENDS+=	once_cell-1.8.0
 CARGO_CRATE_DEPENDS+=	os-release-0.1.0
 CARGO_CRATE_DEPENDS+=	parking_lot-0.11.1
 CARGO_CRATE_DEPENDS+=	parking_lot_core-0.8.3
+CARGO_CRATE_DEPENDS+=	paste-0.1.18
+CARGO_CRATE_DEPENDS+=	paste-impl-0.1.18
+CARGO_CRATE_DEPENDS+=	percent-encoding-2.1.0
 CARGO_CRATE_DEPENDS+=	pkg-config-0.3.19
 CARGO_CRATE_DEPENDS+=	ppv-lite86-0.2.10
 CARGO_CRATE_DEPENDS+=	proc-macro-error-1.0.4
 CARGO_CRATE_DEPENDS+=	proc-macro-error-attr-1.0.4
-CARGO_CRATE_DEPENDS+=	proc-macro2-1.0.26
+CARGO_CRATE_DEPENDS+=	proc-macro-hack-0.5.19
+CARGO_CRATE_DEPENDS+=	proc-macro2-1.0.28
+CARGO_CRATE_DEPENDS+=	pyo3-0.13.2
+CARGO_CRATE_DEPENDS+=	pyo3-macros-0.13.2
+CARGO_CRATE_DEPENDS+=	pyo3-macros-backend-0.13.2
 CARGO_CRATE_DEPENDS+=	quote-1.0.9
-CARGO_CRATE_DEPENDS+=	rand-0.8.3
-CARGO_CRATE_DEPENDS+=	rand_chacha-0.3.0
-CARGO_CRATE_DEPENDS+=	rand_core-0.6.2
-CARGO_CRATE_DEPENDS+=	rand_hc-0.3.0
-CARGO_CRATE_DEPENDS+=	redox_syscall-0.2.8
+CARGO_CRATE_DEPENDS+=	rand-0.8.4
+CARGO_CRATE_DEPENDS+=	rand_chacha-0.3.1
+CARGO_CRATE_DEPENDS+=	rand_core-0.6.3
+CARGO_CRATE_DEPENDS+=	rand_hc-0.3.1
+CARGO_CRATE_DEPENDS+=	redox_syscall-0.2.10
 CARGO_CRATE_DEPENDS+=	redox_users-0.4.0
 CARGO_CRATE_DEPENDS+=	regex-1.5.4
 CARGO_CRATE_DEPENDS+=	regex-syntax-0.6.25
+CARGO_CRATE_DEPENDS+=	rustc_version-0.4.0
+CARGO_CRATE_DEPENDS+=	rustversion-1.0.5
 CARGO_CRATE_DEPENDS+=	ryu-1.0.5
 CARGO_CRATE_DEPENDS+=	same-file-1.0.6
 CARGO_CRATE_DEPENDS+=	scopeguard-1.1.0
-CARGO_CRATE_DEPENDS+=	serde-1.0.126
-CARGO_CRATE_DEPENDS+=	serde_derive-1.0.126
-CARGO_CRATE_DEPENDS+=	serde_json-1.0.64
-CARGO_CRATE_DEPENDS+=	signal-hook-0.1.17
-CARGO_CRATE_DEPENDS+=	signal-hook-registry-1.3.0
+CARGO_CRATE_DEPENDS+=	semver-1.0.4
+CARGO_CRATE_DEPENDS+=	serde-1.0.130
+CARGO_CRATE_DEPENDS+=	serde_derive-1.0.130
+CARGO_CRATE_DEPENDS+=	serde_json-1.0.67
+CARGO_CRATE_DEPENDS+=	signal-hook-0.3.10
+CARGO_CRATE_DEPENDS+=	signal-hook-mio-0.2.1
+CARGO_CRATE_DEPENDS+=	signal-hook-registry-1.4.0
 CARGO_CRATE_DEPENDS+=	smallvec-1.6.1
 CARGO_CRATE_DEPENDS+=	sqlite-0.26.0
 CARGO_CRATE_DEPENDS+=	sqlite3-src-0.3.0
 CARGO_CRATE_DEPENDS+=	sqlite3-sys-0.13.0
 CARGO_CRATE_DEPENDS+=	squote-0.1.2
 CARGO_CRATE_DEPENDS+=	strsim-0.8.0
-CARGO_CRATE_DEPENDS+=	structopt-0.3.21
-CARGO_CRATE_DEPENDS+=	structopt-derive-0.4.14
-CARGO_CRATE_DEPENDS+=	syn-1.0.72
-CARGO_CRATE_DEPENDS+=	sysctl-0.4.1
+CARGO_CRATE_DEPENDS+=	structopt-0.3.23
+CARGO_CRATE_DEPENDS+=	structopt-derive-0.4.16
+CARGO_CRATE_DEPENDS+=	syn-1.0.74
+CARGO_CRATE_DEPENDS+=	sysctl-0.4.2
+CARGO_CRATE_DEPENDS+=	sysinfo-0.19.2
 CARGO_CRATE_DEPENDS+=	textwrap-0.11.0
-CARGO_CRATE_DEPENDS+=	thiserror-1.0.24
-CARGO_CRATE_DEPENDS+=	thiserror-impl-1.0.24
+CARGO_CRATE_DEPENDS+=	thiserror-1.0.26
+CARGO_CRATE_DEPENDS+=	thiserror-impl-1.0.26
+CARGO_CRATE_DEPENDS+=	time-0.1.43
+CARGO_CRATE_DEPENDS+=	tinyvec-1.3.1
+CARGO_CRATE_DEPENDS+=	tinyvec_macros-0.1.0
 CARGO_CRATE_DEPENDS+=	toml-0.5.8
-CARGO_CRATE_DEPENDS+=	tui-0.14.0
-CARGO_CRATE_DEPENDS+=	unicode-segmentation-1.7.1
+CARGO_CRATE_DEPENDS+=	tui-0.16.0
+CARGO_CRATE_DEPENDS+=	unicode-bidi-0.3.6
+CARGO_CRATE_DEPENDS+=	unicode-normalization-0.1.19
+CARGO_CRATE_DEPENDS+=	unicode-segmentation-1.8.0
 CARGO_CRATE_DEPENDS+=	unicode-width-0.1.8
 CARGO_CRATE_DEPENDS+=	unicode-xid-0.2.2
+CARGO_CRATE_DEPENDS+=	unindent-0.1.7
+CARGO_CRATE_DEPENDS+=	url-2.2.2
+CARGO_CRATE_DEPENDS+=	utf8-width-0.1.5
+CARGO_CRATE_DEPENDS+=	vcpkg-0.2.15
 CARGO_CRATE_DEPENDS+=	vec_map-0.8.2
+CARGO_CRATE_DEPENDS+=	vergen-5.1.15
 CARGO_CRATE_DEPENDS+=	version_check-0.9.3
 CARGO_CRATE_DEPENDS+=	walkdir-2.3.2
 CARGO_CRATE_DEPENDS+=	wasi-0.10.2+wasi-snapshot-preview1