Updated net/ocaml-ipaddr to version 2.5.0. Changes include:

* Add `with sexp` (de)serializers to all of the Ipaddr and Macaddr types.
* Add `Ipaddr.V6.Prefix.of_netmask` for conversion from an IPv6
  address/netmask to prefix (useful for some binary interfaces).
* Add `Ipaddr.V6.Prefix.netmask` to generate a netmask address from a
  prefix (useful for some binary interfaces).
* Add `Ipaddr.Prefix.network` for generic prefix -> address conversion
* Add `Ipaddr.Prefix.netmask` for generic prefix -> netmask conversion
* Add `Ipaddr.V4.Prefix.of_netmask` for conversion from an
  address/netmask to prefix
* Add `Ipaddr.V4.Prefix.netmask` to generate a netmask address from a prefix
* Add an [Ipaddr_unix] module to convert to-and-from the standard library.
* Add a toplevel pretty printer in the `ipaddr.top` package.
* Add `of_string_raw` to `Ipaddr.V4.Prefix` and `Ipaddr.V6.Prefix`
* Add `of_addr` to `Ipaddr.V4.Prefix` and `Ipaddr.V6.Prefix`
* Add type `('v4,'v6) v4v6` to `Ipaddr` to represent version disjuncts
* Add `Ipaddr.Prefix` module for generic prefix manipulation
* Change `Ipaddr.V4.make` to accept `int` rather than `int32` (breaking)
* Add IPv6 support
* Add generic IP address support
* Add type `scope` for classifying address scopes
* Add `Ipaddr.V4.of_string_raw` for parsing inside of larger strings
* Add `Ipaddr.V4.to_int16` and `Ipaddr.V4.of_int16`
* Add `unspecified`, `nodes`, and `routers` constants to `Ipaddr.V4`
* Add `Ipaddr.V4.Prefix.network_address` to put an address into a subnet
* Add `of_address_string_exn`, `of_address_string`, `to_address_string`,
  `to_address_buffer` to `Ipaddr.V4.Prefix` to parse/print combined addr/prefix
* Add `multicast_org`, `multicast_admin`, `multicast_link` subnet constants to
  `Ipaddr.V4.Prefix`
* Add `Ipaddr.V4.scope` to classify IPv4 addresses
* Add `Ipaddr.V4.is_global` and `Ipaddr.V4.is_multicast` predicates
* Add optional `sep:char` argument to `Macaddr.to_string`
* Remove internal use of Scanf.scanf

4 files changed, 29 insertions, 10 deletions

diff --git a/net/ocaml-ipaddr/Makefile b/net/ocaml-ipaddr/Makefile
index e72077e805e..a6db485daba 100644
--- a/net/ocaml-ipaddr/Makefile
+++ b/net/ocaml-ipaddr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/11/19 12:00:48 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/20 16:31:26 jaapb Exp $
 
-VERSION=	1.0.0
+VERSION=	2.5.0
 PKGNAME=	ocaml-ipaddr-${VERSION}
-DISTNAME=	v${VERSION}
+DISTNAME=	${VERSION}
 DIST_SUBDIR=	ocaml-ipaddr
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/mirage/ocaml-ipaddr/archive/
@@ -17,5 +17,6 @@ WRKSRC=		${WRKDIR}/ocaml-ipaddr-${VERSION}
 OCAML_USE_FINDLIB=	yes
 OCAML_USE_OASIS=	yes
 
+.include "../../devel/ocaml-sexplib/buildlink3.mk"
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ocaml-ipaddr/PLIST b/net/ocaml-ipaddr/PLIST
index 955087e5134..ce1dde1fde2 100644
--- a/net/ocaml-ipaddr/PLIST
+++ b/net/ocaml-ipaddr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/11/19 12:00:48 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/01/20 16:31:26 jaapb Exp $
 ${OCAML_SITELIB}/ipaddr/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr.a
 ${OCAML_SITELIB}/ipaddr/ipaddr.cma
@@ -7,6 +7,20 @@ ${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.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr_top.a
+${OCAML_SITELIB}/ipaddr/ipaddr_top.cma
+${OCAML_SITELIB}/ipaddr/ipaddr_top.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr_top.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr_top.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr_top.cmxs
+${OCAML_SITELIB}/ipaddr/ipaddr_top.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr_unix.a
+${OCAML_SITELIB}/ipaddr/ipaddr_unix.cma
+${OCAML_SITELIB}/ipaddr/ipaddr_unix.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr_unix.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr_unix.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr_unix.cmxs
+${OCAML_SITELIB}/ipaddr/ipaddr_unix.mli
 ${OCAML_SITELIB}/ipaddr/macaddr.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/macaddr.cmx
 ${OCAML_SITELIB}/ipaddr/macaddr.mli
diff --git a/net/ocaml-ipaddr/buildlink3.mk b/net/ocaml-ipaddr/buildlink3.mk
index 01f7f838d33..f0e6a6d6c53 100644
--- a/net/ocaml-ipaddr/buildlink3.mk
+++ b/net/ocaml-ipaddr/buildlink3.mk
@@ -1,12 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/11/19 12:00:48 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/01/20 16:31:26 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-ipaddr
 
 .if !defined(OCAML_IPADDR_BUILDLINK3_MK)
 OCAML_IPADDR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-ipaddr+=	ocaml-ipaddr>=1.0.0
+BUILDLINK_API_DEPENDS.ocaml-ipaddr+=	ocaml-ipaddr>=2.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-ipaddr?=	ocaml-ipaddr>=2.5.0
 BUILDLINK_PKGSRCDIR.ocaml-ipaddr?=	../../net/ocaml-ipaddr
+BUILDLINK_FILES.ocaml-ipaddr+=	lib/ocaml/site-lib/*
+
+.include "../../lang/ocaml/buildlink3.mk"
 .endif	# OCAML_IPADDR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ocaml-ipaddr
diff --git a/net/ocaml-ipaddr/distinfo b/net/ocaml-ipaddr/distinfo
index 1941e2fd251..568f1a4263e 100644
--- a/net/ocaml-ipaddr/distinfo
+++ b/net/ocaml-ipaddr/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2014/11/19 12:00:48 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2015/01/20 16:31:26 jaapb Exp $
 
-SHA1 (ocaml-ipaddr/v1.0.0.tar.gz) = fb48f8d4b5d921b9f4c7c249bbc12014339776e9
-RMD160 (ocaml-ipaddr/v1.0.0.tar.gz) = 4052a798fcad49db2454dc941b13af0a6bef89b7
-Size (ocaml-ipaddr/v1.0.0.tar.gz) = 45649 bytes
+SHA1 (ocaml-ipaddr/2.5.0.tar.gz) = e660cd08fa7be49d89b08fbb9cd253c6c1fb79de
+RMD160 (ocaml-ipaddr/2.5.0.tar.gz) = 5daf3ab8c236517e0e1ae282a7c1d6c69262f8f9
+Size (ocaml-ipaddr/2.5.0.tar.gz) = 62338 bytes