Updated package devel/ocaml-lwt to version 3.2.0.

This release includes several bugfixes and additions. For more details see
the CHANGES file.

6 files changed, 37 insertions, 51 deletions

diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile
index b4b56192df8..91867d9263b 100644
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2018/01/10 16:53:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.33 2018/01/22 11:53:24 jaapb Exp $
 #
 
 .include "Makefile.common"
 
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	jaapb@NetBSD.org
diff --git a/devel/ocaml-lwt/Makefile.common b/devel/ocaml-lwt/Makefile.common
index a2c913ae0ae..f871dfd84b2 100644
--- a/devel/ocaml-lwt/Makefile.common
+++ b/devel/ocaml-lwt/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.1 2017/09/08 12:45:33 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.2 2018/01/22 11:53:24 jaapb Exp $
 
 # used by devel/ocaml-lwt_glib/Makefile
 # used by devel/ocaml-lwt_react/Makefile
 # used by devel/ocaml-lwt_ssl/Makefile
 
-LWT_VERSION=	3.1.0
+LWT_VERSION=	3.2.0
 DISTNAME=	lwt-${LWT_VERSION}
 
 LICENSE=	gnu-lgpl-v2.1
diff --git a/devel/ocaml-lwt/PLIST b/devel/ocaml-lwt/PLIST
index 6598461c95e..bed245b7344 100644
--- a/devel/ocaml-lwt/PLIST
+++ b/devel/ocaml-lwt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2017/09/08 16:54:31 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/01/22 11:53:24 jaapb Exp $
 ${OCAML_SITELIB}/lwt/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log.a
 ${OCAML_SITELIB}/lwt/log/lwt_log.cma
@@ -84,15 +84,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmxs
 ${OCAML_SITELIB}/lwt/ppx/ppx_lwt.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/preemptive/lwt_preemptive.a
-${OCAML_SITELIB}/lwt/preemptive/lwt_preemptive.cma
-${OCAML_SITELIB}/lwt/preemptive/lwt_preemptive.cmi
-${OCAML_SITELIB}/lwt/preemptive/lwt_preemptive.cmt
-${OCAML_SITELIB}/lwt/preemptive/lwt_preemptive.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/preemptive/lwt_preemptive.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/preemptive/lwt_preemptive.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/preemptive/lwt_preemptive.cmxs
-${OCAML_SITELIB}/lwt/preemptive/lwt_preemptive.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.a
 ${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cma
 ${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmi
@@ -173,6 +164,11 @@ ${OCAML_SITELIB}/lwt/unix/lwt_main.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_main.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_main.cmx
 ${OCAML_SITELIB}/lwt/unix/lwt_main.mli
+${OCAML_SITELIB}/lwt/unix/lwt_preemptive.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_preemptive.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_preemptive.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_preemptive.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_preemptive.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_process.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_process.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_process.cmti
diff --git a/devel/ocaml-lwt/buildlink3.mk b/devel/ocaml-lwt/buildlink3.mk
index 3759a9bf98d..9e93b3060b7 100644
--- a/devel/ocaml-lwt/buildlink3.mk
+++ b/devel/ocaml-lwt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:08 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/22 11:53:24 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-lwt
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-lwt
 OCAML_LWT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-lwt+=	ocaml-lwt>=3.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-lwt+=	ocaml-lwt>=3.1.0nb1
+BUILDLINK_ABI_DEPENDS.ocaml-lwt+=	ocaml-lwt>=3.2.0
 BUILDLINK_PKGSRCDIR.ocaml-lwt?=		../../devel/ocaml-lwt
 
 #.include "../../devel/libev/buildlink3.mk"
diff --git a/devel/ocaml-lwt/distinfo b/devel/ocaml-lwt/distinfo
index a5575e172d4..ae6042b8577 100644
--- a/devel/ocaml-lwt/distinfo
+++ b/devel/ocaml-lwt/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2017/09/08 12:45:33 jaapb Exp $
+$NetBSD: distinfo,v 1.14 2018/01/22 11:53:24 jaapb Exp $
 
-SHA1 (lwt-3.1.0.tar.gz) = 5579bf45f8d13409fb0b0d161e7bf4c1a5a64688
-RMD160 (lwt-3.1.0.tar.gz) = cc767e4a0d33621b78838f3864151ea9cc7d9158
-SHA512 (lwt-3.1.0.tar.gz) = 0b2269e53f2e8a57e1ffd6f237c6b22de39a3b6b0d57276c7cb9371392aabc9fb6364b2617a6408ed0049ed64f71de0c540209cf83ce43899fd025295342eb0d
-Size (lwt-3.1.0.tar.gz) = 285309 bytes
-SHA1 (patch-META.lwt) = 175936461e06bcb94fbb931cde3b5148b1f4871d
+SHA1 (lwt-3.2.0.tar.gz) = fe821da0bf8e6f38d59d29932b1e5404a745304e
+RMD160 (lwt-3.2.0.tar.gz) = b079c2dbc26f05f02a06d73b877d6178289fff0d
+SHA512 (lwt-3.2.0.tar.gz) = 59e4dc53b81b9673c490b20cd3dd362ed8262d32b07e2656b5de801bd204df6050fec02a461c64533ea6c8863d160ddaf9d0050bccbebe82fa696c923486f0c8
+Size (lwt-3.2.0.tar.gz) = 310769 bytes
+SHA1 (patch-META.lwt) = ddfaf4ebd6c90a7022d0779a4e65ded8feb0864f
diff --git a/devel/ocaml-lwt/patches/patch-META.lwt b/devel/ocaml-lwt/patches/patch-META.lwt
index b89fd866e33..e54248be247 100644
--- a/devel/ocaml-lwt/patches/patch-META.lwt
+++ b/devel/ocaml-lwt/patches/patch-META.lwt
@@ -1,7 +1,7 @@
-$NetBSD: patch-META.lwt,v 1.1 2017/09/08 12:57:35 jaapb Exp $
+$NetBSD: patch-META.lwt,v 1.2 2018/01/22 11:53:24 jaapb Exp $
 
 Directories need to be recognised
---- META.lwt.orig	2017-07-19 21:50:36.000000000 +0000
+--- META.lwt.orig	2017-12-19 21:28:38.000000000 +0000
 +++ META.lwt
 @@ -14,7 +14,7 @@ plugin(byte) = "lwt.cma"
  plugin(native) = "lwt.cmxs"
@@ -9,8 +9,8 @@ Directories need to be recognised
  package "log" (
 -  #directory = "log"
 +  directory = "log"
-   version = "3.1.0"
-   description = "Logger for Lwt"
+   version = "3.2.0"
+   description = "Logger for Lwt (deprecated; use lwt_log)"
    requires = "bytes lwt result"
 @@ -26,7 +26,7 @@ package "log" (
  )
@@ -18,60 +18,51 @@ Directories need to be recognised
  package "ppx" (
 -  #directory = "ppx"
 +  directory = "ppx"
-   version = "3.1.0"
-   description = "Lwt PPX syntax extension"
+   version = "3.2.0"
+   description = "Lwt PPX syntax extension (deprecated; use lwt_ppx)"
    requires(ppx_driver) = "lwt.omp"
-@@ -50,7 +50,7 @@ package "omp" (
- )
- 
- package "preemptive" (
--  #directory = "preemptive"
-+  directory = "preemptive"
-   version = "3.1.0"
-   description = "Preemptive thread support for Lwt"
-   requires = "bigarray
-@@ -70,7 +70,7 @@ package "preemptive" (
+@@ -57,7 +57,7 @@ package "preemptive" (
  )
  
  package "simple-top" (
 -  #directory = "simple-top"
 +  directory = "simple-top"
-   version = "3.1.0"
+   version = "3.2.0"
    description = "Lwt-OCaml top level integration (deprecated; use utop)"
    requires = "bigarray
-@@ -90,7 +90,7 @@ package "simple-top" (
+@@ -77,7 +77,7 @@ package "simple-top" (
  )
  
  package "syntax" (
 -  #directory = "syntax"
 +  directory = "syntax"
-   version = "3.1.0"
-   description = "Camlp4 syntax for Lwt (deprecated; use lwt.ppx)"
+   version = "3.2.0"
+   description = "Camlp4 syntax for Lwt (deprecated; use lwt_ppx)"
    requires = "camlp4 lwt.syntax.options"
-@@ -101,7 +101,7 @@ package "syntax" (
+@@ -88,7 +88,7 @@ package "syntax" (
    exists_if = "lwt_syntax.cma"
  
    package "log" (
 -    #directory = "log"
 +    directory = "log"
-     version = "3.1.0"
-     description = "Camlp4 syntax for Lwt logging (deprecated; use lwt.ppx)"
+     version = "3.2.0"
+     description = "Camlp4 syntax for Lwt logging (deprecated; use lwt_ppx)"
      requires = "camlp4 lwt.syntax.options"
-@@ -113,7 +113,7 @@ package "syntax" (
+@@ -100,7 +100,7 @@ package "syntax" (
    )
  
    package "options" (
 -    #directory = "options"
 +    directory = "options"
-     version = "3.1.0"
-     description = "Options for Lwt Camlp4 syntax extension (deprecated; use lwt.ppx)"
+     version = "3.2.0"
+     description = "Options for Lwt Camlp4 syntax extension (deprecated; use lwt_ppx)"
      requires = "camlp4"
-@@ -126,7 +126,7 @@ package "syntax" (
+@@ -113,7 +113,7 @@ package "syntax" (
  )
  
  package "unix" (
 -  #directory = "unix"
 +  directory = "unix"
-   version = "3.1.0"
+   version = "3.2.0"
    description = "Unix support for Lwt"
-   requires = "bigarray bytes lwt lwt.log result unix"
+   requires = "bigarray bytes lwt lwt.log result threads unix"