coccinelle: Add several patches trying to address Seq -> Stdlib.Seq errors

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Jul 7 22:50:53 2020 +0200
Changeset:	b6579035af6131d5585ead0dd4843c08c7c132e8

Modified Files:
	coccinelle/Makefile
	coccinelle/TODO
	coccinelle/distinfo
Added Files:
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____buffer__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____bytesLabels__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____bytes__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____listLabels__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____list__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____stack__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____stringLabels__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____string__s.mli.in

Log Message:
coccinelle: Add several patches trying to address Seq -> Stdlib.Seq errors

...and remove a probably obsolete SUBST_CLASS.

(I'm now stuck on *hashtbl* one and couldn't figure out it, documented in TODO.)

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

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

diffstat:
 coccinelle/Makefile                                |  6 --
 coccinelle/TODO                                    | 24 +++---
 coccinelle/distinfo                                |  9 ++
 ...stdcompat-current_stdcompat____buffer__s.mli.in | 40 +++++++++
 ...mpat-current_stdcompat____bytesLabels__s.mli.in | 31 +++++++
 ..._stdcompat-current_stdcompat____bytes__s.mli.in | 31 +++++++
 ...tdcompat-current_stdcompat____hashtbl__s.mli.in | 96 ++++++++++++++++++++++
 ...ompat-current_stdcompat____listLabels__s.mli.in | 22 +++++
 ...t_stdcompat-current_stdcompat____list__s.mli.in | 22 +++++
 ..._stdcompat-current_stdcompat____stack__s.mli.in | 31 +++++++
 ...pat-current_stdcompat____stringLabels__s.mli.in | 31 +++++++
 ...stdcompat-current_stdcompat____string__s.mli.in | 31 +++++++
 12 files changed, 357 insertions(+), 17 deletions(-)

diffs:
diff --git a/coccinelle/Makefile b/coccinelle/Makefile
index 9efba4bc88..10b72b431f 100644
--- a/coccinelle/Makefile
+++ b/coccinelle/Makefile
@@ -24,12 +24,6 @@ BUILD_TARGET=	all all.opt
 
 REPLACE_PYTHON=	tools/pycocci
 
-SUBST_CLASSES+=		man
-SUBST_FILES.man+=	configure
-SUBST_SED.man+=		-e "s,$${prefix}/man,$${prefix}/${PKGMANDIR},g"
-SUBST_STAGE.man=	pre-configure
-SUBST_MESSAGE.man=	Fixing manpath.
-
 TEST_TARGET=	test
 
 pre-configure:
diff --git a/coccinelle/TODO b/coccinelle/TODO
index 27ed0f8241..cf1159d834 100644
--- a/coccinelle/TODO
+++ b/coccinelle/TODO
@@ -3,21 +3,23 @@ should be investigated further and if possible fixed:
 
  - Build fails with:
 
-    ocamlfind ocamlc -c -package result -package seq -package uchar -bin-annot -no-alias-deps -I . stdcompat__buffer.ml -o stdcompat__buffer.cmo
-    File "stdcompat__buffer.ml", line 1:
-    Error: The implementation stdcompat__buffer.ml
-           does not match the interface stdcompat__buffer.cmi:
+    ocamlfind ocamlc -c -package result -package seq -package uchar -bin-annot -no-alias-deps -I . stdcompat__hashtbl.ml -o stdcompat__hashtbl.cmo
+    File "stdcompat__hashtbl.ml", line 1:
+    Error: The implementation stdcompat__hashtbl.ml
+           does not match the interface stdcompat__hashtbl.cmi:
+           ...
+           At position module type S = <here>
            Values do not match:
-             val to_seq : t -> char Stdlib.Seq.t
+             val to_seq : 'a t -> (key * 'a) Stdcompat__seq.t
            is not included in
-             val to_seq : t -> char Seq/1.t
-           File "stdcompat__buffer_s.mli", line 48, characters 0-28:
+             val to_seq : 'a t -> (key * 'a) Seq.t
+           File "stdcompat__hashtbl_s.mli", line 55, characters 4-48:
              Expected declaration
-           File "buffer.mli", line 163, characters 0-28: Actual declaration
-           File "_none_", line 1:
-             Definition of module Seq/1
+           File "stdcompat__hashtbl.ml", line 185, characters 2-50:
+             Actual declaration
+    make[3]: *** [Makefile:1570: stdcompat__hashtbl.cmo] Error 2
 
-    -- leot (2020/06/29)
+    -- leot (2020/07/07)
 
  - Update to coccinelle-1.0.6 breaks textproc/coccigrep
 
diff --git a/coccinelle/distinfo b/coccinelle/distinfo
index d25e33d5f4..a891eef085 100644
--- a/coccinelle/distinfo
+++ b/coccinelle/distinfo
@@ -5,4 +5,13 @@ RMD160 (coccinelle-1.0.8.tar.gz) = 2c7676dc5c0bdb6839b665e78cc7ca65db0c15f0
 SHA512 (coccinelle-1.0.8.tar.gz) = 496b1632c92cc026fbe28f784f56d4cd78f89a8ccd28dc7db1069c0c6b2b239675a10da305e37ed2a03c605668ecd3399aeed522f12ec3fbbf3ca07277ab7bce
 Size (coccinelle-1.0.8.tar.gz) = 2670961 bytes
 SHA1 (patch-Makefile) = 834190a7229cfd4c5942c31cb59e9b77cda16a30
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____buffer__s.mli.in) = 16d56373a98f5be8b2dc0eb64a4e07f2bfdf97d4
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____bytesLabels__s.mli.in) = d4c6abc691acaf3bb1ddb5394ec4967f8516d551
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____bytes__s.mli.in) = edb3869638883705d84ee1804a405e745547eb00
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in) = ded3902d568bfb6479b2722f9e696e5ec8d34801
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____listLabels__s.mli.in) = b0cbec47d1a5e7e55b24a46bf474556bf91ba21a
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____list__s.mli.in) = e1a1556b3df60dcd00a5942eec9e636adf7c463f
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____stack__s.mli.in) = 9f1ddb25b41146418040143dee6f065dd065b3cf
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____stringLabels__s.mli.in) = 1a1c9ed6b080aee32eec5a98543067c23ad20354
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____string__s.mli.in) = b692472e0df91603da8f46f870ac9d2c032f2d60
 SHA1 (patch-configure.ac) = b250b9ca24e778e48a1d2d9112d1df3f4a7cc8d8
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____buffer__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____buffer__s.mli.in
new file mode 100644
index 0000000000..01449a284f
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____buffer__s.mli.in
@@ -0,0 +1,40 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__buffer_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__buffer_s.mli.in
+@@ -45,7 +45,7 @@ val add_int64_le : t -> int64 -> unit
+ (** @since 4.08.0: val add_int64_le : t -> int64 -> unit *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : t -> char Seq.t
++val to_seq : t -> char Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : t -> char Stdcompat__seq.t
+@@ -54,7 +54,7 @@ val to_seq : t -> char Stdcompat__seq.t
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seqi : t -> (int * char) Seq.t
++val to_seqi : t -> (int * char) Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seqi : t -> (int * char) Stdcompat__seq.t
+@@ -63,7 +63,7 @@ val to_seqi : t -> (int * char) Stdcompa
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val add_seq : t -> char Seq.t -> unit
++val add_seq : t -> char Stdlib.Seq.t -> unit
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val add_seq : t -> char Stdcompat__seq.t -> unit
+@@ -72,7 +72,7 @@ val add_seq : t -> char Stdcompat__seq.t
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : char Seq.t -> t
++val of_seq : char Stdlib.Seq.t -> t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : char Stdcompat__seq.t -> t
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____bytesLabels__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____bytesLabels__s.mli.in
new file mode 100644
index 0000000000..fa40da1b4b
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____bytesLabels__s.mli.in
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__bytesLabels_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__bytesLabels_s.mli.in
+@@ -261,7 +261,7 @@ val set_int64_le : Stdcompat__init.bytes
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : t -> char Seq.t
++val to_seq : t -> char Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : t -> char Stdcompat__seq.t
+@@ -270,7 +270,7 @@ val to_seq : t -> char Stdcompat__seq.t
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seqi : t -> (int * char) Seq.t
++val to_seqi : t -> (int * char) Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seqi : t -> (int * char) Stdcompat__seq.t
+@@ -279,7 +279,7 @@ val to_seqi : t -> (int * char) Stdcompa
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : char Seq.t -> t
++val of_seq : char Stdlib.Seq.t -> t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : char Stdcompat__seq.t -> t
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____bytes__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____bytes__s.mli.in
new file mode 100644
index 0000000000..dc7f3b6142
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____bytes__s.mli.in
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__bytes_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__bytes_s.mli.in
+@@ -261,7 +261,7 @@ val set_int64_le : Stdcompat__init.bytes
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : t -> char Seq.t
++val to_seq : t -> char Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : t -> char Stdcompat__seq.t
+@@ -270,7 +270,7 @@ val to_seq : t -> char Stdcompat__seq.t
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seqi : t -> (int * char) Seq.t
++val to_seqi : t -> (int * char) Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seqi : t -> (int * char) Stdcompat__seq.t
+@@ -279,7 +279,7 @@ val to_seqi : t -> (int * char) Stdcompa
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : char Seq.t -> t
++val of_seq : char Stdlib.Seq.t -> t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : char Stdcompat__seq.t -> t
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in
new file mode 100644
index 0000000000..62816d411a
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in
@@ -0,0 +1,96 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__hashtbl_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__hashtbl_s.mli.in
+@@ -52,12 +52,12 @@ module type S  =
+     val fold : (key -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
+     val length : 'a t -> int
+     val stats : 'a t -> statistics
+-    val to_seq : 'a t -> (key * 'a) Seq.t
+-    val to_seq_keys : 'a t -> key Seq.t
+-    val to_seq_values : 'a t -> 'a Seq.t
+-    val add_seq : 'a t -> (key * 'a) Seq.t -> unit
+-    val replace_seq : 'a t -> (key * 'a) Seq.t -> unit
+-    val of_seq : (key * 'a) Seq.t -> 'a t
++    val to_seq : 'a t -> (key * 'a) Stdlib.Seq.t
++    val to_seq_keys : 'a t -> key Stdlib.Seq.t
++    val to_seq_values : 'a t -> 'a Stdlib.Seq.t
++    val add_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
++    val replace_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
++    val of_seq : (key * 'a) Stdlib.Seq.t -> 'a t
+   end
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+@@ -189,12 +189,12 @@ module type SeededS  =
+     val fold : (key -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
+     val length : 'a t -> int
+     val stats : 'a t -> statistics
+-    val to_seq : 'a t -> (key * 'a) Seq.t
+-    val to_seq_keys : 'a t -> key Seq.t
+-    val to_seq_values : 'a t -> 'a Seq.t
+-    val add_seq : 'a t -> (key * 'a) Seq.t -> unit
+-    val replace_seq : 'a t -> (key * 'a) Seq.t -> unit
+-    val of_seq : (key * 'a) Seq.t -> 'a t
++    val to_seq : 'a t -> (key * 'a) Stdlib.Seq.t
++    val to_seq_keys : 'a t -> key Stdlib.Seq.t
++    val to_seq_values : 'a t -> 'a Stdlib.Seq.t
++    val add_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
++    val replace_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
++    val of_seq : (key * 'a) Stdlib.Seq.t -> 'a t
+   end
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+@@ -293,7 +293,7 @@ functor (H : SeededHashedType) ->
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : ('a, 'b) t -> ('a * 'b) Seq.t
++val to_seq : ('a, 'b) t -> ('a * 'b) Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : ('a, 'b) t -> ('a * 'b) Stdcompat__seq.t
+@@ -302,7 +302,7 @@ val to_seq : ('a, 'b) t -> ('a * 'b) Std
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq_keys : ('a, 'b) t -> 'a Seq.t
++val to_seq_keys : ('a, 'b) t -> 'a Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq_keys : ('a, 'b) t -> 'a Stdcompat__seq.t
+@@ -311,7 +311,7 @@ val to_seq_keys : ('a, 'b) t -> 'a Stdco
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq_values : ('a, 'b) t -> 'b Seq.t
++val to_seq_values : ('a, 'b) t -> 'b Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq_values : ('a, 'b) t -> 'b Stdcompat__seq.t
+@@ -320,7 +320,7 @@ val to_seq_values : ('a, 'b) t -> 'b Std
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val add_seq : ('a, 'b) t -> ('a * 'b) Seq.t -> unit
++val add_seq : ('a, 'b) t -> ('a * 'b) Stdlib.Seq.t -> unit
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val add_seq : ('a, 'b) t -> ('a * 'b) Stdcompat__seq.t -> unit
+@@ -329,7 +329,7 @@ val add_seq : ('a, 'b) t -> ('a * 'b) St
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val replace_seq : ('a, 'b) t -> ('a * 'b) Seq.t -> unit
++val replace_seq : ('a, 'b) t -> ('a * 'b) Stdlib.Seq.t -> unit
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val replace_seq : ('a, 'b) t -> ('a * 'b) Stdcompat__seq.t -> unit
+@@ -338,7 +338,7 @@ val replace_seq : ('a, 'b) t -> ('a * 'b
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : ('a * 'b) Seq.t -> ('a, 'b) t
++val of_seq : ('a * 'b) Stdlib.Seq.t -> ('a, 'b) t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : ('a * 'b) Stdcompat__seq.t -> ('a, 'b) t
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____listLabels__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____listLabels__s.mli.in
new file mode 100644
index 0000000000..d6576bcb9d
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____listLabels__s.mli.in
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__listLabels_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__listLabels_s.mli.in
+@@ -23,7 +23,7 @@ val filter_map : f:('a -> 'b option) -> 
+ (** @since 4.08.0: val filter_map : f:('a -> 'b option) -> 'a list -> 'b list *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : 'a list -> 'a Seq.t
++val to_seq : 'a list -> 'a Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : 'a list -> 'a Stdcompat__seq.t
+@@ -32,7 +32,7 @@ val to_seq : 'a list -> 'a Stdcompat__se
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : 'a Seq.t -> 'a list
++val of_seq : 'a Stdlib.Seq.t -> 'a list
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : 'a Stdcompat__seq.t -> 'a list
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____list__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____list__s.mli.in
new file mode 100644
index 0000000000..471b643bfb
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____list__s.mli.in
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__list_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__list_s.mli.in
+@@ -23,7 +23,7 @@ val filter_map : ('a -> 'b option) -> 'a
+ (** @since 4.08.0: val filter_map : ('a -> 'b option) -> 'a list -> 'b list *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : 'a list -> 'a Seq.t
++val to_seq : 'a list -> 'a Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : 'a list -> 'a Stdcompat__seq.t
+@@ -32,7 +32,7 @@ val to_seq : 'a list -> 'a Stdcompat__se
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : 'a Seq.t -> 'a list
++val of_seq : 'a Stdlib.Seq.t -> 'a list
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : 'a Stdcompat__seq.t -> 'a list
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____stack__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____stack__s.mli.in
new file mode 100644
index 0000000000..31eebe423e
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____stack__s.mli.in
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__stack_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__stack_s.mli.in
+@@ -12,7 +12,7 @@ val top_opt : 'a t -> 'a option
+ (** @since 4.08.0: val top_opt : 'a t -> 'a option *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : 'a t -> 'a Seq.t
++val to_seq : 'a t -> 'a Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : 'a t -> 'a Stdcompat__seq.t
+@@ -21,7 +21,7 @@ val to_seq : 'a t -> 'a Stdcompat__seq.t
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val add_seq : 'a t -> 'a Seq.t -> unit
++val add_seq : 'a t -> 'a Stdlib.Seq.t -> unit
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val add_seq : 'a t -> 'a Stdcompat__seq.t -> unit
+@@ -30,7 +30,7 @@ val add_seq : 'a t -> 'a Stdcompat__seq.
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : 'a Seq.t -> 'a t
++val of_seq : 'a Stdlib.Seq.t -> 'a t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : 'a Stdcompat__seq.t -> 'a t
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____stringLabels__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____stringLabels__s.mli.in
new file mode 100644
index 0000000000..6075b62551
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____stringLabels__s.mli.in
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__stringLabels_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__stringLabels_s.mli.in
+@@ -9,7 +9,7 @@ type t = string
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : t -> char Seq.t
++val to_seq : t -> char Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : t -> char Stdcompat__seq.t
+@@ -18,7 +18,7 @@ val to_seq : t -> char Stdcompat__seq.t
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seqi : t -> (int * char) Seq.t
++val to_seqi : t -> (int * char) Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seqi : t -> (int * char) Stdcompat__seq.t
+@@ -27,7 +27,7 @@ val to_seqi : t -> (int * char) Stdcompa
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : char Seq.t -> t
++val of_seq : char Stdlib.Seq.t -> t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : char Stdcompat__seq.t -> t
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____string__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____string__s.mli.in
new file mode 100644
index 0000000000..7c93b3b02f
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____string__s.mli.in
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__string_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__string_s.mli.in
+@@ -3,7 +3,7 @@ type t = string
+ (** Alias for {!String.t} *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : t -> char Seq.t
++val to_seq : t -> char Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : t -> char Stdcompat__seq.t
+@@ -12,7 +12,7 @@ val to_seq : t -> char Stdcompat__seq.t
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seqi : t -> (int * char) Seq.t
++val to_seqi : t -> (int * char) Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seqi : t -> (int * char) Stdcompat__seq.t
+@@ -21,7 +21,7 @@ val to_seqi : t -> (int * char) Stdcompa
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : char Seq.t -> t
++val of_seq : char Stdlib.Seq.t -> t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : char Stdcompat__seq.t -> t