Updated packate to the latest version, 5.0.0. Changes include:

===== 5.0 (2016-01-28) =====

* Add Eliom_shared and server-side Eliom_content.{Html5,Svg}.R modules
* Add PPX syntax extension
* Clean-up form APIs, now available under Eliom_content.Html5.{D,F}.Form
* Patches to significantly reduce the size of request data
* Compatibility with TyXML 3.6, Js_of_ocaml 2.7, and reactiveData 0.2
* Various bugfixes and enhancements

===== 4.2 (2015-07-21) =====

* Add Manip.children, to get the html children of an element.
* Simplify Html5 and Svg signatures using tyxml's signature functors.
* Various logging improvements, in particular in Eliom_client.
* Fix eliomdep's exit code when calling option "-sort".
* Fix #168: call_ocaml_service always sends boolean true.
* Makes server function return types covariant.
* Restore compatibility with ocsigenserver 2.6 and lwt 2.4.7.
* Various bugfixes and wiki updates.

4 files changed, 80 insertions, 30 deletions

diff --git a/www/eliom/Makefile b/www/eliom/Makefile
index 2277fd566e3..661c1602864 100644
--- a/www/eliom/Makefile
+++ b/www/eliom/Makefile
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2015/08/07 11:20:35 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2016/02/06 14:50:22 jaapb Exp $
 #
 
-VERSION=	4.1.0
-PKGNAME=	eliom-${VERSION}
-PKGREVISION=	2
-DISTNAME=	${VERSION}
-DIST_SUBDIR=	eliom
+GITHUB_PROJECT=	eliom
+DISTNAME=	${GITHUB_PROJECT}-5.0.0
 CATEGORIES=	www
-MASTER_SITES=	http://github.com/ocsigen/eliom/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://ocsigen.org/download/
@@ -16,7 +13,6 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c
-WRKSRC=	${WRKDIR}/eliom-${VERSION}
 
 DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 DEPENDS+=	js_of_ocaml>=2.2:../../devel/js_of_ocaml # with ocaml-tyxml option
@@ -37,7 +33,10 @@ BUILD_TARGET=	byte
 do-install:
 	cd ${WRKSRC} && opam-installer --install --prefix ${DESTDIR}${PREFIX} --libdir ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR} --docdir ${DESTDIR}${PREFIX}/share/doc eliom.install
 
+.include "../../devel/ocaml-reactiveData/buildlink3.mk"
+BUILDLINK_API_DEPENDS.ocaml-reactiveData+=   ocaml-reactiveData>=0.2
 .include "../../devel/ocaml-optcomp/buildlink3.mk"
+.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
 .include "../../misc/ocaml-opam/buildlink3.mk"
 BUILDLINK_DEPMETHOD.ocaml-opam?=    build
 .include "../../net/ocaml-ipaddr/buildlink3.mk"
diff --git a/www/eliom/PLIST b/www/eliom/PLIST
index 97afea9987a..fadcd4aa2b0 100644
--- a/www/eliom/PLIST
+++ b/www/eliom/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/02/11 15:30:12 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/02/06 14:50:22 jaapb Exp $
 bin/eliom-distillery
 bin/eliombuild
 bin/eliomc
@@ -8,6 +8,9 @@ bin/eliomdoc
 bin/eliomopt
 bin/eliompp
 bin/js_of_eliom
+bin/ppx_eliom_client
+bin/ppx_eliom_server
+bin/ppx_eliom_types
 ${OCAML_SITELIB}/eliom/META
 ${OCAML_SITELIB}/eliom/client/client.cma
 ${OCAML_SITELIB}/eliom/client/eliom_bus.cmi
@@ -18,15 +21,20 @@ ${OCAML_SITELIB}/eliom/client/eliom_comet.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_config.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_content.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_content_core.cmi
+${OCAML_SITELIB}/eliom/client/eliom_content_sigs.cmi
+${OCAML_SITELIB}/eliom/client/eliom_cscache.cmi
+${OCAML_SITELIB}/eliom/client/eliom_form_sigs.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_lazy.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_lib.cmi
-${OCAML_SITELIB}/eliom/client/eliom_mkforms.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_parameter.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_pervasives.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_react.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_registration.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_service.cmi
+${OCAML_SITELIB}/eliom/client/eliom_shared.cmi
+${OCAML_SITELIB}/eliom/client/eliom_shared_sigs.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_tools.cmi
+${OCAML_SITELIB}/eliom/client/eliom_tools_common.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_types.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_unwrap.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_uri.cmi
@@ -37,6 +45,34 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.cmxs
 ${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom.a
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom.cma
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom.cmxs
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_client.a
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom_client.cma
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom_client.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_client.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_client.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_client.cmxs
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom_client.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_server.a
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom_server.cma
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom_server.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_server.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_server.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_server.cmxs
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom_server.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_type.a
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom_type.cma
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom_type.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_type.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_type.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_type.cmxs
+${OCAML_SITELIB}/eliom/ppx/ppx_eliom_type.mli
 ${OCAML_SITELIB}/eliom/server/eliom_bus.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_bus.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_comet.cmi
@@ -51,18 +87,21 @@ ${OCAML_SITELIB}/eliom/server/eliom_content.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_content.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_content_.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_content_core.cmx
+${OCAML_SITELIB}/eliom/server/eliom_content_sigs.cmi
 ${OCAML_SITELIB}/eliom/server/eliom_cookie.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_cookie.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_cookies_base.cmx
+${OCAML_SITELIB}/eliom/server/eliom_cscache.cmi
+${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
+${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
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_lib.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_lib_base.cmx
-${OCAML_SITELIB}/eliom/server/eliom_mkforms.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_mkforms.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_mkreg.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_mkreg.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_parameter.cmi
@@ -78,12 +117,15 @@ ${OCAML_SITELIB}/eliom/server/eliom_reference.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_reference.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_registration.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_registration.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_registration_base.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_request_info.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_request_info.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_service.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_service.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_service_base.cmx
+${OCAML_SITELIB}/eliom/server/eliom_shared.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_shared.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_shared_content.cmx
+${OCAML_SITELIB}/eliom/server/eliom_shared_sigs.cmi
 ${OCAML_SITELIB}/eliom/server/eliom_state.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_state.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_tools.cmi
@@ -166,12 +208,21 @@ ${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/Makefile
-${OCAML_SITELIB}/eliom/templates/basic/Makefile.options
-${OCAML_SITELIB}/eliom/templates/basic/PROJECT_NAME.conf.in
-${OCAML_SITELIB}/eliom/templates/basic/PROJECT_NAME.eliom
-${OCAML_SITELIB}/eliom/templates/basic/README
-${OCAML_SITELIB}/eliom/templates/basic/static!css!PROJECT_NAME.css
+${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
+${OCAML_SITELIB}/eliom/templates/basic.ppx/PROJECT_NAME.conf.in
+${OCAML_SITELIB}/eliom/templates/basic.ppx/PROJECT_NAME.eliom
+${OCAML_SITELIB}/eliom/templates/basic.ppx/README
+${OCAML_SITELIB}/eliom/templates/basic.ppx/static!css!PROJECT_NAME.css
+${OCAML_SITELIB}/eliom/templates/mobile/.ocp-indent
 ${OCAML_SITELIB}/eliom/templates/mobile/Makefile
 ${OCAML_SITELIB}/eliom/templates/mobile/Makefile.options
 ${OCAML_SITELIB}/eliom/templates/mobile/PROJECT_NAME.conf.in
@@ -188,4 +239,4 @@ man/man1/eliomdep.1
 man/man1/eliomopt.1
 man/man1/js_of_eliom.1
 share/doc/eliom/CHANGES
-share/doc/eliom/README
+share/doc/eliom/README.md
diff --git a/www/eliom/distinfo b/www/eliom/distinfo
index 7503c5fec86..51d6fd85728 100644
--- a/www/eliom/distinfo
+++ b/www/eliom/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 02:46:52 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/02/06 14:50:22 jaapb Exp $
 
-SHA1 (eliom/4.1.0.tar.gz) = 7b457fa25b53d196e1ba74f4344c307c88f37581
-RMD160 (eliom/4.1.0.tar.gz) = b83e776cae84e60ecb469cb44859c6a41f9463a4
-SHA512 (eliom/4.1.0.tar.gz) = 6dac3f2d26a3730df48270c62e16abec935656022a2cbb1c221ce040ff574b79e82d7da977d58fbd67ca884b64611e6a97a4144a5a142f8aa6c887897cf230f5
-Size (eliom/4.1.0.tar.gz) = 699262 bytes
-SHA1 (patch-pkg_build.ml) = d4d9e70d034da0d57f0b9857693134644f82e918
+SHA1 (eliom-5.0.0.tar.gz) = bc9163f433466f7e1ca4b75c04b34775ddefd7ec
+RMD160 (eliom-5.0.0.tar.gz) = 04ebd9c7698eec73faaf1daf314b36a153ad15e7
+SHA512 (eliom-5.0.0.tar.gz) = 1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887
+Size (eliom-5.0.0.tar.gz) = 728278 bytes
+SHA1 (patch-pkg_build.ml) = 8597e17fc869b7a8e93ee30f551a92c694617dbc
diff --git a/www/eliom/patches/patch-pkg_build.ml b/www/eliom/patches/patch-pkg_build.ml
index f10177a4984..b1f8957263e 100644
--- a/www/eliom/patches/patch-pkg_build.ml
+++ b/www/eliom/patches/patch-pkg_build.ml
@@ -1,12 +1,12 @@
-$NetBSD: patch-pkg_build.ml,v 1.1 2015/02/11 15:30:13 jaapb Exp $
+$NetBSD: patch-pkg_build.ml,v 1.2 2016/02/06 14:50:22 jaapb Exp $
 
 Do not install mime types
---- pkg/build.ml.orig	2014-10-01 15:19:35.000000000 +0000
+--- pkg/build.ml.orig	2016-01-28 18:22:25.000000000 +0000
 +++ pkg/build.ml
-@@ -96,8 +96,7 @@ let () =
+@@ -107,8 +107,7 @@ let () =
      (* MISC *)
  
-     Pkg.doc "README";
+     Pkg.doc "README.md";
 -    Pkg.doc "CHANGES";
 -    Pkg.etc "pkg/etc/mime.types"
 +    Pkg.doc "CHANGES"