Updated package to latest version, 2.7.0. Changes include:

2.7.0 (2016-02-14):
* Remove sexplib.syntax, type_conv deps and camlp4 transitive dependency
* Add ppx_sexp_conv dependency
* Require OCaml 4.02.2+
* Add `Ipaddr.Prefix.subset`, `Ipaddr.V4.Prefix.subset` and `Ipaddr.V6.subset`
  predicates to test containment of subnets (#52 from @seliopou)

2.6.1 (2015-02-20):
* Fix findlib requires in oasis to restore pre-4.02.1 compatibility

2.6.0 (2015-02-19):
* Change IPv6 link-local address prefix from fe80::/10 to fe80::/64. (#39)
* Remove type bytes = string alias (potentially breaking)
* Turn on -safe-string (#41)
* {V4,V6}.to_bytes_raw now uses Bytes.t rather than string (potentially breaking)
* Add multicast MAC conversions from RFC 1112 and RFC 2464
* Add to_domain_name conversions to DNS label lists (in-addr.arpa and ip6.arpa)
* Add V6.interface_routers, V6.site_routers, and V6.Prefix.solicited_node
* Add V6.link_address_of_mac to convert a MAC into a link local IP address

4 files changed, 25 insertions, 15 deletions

diff --git a/net/ocaml-ipaddr/Makefile b/net/ocaml-ipaddr/Makefile
index a4ec9eb84e0..2e8d963de3c 100644
--- a/net/ocaml-ipaddr/Makefile
+++ b/net/ocaml-ipaddr/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2015/08/07 11:20:32 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2016/03/04 16:15:21 jaapb Exp $
 
-VERSION=	2.5.0
-PKGNAME=	ocaml-ipaddr-${VERSION}
-PKGREVISION=	2
-DISTNAME=	${VERSION}
-DIST_SUBDIR=	ocaml-ipaddr
+VERSION=	2.7.0
+GITHUB_PROJECT=	ocaml-ipaddr
+DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/mirage/ocaml-ipaddr/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	https://github.com/mirage/ocaml-ipaddr/
@@ -19,5 +17,6 @@ OCAML_USE_FINDLIB=	yes
 OCAML_USE_OASIS=	yes
 
 .include "../../devel/ocaml-sexplib/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 ce1dde1fde2..d333ade0b89 100644
--- a/net/ocaml-ipaddr/PLIST
+++ b/net/ocaml-ipaddr/PLIST
@@ -1,26 +1,37 @@
-@comment $NetBSD: PLIST,v 1.2 2015/01/20 16:31:26 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/03/04 16:15:21 jaapb Exp $
 ${OCAML_SITELIB}/ipaddr/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr.a
+${OCAML_SITELIB}/ipaddr/ipaddr.annot
 ${OCAML_SITELIB}/ipaddr/ipaddr.cma
 ${OCAML_SITELIB}/ipaddr/ipaddr.cmi
+${OCAML_SITELIB}/ipaddr/ipaddr.cmt
+${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.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ipaddr/ipaddr_top.a
+${OCAML_SITELIB}/ipaddr/ipaddr_top.annot
 ${OCAML_SITELIB}/ipaddr/ipaddr_top.cma
 ${OCAML_SITELIB}/ipaddr/ipaddr_top.cmi
+${OCAML_SITELIB}/ipaddr/ipaddr_top.cmt
 ${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.annot
 ${OCAML_SITELIB}/ipaddr/ipaddr_unix.cma
 ${OCAML_SITELIB}/ipaddr/ipaddr_unix.cmi
+${OCAML_SITELIB}/ipaddr/ipaddr_unix.cmt
+${OCAML_SITELIB}/ipaddr/ipaddr_unix.cmti
 ${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.annot
 ${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.mli
diff --git a/net/ocaml-ipaddr/buildlink3.mk b/net/ocaml-ipaddr/buildlink3.mk
index b6264791f5a..96b9b856bf4 100644
--- a/net/ocaml-ipaddr/buildlink3.mk
+++ b/net/ocaml-ipaddr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/08/07 11:20:32 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2016/03/04 16:15:21 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-ipaddr
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-ipaddr
 OCAML_IPADDR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ipaddr+=	ocaml-ipaddr>=2.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-ipaddr?=	ocaml-ipaddr>=2.5.0nb2
+BUILDLINK_ABI_DEPENDS.ocaml-ipaddr?=	ocaml-ipaddr>=2.7.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 fd67b560d02..e584112789f 100644
--- a/net/ocaml-ipaddr/distinfo
+++ b/net/ocaml-ipaddr/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 00:35:17 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/03/04 16:15:21 jaapb Exp $
 
-SHA1 (ocaml-ipaddr/2.5.0.tar.gz) = e660cd08fa7be49d89b08fbb9cd253c6c1fb79de
-RMD160 (ocaml-ipaddr/2.5.0.tar.gz) = 5daf3ab8c236517e0e1ae282a7c1d6c69262f8f9
-SHA512 (ocaml-ipaddr/2.5.0.tar.gz) = acf2f80d2f5d97787784bb96188d0af69138b69257ec404890e543dcd610554038dd2b069069a1e0cd4ab803e6659e4a908964cd8ae5aadb93403b9638c1320f
-Size (ocaml-ipaddr/2.5.0.tar.gz) = 62338 bytes
+SHA1 (ocaml-ipaddr-2.7.0.tar.gz) = 296d1cfee37280854901cc4cc6e12b0f06c755e6
+RMD160 (ocaml-ipaddr-2.7.0.tar.gz) = 97d5487e135a5233c274056cf2da176a5be930b0
+SHA512 (ocaml-ipaddr-2.7.0.tar.gz) = 36ce32945e05166165ba9d2d6d10a9fb1531a50ff4e9e1a87d1bf557e767fa2938af9cbaeea7da4eefd058d687f0b36696075fd4c9ed075f5207e3c9f5488c87
+Size (ocaml-ipaddr-2.7.0.tar.gz) = 65470 bytes