summaryrefslogtreecommitdiff
path: root/lang/ocaml
diff options
context:
space:
mode:
authorjaapb <jaapb@pkgsrc.org>2018-07-19 12:16:38 +0000
committerjaapb <jaapb@pkgsrc.org>2018-07-19 12:16:38 +0000
commit26a49bada0de9cdef3162b3593ba8a8878e32eba (patch)
treef2db6bad9276650d373965052abf41e01f01e306 /lang/ocaml
parent8cdf1980ddc35659b79cfdac53be8c910879b9c5 (diff)
downloadpkgsrc-26a49bada0de9cdef3162b3593ba8a8878e32eba.tar.gz
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 (limited to 'lang/ocaml')
-rw-r--r--lang/ocaml/Makefile7
-rw-r--r--lang/ocaml/Makefile.common6
-rw-r--r--lang/ocaml/PLIST765
-rw-r--r--lang/ocaml/buildlink3.mk6
-rw-r--r--lang/ocaml/distinfo26
-rw-r--r--lang/ocaml/patches/patch-Makefile134
-rw-r--r--lang/ocaml/patches/patch-Makefile.common18
-rw-r--r--lang/ocaml/patches/patch-asmrun_Makefile14
-rw-r--r--lang/ocaml/patches/patch-byterun_Makefile20
-rw-r--r--lang/ocaml/patches/patch-configure46
-rw-r--r--lang/ocaml/patches/patch-ocamldoc_Makefile41
-rw-r--r--lang/ocaml/patches/patch-otherlibs_dynlink_Makefile21
-rw-r--r--lang/ocaml/patches/patch-otherlibs_systhreads_Makefile41
-rw-r--r--lang/ocaml/patches/patch-otherlibs_threads_Makefile51
-rw-r--r--lang/ocaml/patches/patch-stdlib_Makefile47
-rw-r--r--lang/ocaml/patches/patch-testsuite_tests_tool-ocamldoc-man_Makefile24
16 files changed, 567 insertions, 700 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 74f2936da1e..b41e069207c 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -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 @@ BUILD_TARGET= world
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 @@ EXTRA_RT_LIBS.*=
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 --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 32cb3494a54..6f2cff10069 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -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
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index ec9caf84217..25a86ecac4f 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -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 @@ ${PLIST.ocaml-opt}bin/ocamlmktop.opt
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/memory.h
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/version.h
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.ml
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.cmt
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.cmt
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.cmt
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.cmt
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.cmt
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.cmt
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
-lib/ocaml/filename.cmti
-${PLIST.ocaml-opt}lib/ocaml/filename.cmx
lib/ocaml/filename.ml
lib/ocaml/filename.mli
-${PLIST.ocaml-prof}lib/ocaml/filename.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/filename.p.cmx
-lib/ocaml/format.cmi
-lib/ocaml/format.cmt
-lib/ocaml/format.cmti
-${PLIST.ocaml-opt}lib/ocaml/format.cmx
+lib/ocaml/float.ml
+lib/ocaml/float.mli
lib/ocaml/format.ml
lib/ocaml/format.mli
-${PLIST.ocaml-prof}lib/ocaml/format.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/format.p.cmx
-lib/ocaml/gc.cmi
-lib/ocaml/gc.cmt
-lib/ocaml/gc.cmti
-${PLIST.ocaml-opt}lib/ocaml/gc.cmx
lib/ocaml/gc.ml
lib/ocaml/gc.mli
-${PLIST.ocaml-prof}lib/ocaml/gc.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/gc.p.cmx
-lib/ocaml/genlex.cmi
-lib/ocaml/genlex.cmt
-lib/ocaml/genlex.cmti
-${PLIST.ocaml-opt}lib/ocaml/genlex.cmx
lib/ocaml/genlex.ml
lib/ocaml/genlex.mli
-${PLIST.ocaml-prof}lib/ocaml/genlex.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/genlex.p.cmx
-lib/ocaml/hashtbl.cmi
-lib/ocaml/hashtbl.cmt
-lib/ocaml/hashtbl.cmti
-${PLIST.ocaml-opt}lib/ocaml/hashtbl.cmx
lib/ocaml/hashtbl.ml
lib/ocaml/hashtbl.mli
-${PLIST.ocaml-prof}lib/ocaml/hashtbl.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/hashtbl.p.cmx
-lib/ocaml/int32.cmi
-lib/ocaml/int32.cmt
-lib/ocaml/int32.cmti
-${PLIST.ocaml-opt}lib/ocaml/int32.cmx
lib/ocaml/int32.ml
lib/ocaml/int32.mli
-${PLIST.ocaml-prof}lib/ocaml/int32.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/int32.p.cmx
-lib/ocaml/int64.cmi
-lib/ocaml/int64.cmt
-lib/ocaml/int64.cmti
-${PLIST.ocaml-opt}lib/ocaml/int64.cmx
lib/ocaml/int64.ml
lib/ocaml/int64.mli
-${PLIST.ocaml-prof}lib/ocaml/int64.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/int64.p.cmx
-lib/ocaml/lazy.cmi
-lib/ocaml/lazy.cmt
-lib/ocaml/lazy.cmti
-${PLIST.ocaml-opt}lib/ocaml/lazy.cmx
lib/ocaml/lazy.ml
lib/ocaml/lazy.mli
-${PLIST.ocaml-prof}lib/ocaml/lazy.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/lazy.p.cmx
lib/ocaml/ld.conf
-lib/ocaml/lexing.cmi
-lib/ocaml/lexing.cmt
-lib/ocaml/lexing.cmti
-${PLIST.ocaml-opt}lib/ocaml/lexing.cmx
lib/ocaml/lexing.ml
lib/ocaml/lexing.mli
-${PLIST.ocaml-prof}lib/ocaml/lexing.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/lexing.p.cmx
${PLIST.ocaml-opt}lib/ocaml/libasmrun.a
${PLIST.ocaml-opt}lib/ocaml/libasmrun_pic.a
-lib/ocaml/libasmrun_shared.so
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
+${PLIST.ocaml-opt}lib/ocaml/libasmrun_shared.so
+${PLIST.ocaml-opt}lib/ocaml/libasmrund.a
+${PLIST.ocaml-opt}lib/ocaml/libasmruni.a
+${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
${PLIST.ocaml-opt}lib/ocaml/libbigarray.a
${PLIST.ocaml-opt}lib/ocaml/libcamlrun.a
${PLIST.ocaml-opt}lib/ocaml/libcamlrun_pic.a
-lib/ocaml/libcamlrun_shared.so
+${PLIST.ocaml-opt}lib/ocaml/libcamlrun_shared.so
+${PLIST.ocaml-opt}lib/ocaml/libcamlrund.a
+${PLIST.ocaml-opt}lib/ocaml/libcamlruni.a
${PLIST.ocaml-opt}lib/ocaml/libcamlstr.a
+${PLIST.ocaml-opt}lib/ocaml/libraw_spacetime_lib.a
${PLIST.ocaml-opt}lib/ocaml/libthreads.a
${PLIST.ocaml-opt}lib/ocaml/libthreadsnat.a
${PLIST.ocaml-opt}lib/ocaml/libunix.a
-lib/ocaml/list.cmi
-lib/ocaml/list.cmt
-lib/ocaml/list.cmti
-${PLIST.ocaml-opt}lib/ocaml/list.cmx
lib/ocaml/list.ml
lib/ocaml/list.mli
-${PLIST.ocaml-prof}lib/ocaml/list.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/list.p.cmx
-lib/ocaml/listLabels.cmi
-lib/ocaml/listLabels.cmt
-lib/ocaml/listLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/listLabels.cmx
lib/ocaml/listLabels.ml
lib/ocaml/listLabels.mli
-${PLIST.ocaml-prof}lib/ocaml/listLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/listLabels.p.cmx
lib/ocaml/${PKGMANDIR}/man1/ocaml.1
lib/ocaml/${PKGMANDIR}/man1/ocamlc.1
lib/ocaml/${PKGMANDIR}/man1/ocamlc.opt.1
@@ -1431,6 +1333,8 @@ lib/ocaml/${PKGMANDIR}/man1/ocamlprof.1
lib/ocaml/${PKGMANDIR}/man1/ocamlrun.1
lib/ocaml/${PKGMANDIR}/man1/ocamlyacc.1
lib/ocaml/${PKGMANDIR}/man3/Arg.3
+lib/ocaml/${PKGMANDIR}/man3/Arg_helper.3
+lib/ocaml/${PKGMANDIR}/man3/Arg_helper.Make.3
lib/ocaml/${PKGMANDIR}/man3/Array.3
lib/ocaml/${PKGMANDIR}/man3/ArrayLabels.3
lib/ocaml/${PKGMANDIR}/man3/Ast_helper.3
@@ -1470,6 +1374,7 @@ lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array2.3
lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array3.3
lib/ocaml/${PKGMANDIR}/man3/Bigarray.Genarray.3
lib/ocaml/${PKGMANDIR}/man3/Buffer.3
+lib/ocaml/${PKGMANDIR}/man3/Build_path_prefix_map.3
lib/ocaml/${PKGMANDIR}/man3/Builtin_attributes.3
lib/ocaml/${PKGMANDIR}/man3/Bytes.3
lib/ocaml/${PKGMANDIR}/man3/BytesLabels.3
@@ -1479,13 +1384,21 @@ lib/ocaml/${PKGMANDIR}/man3/CamlinternalFormatBasics.3
lib/ocaml/${PKGMANDIR}/man3/CamlinternalLazy.3
lib/ocaml/${PKGMANDIR}/man3/CamlinternalMod.3
lib/ocaml/${PKGMANDIR}/man3/CamlinternalOO.3
+lib/ocaml/${PKGMANDIR}/man3/Ccomp.3
lib/ocaml/${PKGMANDIR}/man3/Char.3
+lib/ocaml/${PKGMANDIR}/man3/Clflags.3
+lib/ocaml/${PKGMANDIR}/man3/Clflags.Float_arg_helper.3
+lib/ocaml/${PKGMANDIR}/man3/Clflags.Int_arg_helper.3
lib/ocaml/${PKGMANDIR}/man3/Complex.3
+lib/ocaml/${PKGMANDIR}/man3/Condition.3
+lib/ocaml/${PKGMANDIR}/man3/Config.3
+lib/ocaml/${PKGMANDIR}/man3/Consistbl.3
lib/ocaml/${PKGMANDIR}/man3/Depend.3
lib/ocaml/${PKGMANDIR}/man3/Depend.StringMap.3
lib/ocaml/${PKGMANDIR}/man3/Depend.StringSet.3
lib/ocaml/${PKGMANDIR}/man3/Digest.3
lib/ocaml/${PKGMANDIR}/man3/Docstrings.3
+lib/ocaml/${PKGMANDIR}/man3/Dynlink.3
lib/ocaml/${PKGMANDIR}/man3/Ephemeron.3
lib/ocaml/${PKGMANDIR}/man3/Ephemeron.GenHashTable.3
lib/ocaml/${PKGMANDIR}/man3/Ephemeron.GenHashTable.MakeSeeded.3
@@ -1500,10 +1413,15 @@ lib/ocaml/${PKGMANDIR}/man3/Ephemeron.Kn.Make.3
lib/ocaml/${PKGMANDIR}/man3/Ephemeron.Kn.MakeSeeded.3
lib/ocaml/${PKGMANDIR}/man3/Ephemeron.S.3
lib/ocaml/${PKGMANDIR}/man3/Ephemeron.SeededS.3
+lib/ocaml/${PKGMANDIR}/man3/Event.3
lib/ocaml/${PKGMANDIR}/man3/Filename.3
+lib/ocaml/${PKGMANDIR}/man3/Float.3
+lib/ocaml/${PKGMANDIR}/man3/Float.Array.3
lib/ocaml/${PKGMANDIR}/man3/Format.3
lib/ocaml/${PKGMANDIR}/man3/Gc.3
lib/ocaml/${PKGMANDIR}/man3/Genlex.3
+lib/ocaml/${PKGMANDIR}/man3/Graphics.3
+lib/ocaml/${PKGMANDIR}/man3/GraphicsX11.3
lib/ocaml/${PKGMANDIR}/man3/Hashtbl.3
lib/ocaml/${PKGMANDIR}/man3/Hashtbl.HashedType.3
lib/ocaml/${PKGMANDIR}/man3/Hashtbl.Make.3
@@ -1511,6 +1429,21 @@ lib/ocaml/${PKGMANDIR}/man3/Hashtbl.MakeSeeded.3
lib/ocaml/${PKGMANDIR}/man3/Hashtbl.S.3
lib/ocaml/${PKGMANDIR}/man3/Hashtbl.SeededHashedType.3
lib/ocaml/${PKGMANDIR}/man3/Hashtbl.SeededS.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.Make.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.Map.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.Map.T.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.Pair.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.Map.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.Set.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.T.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.Tbl.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.Set.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.Set.T.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.Tbl.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.Tbl.T.3
+lib/ocaml/${PKGMANDIR}/man3/Identifiable.Thing.3
lib/ocaml/${PKGMANDIR}/man3/Int32.3
lib/ocaml/${PKGMANDIR}/man3/Int64.3
lib/ocaml/${PKGMANDIR}/man3/Lazy.3
@@ -1525,6 +1458,18 @@ lib/ocaml/${PKGMANDIR}/man3/Map.Make.3
lib/ocaml/${PKGMANDIR}/man3/Map.OrderedType.3
lib/ocaml/${PKGMANDIR}/man3/Map.S.3
lib/ocaml/${PKGMANDIR}/man3/Marshal.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.Color.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.HookSig.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.Int_literal_converter.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.LongString.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.MakeHooks.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.Stdlib.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.Stdlib.Array.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.Stdlib.List.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.Stdlib.Option.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.StringMap.3
+lib/ocaml/${PKGMANDIR}/man3/Misc.StringSet.3
lib/ocaml/${PKGMANDIR}/man3/MoreLabels.3
lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.3
lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.HashedType.3
@@ -1541,7 +1486,13 @@ lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.3
lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.Make.3
lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.OrderedType.3
lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.S.3
+lib/ocaml/${PKGMANDIR}/man3/Mutex.3
lib/ocaml/${PKGMANDIR}/man3/Nativeint.3
+lib/ocaml/${PKGMANDIR}/man3/Numbers.3
+lib/ocaml/${PKGMANDIR}/man3/Numbers.Float.3
+lib/ocaml/${PKGMANDIR}/man3/Numbers.Int.3
+lib/ocaml/${PKGMANDIR}/man3/Numbers.Int16.3
+lib/ocaml/${PKGMANDIR}/man3/Numbers.Int8.3
lib/ocaml/${PKGMANDIR}/man3/Obj.3
lib/ocaml/${PKGMANDIR}/man3/Obj.Ephemeron.3
lib/ocaml/${PKGMANDIR}/man3/Oo.3
@@ -1551,20 +1502,27 @@ lib/ocaml/${PKGMANDIR}/man3/Parsetree.3
lib/ocaml/${PKGMANDIR}/man3/Parsing.3
lib/ocaml/${PKGMANDIR}/man3/Pervasives.3
lib/ocaml/${PKGMANDIR}/man3/Pervasives.LargeFile.3
+lib/ocaml/${PKGMANDIR}/man3/Pparse.3
+lib/ocaml/${PKGMANDIR}/man3/Pparse.ImplementationHooks.3
+lib/ocaml/${PKGMANDIR}/man3/Pparse.InterfaceHooks.3
lib/ocaml/${PKGMANDIR}/man3/Pprintast.3
lib/ocaml/${PKGMANDIR}/man3/Printast.3
lib/ocaml/${PKGMANDIR}/man3/Printexc.3
lib/ocaml/${PKGMANDIR}/man3/Printexc.Slot.3
lib/ocaml/${PKGMANDIR}/man3/Printf.3
+lib/ocaml/${PKGMANDIR}/man3/Profile.3
lib/ocaml/${PKGMANDIR}/man3/Queue.3
lib/ocaml/${PKGMANDIR}/man3/Random.3
lib/ocaml/${PKGMANDIR}/man3/Random.State.3
lib/ocaml/${PKGMANDIR}/man3/Scanf.3
lib/ocaml/${PKGMANDIR}/man3/Scanf.Scanning.3
+lib/ocaml/${PKGMANDIR}/man3/Seq.3
lib/ocaml/${PKGMANDIR}/man3/Set.3
lib/ocaml/${PKGMANDIR}/man3/Set.Make.3
lib/ocaml/${PKGMANDIR}/man3/Set.OrderedType.3
lib/ocaml/${PKGMANDIR}/man3/Set.S.3
+lib/ocaml/${PKGMANDIR}/man3/Simplif.3
+lib/ocaml/${PKGMANDIR}/man3/Simplif.Hooks.3
lib/ocaml/${PKGMANDIR}/man3/Sort.3
lib/ocaml/${PKGMANDIR}/man3/Spacetime.3
lib/ocaml/${PKGMANDIR}/man3/Spacetime.Series.3
@@ -1579,55 +1537,40 @@ lib/ocaml/${PKGMANDIR}/man3/Str.3
lib/ocaml/${PKGMANDIR}/man3/Stream.3
lib/ocaml/${PKGMANDIR}/man3/String.3
lib/ocaml/${PKGMANDIR}/man3/StringLabels.3
+lib/ocaml/${PKGMANDIR}/man3/Strongly_connected_components.3
+lib/ocaml/${PKGMANDIR}/man3/Strongly_connected_components.Make.3
+lib/ocaml/${PKGMANDIR}/man3/Strongly_connected_components.S.3
+lib/ocaml/${PKGMANDIR}/man3/Strongly_connected_components.S.Id.3
lib/ocaml/${PKGMANDIR}/man3/Syntaxerr.3
lib/ocaml/${PKGMANDIR}/man3/Sys.3
+lib/ocaml/${PKGMANDIR}/man3/Targetint.3
+lib/ocaml/${PKGMANDIR}/man3/Tbl.3
+lib/ocaml/${PKGMANDIR}/man3/Terminfo.3
+lib/ocaml/${PKGMANDIR}/man3/Thread.3
+lib/ocaml/${PKGMANDIR}/man3/ThreadUnix.3
+lib/ocaml/${PKGMANDIR}/man3/Typemod.3
+lib/ocaml/${PKGMANDIR}/man3/Typemod.ImplementationHooks.3
+lib/ocaml/${PKGMANDIR}/man3/Typemod.InterfaceHooks.3
lib/ocaml/${PKGMANDIR}/man3/Uchar.3
lib/ocaml/${PKGMANDIR}/man3/Unix.3
lib/ocaml/${PKGMANDIR}/man3/Unix.LargeFile.3
+lib/ocaml/${PKGMANDIR}/man3/UnixLabels.3
+lib/ocaml/${PKGMANDIR}/man3/UnixLabels.LargeFile.3
+lib/ocaml/${PKGMANDIR}/man3/Warnings.3
lib/ocaml/${PKGMANDIR}/man3/Weak.3
lib/ocaml/${PKGMANDIR}/man3/Weak.Make.3
lib/ocaml/${PKGMANDIR}/man3/Weak.S.3
-lib/ocaml/map.cmi
-lib/ocaml/map.cmt
-lib/ocaml/map.cmti
-${PLIST.ocaml-opt}lib/ocaml/map.cmx
lib/ocaml/map.ml
lib/ocaml/map.mli
-${PLIST.ocaml-prof}lib/ocaml/map.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/map.p.cmx
-lib/ocaml/marshal.cmi
-lib/ocaml/marshal.cmt
-lib/ocaml/marshal.cmti
-${PLIST.ocaml-opt}lib/ocaml/marshal.cmx
lib/ocaml/marshal.ml
lib/ocaml/marshal.mli
-${PLIST.ocaml-prof}lib/ocaml/marshal.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/marshal.p.cmx
-lib/ocaml/moreLabels.cmi
-lib/ocaml/moreLabels.cmt
-lib/ocaml/moreLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/moreLabels.cmx
lib/ocaml/moreLabels.ml
lib/ocaml/moreLabels.mli
-${PLIST.ocaml-prof}lib/ocaml/moreLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/moreLabels.p.cmx
lib/ocaml/mutex.mli
-lib/ocaml/nativeint.cmi
-lib/ocaml/nativeint.cmt
-lib/ocaml/nativeint.cmti
-${PLIST.ocaml-opt}lib/ocaml/nativeint.cmx
lib/ocaml/nativeint.ml
lib/ocaml/nativeint.mli
-${PLIST.ocaml-prof}lib/ocaml/nativeint.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/nativeint.p.cmx
-lib/ocaml/obj.cmi
-lib/ocaml/obj.cmt
-lib/ocaml/obj.cmti
-${PLIST.ocaml-opt}lib/ocaml/obj.cmx
lib/ocaml/obj.ml
lib/ocaml/obj.mli
-${PLIST.ocaml-prof}lib/ocaml/obj.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/obj.p.cmx
lib/ocaml/objinfo_helper
lib/ocaml/ocamldoc/ocamldoc.hva
lib/ocaml/ocamldoc/odoc.cmi
@@ -1731,123 +1674,46 @@ lib/ocaml/ocamldoc/odoc_types.cmi
${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_types.cmx
lib/ocaml/ocamldoc/odoc_value.cmi
${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_value.cmx
-lib/ocaml/oo.cmi
-lib/ocaml/oo.cmt
-lib/ocaml/oo.cmti
-${PLIST.ocaml-opt}lib/ocaml/oo.cmx
lib/ocaml/oo.ml
lib/ocaml/oo.mli
-${PLIST.ocaml-prof}lib/ocaml/oo.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/oo.p.cmx
-lib/ocaml/parsing.cmi
-lib/ocaml/parsing.cmt
-lib/ocaml/parsing.cmti
-${PLIST.ocaml-opt}lib/ocaml/parsing.cmx
lib/ocaml/parsing.ml
lib/ocaml/parsing.mli
-${PLIST.ocaml-prof}lib/ocaml/parsing.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/parsing.p.cmx
-lib/ocaml/pervasives.cmi
-lib/ocaml/pervasives.cmt
-lib/ocaml/pervasives.cmti
-${PLIST.ocaml-opt}lib/ocaml/pervasives.cmx
-lib/ocaml/pervasives.ml
-lib/ocaml/pervasives.mli
-${PLIST.ocaml-prof}lib/ocaml/pervasives.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/pervasives.p.cmx
-lib/ocaml/printexc.cmi
-lib/ocaml/printexc.cmt
-lib/ocaml/printexc.cmti
-${PLIST.ocaml-opt}lib/ocaml/printexc.cmx
lib/ocaml/printexc.ml
lib/ocaml/printexc.mli
-${PLIST.ocaml-prof}lib/ocaml/printexc.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/printexc.p.cmx
-lib/ocaml/printf.cmi
-lib/ocaml/printf.cmt
-lib/ocaml/printf.cmti
-${PLIST.ocaml-opt}lib/ocaml/printf.cmx
lib/ocaml/printf.ml
lib/ocaml/printf.mli
-${PLIST.ocaml-prof}lib/ocaml/printf.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/printf.p.cmx
lib/ocaml/profiling.cmi
lib/ocaml/profiling.cmo
lib/ocaml/profiling.cmt
lib/ocaml/profiling.cmti
${PLIST.ocaml-opt}lib/ocaml/profiling.cmx
lib/ocaml/profiling.o
-lib/ocaml/queue.cmi
-lib/ocaml/queue.cmt
-lib/ocaml/queue.cmti
-${PLIST.ocaml-opt}lib/ocaml/queue.cmx
lib/ocaml/queue.ml
lib/ocaml/queue.mli
-${PLIST.ocaml-prof}lib/ocaml/queue.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/queue.p.cmx
-lib/ocaml/random.cmi
-lib/ocaml/random.cmt
-lib/ocaml/random.cmti
-${PLIST.ocaml-opt}lib/ocaml/random.cmx
lib/ocaml/random.ml
lib/ocaml/random.mli
-${PLIST.ocaml-prof}lib/ocaml/random.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/random.p.cmx
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.a
-${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cma
-${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cmi
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmx
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmxa
-${PLIST.ocaml-spacetime}${PLIST.ocaml-nat}lib/ocaml/raw_spacetime_lib.cmxs
-${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.mli
-lib/ocaml/scanf.cmi
-lib/ocaml/scanf.cmt
-lib/ocaml/scanf.cmti
-${PLIST.ocaml-opt}lib/ocaml/scanf.cmx
+${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.a
+lib/ocaml/raw_spacetime_lib.cma
+lib/ocaml/raw_spacetime_lib.cmi
+lib/ocaml/raw_spacetime_lib.cmti
+${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmx
+${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmxa
+${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmxs
+lib/ocaml/raw_spacetime_lib.mli
lib/ocaml/scanf.ml
lib/ocaml/scanf.mli
-${PLIST.ocaml-prof}lib/ocaml/scanf.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/scanf.p.cmx
-lib/ocaml/set.cmi
-lib/ocaml/set.cmt
-lib/ocaml/set.cmti
-${PLIST.ocaml-opt}lib/ocaml/set.cmx
+lib/ocaml/seq.ml
+lib/ocaml/seq.mli
lib/ocaml/set.ml
lib/ocaml/set.mli
-${PLIST.ocaml-prof}lib/ocaml/set.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/set.p.cmx
-lib/ocaml/sort.cmi
-lib/ocaml/sort.cmt
-lib/ocaml/sort.cmti
-${PLIST.ocaml-opt}lib/ocaml/sort.cmx
lib/ocaml/sort.ml
lib/ocaml/sort.mli
-${PLIST.ocaml-prof}lib/ocaml/sort.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/sort.p.cmx
-lib/ocaml/spacetime.cmi
-lib/ocaml/spacetime.cmt
-lib/ocaml/spacetime.cmti
-${PLIST.ocaml-opt}lib/ocaml/spacetime.cmx
lib/ocaml/spacetime.ml
lib/ocaml/spacetime.mli
-${PLIST.ocaml-prof}lib/ocaml/spacetime.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/spacetime.p.cmx
-lib/ocaml/stack.cmi
-lib/ocaml/stack.cmt
-lib/ocaml/stack.cmti
-${PLIST.ocaml-opt}lib/ocaml/stack.cmx
lib/ocaml/stack.ml
lib/ocaml/stack.mli
-${PLIST.ocaml-prof}lib/ocaml/stack.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stack.p.cmx
-lib/ocaml/stdLabels.cmi
-lib/ocaml/stdLabels.cmt
-lib/ocaml/stdLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdLabels.cmx
lib/ocaml/stdLabels.ml
lib/ocaml/stdLabels.mli
-${PLIST.ocaml-prof}lib/ocaml/stdLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdLabels.p.cmx
lib/ocaml/std_exit.cmi
lib/ocaml/std_exit.cmo
lib/ocaml/std_exit.cmt
@@ -1859,54 +1725,329 @@ ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.cmx
${PLIST.ocaml-prof}lib/ocaml/std_exit.p.o
${PLIST.ocaml-opt}lib/ocaml/stdlib.a
lib/ocaml/stdlib.cma
+lib/ocaml/stdlib.cmi
+lib/ocaml/stdlib.cmt
+lib/ocaml/stdlib.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib.cmx
${PLIST.ocaml-opt}lib/ocaml/stdlib.cmxa
+lib/ocaml/stdlib.ml
+lib/ocaml/stdlib.mli
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.a
+${PLIST.ocaml-prof}lib/ocaml/stdlib.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmx
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmxa
+lib/ocaml/stdlib__arg.cmi
+lib/ocaml/stdlib__arg.cmt
+lib/ocaml/stdlib__arg.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__arg.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.p.cmx
+lib/ocaml/stdlib__array.cmi
+lib/ocaml/stdlib__array.cmt
+lib/ocaml/stdlib__array.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__array.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__array.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__array.p.cmx
+lib/ocaml/stdlib__arrayLabels.cmi
+lib/ocaml/stdlib__arrayLabels.cmt
+lib/ocaml/stdlib__arrayLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__arrayLabels.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.p.cmx
+lib/ocaml/stdlib__bigarray.cmi
+lib/ocaml/stdlib__bigarray.cmt
+lib/ocaml/stdlib__bigarray.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__bigarray.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.p.cmx
+lib/ocaml/stdlib__buffer.cmi
+lib/ocaml/stdlib__buffer.cmt
+lib/ocaml/stdlib__buffer.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__buffer.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.p.cmx
+lib/ocaml/stdlib__bytes.cmi
+lib/ocaml/stdlib__bytes.cmt
+lib/ocaml/stdlib__bytes.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__bytes.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.p.cmx
+lib/ocaml/stdlib__bytesLabels.cmi
+lib/ocaml/stdlib__bytesLabels.cmt
+lib/ocaml/stdlib__bytesLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__bytesLabels.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.p.cmx
+lib/ocaml/stdlib__callback.cmi
+lib/ocaml/stdlib__callback.cmt
+lib/ocaml/stdlib__callback.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__callback.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.p.cmx
+lib/ocaml/stdlib__char.cmi
+lib/ocaml/stdlib__char.cmt
+lib/ocaml/stdlib__char.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__char.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__char.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__char.p.cmx
+lib/ocaml/stdlib__complex.cmi
+lib/ocaml/stdlib__complex.cmt
+lib/ocaml/stdlib__complex.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__complex.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.p.cmx
+lib/ocaml/stdlib__digest.cmi
+lib/ocaml/stdlib__digest.cmt
+lib/ocaml/stdlib__digest.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__digest.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.p.cmx
+lib/ocaml/stdlib__ephemeron.cmi
+lib/ocaml/stdlib__ephemeron.cmt
+lib/ocaml/stdlib__ephemeron.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__ephemeron.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.p.cmx
+lib/ocaml/stdlib__filename.cmi
+lib/ocaml/stdlib__filename.cmt
+lib/ocaml/stdlib__filename.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__filename.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.p.cmx
+lib/ocaml/stdlib__float.cmi
+lib/ocaml/stdlib__float.cmt
+lib/ocaml/stdlib__float.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__float.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__float.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__float.p.cmx
+lib/ocaml/stdlib__format.cmi
+lib/ocaml/stdlib__format.cmt
+lib/ocaml/stdlib__format.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__format.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__format.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__format.p.cmx
+lib/ocaml/stdlib__gc.cmi
+lib/ocaml/stdlib__gc.cmt
+lib/ocaml/stdlib__gc.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__gc.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.p.cmx
+lib/ocaml/stdlib__genlex.cmi
+lib/ocaml/stdlib__genlex.cmt
+lib/ocaml/stdlib__genlex.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__genlex.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.p.cmx
+lib/ocaml/stdlib__hashtbl.cmi
+lib/ocaml/stdlib__hashtbl.cmt
+lib/ocaml/stdlib__hashtbl.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__hashtbl.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.p.cmx
+lib/ocaml/stdlib__int32.cmi
+lib/ocaml/stdlib__int32.cmt
+lib/ocaml/stdlib__int32.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__int32.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.p.cmx
+lib/ocaml/stdlib__int64.cmi
+lib/ocaml/stdlib__int64.cmt
+lib/ocaml/stdlib__int64.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__int64.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.p.cmx
+lib/ocaml/stdlib__lazy.cmi
+lib/ocaml/stdlib__lazy.cmt
+lib/ocaml/stdlib__lazy.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__lazy.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.p.cmx
+lib/ocaml/stdlib__lexing.cmi
+lib/ocaml/stdlib__lexing.cmt
+lib/ocaml/stdlib__lexing.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__lexing.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.p.cmx
+lib/ocaml/stdlib__list.cmi
+lib/ocaml/stdlib__list.cmt
+lib/ocaml/stdlib__list.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__list.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__list.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__list.p.cmx
+lib/ocaml/stdlib__listLabels.cmi
+lib/ocaml/stdlib__listLabels.cmt
+lib/ocaml/stdlib__listLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__listLabels.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.p.cmx
+lib/ocaml/stdlib__map.cmi
+lib/ocaml/stdlib__map.cmt
+lib/ocaml/stdlib__map.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__map.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__map.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__map.p.cmx
+lib/ocaml/stdlib__marshal.cmi
+lib/ocaml/stdlib__marshal.cmt
+lib/ocaml/stdlib__marshal.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__marshal.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.p.cmx
+lib/ocaml/stdlib__moreLabels.cmi
+lib/ocaml/stdlib__moreLabels.cmt
+lib/ocaml/stdlib__moreLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__moreLabels.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.p.cmx
+lib/ocaml/stdlib__nativeint.cmi
+lib/ocaml/stdlib__nativeint.cmt
+lib/ocaml/stdlib__nativeint.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__nativeint.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.p.cmx
+lib/ocaml/stdlib__obj.cmi
+lib/ocaml/stdlib__obj.cmt
+lib/ocaml/stdlib__obj.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__obj.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.p.cmx
+lib/ocaml/stdlib__oo.cmi
+lib/ocaml/stdlib__oo.cmt
+lib/ocaml/stdlib__oo.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__oo.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.p.cmx
+lib/ocaml/stdlib__parsing.cmi
+lib/ocaml/stdlib__parsing.cmt
+lib/ocaml/stdlib__parsing.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__parsing.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.p.cmx
+lib/ocaml/stdlib__printexc.cmi
+lib/ocaml/stdlib__printexc.cmt
+lib/ocaml/stdlib__printexc.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__printexc.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.p.cmx
+lib/ocaml/stdlib__printf.cmi
+lib/ocaml/stdlib__printf.cmt
+lib/ocaml/stdlib__printf.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__printf.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.p.cmx
+lib/ocaml/stdlib__queue.cmi
+lib/ocaml/stdlib__queue.cmt
+lib/ocaml/stdlib__queue.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__queue.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.p.cmx
+lib/ocaml/stdlib__random.cmi
+lib/ocaml/stdlib__random.cmt
+lib/ocaml/stdlib__random.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__random.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__random.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__random.p.cmx
+lib/ocaml/stdlib__scanf.cmi
+lib/ocaml/stdlib__scanf.cmt
+lib/ocaml/stdlib__scanf.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__scanf.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.p.cmx
+lib/ocaml/stdlib__seq.cmi
+lib/ocaml/stdlib__seq.cmt
+lib/ocaml/stdlib__seq.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__seq.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.p.cmx
+lib/ocaml/stdlib__set.cmi
+lib/ocaml/stdlib__set.cmt
+lib/ocaml/stdlib__set.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__set.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__set.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__set.p.cmx
+lib/ocaml/stdlib__sort.cmi
+lib/ocaml/stdlib__sort.cmt
+lib/ocaml/stdlib__sort.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__sort.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__sort.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__sort.p.cmx
+lib/ocaml/stdlib__spacetime.cmi
+lib/ocaml/stdlib__spacetime.cmt
+lib/ocaml/stdlib__spacetime.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__spacetime.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.p.cmx
+lib/ocaml/stdlib__stack.cmi
+lib/ocaml/stdlib__stack.cmt
+lib/ocaml/stdlib__stack.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__stack.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.p.cmx
+lib/ocaml/stdlib__stdLabels.cmi
+lib/ocaml/stdlib__stdLabels.cmt
+lib/ocaml/stdlib__stdLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__stdLabels.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.p.cmx
+lib/ocaml/stdlib__stream.cmi
+lib/ocaml/stdlib__stream.cmt
+lib/ocaml/stdlib__stream.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__stream.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.p.cmx
+lib/ocaml/stdlib__string.cmi
+lib/ocaml/stdlib__string.cmt
+lib/ocaml/stdlib__string.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__string.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__string.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__string.p.cmx
+lib/ocaml/stdlib__stringLabels.cmi
+lib/ocaml/stdlib__stringLabels.cmt
+lib/ocaml/stdlib__stringLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__stringLabels.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.p.cmx
+lib/ocaml/stdlib__sys.cmi
+lib/ocaml/stdlib__sys.cmt
+lib/ocaml/stdlib__sys.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__sys.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.p.cmx
+lib/ocaml/stdlib__uchar.cmi
+lib/ocaml/stdlib__uchar.cmt
+lib/ocaml/stdlib__uchar.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__uchar.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.p.cmx
+lib/ocaml/stdlib__weak.cmi
+lib/ocaml/stdlib__weak.cmt
+lib/ocaml/stdlib__weak.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__weak.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.p.cmx
${PLIST.ocaml-opt}lib/ocaml/str.a
lib/ocaml/str.cma
lib/ocaml/str.cmi
lib/ocaml/str.cmti
${PLIST.ocaml-opt}lib/ocaml/str.cmx
${PLIST.ocaml-opt}lib/ocaml/str.cmxa
-${PLIST.ocaml-nat}lib/ocaml/str.cmxs
+${PLIST.ocaml-opt}lib/ocaml/str.cmxs
lib/ocaml/str.mli
-lib/ocaml/stream.cmi
-lib/ocaml/stream.cmt
-lib/ocaml/stream.cmti
-${PLIST.ocaml-opt}lib/ocaml/stream.cmx
lib/ocaml/stream.ml
lib/ocaml/stream.mli
-${PLIST.ocaml-prof}lib/ocaml/stream.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stream.p.cmx
-lib/ocaml/string.cmi
-lib/ocaml/string.cmt
-lib/ocaml/string.cmti
-${PLIST.ocaml-opt}lib/ocaml/string.cmx
lib/ocaml/string.ml
lib/ocaml/string.mli
-${PLIST.ocaml-prof}lib/ocaml/string.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/string.p.cmx
-lib/ocaml/stringLabels.cmi
-lib/ocaml/stringLabels.cmt
-lib/ocaml/stringLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/stringLabels.cmx
lib/ocaml/stringLabels.ml
lib/ocaml/stringLabels.mli
-${PLIST.ocaml-prof}lib/ocaml/stringLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stringLabels.p.cmx
-${PLIST.ocaml-stub}lib/ocaml/stublibs/dllbigarray.so
-${PLIST.ocaml-stub}lib/ocaml/stublibs/dllcamlstr.so
-${PLIST.ocaml-stub}lib/ocaml/stublibs/dllthreads.so
-${PLIST.ocaml-stub}lib/ocaml/stublibs/dllunix.so
-${PLIST.ocaml-stub}lib/ocaml/stublibs/dllvmthreads.so
-lib/ocaml/sys.cmi
-lib/ocaml/sys.cmt
-lib/ocaml/sys.cmti
-${PLIST.ocaml-opt}lib/ocaml/sys.cmx
+lib/ocaml/stublibs/dllbigarray.so
+lib/ocaml/stublibs/dllcamlstr.so
+lib/ocaml/stublibs/dllraw_spacetime_lib.so
+lib/ocaml/stublibs/dllthreads.so
+lib/ocaml/stublibs/dllunix.so
+lib/ocaml/stublibs/dllvmthreads.so
lib/ocaml/sys.ml
lib/ocaml/sys.mli
-${PLIST.ocaml-prof}lib/ocaml/sys.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/sys.p.cmx
+lib/ocaml/target_camlheaderd
+lib/ocaml/target_camlheaderi
lib/ocaml/thread.mli
lib/ocaml/threadUnix.mli
lib/ocaml/threads/condition.cmi
@@ -1931,21 +2072,15 @@ lib/ocaml/topdirs.cmi
lib/ocaml/topdirs.cmt
lib/ocaml/topdirs.cmti
lib/ocaml/topdirs.mli
-lib/ocaml/uchar.cmi
-lib/ocaml/uchar.cmt
-lib/ocaml/uchar.cmti
-${PLIST.ocaml-opt}lib/ocaml/uchar.cmx
lib/ocaml/uchar.ml
lib/ocaml/uchar.mli
-${PLIST.ocaml-prof}lib/ocaml/uchar.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/uchar.p.cmx
${PLIST.ocaml-opt}lib/ocaml/unix.a
lib/ocaml/unix.cma
lib/ocaml/unix.cmi
lib/ocaml/unix.cmti
${PLIST.ocaml-opt}lib/ocaml/unix.cmx
${PLIST.ocaml-opt}lib/ocaml/unix.cmxa
-${PLIST.ocaml-nat}lib/ocaml/unix.cmxs
+${PLIST.ocaml-opt}lib/ocaml/unix.cmxs
lib/ocaml/unix.mli
lib/ocaml/unixLabels.cmi
lib/ocaml/unixLabels.cmti
@@ -1970,14 +2105,8 @@ lib/ocaml/vmthreads/threadUnix.cmti
lib/ocaml/vmthreads/threadUnix.mli
lib/ocaml/vmthreads/threads.cma
lib/ocaml/vmthreads/unix.cma
-lib/ocaml/weak.cmi
-lib/ocaml/weak.cmt
-lib/ocaml/weak.cmti
-${PLIST.ocaml-opt}lib/ocaml/weak.cmx
lib/ocaml/weak.ml
lib/ocaml/weak.mli
-${PLIST.ocaml-prof}lib/ocaml/weak.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/weak.p.cmx
man/man1/ocaml.1
man/man1/ocamlc.1
man/man1/ocamlc.opt.1
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index f342df4f2a0..d89ad5ac749 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.45 2018/04/04 09:34:46 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2018/07/19 12:16:38 jaapb Exp $
BUILDLINK_TREE+= ocaml
.if !defined(OCAML_BUILDLINK3_MK)
OCAML_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.06.0
-BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.06.1
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.07.0
+BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.07.0nb1
BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml
#BUILDLINK_DEPMETHOD.ocaml?= build
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index ce215dcd3b8..30d97517389 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,30 +1,26 @@
-$NetBSD: distinfo,v 1.121 2018/07/18 00:09:12 joerg Exp $
+$NetBSD: distinfo,v 1.122 2018/07/19 12:16:38 jaapb Exp $
-SHA1 (ocaml-4.06.1.tar.gz) = 63dc362344f1a7b448336c94c33207c2940be475
-RMD160 (ocaml-4.06.1.tar.gz) = ad7a6038544a0d59b72b6fe9e81a4e69c158d397
-SHA512 (ocaml-4.06.1.tar.gz) = 42560874ce363212fa4e862138d7260113bc8dff8b39c040332bbd9b039ba938788344ba8ce63ffc0a251bf21a6e493f3c1e505b6f51db6fec4d21578921060e
-Size (ocaml-4.06.1.tar.gz) = 4049457 bytes
-SHA1 (patch-Makefile) = 7fb492bbc3c44bad1753b8fc6928b7b0cadac436
+SHA1 (ocaml-4.07.0.tar.gz) = 19dba9822a43fc0fe48b4b539d5762ee45c3397f
+RMD160 (ocaml-4.07.0.tar.gz) = 4e471d3c4ac44e99db0b85bd7f8546fc0ce1f2cf
+SHA512 (ocaml-4.07.0.tar.gz) = 2f8c4eb9ee8f4bc041903ef7cf689b956991c4f065ac2c45ced7200bc53c1f0847c5fd4348998280c4c08cc583030c9b52a6d4825f90e356fac1719651c8fb9a
+Size (ocaml-4.07.0.tar.gz) = 4211784 bytes
+SHA1 (patch-Makefile) = 7cc1a24ad27e5d290065edc7a62f2d22693e829d
+SHA1 (patch-Makefile.common) = f7e1d1dbebf91679338c192ffc62c83cd0f2d17e
SHA1 (patch-asmcomp_amd64_emit.mlp) = 68cc42afd6439347524f2d81c48305dcbc173869
SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
-SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
SHA1 (patch-asmrun_amd64.S) = 4be1058a241e03ff73cd08d2aa16b0134c4414ca
-SHA1 (patch-byterun_Makefile) = 02797b10d685b25c0c6f5aab8eadc324e26826e9
-SHA1 (patch-configure) = 0a4e40fb942a3154ca63259df23721e5bac3154c
+SHA1 (patch-byterun_Makefile) = 28f8a9fff06ae99c52213ba2202d5b99b67f6735
+SHA1 (patch-configure) = ba14e3f080fc402915e6cf2334d0055b9258299a
SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
SHA1 (patch-driver_main_args.mli) = 5e8164e4392c0dde6c6264eeed87c346128e1863
SHA1 (patch-driver_optmain.ml) = 5ce77f1f906ce59cb533b4d25e4d57f7a70ab1b3
SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
-SHA1 (patch-ocamldoc_Makefile) = 1da273d69cda171cba8f5d17a9ec37d67ab6634b
SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
SHA1 (patch-otherlibs_Makefile) = 9f8b8ab3fcd72d77b750040d6484b0ad4fca7a61
-SHA1 (patch-otherlibs_dynlink_Makefile) = 9586542c6aa2f618a5d9df62bcb7bfac34ce1163
-SHA1 (patch-otherlibs_systhreads_Makefile) = edf1c481d57f42da9d0cb2699aa39c93eb46265e
-SHA1 (patch-otherlibs_threads_Makefile) = be27019e9349e3337eb24aa7ae3d117c5efbfabb
-SHA1 (patch-stdlib_Makefile) = 4832d06bf0d0873ddf814e77f6085a2acf2b8988
-SHA1 (patch-testsuite_tests_tool-ocamldoc-man_Makefile) = 670c9ecc83ae3b83c2232f9f182ccd21624bfed0
+SHA1 (patch-otherlibs_systhreads_Makefile) = 01a188ceac6df2c90c506ec020ae74bbbeb58888
+SHA1 (patch-otherlibs_threads_Makefile) = a2f32f2f2c124a8cfdbda245119f56a3486f36ec
SHA1 (patch-tools_ocamlcp.ml) = 76dfe040e6d61f0c844e01fa2bd9b6b0f1c21b99
SHA1 (patch-tools_ocamlmklib) = 53785aa5f0684a2c8708891d7e4e9d4400afbe7d
SHA1 (patch-tools_ocamloptp.ml) = 070bd797fcd4120e58d15a09f25d93ec46b87d1a
diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile
index f59e2c4921c..cbc9743d115 100644
--- a/lang/ocaml/patches/patch-Makefile
+++ b/lang/ocaml/patches/patch-Makefile
@@ -1,10 +1,9 @@
-$NetBSD: patch-Makefile,v 1.11 2018/01/10 14:30:35 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.12 2018/07/19 12:16:38 jaapb Exp $
-Use BSD_INSTALL_* instead of mkdir and cp
-
---- Makefile.orig 2017-10-03 08:35:24.000000000 +0000
+Use BSD_INSTALL_* instead of mkdir
+--- Makefile.orig 2018-07-10 14:09:26.000000000 +0000
+++ Makefile
-@@ -608,29 +608,29 @@ endif
+@@ -597,19 +597,19 @@ endif
# Installation
.PHONY: install
install:
@@ -12,119 +11,32 @@ Use BSD_INSTALL_* instead of mkdir and cp
- $(MKDIR) "$(INSTALL_LIBDIR)"
- $(MKDIR) "$(INSTALL_STUBLIBDIR)"
- $(MKDIR) "$(INSTALL_COMPLIBDIR)"
-- cp VERSION "$(INSTALL_LIBDIR)"
+ $(BSD_INSTALL_PROGRAM_DIR) "$(INSTALL_BINDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_STUBLIBDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_COMPLIBDIR)"
-+ $(BSD_INSTALL_DATA) VERSION "$(INSTALL_LIBDIR)"
+ $(INSTALL_DATA) \
+ VERSION \
+ "$(INSTALL_LIBDIR)"
$(MAKE) -C byterun install
-- cp ocaml "$(INSTALL_BINDIR)/ocaml$(EXE)"
-- cp ocamlc "$(INSTALL_BINDIR)/ocamlc.byte$(EXE)"
-+ $(BSD_INSTALL_SCRIPT) ocaml "$(INSTALL_BINDIR)/ocaml$(EXE)"
-+ $(BSD_INSTALL_SCRIPT) ocamlc "$(INSTALL_BINDIR)/ocamlc.byte$(EXE)"
+- $(INSTALL_PROG) ocaml "$(INSTALL_BINDIR)/ocaml$(EXE)"
+- $(INSTALL_PROG) ocamlc "$(INSTALL_BINDIR)/ocamlc.byte$(EXE)"
++ $(INSTALL_DATA) ocaml "$(INSTALL_BINDIR)/ocaml$(EXE)"
++ $(INSTALL_DATA) ocamlc "$(INSTALL_BINDIR)/ocamlc.byte$(EXE)"
$(MAKE) -C stdlib install
-- cp lex/ocamllex "$(INSTALL_BINDIR)/ocamllex.byte$(EXE)"
-- cp yacc/ocamlyacc$(EXE) "$(INSTALL_BINDIR)/ocamlyacc$(EXE)"
-- cp utils/*.cmi utils/*.cmt utils/*.cmti utils/*.mli \
-+ $(BSD_INSTALL_SCRIPT) lex/ocamllex "$(INSTALL_BINDIR)/ocamllex.byte$(EXE)"
-+ $(BSD_INSTALL_SCRIPT) yacc/ocamlyacc$(EXE) "$(INSTALL_BINDIR)/ocamlyacc$(EXE)"
-+ $(BSD_INSTALL_DATA) utils/*.cmi utils/*.cmt utils/*.cmti utils/*.mli \
+- $(INSTALL_PROG) lex/ocamllex "$(INSTALL_BINDIR)/ocamllex.byte$(EXE)"
+- $(INSTALL_PROG) yacc/ocamlyacc$(EXE) "$(INSTALL_BINDIR)/ocamlyacc$(EXE)"
++ $(INSTALL_DATA) lex/ocamllex "$(INSTALL_BINDIR)/ocamllex.byte$(EXE)"
++ $(INSTALL_DATA) yacc/ocamlyacc$(EXE) "$(INSTALL_BINDIR)/ocamlyacc$(EXE)"
+ $(INSTALL_DATA) \
+ utils/*.cmi utils/*.cmt utils/*.cmti utils/*.mli \
parsing/*.cmi parsing/*.cmt parsing/*.cmti parsing/*.mli \
- typing/*.cmi typing/*.cmt typing/*.cmti typing/*.mli \
- bytecomp/*.cmi bytecomp/*.cmt bytecomp/*.cmti bytecomp/*.mli \
- driver/*.cmi driver/*.cmt driver/*.cmti driver/*.mli \
- toplevel/*.cmi toplevel/*.cmt toplevel/*.cmti toplevel/*.mli \
- "$(INSTALL_COMPLIBDIR)"
-- cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
-+ $(BSD_INSTALL_DATA) compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
- compilerlibs/ocamltoplevel.cma $(BYTESTART) $(TOPLEVELSTART) \
- "$(INSTALL_COMPLIBDIR)"
-- cp expunge "$(INSTALL_LIBDIR)/expunge$(EXE)"
-- cp toplevel/topdirs.cmi toplevel/topdirs.cmt toplevel/topdirs.cmti \
-+ $(BSD_INSTALL_SCRIPT) expunge "$(INSTALL_LIBDIR)/expunge$(EXE)"
-+ $(BSD_INSTALL_DATA) toplevel/topdirs.cmi toplevel/topdirs.cmt toplevel/topdirs.cmti \
- toplevel/topdirs.mli "$(INSTALL_LIBDIR)"
+@@ -630,7 +630,7 @@ install:
+ "$(INSTALL_LIBDIR)"
$(MAKE) -C tools install
ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix
-@@ -655,7 +655,7 @@ ifeq "$(UNIX_OR_WIN32)" "win32"
- $(MAKE) install-flexdll; \
- fi
+- $(MKDIR) "$(INSTALL_MANDIR)/man$(PROGRAMS_MAN_SECTION)"
++ $(BSD_INSTALL_MAN_DIR) "$(INSTALL_MANDIR)/man$(PROGRAMS_MAN_SECTION)"
+ -$(MAKE) -C man install
endif
-- cp config/Makefile "$(INSTALL_LIBDIR)/Makefile.config"
-+ $(BSD_INSTALL_DATA) config/Makefile "$(INSTALL_LIBDIR)/Makefile.config"
- if test -f ocamlopt; then $(MAKE) installopt; else \
- cd "$(INSTALL_BINDIR)"; \
- $(LN) ocamlc.byte$(EXE) ocamlc$(EXE); \
-@@ -666,17 +666,17 @@ endif
- .PHONY: installopt
- installopt:
- $(MAKE) -C asmrun install
-- cp ocamlopt "$(INSTALL_BINDIR)/ocamlopt.byte$(EXE)"
-+ $(BSD_INSTALL_SCRIPT) ocamlopt "$(INSTALL_BINDIR)/ocamlopt.byte$(EXE)"
- $(MAKE) -C stdlib installopt
-- cp middle_end/*.cmi middle_end/*.cmt middle_end/*.cmti \
-+ $(BSD_INSTALL_DATA) middle_end/*.cmi middle_end/*.cmt middle_end/*.cmti \
- middle_end/*.mli \
- "$(INSTALL_COMPLIBDIR)"
-- cp middle_end/base_types/*.cmi middle_end/base_types/*.cmt \
-+ $(BSD_INSTALL_DATA) middle_end/base_types/*.cmi middle_end/base_types/*.cmt \
- middle_end/base_types/*.cmti middle_end/base_types/*.mli \
- "$(INSTALL_COMPLIBDIR)"
-- cp asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti asmcomp/*.mli \
-+ $(BSD_INSTALL_DATA) asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti asmcomp/*.mli \
- "$(INSTALL_COMPLIBDIR)"
-- cp compilerlibs/ocamloptcomp.cma $(OPTSTART) "$(INSTALL_COMPLIBDIR)"
-+ $(BSD_INSTALL_DATA) compilerlibs/ocamloptcomp.cma $(OPTSTART) "$(INSTALL_COMPLIBDIR)"
- if test -n "$(WITH_OCAMLDOC)"; then \
- $(MAKE) -C ocamldoc installopt; \
- fi
-@@ -691,30 +691,30 @@ installopt:
- fi
- $(MAKE) -C tools installopt
- if test -f ocamlopt.opt -a -f flexdll/flexlink.opt ; then \
-- cp -f flexdll/flexlink.opt "$(INSTALL_BINDIR)/flexlink$(EXE)" ; \
-+ $(BSD_INSTALL_PROGRAM) flexdll/flexlink.opt "$(INSTALL_BINDIR)/flexlink$(EXE)" ; \
- fi
-
- .PHONY: installoptopt
- installoptopt:
-- cp ocamlc.opt "$(INSTALL_BINDIR)/ocamlc.opt$(EXE)"
-- cp ocamlopt.opt "$(INSTALL_BINDIR)/ocamlopt.opt$(EXE)"
-- cp lex/ocamllex.opt "$(INSTALL_BINDIR)/ocamllex.opt$(EXE)"
-+ $(BSD_INSTALL_PROGRAM) ocamlc.opt "$(INSTALL_BINDIR)/ocamlc.opt$(EXE)"
-+ $(BSD_INSTALL_PROGRAM) ocamlopt.opt "$(INSTALL_BINDIR)/ocamlopt.opt$(EXE)"
-+ $(BSD_INSTALL_PROGRAM) lex/ocamllex.opt "$(INSTALL_BINDIR)/ocamllex.opt$(EXE)"
- cd "$(INSTALL_BINDIR)"; \
- $(LN) ocamlc.opt$(EXE) ocamlc$(EXE); \
- $(LN) ocamlopt.opt$(EXE) ocamlopt$(EXE); \
- $(LN) ocamllex.opt$(EXE) ocamllex$(EXE)
-- cp utils/*.cmx parsing/*.cmx typing/*.cmx bytecomp/*.cmx \
-+ $(BSD_INSTALL_DATA) utils/*.cmx parsing/*.cmx typing/*.cmx bytecomp/*.cmx \
- driver/*.cmx asmcomp/*.cmx "$(INSTALL_COMPLIBDIR)"
-- cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.$(A) \
-+ $(BSD_INSTALL_DATA) compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.$(A) \
- compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.$(A) \
- compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.$(A) \
- $(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.$(O)) \
- $(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.$(O)) \
- "$(INSTALL_COMPLIBDIR)"
- if test -f ocamlnat$(EXE) ; then \
-- cp ocamlnat$(EXE) "$(INSTALL_BINDIR)/ocamlnat$(EXE)"; \
-- cp toplevel/opttopdirs.cmi "$(INSTALL_LIBDIR)"; \
-- cp compilerlibs/ocamlopttoplevel.cmxa \
-+ $(BSD_INSTALL_PROGRAM) ocamlnat$(EXE) "$(INSTALL_BINDIR)/ocamlnat$(EXE)"; \
-+ $(BSD_INSTALL_DATA) toplevel/opttopdirs.cmi "$(INSTALL_LIBDIR)"; \
-+ $(BSD_INSTALL_DATA) compilerlibs/ocamlopttoplevel.cmxa \
- compilerlibs/ocamlopttoplevel.$(A) \
- $(OPTTOPLEVELSTART:.cmo=.cmx) $(OPTTOPLEVELSTART:.cmo=.$(O)) \
- "$(INSTALL_COMPLIBDIR)"; \
-@@ -725,7 +725,7 @@ installoptopt:
- # Installation of the *.ml sources of compiler-libs
- .PHONY: install-compiler-sources
- install-compiler-sources:
-- cp utils/*.ml parsing/*.ml typing/*.ml bytecomp/*.ml driver/*.ml \
-+ $(BSD_INSTALL_DATA) utils/*.ml parsing/*.ml typing/*.ml bytecomp/*.ml driver/*.ml \
- toplevel/*.ml middle_end/*.ml middle_end/base_types/*.ml \
- asmcomp/*.ml $(INSTALL_COMPLIBDIR)
-
+ for i in $(OTHERLIBRARIES); do \
diff --git a/lang/ocaml/patches/patch-Makefile.common b/lang/ocaml/patches/patch-Makefile.common
new file mode 100644
index 00000000000..cab848de725
--- /dev/null
+++ b/lang/ocaml/patches/patch-Makefile.common
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile.common,v 1.1 2018/07/19 12:16:38 jaapb Exp $
+
+Use BSD_INSTALL_*
+--- Makefile.common.orig 2018-07-10 14:09:26.000000000 +0000
++++ Makefile.common
+@@ -16,9 +16,9 @@
+ # This makefile contains common definitions shared by other Makefiles
+ # We assume that config/Makefile has already been included
+
+-INSTALL ?= install
+-INSTALL_DATA ?= $(INSTALL) -m u=rw,g=rw,o=r
+-INSTALL_PROG ?= $(INSTALL) -m u=rwx,g=rwx,o=rx
++INSTALL ?= ${BSD_INSTALL}
++INSTALL_DATA ?= ${BSD_INSTALL_DATA}
++INSTALL_PROG ?= ${BSD_INSTALL_SCRIPT}
+
+ # note: these are defined by lazy expansions
+ # as some parts of the makefiles change BINDIR, etc.
diff --git a/lang/ocaml/patches/patch-asmrun_Makefile b/lang/ocaml/patches/patch-asmrun_Makefile
deleted file mode 100644
index c1128d596f8..00000000000
--- a/lang/ocaml/patches/patch-asmrun_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-asmrun_Makefile,v 1.7 2017/09/08 09:12:44 jaapb Exp $
-
-Use BSD_INSTALL_* instead of mkdir and cp
---- asmrun/Makefile.orig 2017-06-28 14:09:39.000000000 +0000
-+++ asmrun/Makefile
-@@ -129,7 +129,7 @@ libasmrun_shared.$(SO): $(PICOBJS)
-
- .PHONY: install
- install:
-- cp $(TARGETS) "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_DATA) $(TARGETS) "$(INSTALL_LIBDIR)"
-
- $(LINKEDFILES): %.c: ../byterun/%.c
- $(LN) $< $@
diff --git a/lang/ocaml/patches/patch-byterun_Makefile b/lang/ocaml/patches/patch-byterun_Makefile
index b6e52f37488..067c9b95141 100644
--- a/lang/ocaml/patches/patch-byterun_Makefile
+++ b/lang/ocaml/patches/patch-byterun_Makefile
@@ -1,20 +1,14 @@
-$NetBSD: patch-byterun_Makefile,v 1.7 2018/01/10 14:30:35 jaapb Exp $
+$NetBSD: patch-byterun_Makefile,v 1.8 2018/07/19 12:16:38 jaapb Exp $
Use BSD_INSTALL_* instead of mkdir and cp
---- byterun/Makefile.orig 2017-10-03 08:35:24.000000000 +0000
+--- byterun/Makefile.orig 2018-04-11 13:22:42.000000000 +0000
+++ byterun/Makefile
-@@ -104,10 +104,10 @@ ld.conf: ../config/Makefile
-
- .PHONY: install
- install:
-- cp $(PROGRAMS) "$(INSTALL_BINDIR)"
-- cp $(LIBRARIES) "$(INSTALL_LIBDIR)"
+@@ -121,7 +121,7 @@ install:
+ if test -n "$(DYNLIBRARIES)"; then \
+ $(INSTALL_PROG) $(DYNLIBRARIES) "$(INSTALL_LIBDIR)"; \
+ fi
- mkdir -p "$(INSTALL_INCDIR)"
-- cp caml/*.h "$(INSTALL_INCDIR)"
-+ $(BSD_INSTALL_PROGRAM) $(PROGRAMS) "$(INSTALL_BINDIR)"
-+ $(BSD_INSTALL_LIB) $(LIBRARIES) "$(INSTALL_LIBDIR)"
+ $(BSD_INSTALL_DATA_DIR) -p "$(INSTALL_INCDIR)"
-+ $(BSD_INSTALL_DATA) caml/*.h "$(INSTALL_INCDIR)"
+ $(INSTALL_DATA) caml/*.h "$(INSTALL_INCDIR)"
# If primitives contain duplicated lines (e.g. because the code is defined
- # like
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index ad5c3b71ec4..5edaafaee1d 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,11 +1,10 @@
-$NetBSD: patch-configure,v 1.33 2018/04/30 10:38:04 wiz Exp $
+$NetBSD: patch-configure,v 1.34 2018/07/19 12:16:38 jaapb Exp $
All kinds of OS-specific changes to configure
Honor LDFLAGS.
-
---- configure.orig 2017-11-03 13:52:13.000000000 +0000
+--- configure.orig 2018-04-11 13:22:42.000000000 +0000
+++ configure
-@@ -791,7 +791,7 @@ sharedcccompopts=''
+@@ -797,7 +797,7 @@ sharedcccompopts=''
mksharedlib='shared-libs-not-available'
rpath=''
mksharedlibrpath=''
@@ -14,7 +13,7 @@ Honor LDFLAGS.
if $with_sharedlibs; then
case "$target" in
-@@ -820,10 +820,13 @@ if $with_sharedlibs; then
+@@ -826,10 +826,13 @@ if $with_sharedlibs; then
esac;;
*-*-solaris2*)
case "$cc" in
@@ -31,7 +30,7 @@ Honor LDFLAGS.
rpath="-R"
mksharedlibrpath="-R"
else
-@@ -850,7 +853,7 @@ if $with_sharedlibs; then
+@@ -856,7 +859,7 @@ if $with_sharedlibs; then
rpath="-Wl,-rpath,"
mksharedlibrpath="-rpath "
shared_libraries_supported=true;;
@@ -40,7 +39,7 @@ Honor LDFLAGS.
mksharedlib="$cc -shared -flat_namespace -undefined suppress \
-read_only_relocs suppress"
common_cflags="$dl_defs $common_cflags"
-@@ -899,11 +902,7 @@ if $with_sharedlibs; then
+@@ -905,11 +908,7 @@ if $with_sharedlibs; then
i[3456]86-*-linux*) natdynlink=true;;
i[3456]86-*-gnu*) natdynlink=true;;
x86_64-*-linux*) natdynlink=true;;
@@ -53,7 +52,7 @@ Honor LDFLAGS.
x86_64-*-darwin*) natdynlink=true;;
s390x*-*-linux*) natdynlink=true;;
powerpc*-*-linux*) natdynlink=true;;
-@@ -916,6 +915,9 @@ if $with_sharedlibs; then
+@@ -922,6 +921,9 @@ if $with_sharedlibs; then
x86_64-*-openbsd*) natdynlink=true;;
i[3456]86-*-netbsd*) natdynlink=true;;
x86_64-*-netbsd*) natdynlink=true;;
@@ -63,7 +62,7 @@ Honor LDFLAGS.
i386-*-gnu0.3) natdynlink=true;;
i[3456]86-*-haiku*) natdynlink=true;;
arm*-*-linux*) natdynlink=true;;
-@@ -959,6 +962,7 @@ case "$target" in
+@@ -965,6 +967,7 @@ case "$target" in
i[3456]86-*-haiku*) arch=i386; system=beos;;
i[3456]86-*-beos*) arch=i386; system=beos;;
i[3456]86-*-cygwin*) arch=i386; system=cygwin;;
@@ -71,7 +70,7 @@ Honor LDFLAGS.
i[3456]86-*-darwin*) if $arch64; then
arch=amd64; system=macosx
else
-@@ -979,6 +983,8 @@ case "$target" in
+@@ -987,6 +990,8 @@ case "$target" in
armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;;
armv6*-*-linux-gnueabi) arch=arm; model=armv6; system=linux_eabi;;
armv6*-*-freebsd*) arch=arm; model=armv6; system=freebsd;;
@@ -80,7 +79,7 @@ Honor LDFLAGS.
earmv6*-*-netbsd*) arch=arm; model=armv6; system=netbsd;;
earmv7*-*-netbsd*) arch=arm; model=armv7; system=netbsd;;
armv5te*-*-linux-gnueabi) arch=arm; model=armv5te; system=linux_eabi;;
-@@ -996,6 +1002,7 @@ case "$target" in
+@@ -1004,6 +1009,7 @@ case "$target" in
x86_64-*-mingw*) arch=amd64; system=mingw;;
aarch64-*-linux*) arch=arm64; system=linux;;
x86_64-*-cygwin*) arch=amd64; system=cygwin;;
@@ -88,7 +87,7 @@ Honor LDFLAGS.
esac
# Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -1019,7 +1026,6 @@ nativeccprofopts=''
+@@ -1027,7 +1033,6 @@ nativeccprofopts=''
case "$arch,$cc,$system,$model" in
*,*,rhapsody,*) if $arch64; then partialld="ld -r -arch ppc64"; fi;;
amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
@@ -96,7 +95,7 @@ Honor LDFLAGS.
power,gcc*,elf,ppc) partialld="ld -r -m elf32ppclinux";;
power,gcc*,elf,ppc64) partialld="ld -r -m elf64ppc";;
power,gcc*,elf,ppc64le) partialld="ld -r -m elf64lppc";;
-@@ -1037,8 +1043,8 @@ case "$arch,$system" in
+@@ -1045,8 +1050,8 @@ case "$arch,$system" in
fi;;
amd64,solaris) as="${TOOLPREF}as --64"
aspp="${TOOLPREF}gcc -m64 -c";;
@@ -107,7 +106,7 @@ Honor LDFLAGS.
power,elf) if $arch64; then
as="${TOOLPREF}as -a64 -mppc64"
aspp="${TOOLPREF}gcc -m64 -c"
-@@ -1086,6 +1092,8 @@ case "$arch,$system" in
+@@ -1094,6 +1099,8 @@ case "$arch,$system" in
power,elf) profiling='true';;
power,bsd*) profiling='true';;
power,netbsd) profiling='true';;
@@ -116,7 +115,7 @@ Honor LDFLAGS.
*) profiling='false';;
esac
-@@ -1669,6 +1677,8 @@ fi
+@@ -1672,6 +1679,8 @@ fi
x11_include="not found"
x11_link="not found"
@@ -125,7 +124,7 @@ Honor LDFLAGS.
if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then
if pkg-config --exists x11 2>/dev/null; then
x11_include=`pkg-config --cflags x11`
-@@ -1715,6 +1725,7 @@ if test "$x11_include" = "not found"; th
+@@ -1718,6 +1727,7 @@ if test "$x11_include" = "not found"; th
/usr/XFree86/include/X11 \
\
/usr/include \
@@ -133,7 +132,7 @@ Honor LDFLAGS.
/usr/local/include \
/usr/unsupported/include \
/usr/athena/include \
-@@ -1772,6 +1783,7 @@ if test "$x11_include" = "not found"; th
+@@ -1775,6 +1785,7 @@ if test "$x11_include" = "not found"; th
\
/usr/lib64 \
/usr/lib \
@@ -141,11 +140,10 @@ Honor LDFLAGS.
/usr/local/lib \
/usr/unsupported/lib \
/usr/athena/lib \
-@@ -1793,19 +1805,16 @@ if test "$x11_include" = "not found"; th
+@@ -1798,18 +1809,16 @@ if test "$x11_include" = "not found"; th
if test $dir = /usr/lib; then
x11_link="-lX11"
else
-- x11_libs="-L$dir"
- case "$target" in
- *-*-freebsd*|*-*-dragonfly*) x11_link="-L$dir -lX11";;
- *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
@@ -153,7 +151,7 @@ Honor LDFLAGS.
- *) x11_link="-L$dir -lX11";;
- esac
+ x11_libs="-L$dir ${COMPILER_RPATH_FLAG}$dir"
-+ x11_link="-L$dir ${COMPILER_RPATH_FLAG}$dir -lX11"
++ x11_link="-L$dir ${COMPILER_RPATH_FLAG}$dir -lX11"
fi
break
fi
@@ -162,15 +160,15 @@ Honor LDFLAGS.
+fi # end of disable_x11 test
+
- if test "x11_include" != "not found"; then
+ if test "$x11_include" != "not found"; then
if test "$x11_include" = "-I/usr/include"; then
x11_include=""
-@@ -2056,7 +2065,7 @@ config CFLAGS "$common_cflags $internal_
+@@ -2060,7 +2069,7 @@ config CFLAGS "$common_cflags $internal_
config CPPFLAGS "$common_cppflags $internal_cppflags"
config OCAMLC_CFLAGS "$common_cflags $sharedcccompopts"
config OCAMLC_CPPFLAGS "$common_cppflags"
-config LDFLAGS "$ldflags"
+config LDFLAGS "$ldflags $LDFLAGS"
- config BYTECCLIBS "$cclibs $dllib $curseslibs $pthread_link \
- $instrumented_runtime_libs"
+ config BYTECCLIBS "$cclibs $dllib $pthread_link $instrumented_runtime_libs"
config RPATH "$rpath"
+ config EXE "$exe"
diff --git a/lang/ocaml/patches/patch-ocamldoc_Makefile b/lang/ocaml/patches/patch-ocamldoc_Makefile
deleted file mode 100644
index db150766fd6..00000000000
--- a/lang/ocaml/patches/patch-ocamldoc_Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ocamldoc_Makefile,v 1.5 2017/09/08 09:12:44 jaapb Exp $
-
-Use BSD_INSTALL_* instead of mkdir and cp
---- ocamldoc/Makefile.orig 2017-06-28 14:09:39.000000000 +0000
-+++ ocamldoc/Makefile
-@@ -299,12 +299,12 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
-
- .PHONY: install
- install:
-- $(MKDIR) "$(INSTALL_BINDIR)"
-- $(MKDIR) "$(INSTALL_LIBDIR)"
-- $(MKDIR) "$(INSTALL_MANODIR)"
-- $(CP) $(OCAMLDOC) "$(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)"
-- $(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) "$(INSTALL_LIBDIR)"
-- $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_CMTS) "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_PROGRAM_DIR) "$(INSTALL_BINDIR)"
-+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_MAN_DIR) "$(INSTALL_MANODIR)"
-+ $(BSD_INSTALL_SCRIPT) $(OCAMLDOC) "$(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)"
-+ $(BSD_INSTALL_DATA) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_DATA) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_CMTS) "$(INSTALL_LIBDIR)"
- if test -d stdlib_man; then $(CP) stdlib_man/* "$(INSTALL_MANODIR)"; else : ; fi
-
- # Note: at the moment, $(INSTALL_MANODIR) is created even if the doc has
-@@ -316,11 +316,11 @@ installopt:
-
- .PHONY: installopt_really
- installopt_really:
-- $(MKDIR) "$(INSTALL_BINDIR)"
-- $(MKDIR) "$(INSTALL_LIBDIR)"
-- $(CP) $(OCAMLDOC_OPT) "$(INSTALL_BINDIR)/$(OCAMLDOC_OPT)$(EXE)"
-- $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_CMTS) "$(INSTALL_LIBDIR)"
-- $(CP) ocamldoc.hva *.cmx $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) \
-+ $(BSD_INSTALL_PROGRAM_DIR) "$(INSTALL_BINDIR)"
-+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_PROGRAM) $(OCAMLDOC_OPT) "$(INSTALL_BINDIR)/$(OCAMLDOC_OPT)$(EXE)"
-+ $(BSD_INSTALL_DATA) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_CMTS) "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_DATA) ocamldoc.hva *.cmx $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) \
- "$(INSTALL_LIBDIR)"
-
- # TODO: also split into several rules
diff --git a/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile b/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile
deleted file mode 100644
index 9668b9afde4..00000000000
--- a/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-otherlibs_dynlink_Makefile,v 1.5 2017/09/08 09:12:44 jaapb Exp $
-
-Use BSD_INSTALL_* instead of mkdir and cp
---- otherlibs/dynlink/Makefile.orig 2017-06-28 14:09:39.000000000 +0000
-+++ otherlibs/dynlink/Makefile
-@@ -90,12 +90,12 @@ extract_crc: dynlink.cma extract_crc.cmo
- INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
-
- install:
-- cp dynlink.cmi dynlink.cmti dynlink.cma dynlink.mli "$(INSTALL_LIBDIR)"
-- cp extract_crc "$(INSTALL_LIBDIR)/extract_crc$(EXE)"
-+ $(BSD_INSTALL_DATA) dynlink.cmi dynlink.cmti dynlink.cma dynlink.mli "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_SCRIPT) extract_crc "$(INSTALL_LIBDIR)/extract_crc$(EXE)"
-
- installopt:
- if $(NATDYNLINK); then \
-- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) "$(INSTALL_LIBDIR)" && \
-+ $(BSD_INSTALL_DATA) $(NATOBJS) dynlink.cmxa dynlink.$(A) "$(INSTALL_LIBDIR)" && \
- cd "$(INSTALL_LIBDIR)" && $(RANLIB) dynlink.$(A); \
- fi
-
diff --git a/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
index 92c82d663d5..8c01945792d 100644
--- a/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
@@ -1,11 +1,10 @@
-$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.8 2017/09/10 08:56:47 wiz Exp $
+$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.9 2018/07/19 12:16:38 jaapb Exp $
Honor LDFLAGS.
Use BSD_INSTALL_* instead of mkdir and cp
-
---- otherlibs/systhreads/Makefile.orig 2017-07-13 08:56:44.000000000 +0000
+--- otherlibs/systhreads/Makefile.orig 2018-04-11 13:22:42.000000000 +0000
+++ otherlibs/systhreads/Makefile
-@@ -27,6 +27,7 @@ export OCAML_FLEXLINK:=$(ROOTDIR)/boot/o
+@@ -28,6 +28,7 @@ export OCAML_FLEXLINK:=$(ROOTDIR)/boot/o
endif
LIBS = -nostdlib -I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/$(UNIXLIB)
@@ -13,7 +12,7 @@ Use BSD_INSTALL_* instead of mkdir and cp
CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc $(LIBS)
CAMLOPT=$(CAMLRUN) $(ROOTDIR)/ocamlopt $(LIBS)
-@@ -62,14 +63,14 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $
+@@ -68,14 +69,14 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $
allopt: lib$(LIBNAME)nat.$(A) $(LIBNAME).cmxa $(CMIFILES)
lib$(LIBNAME).$(A): $(BYTECODE_C_OBJS)
@@ -30,28 +29,12 @@ Use BSD_INSTALL_* instead of mkdir and cp
# TODO: Figure out why -cclib -lunix is used here.
# It may be because of the threadsUnix module which is deprecated.
# It may hence be good to figure out whether this module shouldn't be
-@@ -124,17 +125,17 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDI
- install:
- if test -f dllthreads$(EXT_DLL); then \
- cp dllthreads$(EXT_DLL) "$(INSTALL_STUBLIBDIR)/dllthreads$(EXT_DLL)"; fi
-- cp libthreads.$(A) "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
+@@ -122,7 +123,7 @@ install:
+ fi
+ $(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A)
-- mkdir -p "$(THREADS_LIBDIR)"
-- cp $(CMIFILES) $(CMIFILES:.cmi=.cmti) threads.cma "$(THREADS_LIBDIR)"
-- cp $(MLIFILES) "$(INSTALL_LIBDIR)"
-- cp threads.h "$(INSTALL_LIBDIR)/caml"
-+ $(BSD_INSTALL_LIB_DIR) "$(THREADS_LIBDIR)"
-+ $(BSD_INSTALL_DATA) $(CMIFILES) $(CMIFILES:.cmi=.cmti) threads.cma "$(THREADS_LIBDIR)"
-+ $(BSD_INSTALL_DATA) $(MLIFILES) "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_DATA) threads.h "$(INSTALL_LIBDIR)/caml"
-
- installopt:
-- cp libthreadsnat.$(A) "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_DATA) libthreadsnat.$(A) "$(INSTALL_LIBDIR)"
- cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreadsnat.$(A)
-- cp $(THREADS_NCOBJS) threads.cmxa threads.$(A) "$(THREADS_LIBDIR)"
-+ $(BSD_INSTALL_DATA) $(THREADS_NCOBJS) threads.cmxa threads.$(A) "$(THREADS_LIBDIR)"
- cd "$(THREADS_LIBDIR)" && $(RANLIB) threads.$(A)
-
- .SUFFIXES: .ml .mli .cmo .cmi .cmx
+- mkdir -p "$(INSTALL_THREADSLIBDIR)"
++ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_THREADSLIBDIR)"
+ $(INSTALL_DATA) \
+ $(CMIFILES) $(CMIFILES:.cmi=.cmti) threads.cma \
+ "$(INSTALL_THREADSLIBDIR)"
diff --git a/lang/ocaml/patches/patch-otherlibs_threads_Makefile b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
index 80704aef16e..700a2992672 100644
--- a/lang/ocaml/patches/patch-otherlibs_threads_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
@@ -1,20 +1,18 @@
-$NetBSD: patch-otherlibs_threads_Makefile,v 1.11 2018/01/10 14:30:35 jaapb Exp $
+$NetBSD: patch-otherlibs_threads_Makefile,v 1.12 2018/07/19 12:16:38 jaapb Exp $
Honor LDFLAGS.
Use BSD_INSTALL_* instead of mkdir and cp
-
---- otherlibs/threads/Makefile.orig 2017-10-03 08:35:24.000000000 +0000
+--- otherlibs/threads/Makefile.orig 2018-04-11 13:22:42.000000000 +0000
+++ otherlibs/threads/Makefile
-@@ -33,6 +33,8 @@ CAML_OBJS=thread.cmo mutex.cmo condition
+@@ -28,6 +28,7 @@ CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc -nost
+ -I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/unix
+ MKLIB=$(CAMLRUN) ../../tools/ocamlmklib
+ COMPFLAGS=-w +33..39 -warn-error A -bin-annot -g -safe-string
++LDOPTS= -ldopt $(LDFLAGS)
- LIB=../../stdlib
+ C_OBJS=scheduler.o
-+LDOPTS=-ldopt "$(LDFLAGS)"
-+
- LIB_OBJS=$(LIB)/camlinternalFormatBasics.cmo pervasives.cmo \
- $(LIB)/array.cmo $(LIB)/list.cmo $(LIB)/char.cmo $(LIB)/bytes.cmo \
- $(LIB)/string.cmo $(LIB)/sys.cmo $(LIB)/sort.cmo marshal.cmo \
-@@ -59,16 +61,16 @@ all: libvmthreads.a threads.cma stdlib.c
+@@ -64,7 +65,7 @@ all: libvmthreads.a threads.cma stdlib.c
allopt:
libvmthreads.a: $(C_OBJS)
@@ -22,32 +20,13 @@ Use BSD_INSTALL_* instead of mkdir and cp
+ $(MKLIB) -o threads -oc vmthreads $(C_OBJS) $(LDOPTS)
threads.cma: $(CAML_OBJS)
-- $(MKLIB) -ocamlc '$(CAMLC)' -o threads -oc vmthreads $(CAML_OBJS)
-+ $(MKLIB) -ocamlc '$(CAMLC)' -o threads -oc vmthreads $(CAML_OBJS) $(LDOPTS)
-
- stdlib.cma: $(LIB_OBJS)
- $(CAMLC) -a -o stdlib.cma $(LIB_OBJS)
-
- unix.cma: $(UNIXLIB_OBJS)
-- $(MKLIB) -ocamlc '$(CAMLC)' -o unix -linkall $(UNIXLIB_OBJS)
-+ $(MKLIB) -ocamlc '$(CAMLC)' -o unix -linkall $(UNIXLIB_OBJS) $(LDOPTS)
-
- pervasives.cmo: pervasives.mli pervasives.cmi pervasives.ml
- $(CAMLC) ${COMPFLAGS} -nopervasives -c pervasives.ml
-@@ -111,12 +113,12 @@ CMIFILES=thread.cmi mutex.cmi condition.
-
- install:
+ $(MKLIB) -ocamlc '$(CAMLC)' -o threads -oc vmthreads $(CAML_OBJS)
+@@ -117,7 +118,7 @@ install:
if test -f dllvmthreads.so; then \
-- cp dllvmthreads.so "$(INSTALL_STUBLIBDIR)"; \
-+ $(BSD_INSTALL_LIB) dllvmthreads.so "$(INSTALL_STUBLIBDIR)"; \
+ $(INSTALL_PROG) dllvmthreads.so "$(INSTALL_STUBLIBDIR)"; \
fi
- mkdir -p "$(INSTALL_LIBDIR)/vmthreads"
-- cp libvmthreads.a "$(INSTALL_LIBDIR)/vmthreads"
-+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)/vmthreads"
-+ $(BSD_INSTALL_DATA) libvmthreads.a "$(INSTALL_LIBDIR)/vmthreads"
++ $(BSD_INSTALL_LIB_DIR) -p "$(INSTALL_LIBDIR)/vmthreads"
+ $(INSTALL_DATA) libvmthreads.a "$(INSTALL_LIBDIR)/vmthreads"
cd "$(INSTALL_LIBDIR)/vmthreads"; $(RANLIB) libvmthreads.a
-- cp $(CMIFILES) $(CMIFILES:.cmi=.mli) $(CMIFILES:.cmi=.cmti) \
-+ $(BSD_INSTALL_DATA) $(CMIFILES) $(CMIFILES:.cmi=.mli) $(CMIFILES:.cmi=.cmti) \
- threads.cma stdlib.cma unix.cma "$(INSTALL_LIBDIR)/vmthreads"
-
- installopt:
+ $(INSTALL_DATA) \
diff --git a/lang/ocaml/patches/patch-stdlib_Makefile b/lang/ocaml/patches/patch-stdlib_Makefile
deleted file mode 100644
index 14f98e951ac..00000000000
--- a/lang/ocaml/patches/patch-stdlib_Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-stdlib_Makefile,v 1.5 2017/09/08 09:12:44 jaapb Exp $
-
-Use BSD_INSTALL_* instead of mkdir and cp
---- stdlib/Makefile.orig 2017-06-28 14:09:39.000000000 +0000
-+++ stdlib/Makefile
-@@ -81,19 +81,19 @@ INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
-
- .PHONY: install
- install::
-- cp stdlib.cma std_exit.cmo *.cmi *.cmt *.cmti *.mli *.ml \
-+ $(BSD_INSTALL_DATA) stdlib.cma std_exit.cmo *.cmi *.cmt *.cmti *.mli *.ml \
- camlheader_ur \
- "$(INSTALL_LIBDIR)"
-- cp target_camlheader "$(INSTALL_LIBDIR)/camlheader"
-+ $(BSD_INSTALL_SCRIPT) target_camlheader "$(INSTALL_LIBDIR)/camlheader"
-
- ifeq "$(RUNTIMED)" "true"
- install::
-- cp target_camlheaderd $(INSTALL_LIBDIR)
-+ $(BSD_INSTALL_SCRIPT) target_camlheaderd $(INSTALL_LIBDIR)
- endif
-
- ifeq "$(RUNTIMEI)" "true"
- install::
-- cp target_camlheaderi $(INSTALL_LIBDIR)
-+ $(BSD_INSTALL_SCRIPT) target_camlheaderi $(INSTALL_LIBDIR)
- endif
-
- .PHONY: installopt
-@@ -101,7 +101,7 @@ installopt: installopt-default installop
-
- .PHONY: installopt-default
- installopt-default:
-- cp stdlib.cmxa stdlib.$(A) std_exit.$(O) *.cmx "$(INSTALL_LIBDIR)"
-+ $(BSD_INSTALL_DATA) stdlib.cmxa stdlib.$(A) std_exit.$(O) *.cmx "$(INSTALL_LIBDIR)"
- cd "$(INSTALL_LIBDIR)"; $(RANLIB) stdlib.$(A)
-
- .PHONY: installopt-noprof
-@@ -109,7 +109,7 @@ installopt-noprof:
-
- .PHONY: installopt-prof
- installopt-prof:
-- cp stdlib.p.cmxa stdlib.p.$(A) std_exit.p.cmx std_exit.p.$(O) \
-+ $(BSD_INSTALL_DATA) stdlib.p.cmxa stdlib.p.$(A) std_exit.p.cmx std_exit.p.$(O) \
- "$(INSTALL_LIBDIR)"
- cd "$(INSTALL_LIBDIR)"; $(RANLIB) stdlib.p.$(A)
-
diff --git a/lang/ocaml/patches/patch-testsuite_tests_tool-ocamldoc-man_Makefile b/lang/ocaml/patches/patch-testsuite_tests_tool-ocamldoc-man_Makefile
deleted file mode 100644
index 1a14ae7230f..00000000000
--- a/lang/ocaml/patches/patch-testsuite_tests_tool-ocamldoc-man_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-testsuite_tests_tool-ocamldoc-man_Makefile,v 1.3 2017/10/10 12:10:05 he Exp $
-
-After one of our other local patches, output lands in a different
-file than what this make job expects. Follow suit.
-
---- testsuite/tests/tool-ocamldoc-man/Makefile.orig 2016-11-04 16:08:24.000000000 +0000
-+++ testsuite/tests/tool-ocamldoc-man/Makefile
-@@ -39,7 +39,7 @@ run: *.mli
- F="`basename $$file .mli`"; \
- $(OCAMLDOC) $(DOCFLAGS) -hide-warnings -man $ \
- -o index $$file; \
-- tail -n +2 $$F.3o > $$F.result; \
-+ tail -n +2 $$F.3 > $$F.result; \
- $(DIFF) $$F.reference $$F.result >/dev/null \
- && echo " => passed" || echo " => failed"; \
- done
-@@ -49,6 +49,6 @@ promote: defaultpromote
-
- .PHONY: clean
- clean: defaultclean
-- @rm -f *.result *.html *.tex *.log *.out *.sty *.toc *.css *.aux *.3o
-+ @rm -f *.result *.html *.tex *.log *.out *.sty *.toc *.css *.aux *.3
-
- include $(BASEDIR)/makefiles/Makefile.common
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 04:53:35 +0000