wezterm: go a little further with porting.

[Benny Siegert <bsiegert%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Fri Jun 4 16:02:21 2021 +0000
Changeset:	89cb6a2def79005630c16e8a0e34f0fb0f0e75d5

Modified Files:
	wezterm/cargo-depends.mk
	wezterm/distinfo
Added Files:
	wezterm/patches/patch-.._vendor_serial-unix-0.4.0_Cargo.toml
	wezterm/patches/patch-.._vendor_serial-unix-0.4.0_src_error.rs

Log Message:
wezterm: go a little further with porting.

"battery" is the next crate without NetBSD support :(

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

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

diffstat:
 wezterm/cargo-depends.mk                                    |  2 +-
 wezterm/distinfo                                            |  2 ++
 .../patches/patch-.._vendor_serial-unix-0.4.0_Cargo.toml    | 11 +++++++++++
 .../patches/patch-.._vendor_serial-unix-0.4.0_src_error.rs  | 13 +++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diffs:
diff --git a/wezterm/cargo-depends.mk b/wezterm/cargo-depends.mk
index bfde4ec60d..654b2a661e 100644
--- a/wezterm/cargo-depends.mk
+++ b/wezterm/cargo-depends.mk
@@ -365,7 +365,7 @@ CARGO_CRATE_DEPENDS+=	tempdir-0.3.7
 CARGO_CRATE_DEPENDS+=	term_size-0.3.2
 CARGO_CRATE_DEPENDS+=	termcolor-1.1.2
 CARGO_CRATE_DEPENDS+=	terminfo-0.7.3
-CARGO_CRATE_DEPENDS+=	termios-0.2.2
+#CARGO_CRATE_DEPENDS+=	termios-0.2.2
 CARGO_CRATE_DEPENDS+=	termios-0.3.3
 CARGO_CRATE_DEPENDS+=	textwrap-0.11.0
 CARGO_CRATE_DEPENDS+=	textwrap-0.13.4
diff --git a/wezterm/distinfo b/wezterm/distinfo
index 05ccaf0b62..656447b9ff 100644
--- a/wezterm/distinfo
+++ b/wezterm/distinfo
@@ -1854,6 +1854,8 @@ SHA512 (zvariant_derive-2.6.0.crate) = 5392e9b27ea685e4ce0c76a92e03b3e9c85c81f6f
 Size (zvariant_derive-2.6.0.crate) = 6857 bytes
 SHA1 (patch-.._vendor_ioctl-rs-0.1.6_src_lib.rs) = 6cde36dfc661d5b47cd168bf19e7e9f39dec84c2
 SHA1 (patch-.._vendor_ioctl-rs-0.1.6_src_os_mod.rs) = ad91945e767d4f9d4c0ab9c5ccee572a2cea53dd
+SHA1 (patch-.._vendor_serial-unix-0.4.0_Cargo.toml) = 210483d5f03eee5735d90007e132749cb66b53a3
+SHA1 (patch-.._vendor_serial-unix-0.4.0_src_error.rs) = 9c9cf55f9dbf11c97734bbc7f8991effb3f6db3e
 SHA1 (patch-Cargo.toml) = 827c6bc5fc17256f803161c9947dbd12cb4db305
 SHA1 (patch-wezterm-font_Cargo.toml) = 9673b78c80406ad2c886817c7301d4dd41298d7c
 SHA1 (patch-wezterm-ssh_Cargo.toml) = 7187ebe4585fb067b9de44fe955e64df9462d99c
diff --git a/wezterm/patches/patch-.._vendor_serial-unix-0.4.0_Cargo.toml b/wezterm/patches/patch-.._vendor_serial-unix-0.4.0_Cargo.toml
new file mode 100644
index 0000000000..63dc8468d2
--- /dev/null
+++ b/wezterm/patches/patch-.._vendor_serial-unix-0.4.0_Cargo.toml
@@ -0,0 +1,11 @@
+$NetBSD$
+
+--- ../vendor/serial-unix-0.4.0/Cargo.toml.orig	2017-07-02 01:20:06.000000000 +0000
++++ ../vendor/serial-unix-0.4.0/Cargo.toml	2021-05-18 07:45:42.314176787 +0000
+@@ -14,5 +14,5 @@
+ [dependencies]
+ serial-core = { version = "0.4", path = "../serial-core" }
+ libc = "0.2.1"
+-termios = "0.2.2"
++termios = "0.3.3"
+ ioctl-rs = "0.1.5"
diff --git a/wezterm/patches/patch-.._vendor_serial-unix-0.4.0_src_error.rs b/wezterm/patches/patch-.._vendor_serial-unix-0.4.0_src_error.rs
new file mode 100644
index 0000000000..d676ae100a
--- /dev/null
+++ b/wezterm/patches/patch-.._vendor_serial-unix-0.4.0_src_error.rs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- ../vendor/serial-unix-0.4.0/src/error.rs.orig	2021-05-18 08:27:01.969610797 +0000
++++ ../vendor/serial-unix-0.4.0/src/error.rs	2021-05-18 08:25:55.579023516 +0000
+@@ -64,7 +64,7 @@
+         __dfly_error()
+     }
+ 
+-    #[cfg(target_os = "openbsd")]
++    #[cfg(any(target_os = "openbsd", target_os = "netbsd"))]
+     unsafe fn errno_location() -> *const c_int {
+         extern { fn __errno() -> *const c_int; }
+         __errno()