CVS commit: pkgsrc/www/eliom

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/eliom
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Sat, 24 Aug 2019 11:07:34 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Sat Aug 24 11:07:34 UTC 2019

Modified Files:
        pkgsrc/www/eliom: Makefile PLIST distinfo
        pkgsrc/www/eliom/patches: patch-pkg_META patch-pkg_build.ml
Added Files:
        pkgsrc/www/eliom/patches: patch-opam patch-src___tags
            patch-src_ocamlbuild_ocamlbuild__eliom.ml
            patch-src_ppx_ppx__eliom__type.ml
            patch-src_ppx_ppx__eliom__utils.ml patch-src_tools_eliomc.ml

Log Message:
Changes to www/eliom for ocaml 4.08

This includes patches already upstream (but not yet released), as well as
removing the dependency on ocaml-deriving-ocsigen.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/eliom/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/eliom/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/eliom/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/eliom/patches/patch-opam \
    pkgsrc/www/eliom/patches/patch-src___tags \
    pkgsrc/www/eliom/patches/patch-src_ocamlbuild_ocamlbuild__eliom.ml \
    pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__type.ml \
    pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__utils.ml \
    pkgsrc/www/eliom/patches/patch-src_tools_eliomc.ml
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/eliom/patches/patch-pkg_META
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/eliom/patches/patch-pkg_build.ml

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

Modified files:

Index: pkgsrc/www/eliom/Makefile
diff -u pkgsrc/www/eliom/Makefile:1.27 pkgsrc/www/eliom/Makefile:1.28
--- pkgsrc/www/eliom/Makefile:1.27      Mon May 13 11:55:44 2019
+++ pkgsrc/www/eliom/Makefile   Sat Aug 24 11:07:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/05/13 11:55:44 jaapb Exp $
+# $NetBSD: Makefile,v 1.28 2019/08/24 11:07:34 jaapb Exp $
 #
 
 GITHUB_PROJECT=        eliom
@@ -16,7 +16,7 @@ USE_LANGUAGES=        c
 OCAML_USE_FINDLIB=     yes
 
 DEPENDS+=      ocsigen>=2.9:../../www/ocsigen
-DEPENDS+=      ocaml-deriving-ocsigen>=0.8.1:../../devel/ocaml-deriving-ocsigen
+#DEPENDS+=     ocaml-deriving-ocsigen>=0.8.1:../../devel/ocaml-deriving-ocsigen
 
 .include "../../mk/ocaml.mk"
 

Index: pkgsrc/www/eliom/PLIST
diff -u pkgsrc/www/eliom/PLIST:1.5 pkgsrc/www/eliom/PLIST:1.6
--- pkgsrc/www/eliom/PLIST:1.5  Fri Dec 30 11:57:24 2016
+++ pkgsrc/www/eliom/PLIST      Sat Aug 24 11:07:34 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/12/30 11:57:24 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/08/24 11:07:34 jaapb Exp $
 bin/eliom-distillery
 bin/eliombuild
 bin/eliomc
@@ -182,30 +182,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom
 ${OCAML_SITELIB}/eliom/server/server.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/server.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/server.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_client.a
-${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_client.cma
-${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_client.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_client.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_client.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_client.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_server.a
-${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_server.cma
-${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_server.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_server.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_server.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_client_server.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_seed.a
-${OCAML_SITELIB}/eliom/syntax/pa_eliom_seed.cma
-${OCAML_SITELIB}/eliom/syntax/pa_eliom_seed.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_seed.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_seed.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_seed.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_type_filter.a
-${OCAML_SITELIB}/eliom/syntax/pa_eliom_type_filter.cma
-${OCAML_SITELIB}/eliom/syntax/pa_eliom_type_filter.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_type_filter.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_type_filter.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/syntax/pa_eliom_type_filter.cmxs
 ${OCAML_SITELIB}/eliom/templates/basic.camlp4/.ocp-indent
 ${OCAML_SITELIB}/eliom/templates/basic.camlp4/Makefile
 ${OCAML_SITELIB}/eliom/templates/basic.camlp4/Makefile.options

Index: pkgsrc/www/eliom/distinfo
diff -u pkgsrc/www/eliom/distinfo:1.14 pkgsrc/www/eliom/distinfo:1.15
--- pkgsrc/www/eliom/distinfo:1.14      Mon May 13 11:55:44 2019
+++ pkgsrc/www/eliom/distinfo   Sat Aug 24 11:07:34 2019
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.14 2019/05/13 11:55:44 jaapb Exp $
+$NetBSD: distinfo,v 1.15 2019/08/24 11:07:34 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-pkg_META) = 8fea0fe537cdc68d7a2e1a9cabc017ab2383d470
-SHA1 (patch-pkg_build.ml) = 8597e17fc869b7a8e93ee30f551a92c694617dbc
+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

Index: pkgsrc/www/eliom/patches/patch-pkg_META
diff -u pkgsrc/www/eliom/patches/patch-pkg_META:1.5 pkgsrc/www/eliom/patches/patch-pkg_META:1.6
--- pkgsrc/www/eliom/patches/patch-pkg_META:1.5 Tue Jan 29 13:33:00 2019
+++ pkgsrc/www/eliom/patches/patch-pkg_META     Sat Aug 24 11:07:34 2019
@@ -1,16 +1,58 @@
-$NetBSD: patch-pkg_META,v 1.5 2019/01/29 13:33:00 jaapb Exp $
+$NetBSD: patch-pkg_META,v 1.6 2019/08/24 11:07:34 jaapb Exp $
 
-Remove camlp4 support (no longer in js_of_ocaml)
---- pkg/META.orig      2018-12-19 14:15:17.000000000 +0000
+Do not build syntax package (patch from upstream)
+--- pkg/META.orig      2019-02-08 11:31:12.000000000 +0000
 +++ pkg/META
-@@ -98,8 +98,8 @@ package "syntax" (
-     description = "Syntax extension: predefined commonly use syntaxes"
-     version = "[distributed with Eliom]"
+@@ -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"
-+    requires(syntax, preprocessor) = "lwt_camlp4"
-+    requires(syntax, toploop) = "lwt_camlp4"
-     archive(syntax, preprocessor) = "-ignore dummy"
-   )
- 
+-    archive(syntax, preprocessor) = "-ignore dummy"
+-  )
+-
+-)
+-
+ package "ppx" (
+   directory = "ppx"
+   package "server" (

Index: pkgsrc/www/eliom/patches/patch-pkg_build.ml
diff -u pkgsrc/www/eliom/patches/patch-pkg_build.ml:1.2 pkgsrc/www/eliom/patches/patch-pkg_build.ml:1.3
--- pkgsrc/www/eliom/patches/patch-pkg_build.ml:1.2     Sat Feb  6 14:50:22 2016
+++ pkgsrc/www/eliom/patches/patch-pkg_build.ml Sat Aug 24 11:07:34 2019
@@ -1,9 +1,23 @@
-$NetBSD: patch-pkg_build.ml,v 1.2 2016/02/06 14:50:22 jaapb Exp $
+$NetBSD: patch-pkg_build.ml,v 1.3 2019/08/24 11:07:34 jaapb Exp $
 
 Do not install mime types
---- pkg/build.ml.orig  2016-01-28 18:22:25.000000000 +0000
+Do not build syntax package (patch from upstream)
+--- pkg/build.ml.orig  2019-02-08 11:31:12.000000000 +0000
 +++ pkg/build.ml
-@@ -107,8 +107,7 @@ let () =
+@@ -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 *)
  
      Pkg.doc "README.md";

Added files:

Index: pkgsrc/www/eliom/patches/patch-opam
diff -u /dev/null pkgsrc/www/eliom/patches/patch-opam:1.1
--- /dev/null   Sat Aug 24 11:07:34 2019
+++ pkgsrc/www/eliom/patches/patch-opam Sat Aug 24 11:07:34 2019
@@ -0,0 +1,13 @@
+$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"}
Index: pkgsrc/www/eliom/patches/patch-src___tags
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src___tags:1.1
--- /dev/null   Sat Aug 24 11:07:34 2019
+++ pkgsrc/www/eliom/patches/patch-src___tags   Sat Aug 24 11:07:34 2019
@@ -0,0 +1,30 @@
+$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)
Index: pkgsrc/www/eliom/patches/patch-src_ocamlbuild_ocamlbuild__eliom.ml
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_ocamlbuild_ocamlbuild__eliom.ml:1.1
--- /dev/null   Sat Aug 24 11:07:34 2019
+++ pkgsrc/www/eliom/patches/patch-src_ocamlbuild_ocamlbuild__eliom.ml  Sat Aug 24 11:07:34 2019
@@ -0,0 +1,15 @@
+$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 *)
Index: pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__type.ml
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__type.ml:1.1
--- /dev/null   Sat Aug 24 11:07:34 2019
+++ pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__type.ml  Sat Aug 24 11:07:34 2019
@@ -0,0 +1,14 @@
+$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
Index: pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__utils.ml
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__utils.ml:1.1
--- /dev/null   Sat Aug 24 11:07:34 2019
+++ pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__utils.ml Sat Aug 24 11:07:34 2019
@@ -0,0 +1,32 @@
+$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
Index: pkgsrc/www/eliom/patches/patch-src_tools_eliomc.ml
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_tools_eliomc.ml:1.1
--- /dev/null   Sat Aug 24 11:07:34 2019
+++ pkgsrc/www/eliom/patches/patch-src_tools_eliomc.ml  Sat Aug 24 11:07:34 2019
@@ -0,0 +1,13 @@
+$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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/www/eliom
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/www/eliom
Indexes:

Home | Main Index | Thread Index | Old Index