Updated www/eliom to version 3.0.3 (the latest). Changes include:

 * Language
 ** Generalized client values in server code
 ** Injections into client sections
 * Tools
 ** Added eliom-destillery for generating project scaffolds
 ** Support Eliom interface files (.eliomi) in eliomc, eliomdep
 ** eliomdep: Generate dependencies between eliom-modules
 ** eliomc: infer only with option -infer, drop option -noinfer
 ** eliomc: Basic support for -i on eliom-files
 ** eliom{c,dep,opt},js_of_eliom: -dump to output the intermediate code
 ** eliomc,js_of_eliom: always open Eliom_pervasives in eliom files
 * API
 ** Eliom_pervasives.server_function to easily access the from the client
 ** Get current state of a scope
 ** Module to access values of Eliom references in external states
    (Eliom_state.Ext)
 ** Scope names are now named scope hierarchies
 ** Iterate the scope hierarchy (group > session > client > request)
 ** Adding Eliom_parameter.(type_checker, neopt)
 ** Add functions to insert html5 in atom feeds
 ** Eliom_tools.{F,D}.html to ease creation of head-tag
 ** Eliom_tools.wrap_handler as an easy alernative to
    Eliom_registration.Customize
 ** Test for initial request of a client on the server

 * Changed server behaviour
 ** Eliom_state.discard_everything now also discards request state
 ** Don't send nodes as data when they are part of the document

 * Changed client behaviour
 ** Show progress cursor during navigation with change_page
 ** Improved error messages
 ** Fail on the client when a [server_function] or call_caml_service
    fails on the server

 * Bugfixes
 ** Allow % for injections directly after parentheses

 * Support dropped for
 ** Xhtml
 ** OCamlDuce
 ** Eliom_compatibility_2_1

 * A myriade of bugfixes

4 files changed, 43 insertions, 26 deletions

diff --git a/www/eliom/Makefile b/www/eliom/Makefile
index f596315af46..51d6792e206 100644
--- a/www/eliom/Makefile
+++ b/www/eliom/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2012/10/28 06:30:14 asau Exp $
+# $NetBSD: Makefile,v 1.4 2012/12/15 16:18:42 jaapb Exp $
 #
 
-DISTNAME=	eliom-2.2.2
-PKGREVISION=	1
+DISTNAME=	eliom-3.0.3
 CATEGORIES=	www
 MASTER_SITES=	http://ocsigen.org/download/
 
-MAINTAINER=	jaapb@kerguelen.org
+MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://ocsigen.org/download/
 COMMENT=	Dynamic webpage generation library
 LICENSE=	gnu-lgpl-v2.1
@@ -15,17 +14,18 @@ USE_LANGUAGES=	c
 USE_TOOLS=	gmake
 HAS_CONFIGURE=	yes
 
-DEPENDS+=	js_of_ocaml>=1.2:../../devel/js_of_ocaml
 DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-DEPENDS+=	ocsigen>=2.1:../../www/ocsigen
-DEPENDS+=	ocaml-tyxml>=2.1:../../textproc/ocaml-tyxml
+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-ssl>=0.4.4:../../security/ocaml-ssl
 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 --without-ocamlduce
+			--libdir ${PREFIX}/lib/ocaml/site-lib
+
+INSTALLATION_DIRS=	lib/ocaml/site-lib
 
 PLIST_VARS=	opt
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
@@ -36,9 +36,7 @@ CONFIGURE_ARGS+=	--enable-natdynlink
 CONFIGURE_ARGS==	--disable-natdynlink
 .endif
 
-pre-install:
-	${MKDIR} ${DESTDIR}${PREFIX}/lib/ocaml/site-lib
-
-.include "../../net/ocamlnet/buildlink3.mk"
 .include "../../lang/ocaml/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 423f13da0a7..28fe970e394 100644
--- a/www/eliom/PLIST
+++ b/www/eliom/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2012/08/12 17:47:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/12/15 16:18:42 jaapb Exp $
 bin/eliomc
 bin/eliomcp
 bin/eliomdep
+bin/eliom-destillery
 ${PLIST.opt}bin/eliomopt
 bin/js_of_eliom
 lib/ocaml/site-lib/eliom/META
@@ -16,7 +17,8 @@ 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_compatibility_2_1.cmi
+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
@@ -29,12 +31,16 @@ 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
@@ -75,6 +81,8 @@ 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
@@ -108,4 +116,11 @@ 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
diff --git a/www/eliom/distinfo b/www/eliom/distinfo
index 844650cc5b4..43a42d02adb 100644
--- a/www/eliom/distinfo
+++ b/www/eliom/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2012/08/12 17:47:43 wiz Exp $
+$NetBSD: distinfo,v 1.2 2012/12/15 16:18:42 jaapb Exp $
 
-SHA1 (eliom-2.2.2.tar.gz) = f0b6bd1824ee59a124d6bae3d10b4a3d891e1ec5
-RMD160 (eliom-2.2.2.tar.gz) = b8e32940187d03b6dac2c0bcc98d0c27f45c6a52
-Size (eliom-2.2.2.tar.gz) = 689737 bytes
-SHA1 (patch-src_Makefile) = 6112c1641804bbe4c98c29e70330ed01a65b8186
+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
diff --git a/www/eliom/patches/patch-src_Makefile b/www/eliom/patches/patch-src_Makefile
index e9d25a1f2d8..53c0c9b0691 100644
--- a/www/eliom/patches/patch-src_Makefile
+++ b/www/eliom/patches/patch-src_Makefile
@@ -1,14 +1,18 @@
-$NetBSD: patch-src_Makefile,v 1.1 2012/08/12 17:47:43 wiz Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2012/12/15 16:18:42 jaapb Exp $
 
-install manpage with proper permissions
---- src/Makefile.orig	2012-06-11 12:46:54.000000000 +0000
+Use correct BSD installation tools
+--- src/Makefile.orig	2012-12-13 16:16:17.000000000 +0000
 +++ src/Makefile
-@@ -61,7 +61,7 @@ install: install.META install.man
+@@ -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 -d $(TEMPROOT)$(MANDIR)/man1
 -	$(INSTALL) -m 755 files/eliomc.1 $(TEMPROOT)$(MANDIR)/man1
-+	$(INSTALL) -m 644 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