CVS commit: pkgsrc/devel/ocaml-lwt

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/ocaml-lwt
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Fri, 13 Apr 2018 12:52:00 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Fri Apr 13 12:52:00 UTC 2018

Modified Files:
        pkgsrc/devel/ocaml-lwt: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
Removed Files:
        pkgsrc/devel/ocaml-lwt/patches: patch-META.lwt patch-src_camlp4_jbuild
            patch-src_camlp4_log_jbuild patch-src_camlp4_options_jbuild
            patch-src_ppx_jbuild

Log Message:
Updated devel/ocaml-lwt to version 4.0.1.

4.0.0 is a major release that breaks quite a few interfaces, such as:

* Delete package lwt.ppx. The PPX syntax is in package lwt_ppx since
  Lwt 3.2.0.
* Remove >> syntax from the PPX.
* Delete modules Lwt_log, Lwt_daemon, Lwt_log_core, and package lwt.log.
  These are in package lwt_log since Lwt 3.2.0, but it is recommended to
  use Logs_lwt from the logs library instead (initiated Hannes Mehnert).
* Delete package lwt.preemptive. It is an alias for lwt.unix since
  Lwt 3.2.0.
* Delete package lwt.syntax. The Camlp4 syntax is in package lwt_camlp4
  since Lwt 3.2.0.
* Delete module Lwt_chan, a predecessor of Lwt_io.
* Delete package lwt.simple-top, a predecessor of utop.
* Make resolvers (Lwt.u) contravariant.

(for an upgrade path see the upstream Github site)

4.0.1 is a bugfix release.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/ocaml-lwt/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-lwt/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ocaml-lwt/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/ocaml-lwt/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/ocaml-lwt/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/ocaml-lwt/patches/patch-META.lwt
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_jbuild \
    pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_log_jbuild \
    pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_options_jbuild \
    pkgsrc/devel/ocaml-lwt/patches/patch-src_ppx_jbuild

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ocaml-lwt/Makefile
diff -u pkgsrc/devel/ocaml-lwt/Makefile:1.35 pkgsrc/devel/ocaml-lwt/Makefile:1.36
--- pkgsrc/devel/ocaml-lwt/Makefile:1.35        Thu Apr  5 11:52:28 2018
+++ pkgsrc/devel/ocaml-lwt/Makefile     Fri Apr 13 12:52:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2018/04/05 11:52:28 jaapb Exp $
+# $NetBSD: Makefile,v 1.36 2018/04/13 12:52:00 jaapb Exp $
 #
 
 .include "Makefile.common"
@@ -13,8 +13,11 @@ COMMENT=     Cooperative threading library f
 #MAKE_JOBS_SAFE=       no
 JBUILDER_BUILD_PACKAGES=       lwt
 
+HAS_CONFIGURE= yes
 CONFIGURE_ARGS=        -use-libev false
 
+OCAML_USE_JBUILDER=    yes
+
 do-configure:
        cd ${WRKSRC} && ocaml src/util/configure.ml ${CONFIGURE_ARGS}
 

Index: pkgsrc/devel/ocaml-lwt/Makefile.common
diff -u pkgsrc/devel/ocaml-lwt/Makefile.common:1.3 pkgsrc/devel/ocaml-lwt/Makefile.common:1.4
--- pkgsrc/devel/ocaml-lwt/Makefile.common:1.3  Thu Apr  5 11:04:39 2018
+++ pkgsrc/devel/ocaml-lwt/Makefile.common      Fri Apr 13 12:52:00 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.3 2018/04/05 11:04:39 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.4 2018/04/13 12:52:00 jaapb Exp $
 
 # used by devel/ocaml-lwt_glib/Makefile
 # used by devel/ocaml-lwt_ppx/Makefile
 # used by devel/ocaml-lwt_react/Makefile
 
-LWT_VERSION=   3.3.0
+LWT_VERSION=   4.0.1
 DISTNAME=      lwt-${LWT_VERSION}
 
 LICENSE=       gnu-lgpl-v2.1

Index: pkgsrc/devel/ocaml-lwt/PLIST
diff -u pkgsrc/devel/ocaml-lwt/PLIST:1.14 pkgsrc/devel/ocaml-lwt/PLIST:1.15
--- pkgsrc/devel/ocaml-lwt/PLIST:1.14   Thu Apr  5 11:52:28 2018
+++ pkgsrc/devel/ocaml-lwt/PLIST        Fri Apr 13 12:52:00 2018
@@ -1,22 +1,5 @@
-@comment $NetBSD: PLIST,v 1.14 2018/04/05 11:52:28 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.15 2018/04/13 12:52:00 jaapb Exp $
 ${OCAML_SITELIB}/lwt/META
-${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.ml
-${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.ml
-${OCAML_SITELIB}/lwt/log/lwt_log_rules.mli
-${OCAML_SITELIB}/lwt/log/lwt.log.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.a
 ${OCAML_SITELIB}/lwt/lwt.cma
 ${OCAML_SITELIB}/lwt/lwt.cmi
@@ -89,15 +72,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/l
 ${OCAML_SITELIB}/lwt/lwt_switch.ml
 ${OCAML_SITELIB}/lwt/lwt_switch.mli
 ${OCAML_SITELIB}/lwt/opam
-${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
-${OCAML_SITELIB}/lwt/simple-top/lwt.simple-top.dune
 ${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
@@ -105,23 +79,11 @@ ${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmx
 ${OCAML_SITELIB}/lwt/unix/lwt_bytes.ml
 ${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.ml
-${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.ml
-${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
@@ -140,12 +102,6 @@ ${OCAML_SITELIB}/lwt/unix/lwt_io.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_io.cmx
 ${OCAML_SITELIB}/lwt/unix/lwt_io.ml
 ${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.ml
-${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

Index: pkgsrc/devel/ocaml-lwt/buildlink3.mk
diff -u pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.9 pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.10
--- pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.9    Thu Apr  5 11:04:39 2018
+++ pkgsrc/devel/ocaml-lwt/buildlink3.mk        Fri Apr 13 12:52:00 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/04/05 11:04:39 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/04/13 12:52:00 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-lwt
 
 .if !defined(OCAML_LWT_BUILDLINK3_MK)
 OCAML_LWT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-lwt+=      ocaml-lwt>=3.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-lwt+=      ocaml-lwt>=3.3.0
+BUILDLINK_API_DEPENDS.ocaml-lwt+=      ocaml-lwt>=4.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-lwt+=      ocaml-lwt>=4.0.1
 BUILDLINK_PKGSRCDIR.ocaml-lwt?=                ../../devel/ocaml-lwt
 
 #.include "../../devel/libev/buildlink3.mk"

Index: pkgsrc/devel/ocaml-lwt/distinfo
diff -u pkgsrc/devel/ocaml-lwt/distinfo:1.17 pkgsrc/devel/ocaml-lwt/distinfo:1.18
--- pkgsrc/devel/ocaml-lwt/distinfo:1.17        Thu Apr  5 11:52:28 2018
+++ pkgsrc/devel/ocaml-lwt/distinfo     Fri Apr 13 12:52:00 2018
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.17 2018/04/05 11:52:28 jaapb Exp $
+$NetBSD: distinfo,v 1.18 2018/04/13 12:52:00 jaapb Exp $
 
-SHA1 (lwt-3.3.0.tar.gz) = 1a8aec06b4080577a989cbaeec0614359465ea73
-RMD160 (lwt-3.3.0.tar.gz) = 2f374a7e315daa03f7f3b3039abbf757dc5b7892
-SHA512 (lwt-3.3.0.tar.gz) = 452425c8c0cddd53463da658b1bb8edb0c5ead2e0de0f733dbf624d373fec94c3121e77cc285427770388e16106fae84c32805b6642d1797200660fed91d0f29
-Size (lwt-3.3.0.tar.gz) = 312052 bytes
-SHA1 (patch-META.lwt) = 0581a5dcea185694703955f6c55837465b62888e
-SHA1 (patch-src_camlp4_jbuild) = f1d1100dcd9b66875ed69dc25bc5546b52c2532e
-SHA1 (patch-src_camlp4_log_jbuild) = 7e6e7dddf0ff1c5983aea6515a43761edab874df
-SHA1 (patch-src_camlp4_options_jbuild) = 3c0232d5424b0ad85cf3a99803ebcf54b51c7ac1
-SHA1 (patch-src_ppx_jbuild) = e57f511041d811232af8a4b52c5c39153cca7dc9
+SHA1 (lwt-4.0.1.tar.gz) = c334e473b5adc6e9c523b99efd79ff6d097151b8
+RMD160 (lwt-4.0.1.tar.gz) = 220787f2dea34019e08f1efc9aa3470136fadbf3
+SHA512 (lwt-4.0.1.tar.gz) = 4c1e63fb052ba001f18ce0ef289eee1548df3fe6381a718493e0adc4744ed40a1acb561fbf279f15c4684e19ed052edd2cab1c7e57da671d9e1e75f3bf1f8644
+Size (lwt-4.0.1.tar.gz) = 291046 bytes
 SHA1 (patch-src_unix_config_discover.ml) = ef8ea37d85f20d56654514617050ee46d6080ef1
-SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = dbecbc5507e901a1187dc69d0fa0c1dfa2097b22
+SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = 5ec0ae3afe3d65e673681fcf8faeebf811e64518

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index