Updated www/eliom to version 6.11.0.

The CHANGES file in the distribution has not been updated fully, but
changes include several improvements and adaptations to new versions of
dependencies and the OCaml language.

11 files changed, 16 insertions, 220 deletions

diff --git a/www/eliom/Makefile b/www/eliom/Makefile
index 7ae545f5ca1..8d309569a96 100644
--- a/www/eliom/Makefile
+++ b/www/eliom/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2020/01/18 21:51:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.32 2020/04/21 12:52:06 jaapb Exp $
 #
 
 GITHUB_PROJECT=	eliom
-DISTNAME=	${GITHUB_PROJECT}-6.7.0
+DISTNAME=	${GITHUB_PROJECT}-6.11.0
 CATEGORIES=	www
-PKGREVISION=	2
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
 MAINTAINER=	jaapb@NetBSD.org
@@ -15,6 +14,7 @@ LICENSE=	gnu-lgpl-v2.1
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c
 OCAML_USE_FINDLIB=	yes
+UNLIMIT_RESOURCES+=	stacksize
 
 DEPENDS+=	ocsigen>=2.9:../../www/ocsigen
 #DEPENDS+=	ocaml-deriving-ocsigen>=0.8.1:../../devel/ocaml-deriving-ocsigen
diff --git a/www/eliom/PLIST b/www/eliom/PLIST
index b295e0c1097..a05879865a3 100644
--- a/www/eliom/PLIST
+++ b/www/eliom/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/08/24 11:07:34 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/04/21 12:52:06 jaapb Exp $
 bin/eliom-distillery
 bin/eliombuild
 bin/eliomc
@@ -103,7 +103,7 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_cscache.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_error_pages.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_extension.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_extension.cmx
-${OCAML_SITELIB}/eliom/server/eliom_form.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_form.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_form_sigs.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_lazy.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_lib.cmi
@@ -182,13 +182,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/server.a
 ${OCAML_SITELIB}/eliom/server/server.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/server.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/server.cmxs
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/.ocp-indent
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/Makefile
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/Makefile.options
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/PROJECT_NAME.conf.in
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/PROJECT_NAME.eliom
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/README
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/static!css!PROJECT_NAME.css
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/.ocp-indent
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/Makefile
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/Makefile.options
diff --git a/www/eliom/distinfo b/www/eliom/distinfo
index 1435e5934bf..b2270b1c8fe 100644
--- a/www/eliom/distinfo
+++ b/www/eliom/distinfo
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.15 2019/08/24 11:07:34 jaapb Exp $
+$NetBSD: distinfo,v 1.16 2020/04/21 12:52:06 jaapb Exp $
 
-SHA1 (eliom-6.7.0.tar.gz) = 02a105be3f58170d7ba39bd2152cb557b5e71fb5
-RMD160 (eliom-6.7.0.tar.gz) = d8f465a141f7eb761bf64964cfeb5653eadb2158
-SHA512 (eliom-6.7.0.tar.gz) = d7914dc1f5f2fd8a2d977dd79523a1b98ccfd8e34f67d285a5566f143d226b2563c4e7a9196170e91aba3c2e732cc97a1aa5b747e678e8bd219cc9b538c84f69
-Size (eliom-6.7.0.tar.gz) = 653578 bytes
-SHA1 (patch-opam) = 106a66cddc084774a6b68dcdfc4532825d89cceb
-SHA1 (patch-pkg_META) = cc17e1c7b2c6620662ffa37a991bf9f6612c3da2
-SHA1 (patch-pkg_build.ml) = 9622b65fe58fe939336ac61fa80579afefda1dec
-SHA1 (patch-src___tags) = 4f3be24e6c5f8c4871fcfc218d2dfc8c413217c8
-SHA1 (patch-src_ocamlbuild_ocamlbuild__eliom.ml) = cbbfd6bbdf9bee928d2d4c82f46cc6335f8c1e3e
-SHA1 (patch-src_ppx_ppx__eliom__type.ml) = 77bb28c5e73b4db7de2b96f07042eeaa31b0e106
-SHA1 (patch-src_ppx_ppx__eliom__utils.ml) = b592111fdef4fb33cace3e9f8857cbd3db64c226
-SHA1 (patch-src_tools_eliomc.ml) = 578c35f563746ef3a974af16f761c047943db633
+SHA1 (eliom-6.11.0.tar.gz) = 00eb272bd75a222c0201576b8ac06c0b0475f35b
+RMD160 (eliom-6.11.0.tar.gz) = 3a40c4734c2d0c968feaf32e7c6f809914fb029c
+SHA512 (eliom-6.11.0.tar.gz) = d17821f2da4808d79278efc4230a328c128c7a4dc1ef60ca01e2093c24e1a5d1c8dd98c06fb5be283d876368154e19d5246eda7b950e8942202ea89fe4352833
+Size (eliom-6.11.0.tar.gz) = 641496 bytes
+SHA1 (patch-pkg_build.ml) = a952e78e2e8e9e35d287fcf6e575a2e91eaf4016
diff --git a/www/eliom/patches/patch-opam b/www/eliom/patches/patch-opam
deleted file mode 100644
index 39323378354..00000000000
--- a/www/eliom/patches/patch-opam
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-opam,v 1.1 2019/08/24 11:07:34 jaapb Exp $
-
-Remove dependency on deriving (patch from upstream)
---- opam.orig	2019-02-08 11:31:12.000000000 +0000
-+++ opam
-@@ -13,7 +13,6 @@ build: [make]
- depends: [
-   "ocaml" {>= "4.06.1"}
-   "ocamlfind"
--  "deriving" {>= "0.6"}
-   "ppx_deriving"
-   "ppx_tools" {>= "0.99.3"}
-   "js_of_ocaml" {>= "3.3"}
diff --git a/www/eliom/patches/patch-pkg_META b/www/eliom/patches/patch-pkg_META
deleted file mode 100644
index dba8b5899b5..00000000000
--- a/www/eliom/patches/patch-pkg_META
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-pkg_META,v 1.6 2019/08/24 11:07:34 jaapb Exp $
-
-Do not build syntax package (patch from upstream)
---- pkg/META.orig	2019-02-08 11:31:12.000000000 +0000
-+++ pkg/META
-@@ -59,52 +59,6 @@ package "client" (
-   linkopts(javascript) = "+eliom.client/eliom_client.js"
- )
- 
--package "syntax" (
--  directory = "syntax"
--  package "common" (
--    description = "Syntax extension: spliting client and server code (base)"
--    version = "[distributed with Eliom]"
--    requires = "camlp4, bytes"
--    requires(preprocessor, syntax, pkg_type_conv) = "type_conv"
--    archive(syntax, preprocessor) = "pa_eliom_seed.cmo"
--  )
--
--  package "client" (
--    description = "Syntax extension: spliting client and server code (client side)"
--    version = "[distributed with Eliom]"
--    requires(syntax, preprocessor) = "eliom.syntax.common"
--    requires(syntax, toploop) = "eliom.syntax.common"
--    archive(syntax, preprocessor) = "pa_eliom_client_client.cmo"
--    archive(syntax, toploop) = "pa_eliom_client_client.cmo"
--  )
--
--  package "server" (
--    description = "Syntax extension: spliting client and server code (server side)"
--    version = "[distributed with Eliom]"
--    requires(syntax, preprocessor) = "eliom.syntax.common"
--    requires(syntax, toploop) = "eliom.syntax.common"
--    archive(syntax, preprocessor) = "pa_eliom_client_server.cmo"
--    archive(syntax, toploop) = "pa_eliom_client_server.cmo"
--  )
--
--  package "type" (
--    description = "Syntax extension: spliting client and server code (type inference)"
--    version = "[distributed with Eliom]"
--    requires(syntax, preprocessor) = "eliom.syntax.common"
--    archive(syntax, preprocessor) = "pa_eliom_type_filter.cmo"
--  )
--
--  package "predef" (
--    description = "Syntax extension: predefined commonly use syntaxes"
--    version = "[distributed with Eliom]"
--
--    requires(syntax, preprocessor) = "js_of_ocaml-camlp4,js_of_ocaml-camlp4.deriving,lwt_camlp4"
--    requires(syntax, toploop) = "js_of_ocaml-camlp4,js_of_ocaml-camlp4.deriving,lwt_camlp4"
--    archive(syntax, preprocessor) = "-ignore dummy"
--  )
--
--)
--
- package "ppx" (
-   directory = "ppx"
-   package "server" (
diff --git a/www/eliom/patches/patch-pkg_build.ml b/www/eliom/patches/patch-pkg_build.ml
index 1bed9b695fb..77dfe45142b 100644
--- a/www/eliom/patches/patch-pkg_build.ml
+++ b/www/eliom/patches/patch-pkg_build.ml
@@ -1,29 +1,14 @@
-$NetBSD: patch-pkg_build.ml,v 1.3 2019/08/24 11:07:34 jaapb Exp $
+$NetBSD: patch-pkg_build.ml,v 1.4 2020/04/21 12:52:06 jaapb Exp $
 
 Do not install mime types
-Do not build syntax package (patch from upstream)
---- pkg/build.ml.orig	2019-02-08 11:31:12.000000000 +0000
+
+--- pkg/build.ml.orig	2020-03-11 10:55:00.000000000 +0000
 +++ pkg/build.ml
-@@ -75,12 +75,6 @@ let () =
-     Pkg.bin ~auto:true ~dst:"eliom-distillery" "src/tools/distillery";
-     Pkg.bin ~auto:true "src/ocamlbuild/eliombuild";
- 
--    (* SYNTAXES *)
--    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_seed" "src/syntax/pa_eliom_seed";
--    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_client_client" "src/syntax/pa_eliom_client_client";
--    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_client_server" "src/syntax/pa_eliom_client_server";
--    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_type_filter" "src/syntax/pa_eliom_type_filter";
--
-     Pkg.lib ~exts:exts_modlib ~dst:"ocamlbuild/ocamlbuild_eliom" "src/ocamlbuild/ocamlbuild_eliom";
- 
-     (* PPX *)
-@@ -109,8 +103,7 @@ let () =
-     (* MISC *)
+@@ -104,7 +104,6 @@ let () =
  
      Pkg.doc "README.md";
--    Pkg.doc "CHANGES";
+     Pkg.doc "CHANGES";
 -    Pkg.etc "pkg/etc/mime.types"
-+    Pkg.doc "CHANGES"
    ] @ (
      List.flatten (
        List.map (fun (name,files) ->
diff --git a/www/eliom/patches/patch-src___tags b/www/eliom/patches/patch-src___tags
deleted file mode 100644
index 5b1c8d5d10a..00000000000
--- a/www/eliom/patches/patch-src___tags
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src___tags,v 1.1 2019/08/24 11:07:34 jaapb Exp $
-
-Remove dependency on deriving, do not build syntax package (patch from upstream)
---- src/_tags.orig	2019-02-08 11:31:12.000000000 +0000
-+++ src/_tags
-@@ -1,4 +1,4 @@
--<{lib,tools,ocamlbuild,syntax}/**/*>:warn(+A-4-6-7-9-27-37-40-42-44-48)
-+<{lib,tools,ocamlbuild}/**/*>:warn(+A-4-6-7-9-27-37-40-42-44-48)
- true:keep_locs
- 
- <lib/type_dir/*.ml{,i}>:eliom_ppx,thread
-@@ -23,7 +23,7 @@ true:keep_locs
- 
- <lib/client/*.ml{,i}>: eliom_ppx
- <lib/client/*.ml{,i}>:package(ocsigenserver.cookies,ocsigenserver.polytables,ocsigenserver.baselib.base)
--<lib/client/*.ml{,i}>:package(deriving.runtime,js_of_ocaml.deriving)
-+<lib/client/*.ml{,i}>:package(js_of_ocaml.deriving)
- <lib/client/*.ml{,i}>:package(lwt_react,tyxml.functor,js_of_ocaml.tyxml,js_of_ocaml-lwt,js_of_ocaml-lwt.logger)
- <lib/client/*.ml{,i}>:package(react,js_of_ocaml,reactiveData)
- 
-@@ -34,9 +34,6 @@ true:keep_locs
- <lib/server/monitor/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml)
- <lib/server/monitor/*.ml{,i}>:I(src/lib/server)
- 
--<syntax/pa_*.*>: syntax(camlp4o),package(camlp4.quotations.o,camlp4.extend,bytes)
--<syntax/pa_*.ml{,i}>: I(+camlp4/Camlp4Parsers)
--
- <ppx/**/*>: package(ppx_tools, compiler-libs.common, ppx_tools.metaquot)
- 
- <ocamlbuild/ocamlbuild_eliom.ml{,i}>: package(ocamlbuild,js_of_ocaml.ocamlbuild)
diff --git a/www/eliom/patches/patch-src_ocamlbuild_ocamlbuild__eliom.ml b/www/eliom/patches/patch-src_ocamlbuild_ocamlbuild__eliom.ml
deleted file mode 100644
index 41ccc0db9c3..00000000000
--- a/www/eliom/patches/patch-src_ocamlbuild_ocamlbuild__eliom.ml
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_ocamlbuild_ocamlbuild__eliom.ml,v 1.1 2019/08/24 11:07:34 jaapb Exp $
-
-Changes for OCaml 4.08 (patch from upstream)
---- src/ocamlbuild/ocamlbuild_eliom.ml.orig	2019-02-08 11:31:12.000000000 +0000
-+++ src/ocamlbuild/ocamlbuild_eliom.ml
-@@ -188,7 +188,8 @@ module MakeIntern (I : INTERNALS)(Eliom 
-         sed_rule ".inferred.mli -> .inferred_gen.mli"
-           ~dep:"%(path)/%(file).inferred.mli"
-           ~prod:"%(path)/%(file).inferred_gen.mli"
--          ["s/_\\[\\([<>]\\)/[\\1/g";
-+          ["s$/[1-9][0-9]*$$g";
-+					 "s/_\\[\\([<>]\\)/[\\1/g";
-            Printf.sprintf "s/'\\(_[a-z0-9_]*\\)/'%s\\1/g" inferred_type_prefix];
- 
-         (* eliom files *)
diff --git a/www/eliom/patches/patch-src_ppx_ppx__eliom__type.ml b/www/eliom/patches/patch-src_ppx_ppx__eliom__type.ml
deleted file mode 100644
index 6cfd64aaf17..00000000000
--- a/www/eliom/patches/patch-src_ppx_ppx__eliom__type.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_ppx_ppx__eliom__type.ml,v 1.1 2019/08/24 11:07:34 jaapb Exp $
-
-Changes for OCaml 4.08 (patch from upstream)
---- src/ppx/ppx_eliom_type.ml.orig	2019-02-08 11:31:12.000000000 +0000
-+++ src/ppx/ppx_eliom_type.ml
-@@ -76,7 +76,7 @@ module Pass = struct
-       then
-         typing_strs :=
-           (id,
--           [%stri let [%p Pat.var id] = Pervasives.ref None]
-+           [%stri let [%p Pat.var id] = Stdlib.ref None]
-            [@metaloc orig_expr.pexp_loc]
-           ) :: !typing_strs
-     in
diff --git a/www/eliom/patches/patch-src_ppx_ppx__eliom__utils.ml b/www/eliom/patches/patch-src_ppx_ppx__eliom__utils.ml
deleted file mode 100644
index 9d5bd86c376..00000000000
--- a/www/eliom/patches/patch-src_ppx_ppx__eliom__utils.ml
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-src_ppx_ppx__eliom__utils.ml,v 1.1 2019/08/24 11:07:34 jaapb Exp $
-
-Changes for OCaml 4.08 (patch from upstream)
---- src/ppx/ppx_eliom_utils.ml.orig	2019-02-08 11:31:12.000000000 +0000
-+++ src/ppx/ppx_eliom_utils.ml
-@@ -232,7 +232,7 @@ module Mli = struct
-   let load_file file =
-     try
-       let items =
--        Pparse.parse_interface ~tool_name:"eliom" Format.err_formatter file
-+        Pparse.parse_interface ~tool_name:"eliom" (* Format.err_formatter *) file
-       in
-       let h = Hashtbl.create 17 in
-       let f item = match get_binding item with
-@@ -382,7 +382,7 @@ module Cannot_have_fragment = struct
-     | Pexp_construct (_,e)
-     | Pexp_variant (_,e) -> opt_forall expression e
-     | Pexp_let (_,l,e) -> vb_forall expression l && expression e
--    | Pexp_open (_,x,e) -> longident x.txt && expression e
-+    | Pexp_open (i,e) -> module_expr i.popen_expr && expression e
-     | Pexp_letmodule (_,me,e) -> module_expr me && expression e
- 
-     (* We could be more precise on those constructs *)
-@@ -430,7 +430,7 @@ module Cannot_have_fragment = struct
-     | Pstr_primitive _ -> true
-     | Pstr_module mb -> module_binding mb
-     | Pstr_recmodule mbl -> List.for_all module_binding mbl
--    | Pstr_open x -> longident x.popen_lid.txt
-+    | Pstr_open x -> module_expr x.popen_expr
-     | Pstr_include x -> module_expr x.pincl_mod
- 
-     | _ -> false
diff --git a/www/eliom/patches/patch-src_tools_eliomc.ml b/www/eliom/patches/patch-src_tools_eliomc.ml
deleted file mode 100644
index 83878cd3def..00000000000
--- a/www/eliom/patches/patch-src_tools_eliomc.ml
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_tools_eliomc.ml,v 1.1 2019/08/24 11:07:34 jaapb Exp $
-
-Changes for OCaml 4.08 (patch from upstream)
---- src/tools/eliomc.ml.orig	2019-02-08 11:31:12.000000000 +0000
-+++ src/tools/eliomc.ml
-@@ -211,6 +211,7 @@ let inferred_type_prefix = "eliom_inferr
-    These appear in type_mli files, but they are not accepted by
-    the OCaml parser.  *)
- let run_sed file =
-+	run_command ("sed -i -e 's$/[1-9][0-9]*$$g' " ^ file);
-   run_command ("sed -i -e 's/_\\[\\([<>]\\)/[\\1/g' " ^ file);
-   run_command
-     (Printf.sprintf