Upgrade lang/ocaml to 4.08.1

* net unison needed some patchign to avoid deprecated library functions.
* all ports depending on the exact version of OCaml need revision bumps.
* net/unison needed some help to avoid deprecated library functions.

ok krw@, testing on i386 and ok daniel@

devel/cil/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2019/08/18 11:33:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.38 2019/09/18 17:49:35 chrisz Exp $
 
 # build system needs per-arch tweaks and is very unfriendly to
 # bytecode-only builds. powerpc nativecode is currently broken.
@@ -7,6 +7,7 @@ ONLY_FOR_ARCHS = ${OCAML_NATIVE_ARCHS}
 COMMENT=	framework for analysis and transformation of C
 CATEGORIES =	devel lang
 
+REVISION =	0
 DISTNAME =	cil-1.7.3
 EXTRACT_SUFX =	.tar.gz
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=cil/}

devel/coccinelle/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2019/07/12 21:15:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.39 2019/09/18 17:49:35 chrisz Exp $
 
 BROKEN-sparc64 =	"/usr/bin/ld: skipping incompatible pyml-current/libpyml_stubs.a when searching for -lpyml_stubs" \
 			"/usr/bin/ld: cannot find -lpyml_stubs"
@@ -8,6 +8,7 @@ COMMENT =	program matching and transformation engine
 # if updating, check for any additional use of diff/grep which
 # may need to be switched to gdiff/ggrep
 DISTNAME =	coccinelle-1.0.6
+REVISION =	0
 EXTRACT_SUFX =	.tgz
 
 CATEGORIES =	devel

devel/dune/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2019/08/17 13:29:42 chrisz Exp $
+# $OpenBSD: Makefile,v 1.7 2019/09/18 17:49:35 chrisz Exp $
 
 COMMENT =		OCaml build system
 
@@ -7,7 +7,7 @@ CATEGORIES =		devel
 GH_ACCOUNT =		ocaml
 GH_PROJECT =		dune
 GH_TAGNAME =		1.10.0
-REVISION =		1
+REVISION =		2
 
 HOMEPAGE =		https://github.com/ocaml/dune
 

devel/frama-c/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2019/09/07 17:11:53 chrisz Exp $
+# $OpenBSD: Makefile,v 1.20 2019/09/18 17:49:35 chrisz Exp $
 
 BROKEN-i386 =	ld: error: undefined symbol: ml_as_z_pred, etc
 
@@ -10,6 +10,7 @@ CATEGORIES =		devel
 GH_ACCOUNT =		Frama-C
 GH_PROJECT =		Frama-C-snapshot
 GH_TAGNAME =		19.0
+REVISION =		0
 DISTNAME =		frama-c-${GH_TAGNAME}-Potassium
 PKGNAME =		frama-c-${GH_TAGNAME}
 

devel/ocaml-biniou/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/08/23 18:35:13 chrisz Exp $
+# $OpenBSD: Makefile,v 1.4 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	binary data format designed for speed, safety, usability
 CATEGORIES =	devel
@@ -6,7 +6,7 @@ CATEGORIES =	devel
 GH_ACCOUNT =	mjambon
 GH_PROJECT =	biniou
 GH_TAGNAME =	v1.2.0
-REVISION =	0
+REVISION =	1
 PKGNAME =	ocaml-${DISTNAME}
 
 # 3-clause BSD

devel/ocaml-cppo/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2019/08/17 13:29:42 chrisz Exp $
+# $OpenBSD: Makefile,v 1.6 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	OCaml preprocessor
 CATEGORIES =	devel
@@ -6,6 +6,7 @@ CATEGORIES =	devel
 GH_ACCOUNT =	ocaml-community
 GH_PROJECT =	cppo
 GH_TAGNAME =	v1.6.6
+REVISION =	0
 PKGNAME =	ocaml-${DISTNAME}
 
 # 3-clause BSD

devel/ocaml-easy-format/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/08/17 13:29:42 chrisz Exp $
+# $OpenBSD: Makefile,v 1.3 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	interface to the OCaml stdlib Format module
 CATEGORIES =	devel
@@ -6,6 +6,7 @@ CATEGORIES =	devel
 GH_ACCOUNT =	mjambon
 GH_PROJECT =	easy-format
 GH_TAGNAME =	v1.3.1
+REVISION =	0
 PKGNAME =	ocaml-${DISTNAME}
 
 # 3-clause BSD

devel/ocaml-graph/Makefile

@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2019/07/12 20:44:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	OCaml graph library
 CATEGORIES =	devel
 
 V =		1.8.8
+REVISION =	0
 DISTNAME =	ocamlgraph-${V}
 PKGNAME =	ocaml-graph-${V}
 MASTER_SITES =	http://ocamlgraph.lri.fr/download/

devel/ocaml-menhir/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2019/08/21 02:55:50 daniel Exp $
+# $OpenBSD: Makefile,v 1.17 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =		OCaml parser generator for LR(1) grammars
 
 V =			20190626
 DISTNAME =		menhir-${V}
 PKGNAME =		ocaml-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 MASTER_SITES =		https://gitlab.inria.fr/fpottier/menhir/-/archive/${V}/
 

devel/ocaml-ocamlbuild/Makefile

@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2019/07/12 20:44:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	ocamlbuild
 CATEGORIES =	devel
 
 V =		0.14.0
+REVISION =	0
 GH_ACCOUNT =	ocaml
 GH_PROJECT =	ocamlbuild
 GH_TAGNAME =	${V}

devel/ocaml-ocamlbuild/patches/patch-Makefile

@@ -0,0 +1,14 @@
+$OpenBSD: patch-Makefile,v 1.1 2019/09/18 17:49:36 chrisz Exp $
+
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -93,7 +93,7 @@ INSTALL_LIB=\
+   src/ocamlbuildlib.cma \
+   src/ocamlbuild.cmo \
+   src/ocamlbuild_pack.cmi \
+-  $(EXTRA_CMO:.cmo=.cmi)
++  $(EXTRA_CMO) $(EXTRA_CMO:.cmo=.cmi)
+ 
+ INSTALL_LIB_OPT=\
+   src/ocamlbuildlib.cmxa src/ocamlbuildlib$(EXT_LIB) \

devel/ocaml-parmap/Makefile

@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2019/07/12 20:44:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	OCaml parallel map primitive for multicores
 CATEGORIES =	devel
 
 V =		1.0-rc10
+REVISION =	0
 NAME =		ocaml-parmap
 DISTNAME =	ocaml-parmap-$V
 DISTFILES =	${DISTNAME}{$V}.tar.gz

devel/ocaml-pcre/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2019/07/12 20:44:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	OCaml Perl-compatible regexp library
 CATEGORIES =	devel textproc
@@ -9,7 +9,7 @@ DISTNAME =	pcre-ocaml-$V
 PKGNAME =	${NAME}-$V
 MASTER_SITES =	https://github.com/mmottl/pcre-ocaml/releases/download/v${V}/
 HOMEPAGE =	https://github.com/mmottl/pcre-ocaml
-REVISION =	0
+REVISION =	1
 
 # GPLv2+
 PERMIT_PACKAGE =		Yes

devel/ocaml-yojson/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/08/23 18:35:13 chrisz Exp $
+# $OpenBSD: Makefile,v 1.4 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	optimized parsing and printing library for the JSON format
 CATEGORIES =	devel
@@ -6,7 +6,7 @@ CATEGORIES =	devel
 GH_ACCOUNT =	ocaml-community
 GH_PROJECT =	yojson
 GH_TAGNAME =	1.7.0
-REVISION =	0
+REVISION =	1
 PKGNAME =	ocaml-${DISTNAME}
 
 # 3-clause BSD

graphics/ocaml-cairo/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/08/17 20:24:35 chrisz Exp $
+# $OpenBSD: Makefile,v 1.4 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	binding to cairo, a 2D vector graphics library
 CATEGORIES =	graphics
@@ -6,6 +6,7 @@ CATEGORIES =	graphics
 GH_ACCOUNT =	Chris00
 GH_PROJECT =	ocaml-cairo
 GH_TAGNAME =	0.6.1
+REVISION =	0
 
 # LGPL 3.0
 PERMIT_PACKAGE = Yes
@@ -21,8 +22,7 @@ MODULES =	lang/ocaml
 BUILD_DEPENDS = devel/dune \
 		sysutils/findlib \
 		lang/ocaml,-graphics \
-		x11/lablgtk2 \
+		x11/lablgtk2
-		devel/ocaml-configurator
 
 LIB_DEPENDS =	devel/pango \
 		graphics/gdk-pixbuf2 \

graphics/pdfsandwich/Makefile

@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2019/07/12 20:47:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2019/09/18 17:49:36 chrisz Exp $
 
 # configure looks for ocamlopt
 ONLY_FOR_ARCHS =	${OCAML_NATIVE_ARCHS}
 COMMENT =	generator for sandwich OCR pdf files
 
 DISTNAME =	pdfsandwich-0.1.7
+REVISION =	0
 
 CATEGORIES =	graphics
 

lang/ocaml-camlp4/Makefile

@@ -1,4 +1,6 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:47:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2019/09/18 17:49:36 chrisz Exp $
+
+BROKEN =	Not yet compatible with OCaml 4.08
 
 COMMENT =	OCaml Preprocessor and Pretty-Printer
 CATEGORIES =	lang

lang/ocaml-camlp5/Makefile

@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2019/08/24 16:38:09 chrisz Exp $
+# $OpenBSD: Makefile,v 1.6 2019/09/18 17:49:36 chrisz Exp $
 
 V =		7.08
+REVISION =	0
 COMMENT =	OCaml Preprocessor and Pretty-Printer
 DISTFILES =	camlp5-rel${V}{rel${V:S/.//}}${EXTRACT_SUFX}
 PKGNAME =	ocaml-camlp5-${V}

lang/ocaml/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.83 2019/07/12 20:47:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.84 2019/09/18 17:49:37 chrisz Exp $
 
 MULTI_PACKAGES = -graphics -main
 
@@ -7,7 +7,7 @@ COMMENT-graphics = OCaml Graphics library providing basic drawing primitives
 
 # XXX Don't even think of updating ocaml alone.
 # Do check that the ports that depend on it still work, or repair them.
-VERSION=		4.07.1
+VERSION=		4.08.1
 
 PKGNAME-main =		ocaml-${VERSION}
 PKGNAME-graphics =	ocaml-graphics-${VERSION}
@@ -29,19 +29,18 @@ MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
 # QPL/LGPL
 PERMIT_PACKAGE=	Yes
 
-CONFIGURE_STYLE=	simple dest
+AUTOCONF_VERSION =	2.69
-CONFIGURE_ARGS+=	-prefix ${PREFIX} \
+CONFIGURE_STYLE =	gnu autoconf no-autoheader
-			-aspp '${CC} -c' \
-			-cc ${CC} \
-			-x11include ${X11BASE}/include \
-			-x11lib ${X11BASE}/lib
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
+			CPPFLAGS="${CFLAGS} ${CPPFLAGS}" \
-			OPENBSD_LOCALBASE="${LOCALBASE}"
+			LDFLAGS="${LDFLAGS}"
+
+CFLAGS +=	-I${LOCALBASE}/include
+LDFLAGS +=	-L${LOCALBASE}/lib
 
 # non-PIC assembly in asmrun/i386.S
 .if ${MACHINE_ARCH} == "i386"
-LDFLAGS+=		-Wl,-znotext
+LDFLAGS+=		-Wl,-z,notext
 .endif
 
 USE_GMAKE=	Yes

lang/ocaml/distinfo

@@ -1,4 +1,4 @@
-SHA256 (ocaml-4.07-refman-html.tar.gz) = bZfBExooGqtXWTYCoZsrRxTb8mY9UTrmOrzi5cAujbg=
+SHA256 (ocaml-4.08-refman-html.tar.gz) = fie/ueRbFhirfIRhy2xiRLAGElWTR1yHukndCXRrXnc=
-SHA256 (ocaml-4.07.1.tar.gz) = KtQ74X7Vx06ieIeuDMR5O4NUCBgMC5F1vJrVMIKlmvQ=
+SHA256 (ocaml-4.08.1.tar.gz) = 7lARjuiEcv1LZDEfpWD4+KtmoYmfAReBXGmhYHCYD3g=
-SIZE (ocaml-4.07-refman-html.tar.gz) = 1003312
+SIZE (ocaml-4.08-refman-html.tar.gz) = 1704609
-SIZE (ocaml-4.07.1.tar.gz) = 4215856
+SIZE (ocaml-4.08.1.tar.gz) = 4897908

lang/ocaml/patches/patch-configure

@@ -1,41 +0,0 @@
-$OpenBSD: patch-configure,v 1.24 2019/03/09 12:29:56 chrisz Exp $
-Index: configure
---- configure.orig
-+++ configure
-@@ -431,7 +431,7 @@ ocamlc_cflags=""
- ocamlc_cppflags=""
- ocamlopt_cflags=""
- ocamlopt_cppflags=""
--ldflags=""
-+ldflags="$LDFLAGS"
- ostype="Unix"
- exe=""
- iflexdir=""
-@@ -456,7 +456,7 @@ esac
- 
- case "$ccfamily" in
-   clang-*)
--    common_cflags="-O2 -fno-strict-aliasing -fwrapv";
-+    common_cflags="$CFLAGS -fno-strict-aliasing -fwrapv";
-     internal_cflags="$gcc_warnings";;
-   gcc-[012]-*)
-     # Some versions known to miscompile OCaml, e,g, 2.7.2.1, some 2.96.
-@@ -871,8 +871,9 @@ if $with_sharedlibs; then
-     *-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
-     |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*)
-       sharedcccompopts="-fPIC"
--      mksharedlib="$cc -shared"
-+      mksharedlib="$cc $common_cflags $ldflags -shared"
-       ldflags="$ldflags -Wl,-E"
-+      mkexe="$cc $ldflags"
-       rpath="-Wl,-rpath,"
-       mksharedlibrpath="-Wl,-rpath,"
-       natdynlinkopts="-Wl,-E"
-@@ -981,6 +982,7 @@ case "$target" in
-   s390x*-*-linux*)              arch=s390x; model=z10; system=elf;;
-   armv6*-*-linux-gnueabihf)     arch=arm; model=armv6; system=linux_eabihf;;
-   armv7*-*-linux-gnueabihf)     arch=arm; model=armv7; system=linux_eabihf;;
-+  arm*-*-openbsd*)              arch=arm; system=bsd;;
-   armv8*-*-linux-gnueabihf)     arch=arm; model=armv8; system=linux_eabihf;;
-   armv8*-*-linux-gnueabi)       arch=arm; model=armv8; system=linux_eabi;;
-   armv7*-*-linux-gnueabi)       arch=arm; model=armv7; system=linux_eabi;;

lang/ocaml/patches/patch-configure_ac

@@ -0,0 +1,84 @@
+$OpenBSD: patch-configure_ac,v 1.1 2019/09/18 17:49:37 chrisz Exp $
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -644,6 +644,11 @@ AS_CASE([$CC,$host],
+ )
+ 
+ 
++# Respect LDFLAGS and CFLAGS
++common_cflags="$common_cflags $CFLAGS"
++oc_ldflags="$oc_ldflags $LDFLAGS"
++
++
+ ## Program to use to install files
+ AC_PROG_INSTALL
+ 
+@@ -760,8 +765,8 @@ AS_IF([test x"$enable_shared" != "xno"],
+     [[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
+     |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]],
+       [sharedlib_cflags="-fPIC"
+-      mksharedlib="$CC -shared"
+       oc_ldflags="$oc_ldflags -Wl,-E"
++      mksharedlib="$CC -shared $oc_ldflags"
+       rpath="-Wl,-rpath,"
+       mksharedlibrpath="-Wl,-rpath,"
+       natdynlinkopts="-Wl,-E"
+@@ -1564,27 +1569,39 @@ AS_IF([test x"$enable_graph_lib" = "xno" ],
+ ## libbfd
+ 
+ AC_CHECK_HEADER([bfd.h],
+-  [libbfd_ling=""
+-  AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd"])
+-  AS_IF([test -z "$libbfd_link"],
+-    [AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd -ldl"], [], [-ldl])])
+-  AS_IF([test -z "$libbfd_link"],
+-    [AC_CHECK_LIB([bfd], [bfd_openr],
+-      [libbfd_link="-lbfd -ldl -liberty"], [], [-ldl -liberty])])
+-  AS_IF([test -z "$libbfd_link"],
+-    [AC_CHECK_LIB([bfd], [bfd_openr],
+-      [libbfd_link="-lbfd -ldl -liberty -lz"], [], [-ldl -liberty -lz])])
+-  AS_IF([test -z "$libbfd_link"],
+-    [AC_CHECK_LIB([bfd], [bfd_openr],
++  [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ],
++    [unset ac_cv_lib_bfd_bfd_openr
++    AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd"])])]
++  [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ],
++    [unset ac_cv_lib_bfd_bfd_openr
++    AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd -ldl"], [], [-ldl])])]
++  [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ],
++    [unset ac_cv_lib_bfd_bfd_openr
++    AC_CHECK_LIB([bfd], [bfd_openr],
++      [libbfd_link="-lbfd -liberty -lz"], [], [-liberty -lz])])]
++  [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ],
++    [unset ac_cv_lib_bfd_bfd_openr
++    AC_CHECK_LIB([bfd], [bfd_openr],
++      [libbfd_link="-lbfd -ldl -liberty"], [], [-ldl -liberty])])]
++  [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ],
++    [unset ac_cv_lib_bfd_bfd_openr
++    AC_CHECK_LIB([bfd], [bfd_openr],
++      [libbfd_link="-lbfd -ldl -liberty -lz"], [], [-ldl -liberty -lz])])]
++  [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ],
++    [unset ac_cv_lib_bfd_bfd_openr
++    AC_CHECK_LIB([bfd], [bfd_openr],
+       [libbfd_link="-lbfd -ldl -liberty -lz -lintl"], [],
+-      [-ldl -liberty -lz -lintl])])
+-  AS_IF([test -n "$libbfd_link"],
+-    [AC_DEFINE([HAS_LIBBFD])],
++      [-ldl -liberty -lz -lintl])])]
++  [AS_IF(
++    [test x"${ac_cv_lib_bfd_bfd_openr}" = "xyes" ],
++    [libbfd_link="${oc_ldflags} ${libbfd_link}"
++    AC_DEFINE([HAS_LIBBFD])],
+     [AC_MSG_NOTICE(m4_normalize([
+       BFD library not found, 'objinfo' will be unable to display
+       info on .cmxs files.
+-    ]))])
+-  ])
++    ]))]
++  )]
++)
+ 
+ ## Does the assembler support debug prefix map and CFI directives
+ as_has_debug_prefix_map=false

lang/ocaml/pkg/PFRAG.native-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.native-main,v 1.9 2019/03/04 12:51:15 chrisz Exp $
+@comment $OpenBSD: PFRAG.native-main,v 1.10 2019/09/18 17:49:37 chrisz Exp $
 %%dynlink%%
 @bin bin/ocamlc.opt
 @bin bin/ocamlcp.opt
@@ -19,63 +19,32 @@ lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cmx
 lib/ocaml/bigarray.cmxa
 lib/ocaml/camlinternalFormat.cmx
-lib/ocaml/camlinternalFormat.p.cmt
 lib/ocaml/camlinternalFormat.p.cmx
 lib/ocaml/camlinternalFormatBasics.cmx
-lib/ocaml/camlinternalFormatBasics.p.cmt
 lib/ocaml/camlinternalFormatBasics.p.cmx
 lib/ocaml/camlinternalLazy.cmx
-lib/ocaml/camlinternalLazy.p.cmt
 lib/ocaml/camlinternalLazy.p.cmx
 lib/ocaml/camlinternalMod.cmx
-lib/ocaml/camlinternalMod.p.cmt
 lib/ocaml/camlinternalMod.p.cmx
 lib/ocaml/camlinternalOO.cmx
-lib/ocaml/camlinternalOO.p.cmt
 lib/ocaml/camlinternalOO.p.cmx
-lib/ocaml/compiler-libs/CSE.cmi
-lib/ocaml/compiler-libs/CSE.cmt
 lib/ocaml/compiler-libs/CSE.cmx
-lib/ocaml/compiler-libs/CSEgen.cmi
-lib/ocaml/compiler-libs/CSEgen.cmt
-lib/ocaml/compiler-libs/CSEgen.cmti
 lib/ocaml/compiler-libs/CSEgen.cmx
 lib/ocaml/compiler-libs/CSEgen.mli
-lib/ocaml/compiler-libs/afl_instrument.cmi
-lib/ocaml/compiler-libs/afl_instrument.cmt
-lib/ocaml/compiler-libs/afl_instrument.cmti
 lib/ocaml/compiler-libs/afl_instrument.cmx
 lib/ocaml/compiler-libs/afl_instrument.mli
-lib/ocaml/compiler-libs/alias_analysis.cmi
+lib/ocaml/compiler-libs/alias_analysis.cmx
-lib/ocaml/compiler-libs/alias_analysis.cmt
-lib/ocaml/compiler-libs/alias_analysis.cmti
 lib/ocaml/compiler-libs/alias_analysis.mli
-lib/ocaml/compiler-libs/allocated_const.cmi
+lib/ocaml/compiler-libs/allocated_const.cmx
-lib/ocaml/compiler-libs/allocated_const.cmt
-lib/ocaml/compiler-libs/allocated_const.cmti
 lib/ocaml/compiler-libs/allocated_const.mli
-lib/ocaml/compiler-libs/arch.cmi
-lib/ocaml/compiler-libs/arch.cmt
 lib/ocaml/compiler-libs/arch.cmx
 lib/ocaml/compiler-libs/arg_helper.cmx
-lib/ocaml/compiler-libs/asmgen.cmi
-lib/ocaml/compiler-libs/asmgen.cmt
-lib/ocaml/compiler-libs/asmgen.cmti
 lib/ocaml/compiler-libs/asmgen.cmx
 lib/ocaml/compiler-libs/asmgen.mli
-lib/ocaml/compiler-libs/asmlibrarian.cmi
-lib/ocaml/compiler-libs/asmlibrarian.cmt
-lib/ocaml/compiler-libs/asmlibrarian.cmti
 lib/ocaml/compiler-libs/asmlibrarian.cmx
 lib/ocaml/compiler-libs/asmlibrarian.mli
-lib/ocaml/compiler-libs/asmlink.cmi
-lib/ocaml/compiler-libs/asmlink.cmt
-lib/ocaml/compiler-libs/asmlink.cmti
 lib/ocaml/compiler-libs/asmlink.cmx
 lib/ocaml/compiler-libs/asmlink.mli
-lib/ocaml/compiler-libs/asmpackager.cmi
-lib/ocaml/compiler-libs/asmpackager.cmt
-lib/ocaml/compiler-libs/asmpackager.cmti
 lib/ocaml/compiler-libs/asmpackager.cmx
 lib/ocaml/compiler-libs/asmpackager.mli
 lib/ocaml/compiler-libs/ast_helper.cmx
@@ -83,25 +52,14 @@ lib/ocaml/compiler-libs/ast_invariants.cmx
 lib/ocaml/compiler-libs/ast_iterator.cmx
 lib/ocaml/compiler-libs/ast_mapper.cmx
 lib/ocaml/compiler-libs/attr_helper.cmx
-lib/ocaml/compiler-libs/augment_specialised_args.cmi
+lib/ocaml/compiler-libs/augment_specialised_args.cmx
-lib/ocaml/compiler-libs/augment_specialised_args.cmt
-lib/ocaml/compiler-libs/augment_specialised_args.cmti
 lib/ocaml/compiler-libs/augment_specialised_args.mli
-lib/ocaml/compiler-libs/backend_intf.cmi
-lib/ocaml/compiler-libs/backend_intf.cmti
 lib/ocaml/compiler-libs/backend_intf.mli
-lib/ocaml/compiler-libs/branch_relaxation.cmi
+lib/ocaml/compiler-libs/backend_var.cmx
-lib/ocaml/compiler-libs/branch_relaxation.cmt
-lib/ocaml/compiler-libs/branch_relaxation.cmti
 lib/ocaml/compiler-libs/branch_relaxation.cmx
 lib/ocaml/compiler-libs/branch_relaxation.mli
-lib/ocaml/compiler-libs/branch_relaxation_intf.cmi
-lib/ocaml/compiler-libs/branch_relaxation_intf.cmt
 lib/ocaml/compiler-libs/branch_relaxation_intf.cmx
 lib/ocaml/compiler-libs/btype.cmx
-lib/ocaml/compiler-libs/build_export_info.cmi
-lib/ocaml/compiler-libs/build_export_info.cmt
-lib/ocaml/compiler-libs/build_export_info.cmti
 lib/ocaml/compiler-libs/build_export_info.cmx
 lib/ocaml/compiler-libs/build_export_info.mli
 lib/ocaml/compiler-libs/build_path_prefix_map.cmx
@@ -111,78 +69,45 @@ lib/ocaml/compiler-libs/bytelibrarian.cmx
 lib/ocaml/compiler-libs/bytelink.cmx
 lib/ocaml/compiler-libs/bytepackager.cmx
 lib/ocaml/compiler-libs/bytesections.cmx
+lib/ocaml/compiler-libs/camlinternalMenhirLib.cmx
 lib/ocaml/compiler-libs/ccomp.cmx
-lib/ocaml/compiler-libs/clambda.cmi
-lib/ocaml/compiler-libs/clambda.cmt
-lib/ocaml/compiler-libs/clambda.cmti
 lib/ocaml/compiler-libs/clambda.cmx
 lib/ocaml/compiler-libs/clambda.mli
 lib/ocaml/compiler-libs/clflags.cmx
-lib/ocaml/compiler-libs/closure.cmi
-lib/ocaml/compiler-libs/closure.cmt
-lib/ocaml/compiler-libs/closure.cmti
 lib/ocaml/compiler-libs/closure.cmx
 lib/ocaml/compiler-libs/closure.mli
-lib/ocaml/compiler-libs/closure_conversion.cmi
+lib/ocaml/compiler-libs/closure_conversion.cmx
-lib/ocaml/compiler-libs/closure_conversion.cmt
-lib/ocaml/compiler-libs/closure_conversion.cmti
 lib/ocaml/compiler-libs/closure_conversion.mli
-lib/ocaml/compiler-libs/closure_conversion_aux.cmi
+lib/ocaml/compiler-libs/closure_conversion_aux.cmx
-lib/ocaml/compiler-libs/closure_conversion_aux.cmt
-lib/ocaml/compiler-libs/closure_conversion_aux.cmti
 lib/ocaml/compiler-libs/closure_conversion_aux.mli
-lib/ocaml/compiler-libs/closure_element.cmi
+lib/ocaml/compiler-libs/closure_element.cmx
-lib/ocaml/compiler-libs/closure_element.cmt
-lib/ocaml/compiler-libs/closure_element.cmti
 lib/ocaml/compiler-libs/closure_element.mli
-lib/ocaml/compiler-libs/closure_id.cmi
+lib/ocaml/compiler-libs/closure_id.cmx
-lib/ocaml/compiler-libs/closure_id.cmt
-lib/ocaml/compiler-libs/closure_id.cmti
 lib/ocaml/compiler-libs/closure_id.mli
-lib/ocaml/compiler-libs/closure_offsets.cmi
-lib/ocaml/compiler-libs/closure_offsets.cmt
-lib/ocaml/compiler-libs/closure_offsets.cmti
 lib/ocaml/compiler-libs/closure_offsets.cmx
 lib/ocaml/compiler-libs/closure_offsets.mli
-lib/ocaml/compiler-libs/closure_origin.cmi
+lib/ocaml/compiler-libs/closure_origin.cmx
-lib/ocaml/compiler-libs/closure_origin.cmt
-lib/ocaml/compiler-libs/closure_origin.cmti
 lib/ocaml/compiler-libs/closure_origin.mli
 lib/ocaml/compiler-libs/cmi_format.cmx
-lib/ocaml/compiler-libs/cmm.cmi
-lib/ocaml/compiler-libs/cmm.cmt
-lib/ocaml/compiler-libs/cmm.cmti
 lib/ocaml/compiler-libs/cmm.cmx
 lib/ocaml/compiler-libs/cmm.mli
-lib/ocaml/compiler-libs/cmmgen.cmi
-lib/ocaml/compiler-libs/cmmgen.cmt
-lib/ocaml/compiler-libs/cmmgen.cmti
 lib/ocaml/compiler-libs/cmmgen.cmx
 lib/ocaml/compiler-libs/cmmgen.mli
 lib/ocaml/compiler-libs/cmt_format.cmx
-lib/ocaml/compiler-libs/cmx_format.cmi
-lib/ocaml/compiler-libs/cmx_format.cmti
 lib/ocaml/compiler-libs/cmx_format.mli
-lib/ocaml/compiler-libs/coloring.cmi
-lib/ocaml/compiler-libs/coloring.cmt
-lib/ocaml/compiler-libs/coloring.cmti
 lib/ocaml/compiler-libs/coloring.cmx
 lib/ocaml/compiler-libs/coloring.mli
-lib/ocaml/compiler-libs/comballoc.cmi
-lib/ocaml/compiler-libs/comballoc.cmt
-lib/ocaml/compiler-libs/comballoc.cmti
 lib/ocaml/compiler-libs/comballoc.cmx
 lib/ocaml/compiler-libs/comballoc.mli
 lib/ocaml/compiler-libs/compdynlink.cmx
+lib/ocaml/compiler-libs/compdynlink_common.cmx
+lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx
+lib/ocaml/compiler-libs/compdynlink_types.cmx
 lib/ocaml/compiler-libs/compenv.cmx
-lib/ocaml/compiler-libs/compilation_unit.cmi
+lib/ocaml/compiler-libs/compilation_unit.cmx
-lib/ocaml/compiler-libs/compilation_unit.cmt
-lib/ocaml/compiler-libs/compilation_unit.cmti
 lib/ocaml/compiler-libs/compilation_unit.mli
 lib/ocaml/compiler-libs/compile.cmx
-lib/ocaml/compiler-libs/compilenv.cmi
+lib/ocaml/compiler-libs/compile_common.cmx
-lib/ocaml/compiler-libs/compilenv.cmt
-lib/ocaml/compiler-libs/compilenv.cmti
 lib/ocaml/compiler-libs/compilenv.cmx
 lib/ocaml/compiler-libs/compilenv.mli
 lib/ocaml/compiler-libs/compmisc.cmx
@@ -191,193 +116,102 @@ lib/ocaml/compiler-libs/config.cmx
 lib/ocaml/compiler-libs/consistbl.cmx
 lib/ocaml/compiler-libs/ctype.cmx
 lib/ocaml/compiler-libs/datarepr.cmx
-lib/ocaml/compiler-libs/deadcode.cmi
-lib/ocaml/compiler-libs/deadcode.cmt
-lib/ocaml/compiler-libs/deadcode.cmti
 lib/ocaml/compiler-libs/deadcode.cmx
 lib/ocaml/compiler-libs/deadcode.mli
-lib/ocaml/compiler-libs/debuginfo.cmi
+lib/ocaml/compiler-libs/debuginfo.cmx
-lib/ocaml/compiler-libs/debuginfo.cmt
-lib/ocaml/compiler-libs/debuginfo.cmti
 lib/ocaml/compiler-libs/debuginfo.mli
 lib/ocaml/compiler-libs/depend.cmx
 lib/ocaml/compiler-libs/dll.cmx
 lib/ocaml/compiler-libs/docstrings.cmx
-lib/ocaml/compiler-libs/effect_analysis.cmi
+lib/ocaml/compiler-libs/effect_analysis.cmx
-lib/ocaml/compiler-libs/effect_analysis.cmt
-lib/ocaml/compiler-libs/effect_analysis.cmti
 lib/ocaml/compiler-libs/effect_analysis.mli
-lib/ocaml/compiler-libs/emit.cmi
-lib/ocaml/compiler-libs/emit.cmt
-lib/ocaml/compiler-libs/emit.cmti
 lib/ocaml/compiler-libs/emit.cmx
 lib/ocaml/compiler-libs/emit.mli
-lib/ocaml/compiler-libs/emitaux.cmi
-lib/ocaml/compiler-libs/emitaux.cmt
-lib/ocaml/compiler-libs/emitaux.cmti
 lib/ocaml/compiler-libs/emitaux.cmx
 lib/ocaml/compiler-libs/emitaux.mli
 lib/ocaml/compiler-libs/emitcode.cmx
 lib/ocaml/compiler-libs/env.cmx
 lib/ocaml/compiler-libs/envaux.cmx
 lib/ocaml/compiler-libs/errors.cmx
-lib/ocaml/compiler-libs/export_id.cmi
+lib/ocaml/compiler-libs/export_id.cmx
-lib/ocaml/compiler-libs/export_id.cmt
-lib/ocaml/compiler-libs/export_id.cmti
 lib/ocaml/compiler-libs/export_id.mli
-lib/ocaml/compiler-libs/export_info.cmi
-lib/ocaml/compiler-libs/export_info.cmt
-lib/ocaml/compiler-libs/export_info.cmti
 lib/ocaml/compiler-libs/export_info.cmx
 lib/ocaml/compiler-libs/export_info.mli
-lib/ocaml/compiler-libs/export_info_for_pack.cmi
-lib/ocaml/compiler-libs/export_info_for_pack.cmt
-lib/ocaml/compiler-libs/export_info_for_pack.cmti
 lib/ocaml/compiler-libs/export_info_for_pack.cmx
 lib/ocaml/compiler-libs/export_info_for_pack.mli
-lib/ocaml/compiler-libs/extract_projections.cmi
+lib/ocaml/compiler-libs/extract_projections.cmx
-lib/ocaml/compiler-libs/extract_projections.cmt
-lib/ocaml/compiler-libs/extract_projections.cmti
 lib/ocaml/compiler-libs/extract_projections.mli
-lib/ocaml/compiler-libs/find_recursive_functions.cmi
+lib/ocaml/compiler-libs/find_recursive_functions.cmx
-lib/ocaml/compiler-libs/find_recursive_functions.cmt
-lib/ocaml/compiler-libs/find_recursive_functions.cmti
 lib/ocaml/compiler-libs/find_recursive_functions.mli
-lib/ocaml/compiler-libs/flambda.cmi
+lib/ocaml/compiler-libs/flambda.cmx
-lib/ocaml/compiler-libs/flambda.cmt
-lib/ocaml/compiler-libs/flambda.cmti
 lib/ocaml/compiler-libs/flambda.mli
-lib/ocaml/compiler-libs/flambda_invariants.cmi
+lib/ocaml/compiler-libs/flambda_invariants.cmx
-lib/ocaml/compiler-libs/flambda_invariants.cmt
-lib/ocaml/compiler-libs/flambda_invariants.cmti
 lib/ocaml/compiler-libs/flambda_invariants.mli
-lib/ocaml/compiler-libs/flambda_iterators.cmi
+lib/ocaml/compiler-libs/flambda_iterators.cmx
-lib/ocaml/compiler-libs/flambda_iterators.cmt
-lib/ocaml/compiler-libs/flambda_iterators.cmti
 lib/ocaml/compiler-libs/flambda_iterators.mli
-lib/ocaml/compiler-libs/flambda_to_clambda.cmi
-lib/ocaml/compiler-libs/flambda_to_clambda.cmt
-lib/ocaml/compiler-libs/flambda_to_clambda.cmti
 lib/ocaml/compiler-libs/flambda_to_clambda.cmx
 lib/ocaml/compiler-libs/flambda_to_clambda.mli
-lib/ocaml/compiler-libs/flambda_utils.cmi
+lib/ocaml/compiler-libs/flambda_utils.cmx
-lib/ocaml/compiler-libs/flambda_utils.cmt
-lib/ocaml/compiler-libs/flambda_utils.cmti
 lib/ocaml/compiler-libs/flambda_utils.mli
-lib/ocaml/compiler-libs/freshening.cmi
+lib/ocaml/compiler-libs/freshening.cmx
-lib/ocaml/compiler-libs/freshening.cmt
-lib/ocaml/compiler-libs/freshening.cmti
 lib/ocaml/compiler-libs/freshening.mli
-lib/ocaml/compiler-libs/id_types.cmi
+lib/ocaml/compiler-libs/id_types.cmx
-lib/ocaml/compiler-libs/id_types.cmt
-lib/ocaml/compiler-libs/id_types.cmti
 lib/ocaml/compiler-libs/id_types.mli
 lib/ocaml/compiler-libs/ident.cmx
 lib/ocaml/compiler-libs/identifiable.cmx
-lib/ocaml/compiler-libs/import_approx.cmi
-lib/ocaml/compiler-libs/import_approx.cmt
-lib/ocaml/compiler-libs/import_approx.cmti
 lib/ocaml/compiler-libs/import_approx.cmx
 lib/ocaml/compiler-libs/import_approx.mli
 lib/ocaml/compiler-libs/includeclass.cmx
 lib/ocaml/compiler-libs/includecore.cmx
 lib/ocaml/compiler-libs/includemod.cmx
-lib/ocaml/compiler-libs/inconstant_idents.cmi
+lib/ocaml/compiler-libs/inconstant_idents.cmx
-lib/ocaml/compiler-libs/inconstant_idents.cmt
-lib/ocaml/compiler-libs/inconstant_idents.cmti
 lib/ocaml/compiler-libs/inconstant_idents.mli
-lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmi
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmx
-lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmt
-lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmti
 lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.mli
-lib/ocaml/compiler-libs/inline_and_simplify.cmi
+lib/ocaml/compiler-libs/inline_and_simplify.cmx
-lib/ocaml/compiler-libs/inline_and_simplify.cmt
-lib/ocaml/compiler-libs/inline_and_simplify.cmti
 lib/ocaml/compiler-libs/inline_and_simplify.mli
-lib/ocaml/compiler-libs/inline_and_simplify_aux.cmi
+lib/ocaml/compiler-libs/inline_and_simplify_aux.cmx
-lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt
-lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti
 lib/ocaml/compiler-libs/inline_and_simplify_aux.mli
-lib/ocaml/compiler-libs/inlining_cost.cmi
+lib/ocaml/compiler-libs/inlining_cost.cmx
-lib/ocaml/compiler-libs/inlining_cost.cmt
-lib/ocaml/compiler-libs/inlining_cost.cmti
 lib/ocaml/compiler-libs/inlining_cost.mli
-lib/ocaml/compiler-libs/inlining_decision.cmi
+lib/ocaml/compiler-libs/inlining_decision.cmx
-lib/ocaml/compiler-libs/inlining_decision.cmt
-lib/ocaml/compiler-libs/inlining_decision.cmti
 lib/ocaml/compiler-libs/inlining_decision.mli
-lib/ocaml/compiler-libs/inlining_decision_intf.cmi
-lib/ocaml/compiler-libs/inlining_decision_intf.cmti
 lib/ocaml/compiler-libs/inlining_decision_intf.mli
-lib/ocaml/compiler-libs/inlining_stats.cmi
+lib/ocaml/compiler-libs/inlining_stats.cmx
-lib/ocaml/compiler-libs/inlining_stats.cmt
-lib/ocaml/compiler-libs/inlining_stats.cmti
 lib/ocaml/compiler-libs/inlining_stats.mli
-lib/ocaml/compiler-libs/inlining_stats_types.cmi
+lib/ocaml/compiler-libs/inlining_stats_types.cmx
-lib/ocaml/compiler-libs/inlining_stats_types.cmt
-lib/ocaml/compiler-libs/inlining_stats_types.cmti
 lib/ocaml/compiler-libs/inlining_stats_types.mli
-lib/ocaml/compiler-libs/inlining_transforms.cmi
+lib/ocaml/compiler-libs/inlining_transforms.cmx
-lib/ocaml/compiler-libs/inlining_transforms.cmt
-lib/ocaml/compiler-libs/inlining_transforms.cmti
 lib/ocaml/compiler-libs/inlining_transforms.mli
 lib/ocaml/compiler-libs/instruct.cmx
-lib/ocaml/compiler-libs/interf.cmi
+lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmx
-lib/ocaml/compiler-libs/interf.cmt
-lib/ocaml/compiler-libs/interf.cmti
 lib/ocaml/compiler-libs/interf.cmx
 lib/ocaml/compiler-libs/interf.mli
-lib/ocaml/compiler-libs/internal_variable_names.cmi
+lib/ocaml/compiler-libs/internal_variable_names.cmx
-lib/ocaml/compiler-libs/internal_variable_names.cmt
-lib/ocaml/compiler-libs/internal_variable_names.cmti
 lib/ocaml/compiler-libs/internal_variable_names.mli
-lib/ocaml/compiler-libs/interval.cmi
-lib/ocaml/compiler-libs/interval.cmt
-lib/ocaml/compiler-libs/interval.cmti
 lib/ocaml/compiler-libs/interval.cmx
 lib/ocaml/compiler-libs/interval.mli
-lib/ocaml/compiler-libs/invariant_params.cmi
+lib/ocaml/compiler-libs/invariant_params.cmx
-lib/ocaml/compiler-libs/invariant_params.cmt
-lib/ocaml/compiler-libs/invariant_params.cmti
 lib/ocaml/compiler-libs/invariant_params.mli
 lib/ocaml/compiler-libs/lambda.cmx
 lib/ocaml/compiler-libs/lexer.cmx
-lib/ocaml/compiler-libs/lift_code.cmi
+lib/ocaml/compiler-libs/lift_code.cmx
-lib/ocaml/compiler-libs/lift_code.cmt
-lib/ocaml/compiler-libs/lift_code.cmti
 lib/ocaml/compiler-libs/lift_code.mli
-lib/ocaml/compiler-libs/lift_constants.cmi
+lib/ocaml/compiler-libs/lift_constants.cmx
-lib/ocaml/compiler-libs/lift_constants.cmt
-lib/ocaml/compiler-libs/lift_constants.cmti
 lib/ocaml/compiler-libs/lift_constants.mli
-lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmi
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmx
-lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt
-lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
 lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
-lib/ocaml/compiler-libs/linearize.cmi
-lib/ocaml/compiler-libs/linearize.cmt
-lib/ocaml/compiler-libs/linearize.cmti
 lib/ocaml/compiler-libs/linearize.cmx
 lib/ocaml/compiler-libs/linearize.mli
-lib/ocaml/compiler-libs/linkage_name.cmi
+lib/ocaml/compiler-libs/linkage_name.cmx
-lib/ocaml/compiler-libs/linkage_name.cmt
-lib/ocaml/compiler-libs/linkage_name.cmti
 lib/ocaml/compiler-libs/linkage_name.mli
-lib/ocaml/compiler-libs/linscan.cmi
-lib/ocaml/compiler-libs/linscan.cmt
-lib/ocaml/compiler-libs/linscan.cmti
 lib/ocaml/compiler-libs/linscan.cmx
 lib/ocaml/compiler-libs/linscan.mli
-lib/ocaml/compiler-libs/liveness.cmi
-lib/ocaml/compiler-libs/liveness.cmt
-lib/ocaml/compiler-libs/liveness.cmti
 lib/ocaml/compiler-libs/liveness.cmx
 lib/ocaml/compiler-libs/liveness.mli
+lib/ocaml/compiler-libs/load_path.cmx
 lib/ocaml/compiler-libs/location.cmx
 lib/ocaml/compiler-libs/longident.cmx
-lib/ocaml/compiler-libs/mach.cmi
-lib/ocaml/compiler-libs/mach.cmt
-lib/ocaml/compiler-libs/mach.cmti
 lib/ocaml/compiler-libs/mach.cmx
 lib/ocaml/compiler-libs/mach.mli
 lib/ocaml/compiler-libs/main.cmx
@@ -386,15 +220,11 @@ lib/ocaml/compiler-libs/main_args.cmx
 lib/ocaml/compiler-libs/makedepend.cmx
 lib/ocaml/compiler-libs/matching.cmx
 lib/ocaml/compiler-libs/meta.cmx
-lib/ocaml/compiler-libs/middle_end.cmi
+lib/ocaml/compiler-libs/middle_end.cmx
-lib/ocaml/compiler-libs/middle_end.cmt
-lib/ocaml/compiler-libs/middle_end.cmti
 lib/ocaml/compiler-libs/middle_end.mli
 lib/ocaml/compiler-libs/misc.cmx
 lib/ocaml/compiler-libs/mtype.cmx
-lib/ocaml/compiler-libs/mutable_variable.cmi
+lib/ocaml/compiler-libs/mutable_variable.cmx
-lib/ocaml/compiler-libs/mutable_variable.cmt
-lib/ocaml/compiler-libs/mutable_variable.cmti
 lib/ocaml/compiler-libs/mutable_variable.mli
 lib/ocaml/compiler-libs/numbers.cmx
 lib/ocaml/compiler-libs/ocamlbytecomp.a
@@ -406,30 +236,17 @@ lib/ocaml/compiler-libs/ocamloptcomp.cma
 lib/ocaml/compiler-libs/ocamloptcomp.cmxa
 lib/ocaml/compiler-libs/opcodes.cmx
 lib/ocaml/compiler-libs/oprint.cmx
-lib/ocaml/compiler-libs/optcompile.cmi
-lib/ocaml/compiler-libs/optcompile.cmt
-lib/ocaml/compiler-libs/optcompile.cmti
 lib/ocaml/compiler-libs/optcompile.cmx
-lib/ocaml/compiler-libs/opterrors.cmi
-lib/ocaml/compiler-libs/opterrors.cmt
-lib/ocaml/compiler-libs/opterrors.cmti
 lib/ocaml/compiler-libs/opterrors.cmx
-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/parameter.cmi
+lib/ocaml/compiler-libs/parameter.cmx
-lib/ocaml/compiler-libs/parameter.cmt
-lib/ocaml/compiler-libs/parameter.cmti
 lib/ocaml/compiler-libs/parameter.mli
 lib/ocaml/compiler-libs/parmatch.cmx
 lib/ocaml/compiler-libs/parse.cmx
 lib/ocaml/compiler-libs/parser.cmx
-lib/ocaml/compiler-libs/pass_wrapper.cmi
+lib/ocaml/compiler-libs/pass_wrapper.cmx
-lib/ocaml/compiler-libs/pass_wrapper.cmt
-lib/ocaml/compiler-libs/pass_wrapper.cmti
 lib/ocaml/compiler-libs/pass_wrapper.mli
 lib/ocaml/compiler-libs/path.cmx
 lib/ocaml/compiler-libs/pparse.cmx
@@ -437,171 +254,89 @@ lib/ocaml/compiler-libs/pprintast.cmx
 lib/ocaml/compiler-libs/predef.cmx
 lib/ocaml/compiler-libs/primitive.cmx
 lib/ocaml/compiler-libs/printast.cmx
-lib/ocaml/compiler-libs/printclambda.cmi
-lib/ocaml/compiler-libs/printclambda.cmt
-lib/ocaml/compiler-libs/printclambda.cmti
 lib/ocaml/compiler-libs/printclambda.cmx
 lib/ocaml/compiler-libs/printclambda.mli
-lib/ocaml/compiler-libs/printcmm.cmi
-lib/ocaml/compiler-libs/printcmm.cmt
-lib/ocaml/compiler-libs/printcmm.cmti
 lib/ocaml/compiler-libs/printcmm.cmx
 lib/ocaml/compiler-libs/printcmm.mli
 lib/ocaml/compiler-libs/printinstr.cmx
 lib/ocaml/compiler-libs/printlambda.cmx
-lib/ocaml/compiler-libs/printlinear.cmi
-lib/ocaml/compiler-libs/printlinear.cmt
-lib/ocaml/compiler-libs/printlinear.cmti
 lib/ocaml/compiler-libs/printlinear.cmx
 lib/ocaml/compiler-libs/printlinear.mli
-lib/ocaml/compiler-libs/printmach.cmi
-lib/ocaml/compiler-libs/printmach.cmt
-lib/ocaml/compiler-libs/printmach.cmti
 lib/ocaml/compiler-libs/printmach.cmx
 lib/ocaml/compiler-libs/printmach.mli
 lib/ocaml/compiler-libs/printpat.cmx
 lib/ocaml/compiler-libs/printtyp.cmx
 lib/ocaml/compiler-libs/printtyped.cmx
-lib/ocaml/compiler-libs/proc.cmi
-lib/ocaml/compiler-libs/proc.cmt
-lib/ocaml/compiler-libs/proc.cmti
 lib/ocaml/compiler-libs/proc.cmx
 lib/ocaml/compiler-libs/proc.mli
 lib/ocaml/compiler-libs/profile.cmx
-lib/ocaml/compiler-libs/projection.cmi
+lib/ocaml/compiler-libs/projection.cmx
-lib/ocaml/compiler-libs/projection.cmt
-lib/ocaml/compiler-libs/projection.cmti
 lib/ocaml/compiler-libs/projection.mli
-lib/ocaml/compiler-libs/ref_to_variables.cmi
+lib/ocaml/compiler-libs/rec_check.cmx
-lib/ocaml/compiler-libs/ref_to_variables.cmt
+lib/ocaml/compiler-libs/ref_to_variables.cmx
-lib/ocaml/compiler-libs/ref_to_variables.cmti
 lib/ocaml/compiler-libs/ref_to_variables.mli
-lib/ocaml/compiler-libs/reg.cmi
-lib/ocaml/compiler-libs/reg.cmt
-lib/ocaml/compiler-libs/reg.cmti
 lib/ocaml/compiler-libs/reg.cmx
 lib/ocaml/compiler-libs/reg.mli
-lib/ocaml/compiler-libs/reload.cmi
-lib/ocaml/compiler-libs/reload.cmt
-lib/ocaml/compiler-libs/reload.cmti
 lib/ocaml/compiler-libs/reload.cmx
 lib/ocaml/compiler-libs/reload.mli
-lib/ocaml/compiler-libs/reloadgen.cmi
-lib/ocaml/compiler-libs/reloadgen.cmt
-lib/ocaml/compiler-libs/reloadgen.cmti
 lib/ocaml/compiler-libs/reloadgen.cmx
 lib/ocaml/compiler-libs/reloadgen.mli
-lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmi
+lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmx
-lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmt
-lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmti
 lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.mli
-lib/ocaml/compiler-libs/remove_unused_arguments.cmi
+lib/ocaml/compiler-libs/remove_unused_arguments.cmx
-lib/ocaml/compiler-libs/remove_unused_arguments.cmt
-lib/ocaml/compiler-libs/remove_unused_arguments.cmti
 lib/ocaml/compiler-libs/remove_unused_arguments.mli
-lib/ocaml/compiler-libs/remove_unused_closure_vars.cmi
+lib/ocaml/compiler-libs/remove_unused_closure_vars.cmx
-lib/ocaml/compiler-libs/remove_unused_closure_vars.cmt
-lib/ocaml/compiler-libs/remove_unused_closure_vars.cmti
 lib/ocaml/compiler-libs/remove_unused_closure_vars.mli
-lib/ocaml/compiler-libs/remove_unused_program_constructs.cmi
+lib/ocaml/compiler-libs/remove_unused_program_constructs.cmx
-lib/ocaml/compiler-libs/remove_unused_program_constructs.cmt
-lib/ocaml/compiler-libs/remove_unused_program_constructs.cmti
 lib/ocaml/compiler-libs/remove_unused_program_constructs.mli
 lib/ocaml/compiler-libs/runtimedef.cmx
-lib/ocaml/compiler-libs/schedgen.cmi
-lib/ocaml/compiler-libs/schedgen.cmt
-lib/ocaml/compiler-libs/schedgen.cmti
 lib/ocaml/compiler-libs/schedgen.cmx
 lib/ocaml/compiler-libs/schedgen.mli
-lib/ocaml/compiler-libs/scheduling.cmi
-lib/ocaml/compiler-libs/scheduling.cmt
-lib/ocaml/compiler-libs/scheduling.cmti
 lib/ocaml/compiler-libs/scheduling.cmx
 lib/ocaml/compiler-libs/scheduling.mli
-lib/ocaml/compiler-libs/selectgen.cmi
-lib/ocaml/compiler-libs/selectgen.cmt
-lib/ocaml/compiler-libs/selectgen.cmti
 lib/ocaml/compiler-libs/selectgen.cmx
 lib/ocaml/compiler-libs/selectgen.mli
-lib/ocaml/compiler-libs/selection.cmi
-lib/ocaml/compiler-libs/selection.cmt
-lib/ocaml/compiler-libs/selection.cmti
 lib/ocaml/compiler-libs/selection.cmx
 lib/ocaml/compiler-libs/selection.mli
 lib/ocaml/compiler-libs/semantics_of_primitives.cmx
-lib/ocaml/compiler-libs/set_of_closures_id.cmi
+lib/ocaml/compiler-libs/set_of_closures_id.cmx
-lib/ocaml/compiler-libs/set_of_closures_id.cmt
-lib/ocaml/compiler-libs/set_of_closures_id.cmti
 lib/ocaml/compiler-libs/set_of_closures_id.mli
-lib/ocaml/compiler-libs/set_of_closures_origin.cmi
+lib/ocaml/compiler-libs/set_of_closures_origin.cmx
-lib/ocaml/compiler-libs/set_of_closures_origin.cmt
-lib/ocaml/compiler-libs/set_of_closures_origin.cmti
 lib/ocaml/compiler-libs/set_of_closures_origin.mli
-lib/ocaml/compiler-libs/share_constants.cmi
+lib/ocaml/compiler-libs/share_constants.cmx
-lib/ocaml/compiler-libs/share_constants.cmt
-lib/ocaml/compiler-libs/share_constants.cmti
 lib/ocaml/compiler-libs/share_constants.mli
-lib/ocaml/compiler-libs/simple_value_approx.cmi
+lib/ocaml/compiler-libs/simple_value_approx.cmx
-lib/ocaml/compiler-libs/simple_value_approx.cmt
-lib/ocaml/compiler-libs/simple_value_approx.cmti
 lib/ocaml/compiler-libs/simple_value_approx.mli
 lib/ocaml/compiler-libs/simplif.cmx
-lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmi
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmx
-lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmt
-lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmti
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops.mli
-lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmi
-lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.mli
-lib/ocaml/compiler-libs/simplify_common.cmi
+lib/ocaml/compiler-libs/simplify_common.cmx
-lib/ocaml/compiler-libs/simplify_common.cmt
-lib/ocaml/compiler-libs/simplify_common.cmti
 lib/ocaml/compiler-libs/simplify_common.mli
-lib/ocaml/compiler-libs/simplify_primitives.cmi
+lib/ocaml/compiler-libs/simplify_primitives.cmx
-lib/ocaml/compiler-libs/simplify_primitives.cmt
-lib/ocaml/compiler-libs/simplify_primitives.cmti
 lib/ocaml/compiler-libs/simplify_primitives.mli
-lib/ocaml/compiler-libs/spacetime_profiling.cmi
-lib/ocaml/compiler-libs/spacetime_profiling.cmt
-lib/ocaml/compiler-libs/spacetime_profiling.cmti
 lib/ocaml/compiler-libs/spacetime_profiling.cmx
 lib/ocaml/compiler-libs/spacetime_profiling.mli
-lib/ocaml/compiler-libs/spill.cmi
-lib/ocaml/compiler-libs/spill.cmt
-lib/ocaml/compiler-libs/spill.cmti
 lib/ocaml/compiler-libs/spill.cmx
 lib/ocaml/compiler-libs/spill.mli
-lib/ocaml/compiler-libs/split.cmi
-lib/ocaml/compiler-libs/split.cmt
-lib/ocaml/compiler-libs/split.cmti
 lib/ocaml/compiler-libs/split.cmx
 lib/ocaml/compiler-libs/split.mli
-lib/ocaml/compiler-libs/static_exception.cmi
+lib/ocaml/compiler-libs/static_exception.cmx
-lib/ocaml/compiler-libs/static_exception.cmt
-lib/ocaml/compiler-libs/static_exception.cmti
 lib/ocaml/compiler-libs/static_exception.mli
-lib/ocaml/compiler-libs/strmatch.cmi
-lib/ocaml/compiler-libs/strmatch.cmt
-lib/ocaml/compiler-libs/strmatch.cmti
 lib/ocaml/compiler-libs/strmatch.cmx
 lib/ocaml/compiler-libs/strmatch.mli
 lib/ocaml/compiler-libs/strongly_connected_components.cmx
 lib/ocaml/compiler-libs/stypes.cmx
 lib/ocaml/compiler-libs/subst.cmx
 lib/ocaml/compiler-libs/switch.cmx
-lib/ocaml/compiler-libs/symbol.cmi
+lib/ocaml/compiler-libs/symbol.cmx
-lib/ocaml/compiler-libs/symbol.cmt
-lib/ocaml/compiler-libs/symbol.cmti
 lib/ocaml/compiler-libs/symbol.mli
 lib/ocaml/compiler-libs/symtable.cmx
 lib/ocaml/compiler-libs/syntaxerr.cmx
-lib/ocaml/compiler-libs/tag.cmi
+lib/ocaml/compiler-libs/tag.cmx
-lib/ocaml/compiler-libs/tag.cmt
-lib/ocaml/compiler-libs/tag.cmti
 lib/ocaml/compiler-libs/tag.mli
 lib/ocaml/compiler-libs/targetint.cmx
 lib/ocaml/compiler-libs/tast_mapper.cmx
-lib/ocaml/compiler-libs/tbl.cmx
 lib/ocaml/compiler-libs/terminfo.cmx
 lib/ocaml/compiler-libs/translattribute.cmx
 lib/ocaml/compiler-libs/translclass.cmx
@@ -609,71 +344,47 @@ lib/ocaml/compiler-libs/translcore.cmx
 lib/ocaml/compiler-libs/translmod.cmx
 lib/ocaml/compiler-libs/translobj.cmx
 lib/ocaml/compiler-libs/translprim.cmx
-lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmi
-lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmt
-lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti
 lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmx
 lib/ocaml/compiler-libs/traverse_for_exported_symbols.mli
 lib/ocaml/compiler-libs/typeclass.cmx
 lib/ocaml/compiler-libs/typecore.cmx
 lib/ocaml/compiler-libs/typedecl.cmx
+lib/ocaml/compiler-libs/typedecl_immediacy.cmx
+lib/ocaml/compiler-libs/typedecl_properties.cmx
+lib/ocaml/compiler-libs/typedecl_unboxed.cmx
+lib/ocaml/compiler-libs/typedecl_variance.cmx
 lib/ocaml/compiler-libs/typedtree.cmx
 lib/ocaml/compiler-libs/typedtreeIter.cmx
-lib/ocaml/compiler-libs/typedtreeMap.cmx
 lib/ocaml/compiler-libs/typemod.cmx
 lib/ocaml/compiler-libs/typeopt.cmx
 lib/ocaml/compiler-libs/types.cmx
 lib/ocaml/compiler-libs/typetexp.cmx
-lib/ocaml/compiler-libs/un_anf.cmi
-lib/ocaml/compiler-libs/un_anf.cmt
-lib/ocaml/compiler-libs/un_anf.cmti
 lib/ocaml/compiler-libs/un_anf.cmx
 lib/ocaml/compiler-libs/un_anf.mli
-lib/ocaml/compiler-libs/unbox_closures.cmi
+lib/ocaml/compiler-libs/unbox_closures.cmx
-lib/ocaml/compiler-libs/unbox_closures.cmt
-lib/ocaml/compiler-libs/unbox_closures.cmti
 lib/ocaml/compiler-libs/unbox_closures.mli
-lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmi
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmx
-lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmt
-lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmti
 lib/ocaml/compiler-libs/unbox_free_vars_of_closures.mli
-lib/ocaml/compiler-libs/unbox_specialised_args.cmi
+lib/ocaml/compiler-libs/unbox_specialised_args.cmx
-lib/ocaml/compiler-libs/unbox_specialised_args.cmt
-lib/ocaml/compiler-libs/unbox_specialised_args.cmti
 lib/ocaml/compiler-libs/unbox_specialised_args.mli
 lib/ocaml/compiler-libs/untypeast.cmx
-lib/ocaml/compiler-libs/var_within_closure.cmi
+lib/ocaml/compiler-libs/var_within_closure.cmx
-lib/ocaml/compiler-libs/var_within_closure.cmt
-lib/ocaml/compiler-libs/var_within_closure.cmti
 lib/ocaml/compiler-libs/var_within_closure.mli
-lib/ocaml/compiler-libs/variable.cmi
+lib/ocaml/compiler-libs/variable.cmx
-lib/ocaml/compiler-libs/variable.cmt
-lib/ocaml/compiler-libs/variable.cmti
 lib/ocaml/compiler-libs/variable.mli
 lib/ocaml/compiler-libs/warnings.cmx
-lib/ocaml/compiler-libs/x86_ast.cmi
-lib/ocaml/compiler-libs/x86_ast.cmti
 lib/ocaml/compiler-libs/x86_ast.mli
-lib/ocaml/compiler-libs/x86_dsl.cmi
-lib/ocaml/compiler-libs/x86_dsl.cmt
-lib/ocaml/compiler-libs/x86_dsl.cmti
 lib/ocaml/compiler-libs/x86_dsl.cmx
 lib/ocaml/compiler-libs/x86_dsl.mli
-lib/ocaml/compiler-libs/x86_gas.cmi
-lib/ocaml/compiler-libs/x86_gas.cmt
-lib/ocaml/compiler-libs/x86_gas.cmti
 lib/ocaml/compiler-libs/x86_gas.cmx
 lib/ocaml/compiler-libs/x86_gas.mli
-lib/ocaml/compiler-libs/x86_masm.cmi
-lib/ocaml/compiler-libs/x86_masm.cmt
-lib/ocaml/compiler-libs/x86_masm.cmti
 lib/ocaml/compiler-libs/x86_masm.cmx
 lib/ocaml/compiler-libs/x86_masm.mli
-lib/ocaml/compiler-libs/x86_proc.cmi
-lib/ocaml/compiler-libs/x86_proc.cmt
-lib/ocaml/compiler-libs/x86_proc.cmti
 lib/ocaml/compiler-libs/x86_proc.cmx
 lib/ocaml/compiler-libs/x86_proc.mli
+lib/ocaml/dynlink_common.cmx
+lib/ocaml/dynlink_platform_intf.cmx
+lib/ocaml/dynlink_types.cmx
 lib/ocaml/libasmrun.a
 lib/ocaml/libasmrun_pic.a
 lib/ocaml/libasmrun_shared.so
@@ -734,159 +445,121 @@ lib/ocaml/profiling.cmx
 lib/ocaml/profiling.o
 lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.o
-lib/ocaml/std_exit.p.cmt
 lib/ocaml/std_exit.p.cmx
 lib/ocaml/std_exit.p.o
 lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cmx
 lib/ocaml/stdlib.cmxa
 lib/ocaml/stdlib.p.a
-lib/ocaml/stdlib.p.cmt
 lib/ocaml/stdlib.p.cmx
 lib/ocaml/stdlib.p.cmxa
 lib/ocaml/stdlib__arg.cmx
-lib/ocaml/stdlib__arg.p.cmt
 lib/ocaml/stdlib__arg.p.cmx
 lib/ocaml/stdlib__array.cmx
-lib/ocaml/stdlib__array.p.cmt
 lib/ocaml/stdlib__array.p.cmx
 lib/ocaml/stdlib__arrayLabels.cmx
-lib/ocaml/stdlib__arrayLabels.p.cmt
 lib/ocaml/stdlib__arrayLabels.p.cmx
 lib/ocaml/stdlib__bigarray.cmx
-lib/ocaml/stdlib__bigarray.p.cmt
 lib/ocaml/stdlib__bigarray.p.cmx
+lib/ocaml/stdlib__bool.cmx
+lib/ocaml/stdlib__bool.p.cmx
 lib/ocaml/stdlib__buffer.cmx
-lib/ocaml/stdlib__buffer.p.cmt
 lib/ocaml/stdlib__buffer.p.cmx
 lib/ocaml/stdlib__bytes.cmx
-lib/ocaml/stdlib__bytes.p.cmt
 lib/ocaml/stdlib__bytes.p.cmx
 lib/ocaml/stdlib__bytesLabels.cmx
-lib/ocaml/stdlib__bytesLabels.p.cmt
 lib/ocaml/stdlib__bytesLabels.p.cmx
 lib/ocaml/stdlib__callback.cmx
-lib/ocaml/stdlib__callback.p.cmt
 lib/ocaml/stdlib__callback.p.cmx
 lib/ocaml/stdlib__char.cmx
-lib/ocaml/stdlib__char.p.cmt
 lib/ocaml/stdlib__char.p.cmx
 lib/ocaml/stdlib__complex.cmx
-lib/ocaml/stdlib__complex.p.cmt
 lib/ocaml/stdlib__complex.p.cmx
 lib/ocaml/stdlib__digest.cmx
-lib/ocaml/stdlib__digest.p.cmt
 lib/ocaml/stdlib__digest.p.cmx
 lib/ocaml/stdlib__ephemeron.cmx
-lib/ocaml/stdlib__ephemeron.p.cmt
 lib/ocaml/stdlib__ephemeron.p.cmx
 lib/ocaml/stdlib__filename.cmx
-lib/ocaml/stdlib__filename.p.cmt
 lib/ocaml/stdlib__filename.p.cmx
 lib/ocaml/stdlib__float.cmx
-lib/ocaml/stdlib__float.p.cmt
 lib/ocaml/stdlib__float.p.cmx
 lib/ocaml/stdlib__format.cmx
-lib/ocaml/stdlib__format.p.cmt
 lib/ocaml/stdlib__format.p.cmx
+lib/ocaml/stdlib__fun.cmx
+lib/ocaml/stdlib__fun.p.cmx
 lib/ocaml/stdlib__gc.cmx
-lib/ocaml/stdlib__gc.p.cmt
 lib/ocaml/stdlib__gc.p.cmx
 lib/ocaml/stdlib__genlex.cmx
-lib/ocaml/stdlib__genlex.p.cmt
 lib/ocaml/stdlib__genlex.p.cmx
 lib/ocaml/stdlib__hashtbl.cmx
-lib/ocaml/stdlib__hashtbl.p.cmt
 lib/ocaml/stdlib__hashtbl.p.cmx
+lib/ocaml/stdlib__int.cmx
+lib/ocaml/stdlib__int.p.cmx
 lib/ocaml/stdlib__int32.cmx
-lib/ocaml/stdlib__int32.p.cmt
 lib/ocaml/stdlib__int32.p.cmx
 lib/ocaml/stdlib__int64.cmx
-lib/ocaml/stdlib__int64.p.cmt
 lib/ocaml/stdlib__int64.p.cmx
 lib/ocaml/stdlib__lazy.cmx
-lib/ocaml/stdlib__lazy.p.cmt
 lib/ocaml/stdlib__lazy.p.cmx
 lib/ocaml/stdlib__lexing.cmx
-lib/ocaml/stdlib__lexing.p.cmt
 lib/ocaml/stdlib__lexing.p.cmx
 lib/ocaml/stdlib__list.cmx
-lib/ocaml/stdlib__list.p.cmt
 lib/ocaml/stdlib__list.p.cmx
 lib/ocaml/stdlib__listLabels.cmx
-lib/ocaml/stdlib__listLabels.p.cmt
 lib/ocaml/stdlib__listLabels.p.cmx
 lib/ocaml/stdlib__map.cmx
-lib/ocaml/stdlib__map.p.cmt
 lib/ocaml/stdlib__map.p.cmx
 lib/ocaml/stdlib__marshal.cmx
-lib/ocaml/stdlib__marshal.p.cmt
 lib/ocaml/stdlib__marshal.p.cmx
 lib/ocaml/stdlib__moreLabels.cmx
-lib/ocaml/stdlib__moreLabels.p.cmt
 lib/ocaml/stdlib__moreLabels.p.cmx
 lib/ocaml/stdlib__nativeint.cmx
-lib/ocaml/stdlib__nativeint.p.cmt
 lib/ocaml/stdlib__nativeint.p.cmx
 lib/ocaml/stdlib__obj.cmx
-lib/ocaml/stdlib__obj.p.cmt
 lib/ocaml/stdlib__obj.p.cmx
 lib/ocaml/stdlib__oo.cmx
-lib/ocaml/stdlib__oo.p.cmt
 lib/ocaml/stdlib__oo.p.cmx
+lib/ocaml/stdlib__option.cmx
+lib/ocaml/stdlib__option.p.cmx
 lib/ocaml/stdlib__parsing.cmx
-lib/ocaml/stdlib__parsing.p.cmt
 lib/ocaml/stdlib__parsing.p.cmx
+lib/ocaml/stdlib__pervasives.cmx
+lib/ocaml/stdlib__pervasives.p.cmx
 lib/ocaml/stdlib__printexc.cmx
-lib/ocaml/stdlib__printexc.p.cmt
 lib/ocaml/stdlib__printexc.p.cmx
 lib/ocaml/stdlib__printf.cmx
-lib/ocaml/stdlib__printf.p.cmt
 lib/ocaml/stdlib__printf.p.cmx
 lib/ocaml/stdlib__queue.cmx
-lib/ocaml/stdlib__queue.p.cmt
 lib/ocaml/stdlib__queue.p.cmx
 lib/ocaml/stdlib__random.cmx
-lib/ocaml/stdlib__random.p.cmt
 lib/ocaml/stdlib__random.p.cmx
+lib/ocaml/stdlib__result.cmx
+lib/ocaml/stdlib__result.p.cmx
 lib/ocaml/stdlib__scanf.cmx
-lib/ocaml/stdlib__scanf.p.cmt
 lib/ocaml/stdlib__scanf.p.cmx
 lib/ocaml/stdlib__seq.cmx
-lib/ocaml/stdlib__seq.p.cmt
 lib/ocaml/stdlib__seq.p.cmx
 lib/ocaml/stdlib__set.cmx
-lib/ocaml/stdlib__set.p.cmt
 lib/ocaml/stdlib__set.p.cmx
-lib/ocaml/stdlib__sort.cmx
-lib/ocaml/stdlib__sort.p.cmt
-lib/ocaml/stdlib__sort.p.cmx
 lib/ocaml/stdlib__spacetime.cmx
-lib/ocaml/stdlib__spacetime.p.cmt
 lib/ocaml/stdlib__spacetime.p.cmx
 lib/ocaml/stdlib__stack.cmx
-lib/ocaml/stdlib__stack.p.cmt
 lib/ocaml/stdlib__stack.p.cmx
 lib/ocaml/stdlib__stdLabels.cmx
-lib/ocaml/stdlib__stdLabels.p.cmt
 lib/ocaml/stdlib__stdLabels.p.cmx
 lib/ocaml/stdlib__stream.cmx
-lib/ocaml/stdlib__stream.p.cmt
 lib/ocaml/stdlib__stream.p.cmx
 lib/ocaml/stdlib__string.cmx
-lib/ocaml/stdlib__string.p.cmt
 lib/ocaml/stdlib__string.p.cmx
 lib/ocaml/stdlib__stringLabels.cmx
-lib/ocaml/stdlib__stringLabels.p.cmt
 lib/ocaml/stdlib__stringLabels.p.cmx
 lib/ocaml/stdlib__sys.cmx
-lib/ocaml/stdlib__sys.p.cmt
 lib/ocaml/stdlib__sys.p.cmx
 lib/ocaml/stdlib__uchar.cmx
-lib/ocaml/stdlib__uchar.p.cmt
 lib/ocaml/stdlib__uchar.p.cmx
+lib/ocaml/stdlib__unit.cmx
+lib/ocaml/stdlib__unit.p.cmx
 lib/ocaml/stdlib__weak.cmx
-lib/ocaml/stdlib__weak.p.cmt
 lib/ocaml/stdlib__weak.p.cmx
 lib/ocaml/str.a
 lib/ocaml/str.cmx

math/coq/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.42 2019/09/10 14:09:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.43 2019/09/18 17:49:35 chrisz Exp $
 
 COMMENT=		proof assistant based on a typed lambda calculus
 
 V=			8.10+beta2
+REVISION=		0
 GH_ACCOUNT =		coq
 GH_PROJECT =		coq
 GH_TAGNAME =		V${V}

math/ocaml-num/Makefile

@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2019/07/12 20:47:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	library for arithmetic on big integers and rationals
 CATEGORIES =	math
 
 V =		1.1
+REVISION =	0
 GH_ACCOUNT =	ocaml
 GH_PROJECT =	num
 #GH_TAGNAME =	v${V}

math/ocaml-zarith/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/07/12 20:47:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	arbitrary precision integer and rational arithmetic
 CATEGORIES =	math
@@ -9,7 +9,7 @@ GH_PROJECT =	Zarith
 GH_TAGNAME =	release-${V}
 DISTNAME =	${GH_PROJECT}-${V}
 PKGNAME =	ocaml-zarith-${V}
-REVISION =	0
+REVISION =	1
 HOMEPAGE =	https://github.com/ocaml/num/
 
 MAINTAINER =	Christopher Zimmermann <chrisz@openbsd.org>

net/mldonkey/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2019/07/12 20:48:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =	e-donkey client
 
 VER =		3.1.6
 DISTNAME =	mldonkey-${VER}
-REVISION =	5
+REVISION =	6
 CATEGORIES =	net
 
 HOMEPAGE =	http://mldonkey.sourceforge.net/Main_Page

net/unison/2.4x/Makefile

@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2019/03/04 12:51:16 chrisz Exp $
+# $OpenBSD: Makefile,v 1.7 2019/09/18 17:49:36 chrisz Exp $
 
 VER=		2.48.15
 REV=		v4
+REVISION=	0
 GH_TAGNAME=	v${VER}${REV}
 PKGNAME=	unison-${VER}${REV:S/^v/pl/}
 

net/unison/2.4x/patches/patch-files_ml

@@ -0,0 +1,14 @@
+$OpenBSD: patch-files_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
+
+Index: files.ml
+--- files.ml.orig
++++ files.ml
+@@ -722,7 +722,7 @@ let get_files_in_directory dir =
+   with End_of_file ->
+     dirh.System.closedir ()
+   end;
+-  Sort.list (<) !files
++  List.sort String.compare !files
+ 
+ let ls dir pattern =
+   Util.convertUnixErrorsToTransient

net/unison/2.4x/patches/patch-recon_ml

@@ -0,0 +1,16 @@
+$OpenBSD: patch-recon_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
+
+Index: recon.ml
+--- recon.ml.orig
++++ recon.ml
+@@ -651,9 +651,7 @@ let rec reconcile
+ 
+ (* Sorts the paths so that they will be displayed in order                   *)
+ let sortPaths pathUpdatesList =
+-  Sort.list
+-    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
+-    pathUpdatesList
++  List.sort Path.compare pathUpdatesList
+ 
+ let rec enterPath p1 p2 t =
+   match Path.deconstruct p1, Path.deconstruct p2 with

net/unison/2.4x/patches/patch-system_system_generic_ml

@@ -0,0 +1,14 @@
+$OpenBSD: patch-system_system_generic_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
+
+Index: system/system_generic.ml
+--- system/system_generic.ml.orig
++++ system/system_generic.ml
+@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
+ let chmod = Unix.chmod
+ let chown = Unix.chown
+ let utimes = Unix.utimes
+-let link = Unix.link
++let link source dest = Unix.link source dest
+ let openfile = Unix.openfile
+ let opendir f =
+   let h = Unix.opendir f in

net/unison/2.5x/Makefile

@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/04 12:51:16 chrisz Exp $
+# $OpenBSD: Makefile,v 1.5 2019/09/18 17:49:36 chrisz Exp $
  
 GH_TAGNAME=	v2.51.2
-REVISION=	1
+REVISION=	2
 
 WRKDIST=	${WRKDIR}/${PKGNAME}/src
 

net/unison/2.5x/patches/patch-files_ml

@@ -0,0 +1,14 @@
+$OpenBSD: patch-files_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
+
+Index: files.ml
+--- files.ml.orig
++++ files.ml
+@@ -734,7 +734,7 @@ let get_files_in_directory dir =
+   with End_of_file ->
+     dirh.System.closedir ()
+   end;
+-  Sort.list (<) !files
++  List.sort String.compare !files
+ 
+ let ls dir pattern =
+   Util.convertUnixErrorsToTransient

net/unison/2.5x/patches/patch-recon_ml

@@ -0,0 +1,16 @@
+$OpenBSD: patch-recon_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
+
+Index: recon.ml
+--- recon.ml.orig
++++ recon.ml
+@@ -661,9 +661,7 @@ let rec reconcile
+ 
+ (* Sorts the paths so that they will be displayed in order                   *)
+ let sortPaths pathUpdatesList =
+-  Sort.list
+-    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
+-    pathUpdatesList
++  List.sort Path.compare pathUpdatesList
+ 
+ let rec enterPath p1 p2 t =
+   match Path.deconstruct p1, Path.deconstruct p2 with

net/unison/2.5x/patches/patch-system_system_generic_ml

@@ -0,0 +1,14 @@
+$OpenBSD: patch-system_system_generic_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
+
+Index: system/system_generic.ml
+--- system/system_generic.ml.orig
++++ system/system_generic.ml
+@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
+ let chmod = Unix.chmod
+ let chown = Unix.chown
+ let utimes = Unix.utimes
+-let link = Unix.link
++let link source dest = Unix.link source dest
+ let openfile = Unix.openfile
+ let opendir f =
+   let h = Unix.opendir f in

sysutils/findlib/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2019/09/07 18:45:02 chrisz Exp $
+# $OpenBSD: Makefile,v 1.38 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT=	OCaml package manager
 CATEGORIES=	sysutils
 DISTNAME=	findlib-1.8.1
+REVISION=	0
 
 MASTER_SITES=	http://download.camlcity.org/download/
 

sysutils/opam/Makefile

@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2019/07/16 18:02:07 chrisz Exp $
+# $OpenBSD: Makefile,v 1.15 2019/09/18 17:49:36 chrisz Exp $
 
 COMMENT =		OCaml source-based package manager
 
 CATEGORIES =		sysutils devel
 
 V =			2.0.5
+REVISION =		0
 PKGNAME =		opam-${V}
 DISTNAME =		opam-full-${V}
 

textproc/bibtex2html/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2019/07/12 20:49:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2019/09/18 17:49:37 chrisz Exp $
 
 COMMENT =		collection of tools for translating from BibTeX to HTML
 
 DISTNAME =		bibtex2html-1.99
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		textproc
 HOMEPAGE =		https://www.lri.fr/~filliatr/bibtex2html/

textproc/hevea/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2019/07/12 20:49:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2019/09/18 17:49:37 chrisz Exp $
 
 COMMENT=	LaTeX to html translator
 
@@ -9,6 +9,7 @@ PERMIT_PACKAGE=	Yes
 WANTLIB=		c m pthread
 
 DISTNAME =	hevea-2.32
+REVISION =	0
 MASTER_SITES =	http://para.inria.fr/~maranget/hevea/distri/ \
 		https://spacehopper.org/mirrors/
 

x11/kde-applications/kalzium/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2019/04/28 20:52:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2019/09/18 17:49:37 chrisz Exp $
 
 COMMENT =	periodic table of elements
 DISTNAME =	kalzium-${VERSION}
 CATEGORIES =	education math
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	https://edu.kde.org/kalzium/
 

x11/lablgtk2/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.46 2019/07/12 20:51:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2019/09/18 17:49:37 chrisz Exp $
 
 COMMENT =	OCaml interface to GTK+2
 
 V =		2.18.8
+REVISION =	0
 DISTNAME =	lablgtk-$V
 PKGNAME =	lablgtk2-$V
 CATEGORIES =	x11 devel