Updated www/ocsigen to its newest version, 2.2.0. Changes include:

* Relative filenames when not running as daemon
* Small change in ocsigen_lib: encoding of parameters with "
* fix Ocsigen_http_client.get_url (and other) first "/" was missing
* Installation: Do not try to chown files to a different user
* Fix error on make logrotate
* redirectmod: fixing default to permanent (as written in manual)
* Minor additions in the API

Also, the package was updated, mostly to use PLIST_VARS.

8 files changed, 185 insertions, 149 deletions

diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile
index ae35c2b20dc..4578a2fbb5a 100644
--- a/www/ocsigen/Makefile
+++ b/www/ocsigen/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2012/10/28 06:30:24 asau Exp $
+# $NetBSD: Makefile,v 1.10 2012/12/15 11:16:07 jaapb Exp $
 #
 
-VERSION=	2.1
+VERSION=	2.2.0
 PKGNAME=	ocsigen-${VERSION}
 DISTNAME=	ocsigenserver-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.ocsigen.org/download/
 
-MAINTAINER=	jaapb@kerguelen.org
+MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://www.ocsigen.org/
 COMMENT=	Web programming framework for OCaml
 LICENSE=	gnu-lgpl-v2.1
@@ -16,7 +15,7 @@ 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.1:../../textproc/ocaml-tyxml
+DEPENDS+=	ocaml-tyxml>=2.2:../../textproc/ocaml-tyxml
 
 OCSIGEN_USER?=	${APACHE_USER}
 OCSIGEN_GROUP?=	${APACHE_GROUP}
@@ -48,15 +47,16 @@ CONFIGURE_ARGS=	--disable-debug \
 		--commandpipe ${VARBASE}/run/ocsigen_command
 
 MAKE_JOBS_SAFE=	no
+INSTALLATION_DIRS=	lib/ocaml/site-lib
 
+PLIST_VARS+=	opt
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
     (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
 CONFIGURE_ARGS+= 		--enable-natdynlink
 BUILDLINK_API_DEPENDS.ocaml+=   ocaml>=3.12.0
-PLIST_SUBST+=			OPT=""
+PLIST.opt=	yes
 .else
 CONFIGURE_ARGS+=		--disable-natdynlink
-PLIST_SUBST+=			OPT="@comment "
 .endif
 
 CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/ocsigen/ocsigenserver.conf.sample \
@@ -64,16 +64,13 @@ CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/ocsigen/ocsigenserver.conf.sampl
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c
 
-pre-install:
-	${RM} -rf ${DESTDIR}/${PREFIX}/lib/ocaml/site-lib/ocsigenserver
-	${MKDIR} ${DESTDIR}/${PREFIX}/lib/ocaml/site-lib
-
 .include "options.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../databases/ocaml-dbm/buildlink3.mk"
+.include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../devel/pcre-ocaml/buildlink3.mk"
-.include "../../security/ocaml-ssl/buildlink3.mk"
-.include "../../security/ocaml-cryptokit/buildlink3.mk"
+.include "../../lang/ocaml/buildlink3.mk"
 .include "../../net/ocamlnet/buildlink3.mk"
-.include "../../devel/ocaml-lwt/buildlink3.mk"
+.include "../../security/ocaml-cryptokit/buildlink3.mk"
+.include "../../security/ocaml-ssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ocsigen/PLIST b/www/ocsigen/PLIST
index bb5e3abb701..a45ed21e846 100644
--- a/www/ocsigen/PLIST
+++ b/www/ocsigen/PLIST
@@ -1,62 +1,70 @@
-@comment $NetBSD: PLIST,v 1.3 2012/07/11 10:40:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/12/15 11:16:07 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/ocsigenserver
 bin/ocsigenserver
-${OPT}bin/ocsigenserver.opt
+${PLIST.opt}bin/ocsigenserver.opt
 share/examples/ocsigen/ocsigenserver.conf
 share/examples/ocsigen/ocsigenserver.conf.sample
 lib/ocaml/site-lib/ocsigenserver/META
-${OPT}lib/ocaml/site-lib/ocsigenserver/baselib.a
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/baselib.a
 lib/ocaml/site-lib/ocsigenserver/baselib.cma
-${OPT}lib/ocaml/site-lib/ocsigenserver/baselib.cmxa
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/baselib.cmxa
 lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmi
 lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmxs
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmx
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmxs
 lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.mli
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.o
+${PLIST.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
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmxs
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmx
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmxs
 lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.mli
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.o
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.o
 lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.o
-${OPT}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.a
+${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.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}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.o
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.a
 lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cma
-${OPT}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxa
-${OPT}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxs
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxa
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxs
 lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.o
+${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
 lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.o
+${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
 lib/ocaml/site-lib/ocsigenserver/framepp.cmi
 lib/ocaml/site-lib/ocsigenserver/framepp.mli
-${OPT}lib/ocaml/site-lib/ocsigenserver/http.a
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/http.a
 lib/ocaml/site-lib/ocsigenserver/http.cma
-${OPT}lib/ocaml/site-lib/ocsigenserver/http.cmxa
+${PLIST.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 ${OPT}lib/ocaml/site-lib/ocsigenserver/libocsigenserver.a
-${OPT}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.a
+@comment ${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/libocsigenserver.a
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.a
 lib/ocaml/site-lib/ocsigenserver/ocsigenserver.cma
-${OPT}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.cmxa
+${PLIST.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
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmxs
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmx
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmxs
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.mli
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.o
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.a
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.o
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.a
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cma
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxa
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxs
+${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.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
 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
@@ -65,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
-${OPT}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmx
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmx
 lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.mli
-${OPT}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.o
+${PLIST.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
@@ -84,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
-${OPT}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmx
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmx
 lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.mli
-${OPT}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.o
+${PLIST.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
@@ -102,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
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/cors.o
+${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
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist.cmi
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist.mli
 lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.o
-${OPT}lib/ocaml/site-lib/ocsigenserver/parsecommandline.a
+${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
 lib/ocaml/site-lib/ocsigenserver/parsecommandline.cma
-${OPT}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxa
-${OPT}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxs
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxa
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxs
 lib/ocaml/site-lib/ocsigenserver/polytables.cmi
 lib/ocaml/site-lib/ocsigenserver/polytables.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/polytables.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/polytables.cmxs
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmx
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmxs
 lib/ocaml/site-lib/ocsigenserver/polytables.mli
-${OPT}lib/ocaml/site-lib/ocsigenserver/polytables.o
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/polytables.o
 lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.o
+${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
 lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.o
+${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
 lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.o
+${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
 lib/ocaml/site-lib/ocsigenserver/server_main.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/server_main.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/server_main.o
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/server_main.cmx
+${PLIST.opt}lib/ocaml/site-lib/ocsigenserver/server_main.o
 lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.o
+${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
 lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmxs
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.o
+${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
 @comment lib/ocaml/site-lib/ocsigenserver/dllocsigenserver.so
 lib/ocaml/site-lib/ocsigenserver/extensions/ocsidbm
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsidbm.opt
+${PLIST.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/PLIST.camlzip b/www/ocsigen/PLIST.camlzip
deleted file mode 100644
index 565caac2991..00000000000
--- a/www/ocsigen/PLIST.camlzip
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.camlzip,v 1.1 2012/07/11 10:40:46 wiz Exp $
-lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmo
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmx
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmxs
-lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.o
diff --git a/www/ocsigen/PLIST.sqlite b/www/ocsigen/PLIST.sqlite
deleted file mode 100644
index 0f743c54c22..00000000000
--- a/www/ocsigen/PLIST.sqlite
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.sqlite,v 1.1 2012/07/11 10:40:46 wiz Exp $
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.a
-lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cma
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxa
-${OPT}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxs
diff --git a/www/ocsigen/distinfo b/www/ocsigen/distinfo
index 46f7d28bd2a..fec1e533c8f 100644
--- a/www/ocsigen/distinfo
+++ b/www/ocsigen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2012/07/11 10:40:47 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/12/15 11:16:07 jaapb Exp $
 
-SHA1 (ocsigenserver-2.1.tar.gz) = 91f8478f1a2b49814274b2456d5cb4de38be5f0d
-RMD160 (ocsigenserver-2.1.tar.gz) = a32552e49c8a0eaec5c01c9d95c54685df7b093e
-Size (ocsigenserver-2.1.tar.gz) = 1254537 bytes
-SHA1 (patch-Makefile) = 0b48726ccfb7dcbc8a2d9c9c0b3a09f6180e9036
-SHA1 (patch-src_Makefile) = e3d15afa20380eaa93f0bdb75ab6404c5c888e71
+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 (patch-Makefile) = c91c9f739462e3ef79bcd3ee4f05acfcff1e4518
+SHA1 (patch-src_Makefile) = acbd4a0e9b6c4a853f18fdacd1625ee142b5c423
diff --git a/www/ocsigen/options.mk b/www/ocsigen/options.mk
index 6b4c519b509..1f77f76b39b 100644
--- a/www/ocsigen/options.mk
+++ b/www/ocsigen/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/07/11 10:40:47 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2012/12/15 11:16:07 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocsigen
 PKG_SUPPORTED_OPTIONS=	sqlite camlzip
@@ -6,20 +6,20 @@ PKG_SUGGESTED_OPTIONS=	camlzip
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	sqlite
 .if !empty(PKG_OPTIONS:Msqlite)
 DEPENDS+=		ocaml-sqlite3>=0.23.0:../../databases/ocaml-sqlite3
 CONFIGURE_ARGS+=	--with-sqlite
-PLIST_SRC+=		PLIST.sqlite
+PLIST.sqlite=		yes
 .else
 CONFIGURE_ARGS+=	--without-sqlite
 .endif
 
+PLIST_VARS+=	camlzip
 .if !empty(PKG_OPTIONS:Mcamlzip)
 DEPENDS+=		ocaml-zip-[0-9]*:../../archivers/ocaml-zip
 CONFIGURE_ARGS+=	--with-camlzip
-PLIST_SRC+=		PLIST.camlzip
+PLIST.camlzip=		yes
 .else
 CONFIGURE_ARGS+=	--without-camlzip
 .endif
-
-PLIST_SRC+=		PLIST
diff --git a/www/ocsigen/patches/patch-Makefile b/www/ocsigen/patches/patch-Makefile
index a1c9a9be1a4..4e8e073473e 100644
--- a/www/ocsigen/patches/patch-Makefile
+++ b/www/ocsigen/patches/patch-Makefile
@@ -1,54 +1,95 @@
-$NetBSD: patch-Makefile,v 1.1 2012/07/11 10:40:47 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2012/12/15 11:16:07 jaapb Exp $
 
-Change makefile to conform to pkgsrc pkginstall framework
---- Makefile.orig	2012-05-30 10:40:45.000000000 +0000
+Correct installation procedure for pkgsrc environment
+--- Makefile.orig	2012-12-07 15:17:09.000000000 +0000
 +++ Makefile
-@@ -66,34 +66,22 @@ install.byte: install.META.byte install.
- install.opt: install.META.opt install.files
+@@ -67,61 +67,53 @@ install.opt: install.META.opt install.fi
+ 
+ # BB If install is not run by root but OCSIGENUSER, OCSIGENGROUP is somebody
+ # BB different, make files universally accessible, we cannot chown.
+-INSTALL_CAN_PUT_PERMISSIONS=yes
++INSTALL_CAN_PUT_PERMISSIONS=no
+ INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g $(OCSIGENGROUP)
+ INSTALL_MOD_660=660
+ INSTALL_MOD_644=644
+ INSTALL_MOD_755=755
+ INSTALL_MOD_770=770
+ INSTALL_MOD_750=750
+-ifneq ($(shell id -u), 0)
+-  ifneq ($(OCSIGENUSER), $(USERNAME))
+-    INSTALL_CAN_PUT_PERMISSIONS=no
+-  endif
+-  ifneq ($(shell groups ${USERNAME}|grep -q ${OCSIGENGROUP}; echo $$?), 0)
+-    INSTALL_CAN_PUT_PERMISSIONS=no
+-  endif
+-endif
+-ifeq ($(INSTALL_CAN_PUT_PERMISSIONS), no)
+-    INSTALL_USER_GROUP=
+-    INSTALL_MOD_660=666
+-    INSTALL_MOD_644=666
+-    INSTALL_MOD_755=777
+-    INSTALL_MOD_770=777
+-    INSTALL_MOD_750=777
+-endif
++#ifneq ($(shell id -u), 0)
++#  ifneq ($(OCSIGENUSER), $(USERNAME))
++#    INSTALL_CAN_PUT_PERMISSIONS=no
++#  endif
++#  ifneq ($(shell groups ${USERNAME}|grep -q ${OCSIGENGROUP}; echo $$?), 0)
++#    INSTALL_CAN_PUT_PERMISSIONS=no
++#  endif
++#endif
++#ifeq ($(INSTALL_CAN_PUT_PERMISSIONS), no)
++#   INSTALL_USER_GROUP=
++#   INSTALL_MOD_660=666
++#   INSTALL_MOD_644=666
++#   INSTALL_MOD_755=777
++#   INSTALL_MOD_770=777
++#   INSTALL_MOD_750=777
++#endif
  
  install.files:
+ 	@echo INSTALL_CAN_PUT_PERMISSIONS: ${INSTALL_CAN_PUT_PERMISSIONS}
 -	 ## Command pipe
--	$(INSTALL) -m 755 -d $(dir $(TEMPROOT)$(COMMANDPIPE))
+-	$(INSTALL) -m ${INSTALL_MOD_755} -d $(dir $(TEMPROOT)$(COMMANDPIPE))
 -	[ -p $(TEMPROOT)$(COMMANDPIPE) ] || \
--	 { mkfifo $(TEMPROOT)$(COMMANDPIPE); \
--	   $(CHMOD) 660 $(TEMPROOT)$(COMMANDPIPE); \
--	   $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(TEMPROOT)$(COMMANDPIPE); }
+-	 { mkfifo -m ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \
+-	   if [ "${INSTALL_CAN_PUT_PERMISSIONS}" = yes ]; \
+-	     then $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(TEMPROOT)$(COMMANDPIPE); \
+-	   fi; }
  	 ## Configuration files
- 	$(INSTALL) -m 755 -d $(TEMPROOT)$(CONFIGDIR)/conf.d
- 	${INSTALL} -m 644 ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/
+-	$(INSTALL) -m ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d
+-	${INSTALL} -m ${INSTALL_MOD_644} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/
++	$(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(CONFIGDIR)/conf.d
++	${BSD_INSTALL_DATA} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/
  	[ -f $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf ] || \
- 	  { $(INSTALL) -m 644 $(PROJECTNAME).conf.sample \
+-	  { $(INSTALL) -m ${INSTALL_MOD_644} $(PROJECTNAME).conf.sample \
++	  { $(BSD_INSTALL_DATA) $(PROJECTNAME).conf.sample \
                  $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf;  }
--	-mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
+ 	-mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
  	 ## Log directory
- 	$(INSTALL) -m 644 src/files/mime.types $(TEMPROOT)$(CONFIGDIR)
--	$(INSTALL) -d -m 755 -o ${OCSIGENUSER} -g ${OCSIGENGROUP} \
--	  $(TEMPROOT)$(LOGDIR)
-+	$(INSTALL) -d -m 755 $(TEMPROOT)$(LOGDIR)
+-	$(INSTALL) -m ${INSTALL_MOD_644} src/files/mime.types $(TEMPROOT)$(CONFIGDIR)
+-	$(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(LOGDIR)
++	$(BSD_INSTALL_DATA) src/files/mime.types $(TEMPROOT)$(CONFIGDIR)
  	 ## Static files
--	$(INSTALL) -d -m 755 -o ${OCSIGENUSER} -g ${OCSIGENGROUP} \
--	  $(TEMPROOT)$(STATICPAGESDIR)
--	$(INSTALL) -d -m 750 -o ${OCSIGENUSER} -g ${OCSIGENGROUP} \
--	  $(TEMPROOT)$(DATADIR)
--	$(INSTALL) -m 644 -o ${OCSIGENUSER} -g ${OCSIGENGROUP} \
--	  local/var/www/*.html $(TEMPROOT)$(STATICPAGESDIR)
--	$(INSTALL) -d -m 755 -o ${OCSIGENUSER} -g ${OCSIGENGROUP} \
--	  $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
--	$(INSTALL) -m 644 -o ${OCSIGENUSER} -g ${OCSIGENGROUP} \
--	  local/var/www/ocsigenstuff/*.png local/var/www/ocsigenstuff/*.css \
-+	$(INSTALL) -d -m 755 $(TEMPROOT)$(STATICPAGESDIR)
-+	$(INSTALL) -d -m 750 $(TEMPROOT)$(DATADIR)
-+	$(INSTALL) -m 644 local/var/www/*.html $(TEMPROOT)$(STATICPAGESDIR)
-+	$(INSTALL) -d -m 755 $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
-+	$(INSTALL) -m 644 local/var/www/ocsigenstuff/*.png \
-+		local/var/www/ocsigenstuff/*.css \
+-	$(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(STATICPAGESDIR)
+-	$(INSTALL) -d -m ${INSTALL_MOD_750} ${INSTALL_USER_GROUP} $(TEMPROOT)$(DATADIR)
+-	$(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \
++	$(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(STATICPAGESDIR)
++	$(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(DATADIR)
++	$(BSD_INSTALL_DATA) \
+ 	  local/var/www/*.html $(TEMPROOT)$(STATICPAGESDIR)
+-	$(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} \
++	$(BSD_INSTALL_DATA_DIR) -d \
+ 	  $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
+-	$(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \
++	$(BSD_INSTALL_DATA) \
+ 	  local/var/www/ocsigenstuff/*.png local/var/www/ocsigenstuff/*.css \
  	  $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
- 	$(INSTALL) -d -m 755 $(TEMPROOT)$(MANDIR)
- 	$(INSTALL) -m 644 src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
-@@ -152,4 +140,4 @@ dist:
+-	$(INSTALL) -d -m ${INSTALL_MOD_755} $(TEMPROOT)$(MANDIR)
+-	$(INSTALL) -m ${INSTALL_MOD_644} src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
++	$(BSD_INSTALL_MAN_DIR) -d $(TEMPROOT)$(MANDIR)
++	$(BSD_INSTALL_MAN) src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
  
- .PHONY: depend
- depend:
--	${MAKE} -C src depend
-\ No newline at end of file
-+	${MAKE} -C src depend
+ uninstall:
+ 	-make -C doc uninstall
diff --git a/www/ocsigen/patches/patch-src_Makefile b/www/ocsigen/patches/patch-src_Makefile
index f1730b3cc98..1ef9606afeb 100644
--- a/www/ocsigen/patches/patch-src_Makefile
+++ b/www/ocsigen/patches/patch-src_Makefile
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_Makefile,v 1.1 2012/07/11 10:40:47 wiz Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2012/12/15 11:16:07 jaapb Exp $
 
-patch to make destdir work
---- src/Makefile.orig	2011-04-22 15:57:48.000000000 +0000
+Proper support of ocamlfind in pkgsrc
+--- src/Makefile.orig	2012-12-07 15:17:09.000000000 +0000
 +++ src/Makefile
-@@ -117,6 +117,7 @@ raw_install:
+@@ -119,6 +119,7 @@ raw_install:
  	$(OCAMLFIND) install $(PROJECTNAME) \
  	   -destdir $(TEMPROOT)$(LIBDIR) \
  	   -patch-version ${VERSION} \
-+           -ldconf /dev/null \
++	   -ldconf ignore \
  	   ${INTF} $(INSTALL_IMPL) $(DOC) files/META
  	 # Extensions
  	$(INSTALL) -m 755 -d $(TEMPROOT)${LIBDIR}/${PROJECTNAME}/extensions/