This is an update of lang/ocaml to its latest version, 4.02.3. Changes

include:

Bug fixes:
- Top-level custom printing for GADTs: interface change in 4.02.2
  (Grégoire Henry, report by Jeremy Yallop)
- corrupted final_table (ygrek)
- R#6926: Regression: ocamldoc lost unattached comment
  (Damien Doligez, report by François Bobot)
- Aliased result type of GADT constructor results in assertion failure
  (Jacques Garrigue)

Feature wishes:
- PR#6691: install .cmt[i] files for stdlib and compiler-libs
  (David Sheets, request by Gabriel Radanne)
- New primitive: caml_alloc_dummy_function
  (Hugo Heuzard)

6 files changed, 628 insertions, 211 deletions

diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 8f626e13154..a255efc8043 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.42 2015/06/30 11:08:47 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.43 2015/08/07 11:16:30 jaapb Exp $
 
 # used by x11/labltk/Makefile
 # used by x11/ocaml-graphics/Makefile
-DISTNAME=	ocaml-4.02.2
+DISTNAME=	ocaml-4.02.3
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.02/
 #EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index c02b62c6851..09c293c689e 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2015/06/30 11:08:47 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.31 2015/08/07 11:16:30 jaapb Exp $
 bin/ocaml
 bin/ocamlbuild
 bin/ocamlbuild.byte
@@ -14,227 +14,674 @@ bin/ocamlobjinfo
 bin/ocamlprof
 bin/ocamlrun
 bin/ocamlyacc
+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.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_mapper.3
+lib/ocaml/${PKGMANDIR}/man3/Asttypes.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/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/Digest.3
+lib/ocaml/${PKGMANDIR}/man3/Docstrings.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/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/Pprintast.printer.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/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/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
 lib/ocaml/Makefile.config
 lib/ocaml/VERSION
 lib/ocaml/arg.cmi
+lib/ocaml/arg.cmt
+lib/ocaml/arg.cmti
 lib/ocaml/arg.ml
 lib/ocaml/arg.mli
+lib/ocaml/arg.p.cmt
 lib/ocaml/arith_status.cmi
 lib/ocaml/arith_status.mli
 lib/ocaml/array.cmi
+lib/ocaml/array.cmt
+lib/ocaml/array.cmti
 lib/ocaml/array.ml
 lib/ocaml/array.mli
+lib/ocaml/array.p.cmt
 lib/ocaml/arrayLabels.cmi
+lib/ocaml/arrayLabels.cmt
+lib/ocaml/arrayLabels.cmti
 lib/ocaml/arrayLabels.ml
 lib/ocaml/arrayLabels.mli
+lib/ocaml/arrayLabels.p.cmt
 lib/ocaml/big_int.cmi
 lib/ocaml/big_int.mli
 lib/ocaml/bigarray.cma
 lib/ocaml/bigarray.cmi
 lib/ocaml/bigarray.mli
 lib/ocaml/buffer.cmi
+lib/ocaml/buffer.cmt
+lib/ocaml/buffer.cmti
 lib/ocaml/buffer.ml
 lib/ocaml/buffer.mli
+lib/ocaml/buffer.p.cmt
 lib/ocaml/bytes.cmi
+lib/ocaml/bytes.cmt
+lib/ocaml/bytes.cmti
 lib/ocaml/bytes.ml
 lib/ocaml/bytes.mli
+lib/ocaml/bytes.p.cmt
 lib/ocaml/bytesLabels.cmi
+lib/ocaml/bytesLabels.cmt
+lib/ocaml/bytesLabels.cmti
 lib/ocaml/bytesLabels.ml
 lib/ocaml/bytesLabels.mli
+lib/ocaml/bytesLabels.p.cmt
+lib/ocaml/callback.cmi
 lib/ocaml/callback.cmi
+lib/ocaml/callback.cmt
+lib/ocaml/callback.cmti
 lib/ocaml/callback.ml
+lib/ocaml/callback.ml
+lib/ocaml/callback.mli
 lib/ocaml/callback.mli
+lib/ocaml/callback.p.cmt
 lib/ocaml/caml/address_class.h
 lib/ocaml/caml/alloc.h
+lib/ocaml/caml/alloc.h
 lib/ocaml/caml/bigarray.h
+lib/ocaml/caml/bigarray.h
+lib/ocaml/caml/callback.h
 lib/ocaml/caml/callback.h
 lib/ocaml/caml/compatibility.h
+lib/ocaml/caml/compatibility.h
 lib/ocaml/caml/config.h
+lib/ocaml/caml/config.h
+lib/ocaml/caml/custom.h
 lib/ocaml/caml/custom.h
 lib/ocaml/caml/fail.h
+lib/ocaml/caml/fail.h
 lib/ocaml/caml/gc.h
 lib/ocaml/caml/hash.h
+lib/ocaml/caml/hash.h
+lib/ocaml/caml/intext.h
 lib/ocaml/caml/intext.h
 lib/ocaml/caml/memory.h
+lib/ocaml/caml/memory.h
 lib/ocaml/caml/misc.h
+lib/ocaml/caml/misc.h
+lib/ocaml/caml/mlvalues.h
 lib/ocaml/caml/mlvalues.h
 lib/ocaml/caml/printexc.h
+lib/ocaml/caml/printexc.h
+lib/ocaml/caml/signals.h
 lib/ocaml/caml/signals.h
 lib/ocaml/caml/socketaddr.h
+lib/ocaml/caml/socketaddr.h
 lib/ocaml/caml/threads.h
+lib/ocaml/caml/threads.h
+lib/ocaml/caml/unixsupport.h
 lib/ocaml/caml/unixsupport.h
 lib/ocaml/caml/version.h
 lib/ocaml/camlheader
+lib/ocaml/camlheader
+lib/ocaml/camlheader_ur
 lib/ocaml/camlheader_ur
 lib/ocaml/camlinternalFormat.cmi
+lib/ocaml/camlinternalFormat.cmt
+lib/ocaml/camlinternalFormat.cmti
 lib/ocaml/camlinternalFormat.ml
 lib/ocaml/camlinternalFormat.mli
+lib/ocaml/camlinternalFormat.p.cmt
 lib/ocaml/camlinternalFormatBasics.cmi
+lib/ocaml/camlinternalFormatBasics.cmt
+lib/ocaml/camlinternalFormatBasics.cmti
 lib/ocaml/camlinternalFormatBasics.cmx
 lib/ocaml/camlinternalFormatBasics.ml
 lib/ocaml/camlinternalFormatBasics.mli
+lib/ocaml/camlinternalFormatBasics.p.cmt
 lib/ocaml/camlinternalLazy.cmi
-lib/ocaml/camlinternalLazy.ml
-lib/ocaml/camlinternalLazy.mli
-lib/ocaml/camlinternalMod.cmi
-lib/ocaml/camlinternalMod.ml
-lib/ocaml/camlinternalMod.mli
-lib/ocaml/camlinternalOO.cmi
-lib/ocaml/camlinternalOO.ml
-lib/ocaml/camlinternalOO.mli
-lib/ocaml/char.cmi
-lib/ocaml/char.ml
-lib/ocaml/char.mli
-lib/ocaml/callback.cmi
-lib/ocaml/callback.ml
-lib/ocaml/callback.mli
-lib/ocaml/caml/alloc.h
-lib/ocaml/caml/bigarray.h
-lib/ocaml/caml/callback.h
-lib/ocaml/caml/compatibility.h
-lib/ocaml/caml/config.h
-lib/ocaml/caml/custom.h
-lib/ocaml/caml/fail.h
-lib/ocaml/caml/hash.h
-lib/ocaml/caml/intext.h
-lib/ocaml/caml/memory.h
-lib/ocaml/caml/misc.h
-lib/ocaml/caml/mlvalues.h
-lib/ocaml/caml/printexc.h
-lib/ocaml/caml/signals.h
-lib/ocaml/caml/socketaddr.h
-lib/ocaml/caml/threads.h
-lib/ocaml/caml/unixsupport.h
-lib/ocaml/camlheader
-lib/ocaml/camlheader_ur
 lib/ocaml/camlinternalLazy.cmi
+lib/ocaml/camlinternalLazy.cmt
+lib/ocaml/camlinternalLazy.cmti
+lib/ocaml/camlinternalLazy.ml
 lib/ocaml/camlinternalLazy.ml
 lib/ocaml/camlinternalLazy.mli
+lib/ocaml/camlinternalLazy.mli
+lib/ocaml/camlinternalLazy.p.cmt
+lib/ocaml/camlinternalMod.cmi
 lib/ocaml/camlinternalMod.cmi
+lib/ocaml/camlinternalMod.cmt
+lib/ocaml/camlinternalMod.cmti
+lib/ocaml/camlinternalMod.ml
 lib/ocaml/camlinternalMod.ml
 lib/ocaml/camlinternalMod.mli
+lib/ocaml/camlinternalMod.mli
+lib/ocaml/camlinternalMod.p.cmt
+lib/ocaml/camlinternalOO.cmi
 lib/ocaml/camlinternalOO.cmi
+lib/ocaml/camlinternalOO.cmt
+lib/ocaml/camlinternalOO.cmti
 lib/ocaml/camlinternalOO.ml
+lib/ocaml/camlinternalOO.ml
+lib/ocaml/camlinternalOO.mli
 lib/ocaml/camlinternalOO.mli
+lib/ocaml/camlinternalOO.p.cmt
+lib/ocaml/char.cmi
 lib/ocaml/char.cmi
+lib/ocaml/char.cmt
+lib/ocaml/char.cmti
 lib/ocaml/char.ml
+lib/ocaml/char.ml
+lib/ocaml/char.mli
 lib/ocaml/char.mli
+lib/ocaml/char.p.cmt
 lib/ocaml/compiler-libs/CSE.cmi
+lib/ocaml/compiler-libs/CSE.cmt
 lib/ocaml/compiler-libs/CSEgen.cmi
+lib/ocaml/compiler-libs/CSEgen.cmt
+lib/ocaml/compiler-libs/CSEgen.cmti
 lib/ocaml/compiler-libs/annot.cmi
+lib/ocaml/compiler-libs/annot.cmti
+lib/ocaml/compiler-libs/arch.cmt
+lib/ocaml/compiler-libs/asmgen.cmt
+lib/ocaml/compiler-libs/asmgen.cmti
+lib/ocaml/compiler-libs/asmlibrarian.cmt
+lib/ocaml/compiler-libs/asmlibrarian.cmti
+lib/ocaml/compiler-libs/asmlink.cmt
+lib/ocaml/compiler-libs/asmlink.cmti
+lib/ocaml/compiler-libs/asmpackager.cmt
+lib/ocaml/compiler-libs/asmpackager.cmti
 lib/ocaml/compiler-libs/ast_helper.cmi
+lib/ocaml/compiler-libs/ast_helper.cmt
+lib/ocaml/compiler-libs/ast_helper.cmti
 lib/ocaml/compiler-libs/ast_mapper.cmi
+lib/ocaml/compiler-libs/ast_mapper.cmt
+lib/ocaml/compiler-libs/ast_mapper.cmti
 lib/ocaml/compiler-libs/asttypes.cmi
+lib/ocaml/compiler-libs/asttypes.cmti
 lib/ocaml/compiler-libs/branch_relaxation.cmi
+lib/ocaml/compiler-libs/branch_relaxation.cmt
+lib/ocaml/compiler-libs/branch_relaxation.cmti
 lib/ocaml/compiler-libs/branch_relaxation_intf.cmi
+lib/ocaml/compiler-libs/branch_relaxation_intf.cmt
 lib/ocaml/compiler-libs/btype.cmi
+lib/ocaml/compiler-libs/btype.cmt
+lib/ocaml/compiler-libs/btype.cmti
 lib/ocaml/compiler-libs/bytegen.cmi
+lib/ocaml/compiler-libs/bytegen.cmt
+lib/ocaml/compiler-libs/bytegen.cmti
 lib/ocaml/compiler-libs/bytelibrarian.cmi
+lib/ocaml/compiler-libs/bytelibrarian.cmt
+lib/ocaml/compiler-libs/bytelibrarian.cmti
 lib/ocaml/compiler-libs/bytelink.cmi
+lib/ocaml/compiler-libs/bytelink.cmt
+lib/ocaml/compiler-libs/bytelink.cmti
 lib/ocaml/compiler-libs/bytepackager.cmi
+lib/ocaml/compiler-libs/bytepackager.cmt
+lib/ocaml/compiler-libs/bytepackager.cmti
 lib/ocaml/compiler-libs/bytesections.cmi
+lib/ocaml/compiler-libs/bytesections.cmt
+lib/ocaml/compiler-libs/bytesections.cmti
 lib/ocaml/compiler-libs/ccomp.cmi
+lib/ocaml/compiler-libs/ccomp.cmt
+lib/ocaml/compiler-libs/ccomp.cmti
+lib/ocaml/compiler-libs/clambda.cmt
+lib/ocaml/compiler-libs/clambda.cmti
 lib/ocaml/compiler-libs/clflags.cmi
+lib/ocaml/compiler-libs/clflags.cmt
+lib/ocaml/compiler-libs/clflags.cmti
+lib/ocaml/compiler-libs/closure.cmt
+lib/ocaml/compiler-libs/closure.cmti
 lib/ocaml/compiler-libs/cmi_format.cmi
+lib/ocaml/compiler-libs/cmi_format.cmt
+lib/ocaml/compiler-libs/cmi_format.cmti
+lib/ocaml/compiler-libs/cmm.cmt
+lib/ocaml/compiler-libs/cmm.cmti
+lib/ocaml/compiler-libs/cmmgen.cmt
+lib/ocaml/compiler-libs/cmmgen.cmti
 lib/ocaml/compiler-libs/cmo_format.cmi
+lib/ocaml/compiler-libs/cmo_format.cmti
 lib/ocaml/compiler-libs/cmt_format.cmi
+lib/ocaml/compiler-libs/cmt_format.cmt
+lib/ocaml/compiler-libs/cmt_format.cmti
+lib/ocaml/compiler-libs/cmx_format.cmti
+lib/ocaml/compiler-libs/coloring.cmt
+lib/ocaml/compiler-libs/coloring.cmti
+lib/ocaml/compiler-libs/comballoc.cmt
+lib/ocaml/compiler-libs/comballoc.cmti
 lib/ocaml/compiler-libs/compenv.cmi
 lib/ocaml/compiler-libs/compenv.cmi
-lib/ocaml/compiler-libs/compmisc.cmi
+lib/ocaml/compiler-libs/compenv.cmt
+lib/ocaml/compiler-libs/compenv.cmti
 lib/ocaml/compiler-libs/compile.cmi
+lib/ocaml/compiler-libs/compile.cmt
+lib/ocaml/compiler-libs/compile.cmti
+lib/ocaml/compiler-libs/compilenv.cmt
+lib/ocaml/compiler-libs/compilenv.cmti
 lib/ocaml/compiler-libs/compmisc.cmi
+lib/ocaml/compiler-libs/compmisc.cmi
+lib/ocaml/compiler-libs/compmisc.cmt
+lib/ocaml/compiler-libs/compmisc.cmti
 lib/ocaml/compiler-libs/config.cmi
+lib/ocaml/compiler-libs/config.cmt
+lib/ocaml/compiler-libs/config.cmti
 lib/ocaml/compiler-libs/consistbl.cmi
+lib/ocaml/compiler-libs/consistbl.cmt
+lib/ocaml/compiler-libs/consistbl.cmti
 lib/ocaml/compiler-libs/ctype.cmi
+lib/ocaml/compiler-libs/ctype.cmt
+lib/ocaml/compiler-libs/ctype.cmti
 lib/ocaml/compiler-libs/datarepr.cmi
+lib/ocaml/compiler-libs/datarepr.cmt
+lib/ocaml/compiler-libs/datarepr.cmti
 lib/ocaml/compiler-libs/deadcode.cmi
+lib/ocaml/compiler-libs/deadcode.cmt
+lib/ocaml/compiler-libs/deadcode.cmti
+lib/ocaml/compiler-libs/debuginfo.cmt
+lib/ocaml/compiler-libs/debuginfo.cmti
 lib/ocaml/compiler-libs/dll.cmi
+lib/ocaml/compiler-libs/dll.cmt
+lib/ocaml/compiler-libs/dll.cmti
 lib/ocaml/compiler-libs/docstrings.cmi
-lib/ocaml/compiler-libs/envaux.cmi
+lib/ocaml/compiler-libs/docstrings.cmt
+lib/ocaml/compiler-libs/docstrings.cmti
+lib/ocaml/compiler-libs/emit.cmt
+lib/ocaml/compiler-libs/emit.cmti
+lib/ocaml/compiler-libs/emitaux.cmt
+lib/ocaml/compiler-libs/emitaux.cmti
 lib/ocaml/compiler-libs/emitcode.cmi
+lib/ocaml/compiler-libs/emitcode.cmt
+lib/ocaml/compiler-libs/emitcode.cmti
 lib/ocaml/compiler-libs/env.cmi
+lib/ocaml/compiler-libs/env.cmt
+lib/ocaml/compiler-libs/env.cmti
+lib/ocaml/compiler-libs/envaux.cmi
 lib/ocaml/compiler-libs/envaux.cmi
+lib/ocaml/compiler-libs/envaux.cmt
+lib/ocaml/compiler-libs/envaux.cmti
 lib/ocaml/compiler-libs/errors.cmi
+lib/ocaml/compiler-libs/errors.cmt
+lib/ocaml/compiler-libs/errors.cmti
 lib/ocaml/compiler-libs/expunge.cmi
+lib/ocaml/compiler-libs/expunge.cmt
 lib/ocaml/compiler-libs/genprintval.cmi
+lib/ocaml/compiler-libs/genprintval.cmt
+lib/ocaml/compiler-libs/genprintval.cmti
 lib/ocaml/compiler-libs/ident.cmi
+lib/ocaml/compiler-libs/ident.cmt
+lib/ocaml/compiler-libs/ident.cmti
 lib/ocaml/compiler-libs/includeclass.cmi
+lib/ocaml/compiler-libs/includeclass.cmt
+lib/ocaml/compiler-libs/includeclass.cmti
 lib/ocaml/compiler-libs/includecore.cmi
+lib/ocaml/compiler-libs/includecore.cmt
+lib/ocaml/compiler-libs/includecore.cmti
 lib/ocaml/compiler-libs/includemod.cmi
+lib/ocaml/compiler-libs/includemod.cmt
+lib/ocaml/compiler-libs/includemod.cmti
 lib/ocaml/compiler-libs/instruct.cmi
+lib/ocaml/compiler-libs/instruct.cmt
+lib/ocaml/compiler-libs/instruct.cmti
+lib/ocaml/compiler-libs/interf.cmt
+lib/ocaml/compiler-libs/interf.cmti
 lib/ocaml/compiler-libs/lambda.cmi
+lib/ocaml/compiler-libs/lambda.cmt
+lib/ocaml/compiler-libs/lambda.cmti
 lib/ocaml/compiler-libs/lexer.cmi
+lib/ocaml/compiler-libs/lexer.cmt
+lib/ocaml/compiler-libs/lexer.cmti
+lib/ocaml/compiler-libs/linearize.cmt
+lib/ocaml/compiler-libs/linearize.cmti
+lib/ocaml/compiler-libs/liveness.cmt
+lib/ocaml/compiler-libs/liveness.cmti
 lib/ocaml/compiler-libs/location.cmi
+lib/ocaml/compiler-libs/location.cmt
+lib/ocaml/compiler-libs/location.cmti
 lib/ocaml/compiler-libs/longident.cmi
+lib/ocaml/compiler-libs/longident.cmt
+lib/ocaml/compiler-libs/longident.cmti
+lib/ocaml/compiler-libs/mach.cmt
+lib/ocaml/compiler-libs/mach.cmti
 lib/ocaml/compiler-libs/main.cmi
 lib/ocaml/compiler-libs/main.cmo
+lib/ocaml/compiler-libs/main.cmt
+lib/ocaml/compiler-libs/main.cmti
 lib/ocaml/compiler-libs/main_args.cmi
+lib/ocaml/compiler-libs/main_args.cmt
+lib/ocaml/compiler-libs/main_args.cmti
 lib/ocaml/compiler-libs/matching.cmi
+lib/ocaml/compiler-libs/matching.cmt
+lib/ocaml/compiler-libs/matching.cmti
 lib/ocaml/compiler-libs/meta.cmi
+lib/ocaml/compiler-libs/meta.cmt
+lib/ocaml/compiler-libs/meta.cmti
 lib/ocaml/compiler-libs/misc.cmi
+lib/ocaml/compiler-libs/misc.cmt
+lib/ocaml/compiler-libs/misc.cmti
 lib/ocaml/compiler-libs/mtype.cmi
+lib/ocaml/compiler-libs/mtype.cmt
+lib/ocaml/compiler-libs/mtype.cmti
 lib/ocaml/compiler-libs/ocamlbytecomp.cma
 lib/ocaml/compiler-libs/ocamlcommon.cma
 lib/ocaml/compiler-libs/ocamloptcomp.cma
 lib/ocaml/compiler-libs/ocamltoplevel.cma
 lib/ocaml/compiler-libs/opcodes.cmi
+lib/ocaml/compiler-libs/opcodes.cmt
 lib/ocaml/compiler-libs/oprint.cmi
+lib/ocaml/compiler-libs/oprint.cmt
+lib/ocaml/compiler-libs/oprint.cmti
+lib/ocaml/compiler-libs/optcompile.cmt
+lib/ocaml/compiler-libs/optcompile.cmti
+lib/ocaml/compiler-libs/opterrors.cmt
+lib/ocaml/compiler-libs/opterrors.cmti
+lib/ocaml/compiler-libs/optmain.cmt
+lib/ocaml/compiler-libs/optmain.cmti
 lib/ocaml/compiler-libs/outcometree.cmi
+lib/ocaml/compiler-libs/outcometree.cmti
 lib/ocaml/compiler-libs/parmatch.cmi
+lib/ocaml/compiler-libs/parmatch.cmt
+lib/ocaml/compiler-libs/parmatch.cmti
 lib/ocaml/compiler-libs/parse.cmi
-lib/ocaml/compiler-libs/pprintast.cmi
+lib/ocaml/compiler-libs/parse.cmt
+lib/ocaml/compiler-libs/parse.cmti
 lib/ocaml/compiler-libs/parser.cmi
+lib/ocaml/compiler-libs/parser.cmt
+lib/ocaml/compiler-libs/parser.cmti
 lib/ocaml/compiler-libs/parsetree.cmi
+lib/ocaml/compiler-libs/parsetree.cmti
 lib/ocaml/compiler-libs/path.cmi
+lib/ocaml/compiler-libs/path.cmt
+lib/ocaml/compiler-libs/path.cmti
 lib/ocaml/compiler-libs/pparse.cmi
+lib/ocaml/compiler-libs/pparse.cmt
+lib/ocaml/compiler-libs/pparse.cmti
+lib/ocaml/compiler-libs/pprintast.cmi
 lib/ocaml/compiler-libs/pprintast.cmi
+lib/ocaml/compiler-libs/pprintast.cmt
+lib/ocaml/compiler-libs/pprintast.cmti
 lib/ocaml/compiler-libs/predef.cmi
+lib/ocaml/compiler-libs/predef.cmt
+lib/ocaml/compiler-libs/predef.cmti
 lib/ocaml/compiler-libs/primitive.cmi
+lib/ocaml/compiler-libs/primitive.cmt
+lib/ocaml/compiler-libs/primitive.cmti
 lib/ocaml/compiler-libs/printast.cmi
+lib/ocaml/compiler-libs/printast.cmt
+lib/ocaml/compiler-libs/printast.cmti
+lib/ocaml/compiler-libs/printclambda.cmt
+lib/ocaml/compiler-libs/printclambda.cmti
+lib/ocaml/compiler-libs/printcmm.cmt
+lib/ocaml/compiler-libs/printcmm.cmti
 lib/ocaml/compiler-libs/printinstr.cmi
+lib/ocaml/compiler-libs/printinstr.cmt
+lib/ocaml/compiler-libs/printinstr.cmti
 lib/ocaml/compiler-libs/printlambda.cmi
+lib/ocaml/compiler-libs/printlambda.cmt
+lib/ocaml/compiler-libs/printlambda.cmti
+lib/ocaml/compiler-libs/printlinear.cmt
+lib/ocaml/compiler-libs/printlinear.cmti
+lib/ocaml/compiler-libs/printmach.cmt
+lib/ocaml/compiler-libs/printmach.cmti
 lib/ocaml/compiler-libs/printtyp.cmi
+lib/ocaml/compiler-libs/printtyp.cmt
+lib/ocaml/compiler-libs/printtyp.cmti
 lib/ocaml/compiler-libs/printtyped.cmi
+lib/ocaml/compiler-libs/printtyped.cmt
+lib/ocaml/compiler-libs/printtyped.cmti
+lib/ocaml/compiler-libs/proc.cmt
+lib/ocaml/compiler-libs/proc.cmti
+lib/ocaml/compiler-libs/reg.cmt
+lib/ocaml/compiler-libs/reg.cmti
+lib/ocaml/compiler-libs/reload.cmt
+lib/ocaml/compiler-libs/reload.cmti
+lib/ocaml/compiler-libs/reloadgen.cmt
+lib/ocaml/compiler-libs/reloadgen.cmti
 lib/ocaml/compiler-libs/runtimedef.cmi
+lib/ocaml/compiler-libs/runtimedef.cmt
+lib/ocaml/compiler-libs/runtimedef.cmti
+lib/ocaml/compiler-libs/schedgen.cmt
+lib/ocaml/compiler-libs/schedgen.cmti
+lib/ocaml/compiler-libs/scheduling.cmt
+lib/ocaml/compiler-libs/scheduling.cmti
+lib/ocaml/compiler-libs/selectgen.cmt
+lib/ocaml/compiler-libs/selectgen.cmti
+lib/ocaml/compiler-libs/selection.cmt
+lib/ocaml/compiler-libs/selection.cmti
 lib/ocaml/compiler-libs/simplif.cmi
+lib/ocaml/compiler-libs/simplif.cmt
+lib/ocaml/compiler-libs/simplif.cmti
+lib/ocaml/compiler-libs/spill.cmt
+lib/ocaml/compiler-libs/spill.cmti
+lib/ocaml/compiler-libs/split.cmt
+lib/ocaml/compiler-libs/split.cmti
 lib/ocaml/compiler-libs/strmatch.cmi
+lib/ocaml/compiler-libs/strmatch.cmt
+lib/ocaml/compiler-libs/strmatch.cmti
 lib/ocaml/compiler-libs/stypes.cmi
+lib/ocaml/compiler-libs/stypes.cmt
+lib/ocaml/compiler-libs/stypes.cmti
 lib/ocaml/compiler-libs/subst.cmi
+lib/ocaml/compiler-libs/subst.cmt
+lib/ocaml/compiler-libs/subst.cmti
 lib/ocaml/compiler-libs/switch.cmi
+lib/ocaml/compiler-libs/switch.cmt
+lib/ocaml/compiler-libs/switch.cmti
 lib/ocaml/compiler-libs/symtable.cmi
+lib/ocaml/compiler-libs/symtable.cmt
+lib/ocaml/compiler-libs/symtable.cmti
 lib/ocaml/compiler-libs/syntaxerr.cmi
+lib/ocaml/compiler-libs/syntaxerr.cmt
+lib/ocaml/compiler-libs/syntaxerr.cmti
 lib/ocaml/compiler-libs/tbl.cmi
+lib/ocaml/compiler-libs/tbl.cmt
+lib/ocaml/compiler-libs/tbl.cmti
 lib/ocaml/compiler-libs/terminfo.cmi
+lib/ocaml/compiler-libs/terminfo.cmt
+lib/ocaml/compiler-libs/terminfo.cmti
 lib/ocaml/compiler-libs/topdirs.cmi
+lib/ocaml/compiler-libs/topdirs.cmt
+lib/ocaml/compiler-libs/topdirs.cmti
 lib/ocaml/compiler-libs/toploop.cmi
+lib/ocaml/compiler-libs/toploop.cmt
+lib/ocaml/compiler-libs/toploop.cmti
 lib/ocaml/compiler-libs/topmain.cmi
+lib/ocaml/compiler-libs/topmain.cmt
+lib/ocaml/compiler-libs/topmain.cmti
 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/translclass.cmi
+lib/ocaml/compiler-libs/translclass.cmt
+lib/ocaml/compiler-libs/translclass.cmti
 lib/ocaml/compiler-libs/translcore.cmi
+lib/ocaml/compiler-libs/translcore.cmt
+lib/ocaml/compiler-libs/translcore.cmti
 lib/ocaml/compiler-libs/translmod.cmi
-lib/ocaml/compiler-libs/typedtreeIter.cmi
-lib/ocaml/compiler-libs/typedtreeMap.cmi
+lib/ocaml/compiler-libs/translmod.cmt
+lib/ocaml/compiler-libs/translmod.cmti
 lib/ocaml/compiler-libs/translobj.cmi
+lib/ocaml/compiler-libs/translobj.cmt
+lib/ocaml/compiler-libs/translobj.cmti
 lib/ocaml/compiler-libs/typeclass.cmi
+lib/ocaml/compiler-libs/typeclass.cmt
+lib/ocaml/compiler-libs/typeclass.cmti
 lib/ocaml/compiler-libs/typecore.cmi
+lib/ocaml/compiler-libs/typecore.cmt
+lib/ocaml/compiler-libs/typecore.cmti
 lib/ocaml/compiler-libs/typedecl.cmi
+lib/ocaml/compiler-libs/typedecl.cmt
+lib/ocaml/compiler-libs/typedecl.cmti
 lib/ocaml/compiler-libs/typedtree.cmi
+lib/ocaml/compiler-libs/typedtree.cmt
+lib/ocaml/compiler-libs/typedtree.cmti
+lib/ocaml/compiler-libs/typedtreeIter.cmi
 lib/ocaml/compiler-libs/typedtreeIter.cmi
+lib/ocaml/compiler-libs/typedtreeIter.cmt
+lib/ocaml/compiler-libs/typedtreeIter.cmti
+lib/ocaml/compiler-libs/typedtreeMap.cmi
 lib/ocaml/compiler-libs/typedtreeMap.cmi
+lib/ocaml/compiler-libs/typedtreeMap.cmt
+lib/ocaml/compiler-libs/typedtreeMap.cmti
 lib/ocaml/compiler-libs/typemod.cmi
+lib/ocaml/compiler-libs/typemod.cmt
+lib/ocaml/compiler-libs/typemod.cmti
 lib/ocaml/compiler-libs/typeopt.cmi
+lib/ocaml/compiler-libs/typeopt.cmt
+lib/ocaml/compiler-libs/typeopt.cmti
 lib/ocaml/compiler-libs/types.cmi
+lib/ocaml/compiler-libs/types.cmt
+lib/ocaml/compiler-libs/types.cmti
 lib/ocaml/compiler-libs/typetexp.cmi
+lib/ocaml/compiler-libs/typetexp.cmt
+lib/ocaml/compiler-libs/typetexp.cmti
 lib/ocaml/compiler-libs/warnings.cmi
+lib/ocaml/compiler-libs/warnings.cmt
+lib/ocaml/compiler-libs/warnings.cmti
 lib/ocaml/complex.cmi
+lib/ocaml/complex.cmt
+lib/ocaml/complex.cmti
 lib/ocaml/complex.ml
 lib/ocaml/complex.mli
+lib/ocaml/complex.p.cmt
 lib/ocaml/condition.mli
 lib/ocaml/digest.cmi
+lib/ocaml/digest.cmt
+lib/ocaml/digest.cmti
 lib/ocaml/digest.ml
 lib/ocaml/digest.mli
+lib/ocaml/digest.p.cmt
 lib/ocaml/dynlink.cma
 lib/ocaml/dynlink.cmi
 lib/ocaml/dynlink.mli
@@ -242,33 +689,60 @@ lib/ocaml/event.mli
 lib/ocaml/expunge
 lib/ocaml/extract_crc
 lib/ocaml/filename.cmi
+lib/ocaml/filename.cmt
+lib/ocaml/filename.cmti
 lib/ocaml/filename.ml
 lib/ocaml/filename.mli
+lib/ocaml/filename.p.cmt
 lib/ocaml/format.cmi
+lib/ocaml/format.cmt
+lib/ocaml/format.cmti
 lib/ocaml/format.ml
 lib/ocaml/format.mli
+lib/ocaml/format.p.cmt
 lib/ocaml/gc.cmi
+lib/ocaml/gc.cmt
+lib/ocaml/gc.cmti
 lib/ocaml/gc.ml
 lib/ocaml/gc.mli
+lib/ocaml/gc.p.cmt
 lib/ocaml/genlex.cmi
+lib/ocaml/genlex.cmt
+lib/ocaml/genlex.cmti
 lib/ocaml/genlex.ml
 lib/ocaml/genlex.mli
+lib/ocaml/genlex.p.cmt
 lib/ocaml/hashtbl.cmi
+lib/ocaml/hashtbl.cmt
+lib/ocaml/hashtbl.cmti
 lib/ocaml/hashtbl.ml
 lib/ocaml/hashtbl.mli
+lib/ocaml/hashtbl.p.cmt
 lib/ocaml/int32.cmi
+lib/ocaml/int32.cmt
+lib/ocaml/int32.cmti
 lib/ocaml/int32.ml
 lib/ocaml/int32.mli
+lib/ocaml/int32.p.cmt
 lib/ocaml/int64.cmi
+lib/ocaml/int64.cmt
+lib/ocaml/int64.cmti
 lib/ocaml/int64.ml
 lib/ocaml/int64.mli
+lib/ocaml/int64.p.cmt
 lib/ocaml/lazy.cmi
+lib/ocaml/lazy.cmt
+lib/ocaml/lazy.cmti
 lib/ocaml/lazy.ml
 lib/ocaml/lazy.mli
+lib/ocaml/lazy.p.cmt
 lib/ocaml/ld.conf
 lib/ocaml/lexing.cmi
+lib/ocaml/lexing.cmt
+lib/ocaml/lexing.cmti
 lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
+lib/ocaml/lexing.p.cmt
 lib/ocaml/libbigarray.a
 lib/ocaml/libcamlrun.a
 lib/ocaml/libcamlrun_pic.a
@@ -278,178 +752,53 @@ lib/ocaml/libnums.a
 lib/ocaml/libthreads.a
 lib/ocaml/libunix.a
 lib/ocaml/list.cmi
+lib/ocaml/list.cmt
+lib/ocaml/list.cmti
 lib/ocaml/list.ml
 lib/ocaml/list.mli
+lib/ocaml/list.p.cmt
 lib/ocaml/listLabels.cmi
+lib/ocaml/listLabels.cmt
+lib/ocaml/listLabels.cmti
 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.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_mapper.3
-lib/ocaml/${PKGMANDIR}/man3/Asttypes.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/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/Digest.3
-lib/ocaml/${PKGMANDIR}/man3/Docstrings.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/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/Pprintast.printer.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/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/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
+lib/ocaml/listLabels.p.cmt
 lib/ocaml/map.cmi
+lib/ocaml/map.cmt
+lib/ocaml/map.cmti
 lib/ocaml/map.ml
 lib/ocaml/map.mli
+lib/ocaml/map.p.cmt
 lib/ocaml/marshal.cmi
+lib/ocaml/marshal.cmt
+lib/ocaml/marshal.cmti
 lib/ocaml/marshal.ml
 lib/ocaml/marshal.mli
+lib/ocaml/marshal.p.cmt
 lib/ocaml/moreLabels.cmi
+lib/ocaml/moreLabels.cmt
+lib/ocaml/moreLabels.cmti
 lib/ocaml/moreLabels.ml
 lib/ocaml/moreLabels.mli
+lib/ocaml/moreLabels.p.cmt
 lib/ocaml/mutex.mli
 lib/ocaml/nat.cmi
 lib/ocaml/nat.mli
 lib/ocaml/nativeint.cmi
+lib/ocaml/nativeint.cmt
+lib/ocaml/nativeint.cmti
 lib/ocaml/nativeint.ml
 lib/ocaml/nativeint.mli
+lib/ocaml/nativeint.p.cmt
 lib/ocaml/num.cmi
 lib/ocaml/num.mli
 lib/ocaml/nums.cma
 lib/ocaml/obj.cmi
+lib/ocaml/obj.cmt
+lib/ocaml/obj.cmti
 lib/ocaml/obj.ml
 lib/ocaml/obj.mli
+lib/ocaml/obj.p.cmt
 lib/ocaml/objinfo_helper
 lib/ocaml/ocamlbuild/ocamlbuild.cmo
 lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi
@@ -509,64 +858,114 @@ lib/ocaml/ocamldoc/odoc_type.cmi
 lib/ocaml/ocamldoc/odoc_types.cmi
 lib/ocaml/ocamldoc/odoc_value.cmi
 lib/ocaml/oo.cmi
+lib/ocaml/oo.cmt
+lib/ocaml/oo.cmti
 lib/ocaml/oo.ml
 lib/ocaml/oo.mli
+lib/ocaml/oo.p.cmt
 lib/ocaml/parsing.cmi
+lib/ocaml/parsing.cmt
+lib/ocaml/parsing.cmti
 lib/ocaml/parsing.ml
 lib/ocaml/parsing.mli
+lib/ocaml/parsing.p.cmt
 lib/ocaml/pervasives.cmi
+lib/ocaml/pervasives.cmt
+lib/ocaml/pervasives.cmti
 lib/ocaml/pervasives.ml
 lib/ocaml/pervasives.mli
+lib/ocaml/pervasives.p.cmt
 lib/ocaml/printexc.cmi
+lib/ocaml/printexc.cmt
+lib/ocaml/printexc.cmti
 lib/ocaml/printexc.ml
 lib/ocaml/printexc.mli
+lib/ocaml/printexc.p.cmt
 lib/ocaml/printf.cmi
+lib/ocaml/printf.cmt
+lib/ocaml/printf.cmti
 lib/ocaml/printf.ml
 lib/ocaml/printf.mli
+lib/ocaml/printf.p.cmt
 lib/ocaml/profiling.cmi
 lib/ocaml/profiling.cmo
 lib/ocaml/queue.cmi
+lib/ocaml/queue.cmt
+lib/ocaml/queue.cmti
 lib/ocaml/queue.ml
 lib/ocaml/queue.mli
+lib/ocaml/queue.p.cmt
 lib/ocaml/random.cmi
+lib/ocaml/random.cmt
+lib/ocaml/random.cmti
 lib/ocaml/random.ml
 lib/ocaml/random.mli
+lib/ocaml/random.p.cmt
 lib/ocaml/ratio.cmi
 lib/ocaml/ratio.mli
 lib/ocaml/scanf.cmi
+lib/ocaml/scanf.cmt
+lib/ocaml/scanf.cmti
 lib/ocaml/scanf.ml
 lib/ocaml/scanf.mli
+lib/ocaml/scanf.p.cmt
 lib/ocaml/set.cmi
+lib/ocaml/set.cmt
+lib/ocaml/set.cmti
 lib/ocaml/set.ml
 lib/ocaml/set.mli
+lib/ocaml/set.p.cmt
 lib/ocaml/sort.cmi
+lib/ocaml/sort.cmt
+lib/ocaml/sort.cmti
 lib/ocaml/sort.ml
 lib/ocaml/sort.mli
+lib/ocaml/sort.p.cmt
 lib/ocaml/stack.cmi
+lib/ocaml/stack.cmt
+lib/ocaml/stack.cmti
 lib/ocaml/stack.ml
 lib/ocaml/stack.mli
+lib/ocaml/stack.p.cmt
 lib/ocaml/stdLabels.cmi
+lib/ocaml/stdLabels.cmt
+lib/ocaml/stdLabels.cmti
 lib/ocaml/stdLabels.ml
 lib/ocaml/stdLabels.mli
+lib/ocaml/stdLabels.p.cmt
 lib/ocaml/std_exit.cmi
 lib/ocaml/std_exit.cmo
+lib/ocaml/std_exit.cmt
 lib/ocaml/std_exit.ml
+lib/ocaml/std_exit.p.cmt
 lib/ocaml/stdlib.cma
 lib/ocaml/str.cma
 lib/ocaml/str.cmi
 lib/ocaml/str.mli
 lib/ocaml/stream.cmi
+lib/ocaml/stream.cmt
+lib/ocaml/stream.cmti
 lib/ocaml/stream.ml
 lib/ocaml/stream.mli
+lib/ocaml/stream.p.cmt
 lib/ocaml/string.cmi
+lib/ocaml/string.cmt
+lib/ocaml/string.cmti
 lib/ocaml/string.ml
 lib/ocaml/string.mli
+lib/ocaml/string.p.cmt
 lib/ocaml/stringLabels.cmi
+lib/ocaml/stringLabels.cmt
+lib/ocaml/stringLabels.cmti
 lib/ocaml/stringLabels.ml
 lib/ocaml/stringLabels.mli
+lib/ocaml/stringLabels.p.cmt
 lib/ocaml/sys.cmi
+lib/ocaml/sys.cmt
+lib/ocaml/sys.cmti
 lib/ocaml/sys.ml
 lib/ocaml/sys.mli
+lib/ocaml/sys.p.cmt
 lib/ocaml/thread.mli
 lib/ocaml/threadUnix.mli
 lib/ocaml/threads/condition.cmi
@@ -596,8 +995,11 @@ 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
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
+lib/ocaml/weak.p.cmt
 man/man1/ocaml.1
 man/man1/ocamlc.1
 man/man1/ocamlc.opt.1
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index 443c5dad448..529924dd865 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2015/06/30 11:08:47 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2015/08/07 11:16:30 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml
 OCAML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
-BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.02.2
+BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.02.3
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 56b6ea8ebfe..aa06fe84062 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.86 2015/07/04 09:29:47 jaapb Exp $
+$NetBSD: distinfo,v 1.87 2015/08/07 11:16:30 jaapb Exp $
 
-SHA1 (ocaml-4.02.2.tar.gz) = 7fb6571972635b00dfda204ca38a4b9dce79a354
-RMD160 (ocaml-4.02.2.tar.gz) = efb044b9c0a76ed20e7960176f26398dea2ba0aa
-Size (ocaml-4.02.2.tar.gz) = 3174187 bytes
-SHA1 (patch-Makefile) = 334808f12a1b14d7159d3b098f932e7621634007
+SHA1 (ocaml-4.02.3.tar.gz) = e68ffd2b5bb491a6345f46b27675e1361a49b274
+RMD160 (ocaml-4.02.3.tar.gz) = 3946204b9396a7fb81ae1042ce67a494579c151b
+Size (ocaml-4.02.3.tar.gz) = 3108892 bytes
+SHA1 (patch-Makefile) = ef49cd32d4cd360dbf4d6e743a34814616cd4e8f
 SHA1 (patch-asmcomp_asmlink.ml) = c97174d349a02783fd852da6ea707baab646a936
 SHA1 (patch-asmcomp_power_emit.mlp) = 726e09e4902b96f4790c7a8093eb245dd7028bf4
 SHA1 (patch-asmrun_Makefile) = 9dbb6cb2291caf5edb892b2b2ef008d61f7b1367
@@ -28,7 +28,7 @@ SHA1 (patch-otherlibs_dynlink_Makefile) = 41cecb61230880a40c55f2f8f25d2b250864eb
 SHA1 (patch-otherlibs_systhreads_Makefile) = f3cdf000f58927dff44b4ce61153c1df8e9eceea
 SHA1 (patch-otherlibs_threads_Makefile) = e976e94bddae1ce8462f22c2eaa6509b9cafb12d
 SHA1 (patch-stdlib_Makefile) = 501b45018245950c78d663bbd6eea1c38a6d04d2
-SHA1 (patch-stdlib_Makefile.shared) = 58d2d0036a5fe57e130d477438d0441d1956c328
+SHA1 (patch-stdlib_Makefile.shared) = 8c2a2b9d7dcecd140d3a7d36189e9b164c8a5462
 SHA1 (patch-tools_Makefile.shared) = ff10364c68df2ac548468c9e5d1ab66458d3413e
 SHA1 (patch-tools_ocamlcp.ml) = 779380f7ffb56f0a8156b2b30f477b2de8c1b269
 SHA1 (patch-tools_ocamlmklib) = bc9c22e8e2a63ae5dc8269587d4ff6c5ac26e440
diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile
index 07ff4356999..1ff2d0ed015 100644
--- a/lang/ocaml/patches/patch-Makefile
+++ b/lang/ocaml/patches/patch-Makefile
@@ -1,7 +1,7 @@
-$NetBSD: patch-Makefile,v 1.5 2015/06/30 11:08:47 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.6 2015/08/07 11:16:30 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
---- Makefile.orig	2015-06-10 09:27:36.000000000 +0000
+--- Makefile.orig	2015-07-20 14:10:11.000000000 +0000
 +++ Makefile
 @@ -186,8 +186,10 @@ LIBFILES=stdlib.cma std_exit.cmo *.cmi c
  # Start up the system from the distribution compiler
@@ -14,7 +14,7 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
  	cp yacc/ocamlyacc$(EXE) boot/ocamlyacc$(EXE)
  	cd stdlib; $(MAKE) COMPILER=../boot/ocamlc all
  	cd stdlib; cp $(LIBFILES) ../boot
-@@ -302,31 +304,31 @@ INSTALL_MANDIR=$(DESTDIR)$(MANDIR)
+@@ -302,35 +304,35 @@ INSTALL_MANDIR=$(DESTDIR)$(MANDIR)
  
  install:
  	if test -d $(INSTALL_BINDIR); then : ; \
@@ -44,11 +44,15 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
  	cd stdlib; $(MAKE) install
 -	cp lex/ocamllex $(INSTALL_BINDIR)/ocamllex$(EXE)
 -	cp $(CAMLYACC)$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE)
--	cp utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \
+-	cp utils/*.cmi utils/*.cmt utils/*.cmti \
 +	$(BSD_INSTALL_SCRIPT) lex/ocamllex $(INSTALL_BINDIR)/ocamllex$(EXE)
 +	$(BSD_INSTALL_SCRIPT) $(CAMLYACC)$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE)
-+	$(BSD_INSTALL_DATA) utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \
- 	   toplevel/*.cmi $(INSTALL_COMPLIBDIR)
++	$(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)
 -	cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
 +	$(BSD_INSTALL_DATA) compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
  	   compilerlibs/ocamltoplevel.cma $(BYTESTART) $(TOPLEVELSTART) \
@@ -60,7 +64,7 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
  	cd tools; $(MAKE) install
  	-cd man; $(MAKE) install
  	for i in $(OTHERLIBRARIES); do \
-@@ -337,16 +339,16 @@ install:
+@@ -341,16 +343,16 @@ install:
  	   else :; fi
  	if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) install); \
  	   else :; fi
@@ -74,14 +78,14 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start
 -	cp ocamlopt $(INSTALL_BINDIR)/ocamlopt$(EXE)
 +	$(BSD_INSTALL_SCRIPT) ocamlopt $(INSTALL_BINDIR)/ocamlopt$(EXE)
  	cd stdlib; $(MAKE) installopt
--	cp asmcomp/*.cmi $(INSTALL_COMPLIBDIR)
+-	cp asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti $(INSTALL_COMPLIBDIR)
 -	cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR)
-+	$(BSD_INSTALL_DATA) asmcomp/*.cmi $(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
  	if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) installopt); \
-@@ -357,10 +359,10 @@ installopt:
+@@ -361,10 +363,10 @@ installopt:
  	cd tools; $(MAKE) installopt
  
  installoptopt:
diff --git a/lang/ocaml/patches/patch-stdlib_Makefile.shared b/lang/ocaml/patches/patch-stdlib_Makefile.shared
index 9408518d531..7b57834aff8 100644
--- a/lang/ocaml/patches/patch-stdlib_Makefile.shared
+++ b/lang/ocaml/patches/patch-stdlib_Makefile.shared
@@ -1,14 +1,25 @@
-$NetBSD: patch-stdlib_Makefile.shared,v 1.3 2015/06/30 11:08:47 jaapb Exp $
+$NetBSD: patch-stdlib_Makefile.shared,v 1.4 2015/08/07 11:16:30 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir and cp
---- stdlib/Makefile.shared.orig	2015-05-12 14:46:37.000000000 +0000
+--- stdlib/Makefile.shared.orig	2015-07-20 14:10:11.000000000 +0000
 +++ stdlib/Makefile.shared
-@@ -45,7 +45,7 @@ all: stdlib.cma std_exit.cmo camlheader 
+@@ -45,16 +45,16 @@ all: stdlib.cma std_exit.cmo camlheader 
  INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
  
  install: install-$(RUNTIMED)
--	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader_ur \
-+	$(BSD_INSTALL_DATA) stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader_ur \
+-	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
+-	cp target_camlheader $(INSTALL_LIBDIR)/camlheader
++	$(BSD_INSTALL_DATA) target_camlheader $(INSTALL_LIBDIR)/camlheader
  
+ install-noruntimed:
+ .PHONY: install-noruntimed
+ 
+ install-runtimed: target_camlheaderd
+-	cp target_camlheaderd $(INSTALL_LIBDIR)/camlheaderd
++	$(BSD_INSTALL_DATA) target_camlheaderd $(INSTALL_LIBDIR)/camlheaderd
+ .PHONY: install-runtimed
+ 
+ stdlib.cma: $(OBJS)