CVS commit: pkgsrc/www/eliom

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Fri Apr 13 13:17:34 UTC 2018

Modified Files:
        pkgsrc/www/eliom: Makefile distinfo
        pkgsrc/www/eliom/patches: patch-src__tags
Added Files:
        pkgsrc/www/eliom/patches: patch-src_lib_eliom__client.client.ml
Removed Files:
        pkgsrc/www/eliom/patches: patch-pkg_META
            patch-src_lib_eliom_content_.client.ml
            patch-src_lib_eliom_request.client.ml
            patch-src_lib_eliom_request.client.mli
            patch-src_ocamlbuild_ocamlbuild_eliom.ml patch-src_tools_utils.ml

Log Message:
Updated www/eliom to version 6.3.0.

This version adds compatibility with OCaml 4.06, Lwt 3 (and 4) and
js_of_ocaml 3.

It also has various small bugfixes and improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/eliom/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/eliom/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/www/eliom/patches/patch-pkg_META \
    pkgsrc/www/eliom/patches/patch-src_lib_eliom_content_.client.ml \
    pkgsrc/www/eliom/patches/patch-src_lib_eliom_request.client.ml \
    pkgsrc/www/eliom/patches/patch-src_lib_eliom_request.client.mli \
    pkgsrc/www/eliom/patches/patch-src_ocamlbuild_ocamlbuild_eliom.ml \
    pkgsrc/www/eliom/patches/patch-src_tools_utils.ml
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/eliom/patches/patch-src__tags
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/eliom/patches/patch-src_lib_eliom__client.client.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.19 pkgsrc/www/eliom/Makefile:1.20
--- pkgsrc/www/eliom/Makefile:1.19      Wed Jan 10 16:53:14 2018
+++ pkgsrc/www/eliom/Makefile   Fri Apr 13 13:17:34 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2018/01/10 16:53:14 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2018/04/13 13:17:34 jaapb Exp $
 #
 
 GITHUB_PROJECT=        eliom
-DISTNAME=      ${GITHUB_PROJECT}-6.2.0
-PKGREVISION=   3
+DISTNAME=      ${GITHUB_PROJECT}-6.3.0
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -16,9 +15,8 @@ USE_TOOLS+=   gmake
 USE_LANGUAGES= c
 OCAML_USE_FINDLIB=     yes
 
-DEPENDS+=      ocsigen>=2.8:../../www/ocsigen
-DEPENDS+=      ocaml-deriving-ocsigen>=0.7.1:../../devel/ocaml-deriving-ocsigen
-
+DEPENDS+=      ocsigen>=2.9:../../www/ocsigen
+DEPENDS+=      ocaml-deriving-ocsigen>=0.8.1:../../devel/ocaml-deriving-ocsigen
 
 .include "../../mk/ocaml.mk"
 
@@ -32,10 +30,11 @@ do-install:
        cd ${WRKSRC} && opam-installer --install --prefix ${DESTDIR}${PREFIX} --libdir ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR} --docdir ${DESTDIR}${PREFIX}/share/doc eliom.install
 
 .include "../../devel/js_of_ocaml/buildlink3.mk"
+.include "../../devel/ocaml-lwt_log/buildlink3.mk"
+.include "../../devel/ocaml-lwt_ppx/buildlink3.mk"
+.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
 .include "../../devel/ocaml-react/buildlink3.mk"
 .include "../../devel/ocaml-reactiveData/buildlink3.mk"
-.include "../../devel/ocaml-optcomp/buildlink3.mk"
-.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../misc/ocaml-opam/buildlink3.mk"
 BUILDLINK_DEPMETHOD.ocaml-opam?=    build

Index: pkgsrc/www/eliom/distinfo
diff -u pkgsrc/www/eliom/distinfo:1.8 pkgsrc/www/eliom/distinfo:1.9
--- pkgsrc/www/eliom/distinfo:1.8       Fri Sep  8 17:14:34 2017
+++ pkgsrc/www/eliom/distinfo   Fri Apr 13 13:17:34 2018
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.8 2017/09/08 17:14:34 jaapb Exp $
+$NetBSD: distinfo,v 1.9 2018/04/13 13:17:34 jaapb Exp $
 
-SHA1 (eliom-6.2.0.tar.gz) = 652dacef947524975efc63253fb806be45a750c3
-RMD160 (eliom-6.2.0.tar.gz) = 1a1b21495cac93c2ad7f207fdd6ad4df819c6600
-SHA512 (eliom-6.2.0.tar.gz) = 02ea52c78470f222297dd9f82218e82427ea2d2d0c9f261d1a9c2decbe7644c0bf583b77b8cef2577d5662d363efd276755f400e7a4c29c89a2265e49ca850db
-Size (eliom-6.2.0.tar.gz) = 724359 bytes
-SHA1 (patch-pkg_META) = 2953bf2e069f171d9b70dec3b985c2f864e29361
+SHA1 (eliom-6.3.0.tar.gz) = dcb78ec42965d626f6891c5f01249a2afa29a820
+RMD160 (eliom-6.3.0.tar.gz) = 98e8c64beb41a130d2e38959986285a074a04f79
+SHA512 (eliom-6.3.0.tar.gz) = d597e7c432dbafb8c4b8f36bf3c8ad43867cfdb4b6d9138358e3aff2e67bdf7c50dc4676cdf03b42da5f66749db3b2e3a9357bc4df9a0754c775480785e96f41
+Size (eliom-6.3.0.tar.gz) = 728342 bytes
 SHA1 (patch-pkg_build.ml) = 8597e17fc869b7a8e93ee30f551a92c694617dbc
-SHA1 (patch-src__tags) = 5058021a43761fff5ce91f26c8fd854014e1e051
-SHA1 (patch-src_lib_eliom_content_.client.ml) = fc7896b38b4719518c6c928949b8713da50026a9
-SHA1 (patch-src_lib_eliom_request.client.ml) = 1d9dbe87011bb05267bce4c2a8993e89484aba8a
-SHA1 (patch-src_lib_eliom_request.client.mli) = 72e9a6c2b59ee2944e0647202782dce38c661c31
-SHA1 (patch-src_ocamlbuild_ocamlbuild_eliom.ml) = c774f7d2a091f7f00e4f1793ee52fd4860f440ea
-SHA1 (patch-src_tools_utils.ml) = fb59916f46fa1d2f99284f0ea24e138a3f116eb0
+SHA1 (patch-src__tags) = 5aff5c25080159e71847ca4caffb53641c5e2811
+SHA1 (patch-src_lib_eliom__client.client.ml) = e66600dcf8011d3833756ea25f7e1884fd090815

Index: pkgsrc/www/eliom/patches/patch-src__tags
diff -u pkgsrc/www/eliom/patches/patch-src__tags:1.1 pkgsrc/www/eliom/patches/patch-src__tags:1.2
--- pkgsrc/www/eliom/patches/patch-src__tags:1.1        Fri Sep  8 17:14:34 2017
+++ pkgsrc/www/eliom/patches/patch-src__tags    Fri Apr 13 13:17:34 2018
@@ -1,45 +1,42 @@
-$NetBSD: patch-src__tags,v 1.1 2017/09/08 17:14:34 jaapb Exp $
+$NetBSD: patch-src__tags,v 1.2 2018/04/13 13:17:34 jaapb Exp $
 
-Use correct packages for ocaml-lwt 3 and js_of_ocaml 3
---- src/_tags.orig     2017-02-07 15:42:18.000000000 +0000
+lwt_ppx is now its own package and has been renamed
+--- src/_tags.orig     2018-02-08 14:30:46.000000000 +0000
 +++ src/_tags
-@@ -2,32 +2,32 @@
+@@ -2,23 +2,23 @@
  true:keep_locs
  
  <lib/type_dir/*.ml{,i}>:eliom_ppx,thread
--<lib/type_dir/*.ml>:package(js_of_ocaml.deriving.ppx,lwt.ppx)
-+<lib/type_dir/*.ml>:package(js_of_ocaml-ppx.deriving,lwt.ppx)
+-<lib/type_dir/*.ml>:package(js_of_ocaml-ppx.deriving,lwt.ppx)
++<lib/type_dir/*.ml>:package(js_of_ocaml-ppx.deriving,lwt_ppx)
  <lib/type_dir/*.ml>:package(js_of_ocaml.ppx)
  
  <lib/server/*.ml{,i}>:eliom_ppx
--<lib/server/*.ml>:package(js_of_ocaml.deriving.ppx,lwt.ppx)
-+<lib/server/*.ml>:package(js_of_ocaml-ppx.deriving,lwt.ppx)
+-<lib/server/*.ml>:package(js_of_ocaml-ppx.deriving,lwt.ppx)
++<lib/server/*.ml>:package(js_of_ocaml-ppx.deriving,lwt_ppx)
  <lib/server/*.ml>:package(js_of_ocaml.ppx)
  
  <lib/server/*.ml{,i}>:thread
  <lib/server/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml.functor)
--<lib/server/*.ml{,i}>:package(react,js_of_ocaml)
-+<lib/server/*.ml{,i}>:package(react,lwt_react,js_of_ocaml)
+-<lib/server/*.ml{,i}>:package(react,lwt_react,js_of_ocaml)
++<lib/server/*.ml{,i}>:package(react,lwt_react,js_of_ocaml,lwt_log)
  
--<lib/server/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
-+<lib/server/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
+ <lib/server/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
  
  <lib/*.eliom{,i}>:eliom_ppx
  
  <lib/*.ml{,i}>:eliom_ppx
--<lib/client/*.ml>:package(js_of_ocaml.deriving.ppx,lwt.ppx,js_of_ocaml.log)
-+<lib/client/*.ml>:package(js_of_ocaml-ppx.deriving,lwt.ppx,js_of_ocaml-lwt.logger)
+-<lib/client/*.ml>:package(js_of_ocaml-ppx.deriving,lwt.ppx,js_of_ocaml-lwt.logger)
++<lib/client/*.ml>:package(js_of_ocaml-ppx.deriving,lwt_ppx,js_of_ocaml-lwt.logger)
  <lib/client/*.ml>:package(js_of_ocaml.ppx)
  
  <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(lwt.react,tyxml.functor,js_of_ocaml.tyxml)
-+<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)
+@@ -29,7 +29,7 @@ true:keep_locs
  
--<lib/client/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
-+<lib/client/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
+ <lib/client/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
  
- <lib/server/monitor/*.ml>:package(lwt.ppx)
+-<lib/server/monitor/*.ml>:package(lwt.ppx)
++<lib/server/monitor/*.ml>:package(lwt_ppx)
  <lib/server/monitor/*.ml{,i}>:thread
+ <lib/server/monitor/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml)
+ <lib/server/monitor/*.ml{,i}>:I(src/lib/server)

Added files:

Index: pkgsrc/www/eliom/patches/patch-src_lib_eliom__client.client.ml
diff -u /dev/null pkgsrc/www/eliom/patches/patch-src_lib_eliom__client.client.ml:1.1
--- /dev/null   Fri Apr 13 13:17:34 2018
+++ pkgsrc/www/eliom/patches/patch-src_lib_eliom__client.client.ml      Fri Apr 13 13:17:34 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lib_eliom__client.client.ml,v 1.1 2018/04/13 13:17:34 jaapb Exp $
+
+The >> syntax has been removed in Lwt 4.0.0.
+--- src/lib/eliom_client.client.ml.orig        2018-02-08 14:30:46.000000000 +0000
++++ src/lib/eliom_client.client.ml
+@@ -1305,8 +1305,8 @@ let () =
+                     uri [(Eliom_request.nl_template_string, t)]
+                     Eliom_request.string_result
+                 in
+-                set_template_content ~replace:true ~uri content >>
+-                (scroll_to_fragment ~offset:state.position fragment;
++                set_template_content ~replace:true ~uri content >>=
++                fun () -> (scroll_to_fragment ~offset:state.position fragment;
+                  Lwt.return_unit)
+               | _ ->
+                 with_new_page