Updated net/ocamlnet to version 4.1.6.

This adds support for OCaml 4.07.

3 files changed, 7 insertions, 106 deletions

diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile
index b17ace9e98b..747098a213e 100644
--- a/net/ocamlnet/Makefile
+++ b/net/ocamlnet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2018/04/17 22:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2018/05/09 15:25:20 jaapb Exp $
 #
 
-DISTNAME=		ocamlnet-4.1.5
-PKGREVISION=		6
+DISTNAME=		ocamlnet-4.1.6
 CATEGORIES=		net
 MASTER_SITES=		http://download.camlcity.org/download/
 
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo
index cbb468e33dd..ef6c003341b 100644
--- a/net/ocamlnet/distinfo
+++ b/net/ocamlnet/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.27 2018/01/22 11:17:52 jaapb Exp $
+$NetBSD: distinfo,v 1.28 2018/05/09 15:25:20 jaapb Exp $
 
-SHA1 (ocamlnet-4.1.5.tar.gz) = 84e17713961536442c440745c4daa158d22d899a
-RMD160 (ocamlnet-4.1.5.tar.gz) = b4b276cd086a6d0901d8d0788b159c451db48ca4
-SHA512 (ocamlnet-4.1.5.tar.gz) = f22c24b3413ccf16fc2538d4390871e60c7c1abc6bd0f599057909d786e7ad852d47c3ba0315b0095c01b345ea58d6d7d9cfefc2f9f9c31fe7b8d5e5c874328c
-Size (ocamlnet-4.1.5.tar.gz) = 4588097 bytes
+SHA1 (ocamlnet-4.1.6.tar.gz) = 691357e0441d97ce3caf6959ee79a84c352e04cf
+RMD160 (ocamlnet-4.1.6.tar.gz) = 174e21cb3d5a0e96811dd181e4c4a09e72d26361
+SHA512 (ocamlnet-4.1.6.tar.gz) = 5bd6437f3ffea309c4382b79bbf87cc46c2fa88c5191df7b1d62294ce523aa25ba7fcf41c8c1cfade5396859db209d60b8b00062b103b1cab2761896443bf881
+Size (ocamlnet-4.1.6.tar.gz) = 4588117 bytes
 SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
-SHA1 (patch-src_netzip_netgzip.ml) = ab46274a135c695c4c3776c2a6f00e73338d5c77
diff --git a/net/ocamlnet/patches/patch-src_netzip_netgzip.ml b/net/ocamlnet/patches/patch-src_netzip_netgzip.ml
deleted file mode 100644
index ef08f4088e6..00000000000
--- a/net/ocamlnet/patches/patch-src_netzip_netgzip.ml
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-src_netzip_netgzip.ml,v 1.3 2018/01/10 16:37:41 jaapb Exp $
-
-Compile with ocaml 4.06 (patch from upstream reported issue)
---- src/netzip/netgzip.ml.orig	2017-12-06 20:20:53.000000000 +0000
-+++ src/netzip/netgzip.ml
-@@ -6,8 +6,7 @@ class input_gzip_rec gzip_ch : Netchanne
- object(self)
-   val mutable closed = false
- 
--  method input s p l = 
--    let s = Bytes.unsafe_to_string s in
-+  method input s p l =
-     let n = Gzip.input gzip_ch s p l in
-     if n = 0 then raise End_of_file;
-     n
-@@ -27,7 +26,6 @@ class input_gzip gzip_ch =
- class output_gzip_rec gzip_ch : Netchannels.rec_out_channel =
- object(self)
-   method output s p l =
--    let s = Bytes.unsafe_to_string s in
-     Gzip.output gzip_ch s p l;
-     l
-   method close_out() =
-@@ -156,24 +154,20 @@ let inflating_conv st incoming at_eof ou
- 		          (fun out_buf out_pos out_len ->
- 		             let (finished, used_in, used_out) =
- 			       try
--                                 let in_buf = Bytes.unsafe_to_string in_buf in
--                                 let out_buf = Bytes.unsafe_to_string out_buf in
--			         Zlib.inflate 
--			           stream 
--                                   in_buf in_pos in_len out_buf out_pos out_len 
-+			         Zlib.inflate
-+			           stream
-+                                   in_buf in_pos in_len out_buf out_pos out_len
- 		                   Zlib.Z_SYNC_FLUSH
- 			       with Zlib.Error(_, _) ->
--                                 dispose_in_ignore st; 
-+                                 dispose_in_ignore st;
-                                  gzip_error "error during decompression" in
--                             
--		       
-+
-+
-                              st.in_size <-
- 			       Int32.add st.in_size (Int32.of_int used_out);
- 		             st.in_crc <-
--                               ( let out_buf = Bytes.unsafe_to_string out_buf in
--			         Zlib.update_crc st.in_crc out_buf out_pos used_out
--                               );
--		       
-+			       Zlib.update_crc st.in_crc out_buf out_pos used_out;
-+
- 		             k := !k + used_in;
- 
-                              if finished then (
-@@ -292,31 +286,27 @@ let deflating_conv st incoming at_eof ou
- 		  (fun out_buf out_pos out_len ->
- 		     let (finished, used_in, used_out) =
- 		       try
--                         let in_buf = Bytes.unsafe_to_string in_buf in
--                         let out_buf = Bytes.unsafe_to_string out_buf in
--			 Zlib.deflate 
--			   stream in_buf 0 in_len out_buf out_pos out_len 
-+			 Zlib.deflate
-+			   stream in_buf 0 in_len out_buf out_pos out_len
- 			   (if at_eof then Zlib.Z_FINISH else Zlib.Z_NO_FLUSH)
--		       with 
-+		       with
- 			 | Zlib.Error(_, "buffer error") ->
- 			     (false, 0, 0)
- 			 |Zlib.Error(_, msg) ->
- 			    raise (Gzip.Error("error during compression")) in
--		     
-+
- 		     st.out_size <- Int32.add st.out_size (Int32.of_int used_in);
--		     st.out_crc <- (
--                       let in_buf = Bytes.unsafe_to_string in_buf in
--                       Zlib.update_crc st.out_crc in_buf 0 used_in
--                     );
--		     
-+		     st.out_crc <-
-+                       Zlib.update_crc st.out_crc in_buf 0 used_in;
-+
- 		     Netbuffer.delete incoming 0 used_in;
--		     
-+
- 		     if at_eof && finished then loop := false;
- 		     used_out
- 		  ) in
- 	      if not at_eof then loop := false
- 	    done;
--	    
-+
- 	    if at_eof then (
- 	      write_int32 outgoing st.out_crc;
- 	      write_int32 outgoing st.out_size;