Updated net/ocaml-ipaddr to version 3.1.0.

Package is now compatible with dune 1.7.

Several backwards incompatible changes in version 3.0.0:
- sexp serialisers removed from main interface;
- macaddr module now in separate opam package;
- replace of_string/bytes functions with rresult types;
- use sexplib0 instead of the full sexp library;
- changes to function signatures.

Full details in the CHANGES.md file; there are also several minor changes.

4 files changed, 60 insertions, 22 deletions

diff --git a/net/ocaml-ipaddr/Makefile b/net/ocaml-ipaddr/Makefile
index d09d6cb097b..9bce48125a4 100644
--- a/net/ocaml-ipaddr/Makefile
+++ b/net/ocaml-ipaddr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2018/11/27 18:59:50 jaapb Exp $
+# $NetBSD: Makefile,v 1.18 2019/03/05 18:53:15 jaapb Exp $
 
-VERSION=	2.8.0
 GITHUB_PROJECT=	ocaml-ipaddr
-DISTNAME=	${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=	7
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+DISTNAME=	${GITHUB_PROJECT}-3.1.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
@@ -13,8 +12,11 @@ COMMENT=	Library for manipulation of IP and MAC addresses
 LICENSE=	isc
 
 OCAML_USE_DUNE=	yes
+DUNE_BUILD_PACKAGES=	macaddr ipaddr
+OPAM_INSTALL_FILES=	macaddr ipaddr
 
 .include "../../devel/ocamlbuild/buildlink3.mk"
+.include "../../devel/ocaml-sexplib0/buildlink3.mk"
 .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk"
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ocaml-ipaddr/PLIST b/net/ocaml-ipaddr/PLIST
index 1dc7494751a..9e6d685bf4b 100644
--- a/net/ocaml-ipaddr/PLIST
+++ b/net/ocaml-ipaddr/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2018/04/09 10:24:20 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/03/05 18:53:15 jaapb Exp $
 ${OCAML_SITELIB}/ipaddr/META
+${OCAML_SITELIB}/ipaddr/dune-package
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr.a
 ${OCAML_SITELIB}/ipaddr/ipaddr.cma
 ${OCAML_SITELIB}/ipaddr/ipaddr.cmi
@@ -8,16 +9,19 @@ ${OCAML_SITELIB}/ipaddr/ipaddr.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr.cmxs
-${OCAML_SITELIB}/ipaddr/ipaddr.dune
 ${OCAML_SITELIB}/ipaddr/ipaddr.ml
 ${OCAML_SITELIB}/ipaddr/ipaddr.mli
-${OCAML_SITELIB}/ipaddr/macaddr.cmi
-${OCAML_SITELIB}/ipaddr/macaddr.cmt
-${OCAML_SITELIB}/ipaddr/macaddr.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/macaddr.cmx
-${OCAML_SITELIB}/ipaddr/macaddr.ml
-${OCAML_SITELIB}/ipaddr/macaddr.mli
 ${OCAML_SITELIB}/ipaddr/opam
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.a
+${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.cma
+${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.cmi
+${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.cmt
+${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.cmxs
+${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.ml
+${OCAML_SITELIB}/ipaddr/sexp/ipaddr_sexp.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/top/ipaddr_top.a
 ${OCAML_SITELIB}/ipaddr/top/ipaddr_top.cma
 ${OCAML_SITELIB}/ipaddr/top/ipaddr_top.cmi
@@ -26,7 +30,6 @@ ${OCAML_SITELIB}/ipaddr/top/ipaddr_top.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/top/ipaddr_top.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/top/ipaddr_top.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/top/ipaddr_top.cmxs
-${OCAML_SITELIB}/ipaddr/top/ipaddr.top.dune
 ${OCAML_SITELIB}/ipaddr/top/ipaddr_top.ml
 ${OCAML_SITELIB}/ipaddr/top/ipaddr_top.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/unix/ipaddr_unix.a
@@ -37,9 +40,42 @@ ${OCAML_SITELIB}/ipaddr/unix/ipaddr_unix.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/unix/ipaddr_unix.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/unix/ipaddr_unix.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/unix/ipaddr_unix.cmxs
-${OCAML_SITELIB}/ipaddr/unix/ipaddr.unix.dune
 ${OCAML_SITELIB}/ipaddr/unix/ipaddr_unix.ml
 ${OCAML_SITELIB}/ipaddr/unix/ipaddr_unix.mli
+${OCAML_SITELIB}/macaddr/META
+${OCAML_SITELIB}/macaddr/dune-package
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/macaddr.a
+${OCAML_SITELIB}/macaddr/macaddr.cma
+${OCAML_SITELIB}/macaddr/macaddr.cmi
+${OCAML_SITELIB}/macaddr/macaddr.cmt
+${OCAML_SITELIB}/macaddr/macaddr.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/macaddr.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/macaddr.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/macaddr.cmxs
+${OCAML_SITELIB}/macaddr/macaddr.ml
+${OCAML_SITELIB}/macaddr/macaddr.mli
+${OCAML_SITELIB}/macaddr/opam
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.a
+${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.cma
+${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.cmi
+${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.cmt
+${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.cmxs
+${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.ml
+${OCAML_SITELIB}/macaddr/sexp/macaddr_sexp.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/top/macaddr_top.a
+${OCAML_SITELIB}/macaddr/top/macaddr_top.cma
+${OCAML_SITELIB}/macaddr/top/macaddr_top.cmi
+${OCAML_SITELIB}/macaddr/top/macaddr_top.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/top/macaddr_top.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/top/macaddr_top.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/top/macaddr_top.cmxs
+${OCAML_SITELIB}/macaddr/top/macaddr_top.ml
 share/doc/ipaddr/CHANGES.md
 share/doc/ipaddr/LICENSE.md
 share/doc/ipaddr/README.md
+share/doc/macaddr/CHANGES.md
+share/doc/macaddr/LICENSE.md
+share/doc/macaddr/README.md
diff --git a/net/ocaml-ipaddr/buildlink3.mk b/net/ocaml-ipaddr/buildlink3.mk
index fd4d53b16fd..0dcd3eeb13f 100644
--- a/net/ocaml-ipaddr/buildlink3.mk
+++ b/net/ocaml-ipaddr/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.17 2018/11/27 18:59:50 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2019/03/05 18:53:15 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-ipaddr
 
 .if !defined(OCAML_IPADDR_BUILDLINK3_MK)
 OCAML_IPADDR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-ipaddr+=	ocaml-ipaddr>=2.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-ipaddr?=	ocaml-ipaddr>=2.8.0nb7
+BUILDLINK_API_DEPENDS.ocaml-ipaddr+=	ocaml-ipaddr>=3.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-ipaddr?=	ocaml-ipaddr>=3.1.0
 BUILDLINK_PKGSRCDIR.ocaml-ipaddr?=	../../net/ocaml-ipaddr
 BUILDLINK_FILES.ocaml-ipaddr+=		lib/ocaml/site-lib/*
 
diff --git a/net/ocaml-ipaddr/distinfo b/net/ocaml-ipaddr/distinfo
index 7cd7f7421e3..cd6a9fcbff8 100644
--- a/net/ocaml-ipaddr/distinfo
+++ b/net/ocaml-ipaddr/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2017/07/21 14:21:26 jaapb Exp $
+$NetBSD: distinfo,v 1.7 2019/03/05 18:53:15 jaapb Exp $
 
-SHA1 (ocaml-ipaddr-2.8.0.tar.gz) = afc9c209fbe6078af45da77bb81d8f4c1d84eed3
-RMD160 (ocaml-ipaddr-2.8.0.tar.gz) = 329a772880b863d7b7f8537b4040b484c5e85bc3
-SHA512 (ocaml-ipaddr-2.8.0.tar.gz) = 1714ee4d6b2afa17b987844f37a9896f01d7b674770fa6804b03222dba656130f9ee0d2d1409b67e770e21f973682c7d1d5c550abb0a5d94bc0c04a1a97e8e3c
-Size (ocaml-ipaddr-2.8.0.tar.gz) = 22134 bytes
+SHA1 (ocaml-ipaddr-3.1.0.tar.gz) = bbc11a2c612109a7b05550f5b7053f53a3232200
+RMD160 (ocaml-ipaddr-3.1.0.tar.gz) = fc36e3dd562e5fc901b93809c94ad9f8e1eb9744
+SHA512 (ocaml-ipaddr-3.1.0.tar.gz) = f72da1be1c2664450e9ff2a9bb03ae5d4b938275c2de115ba16a0529da510060c7aac4cc2c6ac4600c196f30e60ac27284d72eac2a8b482b27ace633c4b64170
+Size (ocaml-ipaddr-3.1.0.tar.gz) = 25889 bytes