[pkgsrc/trunk]: pkgsrc/devel/ocaml-core Updated devel/ocaml-core to version 0...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/ocaml-core Updated devel/ocaml-core to version 0...
From: jaapb <jaapb%pkgsrc.org@localhost>
Date: Mon, 06 Apr 2020 12:53:04 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4987e04ba329
branches:  trunk
changeset: 421676:4987e04ba329
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Fri Jan 17 09:33:45 2020 +0000

description:
Updated devel/ocaml-core to version 0.13.0.

The changelog hasn't been updated, but this version definitely adds
support for OCaml 4.09.

diffstat:

 devel/ocaml-core/Makefile               |  20 +++++++-
 devel/ocaml-core/PLIST                  |  80 ++++++++++++++++----------------
 devel/ocaml-core/buildlink3.mk          |   4 +-
 devel/ocaml-core/distinfo               |  11 ++--
 devel/ocaml-core/patches/patch-src_dune |  16 ------
 5 files changed, 65 insertions(+), 66 deletions(-)

diffs (258 lines):

diff -r 51d2009e0994 -r 4987e04ba329 devel/ocaml-core/Makefile
--- a/devel/ocaml-core/Makefile Fri Jan 17 09:19:41 2020 +0000
+++ b/devel/ocaml-core/Makefile Fri Jan 17 09:33:45 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2019/07/01 12:38:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/17 09:33:45 jaapb Exp $
 
 GITHUB_PROJECT=        core
 GITHUB_TAG=    v${PKGVERSION_NOREV}
-DISTNAME=      ${GITHUB_PROJECT}-0.12.3
+DISTNAME=      ${GITHUB_PROJECT}-0.13.0
 PKGNAME=       ocaml-${DISTNAME}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=janestreet/}
@@ -17,6 +17,20 @@
 OCAML_USE_DUNE=        yes
 OCAML_USE_OPAM=        no
 
+SUBST_CLASSES+=                        fix-dune-flags
+SUBST_STAGE.fix-dune-flags=    post-extract
+SUBST_MESSAGE.fix-dune-flags=  Fixing unknown dune flags.
+SUBST_FILES.fix-dune-flags=    \
+       bench/bin/dune daemon/src/dune daemon/test-bin/dune \
+       error_checking_mutex/src/dune \
+       example/command/dune lock_file_blocking/src/dune \
+       lock_file_blocking/test/dune lock_file_blocking/test-bin/dune \
+       nano_mutex/bench/dune src/dune test/bin/manual/dune \
+       test/bin/dune test/src/dune time_stamp_counter/bench/dune \
+       time_stamp_counter/src/dune
+SUBST_SED.fix-dune-flags=      -e 's|-allow-unannotated-ignores||g'
+SUBST_SED.fix-dune-flags+=     -e 's|-check-doc-comments||g'
+
 # needs specific install command because it has shell scripts
 do-install:
        ${RUN} for i in ${OPAM_INSTALL_FILES}; do \
@@ -29,7 +43,7 @@
                -docdir ${OCAML_TOPKG_DOCDIR}/$$i \
                -stublibsdir ${PREFIX}/${OCAML_SITELIBDIR}/stublibs \
                -bindir ${PREFIX}/bin \
-    $$i.install; \
+    ${OPAM_INSTALL_DIR}/$$i.install; \
   done
 
 .include "../../mk/ocaml.mk"
diff -r 51d2009e0994 -r 4987e04ba329 devel/ocaml-core/PLIST
--- a/devel/ocaml-core/PLIST    Fri Jan 17 09:19:41 2020 +0000
+++ b/devel/ocaml-core/PLIST    Fri Jan 17 09:33:45 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/25 09:14:48 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/01/17 09:33:45 jaapb Exp $
 bin/corebuild
 bin/coretop
 ${OCAML_SITELIB}/core/META
@@ -49,10 +49,6 @@
 ${OCAML_SITELIB}/core/core__Command.cmt
 ${OCAML_SITELIB}/core/core__Command.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Command.cmx
-${OCAML_SITELIB}/core/core__Core_condition.cmi
-${OCAML_SITELIB}/core/core__Core_condition.cmt
-${OCAML_SITELIB}/core/core__Core_condition.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Core_condition.cmx
 ${OCAML_SITELIB}/core/core__Core_date.cmi
 ${OCAML_SITELIB}/core/core__Core_date.cmt
 ${OCAML_SITELIB}/core/core__Core_date.cmti
@@ -64,10 +60,6 @@
 ${OCAML_SITELIB}/core/core__Core_filename.cmt
 ${OCAML_SITELIB}/core/core__Core_filename.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Core_filename.cmx
-${OCAML_SITELIB}/core/core__Core_mutex.cmi
-${OCAML_SITELIB}/core/core__Core_mutex.cmt
-${OCAML_SITELIB}/core/core__Core_mutex.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Core_mutex.cmx
 ${OCAML_SITELIB}/core/core__Core_sys.cmi
 ${OCAML_SITELIB}/core/core__Core_sys.cmt
 ${OCAML_SITELIB}/core/core__Core_sys.cmti
@@ -133,9 +125,6 @@
 ${OCAML_SITELIB}/core/core__Linux_ext_intf.cmi
 ${OCAML_SITELIB}/core/core__Linux_ext_intf.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Linux_ext_intf.cmx
-${OCAML_SITELIB}/core/core__Mutex0.cmi
-${OCAML_SITELIB}/core/core__Mutex0.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Mutex0.cmx
 ${OCAML_SITELIB}/core/core__Signal.cmi
 ${OCAML_SITELIB}/core/core__Signal.cmt
 ${OCAML_SITELIB}/core/core__Signal.cmti
@@ -156,33 +145,14 @@
 ${OCAML_SITELIB}/core/core__Time_ns_intf.cmi
 ${OCAML_SITELIB}/core/core__Time_ns_intf.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Time_ns_intf.cmx
-${OCAML_SITELIB}/core/core__Time_stamp_counter.cmi
-${OCAML_SITELIB}/core/core__Time_stamp_counter.cmt
-${OCAML_SITELIB}/core/core__Time_stamp_counter.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Time_stamp_counter.cmx
 ${OCAML_SITELIB}/core/core__Unix_error.cmi
 ${OCAML_SITELIB}/core/core__Unix_error.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Unix_error.cmx
-${OCAML_SITELIB}/core/core__User_and_group.cmi
-${OCAML_SITELIB}/core/core__User_and_group.cmt
-${OCAML_SITELIB}/core/core__User_and_group.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__User_and_group.cmx
-${OCAML_SITELIB}/core/core__Version_util.cmi
-${OCAML_SITELIB}/core/core__Version_util.cmt
-${OCAML_SITELIB}/core/core__Version_util.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Version_util.cmx
-${OCAML_SITELIB}/core/core__Version_util_intf.cmi
-${OCAML_SITELIB}/core/core__Version_util_intf.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/core/core__Version_util_intf.cmx
-${OCAML_SITELIB}/core/core_condition.ml
-${OCAML_SITELIB}/core/core_condition.mli
 ${OCAML_SITELIB}/core/core_date.ml
 ${OCAML_SITELIB}/core/core_date.mli
 ${OCAML_SITELIB}/core/core_date_intf.ml
 ${OCAML_SITELIB}/core/core_filename.ml
 ${OCAML_SITELIB}/core/core_filename.mli
-${OCAML_SITELIB}/core/core_mutex.ml
-${OCAML_SITELIB}/core/core_mutex.mli
 ${OCAML_SITELIB}/core/core_sys.ml
 ${OCAML_SITELIB}/core/core_sys.mli
 ${OCAML_SITELIB}/core/core_thread.ml
@@ -218,6 +188,25 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/daemon/daemon__Import.cmx
 ${OCAML_SITELIB}/core/daemon/import.ml
 ${OCAML_SITELIB}/core/dune-package
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.a
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.cma
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.cmi
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.cmt
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.cmxs
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.ml
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex.mli
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex__.cmi
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex__.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex__.cmx
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex__.ml
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex__Import.cmi
+${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex__Import.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/error_checking_mutex/error_checking_mutex__Import.cmx
+${OCAML_SITELIB}/core/error_checking_mutex/import.ml
+${OCAML_SITELIB}/core/error_checking_mutex/liberror_checking_mutex_stubs.a
 ${OCAML_SITELIB}/core/import.ml
 ${OCAML_SITELIB}/core/import_time.ml
 ${OCAML_SITELIB}/core/interval.ml
@@ -250,7 +239,6 @@
 ${OCAML_SITELIB}/core/lock_file_blocking/lock_file_blocking__Import.cmi
 ${OCAML_SITELIB}/core/lock_file_blocking/lock_file_blocking__Import.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/lock_file_blocking/lock_file_blocking__Import.cmx
-${OCAML_SITELIB}/core/mutex0.ml
 ${OCAML_SITELIB}/core/nano_mutex/import.ml
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/nano_mutex/nano_mutex.a
 ${OCAML_SITELIB}/core/nano_mutex/nano_mutex.cma
@@ -333,8 +321,25 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/syslog/syslog__Import.cmx
 ${OCAML_SITELIB}/core/time_common.ml
 ${OCAML_SITELIB}/core/time_ns_intf.ml
-${OCAML_SITELIB}/core/time_stamp_counter.ml
-${OCAML_SITELIB}/core/time_stamp_counter.mli
+${OCAML_SITELIB}/core/time_stamp_counter/import.ml
+${OCAML_SITELIB}/core/time_stamp_counter/libtime_stamp_counter_stubs.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.a
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.cma
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.cmi
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.cmt
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.cmxs
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.ml
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter.mli
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter__.cmi
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter__.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter__.cmx
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter__.ml
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter__Import.cmi
+${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter__Import.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/core/time_stamp_counter/time_stamp_counter__Import.cmx
 ${OCAML_SITELIB}/core/top/core_install_printers.ml
 ${OCAML_SITELIB}/core/top/core_top.cma
 ${OCAML_SITELIB}/core/top/core_top.cmi
@@ -343,8 +348,6 @@
 ${OCAML_SITELIB}/core/top/core_top__Core_install_printers.cmi
 ${OCAML_SITELIB}/core/top/core_top__Core_install_printers.cmt
 ${OCAML_SITELIB}/core/unix_error.ml
-${OCAML_SITELIB}/core/user_and_group.ml
-${OCAML_SITELIB}/core/user_and_group.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/uuid/uuid_unix.a
 ${OCAML_SITELIB}/core/uuid/uuid_unix.cma
 ${OCAML_SITELIB}/core/uuid/uuid_unix.cmi
@@ -355,11 +358,10 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/core/uuid/uuid_unix.cmxs
 ${OCAML_SITELIB}/core/uuid/uuid_unix.ml
 ${OCAML_SITELIB}/core/uuid/uuid_unix.mli
-${OCAML_SITELIB}/core/version_util.ml
-${OCAML_SITELIB}/core/version_util.mli
-${OCAML_SITELIB}/core/version_util_intf.ml
 ${OCAML_SITELIB}/stublibs/dllcore_stubs.so
+${OCAML_SITELIB}/stublibs/dllerror_checking_mutex_stubs.so
 ${OCAML_SITELIB}/stublibs/dllsyslog_stubs.so
+${OCAML_SITELIB}/stublibs/dlltime_stamp_counter_stubs.so
 share/doc/core/CHANGES.md
 share/doc/core/LICENSE.md
 share/doc/core/README.md
diff -r 51d2009e0994 -r 4987e04ba329 devel/ocaml-core/buildlink3.mk
--- a/devel/ocaml-core/buildlink3.mk    Fri Jan 17 09:19:41 2020 +0000
+++ b/devel/ocaml-core/buildlink3.mk    Fri Jan 17 09:33:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2019/07/01 12:38:53 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/01/17 09:33:45 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-core
 
@@ -6,7 +6,7 @@
 OCAML_CORE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-core+=     ocaml-core>=0.12.0
-BUILDLINK_ABI_DEPENDS.ocaml-core+=     ocaml-core>=0.12.3
+BUILDLINK_ABI_DEPENDS.ocaml-core+=     ocaml-core>=0.13.0
 BUILDLINK_PKGSRCDIR.ocaml-core?=       ../../devel/ocaml-core
 
 .endif # OCAML_CORE_BUILDLINK3_MK
diff -r 51d2009e0994 -r 4987e04ba329 devel/ocaml-core/distinfo
--- a/devel/ocaml-core/distinfo Fri Jan 17 09:19:41 2020 +0000
+++ b/devel/ocaml-core/distinfo Fri Jan 17 09:33:45 2020 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2019/07/01 12:38:53 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2020/01/17 09:33:45 jaapb Exp $
 
-SHA1 (core-0.12.3.tar.gz) = 402f9021ea7dcbd061384abe44695adc5810cef7
-RMD160 (core-0.12.3.tar.gz) = e824f4ec1bf16ee7ea13462412a77ce4209dd297
-SHA512 (core-0.12.3.tar.gz) = 06f00ce0285055fc2a91dab940dcb8968585bd80e5203e7874d2997196f1b26492508f6f0c1ea86ead9285551d5142a4dfaf34375b90c330f2858604042d0743
-Size (core-0.12.3.tar.gz) = 693666 bytes
-SHA1 (patch-src_dune) = d8063672e7077ff38bd62bc93eb28dd96523669a
+SHA1 (core-0.13.0.tar.gz) = 326679d75deb784935c2f6844290988c565929fb
+RMD160 (core-0.13.0.tar.gz) = 2010351f6154fd20a5b367a83366b0dab8a2027d
+SHA512 (core-0.13.0.tar.gz) = b5bfcf1d13717d108c67219e15d852d6ae976150ccb9bdcbb1d93c565c08a1c315fa842d4f71a834e490c9862730a124a825481ed736420b56f4083b5953e7d5
+Size (core-0.13.0.tar.gz) = 694942 bytes
diff -r 51d2009e0994 -r 4987e04ba329 devel/ocaml-core/patches/patch-src_dune
--- a/devel/ocaml-core/patches/patch-src_dune   Fri Jan 17 09:19:41 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_dune,v 1.1 2019/03/25 09:14:48 jaapb Exp $
-
-Remove unknown argument
---- src/dune.orig      2019-02-22 16:22:56.000000000 +0000
-+++ src/dune
-@@ -11,7 +11,7 @@
-   pthread_np_stubs recvmmsg signal_stubs time_stamp_counter_stubs timespec
-   unix_stubs unix_time_stubs nss_stubs)
-  (preprocessor_deps config.h)
-- (preprocess (pps ppx_jane -check-doc-comments)))
-+ (preprocess (pps ppx_jane)))
- 
- (alias (name runtest) (deps (:first_dep nss_stubs.c) nss_stubs.cinaps)
-- (action (bash "%{bin:cinaps} %{first_dep}")))
-\ No newline at end of file
-+ (action (bash "%{bin:cinaps} %{first_dep}")))
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-ppx_derivers to 1.2.1
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-dune to 2.1.3nb1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-ppx_derivers to 1.2.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-dune to 2.1.3nb1
Indexes:
Home | Main Index | Thread Index | Old Index