Updated package to latest version, 2.7, and added patches and cleaned up

the Makefile. Changes include:

 * Fix content type selection for XML content
 * Send gzip trailer in Deflatemod
 * Log more details about SSL accept errors
 * Support the Content-Disposition header
 * Optimize buffering

4 files changed, 86 insertions, 11 deletions

diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile
index 1a802d8e98c..27448b1d896 100644
--- a/www/ocsigen/Makefile
+++ b/www/ocsigen/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2016/05/05 11:45:42 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2016/06/20 19:35:56 jaapb Exp $
 #
 
-VERSION=	2.6
+VERSION=	2.7
+GITHUB_PROJECT=	ocsigenserver
 PKGNAME=	ocsigen-${VERSION}
-PKGREVISION=	2
-DISTNAME=	${VERSION}
-DIST_SUBDIR=	ocsigenserver
+DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=	www
-MASTER_SITES=	http://github.com/ocsigen/ocsigenserver/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://www.ocsigen.org/
@@ -56,6 +55,7 @@ USE_TOOLS+=	gmake
 WRKSRC=	${WRKDIR}/ocsigenserver-${VERSION}
 
 OCAML_USE_FINDLIB=	yes
+OCAML_FINDLIB_DIRS=	ocsigenserver
 
 .include "../../mk/ocaml.mk"
 
diff --git a/www/ocsigen/distinfo b/www/ocsigen/distinfo
index 4834565faf4..7aca85d7ed1 100644
--- a/www/ocsigen/distinfo
+++ b/www/ocsigen/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.7 2016/02/06 13:20:33 jaapb Exp $
+$NetBSD: distinfo,v 1.8 2016/06/20 19:35:56 jaapb Exp $
 
-SHA1 (ocsigenserver/2.6.tar.gz) = 85526cc9b0b40111bfceaa27fbb232e68859a1f1
-RMD160 (ocsigenserver/2.6.tar.gz) = e823500a4bd1317b63dbd079828755bdf935d2ba
-SHA512 (ocsigenserver/2.6.tar.gz) = 56805378d375de7e7653f74b3681fe21c798df2c50ee6889bd238df8f64aa053dfdbd1df2b6396b2f8c9ed8547b8176ef9498ccbf19df4bf111469353a6d9434
-Size (ocsigenserver/2.6.tar.gz) = 1261542 bytes
+SHA1 (ocsigenserver-2.7.tar.gz) = ce8319c61c368df3b8f7f31be4af8828c801b08d
+RMD160 (ocsigenserver-2.7.tar.gz) = 8839bdcb642ebf4631085803d1c6159e9af3d397
+SHA512 (ocsigenserver-2.7.tar.gz) = e31fa428e1d86232e4066a93fc948b592e80bb3e8374efee4f40d02c53e8a713ade8aa9904623c1129c892557ac4a451928278b808abe190bb254e6e43aab256
+Size (ocsigenserver-2.7.tar.gz) = 1262049 bytes
 SHA1 (patch-Makefile) = c91c9f739462e3ef79bcd3ee4f05acfcff1e4518
 SHA1 (patch-src_Makefile) = acbd4a0e9b6c4a853f18fdacd1625ee142b5c423
+SHA1 (patch-src_http_ocsigen_senders.ml) = 61fcd61531f955d169991692f44d532597057984
+SHA1 (patch-src_http_ocsigen_senders.mli) = 71dce72976e55a49c8111dea29ceaa8f0008bdd8
diff --git a/www/ocsigen/patches/patch-src_http_ocsigen_senders.ml b/www/ocsigen/patches/patch-src_http_ocsigen_senders.ml
new file mode 100644
index 00000000000..7631bfc324f
--- /dev/null
+++ b/www/ocsigen/patches/patch-src_http_ocsigen_senders.ml
@@ -0,0 +1,57 @@
+$NetBSD: patch-src_http_ocsigen_senders.ml,v 1.1 2016/06/20 19:35:56 jaapb Exp $
+
+Catch up with Tyxml (patch from upstream, not in release yet)
+--- src/http/ocsigen_senders.ml.orig	2016-04-12 12:46:24.000000000 +0000
++++ src/http/ocsigen_senders.ml
+@@ -77,7 +77,7 @@ module Make_XML_Content(Xml : Xml_sigs.I
+          ~stream:(x, None) ())
+ end
+ 
+-module Html5_content = Make_XML_Content(Xml)(Html5.M)
++module Html_content = Make_XML_Content(Tyxml.Xml)(Tyxml.Html)
+ 
+ 
+ (*****************************************************************************)
+@@ -473,11 +473,11 @@ struct
+   let get_etag ?options c = None
+ 
+   let error_page s msg c =
+-    Html5.M.html
+-      (Html5.M.head (Html5.M.title (Html5.M.pcdata s)) [])
+-      (Html5.M.body
+-         (Html5.M.h1 [Html5.M.pcdata msg]::
+-          Html5.M.p [Html5.M.pcdata s]::
++    Tyxml.Html.html
++      (Tyxml.Html.head (Tyxml.Html.title (Tyxml.Html.pcdata s)) [])
++      (Tyxml.Html.body
++         (Tyxml.Html.h1 [Tyxml.Html.pcdata msg]::
++          Tyxml.Html.p [Tyxml.Html.pcdata s]::
+           c)
+       )
+ 
+@@ -512,11 +512,11 @@ struct
+         error_page
+           ("Error "^str_code)
+           error_msg
+-          [Html5.M.p
+-             [Html5.M.pcdata (Printexc.to_string exn);
+-              Html5.M.br ();
+-              Html5.M.em
+-                [Html5.M.pcdata "(Ocsigen running in debug mode)"]
++          [Tyxml.Html.p
++             [Tyxml.Html.pcdata (Printexc.to_string exn);
++              Tyxml.Html.br ();
++              Tyxml.Html.em
++                [Tyxml.Html.pcdata "(Ocsigen running in debug mode)"]
+              ]]
+       | _ ->
+         error_page
+@@ -524,7 +524,7 @@ struct
+           error_msg
+           []
+     in
+-    Html5_content.result_of_content err_page >>= fun r ->
++    Html_content.result_of_content err_page >>= fun r ->
+     Lwt.return
+       (Result.update r
+          ~cookies:cookies_to_set
diff --git a/www/ocsigen/patches/patch-src_http_ocsigen_senders.mli b/www/ocsigen/patches/patch-src_http_ocsigen_senders.mli
new file mode 100644
index 00000000000..f55fe42f685
--- /dev/null
+++ b/www/ocsigen/patches/patch-src_http_ocsigen_senders.mli
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_http_ocsigen_senders.mli,v 1.1 2016/06/20 19:35:56 jaapb Exp $
+
+Catch up with Tyxml (patch from upstream, not in release yet)
+--- src/http/ocsigen_senders.mli.orig	2016-04-12 12:46:24.000000000 +0000
++++ src/http/ocsigen_senders.mli
+@@ -23,8 +23,8 @@ module File_content : Ocsigen_http_frame
+   with  type t =
+     string * Ocsigen_charset_mime.charset_assoc * Ocsigen_charset_mime.mime_assoc
+ 
+-module Html5_content :
+-  Ocsigen_http_frame.HTTP_CONTENT with type t = Html5.M.doc
++module Html_content :
++  Ocsigen_http_frame.HTTP_CONTENT with type t = Tyxml.Html.doc
+ 
+ module Make_XML_Content(Xml : Xml_sigs.Iterable)
+     (Typed_xml : Xml_sigs.Typed_xml with module Xml := Xml) :