Updated package to latest version, 4.1.0. Changes include:

* Reactive DOM elements (thanks to a contribution by besport.com)
* PUT and DELETE services for RESTful Eliom Applications
Contribution by Domoco)
* EXPERIMENTAL: Mobile apps with Eliom. By making it possible to start
he application from client-side.
* Documentation improvements
* Improvements in typing of services (Contribution by Jacques-Pascal Deplaix)
* Filtering data from Eliom buses
* "caml" in value or type names now replaced by "OCaml" everywhere
* New module {{{Eliom_registration.File_ct}}} to make easier to send files with
heir content type
* Now possible to define services in shared sections
* Adding function {{{Eliom_client.change_url}}} to change the URL without doing a request
* Adding function {{{Eliom_service.attach_coservice'}}} to attach a non-attached coservice to an URL
* Improving comet configurations: now possible to stay idle instead of being completely inactive
* Now using defaultprotocol option (from ocsigenserver) to compute URLs
* The default expiration date for cookies on client side is now 10 years
* Now possible to send files in {{{Eliom_client.call_ocaml_service}}}
* Various additions and bugfixes in {{{Manip}}}, {{{Eliom_request_info}}},
{{Eliom_content.html5}}} (events) (contributions by besport.com)
* eliom-destillery renamed into eliom-distillery
* Templates for eliom-distillery
* New programs: eliomdoc and eliompp
* Ocamlbuild package
* Various bugfixes

7 files changed, 229 insertions, 199 deletions

diff --git a/www/eliom/Makefile b/www/eliom/Makefile
index 96458b056b1..c1eeb3d7452 100644
--- a/www/eliom/Makefile
+++ b/www/eliom/Makefile
@@ -1,43 +1,45 @@
-# $NetBSD: Makefile,v 1.7 2014/02/12 23:18:44 tron Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/11 15:30:12 jaapb Exp $
 #
 
-DISTNAME=	eliom-3.0.3
-PKGREVISION=	3
+VERSION=	4.1.0
+PKGNAME=	eliom-${VERSION}
+DISTNAME=	${VERSION}
+DIST_SUBDIR=	eliom
 CATEGORIES=	www
-MASTER_SITES=	http://ocsigen.org/download/
+MASTER_SITES=	http://github.com/ocsigen/eliom/archive/
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://ocsigen.org/download/
 COMMENT=	Dynamic webpage generation library
 LICENSE=	gnu-lgpl-v2.1
 
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c
-USE_TOOLS=	gmake
-HAS_CONFIGURE=	yes
+WRKSRC=	${WRKDIR}/eliom-${VERSION}
 
 DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-DEPENDS+=	js_of_ocaml>=1.3.2:../../devel/js_of_ocaml
-DEPENDS+=	ocsigen>=2.2:../../www/ocsigen
-DEPENDS+=	ocaml-tyxml>=2.2:../../textproc/ocaml-tyxml
-DEPENDS+=	ocaml-react>=0.9.2:../../devel/ocaml-react
-DEPENDS+=	ocaml-calendar>=2.01.1:../../time/ocaml-calendar
-DEPENDS+=	ocaml-deriving-ocsigen>=0.3:../../devel/ocaml-deriving-ocsigen
-
-CONFIGURE_ARGS+=	--temproot ${DESTDIR} --prefix ${PREFIX} \
-			--libdir ${PREFIX}/lib/ocaml/site-lib
-
-INSTALLATION_DIRS=	lib/ocaml/site-lib
-
-PLIST_VARS=	opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST.opt=	yes
-CONFIGURE_ARGS+=	--enable-natdynlink
+DEPENDS+=	js_of_ocaml>=2.2:../../devel/js_of_ocaml # with ocaml-tyxml option
+DEPENDS+=	ocsigen>=2.4:../../www/ocsigen
+DEPENDS+=	ocaml-tyxml>=3:../../textproc/ocaml-tyxml
+DEPENDS+=	ocaml-react>=0.9.3:../../devel/ocaml-react
+DEPENDS+=	ocaml-calendar>=2.03.1:../../time/ocaml-calendar
+DEPENDS+=	ocaml-deriving-ocsigen>=0.6:../../devel/ocaml-deriving-ocsigen
+
+.include "../../mk/ocaml.mk"
+
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
+BUILD_TARGET=	all
 .else
-CONFIGURE_ARGS==	--disable-natdynlink
+BUILD_TARGET=	byte
 .endif
 
-.include "../../lang/ocaml/buildlink3.mk"
+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-optcomp/buildlink3.mk"
+.include "../../misc/ocaml-opam/buildlink3.mk"
+BUILDLINK_DEPMETHOD.ocaml-opam?=    build
+.include "../../net/ocaml-ipaddr/buildlink3.mk"
 .include "../../net/ocamlnet/buildlink3.mk"
 .include "../../security/ocaml-ssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/eliom/PLIST b/www/eliom/PLIST
index 28fe970e394..97afea9987a 100644
--- a/www/eliom/PLIST
+++ b/www/eliom/PLIST
@@ -1,126 +1,191 @@
-@comment $NetBSD: PLIST,v 1.2 2012/12/15 16:18:42 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/02/11 15:30:12 jaapb Exp $
+bin/eliom-distillery
+bin/eliombuild
 bin/eliomc
 bin/eliomcp
 bin/eliomdep
-bin/eliom-destillery
-${PLIST.opt}bin/eliomopt
+bin/eliomdoc
+bin/eliomopt
+bin/eliompp
 bin/js_of_eliom
-lib/ocaml/site-lib/eliom/META
-lib/ocaml/site-lib/eliom/client/dlleliom_client.so
-lib/ocaml/site-lib/eliom/client/eliom_bus.cmi
-lib/ocaml/site-lib/eliom/client/eliom_bus.mli
-lib/ocaml/site-lib/eliom/client/eliom_client.cma
-lib/ocaml/site-lib/eliom/client/eliom_client.cmi
-lib/ocaml/site-lib/eliom/client/eliom_client.js
-lib/ocaml/site-lib/eliom/client/eliom_client.mli
-lib/ocaml/site-lib/eliom/client/eliom_client_main.cmo
-lib/ocaml/site-lib/eliom/client/eliom_comet.cmi
-lib/ocaml/site-lib/eliom/client/eliom_comet.mli
-lib/ocaml/site-lib/eliom/client/eliom_comet_base.mli
-lib/ocaml/site-lib/eliom/client/eliom_config.cmi
-lib/ocaml/site-lib/eliom/client/eliom_config.mli
-lib/ocaml/site-lib/eliom/client/eliom_content.cmi
-lib/ocaml/site-lib/eliom/client/eliom_content.mli
-lib/ocaml/site-lib/eliom/client/eliom_content_core.cmi
-lib/ocaml/site-lib/eliom/client/eliom_content_core.mli
-lib/ocaml/site-lib/eliom/client/eliom_lazy.cmi
-lib/ocaml/site-lib/eliom/client/eliom_lazy.mli
-lib/ocaml/site-lib/eliom/client/eliom_lib.cmi
-lib/ocaml/site-lib/eliom/client/eliom_lib.mli
-lib/ocaml/site-lib/eliom/client/eliom_mkforms.cmi
-lib/ocaml/site-lib/eliom/client/eliom_mkforms.mli
-lib/ocaml/site-lib/eliom/client/eliom_parameter.cmi
-lib/ocaml/site-lib/eliom/client/eliom_parameter.mli
-lib/ocaml/site-lib/eliom/client/eliom_pervasives.cmi
-lib/ocaml/site-lib/eliom/client/eliom_pervasives.mli
-lib/ocaml/site-lib/eliom/client/eliom_react.cmi
-lib/ocaml/site-lib/eliom/client/eliom_react.mli
-lib/ocaml/site-lib/eliom/client/eliom_registration.cmi
-lib/ocaml/site-lib/eliom/client/eliom_registration.mli
-lib/ocaml/site-lib/eliom/client/eliom_service.cmi
-lib/ocaml/site-lib/eliom/client/eliom_service.mli
-lib/ocaml/site-lib/eliom/client/eliom_tools.cmi
-lib/ocaml/site-lib/eliom/client/eliom_tools.mli
-lib/ocaml/site-lib/eliom/client/eliom_types_base.mli
-lib/ocaml/site-lib/eliom/client/eliom_unwrap.cmi
-lib/ocaml/site-lib/eliom/client/eliom_unwrap.mli
-lib/ocaml/site-lib/eliom/client/eliom_uri.cmi
-lib/ocaml/site-lib/eliom/client/eliom_uri.mli
-lib/ocaml/site-lib/eliom/client/libeliom_client.a
-lib/ocaml/site-lib/eliom/server/atom_feed.cmi
-lib/ocaml/site-lib/eliom/server/atom_feed.mli
-lib/ocaml/site-lib/eliom/server/eliom.a
-lib/ocaml/site-lib/eliom/server/eliom.cma
-lib/ocaml/site-lib/eliom/server/eliom.cmxa
-lib/ocaml/site-lib/eliom/server/eliom.cmxs
-lib/ocaml/site-lib/eliom/server/eliom_atom.cmi
-lib/ocaml/site-lib/eliom/server/eliom_atom.mli
-lib/ocaml/site-lib/eliom/server/eliom_bus.cmi
-lib/ocaml/site-lib/eliom/server/eliom_bus.mli
-lib/ocaml/site-lib/eliom/server/eliom_comet.cmi
-lib/ocaml/site-lib/eliom/server/eliom_comet.mli
-lib/ocaml/site-lib/eliom/server/eliom_common.cmi
-lib/ocaml/site-lib/eliom/server/eliom_common.mli
-lib/ocaml/site-lib/eliom/server/eliom_config.cmi
-lib/ocaml/site-lib/eliom/server/eliom_config.mli
-lib/ocaml/site-lib/eliom/server/eliom_content.cmi
-lib/ocaml/site-lib/eliom/server/eliom_content.mli
-lib/ocaml/site-lib/eliom/server/eliom_content_core.cmi
-lib/ocaml/site-lib/eliom/server/eliom_content_core.mli
-lib/ocaml/site-lib/eliom/server/eliom_cookie.cmi
-lib/ocaml/site-lib/eliom/server/eliom_cookie.mli
-lib/ocaml/site-lib/eliom/server/eliom_extension.cmi
-lib/ocaml/site-lib/eliom/server/eliom_extension.mli
-lib/ocaml/site-lib/eliom/server/eliom_lib.cmi
-lib/ocaml/site-lib/eliom/server/eliom_lib.mli
-lib/ocaml/site-lib/eliom/server/eliom_mkforms.cmi
-lib/ocaml/site-lib/eliom/server/eliom_mkforms.mli
-lib/ocaml/site-lib/eliom/server/eliom_mkreg.cmi
-lib/ocaml/site-lib/eliom/server/eliom_mkreg.mli
-lib/ocaml/site-lib/eliom/server/eliom_openid.cmi
-lib/ocaml/site-lib/eliom/server/eliom_openid.mli
-lib/ocaml/site-lib/eliom/server/eliom_parameter.cmi
-lib/ocaml/site-lib/eliom/server/eliom_parameter.mli
-lib/ocaml/site-lib/eliom/server/eliom_pervasives.cmi
-lib/ocaml/site-lib/eliom/server/eliom_pervasives.mli
-lib/ocaml/site-lib/eliom/server/eliom_react.cmi
-lib/ocaml/site-lib/eliom/server/eliom_react.mli
-lib/ocaml/site-lib/eliom/server/eliom_reference.cmi
-lib/ocaml/site-lib/eliom/server/eliom_reference.mli
-lib/ocaml/site-lib/eliom/server/eliom_registration.cmi
-lib/ocaml/site-lib/eliom/server/eliom_registration.mli
-lib/ocaml/site-lib/eliom/server/eliom_request_info.cmi
-lib/ocaml/site-lib/eliom/server/eliom_request_info.mli
-lib/ocaml/site-lib/eliom/server/eliom_s2s.cmi
-lib/ocaml/site-lib/eliom/server/eliom_s2s.mli
-lib/ocaml/site-lib/eliom/server/eliom_service.cmi
-lib/ocaml/site-lib/eliom/server/eliom_service.mli
-lib/ocaml/site-lib/eliom/server/eliom_state.cmi
-lib/ocaml/site-lib/eliom/server/eliom_state.mli
-lib/ocaml/site-lib/eliom/server/eliom_tools.cmi
-lib/ocaml/site-lib/eliom/server/eliom_tools.mli
-lib/ocaml/site-lib/eliom/server/eliom_tools_common.cmi
-lib/ocaml/site-lib/eliom/server/eliom_tools_common.mli
-lib/ocaml/site-lib/eliom/server/eliom_types.cmi
-lib/ocaml/site-lib/eliom/server/eliom_types.mli
-lib/ocaml/site-lib/eliom/server/eliom_uri.cmi
-lib/ocaml/site-lib/eliom/server/eliom_uri.mli
-lib/ocaml/site-lib/eliom/server/eliom_wrap.cmi
-lib/ocaml/site-lib/eliom/server/eliom_wrap.mli
-lib/ocaml/site-lib/eliom/syntax/pa_eliom_client_client.cmo
-lib/ocaml/site-lib/eliom/syntax/pa_eliom_client_server.cmo
-lib/ocaml/site-lib/eliom/syntax/pa_eliom_seed.cmo
-lib/ocaml/site-lib/eliom/syntax/pa_eliom_type_filter.cmo
-lib/ocaml/site-lib/eliom/syntax/pa_include.cmo
+${OCAML_SITELIB}/eliom/META
+${OCAML_SITELIB}/eliom/client/client.cma
+${OCAML_SITELIB}/eliom/client/eliom_bus.cmi
+${OCAML_SITELIB}/eliom/client/eliom_client.cmi
+${OCAML_SITELIB}/eliom/client/eliom_client.js
+${OCAML_SITELIB}/eliom/client/eliom_client_main.cmo
+${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_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_tools.cmi
+${OCAML_SITELIB}/eliom/client/eliom_types.cmi
+${OCAML_SITELIB}/eliom/client/eliom_unwrap.cmi
+${OCAML_SITELIB}/eliom/client/eliom_uri.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.a
+${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.cma
+${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.cmi
+${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
+${OCAML_SITELIB}/eliom/server/eliom_bus.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_bus.cmx
+${OCAML_SITELIB}/eliom/server/eliom_comet.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_comet.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_comet_base.cmx
+${OCAML_SITELIB}/eliom/server/eliom_common.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_common.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_common_base.cmx
+${OCAML_SITELIB}/eliom/server/eliom_config.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_config.cmx
+${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_cookie.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_cookie.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_cookies_base.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
+${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
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_parameter.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_parameter_base.cmx
+${OCAML_SITELIB}/eliom/server/eliom_pervasives.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_pervasives.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_pervasives_base.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_process.cmx
+${OCAML_SITELIB}/eliom/server/eliom_react.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_react.cmx
+${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_state.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_state.cmx
+${OCAML_SITELIB}/eliom/server/eliom_tools.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_tools.cmx
+${OCAML_SITELIB}/eliom/server/eliom_tools_common.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_tools_common.cmx
+${OCAML_SITELIB}/eliom/server/eliom_types.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_types.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_types_base.cmx
+${OCAML_SITELIB}/eliom/server/eliom_uri.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_uri.cmx
+${OCAML_SITELIB}/eliom/server/eliom_wrap.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_wrap.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_cli.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_cookies.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_datasess.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_gc.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_naservices.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_pagegen.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_parameters.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_persess.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_sersess.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_services.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_sessadmin.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_sessexpl.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_sessiongroups.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_timeouts.cmx
+${OCAML_SITELIB}/eliom/server/extensions/atom_feed.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/atom_feed.cmx
+${OCAML_SITELIB}/eliom/server/extensions/eliom_atom.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/eliom_atom.cmx
+${OCAML_SITELIB}/eliom/server/extensions/eliom_openid.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/eliom_openid.cmx
+${OCAML_SITELIB}/eliom/server/extensions/eliom_s2s.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/eliom_s2s.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/extensions.a
+${OCAML_SITELIB}/eliom/server/extensions/extensions.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/extensions.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/extensions.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.a
+${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.cma
+${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.cmxs
+${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor_main.a
+${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor_main.cma
+${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor_main.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor_main.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor_main.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor_main.cmxs
+${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor_main.mli
+${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
+${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/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/mobile/Makefile
+${OCAML_SITELIB}/eliom/templates/mobile/Makefile.options
+${OCAML_SITELIB}/eliom/templates/mobile/PROJECT_NAME.conf.in
+${OCAML_SITELIB}/eliom/templates/mobile/PROJECT_NAME.eliom
+${OCAML_SITELIB}/eliom/templates/mobile/README
+${OCAML_SITELIB}/eliom/templates/mobile/mobile!PROJECT_NAME.config.xml.in
+${OCAML_SITELIB}/eliom/templates/mobile/static!css!PROJECT_NAME.css
+${OCAML_SITELIB}/eliom/templates/mobile/static!index.html
+${OCAML_SITELIB}/eliom/templates/mobile/static!js!PROJECT_NAME.js
+man/man1/eliom-distillery.1
 man/man1/eliomc.1
 man/man1/eliomcp.1
 man/man1/eliomdep.1
 man/man1/eliomopt.1
-man/man1/eliom-destillery.1
 man/man1/js_of_eliom.1
-share/eliom/destillery/basic/Makefile
-share/eliom/destillery/basic/Makefile.options
-share/eliom/destillery/basic/PROJECT_NAME.conf.in
-share/eliom/destillery/basic/PROJECT_NAME.eliom
-share/eliom/destillery/basic/README
-share/eliom/destillery/basic/static!css!PROJECT_NAME.css
+share/doc/eliom/CHANGES
+share/doc/eliom/README
diff --git a/www/eliom/distinfo b/www/eliom/distinfo
index 43a42d02adb..2287f21e158 100644
--- a/www/eliom/distinfo
+++ b/www/eliom/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/12/15 16:18:42 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2015/02/11 15:30:12 jaapb Exp $
 
-SHA1 (eliom-3.0.3.tar.gz) = ebdb5f640c46effef1394b30b574a0837a172584
-RMD160 (eliom-3.0.3.tar.gz) = e0db24c5d915401fe9eef4031738f761b4819995
-Size (eliom-3.0.3.tar.gz) = 743842 bytes
-SHA1 (patch-src_Makefile) = 7815ffeea40d628bf062de09122887863cf76fbf
-SHA1 (patch-src_client_Makefile) = 85bd44e3fcd035652a16d5d9aeeeb237a6f06692
-SHA1 (patch-src_client_Makefile.filelist) = 76baa0cd13b029a01d4ec04f6b8486b0d9cee334
+SHA1 (eliom/4.1.0.tar.gz) = 7b457fa25b53d196e1ba74f4344c307c88f37581
+RMD160 (eliom/4.1.0.tar.gz) = b83e776cae84e60ecb469cb44859c6a41f9463a4
+Size (eliom/4.1.0.tar.gz) = 699262 bytes
+SHA1 (patch-pkg_build.ml) = d4d9e70d034da0d57f0b9857693134644f82e918
diff --git a/www/eliom/patches/patch-pkg_build.ml b/www/eliom/patches/patch-pkg_build.ml
new file mode 100644
index 00000000000..f10177a4984
--- /dev/null
+++ b/www/eliom/patches/patch-pkg_build.ml
@@ -0,0 +1,15 @@
+$NetBSD: patch-pkg_build.ml,v 1.1 2015/02/11 15:30:13 jaapb Exp $
+
+Do not install mime types
+--- pkg/build.ml.orig	2014-10-01 15:19:35.000000000 +0000
++++ pkg/build.ml
+@@ -96,8 +96,7 @@ let () =
+     (* MISC *)
+ 
+     Pkg.doc "README";
+-    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_Makefile b/www/eliom/patches/patch-src_Makefile
deleted file mode 100644
index 53c0c9b0691..00000000000
--- a/www/eliom/patches/patch-src_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.2 2012/12/15 16:18:42 jaapb Exp $
-
-Use correct BSD installation tools
---- src/Makefile.orig	2012-12-13 16:16:17.000000000 +0000
-+++ src/Makefile
-@@ -60,9 +60,9 @@ install: install.META install.man
- 	${MAKE} -C tools install
- 
- install.man: install.META
--	$(INSTALL) -m 755 -d $(TEMPROOT)$(MANDIR)/man1
--	$(INSTALL) -m 755 files/eliomc.1 $(TEMPROOT)$(MANDIR)/man1
--	$(INSTALL) -m 755 files/eliom-destillery.1 $(TEMPROOT)$(MANDIR)/man1
-+	$(BSD_INSTALL_MAN_DIR) -d $(TEMPROOT)$(MANDIR)/man1
-+	$(BSD_INSTALL_MAN) files/eliomc.1 $(TEMPROOT)$(MANDIR)/man1
-+	$(BSD_INSTALL_MAN) files/eliom-destillery.1 $(TEMPROOT)$(MANDIR)/man1
- 	ln -sf eliomc.1 $(TEMPROOT)$(MANDIR)/man1/js_of_eliom.1
- 	ln -sf eliomc.1 $(TEMPROOT)$(MANDIR)/man1/eliomopt.1
- 	ln -sf eliomc.1 $(TEMPROOT)$(MANDIR)/man1/eliomcp.1
diff --git a/www/eliom/patches/patch-src_client_Makefile b/www/eliom/patches/patch-src_client_Makefile
deleted file mode 100644
index 89f1cf4e1dd..00000000000
--- a/www/eliom/patches/patch-src_client_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_client_Makefile,v 1.1 2012/08/12 17:47:43 wiz Exp $
-
-install library stub with proper permissions
---- src/client/Makefile.orig	2012-06-11 12:46:54.000000000 +0000
-+++ src/client/Makefile
-@@ -97,7 +97,8 @@ odoc: ${DOC:.mli=.odoc}
- 
- install: ${PREDEP}
- 	${INSTALL} -m 755 -d ${CLIENTDIR}
--	${INSTALL} -m 644 ${INTF} ${IMPL} ${STUBS} ${DOC} ${CLIENTDIR}
-+	${INSTALL} -m 644 ${INTF} ${IMPL} ${DOC} ${STUBS} ${CLIENTDIR}
-+	${BSD_INSTALL_LIB} ${EXEC_STUBS} ${CLIENTDIR}
- 
- uninstall:
- 	-rm -fr ${CLIENTDIR}
diff --git a/www/eliom/patches/patch-src_client_Makefile.filelist b/www/eliom/patches/patch-src_client_Makefile.filelist
deleted file mode 100644
index a37813ca004..00000000000
--- a/www/eliom/patches/patch-src_client_Makefile.filelist
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_client_Makefile.filelist,v 1.1 2012/08/12 17:47:43 wiz Exp $
-
-install library stub with proper permissions
---- src/client/Makefile.filelist.orig	2012-06-11 12:46:54.000000000 +0000
-+++ src/client/Makefile.filelist
-@@ -21,8 +21,9 @@ NO_MLI := eliom_compatibility_2_1.cmi
- IMPL := ${PROJECTNAME}_client.cma      \
-         ${PROJECTNAME}_client_main.cmo \
- 
--STUBS := dlleliom_client.so \
--	 libeliom_client.a  \
-+EXEC_STUBS := dlleliom_client.so
-+
-+STUBS := libeliom_client.a  \
- 	 eliom_client.js    \
- 
- NOP4 := eliom_lib.mli