Updated www/ocaml-uri to version 3.1.0.

This version splits out the uri and uri-sexp packages, and has some other
minor improvements and updates.

4 files changed, 30 insertions, 43 deletions

diff --git a/www/ocaml-uri/Makefile b/www/ocaml-uri/Makefile
index 26610d4b1f1..67984b76996 100644
--- a/www/ocaml-uri/Makefile
+++ b/www/ocaml-uri/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2019/03/19 14:26:38 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2020/04/21 11:21:47 jaapb Exp $
 
 GITHUB_PROJECT=	ocaml-uri
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTNAME=	${GITHUB_PROJECT}-2.2.0
+DISTNAME=	${GITHUB_PROJECT}-3.1.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
@@ -13,7 +13,9 @@ LICENSE=	isc
 
 USE_LANGUAGES=	# none
 
-OCAML_USE_DUNE=	yes
+OCAML_USE_DUNE=		yes
+DUNE_BUILD_PACKAGES=	uri uri-sexp
+OPAM_INSTALL_FILES=	uri uri-sexp
 
 .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk"
 .include "../../devel/ocaml-re/buildlink3.mk"
diff --git a/www/ocaml-uri/PLIST b/www/ocaml-uri/PLIST
index 6067ac9ed7d..394846621b2 100644
--- a/www/ocaml-uri/PLIST
+++ b/www/ocaml-uri/PLIST
@@ -1,6 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/19 14:26:38 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/21 11:21:47 jaapb Exp $
+${OCAML_SITELIB}/uri-sexp/META
+${OCAML_SITELIB}/uri-sexp/dune-package
+${OCAML_SITELIB}/uri-sexp/opam
+${PLIST.ocaml-opt}${OCAML_SITELIB}/uri-sexp/uri_sexp.a
+${OCAML_SITELIB}/uri-sexp/uri_sexp.cma
+${OCAML_SITELIB}/uri-sexp/uri_sexp.cmi
+${OCAML_SITELIB}/uri-sexp/uri_sexp.cmt
+${OCAML_SITELIB}/uri-sexp/uri_sexp.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/uri-sexp/uri_sexp.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/uri-sexp/uri_sexp.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/uri-sexp/uri_sexp.cmxs
+${OCAML_SITELIB}/uri-sexp/uri_sexp.ml
+${OCAML_SITELIB}/uri-sexp/uri_sexp.mli
 ${OCAML_SITELIB}/uri/META
-${OCAML_SITELIB}/uri/Uri_re.ml
 ${OCAML_SITELIB}/uri/dune-package
 ${OCAML_SITELIB}/uri/opam
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/services/uri_services.a
@@ -23,24 +35,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/services_full/uri_services_full.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/services_full/uri_services_full.cmxs
 ${OCAML_SITELIB}/uri/services_full/uri_services_full.ml
 ${OCAML_SITELIB}/uri/services_full/uri_services_full.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/sexp/uri_sexp.a
-${OCAML_SITELIB}/uri/sexp/uri_sexp.cma
-${OCAML_SITELIB}/uri/sexp/uri_sexp.cmi
-${OCAML_SITELIB}/uri/sexp/uri_sexp.cmt
-${OCAML_SITELIB}/uri/sexp/uri_sexp.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/sexp/uri_sexp.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/sexp/uri_sexp.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/sexp/uri_sexp.cmxs
-${OCAML_SITELIB}/uri/sexp/uri_sexp.ml
-${OCAML_SITELIB}/uri/sexp/uri_sexp.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/top/uri_top.a
-${OCAML_SITELIB}/uri/top/uri_top.cma
-${OCAML_SITELIB}/uri/top/uri_top.cmi
-${OCAML_SITELIB}/uri/top/uri_top.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/top/uri_top.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/top/uri_top.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/top/uri_top.cmxs
-${OCAML_SITELIB}/uri/top/uri_top.ml
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/uri.a
 ${OCAML_SITELIB}/uri/uri.cma
 ${OCAML_SITELIB}/uri/uri.cmi
@@ -51,19 +45,9 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/uri.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/uri.cmxs
 ${OCAML_SITELIB}/uri/uri.ml
 ${OCAML_SITELIB}/uri/uri.mli
-${OCAML_SITELIB}/uri/uri__.cmi
-${OCAML_SITELIB}/uri/uri__.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/uri__.cmx
-${OCAML_SITELIB}/uri/uri__.ml
-${OCAML_SITELIB}/uri/uri__Uri_re.cmi
-${OCAML_SITELIB}/uri/uri__Uri_re.cmt
-${OCAML_SITELIB}/uri/uri__Uri_re.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/uri__Uri_re.cmx
-${OCAML_SITELIB}/uri/uri_re.cmi
-${OCAML_SITELIB}/uri/uri_re.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/uri/uri_re.cmx
-${OCAML_SITELIB}/uri/uri_re.ml
-${OCAML_SITELIB}/uri/uri_re.mli
+share/doc/uri-sexp/CHANGES.md
+share/doc/uri-sexp/LICENSE.md
+share/doc/uri-sexp/README.md
 share/doc/uri/CHANGES.md
 share/doc/uri/LICENSE.md
 share/doc/uri/README.md
diff --git a/www/ocaml-uri/buildlink3.mk b/www/ocaml-uri/buildlink3.mk
index 844d54eeaf7..3db4f3715a3 100644
--- a/www/ocaml-uri/buildlink3.mk
+++ b/www/ocaml-uri/buildlink3.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2019/11/04 22:09:58 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/04/21 11:21:47 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-uri
 
 .if !defined(OCAML_URI_BUILDLINK3_MK)
 OCAML_URI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-uri+=	ocaml-uri>=2.2.0
+BUILDLINK_API_DEPENDS.ocaml-uri+=	ocaml-uri>=3.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-uri+=	ocaml-uri>=3.1.0
 BUILDLINK_PKGSRCDIR.ocaml-uri?=		../../www/ocaml-uri
 
 .endif	# OCAML_URI_BUILDLINK3_MK
diff --git a/www/ocaml-uri/distinfo b/www/ocaml-uri/distinfo
index 481b041013d..0dda305da2a 100644
--- a/www/ocaml-uri/distinfo
+++ b/www/ocaml-uri/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2019/03/19 14:26:38 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2020/04/21 11:21:47 jaapb Exp $
 
-SHA1 (ocaml-uri-2.2.0.tar.gz) = 1d218e737ad9787d4bbaf7338af62590e7c028c0
-RMD160 (ocaml-uri-2.2.0.tar.gz) = 4f73dffaaf72d7c8619be92f828a9439702ecf37
-SHA512 (ocaml-uri-2.2.0.tar.gz) = f032c9624752527d05b440ad182f36e0bf44ca1ee34a8100b9303fc39e9b6384913ddb0420171807b1d35ea522a2a01db2419a4e2d7b33fd85b05d64e0396f79
-Size (ocaml-uri-2.2.0.tar.gz) = 216253 bytes
+SHA1 (ocaml-uri-3.1.0.tar.gz) = 33b5ed08217577240f33ca0c5487b891582fa560
+RMD160 (ocaml-uri-3.1.0.tar.gz) = 8cef8ab1a850136bdc89dbe76ffd91a9bed9a6bd
+SHA512 (ocaml-uri-3.1.0.tar.gz) = 05c29710e8bd0eb92a3b1438b201776055490f9c913da75de20917f0e8a95b502e59c0b4776f9f111d78a6818f7b815572a68231aa5b106637f11b5e13214e72
+Size (ocaml-uri-3.1.0.tar.gz) = 216814 bytes