ocaml: update to 4.04.0

3 files changed, 109 insertions, 19 deletions

diff --git a/ocaml/.footprint b/ocaml/.footprint
index d7447c25d..23c366bea 100644
--- a/ocaml/.footprint
+++ b/ocaml/.footprint
@@ -1,18 +1,39 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ocaml
--rwxr-xr-x	root/root	usr/bin/ocamlc
--rwxr-xr-x	root/root	usr/bin/ocamlcp
+lrwxrwxrwx	root/root	usr/bin/ocamlc -> ocamlc.opt
+-rwxr-xr-x	root/root	usr/bin/ocamlc.byte
+-rwxr-xr-x	root/root	usr/bin/ocamlc.opt
+lrwxrwxrwx	root/root	usr/bin/ocamlcp -> ocamlcp.opt
+-rwxr-xr-x	root/root	usr/bin/ocamlcp.byte
+-rwxr-xr-x	root/root	usr/bin/ocamlcp.opt
 -rwxr-xr-x	root/root	usr/bin/ocamldebug
--rwxr-xr-x	root/root	usr/bin/ocamldep
+lrwxrwxrwx	root/root	usr/bin/ocamldep -> ocamldep.opt
+-rwxr-xr-x	root/root	usr/bin/ocamldep.byte
+-rwxr-xr-x	root/root	usr/bin/ocamldep.opt
 -rwxr-xr-x	root/root	usr/bin/ocamldoc
--rwxr-xr-x	root/root	usr/bin/ocamllex
--rwxr-xr-x	root/root	usr/bin/ocamlmklib
--rwxr-xr-x	root/root	usr/bin/ocamlmktop
--rwxr-xr-x	root/root	usr/bin/ocamlobjinfo
--rwxr-xr-x	root/root	usr/bin/ocamlopt
--rwxr-xr-x	root/root	usr/bin/ocamloptp
--rwxr-xr-x	root/root	usr/bin/ocamlprof
+-rwxr-xr-x	root/root	usr/bin/ocamldoc.opt
+lrwxrwxrwx	root/root	usr/bin/ocamllex -> ocamllex.opt
+-rwxr-xr-x	root/root	usr/bin/ocamllex.byte
+-rwxr-xr-x	root/root	usr/bin/ocamllex.opt
+lrwxrwxrwx	root/root	usr/bin/ocamlmklib -> ocamlmklib.opt
+-rwxr-xr-x	root/root	usr/bin/ocamlmklib.byte
+-rwxr-xr-x	root/root	usr/bin/ocamlmklib.opt
+lrwxrwxrwx	root/root	usr/bin/ocamlmktop -> ocamlmktop.opt
+-rwxr-xr-x	root/root	usr/bin/ocamlmktop.byte
+-rwxr-xr-x	root/root	usr/bin/ocamlmktop.opt
+lrwxrwxrwx	root/root	usr/bin/ocamlobjinfo -> ocamlobjinfo.opt
+-rwxr-xr-x	root/root	usr/bin/ocamlobjinfo.byte
+-rwxr-xr-x	root/root	usr/bin/ocamlobjinfo.opt
+lrwxrwxrwx	root/root	usr/bin/ocamlopt -> ocamlopt.opt
+-rwxr-xr-x	root/root	usr/bin/ocamlopt.byte
+-rwxr-xr-x	root/root	usr/bin/ocamlopt.opt
+lrwxrwxrwx	root/root	usr/bin/ocamloptp -> ocamloptp.opt
+-rwxr-xr-x	root/root	usr/bin/ocamloptp.byte
+-rwxr-xr-x	root/root	usr/bin/ocamloptp.opt
+lrwxrwxrwx	root/root	usr/bin/ocamlprof -> ocamlprof.opt
+-rwxr-xr-x	root/root	usr/bin/ocamlprof.byte
+-rwxr-xr-x	root/root	usr/bin/ocamlprof.opt
 -rwxr-xr-x	root/root	usr/bin/ocamlrun
 -rwxr-xr-x	root/root	usr/bin/ocamlyacc
 drwxr-xr-x	root/root	usr/lib/
@@ -92,24 +113,60 @@ drwxr-xr-x	root/root	usr/lib/ocaml/
 drwxr-xr-x	root/root	usr/lib/ocaml/caml/
 -rw-r--r--	root/root	usr/lib/ocaml/caml/address_class.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/alloc.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/backtrace.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/backtrace_prim.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/bigarray.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/callback.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/compact.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/compare.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/compatibility.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/config.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/custom.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/debugger.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/dynlink.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/exec.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/fail.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/finalise.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/fix_code.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/freelist.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/gc.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/gc_ctrl.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/globroots.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/hash.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/hooks.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/instrtrace.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/instruct.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/int64_emul.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/int64_format.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/int64_native.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/interp.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/intext.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/io.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/jumptbl.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/major_gc.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/md5.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/memory.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/minor_gc.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/misc.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/mlvalues.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/osdeps.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/prims.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/printexc.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/reverse.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/roots.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/signals.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/signals_machdep.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/socketaddr.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/stack.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/stacks.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/startup.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/startup_aux.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/sys.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/threads.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/ui.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/unixsupport.h
 -rw-r--r--	root/root	usr/lib/ocaml/caml/version.h
+-rw-r--r--	root/root	usr/lib/ocaml/caml/weak.h
 -rw-r--r--	root/root	usr/lib/ocaml/camlheader
 -rw-r--r--	root/root	usr/lib/ocaml/camlheader_ur
 -rw-r--r--	root/root	usr/lib/ocaml/camlinternalFormat.cmi
@@ -325,6 +382,10 @@ drwxr-xr-x	root/root	usr/lib/ocaml/compiler-libs/
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/comballoc.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/comballoc.cmti
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/comballoc.cmx
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compdynlink.cmi
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compdynlink.cmt
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compdynlink.cmti
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compdynlink.cmx
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compenv.cmi
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compenv.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compenv.cmti
@@ -344,6 +405,10 @@ drwxr-xr-x	root/root	usr/lib/ocaml/compiler-libs/
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compmisc.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compmisc.cmti
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compmisc.cmx
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compplugin.cmi
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compplugin.cmt
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compplugin.cmti
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/compplugin.cmx
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/config.cmi
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/config.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/config.cmti
@@ -367,7 +432,10 @@ drwxr-xr-x	root/root	usr/lib/ocaml/compiler-libs/
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/debuginfo.cmi
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/debuginfo.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/debuginfo.cmti
--rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/debuginfo.cmx
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/depend.cmi
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/depend.cmt
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/depend.cmti
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/depend.cmx
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/dll.cmi
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/dll.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/dll.cmti
@@ -777,6 +845,10 @@ drwxr-xr-x	root/root	usr/lib/ocaml/compiler-libs/
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/simplify_primitives.cmi
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/simplify_primitives.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/simplify_primitives.cmti
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/spacetime_profiling.cmi
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/spacetime_profiling.cmt
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/spacetime_profiling.cmti
+-rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/spacetime_profiling.cmx
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/spill.cmi
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/spill.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/compiler-libs/spill.cmti
@@ -1312,6 +1384,13 @@ drwxr-xr-x	root/root	usr/lib/ocaml/ocamldoc/custom/
 -rw-r--r--	root/root	usr/lib/ocaml/ratio.cmi
 -rw-r--r--	root/root	usr/lib/ocaml/ratio.cmx
 -rw-r--r--	root/root	usr/lib/ocaml/ratio.mli
+-rw-r--r--	root/root	usr/lib/ocaml/raw_spacetime_lib.a
+-rw-r--r--	root/root	usr/lib/ocaml/raw_spacetime_lib.cma
+-rw-r--r--	root/root	usr/lib/ocaml/raw_spacetime_lib.cmi
+-rw-r--r--	root/root	usr/lib/ocaml/raw_spacetime_lib.cmx
+-rw-r--r--	root/root	usr/lib/ocaml/raw_spacetime_lib.cmxa
+-rwxr-xr-x	root/root	usr/lib/ocaml/raw_spacetime_lib.cmxs
+-rw-r--r--	root/root	usr/lib/ocaml/raw_spacetime_lib.mli
 -rw-r--r--	root/root	usr/lib/ocaml/scanf.cmi
 -rw-r--r--	root/root	usr/lib/ocaml/scanf.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/scanf.cmti
@@ -1336,6 +1415,14 @@ drwxr-xr-x	root/root	usr/lib/ocaml/ocamldoc/custom/
 -rw-r--r--	root/root	usr/lib/ocaml/sort.mli
 -rw-r--r--	root/root	usr/lib/ocaml/sort.p.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/sort.p.cmx
+-rw-r--r--	root/root	usr/lib/ocaml/spacetime.cmi
+-rw-r--r--	root/root	usr/lib/ocaml/spacetime.cmt
+-rw-r--r--	root/root	usr/lib/ocaml/spacetime.cmti
+-rw-r--r--	root/root	usr/lib/ocaml/spacetime.cmx
+-rw-r--r--	root/root	usr/lib/ocaml/spacetime.ml
+-rw-r--r--	root/root	usr/lib/ocaml/spacetime.mli
+-rw-r--r--	root/root	usr/lib/ocaml/spacetime.p.cmt
+-rw-r--r--	root/root	usr/lib/ocaml/spacetime.p.cmx
 -rw-r--r--	root/root	usr/lib/ocaml/stack.cmi
 -rw-r--r--	root/root	usr/lib/ocaml/stack.cmt
 -rw-r--r--	root/root	usr/lib/ocaml/stack.cmti
@@ -1539,6 +1626,9 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/CamlinternalOO.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Char.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Complex.3o.gz
+-rw-r--r--	root/root	usr/share/man/man3/Depend.3o.gz
+-rw-r--r--	root/root	usr/share/man/man3/Depend.StringMap.3o.gz
+-rw-r--r--	root/root	usr/share/man/man3/Depend.StringSet.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Digest.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Docstrings.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Ephemeron.3o.gz
@@ -1608,7 +1698,6 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/Pervasives.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Pervasives.LargeFile.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Pprintast.3o.gz
--rw-r--r--	root/root	usr/share/man/man3/Pprintast.printer.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Printast.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Printexc.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Printexc.Slot.3o.gz
@@ -1623,6 +1712,9 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/Set.OrderedType.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Set.S.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Sort.3o.gz
+-rw-r--r--	root/root	usr/share/man/man3/Spacetime.3o.gz
+-rw-r--r--	root/root	usr/share/man/man3/Spacetime.Series.3o.gz
+-rw-r--r--	root/root	usr/share/man/man3/Spacetime.Snapshot.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/Stack.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/StdLabels.3o.gz
 -rw-r--r--	root/root	usr/share/man/man3/StdLabels.Array.3o.gz
diff --git a/ocaml/.md5sum b/ocaml/.md5sum
index b97a6f159..4ca4004a8 100644
--- a/ocaml/.md5sum
+++ b/ocaml/.md5sum
@@ -1 +1 @@
-89f62881e03dfad0cf04991fbc03f955  ocaml-4.03.0.tar.xz
+39fe3c8ebb07bb62874a84b7a7d51e1d  ocaml-4.04.0.tar.xz
diff --git a/ocaml/Pkgfile b/ocaml/Pkgfile
index 6dcc4ded4..99f33b8c0 100644
--- a/ocaml/Pkgfile
+++ b/ocaml/Pkgfile
@@ -2,18 +2,16 @@
 # URL:         http://caml.inria.fr/
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 # Packager:    Erlend Bergsas Mikkelsen, howl at online dot no
-# Depends on:  binutils gdbm
+# Depends on:  binutils ncurses zlib
 
 name=ocaml
-version=4.03.0
+version=4.04.0
 release=1
 source=(http://caml.inria.fr/pub/distrib/$name-${version%.*}/$name-$version.tar.xz)
 
 build() {
     cd $name-$version
-    ./configure -prefix /usr -mandir /usr/share/man -with-pthread -no-graph
-    make -j1 world.opt
+    ./configure -prefix /usr -mandir /usr/share/man -no-graph
+    make world.opt
     make DESTDIR=$PKG install
-    local f
-    for f in $PKG/usr/bin/*.opt; do mv $f ${f%%.opt}; done
 }