- Update to 4.02.3

PR:		203589
Submitted by:	michipili@gmail.com(maintainer)

4 files changed, 651 insertions, 215 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 33dbd8b53bec..ac3f534236cf 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -3,7 +3,7 @@
 # for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
 
 PORTNAME=	ocaml
-PORTVERSION=	4.02.1
+PORTVERSION=	4.02.3
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
 		http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs
@@ -23,6 +23,7 @@ BROKEN_mips64=	No ASM support
 BROKEN_mips=	No ASM support
 
 USES=		cpe gmake tar:xz
+USE_LDCONFIG=	yes
 CPE_VENDOR=	inria
 REINPLACE_ARGS=	-i ""
 HAS_CONFIGURE=	yes
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 727bb4b43fd7..7d6268c276f7 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,5 +1,5 @@
-SHA256 (ocaml-4.02.1.tar.xz) = 68c4b01be54c23bc20fc0a8beaa5c7433b8483f8950490129cfe7662e0c6f4dc
-SIZE (ocaml-4.02.1.tar.xz) = 2031244
+SHA256 (ocaml-4.02.3.tar.xz) = 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3
+SIZE (ocaml-4.02.3.tar.xz) = 2058552
 SHA256 (ocaml-4.02-refman-html.tar.gz) = 1d3b7e5494c075d86c760f6320acba086d686e7409cb75f8267bccfb6ad5f3a8
 SIZE (ocaml-4.02-refman-html.tar.gz) = 612839
 SHA256 (ocaml-4.02-refman.ps.gz) = b14b5aec1e4e1aded2d36e78ceeedfc3c19c3369b257ab507f6a0755651e8f4a
diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure
index c9f609782352..10f57e7a5ae4 100644
--- a/lang/ocaml/files/patch-configure
+++ b/lang/ocaml/files/patch-configure
@@ -1,75 +1,80 @@
---- configure.orig	2014-10-03 19:25:46 UTC
+--- configure.orig	2015-05-12 14:46:37 UTC
 +++ configure
-@@ -85,10 +85,6 @@ exec 3>&1
+@@ -446,7 +446,7 @@ esac
  
- # Parse command-line arguments
+ # Configure compiler to use in further tests
  
--if echo "$configure_options" | grep -q -e '--\?[a-zA-Z0-9-]\+='; then
--  err "Arguments to this script look like '-prefix /foo/bar', not '-prefix=/foo/bar' (note the '=')."
--fi
--
- while : ; do
-   case "$1" in
-     "") break;;
-@@ -659,7 +659,8 @@ if test $with_sharedlibs = "yes"; then
-       mksharedlib="$flexlink"
-       mkmaindll="$flexlink -maindll"
+-cc="$bytecc -O $bytecclinkopts"
++cc="$bytecc $bytecclinkopts"
+ export cc cclibs verbose
+ 
+ # Check C compiler
+@@ -690,7 +690,7 @@ if test $with_sharedlibs = "yes"; then
+       shared_libraries_supported=true;;
+     *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
+       sharedcccompopts="-fPIC"
+-      mksharedlib="$bytecc -shared"
++      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts -shared"
+       bytecclinkopts="$bytecclinkopts -Wl,-E"
+       byteccrpath="-Wl,-rpath,"
+       mksharedlibrpath="-Wl,-rpath,"
+@@ -700,7 +700,7 @@ if test $with_sharedlibs = "yes"; then
+       case "$bytecc" in
+         *gcc*)
+           sharedcccompopts="-fPIC"
+-          mksharedlib="$bytecc -shared"
++          mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts -shared"
+           byteccrpath="-Wl,-rpath,"
+           mksharedlibrpath="-Wl,-rpath,"
+           shared_libraries_supported=true;;
+@@ -716,11 +716,11 @@ if test $with_sharedlibs = "yes"; then
+         *gcc*)
+           sharedcccompopts="-fPIC"
+           if sh ./solaris-ld; then
+-            mksharedlib="$bytecc -shared"
++            mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts -shared"
+             byteccrpath="-R"
+             mksharedlibrpath="-R"
+           else
+-            mksharedlib="$bytecc -shared"
++            mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts -shared"
+             bytecclinkopts="$bytecclinkopts -Wl,-E"
+             natdynlinkopts="-Wl,-E"
+             byteccrpath="-Wl,-rpath,"
+@@ -744,12 +744,12 @@ if test $with_sharedlibs = "yes"; then
+       mksharedlibrpath="-rpath "
+       shared_libraries_supported=true;;
+     i[3456]86-*-darwin[89].*)
+-      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
++      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
+       bytecccompopts="$dl_defs $bytecccompopts"
+       dl_needs_underscore=false
        shared_libraries_supported=true;;
--    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
-+    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*| \
-+    *-*-dragonfly*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
+     *-apple-darwin*)
+-      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
++      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
+       bytecccompopts="$dl_defs $bytecccompopts"
+       dl_needs_underscore=false
+       shared_libraries_supported=true;;
+@@ -759,7 +759,7 @@ if test $with_sharedlibs = "yes"; then
+       shared_libraries_supported=false;;
+     *-*-openbsd*)
        sharedcccompopts="-fPIC"
-       mksharedlib="$bytecc -shared"
+-      mksharedlib="$bytecc -shared"
++      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts -shared"
        bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -761,11 +758,13 @@ if test $with_sharedlibs = "yes"; then
-       fi;;
-     x86_64-*-darwin*)             natdynlink=true;;
-     powerpc*-*-linux*)            natdynlink=true;;
-+    powerpc*-*-freebsd*)          natdynlink=true;;
-     sparc*-*-linux*)              natdynlink=true;;
-     i686-*-kfreebsd*)             natdynlink=true;;
-     x86_64-*-kfreebsd*)           natdynlink=true;;
-     i[3456]86-*-freebsd*)         natdynlink=true;;
-     x86_64-*-freebsd*)            natdynlink=true;;
-+    x86_64-*-dragonfly*)          natdynlink=true;;
-     i[3456]86-*-openbsd*)         natdynlink=true;;
-     x86_64-*-openbsd*)            natdynlink=true;;
-     i[3456]86-*-netbsd*)          natdynlink=true;;
-@@ -815,6 +814,7 @@ case "$target" in
-   i[3456]86-*-gnu*)             arch=i386; system=gnu;;
-   i[3456]86-*-mingw*)           arch=i386; system=mingw;;
-   powerpc*-*-linux*)            arch=power; model=ppc; system=elf;;
-+  powerpc-*-freebsd*)           arch=power; model=ppc; system=bsd_elf;;
-   powerpc-*-netbsd*)            arch=power; model=ppc; system=elf;;
-   powerpc-*-openbsd*)           arch=power; model=ppc; system=bsd_elf;;
-   powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
-@@ -833,6 +833,7 @@ case "$target" in
-   zaurus*-*-openbsd*)           arch=arm; system=bsd;;
-   x86_64-*-linux*)              arch=amd64; system=linux;;
-   x86_64-*-gnu*)                arch=amd64; system=gnu;;
-+  x86_64-*-dragonfly*)          arch=amd64; system=dragonfly;;
-   x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
-   x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
-   x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
-@@ -905,6 +908,8 @@ case "$arch,$system" in
-                   aspp="${TOOLPREF}cc -c";;
-   *,freebsd)      as="${TOOLPREF}as"
-                   aspp="${TOOLPREF}cc -c";;
-+  *,dragonfly)    as="as"
-+                  aspp="cc -c";;
-   amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*)
-                   as="${TOOLPREF}as"
-                   aspp="${TOOLPREF}gcc -c";;
-@@ -1390,7 +1395,7 @@ if test "$pthread_wanted" = "yes"; then
-     bytecccompopts="$bytecccompopts -D_REENTRANT"
-     nativecccompopts="$nativecccompopts -D_REENTRANT"
-     case "$target" in
--      *-*-freebsd*)
-+      *-*-freebsd*|*-*-dragonfly*)
-           bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
-           nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
-       *-*-openbsd*)
-@@ -1560,6 +1565,7 @@ if test "$x11_include" = "not found"; th
+       natdynlinkopts="-Wl,-E"
+       byteccrpath="-Wl,-rpath,"
+@@ -889,7 +889,7 @@ else
+ fi
+ 
+ nativecccompopts=''
+-nativecclinkopts=''
++nativecclinkopts=""
+ # FIXME the naming of nativecclinkopts is broken: these are options for
+ # ld (for shared libs), not for cc
+ nativeccrpath="$byteccrpath"
+@@ -1601,6 +1601,7 @@ if test "$x11_include" = "not found"; th
        else
          x11_libs="-L$dir"
          case "$target" in
@@ -77,3 +82,29 @@
            *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
            *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
            *) x11_link="-L$dir -lX11";;
+@@ -1644,10 +1645,10 @@ echo "X11_LINK=$x11_link" >> Makefile
+ # Look for BFD library
+ 
+ if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \
+-   sh ./hasgot -DPACKAGE=ocaml -lbfd -ldl -liberty -lz bfd_openr; then
++   sh ./hasgot -DPACKAGE=ocaml -lbfd $dllib -liberty -lz bfd_openr; then
+   inf "BFD library found."
+   echo "#define HAS_LIBBFD" >> s.h
+-  echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
++  echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile
+ else
+   wrn "BFD library not found, 'objinfo' will be unable to display info on .cmxs files."
+   echo "LIBBFD_LINK=" >> Makefile
+@@ -1686,12 +1687,6 @@ if $no_naked_pointers; then
+   echo "#define NO_NAKED_POINTERS" >> m.h
+ fi
+ 
+-# Add Unix-style optimization flag
+-bytecccompopts="-O $bytecccompopts"
+-dllcccompopts="-O $dllcccompopts"
+-nativecccompopts="-O $nativecccompopts"
+-sharedcccompopts="-O $sharedcccompopts"
+-
+ # Final twiddling of compiler options to work around known bugs
+ 
+ nativeccprofopts="$nativecccompopts"
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index 8f6780fc4b5a..64cc11d08ccd 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -1,3 +1,90 @@
+%%PROF%%lib/ocaml/arg.p.cmx
+%%PROF%%lib/ocaml/arrayLabels.p.cmx
+%%PROF%%lib/ocaml/array.p.cmx
+%%PROF%%lib/ocaml/buffer.p.cmx
+%%PROF%%lib/ocaml/bytesLabels.p.cmx
+%%PROF%%lib/ocaml/bytes.p.cmx
+%%PROF%%lib/ocaml/callback.p.cmx
+%%PROF%%lib/ocaml/camlinternalFormatBasics.p.cmx
+%%PROF%%lib/ocaml/camlinternalFormat.p.cmx
+%%PROF%%lib/ocaml/camlinternalLazy.p.cmx
+%%PROF%%lib/ocaml/camlinternalMod.p.cmx
+%%PROF%%lib/ocaml/camlinternalOO.p.cmx
+%%PROF%%lib/ocaml/char.p.cmx
+%%PROF%%lib/ocaml/complex.p.cmx
+%%PROF%%lib/ocaml/digest.p.cmx
+%%PROF%%lib/ocaml/filename.p.cmx
+%%PROF%%lib/ocaml/format.p.cmx
+%%PROF%%lib/ocaml/gc.p.cmx
+%%PROF%%lib/ocaml/genlex.p.cmx
+%%PROF%%lib/ocaml/hashtbl.p.cmx
+%%PROF%%lib/ocaml/int32.p.cmx
+%%PROF%%lib/ocaml/int64.p.cmx
+%%PROF%%lib/ocaml/lazy.p.cmx
+%%PROF%%lib/ocaml/lexing.p.cmx
+%%PROF%%lib/ocaml/listLabels.p.cmx
+%%PROF%%lib/ocaml/list.p.cmx
+%%PROF%%lib/ocaml/map.p.cmx
+%%PROF%%lib/ocaml/marshal.p.cmx
+%%PROF%%lib/ocaml/moreLabels.p.cmx
+%%PROF%%lib/ocaml/nativeint.p.cmx
+%%PROF%%lib/ocaml/obj.p.cmx
+%%PROF%%lib/ocaml/oo.p.cmx
+%%PROF%%lib/ocaml/parsing.p.cmx
+%%PROF%%lib/ocaml/pervasives.p.cmx
+%%PROF%%lib/ocaml/printexc.p.cmx
+%%PROF%%lib/ocaml/printf.p.cmx
+%%PROF%%lib/ocaml/queue.p.cmx
+%%PROF%%lib/ocaml/random.p.cmx
+%%PROF%%lib/ocaml/scanf.p.cmx
+%%PROF%%lib/ocaml/set.p.cmx
+%%PROF%%lib/ocaml/sort.p.cmx
+%%PROF%%lib/ocaml/stack.p.cmx
+%%PROF%%lib/ocaml/stdLabels.p.cmx
+%%PROF%%lib/ocaml/std_exit.p.cmx
+%%PROF%%lib/ocaml/std_exit.p.o
+%%PROF%%lib/ocaml/stdlib.p.a
+%%PROF%%lib/ocaml/stdlib.p.cmxa
+%%PROF%%lib/ocaml/stream.p.cmx
+%%PROF%%lib/ocaml/stringLabels.p.cmx
+%%PROF%%lib/ocaml/string.p.cmx
+%%PROF%%lib/ocaml/sys.p.cmx
+%%PROF%%lib/ocaml/weak.p.cmx
+%%THREADS%%@dir lib/ocaml/threads
+%%THREADS%%lib/ocaml/caml/threads.h
+%%THREADS%%lib/ocaml/condition.mli
+%%THREADS%%lib/ocaml/event.mli
+%%THREADS%%lib/ocaml/libthreads.a
+%%THREADS%%lib/ocaml/libthreadsnat.a
+%%THREADS%%lib/ocaml/mutex.mli
+%%THREADS%%lib/ocaml/stublibs/dllthreads.so
+%%THREADS%%lib/ocaml/threadUnix.mli
+%%THREADS%%lib/ocaml/thread.mli
+%%THREADS%%lib/ocaml/threads/condition.cmi
+%%THREADS%%lib/ocaml/threads/condition.cmx
+%%THREADS%%lib/ocaml/threads/event.cmi
+%%THREADS%%lib/ocaml/threads/event.cmx
+%%THREADS%%lib/ocaml/threads/mutex.cmi
+%%THREADS%%lib/ocaml/threads/mutex.cmx
+%%THREADS%%lib/ocaml/threads/threadUnix.cmi
+%%THREADS%%lib/ocaml/threads/threadUnix.cmx
+%%THREADS%%lib/ocaml/threads/thread.cmi
+%%THREADS%%lib/ocaml/threads/thread.cmx
+%%THREADS%%lib/ocaml/threads/threads.a
+%%THREADS%%lib/ocaml/threads/threads.cma
+%%THREADS%%lib/ocaml/threads/threads.cmxa
+%%X11%%lib/ocaml/graphicsX11.cmi
+%%X11%%lib/ocaml/graphicsX11.cmx
+%%X11%%lib/ocaml/graphicsX11.mli
+%%X11%%lib/ocaml/graphics.a
+%%X11%%lib/ocaml/graphics.cma
+%%X11%%lib/ocaml/graphics.cmi
+%%X11%%lib/ocaml/graphics.cmx
+%%X11%%lib/ocaml/graphics.cmxa
+%%X11%%lib/ocaml/graphics.cmxs
+%%X11%%lib/ocaml/graphics.mli
+%%X11%%lib/ocaml/libgraphics.a
+%%X11%%lib/ocaml/stublibs/dllgraphics.so
 bin/ocaml
 bin/ocamlbuild
 bin/ocamlbuild.byte
@@ -24,27 +111,30 @@ bin/ocamlyacc
 lib/ocaml/Makefile.config
 lib/ocaml/VERSION
 lib/ocaml/arg.cmi
+lib/ocaml/arg.cmt
+lib/ocaml/arg.cmti
 lib/ocaml/arg.cmx
-%%PROF%%lib/ocaml/arg.p.cmx
 lib/ocaml/arg.ml
 lib/ocaml/arg.mli
+lib/ocaml/arg.p.cmt
 lib/ocaml/arith_flags.cmx
 lib/ocaml/arith_status.cmi
 lib/ocaml/arith_status.cmx
 lib/ocaml/arith_status.mli
-lib/ocaml/array.cmi
-lib/ocaml/array.cmx
-%%PROF%%lib/ocaml/array.p.cmx
-lib/ocaml/array.ml
-lib/ocaml/array.mli
 lib/ocaml/arrayLabels.cmi
+lib/ocaml/arrayLabels.cmt
+lib/ocaml/arrayLabels.cmti
 lib/ocaml/arrayLabels.cmx
-%%PROF%%lib/ocaml/arrayLabels.p.cmx
 lib/ocaml/arrayLabels.ml
 lib/ocaml/arrayLabels.mli
-lib/ocaml/big_int.cmi
-lib/ocaml/big_int.cmx
-lib/ocaml/big_int.mli
+lib/ocaml/arrayLabels.p.cmt
+lib/ocaml/array.cmi
+lib/ocaml/array.cmt
+lib/ocaml/array.cmti
+lib/ocaml/array.cmx
+lib/ocaml/array.ml
+lib/ocaml/array.mli
+lib/ocaml/array.p.cmt
 lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cma
 lib/ocaml/bigarray.cmi
@@ -52,26 +142,38 @@ lib/ocaml/bigarray.cmx
 lib/ocaml/bigarray.cmxa
 lib/ocaml/bigarray.cmxs
 lib/ocaml/bigarray.mli
+lib/ocaml/big_int.cmi
+lib/ocaml/big_int.cmx
+lib/ocaml/big_int.mli
 lib/ocaml/buffer.cmi
+lib/ocaml/buffer.cmt
+lib/ocaml/buffer.cmti
 lib/ocaml/buffer.cmx
-%%PROF%%lib/ocaml/buffer.p.cmx
 lib/ocaml/buffer.ml
 lib/ocaml/buffer.mli
-lib/ocaml/bytes.cmi
-lib/ocaml/bytes.cmx
-%%PROF%%lib/ocaml/bytes.p.cmx
-lib/ocaml/bytes.ml
-lib/ocaml/bytes.mli
+lib/ocaml/buffer.p.cmt
 lib/ocaml/bytesLabels.cmi
+lib/ocaml/bytesLabels.cmt
+lib/ocaml/bytesLabels.cmti
 lib/ocaml/bytesLabels.cmx
-%%PROF%%lib/ocaml/bytesLabels.p.cmx
 lib/ocaml/bytesLabels.ml
 lib/ocaml/bytesLabels.mli
+lib/ocaml/bytesLabels.p.cmt
+lib/ocaml/bytes.cmi
+lib/ocaml/bytes.cmt
+lib/ocaml/bytes.cmti
+lib/ocaml/bytes.cmx
+lib/ocaml/bytes.ml
+lib/ocaml/bytes.mli
+lib/ocaml/bytes.p.cmt
 lib/ocaml/callback.cmi
+lib/ocaml/callback.cmt
+lib/ocaml/callback.cmti
 lib/ocaml/callback.cmx
-%%PROF%%lib/ocaml/callback.p.cmx
 lib/ocaml/callback.ml
 lib/ocaml/callback.mli
+lib/ocaml/callback.p.cmt
+lib/ocaml/caml/address_class.h
 lib/ocaml/caml/alloc.h
 lib/ocaml/caml/bigarray.h
 lib/ocaml/caml/callback.h
@@ -79,119 +181,266 @@ lib/ocaml/caml/compatibility.h
 lib/ocaml/caml/config.h
 lib/ocaml/caml/custom.h
 lib/ocaml/caml/fail.h
+lib/ocaml/caml/gc.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
-%%THREADS%%lib/ocaml/caml/threads.h
-lib/ocaml/caml/unixsupport.h
-lib/ocaml/caml/version.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
-lib/ocaml/camlinternalFormat.cmi
-lib/ocaml/camlinternalFormat.cmx
-%%PROF%%lib/ocaml/camlinternalFormat.p.cmx
-lib/ocaml/camlinternalFormat.ml
-lib/ocaml/camlinternalFormat.mli
 lib/ocaml/camlinternalFormatBasics.cmi
+lib/ocaml/camlinternalFormatBasics.cmt
+lib/ocaml/camlinternalFormatBasics.cmti
 lib/ocaml/camlinternalFormatBasics.cmx
-%%PROF%%lib/ocaml/camlinternalFormatBasics.p.cmx
 lib/ocaml/camlinternalFormatBasics.ml
 lib/ocaml/camlinternalFormatBasics.mli
+lib/ocaml/camlinternalFormatBasics.p.cmt
+lib/ocaml/camlinternalFormat.cmi
+lib/ocaml/camlinternalFormat.cmt
+lib/ocaml/camlinternalFormat.cmti
+lib/ocaml/camlinternalFormat.cmx
+lib/ocaml/camlinternalFormat.ml
+lib/ocaml/camlinternalFormat.mli
+lib/ocaml/camlinternalFormat.p.cmt
 lib/ocaml/camlinternalLazy.cmi
+lib/ocaml/camlinternalLazy.cmt
+lib/ocaml/camlinternalLazy.cmti
 lib/ocaml/camlinternalLazy.cmx
-%%PROF%%lib/ocaml/camlinternalLazy.p.cmx
 lib/ocaml/camlinternalLazy.ml
 lib/ocaml/camlinternalLazy.mli
+lib/ocaml/camlinternalLazy.p.cmt
 lib/ocaml/camlinternalMod.cmi
+lib/ocaml/camlinternalMod.cmt
+lib/ocaml/camlinternalMod.cmti
 lib/ocaml/camlinternalMod.cmx
-%%PROF%%lib/ocaml/camlinternalMod.p.cmx
 lib/ocaml/camlinternalMod.ml
 lib/ocaml/camlinternalMod.mli
+lib/ocaml/camlinternalMod.p.cmt
 lib/ocaml/camlinternalOO.cmi
+lib/ocaml/camlinternalOO.cmt
+lib/ocaml/camlinternalOO.cmti
 lib/ocaml/camlinternalOO.cmx
-%%PROF%%lib/ocaml/camlinternalOO.p.cmx
 lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
+lib/ocaml/camlinternalOO.p.cmt
+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/unixsupport.h
+lib/ocaml/caml/version.h
 lib/ocaml/char.cmi
+lib/ocaml/char.cmt
+lib/ocaml/char.cmti
 lib/ocaml/char.cmx
-%%PROF%%lib/ocaml/char.p.cmx
 lib/ocaml/char.ml
 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.cmi
+lib/ocaml/compiler-libs/arch.cmt
 lib/ocaml/compiler-libs/asmgen.cmi
+lib/ocaml/compiler-libs/asmgen.cmt
+lib/ocaml/compiler-libs/asmgen.cmti
 lib/ocaml/compiler-libs/asmlibrarian.cmi
+lib/ocaml/compiler-libs/asmlibrarian.cmt
+lib/ocaml/compiler-libs/asmlibrarian.cmti
 lib/ocaml/compiler-libs/asmlink.cmi
+lib/ocaml/compiler-libs/asmlink.cmt
+lib/ocaml/compiler-libs/asmlink.cmti
 lib/ocaml/compiler-libs/asmpackager.cmi
+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.cmi
+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.cmi
+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.cmi
+lib/ocaml/compiler-libs/cmm.cmt
+lib/ocaml/compiler-libs/cmm.cmti
 lib/ocaml/compiler-libs/cmmgen.cmi
+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.cmi
+lib/ocaml/compiler-libs/cmx_format.cmti
 lib/ocaml/compiler-libs/coloring.cmi
+lib/ocaml/compiler-libs/coloring.cmt
+lib/ocaml/compiler-libs/coloring.cmti
 lib/ocaml/compiler-libs/comballoc.cmi
+lib/ocaml/compiler-libs/comballoc.cmt
+lib/ocaml/compiler-libs/comballoc.cmti
 lib/ocaml/compiler-libs/compenv.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.cmi
+lib/ocaml/compiler-libs/compilenv.cmt
+lib/ocaml/compiler-libs/compilenv.cmti
 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.cmi
+lib/ocaml/compiler-libs/debuginfo.cmt
+lib/ocaml/compiler-libs/debuginfo.cmti
 lib/ocaml/compiler-libs/dll.cmi
-lib/ocaml/compiler-libs/emit.cmi
+lib/ocaml/compiler-libs/dll.cmt
+lib/ocaml/compiler-libs/dll.cmti
+lib/ocaml/compiler-libs/docstrings.cmi
+lib/ocaml/compiler-libs/docstrings.cmt
+lib/ocaml/compiler-libs/docstrings.cmti
 lib/ocaml/compiler-libs/emitaux.cmi
+lib/ocaml/compiler-libs/emitaux.cmt
+lib/ocaml/compiler-libs/emitaux.cmti
+lib/ocaml/compiler-libs/emit.cmi
+lib/ocaml/compiler-libs/emit.cmt
+lib/ocaml/compiler-libs/emit.cmti
 lib/ocaml/compiler-libs/emitcode.cmi
-lib/ocaml/compiler-libs/env.cmi
+lib/ocaml/compiler-libs/emitcode.cmt
+lib/ocaml/compiler-libs/emitcode.cmti
 lib/ocaml/compiler-libs/envaux.cmi
+lib/ocaml/compiler-libs/envaux.cmt
+lib/ocaml/compiler-libs/envaux.cmti
+lib/ocaml/compiler-libs/env.cmi
+lib/ocaml/compiler-libs/env.cmt
+lib/ocaml/compiler-libs/env.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.cmi
+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.cmi
+lib/ocaml/compiler-libs/linearize.cmt
+lib/ocaml/compiler-libs/linearize.cmti
 lib/ocaml/compiler-libs/liveness.cmi
+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.cmi
+lib/ocaml/compiler-libs/mach.cmt
+lib/ocaml/compiler-libs/mach.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/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.cmx
 lib/ocaml/compiler-libs/main.o
-lib/ocaml/compiler-libs/main_args.cmi
 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.a
 lib/ocaml/compiler-libs/ocamlbytecomp.cma
 lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
@@ -203,195 +452,338 @@ lib/ocaml/compiler-libs/ocamloptcomp.cma
 lib/ocaml/compiler-libs/ocamloptcomp.cmxa
 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.cmi
+lib/ocaml/compiler-libs/optcompile.cmt
+lib/ocaml/compiler-libs/optcompile.cmti
 lib/ocaml/compiler-libs/opterrors.cmi
+lib/ocaml/compiler-libs/opterrors.cmt
+lib/ocaml/compiler-libs/opterrors.cmti
 lib/ocaml/compiler-libs/optmain.cmi
 lib/ocaml/compiler-libs/optmain.cmo
+lib/ocaml/compiler-libs/optmain.cmt
+lib/ocaml/compiler-libs/optmain.cmti
 lib/ocaml/compiler-libs/optmain.cmx
 lib/ocaml/compiler-libs/optmain.o
 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/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.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.cmi
+lib/ocaml/compiler-libs/printclambda.cmt
+lib/ocaml/compiler-libs/printclambda.cmti
 lib/ocaml/compiler-libs/printcmm.cmi
+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.cmi
+lib/ocaml/compiler-libs/printlinear.cmt
+lib/ocaml/compiler-libs/printlinear.cmti
 lib/ocaml/compiler-libs/printmach.cmi
+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.cmi
+lib/ocaml/compiler-libs/proc.cmt
+lib/ocaml/compiler-libs/proc.cmti
 lib/ocaml/compiler-libs/reg.cmi
+lib/ocaml/compiler-libs/reg.cmt
+lib/ocaml/compiler-libs/reg.cmti
 lib/ocaml/compiler-libs/reload.cmi
+lib/ocaml/compiler-libs/reload.cmt
+lib/ocaml/compiler-libs/reload.cmti
 lib/ocaml/compiler-libs/reloadgen.cmi
+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.cmi
+lib/ocaml/compiler-libs/schedgen.cmt
+lib/ocaml/compiler-libs/schedgen.cmti
 lib/ocaml/compiler-libs/scheduling.cmi
+lib/ocaml/compiler-libs/scheduling.cmt
+lib/ocaml/compiler-libs/scheduling.cmti
 lib/ocaml/compiler-libs/selectgen.cmi
+lib/ocaml/compiler-libs/selectgen.cmt
+lib/ocaml/compiler-libs/selectgen.cmti
 lib/ocaml/compiler-libs/selection.cmi
+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.cmi
+lib/ocaml/compiler-libs/spill.cmt
+lib/ocaml/compiler-libs/spill.cmti
 lib/ocaml/compiler-libs/split.cmi
+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/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/typedtree.cmi
+lib/ocaml/compiler-libs/typedecl.cmt
+lib/ocaml/compiler-libs/typedecl.cmti
 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.cmt
+lib/ocaml/compiler-libs/typedtreeMap.cmti
+lib/ocaml/compiler-libs/typedtree.cmi
+lib/ocaml/compiler-libs/typedtree.cmt
+lib/ocaml/compiler-libs/typedtree.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.cmx
-%%PROF%%lib/ocaml/complex.p.cmx
 lib/ocaml/complex.ml
 lib/ocaml/complex.mli
-%%THREADS%%lib/ocaml/condition.mli
+lib/ocaml/complex.p.cmt
 lib/ocaml/digest.cmi
+lib/ocaml/digest.cmt
+lib/ocaml/digest.cmti
 lib/ocaml/digest.cmx
-%%PROF%%lib/ocaml/digest.p.cmx
 lib/ocaml/digest.ml
 lib/ocaml/digest.mli
+lib/ocaml/digest.p.cmt
 lib/ocaml/dynlink.a
 lib/ocaml/dynlink.cma
 lib/ocaml/dynlink.cmi
 lib/ocaml/dynlink.cmx
 lib/ocaml/dynlink.cmxa
 lib/ocaml/dynlink.mli
-%%THREADS%%lib/ocaml/event.mli
-@(,,0555) lib/ocaml/expunge
-@(,,0555) lib/ocaml/extract_crc
 lib/ocaml/filename.cmi
+lib/ocaml/filename.cmt
+lib/ocaml/filename.cmti
 lib/ocaml/filename.cmx
-%%PROF%%lib/ocaml/filename.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/format.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/gc.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/genlex.p.cmx
 lib/ocaml/genlex.ml
 lib/ocaml/genlex.mli
-%%X11%%lib/ocaml/graphics.a
-%%X11%%lib/ocaml/graphics.cma
-%%X11%%lib/ocaml/graphics.cmi
-%%X11%%lib/ocaml/graphics.cmx
-%%X11%%lib/ocaml/graphics.cmxa
-%%X11%%lib/ocaml/graphics.cmxs
-%%X11%%lib/ocaml/graphics.mli
-%%X11%%lib/ocaml/graphicsX11.cmi
-%%X11%%lib/ocaml/graphicsX11.cmx
-%%X11%%lib/ocaml/graphicsX11.mli
+lib/ocaml/genlex.p.cmt
 lib/ocaml/hashtbl.cmi
+lib/ocaml/hashtbl.cmt
+lib/ocaml/hashtbl.cmti
 lib/ocaml/hashtbl.cmx
-%%PROF%%lib/ocaml/hashtbl.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/int32.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/int64.p.cmx
 lib/ocaml/int64.ml
 lib/ocaml/int64.mli
+lib/ocaml/int64.p.cmt
 lib/ocaml/int_misc.cmx
 lib/ocaml/lazy.cmi
+lib/ocaml/lazy.cmt
+lib/ocaml/lazy.cmti
 lib/ocaml/lazy.cmx
-%%PROF%%lib/ocaml/lazy.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/lexing.p.cmx
 lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
+lib/ocaml/lexing.p.cmt
 lib/ocaml/libasmrun.a
 lib/ocaml/libasmrunp.a
+lib/ocaml/libasmrun_pic.a
+lib/ocaml/libasmrun_shared.so
 lib/ocaml/libbigarray.a
 lib/ocaml/libcamlrun.a
+lib/ocaml/libcamlrun_pic.a
 lib/ocaml/libcamlrun_shared.so
 lib/ocaml/libcamlstr.a
-%%X11%%lib/ocaml/libgraphics.a
 lib/ocaml/libnums.a
-%%THREADS%%lib/ocaml/libthreads.a
-%%THREADS%%lib/ocaml/libthreadsnat.a
 lib/ocaml/libunix.a
-lib/ocaml/list.cmi
-lib/ocaml/list.cmx
-%%PROF%%lib/ocaml/list.p.cmx
-lib/ocaml/list.ml
-lib/ocaml/list.mli
 lib/ocaml/listLabels.cmi
+lib/ocaml/listLabels.cmt
+lib/ocaml/listLabels.cmti
 lib/ocaml/listLabels.cmx
-%%PROF%%lib/ocaml/listLabels.p.cmx
 lib/ocaml/listLabels.ml
 lib/ocaml/listLabels.mli
+lib/ocaml/listLabels.p.cmt
+lib/ocaml/list.cmi
+lib/ocaml/list.cmt
+lib/ocaml/list.cmti
+lib/ocaml/list.cmx
+lib/ocaml/list.ml
+lib/ocaml/list.mli
+lib/ocaml/list.p.cmt
 lib/ocaml/map.cmi
+lib/ocaml/map.cmt
+lib/ocaml/map.cmti
 lib/ocaml/map.cmx
-%%PROF%%lib/ocaml/map.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/marshal.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/moreLabels.p.cmx
 lib/ocaml/moreLabels.ml
 lib/ocaml/moreLabels.mli
-%%THREADS%%lib/ocaml/mutex.mli
+lib/ocaml/moreLabels.p.cmt
 lib/ocaml/nat.cmi
 lib/ocaml/nat.cmx
-lib/ocaml/nat.mli
 lib/ocaml/nativeint.cmi
+lib/ocaml/nativeint.cmt
+lib/ocaml/nativeint.cmti
 lib/ocaml/nativeint.cmx
-%%PROF%%lib/ocaml/nativeint.p.cmx
 lib/ocaml/nativeint.ml
 lib/ocaml/nativeint.mli
+lib/ocaml/nativeint.p.cmt
+lib/ocaml/nat.mli
 lib/ocaml/num.cmi
 lib/ocaml/num.cmx
 lib/ocaml/num.mli
@@ -400,17 +792,22 @@ lib/ocaml/nums.cma
 lib/ocaml/nums.cmxa
 lib/ocaml/nums.cmxs
 lib/ocaml/obj.cmi
+lib/ocaml/obj.cmt
+lib/ocaml/obj.cmti
 lib/ocaml/obj.cmx
-%%PROF%%lib/ocaml/obj.p.cmx
+lib/ocaml/objinfo_helper
 lib/ocaml/obj.ml
 lib/ocaml/obj.mli
-lib/ocaml/objinfo_helper
+lib/ocaml/obj.p.cmt
 lib/ocaml/ocamlbuild/ocamlbuild.cmo
 lib/ocaml/ocamlbuild/ocamlbuild.cmx
-lib/ocaml/ocamlbuild/ocamlbuild.o
 lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi
 lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
 lib/ocaml/ocamlbuild/ocamlbuild_executor.o
+lib/ocaml/ocamlbuild/ocamlbuildlib.a
+lib/ocaml/ocamlbuild/ocamlbuildlib.cma
+lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
+lib/ocaml/ocamlbuild/ocamlbuild.o
 lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi
 lib/ocaml/ocamlbuild/ocamlbuild_pack.cmx
 lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
@@ -419,15 +816,12 @@ lib/ocaml/ocamlbuild/ocamlbuild_plugin.o
 lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi
 lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx
 lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
-lib/ocaml/ocamlbuild/ocamlbuildlib.a
-lib/ocaml/ocamlbuild/ocamlbuildlib.cma
-lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
 lib/ocaml/ocamldoc/ocamldoc.hva
-lib/ocaml/ocamldoc/odoc.cmi
 lib/ocaml/ocamldoc/odoc_analyse.cmi
 lib/ocaml/ocamldoc/odoc_args.cmi
 lib/ocaml/ocamldoc/odoc_ast.cmi
 lib/ocaml/ocamldoc/odoc_class.cmi
+lib/ocaml/ocamldoc/odoc.cmi
 lib/ocaml/ocamldoc/odoc_comments.cmi
 lib/ocaml/ocamldoc/odoc_comments_global.cmi
 lib/ocaml/ocamldoc/odoc_config.cmi
@@ -476,134 +870,150 @@ 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.cmx
-%%PROF%%lib/ocaml/oo.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/parsing.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/pervasives.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/printexc.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/printf.p.cmx
 lib/ocaml/printf.ml
 lib/ocaml/printf.mli
+lib/ocaml/printf.p.cmt
 lib/ocaml/profiling.cmi
 lib/ocaml/profiling.cmo
 lib/ocaml/profiling.cmx
 lib/ocaml/profiling.o
 lib/ocaml/queue.cmi
+lib/ocaml/queue.cmt
+lib/ocaml/queue.cmti
 lib/ocaml/queue.cmx
-%%PROF%%lib/ocaml/queue.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/random.p.cmx
 lib/ocaml/random.ml
 lib/ocaml/random.mli
+lib/ocaml/random.p.cmt
 lib/ocaml/ratio.cmi
 lib/ocaml/ratio.cmx
 lib/ocaml/ratio.mli
 lib/ocaml/scanf.cmi
+lib/ocaml/scanf.cmt
+lib/ocaml/scanf.cmti
 lib/ocaml/scanf.cmx
-%%PROF%%lib/ocaml/scanf.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/set.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/sort.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/stack.p.cmx
 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.cmx
-%%PROF%%lib/ocaml/stdLabels.p.cmx
 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.cmx
 lib/ocaml/std_exit.ml
 lib/ocaml/std_exit.o
-%%PROF%%lib/ocaml/std_exit.p.cmx
-%%PROF%%lib/ocaml/std_exit.p.o
+lib/ocaml/std_exit.p.cmt
 lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cma
 lib/ocaml/stdlib.cmxa
-%%PROF%%lib/ocaml/stdlib.p.a
-%%PROF%%lib/ocaml/stdlib.p.cmxa
 lib/ocaml/str.a
 lib/ocaml/str.cma
 lib/ocaml/str.cmi
 lib/ocaml/str.cmx
 lib/ocaml/str.cmxa
 lib/ocaml/str.cmxs
-lib/ocaml/str.mli
 lib/ocaml/stream.cmi
+lib/ocaml/stream.cmt
+lib/ocaml/stream.cmti
 lib/ocaml/stream.cmx
-%%PROF%%lib/ocaml/stream.p.cmx
 lib/ocaml/stream.ml
 lib/ocaml/stream.mli
-lib/ocaml/string.cmi
-lib/ocaml/string.cmx
-%%PROF%%lib/ocaml/string.p.cmx
-lib/ocaml/string.ml
-lib/ocaml/string.mli
+lib/ocaml/stream.p.cmt
 lib/ocaml/stringLabels.cmi
+lib/ocaml/stringLabels.cmt
+lib/ocaml/stringLabels.cmti
 lib/ocaml/stringLabels.cmx
-%%PROF%%lib/ocaml/stringLabels.p.cmx
 lib/ocaml/stringLabels.ml
 lib/ocaml/stringLabels.mli
+lib/ocaml/stringLabels.p.cmt
+lib/ocaml/string.cmi
+lib/ocaml/string.cmt
+lib/ocaml/string.cmti
+lib/ocaml/string.cmx
+lib/ocaml/string.ml
+lib/ocaml/string.mli
+lib/ocaml/string.p.cmt
+lib/ocaml/str.mli
 lib/ocaml/stublibs/dllbigarray.so
 lib/ocaml/stublibs/dllcamlstr.so
-%%X11%%lib/ocaml/stublibs/dllgraphics.so
 lib/ocaml/stublibs/dllnums.so
-%%THREADS%%lib/ocaml/stublibs/dllthreads.so
 lib/ocaml/stublibs/dllunix.so
 lib/ocaml/stublibs/dllvmthreads.so
 lib/ocaml/sys.cmi
+lib/ocaml/sys.cmt
+lib/ocaml/sys.cmti
 lib/ocaml/sys.cmx
-%%PROF%%lib/ocaml/sys.p.cmx
 lib/ocaml/sys.ml
 lib/ocaml/sys.mli
-%%THREADS%%lib/ocaml/thread.mli
-%%THREADS%%lib/ocaml/threadUnix.mli
-%%THREADS%%lib/ocaml/threads/condition.cmi
-%%THREADS%%lib/ocaml/threads/condition.cmx
-%%THREADS%%lib/ocaml/threads/event.cmi
-%%THREADS%%lib/ocaml/threads/event.cmx
-%%THREADS%%lib/ocaml/threads/mutex.cmi
-%%THREADS%%lib/ocaml/threads/mutex.cmx
-%%THREADS%%lib/ocaml/threads/thread.cmi
-%%THREADS%%lib/ocaml/threads/thread.cmx
-%%THREADS%%lib/ocaml/threads/threadUnix.cmi
-%%THREADS%%lib/ocaml/threads/threadUnix.cmx
-%%THREADS%%lib/ocaml/threads/threads.a
-%%THREADS%%lib/ocaml/threads/threads.cma
-%%THREADS%%lib/ocaml/threads/threads.cmxa
+lib/ocaml/sys.p.cmt
 lib/ocaml/topdirs.cmi
+lib/ocaml/unixLabels.cmi
+lib/ocaml/unixLabels.cmx
+lib/ocaml/unixLabels.mli
 lib/ocaml/unix.a
 lib/ocaml/unix.cma
 lib/ocaml/unix.cmi
@@ -611,9 +1021,6 @@ lib/ocaml/unix.cmx
 lib/ocaml/unix.cmxa
 lib/ocaml/unix.cmxs
 lib/ocaml/unix.mli
-lib/ocaml/unixLabels.cmi
-lib/ocaml/unixLabels.cmx
-lib/ocaml/unixLabels.mli
 lib/ocaml/vmthreads/condition.cmi
 lib/ocaml/vmthreads/condition.mli
 lib/ocaml/vmthreads/event.cmi
@@ -622,17 +1029,22 @@ lib/ocaml/vmthreads/libvmthreads.a
 lib/ocaml/vmthreads/mutex.cmi
 lib/ocaml/vmthreads/mutex.mli
 lib/ocaml/vmthreads/stdlib.cma
-lib/ocaml/vmthreads/thread.cmi
-lib/ocaml/vmthreads/thread.mli
 lib/ocaml/vmthreads/threadUnix.cmi
 lib/ocaml/vmthreads/threadUnix.mli
+lib/ocaml/vmthreads/thread.cmi
+lib/ocaml/vmthreads/thread.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.cmx
-%%PROF%%lib/ocaml/weak.p.cmx
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
+lib/ocaml/weak.p.cmt
+@(,,0555) lib/ocaml/expunge
+@(,,0555) lib/ocaml/extract_crc
+@dir lib/ocaml/ocamldoc/custom
 man/man1/ocaml.1.gz
 man/man1/ocamlc.1.gz
 man/man1/ocamlc.opt.1.gz
@@ -694,6 +1106,7 @@ man/man3/CamlinternalOO.3o.gz
 man/man3/Char.3o.gz
 man/man3/Complex.3o.gz
 man/man3/Digest.3o.gz
+man/man3/Docstrings.3o.gz
 man/man3/Filename.3o.gz
 man/man3/Format.3o.gz
 man/man3/Gc.3o.gz
@@ -778,12 +1191,3 @@ man/man3/Unix.LargeFile.3o.gz
 man/man3/Weak.3o.gz
 man/man3/Weak.Make.3o.gz
 man/man3/Weak.S.3o.gz
-@dir lib/ocaml/caml
-@dir lib/ocaml/compiler-libs
-@dir lib/ocaml/ocamlbuild
-@dir lib/ocaml/ocamldoc/custom
-@dir lib/ocaml/ocamldoc
-@dir lib/ocaml/stublibs
-%%THREADS%%@dir lib/ocaml/threads
-@dir lib/ocaml/vmthreads
-@dir lib/ocaml