CVS commit: pkgsrc/www/ocsigen

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/ocsigen
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Fri, 20 May 2022 07:04:07 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Fri May 20 07:04:07 UTC 2022

Modified Files:
        pkgsrc/www/ocsigen: Makefile PLIST distinfo
        pkgsrc/www/ocsigen/patches: patch-Makefile
Added Files:
        pkgsrc/www/ocsigen/patches: patch-src_server_dune
            patch-src_server_ocsigen__cohttp.ml
Removed Files:
        pkgsrc/www/ocsigen: options.mk
        pkgsrc/www/ocsigen/patches: patch-src_extensions_cgimod.ml

Log Message:
Updated www/ocsigen to version 5.0.1.

For such a huge increase in version number there are surprisingly few
changes: mostly minor changes and bugfixes, plus OCaml and other
compatibility updates. The build system has changed to Dune, and the
persistent storage library has been split off into ocsipersist.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/ocsigen/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/ocsigen/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/ocsigen/distinfo
cvs rdiff -u -r1.7 -r0 pkgsrc/www/ocsigen/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/ocsigen/patches/patch-Makefile
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_cgimod.ml
cvs rdiff -u -r0 -r1.1 pkgsrc/www/ocsigen/patches/patch-src_server_dune \
    pkgsrc/www/ocsigen/patches/patch-src_server_ocsigen__cohttp.ml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ocsigen/Makefile
diff -u pkgsrc/www/ocsigen/Makefile:1.41 pkgsrc/www/ocsigen/Makefile:1.42
--- pkgsrc/www/ocsigen/Makefile:1.41    Mon Mar  8 08:13:09 2021
+++ pkgsrc/www/ocsigen/Makefile Fri May 20 07:04:06 2022
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.42 2022/05/20 07:04:06 jaapb Exp $
 #
 
-VERSION=       2.16.1
+VERSION=       5.0.1
 GITHUB_PROJECT=        ocsigenserver
 PKGNAME=       ocsigen-${VERSION}
-PKGREVISION=   1
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -17,9 +16,7 @@ LICENSE=      gnu-lgpl-v2.1
 # ln: ./ocsipersist.mli: File exists
 # Makefile:42: recipe for target 'ocsipersist.mli' failed
 MAKE_JOBS_SAFE=        no
-
-DEPENDS+=      ocaml-react-[0-9]*:../../devel/ocaml-react
-DEPENDS+=      ocaml-text-[0-9]*:../../textproc/ocaml-text
+USE_TOOLS+=    sed gmake
 
 OCSIGEN_USER?=         ${APACHE_USER}
 OCSIGEN_GROUP?=                ${APACHE_GROUP}
@@ -34,8 +31,7 @@ FILES_SUBST+= OCSIGEN_USER=${OCSIGEN_USE
                VARBASE=${VARBASE:Q}
 
 HAS_CONFIGURE= yes
-CONFIGURE_ARGS=        --disable-debug \
-               --temproot ${DESTDIR} \
+CONFIGURE_ARGS=        --temproot ${DESTDIR} \
                --prefix ${PREFIX} \
                --bindir ${PREFIX}/bin \
                --libdir ${PREFIX}/lib/ocaml/site-lib \
@@ -50,36 +46,47 @@ CONFIGURE_ARGS=     --disable-debug \
                --datadir ${VARBASE}/lib/ocsigen \
                --commandpipe ${VARBASE}/run/ocsigen_command
 
-CONF_FILES+=   ${DESTDIR}${PREFIX}/share/examples/ocsigen/ocsigenserver.conf.sample \
+#CONF_FILES+=  ${DESTDIR}${PREFIX}/share/examples/ocsigen/ocsigenserver.conf.sample \
                ${PKG_SYSCONFDIR}/ocsigenserver/ocsigenserver.conf
-USE_TOOLS+=    gmake
 
 OCAML_USE_FINDLIB=     yes
 OCAML_FINDLIB_DIRS=    ocsigenserver
+OCAML_USE_DUNE=                yes
+OPAM_INSTALL_FILES=    ocsigenserver
+INSTALL_UNSTRIPPED=    yes
 
 .include "../../mk/ocaml.mk"
 
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-CONFIGURE_ARGS+=               --enable-natdynlink
-BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=3.12.0
-.else
-CONFIGURE_ARGS+=               --disable-natdynlink
-.endif
+#.if ${OCAML_USE_OPT_COMPILER} == "yes"
+#CONFIGURE_ARGS+=              --enable-natdynlink
+#BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.12.0
+#.else
+#CONFIGURE_ARGS+=              --disable-natdynlink
+#.endif
 
 post-extract:
        ${RUN} ${CP} ${FILESDIR}/ocsigen_getcommandline.mli ${WRKSRC}/src/baselib/commandline
        ${RUN} ${CP} ${FILESDIR}/ocsigen_getcommandline.mli ${WRKSRC}/src/baselib/nocommandline
 
-.include "options.mk"
+post-configure:
+       ${RUN} cd ${WRKSRC} && gmake -C src confs
+
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../archivers/ocaml-zip/buildlink3.mk"
+.include "../../devel/ocaml-dune/buildlink3.mk"
+.include "../../devel/ocaml-hmap/buildlink3.mk"
 .include "../../devel/ocaml-lwt_log/buildlink3.mk"
 .include "../../devel/ocaml-lwt_react/buildlink3.mk"
 .include "../../devel/ocaml-lwt_ssl/buildlink3.mk"
+.include "../../devel/ocaml-lwt/buildlink3.mk"
+.include "../../devel/ocaml-react/buildlink3.mk"
 .include "../../devel/pcre-ocaml/buildlink3.mk"
+.include "../../net/ocaml-conduit/buildlink3.mk"
 .include "../../net/ocaml-ipaddr/buildlink3.mk"
-.include "../../net/ocamlnet/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 "../../textproc/ocaml-tyxml/buildlink3.mk"
 .include "../../textproc/ocaml-xml-light/buildlink3.mk"
+.include "../../www/ocaml-cohttp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/ocsigen/PLIST
diff -u pkgsrc/www/ocsigen/PLIST:1.11 pkgsrc/www/ocsigen/PLIST:1.12
--- pkgsrc/www/ocsigen/PLIST:1.11       Sat Aug 24 11:13:48 2019
+++ pkgsrc/www/ocsigen/PLIST    Fri May 20 07:04:06 2022
@@ -1,208 +1,265 @@
-@comment $NetBSD: PLIST,v 1.11 2019/08/24 11:13:48 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.12 2022/05/20 07:04:06 jaapb Exp $
 bin/ocsigenserver
-${PLIST.ocaml-opt}bin/ocsigenserver.opt
+bin/ocsigenserver.opt
 ${OCAML_SITELIB}/ocsigenserver/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib.a
-${OCAML_SITELIB}/ocsigenserver/baselib.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib.cmxa
-${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmi
-${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmxs
-${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.o
-${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmi
-${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmxs
-${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.o
-${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.o
-${PLIST.camlzip}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.cmo
-${PLIST.camlzip}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.cmx
-${PLIST.camlzip}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.cmxs
-${PLIST.camlzip}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.a
-${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.cmxs
-${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.o
-${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.o
-${OCAML_SITELIB}/ocsigenserver/framepp.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/framepp.cmx
-${OCAML_SITELIB}/ocsigenserver/framepp.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http.a
-${OCAML_SITELIB}/ocsigenserver/http.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http.cmxa
-${OCAML_SITELIB}/ocsigenserver/http_headers.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http_headers.cmx
-${OCAML_SITELIB}/ocsigenserver/http_headers.mli
-@comment ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/libocsigenserver.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigenserver.a
-${OCAML_SITELIB}/ocsigenserver/ocsigenserver.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigenserver.cmxa
-${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmi
-${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmxs
-${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.o
-${PLIST.dbm}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.a
-${PLIST.dbm}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cma
-${PLIST.dbm}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cmxa
-${PLIST.dbm}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cmxs
-${PLIST.pgsql}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.a
-${PLIST.pgsql}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cma
-${PLIST.pgsql}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxa
-${PLIST.pgsql}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxs
-${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.a
-${PLIST.sqlite}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cma
-${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cmxa
-${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cmxs
-${OCAML_SITELIB}/ocsigenserver/ocsigen_cache.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cache.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_cache.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_charset_mime.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_charset_mime.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_charset_mime.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.a
+${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.cma
+${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.cmi
+${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.cmt
+${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.cmxs
+${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.ml
+${OCAML_SITELIB}/ocsigenserver/baselib/base/ocsigen_lib_base.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/baselib.a
+${OCAML_SITELIB}/ocsigenserver/baselib/baselib.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/baselib.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/baselib.cmxs
+${OCAML_SITELIB}/ocsigenserver/baselib/dynlink_wrapper.cmi
+${OCAML_SITELIB}/ocsigenserver/baselib/dynlink_wrapper.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/dynlink_wrapper.cmx
+${OCAML_SITELIB}/ocsigenserver/baselib/dynlink_wrapper.ml
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_cache.cmi
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_cache.cmt
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_cache.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_cache.cmx
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_cache.ml
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_cache.mli
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_config_static.cmi
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_config_static.cmt
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_config_static.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_config_static.cmx
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_config_static.ml
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_config_static.mli
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_lib.cmi
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_lib.cmt
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_lib.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_lib.cmx
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_lib.ml
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_lib.mli
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_loader.cmi
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_loader.cmt
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_loader.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_loader.cmx
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_loader.ml
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_loader.mli
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_stream.cmi
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_stream.cmt
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_stream.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_stream.cmx
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_stream.ml
+${OCAML_SITELIB}/ocsigenserver/baselib/ocsigen_stream.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.a
+${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.cma
+${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.cmi
+${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.cmt
+${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.cmxs
+${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.ml
+${OCAML_SITELIB}/ocsigenserver/cookies/ocsigen_cookie_map.mli
+${OCAML_SITELIB}/ocsigenserver/dune-package
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.a
+${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.cma
+${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.cmt
+${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.ml
+${OCAML_SITELIB}/ocsigenserver/ext/accesscontrol/accesscontrol.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.a
+${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.cma
+${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.cmt
+${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.ml
+${OCAML_SITELIB}/ocsigenserver/ext/authbasic/authbasic.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.a
+${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.cma
+${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.cmt
+${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.ml
+${OCAML_SITELIB}/ocsigenserver/ext/cors/cors.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.a
+${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.cma
+${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.cmt
+${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.ml
+${OCAML_SITELIB}/ocsigenserver/ext/deflatemod/deflatemod.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/extendconfiguration/extendconfiguration.a
+${OCAML_SITELIB}/ocsigenserver/ext/extendconfiguration/extendconfiguration.cma
+${OCAML_SITELIB}/ocsigenserver/ext/extendconfiguration/extendconfiguration.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/extendconfiguration/extendconfiguration.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/extendconfiguration/extendconfiguration.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/extendconfiguration/extendconfiguration.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/extendconfiguration/extendconfiguration.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/extendconfiguration/extendconfiguration.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.a
+${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.cma
+${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.cmt
+${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.ml
+${OCAML_SITELIB}/ocsigenserver/ext/outputfilter/outputfilter.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.a
+${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.cma
+${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.cmt
+${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.ml
+${OCAML_SITELIB}/ocsigenserver/ext/redirectmod/redirectmod.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/revproxy/revproxy.a
+${OCAML_SITELIB}/ocsigenserver/ext/revproxy/revproxy.cma
+${OCAML_SITELIB}/ocsigenserver/ext/revproxy/revproxy.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/revproxy/revproxy.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/revproxy/revproxy.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/revproxy/revproxy.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/revproxy/revproxy.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/revproxy/revproxy.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/rewritemod/rewritemod.a
+${OCAML_SITELIB}/ocsigenserver/ext/rewritemod/rewritemod.cma
+${OCAML_SITELIB}/ocsigenserver/ext/rewritemod/rewritemod.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/rewritemod/rewritemod.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/rewritemod/rewritemod.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/rewritemod/rewritemod.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/rewritemod/rewritemod.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/rewritemod/rewritemod.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.a
+${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.cma
+${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.cmt
+${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.ml
+${OCAML_SITELIB}/ocsigenserver/ext/staticmod/staticmod.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/userconf/userconf.a
+${OCAML_SITELIB}/ocsigenserver/ext/userconf/userconf.cma
+${OCAML_SITELIB}/ocsigenserver/ext/userconf/userconf.cmi
+${OCAML_SITELIB}/ocsigenserver/ext/userconf/userconf.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/userconf/userconf.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/userconf/userconf.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ext/userconf/userconf.cmxs
+${OCAML_SITELIB}/ocsigenserver/ext/userconf/userconf.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http/http.a
+${OCAML_SITELIB}/ocsigenserver/http/http.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http/http.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http/http.cmxs
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_charset_mime.cmi
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_charset_mime.cmt
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_charset_mime.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http/ocsigen_charset_mime.cmx
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_charset_mime.ml
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_charset_mime.mli
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_header.cmi
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_header.cmt
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_header.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http/ocsigen_header.cmx
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_header.ml
+${OCAML_SITELIB}/ocsigenserver/http/ocsigen_header.mli
+${OCAML_SITELIB}/ocsigenserver/ocsigen_cohttp.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_cohttp.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_cohttp.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cohttp.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_cohttp.ml
+${OCAML_SITELIB}/ocsigenserver/ocsigen_cohttp.mli
+${OCAML_SITELIB}/ocsigenserver/ocsigen_command.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_command.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_command.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_command.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_command.ml
+${OCAML_SITELIB}/ocsigenserver/ocsigen_command.mli
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_config.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_config.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_config.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_config.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_config.ml
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_config.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.cmi
-${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.o
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.ml
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_getcommandline.cmi
-${OCAML_SITELIB}/ocsigenserver/ocsigen_getcommandline.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_headers.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_headers.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_headers.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_http_client.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_http_client.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_http_client.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_http_com.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_http_com.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_http_com.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_http_frame.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_http_frame.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_http_frame.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_lib.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_lib.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_lib.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.cmi
-${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.o
-${OCAML_SITELIB}/ocsigenserver/ocsigen_loader.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_loader.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_loader.mli
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.ml
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.mli
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.ml
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.mli
+${OCAML_SITELIB}/ocsigenserver/ocsigen_multipart.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_multipart.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_multipart.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_multipart.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_multipart.ml
+${OCAML_SITELIB}/ocsigenserver/ocsigen_multipart.mli
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.ml
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_request_info.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_request_info.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_request_info.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_senders.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_senders.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_senders.mli
+${OCAML_SITELIB}/ocsigenserver/ocsigen_request.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_request.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_request.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_request.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_request.ml
+${OCAML_SITELIB}/ocsigenserver/ocsigen_request.mli
+${OCAML_SITELIB}/ocsigenserver/ocsigen_response.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_response.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_response.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_response.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_response.ml
+${OCAML_SITELIB}/ocsigenserver/ocsigen_response.mli
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_server.cmi
+${OCAML_SITELIB}/ocsigenserver/ocsigen_server.cmt
+${OCAML_SITELIB}/ocsigenserver/ocsigen_server.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_server.cmx
+${OCAML_SITELIB}/ocsigenserver/ocsigen_server.ml
 ${OCAML_SITELIB}/ocsigenserver/ocsigen_server.mli
-${OCAML_SITELIB}/ocsigenserver/ocsigen_stream.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_stream.cmx
-${OCAML_SITELIB}/ocsigenserver/ocsigen_stream.mli
-${OCAML_SITELIB}/ocsigenserver/extensions/cors.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cors.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cors.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cors.o
-${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist.cmi
-${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist.mli
-${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/parsecommandline.a
-${OCAML_SITELIB}/ocsigenserver/parsecommandline.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/parsecommandline.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/parsecommandline.cmxs
-${OCAML_SITELIB}/ocsigenserver/polytables.cmi
-${OCAML_SITELIB}/ocsigenserver/polytables.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables.cmxs
-${OCAML_SITELIB}/ocsigenserver/polytables.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables.o
-${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.o
-${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.o
-${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.o
-${OCAML_SITELIB}/ocsigenserver/server_main.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/server_main.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/server_main.o
-${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.o
-${OCAML_SITELIB}/ocsigenserver/extensions/userconf.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/userconf.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/userconf.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/userconf.o
-@comment ${OCAML_SITELIB}/ocsigenserver/dllocsigenserver.so
-${PLIST.dbm}${OCAML_SITELIB}/ocsigenserver/extensions/ocsidbm
-${PLIST.dbm}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsidbm.opt
-man/man1/ocsigenserver.1
-share/examples/ocsigen/mime.types
-share/examples/ocsigen/ocsigenserver.conf
-share/examples/ocsigen/ocsigenserver.conf.sample
-share/ocsigen/www/index.html
-share/ocsigen/www/ocsigenstuff/back.png
-share/ocsigen/www/ocsigenstuff/cdimage.png
-share/ocsigen/www/ocsigenstuff/deb.png
-share/ocsigen/www/ocsigenstuff/dvi.png
-share/ocsigen/www/ocsigenstuff/folder_open.png
-share/ocsigen/www/ocsigenstuff/html.png
-share/ocsigen/www/ocsigenstuff/image.png
-share/ocsigen/www/ocsigenstuff/ocsigen5.png
-share/ocsigen/www/ocsigenstuff/pdf.png
-share/ocsigen/www/ocsigenstuff/postscript.png
-share/ocsigen/www/ocsigenstuff/readme.png
-share/ocsigen/www/ocsigenstuff/rpm.png
-share/ocsigen/www/ocsigenstuff/sound.png
-share/ocsigen/www/ocsigenstuff/source_c.png
-share/ocsigen/www/ocsigenstuff/source_java.png
-share/ocsigen/www/ocsigenstuff/source_pl.png
-share/ocsigen/www/ocsigenstuff/source_py.png
-share/ocsigen/www/ocsigenstuff/style.css
-share/ocsigen/www/ocsigenstuff/tar.png
-share/ocsigen/www/ocsigenstuff/tex.png
-share/ocsigen/www/ocsigenstuff/tgz.png
-share/ocsigen/www/ocsigenstuff/txt.png
-share/ocsigen/www/ocsigenstuff/unknown.png
-share/ocsigen/www/ocsigenstuff/video.png
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigenserver.a
+${OCAML_SITELIB}/ocsigenserver/ocsigenserver.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigenserver.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigenserver.cmxs
+${OCAML_SITELIB}/ocsigenserver/opam
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables/polytables.a
+${OCAML_SITELIB}/ocsigenserver/polytables/polytables.cma
+${OCAML_SITELIB}/ocsigenserver/polytables/polytables.cmi
+${OCAML_SITELIB}/ocsigenserver/polytables/polytables.cmt
+${OCAML_SITELIB}/ocsigenserver/polytables/polytables.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables/polytables.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables/polytables.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables/polytables.cmxs
+${OCAML_SITELIB}/ocsigenserver/polytables/polytables.ml
+${OCAML_SITELIB}/ocsigenserver/polytables/polytables.mli
+share/doc/ocsigenserver/CHANGES
+share/doc/ocsigenserver/LICENSE
+share/doc/ocsigenserver/README.md

Index: pkgsrc/www/ocsigen/distinfo
diff -u pkgsrc/www/ocsigen/distinfo:1.18 pkgsrc/www/ocsigen/distinfo:1.19
--- pkgsrc/www/ocsigen/distinfo:1.18    Tue Oct 26 11:29:42 2021
+++ pkgsrc/www/ocsigen/distinfo Fri May 20 07:04:06 2022
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 11:29:42 nia Exp $
+$NetBSD: distinfo,v 1.19 2022/05/20 07:04:06 jaapb Exp $
 
-BLAKE2s (ocsigenserver-2.16.1.tar.gz) = 889d82cccd92d2944d5783b1288721e26ca043231a96aceeb61c030bb16c49dd
-SHA512 (ocsigenserver-2.16.1.tar.gz) = be5c1fb6c54fb374232a94e82aee7fd77cdee95584e5ad421f9f41965b0f2ce69c01f6a8bd1b2c622cd806668b7b6ff849ff4f3099283d1406144f27ea8da6cf
-Size (ocsigenserver-2.16.1.tar.gz) = 1241874 bytes
-SHA1 (patch-Makefile) = b1ea31d9ed70a2e672690893676da09773e433d3
+BLAKE2s (ocsigenserver-5.0.1.tar.gz) = 4e9099cc070449ec80a80a395a18a3405e693cea17a36f16b43cde22d0dac84e
+SHA512 (ocsigenserver-5.0.1.tar.gz) = 1b8653487722ad26c0c0bfcf820402a783018039ce8b7c749ffb57bc80eeb1234464950ee639cb951c5b3dde1b4e85a992dfbbc782d55e7c2a356ff2f28a3917
+Size (ocsigenserver-5.0.1.tar.gz) = 1164098 bytes
+SHA1 (patch-Makefile) = b5c387136f7c0e89e7afd7166fd96b54b332a18b
 SHA1 (patch-src_baselib_dynlink__wrapper.nonatdynlink.ml) = 78d373be4873cf1a632adcb5af30e14891adaf1f
-SHA1 (patch-src_extensions_cgimod.ml) = def79063076f4d264a6e71d8fd97a64c5e453e32
+SHA1 (patch-src_server_dune) = 6b683b96bf629d9a44eeddbe57313d0b6ad27b98
+SHA1 (patch-src_server_ocsigen__cohttp.ml) = 3fe88c9aebd1e22e9e9271ed381b4107e9b0d12d

Index: pkgsrc/www/ocsigen/patches/patch-Makefile
diff -u pkgsrc/www/ocsigen/patches/patch-Makefile:1.4 pkgsrc/www/ocsigen/patches/patch-Makefile:1.5
--- pkgsrc/www/ocsigen/patches/patch-Makefile:1.4       Tue Apr 21 11:51:02 2020
+++ pkgsrc/www/ocsigen/patches/patch-Makefile   Fri May 20 07:04:07 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.4 2020/04/21 11:51:02 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.5 2022/05/20 07:04:07 jaapb Exp $
 
 Use BSD_* installation commands
 
---- Makefile.orig      2016-11-15 15:04:34.000000000 +0000
+--- Makefile.orig      2021-07-12 10:00:50.000000000 +0000
 +++ Makefile
-@@ -67,66 +67,43 @@ install.opt: install.META.opt install.fi
+@@ -45,64 +45,41 @@ distclean: clean.local
  
  # BB If install is not run by root but OCSIGENUSER, OCSIGENGROUP is somebody
  # BB different, make files universally accessible, we cannot chown.
@@ -35,27 +35,28 @@ Use BSD_* installation commands
 +INSTALL_CAN_PUT_PERMISSIONS=no
  
  install.files:
+       @echo
+       @echo "## Run \"make doc\" and \"make install.doc\" to build and install the ocamldoc."
        @echo INSTALL_CAN_PUT_PERMISSIONS: ${INSTALL_CAN_PUT_PERMISSIONS}
         ## Command pipe
 -      $(INSTALL) -m ${INSTALL_MOD_755} -d $(dir $(TEMPROOT)$(COMMANDPIPE))
-+      $(BSD_INSTALL_DATA_DIR) $(dir $(TEMPROOT)$(COMMANDPIPE))
++      $(BSD_INSTALL_DATA_DIR) -d $(dir $(TEMPROOT)$(COMMANDPIPE))
        [ -p $(TEMPROOT)$(COMMANDPIPE) ] || \
--       { mkfifo -m ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \
-+       { mkfifo ${INSTALL_MOD_660} $(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 ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d
--      ${INSTALL} -m ${INSTALL_MOD_644} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/
-+      $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(CONFIGDIR)/conf.d
-+      ${BSD_INSTALL_DATA} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/
-       [ -f $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf ] || \
--        { $(INSTALL) -m ${INSTALL_MOD_644} $(PROJECTNAME).conf.sample \
-+        { $(BSD_INSTALL_DATA) $(PROJECTNAME).conf.sample \
-                 $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf;  }
+-      ${INSTALL} -m ${INSTALL_MOD_644} ocsigenserver.conf.sample $(TEMPROOT)$(CONFIGDIR)/
++      $(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(CONFIGDIR)/conf.d
++      $(BSD_INSTALL_DATA) ocsigenserver.conf.sample $(TEMPROOT)$(CONFIGDIR)/
+       [ -f $(TEMPROOT)$(CONFIGDIR)/ocsigenserver.conf ] || \
+-        { $(INSTALL) -m ${INSTALL_MOD_644} ocsigenserver.conf.sample \
++        { $(BSD_INSTALL_DATA) ocsigenserver.conf.sample \
+               $(TEMPROOT)$(CONFIGDIR)/ocsigenserver.conf;  }
 -      -mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
-+#-mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
++#     -mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
         ## Log directory
 -      $(INSTALL) -m ${INSTALL_MOD_644} src/files/mime.types $(TEMPROOT)$(CONFIGDIR)
 -      $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(LOGDIR)
@@ -77,14 +78,9 @@ Use BSD_* installation commands
          local/var/www/ocsigenstuff/*.png local/var/www/ocsigenstuff/*.css \
          $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
 -      $(INSTALL) -d -m ${INSTALL_MOD_755} $(TEMPROOT)$(MANDIR)
--      $(INSTALL) -m ${INSTALL_MOD_644} src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
+-      $(INSTALL) -m ${INSTALL_MOD_644} src/files/ocsigenserver.1 $(TEMPROOT)$(MANDIR)
 +      $(BSD_INSTALL_MAN_DIR) $(TEMPROOT)$(MANDIR)
-+      $(BSD_INSTALL_MAN) src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
++      $(BSD_INSTALL_MAN) src/files/ocsigenserver.1 $(TEMPROOT)$(MANDIR)
  
  uninstall:
        -make -C doc uninstall
--      -rm -f $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf.sample
-+      -rm -F $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf.sample
-       -rm -f $(TEMPROOT)$(MANDIR)/${PROJECTNAME}.1
-       -rm -f $(TEMPROOT)$(COMMANDPIPE)
-       -rmdir --ignore-fail-on-non-empty $(TEMPROOT)$(CONFIGDIR)/conf.d

Added files:

Index: pkgsrc/www/ocsigen/patches/patch-src_server_dune
diff -u /dev/null pkgsrc/www/ocsigen/patches/patch-src_server_dune:1.1
--- /dev/null   Fri May 20 07:04:07 2022
+++ pkgsrc/www/ocsigen/patches/patch-src_server_dune    Fri May 20 07:04:07 2022
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_server_dune,v 1.1 2022/05/20 07:04:07 jaapb Exp $
+
+Ssl library needs to be included as a dependency
+
+--- src/server/dune.orig       2022-01-21 16:20:49.000000000 +0000
++++ src/server/dune
+@@ -2,4 +2,4 @@
+   (name ocsigenserver)
+   (public_name ocsigenserver)
+   (wrapped false)
+-  (libraries xml-light cohttp-lwt-unix hmap polytables ocsigen_cookie_map baselib http))
++  (libraries xml-light cohttp-lwt-unix hmap polytables ocsigen_cookie_map baselib http ssl))
Index: pkgsrc/www/ocsigen/patches/patch-src_server_ocsigen__cohttp.ml
diff -u /dev/null pkgsrc/www/ocsigen/patches/patch-src_server_ocsigen__cohttp.ml:1.1
--- /dev/null   Fri May 20 07:04:07 2022
+++ pkgsrc/www/ocsigen/patches/patch-src_server_ocsigen__cohttp.ml      Fri May 20 07:04:07 2022
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_server_ocsigen__cohttp.ml,v 1.1 2022/05/20 07:04:07 jaapb Exp $
+
+Deal with changes in newer version of cohttp (patch from upstream)
+
+--- src/server/ocsigen_cohttp.ml.orig  2022-01-21 16:20:49.000000000 +0000
++++ src/server/ocsigen_cohttp.ml
+@@ -14,13 +14,13 @@ exception Ext_http_error of
+ 
+ let _print_request fmt request =
+ 
+-  let print_list print_data out_ch lst =
++  (* let print_list print_data out_ch lst =
+     let rec aux = function
+       | [] -> ()
+       | [ x ] -> print_data out_ch x
+       | x :: r -> print_data out_ch x; aux r
+     in aux lst
+-  in
++  in *)
+ 
+   Format.fprintf fmt "%s [%s/%s]:\n"
+     (Uri.to_string (Cohttp.Request.uri request))
+@@ -29,10 +29,7 @@ let _print_request fmt request =
+ 
+   Cohttp.Header.iter
+     (fun key values ->
+-       (print_list
+-          (fun fmt value -> Format.fprintf fmt "\t%s = %s\n" key value)
+-          fmt
+-          values))
++       Format.fprintf fmt "\t%s = %s\n" key values)
+     (Cohttp.Request.headers request)
+ 
+ let connections = Hashtbl.create 256

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index