Updated www/ocsigen to version 2.15.0.

This adds support for OCaml 4.08, plus some other minor fixes and changes.

6 files changed, 25 insertions, 41 deletions

diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile
index f0836659169..ac49bf4a022 100644
--- a/www/ocsigen/Makefile
+++ b/www/ocsigen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2019/01/29 12:47:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.36 2019/08/24 11:13:48 jaapb Exp $
 #
 
-VERSION=	2.11.0
+VERSION=	2.15.0
 GITHUB_PROJECT=	ocsigenserver
 PKGNAME=	ocsigen-${VERSION}
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
diff --git a/www/ocsigen/PLIST b/www/ocsigen/PLIST
index 14b0a343868..320162f2ecd 100644
--- a/www/ocsigen/PLIST
+++ b/www/ocsigen/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2018/04/13 13:15:00 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.11 2019/08/24 11:13:48 jaapb Exp $
 bin/ocsigenserver
 ${PLIST.ocaml-opt}bin/ocsigenserver.opt
-share/examples/ocsigen/ocsigenserver.conf
-share/examples/ocsigen/ocsigenserver.conf.sample
 ${OCAML_SITELIB}/ocsigenserver/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib.a
 ${OCAML_SITELIB}/ocsigenserver/baselib.cma
@@ -181,6 +179,8 @@ ${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
diff --git a/www/ocsigen/distinfo b/www/ocsigen/distinfo
index 18c0d0916b7..59fc0d260f1 100644
--- a/www/ocsigen/distinfo
+++ b/www/ocsigen/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.13 2019/01/29 12:47:02 jaapb Exp $
+$NetBSD: distinfo,v 1.14 2019/08/24 11:13:48 jaapb Exp $
 
-SHA1 (ocsigenserver-2.11.0.tar.gz) = 6c8e5c5bae9fe52e62ef3c7d7333c3196f191ede
-RMD160 (ocsigenserver-2.11.0.tar.gz) = c4d9380cd4f49ebab9e7abfb0ac2dec0881b6810
-SHA512 (ocsigenserver-2.11.0.tar.gz) = 18b9f4dff8214487dc3cd111c8ce2a06835ffec8062fae46ebafde97b1c3267f37f6b1c620d6c07320172c33a75568220c298cc96b789e907e72870a1ae7c70b
-Size (ocsigenserver-2.11.0.tar.gz) = 1265753 bytes
+SHA1 (ocsigenserver-2.15.0.tar.gz) = d0d3de02afa0f4c3f83a015bdad6998428b7c9de
+RMD160 (ocsigenserver-2.15.0.tar.gz) = cc75d34796bad473277f847500cb92991b6a4daa
+SHA512 (ocsigenserver-2.15.0.tar.gz) = 4ba56d41c27243732ce818cf14abe8cc0965fb97453d2fc2fa2eafe6cc6143079ea50294410bcf8a7d677d63c199b085795174a43571a3a6d7a214845b9da95f
+Size (ocsigenserver-2.15.0.tar.gz) = 1241830 bytes
 SHA1 (patch-Makefile) = 637a45aacd7c8afaeb73be624eb7732b21e78b4d
-SHA1 (patch-src_baselib_Makefile) = e2fd5e5bd933d4ec844713c8f574efd5fa8426cf
+SHA1 (patch-src_baselib_dynlink__wrapper.nonatdynlink.ml) = 5653b7ef36efec98e0a48a07c5fe186f2830dc38
 SHA1 (patch-src_extensions_cgimod.ml) = 06630606179f07e1c9ffcec05e8e0f41cf73fc7c
-SHA1 (patch-src_server_Makefile) = 0f315fb0533d3d0b8f8cf1f3a61e11b013571b05
diff --git a/www/ocsigen/patches/patch-src_baselib_Makefile b/www/ocsigen/patches/patch-src_baselib_Makefile
deleted file mode 100644
index b9a620f5505..00000000000
--- a/www/ocsigen/patches/patch-src_baselib_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_baselib_Makefile,v 1.3 2018/04/13 13:15:00 jaapb Exp $
-
-The lwt_log package has been separated from lwt
---- src/baselib/Makefile.orig	2018-02-01 12:55:17.000000000 +0000
-+++ src/baselib/Makefile
-@@ -9,7 +9,8 @@ PACKAGE  := \
- 	findlib \
- 	tyxml \
- 	${LWT_PREEMPTIVE_PACKAGE} \
--	ipaddr
-+	ipaddr \
-+	lwt_log
- 
- LIBS     := ${addprefix -package ,${PACKAGE}}
- # -no-keep-locs is needed since OCaml 4.06. If we don't compile with
diff --git a/www/ocsigen/patches/patch-src_baselib_dynlink__wrapper.nonatdynlink.ml b/www/ocsigen/patches/patch-src_baselib_dynlink__wrapper.nonatdynlink.ml
new file mode 100644
index 00000000000..2ee8310412e
--- /dev/null
+++ b/www/ocsigen/patches/patch-src_baselib_dynlink__wrapper.nonatdynlink.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_baselib_dynlink__wrapper.nonatdynlink.ml,v 1.1 2019/08/24 11:13:48 jaapb Exp $
+
+Changes for OCaml 4.08 (patch from upstream)
+--- src/baselib/dynlink_wrapper.nonatdynlink.ml.orig	2018-12-19 10:54:19.000000000 +0000
++++ src/baselib/dynlink_wrapper.nonatdynlink.ml
+@@ -26,8 +26,6 @@ let loadfile _ = failwith message
+ 
+ let error_message _ = failwith message
+ 
+-let init _ = ()
+-
+ let allow_unsafe_modules _ = ()
+ 
+ let prohibit _ = ()
diff --git a/www/ocsigen/patches/patch-src_server_Makefile b/www/ocsigen/patches/patch-src_server_Makefile
deleted file mode 100644
index 244beca2507..00000000000
--- a/www/ocsigen/patches/patch-src_server_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_server_Makefile,v 1.1 2018/04/13 13:15:00 jaapb Exp $
-
-The lwt_log package has been separated from lwt
---- src/server/Makefile.orig	2018-02-01 12:55:17.000000000 +0000
-+++ src/server/Makefile
-@@ -2,7 +2,7 @@ include ../../Makefile.config
- 
- all: byte opt
- 
--PACKAGE  := ${SERVER_PACKAGE} ## See ../../Makefile.options
-+PACKAGE  := ${SERVER_PACKAGE} lwt_log ## See ../../Makefile.options
- LIBS     := -I ../baselib -I ../http ${addprefix -package ,${PACKAGE}} -I .
- OCAMLC   := $(OCAMLFIND) ocamlc ${BYTEDBG} ${THREAD}
- OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG} ${THREAD}