Updated package to latest version, 3.1.0, which includes some

infrastructure changes as well (packages for glib, react and ssl support
have been split off). Upstream changes include:

===== 3.1.0 (2017-07-19) =====

====== Additions ======

  * Port to Jbuilder (#374, Andrew Ray).
  * Lwt_io.establish_server_with_client_address (#346, Rudi Grinberg).
  * Lwt_unix.getcwd (#403, Rapha?l Proust).

====== Planned to break in 4.0.0 ======

  * Delete lwt.simple-top (#371).
  * Delete Lwt_chan (#441).

====== Fixes ======

  * Make Lwt_log functions tail-recursive (#348, Jan Doms).
  * Make more of Lwt_list tail-recursive (#347, Jan Doms).
  * Improve string messages in exceptions (#368, #382, Jan Doms, Rapha?l
    Proust).
  * Don't call Unix.set_nonblock or Unix.clear_nonblock unnecessarily on
    some fds (#356, David Sheets).
  * Lwt_unix.sleep and Lwt_unix.timeout returning too early when using
    libev (#433, Stijn Devriendt).
  * Lwt_sequence.fold_r iterating the wrong way in some cases (#405,
    Stijn Devriendt).
  * Build conflicts in some cases due to duplicate cst_to_constr
    function (#362, J?r?mie Dimino).
  * Don't use deprecated readdir_r system call (#430, Rapha?l Proust).

====== Miscellaneous ======

  * The Lwt core, lwt.ml, has been thoroughly refactored and commented
    (#354, reviewed Gabriel Radanne, Edwin T?r?k, Rapha?l Proust, Jan
    Doms, Fabian Hemmer, Sebastien Mondet, Simon Cruanes, Anil
    Madhavapeddy, Pierre Chambart, and many others).
  * Lots of tests for most of the Lwt core (#339, #389, #392, #440,
    #448, #450, Joseph Thomas, Ryan Slade).
  * Documentation fixes (including by Joseph Thomas, Rapha?l Proust,
    Richard Degenne, Stavros Polymenis).
  * Contributing documentation (#379).
  * Massively adjust whitespace for legibility (#400, #409, #416,
    Richard Degenne).
  * Improvements to CI (Etienne Millon, Raphael Rafatpanah, Zack Coker,
    Yotam Barnoy).
  * The additional packages lwt_ssl, lwt_react, lwt_glib get new minor
    releases, the change being new Jbuilder build systems (#374, Andrew
    Ray).

===== 3.0.0 (2017-04-10) =====

====== Breaking ======

  * These changes were originally announced in release 2.7.0 (#308).
  * Lwt_engine.libev now has an optional argument for selecting the libev back
    end (#269, #294, Jeremy Yallop).
  * Lwt_io.establish_server has been changed to make it more difficult to leak
    file descriptors (#258, #260).
  * Lwt_io.shutdown_server now evaluates to a promise, which completes when the
    listening socket's close(2) operation completes (#259).
  * Lwt_unix.bind now evaluates to a promise, because the bind(2) system call
    can block for Unix domain sockets (#296, requested David Sheets).
  * ocamlfind packages lwt.react, lwt.ssl, lwt.glib are replaced by lwt_react,
    lwt_ssl, lwt_glib. These have been separate OPAM packages, under those
names, since 2.7.0 (#301).

6 files changed, 200 insertions, 240 deletions

diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile
index 34582d038a3..d0a7d8589a1 100644
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@@ -1,35 +1,27 @@
-# $NetBSD: Makefile,v 1.29 2017/07/11 11:06:54 jaapb Exp $
+# $NetBSD: Makefile,v 1.30 2017/09/08 12:45:33 jaapb Exp $
 #
 
-DISTNAME=	lwt-2.7.1
+.include "Makefile.common"
+
 PKGNAME=	ocaml-${DISTNAME}
 CATEGORIES=	devel
-#MASTER_SITES=	http://github.com/ocsigen/lwt/archive/
-MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
-GITHUB_PROJECT=	lwt
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://www.ocsigen.org/
 COMMENT=	Cooperative threading library for OCaml
-LICENSE=	gnu-lgpl-v2.1
 
-DEPENDS+=	ocaml-ppx_tools-[0-9]*:../../devel/ocaml-ppx_tools
-DEPENDS+=	ocaml-react-[0-9]*:../../devel/ocaml-react
+JBUILDER_BUILD_TARGETS=	lwt
 
-OCAML_USE_OASIS_DYNRUN=	yes
-CONFIGURE_ARGS+=	--destdir "${DESTDIR}" --prefix "${PREFIX}" \
-			--bindir "${DESTDIR}${PREFIX}/bin" \
-			--enable-react --disable-glib
+CONFIGURE_ARGS=	-use-libev false
 
-SUBST_CLASSES+=		libev destdir
-SUBST_STAGE.libev=	post-configure
-SUBST_MESSAGE.libev=	Correcting compiler flags for libev
-SUBST_FILES.libev=	setup.data
-SUBST_SED.libev=	-e 's%"-lev"%"-lev -L${PREFIX}/lib/ev ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ev"%'
+do-configure:
+	cd ${WRKSRC} && ocaml src/util/configure.ml ${CONFIGURE_ARGS}
 
 .include "options.mk"
 .include "../../mk/ocaml.mk"
-.include "../../devel/libev/buildlink3.mk"
 .include "../../devel/ocaml-cppo/buildlink3.mk"
 .include "../../devel/ocaml-findlib/buildlink3.mk"
+.include "../../devel/ocaml-migrate-parsetree/buildlink3.mk"
+.include "../../devel/ocaml-ppx_tools_versioned/buildlink3.mk"
+.include "../../devel/ocaml-result/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-lwt/Makefile.common b/devel/ocaml-lwt/Makefile.common
new file mode 100644
index 00000000000..a2c913ae0ae
--- /dev/null
+++ b/devel/ocaml-lwt/Makefile.common
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.common,v 1.1 2017/09/08 12:45:33 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
+DISTNAME=	lwt-${LWT_VERSION}
+
+LICENSE=	gnu-lgpl-v2.1
+
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
+GITHUB_PROJECT=	lwt
+GITHUB_TAG=	${LWT_VERSION}
+
+OCAML_USE_JBUILDER=	yes
+JBUILDER_BUILD_FLAGS=	--only-packages
+
+DISTINFO_FILE=	${PKGDIR}/../../devel/ocaml-lwt/distinfo
+PATCHDIR=	${PKGDIR}/../../devel/ocaml-lwt/patches
diff --git a/devel/ocaml-lwt/PLIST b/devel/ocaml-lwt/PLIST
index 5e4accf4ed2..cc1e0a56a36 100644
--- a/devel/ocaml-lwt/PLIST
+++ b/devel/ocaml-lwt/PLIST
@@ -1,46 +1,20 @@
-@comment $NetBSD: PLIST,v 1.9 2017/07/11 11:06:54 jaapb Exp $
-${PLIST.ppx}bin/ppx_lwt
+@comment $NetBSD: PLIST,v 1.10 2017/09/08 12:45:33 jaapb Exp $
 ${OCAML_SITELIB}/lwt/META
-${OCAML_SITELIB}/lwt/dlllwt-unix_stubs.so
-${OCAML_SITELIB}/lwt/liblwt-unix_stubs.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-log.a
-${OCAML_SITELIB}/lwt/lwt-log.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-log.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-log.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-preemptive.a
-${OCAML_SITELIB}/lwt/lwt-preemptive.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-preemptive.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-preemptive.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-react.a
-${OCAML_SITELIB}/lwt/lwt-react.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-react.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-react.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-simple-top.a
-${OCAML_SITELIB}/lwt/lwt-simple-top.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-simple-top.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-simple-top.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-ssl.a
-${OCAML_SITELIB}/lwt/lwt-ssl.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-ssl.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-ssl.cmxs
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-log.a
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/lwt-syntax-log.cma
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-log.cmxa
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-log.cmxs
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-options.a
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/lwt-syntax-options.cma
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-options.cmxa
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-options.cmxs
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax.a
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/lwt-syntax.cma
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax.cmxa
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-unix.a
-${OCAML_SITELIB}/lwt/lwt-unix.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-unix.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-unix.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log.a
+${OCAML_SITELIB}/lwt/log/lwt_log.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log.cmxs
+${OCAML_SITELIB}/lwt/log/lwt_log_core.cmi
+${OCAML_SITELIB}/lwt/log/lwt_log_core.cmt
+${OCAML_SITELIB}/lwt/log/lwt_log_core.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log_core.cmx
+${OCAML_SITELIB}/lwt/log/lwt_log_core.mli
+${OCAML_SITELIB}/lwt/log/lwt_log_rules.cmi
+${OCAML_SITELIB}/lwt/log/lwt_log_rules.cmt
+${OCAML_SITELIB}/lwt/log/lwt_log_rules.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log_rules.cmx
+${OCAML_SITELIB}/lwt/log/lwt_log_rules.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.a
-${OCAML_SITELIB}/lwt/lwt.annot
 ${OCAML_SITELIB}/lwt/lwt.cma
 ${OCAML_SITELIB}/lwt/lwt.cmi
 ${OCAML_SITELIB}/lwt/lwt.cmt
@@ -49,198 +23,192 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxs
 ${OCAML_SITELIB}/lwt/lwt.mli
-${OCAML_SITELIB}/lwt/lwt_bytes.annot
-${OCAML_SITELIB}/lwt/lwt_bytes.cmi
-${OCAML_SITELIB}/lwt/lwt_bytes.cmt
-${OCAML_SITELIB}/lwt/lwt_bytes.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_bytes.cmx
-${OCAML_SITELIB}/lwt/lwt_bytes.mli
-${OCAML_SITELIB}/lwt/lwt_chan.annot
-${OCAML_SITELIB}/lwt/lwt_chan.cmi
-${OCAML_SITELIB}/lwt/lwt_chan.cmt
-${OCAML_SITELIB}/lwt/lwt_chan.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_chan.cmx
-${OCAML_SITELIB}/lwt/lwt_chan.mli
-${OCAML_SITELIB}/lwt/lwt_condition.annot
 ${OCAML_SITELIB}/lwt/lwt_condition.cmi
 ${OCAML_SITELIB}/lwt/lwt_condition.cmt
 ${OCAML_SITELIB}/lwt/lwt_condition.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_condition.cmx
 ${OCAML_SITELIB}/lwt/lwt_condition.mli
-${OCAML_SITELIB}/lwt/lwt_config.h
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_config.cmx
-${OCAML_SITELIB}/lwt/lwt_daemon.annot
-${OCAML_SITELIB}/lwt/lwt_daemon.cmi
-${OCAML_SITELIB}/lwt/lwt_daemon.cmt
-${OCAML_SITELIB}/lwt/lwt_daemon.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_daemon.cmx
-${OCAML_SITELIB}/lwt/lwt_daemon.mli
-${OCAML_SITELIB}/lwt/lwt_engine.annot
-${OCAML_SITELIB}/lwt/lwt_engine.cmi
-${OCAML_SITELIB}/lwt/lwt_engine.cmt
-${OCAML_SITELIB}/lwt/lwt_engine.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_engine.cmx
-${OCAML_SITELIB}/lwt/lwt_engine.mli
-${OCAML_SITELIB}/lwt/lwt_gc.annot
-${OCAML_SITELIB}/lwt/lwt_gc.cmi
-${OCAML_SITELIB}/lwt/lwt_gc.cmt
-${OCAML_SITELIB}/lwt/lwt_gc.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_gc.cmx
-${OCAML_SITELIB}/lwt/lwt_gc.mli
-${OCAML_SITELIB}/lwt/lwt_io.annot
-${OCAML_SITELIB}/lwt/lwt_io.cmi
-${OCAML_SITELIB}/lwt/lwt_io.cmt
-${OCAML_SITELIB}/lwt/lwt_io.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_io.cmx
-${OCAML_SITELIB}/lwt/lwt_io.mli
-${OCAML_SITELIB}/lwt/lwt_list.annot
 ${OCAML_SITELIB}/lwt/lwt_list.cmi
 ${OCAML_SITELIB}/lwt/lwt_list.cmt
 ${OCAML_SITELIB}/lwt/lwt_list.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_list.cmx
 ${OCAML_SITELIB}/lwt/lwt_list.mli
-${OCAML_SITELIB}/lwt/lwt_log.annot
-${OCAML_SITELIB}/lwt/lwt_log.cmi
-${OCAML_SITELIB}/lwt/lwt_log.cmt
-${OCAML_SITELIB}/lwt/lwt_log.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_log.cmx
-${OCAML_SITELIB}/lwt/lwt_log.mli
-${OCAML_SITELIB}/lwt/lwt_log_core.annot
-${OCAML_SITELIB}/lwt/lwt_log_core.cmi
-${OCAML_SITELIB}/lwt/lwt_log_core.cmt
-${OCAML_SITELIB}/lwt/lwt_log_core.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_log_core.cmx
-${OCAML_SITELIB}/lwt/lwt_log_core.mli
-${OCAML_SITELIB}/lwt/lwt_log_rules.annot
-${OCAML_SITELIB}/lwt/lwt_log_rules.cmi
-${OCAML_SITELIB}/lwt/lwt_log_rules.cmt
-${OCAML_SITELIB}/lwt/lwt_log_rules.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_log_rules.cmx
-${OCAML_SITELIB}/lwt/lwt_log_rules.mli
-${OCAML_SITELIB}/lwt/lwt_main.annot
-${OCAML_SITELIB}/lwt/lwt_main.cmi
-${OCAML_SITELIB}/lwt/lwt_main.cmt
-${OCAML_SITELIB}/lwt/lwt_main.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_main.cmx
-${OCAML_SITELIB}/lwt/lwt_main.mli
-${OCAML_SITELIB}/lwt/lwt_mutex.annot
 ${OCAML_SITELIB}/lwt/lwt_mutex.cmi
 ${OCAML_SITELIB}/lwt/lwt_mutex.cmt
 ${OCAML_SITELIB}/lwt/lwt_mutex.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_mutex.cmx
 ${OCAML_SITELIB}/lwt/lwt_mutex.mli
-${OCAML_SITELIB}/lwt/lwt_mvar.annot
 ${OCAML_SITELIB}/lwt/lwt_mvar.cmi
 ${OCAML_SITELIB}/lwt/lwt_mvar.cmt
 ${OCAML_SITELIB}/lwt/lwt_mvar.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_mvar.cmx
 ${OCAML_SITELIB}/lwt/lwt_mvar.mli
-${OCAML_SITELIB}/lwt/lwt_pool.annot
 ${OCAML_SITELIB}/lwt/lwt_pool.cmi
 ${OCAML_SITELIB}/lwt/lwt_pool.cmt
 ${OCAML_SITELIB}/lwt/lwt_pool.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_pool.cmx
 ${OCAML_SITELIB}/lwt/lwt_pool.mli
-${OCAML_SITELIB}/lwt/lwt_pqueue.annot
 ${OCAML_SITELIB}/lwt/lwt_pqueue.cmi
 ${OCAML_SITELIB}/lwt/lwt_pqueue.cmt
 ${OCAML_SITELIB}/lwt/lwt_pqueue.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_pqueue.cmx
 ${OCAML_SITELIB}/lwt/lwt_pqueue.mli
-${OCAML_SITELIB}/lwt/lwt_preemptive.annot
-${OCAML_SITELIB}/lwt/lwt_preemptive.cmi
-${OCAML_SITELIB}/lwt/lwt_preemptive.cmt
-${OCAML_SITELIB}/lwt/lwt_preemptive.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_preemptive.cmx
-${OCAML_SITELIB}/lwt/lwt_preemptive.mli
-${OCAML_SITELIB}/lwt/lwt_process.annot
-${OCAML_SITELIB}/lwt/lwt_process.cmi
-${OCAML_SITELIB}/lwt/lwt_process.cmt
-${OCAML_SITELIB}/lwt/lwt_process.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_process.cmx
-${OCAML_SITELIB}/lwt/lwt_process.mli
-${OCAML_SITELIB}/lwt/lwt_react.annot
-${OCAML_SITELIB}/lwt/lwt_react.cmi
-${OCAML_SITELIB}/lwt/lwt_react.cmt
-${OCAML_SITELIB}/lwt/lwt_react.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_react.cmx
-${OCAML_SITELIB}/lwt/lwt_react.mli
-${OCAML_SITELIB}/lwt/lwt_result.annot
 ${OCAML_SITELIB}/lwt/lwt_result.cmi
 ${OCAML_SITELIB}/lwt/lwt_result.cmt
 ${OCAML_SITELIB}/lwt/lwt_result.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_result.cmx
 ${OCAML_SITELIB}/lwt/lwt_result.mli
-${OCAML_SITELIB}/lwt/lwt_sequence.annot
 ${OCAML_SITELIB}/lwt/lwt_sequence.cmi
 ${OCAML_SITELIB}/lwt/lwt_sequence.cmt
 ${OCAML_SITELIB}/lwt/lwt_sequence.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_sequence.cmx
 ${OCAML_SITELIB}/lwt/lwt_sequence.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_simple_top.cmx
-${OCAML_SITELIB}/lwt/lwt_ssl.annot
-${OCAML_SITELIB}/lwt/lwt_ssl.cmi
-${OCAML_SITELIB}/lwt/lwt_ssl.cmt
-${OCAML_SITELIB}/lwt/lwt_ssl.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_ssl.cmx
-${OCAML_SITELIB}/lwt/lwt_ssl.mli
-${OCAML_SITELIB}/lwt/lwt_stream.annot
 ${OCAML_SITELIB}/lwt/lwt_stream.cmi
 ${OCAML_SITELIB}/lwt/lwt_stream.cmt
 ${OCAML_SITELIB}/lwt/lwt_stream.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_stream.cmx
 ${OCAML_SITELIB}/lwt/lwt_stream.mli
-${OCAML_SITELIB}/lwt/lwt_switch.annot
 ${OCAML_SITELIB}/lwt/lwt_switch.cmi
 ${OCAML_SITELIB}/lwt/lwt_switch.cmt
 ${OCAML_SITELIB}/lwt/lwt_switch.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_switch.cmx
 ${OCAML_SITELIB}/lwt/lwt_switch.mli
-${OCAML_SITELIB}/lwt/lwt_sys.annot
-${OCAML_SITELIB}/lwt/lwt_sys.cmi
-${OCAML_SITELIB}/lwt/lwt_sys.cmt
-${OCAML_SITELIB}/lwt/lwt_sys.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_sys.cmx
-${OCAML_SITELIB}/lwt/lwt_sys.mli
-${OCAML_SITELIB}/lwt/lwt_throttle.annot
-${OCAML_SITELIB}/lwt/lwt_throttle.cmi
-${OCAML_SITELIB}/lwt/lwt_throttle.cmt
-${OCAML_SITELIB}/lwt/lwt_throttle.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_throttle.cmx
-${OCAML_SITELIB}/lwt/lwt_throttle.mli
-${OCAML_SITELIB}/lwt/lwt_timeout.annot
-${OCAML_SITELIB}/lwt/lwt_timeout.cmi
-${OCAML_SITELIB}/lwt/lwt_timeout.cmt
-${OCAML_SITELIB}/lwt/lwt_timeout.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_timeout.cmx
-${OCAML_SITELIB}/lwt/lwt_timeout.mli
-${OCAML_SITELIB}/lwt/lwt_unix.annot
-${OCAML_SITELIB}/lwt/lwt_unix.cmi
-${OCAML_SITELIB}/lwt/lwt_unix.cmt
-${OCAML_SITELIB}/lwt/lwt_unix.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_unix.cmx
-${OCAML_SITELIB}/lwt/lwt_unix.h
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_unix_jobs_generated.cmx
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt.annot
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt.cmi
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt.cmt
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt.cmti
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/pa_lwt.cmx
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt.mli
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt_log.annot
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt_log.cmi
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt_log.cmt
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt_log.cmti
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/pa_lwt_log.cmx
-${PLIST.camlp4}${OCAML_SITELIB}/lwt/pa_lwt_log.mli
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/pa_lwt_options.cmx
-${PLIST.ocaml-opt}${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx.a
-${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx.cma
-${PLIST.ocaml-opt}${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx.cmxa
-${PLIST.ocaml-opt}${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx.cmxs
-${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx_lwt.annot
-${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx_lwt.cmi
-${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx_lwt.cmt
-${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx_lwt.cmti
-${PLIST.ocaml-opt}${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx_lwt.cmx
-${PLIST.ppx}${OCAML_SITELIB}/lwt/ppx_lwt.mli
+${OCAML_SITELIB}/lwt/opam
+${OCAML_SITELIB}/lwt/ppx/ppx.exe
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.a
+${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cma
+${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmi
+${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmt
+${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmti
+${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
+${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmxs
+${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.ml
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.a
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.cma
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.cmxa
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.cmxs
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmi
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmt
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmti
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmx
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.mli
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.a
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.cma
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.cmxa
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.cmxs
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.a
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.cma
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.cmxa
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.cmxs
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.cmi
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.cmt
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.cmx
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.ml
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmi
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmt
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmti
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmx
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/liblwt_unix_stubs.a
+${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_bytes.mli
+${OCAML_SITELIB}/lwt/unix/lwt_chan.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_chan.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_chan.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_chan.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_chan.mli
+${OCAML_SITELIB}/lwt/unix/lwt_config.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_config.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_config.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_config.h
+${OCAML_SITELIB}/lwt/unix/lwt_config.ml
+${OCAML_SITELIB}/lwt/unix/lwt_daemon.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_daemon.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_daemon.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_daemon.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_daemon.mli
+${OCAML_SITELIB}/lwt/unix/lwt_engine.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_engine.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_engine.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_engine.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_engine.mli
+${OCAML_SITELIB}/lwt/unix/lwt_gc.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_gc.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_gc.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_gc.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_gc.mli
+${OCAML_SITELIB}/lwt/unix/lwt_io.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_io.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_io.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_io.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_io.mli
+${OCAML_SITELIB}/lwt/unix/lwt_log.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_log.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_log.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_log.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_log.mli
+${OCAML_SITELIB}/lwt/unix/lwt_main.cmi
+${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_process.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_process.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_process.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_process.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_process.mli
+${OCAML_SITELIB}/lwt/unix/lwt_sys.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_sys.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_sys.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_sys.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_sys.mli
+${OCAML_SITELIB}/lwt/unix/lwt_throttle.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_throttle.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_throttle.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_throttle.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_throttle.mli
+${OCAML_SITELIB}/lwt/unix/lwt_timeout.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_timeout.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_timeout.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_timeout.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_timeout.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.a
+${OCAML_SITELIB}/lwt/unix/lwt_unix.cma
+${OCAML_SITELIB}/lwt/unix/lwt_unix.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_unix.cmt
+${OCAML_SITELIB}/lwt/unix/lwt_unix.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmxs
+${OCAML_SITELIB}/lwt/unix/lwt_unix.h
+${OCAML_SITELIB}/lwt/unix/lwt_unix.mli
+${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs_generated.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs_generated.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs_generated.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs_generated.ml
+${OCAML_SITELIB}/lwt/unix/lwt_unix_unix.h
+${OCAML_SITELIB}/lwt/unix/lwt_unix_windows.h
+${OCAML_SITELIB}/stubslibs/dlllwt_unix_stubs.so
+share/doc/lwt/CHANGES
+share/doc/lwt/README.md
diff --git a/devel/ocaml-lwt/buildlink3.mk b/devel/ocaml-lwt/buildlink3.mk
index 232deac3967..3c246f14632 100644
--- a/devel/ocaml-lwt/buildlink3.mk
+++ b/devel/ocaml-lwt/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/07/11 11:06:54 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2017/09/08 12:45:33 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-lwt
 
 .if !defined(OCAML_LWT_BUILDLINK3_MK)
 OCAML_LWT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-lwt+=	ocaml-lwt>=2.4.2
-BUILDLINK_ABI_DEPENDS.ocaml-lwt+=	ocaml-lwt>=2.7.1
+BUILDLINK_API_DEPENDS.ocaml-lwt+=	ocaml-lwt>=3.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-lwt+=	ocaml-lwt>=3.1.0
 BUILDLINK_PKGSRCDIR.ocaml-lwt?=	../../devel/ocaml-lwt
 
-.include "../../devel/libev/buildlink3.mk"
+#.include "../../devel/libev/buildlink3.mk"
 .endif	# OCAMLLWT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ocaml-lwt
diff --git a/devel/ocaml-lwt/distinfo b/devel/ocaml-lwt/distinfo
index d3e4540d765..a5575e172d4 100644
--- a/devel/ocaml-lwt/distinfo
+++ b/devel/ocaml-lwt/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2017/07/11 11:06:54 jaapb Exp $
+$NetBSD: distinfo,v 1.13 2017/09/08 12:45:33 jaapb Exp $
 
-SHA1 (lwt-2.7.1.tar.gz) = 525d5840a0bb6d892ad0f3b54c2b1bb34471c986
-RMD160 (lwt-2.7.1.tar.gz) = e2067b48d3f0844aa4e352c73e5a1a422cb38e6f
-SHA512 (lwt-2.7.1.tar.gz) = e353cfabb6845f3c410e1a3e658787f3a9cb981e73701d84555e639af052bb05eb734d7f7027eb3c0079c9edfef21bb0ca4b9a7683b02056d724142a2980c348
-Size (lwt-2.7.1.tar.gz) = 296224 bytes
+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
diff --git a/devel/ocaml-lwt/options.mk b/devel/ocaml-lwt/options.mk
index be99dd6b26d..3a4189be2c3 100644
--- a/devel/ocaml-lwt/options.mk
+++ b/devel/ocaml-lwt/options.mk
@@ -1,42 +1,21 @@
-# $NetBSD: options.mk,v 1.3 2017/07/11 11:06:54 jaapb Exp $
+# $NetBSD: options.mk,v 1.4 2017/09/08 12:45:33 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocaml-lwt
-PKG_SUPPORTED_OPTIONS=	ssl ppx camlp4
-PKG_SUGGESTED_OPTIONS=	ssl ppx camlp4
-PLIST_VARS+=	ppx camlp4
+PKG_SUPPORTED_OPTIONS=	camlp4
+PKG_SUGGESTED_OPTIONS=	# empty
+PLIST_VARS+=	camlp4
 
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### SSL support
-###
-.if !empty(PKG_OPTIONS:Mssl)
-.include "../../security/ocaml-ssl/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.5.0
-CONFIGURE_ARGS+=	--enable-ssl
-.else
-CONFIGURE_ARGS+=	--disable-ssl
-.endif
-
-###
 ### Camlp4 support
 ###
 .if !empty(PKG_OPTIONS:Mcamlp4)
 .include "../../lang/camlp4/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-camlp4
+CONFIGURE_ARGS+=	-use-camlp4 true
 PLIST.camlp4=	yes
 .else
-CONFIGURE_ARGS+=	--disable-camlp4
-.endif
-
-###
-### SSL support
-###
-.if !empty(PKG_OPTIONS:Mppx)
-CONFIGURE_ARGS+=	--enable-ppx
-PLIST.ppx=	yes
-.else
-CONFIGURE_ARGS+=	--disable-ppx
+CONFIGURE_ARGS+=	-use-camlp4 false
 .endif