Update package to latest version, 2.5. Changes include:

* Use ipaddr
* Support "Expect: 100-continue"
* fix PID file
* fix VERSION
* Support for DELETE and PUT http method
* Support syslog logs
* option for ipv4/v6 in ocsigen_http_client
* Prevent exit when an Lwt.async task raise an exception
* fix HTTP bytes range (#8)

8 files changed, 109 insertions, 157 deletions

diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile
index d4ea741d7a6..102bb822e37 100644
--- a/www/ocsigen/Makefile
+++ b/www/ocsigen/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.14 2014/02/12 23:18:46 tron Exp $
+# $NetBSD: Makefile,v 1.15 2015/02/11 13:45:02 jaapb Exp $
 #
 
-VERSION=	2.2.0
+VERSION=	2.5
 PKGNAME=	ocsigen-${VERSION}
-DISTNAME=	ocsigenserver-${VERSION}
-PKGREVISION=	4
+DISTNAME=	${VERSION}
+DIST_SUBDIR=	ocsigenserver
 CATEGORIES=	www
-MASTER_SITES=	http://www.ocsigen.org/download/
+MASTER_SITES=	http://github.com/ocsigen/ocsigenserver/archive/
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://www.ocsigen.org/
 COMMENT=	Web programming framework for OCaml
 LICENSE=	gnu-lgpl-v2.1
 
-DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-DEPENDS+=	ocaml-react-[0-9]*:../../devel/ocaml-react
-DEPENDS+=	ocaml-text-[0-9]*:../../textproc/ocaml-text
-DEPENDS+=	ocaml-tyxml>=2.2:../../textproc/ocaml-tyxml
+DEPENDS+=     ocaml-react-[0-9]*:../../devel/ocaml-react
+DEPENDS+=     ocaml-text-[0-9]*:../../textproc/ocaml-text
 
 OCSIGEN_USER?=	${APACHE_USER}
 OCSIGEN_GROUP?=	${APACHE_GROUP}
@@ -47,31 +45,30 @@ CONFIGURE_ARGS=	--disable-debug \
 		--datadir ${VARBASE}/lib/ocsigen \
 		--commandpipe ${VARBASE}/run/ocsigen_command
 
-MAKE_JOBS_SAFE=	no
-INSTALLATION_DIRS=	lib/ocaml/site-lib
+CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/ocsigen/ocsigenserver.conf.sample \
+		${PKG_SYSCONFDIR}/ocsigenserver/ocsigenserver.conf
+USE_TOOLS+=	gmake
+WRKSRC=	${WRKDIR}/ocsigenserver-${VERSION}
+
+OCAML_USE_FINDLIB=	yes
+
+.include "../../mk/ocaml.mk"
 
-PLIST_VARS+=	opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
 CONFIGURE_ARGS+= 		--enable-natdynlink
 BUILDLINK_API_DEPENDS.ocaml+=   ocaml>=3.12.0
-PLIST.opt=	yes
 .else
 CONFIGURE_ARGS+=		--disable-natdynlink
 .endif
 
-CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/ocsigen/ocsigenserver.conf.sample \
-		${PKG_SYSCONFDIR}/ocsigenserver/ocsigenserver.conf
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c
-
 .include "options.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../databases/ocaml-dbm/buildlink3.mk"
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../devel/pcre-ocaml/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../lang/camlp4/buildlink3.mk"
+.include "../../net/ocaml-ipaddr/buildlink3.mk"
 .include "../../net/ocamlnet/buildlink3.mk"
 .include "../../security/ocaml-cryptokit/buildlink3.mk"
 .include "../../security/ocaml-ssl/buildlink3.mk"
+.include "../../textproc/ocaml-tyxml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ocsigen/PLIST b/www/ocsigen/PLIST
index a45ed21e846..b5739a030ea 100644
--- a/www/ocsigen/PLIST
+++ b/www/ocsigen/PLIST
@@ -1,70 +1,70 @@
-@comment $NetBSD: PLIST,v 1.4 2012/12/15 11:16:07 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/02/11 13:45:02 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/ocsigenserver
 bin/ocsigenserver
-${PLIST.opt}bin/ocsigenserver.opt
+${PLIST.ocaml-opt}bin/ocsigenserver.opt
 share/examples/ocsigen/ocsigenserver.conf
 share/examples/ocsigen/ocsigenserver.conf.sample
 lib/ocaml/site-lib/ocsigenserver/META
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/baselib.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/baselib.a
 lib/ocaml/site-lib/ocsigenserver/baselib.cma
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/baselib.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/baselib.cmxa
 lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmi
 lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmxs
 lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.mli
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.o
 lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmi
 lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmxs
 lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.mli
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.o
 lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.o
 ${PLIST.camlzip}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmo
-${PLIST.camlzip}${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmx
-${PLIST.camlzip}${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmxs
+${PLIST.camlzip}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmx
+${PLIST.camlzip}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmxs
 ${PLIST.camlzip}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.o
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.a
 lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cma
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxa
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxs
 lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.o
 lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.o
 lib/ocaml/site-lib/ocsigenserver/framepp.cmi
 lib/ocaml/site-lib/ocsigenserver/framepp.mli
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/http.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/http.a
 lib/ocaml/site-lib/ocsigenserver/http.cma
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/http.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/http.cmxa
 lib/ocaml/site-lib/ocsigenserver/http_headers.cmi
 lib/ocaml/site-lib/ocsigenserver/http_headers.mli
-@comment ${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/libocsigenserver.a
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.a
+@comment ${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/libocsigenserver.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.a
 lib/ocaml/site-lib/ocsigenserver/ocsigenserver.cma
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.cmxa
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmi
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmxs
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.mli
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.o
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.a
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cma
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxa
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxs
-${PLIST.sqlite}${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxs
+${PLIST.sqlite}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.a
 ${PLIST.sqlite}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cma
-${PLIST.sqlite}${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxa
-${PLIST.sqlite}${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxs
+${PLIST.sqlite}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxa
+${PLIST.sqlite}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxs
 lib/ocaml/site-lib/ocsigenserver/ocsigen_cache.cmi
 lib/ocaml/site-lib/ocsigenserver/ocsigen_cache.mli
 lib/ocaml/site-lib/ocsigenserver/ocsigen_charset_mime.cmi
@@ -73,9 +73,9 @@ lib/ocaml/site-lib/ocsigenserver/ocsigen_config.cmi
 lib/ocaml/site-lib/ocsigenserver/ocsigen_config.mli
 lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmi
 lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmx
 lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.mli
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.o
 lib/ocaml/site-lib/ocsigenserver/ocsigen_extensions.cmi
 lib/ocaml/site-lib/ocsigenserver/ocsigen_extensions.mli
 lib/ocaml/site-lib/ocsigenserver/ocsigen_getcommandline.cmi
@@ -92,9 +92,9 @@ lib/ocaml/site-lib/ocsigenserver/ocsigen_lib.cmi
 lib/ocaml/site-lib/ocsigenserver/ocsigen_lib.mli
 lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmi
 lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmx
 lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.mli
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.o
 lib/ocaml/site-lib/ocsigenserver/ocsigen_loader.cmi
 lib/ocaml/site-lib/ocsigenserver/ocsigen_loader.mli
 lib/ocaml/site-lib/ocsigenserver/ocsigen_local_files.cmi
@@ -110,51 +110,51 @@ lib/ocaml/site-lib/ocsigenserver/ocsigen_server.mli
 lib/ocaml/site-lib/ocsigenserver/ocsigen_stream.cmi
 lib/ocaml/site-lib/ocsigenserver/ocsigen_stream.mli
 lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.o
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist.cmi
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist.mli
 lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.o
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.a
 lib/ocaml/site-lib/ocsigenserver/parsecommandline.cma
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxa
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxs
 lib/ocaml/site-lib/ocsigenserver/polytables.cmi
 lib/ocaml/site-lib/ocsigenserver/polytables.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmxs
 lib/ocaml/site-lib/ocsigenserver/polytables.mli
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/polytables.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/polytables.o
 lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.o
 lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.o
 lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.o
 lib/ocaml/site-lib/ocsigenserver/server_main.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/server_main.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/server_main.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/server_main.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/server_main.o
 lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.o
 lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmo
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmx
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmxs
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.o
 @comment lib/ocaml/site-lib/ocsigenserver/dllocsigenserver.so
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsidbm
-${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsidbm.opt
+${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsidbm.opt
 man/man1/ocsigenserver.1
 share/examples/ocsigen/mime.types
 share/ocsigen/www/index.html
diff --git a/www/ocsigen/distinfo b/www/ocsigen/distinfo
index f31a0580539..ee88984965e 100644
--- a/www/ocsigen/distinfo
+++ b/www/ocsigen/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.4 2013/06/11 14:56:06 jaapb Exp $
+$NetBSD: distinfo,v 1.5 2015/02/11 13:45:02 jaapb Exp $
 
-SHA1 (ocsigenserver-2.2.0.tar.gz) = 9402b0518fd1701b0a50cb307853293ceae22605
-RMD160 (ocsigenserver-2.2.0.tar.gz) = f6683ab488e6bb9fed65a1e99706440c49c52fcd
-Size (ocsigenserver-2.2.0.tar.gz) = 1259122 bytes
+SHA1 (ocsigenserver/2.5.tar.gz) = bd4d167eab257196aac036a5749bb91b02087c56
+RMD160 (ocsigenserver/2.5.tar.gz) = a0610a3125c1411c73d22dc9cc708f9dba3c1558
+Size (ocsigenserver/2.5.tar.gz) = 1259472 bytes
 SHA1 (patch-Makefile) = c91c9f739462e3ef79bcd3ee4f05acfcff1e4518
-SHA1 (patch-Makefile.options) = f0908f862401b6dbed09ed59624ad0db7759a2a6
 SHA1 (patch-src_Makefile) = acbd4a0e9b6c4a853f18fdacd1625ee142b5c423
-SHA1 (patch-src_baselib_Makefile) = c29813b664f251e60da1ca65c8cfea59df350de3
-SHA1 (patch-src_extensions_Makefile) = 26a64c67b33936f0a7864263c498610797d87f31
-SHA1 (patch-src_http_Makefile) = 3fd370004363cfef342a28c369cf997d47d097ba
diff --git a/www/ocsigen/options.mk b/www/ocsigen/options.mk
index 1f77f76b39b..1b9bc9f6b55 100644
--- a/www/ocsigen/options.mk
+++ b/www/ocsigen/options.mk
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.3 2012/12/15 11:16:07 jaapb Exp $
+# $NetBSD: options.mk,v 1.4 2015/02/11 13:45:02 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocsigen
-PKG_SUPPORTED_OPTIONS=	sqlite camlzip
-PKG_SUGGESTED_OPTIONS=	camlzip
+PKG_SUPPORTED_OPTIONS=	camlzip
+PKG_OPTIONS_NONEMPTY_SETS=	database
+PKG_OPTIONS_SET.database=	sqlite gdbm
+PKG_SUGGESTED_OPTIONS=	gdbm camlzip
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,6 +17,15 @@ PLIST.sqlite=		yes
 CONFIGURE_ARGS+=	--without-sqlite
 .endif
 
+PLIST_VARS+=	dbm
+.if !empty(PKG_OPTIONS:Mgdbm)
+.include "../../databases/ocaml-dbm/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-dbm
+PLIST.dbm=		yes
+.else
+CONFIGURE_ARGS+=	--without-dbm
+.endif
+
 PLIST_VARS+=	camlzip
 .if !empty(PKG_OPTIONS:Mcamlzip)
 DEPENDS+=		ocaml-zip-[0-9]*:../../archivers/ocaml-zip
diff --git a/www/ocsigen/patches/patch-Makefile.options b/www/ocsigen/patches/patch-Makefile.options
deleted file mode 100644
index d429cbb927e..00000000000
--- a/www/ocsigen/patches/patch-Makefile.options
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Makefile.options,v 1.1 2013/06/11 14:56:06 jaapb Exp $
-
-Add netstring-pcre package, no longer provided by netstring by default
---- Makefile.options.orig	2012-12-07 15:17:09.000000000 +0000
-+++ Makefile.options
-@@ -34,6 +34,7 @@ BASE_PACKAGE := lwt
- SERVER_PACKAGE := lwt.ssl           \
- 	          ${LWT_EXTRA_PACKAGE} \
- 	          netstring         \
-+	          netstring-pcre    \
-                   findlib           \
- 	          cryptokit         \
- 		  tyxml             \
diff --git a/www/ocsigen/patches/patch-src_baselib_Makefile b/www/ocsigen/patches/patch-src_baselib_Makefile
deleted file mode 100644
index fad7dcd532a..00000000000
--- a/www/ocsigen/patches/patch-src_baselib_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_baselib_Makefile,v 1.1 2013/06/11 14:56:06 jaapb Exp $
-
-Add netstring-pcre package, no longer provided by netstring by default
---- src/baselib/Makefile.orig	2012-12-07 15:17:09.000000000 +0000
-+++ src/baselib/Makefile
-@@ -1,6 +1,6 @@
- include ../../Makefile.config
- 
--LIBS     := -package lwt.unix,netstring,cryptokit,findlib,tyxml,lwt.syntax,${LWT_EXTRA_PACKAGE}
-+LIBS     := -package lwt.unix,netstring,netstring-pcre,cryptokit,findlib,tyxml,lwt.syntax,${LWT_EXTRA_PACKAGE}
- OCAMLC   := $(OCAMLFIND) ocamlc${BYTEDBG} ${THREAD}
- OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG} ${THREAD}
- OCAMLDOC := $(OCAMLFIND) ocamldoc
diff --git a/www/ocsigen/patches/patch-src_extensions_Makefile b/www/ocsigen/patches/patch-src_extensions_Makefile
deleted file mode 100644
index c24123ee6ea..00000000000
--- a/www/ocsigen/patches/patch-src_extensions_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_extensions_Makefile,v 1.1 2013/06/11 14:56:06 jaapb Exp $
-
-Add netstring-pcre package, no longer provided by netstring by default
---- src/extensions/Makefile.orig	2012-12-07 15:17:09.000000000 +0000
-+++ src/extensions/Makefile
-@@ -4,6 +4,7 @@ PACKAGE  := lwt.unix     \
- 	    lwt.ssl      \
- 	    lwt.react    \
-             netstring    \
-+            netstring-pcre \
- 	    tyxml.parser \
- 
- LIBS     := -I ../baselib -I ../http -I ../server ${addprefix -package ,${PACKAGE}}
diff --git a/www/ocsigen/patches/patch-src_http_Makefile b/www/ocsigen/patches/patch-src_http_Makefile
deleted file mode 100644
index c0c6fb2188f..00000000000
--- a/www/ocsigen/patches/patch-src_http_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_http_Makefile,v 1.1 2013/06/11 14:56:06 jaapb Exp $
-
-Add netstring-pcre package, no longer provided by netstring by default
---- src/http/Makefile.orig	2012-12-07 15:17:09.000000000 +0000
-+++ src/http/Makefile
-@@ -1,6 +1,6 @@
- include ../../Makefile.config
- 
--LIBS     := -package netstring,lwt.ssl,tyxml -I ../baselib
-+LIBS     := -package netstring,netstring-pcre,lwt.ssl,tyxml -I ../baselib
- OCAMLC   := $(OCAMLFIND) ocamlc${BYTEDBG}
- OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG}
- OCAMLDOC := $(OCAMLFIND) ocamldoc