[pkgsrc/trunk]: pkgsrc/lang/ocaml Updated lang/ocaml to the newest version, 4...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/ocaml Updated lang/ocaml to the newest version, 4...
From: jaapb <jaapb%pkgsrc.org@localhost>
Date: Thu, 19 Jul 2018 13:21:57 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/408cb2793f18
branches:  trunk
changeset: 310593:408cb2793f18
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Thu Jul 19 12:16:38 2018 +0000

description:
Updated lang/ocaml to the newest version, 4.07.0.

This breaks quite a few dependencies, more commits to follow.

There are many bugfixes and improvements (see the Changes file), I will
summarise the changes that may cause breakage:

* all standard library modules are now packed into the Stdlib module;
* Unix.isatty now works under the native Windows ports
* strings and bytes are distinguishable in bytecode
* Module aliases are no longer removed in 'module type of' and
  'with module'
* soundness bugfix with non-generalised type variables and local modules
* Ident.t is now abstract and immutable
* only allow directives with filename and at the begining of the line

diffstat:

 lang/ocaml/Makefile                                                 |    7 +-
 lang/ocaml/Makefile.common                                          |    6 +-
 lang/ocaml/PLIST                                                    |  765 +++++----
 lang/ocaml/buildlink3.mk                                            |    6 +-
 lang/ocaml/distinfo                                                 |   26 +-
 lang/ocaml/patches/patch-Makefile                                   |  134 +-
 lang/ocaml/patches/patch-Makefile.common                            |   18 +
 lang/ocaml/patches/patch-asmrun_Makefile                            |   14 -
 lang/ocaml/patches/patch-byterun_Makefile                           |   20 +-
 lang/ocaml/patches/patch-configure                                  |   46 +-
 lang/ocaml/patches/patch-ocamldoc_Makefile                          |   41 -
 lang/ocaml/patches/patch-otherlibs_dynlink_Makefile                 |   21 -
 lang/ocaml/patches/patch-otherlibs_systhreads_Makefile              |   41 +-
 lang/ocaml/patches/patch-otherlibs_threads_Makefile                 |   53 +-
 lang/ocaml/patches/patch-stdlib_Makefile                            |   47 -
 lang/ocaml/patches/patch-testsuite_tests_tool-ocamldoc-man_Makefile |   24 -
 16 files changed, 568 insertions(+), 701 deletions(-)

diffs (truncated from 1908 to 300 lines):

diff -r 39c11e7d8131 -r 408cb2793f18 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Thu Jul 19 09:25:11 2018 +0000
+++ b/lang/ocaml/Makefile       Thu Jul 19 12:16:38 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2018/04/04 09:34:46 jaapb Exp $
+# $NetBSD: Makefile,v 1.120 2018/07/19 12:16:38 jaapb Exp $
 
 .include "Makefile.common"
 
@@ -8,6 +8,8 @@
 MAKE_JOBS_SAFE=                no
 UNLIMIT_RESOURCES=     stacksize
 
+USE_TOOLS+=            bash
+
 USE_GCC_RUNTIME=       yes
 
 PLIST_VARS+=   ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime
@@ -78,6 +80,9 @@
 
 PRINT_PLIST_AWK+=      { gsub(/lib\/ocaml\/${PKGMANDIR:S|/|\\/|}/, "lib/ocaml/$${PKGMANDIR}"); }
 
+REPLACE_BASH+=         tools/ocaml-instr-graph
+REPLACE_AWK+=          tools/ocaml-instr-report
+
 do-test:
        cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
 
diff -r 39c11e7d8131 -r 408cb2793f18 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Thu Jul 19 09:25:11 2018 +0000
+++ b/lang/ocaml/Makefile.common        Thu Jul 19 12:16:38 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.53 2018/04/04 09:34:46 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.54 2018/07/19 12:16:38 jaapb Exp $
 
 # used by x11/labltk/Makefile
 # used by x11/ocaml-graphics/Makefile
-DISTNAME=      ocaml-4.06.1
+DISTNAME=      ocaml-4.07.0
 CATEGORIES=    lang
-MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-4.06/
+MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-4.07/
 #EXTRACT_SUFX= .tar.bz2
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
diff -r 39c11e7d8131 -r 408cb2793f18 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST  Thu Jul 19 09:25:11 2018 +0000
+++ b/lang/ocaml/PLIST  Thu Jul 19 12:16:38 2018 +0000
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.45 2018/01/10 14:30:34 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.46 2018/07/19 12:16:38 jaapb Exp $
 bin/ocaml
+bin/ocaml-instr-graph
+bin/ocaml-instr-report
 bin/ocamlc
 bin/ocamlc.byte
 ${PLIST.ocaml-opt}bin/ocamlc.opt
@@ -25,83 +27,44 @@
 bin/ocamlobjinfo
 bin/ocamlobjinfo.byte
 ${PLIST.ocaml-opt}bin/ocamlobjinfo.opt
-bin/ocamlopt
-bin/ocamlopt.byte
+${PLIST.ocaml-opt}bin/ocamlopt
+${PLIST.ocaml-opt}bin/ocamlopt.byte
 ${PLIST.ocaml-opt}bin/ocamlopt.opt
-bin/ocamloptp
-bin/ocamloptp.byte
-${PLIST.ocaml-opt}bin/ocamloptp.opt
-bin/ocamlprof
-bin/ocamlprof.byte
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}bin/ocamloptp
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}bin/ocamloptp.byte
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}bin/ocamloptp.opt
+${PLIST.ocaml-prof}bin/ocamlprof
+${PLIST.ocaml-prof}bin/ocamlprof.byte
 ${PLIST.ocaml-opt}bin/ocamlprof.opt
 bin/ocamlrun
+bin/ocamlrund
+bin/ocamlruni
 bin/ocamlyacc
 lib/ocaml/Makefile.config
 lib/ocaml/VERSION
-lib/ocaml/arg.cmi
-lib/ocaml/arg.cmt
-lib/ocaml/arg.cmti
-${PLIST.ocaml-opt}lib/ocaml/arg.cmx
 lib/ocaml/arg.ml
 lib/ocaml/arg.mli
-${PLIST.ocaml-prof}lib/ocaml/arg.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/arg.p.cmx
-lib/ocaml/array.cmi
-lib/ocaml/array.cmt
-lib/ocaml/array.cmti
-${PLIST.ocaml-opt}lib/ocaml/array.cmx
 lib/ocaml/array.ml
 lib/ocaml/array.mli
-${PLIST.ocaml-prof}lib/ocaml/array.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/array.p.cmx
-lib/ocaml/arrayLabels.cmi
-lib/ocaml/arrayLabels.cmt
-lib/ocaml/arrayLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/arrayLabels.cmx
 lib/ocaml/arrayLabels.ml
 lib/ocaml/arrayLabels.mli
-${PLIST.ocaml-prof}lib/ocaml/arrayLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/arrayLabels.p.cmx
 ${PLIST.ocaml-opt}lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cma
 lib/ocaml/bigarray.cmi
 lib/ocaml/bigarray.cmti
 ${PLIST.ocaml-opt}lib/ocaml/bigarray.cmx
 ${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxa
-${PLIST.ocaml-nat}lib/ocaml/bigarray.cmxs
+${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxs
+lib/ocaml/bigarray.ml
 lib/ocaml/bigarray.mli
-lib/ocaml/buffer.cmi
-lib/ocaml/buffer.cmt
-lib/ocaml/buffer.cmti
-${PLIST.ocaml-opt}lib/ocaml/buffer.cmx
 lib/ocaml/buffer.ml
 lib/ocaml/buffer.mli
-${PLIST.ocaml-prof}lib/ocaml/buffer.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/buffer.p.cmx
-lib/ocaml/bytes.cmi
-lib/ocaml/bytes.cmt
-lib/ocaml/bytes.cmti
-${PLIST.ocaml-opt}lib/ocaml/bytes.cmx
 lib/ocaml/bytes.ml
 lib/ocaml/bytes.mli
-${PLIST.ocaml-prof}lib/ocaml/bytes.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/bytes.p.cmx
-lib/ocaml/bytesLabels.cmi
-lib/ocaml/bytesLabels.cmt
-lib/ocaml/bytesLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/bytesLabels.cmx
 lib/ocaml/bytesLabels.ml
 lib/ocaml/bytesLabels.mli
-${PLIST.ocaml-prof}lib/ocaml/bytesLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/bytesLabels.p.cmx
-lib/ocaml/callback.cmi
-lib/ocaml/callback.cmt
-lib/ocaml/callback.cmti
-${PLIST.ocaml-opt}lib/ocaml/callback.cmx
 lib/ocaml/callback.ml
 lib/ocaml/callback.mli
-${PLIST.ocaml-prof}lib/ocaml/callback.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/callback.p.cmx
 lib/ocaml/caml/address_class.h
 lib/ocaml/caml/alloc.h
 lib/ocaml/caml/backtrace.h
@@ -141,6 +104,7 @@
 lib/ocaml/caml/minor_gc.h
 lib/ocaml/caml/misc.h
 lib/ocaml/caml/mlvalues.h
+lib/ocaml/caml/opnames.h
 lib/ocaml/caml/osdeps.h
 lib/ocaml/caml/prims.h
 lib/ocaml/caml/printexc.h
@@ -163,13 +127,6 @@
 lib/ocaml/caml/weak.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
-lib/ocaml/camlinternalBigarray.cmi
-lib/ocaml/camlinternalBigarray.cmt
-${PLIST.ocaml-opt}lib/ocaml/camlinternalBigarray.cmx
-lib/ocaml/camlinternalBigarray.ml
-${PLIST.ocaml-prof}lib/ocaml/camlinternalBigarray.p.cmi
-${PLIST.ocaml-prof}lib/ocaml/camlinternalBigarray.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalBigarray.p.cmx
 lib/ocaml/camlinternalFormat.cmi
 lib/ocaml/camlinternalFormat.cmt
 lib/ocaml/camlinternalFormat.cmti
@@ -210,14 +167,8 @@
 lib/ocaml/camlinternalOO.mli
 ${PLIST.ocaml-prof}lib/ocaml/camlinternalOO.p.cmt
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.p.cmx
-lib/ocaml/char.cmi
-lib/ocaml/char.cmt
-lib/ocaml/char.cmti
-${PLIST.ocaml-opt}lib/ocaml/char.cmx
 lib/ocaml/char.ml
 lib/ocaml/char.mli
-${PLIST.ocaml-prof}lib/ocaml/char.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/char.p.cmx
 lib/ocaml/compiler-libs/CSE.cmi
 lib/ocaml/compiler-libs/CSE.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmx
@@ -323,6 +274,11 @@
 lib/ocaml/compiler-libs/build_export_info.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/build_export_info.cmx
 lib/ocaml/compiler-libs/build_export_info.mli
+lib/ocaml/compiler-libs/build_path_prefix_map.cmi
+lib/ocaml/compiler-libs/build_path_prefix_map.cmt
+lib/ocaml/compiler-libs/build_path_prefix_map.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/build_path_prefix_map.cmx
+lib/ocaml/compiler-libs/build_path_prefix_map.mli
 lib/ocaml/compiler-libs/builtin_attributes.cmi
 lib/ocaml/compiler-libs/builtin_attributes.cmt
 lib/ocaml/compiler-libs/builtin_attributes.cmti
@@ -394,6 +350,10 @@
 lib/ocaml/compiler-libs/closure_offsets.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmx
 lib/ocaml/compiler-libs/closure_offsets.mli
+lib/ocaml/compiler-libs/closure_origin.cmi
+lib/ocaml/compiler-libs/closure_origin.cmt
+lib/ocaml/compiler-libs/closure_origin.cmti
+lib/ocaml/compiler-libs/closure_origin.mli
 lib/ocaml/compiler-libs/cmi_format.cmi
 lib/ocaml/compiler-libs/cmi_format.cmt
 lib/ocaml/compiler-libs/cmi_format.cmti
@@ -678,6 +638,10 @@
 lib/ocaml/compiler-libs/interf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.cmx
 lib/ocaml/compiler-libs/interf.mli
+lib/ocaml/compiler-libs/internal_variable_names.cmi
+lib/ocaml/compiler-libs/internal_variable_names.cmt
+lib/ocaml/compiler-libs/internal_variable_names.cmti
+lib/ocaml/compiler-libs/internal_variable_names.mli
 lib/ocaml/compiler-libs/interval.cmi
 lib/ocaml/compiler-libs/interval.cmt
 lib/ocaml/compiler-libs/interval.cmti
@@ -920,6 +884,11 @@
 lib/ocaml/compiler-libs/printmach.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printmach.cmx
 lib/ocaml/compiler-libs/printmach.mli
+lib/ocaml/compiler-libs/printpat.cmi
+lib/ocaml/compiler-libs/printpat.cmt
+lib/ocaml/compiler-libs/printpat.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printpat.cmx
+lib/ocaml/compiler-libs/printpat.mli
 lib/ocaml/compiler-libs/printtyp.cmi
 lib/ocaml/compiler-libs/printtyp.cmt
 lib/ocaml/compiler-libs/printtyp.cmti
@@ -1171,6 +1140,16 @@
 lib/ocaml/compiler-libs/translobj.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translobj.cmx
 lib/ocaml/compiler-libs/translobj.mli
+lib/ocaml/compiler-libs/translprim.cmi
+lib/ocaml/compiler-libs/translprim.cmt
+lib/ocaml/compiler-libs/translprim.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translprim.cmx
+lib/ocaml/compiler-libs/translprim.mli
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmi
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmt
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmx
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.mli
 lib/ocaml/compiler-libs/typeclass.cmi
 lib/ocaml/compiler-libs/typeclass.cmt
 lib/ocaml/compiler-libs/typeclass.cmti
@@ -1279,142 +1258,65 @@
 lib/ocaml/compiler-libs/x86_proc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_proc.cmx
 lib/ocaml/compiler-libs/x86_proc.mli
-lib/ocaml/complex.cmi
-lib/ocaml/complex.cmt
-lib/ocaml/complex.cmti
-${PLIST.ocaml-opt}lib/ocaml/complex.cmx
 lib/ocaml/complex.ml
 lib/ocaml/complex.mli
-${PLIST.ocaml-prof}lib/ocaml/complex.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/complex.p.cmx
 lib/ocaml/condition.mli
-lib/ocaml/digest.cmi
-lib/ocaml/digest.cmt
-lib/ocaml/digest.cmti
-${PLIST.ocaml-opt}lib/ocaml/digest.cmx
 lib/ocaml/digest.ml
 lib/ocaml/digest.mli
-${PLIST.ocaml-prof}lib/ocaml/digest.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/digest.p.cmx
-${PLIST.ocaml-opt}${PLIST.ocaml-nat}lib/ocaml/dynlink.a
-${PLIST.ocaml-opt}lib/ocaml/dynlink.cma
-${PLIST.ocaml-opt}lib/ocaml/dynlink.cmi
-${PLIST.ocaml-opt}lib/ocaml/dynlink.cmti
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.cmx
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.cmxa
-${PLIST.ocaml-opt}lib/ocaml/dynlink.mli
-lib/ocaml/ephemeron.cmi
-lib/ocaml/ephemeron.cmt
-lib/ocaml/ephemeron.cmti
-${PLIST.ocaml-opt}lib/ocaml/ephemeron.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink.a
+lib/ocaml/dynlink.cma
+lib/ocaml/dynlink.cmi
+lib/ocaml/dynlink.cmti
+${PLIST.ocaml-opt}lib/ocaml/dynlink.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink.cmxa
+lib/ocaml/dynlink.mli
 lib/ocaml/ephemeron.ml
 lib/ocaml/ephemeron.mli
-${PLIST.ocaml-prof}lib/ocaml/ephemeron.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/ephemeron.p.cmx
 lib/ocaml/event.mli
 lib/ocaml/expunge
 lib/ocaml/extract_crc
-lib/ocaml/filename.cmi
-lib/ocaml/filename.cmt
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/camlp4 Updated lang/camlp4 to version 4.07+1.
Next by Date: [pkgsrc/trunk]: pkgsrc/graphics graphics/Makefile: Add go-smartcrop
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/camlp4 Updated lang/camlp4 to version 4.07+1.
Next by Thread: [pkgsrc/trunk]: pkgsrc/graphics graphics/Makefile: Add go-smartcrop
Indexes:
Home | Main Index | Thread Index | Old Index