Updated package to latest version, 4.05.

Package changes: PLIST cleanup, and added some options for native
compilation.

Changes from ocaml 4.04.2 include (MPR and GPR changed to M and G to not
trigger our CVS hooks):
(Changes that can break existing programs are marked with a "*")

### Language features:

### Code generation and optimizations:

- M#7201, G#954: Correct wrong optimisation of "0 / <expr>"
  and "0 mod <expr>" in the case when <expr> was a non-constant
  evaluating to zero
  (Mark Shinwell, review by Gabriel Scherer, Leo White and Xavier Leroy)

- M#7357, G#832: Improve compilation time for toplevel
  include(struct ... end : sig ... end)
  (Alain Frisch, report by Hongbo Zhang, review by Jacques Garrigue)

- M#7533, G#1173: Correctly perform side effects for certain
  cases of "/" and "mod"
  (Mark Shinwell, report by Jan Mitgaard)

- G#504: Instrumentation support for fuzzing with afl-fuzz.
  (Stephen Dolan, review by Alain Frisch, Pierre Chambart, Mark
  Shinwell, Gabriel Scherer and Damien Doligez)

- G#863, G#1068, G#1069: Optimise matches with constant
  results to lookup tables.
  (Stephen Dolan, review by Gabriel Scherer, Pierre Chambart,
  Mark Shinwell, and bug report by Gabriel Scherer)

- G#1150: Fix typo in arm64 assembler directives
  (KC Sivaramakrishnan)

### Runtime system:

- M#385, G#953: Add caml_startup_exn
  (Mark Shinwell)

- M#7423, G#946: expose new exception-raising functions
  `void caml_{failwith,invalid_argument}_value(value msg)`
  in addition to
  `void caml_{failwith,invalid_argument}(char const *msg)`.
  The previous functions would not free their message argument, so
  were inconvient for dynamically-allocated messages; the messages
  passed to the new functions are handled by the garbage collector.
  (Gabriel Scherer, review by Mark Shinwell, request by Immanuel Litzroth)

- M#7557, G#1213: More security for getenv
  (Damien Doligez, reports by Seth Arnold and Eric Milliken, review by
  Xavier Leroy, David Allsopp, Stephen Dolan, Hannes Mehnert)

- G#795: remove 256-character limitation on Sys.executable_name
  (Xavier Leroy)

- G#891: Use -fno-builtin-memcmp when building runtime with gcc.
  (Leo White)

### Type system:

- M#6608, G#901: unify record types when overriding all fields
  (Tadeu Zagallo and Gabriel Scherer, report by Jeremy Yallop,
  review by David Allsopp, Jacques Garrigue)

* M#7414, G#929: Soundness bug with non-generalized type variables and
  functors.
  (compatibility: some code using module-global mutable state will
   fail at compile-time and is fixed by adding extra annotations;
   see the Mantis and Github discussions.)
  (Jacques Garrigue, report by Leo White)

### Compiler user-interface and warnings:

- M#7050, G#748 G#843 G#864: new `-args/-args0 <file>` parameters to
  provide extra command-line arguments in a file -- see documentation.
  User programs may implement similar options using the new `Expand`
  constructor of the `Arg` module.
  (Bernhard Schommer, review by J?r?mie Dimino, Gabriel Scherer
   and Damien Doligez, discussion with Alain Frisch and Xavier Leroy,
   feature request from the Coq team)

- M#7137, G#960: "-open" command line flag now accepts
  a module path (not a module name)
  (Arseniy Alekseyev and Leo White)

- M#7172, G#970: add extra (ocamlc -config) options
  int_size, word_size, ext_exe
  (Gabriel Scherer, request by Daniel B?nzli)

- M#7315, G#736: refine some error locations
  (Gabriel Scherer and Alain Frisch, report by Matej Ko??k)

- M#7473, G#1025: perform proper globbing for command-line arguments on
  Windows
  (Jonathan Protzenko)

- M#7479: make sure "ocamlc -pack" is only given .cmo and .cmi files,
  and that "ocamlopt -pack" is only given .cmx and .cmi files.
  (Xavier Leroy)

- G#796: allow compiler plugins to declare their own arguments.
  (Fabrice Le Fessant)

- G#829: better error when opening a module aliased to a functor
  (Alain Frisch)

- G#911: ocamlc/ocamlopt do not pass warnings-related options to C
  compiler when called to compile third-party C source files
  (S?bastien Hinderer, review by Adrien Nader and David Allsopp)

- G#915: fix -dsource (pprintast.ml) bugs
  (Runhang Li, review by Alain Frisch)

* G#933: ocamlopt -p now reports an error on platforms that do not
  support profiling with gprof; dummy profiling libraries are no longer
  installed on such platforms.
  This can be tested with ocamlopt -config
  (S?bastien Hinderer)

- G#1009: "ocamlc -c -linkall" and "ocamlopt -c -linkall" can now be used
  to set the "always link" flag on individual compilation units.  This
  controls linking with finer granularity than "-a -linkall", which sets
  the "always link" flag on all units of the given library.
  (Xavier Leroy)

- G#1015: add option "-plugin PLUGIN" to ocamldep too. Use compilerlibs
  to build ocamldep. Add option "-depend" to ocamlc/ocamlopt to behave
  as ocamldep. Remove any use of ocamldep to build the distribution.
  (Fabrice Le Fessant)

- G#1027: various improvements to -dtimings, mostly including time
  spent in subprocesses like preprocessors
  (Valentin Gatien-Baron, review by Gabriel Scherer)

- G#1098: the compiler now takes the boolean "OCAML_COLOR" environment
  variable into account if "-color" is not provided.  This allows users
  to override the default behaviour without modifying invocations of ocaml
  manually.
  (Hannes Mehnert, Guillaume Bury,
   review by Daniel B?nzli, Gabriel Scherer, Damien Doligez)

### Standard library:

- M#6975, G#902: Truncate function added to stdlib Buffer module
  (Dhruv Makwana, review by Alain Frisch and Gabriel Scherer)

- M#7279, G#710: `Weak.get_copy` `Ephemeron.*_copy` doesn't copy
  custom blocks anymore
  (Fran?ois Bobot, Alain Frisch, bug reported by Martin R. Neuh?u?er,
  review by Thomas Braibant and Damien Doligez)

* M#7500, G#1081: Remove Uchar.dump
  (Daniel B?nzli)

- G#760: Add a functions List.compare_lengths and
  List.compare_length_with to avoid full list length computations
  (Fabrice Le Fessant, review by Leo White, Josh Berdine and Gabriel Scherer)

- G#778: Arg: added option Expand that allows to expand a string
  argument to a string array of new arguments
  (Bernhard Schommer, review by Gabriel Scherer and J?r?mie Dimino)

- G#849: Expose a Spacetime.enabled value
  (Leo White)

- G#885: Option-returning variants of stdlib functions
  (Alain Frisch, review by David Allsopp and Bart Jacobs)

- G#869: Add find_first, find_first_opt, find_last, find_last_opt to
  maps and sets.  Find the first or last binding or element
  satisfying a monotonic predicate.
  (Gabriel de Perthuis, with contributions from Alain Frisch, review by
  Hezekiah M. Carty and Simon Cruanes, initial report by Gerd Stolpmann)

- G#875: Add missing functions to ArrayLabels, BytesLabels,
  ListLabels, MoreLabels, StringLabels so they are compatible with
  non-labeled counterparts. Also add missing @@ocaml.deprecated attributes
  in StringLabels and BytesLabels.
  (Roma Sokolov, review by Gabriel Scherer, Jacques Garrigue,
   Gabriel Radanne, Alain Frisch)

- G#999: Arg, do not repeat the usage message thrice when reporting an error
  (this was a regression in 4.03)
  (Florian Angeletti, review by Gabriel Scherer)

- G#1042: Fix escaping of command-line arguments in
  Unix.create_process{,_env} under Windows.  Arguments with tabs should now
  be received verbatim by the child process.
  (Nicolas Ojeda Bar, Andreas Hauptmann review by Xavier Leroy)

### Debugging and profiling:

- M#7258: ocamldebug's "install_printer" command had problems with
  module aliases
  (Xavier Leroy)

- G#378: Add [Printexc.raise_with_backtrace] to raise an exception using
  an explicit backtrace
  (Fran?ois Bobot, review by Gabriel Scherer, Xavier Leroy, Damien Doligez,
   Fr?d?ric Bour)

### Manual and documentation:

- M#6597, G#1030: add forward references to language extensions
  that extend non-terminal symbols in the language reference section.
  (Florian Angeletti, review by Gabriel Scherer)

- M#7497, G#1095: manual, enable numbering for table of contents
  (Florian Angeletti, request by Daniel B?nzli)

- M#7539, G#1181: manual, update dead links in ocamldoc chapter
  (Florian Angeletti)

- G#633: manpage and manual documentation for the `-opaque` option
  (Konstantin Romanov, Gabriel Scherer, review by Mark Shinwell)

- G#751, G#925: add a HACKING.adoc file to contain various
  tips and tricks for people hacking on the repository. See also
  CONTRIBUTING.md for advice on sending contributions upstream.
  (Gabriel Scherer and Gabriel Radanne, review by David Allsopp,
  inspired by John Whitington)

- G#916: new tool lintapidiff, use it to update the manual with
  @since annotations for API changes introduced between 4.00-4.05.
  (Edwin T?r?k, review by Gabriel Scherer, discussion with Alain Frisch,
   David Allsopp, S?bastien Hinderer, Damien Doligez and Xavier Leroy)

- G#939: activate the caml_example environment in the language
  extensions section of the manual. Convert some existing code
  examples to this format.
  (Florian Angeletti)

- G#1082: clarify that the use of quoted string for preprocessed
  foreign quotations still requires the use of an extension node
  [%foo ...] to mark non-standard interpretation.
  (Gabriel Scherer, request by Matthew Wahab in G#1066,
   review by Florian Angeletti)

### Other libraries:

- M#7158: Event.sync, Mutex.create, Condition.create cause too many GCs.
  The fix is to no longer consider mutexes and condition variables
  as rare kernel resources.
  (Xavier Leroy)

- M#7264: document the different behaviors of Unix.lockf under POSIX
  and under Win32.
  (Xavier Leroy, report by David Allsopp)

- M#7339, G#787: Support the '0 dimension' case for bigarrays
  (see Bigarray documentation)
  (Laurent Mazare,
   review by Gabriel Scherer, Alain Frisch and Hezekiah M. Carty)

* M#7342, G#797: fix Unix.read on pipes with no data left on Windows
  it previously raised an EPIPE error, it now returns 0 like other OSes
  (Jonathan Protzenko, review by Andreas Hauptmann and Damien Doligez)

- G#650: in the Unix library, add `?cloexec:bool` optional arguments to
  functions that create file descriptors (`dup`, `dup2`, `pipe`, `socket`,
  `socketpair`, `accept`).  Implement these optional arguments in the
  most atomic manner provided by the operating system to set (or clear)
  the close-on-exec flag at the same time the file descriptor is created,
  reducing the risk of race conditions with `exec` or `create_process`
  calls running in other threads, and improving security.  Also: add a
  `O_KEEPEXEC` flag for `openfile` by symmetry with `O_CLOEXEC`.
  (Xavier Leroy, review by Mark Shinwell, David Allsopp and Alain Frisch,
   request by Romain Beauxis)

- G#996: correctly update caml_top_of_stack in systhreads
  (Fabrice Le Fessant)

- G#997, G#1077: Deprecate Bigarray.*.map_file and add Unix.map_file as a
  first step towards moving Bigarray to the stdlib
  (J?r?mie Dimino and Xavier Leroy)

### Toplevel:

- M#7060, G#1035: Print exceptions in installed custom printers
  (Tadeu Zagallo, review by David Allsopp)

### Tools:

- M#5163: ocamlobjinfo, dump globals defined by bytecode executables
  (St?phane Glondu)

- M#7333: ocamldoc, use the first sentence of text file as
  a short description in overviews.
  (Florian Angeletti)

- G#848: ocamldoc, escape link targets in HTML output
  (Etienne Millon, review by Gabriel Scherer, Florian Angeletti and
  Daniel B?nzli)

- G#986: ocamldoc, use relative paths in error message
  to solve ocamlbuild+doc usability issue (ocaml/ocamlbuild#79)
  (Gabriel Scherer, review by Florian Angeletti, discussion with Daniel B?nzli)

- G#1017: ocamldoc, add an option to detect code fragments that could be
  transformed into a cross-reference to a known element.
  (Florian Angeletti, review and suggestion by David Allsopp)

- clarify ocamldoc text parsing error messages
  (Gabriel Scherer)

### Compiler distribution build system:

- M#7377: remove -std=gnu99 for newer gcc versions
  (Damien Doligez, report by ygrek)

- M#7452, G#1228: tweak GCC options to try to avoid the
  Skylake/Kaby lake bug
  (Damien Doligez, review by David Allsopp, Xavier Leroy and Mark Shinwell)

- G#693: fail on unexpected errors or warnings within caml_example
  environment.
  (Florian Angeletti)

- G#803: new ocamllex-based tool to extract bytecode compiler
  opcode information from C headers.
  (Nicolas Ojeda Bar)

- G#827: install missing mli and cmti files, new make target
  install-compiler-sources for installation of compiler-libs ml files
  (Hendrik Tews)

- G#887: allow -with-frame-pointers if clang is used as compiler on Linux
  (Bernhard Schommer)

- G#898: fix locale-dependence of primitive list order,
  detected through reproducible-builds.org.
  (Hannes Mehnert, review by Gabriel Scherer and Ximin Luo)

- G#907: Remove unused variable from the build system
  (S?bastien Hinderer, review by whitequark, Gabriel Scherer, Adrien Nader)

- G#911: Clarify the use of C compiler related variables in the build system.
  (S?bastien Hinderer, review by Adrien Nader, Alain Frisch, David Allsopp)

- G#919: use clang as preprocessor assembler if clang is used as compiler
  (Bernhard Schommer)

- G#927: improve the detection of hashbang support in the configure script
  (Arma?l Gu?neau)

- G#932: install ocaml{c,lex}->ocaml{c,lex}.byte symlink correctly
  when the opt target is built but opt.opt target is not.
  (whitequark, review by Gabriel Scherer)

- G#935: allow build in Android's termux
  (ygrek, review by Gabriel Scherer)

- G#984: Fix compilation of compiler distribution when Spacetime
  enabled
  (Mark Shinwell)

- G#991: On Windows, fix installation when native compiler is not
  built
  (S?bastien Hinderer, review by David Allsopp)

- G#1033: merge Unix and Windows build systems in the root directory
  (S?bastien Hinderer, review by Damien Doligez and Adrien Nader)

- G#1047: Make .depend files generated for C sources more portable
  (S?bastien Hinderer, review by Xavier Leroy and David Allsopp)

- G#1076: Simplify ocamlyacc's build system
  (S?bastien Hinderer, review by David Allsopp)

### Compiler distribution build system: Makefile factorization

The compiler distribution build system (the set of Makefiles used to
build the compiler distribution) traditionally had separate Makefiles
for Unix and Windows, which lead to some amount of duplication and
subtle differences and technical debt in general -- for people working
on the compiler distribution, but also cross-compilation or porting to
new systems. During the 4.05 development period, S?bastien Hinderer
worked on harmonizing the build rules and merging the two build
systems.

* Some changes were made to the config/Makefile file which
  is exported as $(ocamlc -where)/Makefile.config, and on
  which some advanced users might rely. The changes are
  as follows:
  - a BYTERUN variable was added that points to the installed ocamlrun
  - the PARTIALLD variable was removed (PACKLD is more complete)
  - the always-empty DLLCCCOMPOPTS was removed
  - the SHARED variable was removed; its value is "shared" or "noshared",
    which duplicates the existing and more convenient
    SUPPORTS_SHARED_LIBRARIES variable whose value is "true" or "false".

  Note that Makefile.config may change further in the future and relying
  on it is a bit fragile. We plan to make `ocamlc -config` easier to use
  for scripting purposes, and have a stable interface there. If you rely
  on Makefile.config, you may want to get in touch with S?bastien Hinderer
  or participate to M#7116 (Allow easy retrieval of Makefile.config's values)
  or M#7172 (More information in ocamlc -config).

The complete list of changes is listed below.

- G#705: update Makefile.nt so that ocamlnat compiles
  for non-Cygwin Windows ports.
  (S?bastien Hinderer, review by Alain Frisch)

- G#729: Make sure ocamlnat is built with a $(EXE) extension, merge
  rules between Unix and Windows Makefiles
  (S?bastien Hinderer, review by Alain Frisch)

- G#762: Merge build systems in the yacc/ directory.
  (S?bastien Hinderer, review by David Allsopp, Alain Frisch)

- G#764: Merge build systems in the debugger/ directory.
  (S?bastien Hinderer, review by Alain Frisch)

- G#785: Merge build systems in otherlibs/systhreads/
  (S?bastien Hinderer, review by Alain Frisch, David Allsopp,
   testing and regression fix by J?r?mie Dimino)

- G#788: Merge build systems in subdirectories of otherlibs/.
  (S?bastien Hinderer, review by Alain Frisch)

- G#808, G#906: Merge Unix and Windows build systems
  in the ocamldoc/ directory
  (S?bastien Hinderer, review by Alain Frisch)

- G#812: Merge build systems in the tools/ subdirectory
  (S?bastien Hinderer, review by Alain Frisch)

- G#866: Merge build systems in the stdlib/ directory
  (S?bastien Hinderer, review by David Allsopp and Adrien Nader)

- G#941: Merge Unix and Windows build systems in the asmrun/ directory
  (S?bastien Hinderer, review by Mark Shinwell, Adrien Nader,
   Xavier Leroy, David Allsopp, Damien Doligez)

- G#981: Merge build systems in the byterun/ directory
  (S?bastien Hinderer, review by Adrien Nader)

- G#1033, G#1048: Merge build systems in the root directory
  (S?bastien Hinderer, review by Adrien Nader and Damien Doligez,
   testing and regression fix by Andreas Hauptmann)

### Internal/compiler-libs changes:

- G#673: distinguish initialization of block fields from mutation in lambda.
  (Fr?d?ric Bour, review by Xavier Leroy, Stephen Dolan and Mark Shinwell)

- G#744, G#781: fix duplicate self-reference in imported cmi_crcs
  list in .cmti files + avoid rebuilding cmi_info record when creating
  .cmti files
  (Alain Frisch, report by Daniel B?nzli, review by J?r?mie Dimino)

- G#881: change `Outcometree.out_variant` to be more general.
  `Ovar_name of out_ident * out_type list` becomes `Ovar_type of out_type`.
  (Valentin Gatien-Baron, review by Leo White)

- G#908: refactor PIC-handling in the s390x backend
  (Gabriel Scherer, review by Xavier Leroy and Mark Shinwell)

### Bug fixes

- M#5115: protect all byterun/fail.c functions against
  uninitialized caml_global_data (only changes the bytecode behavior)
  (Gabriel Scherer, review by Xavier Leroy)

- M#6136, G#967: Fix Closure so that overapplication evaluation order
  matches the bytecode compiler and Flambda.
  (Mark Shinwell, report by Jeremy Yallop, review by Fr?d?ric Bour)

- M#6550, G#1094: Allow creation of empty .cmxa files on macOS
  (Mark Shinwell)

- M#6594, G#955: Remove "Istore_symbol" specific operation on x86-64.
  This is more robust and in particular avoids assembly failures on Win64.
  (Mark Shinwell, review by Xavier Leroy, testing by David Allsopp and
   Olivier Andrieu)

- M#6903: Unix.execvpe doesn't change environment on Cygwin
  (Xavier Leroy, report by Adrien Nader)

- M#6987: Strange error message probably caused by
  universal variable escape (with polymorphic variants)
  (Jacques Garrigue, report by Mikhail Mandrykin and Leo White)

- M#7216, G#949: don't require double parens in Functor((val x))
  (Jacques Garrigue, review by Valentin Gatien-Baron)

- M#7331: ocamldoc, avoid infinite loop in presence of self alias,
  i.e. module rec M:sig end = M
  (Florian Angeletti, review Gabriel Scherer)

- M#7346, G#966: Fix evaluation order problem whereby expressions could
  be incorrectly re-ordered when compiling with Flambda.  This also fixes one
  example of evaluation order in the native code compiler not matching the
  bytecode compiler (even when not using Flambda)
  (Mark Shinwell, Leo White, code review by Pierre Chambart)

- M#7348: Private row variables can escape their scope
  (Jacques Garrigue, report by Leo White)

- M#7407: Two not-quite-standard C idioms rejected by SUNWSPro compilers
  (Xavier Leroy)

- M#7421: Soundness bug with GADTs and lazy
  (Jacques Garrigue, report by Leo White)

- M#7424: Typechecker diverges on unboxed type declaration
  (Jacques Garrigue, report by Stephen Dolan)

- M#7426, G#965: Fix fatal error during object compilation (also
  introduces new [Pfield_computed] and [Psetfield_computed] primitives)
  (Mark Shinwell, report by Ulrich Singer)

- M#7427, G#959: Don't delete let bodies in Cmmgen
  (Mark Shinwell, report by Valentin Gatien-Baron)

- M#7432: Linking modules compiled with -labels and -nolabels is not safe
  (Jacques Garrigue, report by Jeremy Yallop)

- M#7437: typing assert failure with nonrec priv
  (Jacques Garrigue, report by Anil Madhavapeddy)

- M#7438: warning +34 exposes #row with private types
  (Alain Frisch, report by Anil Madhavapeddy)

- M#7443, G#990: spurious unused open warning with local open in patterns
  (Florian Angeletti, report by Gabriel Scherer)

- M#7456, G#1092: fix slow compilation on source files containing a lot
  of similar debugging information location entries
  (Mark Shinwell)

- M#7504: fix warning 8 with unconstrained records
  (Florian Angeletti, report by John Whitington)

- M#7511, G#1133: Unboxed type with unboxed argument should not be accepted
  (Damien Doligez, review by Jeremy Yallop and Leo White)

- G#805, G#815, G#833: check for integer overflow in String.concat
  (Jeremy Yallop,
   review by Damien Doligez, Alain Frisch, Daniel B?nzli, Fabrice Le Fessant)

- G#881: short-paths did not apply to some polymorphic variants
  (Valentin Gatien-Baron, review by Leo White)

- G#886: Fix Ctype.moregeneral's handling of row_name
  (Leo White, review by Jacques Garrigue)

- G#934: check for integer overflow in Bytes.extend
  (Jeremy Yallop, review by Gabriel Scherer)

- G#956: Keep possibly-effectful expressions when optimizing multiplication
  by zero.
  (Jeremy Yallop, review by Nicol?s Ojeda B?r, Xavier Leroy and Mark Shinwell)

- G#977: Catch Out_of_range in ocamldebug's "list" command
  (Yunxing Dai)

- G#983: Avoid removing effectful expressions in Closure, and
  eliminate more non-effectful ones
  (Alain Frisch, review by Mark Shinwell and Gabriel Scherer)

- G#987: alloc_sockaddr: don't assume a null terminator. It is not inserted
  on macOS by system calls that fill in a struct sockaddr (e.g. getsockname).
  (Anton Bachin)

- G#998: Do not delete unused closures in un_anf.ml.
  (Leo White, review by Mark Shinwell and Pierre Chambart)

- G#1019: Fix fatal error in Flambda mode "[functions] does not map set of
  closures ID"
  (Pierre Chambart, code review by Mark Shinwell and Leo White)

- G#1075: Ensure that zero-sized float arrays have zero tags.
  (Mark Shinwell, Leo White, review by Xavier Leroy)

* G#1088: Gc.minor_words now returns accurate numbers.
  (compatibility: the .mli declaration of `Gc.minor_words`
   and `Gc.get_minor_free` changed, which may break libraries
   re-exporting these values.)
(Stephen Dolan, review by Pierre Chambart and Xavier Leroy)

24 files changed, 1172 insertions, 1091 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 8c55c4da496..5cb158a3eb3 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.112 2017/07/18 17:41:04 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2017/09/08 09:12:44 jaapb Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		3
+#PKGREVISION=		3
 
 CONFIGURE_ENV+=		disable_x11=yes
 
@@ -12,6 +12,9 @@ UNLIMIT_RESOURCES=	stacksize
 
 USE_GCC_RUNTIME=	yes
 
+PLIST_VARS+=	ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime
+
+.include "options.mk"
 ###
 ### PLIST components
 ###
@@ -23,7 +26,7 @@ USE_GCC_RUNTIME=	yes
     ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
     ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \
     ${OPSYS} == "Linux"
-PLIST_SRC+=	${PKGDIR}/PLIST.stub
+PLIST.ocaml-stub=	yes
 .endif
 
 # Optional components built only on certain platforms.
@@ -31,12 +34,12 @@ PLIST_SRC+=	${PKGDIR}/PLIST.stub
     !empty(MACHINE_ARCH:M*arm*) || \
     (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
 BUILD_TARGET+=	opt opt.opt
-PLIST_SRC+=	${PKGDIR}/PLIST.opt
+PLIST.ocaml-opt=	yes
 .  if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
       empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-arm) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-sparc)
-PLIST_SRC+=	${PKGDIR}/PLIST.prof
+PLIST.ocaml-prof=yes
 .  endif
 .endif
 
@@ -49,18 +52,15 @@ PLIST_SRC+=	${PKGDIR}/PLIST.prof
       (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)) || \
       !empty(MACHINE_PLATFORM:MDarwin-*-*) || \
       !empty(MACHINE_PLATFORM:MSunOS-*-*)
-PLIST_SRC+=	${PKGDIR}/PLIST.natdynlink
+PLIST.ocaml-nat= yes
 .  endif
 .endif
 
 # Spacetime profiling is only available for native code on 64-bit targets.
 .if ${MACHINE_ARCH} == "x86_64"
-PLIST_SRC+=	${PKGDIR}/PLIST.raw_spacetime
+PLIST.ocaml-spacetime= yes
 .endif
 
-# Common ocaml files.
-PLIST_SRC+=	${PKGDIR}/PLIST
-
 # This is needed because ${WRKSRC}/build/partial-install.sh uses
 # $PWD as part of its script.  However, with /bin/sh on SunOS
 # (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index fd6c4c042b1..72c93c05c83 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.50 2017/07/11 09:52:11 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.51 2017/09/08 09:12:44 jaapb Exp $
 
 # used by x11/labltk/Makefile
 # used by x11/ocaml-graphics/Makefile
-DISTNAME=	ocaml-4.04.2
+DISTNAME=	ocaml-4.05.0
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.04/
+MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.05/
 #EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jaapb@NetBSD.org
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index 8956e3a73db..a5f16043b21 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,27 +1,38 @@
-@comment $NetBSD: PLIST,v 1.40 2017/07/17 09:45:36 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.41 2017/09/08 09:12:44 jaapb Exp $
 bin/ocaml
 bin/ocamlc
 bin/ocamlc.byte
+${PLIST.ocaml-opt}bin/ocamlc.opt
 bin/ocamlcp
 bin/ocamlcp.byte
+${PLIST.ocaml-opt}bin/ocamlcp.opt
 bin/ocamldebug
 bin/ocamldep
 bin/ocamldep.byte
+${PLIST.ocaml-opt}bin/ocamldep.opt
 bin/ocamldoc
+${PLIST.ocaml-opt}bin/ocamldoc.opt
 bin/ocamllex
 bin/ocamllex.byte
+${PLIST.ocaml-opt}bin/ocamllex.opt
 bin/ocamlmklib
 bin/ocamlmklib.byte
+${PLIST.ocaml-opt}bin/ocamlmklib.opt
 bin/ocamlmktop
 bin/ocamlmktop.byte
+${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.opt
 bin/ocamloptp
 bin/ocamloptp.byte
+${PLIST.ocaml-opt}bin/ocamloptp.opt
 bin/ocamlprof
 bin/ocamlprof.byte
+${PLIST.ocaml-opt}bin/ocamlprof.opt
 bin/ocamlrun
 bin/ocamlyacc
 lib/ocaml/Makefile.config
@@ -29,45 +40,76 @@ 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
+${PLIST.ocaml-opt}lib/ocaml/arith_flags.cmx
 lib/ocaml/arith_status.cmi
+lib/ocaml/arith_status.cmti
+${PLIST.ocaml-opt}lib/ocaml/arith_status.cmx
 lib/ocaml/arith_status.mli
 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
 lib/ocaml/big_int.cmi
+lib/ocaml/big_int.cmti
+${PLIST.ocaml-opt}lib/ocaml/big_int.cmx
 lib/ocaml/big_int.mli
+${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
 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
@@ -114,6 +156,7 @@ lib/ocaml/caml/roots.h
 lib/ocaml/caml/signals.h
 lib/ocaml/caml/signals_machdep.h
 lib/ocaml/caml/socketaddr.h
+lib/ocaml/caml/spacetime.h
 lib/ocaml/caml/stack.h
 lib/ocaml/caml/stacks.h
 lib/ocaml/caml/startup.h
@@ -129,1167 +172,1812 @@ lib/ocaml/camlheader_ur
 lib/ocaml/camlinternalFormat.cmi
 lib/ocaml/camlinternalFormat.cmt
 lib/ocaml/camlinternalFormat.cmti
+${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.cmx
 lib/ocaml/camlinternalFormat.ml
 lib/ocaml/camlinternalFormat.mli
+${PLIST.ocaml-prof}lib/ocaml/camlinternalFormat.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.p.cmx
 lib/ocaml/camlinternalFormatBasics.cmi
 lib/ocaml/camlinternalFormatBasics.cmt
 lib/ocaml/camlinternalFormatBasics.cmti
+${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.cmx
 lib/ocaml/camlinternalFormatBasics.ml
 lib/ocaml/camlinternalFormatBasics.mli
+${PLIST.ocaml-prof}lib/ocaml/camlinternalFormatBasics.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.p.cmx
 lib/ocaml/camlinternalLazy.cmi
 lib/ocaml/camlinternalLazy.cmt
 lib/ocaml/camlinternalLazy.cmti
+${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.cmx
 lib/ocaml/camlinternalLazy.ml
 lib/ocaml/camlinternalLazy.mli
+${PLIST.ocaml-prof}lib/ocaml/camlinternalLazy.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.p.cmx
 lib/ocaml/camlinternalMod.cmi
 lib/ocaml/camlinternalMod.cmt
 lib/ocaml/camlinternalMod.cmti
+${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.cmx
 lib/ocaml/camlinternalMod.ml
 lib/ocaml/camlinternalMod.mli
+${PLIST.ocaml-prof}lib/ocaml/camlinternalMod.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.p.cmx
 lib/ocaml/camlinternalOO.cmi
 lib/ocaml/camlinternalOO.cmt
 lib/ocaml/camlinternalOO.cmti
+${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.cmx
 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
 lib/ocaml/compiler-libs/CSEgen.cmi
 lib/ocaml/compiler-libs/CSEgen.cmt
 lib/ocaml/compiler-libs/CSEgen.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSEgen.cmx
+lib/ocaml/compiler-libs/CSEgen.mli
+lib/ocaml/compiler-libs/afl_instrument.cmi
+lib/ocaml/compiler-libs/afl_instrument.cmt
+lib/ocaml/compiler-libs/afl_instrument.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/afl_instrument.cmx
+lib/ocaml/compiler-libs/afl_instrument.mli
 lib/ocaml/compiler-libs/alias_analysis.cmi
 lib/ocaml/compiler-libs/alias_analysis.cmt
 lib/ocaml/compiler-libs/alias_analysis.cmti
+lib/ocaml/compiler-libs/alias_analysis.mli
 lib/ocaml/compiler-libs/allocated_const.cmi
 lib/ocaml/compiler-libs/allocated_const.cmt
 lib/ocaml/compiler-libs/allocated_const.cmti
+lib/ocaml/compiler-libs/allocated_const.mli
 lib/ocaml/compiler-libs/annot.cmi
 lib/ocaml/compiler-libs/annot.cmti
+lib/ocaml/compiler-libs/annot.mli
 lib/ocaml/compiler-libs/arch.cmi
 lib/ocaml/compiler-libs/arch.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arch.cmx
 lib/ocaml/compiler-libs/arg_helper.cmi
 lib/ocaml/compiler-libs/arg_helper.cmt
 lib/ocaml/compiler-libs/arg_helper.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arg_helper.cmx
+lib/ocaml/compiler-libs/arg_helper.mli
 lib/ocaml/compiler-libs/asmgen.cmi
 lib/ocaml/compiler-libs/asmgen.cmt
 lib/ocaml/compiler-libs/asmgen.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmgen.cmx
+lib/ocaml/compiler-libs/asmgen.mli
 lib/ocaml/compiler-libs/asmlibrarian.cmi
 lib/ocaml/compiler-libs/asmlibrarian.cmt
 lib/ocaml/compiler-libs/asmlibrarian.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlibrarian.cmx
+lib/ocaml/compiler-libs/asmlibrarian.mli
 lib/ocaml/compiler-libs/asmlink.cmi
 lib/ocaml/compiler-libs/asmlink.cmt
 lib/ocaml/compiler-libs/asmlink.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlink.cmx
+lib/ocaml/compiler-libs/asmlink.mli
 lib/ocaml/compiler-libs/asmpackager.cmi
 lib/ocaml/compiler-libs/asmpackager.cmt
 lib/ocaml/compiler-libs/asmpackager.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmpackager.cmx
+lib/ocaml/compiler-libs/asmpackager.mli
 lib/ocaml/compiler-libs/ast_helper.cmi
 lib/ocaml/compiler-libs/ast_helper.cmt
 lib/ocaml/compiler-libs/ast_helper.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ast_helper.cmx
+lib/ocaml/compiler-libs/ast_helper.mli
 lib/ocaml/compiler-libs/ast_invariants.cmi
 lib/ocaml/compiler-libs/ast_invariants.cmt
 lib/ocaml/compiler-libs/ast_invariants.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ast_invariants.cmx
+lib/ocaml/compiler-libs/ast_invariants.mli
 lib/ocaml/compiler-libs/ast_iterator.cmi
 lib/ocaml/compiler-libs/ast_iterator.cmt
 lib/ocaml/compiler-libs/ast_iterator.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ast_iterator.cmx
+lib/ocaml/compiler-libs/ast_iterator.mli
 lib/ocaml/compiler-libs/ast_mapper.cmi
 lib/ocaml/compiler-libs/ast_mapper.cmt
 lib/ocaml/compiler-libs/ast_mapper.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ast_mapper.cmx
+lib/ocaml/compiler-libs/ast_mapper.mli
 lib/ocaml/compiler-libs/asttypes.cmi
 lib/ocaml/compiler-libs/asttypes.cmti
+lib/ocaml/compiler-libs/asttypes.mli
 lib/ocaml/compiler-libs/attr_helper.cmi
 lib/ocaml/compiler-libs/attr_helper.cmt
 lib/ocaml/compiler-libs/attr_helper.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/attr_helper.cmx
+lib/ocaml/compiler-libs/attr_helper.mli
 lib/ocaml/compiler-libs/augment_specialised_args.cmi
 lib/ocaml/compiler-libs/augment_specialised_args.cmt
 lib/ocaml/compiler-libs/augment_specialised_args.cmti
+lib/ocaml/compiler-libs/augment_specialised_args.mli
 lib/ocaml/compiler-libs/backend_intf.cmi
 lib/ocaml/compiler-libs/backend_intf.cmti
+lib/ocaml/compiler-libs/backend_intf.mli
 lib/ocaml/compiler-libs/branch_relaxation.cmi
 lib/ocaml/compiler-libs/branch_relaxation.cmt
 lib/ocaml/compiler-libs/branch_relaxation.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmx
+lib/ocaml/compiler-libs/branch_relaxation.mli
 lib/ocaml/compiler-libs/branch_relaxation_intf.cmi
 lib/ocaml/compiler-libs/branch_relaxation_intf.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation_intf.cmx
 lib/ocaml/compiler-libs/btype.cmi
 lib/ocaml/compiler-libs/btype.cmt
 lib/ocaml/compiler-libs/btype.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/btype.cmx
+lib/ocaml/compiler-libs/btype.mli
 lib/ocaml/compiler-libs/build_export_info.cmi
 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/builtin_attributes.cmi
 lib/ocaml/compiler-libs/builtin_attributes.cmt
 lib/ocaml/compiler-libs/builtin_attributes.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/builtin_attributes.cmx
+lib/ocaml/compiler-libs/builtin_attributes.mli
 lib/ocaml/compiler-libs/bytegen.cmi
 lib/ocaml/compiler-libs/bytegen.cmt
 lib/ocaml/compiler-libs/bytegen.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytegen.cmx
+lib/ocaml/compiler-libs/bytegen.mli
 lib/ocaml/compiler-libs/bytelibrarian.cmi
 lib/ocaml/compiler-libs/bytelibrarian.cmt
 lib/ocaml/compiler-libs/bytelibrarian.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytelibrarian.cmx
+lib/ocaml/compiler-libs/bytelibrarian.mli
 lib/ocaml/compiler-libs/bytelink.cmi
 lib/ocaml/compiler-libs/bytelink.cmt
 lib/ocaml/compiler-libs/bytelink.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytelink.cmx
+lib/ocaml/compiler-libs/bytelink.mli
 lib/ocaml/compiler-libs/bytepackager.cmi
 lib/ocaml/compiler-libs/bytepackager.cmt
 lib/ocaml/compiler-libs/bytepackager.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytepackager.cmx
+lib/ocaml/compiler-libs/bytepackager.mli
 lib/ocaml/compiler-libs/bytesections.cmi
 lib/ocaml/compiler-libs/bytesections.cmt
 lib/ocaml/compiler-libs/bytesections.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytesections.cmx
+lib/ocaml/compiler-libs/bytesections.mli
 lib/ocaml/compiler-libs/ccomp.cmi
 lib/ocaml/compiler-libs/ccomp.cmt
 lib/ocaml/compiler-libs/ccomp.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ccomp.cmx
+lib/ocaml/compiler-libs/ccomp.mli
 lib/ocaml/compiler-libs/clambda.cmi
 lib/ocaml/compiler-libs/clambda.cmt
 lib/ocaml/compiler-libs/clambda.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmx
+lib/ocaml/compiler-libs/clambda.mli
 lib/ocaml/compiler-libs/clflags.cmi
 lib/ocaml/compiler-libs/clflags.cmt
 lib/ocaml/compiler-libs/clflags.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clflags.cmx
+lib/ocaml/compiler-libs/clflags.mli
 lib/ocaml/compiler-libs/closure.cmi
 lib/ocaml/compiler-libs/closure.cmt
 lib/ocaml/compiler-libs/closure.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure.cmx
+lib/ocaml/compiler-libs/closure.mli
 lib/ocaml/compiler-libs/closure_conversion.cmi
 lib/ocaml/compiler-libs/closure_conversion.cmt
 lib/ocaml/compiler-libs/closure_conversion.cmti
+lib/ocaml/compiler-libs/closure_conversion.mli
 lib/ocaml/compiler-libs/closure_conversion_aux.cmi
 lib/ocaml/compiler-libs/closure_conversion_aux.cmt
 lib/ocaml/compiler-libs/closure_conversion_aux.cmti
+lib/ocaml/compiler-libs/closure_conversion_aux.mli
 lib/ocaml/compiler-libs/closure_element.cmi
 lib/ocaml/compiler-libs/closure_element.cmt
 lib/ocaml/compiler-libs/closure_element.cmti
+lib/ocaml/compiler-libs/closure_element.mli
 lib/ocaml/compiler-libs/closure_id.cmi
 lib/ocaml/compiler-libs/closure_id.cmt
 lib/ocaml/compiler-libs/closure_id.cmti
+lib/ocaml/compiler-libs/closure_id.mli
 lib/ocaml/compiler-libs/closure_offsets.cmi
 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/cmi_format.cmi
 lib/ocaml/compiler-libs/cmi_format.cmt
 lib/ocaml/compiler-libs/cmi_format.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmi_format.cmx
+lib/ocaml/compiler-libs/cmi_format.mli
 lib/ocaml/compiler-libs/cmm.cmi
 lib/ocaml/compiler-libs/cmm.cmt
 lib/ocaml/compiler-libs/cmm.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmx
+lib/ocaml/compiler-libs/cmm.mli
 lib/ocaml/compiler-libs/cmmgen.cmi
 lib/ocaml/compiler-libs/cmmgen.cmt
 lib/ocaml/compiler-libs/cmmgen.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmx
+lib/ocaml/compiler-libs/cmmgen.mli
 lib/ocaml/compiler-libs/cmo_format.cmi
 lib/ocaml/compiler-libs/cmo_format.cmti
+lib/ocaml/compiler-libs/cmo_format.mli
 lib/ocaml/compiler-libs/cmt_format.cmi
 lib/ocaml/compiler-libs/cmt_format.cmt
 lib/ocaml/compiler-libs/cmt_format.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmt_format.cmx
+lib/ocaml/compiler-libs/cmt_format.mli
 lib/ocaml/compiler-libs/cmx_format.cmi
 lib/ocaml/compiler-libs/cmx_format.cmti
+lib/ocaml/compiler-libs/cmx_format.mli
 lib/ocaml/compiler-libs/coloring.cmi
 lib/ocaml/compiler-libs/coloring.cmt
 lib/ocaml/compiler-libs/coloring.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmx
+lib/ocaml/compiler-libs/coloring.mli
 lib/ocaml/compiler-libs/comballoc.cmi
 lib/ocaml/compiler-libs/comballoc.cmt
 lib/ocaml/compiler-libs/comballoc.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmx
+lib/ocaml/compiler-libs/comballoc.mli
 lib/ocaml/compiler-libs/compdynlink.cmi
 lib/ocaml/compiler-libs/compdynlink.cmt
 lib/ocaml/compiler-libs/compdynlink.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink.cmx
+lib/ocaml/compiler-libs/compdynlink.mli
 lib/ocaml/compiler-libs/compenv.cmi
 lib/ocaml/compiler-libs/compenv.cmt
 lib/ocaml/compiler-libs/compenv.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compenv.cmx
+lib/ocaml/compiler-libs/compenv.mli
 lib/ocaml/compiler-libs/compilation_unit.cmi
 lib/ocaml/compiler-libs/compilation_unit.cmt
 lib/ocaml/compiler-libs/compilation_unit.cmti
+lib/ocaml/compiler-libs/compilation_unit.mli
 lib/ocaml/compiler-libs/compile.cmi
 lib/ocaml/compiler-libs/compile.cmt
 lib/ocaml/compiler-libs/compile.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compile.cmx
+lib/ocaml/compiler-libs/compile.mli
 lib/ocaml/compiler-libs/compilenv.cmi
 lib/ocaml/compiler-libs/compilenv.cmt
 lib/ocaml/compiler-libs/compilenv.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.cmx
+lib/ocaml/compiler-libs/compilenv.mli
 lib/ocaml/compiler-libs/compmisc.cmi
 lib/ocaml/compiler-libs/compmisc.cmt
 lib/ocaml/compiler-libs/compmisc.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compmisc.cmx
+lib/ocaml/compiler-libs/compmisc.mli
 lib/ocaml/compiler-libs/compplugin.cmi
 lib/ocaml/compiler-libs/compplugin.cmt
 lib/ocaml/compiler-libs/compplugin.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compplugin.cmx
+lib/ocaml/compiler-libs/compplugin.mli
 lib/ocaml/compiler-libs/config.cmi
 lib/ocaml/compiler-libs/config.cmt
 lib/ocaml/compiler-libs/config.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/config.cmx
+lib/ocaml/compiler-libs/config.mli
 lib/ocaml/compiler-libs/consistbl.cmi
 lib/ocaml/compiler-libs/consistbl.cmt
 lib/ocaml/compiler-libs/consistbl.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/consistbl.cmx
+lib/ocaml/compiler-libs/consistbl.mli
 lib/ocaml/compiler-libs/ctype.cmi
 lib/ocaml/compiler-libs/ctype.cmt
 lib/ocaml/compiler-libs/ctype.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ctype.cmx
+lib/ocaml/compiler-libs/ctype.mli
 lib/ocaml/compiler-libs/datarepr.cmi
 lib/ocaml/compiler-libs/datarepr.cmt
 lib/ocaml/compiler-libs/datarepr.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/datarepr.cmx
+lib/ocaml/compiler-libs/datarepr.mli
 lib/ocaml/compiler-libs/deadcode.cmi
 lib/ocaml/compiler-libs/deadcode.cmt
 lib/ocaml/compiler-libs/deadcode.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/deadcode.cmx
+lib/ocaml/compiler-libs/deadcode.mli
 lib/ocaml/compiler-libs/debuginfo.cmi
 lib/ocaml/compiler-libs/debuginfo.cmt
 lib/ocaml/compiler-libs/debuginfo.cmti
+lib/ocaml/compiler-libs/debuginfo.mli
 lib/ocaml/compiler-libs/depend.cmi
 lib/ocaml/compiler-libs/depend.cmt
 lib/ocaml/compiler-libs/depend.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/depend.cmx
+lib/ocaml/compiler-libs/depend.mli
 lib/ocaml/compiler-libs/dll.cmi
 lib/ocaml/compiler-libs/dll.cmt
 lib/ocaml/compiler-libs/dll.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dll.cmx
+lib/ocaml/compiler-libs/dll.mli
 lib/ocaml/compiler-libs/docstrings.cmi
 lib/ocaml/compiler-libs/docstrings.cmt
 lib/ocaml/compiler-libs/docstrings.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/docstrings.cmx
+lib/ocaml/compiler-libs/docstrings.mli
 lib/ocaml/compiler-libs/effect_analysis.cmi
 lib/ocaml/compiler-libs/effect_analysis.cmt
 lib/ocaml/compiler-libs/effect_analysis.cmti
+lib/ocaml/compiler-libs/effect_analysis.mli
 lib/ocaml/compiler-libs/emit.cmi
 lib/ocaml/compiler-libs/emit.cmt
 lib/ocaml/compiler-libs/emit.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emit.cmx
+lib/ocaml/compiler-libs/emit.mli
 lib/ocaml/compiler-libs/emitaux.cmi
 lib/ocaml/compiler-libs/emitaux.cmt
 lib/ocaml/compiler-libs/emitaux.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitaux.cmx
+lib/ocaml/compiler-libs/emitaux.mli
 lib/ocaml/compiler-libs/emitcode.cmi
 lib/ocaml/compiler-libs/emitcode.cmt
 lib/ocaml/compiler-libs/emitcode.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitcode.cmx
+lib/ocaml/compiler-libs/emitcode.mli
 lib/ocaml/compiler-libs/env.cmi
 lib/ocaml/compiler-libs/env.cmt
 lib/ocaml/compiler-libs/env.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/env.cmx
+lib/ocaml/compiler-libs/env.mli
 lib/ocaml/compiler-libs/envaux.cmi
 lib/ocaml/compiler-libs/envaux.cmt
 lib/ocaml/compiler-libs/envaux.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/envaux.cmx
+lib/ocaml/compiler-libs/envaux.mli
 lib/ocaml/compiler-libs/errors.cmi
 lib/ocaml/compiler-libs/errors.cmt
 lib/ocaml/compiler-libs/errors.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/errors.cmx
+lib/ocaml/compiler-libs/errors.mli
 lib/ocaml/compiler-libs/export_id.cmi
 lib/ocaml/compiler-libs/export_id.cmt
 lib/ocaml/compiler-libs/export_id.cmti
+lib/ocaml/compiler-libs/export_id.mli
 lib/ocaml/compiler-libs/export_info.cmi
 lib/ocaml/compiler-libs/export_info.cmt
 lib/ocaml/compiler-libs/export_info.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info.cmx
+lib/ocaml/compiler-libs/export_info.mli
 lib/ocaml/compiler-libs/export_info_for_pack.cmi
 lib/ocaml/compiler-libs/export_info_for_pack.cmt
 lib/ocaml/compiler-libs/export_info_for_pack.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info_for_pack.cmx
+lib/ocaml/compiler-libs/export_info_for_pack.mli
 lib/ocaml/compiler-libs/expunge.cmi
 lib/ocaml/compiler-libs/expunge.cmt
 lib/ocaml/compiler-libs/extract_projections.cmi
 lib/ocaml/compiler-libs/extract_projections.cmt
 lib/ocaml/compiler-libs/extract_projections.cmti
+lib/ocaml/compiler-libs/extract_projections.mli
 lib/ocaml/compiler-libs/find_recursive_functions.cmi
 lib/ocaml/compiler-libs/find_recursive_functions.cmt
 lib/ocaml/compiler-libs/find_recursive_functions.cmti
+lib/ocaml/compiler-libs/find_recursive_functions.mli
 lib/ocaml/compiler-libs/flambda.cmi
 lib/ocaml/compiler-libs/flambda.cmt
 lib/ocaml/compiler-libs/flambda.cmti
+lib/ocaml/compiler-libs/flambda.mli
 lib/ocaml/compiler-libs/flambda_invariants.cmi
 lib/ocaml/compiler-libs/flambda_invariants.cmt
 lib/ocaml/compiler-libs/flambda_invariants.cmti
+lib/ocaml/compiler-libs/flambda_invariants.mli
 lib/ocaml/compiler-libs/flambda_iterators.cmi
 lib/ocaml/compiler-libs/flambda_iterators.cmt
 lib/ocaml/compiler-libs/flambda_iterators.cmti
+lib/ocaml/compiler-libs/flambda_iterators.mli
 lib/ocaml/compiler-libs/flambda_to_clambda.cmi
 lib/ocaml/compiler-libs/flambda_to_clambda.cmt
 lib/ocaml/compiler-libs/flambda_to_clambda.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmx
+lib/ocaml/compiler-libs/flambda_to_clambda.mli
 lib/ocaml/compiler-libs/flambda_utils.cmi
 lib/ocaml/compiler-libs/flambda_utils.cmt
 lib/ocaml/compiler-libs/flambda_utils.cmti
+lib/ocaml/compiler-libs/flambda_utils.mli
 lib/ocaml/compiler-libs/freshening.cmi
 lib/ocaml/compiler-libs/freshening.cmt
 lib/ocaml/compiler-libs/freshening.cmti
+lib/ocaml/compiler-libs/freshening.mli
 lib/ocaml/compiler-libs/genprintval.cmi
 lib/ocaml/compiler-libs/genprintval.cmt
 lib/ocaml/compiler-libs/genprintval.cmti
+lib/ocaml/compiler-libs/genprintval.mli
 lib/ocaml/compiler-libs/id_types.cmi
 lib/ocaml/compiler-libs/id_types.cmt
 lib/ocaml/compiler-libs/id_types.cmti
+lib/ocaml/compiler-libs/id_types.mli
 lib/ocaml/compiler-libs/ident.cmi
 lib/ocaml/compiler-libs/ident.cmt
 lib/ocaml/compiler-libs/ident.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ident.cmx
+lib/ocaml/compiler-libs/ident.mli
 lib/ocaml/compiler-libs/identifiable.cmi
 lib/ocaml/compiler-libs/identifiable.cmt
 lib/ocaml/compiler-libs/identifiable.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/identifiable.cmx
+lib/ocaml/compiler-libs/identifiable.mli
 lib/ocaml/compiler-libs/import_approx.cmi
 lib/ocaml/compiler-libs/import_approx.cmt
 lib/ocaml/compiler-libs/import_approx.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/import_approx.cmx
+lib/ocaml/compiler-libs/import_approx.mli
 lib/ocaml/compiler-libs/includeclass.cmi
 lib/ocaml/compiler-libs/includeclass.cmt
 lib/ocaml/compiler-libs/includeclass.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includeclass.cmx
+lib/ocaml/compiler-libs/includeclass.mli
 lib/ocaml/compiler-libs/includecore.cmi
 lib/ocaml/compiler-libs/includecore.cmt
 lib/ocaml/compiler-libs/includecore.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includecore.cmx
+lib/ocaml/compiler-libs/includecore.mli
 lib/ocaml/compiler-libs/includemod.cmi
 lib/ocaml/compiler-libs/includemod.cmt
 lib/ocaml/compiler-libs/includemod.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includemod.cmx
+lib/ocaml/compiler-libs/includemod.mli
 lib/ocaml/compiler-libs/inconstant_idents.cmi
 lib/ocaml/compiler-libs/inconstant_idents.cmt
 lib/ocaml/compiler-libs/inconstant_idents.cmti
+lib/ocaml/compiler-libs/inconstant_idents.mli
 lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmi
 lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmt
 lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmti
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.mli
 lib/ocaml/compiler-libs/inline_and_simplify.cmi
 lib/ocaml/compiler-libs/inline_and_simplify.cmt
 lib/ocaml/compiler-libs/inline_and_simplify.cmti
+lib/ocaml/compiler-libs/inline_and_simplify.mli
 lib/ocaml/compiler-libs/inline_and_simplify_aux.cmi
 lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt
 lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti
+lib/ocaml/compiler-libs/inline_and_simplify_aux.mli
 lib/ocaml/compiler-libs/inlining_cost.cmi
 lib/ocaml/compiler-libs/inlining_cost.cmt
 lib/ocaml/compiler-libs/inlining_cost.cmti
+lib/ocaml/compiler-libs/inlining_cost.mli
 lib/ocaml/compiler-libs/inlining_decision.cmi
 lib/ocaml/compiler-libs/inlining_decision.cmt
 lib/ocaml/compiler-libs/inlining_decision.cmti
+lib/ocaml/compiler-libs/inlining_decision.mli
 lib/ocaml/compiler-libs/inlining_decision_intf.cmi
 lib/ocaml/compiler-libs/inlining_decision_intf.cmti
+lib/ocaml/compiler-libs/inlining_decision_intf.mli
 lib/ocaml/compiler-libs/inlining_stats.cmi
 lib/ocaml/compiler-libs/inlining_stats.cmt
 lib/ocaml/compiler-libs/inlining_stats.cmti
+lib/ocaml/compiler-libs/inlining_stats.mli
 lib/ocaml/compiler-libs/inlining_stats_types.cmi
 lib/ocaml/compiler-libs/inlining_stats_types.cmt
 lib/ocaml/compiler-libs/inlining_stats_types.cmti
+lib/ocaml/compiler-libs/inlining_stats_types.mli
 lib/ocaml/compiler-libs/inlining_transforms.cmi
 lib/ocaml/compiler-libs/inlining_transforms.cmt
 lib/ocaml/compiler-libs/inlining_transforms.cmti
+lib/ocaml/compiler-libs/inlining_transforms.mli
 lib/ocaml/compiler-libs/instruct.cmi
 lib/ocaml/compiler-libs/instruct.cmt
 lib/ocaml/compiler-libs/instruct.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/instruct.cmx
+lib/ocaml/compiler-libs/instruct.mli
 lib/ocaml/compiler-libs/interf.cmi
 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/invariant_params.cmi
 lib/ocaml/compiler-libs/invariant_params.cmt
 lib/ocaml/compiler-libs/invariant_params.cmti
+lib/ocaml/compiler-libs/invariant_params.mli
 lib/ocaml/compiler-libs/lambda.cmi
 lib/ocaml/compiler-libs/lambda.cmt
 lib/ocaml/compiler-libs/lambda.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lambda.cmx
+lib/ocaml/compiler-libs/lambda.mli
 lib/ocaml/compiler-libs/lexer.cmi
 lib/ocaml/compiler-libs/lexer.cmt
 lib/ocaml/compiler-libs/lexer.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lexer.cmx
+lib/ocaml/compiler-libs/lexer.mli
 lib/ocaml/compiler-libs/lift_code.cmi
 lib/ocaml/compiler-libs/lift_code.cmt
 lib/ocaml/compiler-libs/lift_code.cmti
+lib/ocaml/compiler-libs/lift_code.mli
 lib/ocaml/compiler-libs/lift_constants.cmi
 lib/ocaml/compiler-libs/lift_constants.cmt
 lib/ocaml/compiler-libs/lift_constants.cmti
+lib/ocaml/compiler-libs/lift_constants.mli
 lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmi
 lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt
 lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
 lib/ocaml/compiler-libs/linearize.cmi
 lib/ocaml/compiler-libs/linearize.cmt
 lib/ocaml/compiler-libs/linearize.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmx
+lib/ocaml/compiler-libs/linearize.mli
 lib/ocaml/compiler-libs/linkage_name.cmi
 lib/ocaml/compiler-libs/linkage_name.cmt
 lib/ocaml/compiler-libs/linkage_name.cmti
+lib/ocaml/compiler-libs/linkage_name.mli
 lib/ocaml/compiler-libs/liveness.cmi
 lib/ocaml/compiler-libs/liveness.cmt
 lib/ocaml/compiler-libs/liveness.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.cmx
+lib/ocaml/compiler-libs/liveness.mli
 lib/ocaml/compiler-libs/location.cmi
 lib/ocaml/compiler-libs/location.cmt
 lib/ocaml/compiler-libs/location.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/location.cmx
+lib/ocaml/compiler-libs/location.mli
 lib/ocaml/compiler-libs/longident.cmi
 lib/ocaml/compiler-libs/longident.cmt
 lib/ocaml/compiler-libs/longident.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/longident.cmx
+lib/ocaml/compiler-libs/longident.mli
 lib/ocaml/compiler-libs/mach.cmi
 lib/ocaml/compiler-libs/mach.cmt
 lib/ocaml/compiler-libs/mach.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mach.cmx
+lib/ocaml/compiler-libs/mach.mli
 lib/ocaml/compiler-libs/main.cmi
 lib/ocaml/compiler-libs/main.cmo
 lib/ocaml/compiler-libs/main.cmt
 lib/ocaml/compiler-libs/main.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main.cmx
+lib/ocaml/compiler-libs/main.mli
 lib/ocaml/compiler-libs/main.o
 lib/ocaml/compiler-libs/main_args.cmi
 lib/ocaml/compiler-libs/main_args.cmt
 lib/ocaml/compiler-libs/main_args.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main_args.cmx
+lib/ocaml/compiler-libs/main_args.mli
 lib/ocaml/compiler-libs/matching.cmi
 lib/ocaml/compiler-libs/matching.cmt
 lib/ocaml/compiler-libs/matching.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/matching.cmx
+lib/ocaml/compiler-libs/matching.mli
 lib/ocaml/compiler-libs/meta.cmi
 lib/ocaml/compiler-libs/meta.cmt
 lib/ocaml/compiler-libs/meta.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/meta.cmx
+lib/ocaml/compiler-libs/meta.mli
 lib/ocaml/compiler-libs/middle_end.cmi
 lib/ocaml/compiler-libs/middle_end.cmt
 lib/ocaml/compiler-libs/middle_end.cmti
+lib/ocaml/compiler-libs/middle_end.mli
 lib/ocaml/compiler-libs/misc.cmi
 lib/ocaml/compiler-libs/misc.cmt
 lib/ocaml/compiler-libs/misc.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/misc.cmx
+lib/ocaml/compiler-libs/misc.mli
 lib/ocaml/compiler-libs/mtype.cmi
 lib/ocaml/compiler-libs/mtype.cmt
 lib/ocaml/compiler-libs/mtype.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mtype.cmx
+lib/ocaml/compiler-libs/mtype.mli
 lib/ocaml/compiler-libs/mutable_variable.cmi
 lib/ocaml/compiler-libs/mutable_variable.cmt
 lib/ocaml/compiler-libs/mutable_variable.cmti
+lib/ocaml/compiler-libs/mutable_variable.mli
 lib/ocaml/compiler-libs/numbers.cmi
 lib/ocaml/compiler-libs/numbers.cmt
 lib/ocaml/compiler-libs/numbers.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/numbers.cmx
+lib/ocaml/compiler-libs/numbers.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlbytecomp.a
 lib/ocaml/compiler-libs/ocamlbytecomp.cma
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.a
 lib/ocaml/compiler-libs/ocamlcommon.cma
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.cmxa
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.a
 lib/ocaml/compiler-libs/ocamloptcomp.cma
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cmxa
 lib/ocaml/compiler-libs/ocamltoplevel.cma
 lib/ocaml/compiler-libs/opcodes.cmi
 lib/ocaml/compiler-libs/opcodes.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opcodes.cmx
 lib/ocaml/compiler-libs/oprint.cmi
 lib/ocaml/compiler-libs/oprint.cmt
 lib/ocaml/compiler-libs/oprint.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/oprint.cmx
+lib/ocaml/compiler-libs/oprint.mli
 lib/ocaml/compiler-libs/optcompile.cmi
 lib/ocaml/compiler-libs/optcompile.cmt
 lib/ocaml/compiler-libs/optcompile.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optcompile.cmx
+lib/ocaml/compiler-libs/optcompile.mli
 lib/ocaml/compiler-libs/opterrors.cmi
 lib/ocaml/compiler-libs/opterrors.cmt
 lib/ocaml/compiler-libs/opterrors.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opterrors.cmx
+lib/ocaml/compiler-libs/opterrors.mli
 lib/ocaml/compiler-libs/optmain.cmi
 lib/ocaml/compiler-libs/optmain.cmo
 lib/ocaml/compiler-libs/optmain.cmt
 lib/ocaml/compiler-libs/optmain.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmx
+lib/ocaml/compiler-libs/optmain.mli
 lib/ocaml/compiler-libs/optmain.o
+lib/ocaml/compiler-libs/opttopdirs.mli
+lib/ocaml/compiler-libs/opttoploop.mli
+lib/ocaml/compiler-libs/opttopmain.mli
 lib/ocaml/compiler-libs/outcometree.cmi
 lib/ocaml/compiler-libs/outcometree.cmti
+lib/ocaml/compiler-libs/outcometree.mli
 lib/ocaml/compiler-libs/parmatch.cmi
 lib/ocaml/compiler-libs/parmatch.cmt
 lib/ocaml/compiler-libs/parmatch.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parmatch.cmx
+lib/ocaml/compiler-libs/parmatch.mli
 lib/ocaml/compiler-libs/parse.cmi
 lib/ocaml/compiler-libs/parse.cmt
 lib/ocaml/compiler-libs/parse.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parse.cmx
+lib/ocaml/compiler-libs/parse.mli
 lib/ocaml/compiler-libs/parser.cmi
 lib/ocaml/compiler-libs/parser.cmt
 lib/ocaml/compiler-libs/parser.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parser.cmx
+lib/ocaml/compiler-libs/parser.mli
 lib/ocaml/compiler-libs/parsetree.cmi
 lib/ocaml/compiler-libs/parsetree.cmti
+lib/ocaml/compiler-libs/parsetree.mli
 lib/ocaml/compiler-libs/pass_wrapper.cmi
 lib/ocaml/compiler-libs/pass_wrapper.cmt
 lib/ocaml/compiler-libs/pass_wrapper.cmti
+lib/ocaml/compiler-libs/pass_wrapper.mli
 lib/ocaml/compiler-libs/path.cmi
 lib/ocaml/compiler-libs/path.cmt
 lib/ocaml/compiler-libs/path.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/path.cmx
+lib/ocaml/compiler-libs/path.mli
 lib/ocaml/compiler-libs/pparse.cmi
 lib/ocaml/compiler-libs/pparse.cmt
 lib/ocaml/compiler-libs/pparse.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pparse.cmx
+lib/ocaml/compiler-libs/pparse.mli
 lib/ocaml/compiler-libs/pprintast.cmi
 lib/ocaml/compiler-libs/pprintast.cmt
 lib/ocaml/compiler-libs/pprintast.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pprintast.cmx
+lib/ocaml/compiler-libs/pprintast.mli
 lib/ocaml/compiler-libs/predef.cmi
 lib/ocaml/compiler-libs/predef.cmt
 lib/ocaml/compiler-libs/predef.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/predef.cmx
+lib/ocaml/compiler-libs/predef.mli
 lib/ocaml/compiler-libs/primitive.cmi
 lib/ocaml/compiler-libs/primitive.cmt
 lib/ocaml/compiler-libs/primitive.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/primitive.cmx
+lib/ocaml/compiler-libs/primitive.mli
 lib/ocaml/compiler-libs/printast.cmi
 lib/ocaml/compiler-libs/printast.cmt
 lib/ocaml/compiler-libs/printast.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printast.cmx
+lib/ocaml/compiler-libs/printast.mli
 lib/ocaml/compiler-libs/printclambda.cmi
 lib/ocaml/compiler-libs/printclambda.cmt
 lib/ocaml/compiler-libs/printclambda.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmx
+lib/ocaml/compiler-libs/printclambda.mli
 lib/ocaml/compiler-libs/printcmm.cmi
 lib/ocaml/compiler-libs/printcmm.cmt
 lib/ocaml/compiler-libs/printcmm.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmx
+lib/ocaml/compiler-libs/printcmm.mli
 lib/ocaml/compiler-libs/printinstr.cmi
 lib/ocaml/compiler-libs/printinstr.cmt
 lib/ocaml/compiler-libs/printinstr.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printinstr.cmx
+lib/ocaml/compiler-libs/printinstr.mli
 lib/ocaml/compiler-libs/printlambda.cmi
 lib/ocaml/compiler-libs/printlambda.cmt
 lib/ocaml/compiler-libs/printlambda.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printlambda.cmx
+lib/ocaml/compiler-libs/printlambda.mli
 lib/ocaml/compiler-libs/printlinear.cmi
 lib/ocaml/compiler-libs/printlinear.cmt
 lib/ocaml/compiler-libs/printlinear.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printlinear.cmx
+lib/ocaml/compiler-libs/printlinear.mli
 lib/ocaml/compiler-libs/printmach.cmi
 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/printtyp.cmi
 lib/ocaml/compiler-libs/printtyp.cmt
 lib/ocaml/compiler-libs/printtyp.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printtyp.cmx
+lib/ocaml/compiler-libs/printtyp.mli
 lib/ocaml/compiler-libs/printtyped.cmi
 lib/ocaml/compiler-libs/printtyped.cmt
 lib/ocaml/compiler-libs/printtyped.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printtyped.cmx
+lib/ocaml/compiler-libs/printtyped.mli
 lib/ocaml/compiler-libs/proc.cmi
 lib/ocaml/compiler-libs/proc.cmt
 lib/ocaml/compiler-libs/proc.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/proc.cmx
+lib/ocaml/compiler-libs/proc.mli
 lib/ocaml/compiler-libs/projection.cmi
 lib/ocaml/compiler-libs/projection.cmt
 lib/ocaml/compiler-libs/projection.cmti
+lib/ocaml/compiler-libs/projection.mli
 lib/ocaml/compiler-libs/ref_to_variables.cmi
 lib/ocaml/compiler-libs/ref_to_variables.cmt
 lib/ocaml/compiler-libs/ref_to_variables.cmti
+lib/ocaml/compiler-libs/ref_to_variables.mli
 lib/ocaml/compiler-libs/reg.cmi
 lib/ocaml/compiler-libs/reg.cmt
 lib/ocaml/compiler-libs/reg.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmx
+lib/ocaml/compiler-libs/reg.mli
 lib/ocaml/compiler-libs/reload.cmi
 lib/ocaml/compiler-libs/reload.cmt
 lib/ocaml/compiler-libs/reload.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmx
+lib/ocaml/compiler-libs/reload.mli
 lib/ocaml/compiler-libs/reloadgen.cmi
 lib/ocaml/compiler-libs/reloadgen.cmt
 lib/ocaml/compiler-libs/reloadgen.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reloadgen.cmx
+lib/ocaml/compiler-libs/reloadgen.mli
 lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmi
 lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmt
 lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmti
+lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.mli
 lib/ocaml/compiler-libs/remove_unused_arguments.cmi
 lib/ocaml/compiler-libs/remove_unused_arguments.cmt
 lib/ocaml/compiler-libs/remove_unused_arguments.cmti
+lib/ocaml/compiler-libs/remove_unused_arguments.mli
 lib/ocaml/compiler-libs/remove_unused_closure_vars.cmi
 lib/ocaml/compiler-libs/remove_unused_closure_vars.cmt
 lib/ocaml/compiler-libs/remove_unused_closure_vars.cmti
+lib/ocaml/compiler-libs/remove_unused_closure_vars.mli
 lib/ocaml/compiler-libs/remove_unused_program_constructs.cmi
 lib/ocaml/compiler-libs/remove_unused_program_constructs.cmt
 lib/ocaml/compiler-libs/remove_unused_program_constructs.cmti
+lib/ocaml/compiler-libs/remove_unused_program_constructs.mli
 lib/ocaml/compiler-libs/runtimedef.cmi
 lib/ocaml/compiler-libs/runtimedef.cmt
 lib/ocaml/compiler-libs/runtimedef.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/runtimedef.cmx
+lib/ocaml/compiler-libs/runtimedef.mli
 lib/ocaml/compiler-libs/schedgen.cmi
 lib/ocaml/compiler-libs/schedgen.cmt
 lib/ocaml/compiler-libs/schedgen.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/schedgen.cmx
+lib/ocaml/compiler-libs/schedgen.mli
 lib/ocaml/compiler-libs/scheduling.cmi
 lib/ocaml/compiler-libs/scheduling.cmt
 lib/ocaml/compiler-libs/scheduling.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/scheduling.cmx
+lib/ocaml/compiler-libs/scheduling.mli
 lib/ocaml/compiler-libs/selectgen.cmi
 lib/ocaml/compiler-libs/selectgen.cmt
 lib/ocaml/compiler-libs/selectgen.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selectgen.cmx
+lib/ocaml/compiler-libs/selectgen.mli
 lib/ocaml/compiler-libs/selection.cmi
 lib/ocaml/compiler-libs/selection.cmt
 lib/ocaml/compiler-libs/selection.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selection.cmx
+lib/ocaml/compiler-libs/selection.mli
 lib/ocaml/compiler-libs/semantics_of_primitives.cmi
 lib/ocaml/compiler-libs/semantics_of_primitives.cmt
 lib/ocaml/compiler-libs/semantics_of_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/semantics_of_primitives.cmx
+lib/ocaml/compiler-libs/semantics_of_primitives.mli
 lib/ocaml/compiler-libs/set_of_closures_id.cmi
 lib/ocaml/compiler-libs/set_of_closures_id.cmt
 lib/ocaml/compiler-libs/set_of_closures_id.cmti
+lib/ocaml/compiler-libs/set_of_closures_id.mli
 lib/ocaml/compiler-libs/set_of_closures_origin.cmi
 lib/ocaml/compiler-libs/set_of_closures_origin.cmt
 lib/ocaml/compiler-libs/set_of_closures_origin.cmti
+lib/ocaml/compiler-libs/set_of_closures_origin.mli
 lib/ocaml/compiler-libs/share_constants.cmi
 lib/ocaml/compiler-libs/share_constants.cmt
 lib/ocaml/compiler-libs/share_constants.cmti
+lib/ocaml/compiler-libs/share_constants.mli
 lib/ocaml/compiler-libs/simple_value_approx.cmi
 lib/ocaml/compiler-libs/simple_value_approx.cmt
 lib/ocaml/compiler-libs/simple_value_approx.cmti
+lib/ocaml/compiler-libs/simple_value_approx.mli
 lib/ocaml/compiler-libs/simplif.cmi
 lib/ocaml/compiler-libs/simplif.cmt
 lib/ocaml/compiler-libs/simplif.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplif.cmx
+lib/ocaml/compiler-libs/simplif.mli
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmi
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmt
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmti
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.mli
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmi
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.mli
 lib/ocaml/compiler-libs/simplify_common.cmi
 lib/ocaml/compiler-libs/simplify_common.cmt
 lib/ocaml/compiler-libs/simplify_common.cmti
+lib/ocaml/compiler-libs/simplify_common.mli
 lib/ocaml/compiler-libs/simplify_primitives.cmi
 lib/ocaml/compiler-libs/simplify_primitives.cmt
 lib/ocaml/compiler-libs/simplify_primitives.cmti
+lib/ocaml/compiler-libs/simplify_primitives.mli
 lib/ocaml/compiler-libs/spacetime_profiling.cmi
 lib/ocaml/compiler-libs/spacetime_profiling.cmt
 lib/ocaml/compiler-libs/spacetime_profiling.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.cmx
+lib/ocaml/compiler-libs/spacetime_profiling.mli
 lib/ocaml/compiler-libs/spill.cmi
 lib/ocaml/compiler-libs/spill.cmt
 lib/ocaml/compiler-libs/spill.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spill.cmx
+lib/ocaml/compiler-libs/spill.mli
 lib/ocaml/compiler-libs/split.cmi
 lib/ocaml/compiler-libs/split.cmt
 lib/ocaml/compiler-libs/split.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/split.cmx
+lib/ocaml/compiler-libs/split.mli
 lib/ocaml/compiler-libs/static_exception.cmi
 lib/ocaml/compiler-libs/static_exception.cmt
 lib/ocaml/compiler-libs/static_exception.cmti
+lib/ocaml/compiler-libs/static_exception.mli
 lib/ocaml/compiler-libs/strmatch.cmi
 lib/ocaml/compiler-libs/strmatch.cmt
 lib/ocaml/compiler-libs/strmatch.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strmatch.cmx
+lib/ocaml/compiler-libs/strmatch.mli
 lib/ocaml/compiler-libs/strongly_connected_components.cmi
 lib/ocaml/compiler-libs/strongly_connected_components.cmt
 lib/ocaml/compiler-libs/strongly_connected_components.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strongly_connected_components.cmx
+lib/ocaml/compiler-libs/strongly_connected_components.mli
 lib/ocaml/compiler-libs/stypes.cmi
 lib/ocaml/compiler-libs/stypes.cmt
 lib/ocaml/compiler-libs/stypes.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/stypes.cmx
+lib/ocaml/compiler-libs/stypes.mli
 lib/ocaml/compiler-libs/subst.cmi
 lib/ocaml/compiler-libs/subst.cmt
 lib/ocaml/compiler-libs/subst.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/subst.cmx
+lib/ocaml/compiler-libs/subst.mli
 lib/ocaml/compiler-libs/switch.cmi
 lib/ocaml/compiler-libs/switch.cmt
 lib/ocaml/compiler-libs/switch.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/switch.cmx
+lib/ocaml/compiler-libs/switch.mli
 lib/ocaml/compiler-libs/symbol.cmi
 lib/ocaml/compiler-libs/symbol.cmt
 lib/ocaml/compiler-libs/symbol.cmti
+lib/ocaml/compiler-libs/symbol.mli
 lib/ocaml/compiler-libs/symtable.cmi
 lib/ocaml/compiler-libs/symtable.cmt
 lib/ocaml/compiler-libs/symtable.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symtable.cmx
+lib/ocaml/compiler-libs/symtable.mli
 lib/ocaml/compiler-libs/syntaxerr.cmi
 lib/ocaml/compiler-libs/syntaxerr.cmt
 lib/ocaml/compiler-libs/syntaxerr.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/syntaxerr.cmx
+lib/ocaml/compiler-libs/syntaxerr.mli
 lib/ocaml/compiler-libs/tag.cmi
 lib/ocaml/compiler-libs/tag.cmt
 lib/ocaml/compiler-libs/tag.cmti
+lib/ocaml/compiler-libs/tag.mli
+lib/ocaml/compiler-libs/targetint.cmi
+lib/ocaml/compiler-libs/targetint.cmt
+lib/ocaml/compiler-libs/targetint.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/targetint.cmx
+lib/ocaml/compiler-libs/targetint.mli
 lib/ocaml/compiler-libs/tast_mapper.cmi
 lib/ocaml/compiler-libs/tast_mapper.cmt
 lib/ocaml/compiler-libs/tast_mapper.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tast_mapper.cmx
+lib/ocaml/compiler-libs/tast_mapper.mli
 lib/ocaml/compiler-libs/tbl.cmi
 lib/ocaml/compiler-libs/tbl.cmt
 lib/ocaml/compiler-libs/tbl.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tbl.cmx
+lib/ocaml/compiler-libs/tbl.mli
 lib/ocaml/compiler-libs/terminfo.cmi
 lib/ocaml/compiler-libs/terminfo.cmt
 lib/ocaml/compiler-libs/terminfo.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/terminfo.cmx
+lib/ocaml/compiler-libs/terminfo.mli
 lib/ocaml/compiler-libs/timings.cmi
 lib/ocaml/compiler-libs/timings.cmt
 lib/ocaml/compiler-libs/timings.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/timings.cmx
+lib/ocaml/compiler-libs/timings.mli
 lib/ocaml/compiler-libs/topdirs.cmi
 lib/ocaml/compiler-libs/topdirs.cmt
 lib/ocaml/compiler-libs/topdirs.cmti
+lib/ocaml/compiler-libs/topdirs.mli
 lib/ocaml/compiler-libs/toploop.cmi
 lib/ocaml/compiler-libs/toploop.cmt
 lib/ocaml/compiler-libs/toploop.cmti
+lib/ocaml/compiler-libs/toploop.mli
 lib/ocaml/compiler-libs/topmain.cmi
 lib/ocaml/compiler-libs/topmain.cmt
 lib/ocaml/compiler-libs/topmain.cmti
+lib/ocaml/compiler-libs/topmain.mli
 lib/ocaml/compiler-libs/topstart.cmi
 lib/ocaml/compiler-libs/topstart.cmo
 lib/ocaml/compiler-libs/topstart.cmt
 lib/ocaml/compiler-libs/trace.cmi
 lib/ocaml/compiler-libs/trace.cmt
 lib/ocaml/compiler-libs/trace.cmti
+lib/ocaml/compiler-libs/trace.mli
 lib/ocaml/compiler-libs/translattribute.cmi
 lib/ocaml/compiler-libs/translattribute.cmt
 lib/ocaml/compiler-libs/translattribute.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translattribute.cmx
+lib/ocaml/compiler-libs/translattribute.mli
 lib/ocaml/compiler-libs/translclass.cmi
 lib/ocaml/compiler-libs/translclass.cmt
 lib/ocaml/compiler-libs/translclass.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translclass.cmx
+lib/ocaml/compiler-libs/translclass.mli
 lib/ocaml/compiler-libs/translcore.cmi
 lib/ocaml/compiler-libs/translcore.cmt
 lib/ocaml/compiler-libs/translcore.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translcore.cmx
+lib/ocaml/compiler-libs/translcore.mli
 lib/ocaml/compiler-libs/translmod.cmi
 lib/ocaml/compiler-libs/translmod.cmt
 lib/ocaml/compiler-libs/translmod.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translmod.cmx
+lib/ocaml/compiler-libs/translmod.mli
 lib/ocaml/compiler-libs/translobj.cmi
 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/typeclass.cmi
 lib/ocaml/compiler-libs/typeclass.cmt
 lib/ocaml/compiler-libs/typeclass.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typeclass.cmx
+lib/ocaml/compiler-libs/typeclass.mli
 lib/ocaml/compiler-libs/typecore.cmi
 lib/ocaml/compiler-libs/typecore.cmt
 lib/ocaml/compiler-libs/typecore.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typecore.cmx
+lib/ocaml/compiler-libs/typecore.mli
 lib/ocaml/compiler-libs/typedecl.cmi
 lib/ocaml/compiler-libs/typedecl.cmt
 lib/ocaml/compiler-libs/typedecl.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl.cmx
+lib/ocaml/compiler-libs/typedecl.mli
 lib/ocaml/compiler-libs/typedtree.cmi
 lib/ocaml/compiler-libs/typedtree.cmt
 lib/ocaml/compiler-libs/typedtree.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtree.cmx
+lib/ocaml/compiler-libs/typedtree.mli
 lib/ocaml/compiler-libs/typedtreeIter.cmi
 lib/ocaml/compiler-libs/typedtreeIter.cmt
 lib/ocaml/compiler-libs/typedtreeIter.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtreeIter.cmx
+lib/ocaml/compiler-libs/typedtreeIter.mli
 lib/ocaml/compiler-libs/typedtreeMap.cmi
 lib/ocaml/compiler-libs/typedtreeMap.cmt
 lib/ocaml/compiler-libs/typedtreeMap.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtreeMap.cmx
+lib/ocaml/compiler-libs/typedtreeMap.mli
 lib/ocaml/compiler-libs/typemod.cmi
 lib/ocaml/compiler-libs/typemod.cmt
 lib/ocaml/compiler-libs/typemod.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typemod.cmx
+lib/ocaml/compiler-libs/typemod.mli
 lib/ocaml/compiler-libs/typeopt.cmi
 lib/ocaml/compiler-libs/typeopt.cmt
 lib/ocaml/compiler-libs/typeopt.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typeopt.cmx
+lib/ocaml/compiler-libs/typeopt.mli
 lib/ocaml/compiler-libs/types.cmi
 lib/ocaml/compiler-libs/types.cmt
 lib/ocaml/compiler-libs/types.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/types.cmx
+lib/ocaml/compiler-libs/types.mli
 lib/ocaml/compiler-libs/typetexp.cmi
 lib/ocaml/compiler-libs/typetexp.cmt
 lib/ocaml/compiler-libs/typetexp.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typetexp.cmx
+lib/ocaml/compiler-libs/typetexp.mli
 lib/ocaml/compiler-libs/un_anf.cmi
 lib/ocaml/compiler-libs/un_anf.cmt
 lib/ocaml/compiler-libs/un_anf.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/un_anf.cmx
+lib/ocaml/compiler-libs/un_anf.mli
 lib/ocaml/compiler-libs/unbox_closures.cmi
 lib/ocaml/compiler-libs/unbox_closures.cmt
 lib/ocaml/compiler-libs/unbox_closures.cmti
+lib/ocaml/compiler-libs/unbox_closures.mli
 lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmi
 lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmt
 lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmti
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.mli
 lib/ocaml/compiler-libs/unbox_specialised_args.cmi
 lib/ocaml/compiler-libs/unbox_specialised_args.cmt
 lib/ocaml/compiler-libs/unbox_specialised_args.cmti
+lib/ocaml/compiler-libs/unbox_specialised_args.mli
 lib/ocaml/compiler-libs/untypeast.cmi
 lib/ocaml/compiler-libs/untypeast.cmt
 lib/ocaml/compiler-libs/untypeast.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/untypeast.cmx
+lib/ocaml/compiler-libs/untypeast.mli
 lib/ocaml/compiler-libs/var_within_closure.cmi
 lib/ocaml/compiler-libs/var_within_closure.cmt
 lib/ocaml/compiler-libs/var_within_closure.cmti
+lib/ocaml/compiler-libs/var_within_closure.mli
 lib/ocaml/compiler-libs/variable.cmi
 lib/ocaml/compiler-libs/variable.cmt
 lib/ocaml/compiler-libs/variable.cmti
+lib/ocaml/compiler-libs/variable.mli
 lib/ocaml/compiler-libs/warnings.cmi
 lib/ocaml/compiler-libs/warnings.cmt
 lib/ocaml/compiler-libs/warnings.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/warnings.cmx
+lib/ocaml/compiler-libs/warnings.mli
 lib/ocaml/compiler-libs/x86_ast.cmi
 lib/ocaml/compiler-libs/x86_ast.cmti
+lib/ocaml/compiler-libs/x86_ast.mli
 lib/ocaml/compiler-libs/x86_dsl.cmi
 lib/ocaml/compiler-libs/x86_dsl.cmt
 lib/ocaml/compiler-libs/x86_dsl.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_dsl.cmx
+lib/ocaml/compiler-libs/x86_dsl.mli
 lib/ocaml/compiler-libs/x86_gas.cmi
 lib/ocaml/compiler-libs/x86_gas.cmt
 lib/ocaml/compiler-libs/x86_gas.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_gas.cmx
+lib/ocaml/compiler-libs/x86_gas.mli
 lib/ocaml/compiler-libs/x86_masm.cmi
 lib/ocaml/compiler-libs/x86_masm.cmt
 lib/ocaml/compiler-libs/x86_masm.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_masm.cmx
+lib/ocaml/compiler-libs/x86_masm.mli
 lib/ocaml/compiler-libs/x86_proc.cmi
 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
-lib/ocaml/dynlink.cma
-lib/ocaml/dynlink.cmi
-lib/ocaml/dynlink.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-nat}lib/ocaml/dynlink.cma
+${PLIST.ocaml-nat}lib/ocaml/dynlink.cmi
+${PLIST.ocaml-nat}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-nat}lib/ocaml/dynlink.mli
 lib/ocaml/ephemeron.cmi
 lib/ocaml/ephemeron.cmt
 lib/ocaml/ephemeron.cmti
+${PLIST.ocaml-opt}lib/ocaml/ephemeron.cmx
 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/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
+${PLIST.ocaml-opt}lib/ocaml/int_misc.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-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/libcamlstr.a
+${PLIST.ocaml-opt}lib/ocaml/libnums.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
-lib/ocaml/${PKGMANDIR}/man1/ocaml.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlc.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlc.opt.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlcp.1
-lib/ocaml/${PKGMANDIR}/man1/ocamldebug.1
-lib/ocaml/${PKGMANDIR}/man1/ocamldep.1
-lib/ocaml/${PKGMANDIR}/man1/ocamldoc.1
-lib/ocaml/${PKGMANDIR}/man1/ocamllex.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlmktop.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlopt.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlopt.opt.1
-lib/ocaml/${PKGMANDIR}/man1/ocamloptp.1
-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/Array.3
-lib/ocaml/${PKGMANDIR}/man3/ArrayLabels.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cf.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Ci.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cl.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Const.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Csig.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cstr.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Ctf.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cty.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Exp.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Incl.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mb.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Md.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mod.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mtd.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mty.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Opn.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Pat.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Sig.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Str.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Te.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Typ.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Type.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Val.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Vb.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_invariants.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_iterator.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_mapper.3
-lib/ocaml/${PKGMANDIR}/man3/Asttypes.3
-lib/ocaml/${PKGMANDIR}/man3/Attr_helper.3
-lib/ocaml/${PKGMANDIR}/man3/Bigarray.3
-lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array1.3
-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/Builtin_attributes.3
-lib/ocaml/${PKGMANDIR}/man3/Bytes.3
-lib/ocaml/${PKGMANDIR}/man3/BytesLabels.3
-lib/ocaml/${PKGMANDIR}/man3/Callback.3
-lib/ocaml/${PKGMANDIR}/man3/CamlinternalFormat.3
-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/Char.3
-lib/ocaml/${PKGMANDIR}/man3/Complex.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/Ephemeron.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.GenHashTable.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.GenHashTable.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K1.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K1.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K1.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K2.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K2.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K2.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.Kn.3
-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/Filename.3
-lib/ocaml/${PKGMANDIR}/man3/Format.3
-lib/ocaml/${PKGMANDIR}/man3/Gc.3
-lib/ocaml/${PKGMANDIR}/man3/Genlex.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.HashedType.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.Make.3
-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/Int32.3
-lib/ocaml/${PKGMANDIR}/man3/Int64.3
-lib/ocaml/${PKGMANDIR}/man3/Lazy.3
-lib/ocaml/${PKGMANDIR}/man3/Lexer.3
-lib/ocaml/${PKGMANDIR}/man3/Lexing.3
-lib/ocaml/${PKGMANDIR}/man3/List.3
-lib/ocaml/${PKGMANDIR}/man3/ListLabels.3
-lib/ocaml/${PKGMANDIR}/man3/Location.3
-lib/ocaml/${PKGMANDIR}/man3/Longident.3
-lib/ocaml/${PKGMANDIR}/man3/Map.3
-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/MoreLabels.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.HashedType.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.Make.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.S.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.SeededHashedType.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.SeededS.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.Make.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.OrderedType.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.S.3
-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/Nativeint.3
-lib/ocaml/${PKGMANDIR}/man3/Num.3
-lib/ocaml/${PKGMANDIR}/man3/Obj.3
-lib/ocaml/${PKGMANDIR}/man3/Obj.Ephemeron.3
-lib/ocaml/${PKGMANDIR}/man3/Oo.3
-lib/ocaml/${PKGMANDIR}/man3/Parse.3
-lib/ocaml/${PKGMANDIR}/man3/Parser.3
-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/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/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/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/Sort.3
-lib/ocaml/${PKGMANDIR}/man3/Spacetime.3
-lib/ocaml/${PKGMANDIR}/man3/Spacetime.Series.3
-lib/ocaml/${PKGMANDIR}/man3/Spacetime.Snapshot.3
-lib/ocaml/${PKGMANDIR}/man3/Stack.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.Array.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.Bytes.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.List.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.String.3
-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/Syntaxerr.3
-lib/ocaml/${PKGMANDIR}/man3/Sys.3
-lib/ocaml/${PKGMANDIR}/man3/Uchar.3
-lib/ocaml/${PKGMANDIR}/man3/Unix.3
-lib/ocaml/${PKGMANDIR}/man3/Unix.LargeFile.3
-lib/ocaml/${PKGMANDIR}/man3/Weak.3
-lib/ocaml/${PKGMANDIR}/man3/Weak.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Weak.S.3
+${PLIST.ocaml-prof}lib/ocaml/listLabels.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/listLabels.p.cmx
+lib/ocaml/man/man1/ocaml.1
+lib/ocaml/man/man1/ocamlc.1
+lib/ocaml/man/man1/ocamlc.opt.1
+lib/ocaml/man/man1/ocamlcp.1
+lib/ocaml/man/man1/ocamldebug.1
+lib/ocaml/man/man1/ocamldep.1
+lib/ocaml/man/man1/ocamldoc.1
+lib/ocaml/man/man1/ocamllex.1
+lib/ocaml/man/man1/ocamlmktop.1
+lib/ocaml/man/man1/ocamlopt.1
+lib/ocaml/man/man1/ocamlopt.opt.1
+lib/ocaml/man/man1/ocamloptp.1
+lib/ocaml/man/man1/ocamlprof.1
+lib/ocaml/man/man1/ocamlrun.1
+lib/ocaml/man/man1/ocamlyacc.1
+lib/ocaml/man/man3/Arg.3
+lib/ocaml/man/man3/Array.3
+lib/ocaml/man/man3/ArrayLabels.3
+lib/ocaml/man/man3/Ast_helper.3
+lib/ocaml/man/man3/Ast_helper.Cf.3
+lib/ocaml/man/man3/Ast_helper.Ci.3
+lib/ocaml/man/man3/Ast_helper.Cl.3
+lib/ocaml/man/man3/Ast_helper.Const.3
+lib/ocaml/man/man3/Ast_helper.Csig.3
+lib/ocaml/man/man3/Ast_helper.Cstr.3
+lib/ocaml/man/man3/Ast_helper.Ctf.3
+lib/ocaml/man/man3/Ast_helper.Cty.3
+lib/ocaml/man/man3/Ast_helper.Exp.3
+lib/ocaml/man/man3/Ast_helper.Incl.3
+lib/ocaml/man/man3/Ast_helper.Mb.3
+lib/ocaml/man/man3/Ast_helper.Md.3
+lib/ocaml/man/man3/Ast_helper.Mod.3
+lib/ocaml/man/man3/Ast_helper.Mtd.3
+lib/ocaml/man/man3/Ast_helper.Mty.3
+lib/ocaml/man/man3/Ast_helper.Opn.3
+lib/ocaml/man/man3/Ast_helper.Pat.3
+lib/ocaml/man/man3/Ast_helper.Sig.3
+lib/ocaml/man/man3/Ast_helper.Str.3
+lib/ocaml/man/man3/Ast_helper.Te.3
+lib/ocaml/man/man3/Ast_helper.Typ.3
+lib/ocaml/man/man3/Ast_helper.Type.3
+lib/ocaml/man/man3/Ast_helper.Val.3
+lib/ocaml/man/man3/Ast_helper.Vb.3
+lib/ocaml/man/man3/Ast_invariants.3
+lib/ocaml/man/man3/Ast_iterator.3
+lib/ocaml/man/man3/Ast_mapper.3
+lib/ocaml/man/man3/Asttypes.3
+lib/ocaml/man/man3/Attr_helper.3
+lib/ocaml/man/man3/Bigarray.3
+lib/ocaml/man/man3/Bigarray.Array0.3
+lib/ocaml/man/man3/Bigarray.Array1.3
+lib/ocaml/man/man3/Bigarray.Array2.3
+lib/ocaml/man/man3/Bigarray.Array3.3
+lib/ocaml/man/man3/Bigarray.Genarray.3
+lib/ocaml/man/man3/Buffer.3
+lib/ocaml/man/man3/Builtin_attributes.3
+lib/ocaml/man/man3/Bytes.3
+lib/ocaml/man/man3/BytesLabels.3
+lib/ocaml/man/man3/Callback.3
+lib/ocaml/man/man3/CamlinternalFormat.3
+lib/ocaml/man/man3/CamlinternalFormatBasics.3
+lib/ocaml/man/man3/CamlinternalLazy.3
+lib/ocaml/man/man3/CamlinternalMod.3
+lib/ocaml/man/man3/CamlinternalOO.3
+lib/ocaml/man/man3/Char.3
+lib/ocaml/man/man3/Complex.3
+lib/ocaml/man/man3/Depend.3
+lib/ocaml/man/man3/Depend.StringMap.3
+lib/ocaml/man/man3/Depend.StringSet.3
+lib/ocaml/man/man3/Digest.3
+lib/ocaml/man/man3/Docstrings.3
+lib/ocaml/man/man3/Ephemeron.3
+lib/ocaml/man/man3/Ephemeron.GenHashTable.3
+lib/ocaml/man/man3/Ephemeron.GenHashTable.MakeSeeded.3
+lib/ocaml/man/man3/Ephemeron.K1.3
+lib/ocaml/man/man3/Ephemeron.K1.Make.3
+lib/ocaml/man/man3/Ephemeron.K1.MakeSeeded.3
+lib/ocaml/man/man3/Ephemeron.K2.3
+lib/ocaml/man/man3/Ephemeron.K2.Make.3
+lib/ocaml/man/man3/Ephemeron.K2.MakeSeeded.3
+lib/ocaml/man/man3/Ephemeron.Kn.3
+lib/ocaml/man/man3/Ephemeron.Kn.Make.3
+lib/ocaml/man/man3/Ephemeron.Kn.MakeSeeded.3
+lib/ocaml/man/man3/Ephemeron.S.3
+lib/ocaml/man/man3/Ephemeron.SeededS.3
+lib/ocaml/man/man3/Filename.3
+lib/ocaml/man/man3/Format.3
+lib/ocaml/man/man3/Gc.3
+lib/ocaml/man/man3/Genlex.3
+lib/ocaml/man/man3/Hashtbl.3
+lib/ocaml/man/man3/Hashtbl.HashedType.3
+lib/ocaml/man/man3/Hashtbl.Make.3
+lib/ocaml/man/man3/Hashtbl.MakeSeeded.3
+lib/ocaml/man/man3/Hashtbl.S.3
+lib/ocaml/man/man3/Hashtbl.SeededHashedType.3
+lib/ocaml/man/man3/Hashtbl.SeededS.3
+lib/ocaml/man/man3/Int32.3
+lib/ocaml/man/man3/Int64.3
+lib/ocaml/man/man3/Lazy.3
+lib/ocaml/man/man3/Lexer.3
+lib/ocaml/man/man3/Lexing.3
+lib/ocaml/man/man3/List.3
+lib/ocaml/man/man3/ListLabels.3
+lib/ocaml/man/man3/Location.3
+lib/ocaml/man/man3/Longident.3
+lib/ocaml/man/man3/Map.3
+lib/ocaml/man/man3/Map.Make.3
+lib/ocaml/man/man3/Map.OrderedType.3
+lib/ocaml/man/man3/Map.S.3
+lib/ocaml/man/man3/Marshal.3
+lib/ocaml/man/man3/MoreLabels.3
+lib/ocaml/man/man3/MoreLabels.Hashtbl.3
+lib/ocaml/man/man3/MoreLabels.Hashtbl.HashedType.3
+lib/ocaml/man/man3/MoreLabels.Hashtbl.Make.3
+lib/ocaml/man/man3/MoreLabels.Hashtbl.MakeSeeded.3
+lib/ocaml/man/man3/MoreLabels.Hashtbl.S.3
+lib/ocaml/man/man3/MoreLabels.Hashtbl.SeededHashedType.3
+lib/ocaml/man/man3/MoreLabels.Hashtbl.SeededS.3
+lib/ocaml/man/man3/MoreLabels.Map.3
+lib/ocaml/man/man3/MoreLabels.Map.Make.3
+lib/ocaml/man/man3/MoreLabels.Map.OrderedType.3
+lib/ocaml/man/man3/MoreLabels.Map.S.3
+lib/ocaml/man/man3/MoreLabels.Set.3
+lib/ocaml/man/man3/MoreLabels.Set.Make.3
+lib/ocaml/man/man3/MoreLabels.Set.OrderedType.3
+lib/ocaml/man/man3/MoreLabels.Set.S.3
+lib/ocaml/man/man3/Nativeint.3
+lib/ocaml/man/man3/Num.3
+lib/ocaml/man/man3/Obj.3
+lib/ocaml/man/man3/Obj.Ephemeron.3
+lib/ocaml/man/man3/Oo.3
+lib/ocaml/man/man3/Parse.3
+lib/ocaml/man/man3/Parser.3
+lib/ocaml/man/man3/Parsetree.3
+lib/ocaml/man/man3/Parsing.3
+lib/ocaml/man/man3/Pervasives.3
+lib/ocaml/man/man3/Pervasives.LargeFile.3
+lib/ocaml/man/man3/Pprintast.3
+lib/ocaml/man/man3/Printast.3
+lib/ocaml/man/man3/Printexc.3
+lib/ocaml/man/man3/Printexc.Slot.3
+lib/ocaml/man/man3/Printf.3
+lib/ocaml/man/man3/Queue.3
+lib/ocaml/man/man3/Random.3
+lib/ocaml/man/man3/Random.State.3
+lib/ocaml/man/man3/Scanf.3
+lib/ocaml/man/man3/Scanf.Scanning.3
+lib/ocaml/man/man3/Set.3
+lib/ocaml/man/man3/Set.Make.3
+lib/ocaml/man/man3/Set.OrderedType.3
+lib/ocaml/man/man3/Set.S.3
+lib/ocaml/man/man3/Sort.3
+lib/ocaml/man/man3/Spacetime.3
+lib/ocaml/man/man3/Spacetime.Series.3
+lib/ocaml/man/man3/Spacetime.Snapshot.3
+lib/ocaml/man/man3/Stack.3
+lib/ocaml/man/man3/StdLabels.3
+lib/ocaml/man/man3/StdLabels.Array.3
+lib/ocaml/man/man3/StdLabels.Bytes.3
+lib/ocaml/man/man3/StdLabels.List.3
+lib/ocaml/man/man3/StdLabels.String.3
+lib/ocaml/man/man3/Str.3
+lib/ocaml/man/man3/Stream.3
+lib/ocaml/man/man3/String.3
+lib/ocaml/man/man3/StringLabels.3
+lib/ocaml/man/man3/Syntaxerr.3
+lib/ocaml/man/man3/Sys.3
+lib/ocaml/man/man3/Uchar.3
+lib/ocaml/man/man3/Unix.3
+lib/ocaml/man/man3/Unix.LargeFile.3
+lib/ocaml/man/man3/Weak.3
+lib/ocaml/man/man3/Weak.Make.3
+lib/ocaml/man/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/nat.cmi
+lib/ocaml/nat.cmti
+${PLIST.ocaml-opt}lib/ocaml/nat.cmx
 lib/ocaml/nat.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/num.cmi
+lib/ocaml/num.cmti
+${PLIST.ocaml-opt}lib/ocaml/num.cmx
 lib/ocaml/num.mli
+${PLIST.ocaml-opt}lib/ocaml/nums.a
 lib/ocaml/nums.cma
+${PLIST.ocaml-opt}lib/ocaml/nums.cmxa
+${PLIST.ocaml-nat}lib/ocaml/nums.cmxs
 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
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc.cmx
 lib/ocaml/ocamldoc/odoc_analyse.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_analyse.cmx
 lib/ocaml/ocamldoc/odoc_args.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_args.cmx
 lib/ocaml/ocamldoc/odoc_ast.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_ast.cmx
 lib/ocaml/ocamldoc/odoc_class.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_class.cmx
 lib/ocaml/ocamldoc/odoc_comments.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_comments.cmx
 lib/ocaml/ocamldoc/odoc_comments_global.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_comments_global.cmx
 lib/ocaml/ocamldoc/odoc_config.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_config.cmx
 lib/ocaml/ocamldoc/odoc_control.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_control.cmx
 lib/ocaml/ocamldoc/odoc_cross.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_cross.cmx
 lib/ocaml/ocamldoc/odoc_dag2html.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_dag2html.cmx
 lib/ocaml/ocamldoc/odoc_dep.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_dep.cmx
 lib/ocaml/ocamldoc/odoc_dot.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_dot.cmx
 lib/ocaml/ocamldoc/odoc_env.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_env.cmx
 lib/ocaml/ocamldoc/odoc_exception.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_exception.cmx
 lib/ocaml/ocamldoc/odoc_extension.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_extension.cmx
 lib/ocaml/ocamldoc/odoc_gen.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_gen.cmx
 lib/ocaml/ocamldoc/odoc_global.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_global.cmx
 lib/ocaml/ocamldoc/odoc_html.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_html.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_info.a
 lib/ocaml/ocamldoc/odoc_info.cma
 lib/ocaml/ocamldoc/odoc_info.cmi
+lib/ocaml/ocamldoc/odoc_info.cmt
+lib/ocaml/ocamldoc/odoc_info.cmti
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_info.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_info.cmxa
 lib/ocaml/ocamldoc/odoc_info.mli
 lib/ocaml/ocamldoc/odoc_inherit.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_inherit.cmx
 lib/ocaml/ocamldoc/odoc_latex.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_latex.cmx
 lib/ocaml/ocamldoc/odoc_latex_style.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_latex_style.cmx
 lib/ocaml/ocamldoc/odoc_lexer.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_lexer.cmx
 lib/ocaml/ocamldoc/odoc_man.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_man.cmx
 lib/ocaml/ocamldoc/odoc_merge.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_merge.cmx
 lib/ocaml/ocamldoc/odoc_messages.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_messages.cmx
 lib/ocaml/ocamldoc/odoc_misc.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_misc.cmx
 lib/ocaml/ocamldoc/odoc_module.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_module.cmx
 lib/ocaml/ocamldoc/odoc_name.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_name.cmx
 lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_ocamlhtml.cmx
 lib/ocaml/ocamldoc/odoc_parameter.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_parameter.cmx
 lib/ocaml/ocamldoc/odoc_parser.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_parser.cmx
 lib/ocaml/ocamldoc/odoc_print.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_print.cmx
 lib/ocaml/ocamldoc/odoc_scan.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_scan.cmx
 lib/ocaml/ocamldoc/odoc_search.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_search.cmx
 lib/ocaml/ocamldoc/odoc_see_lexer.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_see_lexer.cmx
 lib/ocaml/ocamldoc/odoc_sig.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_sig.cmx
 lib/ocaml/ocamldoc/odoc_str.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_str.cmx
 lib/ocaml/ocamldoc/odoc_test.cmi
 lib/ocaml/ocamldoc/odoc_texi.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_texi.cmx
 lib/ocaml/ocamldoc/odoc_text.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_text.cmx
 lib/ocaml/ocamldoc/odoc_text_lexer.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_text_lexer.cmx
 lib/ocaml/ocamldoc/odoc_text_parser.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_text_parser.cmx
 lib/ocaml/ocamldoc/odoc_to_text.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_to_text.cmx
 lib/ocaml/ocamldoc/odoc_type.cmi
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_type.cmx
 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
 lib/ocaml/ratio.cmi
+lib/ocaml/ratio.cmti
+${PLIST.ocaml-opt}lib/ocaml/ratio.cmx
 lib/ocaml/ratio.mli
+${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
 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/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
+${PLIST.ocaml-opt}lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.ml
 lib/ocaml/std_exit.o
-lib/ocaml/std_exit.p.cmx
-lib/ocaml/std_exit.p.o
+${PLIST.ocaml-prof}lib/ocaml/std_exit.p.cmt
+${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.p.a
-lib/ocaml/stdlib.p.cmxa
+${PLIST.ocaml-opt}lib/ocaml/stdlib.cmxa
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.a
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmxa
+${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
 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/dllnums.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/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/thread.mli
 lib/ocaml/threadUnix.mli
 lib/ocaml/threads/condition.cmi
+lib/ocaml/threads/condition.cmti
+${PLIST.ocaml-opt}lib/ocaml/threads/condition.cmx
 lib/ocaml/threads/event.cmi
+lib/ocaml/threads/event.cmti
+${PLIST.ocaml-opt}lib/ocaml/threads/event.cmx
 lib/ocaml/threads/mutex.cmi
+lib/ocaml/threads/mutex.cmti
+${PLIST.ocaml-opt}lib/ocaml/threads/mutex.cmx
 lib/ocaml/threads/thread.cmi
+lib/ocaml/threads/thread.cmti
+${PLIST.ocaml-opt}lib/ocaml/threads/thread.cmx
 lib/ocaml/threads/threadUnix.cmi
+lib/ocaml/threads/threadUnix.cmti
+${PLIST.ocaml-opt}lib/ocaml/threads/threadUnix.cmx
+${PLIST.ocaml-opt}lib/ocaml/threads/threads.a
 lib/ocaml/threads/threads.cma
+${PLIST.ocaml-opt}lib/ocaml/threads/threads.cmxa
 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
 lib/ocaml/unix.mli
 lib/ocaml/unixLabels.cmi
+lib/ocaml/unixLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/unixLabels.cmx
 lib/ocaml/unixLabels.mli
 lib/ocaml/vmthreads/condition.cmi
+lib/ocaml/vmthreads/condition.cmti
 lib/ocaml/vmthreads/condition.mli
 lib/ocaml/vmthreads/event.cmi
+lib/ocaml/vmthreads/event.cmti
 lib/ocaml/vmthreads/event.mli
+${PLIST.ocaml-opt}lib/ocaml/vmthreads/libvmthreads.a
 lib/ocaml/vmthreads/mutex.cmi
+lib/ocaml/vmthreads/mutex.cmti
 lib/ocaml/vmthreads/mutex.mli
 lib/ocaml/vmthreads/stdlib.cma
 lib/ocaml/vmthreads/thread.cmi
+lib/ocaml/vmthreads/thread.cmti
 lib/ocaml/vmthreads/thread.mli
 lib/ocaml/vmthreads/threadUnix.cmi
+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
@@ -1305,4 +1993,3 @@ man/man1/ocamloptp.1
 man/man1/ocamlprof.1
 man/man1/ocamlrun.1
 man/man1/ocamlyacc.1
-@pkgdir lib/ocaml/ocamldoc/custom
diff --git a/lang/ocaml/PLIST.natdynlink b/lang/ocaml/PLIST.natdynlink
deleted file mode 100644
index 9dc21bca357..00000000000
--- a/lang/ocaml/PLIST.natdynlink
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.natdynlink,v 1.2 2012/10/08 15:05:32 jaapb Exp $
-lib/ocaml/bigarray.cmxs
-lib/ocaml/dynlink.a
-lib/ocaml/dynlink.cmx
-lib/ocaml/dynlink.cmxa
-lib/ocaml/nums.cmxs
-lib/ocaml/str.cmxs
-lib/ocaml/unix.cmxs
diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt
deleted file mode 100644
index e1176f2da6b..00000000000
--- a/lang/ocaml/PLIST.opt
+++ /dev/null
@@ -1,307 +0,0 @@
-@comment $NetBSD: PLIST.opt,v 1.28 2017/07/11 17:15:01 he Exp $
-bin/ocamlc.opt
-bin/ocamlcp.opt
-bin/ocamldep.opt
-bin/ocamldoc.opt
-bin/ocamllex.opt
-bin/ocamlmklib.opt
-bin/ocamlmktop.opt
-bin/ocamlobjinfo.opt
-bin/ocamlopt.opt
-bin/ocamloptp.opt
-bin/ocamlprof.opt
-lib/ocaml/arg.cmx
-lib/ocaml/arith_flags.cmx
-lib/ocaml/arith_status.cmx
-lib/ocaml/array.cmx
-lib/ocaml/arrayLabels.cmx
-lib/ocaml/big_int.cmx
-lib/ocaml/bigarray.a
-lib/ocaml/bigarray.cmx
-lib/ocaml/bigarray.cmxa
-lib/ocaml/buffer.cmx
-lib/ocaml/bytes.cmx
-lib/ocaml/bytesLabels.cmx
-lib/ocaml/callback.cmx
-lib/ocaml/camlinternalFormat.cmx
-lib/ocaml/camlinternalFormatBasics.cmx
-lib/ocaml/camlinternalLazy.cmx
-lib/ocaml/camlinternalMod.cmx
-lib/ocaml/camlinternalOO.cmx
-lib/ocaml/char.cmx
-lib/ocaml/compiler-libs/CSE.cmx
-lib/ocaml/compiler-libs/CSEgen.cmx
-lib/ocaml/compiler-libs/arch.cmx
-lib/ocaml/compiler-libs/arg_helper.cmx
-lib/ocaml/compiler-libs/asmgen.cmx
-lib/ocaml/compiler-libs/asmlibrarian.cmx
-lib/ocaml/compiler-libs/asmlink.cmx
-lib/ocaml/compiler-libs/asmpackager.cmx
-lib/ocaml/compiler-libs/ast_helper.cmx
-lib/ocaml/compiler-libs/ast_invariants.cmx
-lib/ocaml/compiler-libs/ast_iterator.cmx
-lib/ocaml/compiler-libs/ast_mapper.cmx
-lib/ocaml/compiler-libs/attr_helper.cmx
-lib/ocaml/compiler-libs/branch_relaxation.cmx
-lib/ocaml/compiler-libs/branch_relaxation_intf.cmx
-lib/ocaml/compiler-libs/btype.cmx
-lib/ocaml/compiler-libs/build_export_info.cmx
-lib/ocaml/compiler-libs/builtin_attributes.cmx
-lib/ocaml/compiler-libs/bytegen.cmx
-lib/ocaml/compiler-libs/bytelibrarian.cmx
-lib/ocaml/compiler-libs/bytelink.cmx
-lib/ocaml/compiler-libs/bytepackager.cmx
-lib/ocaml/compiler-libs/bytesections.cmx
-lib/ocaml/compiler-libs/ccomp.cmx
-lib/ocaml/compiler-libs/clambda.cmx
-lib/ocaml/compiler-libs/clflags.cmx
-lib/ocaml/compiler-libs/closure.cmx
-lib/ocaml/compiler-libs/closure_offsets.cmx
-lib/ocaml/compiler-libs/cmi_format.cmx
-lib/ocaml/compiler-libs/cmm.cmx
-lib/ocaml/compiler-libs/cmmgen.cmx
-lib/ocaml/compiler-libs/cmt_format.cmx
-lib/ocaml/compiler-libs/coloring.cmx
-lib/ocaml/compiler-libs/comballoc.cmx
-lib/ocaml/compiler-libs/compdynlink.cmx
-lib/ocaml/compiler-libs/compenv.cmx
-lib/ocaml/compiler-libs/compile.cmx
-lib/ocaml/compiler-libs/compilenv.cmx
-lib/ocaml/compiler-libs/compmisc.cmx
-lib/ocaml/compiler-libs/compplugin.cmx
-lib/ocaml/compiler-libs/config.cmx
-lib/ocaml/compiler-libs/consistbl.cmx
-lib/ocaml/compiler-libs/ctype.cmx
-lib/ocaml/compiler-libs/datarepr.cmx
-lib/ocaml/compiler-libs/deadcode.cmx
-lib/ocaml/compiler-libs/depend.cmx
-lib/ocaml/compiler-libs/dll.cmx
-lib/ocaml/compiler-libs/docstrings.cmx
-lib/ocaml/compiler-libs/emit.cmx
-lib/ocaml/compiler-libs/emitaux.cmx
-lib/ocaml/compiler-libs/emitcode.cmx
-lib/ocaml/compiler-libs/env.cmx
-lib/ocaml/compiler-libs/envaux.cmx
-lib/ocaml/compiler-libs/errors.cmx
-lib/ocaml/compiler-libs/export_info.cmx
-lib/ocaml/compiler-libs/export_info_for_pack.cmx
-lib/ocaml/compiler-libs/flambda_to_clambda.cmx
-lib/ocaml/compiler-libs/ident.cmx
-lib/ocaml/compiler-libs/identifiable.cmx
-lib/ocaml/compiler-libs/import_approx.cmx
-lib/ocaml/compiler-libs/includeclass.cmx
-lib/ocaml/compiler-libs/includecore.cmx
-lib/ocaml/compiler-libs/includemod.cmx
-lib/ocaml/compiler-libs/instruct.cmx
-lib/ocaml/compiler-libs/interf.cmx
-lib/ocaml/compiler-libs/lambda.cmx
-lib/ocaml/compiler-libs/lexer.cmx
-lib/ocaml/compiler-libs/linearize.cmx
-lib/ocaml/compiler-libs/liveness.cmx
-lib/ocaml/compiler-libs/location.cmx
-lib/ocaml/compiler-libs/longident.cmx
-lib/ocaml/compiler-libs/mach.cmx
-lib/ocaml/compiler-libs/main.cmx
-lib/ocaml/compiler-libs/main_args.cmx
-lib/ocaml/compiler-libs/matching.cmx
-lib/ocaml/compiler-libs/meta.cmx
-lib/ocaml/compiler-libs/misc.cmx
-lib/ocaml/compiler-libs/mtype.cmx
-lib/ocaml/compiler-libs/numbers.cmx
-lib/ocaml/compiler-libs/ocamlbytecomp.a
-lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
-lib/ocaml/compiler-libs/ocamlcommon.a
-lib/ocaml/compiler-libs/ocamlcommon.cmxa
-lib/ocaml/compiler-libs/ocamloptcomp.a
-lib/ocaml/compiler-libs/ocamloptcomp.cmxa
-lib/ocaml/compiler-libs/opcodes.cmx
-lib/ocaml/compiler-libs/oprint.cmx
-lib/ocaml/compiler-libs/optcompile.cmx
-lib/ocaml/compiler-libs/opterrors.cmx
-lib/ocaml/compiler-libs/optmain.cmx
-lib/ocaml/compiler-libs/parmatch.cmx
-lib/ocaml/compiler-libs/parse.cmx
-lib/ocaml/compiler-libs/parser.cmx
-lib/ocaml/compiler-libs/path.cmx
-lib/ocaml/compiler-libs/pparse.cmx
-lib/ocaml/compiler-libs/pprintast.cmx
-lib/ocaml/compiler-libs/predef.cmx
-lib/ocaml/compiler-libs/primitive.cmx
-lib/ocaml/compiler-libs/printast.cmx
-lib/ocaml/compiler-libs/printclambda.cmx
-lib/ocaml/compiler-libs/printcmm.cmx
-lib/ocaml/compiler-libs/printinstr.cmx
-lib/ocaml/compiler-libs/printlambda.cmx
-lib/ocaml/compiler-libs/printlinear.cmx
-lib/ocaml/compiler-libs/printmach.cmx
-lib/ocaml/compiler-libs/printtyp.cmx
-lib/ocaml/compiler-libs/printtyped.cmx
-lib/ocaml/compiler-libs/proc.cmx
-lib/ocaml/compiler-libs/reg.cmx
-lib/ocaml/compiler-libs/reload.cmx
-lib/ocaml/compiler-libs/reloadgen.cmx
-lib/ocaml/compiler-libs/runtimedef.cmx
-lib/ocaml/compiler-libs/schedgen.cmx
-lib/ocaml/compiler-libs/scheduling.cmx
-lib/ocaml/compiler-libs/selectgen.cmx
-lib/ocaml/compiler-libs/selection.cmx
-lib/ocaml/compiler-libs/simplif.cmx
-lib/ocaml/compiler-libs/spacetime_profiling.cmx
-lib/ocaml/compiler-libs/spill.cmx
-lib/ocaml/compiler-libs/split.cmx
-lib/ocaml/compiler-libs/strmatch.cmx
-lib/ocaml/compiler-libs/strongly_connected_components.cmx
-lib/ocaml/compiler-libs/stypes.cmx
-lib/ocaml/compiler-libs/subst.cmx
-lib/ocaml/compiler-libs/switch.cmx
-lib/ocaml/compiler-libs/symtable.cmx
-lib/ocaml/compiler-libs/syntaxerr.cmx
-lib/ocaml/compiler-libs/tast_mapper.cmx
-lib/ocaml/compiler-libs/tbl.cmx
-lib/ocaml/compiler-libs/terminfo.cmx
-lib/ocaml/compiler-libs/timings.cmx
-lib/ocaml/compiler-libs/translattribute.cmx
-lib/ocaml/compiler-libs/translclass.cmx
-lib/ocaml/compiler-libs/translcore.cmx
-lib/ocaml/compiler-libs/translmod.cmx
-lib/ocaml/compiler-libs/translobj.cmx
-lib/ocaml/compiler-libs/typeclass.cmx
-lib/ocaml/compiler-libs/typecore.cmx
-lib/ocaml/compiler-libs/typedecl.cmx
-lib/ocaml/compiler-libs/typedtree.cmx
-lib/ocaml/compiler-libs/typedtreeIter.cmx
-lib/ocaml/compiler-libs/typedtreeMap.cmx
-lib/ocaml/compiler-libs/typemod.cmx
-lib/ocaml/compiler-libs/typeopt.cmx
-lib/ocaml/compiler-libs/types.cmx
-lib/ocaml/compiler-libs/typetexp.cmx
-lib/ocaml/compiler-libs/un_anf.cmx
-lib/ocaml/compiler-libs/untypeast.cmx
-lib/ocaml/compiler-libs/warnings.cmx
-lib/ocaml/compiler-libs/x86_dsl.cmx
-lib/ocaml/compiler-libs/x86_gas.cmx
-lib/ocaml/compiler-libs/x86_masm.cmx
-lib/ocaml/compiler-libs/x86_proc.cmx
-lib/ocaml/complex.cmx
-lib/ocaml/digest.cmx
-lib/ocaml/ephemeron.cmx
-lib/ocaml/filename.cmx
-lib/ocaml/format.cmx
-lib/ocaml/gc.cmx
-lib/ocaml/genlex.cmx
-lib/ocaml/hashtbl.cmx
-lib/ocaml/int32.cmx
-lib/ocaml/int64.cmx
-lib/ocaml/int_misc.cmx
-lib/ocaml/lazy.cmx
-lib/ocaml/lexing.cmx
-lib/ocaml/libasmrun.a
-lib/ocaml/libasmrun_pic.a
-lib/ocaml/libasmrunp.a
-lib/ocaml/libbigarray.a
-lib/ocaml/libcamlrun.a
-lib/ocaml/libcamlrun_pic.a
-lib/ocaml/libcamlstr.a
-lib/ocaml/libnums.a
-lib/ocaml/libthreads.a
-lib/ocaml/libthreadsnat.a
-lib/ocaml/libunix.a
-lib/ocaml/list.cmx
-lib/ocaml/listLabels.cmx
-lib/ocaml/map.cmx
-lib/ocaml/marshal.cmx
-lib/ocaml/moreLabels.cmx
-lib/ocaml/nat.cmx
-lib/ocaml/nativeint.cmx
-lib/ocaml/num.cmx
-lib/ocaml/nums.a
-lib/ocaml/nums.cmxa
-lib/ocaml/obj.cmx
-lib/ocaml/ocamldoc/odoc.cmx
-lib/ocaml/ocamldoc/odoc_analyse.cmx
-lib/ocaml/ocamldoc/odoc_args.cmx
-lib/ocaml/ocamldoc/odoc_ast.cmx
-lib/ocaml/ocamldoc/odoc_class.cmx
-lib/ocaml/ocamldoc/odoc_comments.cmx
-lib/ocaml/ocamldoc/odoc_comments_global.cmx
-lib/ocaml/ocamldoc/odoc_config.cmx
-lib/ocaml/ocamldoc/odoc_control.cmx
-lib/ocaml/ocamldoc/odoc_cross.cmx
-lib/ocaml/ocamldoc/odoc_dag2html.cmx
-lib/ocaml/ocamldoc/odoc_dep.cmx
-lib/ocaml/ocamldoc/odoc_dot.cmx
-lib/ocaml/ocamldoc/odoc_env.cmx
-lib/ocaml/ocamldoc/odoc_exception.cmx
-lib/ocaml/ocamldoc/odoc_extension.cmx
-lib/ocaml/ocamldoc/odoc_gen.cmx
-lib/ocaml/ocamldoc/odoc_global.cmx
-lib/ocaml/ocamldoc/odoc_html.cmx
-lib/ocaml/ocamldoc/odoc_info.a
-lib/ocaml/ocamldoc/odoc_info.cmx
-lib/ocaml/ocamldoc/odoc_info.cmxa
-lib/ocaml/ocamldoc/odoc_inherit.cmx
-lib/ocaml/ocamldoc/odoc_latex.cmx
-lib/ocaml/ocamldoc/odoc_latex_style.cmx
-lib/ocaml/ocamldoc/odoc_lexer.cmx
-lib/ocaml/ocamldoc/odoc_man.cmx
-lib/ocaml/ocamldoc/odoc_merge.cmx
-lib/ocaml/ocamldoc/odoc_messages.cmx
-lib/ocaml/ocamldoc/odoc_misc.cmx
-lib/ocaml/ocamldoc/odoc_module.cmx
-lib/ocaml/ocamldoc/odoc_name.cmx
-lib/ocaml/ocamldoc/odoc_ocamlhtml.cmx
-lib/ocaml/ocamldoc/odoc_parameter.cmx
-lib/ocaml/ocamldoc/odoc_parser.cmx
-lib/ocaml/ocamldoc/odoc_print.cmx
-lib/ocaml/ocamldoc/odoc_scan.cmx
-lib/ocaml/ocamldoc/odoc_search.cmx
-lib/ocaml/ocamldoc/odoc_see_lexer.cmx
-lib/ocaml/ocamldoc/odoc_sig.cmx
-lib/ocaml/ocamldoc/odoc_str.cmx
-lib/ocaml/ocamldoc/odoc_texi.cmx
-lib/ocaml/ocamldoc/odoc_text.cmx
-lib/ocaml/ocamldoc/odoc_text_lexer.cmx
-lib/ocaml/ocamldoc/odoc_text_parser.cmx
-lib/ocaml/ocamldoc/odoc_to_text.cmx
-lib/ocaml/ocamldoc/odoc_type.cmx
-lib/ocaml/ocamldoc/odoc_types.cmx
-lib/ocaml/ocamldoc/odoc_value.cmx
-lib/ocaml/oo.cmx
-lib/ocaml/parsing.cmx
-lib/ocaml/pervasives.cmx
-lib/ocaml/printexc.cmx
-lib/ocaml/printf.cmx
-lib/ocaml/profiling.cmx
-lib/ocaml/queue.cmx
-lib/ocaml/random.cmx
-lib/ocaml/ratio.cmx
-lib/ocaml/scanf.cmx
-lib/ocaml/set.cmx
-lib/ocaml/sort.cmx
-lib/ocaml/spacetime.cmx
-lib/ocaml/stack.cmx
-lib/ocaml/stdLabels.cmx
-lib/ocaml/std_exit.cmx
-lib/ocaml/stdlib.a
-lib/ocaml/stdlib.cmxa
-lib/ocaml/str.a
-lib/ocaml/str.cmx
-lib/ocaml/str.cmxa
-lib/ocaml/stream.cmx
-lib/ocaml/string.cmx
-lib/ocaml/stringLabels.cmx
-lib/ocaml/sys.cmx
-lib/ocaml/threads/condition.cmx
-lib/ocaml/threads/event.cmx
-lib/ocaml/threads/mutex.cmx
-lib/ocaml/threads/thread.cmx
-lib/ocaml/threads/threadUnix.cmx
-lib/ocaml/threads/threads.a
-lib/ocaml/threads/threads.cmxa
-lib/ocaml/uchar.cmx
-lib/ocaml/unix.a
-lib/ocaml/unix.cmx
-lib/ocaml/unix.cmxa
-lib/ocaml/unixLabels.cmx
-lib/ocaml/vmthreads/libvmthreads.a
-lib/ocaml/weak.cmx
diff --git a/lang/ocaml/PLIST.prof b/lang/ocaml/PLIST.prof
deleted file mode 100644
index 62d1b16b6dd..00000000000
--- a/lang/ocaml/PLIST.prof
+++ /dev/null
@@ -1,104 +0,0 @@
-@comment $NetBSD: PLIST.prof,v 1.11 2017/03/27 12:51:58 jperkin Exp $
-lib/ocaml/arg.p.cmt
-lib/ocaml/arg.p.cmx
-lib/ocaml/array.p.cmt
-lib/ocaml/array.p.cmx
-lib/ocaml/arrayLabels.p.cmt
-lib/ocaml/arrayLabels.p.cmx
-lib/ocaml/buffer.p.cmt
-lib/ocaml/buffer.p.cmx
-lib/ocaml/bytes.p.cmt
-lib/ocaml/bytes.p.cmx
-lib/ocaml/bytesLabels.p.cmt
-lib/ocaml/bytesLabels.p.cmx
-lib/ocaml/callback.p.cmt
-lib/ocaml/callback.p.cmx
-lib/ocaml/camlinternalFormat.p.cmt
-lib/ocaml/camlinternalFormat.p.cmx
-lib/ocaml/camlinternalFormatBasics.p.cmt
-lib/ocaml/camlinternalFormatBasics.p.cmx
-lib/ocaml/camlinternalLazy.p.cmt
-lib/ocaml/camlinternalLazy.p.cmx
-lib/ocaml/camlinternalMod.p.cmt
-lib/ocaml/camlinternalMod.p.cmx
-lib/ocaml/camlinternalOO.p.cmt
-lib/ocaml/camlinternalOO.p.cmx
-lib/ocaml/char.p.cmt
-lib/ocaml/char.p.cmx
-lib/ocaml/complex.p.cmt
-lib/ocaml/complex.p.cmx
-lib/ocaml/digest.p.cmt
-lib/ocaml/digest.p.cmx
-lib/ocaml/ephemeron.p.cmt
-lib/ocaml/ephemeron.p.cmx
-lib/ocaml/filename.p.cmt
-lib/ocaml/filename.p.cmx
-lib/ocaml/format.p.cmt
-lib/ocaml/format.p.cmx
-lib/ocaml/gc.p.cmt
-lib/ocaml/gc.p.cmx
-lib/ocaml/genlex.p.cmt
-lib/ocaml/genlex.p.cmx
-lib/ocaml/hashtbl.p.cmt
-lib/ocaml/hashtbl.p.cmx
-lib/ocaml/int32.p.cmt
-lib/ocaml/int32.p.cmx
-lib/ocaml/int64.p.cmt
-lib/ocaml/int64.p.cmx
-lib/ocaml/lazy.p.cmt
-lib/ocaml/lazy.p.cmx
-lib/ocaml/lexing.p.cmt
-lib/ocaml/lexing.p.cmx
-lib/ocaml/list.p.cmt
-lib/ocaml/list.p.cmx
-lib/ocaml/listLabels.p.cmt
-lib/ocaml/listLabels.p.cmx
-lib/ocaml/map.p.cmt
-lib/ocaml/map.p.cmx
-lib/ocaml/marshal.p.cmt
-lib/ocaml/marshal.p.cmx
-lib/ocaml/moreLabels.p.cmt
-lib/ocaml/moreLabels.p.cmx
-lib/ocaml/nativeint.p.cmt
-lib/ocaml/nativeint.p.cmx
-lib/ocaml/obj.p.cmt
-lib/ocaml/obj.p.cmx
-lib/ocaml/oo.p.cmt
-lib/ocaml/oo.p.cmx
-lib/ocaml/parsing.p.cmt
-lib/ocaml/parsing.p.cmx
-lib/ocaml/pervasives.p.cmt
-lib/ocaml/pervasives.p.cmx
-lib/ocaml/printexc.p.cmt
-lib/ocaml/printexc.p.cmx
-lib/ocaml/printf.p.cmt
-lib/ocaml/printf.p.cmx
-lib/ocaml/queue.p.cmt
-lib/ocaml/queue.p.cmx
-lib/ocaml/random.p.cmt
-lib/ocaml/random.p.cmx
-lib/ocaml/scanf.p.cmt
-lib/ocaml/scanf.p.cmx
-lib/ocaml/set.p.cmt
-lib/ocaml/set.p.cmx
-lib/ocaml/sort.p.cmt
-lib/ocaml/sort.p.cmx
-lib/ocaml/spacetime.p.cmt
-lib/ocaml/spacetime.p.cmx
-lib/ocaml/stack.p.cmt
-lib/ocaml/stack.p.cmx
-lib/ocaml/stdLabels.p.cmt
-lib/ocaml/stdLabels.p.cmx
-lib/ocaml/std_exit.p.cmt
-lib/ocaml/stream.p.cmt
-lib/ocaml/stream.p.cmx
-lib/ocaml/string.p.cmt
-lib/ocaml/string.p.cmx
-lib/ocaml/stringLabels.p.cmt
-lib/ocaml/stringLabels.p.cmx
-lib/ocaml/sys.p.cmt
-lib/ocaml/sys.p.cmx
-lib/ocaml/uchar.p.cmt
-lib/ocaml/uchar.p.cmx
-lib/ocaml/weak.p.cmt
-lib/ocaml/weak.p.cmx
diff --git a/lang/ocaml/PLIST.raw_spacetime b/lang/ocaml/PLIST.raw_spacetime
deleted file mode 100644
index 318c9018971..00000000000
--- a/lang/ocaml/PLIST.raw_spacetime
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.raw_spacetime,v 1.1 2017/03/27 11:51:30 jperkin Exp $
-lib/ocaml/raw_spacetime_lib.a
-lib/ocaml/raw_spacetime_lib.cma
-lib/ocaml/raw_spacetime_lib.cmi
-lib/ocaml/raw_spacetime_lib.cmx
-lib/ocaml/raw_spacetime_lib.cmxa
-lib/ocaml/raw_spacetime_lib.cmxs
-lib/ocaml/raw_spacetime_lib.mli
diff --git a/lang/ocaml/PLIST.stub b/lang/ocaml/PLIST.stub
deleted file mode 100644
index e3f913b8fee..00000000000
--- a/lang/ocaml/PLIST.stub
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST.stub,v 1.6 2012/10/08 15:05:32 jaapb Exp $
-lib/ocaml/stublibs/dllbigarray.so
-lib/ocaml/stublibs/dllcamlstr.so
-lib/ocaml/stublibs/dllnums.so
-lib/ocaml/stublibs/dllthreads.so
-lib/ocaml/stublibs/dllunix.so
-lib/ocaml/stublibs/dllvmthreads.so
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index 07e1730557f..7cdb9f4dc80 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.40 2017/07/11 09:52:11 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.41 2017/09/08 09:12:44 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml
 
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.04.0
-BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.04.2
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.05.0
+BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.05.0
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 1d9ffe9951e..59302521690 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,33 +1,29 @@
-$NetBSD: distinfo,v 1.108 2017/07/18 17:41:04 wiz Exp $
+$NetBSD: distinfo,v 1.109 2017/09/08 09:12:44 jaapb Exp $
 
-SHA1 (ocaml-4.04.2.tar.gz) = 24281675ea90c9234e323d556f1d4cd7bdab8ec1
-RMD160 (ocaml-4.04.2.tar.gz) = 3d8f78cd544815233f814a0e24eba8d3c948b190
-SHA512 (ocaml-4.04.2.tar.gz) = c02e9353e8e62154ca683027c005154a7f280034d1ec9184ee52286d4a41852ba70f4ec976c01e07720f3c75e949da049eafc553e7a35ebaa65136e29ab248f5
-Size (ocaml-4.04.2.tar.gz) = 3561930 bytes
-SHA1 (patch-Makefile) = 426d2aa080922fb6f034a76b8009f2fcbbe7a693
+SHA1 (ocaml-4.05.0.tar.gz) = ef9e3febed311cf9331baefd2999961b36f849cb
+RMD160 (ocaml-4.05.0.tar.gz) = 67b299c3abe032f955e95eac106c32664351453c
+SHA512 (ocaml-4.05.0.tar.gz) = 9ad68932d7ae9e33fa0f84da7288c47d518d1ef367204f6415caee000feeb8fae2ea079b1d9fa780e9470608df9e030632f4377d320236d0389991aceec94b69
+Size (ocaml-4.05.0.tar.gz) = 3913079 bytes
+SHA1 (patch-Makefile) = 557a2a34d09e7c063b34d9b97b4e3d1a8e4cd902
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
-SHA1 (patch-asmrun_Makefile) = 923b46ebf5fb56693b8335787846dafda936b34c
+SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
 SHA1 (patch-asmrun_signals__osdep.h) = 1b990aad8e99692f0799e2d3dc61df2f4d1c8f6a
-SHA1 (patch-byterun_Makefile) = b9b14b097904fbde4b738b89461991411e985ae1
-SHA1 (patch-configure) = 291e703a6a2147b760330f4623a049cceb2543e9
-SHA1 (patch-debugger_Makefile.shared) = f0aac2e10b7ccf2e8e43bbbd3fd3e59e4dc4eeae
+SHA1 (patch-byterun_Makefile) = 28b8298093a439fe1418dc91bb8a06da9870bfab
+SHA1 (patch-configure) = 6559c8728ed6676b2bab19f75538ba9d16cceea1
 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) = f4fcde662061e7e7e664ec42617f1e37f1fcf214
-SHA1 (patch-ocamldoc_Makefile) = ba4e2c76e1f2832988dd6933cd9d68a7ba3fb870
+SHA1 (patch-ocamldoc_Makefile) = 1da273d69cda171cba8f5d17a9ec37d67ab6634b
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
 SHA1 (patch-otherlibs_Makefile) = e7b777dd1c5723eb5950db38525fd9565258801f
 SHA1 (patch-otherlibs_bigarray_mmap__unix.c) = 39979990e3463c944598ac0d0bf8a2c4a3f0d558
-SHA1 (patch-otherlibs_dynlink_Makefile) = f892254a5e5a01462ecbf68e45f9bfe5783158d3
-SHA1 (patch-otherlibs_systhreads_Makefile) = cc579ea90c738b6ae8a377d15695b907b630e660
-SHA1 (patch-otherlibs_threads_Makefile) = 3d01ed6de00d8d1991e7cd3ec4fa004f542792e9
-SHA1 (patch-stdlib_Makefile) = 67591b1809dd72aac446238491e371d135466734
-SHA1 (patch-stdlib_Makefile.shared) = dac87da3b0461a2c816b862af3a0c0bdf740b749
-SHA1 (patch-testsuite_tests_tool-ocamldoc-man_Makefile) = 41c7d6ffa98ed4f4fe261d6ed890be045c55adaf
-SHA1 (patch-tools_Makefile.shared) = 517137929c9941df305f7f14ba5f17ec9e012822
+SHA1 (patch-otherlibs_dynlink_Makefile) = 9586542c6aa2f618a5d9df62bcb7bfac34ce1163
+SHA1 (patch-otherlibs_systhreads_Makefile) = da3f42ab255cb1b94a49f1e90a0df6911c8edb1c
+SHA1 (patch-otherlibs_threads_Makefile) = 0f1a872f2d0599b25f2c4dfbbfe0c7ff22b69339
+SHA1 (patch-stdlib_Makefile) = 4832d06bf0d0873ddf814e77f6085a2acf2b8988
 SHA1 (patch-tools_ocamlcp.ml) = 299c84c169bacfe0315a986d739b3e61d2491289
 SHA1 (patch-tools_ocamlmklib) = 53785aa5f0684a2c8708891d7e4e9d4400afbe7d
 SHA1 (patch-tools_ocamloptp.ml) = bb6ba38e9bb260117d67491566474fda750d708b
diff --git a/lang/ocaml/options.mk b/lang/ocaml/options.mk
new file mode 100644
index 00000000000..c3d862d6c9e
--- /dev/null
+++ b/lang/ocaml/options.mk
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2017/09/08 09:12:44 jaapb Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ocaml
+PKG_SUPPORTED_OPTIONS=	pic flambda spacetime
+PKG_SUGGESTED_OPTIONS=	pic
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpic)
+CONFIGURE_ARGS+=	-fPIC
+.endif
+
+.if !empty(PKG_OPTIONS:Mflambda)
+CONFIGURE_ARGS+=	-flambda
+.endif
+
+.if !empty(PKG_OPTIONS:Mspacetime)
+CONFIGURE_ARGS+=	-spacetime
+.endif
diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile
index b253af32298..dec98d8555a 100644
--- a/lang/ocaml/patches/patch-Makefile
+++ b/lang/ocaml/patches/patch-Makefile
@@ -1,117 +1,131 @@
-$NetBSD: patch-Makefile,v 1.9 2016/12/30 11:15:00 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.10 2017/09/08 09:12:44 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- Makefile.orig	2016-09-05 13:19:52.000000000 +0000
+--- Makefile.orig	2017-06-28 14:09:39.000000000 +0000
 +++ Makefile
-@@ -210,36 +210,36 @@ INSTALL_MANDIR=$(DESTDIR)$(MANDIR)
- 
+@@ -593,29 +593,29 @@ endif
+ # Installation
+ .PHONY: install
  install:
- 	if test -d $(INSTALL_BINDIR); then : ; \
--	  else $(MKDIR) $(INSTALL_BINDIR); fi
-+	  else $(BSD_INSTALL_PROGRAM_DIR) $(INSTALL_BINDIR); fi
- 	if test -d $(INSTALL_LIBDIR); then : ; \
--	  else $(MKDIR) $(INSTALL_LIBDIR); fi
-+	  else $(BSD_INSTALL_DATA_DIR) $(INSTALL_LIBDIR); fi
- 	if test -d $(INSTALL_STUBLIBDIR); then : ; \
--	  else $(MKDIR) $(INSTALL_STUBLIBDIR); fi
-+	  else $(BSD_INSTALL_DATA_DIR) $(INSTALL_STUBLIBDIR); fi
- 	if test -d $(INSTALL_COMPLIBDIR); then : ; \
--	  else $(MKDIR) $(INSTALL_COMPLIBDIR); fi
-+	  else $(BSD_INSTALL_DATA_DIR) $(INSTALL_COMPLIBDIR); fi
- 	if test -d $(INSTALL_MANDIR)/man$(MANEXT); then : ; \
--	  else $(MKDIR) $(INSTALL_MANDIR)/man$(MANEXT); fi
--	cp VERSION $(INSTALL_LIBDIR)/
-+	  else $(BSD_INSTALL_MAN_DIR) $(INSTALL_MANDIR)/man$(MANEXT); fi
-+	$(BSD_INSTALL_DATA) VERSION $(INSTALL_LIBDIR)/
- 	cd $(INSTALL_LIBDIR); rm -f \
- 	  dllbigarray$(EXT_DLL) dllnums$(EXT_DLL) dllthreads$(EXT_DLL) \
- 	  dllunix$(EXT_DLL) dllgraphics$(EXT_DLL) dllstr$(EXT_DLL)
- 	cd byterun; $(MAKE) install
--	cp ocamlc $(INSTALL_BINDIR)/ocamlc.byte$(EXE)
--	cp ocaml $(INSTALL_BINDIR)/ocaml$(EXE)
-+	$(BSD_INSTALL_SCRIPT) ocamlc $(INSTALL_BINDIR)/ocamlc.byte$(EXE)
-+	$(BSD_INSTALL_SCRIPT) ocaml $(INSTALL_BINDIR)/ocaml$(EXE)
- 	cd stdlib; $(MAKE) install
--	cp lex/ocamllex $(INSTALL_BINDIR)/ocamllex.byte$(EXE)
--	cp $(CAMLYACC)$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE)
--	cp utils/*.cmi utils/*.cmt utils/*.cmti \
-+	$(BSD_INSTALL_SCRIPT) lex/ocamllex $(INSTALL_BINDIR)/ocamllex.byte$(EXE)
-+	$(BSD_INSTALL_SCRIPT) $(CAMLYACC)$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE)
-+	$(BSD_INSTALL_DATA) utils/*.cmi utils/*.cmt utils/*.cmti \
- 	   parsing/*.cmi parsing/*.cmt parsing/*.cmti \
- 	   typing/*.cmi typing/*.cmt typing/*.cmti \
- 	   bytecomp/*.cmi bytecomp/*.cmt bytecomp/*.cmti \
- 	   driver/*.cmi driver/*.cmt driver/*.cmti \
- 	   toplevel/*.cmi toplevel/*.cmt toplevel/*.cmti $(INSTALL_COMPLIBDIR)
+-	$(MKDIR) "$(INSTALL_BINDIR)"
+-	$(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)"
+ 	$(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)"
+ 	$(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 \
+ 	   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 $(INSTALL_LIBDIR)
-+	$(BSD_INSTALL_SCRIPT) expunge $(INSTALL_LIBDIR)/expunge$(EXE)
-+	$(BSD_INSTALL_DATA) toplevel/topdirs.cmi $(INSTALL_LIBDIR)
- 	cd tools; $(MAKE) install
- 	-cd man; $(MAKE) install
- 	for i in $(OTHERLIBRARIES); do \
-@@ -247,7 +247,7 @@ install:
- 	done
- 	if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKE) install); fi
- 	if test -n "$(WITH_DEBUGGER)"; then (cd debugger; $(MAKE) install); fi
--	cp config/Makefile $(INSTALL_LIBDIR)/Makefile.config
-+	$(BSD_INSTALL_DATA) config/Makefile $(INSTALL_LIBDIR)/Makefile.config
+ 	   "$(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)"
+ 	$(MAKE) -C tools install
+ ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix
+@@ -636,7 +636,7 @@ ifeq "$(UNIX_OR_WIN32)" "win32"
+ 	  $(MAKE) install-flexdll; \
+ 	fi
+ 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 -sf ocamlc.byte$(EXE) ocamlc$(EXE); \
-@@ -257,14 +257,14 @@ install:
- # Installation of the native-code compiler
+ 	   cd "$(INSTALL_BINDIR)"; \
+ 	   $(LN) ocamlc.byte$(EXE) ocamlc$(EXE); \
+@@ -647,17 +647,17 @@ endif
+ .PHONY: installopt
  installopt:
- 	cd asmrun; $(MAKE) install
--	cp ocamlopt $(INSTALL_BINDIR)/ocamlopt.byte$(EXE)
-+	$(BSD_INSTALL_SCRIPT) ocamlopt $(INSTALL_BINDIR)/ocamlopt.byte$(EXE)
- 	cd stdlib; $(MAKE) 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 \
- 		$(INSTALL_COMPLIBDIR)
+ 	    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 $(INSTALL_COMPLIBDIR)
--	cp asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti $(INSTALL_COMPLIBDIR)
--	cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR)
-+	$(BSD_INSTALL_DATA) asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti $(INSTALL_COMPLIBDIR)
-+	$(BSD_INSTALL_DATA) compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR)
- 	if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKE) installopt); \
- 		else :; fi
- 	for i in $(OTHERLIBRARIES); \
-@@ -274,14 +274,14 @@ installopt:
- 	cd tools; $(MAKE) installopt
+ 	    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
+@@ -672,32 +672,32 @@ 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) -f 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 -sf ocamlc.opt$(EXE) ocamlc$(EXE); \
- 	   ln -sf ocamlopt.opt$(EXE) ocamlopt$(EXE); \
- 	   ln -sf ocamllex.opt$(EXE) ocamllex$(EXE)
+-	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 \
- 	   compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \
-@@ -290,9 +290,9 @@ installoptopt:
- 	   $(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.o) \
- 	   $(INSTALL_COMPLIBDIR)
- 	if test -f ocamlnat ; then \
--	  cp ocamlnat $(INSTALL_BINDIR)/ocamlnat$(EXE); \
--	  cp toplevel/opttopdirs.cmi $(INSTALL_LIBDIR); \
+ 	   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 $(INSTALL_BINDIR)/ocamlnat$(EXE); \
-+	  $(BSD_INSTALL_DATA) toplevel/opttopdirs.cmi $(INSTALL_LIBDIR); \
++	  $(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); \
+ 	     compilerlibs/ocamlopttoplevel.$(A) \
+ 	     $(OPTTOPLEVELSTART:.cmo=.cmx) $(OPTTOPLEVELSTART:.cmo=.$(O)) \
+ 	     "$(INSTALL_COMPLIBDIR)"; \
+@@ -708,7 +708,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)
+ 
diff --git a/lang/ocaml/patches/patch-asmrun_Makefile b/lang/ocaml/patches/patch-asmrun_Makefile
index cd209bb5fd2..c1128d596f8 100644
--- a/lang/ocaml/patches/patch-asmrun_Makefile
+++ b/lang/ocaml/patches/patch-asmrun_Makefile
@@ -1,47 +1,14 @@
-$NetBSD: patch-asmrun_Makefile,v 1.6 2016/05/05 08:12:01 jaapb Exp $
+$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	2016-04-01 12:53:41.000000000 +0000
+--- asmrun/Makefile.orig	2017-06-28 14:09:39.000000000 +0000
 +++ asmrun/Makefile
-@@ -92,25 +92,25 @@ libasmrun_shared.so: $(PICOBJS)
- INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
+@@ -129,7 +129,7 @@ libasmrun_shared.$(SO): $(PICOBJS)
  
- install::
--	cp libasmrun.a $(INSTALL_LIBDIR)/libasmrun.a
-+	$(BSD_INSTALL_DATA) libasmrun.a $(INSTALL_LIBDIR)/libasmrun.a
- 	cd $(INSTALL_LIBDIR); $(RANLIB) libasmrun.a
- .PHONY: install-default
+ .PHONY: install
+ install:
+-	cp $(TARGETS) "$(INSTALL_LIBDIR)"
++	$(BSD_INSTALL_DATA) $(TARGETS) "$(INSTALL_LIBDIR)"
  
- ifeq "$(RUNTIMED)" "runtimed"
- install::
--	cp libasmrund.a $(INSTALL_LIBDIR)/libasmrund.a
-+	$(BSD_INSTALL_DATA) libasmrund.a $(INSTALL_LIBDIR)/libasmrund.a
- 	cd $(INSTALL_LIBDIR); $(RANLIB) libasmrund.a
- endif
- 
- ifeq "$(RUNTIMEI)" "true"
- install::
--	cp libasmruni.a $(INSTALL_LIBDIR)/libasmruni.a
-+	$(BSD_INSTALL_DATA) libasmruni.a $(INSTALL_LIBDIR)/libasmruni.a
- 	cd $(INSTALL_LIBDIR); $(RANLIB) libasmruni.a
- endif
- 
- ifeq "$(PROFILING)" "prof"
- install::
--	cp libasmrunp.a $(INSTALL_LIBDIR)/libasmrunp.a
-+	$(BSD_INSTALL_DATA) libasmrunp.a $(INSTALL_LIBDIR)/libasmrunp.a
- 	cd $(INSTALL_LIBDIR); $(RANLIB) libasmrunp.a
- else
- install::
-@@ -120,9 +120,9 @@ endif
- 
- ifeq "$(SHARED)" "shared"
- install::
--	cp libasmrun_pic.a $(INSTALL_LIBDIR)/libasmrun_pic.a
-+	$(BSD_INSTALL_DATA) libasmrun_pic.a $(INSTALL_LIBDIR)/libasmrun_pic.a
- 	cd $(INSTALL_LIBDIR); $(RANLIB) libasmrunp.a
--	cp libasmrun_shared.so $(INSTALL_LIBDIR)/libasmrun_shared.so
-+	$(BSD_INSTALL_LIB) libasmrun_shared.so $(INSTALL_LIBDIR)/libasmrun_shared.so
- endif
- 
- main.c: ../byterun/main.c
+ $(LINKEDFILES): %.c: ../byterun/%.c
+ 	$(LN) $< $@
diff --git a/lang/ocaml/patches/patch-byterun_Makefile b/lang/ocaml/patches/patch-byterun_Makefile
index 83f0f4511e3..4079d799d89 100644
--- a/lang/ocaml/patches/patch-byterun_Makefile
+++ b/lang/ocaml/patches/patch-byterun_Makefile
@@ -1,25 +1,18 @@
-$NetBSD: patch-byterun_Makefile,v 1.5 2016/05/05 08:12:01 jaapb Exp $
+$NetBSD: patch-byterun_Makefile,v 1.6 2017/09/08 09:12:44 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- byterun/Makefile.orig	2016-04-01 12:53:41.000000000 +0000
+--- byterun/Makefile.orig	2017-06-28 14:09:39.000000000 +0000
 +++ byterun/Makefile
-@@ -15,7 +15,7 @@
- 
- include Makefile.common
- 
--CFLAGS=-DCAML_NAME_SPACE $(BYTECCCOMPOPTS) $(IFLEXDIR)
-+CFLAGS+=-DCAML_NAME_SPACE $(BYTECCCOMPOPTS) $(IFLEXDIR)
- DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS) $(IFLEXDIR)
- IFLAGS=$(CFLAGS) -DCAML_INSTR
- 
-@@ -68,8 +68,8 @@ install-noshared:
- .PHONY: install-noshared
- 
- install-shared:
--	cp libcamlrun_shared.so "$(INSTALL_LIBDIR)/libcamlrun_shared.so"
--	cp libcamlrun_pic.a "$(INSTALL_LIBDIR)/libcamlrun_pic.a"
-+	$(BSD_INSTALL_LIB) libcamlrun_shared.so "$(INSTALL_LIBDIR)/libcamlrun_shared.so"
-+	$(BSD_INSTALL_DATA) libcamlrun_pic.a "$(INSTALL_LIBDIR)/libcamlrun_pic.a"
- 	cd "$(INSTALL_LIBDIR)"; $(RANLIB) libcamlrun_pic.a
- .PHONY: install-shared
+@@ -112,9 +112,9 @@ ld.conf: ../config/Makefile
  
+ .PHONY: install
+ install:
+-	cp $(PROGRAMS) "$(INSTALL_BINDIR)"
+-	cp $(LIBRARIES) "$(INSTALL_LIBDIR)"
+-	mkdir -p "$(INSTALL_LIBDIR)/caml"
++	$(BSD_INSTALL_PROGRAM) $(PROGRAMS) "$(INSTALL_BINDIR)"
++	$(BSD_INSTALL_LIB) $(LIBRARIES) "$(INSTALL_LIBDIR)"
++	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)/caml"
+ 	for i in caml/*.h; do \
+ 	  sed -f ../tools/cleanup-header $$i \
+ 	      > "$(INSTALL_LIBDIR)/$$i"; \
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index dc615a069c2..607ae79f7dd 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.23 2017/07/11 17:15:02 he Exp $
+$NetBSD: patch-configure,v 1.24 2017/09/08 09:12:44 jaapb Exp $
 
 All kinds of OS-specific changes to configure
 
 --- configure.orig	2016-11-04 16:08:24.000000000 +0000
 +++ configure
-@@ -726,7 +726,10 @@ if test $with_sharedlibs = "yes"; then
+@@ -764,7 +764,10 @@ if test $with_sharedlibs = "yes"; then
          *gcc*)
            sharedcccompopts="-fPIC"
            if sh ./solaris-ld; then
@@ -16,7 +16,7 @@ All kinds of OS-specific changes to configure
              byteccrpath="-R"
              mksharedlibrpath="-R"
            else
-@@ -753,7 +756,7 @@ if test $with_sharedlibs = "yes"; then
+@@ -791,7 +794,7 @@ if test $with_sharedlibs = "yes"; then
        byteccrpath="-Wl,-rpath,"
        mksharedlibrpath="-rpath "
        shared_libraries_supported=true;;
@@ -25,7 +25,7 @@ All kinds of OS-specific changes to configure
        mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress \
                     -read_only_relocs suppress"
        bytecccompopts="$dl_defs $bytecccompopts"
-@@ -795,11 +798,7 @@ if test $with_sharedlibs = "yes"; then
+@@ -830,11 +833,7 @@ if test $with_sharedlibs = "yes"; then
      i[3456]86-*-linux*)           natdynlink=true;;
      i[3456]86-*-gnu*)             natdynlink=true;;
      x86_64-*-linux*)              natdynlink=true;;
@@ -38,7 +38,7 @@ All kinds of OS-specific changes to configure
      x86_64-*-darwin*)             natdynlink=true;;
      s390x*-*-linux*)              natdynlink=true;;
      powerpc*-*-linux*)            natdynlink=true;;
-@@ -813,6 +812,9 @@ if test $with_sharedlibs = "yes"; then
+@@ -848,6 +847,9 @@ if test $with_sharedlibs = "yes"; then
      x86_64-*-openbsd*)            natdynlink=true;;
      i[3456]86-*-netbsd*)          natdynlink=true;;
      x86_64-*-netbsd*)             natdynlink=true;;
@@ -48,7 +48,7 @@ All kinds of OS-specific changes to configure
      i386-*-gnu0.3)                natdynlink=true;;
      i[3456]86-*-haiku*)           natdynlink=true;;
      arm*-*-linux*)                natdynlink=true;;
-@@ -842,6 +844,7 @@ case "$target" in
+@@ -891,6 +893,7 @@ case "$target" in
    sparc*-*-gnu*)                arch=sparc; system=gnu;;
    i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
    i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
@@ -56,7 +56,7 @@ All kinds of OS-specific changes to configure
    i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
    i[3456]86-*-solaris*)         if $arch64; then
                                    arch=amd64; system=solaris
-@@ -851,6 +854,7 @@ case "$target" in
+@@ -900,6 +903,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;;
@@ -64,7 +64,7 @@ All kinds of OS-specific changes to configure
    i[3456]86-*-darwin*)          if $arch64; then
                                    arch=amd64; system=macosx
                                  else
-@@ -888,6 +892,7 @@ case "$target" in
+@@ -937,6 +941,7 @@ case "$target" in
    x86_64-*-mingw*)              arch=amd64; system=mingw;;
    aarch64-*-linux*)             arch=arm64; system=linux;;
    x86_64-*-cygwin*)             arch=amd64; system=cygwin;;
@@ -72,7 +72,7 @@ All kinds of OS-specific changes to configure
  esac
  
  # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -923,7 +928,6 @@ case "$arch,$nativecc,$system,$model" in
+@@ -973,7 +978,6 @@ case "$arch,$nativecc,$system,$model" in
    *,*,nextstep,*)      nativecclinkopts="-posix";;
    *,*,rhapsody,*)      if $arch64; then partialld="ld -r -arch ppc64"; fi;;
    amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
@@ -80,7 +80,7 @@ All kinds of OS-specific changes to configure
    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";;
-@@ -941,8 +945,8 @@ case "$arch,$system" in
+@@ -991,8 +995,8 @@ case "$arch,$system" in
                      fi;;
    amd64,solaris)  as="${TOOLPREF}as --64"
                    aspp="${TOOLPREF}gcc -m64 -c";;
@@ -91,16 +91,16 @@ All kinds of OS-specific changes to configure
    power,elf)      if $arch64; then
                      as="${TOOLPREF}as -a64 -mppc64"
                      aspp="${TOOLPREF}gcc -m64 -c"
-@@ -991,6 +995,8 @@ case "$arch,$system" in
-   arm,linux*) profiling='prof';;
-   power,elf) profiling='prof';;
-   power,bsd*) profiling='prof';;
-+  *,*,dragonfly) profiling='prof';;
-+  amd64,solaris) profiling='prof';;
-   *) profiling='noprof';;
+@@ -1048,6 +1052,8 @@ case "$arch,$system" in
+   arm,linux*) profiling='true';;
+   power,elf) profiling='true';;
+   power,bsd*) profiling='true';;
++	*,*,dragonfly) profiling='true';;
++	amd64,solaris) profiling='true';;
+   *) profiling='false';;
  esac
  
-@@ -1554,6 +1560,8 @@ fi
+@@ -1642,6 +1648,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -109,7 +109,7 @@ All kinds of OS-specific changes to configure
  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`
-@@ -1600,6 +1608,7 @@ if test "$x11_include" = "not found"; th
+@@ -1688,6 +1696,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -117,7 +117,7 @@ All kinds of OS-specific changes to configure
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1657,6 +1666,7 @@ if test "$x11_include" = "not found"; th
+@@ -1745,6 +1754,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -125,7 +125,7 @@ All kinds of OS-specific changes to configure
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1678,19 +1688,16 @@ if test "$x11_include" = "not found"; th
+@@ -1766,19 +1776,16 @@ if test "$x11_include" = "not found"; th
        if test $dir = /usr/lib; then
          x11_link="-lX11"
        else
diff --git a/lang/ocaml/patches/patch-debugger_Makefile.shared b/lang/ocaml/patches/patch-debugger_Makefile.shared
deleted file mode 100644
index c100b2d9428..00000000000
--- a/lang/ocaml/patches/patch-debugger_Makefile.shared
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-debugger_Makefile.shared,v 1.4 2016/05/05 08:12:01 jaapb Exp $
-
-Use BSD_INSTALL_* instead of mkdir and cp
---- debugger/Makefile.shared.orig	2016-04-01 12:53:41.000000000 +0000
-+++ debugger/Makefile.shared
-@@ -94,7 +94,7 @@ ocamldebug$(EXE): $(OBJS) $(OTHEROBJS)
- 	$(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) $(OBJS)
- 
- install:
--	cp ocamldebug$(EXE) "$(INSTALL_BINDIR)/ocamldebug$(EXE)"
-+	$(BSD_INSTALL_SCRIPT) ocamldebug$(EXE) "$(INSTALL_BINDIR)/ocamldebug$(EXE)"
- 
- clean::
- 	rm -f ocamldebug$(EXE)
diff --git a/lang/ocaml/patches/patch-ocamldoc_Makefile b/lang/ocaml/patches/patch-ocamldoc_Makefile
index 57e4d0ea12b..db150766fd6 100644
--- a/lang/ocaml/patches/patch-ocamldoc_Makefile
+++ b/lang/ocaml/patches/patch-ocamldoc_Makefile
@@ -1,44 +1,41 @@
-$NetBSD: patch-ocamldoc_Makefile,v 1.4 2016/05/05 08:12:01 jaapb Exp $
+$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	2016-04-01 12:53:41.000000000 +0000
+--- ocamldoc/Makefile.orig	2017-06-28 14:09:39.000000000 +0000
 +++ ocamldoc/Makefile
-@@ -256,24 +256,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
- # Installation targets
- ######################
- install: dummy
--	if test -d "$(INSTALL_BINDIR)"; then : ; else $(MKDIR) "$(INSTALL_BINDIR)"; fi
--	if test -d "$(INSTALL_LIBDIR)"; then : ; else $(MKDIR) "$(INSTALL_LIBDIR)"; fi
--	if test -d "$(INSTALL_CUSTOMDIR)"; then : ; else $(MKDIR) "$(INSTALL_CUSTOMDIR)"; fi
+@@ -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_LIBDIR)"
--	if test -d "$(INSTALL_MANODIR)"; then : ; else $(MKDIR) "$(INSTALL_MANODIR)"; fi
--	if test -d stdlib_man; then $(CP) stdlib_man/* "$(INSTALL_MANODIR)"; else : ; fi
-+	if test -d "$(INSTALL_BINDIR)"; then : ; else $(BSD_INSTALL_PROGRAM_DIR) "$(INSTALL_BINDIR)"; fi
-+	if test -d "$(INSTALL_LIBDIR)"; then : ; else $(BSD_INSTALL_DATA_DIR) "$(INSTALL_LIBDIR)"; fi
-+	if test -d "$(INSTALL_CUSTOMDIR)"; then : ; else $(BSD_INSTALL_DATA_DIR) "$(INSTALL_CUSTOMDIR)"; fi
+-	$(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_LIBDIR)"
-+	if test -d "$(INSTALL_MANODIR)"; then : ; else $(BSD_INSTALL_MAN_DIR) "$(INSTALL_MANODIR)"; fi
-+	if test -d stdlib_man; then $(BSD_INSTALL_MAN) stdlib_man/* "$(INSTALL_MANODIR)"; else : ; fi
++	$(BSD_INSTALL_DATA) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_CMTS) "$(INSTALL_LIBDIR)"
+ 	if test -d stdlib_man; then $(CP) stdlib_man/* "$(INSTALL_MANODIR)"; else : ; fi
  
- installopt:
- 	if test -f $(OCAMLDOC_OPT); then $(MAKE) installopt_really ; fi
+ # Note: at the moment, $(INSTALL_MANODIR) is created even if the doc has
+@@ -316,11 +316,11 @@ installopt:
  
+ .PHONY: installopt_really
  installopt_really:
--	if test -d "$(INSTALL_BINDIR)"; then : ; else $(MKDIR) "$(INSTALL_BINDIR)"; fi
--	if test -d "$(INSTALL_LIBDIR)"; then : ; else $(MKDIR) "$(INSTALL_LIBDIR)"; fi
+-	$(MKDIR) "$(INSTALL_BINDIR)"
+-	$(MKDIR) "$(INSTALL_LIBDIR)"
 -	$(CP) $(OCAMLDOC_OPT) "$(INSTALL_BINDIR)/$(OCAMLDOC_OPT)$(EXE)"
--	$(CP) ocamldoc.hva *.cmx $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) "$(INSTALL_LIBDIR)"
--	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) "$(INSTALL_LIBDIR)"
-+	if test -d "$(INSTALL_BINDIR)"; then : ; else $(BSD_INSTALL_PROGRAM_DIR) "$(INSTALL_BINDIR)"; fi
-+	if test -d "$(INSTALL_LIBDIR)"; then : ; else $(BSD_INSTALL_DATA_DIR) "$(INSTALL_LIBDIR)"; fi
+-	$(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) ocamldoc.hva *.cmx $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) "$(INSTALL_LIBDIR)"
-+	$(BSD_INSTALL_DATA) $(INSTALL_MLIS) $(INSTALL_CMIS) "$(INSTALL_LIBDIR)"
++	$(BSD_INSTALL_DATA) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_CMTS) "$(INSTALL_LIBDIR)"
++	$(BSD_INSTALL_DATA) ocamldoc.hva *.cmx $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) \
+ 	  "$(INSTALL_LIBDIR)"
  
- # Testing :
- ###########
+ # TODO: also split into several rules
diff --git a/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile b/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile
index bd36db1e993..9668b9afde4 100644
--- a/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile
@@ -1,16 +1,15 @@
-$NetBSD: patch-otherlibs_dynlink_Makefile,v 1.4 2016/05/05 08:12:01 jaapb Exp $
+$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	2016-04-01 12:53:41.000000000 +0000
+--- otherlibs/dynlink/Makefile.orig	2017-06-28 14:09:39.000000000 +0000
 +++ otherlibs/dynlink/Makefile
-@@ -88,12 +88,12 @@ extract_crc: dynlink.cma extract_crc.cmo
+@@ -90,12 +90,12 @@ extract_crc: dynlink.cma extract_crc.cmo
  INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
  
  install:
--	cp dynlink.cmi dynlink.cma dynlink.mli "$(INSTALL_LIBDIR)"
+-	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.cma dynlink.mli "$(INSTALL_LIBDIR)"
++	$(BSD_INSTALL_DATA) dynlink.cmi dynlink.cmti dynlink.cma dynlink.mli "$(INSTALL_LIBDIR)"
 +	$(BSD_INSTALL_SCRIPT) extract_crc "$(INSTALL_LIBDIR)/extract_crc$(EXE)"
  
  installopt:
diff --git a/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
index e92e855c0a5..f7785a977ad 100644
--- a/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
@@ -1,62 +1,31 @@
-$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.6 2017/07/17 23:26:23 wiz Exp $
+$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.7 2017/09/08 09:12:44 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
 
 --- otherlibs/systhreads/Makefile.orig	2017-06-23 15:13:40.000000000 +0000
 +++ otherlibs/systhreads/Makefile
-@@ -29,6 +29,7 @@ OPTCOMPFLAGS=-O3
- else
- OPTCOMPFLAGS=
- endif
-+LDOPTS=-ldopt "$(LDFLAGS)"
- 
- BYTECODE_C_OBJS=st_stubs_b.o
- NATIVECODE_C_OBJS=st_stubs_n.o
-@@ -40,7 +41,7 @@ all: libthreads.a threads.cma
- allopt: libthreadsnat.a threads.cmxa
- 
- libthreads.a: $(BYTECODE_C_OBJS)
--	$(MKLIB) -o threads $(BYTECODE_C_OBJS) $(PTHREAD_LINK)
-+	$(MKLIB) -o threads $(BYTECODE_C_OBJS) $(PTHREAD_LINK) $(LDOPTS)
- 
- st_stubs_b.o: st_stubs.c st_posix.h
- 	$(BYTECC) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
-@@ -60,7 +61,7 @@ st_stubs_n.o: st_stubs.c st_posix.h
- 
- threads.cma: $(THREAD_OBJS)
- 	$(MKLIB) -ocamlc '$(CAMLC)' -o threads $(THREAD_OBJS) \
--	  -cclib -lunix $(PTHREAD_CAML_LINK)
-+	  -cclib -lunix $(PTHREAD_CAML_LINK) $(LDOPTS)
- 
- # See remark above: force static linking of libthreadsnat.a
- threads.cmxa: $(THREAD_OBJS:.cmo=.cmx)
-@@ -86,21 +87,21 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDI
- 
+@@ -124,17 +124,17 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDI
  install:
- 	if test -f dllthreads.so; then \
--	  cp dllthreads.so $(INSTALL_STUBLIBDIR)/dllthreads.so; fi
--	cp libthreads.a $(INSTALL_LIBDIR)/libthreads.a
-+	  $(BSD_INSTALL_LIB) dllthreads.so $(INSTALL_STUBLIBDIR)/dllthreads.so; fi
-+	$(BSD_INSTALL_DATA) libthreads.a $(INSTALL_LIBDIR)/libthreads.a
- 	cd $(INSTALL_LIBDIR); $(RANLIB) libthreads.a
- 	if test -d $(INSTALL_LIBDIR)/threads; then :; \
--	  else mkdir $(INSTALL_LIBDIR)/threads; fi
--	cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(INSTALL_LIBDIR)/threads
-+	  else $(BSD_INSTALL_DATA_DIR) $(INSTALL_LIBDIR)/threads; fi
-+	$(BSD_INSTALL_DATA) $(THREAD_OBJS:.cmo=.cmi) threads.cma $(INSTALL_LIBDIR)/threads
- 	rm -f $(INSTALL_LIBDIR)/threads/stdlib.cma
--	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
-+	$(BSD_INSTALL_DATA) thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
- 	   $(INSTALL_LIBDIR)
--	cp threads.h $(INSTALL_LIBDIR)/caml/threads.h
-+	$(BSD_INSTALL_DATA) threads.h $(INSTALL_LIBDIR)/caml/threads.h
+ 	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)"
+ 	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)/libthreadsnat.a
-+	$(BSD_INSTALL_DATA) libthreadsnat.a $(INSTALL_LIBDIR)/libthreadsnat.a
- 	cd $(INSTALL_LIBDIR); $(RANLIB) libthreadsnat.a
--	cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a \
-+	$(BSD_INSTALL_DATA) $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a \
- 	   $(INSTALL_LIBDIR)/threads
- 	cd $(INSTALL_LIBDIR)/threads && $(RANLIB) threads.a
- 
+-	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
diff --git a/lang/ocaml/patches/patch-otherlibs_threads_Makefile b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
index c40fe145bb7..55327f4d9c3 100644
--- a/lang/ocaml/patches/patch-otherlibs_threads_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
@@ -1,39 +1,10 @@
-$NetBSD: patch-otherlibs_threads_Makefile,v 1.8 2017/07/17 23:26:23 wiz Exp $
+$NetBSD: patch-otherlibs_threads_Makefile,v 1.9 2017/09/08 09:12:44 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
 
 --- otherlibs/threads/Makefile.orig	2017-06-23 15:13:40.000000000 +0000
 +++ otherlibs/threads/Makefile
-@@ -31,6 +31,8 @@ C_OBJS=scheduler.o
- 
- CAML_OBJS=thread.cmo mutex.cmo condition.cmo event.cmo threadUnix.cmo
- 
-+LDOPTS=-ldopt "$(LDFLAGS)"
-+
- LIB=../../stdlib
- 
- LIB_OBJS=$(LIB)/camlinternalFormatBasics.cmo pervasives.cmo		\
-@@ -59,16 +61,16 @@ all: libvmthreads.a threads.cma stdlib.c
- allopt:
- 
- libvmthreads.a: $(C_OBJS)
--	$(MKLIB) -o threads -oc vmthreads $(C_OBJS)
-+	$(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
-@@ -109,14 +111,14 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDI
+@@ -111,12 +111,12 @@ CMIFILES=thread.cmi mutex.cmi condition.
  
  install:
  	if test -f dllvmthreads.so; then \
@@ -42,14 +13,11 @@ Use BSD_INSTALL_* instead of mkdir and cp
  	fi
 -	mkdir -p $(INSTALL_LIBDIR)/vmthreads
 -	cp libvmthreads.a $(INSTALL_LIBDIR)/vmthreads/libvmthreads.a
-+	$(BSD_INSTALL_DATA_DIR) -p $(INSTALL_LIBDIR)/vmthreads
++	$(BSD_INSTALL_LIB_DIR) $(INSTALL_LIBDIR)/vmthreads
 +	$(BSD_INSTALL_DATA) libvmthreads.a $(INSTALL_LIBDIR)/vmthreads/libvmthreads.a
  	cd $(INSTALL_LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
--	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
-+	$(BSD_INSTALL_DATA) thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
+-	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
--	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
-+	$(BSD_INSTALL_DATA) thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
- 	   $(INSTALL_LIBDIR)/vmthreads
  
  installopt:
diff --git a/lang/ocaml/patches/patch-stdlib_Makefile b/lang/ocaml/patches/patch-stdlib_Makefile
index cbc8f9e1e6d..14f98e951ac 100644
--- a/lang/ocaml/patches/patch-stdlib_Makefile
+++ b/lang/ocaml/patches/patch-stdlib_Makefile
@@ -1,24 +1,47 @@
-$NetBSD: patch-stdlib_Makefile,v 1.4 2016/05/05 08:12:01 jaapb Exp $
+$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	2016-04-01 12:53:41.000000000 +0000
+--- stdlib/Makefile.orig	2017-06-28 14:09:39.000000000 +0000
 +++ stdlib/Makefile
-@@ -27,7 +27,7 @@ allopt-prof: stdlib.p.cmxa std_exit.p.cm
- installopt: installopt-default installopt-$(PROFILING)
+@@ -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
+-	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)
  
- installopt-noprof:
-@@ -41,7 +41,7 @@ installopt-noprof:
- 	  ln -s std_exit.o "$(INSTALL_LIBDIR)/std_exit.p.o"
+ .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 \
+-	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
+ 	cd "$(INSTALL_LIBDIR)"; $(RANLIB) stdlib.p.$(A)
  
diff --git a/lang/ocaml/patches/patch-stdlib_Makefile.shared b/lang/ocaml/patches/patch-stdlib_Makefile.shared
deleted file mode 100644
index 59929ceed86..00000000000
--- a/lang/ocaml/patches/patch-stdlib_Makefile.shared
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-stdlib_Makefile.shared,v 1.6 2016/05/05 08:12:01 jaapb Exp $
-
-Use BSD_INSTALL_* instead of mkdir and cp
-
---- stdlib/Makefile.shared.orig	2016-04-01 12:53:41.000000000 +0000
-+++ stdlib/Makefile.shared
-@@ -61,19 +61,19 @@ endif
- INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
- 
- 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_DATA) target_camlheader "$(INSTALL_LIBDIR)/camlheader"
- 
- ifeq "$(RUNTIMED)" "runtimed"
- install::
--	cp target_camlheaderd $(INSTALL_LIBDIR)
-+	$(BSD_INSTALL_DATA) target_camlheaderd $(INSTALL_LIBDIR)
- endif
- 
- ifeq "$(RUNTIMEI)" "true"
- install::
--	cp target_camlheaderi $(INSTALL_LIBDIR)
-+	$(BSD_INSTALL_DATA) target_camlheaderi $(INSTALL_LIBDIR)
- endif
- 
- stdlib.cma: $(OBJS)
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 2a9f65dcd22..00000000000
--- a/lang/ocaml/patches/patch-testsuite_tests_tool-ocamldoc-man_Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-testsuite_tests_tool-ocamldoc-man_Makefile,v 1.1 2017/07/12 07:52:28 he Exp $
-
-Hm, the output lands in a different file than what the make job
-expects.  The result is however as expected when that is taken into
-account.
-
---- testsuite/tests/tool-ocamldoc-man/Makefile.orig	2017-07-12 07:22:07.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
diff --git a/lang/ocaml/patches/patch-tools_Makefile.shared b/lang/ocaml/patches/patch-tools_Makefile.shared
deleted file mode 100644
index 50a617af523..00000000000
--- a/lang/ocaml/patches/patch-tools_Makefile.shared
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-tools_Makefile.shared,v 1.5 2016/12/30 11:15:00 jaapb Exp $
-
-Use BSD_INSTALL_* instead of mkdir and cp
-
---- tools/Makefile.shared.orig	2016-09-05 13:19:52.000000000 +0000
-+++ tools/Makefile.shared
-@@ -140,10 +140,10 @@ $(call byte_and_opt,ocamloptp,$(ocamlcp_
- opt:: profiling.cmx
- 
- install::
--	cp -- profiling.cmi profiling.cmo "$(INSTALL_LIBDIR)"
-+	$(BSD_INSTALL_DATA) -- profiling.cmi profiling.cmo "$(INSTALL_LIBDIR)"
- 
- installopt::
--	cp -- profiling.cmx profiling.$(O) "$(INSTALL_LIBDIR)"
-+	$(BSD_INSTALL_DATA) -- profiling.cmx profiling.$(O) "$(INSTALL_LIBDIR)"
- 
- # To help building mixed-mode libraries (OCaml + C)
- 
-@@ -230,9 +230,9 @@ endif
- install::
- 	for i in $(install_files); \
- 	do \
--	  cp -- "$$i" "$(INSTALL_BINDIR)/$$i.byte$(EXE)" && \
-+	  $(BSD_INSTALL_SCRIPT) -- "$$i" "$(INSTALL_BINDIR)/$$i.byte$(EXE)" && \
- 	  if test -f "$$i".opt; then \
--	    cp -- "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)" && \
-+	    $(BSD_INSTALL_PROGRAM) -- "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)" && \
- 	    (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \
- 	  else \
- 	    (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.byte$(EXE)" "$$i$(EXE)"); \
-@@ -329,7 +329,7 @@ OBJINFO=../compilerlibs/ocamlcommon.cma 
- $(call byte_and_opt,ocamlobjinfo,$(OBJINFO),objinfo_helper$(EXE))
- 
- install::
--	cp objinfo_helper$(EXE) "$(INSTALL_LIBDIR)/objinfo_helper$(EXE)"
-+	$(BSD_INSTALL_SCRIPT) objinfo_helper$(EXE) "$(INSTALL_LIBDIR)/objinfo_helper$(EXE)"
- 
- # Scan object files for required primitives
- $(call byte_and_opt,primreq,config.cmo primreq.cmo,)
-@@ -356,7 +356,7 @@ $(call byte_and_opt,cmpbyt,$(CMPBYT),)
- 
- ifeq "$(RUNTIMEI)" "true"
- install::
--	cp ocaml-instr-graph ocaml-instr-report "$(INSTALL_BINDIR)/"
-+	$(BSD_INSTALL_SCRIPT) ocaml-instr-graph ocaml-instr-report "$(INSTALL_BINDIR)/"
- endif
- 
- # Common stuff