taplo-lsp: fix broken build

[pin <voidpin%protonmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Tue Dec 21 12:55:11 2021 +0100
Changeset:	0316421ba252f145c43e9eab9bffd1e663fbe3f9

Modified Files:
	taplo-lsp/Makefile
	taplo-lsp/PLIST
	taplo-lsp/cargo-depends.mk
	taplo-lsp/distinfo
	taplo-lsp/patches/patch-taplo-cli_Cargo.toml
	taplo-lsp/patches/patch-taplo-lsp_Cargo.toml
Removed Files:
	taplo-lsp/TODO

Log Message:
taplo-lsp: fix broken build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0316421ba252f145c43e9eab9bffd1e663fbe3f9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 taplo-lsp/Makefile                           |  5 +++++
 taplo-lsp/PLIST                              |  4 +---
 taplo-lsp/TODO                               | 23 -----------------------
 taplo-lsp/cargo-depends.mk                   |  4 ++--
 taplo-lsp/distinfo                           | 16 ++++++++--------
 taplo-lsp/patches/patch-taplo-cli_Cargo.toml |  2 ++
 taplo-lsp/patches/patch-taplo-lsp_Cargo.toml |  2 ++
 7 files changed, 20 insertions(+), 36 deletions(-)

diffs:
diff --git a/taplo-lsp/Makefile b/taplo-lsp/Makefile
index 12f28a564f..6bcccbf167 100644
--- a/taplo-lsp/Makefile
+++ b/taplo-lsp/Makefile
@@ -21,6 +21,11 @@ USE_TOOLS+=	pkg-config
 # before you can run 'make print-cargo-depends'
 .include "cargo-depends.mk"
 
+INSTALLATION_DIRS=	bin
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/target/release/taplo-lsp ${DESTDIR}${PREFIX}/bin
+
 .include "../../lang/rust/cargo.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/taplo-lsp/PLIST b/taplo-lsp/PLIST
index 92ba51a2d7..7aaaa70f53 100644
--- a/taplo-lsp/PLIST
+++ b/taplo-lsp/PLIST
@@ -1,4 +1,2 @@
 @comment $NetBSD$
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+bin/taplo-lsp
diff --git a/taplo-lsp/TODO b/taplo-lsp/TODO
deleted file mode 100644
index 55dd84b4d9..0000000000
--- a/taplo-lsp/TODO
+++ /dev/null
@@ -1,23 +0,0 @@
-Does not build:
-
-   Compiling taplo-lsp v0.2.1 (/scratch/devel/taplo-lsp/work/taplo-release-lsp-0.2.6/taplo-lsp)
-error[E0599]: no method named `about` found for struct `Arg` in the current scope
-  --> taplo-lsp/bin/lsp/main.rs:50:26
-   |
-50 |                         .about("The address to listen on")
-   |                          ^^^^^ method not found in `Arg<'_>`
-
-error[E0599]: no method named `about` found for struct `Arg` in the current scope
-  --> taplo-lsp/bin/lsp/main.rs:53:39
-   |
-53 |                 .arg(Arg::new("port").about("Port to use").default_value("5000")),
-   |                                       ^^^^^ method not found in `Arg<'_>`
-
-For more information about this error, try `rustc --explain E0599`.
-error: could not compile `taplo-lsp` due to 2 previous errors
-*** Error code 101
-
-Stop.
-
-Reported upstream:
-https://github.com/tamasfe/taplo/issues/197
diff --git a/taplo-lsp/cargo-depends.mk b/taplo-lsp/cargo-depends.mk
index 3fd8570df6..00694a4437 100644
--- a/taplo-lsp/cargo-depends.mk
+++ b/taplo-lsp/cargo-depends.mk
@@ -18,8 +18,8 @@ CARGO_CRATE_DEPENDS+=	cc-1.0.72
 CARGO_CRATE_DEPENDS+=	cfg-if-0.1.10
 CARGO_CRATE_DEPENDS+=	cfg-if-1.0.0
 CARGO_CRATE_DEPENDS+=	chrono-0.4.19
-CARGO_CRATE_DEPENDS+=	clap-3.0.0-rc.3
-CARGO_CRATE_DEPENDS+=	clap_derive-3.0.0-rc.3
+CARGO_CRATE_DEPENDS+=	clap-3.0.0-beta.2
+CARGO_CRATE_DEPENDS+=	clap_derive-3.0.0-beta.2
 CARGO_CRATE_DEPENDS+=	colored-2.0.0
 CARGO_CRATE_DEPENDS+=	console_error_panic_hook-0.1.7
 CARGO_CRATE_DEPENDS+=	const_fn-0.4.8
diff --git a/taplo-lsp/distinfo b/taplo-lsp/distinfo
index 4d10bc1ff2..38c651b21b 100644
--- a/taplo-lsp/distinfo
+++ b/taplo-lsp/distinfo
@@ -54,12 +54,12 @@ Size (cfg-if-1.0.0.crate) = 7934 bytes
 BLAKE2s (chrono-0.4.19.crate) = d6fed9203ab335271d17a56de9a78a9a6c418561751716d924ce04cd0260a2a0
 SHA512 (chrono-0.4.19.crate) = a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 Size (chrono-0.4.19.crate) = 155663 bytes
-BLAKE2s (clap-3.0.0-rc.3.crate) = a6e668bfd8d4f864a072393c2f34a910c47b1f75e81a55c9822cdfedda004d2f
-SHA512 (clap-3.0.0-rc.3.crate) = b914302a4b28ab78cdf7af28ab0c10c7e98ed8d3a40ad05d60f37c7b3dc0b9f5d9f4d26d8b44884ca58ab6ed456a633eb533da44b248f32b42111c478fb80c99
-Size (clap-3.0.0-rc.3.crate) = 187850 bytes
-BLAKE2s (clap_derive-3.0.0-rc.3.crate) = 23485c768ef1358acc9a67a519eb79f591a4c120d0475338b016e0488e662572
-SHA512 (clap_derive-3.0.0-rc.3.crate) = 9b516b3609b4e51d6f1a4073c2f6fa39ce5252fe61e947793eb85d7fbf0cc1af23cab47631af803e4adeeb81eae5d0bfb1efc9e5a9160abc3a31adb73dbf13b0
-Size (clap_derive-3.0.0-rc.3.crate) = 24605 bytes
+BLAKE2s (clap-3.0.0-beta.2.crate) = aace55bb05453cc6bb81c77c105b3628791ce79afe9a5f960802d8135f42fe5c
+SHA512 (clap-3.0.0-beta.2.crate) = bb51ab2dfe06eb11023d3933ca7a657e3c9e6fa064cba81e2436450036dca3dcc2ca5a9b90785a0042dd823e57ad1e7dc765b788928c249fd10906329b33cdb7
+Size (clap-3.0.0-beta.2.crate) = 141105 bytes
+BLAKE2s (clap_derive-3.0.0-beta.2.crate) = d2be72fc7771fed20f242bf93151624a8f51700347ce581b68dcba6fcf644171
+SHA512 (clap_derive-3.0.0-beta.2.crate) = 4e2620557daae4f1da925e0ead0f18c76586b59b9e2289d85a949a081f88e097b56bfda2ef07c88704e7b5704dc58de3a468bf73705ba64a85d59103ff60dd5f
+Size (clap_derive-3.0.0-beta.2.crate) = 23425 bytes
 BLAKE2s (colored-2.0.0.crate) = d662d4cff2fde6538fe02524b0e763f1928411c0dfb593c90c8dd6a6616389ec
 SHA512 (colored-2.0.0.crate) = c9ee830c1e8a32372ab8c7ce569701deaa6533fa369fc1b4c04bed57b1e686ed775fc76c3d9815ad21ee69cfc7c30d645abcbacad39081c7e37ff83ebb6d9e8a
 Size (colored-2.0.0.crate) = 21619 bytes
@@ -675,5 +675,5 @@ Size (ws2_32-sys-0.2.1.crate) = 4697 bytes
 BLAKE2s (yaml-rust-0.4.5.crate) = 65c7c0fe708cb682959e36fbb03b09a35b09d529e5c87364107f5985940a1404
 SHA512 (yaml-rust-0.4.5.crate) = 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 Size (yaml-rust-0.4.5.crate) = 47783 bytes
-SHA1 (patch-taplo-cli_Cargo.toml) = ef4636eb2e9ce33b563404fc0f934f706d70a361
-SHA1 (patch-taplo-lsp_Cargo.toml) = 0ebc8113af2100a99121da3fa6830c4acbb79f24
+SHA1 (patch-taplo-cli_Cargo.toml) = 4d7f8c942ee17b69533b1aceea5f3feb0327bd81
+SHA1 (patch-taplo-lsp_Cargo.toml) = 5576eb1b222d442f7c0070cb66f97802848232e5
diff --git a/taplo-lsp/patches/patch-taplo-cli_Cargo.toml b/taplo-lsp/patches/patch-taplo-cli_Cargo.toml
index 27758239fd..804b0fd8aa 100644
--- a/taplo-lsp/patches/patch-taplo-cli_Cargo.toml
+++ b/taplo-lsp/patches/patch-taplo-cli_Cargo.toml
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Force clap version to avoid breakage
+
 --- taplo-cli/Cargo.toml.orig	2021-09-28 18:57:16.000000000 +0000
 +++ taplo-cli/Cargo.toml
 @@ -22,7 +22,7 @@ nightly = []
diff --git a/taplo-lsp/patches/patch-taplo-lsp_Cargo.toml b/taplo-lsp/patches/patch-taplo-lsp_Cargo.toml
index 89d79f1813..b520874d96 100644
--- a/taplo-lsp/patches/patch-taplo-lsp_Cargo.toml
+++ b/taplo-lsp/patches/patch-taplo-lsp_Cargo.toml
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Force clap version to avoid breakage
+
 --- taplo-lsp/Cargo.toml.orig	2021-09-28 18:57:16.000000000 +0000
 +++ taplo-lsp/Cargo.toml
 @@ -57,7 +57,7 @@ tokio = { version = "1", features = [