Updated net/ocaml-ipaddr to version 4.0.0.

Apart from some minor changes, this version adds separate packages that
use the sexp and cstruct libraries.

4 files changed, 80 insertions, 33 deletions

diff --git a/net/ocaml-ipaddr/Makefile b/net/ocaml-ipaddr/Makefile
index ac5180990c8..d7bee3cc2b0 100644
--- a/net/ocaml-ipaddr/Makefile
+++ b/net/ocaml-ipaddr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:45 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2020/04/08 12:31:01 jaapb Exp $
 
 GITHUB_PROJECT=	ocaml-ipaddr
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTNAME=	${GITHUB_PROJECT}-3.1.0
+DISTNAME=	${GITHUB_PROJECT}-4.0.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
@@ -12,11 +12,14 @@ 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
+DUNE_BUILD_PACKAGES=	macaddr macaddr-cstruct macaddr-sexp \
+			ipaddr ipaddr-cstruct ipaddr-sexp
+OPAM_INSTALL_FILES=	${DUNE_BUILD_PACKAGES}
 
 .include "../../devel/ocamlbuild/buildlink3.mk"
+.include "../../devel/ocaml-cstruct/buildlink3.mk"
 .include "../../devel/ocaml-sexplib0/buildlink3.mk"
 .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk"
+.include "../../net/ocaml-domain-name/buildlink3.mk"
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ocaml-ipaddr/PLIST b/net/ocaml-ipaddr/PLIST
index 9e6d685bf4b..a6901cad55e 100644
--- a/net/ocaml-ipaddr/PLIST
+++ b/net/ocaml-ipaddr/PLIST
@@ -1,4 +1,30 @@
-@comment $NetBSD: PLIST,v 1.7 2019/03/05 18:53:15 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/04/08 12:31:01 jaapb Exp $
+${OCAML_SITELIB}/ipaddr-cstruct/META
+${OCAML_SITELIB}/ipaddr-cstruct/dune-package
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.a
+${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.cma
+${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.cmi
+${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.cmt
+${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.cmxs
+${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.ml
+${OCAML_SITELIB}/ipaddr-cstruct/ipaddr_cstruct.mli
+${OCAML_SITELIB}/ipaddr-cstruct/opam
+${OCAML_SITELIB}/ipaddr-sexp/META
+${OCAML_SITELIB}/ipaddr-sexp/dune-package
+${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
+${OCAML_SITELIB}/ipaddr-sexp/opam
 ${OCAML_SITELIB}/ipaddr/META
 ${OCAML_SITELIB}/ipaddr/dune-package
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr.a
@@ -12,16 +38,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr.cmxs
 ${OCAML_SITELIB}/ipaddr/ipaddr.ml
 ${OCAML_SITELIB}/ipaddr/ipaddr.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
@@ -42,6 +58,32 @@ ${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.ml
 ${OCAML_SITELIB}/ipaddr/unix/ipaddr_unix.mli
+${OCAML_SITELIB}/macaddr-cstruct/META
+${OCAML_SITELIB}/macaddr-cstruct/dune-package
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.a
+${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.cma
+${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.cmi
+${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.cmt
+${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.cmxs
+${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.ml
+${OCAML_SITELIB}/macaddr-cstruct/macaddr_cstruct.mli
+${OCAML_SITELIB}/macaddr-cstruct/opam
+${OCAML_SITELIB}/macaddr-sexp/META
+${OCAML_SITELIB}/macaddr-sexp/dune-package
+${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
+${OCAML_SITELIB}/macaddr-sexp/opam
 ${OCAML_SITELIB}/macaddr/META
 ${OCAML_SITELIB}/macaddr/dune-package
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/macaddr/macaddr.a
@@ -55,16 +97,6 @@ ${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
@@ -73,9 +105,21 @@ ${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-cstruct/CHANGES.md
+share/doc/ipaddr-cstruct/LICENSE.md
+share/doc/ipaddr-cstruct/README.md
+share/doc/ipaddr-sexp/CHANGES.md
+share/doc/ipaddr-sexp/LICENSE.md
+share/doc/ipaddr-sexp/README.md
 share/doc/ipaddr/CHANGES.md
 share/doc/ipaddr/LICENSE.md
 share/doc/ipaddr/README.md
+share/doc/macaddr-cstruct/CHANGES.md
+share/doc/macaddr-cstruct/LICENSE.md
+share/doc/macaddr-cstruct/README.md
+share/doc/macaddr-sexp/CHANGES.md
+share/doc/macaddr-sexp/LICENSE.md
+share/doc/macaddr-sexp/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 0dcd3eeb13f..4c973eeafbc 100644
--- a/net/ocaml-ipaddr/buildlink3.mk
+++ b/net/ocaml-ipaddr/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.18 2019/03/05 18:53:15 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2020/04/08 12:31:01 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-ipaddr
 
 .if !defined(OCAML_IPADDR_BUILDLINK3_MK)
 OCAML_IPADDR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-ipaddr+=	ocaml-ipaddr>=3.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-ipaddr?=	ocaml-ipaddr>=3.1.0
+BUILDLINK_API_DEPENDS.ocaml-ipaddr+=	ocaml-ipaddr>=4.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-ipaddr?=	ocaml-ipaddr>=4.0.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 cd6a9fcbff8..a86d5eec7a9 100644
--- a/net/ocaml-ipaddr/distinfo
+++ b/net/ocaml-ipaddr/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2019/03/05 18:53:15 jaapb Exp $
+$NetBSD: distinfo,v 1.8 2020/04/08 12:31:01 jaapb Exp $
 
-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
+SHA1 (ocaml-ipaddr-4.0.0.tar.gz) = 456f93246b3974144e3ac0f9d34c82ee1060d5df
+RMD160 (ocaml-ipaddr-4.0.0.tar.gz) = 31061f349a7c491791c4cc969a29a8dfb02016e8
+SHA512 (ocaml-ipaddr-4.0.0.tar.gz) = 7818d85b0d85d66a4b0eb464248ac1b9b1b9cc61e9ea5b7488f04e5728e7687f6f0898e1b13807d3419f38eb43026ffca00b77ee88ccd6eed374d5a3a789b5e2
+Size (ocaml-ipaddr-4.0.0.tar.gz) = 29013 bytes