Updated package net/ocamlnet to version 4.1.5.

This version includes support for native plugins, and some more minor
fixes.

7 files changed, 115 insertions, 140 deletions

diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile
index be65122b08d..0b17086849b 100644
--- a/net/ocamlnet/Makefile
+++ b/net/ocamlnet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2017/11/30 16:45:35 adam Exp $
+# $NetBSD: Makefile,v 1.46 2018/01/10 16:37:41 jaapb Exp $
 #
 
-DISTNAME=		ocamlnet-4.1.4
-PKGREVISION=		5
+DISTNAME=		ocamlnet-4.1.5
 CATEGORIES=		net
 MASTER_SITES=		http://download.camlcity.org/download/
 
diff --git a/net/ocamlnet/PLIST b/net/ocamlnet/PLIST
index d52f79f2c15..b1aa1fbb36e 100644
--- a/net/ocamlnet/PLIST
+++ b/net/ocamlnet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2017/09/04 18:17:47 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/01/10 16:37:41 jaapb Exp $
 ${OCAML_SITELIB}/equeue/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a
 ${OCAML_SITELIB}/equeue/equeue.cma
@@ -458,6 +458,7 @@ ${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.p.cmxs
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmi
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmxs
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.o
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.p.cmx
@@ -524,18 +525,22 @@ ${OCAML_SITELIB}/netunidata/META
 ${OCAML_SITELIB}/netunidata/netmappings_iso.cmi
 ${OCAML_SITELIB}/netunidata/netmappings_iso.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.o
 ${OCAML_SITELIB}/netunidata/netmappings_jp.cmi
 ${OCAML_SITELIB}/netunidata/netmappings_jp.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.o
 ${OCAML_SITELIB}/netunidata/netmappings_kr.cmi
 ${OCAML_SITELIB}/netunidata/netmappings_kr.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.o
 ${OCAML_SITELIB}/netunidata/netmappings_other.cmi
 ${OCAML_SITELIB}/netunidata/netmappings_other.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.o
 ${OCAML_SITELIB}/netunidata/netunichecksums.cmi
 ${OCAML_SITELIB}/netunidata/netuniconfig.cmi
@@ -551,6 +556,7 @@ ${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.p.cmxs
 ${OCAML_SITELIB}/netunidata/netuniinit.cmi
 ${OCAML_SITELIB}/netunidata/netuniinit.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmx
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.o
 ${OCAML_SITELIB}/netzip/META
 ${OCAML_SITELIB}/netzip/netgzip.cmi
diff --git a/net/ocamlnet/buildlink3.mk b/net/ocamlnet/buildlink3.mk
index d96841af1c6..7b80c0d1820 100644
--- a/net/ocamlnet/buildlink3.mk
+++ b/net/ocamlnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:27 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/10 16:37:41 jaapb Exp $
 
 BUILDLINK_TREE+=	ocamlnet
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	ocamlnet
 OCAMLNET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocamlnet+=	ocamlnet>=4.1.2
-BUILDLINK_ABI_DEPENDS.ocamlnet+=	ocamlnet>=4.1.4nb3
-BUILDLINK_PKGSRCDIR.ocamlnet?=		../../net/ocamlnet
+BUILDLINK_ABI_DEPENDS.ocamlnet+=	ocamlnet>=4.1.5
+BUILDLINK_PKGSRCDIR.ocamlnet?=	../../net/ocamlnet
 
 .endif	# OCAMLNET_BUILDLINK3_MK
 
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo
index adaa6b14ffe..ab1450c20b3 100644
--- a/net/ocamlnet/distinfo
+++ b/net/ocamlnet/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.25 2018/01/07 21:01:09 joerg Exp $
+$NetBSD: distinfo,v 1.26 2018/01/10 16:37:41 jaapb Exp $
 
-SHA1 (ocamlnet-4.1.4.tar.gz) = f7bb6e98f2c35850fb8dce428c061ce316d55ce2
-RMD160 (ocamlnet-4.1.4.tar.gz) = a71a5c894db5c540e5b47df750ea4a1468ea7bf8
-SHA512 (ocamlnet-4.1.4.tar.gz) = ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0
-Size (ocamlnet-4.1.4.tar.gz) = 4552969 bytes
-SHA1 (patch-Makefile.rules) = 124b787309e39334036681035e0687120da672c8
-SHA1 (patch-src_netsys_Makefile) = 9edbac14c5f5840933f3e93b27bb95750e946089
+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 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
 SHA1 (patch-src_nettls-nettle.c) = 75748ff2fd30ff6f54f15b9646a22b420d108f28
+SHA1 (patch-src_netzip_netgzip.ml) = ab46274a135c695c4c3776c2a6f00e73338d5c77
diff --git a/net/ocamlnet/patches/patch-Makefile.rules b/net/ocamlnet/patches/patch-Makefile.rules
deleted file mode 100644
index 72890f8684c..00000000000
--- a/net/ocamlnet/patches/patch-Makefile.rules
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-Makefile.rules,v 1.3 2017/07/17 12:30:55 jaapb Exp $
-
-Add rules to produce .cmxs files
---- Makefile.rules.orig	2016-06-19 14:49:12.000000000 +0000
-+++ Makefile.rules
-@@ -48,15 +48,20 @@ ARCHIVE  ?= $(PKGNAME)
- 
- ARCHIVE_CMA ?= $(ARCHIVE).cma 
- ARCHIVE_CMXA ?= $(ARCHIVE).cmxa 
-+ARCHIVE_CMXS ?= $(ARCHIVE).cmxs 
- ARCHIVE_P ?= $(ARCHIVE).p
- ARCHIVE_P_CMXA ?= $(ARCHIVE_P).cmxa
-+ARCHIVE_P_CMXS ?= $(ARCHIVE_P).cmxs
- 
- MT_TYPE ?= posix
- HAVE_GPROF ?= 0
-+HAVE_SHARED ?= 0
- ALL ?= $(ARCHIVE_CMA) $(ALL_EXTRA) \
-        all-mt-$(MT_TYPE)
- OPT ?= $(ARCHIVE_CMXA) $(OPT_EXTRA) \
--       opt-mt-$(MT_TYPE) opt-p-$(HAVE_GPROF) opt-mt-$(MT_TYPE)-p-$(HAVE_GPROF)
-+       opt-mt-$(MT_TYPE) opt-p-$(HAVE_GPROF) opt-mt-$(MT_TYPE)-p-$(HAVE_GPROF) \
-+			 opt-shared-$(HAVE_SHARED) opt-p-$(HAVE_GPROF)-shared-$(HAVE_SHARED)
-+
- 
- all: $(ALL)
- 
-@@ -72,7 +77,12 @@ opt-mt-vm-p-0:
- opt-mt-posix-p-0:
- opt-mt-vm-p-1:
- opt-mt-posix-p-1: $(OPTMTP_EXTRA)
--
-+opt-shared-0:
-+opt-shared-1: $(ARCHIVE_CMXS)
-+opt-p-0-shared-0:
-+opt-p-0-shared-1:
-+opt-p-1-shared-0:
-+opt-p-1-shared-1: $(ARCHIVE_P_CMXS)
- 
- 
- $(ARCHIVE_CMA): $(OBJECTS) $(COBJECTS)
-@@ -89,6 +99,9 @@ $(ARCHIVE_CMXA): $(XOBJECTS) $(COBJECTS)
- 		$(OCAMLMKLIB) -o $(ARCHIVE) $(XOBJECTS) $(COBJECTS) $(LINK_OPTIONS); \
- 	fi
- 
-+$(ARCHIVE_CMXS): $(ARCHIVE_CMXA)
-+		$(OCAMLOPT) -linkall -shared -I . -o $(ARCHIVE_CMXS) $(ARCHIVE_CMXA);
-+
- $(ARCHIVE_P_CMXA): $(XOBJECTS) $(COBJECTS)
- 	if [ "X$(COBJECTS)" = "X" ]; then \
- 		$(OCAMLOPT) -a -o $(ARCHIVE_P_CMXA) $(POBJECTS); \
-@@ -96,9 +109,12 @@ $(ARCHIVE_P_CMXA): $(XOBJECTS) $(COBJECT
- 		$(OCAMLMKLIB) -o $(ARCHIVE_P) $(POBJECTS) $(COBJECTS) $(LINK_OPTIONS); \
- 	fi
- 
-+$(ARCHIVE_P_CMXS): $(ARCHIVE_P_CMXA)
-+		$(OCAMLOPT) -linkall -shared -I . -o $(ARCHIVE_P_CMXS) $(ARCHIVE_P_CMXA);
-+
- # Files to remove everywhere by "make clean":
- 
--CLEAN_LIST = *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa dll* packlist-* \
-+CLEAN_LIST = *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa *.cmxs dll* packlist-* \
- 	     ocamldoc.dump META depend $(PACKLIST) $(GENERATE)
- 
- # Generic build rules:
-@@ -158,7 +174,7 @@ realuninstall: $(UNINSTOTHER) uninstall-
- 
- .PHONY: install-findlib
- install-findlib: META
--	files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a dll* META $(INSTALL_EXTRA)` && \
-+	files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.cmxs *.a dll* META $(INSTALL_EXTRA)` && \
- 	$(OCAMLFIND) install $(PKGNAME) $$files
- 
- .PHONY: uninstall-findlib
diff --git a/net/ocamlnet/patches/patch-src_netsys_Makefile b/net/ocamlnet/patches/patch-src_netsys_Makefile
deleted file mode 100644
index cd4d7a6ae28..00000000000
--- a/net/ocamlnet/patches/patch-src_netsys_Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-src_netsys_Makefile,v 1.1 2017/07/17 12:30:55 jaapb Exp $
-
-Add rules to produce .cmxs files
---- src/netsys/Makefile.orig	2016-06-19 14:49:12.000000000 +0000
-+++ src/netsys/Makefile
-@@ -41,6 +41,12 @@ OPT_EXTRA = netsys_oothr.cmxa netsys_c_g
- OPTP_EXTRA = netsys_oothr.p.cmxa netsys_gprof_init.cmx
- OPTMT_EXTRA = netsys_oothr_mt.cmxa netsys_oothr_mt_init.cmx
- OPTMTP_EXTRA = netsys_oothr_mt.p.cmxa netsys_oothr_mt_init.cmx
-+ifeq ($(HAVE_SHARED),1)
-+OPT_EXTRA += netsys_oothr.cmxs
-+OPTP_EXTRA += netsys_oothr.p.cmxs
-+OPTMT_EXTRA += netsys_oothr_mt.cmxs
-+OPTMTP_EXTRA += netsys_oothr_mt.p.cmxs
-+endif
- # Note: we cannot refer here to *.p.cmx because there is no direct
- # rule to build these files from .ml. They are implicitly built
- # when the corresponding *.cmx (without .p) is created.
-@@ -81,9 +87,15 @@ netsys_oothr.cma: netsys_oothr.cmo
- netsys_oothr.cmxa: netsys_oothr.cmx
- 	$(OCAMLOPT) -o netsys_oothr.cmxa -a netsys_oothr.cmx
- 
-+netsys_oothr.cmxs: netsys_oothr.cmxa
-+	$(OCAMLOPT) -linkall -shared -o netsys_oothr.cmxs netsys_oothr.cmxa
-+
- netsys_oothr.p.cmxa: netsys_oothr.cmx
- 	$(OCAMLOPT) -o netsys_oothr.p.cmxa -a netsys_oothr.p.cmx
- 
-+netsys_oothr.p.cmxs: netsys_oothr.p.cmxa
-+	$(OCAMLOPT) -linkall -shared -o netsys_oothr.p.cmxs netsys_oothr.p.cmxa
-+
- netsys_oothr_mt.cma: netsys_oothr.cmo netsys_oothr_mt.cmo
- 	$(OCAMLC) -o netsys_oothr_mt.cma -a \
- 		netsys_oothr.cmo netsys_oothr_mt.cmo
-@@ -92,10 +104,17 @@ netsys_oothr_mt.cmxa: netsys_oothr.cmx n
- 	$(OCAMLOPT) -o netsys_oothr_mt.cmxa -a \
- 		netsys_oothr.cmx netsys_oothr_mt.cmx
- 
-+netsys_oothr_mt.cmxs: netsys_oothr_mt.cmxa
-+	$(OCAMLOPT) -linkall -shared -o netsys_oothr_mt.cmxs netsys_oothr_mt.cmxa
-+
- netsys_oothr_mt.p.cmxa: netsys_oothr.cmx netsys_oothr-$(MT_TYPE)
- 	$(OCAMLOPT) -o netsys_oothr_mt.p.cmxa -a \
- 		netsys_oothr.p.cmx netsys_oothr_mt.p.cmx
- 
-+netsys_oothr_mt.p.cmxs: netsys_oothr_mt.p.cmxa
-+	$(OCAMLOPT) -linkall -shared -o netsys_oothr_mt.p.cmxs \
-+		netsys_oothr_mt.p.cmxa
-+
- .PHONY: netsys_oothr-vm netsys_oothr-posix
- netsys_oothr-vm:
- 
diff --git a/net/ocamlnet/patches/patch-src_netzip_netgzip.ml b/net/ocamlnet/patches/patch-src_netzip_netgzip.ml
new file mode 100644
index 00000000000..ef08f4088e6
--- /dev/null
+++ b/net/ocamlnet/patches/patch-src_netzip_netgzip.ml
@@ -0,0 +1,97 @@
+$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;