go-parse: fix build.

The buffer package specifies a canonical import path, but elsewhere in
the code of the package, it is imported with a different path (containing
/v2/). This has been broken since Go 1.12.

11 files changed, 107 insertions, 2 deletions

diff --git a/www/go-parse/Makefile b/www/go-parse/Makefile
index 4094d7a0ff9..5d24d021962 100644
--- a/www/go-parse/Makefile
+++ b/www/go-parse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/12/13 07:44:05 bsiegert Exp $
+# $NetBSD: Makefile,v 1.12 2019/12/22 10:38:15 bsiegert Exp $
 
 DISTNAME=	parse-2.3.5
 PKGNAME=	go-${DISTNAME}
@@ -16,5 +16,8 @@ LICENSE=	mit
 GO_DIST_BASE=	${DISTNAME}
 GO_SRCPATH=	github.com/tdewolff/parse
 
+post-install:
+	find ${DESTDIR}${PREFIX} -name "*.orig" -exec rm \{\} \;
+
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/go-parse/distinfo b/www/go-parse/distinfo
index 02a98bc0217..f13487b369a 100644
--- a/www/go-parse/distinfo
+++ b/www/go-parse/distinfo
@@ -1,6 +1,15 @@
-$NetBSD: distinfo,v 1.1 2018/11/18 08:42:16 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2019/12/22 10:38:15 bsiegert Exp $
 
 SHA1 (parse-2.3.5.tar.gz) = e42a580abc7b74a88abd707bd63a15245750bbbf
 RMD160 (parse-2.3.5.tar.gz) = 7ec2fd6987d9c4fddb21669d1b1980f640786a7d
 SHA512 (parse-2.3.5.tar.gz) = e32da6cd04de9535b612adce1064203a6d50b8065104353efbd9088f2807de22433c9b1d112e99184683cf212d229c0a674afb77732ec254293c079a47fff47e
 Size (parse-2.3.5.tar.gz) = 75027 bytes
+SHA1 (patch-buffer_buffer.go) = abd4848578932ce02b7b76f097d6c12974fb1a6a
+SHA1 (patch-buffer_lexer.go) = e8fde846ea9e658a6c73d2b4e0cf7b35909d9d5a
+SHA1 (patch-buffer_lexer__test.go) = 15a422e2840db3f67d862f055cb6400ea0efca87
+SHA1 (patch-buffer_reader.go) = ca66390b91fef7576e3e53d58dd367bb9f8b6d04
+SHA1 (patch-buffer_reader__test.go) = 071481b95d888eab77d97ed6656b240e038a7c2d
+SHA1 (patch-buffer_streamlexer.go) = 7c01833dd18d37ade71e9461aa8e009c1ac143b2
+SHA1 (patch-buffer_streamlexer__test.go) = 7499b4a93e48905ed2d453abdb001060eb61d530
+SHA1 (patch-buffer_writer.go) = 6afbdb31bb0ff88ca7ceacab86c40eef830a800e
+SHA1 (patch-buffer_writer__test.go) = bf18af95bb22c3093f2124e36784ea749fc39afd
diff --git a/www/go-parse/patches/patch-buffer_buffer.go b/www/go-parse/patches/patch-buffer_buffer.go
new file mode 100644
index 00000000000..284fe7db1ca
--- /dev/null
+++ b/www/go-parse/patches/patch-buffer_buffer.go
@@ -0,0 +1,13 @@
+$NetBSD: patch-buffer_buffer.go,v 1.1 2019/12/22 10:38:16 bsiegert Exp $
+
+--- buffer/buffer.go.orig	2018-11-06 02:48:29.000000000 +0000
++++ buffer/buffer.go
+@@ -5,7 +5,7 @@ The `Reader` and `Writer` types implemen
+ The `Lexer` type is useful for building lexers because it keeps track of the start and end position of a byte selection, and shifts the bytes whenever a valid token is found.
+ The `StreamLexer` does the same, but keeps a buffer pool so that it reads a limited amount at a time, allowing to parse from streaming sources.
+ */
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+ 
+ // defaultBufSize specifies the default initial length of internal buffers.
+ var defaultBufSize = 4096
diff --git a/www/go-parse/patches/patch-buffer_lexer.go b/www/go-parse/patches/patch-buffer_lexer.go
new file mode 100644
index 00000000000..61581c6c2d4
--- /dev/null
+++ b/www/go-parse/patches/patch-buffer_lexer.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-buffer_lexer.go,v 1.1 2019/12/22 10:38:16 bsiegert Exp $
+
+--- buffer/lexer.go.orig	2018-11-06 02:48:29.000000000 +0000
++++ buffer/lexer.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+ 
+ import (
+ 	"io"
diff --git a/www/go-parse/patches/patch-buffer_lexer__test.go b/www/go-parse/patches/patch-buffer_lexer__test.go
new file mode 100644
index 00000000000..89ed05e8474
--- /dev/null
+++ b/www/go-parse/patches/patch-buffer_lexer__test.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-buffer_lexer__test.go,v 1.1 2019/12/22 10:38:16 bsiegert Exp $
+
+--- buffer/lexer_test.go.orig	2018-11-06 02:48:29.000000000 +0000
++++ buffer/lexer_test.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+ 
+ import (
+ 	"bytes"
diff --git a/www/go-parse/patches/patch-buffer_reader.go b/www/go-parse/patches/patch-buffer_reader.go
new file mode 100644
index 00000000000..8a8e8080e2e
--- /dev/null
+++ b/www/go-parse/patches/patch-buffer_reader.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-buffer_reader.go,v 1.1 2019/12/22 10:38:16 bsiegert Exp $
+
+--- buffer/reader.go.orig	2018-11-06 02:48:29.000000000 +0000
++++ buffer/reader.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+ 
+ import "io"
+ 
diff --git a/www/go-parse/patches/patch-buffer_reader__test.go b/www/go-parse/patches/patch-buffer_reader__test.go
new file mode 100644
index 00000000000..93a4164ac47
--- /dev/null
+++ b/www/go-parse/patches/patch-buffer_reader__test.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-buffer_reader__test.go,v 1.1 2019/12/22 10:38:16 bsiegert Exp $
+
+--- buffer/reader_test.go.orig	2018-11-06 02:48:29.000000000 +0000
++++ buffer/reader_test.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+ 
+ import (
+ 	"bytes"
diff --git a/www/go-parse/patches/patch-buffer_streamlexer.go b/www/go-parse/patches/patch-buffer_streamlexer.go
new file mode 100644
index 00000000000..24108baba7d
--- /dev/null
+++ b/www/go-parse/patches/patch-buffer_streamlexer.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-buffer_streamlexer.go,v 1.1 2019/12/22 10:38:16 bsiegert Exp $
+
+--- buffer/streamlexer.go.orig	2018-11-06 02:48:29.000000000 +0000
++++ buffer/streamlexer.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+ 
+ import (
+ 	"io"
diff --git a/www/go-parse/patches/patch-buffer_streamlexer__test.go b/www/go-parse/patches/patch-buffer_streamlexer__test.go
new file mode 100644
index 00000000000..a0c77e5d4a7
--- /dev/null
+++ b/www/go-parse/patches/patch-buffer_streamlexer__test.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-buffer_streamlexer__test.go,v 1.1 2019/12/22 10:38:16 bsiegert Exp $
+
+--- buffer/streamlexer_test.go.orig	2018-11-06 02:48:29.000000000 +0000
++++ buffer/streamlexer_test.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+ 
+ import (
+ 	"bytes"
diff --git a/www/go-parse/patches/patch-buffer_writer.go b/www/go-parse/patches/patch-buffer_writer.go
new file mode 100644
index 00000000000..9453c4137d7
--- /dev/null
+++ b/www/go-parse/patches/patch-buffer_writer.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-buffer_writer.go,v 1.1 2019/12/22 10:38:16 bsiegert Exp $
+
+--- buffer/writer.go.orig	2018-11-06 02:48:29.000000000 +0000
++++ buffer/writer.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+ 
+ // Writer implements an io.Writer over a byte slice.
+ type Writer struct {
diff --git a/www/go-parse/patches/patch-buffer_writer__test.go b/www/go-parse/patches/patch-buffer_writer__test.go
new file mode 100644
index 00000000000..b38a06ced35
--- /dev/null
+++ b/www/go-parse/patches/patch-buffer_writer__test.go
@@ -0,0 +1,10 @@
+$NetBSD: patch-buffer_writer__test.go,v 1.1 2019/12/22 10:38:16 bsiegert Exp $
+
+--- buffer/writer_test.go.orig	2018-11-06 02:48:29.000000000 +0000
++++ buffer/writer_test.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+ 
+ import (
+ 	"fmt"