sysutils/macchina: update to 3.0.0

macchina v3.0, codename "Nickel"

-You can now customize the text of every readout's key (#165).
 see the new Carbon.json, if installing using pkgsrc you can find it inside
 ${PREFIX}/share/examples/macchina/
-Added initial FreeBSD support libmacchina#77
-Provide an option to shorten kernel output using the --long-kernel flag or
 long_kernel configuration option (#168)
-Use if-addrs as our IP crate (#163)
 You now have to specify your network interface through the --interface
 flag or interface configuration option.
-Bump our dependencies to their latest versions.

4 files changed, 42 insertions, 36 deletions

diff --git a/sysutils/macchina/Makefile b/sysutils/macchina/Makefile
index c8e77a5a0a8..030d7bb9744 100644
--- a/sysutils/macchina/Makefile
+++ b/sysutils/macchina/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2021/10/18 09:17:26 pin Exp $
+# $NetBSD: Makefile,v 1.36 2021/10/22 09:19:36 pin Exp $
 
-DISTNAME=	macchina-2.0.0
+DISTNAME=	macchina-3.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Macchina-CLI/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -17,6 +17,7 @@ INSTALLATION_DIRS=	bin share/examples/macchina
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/macchina ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/macchina.toml ${DESTDIR}${PREFIX}/share/examples/macchina
+	${INSTALL_DATA} ${WRKSRC}/theme/Carbon.json ${DESTDIR}${PREFIX}/share/examples/macchina
 
 DEPENDS+=	wmctrl-[0-9]*:../../wm/wmctrl
 
diff --git a/sysutils/macchina/PLIST b/sysutils/macchina/PLIST
index bc08409a53d..43342a09aed 100644
--- a/sysutils/macchina/PLIST
+++ b/sysutils/macchina/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/05/18 06:59:13 pin Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/10/22 09:19:36 pin Exp $
 bin/macchina
+share/examples/macchina/Carbon.json
 share/examples/macchina/macchina.toml
diff --git a/sysutils/macchina/cargo-depends.mk b/sysutils/macchina/cargo-depends.mk
index 05f82c60dd2..8e90f8d1e97 100644
--- a/sysutils/macchina/cargo-depends.mk
+++ b/sysutils/macchina/cargo-depends.mk
@@ -1,7 +1,7 @@
-# $NetBSD: cargo-depends.mk,v 1.21 2021/10/07 11:47:08 pin Exp $
+# $NetBSD: cargo-depends.mk,v 1.22 2021/10/22 09:19:36 pin Exp $
 
 CARGO_CRATE_DEPENDS+=	aho-corasick-0.7.18
-CARGO_CRATE_DEPENDS+=	ansi-to-tui-0.4.0
+CARGO_CRATE_DEPENDS+=	ansi-to-tui-0.4.1
 CARGO_CRATE_DEPENDS+=	ansi_term-0.11.0
 CARGO_CRATE_DEPENDS+=	anyhow-1.0.44
 CARGO_CRATE_DEPENDS+=	atty-0.2.14
@@ -37,16 +37,17 @@ CARGO_CRATE_DEPENDS+=	git2-0.13.22
 CARGO_CRATE_DEPENDS+=	heck-0.3.3
 CARGO_CRATE_DEPENDS+=	hermit-abi-0.1.19
 CARGO_CRATE_DEPENDS+=	idna-0.2.3
+CARGO_CRATE_DEPENDS+=	if-addrs-0.6.6
+CARGO_CRATE_DEPENDS+=	if-addrs-sys-0.3.2
 CARGO_CRATE_DEPENDS+=	instant-0.1.10
 CARGO_CRATE_DEPENDS+=	itertools-0.10.1
 CARGO_CRATE_DEPENDS+=	itoa-0.4.8
 CARGO_CRATE_DEPENDS+=	jobserver-0.1.24
 CARGO_CRATE_DEPENDS+=	lazy_static-1.4.0
-CARGO_CRATE_DEPENDS+=	libc-0.2.102
+CARGO_CRATE_DEPENDS+=	libc-0.2.104
 CARGO_CRATE_DEPENDS+=	libgit2-sys-0.12.23+1.2.0
-CARGO_CRATE_DEPENDS+=	libmacchina-2.1.8
+CARGO_CRATE_DEPENDS+=	libmacchina-3.2.2
 CARGO_CRATE_DEPENDS+=	libz-sys-1.1.3
-CARGO_CRATE_DEPENDS+=	local_ipaddress-0.1.3
 CARGO_CRATE_DEPENDS+=	lock_api-0.4.5
 CARGO_CRATE_DEPENDS+=	log-0.4.14
 CARGO_CRATE_DEPENDS+=	mach-0.3.2
@@ -96,8 +97,8 @@ 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.23
-CARGO_CRATE_DEPENDS+=	structopt-derive-0.4.16
+CARGO_CRATE_DEPENDS+=	structopt-0.3.25
+CARGO_CRATE_DEPENDS+=	structopt-derive-0.4.18
 CARGO_CRATE_DEPENDS+=	syn-1.0.76
 CARGO_CRATE_DEPENDS+=	sysctl-0.4.2
 CARGO_CRATE_DEPENDS+=	textwrap-0.11.0
@@ -117,7 +118,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+=	vergen-5.1.16
 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
diff --git a/sysutils/macchina/distinfo b/sysutils/macchina/distinfo
index c92701b117e..4726a5ed2d9 100644
--- a/sysutils/macchina/distinfo
+++ b/sysutils/macchina/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.30 2021/10/18 09:17:26 pin Exp $
+$NetBSD: distinfo,v 1.31 2021/10/22 09:19:36 pin Exp $
 
 RMD160 (aho-corasick-0.7.18.crate) = b0dc4b0030152d0db9483ea816548ec9c330b211
 SHA512 (aho-corasick-0.7.18.crate) = 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 Size (aho-corasick-0.7.18.crate) = 112923 bytes
-RMD160 (ansi-to-tui-0.4.0.crate) = 384ae2d7cbe8988e8d88e3105df3d87d63455293
-SHA512 (ansi-to-tui-0.4.0.crate) = 47051cc872a39f6f67ef7d57a9da69cd90cea156e3bc81627c274c5718494b51f5b9766394fa1fc52493983bed58db5c33ad1da8bfb46824981f9744560516d2
-Size (ansi-to-tui-0.4.0.crate) = 7081 bytes
+RMD160 (ansi-to-tui-0.4.1.crate) = 7cb94bc272d52ec4cb6a39eba52247d02278a39b
+SHA512 (ansi-to-tui-0.4.1.crate) = b2218bfe552693c1f07b53774e42161be0d0095ffd0facb7b117cfc99b3927ef4c011d1f30141e46cc9ed61cd71b5b57b2053cf5dc110ff7a74c4fef75433a4e
+Size (ansi-to-tui-0.4.1.crate) = 7209 bytes
 RMD160 (ansi_term-0.11.0.crate) = 0bc10d826fc7a658ac1026dac333cc54f26f7c5b
 SHA512 (ansi_term-0.11.0.crate) = a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 Size (ansi_term-0.11.0.crate) = 17087 bytes
@@ -111,6 +111,12 @@ Size (hermit-abi-0.1.19.crate) = 9979 bytes
 RMD160 (idna-0.2.3.crate) = ed2e3d1829296b7e55db0a5e3785a4ab38cb3bfb
 SHA512 (idna-0.2.3.crate) = 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 Size (idna-0.2.3.crate) = 271023 bytes
+RMD160 (if-addrs-0.6.6.crate) = 653e9b65503a75e596bd2032a4a7e24129188718
+SHA512 (if-addrs-0.6.6.crate) = 5928a6047023abec957fa461362a7ed3609ca5772a1de46798a78d74b2397e2db5197dc6621b7ac70de787eda3f8132732bc76ec242f006f6f01f7dd6f88b110
+Size (if-addrs-0.6.6.crate) = 9845 bytes
+RMD160 (if-addrs-sys-0.3.2.crate) = 383a9835101b9ca6e4d1730bcfa76c4cb26cfb39
+SHA512 (if-addrs-sys-0.3.2.crate) = e06ec03d5a0dc6958d0060dfe39229c6969f979b076455755634b2a32f811298e8e1ce7b58fef20c98559f10c7829648f697b42d9a18964c0219b3b653f50194
+Size (if-addrs-sys-0.3.2.crate) = 6778 bytes
 RMD160 (instant-0.1.10.crate) = b98ae29b37418fbb6a3cddf3418cd887bb7b1251
 SHA512 (instant-0.1.10.crate) = a6b2c7e0a7b954e961f2d904a4cd6f701617ad70a7ea13230ee157c473c903803dd64596baa0fabd075e995cd3d013e10681c8d712977341ea2b6f97dd48d596
 Size (instant-0.1.10.crate) = 5218 bytes
@@ -126,30 +132,27 @@ Size (jobserver-0.1.24.crate) = 21303 bytes
 RMD160 (lazy_static-1.4.0.crate) = 6c74661c140113ff3b1d660bba095259398bbb55
 SHA512 (lazy_static-1.4.0.crate) = e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 Size (lazy_static-1.4.0.crate) = 10443 bytes
-RMD160 (libc-0.2.102.crate) = 57cff9035644ac59f76c21364400be4d01b5bf73
-SHA512 (libc-0.2.102.crate) = cec681043b9c279e25ffbfdf2aeffe2a5fe057a8187fc2c986aca9a3fc900eac96ae3134632b124f1aaae4e5d2ecbc7122aeb40d94f83b5ec075769ede361643
-Size (libc-0.2.102.crate) = 537138 bytes
+RMD160 (libc-0.2.104.crate) = bbbd59c98b4c4b90d03398f3d78865e1f569d878
+SHA512 (libc-0.2.104.crate) = 25bfce165d0265827f2bf5de255ba8abea6880d82ec9022744de358d4518f381a0cf1fecc5d741b85ee8f90683b7ca3117743236fa32813ac807721fcb15d029
+Size (libc-0.2.104.crate) = 548775 bytes
 RMD160 (libgit2-sys-0.12.23+1.2.0.crate) = d295be40fd14a76348a5a0c2a8c871e931ad18da
 SHA512 (libgit2-sys-0.12.23+1.2.0.crate) = 96a7ed25c1407168c1a2476148f11288d8c606e568f0b5761a7afa04a01cdcff2227db00f19ea0860099bf483214086e652193aa716ef90c3b15cb0f8bb7f5fc
 Size (libgit2-sys-0.12.23+1.2.0.crate) = 1473458 bytes
-RMD160 (libmacchina-2.1.8.crate) = 8ae915d0b331f5860f3a3f3e720459cb438ee980
-SHA512 (libmacchina-2.1.8.crate) = 7d9c369b996a129d68e0fefa91d87ed0269e16bb6f4aa25ee9b6b87bd4720180c4d84ddf5674e65927df4c4504305c188ee6c9f3961f9735d8b9bf62de46038f
-Size (libmacchina-2.1.8.crate) = 70272 bytes
+RMD160 (libmacchina-3.2.2.crate) = ccd2cba2056a7dd547944fc75c766659c91b68f5
+SHA512 (libmacchina-3.2.2.crate) = 7044e70f35feada2814142af56f11af324d9e945e847863e3bfa321ce934d4a8ff8b0f005ad66b5da78106fc794199e967f4e41b3527930c21a38ad96e46fd30
+Size (libmacchina-3.2.2.crate) = 71773 bytes
 RMD160 (libz-sys-1.1.3.crate) = a6885ab0520ba41a634a1e31da1ad292dc464116
 SHA512 (libz-sys-1.1.3.crate) = 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
 Size (libz-sys-1.1.3.crate) = 1341394 bytes
-RMD160 (local_ipaddress-0.1.3.crate) = 0d17ad819fa36006eed033a6398f0ac5c61e8967
-SHA512 (local_ipaddress-0.1.3.crate) = b63dac8a36821c1eceebfd05019f277c29e40c0bd06f7cf4ea275b5b34710ca9c15b36cb47c02b02e49621d6de813849f6acc104e0ac24acbcefd89b290b8869
-Size (local_ipaddress-0.1.3.crate) = 2255 bytes
 RMD160 (lock_api-0.4.5.crate) = 627a985378cedf13dd87580261f702184fed7fad
 SHA512 (lock_api-0.4.5.crate) = d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 Size (lock_api-0.4.5.crate) = 25199 bytes
 RMD160 (log-0.4.14.crate) = 91b8b87a9386f54c92b4625d69722c8871eb8b3a
 SHA512 (log-0.4.14.crate) = 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 Size (log-0.4.14.crate) = 34582 bytes
-RMD160 (macchina-2.0.0.tar.gz) = 2fdda846b6d8b70417910dc3f6ba8cfbdfd53bc9
-SHA512 (macchina-2.0.0.tar.gz) = 9bd521751448e41fef3cc18875290704681f7d4c6d0053563a655c3cdfd6a0d27e9578c55684ce666937b2ac4cb01332034b58e34425b5bd404e10be6d29c717
-Size (macchina-2.0.0.tar.gz) = 51111 bytes
+RMD160 (macchina-3.0.0.tar.gz) = 9e712a28aeeb09d3299ef886b180d25ca0914231
+SHA512 (macchina-3.0.0.tar.gz) = 2f6a28dd9f586bf1f90c81aa5dcbdf36550b469c7f06338f810577e217129c44ca091a5b5b89ff54c5dbac442c711c874f9b5a0a9c4f05ee4c63896fed2b0d9f
+Size (macchina-3.0.0.tar.gz) = 51993 bytes
 RMD160 (mach-0.3.2.crate) = d15fae9a578ec70b31f078b450c2b645404b5ff0
 SHA512 (mach-0.3.2.crate) = 73622b37915f3445a57cbac5eb378bfee61f5a2383c0dd8bd7c29b5e46447405ebaeb706f3a3274e5afe37b0506afaf1511836cb8897d9d480a3abd41f18fa26
 Size (mach-0.3.2.crate) = 19611 bytes
@@ -291,12 +294,12 @@ Size (squote-0.1.2.crate) = 12293 bytes
 RMD160 (strsim-0.8.0.crate) = 980ec0eecba085ca6419d089af3743e23b27cd16
 SHA512 (strsim-0.8.0.crate) = 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 Size (strsim-0.8.0.crate) = 9309 bytes
-RMD160 (structopt-0.3.23.crate) = fdbfc08a6ec67e17c5ac65a1a1da9f5771aa04d3
-SHA512 (structopt-0.3.23.crate) = 6f6cb5e2ecb7bc2e1e7c58d98e3e9f54dd4ff4698d22aa32e2fe7ab6c51a8e9e8c418260321a3f4aaae1808a68eebcc40f619de28433949aa846c27f06ff5cef
-Size (structopt-0.3.23.crate) = 52029 bytes
-RMD160 (structopt-derive-0.4.16.crate) = 3df0c286bbdda6c465349d6faef1ce2875b3b6dc
-SHA512 (structopt-derive-0.4.16.crate) = 11c5fa7a0fdc35a02fba22c940260a4a5bb26ec431d92e032789731afd97576cfe63c988ca614747ac477433cad640c972b48f5c90cb9893be28ffc9774c247c
-Size (structopt-derive-0.4.16.crate) = 20996 bytes
+RMD160 (structopt-0.3.25.crate) = fd9887b093dc6bb5193fc0d4d81801bf7c1f589c
+SHA512 (structopt-0.3.25.crate) = f07c505fbabfd880ee5f931e8a3ed8a1d01fc0a66a78c0cc04a2600d2f5cb2d699ac41719062c5c4d2cb06a64ce1433641837bb7d9fb755018ce95844216811d
+Size (structopt-0.3.25.crate) = 52296 bytes
+RMD160 (structopt-derive-0.4.18.crate) = bb348058d7225b8ab043dada1c22a0dcd5e78225
+SHA512 (structopt-derive-0.4.18.crate) = 68a7f9c2ed987993fdd8bb7e81c31969a1fdf5351c58cba9de61a2f5957aba1626be4b0742f31d4de502301675ba24b0d91dd3acb24f5607bdeec83070626a57
+Size (structopt-derive-0.4.18.crate) = 20996 bytes
 RMD160 (syn-1.0.76.crate) = ee4d83ca3e8d3ec69031d77fa056790d64b4acbf
 SHA512 (syn-1.0.76.crate) = 0f32138d219ca74fcff1ee5ee5bb89f965a30b74c10a040bd8361332cb84900322194dd85ad7571c4bce72c1f66368546db5881165939800f2587b15ce07298a
 Size (syn-1.0.76.crate) = 233723 bytes
@@ -354,9 +357,9 @@ Size (vcpkg-0.2.15.crate) = 228735 bytes
 RMD160 (vec_map-0.8.2.crate) = dc0c5e6458586494c3bea361d24856055b2b723b
 SHA512 (vec_map-0.8.2.crate) = 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 Size (vec_map-0.8.2.crate) = 14466 bytes
-RMD160 (vergen-5.1.15.crate) = df208067fc6e5f1af3ff80206b5de6d9b3a251cb
-SHA512 (vergen-5.1.15.crate) = cedf74c73679d855e28866eb453be44ce30b1697bc946d925157cd155a6b2fe8c6cfca9d9509eb74aec1d5674bfe1b895bd236d0390df7b5a1ce5dcfd69059e5
-Size (vergen-5.1.15.crate) = 27916 bytes
+RMD160 (vergen-5.1.16.crate) = f06936ea819055ac51af1623b3f5435aef242183
+SHA512 (vergen-5.1.16.crate) = b37bb63065056704d2f57728afe0889f0da5ab05d0d44a99a4d627a827698c3b228315e34febcd7feca437aca0b894f0d828c9bffc1b9c64e2f9b412ed9948ab
+Size (vergen-5.1.16.crate) = 28095 bytes
 RMD160 (version_check-0.9.3.crate) = 86f7ac2fb4d8bb621f9cec2d750fce5f7fb65847
 SHA512 (version_check-0.9.3.crate) = 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 Size (version_check-0.9.3.crate) = 12547 bytes