tinygo: use fork of go-serial until upstream has merged support

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Aug 8 17:24:29 2024 +0200
Changeset:	f065ea138871ad6f71310f837c6f142d45c294ec

Modified Files:
	tinygo/Makefile
	tinygo/distinfo
	tinygo/go-modules.mk
	tinygo/patches/patch-go.mod
Added Files:
	tinygo/patches/patch-go.sum
Removed Files:
	tinygo/patches/patch-.._go.bug.st_serial_serial__resetbuf__linux__bsd.go
	tinygo/patches/patch-.._go.bug.st_serial_serial__unix.go
	tinygo/patches/patch-.._go.bug.st_serial_unixutils_pipe.go
	tinygo/patches/patch-.._go.bug.st_serial_unixutils_select.go

Log Message:
tinygo: use fork of go-serial until upstream has merged support

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

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

diffstat:
 tinygo/Makefile                                           |  7 +------
 tinygo/distinfo                                           | 13 ++++++++-----
 tinygo/go-modules.mk                                      |  2 ++
 ...ch-.._go.bug.st_serial_serial__resetbuf__linux__bsd.go | 15 ---------------
 tinygo/patches/patch-.._go.bug.st_serial_serial__unix.go  | 15 ---------------
 .../patches/patch-.._go.bug.st_serial_unixutils_pipe.go   | 15 ---------------
 .../patches/patch-.._go.bug.st_serial_unixutils_select.go | 15 ---------------
 tinygo/patches/patch-go.mod                               | 15 +++++----------
 tinygo/patches/patch-go.sum                               | 15 +++++++++++++++
 9 files changed, 31 insertions(+), 81 deletions(-)

diffs:
diff --git a/tinygo/Makefile b/tinygo/Makefile
index b167a3042e..10dc9457d4 100644
--- a/tinygo/Makefile
+++ b/tinygo/Makefile
@@ -43,19 +43,14 @@ CHECK_INTERPRETER_SKIP+=	tinygo/lib/macos-minimal-sdk/generate-stubs.py
 CHECK_INTERPRETER_SKIP+=	tinygo/lib/picolibc/newlib/libc/string/uniset
 CHECK_INTERPRETER_SKIP+=	tinygo/lib/picolibc/newlib/libc/tinystdio/make-dtoa-data
 
-GO_MODULE_EXTRACT=	go.bug.st_serial_@v_v1.6.0.zip
 DISTFILES=		${DEFAULT_DISTFILES} ${TINYGO_DISTFILES}
-EXTRACT_ONLY=		${DEFAULT_DISTFILES} ${TINYGO_DISTFILES} ${_GITHUB_DEFAULT_DISTFILES} ${GO_MODULE_EXTRACT}
+EXTRACT_ONLY=		${DEFAULT_DISTFILES} ${TINYGO_DISTFILES} ${_GITHUB_DEFAULT_DISTFILES}
 
 .include "go-modules.mk"
 
 post-extract:
 	mv ${WRKDIR}/llvm-project* ${WRKSRC}/llvm-project
 	rm -rf ${WRKSRC}/lib/musl && mv ${WRKDIR}/musl* ${WRKSRC}/lib/musl
-	cp ${WRKDIR}/go.bug.st/serial@v1.6.0/serial_openbsd.go		\
-		${WRKDIR}/go.bug.st/serial@v1.6.0/serial_netbsd.go
-	cp ${WRKDIR}/go.bug.st/serial@v1.6.0/enumerator/usb_openbsd.go	\
-		${WRKDIR}/go.bug.st/serial@v1.6.0/enumerator/usb_netbsd.go
 
 do-build:
 .for t in llvm-build tinygo build/release
diff --git a/tinygo/distinfo b/tinygo/distinfo
index aa3ffe632f..93ac97b2e7 100644
--- a/tinygo/distinfo
+++ b/tinygo/distinfo
@@ -258,6 +258,12 @@ Size (github.com_tinygo-org_tools_@v_v0.0.0-20240612102102-36af80766fc9.mod) = 3
 BLAKE2s (github.com_tinygo-org_tools_@v_v0.0.0-20240612102102-36af80766fc9.zip) = 40aa7b22355a9e0f8b4defc26226fa2a6e33a603d7d9e634dd6be01fbc855659
 SHA512 (github.com_tinygo-org_tools_@v_v0.0.0-20240612102102-36af80766fc9.zip) = 2389c3d3b6554b748a8f76a4c983550fd675a5d7599e04ba207df4ec2a5feee0022be94ef76c93ebb3cb5c0a9181c7c4558f1af31cf265c942affd01d770532a
 Size (github.com_tinygo-org_tools_@v_v0.0.0-20240612102102-36af80766fc9.zip) = 3275875 bytes
+BLAKE2s (github.com_tnn2_go-serial_@v_v0.0.0-20240808132751-d345e1ef8d6d.mod) = 5012b950da47796a8033ce6fb3d9b21b3f01e5a385cd54b35abf934d9b9d71ac
+SHA512 (github.com_tnn2_go-serial_@v_v0.0.0-20240808132751-d345e1ef8d6d.mod) = 26efc4824c9a6515cd3e1eabec7018321fb0876e7253ca4bccb1f156178d9856cc32276eb85b1a24732b05bf70009bb39e3a29da8dcb5d05abf2086bab1edbae
+Size (github.com_tnn2_go-serial_@v_v0.0.0-20240808132751-d345e1ef8d6d.mod) = 290 bytes
+BLAKE2s (github.com_tnn2_go-serial_@v_v0.0.0-20240808132751-d345e1ef8d6d.zip) = 0ee689387de137bf39d0e9bfc1f82f54db42f6eded77658f90729969bb55fed4
+SHA512 (github.com_tnn2_go-serial_@v_v0.0.0-20240808132751-d345e1ef8d6d.zip) = 882b725ebebfe27155de5b3d48e8385742d003997b20647a52fad21cc8e8b3b3da2943e69fed6f41219e5d578a80ffe44c893a4bd56ee396fb23075641a0d8e0
+Size (github.com_tnn2_go-serial_@v_v0.0.0-20240808132751-d345e1ef8d6d.zip) = 49648 bytes
 BLAKE2s (golang.org_x_net_@v_v0.26.0.mod) = 38b09ecda0e04826ccb2989569da572b2714e0bc3d5171027058341ce023136e
 SHA512 (golang.org_x_net_@v_v0.26.0.mod) = f443722dc3f645fc0d5c20a1b18d433f25fcc648dc947ec8fc9b795766b528e5e05d87c94ee05f17771f83e6cf1161794a9d510038f5a6f9521a96b4d66de5c4
 Size (golang.org_x_net_@v_v0.26.0.mod) = 155 bytes
@@ -342,11 +348,8 @@ Size (tinygo.org_x_go-llvm_@v_v0.0.0-20240518103902-697964f2a9dc.zip) = 54524 by
 BLAKE2s (tinygo_xtensa_release_18.1.2.tar.gz) = 5152c6f489c99ce687315f9b89f4469e859fad8ca006ef7ce6308e31b318577b
 SHA512 (tinygo_xtensa_release_18.1.2.tar.gz) = 0ea5e6aacc8d89e78734264abb0689829522556c5251f2b146857e1f16a3ff249ee9ed69515fab0d6c1dec21cfeb54b3eceab2f43c7c72be14922f1fcd822057
 Size (tinygo_xtensa_release_18.1.2.tar.gz) = 206000262 bytes
-SHA1 (patch-.._go.bug.st_serial_serial__resetbuf__linux__bsd.go) = c1564c1e70764672f2d677daca9989cc05f2e03f
-SHA1 (patch-.._go.bug.st_serial_serial__unix.go) = 9c09cfb29d05b1be659da0bdc764c298387241bc
-SHA1 (patch-.._go.bug.st_serial_unixutils_pipe.go) = d99b072e6c725fe6a8dbb0fea02b11a0f5c2d523
-SHA1 (patch-.._go.bug.st_serial_unixutils_select.go) = e8192f834ec3b9788c4f5faa35afc7c68b393761
 SHA1 (patch-GNUmakefile) = ae6dbffd162b0606474d12c2d1e2ee2e7ab22ee3
 SHA1 (patch-builder_buildid.go) = 747b6cfdae7c00eeb062650f56da5ecc67dc4d10
-SHA1 (patch-go.mod) = 563110f0e0c59211c45e9035d3ba223127cc118d
+SHA1 (patch-go.mod) = 272154f356588333d89c9f676a500004110e1ded
+SHA1 (patch-go.sum) = 454073422c8410a3afb1159b0021428bdaf6231b
 SHA1 (patch-main.go) = 876fc346d206f369e57b2cb2255bb2e2e01d3d6b
diff --git a/tinygo/go-modules.mk b/tinygo/go-modules.mk
index 7cdd7506e3..ae8d152931 100644
--- a/tinygo/go-modules.mk
+++ b/tinygo/go-modules.mk
@@ -80,6 +80,8 @@ GO_MODULE_FILES+=	github.com/stretchr/testify/@v/v1.8.0.mod
 GO_MODULE_FILES+=	github.com/stretchr/testify/@v/v1.8.4.mod
 GO_MODULE_FILES+=	github.com/tinygo-org/tools/@v/v0.0.0-20240612102102-36af80766fc9.mod
 GO_MODULE_FILES+=	github.com/tinygo-org/tools/@v/v0.0.0-20240612102102-36af80766fc9.zip
+GO_MODULE_FILES+=	github.com/tnn2/go-serial/@v/v0.0.0-20240808132751-d345e1ef8d6d.mod
+GO_MODULE_FILES+=	github.com/tnn2/go-serial/@v/v0.0.0-20240808132751-d345e1ef8d6d.zip
 GO_MODULE_FILES+=	golang.org/x/net/@v/v0.26.0.mod
 GO_MODULE_FILES+=	golang.org/x/net/@v/v0.26.0.zip
 GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod
diff --git a/tinygo/patches/patch-.._go.bug.st_serial_serial__resetbuf__linux__bsd.go b/tinygo/patches/patch-.._go.bug.st_serial_serial__resetbuf__linux__bsd.go
deleted file mode 100644
index 2618188d78..0000000000
--- a/tinygo/patches/patch-.._go.bug.st_serial_serial__resetbuf__linux__bsd.go
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-add NetBSD support
-
---- ../go.bug.st/serial@v1.6.0/serial_resetbuf_linux_bsd.go.orig	2024-01-09 09:15:27.333184302 +0000
-+++ ../go.bug.st/serial@v1.6.0/serial_resetbuf_linux_bsd.go
-@@ -4,7 +4,7 @@
- // license that can be found in the LICENSE file.
- //
- 
--//go:build linux || freebsd || openbsd
-+//go:build linux || freebsd || openbsd || netbsd
- 
- package serial
- 
diff --git a/tinygo/patches/patch-.._go.bug.st_serial_serial__unix.go b/tinygo/patches/patch-.._go.bug.st_serial_serial__unix.go
deleted file mode 100644
index 3542322b46..0000000000
--- a/tinygo/patches/patch-.._go.bug.st_serial_serial__unix.go
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-add NetBSD support
-
---- ../go.bug.st/serial@v1.6.0/serial_unix.go.orig	2024-01-09 09:59:18.713747734 +0000
-+++ ../go.bug.st/serial@v1.6.0/serial_unix.go
-@@ -4,7 +4,7 @@
- // license that can be found in the LICENSE file.
- //
- 
--//go:build linux || darwin || freebsd || openbsd
-+//go:build linux || darwin || freebsd || openbsd || netbsd
- 
- package serial
- 
diff --git a/tinygo/patches/patch-.._go.bug.st_serial_unixutils_pipe.go b/tinygo/patches/patch-.._go.bug.st_serial_unixutils_pipe.go
deleted file mode 100644
index bea3f041fb..0000000000
--- a/tinygo/patches/patch-.._go.bug.st_serial_unixutils_pipe.go
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-add NetBSD support
-
---- ../go.bug.st/serial@v1.6.0/unixutils/pipe.go.orig	2024-01-09 09:32:21.813292581 +0000
-+++ ../go.bug.st/serial@v1.6.0/unixutils/pipe.go
-@@ -4,7 +4,7 @@
- // license that can be found in the LICENSE file.
- //
- 
--//go:build linux || darwin || freebsd || openbsd
-+//go:build linux || darwin || freebsd || openbsd || netbsd
- 
- package unixutils
- 
diff --git a/tinygo/patches/patch-.._go.bug.st_serial_unixutils_select.go b/tinygo/patches/patch-.._go.bug.st_serial_unixutils_select.go
deleted file mode 100644
index 13eeb59473..0000000000
--- a/tinygo/patches/patch-.._go.bug.st_serial_unixutils_select.go
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-add NetBSD support
-
---- ../go.bug.st/serial@v1.6.0/unixutils/select.go.orig	2024-01-09 09:32:28.935903189 +0000
-+++ ../go.bug.st/serial@v1.6.0/unixutils/select.go
-@@ -4,7 +4,7 @@
- // license that can be found in the LICENSE file.
- //
- 
--//go:build linux || darwin || freebsd || openbsd
-+//go:build linux || darwin || freebsd || openbsd || netbsd
- 
- package unixutils
- 
diff --git a/tinygo/patches/patch-go.mod b/tinygo/patches/patch-go.mod
index e5406026f3..0202879b37 100644
--- a/tinygo/patches/patch-go.mod
+++ b/tinygo/patches/patch-go.mod
@@ -1,15 +1,10 @@
 $NetBSD$
 
-Override serial module since we need to patch it.
-
---- go.mod.orig	2024-07-23 09:34:25.735598236 +0000
+--- go.mod.orig	2024-08-08 14:51:00.043056325 +0000
 +++ go.mod
-@@ -2,6 +2,8 @@ module github.com/tinygo-org/tinygo
- 
- go 1.19
+@@ -47,3 +47,5 @@ require (
+ )
  
-+replace go.bug.st/serial => ../go.bug.st/serial@v1.6.0
+ replace golang.org/x/tools => github.com/tinygo-org/tools v0.0.0-20240612102102-36af80766fc9
 +
- require (
- 	github.com/aykevl/go-wasm v0.0.2-0.20240312204833-50275154210c
- 	github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
++replace go.bug.st/serial => github.com/tnn2/go-serial v0.0.0-20240808132751-d345e1ef8d6d
diff --git a/tinygo/patches/patch-go.sum b/tinygo/patches/patch-go.sum
new file mode 100644
index 0000000000..7bec3d2ad5
--- /dev/null
+++ b/tinygo/patches/patch-go.sum
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- go.sum.orig	2024-06-16 16:24:36.000000000 +0000
++++ go.sum
+@@ -82,8 +82,8 @@ github.com/stretchr/testify v1.8.4 h1:Cc
+ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+ github.com/tinygo-org/tools v0.0.0-20240612102102-36af80766fc9 h1:t8VQNFa68kSA8ze7gi8kSxF22a7/vmr1OtOPLvgO3+8=
+ github.com/tinygo-org/tools v0.0.0-20240612102102-36af80766fc9/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
+-go.bug.st/serial v1.6.0 h1:mAbRGN4cKE2J5gMwsMHC2KQisdLRQssO9WSM+rbZJ8A=
+-go.bug.st/serial v1.6.0/go.mod h1:UABfsluHAiaNI+La2iESysd9Vetq7VRdpxvjx7CmmOE=
++github.com/tnn2/go-serial v0.0.0-20240808132751-d345e1ef8d6d h1:ETRP2BUPBgmvJburf5w+IXW5Uj38d6YgK/wKkuJuScM=
++github.com/tnn2/go-serial v0.0.0-20240808132751-d345e1ef8d6d/go.mod h1:nofMJxTeNVny/m6+KaafC6vJGj3miwQZ6vW4BZUGJPI=
+ golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+ golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+ golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=