summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Dokuchaev <danfe@FreeBSD.org>2019-06-24 10:14:57 +0000
committerAlexey Dokuchaev <danfe@FreeBSD.org>2019-06-24 10:14:57 +0000
commitb51d4476846a1b8364c05d954e88fa977c5d2080 (patch)
treec6799f414d81b83df0e1640dde540befcd389da6
parentUpdate to version 3.7. (diff)
Update OCaml to version 4.05.0 (this is the last version where strings
are unsafe by default, which is the main motivation why it was picked, but not the very latest one) and synchronize the rest of the stack and dependent ports with it, particularly: - Update `devel/ocaml-ocamlbuild' to version 0.14.0 and unbreak, register build dependency on all ports that require it (should be part of USE_OCAML, but we do not want to make any Mk-related changes the for time being) - Update `devel/ocaml-camlp4' to version 4.05+2 - Update `devel/ocaml-camlp5' to version 7.07 (the project had moved to GitHub) - Mark `devel/ocaml-deriving-ocsigen' as BROKEN for now, it is very outdated and requires quite a lot of work - Update `x11-toolkits/ocaml-labltk' to version 8.06.3 PR: 218333 Exp-run by: antoine
Notes
Notes: svn path=/head/; revision=505020
-rw-r--r--converters/ocaml-base64/Makefile2
-rw-r--r--converters/ocaml-jsonm/Makefile1
-rw-r--r--databases/ocaml-sqlite3/Makefile2
-rw-r--r--devel/aifad/Makefile1
-rw-r--r--devel/cil/Makefile2
-rw-r--r--devel/menhir/Makefile2
-rw-r--r--devel/ocaml-camljava/Makefile1
-rw-r--r--devel/ocaml-camlp4/Makefile7
-rw-r--r--devel/ocaml-camlp4/distinfo6
-rw-r--r--devel/ocaml-camlp4/files/patch-Makefile15
-rw-r--r--devel/ocaml-camlp4/files/patch-build_install.sh13
-rw-r--r--devel/ocaml-camlp5/Makefile7
-rw-r--r--devel/ocaml-camlp5/distinfo5
-rw-r--r--devel/ocaml-camlp5/pkg-plist2
-rw-r--r--devel/ocaml-cfg/Makefile1
-rw-r--r--devel/ocaml-cmdliner/Makefile2
-rw-r--r--devel/ocaml-deriving-ocsigen/Makefile2
-rw-r--r--devel/ocaml-findlib/Makefile8
-rw-r--r--devel/ocaml-findlib/pkg-plist2
-rw-r--r--devel/ocaml-ipaddr/Makefile1
-rw-r--r--devel/ocaml-lacaml/Makefile2
-rw-r--r--devel/ocaml-lwt/Makefile5
-rw-r--r--devel/ocaml-ocamlbuild/Makefile6
-rw-r--r--devel/ocaml-ocamlbuild/distinfo6
-rw-r--r--devel/ocaml-ocamlbuild/pkg-plist3
-rw-r--r--devel/ocaml-parmap/Makefile2
-rw-r--r--devel/ocaml-pcre/Makefile1
-rw-r--r--devel/ocaml-pomap/Makefile2
-rw-r--r--devel/ocaml-ppx-tools/Makefile3
-rw-r--r--devel/ocaml-ppx-tools/distinfo6
-rw-r--r--devel/ocaml-re/Makefile2
-rw-r--r--devel/ocaml-react/Makefile2
-rw-r--r--devel/ocaml-res/Makefile2
-rw-r--r--devel/ocaml-sexplib/Makefile1
-rw-r--r--devel/ocaml-sexplib/files/patch-lib_conv.ml46
-rw-r--r--devel/ocaml-type_conv/Makefile2
-rw-r--r--devel/ocaml-ulex/Makefile2
-rw-r--r--devel/ocaml-uutf/Makefile2
-rw-r--r--lang/ocaml-camlidl/Makefile1
-rw-r--r--lang/ocaml/Makefile10
-rw-r--r--lang/ocaml/distinfo17
-rw-r--r--lang/ocaml/files/patch-configure167
-rw-r--r--lang/ocaml/pkg-descr2
-rw-r--r--lang/ocaml/pkg-plist845
-rw-r--r--math/facile/Makefile1
-rw-r--r--math/ocamlgsl/Makefile1
-rw-r--r--net-p2p/mldonkey/Makefile6
-rw-r--r--security/ocaml-cryptokit/Makefile5
-rw-r--r--security/sks/Makefile5
-rw-r--r--security/sks/files/debian-bug-870150144
-rw-r--r--security/sks/files/patch-Makefile50
-rw-r--r--textproc/hevea/Makefile2
-rw-r--r--textproc/ocaml-text/Makefile2
-rw-r--r--x11-toolkits/ocaml-labltk/Makefile5
-rw-r--r--x11-toolkits/ocaml-labltk/distinfo5
55 files changed, 1209 insertions, 236 deletions
diff --git a/converters/ocaml-base64/Makefile b/converters/ocaml-base64/Makefile
index bdca5cee0bc0..d37356e985ec 100644
--- a/converters/ocaml-base64/Makefile
+++ b/converters/ocaml-base64/Makefile
@@ -10,6 +10,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
COMMENT= Base64 encoding and decoding in OCaml
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USE_GITHUB= yes
GH_ACCOUNT= mirage
GH_PROJECT= ocaml-base64
diff --git a/converters/ocaml-jsonm/Makefile b/converters/ocaml-jsonm/Makefile
index dbb5e34fff15..600ccac12ce8 100644
--- a/converters/ocaml-jsonm/Makefile
+++ b/converters/ocaml-jsonm/Makefile
@@ -13,6 +13,7 @@ COMMENT= Non-blocking streaming JSON codec for OCaml
LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf
+BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
RUN_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf
USES= tar:tbz
diff --git a/databases/ocaml-sqlite3/Makefile b/databases/ocaml-sqlite3/Makefile
index 42f1959e1dd8..d8a93e5cd454 100644
--- a/databases/ocaml-sqlite3/Makefile
+++ b/databases/ocaml-sqlite3/Makefile
@@ -15,6 +15,8 @@ LICENSE_NAME= OCaml-SQLite3 unique permissive license
LICENSE_FILE= ${WRKSRC}/COPYING.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USES= compiler:features gmake pkgconfig sqlite
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile
index 5ac9f9aca82e..d6a441db0e22 100644
--- a/devel/aifad/Makefile
+++ b/devel/aifad/Makefile
@@ -13,6 +13,7 @@ LICENSE= LGPL21+
BUILD_DEPENDS= menhir:devel/menhir \
ocaml-cfg>0:devel/ocaml-cfg \
+ ocamlbuild:devel/ocaml-ocamlbuild \
ocaml-pcre>0:devel/ocaml-pcre \
ocaml-res>0:devel/ocaml-res
LIB_DEPENDS= libpcre.so:devel/pcre
diff --git a/devel/cil/Makefile b/devel/cil/Makefile
index e20f321b05ee..6b1debbccdd7 100644
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
CONFLICTS= ccured-[0-9]*
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
ONLY_FOR_ARCHS= i386 amd64
USES= gmake perl5
USE_OCAML= yes
diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile
index 6a18864494fc..b1d88c8055be 100644
--- a/devel/menhir/Makefile
+++ b/devel/menhir/Makefile
@@ -12,6 +12,8 @@ COMMENT= LR(1) parser generator for OCaml
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USES= gmake shebangfix
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile
index fa73b17c913d..15e6c6b53f27 100644
--- a/devel/ocaml-camljava/Makefile
+++ b/devel/ocaml-camljava/Makefile
@@ -23,6 +23,7 @@ post-patch:
-e "s,^\(CC=\).*,#\&,g" \
-e "s,i386,${ARCH},g" \
${WRKSRC}/Makefile.config
+ @${REINPLACE_CMD} -e 's,(int64,&_t,' ${WRKSRC}/lib/jnistubs.c
test:
@${ECHO_CMD} "Testing IDL library"
diff --git a/devel/ocaml-camlp4/Makefile b/devel/ocaml-camlp4/Makefile
index 56692428b933..07d08c901f6a 100644
--- a/devel/ocaml-camlp4/Makefile
+++ b/devel/ocaml-camlp4/Makefile
@@ -2,16 +2,17 @@
# $FreeBSD$
PORTNAME= camlp4
-PORTVERSION= 4.02.1+1
-PORTREVISION= 1
+PORTVERSION= 4.05+2
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
MAINTAINER= michipili@gmail.com
-COMMENT= Camlp4 is a system for writing extensible parsers for OCaml
+COMMENT= System for writing extensible parsers for OCaml
LICENSE= LGPL20
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USE_GITHUB= yes
GH_ACCOUNT= ocaml
diff --git a/devel/ocaml-camlp4/distinfo b/devel/ocaml-camlp4/distinfo
index dafc83be6c4b..058ba6be8a87 100644
--- a/devel/ocaml-camlp4/distinfo
+++ b/devel/ocaml-camlp4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464772487
-SHA256 (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 06ec2c075a3960a757ba133bba468f06622624f9a44e18e3de7d609fa06f62d2
-SIZE (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 645754
+TIMESTAMP = 1533176554
+SHA256 (ocaml-camlp4-4.05+2_GH0.tar.gz) = db242c0f4896ddd9dc7d6e8064cba8bf099fb9a4d4f5ed35120978501cd3a935
+SIZE (ocaml-camlp4-4.05+2_GH0.tar.gz) = 647609
diff --git a/devel/ocaml-camlp4/files/patch-Makefile b/devel/ocaml-camlp4/files/patch-Makefile
index bf1e1fab001b..7e45c5769b8a 100644
--- a/devel/ocaml-camlp4/files/patch-Makefile
+++ b/devel/ocaml-camlp4/files/patch-Makefile
@@ -1,18 +1,11 @@
---- Makefile.orig 2014-10-21 11:41:15 UTC
+--- Makefile.orig 2017-10-11 20:17:38 UTC
+++ Makefile
-@@ -19,12 +19,12 @@ all: byte native
+@@ -21,7 +21,7 @@ all: byte native
.PHONY: install
install:
-- ./build/install.sh
-+ env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) ./build/install.sh
+- env DESTDIR=$(DESTDIR) sh ./build/install.sh
++ env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) sh ./build/install.sh
.PHONY: install-META
install-META: camlp4/META
-- mkdir -p ${PKGDIR}/camlp4/
-- cp -f camlp4/META ${PKGDIR}/camlp4/
-+ mkdir -p ${DESTDIR}${PKGDIR}/camlp4/
-+ cp -f camlp4/META ${DESTDIR}${PKGDIR}/camlp4/
-
- camlp4/META: camlp4/META.in
- sed -e s/@@VERSION@@/${version}/g $? > $@
diff --git a/devel/ocaml-camlp4/files/patch-build_install.sh b/devel/ocaml-camlp4/files/patch-build_install.sh
deleted file mode 100644
index b99f59baa514..000000000000
--- a/devel/ocaml-camlp4/files/patch-build_install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/install.sh.orig 2014-10-21 11:41:15 UTC
-+++ build/install.sh
-@@ -26,8 +26,8 @@ SAVED_LIBDIR="${LIBDIR}"
-
- . ./config.sh
-
--BINDIR="${SAVED_BINDIR:-${BINDIR}}"
--LIBDIR="${SAVED_LIBDIR:-${LIBDIR}}"
-+BINDIR="${DESTDIR}${SAVED_BINDIR:-${BINDIR}}"
-+LIBDIR="${DESTDIR}${SAVED_LIBDIR:-${LIBDIR}}"
-
- not_installed=$PWD/_build/not_installed
-
diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile
index 9e89e1ccf7a0..44968a05da5f 100644
--- a/devel/ocaml-camlp5/Makefile
+++ b/devel/ocaml-camlp5/Makefile
@@ -2,11 +2,8 @@
# $FreeBSD$
PORTNAME= camlp5
-PORTVERSION= 6.16
+PORTVERSION= 7.07
CATEGORIES= devel
-MASTER_SITES= http://camlp5.gforge.inria.fr/distrib/src/ \
- http://cristal.inria.fr/~ddr/camlp5/distrib/src/ \
- http://pauillac.inria.fr/~ddr/camlp5/distrib/src/
PKGNAMEPREFIX= ocaml-
DIST_SUBDIR= ${PKGBASE}
@@ -19,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= tar:tgz
+USE_GITHUB= yes
+GH_TAGNAME= rel${PORTVERSION:S/.//}
USE_OCAML= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix ${PREFIX}
diff --git a/devel/ocaml-camlp5/distinfo b/devel/ocaml-camlp5/distinfo
index 2f717af62e5e..2ff8c4ba9974 100644
--- a/devel/ocaml-camlp5/distinfo
+++ b/devel/ocaml-camlp5/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ocaml-camlp5/camlp5-6.16.tgz) = fd446cff6421f5144a521c7cecfdc7217b1424908186cddd3d5be543b35058b1
-SIZE (ocaml-camlp5/camlp5-6.16.tgz) = 759877
+TIMESTAMP = 1539160056
+SHA256 (ocaml-camlp5/camlp5-camlp5-7.07-rel707_GH0.tar.gz) = a2c493b833b217adf94d2000eb19015b990c4e441beb35cf36b1d33ed2351991
+SIZE (ocaml-camlp5/camlp5-camlp5-7.07-rel707_GH0.tar.gz) = 813500
diff --git a/devel/ocaml-camlp5/pkg-plist b/devel/ocaml-camlp5/pkg-plist
index 5c24601eb7d4..60b8267cd96f 100644
--- a/devel/ocaml-camlp5/pkg-plist
+++ b/devel/ocaml-camlp5/pkg-plist
@@ -8,6 +8,8 @@ bin/mkcamlp5
bin/mkcamlp5.opt
bin/ocpp5
lib/ocaml/camlp5/META
+lib/ocaml/camlp5/ast2pt.cmi
+lib/ocaml/camlp5/ast2pt.mli
lib/ocaml/camlp5/camlp5.a
lib/ocaml/camlp5/camlp5.cma
lib/ocaml/camlp5/camlp5.cmxa
diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile
index 10403728c39e..1611427e132a 100644
--- a/devel/ocaml-cfg/Makefile
+++ b/devel/ocaml-cfg/Makefile
@@ -14,6 +14,7 @@ LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.txt
BUILD_DEPENDS= menhir:devel/menhir
+BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
USE_GITHUB= yes
GH_ACCOUNT= mmottl
diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile
index 9ed9bb4edf60..e2b33c7d6fa8 100644
--- a/devel/ocaml-cmdliner/Makefile
+++ b/devel/ocaml-cmdliner/Makefile
@@ -11,6 +11,8 @@ COMMENT= OCaml module for handling of command line interfaces
LICENSE= BSD3CLAUSE
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USES= tar:tbz
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
diff --git a/devel/ocaml-deriving-ocsigen/Makefile b/devel/ocaml-deriving-ocsigen/Makefile
index dc00badf524f..5e5a9d371bdf 100644
--- a/devel/ocaml-deriving-ocsigen/Makefile
+++ b/devel/ocaml-deriving-ocsigen/Makefile
@@ -11,6 +11,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
COMMENT= Function derivation library
+BROKEN= old version, incompatible with modern OCaml
+
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 2b1e3e361493..f85b742948a0 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -36,12 +36,18 @@ TOOLBOX_CONFIGURE_ON= -with-toolbox
TOOLBOX_RUN_DEPENDS= labltk:x11-toolkits/ocaml-labltk
TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS}
+.include <bsd.port.pre.mk>
+
post-install:
cd ${STAGEDIR}${PREFIX} && \
${STRIP_CMD} bin/ocamlfind \
${OCAML_SITELIBDIR}/findlib/findlib.cmxs \
${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \
${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs
+# Spacetime profiling is only available for native code on 64-bit targets
+.if ${ARCH} == i386 || ${ARCH} == powerpc
+ @${REINPLACE_CMD} -e '/raw_spacetime/d' ${TMPPLIST}
+.endif
post-install-TOOLBOX-on:
${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \
@@ -52,4 +58,4 @@ post-install-DOCS-on:
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \
"! -regex .*ref-man.*"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist
index 7ccae20246da..8d0cad0e5353 100644
--- a/devel/ocaml-findlib/pkg-plist
+++ b/devel/ocaml-findlib/pkg-plist
@@ -40,8 +40,8 @@ bin/safe_camlp4
%%OCAML_SITELIBDIR%%/num-top/num_top.cmi
%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi
%%OCAML_SITELIBDIR%%/num/META
-%%OCAML_SITELIBDIR%%/ocamlbuild/META
%%OCAML_SITELIBDIR%%/ocamldoc/META
+%%OCAML_SITELIBDIR%%/raw_spacetime/META
%%OCAML_SITELIBDIR%%/stdlib/META
%%OCAML_SITELIBDIR%%/str/META
%%OCAML_SITELIBDIR%%/threads/META
diff --git a/devel/ocaml-ipaddr/Makefile b/devel/ocaml-ipaddr/Makefile
index 1be028492abe..fbbddf62f1bd 100644
--- a/devel/ocaml-ipaddr/Makefile
+++ b/devel/ocaml-ipaddr/Makefile
@@ -9,6 +9,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= OCaml library for manipulation of IP address representations
BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib
+BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
RUN_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib
USE_GITHUB= yes
diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile
index c4a56f0cce60..e7d7995aed44 100644
--- a/devel/ocaml-lacaml/Makefile
+++ b/devel/ocaml-lacaml/Makefile
@@ -14,6 +14,8 @@ COMMENT= OCaml interface to BLAS and LAPACK libraries
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.txt
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
USE_OCAMLFIND_PLIST=yes
diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile
index 4e10ef16d410..acaea76f556e 100644
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@@ -13,6 +13,7 @@ LICENSE= LGPL21
BUILD_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \
${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
+BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
RUN_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \
${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
@@ -51,6 +52,10 @@ DOCS_RUN_DEPENDS= ${SA_DIR}/text/text.a:textproc/ocaml-text
post-patch:
@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \
${WRKSRC}/setup.ml
+ @${REINPLACE_CMD} -e 's,| O_CLOEXEC,& | O_KEEPEXEC, \
+ ; s,else Unix\.socketpair ,&?cloexec:None,' \
+ ${WRKSRC}/src/unix/lwt_unix.ml \
+ ${WRKSRC}/src/unix/lwt_unix.mli
do-configure:
cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS}
diff --git a/devel/ocaml-ocamlbuild/Makefile b/devel/ocaml-ocamlbuild/Makefile
index 9a8f097658e4..33572f7f6406 100644
--- a/devel/ocaml-ocamlbuild/Makefile
+++ b/devel/ocaml-ocamlbuild/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ocamlbuild
-PORTVERSION= 0.9.3
+PORTVERSION= 0.14.0
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@@ -11,8 +11,6 @@ COMMENT= Build tool for OCaml libraries and programs
LICENSE= GPLv2
-BROKEN= conflicts with ocaml
-
USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= ocaml
@@ -20,6 +18,4 @@ USE_OCAML= yes
ALL_TARGET= configure all
-MAKE_ARGS= CHECK_IF_PREINSTALLED=false # XXX: remove after 4.03.0+
-
.include <bsd.port.mk>
diff --git a/devel/ocaml-ocamlbuild/distinfo b/devel/ocaml-ocamlbuild/distinfo
index bb51ddd13112..9a3197bb922e 100644
--- a/devel/ocaml-ocamlbuild/distinfo
+++ b/devel/ocaml-ocamlbuild/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475804532
-SHA256 (ocaml-ocamlbuild-0.9.3_GH0.tar.gz) = 32e4824906888c61244909eab0d2c22d31f18fc9579873a070a4cf7947c2c0a9
-SIZE (ocaml-ocamlbuild-0.9.3_GH0.tar.gz) = 191583
+TIMESTAMP = 1550933160
+SHA256 (ocaml-ocamlbuild-0.14.0_GH0.tar.gz) = 87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78
+SIZE (ocaml-ocamlbuild-0.14.0_GH0.tar.gz) = 198267
diff --git a/devel/ocaml-ocamlbuild/pkg-plist b/devel/ocaml-ocamlbuild/pkg-plist
index 6f5e6bbab2eb..0ff52e89fc06 100644
--- a/devel/ocaml-ocamlbuild/pkg-plist
+++ b/devel/ocaml-ocamlbuild/pkg-plist
@@ -19,4 +19,7 @@ lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
lib/ocaml/ocamlbuild/ocamlbuildlib.a
lib/ocaml/ocamlbuild/ocamlbuildlib.cma
lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
+lib/ocaml/ocamlbuild/signatures.cmi
+lib/ocaml/ocamlbuild/signatures.cmti
lib/ocaml/ocamlbuild/signatures.mli
+man/man1/ocamlbuild.1.gz
diff --git a/devel/ocaml-parmap/Makefile b/devel/ocaml-parmap/Makefile
index 21a30400e79d..8ec1bce70669 100644
--- a/devel/ocaml-parmap/Makefile
+++ b/devel/ocaml-parmap/Makefile
@@ -12,6 +12,8 @@ COMMENT= Minimalistic library allowing to exploit multicore architecture
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USE_GITHUB= yes
GH_ACCOUNT= rdicosmo
diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index 91c5232f5727..31b462f363ec 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -13,6 +13,7 @@ COMMENT= Perl compatible regular expressions for Objective Caml
LICENSE= LGPL21
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
LIB_DEPENDS= libpcre.so:devel/pcre
USE_GITHUB= yes
diff --git a/devel/ocaml-pomap/Makefile b/devel/ocaml-pomap/Makefile
index 573fd46ef438..2f97aa3eb7c8 100644
--- a/devel/ocaml-pomap/Makefile
+++ b/devel/ocaml-pomap/Makefile
@@ -13,6 +13,8 @@ COMMENT= OCaml library to maintain a list of partially ordered elements
LICENSE= LGPL20+ # source says LGPL20+, COPYING says LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.txt
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USE_GITHUB= yes
GH_ACCOUNT= mmottl
diff --git a/devel/ocaml-ppx-tools/Makefile b/devel/ocaml-ppx-tools/Makefile
index 829f9b32fc8e..2167037710bd 100644
--- a/devel/ocaml-ppx-tools/Makefile
+++ b/devel/ocaml-ppx-tools/Makefile
@@ -3,7 +3,8 @@
PORTNAME= ppx-tools
PORTVERSION= 5.0
-DISTVERSIONSUFFIX= +4.02.0
+PORTREVISION= 1
+DISTVERSIONSUFFIX= +4.05.0
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
diff --git a/devel/ocaml-ppx-tools/distinfo b/devel/ocaml-ppx-tools/distinfo
index 71ac38e209e7..e05e5a0424e8 100644
--- a/devel/ocaml-ppx-tools/distinfo
+++ b/devel/ocaml-ppx-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1462286829
-SHA256 (ocaml-ppx-ppx_tools-5.0+4.02.0_GH0.tar.gz) = 2c9b80f1755a6155820fc165b603f7184998ec2f097ff2c74169a2f86c264f66
-SIZE (ocaml-ppx-ppx_tools-5.0+4.02.0_GH0.tar.gz) = 17443
+TIMESTAMP = 1488115400
+SHA256 (ocaml-ppx-ppx_tools-5.0+4.05.0_GH0.tar.gz) = 031e05e2f98fd77a412cff00f19262e186b0c8a1804fece06d2af05e37a563b7
+SIZE (ocaml-ppx-ppx_tools-5.0+4.05.0_GH0.tar.gz) = 17893
diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile
index 4ebd04ada0de..b7311d3af7f5 100644
--- a/devel/ocaml-re/Makefile
+++ b/devel/ocaml-re/Makefile
@@ -12,6 +12,8 @@ COMMENT= Pure OCaml regular expressions
LICENSE= LGPL21
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USES= gmake
HAS_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile
index 06c01db9eb5b..f33cdd266c23 100644
--- a/devel/ocaml-react/Makefile
+++ b/devel/ocaml-react/Makefile
@@ -12,6 +12,8 @@ COMMENT= OCaml module for functional reactive programming
LICENSE= BSD3CLAUSE
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USES= tar:tbz
USE_OCAML= yes
OPTIONS_DEFINE= X11
diff --git a/devel/ocaml-res/Makefile b/devel/ocaml-res/Makefile
index c8de3cdb1f32..4bd4495e3340 100644
--- a/devel/ocaml-res/Makefile
+++ b/devel/ocaml-res/Makefile
@@ -13,6 +13,8 @@ COMMENT= Automatically Resizing Contiguous Memory for OCaml
LICENSE= LGPL20+ # source says LGPL20+, COPYING says LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.txt
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
USE_OCAMLFIND_PLIST=yes
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index f8a5f9150b66..62b25e3f3b6a 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -16,6 +16,7 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.txt
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE-Tywith.txt
BUILD_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv
+BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
RUN_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv
OPTIONS_DEFINE= DOCS
diff --git a/devel/ocaml-sexplib/files/patch-lib_conv.ml b/devel/ocaml-sexplib/files/patch-lib_conv.ml
new file mode 100644
index 000000000000..4e1382e8aa58
--- /dev/null
+++ b/devel/ocaml-sexplib/files/patch-lib_conv.ml
@@ -0,0 +1,46 @@
+From cba80ebe02962504fbe404b1baf484a5000f44b4
+From: Jeremie Dimino <jdimino@janestreet.com>
+Date: Tue, 12 Jul 2016 17:08:10 +0100
+Subject: [PATCH] 114.01+04
+
+--- lib/conv.ml.orig 2016-03-09 15:44:55 UTC
++++ lib/conv.ml
+@@ -185,7 +185,7 @@ module Exn_converter = struct
+
+ (* [Obj.extension_id] works on both the exception itself, and the extension slot of the
+ exception. *)
+- let rec clean_up_handler (slot : Obj.t) =
++ let rec clean_up_handler (slot : extension_constructor) =
+ let id = Obj.extension_id slot in
+ let old_exn_id_map = !exn_id_map in
+ let new_exn_id_map = Exn_ids.remove id old_exn_id_map in
+@@ -196,7 +196,7 @@ module Exn_converter = struct
+ exn_id_map := new_exn_id_map
+
+ let add_auto ?(finalise = true) exn sexp_of_exn =
+- let id = Obj.extension_id exn in
++ let id = Obj.extension_id (Obj.extension_constructor exn) in
+ let rec loop () =
+ let old_exn_id_map = !exn_id_map in
+ let new_exn_id_map = Exn_ids.add id sexp_of_exn old_exn_id_map in
+@@ -205,13 +205,18 @@ module Exn_converter = struct
+ loop ()
+ else begin
+ exn_id_map := new_exn_id_map;
+- if finalise then Gc.finalise clean_up_handler (Obj.extension_slot exn)
++ if finalise then
++ try
++ Gc.finalise clean_up_handler (Obj.extension_constructor exn)
++ with Invalid_argument _ ->
++ (* Pre-allocated extension constructors cannot be finalised *)
++ ()
+ end
+ in
+ loop ()
+
+ let find_auto exn =
+- let id = Obj.extension_id exn in
++ let id = Obj.extension_id (Obj.extension_constructor exn) in
+ match Exn_ids.find id !exn_id_map with
+ | exception Not_found -> None
+ | sexp_of_exn -> Some (sexp_of_exn exn)
diff --git a/devel/ocaml-type_conv/Makefile b/devel/ocaml-type_conv/Makefile
index 274a6af1ba1d..d77ca0aba611 100644
--- a/devel/ocaml-type_conv/Makefile
+++ b/devel/ocaml-type_conv/Makefile
@@ -13,6 +13,8 @@ COMMENT= Type conversion routines for OCaml
LICENSE= APACHE20 BSD3CLAUSE
LICENSE_COMB= multi
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
OPTIONS_DEFINE= DOCS
CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX}
diff --git a/devel/ocaml-ulex/Makefile b/devel/ocaml-ulex/Makefile
index 196b0538b147..7ca760b0554e 100644
--- a/devel/ocaml-ulex/Makefile
+++ b/devel/ocaml-ulex/Makefile
@@ -11,6 +11,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
COMMENT= Lexer generator for Unicode and OCaml
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USES= gmake
USE_OCAML= true
USE_OCAML_FINDLIB= true
diff --git a/devel/ocaml-uutf/Makefile b/devel/ocaml-uutf/Makefile
index ea05a254fb2b..2431c0b25dce 100644
--- a/devel/ocaml-uutf/Makefile
+++ b/devel/ocaml-uutf/Makefile
@@ -12,6 +12,8 @@ COMMENT= Non-blocking streaming Unicode codec for OCaml
LICENSE= BSD3CLAUSE
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USES= tar:tbz
USE_OCAML= yes
diff --git a/lang/ocaml-camlidl/Makefile b/lang/ocaml-camlidl/Makefile
index 33e292289c6d..90a43711b3ae 100644
--- a/lang/ocaml-camlidl/Makefile
+++ b/lang/ocaml-camlidl/Makefile
@@ -35,6 +35,7 @@ post-extract:
@${REINPLACE_CMD} -e \
"/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_SCRIPT},g" \
+ -e 's,$$(OCAMLC),& -warn-error -a,' \
${WRKSRC}/compiler/Makefile
@${REINPLACE_CMD} -e \
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index deb86351b182..6df22421a560 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.3
+PORTVERSION= 4.05.0
CATEGORIES= lang
MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs
@@ -118,7 +118,8 @@ post-patch:
-e "\|nativecclinkopts=|s|''|\"${LDFLAGS:C/-Wl,//}\"|" \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \
- ${WRKSRC}/Makefile ${WRKSRC}/asmrun/Makefile \
+ ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tools \
+ ${WRKSRC}/asmrun/Makefile \
${WRKSRC}/otherlibs/systhreads/Makefile \
${WRKSRC}/testsuite/makefiles/Makefile.common \
${WRKSRC}/testsuite/tests/asmcomp/Makefile
@@ -127,7 +128,6 @@ post-configure:
@${REINPLACE_CMD} -E \
-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
${WRKSRC}/config/Makefile
-
# INSTALL* safeness (which preserves the correct permissions despite
# user's umask(1)
@${FIND} ${WRKDIR} -type f -name Makefile -print0 | \
@@ -150,5 +150,9 @@ post-install:
${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR}
.endif
+# Spacetime profiling is only available for native code on 64-bit targets
+.if ${ARCH} == i386 || ${ARCH} == powerpc
+ @${REINPLACE_CMD} -e '/raw_spacetime_lib/d' ${TMPPLIST}
+.endif
.include <bsd.port.post.mk>
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 7d6268c276f7..f6b7a60c0407 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,8 +1,9 @@
-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
-SIZE (ocaml-4.02-refman.ps.gz) = 1111960
-SHA256 (ocaml-4.02-refman.pdf) = 5575824bf0c94b07d3c618c378e02ea0d5341b9e319b4e8c5b331d0ff51898d8
-SIZE (ocaml-4.02-refman.pdf) = 1519190
+TIMESTAMP = 1532851883
+SHA256 (ocaml-4.05.0.tar.xz) = 04a527ba14b4d7d1b2ea7b2ae21aefecfa8d304399db94f35a96df1459e02ef9
+SIZE (ocaml-4.05.0.tar.xz) = 2442036
+SHA256 (ocaml-4.05-refman-html.tar.gz) = 2524723648dbbc34b42cbe2fe06822b79837299429d26ff037169b568888cd9c
+SIZE (ocaml-4.05-refman-html.tar.gz) = 882287
+SHA256 (ocaml-4.05-refman.ps.gz) = 1540f86028a9460313b5ab3e0544e280052577d5dc4966f80647e1f49c5ab8df
+SIZE (ocaml-4.05-refman.ps.gz) = 1221553
+SHA256 (ocaml-4.05-refman.pdf) = 3d3a82a676668ccf66fa6d88f46a2496c89b1488ee6098585a6b7f22a9171eef
+SIZE (ocaml-4.05-refman.pdf) = 1741857
diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure
index b7c566f649ef..02286d19eb9a 100644
--- a/lang/ocaml/files/patch-configure
+++ b/lang/ocaml/files/patch-configure
@@ -1,62 +1,30 @@
---- configure.orig 2015-05-12 14:46:37 UTC
+--- configure.orig 2017-07-13 08:56:44 UTC
+++ configure
-@@ -446,7 +446,7 @@ esac
-
- # Configure compiler to use in further tests
-
--cc="$bytecc -O $bytecclinkopts"
-+cc="$bytecc $bytecclinkopts"
- export cc cclibs verbose
-
- # Check C compiler
-@@ -688,9 +688,9 @@ if test $with_sharedlibs = "yes"; then
- mksharedlib="$flexlink"
- mkmaindll="$flexlink -maindll"
- shared_libraries_supported=true;;
-- *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
-+ *-*-linux-gnu|*-*-linux|*-*-dragonfly*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
- sharedcccompopts="-fPIC"
-- mksharedlib="$bytecc -shared"
-+ mksharedlib="$bytecc $bytecclinkopts -shared"
- bytecclinkopts="$bytecclinkopts -Wl,-E"
- byteccrpath="-Wl,-rpath,"
- mksharedlibrpath="-Wl,-rpath,"
-@@ -790,9 +790,11 @@ if test $with_sharedlibs = "yes"; then
- fi;;
+@@ -838,6 +838,7 @@ if test $with_sharedlibs = "yes"; then
x86_64-*-darwin*) natdynlink=true;;
+ s390x*-*-linux*) natdynlink=true;;
powerpc*-*-linux*) natdynlink=true;;
+ powerpc*-*-freebsd*) natdynlink=true;;
sparc*-*-linux*) natdynlink=true;;
i686-*-kfreebsd*) natdynlink=true;;
x86_64-*-kfreebsd*) natdynlink=true;;
-+ x86_64-*-dragonfly*) natdynlink=true;;
- i[3456]86-*-freebsd*) natdynlink=true;;
- x86_64-*-freebsd*) natdynlink=true;;
- i[3456]86-*-openbsd*) natdynlink=true;;
-@@ -804,6 +806,7 @@ if test $with_sharedlibs = "yes"; then
- arm*-*-linux*) natdynlink=true;;
+@@ -854,6 +855,7 @@ if test $with_sharedlibs = "yes"; then
arm*-*-freebsd*) natdynlink=true;;
+ earm*-*-netbsd*) natdynlink=true;;
aarch64-*-linux*) natdynlink=true;;
+ aarch64-*-freebsd*) natdynlink=true;;
esac
fi
-@@ -844,6 +847,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;;
+@@ -921,6 +923,7 @@ case "$target" in
+ powerpc*-*-linux*) arch=power;
+ if $arch64; then model=ppc64; else model=ppc; fi
+ 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;;
-@@ -862,12 +866,14 @@ 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;;
+ s390x*-*-linux*) arch=s390x; model=z10; system=elf;;
+@@ -946,6 +949,7 @@ case "$target" in
x86_64-*-darwin*) arch=amd64; system=macosx;;
x86_64-*-mingw*) arch=amd64; system=mingw;;
aarch64-*-linux*) arch=arm64; system=linux;;
@@ -64,106 +32,25 @@
x86_64-*-cygwin*) arch=amd64; system=cygwin;;
esac
-@@ -889,7 +895,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"
-@@ -932,6 +938,8 @@ case "$arch,$system" in
- esac;;
- arm,freebsd) as="${TOOLPREF}cc -c"
- aspp="${TOOLPREF}cc -c";;
-+ *,dragonfly) as="${TOOLPREF}as"
-+ aspp="${TOOLPREF}cc -c";;
- *,freebsd) as="${TOOLPREF}as"
- aspp="${TOOLPREF}cc -c";;
- amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*)
-@@ -955,9 +963,11 @@ case "$arch,$system" in
+@@ -1051,10 +1055,12 @@ case "$arch,$system" in
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
- amd64,linux) profiling='prof';;
- amd64,openbsd) profiling='prof';;
-+ amd64,dragonfly) profiling='prof';;
- amd64,freebsd) profiling='prof';;
- amd64,netbsd) profiling='prof';;
- amd64,gnu) profiling='prof';;
-+ arm,freebsd) profiling='prof';;
- arm,linux*) profiling='prof';;
- power,elf) profiling='prof';;
- power,bsd*) profiling='prof';;
-@@ -1415,6 +1425,8 @@ if test "$pthread_wanted" = "yes"; then
- case "$target" in
- *-*-solaris*) pthread_link="-lpthread -lposix4"
- pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
-+ *-*-dragon*) pthread_link="-pthread"
-+ pthread_caml_link="-cclib -pthread";;
- *-*-freebsd*) pthread_link="-pthread"
- pthread_caml_link="-cclib -pthread";;
- *-*-openbsd*) pthread_link="-pthread"
-@@ -1431,7 +1443,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*)
-@@ -1601,6 +1613,7 @@ if test "$x11_include" = "not found"; then
- else
- x11_libs="-L$dir"
- case "$target" in
-+ *-*-freebsd*|*-*-dragonfly*) x11_link="-L$dir -lX11";;
- *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
- *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
- *) x11_link="-L$dir -lX11";;
-@@ -1644,10 +1657,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 +1699,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"
-@@ -1701,6 +1708,11 @@ case "$buggycc" in
- nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
- esac
-
-+# Allow user-defined C compiler flags
-+
-+bytecccompopts="$bytecccompopts $CFLAGS"
-+nativecccompopts="$nativecccompopts $CFLAGS"
-+
- # Finish generated files
-
- cclibs="$cclibs $mathlib"
-@@ -1723,7 +1735,7 @@ SYSLIB=-l\$(1)
- MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib \$(1)
- #ml let mklib out files opts = Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s" out opts files out;;
+ amd64,linux) profiling='true';;
+ amd64,openbsd) profiling='true';;
++ amd64,dragonfly) profiling='true';;
+ amd64,freebsd) profiling='true';;
+ amd64,netbsd) profiling='true';;
+ arm,netbsd) profiling='true';;
+ amd64,gnu) profiling='true';;
++ arm,freebsd) profiling='true';;
+ arm,linux*) profiling='true';;
+ power,elf) profiling='true';;
+ power,bsd*) profiling='true';;
+@@ -2029,7 +2035,7 @@ MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib
+ #ml Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s"
+ #ml out opts files out;;
EOF
-echo "ARCH=$arch" >> Makefile
+echo "SYSTEM_ARCH=$arch" >> Makefile
echo "MODEL=$model" >> Makefile
echo "SYSTEM=$system" >> Makefile
- echo "NATIVECC=$nativecc" >> Makefile
+ echo "NATIVECC=$nativecc $nativecccompopts" >> Makefile
diff --git a/lang/ocaml/pkg-descr b/lang/ocaml/pkg-descr
index fdd8f2db63d0..860c52da2f82 100644
--- a/lang/ocaml/pkg-descr
+++ b/lang/ocaml/pkg-descr
@@ -16,4 +16,4 @@ of processors. Compilation takes longer and generates bigger code, but
the generated programs deliver excellent performance, while retaining
the moderate memory requirements of the bytecode compiler.
-WWW: http://caml.inria.fr/ocaml/
+WWW: http://ocaml.org/
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index 7a0b99797a9e..13afc4904bcf 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -49,6 +49,7 @@
%%PROF%%lib/ocaml/string.p.cmx
%%PROF%%lib/ocaml/stringLabels.p.cmx
%%PROF%%lib/ocaml/sys.p.cmx
+%%PROF%%lib/ocaml/uchar.p.cmx
%%PROF%%lib/ocaml/weak.p.cmx
%%THREADS%%@dir lib/ocaml/threads
%%THREADS%%lib/ocaml/caml/threads.h
@@ -76,36 +77,51 @@
%%X11%%lib/ocaml/graphics.a
%%X11%%lib/ocaml/graphics.cma
%%X11%%lib/ocaml/graphics.cmi
+%%X11%%lib/ocaml/graphics.cmti
%%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.cmti
%%X11%%lib/ocaml/graphicsX11.cmx
%%X11%%lib/ocaml/graphicsX11.mli
%%X11%%lib/ocaml/libgraphics.a
%%X11%%lib/ocaml/stublibs/dllgraphics.so
bin/ocaml
-bin/ocamlbuild
-bin/ocamlbuild.byte
-bin/ocamlbuild.native
bin/ocamlc
+bin/ocamlc.byte
bin/ocamlc.opt
bin/ocamlcp
+bin/ocamlcp.byte
+bin/ocamlcp.opt
bin/ocamldebug
bin/ocamldep
+bin/ocamldep.byte
bin/ocamldep.opt
bin/ocamldoc
bin/ocamldoc.opt
bin/ocamllex
+bin/ocamllex.byte
bin/ocamllex.opt
bin/ocamlmklib
+bin/ocamlmklib.byte
+bin/ocamlmklib.opt
bin/ocamlmktop
+bin/ocamlmktop.byte
+bin/ocamlmktop.opt
bin/ocamlobjinfo
+bin/ocamlobjinfo.byte
+bin/ocamlobjinfo.opt
bin/ocamlopt
+bin/ocamlopt.byte
bin/ocamlopt.opt
bin/ocamloptp
+bin/ocamloptp.byte
+bin/ocamloptp.opt
bin/ocamlprof
+bin/ocamlprof.byte
+bin/ocamlprof.opt
bin/ocamlrun
bin/ocamlyacc
lib/ocaml/Makefile.config
@@ -119,6 +135,7 @@ lib/ocaml/arg.mli
lib/ocaml/arg.p.cmt
lib/ocaml/arith_flags.cmx
lib/ocaml/arith_status.cmi
+lib/ocaml/arith_status.cmti
lib/ocaml/arith_status.cmx
lib/ocaml/arith_status.mli
lib/ocaml/array.cmi
@@ -136,11 +153,13 @@ lib/ocaml/arrayLabels.ml
lib/ocaml/arrayLabels.mli
lib/ocaml/arrayLabels.p.cmt
lib/ocaml/big_int.cmi
+lib/ocaml/big_int.cmti
lib/ocaml/big_int.cmx
lib/ocaml/big_int.mli
lib/ocaml/bigarray.a
lib/ocaml/bigarray.cma
lib/ocaml/bigarray.cmi
+lib/ocaml/bigarray.cmti
lib/ocaml/bigarray.cmx
lib/ocaml/bigarray.cmxa
lib/ocaml/bigarray.cmxs
@@ -175,23 +194,60 @@ lib/ocaml/callback.mli
lib/ocaml/callback.p.cmt
lib/ocaml/caml/address_class.h
lib/ocaml/caml/alloc.h
+lib/ocaml/caml/backtrace.h
+lib/ocaml/caml/backtrace_prim.h
lib/ocaml/caml/bigarray.h
lib/ocaml/caml/callback.h
+lib/ocaml/caml/compact.h
+lib/ocaml/caml/compare.h
lib/ocaml/caml/compatibility.h
lib/ocaml/caml/config.h
lib/ocaml/caml/custom.h
+lib/ocaml/caml/debugger.h
+lib/ocaml/caml/dynlink.h
+lib/ocaml/caml/exec.h
lib/ocaml/caml/fail.h
+lib/ocaml/caml/finalise.h
+lib/ocaml/caml/fix_code.h
+lib/ocaml/caml/freelist.h
lib/ocaml/caml/gc.h
+lib/ocaml/caml/gc_ctrl.h
+lib/ocaml/caml/globroots.h
lib/ocaml/caml/hash.h
+lib/ocaml/caml/hooks.h
+lib/ocaml/caml/instrtrace.h
+lib/ocaml/caml/instruct.h
+lib/ocaml/caml/int64_emul.h
+lib/ocaml/caml/int64_format.h
+lib/ocaml/caml/int64_native.h
+lib/ocaml/caml/interp.h
lib/ocaml/caml/intext.h
+lib/ocaml/caml/io.h
+lib/ocaml/caml/jumptbl.h
+lib/ocaml/caml/major_gc.h
+lib/ocaml/caml/md5.h
lib/ocaml/caml/memory.h
+lib/ocaml/caml/minor_gc.h
lib/ocaml/caml/misc.h
lib/ocaml/caml/mlvalues.h
+lib/ocaml/caml/osdeps.h
+lib/ocaml/caml/prims.h
lib/ocaml/caml/printexc.h
+lib/ocaml/caml/reverse.h
+lib/ocaml/caml/roots.h
lib/ocaml/caml/signals.h
+lib/ocaml/caml/signals_machdep.h
lib/ocaml/caml/socketaddr.h
+lib/ocaml/caml/spacetime.h
+lib/ocaml/caml/stack.h
+lib/ocaml/caml/stacks.h
+lib/ocaml/caml/startup.h
+lib/ocaml/caml/startup_aux.h
+lib/ocaml/caml/sys.h
+lib/ocaml/caml/ui.h
lib/ocaml/caml/unixsupport.h
lib/ocaml/caml/version.h
+lib/ocaml/caml/weak.h
lib/ocaml/camlheader
lib/ocaml/camlheader_ur
lib/ocaml/camlinternalFormat.cmi
@@ -238,209 +294,564 @@ 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/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.cmt
+lib/ocaml/compiler-libs/alias_analysis.cmti
+lib/ocaml/compiler-libs/alias_analysis.mli
+lib/ocaml/compiler-libs/allocated_const.cmi
+lib/ocaml/compiler-libs/allocated_const.cmt
+lib/ocaml/compiler-libs/allocated_const.cmti
+lib/ocaml/compiler-libs/allocated_const.mli
lib/ocaml/compiler-libs/annot.cmi
lib/ocaml/compiler-libs/annot.cmti
+lib/ocaml/compiler-libs/annot.mli
lib/ocaml/compiler-libs/arch.cmi
lib/ocaml/compiler-libs/arch.cmt
+lib/ocaml/compiler-libs/arch.cmx
+lib/ocaml/compiler-libs/arg_helper.cmi
+lib/ocaml/compiler-libs/arg_helper.cmt
+lib/ocaml/compiler-libs/arg_helper.cmti
+lib/ocaml/compiler-libs/arg_helper.cmx
+lib/ocaml/compiler-libs/arg_helper.mli
lib/ocaml/compiler-libs/asmgen.cmi
lib/ocaml/compiler-libs/asmgen.cmt
lib/ocaml/compiler-libs/asmgen.cmti
+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.cmi
lib/ocaml/compiler-libs/ast_helper.cmt
lib/ocaml/compiler-libs/ast_helper.cmti
+lib/ocaml/compiler-libs/ast_helper.cmx
+lib/ocaml/compiler-libs/ast_helper.mli
+lib/ocaml/compiler-libs/ast_invariants.cmi
+lib/ocaml/compiler-libs/ast_invariants.cmt
+lib/ocaml/compiler-libs/ast_invariants.cmti
+lib/ocaml/compiler-libs/ast_invariants.cmx
+lib/ocaml/compiler-libs/ast_invariants.mli
+lib/ocaml/compiler-libs/ast_iterator.cmi
+lib/ocaml/compiler-libs/ast_iterator.cmt
+lib/ocaml/compiler-libs/ast_iterator.cmti
+lib/ocaml/compiler-libs/ast_iterator.cmx
+lib/ocaml/compiler-libs/ast_iterator.mli
lib/ocaml/compiler-libs/ast_mapper.cmi
lib/ocaml/compiler-libs/ast_mapper.cmt
lib/ocaml/compiler-libs/ast_mapper.cmti
+lib/ocaml/compiler-libs/ast_mapper.cmx
+lib/ocaml/compiler-libs/ast_mapper.mli
lib/ocaml/compiler-libs/asttypes.cmi
lib/ocaml/compiler-libs/asttypes.cmti
+lib/ocaml/compiler-libs/asttypes.mli
+lib/ocaml/compiler-libs/attr_helper.cmi
+lib/ocaml/compiler-libs/attr_helper.cmt
+lib/ocaml/compiler-libs/attr_helper.cmti
+lib/ocaml/compiler-libs/attr_helper.cmx
+lib/ocaml/compiler-libs/attr_helper.mli
+lib/ocaml/compiler-libs/augment_specialised_args.cmi
+lib/ocaml/compiler-libs/augment_specialised_args.cmt
+lib/ocaml/compiler-libs/augment_specialised_args.cmti
+lib/ocaml/compiler-libs/augment_specialised_args.mli
+lib/ocaml/compiler-libs/backend_intf.cmi
+lib/ocaml/compiler-libs/backend_intf.cmti
+lib/ocaml/compiler-libs/backend_intf.mli
lib/ocaml/compiler-libs/branch_relaxation.cmi
lib/ocaml/compiler-libs/branch_relaxation.cmt
lib/ocaml/compiler-libs/branch_relaxation.cmti
+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.cmi
lib/ocaml/compiler-libs/btype.cmt
lib/ocaml/compiler-libs/btype.cmti
+lib/ocaml/compiler-libs/btype.cmx
+lib/ocaml/compiler-libs/btype.mli
+lib/ocaml/compiler-libs/build_export_info.cmi
+lib/ocaml/compiler-libs/build_export_info.cmt
+lib/ocaml/compiler-libs/build_export_info.cmti
+lib/ocaml/compiler-libs/build_export_info.cmx
+lib/ocaml/compiler-libs/build_export_info.mli
+lib/ocaml/compiler-libs/builtin_attributes.cmi
+lib/ocaml/compiler-libs/builtin_attributes.cmt
+lib/ocaml/compiler-libs/builtin_attributes.cmti
+lib/ocaml/compiler-libs/builtin_attributes.cmx
+lib/ocaml/compiler-libs/builtin_attributes.mli
lib/ocaml/compiler-libs/bytegen.cmi
lib/ocaml/compiler-libs/bytegen.cmt
lib/ocaml/compiler-libs/bytegen.cmti
+lib/ocaml/compiler-libs/bytegen.cmx
+lib/ocaml/compiler-libs/bytegen.mli
lib/ocaml/compiler-libs/bytelibrarian.cmi
lib/ocaml/compiler-libs/bytelibrarian.cmt
lib/ocaml/compiler-libs/bytelibrarian.cmti
+lib/ocaml/compiler-libs/bytelibrarian.cmx
+lib/ocaml/compiler-libs/bytelibrarian.mli
lib/ocaml/compiler-libs/bytelink.cmi
lib/ocaml/compiler-libs/bytelink.cmt
lib/ocaml/compiler-libs/bytelink.cmti
+lib/ocaml/compiler-libs/bytelink.cmx
+lib/ocaml/compiler-libs/bytelink.mli
lib/ocaml/compiler-libs/bytepackager.cmi
lib/ocaml/compiler-libs/bytepackager.cmt
lib/ocaml/compiler-libs/bytepackager.cmti
+lib/ocaml/compiler-libs/bytepackager.cmx
+lib/ocaml/compiler-libs/bytepackager.mli
lib/ocaml/compiler-libs/bytesections.cmi
lib/ocaml/compiler-libs/bytesections.cmt
lib/ocaml/compiler-libs/bytesections.cmti
+lib/ocaml/compiler-libs/bytesections.cmx
+lib/ocaml/compiler-libs/bytesections.mli
lib/ocaml/compiler-libs/ccomp.cmi
lib/ocaml/compiler-libs/ccomp.cmt
lib/ocaml/compiler-libs/ccomp.cmti
+lib/ocaml/compiler-libs/ccomp.cmx
+lib/ocaml/compiler-libs/ccomp.mli
lib/ocaml/compiler-libs/clambda.cmi
lib/ocaml/compiler-libs/clambda.cmt
lib/ocaml/compiler-libs/clambda.cmti
+lib/ocaml/compiler-libs/clambda.cmx
+lib/ocaml/compiler-libs/clambda.mli
lib/ocaml/compiler-libs/clflags.cmi
lib/ocaml/compiler-libs/clflags.cmt
lib/ocaml/compiler-libs/clflags.cmti
+lib/ocaml/compiler-libs/clflags.cmx
+lib/ocaml/compiler-libs/clflags.mli
lib/ocaml/compiler-libs/closure.cmi
lib/ocaml/compiler-libs/closure.cmt
lib/ocaml/compiler-libs/closure.cmti
+lib/ocaml/compiler-libs/closure.cmx
+lib/ocaml/compiler-libs/closure.mli
+lib/ocaml/compiler-libs/closure_conversion.cmi
+lib/ocaml/compiler-libs/closure_conversion.cmt
+lib/ocaml/compiler-libs/closure_conversion.cmti
+lib/ocaml/compiler-libs/closure_conversion.mli
+lib/ocaml/compiler-libs/closure_conversion_aux.cmi
+lib/ocaml/compiler-libs/closure_conversion_aux.cmt
+lib/ocaml/compiler-libs/closure_conversion_aux.cmti
+lib/ocaml/compiler-libs/closure_conversion_aux.mli
+lib/ocaml/compiler-libs/closure_element.cmi
+lib/ocaml/compiler-libs/closure_element.cmt
+lib/ocaml/compiler-libs/closure_element.cmti
+lib/ocaml/compiler-libs/closure_element.mli
+lib/ocaml/compiler-libs/closure_id.cmi
+lib/ocaml/compiler-libs/closure_id.cmt
+lib/ocaml/compiler-libs/closure_id.cmti
+lib/ocaml/compiler-libs/closure_id.mli
+lib/ocaml/compiler-libs/closure_offsets.cmi
+lib/ocaml/compiler-libs/closure_offsets.cmt
+lib/ocaml/compiler-libs/closure_offsets.cmti
+lib/ocaml/compiler-libs/closure_offsets.cmx
+lib/ocaml/compiler-libs/closure_offsets.mli
lib/ocaml/compiler-libs/cmi_format.cmi
lib/ocaml/compiler-libs/cmi_format.cmt
lib/ocaml/compiler-libs/cmi_format.cmti
+lib/ocaml/compiler-libs/cmi_format.cmx
+lib/ocaml/compiler-libs/cmi_format.mli
lib/ocaml/compiler-libs/cmm.cmi
lib/ocaml/compiler-libs/cmm.cmt
lib/ocaml/compiler-libs/cmm.cmti
+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/cmo_format.cmi
lib/ocaml/compiler-libs/cmo_format.cmti
+lib/ocaml/compiler-libs/cmo_format.mli
lib/ocaml/compiler-libs/cmt_format.cmi
lib/ocaml/compiler-libs/cmt_format.cmt
lib/ocaml/compiler-libs/cmt_format.cmti
+lib/ocaml/compiler-libs/cmt_format.cmx
+lib/ocaml/compiler-libs/cmt_format.mli
lib/ocaml/compiler-libs/cmx_format.cmi
lib/ocaml/compiler-libs/cmx_format.cmti
+lib/ocaml/compiler-libs/cmx_format.mli
lib/ocaml/compiler-libs/coloring.cmi
lib/ocaml/compiler-libs/coloring.cmt
lib/ocaml/compiler-libs/coloring.cmti
+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.cmi
+lib/ocaml/compiler-libs/compdynlink.cmt
+lib/ocaml/compiler-libs/compdynlink.cmti
+lib/ocaml/compiler-libs/compdynlink.cmx
+lib/ocaml/compiler-libs/compdynlink.mli
lib/ocaml/compiler-libs/compenv.cmi
lib/ocaml/compiler-libs/compenv.cmt
lib/ocaml/compiler-libs/compenv.cmti
+lib/ocaml/compiler-libs/compenv.cmx
+lib/ocaml/compiler-libs/compenv.mli
+lib/ocaml/compiler-libs/compilation_unit.cmi
+lib/ocaml/compiler-libs/compilation_unit.cmt
+lib/ocaml/compiler-libs/compilation_unit.cmti
+lib/ocaml/compiler-libs/compilation_unit.mli
lib/ocaml/compiler-libs/compile.cmi
lib/ocaml/compiler-libs/compile.cmt
lib/ocaml/compiler-libs/compile.cmti
+lib/ocaml/compiler-libs/compile.cmx
+lib/ocaml/compiler-libs/compile.mli
lib/ocaml/compiler-libs/compilenv.cmi
lib/ocaml/compiler-libs/compilenv.cmt
lib/ocaml/compiler-libs/compilenv.cmti
+lib/ocaml/compiler-libs/compilenv.cmx
+lib/ocaml/compiler-libs/compilenv.mli
lib/ocaml/compiler-libs/compmisc.cmi
lib/ocaml/compiler-libs/compmisc.cmt
lib/ocaml/compiler-libs/compmisc.cmti
+lib/ocaml/compiler-libs/compmisc.cmx
+lib/ocaml/compiler-libs/compmisc.mli
+lib/ocaml/compiler-libs/compplugin.cmi
+lib/ocaml/compiler-libs/compplugin.cmt
+lib/ocaml/compiler-libs/compplugin.cmti
+lib/ocaml/compiler-libs/compplugin.cmx
+lib/ocaml/compiler-libs/compplugin.mli
lib/ocaml/compiler-libs/config.cmi
lib/ocaml/compiler-libs/config.cmt
lib/ocaml/compiler-libs/config.cmti
+lib/ocaml/compiler-libs/config.cmx
+lib/ocaml/compiler-libs/config.mli
lib/ocaml/compiler-libs/consistbl.cmi
lib/ocaml/compiler-libs/consistbl.cmt
lib/ocaml/compiler-libs/consistbl.cmti
+lib/ocaml/compiler-libs/consistbl.cmx
+lib/ocaml/compiler-libs/consistbl.mli
lib/ocaml/compiler-libs/ctype.cmi
lib/ocaml/compiler-libs/ctype.cmt
lib/ocaml/compiler-libs/ctype.cmti
+lib/ocaml/compiler-libs/ctype.cmx
+lib/ocaml/compiler-libs/ctype.mli
lib/ocaml/compiler-libs/datarepr.cmi
lib/ocaml/compiler-libs/datarepr.cmt
lib/ocaml/compiler-libs/datarepr.cmti
+lib/ocaml/compiler-libs/datarepr.cmx
+lib/ocaml/compiler-libs/datarepr.mli
lib/ocaml/compiler-libs/deadcode.cmi
lib/ocaml/compiler-libs/deadcode.cmt
lib/ocaml/compiler-libs/deadcode.cmti
+lib/ocaml/compiler-libs/deadcode.cmx
+lib/ocaml/compiler-libs/deadcode.mli
lib/ocaml/compiler-libs/debuginfo.cmi
lib/ocaml/compiler-libs/debuginfo.cmt
lib/ocaml/compiler-libs/debuginfo.cmti
+lib/ocaml/compiler-libs/debuginfo.mli
+lib/ocaml/compiler-libs/depend.cmi
+lib/ocaml/compiler-libs/depend.cmt
+lib/ocaml/compiler-libs/depend.cmti
+lib/ocaml/compiler-libs/depend.cmx
+lib/ocaml/compiler-libs/depend.mli
lib/ocaml/compiler-libs/dll.cmi
lib/ocaml/compiler-libs/dll.cmt
lib/ocaml/compiler-libs/dll.cmti
+lib/ocaml/compiler-libs/dll.cmx
+lib/ocaml/compiler-libs/dll.mli
lib/ocaml/compiler-libs/docstrings.cmi
lib/ocaml/compiler-libs/docstrings.cmt
lib/ocaml/compiler-libs/docstrings.cmti
+lib/ocaml/compiler-libs/docstrings.cmx
+lib/ocaml/compiler-libs/docstrings.mli
+lib/ocaml/compiler-libs/effect_analysis.cmi
+lib/ocaml/compiler-libs/effect_analysis.cmt
+lib/ocaml/compiler-libs/effect_analysis.cmti
+lib/ocaml/compiler-libs/effect_analysis.mli
lib/ocaml/compiler-libs/emit.cmi
lib/ocaml/compiler-libs/emit.cmt
lib/ocaml/compiler-libs/emit.cmti
+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.cmi
lib/ocaml/compiler-libs/emitcode.cmt
lib/ocaml/compiler-libs/emitcode.cmti
+lib/ocaml/compiler-libs/emitcode.cmx
+lib/ocaml/compiler-libs/emitcode.mli
lib/ocaml/compiler-libs/env.cmi
lib/ocaml/compiler-libs/env.cmt
lib/ocaml/compiler-libs/env.cmti
+lib/ocaml/compiler-libs/env.cmx
+lib/ocaml/compiler-libs/env.mli
lib/ocaml/compiler-libs/envaux.cmi
lib/ocaml/compiler-libs/envaux.cmt
lib/ocaml/compiler-libs/envaux.cmti
+lib/ocaml/compiler-libs/envaux.cmx
+lib/ocaml/compiler-libs/envaux.mli
lib/ocaml/compiler-libs/errors.cmi
lib/ocaml/compiler-libs/errors.cmt
lib/ocaml/compiler-libs/errors.cmti
+lib/ocaml/compiler-libs/errors.cmx
+lib/ocaml/compiler-libs/errors.mli
+lib/ocaml/compiler-libs/export_id.cmi
+lib/ocaml/compiler-libs/export_id.cmt
+lib/ocaml/compiler-libs/export_id.cmti
+lib/ocaml/compiler-libs/export_id.mli
+lib/ocaml/compiler-libs/export_info.cmi
+lib/ocaml/compiler-libs/export_info.cmt
+lib/ocaml/compiler-libs/export_info.cmti
+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/expunge.cmi
lib/ocaml/compiler-libs/expunge.cmt
+lib/ocaml/compiler-libs/extract_projections.cmi
+lib/ocaml/compiler-libs/extract_projections.cmt
+lib/ocaml/compiler-libs/extract_projections.cmti
+lib/ocaml/compiler-libs/extract_projections.mli
+lib/ocaml/compiler-libs/find_recursive_functions.cmi
+lib/ocaml/compiler-libs/find_recursive_functions.cmt
+lib/ocaml/compiler-libs/find_recursive_functions.cmti
+lib/ocaml/compiler-libs/find_recursive_functions.mli
+lib/ocaml/compiler-libs/flambda.cmi
+lib/ocaml/compiler-libs/flambda.cmt
+lib/ocaml/compiler-libs/flambda.cmti
+lib/ocaml/compiler-libs/flambda.mli
+lib/ocaml/compiler-libs/flambda_invariants.cmi
+lib/ocaml/compiler-libs/flambda_invariants.cmt
+lib/ocaml/compiler-libs/flambda_invariants.cmti
+lib/ocaml/compiler-libs/flambda_invariants.mli
+lib/ocaml/compiler-libs/flambda_iterators.cmi
+lib/ocaml/compiler-libs/flambda_iterators.cmt
+lib/ocaml/compiler-libs/flambda_iterators.cmti
+lib/ocaml/compiler-libs/flambda_iterators.mli
+lib/ocaml/compiler-libs/flambda_to_clambda.cmi
+lib/ocaml/compiler-libs/flambda_to_clambda.cmt
+lib/ocaml/compiler-libs/flambda_to_clambda.cmti
+lib/ocaml/compiler-libs/flambda_to_clambda.cmx
+lib/ocaml/compiler-libs/flambda_to_clambda.mli
+lib/ocaml/compiler-libs/flambda_utils.cmi
+lib/ocaml/compiler-libs/flambda_utils.cmt
+lib/ocaml/compiler-libs/flambda_utils.cmti
+lib/ocaml/compiler-libs/flambda_utils.mli
+lib/ocaml/compiler-libs/freshening.cmi
+lib/ocaml/compiler-libs/freshening.cmt
+lib/ocaml/compiler-libs/freshening.cmti
+lib/ocaml/compiler-libs/freshening.mli
lib/ocaml/compiler-libs/genprintval.cmi
lib/ocaml/compiler-libs/genprintval.cmt
lib/ocaml/compiler-libs/genprintval.cmti
+lib/ocaml/compiler-libs/genprintval.mli
+lib/ocaml/compiler-libs/id_types.cmi
+lib/ocaml/compiler-libs/id_types.cmt
+lib/ocaml/compiler-libs/id_types.cmti
+lib/ocaml/compiler-libs/id_types.mli
lib/ocaml/compiler-libs/ident.cmi
lib/ocaml/compiler-libs/ident.cmt
lib/ocaml/compiler-libs/ident.cmti
+lib/ocaml/compiler-libs/ident.cmx
+lib/ocaml/compiler-libs/ident.mli
+lib/ocaml/compiler-libs/identifiable.cmi
+lib/ocaml/compiler-libs/identifiable.cmt
+lib/ocaml/compiler-libs/identifiable.cmti
+lib/ocaml/compiler-libs/identifiable.cmx
+lib/ocaml/compiler-libs/identifiable.mli
+lib/ocaml/compiler-libs/import_approx.cmi
+lib/ocaml/compiler-libs/import_approx.cmt
+lib/ocaml/compiler-libs/import_approx.cmti
+lib/ocaml/compiler-libs/import_approx.cmx
+lib/ocaml/compiler-libs/import_approx.mli
lib/ocaml/compiler-libs/includeclass.cmi
lib/ocaml/compiler-libs/includeclass.cmt
lib/ocaml/compiler-libs/includeclass.cmti
+lib/ocaml/compiler-libs/includeclass.cmx
+lib/ocaml/compiler-libs/includeclass.mli
lib/ocaml/compiler-libs/includecore.cmi
lib/ocaml/compiler-libs/includecore.cmt
lib/ocaml/compiler-libs/includecore.cmti
+lib/ocaml/compiler-libs/includecore.cmx
+lib/ocaml/compiler-libs/includecore.mli
lib/ocaml/compiler-libs/includemod.cmi
lib/ocaml/compiler-libs/includemod.cmt
lib/ocaml/compiler-libs/includemod.cmti
+lib/ocaml/compiler-libs/includemod.cmx
+lib/ocaml/compiler-libs/includemod.mli
+lib/ocaml/compiler-libs/inconstant_idents.cmi
+lib/ocaml/compiler-libs/inconstant_idents.cmt
+lib/ocaml/compiler-libs/inconstant_idents.cmti
+lib/ocaml/compiler-libs/inconstant_idents.mli
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmi
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmt
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmti
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.mli
+lib/ocaml/compiler-libs/inline_and_simplify.cmi
+lib/ocaml/compiler-libs/inline_and_simplify.cmt
+lib/ocaml/compiler-libs/inline_and_simplify.cmti
+lib/ocaml/compiler-libs/inline_and_simplify.mli
+lib/ocaml/compiler-libs/inline_and_simplify_aux.cmi
+lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt
+lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti
+lib/ocaml/compiler-libs/inline_and_simplify_aux.mli
+lib/ocaml/compiler-libs/inlining_cost.cmi
+lib/ocaml/compiler-libs/inlining_cost.cmt
+lib/ocaml/compiler-libs/inlining_cost.cmti
+lib/ocaml/compiler-libs/inlining_cost.mli
+lib/ocaml/compiler-libs/inlining_decision.cmi
+lib/ocaml/compiler-libs/inlining_decision.cmt
+lib/ocaml/compiler-libs/inlining_decision.cmti
+lib/ocaml/compiler-libs/inlining_decision.mli
+lib/ocaml/compiler-libs/inlining_decision_intf.cmi
+lib/ocaml/compiler-libs/inlining_decision_intf.cmti
+lib/ocaml/compiler-libs/inlining_decision_intf.mli
+lib/ocaml/compiler-libs/inlining_stats.cmi
+lib/ocaml/compiler-libs/inlining_stats.cmt
+lib/ocaml/compiler-libs/inlining_stats.cmti
+lib/ocaml/compiler-libs/inlining_stats.mli
+lib/ocaml/compiler-libs/inlining_stats_types.cmi
+lib/ocaml/compiler-libs/inlining_stats_types.cmt
+lib/ocaml/compiler-libs/inlining_stats_types.cmti
+lib/ocaml/compiler-libs/inlining_stats_types.mli
+lib/ocaml/compiler-libs/inlining_transforms.cmi
+lib/ocaml/compiler-libs/inlining_transforms.cmt
+lib/ocaml/compiler-libs/inlining_transforms.cmti
+lib/ocaml/compiler-libs/inlining_transforms.mli
lib/ocaml/compiler-libs/instruct.cmi
lib/ocaml/compiler-libs/instruct.cmt
lib/ocaml/compiler-libs/instruct.cmti
+lib/ocaml/compiler-libs/instruct.cmx
+lib/ocaml/compiler-libs/instruct.mli
lib/ocaml/compiler-libs/interf.cmi
lib/ocaml/compiler-libs/interf.cmt
lib/ocaml/compiler-libs/interf.cmti
+lib/ocaml/compiler-libs/interf.cmx
+lib/ocaml/compiler-libs/interf.mli
+lib/ocaml/compiler-libs/invariant_params.cmi
+lib/ocaml/compiler-libs/invariant_params.cmt
+lib/ocaml/compiler-libs/invariant_params.cmti
+lib/ocaml/compiler-libs/invariant_params.mli
lib/ocaml/compiler-libs/lambda.cmi
lib/ocaml/compiler-libs/lambda.cmt
lib/ocaml/compiler-libs/lambda.cmti
+lib/ocaml/compiler-libs/lambda.cmx
+lib/ocaml/compiler-libs/lambda.mli
lib/ocaml/compiler-libs/lexer.cmi
lib/ocaml/compiler-libs/lexer.cmt
lib/ocaml/compiler-libs/lexer.cmti
+lib/ocaml/compiler-libs/lexer.cmx
+lib/ocaml/compiler-libs/lexer.mli
+lib/ocaml/compiler-libs/lift_code.cmi
+lib/ocaml/compiler-libs/lift_code.cmt
+lib/ocaml/compiler-libs/lift_code.cmti
+lib/ocaml/compiler-libs/lift_code.mli
+lib/ocaml/compiler-libs/lift_constants.cmi
+lib/ocaml/compiler-libs/lift_constants.cmt
+lib/ocaml/compiler-libs/lift_constants.cmti
+lib/ocaml/compiler-libs/lift_constants.mli
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmi
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
lib/ocaml/compiler-libs/linearize.cmi
lib/ocaml/compiler-libs/linearize.cmt
lib/ocaml/compiler-libs/linearize.cmti
+lib/ocaml/compiler-libs/linearize.cmx
+lib/ocaml/compiler-libs/linearize.mli
+lib/ocaml/compiler-libs/linkage_name.cmi
+lib/ocaml/compiler-libs/linkage_name.cmt
+lib/ocaml/compiler-libs/linkage_name.cmti
+lib/ocaml/compiler-libs/linkage_name.mli
lib/ocaml/compiler-libs/liveness.cmi
lib/ocaml/compiler-libs/liveness.cmt
lib/ocaml/compiler-libs/liveness.cmti
+lib/ocaml/compiler-libs/liveness.cmx
+lib/ocaml/compiler-libs/liveness.mli
lib/ocaml/compiler-libs/location.cmi
lib/ocaml/compiler-libs/location.cmt
lib/ocaml/compiler-libs/location.cmti
+lib/ocaml/compiler-libs/location.cmx
+lib/ocaml/compiler-libs/location.mli
lib/ocaml/compiler-libs/longident.cmi
lib/ocaml/compiler-libs/longident.cmt
lib/ocaml/compiler-libs/longident.cmti
+lib/ocaml/compiler-libs/longident.cmx
+lib/ocaml/compiler-libs/longident.mli
lib/ocaml/compiler-libs/mach.cmi
lib/ocaml/compiler-libs/mach.cmt
lib/ocaml/compiler-libs/mach.cmti
+lib/ocaml/compiler-libs/mach.cmx
+lib/ocaml/compiler-libs/mach.mli
lib/ocaml/compiler-libs/main.cmi
lib/ocaml/compiler-libs/main.cmo
lib/ocaml/compiler-libs/main.cmt
lib/ocaml/compiler-libs/main.cmti
lib/ocaml/compiler-libs/main.cmx
+lib/ocaml/compiler-libs/main.mli
lib/ocaml/compiler-libs/main.o
lib/ocaml/compiler-libs/main_args.cmi
lib/ocaml/compiler-libs/main_args.cmt
lib/ocaml/compiler-libs/main_args.cmti
+lib/ocaml/compiler-libs/main_args.cmx
+lib/ocaml/compiler-libs/main_args.mli
lib/ocaml/compiler-libs/matching.cmi
lib/ocaml/compiler-libs/matching.cmt
lib/ocaml/compiler-libs/matching.cmti
+lib/ocaml/compiler-libs/matching.cmx
+lib/ocaml/compiler-libs/matching.mli
lib/ocaml/compiler-libs/meta.cmi
lib/ocaml/compiler-libs/meta.cmt
lib/ocaml/compiler-libs/meta.cmti
+lib/ocaml/compiler-libs/meta.cmx
+lib/ocaml/compiler-libs/meta.mli
+lib/ocaml/compiler-libs/middle_end.cmi
+lib/ocaml/compiler-libs/middle_end.cmt
+lib/ocaml/compiler-libs/middle_end.cmti
+lib/ocaml/compiler-libs/middle_end.mli
lib/ocaml/compiler-libs/misc.cmi
lib/ocaml/compiler-libs/misc.cmt
lib/ocaml/compiler-libs/misc.cmti
+lib/ocaml/compiler-libs/misc.cmx
+lib/ocaml/compiler-libs/misc.mli
lib/ocaml/compiler-libs/mtype.cmi
lib/ocaml/compiler-libs/mtype.cmt
lib/ocaml/compiler-libs/mtype.cmti
+lib/ocaml/compiler-libs/mtype.cmx
+lib/ocaml/compiler-libs/mtype.mli
+lib/ocaml/compiler-libs/mutable_variable.cmi
+lib/ocaml/compiler-libs/mutable_variable.cmt
+lib/ocaml/compiler-libs/mutable_variable.cmti
+lib/ocaml/compiler-libs/mutable_variable.mli
+lib/ocaml/compiler-libs/numbers.cmi
+lib/ocaml/compiler-libs/numbers.cmt
+lib/ocaml/compiler-libs/numbers.cmti
+lib/ocaml/compiler-libs/numbers.cmx
+lib/ocaml/compiler-libs/numbers.mli
lib/ocaml/compiler-libs/ocamlbytecomp.a
lib/ocaml/compiler-libs/ocamlbytecomp.cma
lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
@@ -453,196 +864,476 @@ 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/opcodes.cmx
lib/ocaml/compiler-libs/oprint.cmi
lib/ocaml/compiler-libs/oprint.cmt
lib/ocaml/compiler-libs/oprint.cmti
+lib/ocaml/compiler-libs/oprint.cmx
+lib/ocaml/compiler-libs/oprint.mli
lib/ocaml/compiler-libs/optcompile.cmi
lib/ocaml/compiler-libs/optcompile.cmt
lib/ocaml/compiler-libs/optcompile.cmti
+lib/ocaml/compiler-libs/optcompile.cmx
+lib/ocaml/compiler-libs/optcompile.mli
lib/ocaml/compiler-libs/opterrors.cmi
lib/ocaml/compiler-libs/opterrors.cmt
lib/ocaml/compiler-libs/opterrors.cmti
+lib/ocaml/compiler-libs/opterrors.cmx
+lib/ocaml/compiler-libs/opterrors.mli
lib/ocaml/compiler-libs/optmain.cmi
lib/ocaml/compiler-libs/optmain.cmo
lib/ocaml/compiler-libs/optmain.cmt
lib/ocaml/compiler-libs/optmain.cmti
lib/ocaml/compiler-libs/optmain.cmx
+lib/ocaml/compiler-libs/optmain.mli
lib/ocaml/compiler-libs/optmain.o
+lib/ocaml/compiler-libs/opttopdirs.mli
+lib/ocaml/compiler-libs/opttoploop.mli
+lib/ocaml/compiler-libs/opttopmain.mli
lib/ocaml/compiler-libs/outcometree.cmi
lib/ocaml/compiler-libs/outcometree.cmti
+lib/ocaml/compiler-libs/outcometree.mli
lib/ocaml/compiler-libs/parmatch.cmi
lib/ocaml/compiler-libs/parmatch.cmt
lib/ocaml/compiler-libs/parmatch.cmti
+lib/ocaml/compiler-libs/parmatch.cmx
+lib/ocaml/compiler-libs/parmatch.mli
lib/ocaml/compiler-libs/parse.cmi
lib/ocaml/compiler-libs/parse.cmt
lib/ocaml/compiler-libs/parse.cmti
+lib/ocaml/compiler-libs/parse.cmx
+lib/ocaml/compiler-libs/parse.mli
lib/ocaml/compiler-libs/parser.cmi
lib/ocaml/compiler-libs/parser.cmt
lib/ocaml/compiler-libs/parser.cmti
+lib/ocaml/compiler-libs/parser.cmx
+lib/ocaml/compiler-libs/parser.mli
lib/ocaml/compiler-libs/parsetree.cmi
lib/ocaml/compiler-libs/parsetree.cmti
+lib/ocaml/compiler-libs/parsetree.mli
+lib/ocaml/compiler-libs/pass_wrapper.cmi
+lib/ocaml/compiler-libs/pass_wrapper.cmt
+lib/ocaml/compiler-libs/pass_wrapper.cmti
+lib/ocaml/compiler-libs/pass_wrapper.mli
lib/ocaml/compiler-libs/path.cmi
lib/ocaml/compiler-libs/path.cmt
lib/ocaml/compiler-libs/path.cmti
+lib/ocaml/compiler-libs/path.cmx
+lib/ocaml/compiler-libs/path.mli
lib/ocaml/compiler-libs/pparse.cmi
lib/ocaml/compiler-libs/pparse.cmt
lib/ocaml/compiler-libs/pparse.cmti
+lib/ocaml/compiler-libs/pparse.cmx
+lib/ocaml/compiler-libs/pparse.mli
lib/ocaml/compiler-libs/pprintast.cmi
lib/ocaml/compiler-libs/pprintast.cmt
lib/ocaml/compiler-libs/pprintast.cmti
+lib/ocaml/compiler-libs/pprintast.cmx
+lib/ocaml/compiler-libs/pprintast.mli
lib/ocaml/compiler-libs/predef.cmi
lib/ocaml/compiler-libs/predef.cmt
lib/ocaml/compiler-libs/predef.cmti
+lib/ocaml/compiler-libs/predef.cmx
+lib/ocaml/compiler-libs/predef.mli
lib/ocaml/compiler-libs/primitive.cmi
lib/ocaml/compiler-libs/primitive.cmt
lib/ocaml/compiler-libs/primitive.cmti
+lib/ocaml/compiler-libs/primitive.cmx
+lib/ocaml/compiler-libs/primitive.mli
lib/ocaml/compiler-libs/printast.cmi
lib/ocaml/compiler-libs/printast.cmt
lib/ocaml/compiler-libs/printast.cmti
+lib/ocaml/compiler-libs/printast.cmx
+lib/ocaml/compiler-libs/printast.mli
lib/ocaml/compiler-libs/printclambda.cmi
lib/ocaml/compiler-libs/printclambda.cmt
lib/ocaml/compiler-libs/printclambda.cmti
+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.cmi
lib/ocaml/compiler-libs/printinstr.cmt
lib/ocaml/compiler-libs/printinstr.cmti
+lib/ocaml/compiler-libs/printinstr.cmx
+lib/ocaml/compiler-libs/printinstr.mli
lib/ocaml/compiler-libs/printlambda.cmi
lib/ocaml/compiler-libs/printlambda.cmt
lib/ocaml/compiler-libs/printlambda.cmti
+lib/ocaml/compiler-libs/printlambda.cmx
+lib/ocaml/compiler-libs/printlambda.mli
lib/ocaml/compiler-libs/printlinear.cmi
lib/ocaml/compiler-libs/printlinear.cmt
lib/ocaml/compiler-libs/printlinear.cmti
+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/printtyp.cmi
lib/ocaml/compiler-libs/printtyp.cmt
lib/ocaml/compiler-libs/printtyp.cmti
+lib/ocaml/compiler-libs/printtyp.cmx
+lib/ocaml/compiler-libs/printtyp.mli
lib/ocaml/compiler-libs/printtyped.cmi
lib/ocaml/compiler-libs/printtyped.cmt
lib/ocaml/compiler-libs/printtyped.cmti
+lib/ocaml/compiler-libs/printtyped.cmx
+lib/ocaml/compiler-libs/printtyped.mli
lib/ocaml/compiler-libs/proc.cmi
lib/ocaml/compiler-libs/proc.cmt
lib/ocaml/compiler-libs/proc.cmti
+lib/ocaml/compiler-libs/proc.cmx
+lib/ocaml/compiler-libs/proc.mli
+lib/ocaml/compiler-libs/projection.cmi
+lib/ocaml/compiler-libs/projection.cmt
+lib/ocaml/compiler-libs/projection.cmti
+lib/ocaml/compiler-libs/projection.mli
+lib/ocaml/compiler-libs/ref_to_variables.cmi
+lib/ocaml/compiler-libs/ref_to_variables.cmt
+lib/ocaml/compiler-libs/ref_to_variables.cmti
+lib/ocaml/compiler-libs/ref_to_variables.mli
lib/ocaml/compiler-libs/reg.cmi
lib/ocaml/compiler-libs/reg.cmt
lib/ocaml/compiler-libs/reg.cmti
+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.cmt
+lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmti
+lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.mli
+lib/ocaml/compiler-libs/remove_unused_arguments.cmi
+lib/ocaml/compiler-libs/remove_unused_arguments.cmt
+lib/ocaml/compiler-libs/remove_unused_arguments.cmti
+lib/ocaml/compiler-libs/remove_unused_arguments.mli
+lib/ocaml/compiler-libs/remove_unused_closure_vars.cmi
+lib/ocaml/compiler-libs/remove_unused_closure_vars.cmt
+lib/ocaml/compiler-libs/remove_unused_closure_vars.cmti
+lib/ocaml/compiler-libs/remove_unused_closure_vars.mli
+lib/ocaml/compiler-libs/remove_unused_program_constructs.cmi
+lib/ocaml/compiler-libs/remove_unused_program_constructs.cmt
+lib/ocaml/compiler-libs/remove_unused_program_constructs.cmti
+lib/ocaml/compiler-libs/remove_unused_program_constructs.mli
lib/ocaml/compiler-libs/runtimedef.cmi
lib/ocaml/compiler-libs/runtimedef.cmt
lib/ocaml/compiler-libs/runtimedef.cmti
+lib/ocaml/compiler-libs/runtimedef.cmx
+lib/ocaml/compiler-libs/runtimedef.mli
lib/ocaml/compiler-libs/schedgen.cmi
lib/ocaml/compiler-libs/schedgen.cmt
lib/ocaml/compiler-libs/schedgen.cmti
+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.cmi
+lib/ocaml/compiler-libs/semantics_of_primitives.cmt
+lib/ocaml/compiler-libs/semantics_of_primitives.cmti
+lib/ocaml/compiler-libs/semantics_of_primitives.cmx
+lib/ocaml/compiler-libs/semantics_of_primitives.mli
+lib/ocaml/compiler-libs/set_of_closures_id.cmi
+lib/ocaml/compiler-libs/set_of_closures_id.cmt
+lib/ocaml/compiler-libs/set_of_closures_id.cmti
+lib/ocaml/compiler-libs/set_of_closures_id.mli
+lib/ocaml/compiler-libs/set_of_closures_origin.cmi
+lib/ocaml/compiler-libs/set_of_closures_origin.cmt
+lib/ocaml/compiler-libs/set_of_closures_origin.cmti
+lib/ocaml/compiler-libs/set_of_closures_origin.mli
+lib/ocaml/compiler-libs/share_constants.cmi
+lib/ocaml/compiler-libs/share_constants.cmt
+lib/ocaml/compiler-libs/share_constants.cmti
+lib/ocaml/compiler-libs/share_constants.mli
+lib/ocaml/compiler-libs/simple_value_approx.cmi
+lib/ocaml/compiler-libs/simple_value_approx.cmt
+lib/ocaml/compiler-libs/simple_value_approx.cmti
+lib/ocaml/compiler-libs/simple_value_approx.mli
lib/ocaml/compiler-libs/simplif.cmi
lib/ocaml/compiler-libs/simplif.cmt
lib/ocaml/compiler-libs/simplif.cmti
+lib/ocaml/compiler-libs/simplif.cmx
+lib/ocaml/compiler-libs/simplif.mli
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmi
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmt
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmti
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.mli
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmi
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.mli
+lib/ocaml/compiler-libs/simplify_common.cmi
+lib/ocaml/compiler-libs/simplify_common.cmt
+lib/ocaml/compiler-libs/simplify_common.cmti
+lib/ocaml/compiler-libs/simplify_common.mli
+lib/ocaml/compiler-libs/simplify_primitives.cmi
+lib/ocaml/compiler-libs/simplify_primitives.cmt
+lib/ocaml/compiler-libs/simplify_primitives.cmti
+lib/ocaml/compiler-libs/simplify_primitives.mli
+lib/ocaml/compiler-libs/spacetime_profiling.cmi
+lib/ocaml/compiler-libs/spacetime_profiling.cmt
+lib/ocaml/compiler-libs/spacetime_profiling.cmti
+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.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.cmi
+lib/ocaml/compiler-libs/strongly_connected_components.cmt
+lib/ocaml/compiler-libs/strongly_connected_components.cmti
+lib/ocaml/compiler-libs/strongly_connected_components.cmx
+lib/ocaml/compiler-libs/strongly_connected_components.mli
lib/ocaml/compiler-libs/stypes.cmi
lib/ocaml/compiler-libs/stypes.cmt
lib/ocaml/compiler-libs/stypes.cmti
+lib/ocaml/compiler-libs/stypes.cmx
+lib/ocaml/compiler-libs/stypes.mli
lib/ocaml/compiler-libs/subst.cmi
lib/ocaml/compiler-libs/subst.cmt
lib/ocaml/compiler-libs/subst.cmti
+lib/ocaml/compiler-libs/subst.cmx
+lib/ocaml/compiler-libs/subst.mli
lib/ocaml/compiler-libs/switch.cmi
lib/ocaml/compiler-libs/switch.cmt
lib/ocaml/compiler-libs/switch.cmti
+lib/ocaml/compiler-libs/switch.cmx
+lib/ocaml/compiler-libs/switch.mli
+lib/ocaml/compiler-libs/symbol.cmi
+lib/ocaml/compiler-libs/symbol.cmt
+lib/ocaml/compiler-libs/symbol.cmti
+lib/ocaml/compiler-libs/symbol.mli
lib/ocaml/compiler-libs/symtable.cmi
lib/ocaml/compiler-libs/symtable.cmt
lib/ocaml/compiler-libs/symtable.cmti
+lib/ocaml/compiler-libs/symtable.cmx
+lib/ocaml/compiler-libs/symtable.mli
lib/ocaml/compiler-libs/syntaxerr.cmi
lib/ocaml/compiler-libs/syntaxerr.cmt
lib/ocaml/compiler-libs/syntaxerr.cmti
+lib/ocaml/compiler-libs/syntaxerr.cmx
+lib/ocaml/compiler-libs/syntaxerr.mli
+lib/ocaml/compiler-libs/tag.cmi
+lib/ocaml/compiler-libs/tag.cmt
+lib/ocaml/compiler-libs/tag.cmti
+lib/ocaml/compiler-libs/tag.mli
+lib/ocaml/compiler-libs/targetint.cmi
+lib/ocaml/compiler-libs/targetint.cmt
+lib/ocaml/compiler-libs/targetint.cmti
+lib/ocaml/compiler-libs/targetint.cmx
+lib/ocaml/compiler-libs/targetint.mli
+lib/ocaml/compiler-libs/tast_mapper.cmi
+lib/ocaml/compiler-libs/tast_mapper.cmt
+lib/ocaml/compiler-libs/tast_mapper.cmti
+lib/ocaml/compiler-libs/tast_mapper.cmx
+lib/ocaml/compiler-libs/tast_mapper.mli
lib/ocaml/compiler-libs/tbl.cmi
lib/ocaml/compiler-libs/tbl.cmt
lib/ocaml/compiler-libs/tbl.cmti
+lib/ocaml/compiler-libs/tbl.cmx
+lib/ocaml/compiler-libs/tbl.mli
lib/ocaml/compiler-libs/terminfo.cmi
lib/ocaml/compiler-libs/terminfo.cmt
lib/ocaml/compiler-libs/terminfo.cmti
+lib/ocaml/compiler-libs/terminfo.cmx
+lib/ocaml/compiler-libs/terminfo.mli
+lib/ocaml/compiler-libs/timings.cmi
+lib/ocaml/compiler-libs/timings.cmt
+lib/ocaml/compiler-libs/timings.cmti
+lib/ocaml/compiler-libs/timings.cmx
+lib/ocaml/compiler-libs/timings.mli
lib/ocaml/compiler-libs/topdirs.cmi
lib/ocaml/compiler-libs/topdirs.cmt
lib/ocaml/compiler-libs/topdirs.cmti
+lib/ocaml/compiler-libs/topdirs.mli
lib/ocaml/compiler-libs/toploop.cmi
lib/ocaml/compiler-libs/toploop.cmt
lib/ocaml/compiler-libs/toploop.cmti
+lib/ocaml/compiler-libs/toploop.mli
lib/ocaml/compiler-libs/topmain.cmi
lib/ocaml/compiler-libs/topmain.cmt
lib/ocaml/compiler-libs/topmain.cmti
+lib/ocaml/compiler-libs/topmain.mli
lib/ocaml/compiler-libs/topstart.cmi
lib/ocaml/compiler-libs/topstart.cmo
lib/ocaml/compiler-libs/topstart.cmt
lib/ocaml/compiler-libs/trace.cmi
lib/ocaml/compiler-libs/trace.cmt
lib/ocaml/compiler-libs/trace.cmti
+lib/ocaml/compiler-libs/trace.mli
+lib/ocaml/compiler-libs/translattribute.cmi
+lib/ocaml/compiler-libs/translattribute.cmt
+lib/ocaml/compiler-libs/translattribute.cmti
+lib/ocaml/compiler-libs/translattribute.cmx
+lib/ocaml/compiler-libs/translattribute.mli
lib/ocaml/compiler-libs/translclass.cmi
lib/ocaml/compiler-libs/translclass.cmt
lib/ocaml/compiler-libs/translclass.cmti
+lib/ocaml/compiler-libs/translclass.cmx
+lib/ocaml/compiler-libs/translclass.mli
lib/ocaml/compiler-libs/translcore.cmi
lib/ocaml/compiler-libs/translcore.cmt
lib/ocaml/compiler-libs/translcore.cmti
+lib/ocaml/compiler-libs/translcore.cmx
+lib/ocaml/compiler-libs/translcore.mli
lib/ocaml/compiler-libs/translmod.cmi
lib/ocaml/compiler-libs/translmod.cmt
lib/ocaml/compiler-libs/translmod.cmti
+lib/ocaml/compiler-libs/translmod.cmx
+lib/ocaml/compiler-libs/translmod.mli
lib/ocaml/compiler-libs/translobj.cmi
lib/ocaml/compiler-libs/translobj.cmt
lib/ocaml/compiler-libs/translobj.cmti
+lib/ocaml/compiler-libs/translobj.cmx
+lib/ocaml/compiler-libs/translobj.mli
lib/ocaml/compiler-libs/typeclass.cmi
lib/ocaml/compiler-libs/typeclass.cmt
lib/ocaml/compiler-libs/typeclass.cmti
+lib/ocaml/compiler-libs/typeclass.cmx
+lib/ocaml/compiler-libs/typeclass.mli
lib/ocaml/compiler-libs/typecore.cmi
lib/ocaml/compiler-libs/typecore.cmt
lib/ocaml/compiler-libs/typecore.cmti
+lib/ocaml/compiler-libs/typecore.cmx
+lib/ocaml/compiler-libs/typecore.mli
lib/ocaml/compiler-libs/typedecl.cmi
lib/ocaml/compiler-libs/typedecl.cmt
lib/ocaml/compiler-libs/typedecl.cmti
+lib/ocaml/compiler-libs/typedecl.cmx
+lib/ocaml/compiler-libs/typedecl.mli
lib/ocaml/compiler-libs/typedtree.cmi
lib/ocaml/compiler-libs/typedtree.cmt
lib/ocaml/compiler-libs/typedtree.cmti
+lib/ocaml/compiler-libs/typedtree.cmx
+lib/ocaml/compiler-libs/typedtree.mli
lib/ocaml/compiler-libs/typedtreeIter.cmi
lib/ocaml/compiler-libs/typedtreeIter.cmt
lib/ocaml/compiler-libs/typedtreeIter.cmti
+lib/ocaml/compiler-libs/typedtreeIter.cmx
+lib/ocaml/compiler-libs/typedtreeIter.mli
lib/ocaml/compiler-libs/typedtreeMap.cmi
lib/ocaml/compiler-libs/typedtreeMap.cmt
lib/ocaml/compiler-libs/typedtreeMap.cmti
+lib/ocaml/compiler-libs/typedtreeMap.cmx
+lib/ocaml/compiler-libs/typedtreeMap.mli
lib/ocaml/compiler-libs/typemod.cmi
lib/ocaml/compiler-libs/typemod.cmt
lib/ocaml/compiler-libs/typemod.cmti
+lib/ocaml/compiler-libs/typemod.cmx
+lib/ocaml/compiler-libs/typemod.mli
lib/ocaml/compiler-libs/typeopt.cmi
lib/ocaml/compiler-libs/typeopt.cmt
lib/ocaml/compiler-libs/typeopt.cmti
+lib/ocaml/compiler-libs/typeopt.cmx
+lib/ocaml/compiler-libs/typeopt.mli
lib/ocaml/compiler-libs/types.cmi
lib/ocaml/compiler-libs/types.cmt
lib/ocaml/compiler-libs/types.cmti
+lib/ocaml/compiler-libs/types.cmx
+lib/ocaml/compiler-libs/types.mli
lib/ocaml/compiler-libs/typetexp.cmi
lib/ocaml/compiler-libs/typetexp.cmt
lib/ocaml/compiler-libs/typetexp.cmti
+lib/ocaml/compiler-libs/typetexp.cmx
+lib/ocaml/compiler-libs/typetexp.mli
+lib/ocaml/compiler-libs/un_anf.cmi
+lib/ocaml/compiler-libs/un_anf.cmt
+lib/ocaml/compiler-libs/un_anf.cmti
+lib/ocaml/compiler-libs/un_anf.cmx
+lib/ocaml/compiler-libs/un_anf.mli
+lib/ocaml/compiler-libs/unbox_closures.cmi
+lib/ocaml/compiler-libs/unbox_closures.cmt
+lib/ocaml/compiler-libs/unbox_closures.cmti
+lib/ocaml/compiler-libs/unbox_closures.mli
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmi
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmt
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmti
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.mli
+lib/ocaml/compiler-libs/unbox_specialised_args.cmi
+lib/ocaml/compiler-libs/unbox_specialised_args.cmt
+lib/ocaml/compiler-libs/unbox_specialised_args.cmti
+lib/ocaml/compiler-libs/unbox_specialised_args.mli
+lib/ocaml/compiler-libs/untypeast.cmi
+lib/ocaml/compiler-libs/untypeast.cmt
+lib/ocaml/compiler-libs/untypeast.cmti
+lib/ocaml/compiler-libs/untypeast.cmx
+lib/ocaml/compiler-libs/untypeast.mli
+lib/ocaml/compiler-libs/var_within_closure.cmi
+lib/ocaml/compiler-libs/var_within_closure.cmt
+lib/ocaml/compiler-libs/var_within_closure.cmti
+lib/ocaml/compiler-libs/var_within_closure.mli
+lib/ocaml/compiler-libs/variable.cmi
+lib/ocaml/compiler-libs/variable.cmt
+lib/ocaml/compiler-libs/variable.cmti
+lib/ocaml/compiler-libs/variable.mli
lib/ocaml/compiler-libs/warnings.cmi
lib/ocaml/compiler-libs/warnings.cmt
lib/ocaml/compiler-libs/warnings.cmti
+lib/ocaml/compiler-libs/warnings.cmx
+lib/ocaml/compiler-libs/warnings.mli
+lib/ocaml/compiler-libs/x86_ast.cmi
+lib/ocaml/compiler-libs/x86_ast.cmti
+lib/ocaml/compiler-libs/x86_ast.mli
+lib/ocaml/compiler-libs/x86_dsl.cmi
+lib/ocaml/compiler-libs/x86_dsl.cmt
+lib/ocaml/compiler-libs/x86_dsl.cmti
+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/complex.cmi
lib/ocaml/complex.cmt
lib/ocaml/complex.cmti
@@ -660,9 +1351,18 @@ lib/ocaml/digest.p.cmt
lib/ocaml/dynlink.a
lib/ocaml/dynlink.cma
lib/ocaml/dynlink.cmi
+lib/ocaml/dynlink.cmti
lib/ocaml/dynlink.cmx
lib/ocaml/dynlink.cmxa
lib/ocaml/dynlink.mli
+lib/ocaml/ephemeron.cmi
+lib/ocaml/ephemeron.cmt
+lib/ocaml/ephemeron.cmti
+lib/ocaml/ephemeron.cmx
+lib/ocaml/ephemeron.ml
+lib/ocaml/ephemeron.mli
+lib/ocaml/ephemeron.p.cmt
+lib/ocaml/ephemeron.p.cmx
lib/ocaml/filename.cmi
lib/ocaml/filename.cmt
lib/ocaml/filename.cmti
@@ -775,6 +1475,7 @@ lib/ocaml/moreLabels.ml
lib/ocaml/moreLabels.mli
lib/ocaml/moreLabels.p.cmt
lib/ocaml/nat.cmi
+lib/ocaml/nat.cmti
lib/ocaml/nat.cmx
lib/ocaml/nat.mli
lib/ocaml/nativeint.cmi
@@ -785,6 +1486,7 @@ lib/ocaml/nativeint.ml
lib/ocaml/nativeint.mli
lib/ocaml/nativeint.p.cmt
lib/ocaml/num.cmi
+lib/ocaml/num.cmti
lib/ocaml/num.cmx
lib/ocaml/num.mli
lib/ocaml/nums.a
@@ -799,76 +1501,108 @@ lib/ocaml/obj.ml
lib/ocaml/obj.mli
lib/ocaml/obj.p.cmt
lib/ocaml/objinfo_helper
-lib/ocaml/ocamlbuild/ocamlbuild.cmo
-lib/ocaml/ocamlbuild/ocamlbuild.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/ocamlbuild_pack.cmi
-lib/ocaml/ocamlbuild/ocamlbuild_pack.cmx
-lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
-lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx
-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.cmx
lib/ocaml/ocamldoc/odoc_analyse.cmi
+lib/ocaml/ocamldoc/odoc_analyse.cmx
lib/ocaml/ocamldoc/odoc_args.cmi
+lib/ocaml/ocamldoc/odoc_args.cmx
lib/ocaml/ocamldoc/odoc_ast.cmi
+lib/ocaml/ocamldoc/odoc_ast.cmx
lib/ocaml/ocamldoc/odoc_class.cmi
+lib/ocaml/ocamldoc/odoc_class.cmx
lib/ocaml/ocamldoc/odoc_comments.cmi
+lib/ocaml/ocamldoc/odoc_comments.cmx
lib/ocaml/ocamldoc/odoc_comments_global.cmi
+lib/ocaml/ocamldoc/odoc_comments_global.cmx
lib/ocaml/ocamldoc/odoc_config.cmi
+lib/ocaml/ocamldoc/odoc_config.cmx
lib/ocaml/ocamldoc/odoc_control.cmi
+lib/ocaml/ocamldoc/odoc_control.cmx
lib/ocaml/ocamldoc/odoc_cross.cmi
+lib/ocaml/ocamldoc/odoc_cross.cmx
lib/ocaml/ocamldoc/odoc_dag2html.cmi
+lib/ocaml/ocamldoc/odoc_dag2html.cmx
lib/ocaml/ocamldoc/odoc_dep.cmi
+lib/ocaml/ocamldoc/odoc_dep.cmx
lib/ocaml/ocamldoc/odoc_dot.cmi
+lib/ocaml/ocamldoc/odoc_dot.cmx
lib/ocaml/ocamldoc/odoc_env.cmi
+lib/ocaml/ocamldoc/odoc_env.cmx
lib/ocaml/ocamldoc/odoc_exception.cmi
+lib/ocaml/ocamldoc/odoc_exception.cmx
lib/ocaml/ocamldoc/odoc_extension.cmi
+lib/ocaml/ocamldoc/odoc_extension.cmx
lib/ocaml/ocamldoc/odoc_gen.cmi
+lib/ocaml/ocamldoc/odoc_gen.cmx
lib/ocaml/ocamldoc/odoc_global.cmi
+lib/ocaml/ocamldoc/odoc_global.cmx
lib/ocaml/ocamldoc/odoc_html.cmi
+lib/ocaml/ocamldoc/odoc_html.cmx
lib/ocaml/ocamldoc/odoc_info.a
lib/ocaml/ocamldoc/odoc_info.cma
lib/ocaml/ocamldoc/odoc_info.cmi
+lib/ocaml/ocamldoc/odoc_info.cmt
+lib/ocaml/ocamldoc/odoc_info.cmti
+lib/ocaml/ocamldoc/odoc_info.cmx
lib/ocaml/ocamldoc/odoc_info.cmxa
lib/ocaml/ocamldoc/odoc_info.mli
lib/ocaml/ocamldoc/odoc_inherit.cmi
+lib/ocaml/ocamldoc/odoc_inherit.cmx
lib/ocaml/ocamldoc/odoc_latex.cmi
+lib/ocaml/ocamldoc/odoc_latex.cmx
lib/ocaml/ocamldoc/odoc_latex_style.cmi
+lib/ocaml/ocamldoc/odoc_latex_style.cmx
lib/ocaml/ocamldoc/odoc_lexer.cmi
+lib/ocaml/ocamldoc/odoc_lexer.cmx
lib/ocaml/ocamldoc/odoc_man.cmi
+lib/ocaml/ocamldoc/odoc_man.cmx
lib/ocaml/ocamldoc/odoc_merge.cmi
+lib/ocaml/ocamldoc/odoc_merge.cmx
lib/ocaml/ocamldoc/odoc_messages.cmi
+lib/ocaml/ocamldoc/odoc_messages.cmx
lib/ocaml/ocamldoc/odoc_misc.cmi
+lib/ocaml/ocamldoc/odoc_misc.cmx
lib/ocaml/ocamldoc/odoc_module.cmi
+lib/ocaml/ocamldoc/odoc_module.cmx
lib/ocaml/ocamldoc/odoc_name.cmi
+lib/ocaml/ocamldoc/odoc_name.cmx
lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
+lib/ocaml/ocamldoc/odoc_ocamlhtml.cmx
lib/ocaml/ocamldoc/odoc_parameter.cmi
+lib/ocaml/ocamldoc/odoc_parameter.cmx
lib/ocaml/ocamldoc/odoc_parser.cmi
+lib/ocaml/ocamldoc/odoc_parser.cmx
lib/ocaml/ocamldoc/odoc_print.cmi
+lib/ocaml/ocamldoc/odoc_print.cmx
lib/ocaml/ocamldoc/odoc_scan.cmi
+lib/ocaml/ocamldoc/odoc_scan.cmx
lib/ocaml/ocamldoc/odoc_search.cmi
+lib/ocaml/ocamldoc/odoc_search.cmx
lib/ocaml/ocamldoc/odoc_see_lexer.cmi
+lib/ocaml/ocamldoc/odoc_see_lexer.cmx
lib/ocaml/ocamldoc/odoc_sig.cmi
+lib/ocaml/ocamldoc/odoc_sig.cmx
lib/ocaml/ocamldoc/odoc_str.cmi
+lib/ocaml/ocamldoc/odoc_str.cmx
lib/ocaml/ocamldoc/odoc_test.cmi
lib/ocaml/ocamldoc/odoc_texi.cmi
+lib/ocaml/ocamldoc/odoc_texi.cmx
lib/ocaml/ocamldoc/odoc_text.cmi
+lib/ocaml/ocamldoc/odoc_text.cmx
lib/ocaml/ocamldoc/odoc_text_lexer.cmi
+lib/ocaml/ocamldoc/odoc_text_lexer.cmx
lib/ocaml/ocamldoc/odoc_text_parser.cmi
+lib/ocaml/ocamldoc/odoc_text_parser.cmx
lib/ocaml/ocamldoc/odoc_to_text.cmi
+lib/ocaml/ocamldoc/odoc_to_text.cmx
lib/ocaml/ocamldoc/odoc_type.cmi
+lib/ocaml/ocamldoc/odoc_type.cmx
lib/ocaml/ocamldoc/odoc_types.cmi
+lib/ocaml/ocamldoc/odoc_types.cmx
lib/ocaml/ocamldoc/odoc_value.cmi
+lib/ocaml/ocamldoc/odoc_value.cmx
lib/ocaml/oo.cmi
lib/ocaml/oo.cmt
lib/ocaml/oo.cmti
@@ -906,6 +1640,8 @@ lib/ocaml/printf.mli
lib/ocaml/printf.p.cmt
lib/ocaml/profiling.cmi
lib/ocaml/profiling.cmo
+lib/ocaml/profiling.cmt
+lib/ocaml/profiling.cmti
lib/ocaml/profiling.cmx
lib/ocaml/profiling.o
lib/ocaml/queue.cmi
@@ -923,8 +1659,16 @@ lib/ocaml/random.ml
lib/ocaml/random.mli
lib/ocaml/random.p.cmt
lib/ocaml/ratio.cmi
+lib/ocaml/ratio.cmti
lib/ocaml/ratio.cmx
lib/ocaml/ratio.mli
+lib/ocaml/raw_spacetime_lib.a
+lib/ocaml/raw_spacetime_lib.cma
+lib/ocaml/raw_spacetime_lib.cmi
+lib/ocaml/raw_spacetime_lib.cmx
+lib/ocaml/raw_spacetime_lib.cmxa
+lib/ocaml/raw_spacetime_lib.cmxs
+lib/ocaml/raw_spacetime_lib.mli
lib/ocaml/scanf.cmi
lib/ocaml/scanf.cmt
lib/ocaml/scanf.cmti
@@ -946,6 +1690,14 @@ lib/ocaml/sort.cmx
lib/ocaml/sort.ml
lib/ocaml/sort.mli
lib/ocaml/sort.p.cmt
+lib/ocaml/spacetime.cmi
+lib/ocaml/spacetime.cmt
+lib/ocaml/spacetime.cmti
+lib/ocaml/spacetime.cmx
+lib/ocaml/spacetime.ml
+lib/ocaml/spacetime.mli
+lib/ocaml/spacetime.p.cmt
+lib/ocaml/spacetime.p.cmx
lib/ocaml/stack.cmi
lib/ocaml/stack.cmt
lib/ocaml/stack.cmti
@@ -973,6 +1725,7 @@ lib/ocaml/stdlib.cmxa
lib/ocaml/str.a
lib/ocaml/str.cma
lib/ocaml/str.cmi
+lib/ocaml/str.cmti
lib/ocaml/str.cmx
lib/ocaml/str.cmxa
lib/ocaml/str.cmxs
@@ -1010,28 +1763,50 @@ lib/ocaml/sys.cmx
lib/ocaml/sys.ml
lib/ocaml/sys.mli
lib/ocaml/sys.p.cmt
+lib/ocaml/threads/condition.cmti
+lib/ocaml/threads/event.cmti
+lib/ocaml/threads/mutex.cmti
+lib/ocaml/threads/thread.cmti
+lib/ocaml/threads/threadUnix.cmti
lib/ocaml/topdirs.cmi
+lib/ocaml/topdirs.cmt
+lib/ocaml/topdirs.cmti
+lib/ocaml/topdirs.mli
+lib/ocaml/uchar.cmi
+lib/ocaml/uchar.cmt
+lib/ocaml/uchar.cmti
+lib/ocaml/uchar.cmx
+lib/ocaml/uchar.ml
+lib/ocaml/uchar.mli
+lib/ocaml/uchar.p.cmt
lib/ocaml/unix.a
lib/ocaml/unix.cma
lib/ocaml/unix.cmi
+lib/ocaml/unix.cmti
lib/ocaml/unix.cmx
lib/ocaml/unix.cmxa
lib/ocaml/unix.cmxs
lib/ocaml/unix.mli
lib/ocaml/unixLabels.cmi
+lib/ocaml/unixLabels.cmti
lib/ocaml/unixLabels.cmx
lib/ocaml/unixLabels.mli
lib/ocaml/vmthreads/condition.cmi
+lib/ocaml/vmthreads/condition.cmti
lib/ocaml/vmthreads/condition.mli
lib/ocaml/vmthreads/event.cmi
+lib/ocaml/vmthreads/event.cmti
lib/ocaml/vmthreads/event.mli
lib/ocaml/vmthreads/libvmthreads.a
lib/ocaml/vmthreads/mutex.cmi
+lib/ocaml/vmthreads/mutex.cmti
lib/ocaml/vmthreads/mutex.mli
lib/ocaml/vmthreads/stdlib.cma
lib/ocaml/vmthreads/thread.cmi
+lib/ocaml/vmthreads/thread.cmti
lib/ocaml/vmthreads/thread.mli
lib/ocaml/vmthreads/threadUnix.cmi
+lib/ocaml/vmthreads/threadUnix.cmti
lib/ocaml/vmthreads/threadUnix.mli
lib/ocaml/vmthreads/threads.cma
lib/ocaml/vmthreads/unix.cma
@@ -1044,7 +1819,6 @@ 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
@@ -1067,6 +1841,7 @@ man/man3/Ast_helper.3o.gz
man/man3/Ast_helper.Cf.3o.gz
man/man3/Ast_helper.Ci.3o.gz
man/man3/Ast_helper.Cl.3o.gz
+man/man3/Ast_helper.Const.3o.gz
man/man3/Ast_helper.Csig.3o.gz
man/man3/Ast_helper.Cstr.3o.gz
man/man3/Ast_helper.Ctf.3o.gz
@@ -1087,14 +1862,19 @@ man/man3/Ast_helper.Typ.3o.gz
man/man3/Ast_helper.Type.3o.gz
man/man3/Ast_helper.Val.3o.gz
man/man3/Ast_helper.Vb.3o.gz
+man/man3/Ast_invariants.3o.gz
+man/man3/Ast_iterator.3o.gz
man/man3/Ast_mapper.3o.gz
man/man3/Asttypes.3o.gz
+man/man3/Attr_helper.3o.gz
man/man3/Bigarray.3o.gz
+man/man3/Bigarray.Array0.3o.gz
man/man3/Bigarray.Array1.3o.gz
man/man3/Bigarray.Array2.3o.gz
man/man3/Bigarray.Array3.3o.gz
man/man3/Bigarray.Genarray.3o.gz
man/man3/Buffer.3o.gz
+man/man3/Builtin_attributes.3o.gz
man/man3/Bytes.3o.gz
man/man3/BytesLabels.3o.gz
man/man3/Callback.3o.gz
@@ -1105,8 +1885,25 @@ man/man3/CamlinternalMod.3o.gz
man/man3/CamlinternalOO.3o.gz
man/man3/Char.3o.gz
man/man3/Complex.3o.gz
+man/man3/Depend.3o.gz
+man/man3/Depend.StringMap.3o.gz
+man/man3/Depend.StringSet.3o.gz
man/man3/Digest.3o.gz
man/man3/Docstrings.3o.gz
+man/man3/Ephemeron.3o.gz
+man/man3/Ephemeron.GenHashTable.3o.gz
+man/man3/Ephemeron.GenHashTable.MakeSeeded.3o.gz
+man/man3/Ephemeron.K1.3o.gz
+man/man3/Ephemeron.K1.Make.3o.gz
+man/man3/Ephemeron.K1.MakeSeeded.3o.gz
+man/man3/Ephemeron.K2.3o.gz
+man/man3/Ephemeron.K2.Make.3o.gz
+man/man3/Ephemeron.K2.MakeSeeded.3o.gz
+man/man3/Ephemeron.Kn.3o.gz
+man/man3/Ephemeron.Kn.Make.3o.gz
+man/man3/Ephemeron.Kn.MakeSeeded.3o.gz
+man/man3/Ephemeron.S.3o.gz
+man/man3/Ephemeron.SeededS.3o.gz
man/man3/Filename.3o.gz
man/man3/Format.3o.gz
man/man3/Gc.3o.gz
@@ -1151,6 +1948,7 @@ man/man3/MoreLabels.Set.S.3o.gz
man/man3/Nativeint.3o.gz
man/man3/Num.3o.gz
man/man3/Obj.3o.gz
+man/man3/Obj.Ephemeron.3o.gz
man/man3/Oo.3o.gz
man/man3/Parse.3o.gz
man/man3/Parser.3o.gz
@@ -1159,7 +1957,6 @@ man/man3/Parsing.3o.gz
man/man3/Pervasives.3o.gz
man/man3/Pervasives.LargeFile.3o.gz
man/man3/Pprintast.3o.gz
-man/man3/Pprintast.printer.3o.gz
man/man3/Printast.3o.gz
man/man3/Printexc.3o.gz
man/man3/Printexc.Slot.3o.gz
@@ -1174,6 +1971,9 @@ man/man3/Set.Make.3o.gz
man/man3/Set.OrderedType.3o.gz
man/man3/Set.S.3o.gz
man/man3/Sort.3o.gz
+man/man3/Spacetime.3o.gz
+man/man3/Spacetime.Series.3o.gz
+man/man3/Spacetime.Snapshot.3o.gz
man/man3/Stack.3o.gz
man/man3/StdLabels.3o.gz
man/man3/StdLabels.Array.3o.gz
@@ -1186,6 +1986,7 @@ man/man3/String.3o.gz
man/man3/StringLabels.3o.gz
man/man3/Syntaxerr.3o.gz
man/man3/Sys.3o.gz
+man/man3/Uchar.3o.gz
man/man3/Unix.3o.gz
man/man3/Unix.LargeFile.3o.gz
man/man3/Weak.3o.gz
diff --git a/math/facile/Makefile b/math/facile/Makefile
index 89266f6c6ff9..c86f5e7cef72 100644
--- a/math/facile/Makefile
+++ b/math/facile/Makefile
@@ -3,6 +3,7 @@
PORTNAME= facile
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://opti.recherche.enac.fr/facile/distrib/
diff --git a/math/ocamlgsl/Makefile b/math/ocamlgsl/Makefile
index b70fd39377a6..1bd447fb90b8 100644
--- a/math/ocamlgsl/Makefile
+++ b/math/ocamlgsl/Makefile
@@ -14,6 +14,7 @@ LICENSE= GPLv3
LIB_DEPENDS= libgsl.so:math/gsl
BUILD_DEPENDS= gawk:lang/gawk \
+ ocamlbuild:devel/ocaml-ocamlbuild \
${OCAMLC_DEPEND}
RUN_DEPENDS= ocamlfind:devel/ocaml-findlib
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 179eb9460eb7..d1d7d5804f99 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -117,10 +117,12 @@ post-patch:
${WRKSRC}/src/daemon/common/commonOptions.ml \
${WRKSRC}/src/networks/donkey/donkeyServers.ml
@${REINPLACE_CMD} \
- -e 's/[u(]int32/&_t/' ${WRKSRC}/src/utils/cdk/zlibstubs.c
+ -e 's/[u(]int32/&_t/' ${WRKSRC}/src/utils/cdk/zlibstubs.c \
+ ${WRKSRC}/src/utils/cdk/gdstubs.c
@${REINPLACE_CMD} \
-e 's/int64/&_t/' ${WRKSRC}/src/config/unix/os_stubs_c.c \
- ${WRKSRC}/src/utils/lib/os_stubs.h
+ ${WRKSRC}/src/utils/lib/os_stubs.h \
+ ${WRKSRC}/src/utils/lib/fst_hash.c
do-install:
.if ${PORT_OPTIONS:MCORE}
diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile
index 92a95ed3e933..6f6c269abf94 100644
--- a/security/ocaml-cryptokit/Makefile
+++ b/security/ocaml-cryptokit/Makefile
@@ -10,6 +10,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
COMMENT= Variety of cryptographic primitives for Objective Caml
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
DESTDIRNAME= destdir
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --docdir ${OCAML_DOCSDIR}
@@ -27,7 +29,8 @@ OPTIONS_DEFINE= DOCS
DOCS_ALL_TARGET= doc
post-patch:
- ${REINPLACE_CMD} 's,"install","install" :: "-ldconf ignore",' \
+ @${REINPLACE_CMD} 's,"install","install" :: "-ldconf ignore",' \
${WRKSRC}/setup.ml
+ @${REINPLACE_CMD} -e 's,uint32,&_t,' ${WRKSRC}/src/stubs-md5.c
.include <bsd.port.mk>
diff --git a/security/sks/Makefile b/security/sks/Makefile
index 9ce7c672bfb4..02139280dfaa 100644
--- a/security/sks/Makefile
+++ b/security/sks/Makefile
@@ -5,6 +5,8 @@ PORTVERSION= 1.1.6
CATEGORIES= security
MASTER_SITES= http://bitbucket.org/skskeyserver/sks-keyserver/downloads/
+EXTRA_PATCHES= ${FILESDIR}/debian-bug-870150:-p1
+
MAINTAINER= johans@FreeBSD.org
COMMENT= Synchronizing Key Server, a fast OpenPGP keyserver
@@ -32,9 +34,6 @@ post-extract:
@cd ${WRKSRC} && ${RM} .depend
post-patch:
- @${REINPLACE_CMD} -Ee '/^CC=/d; /^CFLAGS=/s/=/+=/' \
- -e '/^install/,$$s/\$$\((PREFIX|MANDIR)\)/$$(DESTDIR)&/' \
- -e '/patch/s/-p 0/-p0/' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/s/=/+=/' ${WRKSRC}/bdb/Makefile
pre-build:
diff --git a/security/sks/files/debian-bug-870150 b/security/sks/files/debian-bug-870150
new file mode 100644
index 000000000000..e8dbca5296b8
--- /dev/null
+++ b/security/sks/files/debian-bug-870150
@@ -0,0 +1,144 @@
+Description: Fix FTBFS with OCaml 4.05.0
+Author: Stephane Glondu <glondu@debian.org>
+Bug-Debian: https://bugs.debian.org/870150
+Last-Update: 2017-08-01
+
+--- sks-1.1.6.orig/eventloop.ml
++++ sks-1.1.6/eventloop.ml
+@@ -26,6 +26,7 @@ open MoreLabels
+ open Printf
+ open Common
+ open Packet
++let unix_socket = Unix.socket
+ module Unix = UnixLabels
+ open Unix
+
+@@ -129,7 +130,7 @@ let create_sock addr =
+ let domain =
+ Unix.domain_of_sockaddr addr in
+ let sock =
+- socket ~domain ~kind:SOCK_STREAM ~protocol:0 in
++ unix_socket domain SOCK_STREAM 0 in
+ setsockopt sock SO_REUSEADDR true;
+ if domain = PF_INET6 then
+ setsockopt sock IPV6_ONLY true;
+--- sks-1.1.6.orig/reconComm.ml
++++ sks-1.1.6/reconComm.ml
+@@ -26,6 +26,7 @@ open Printf
+ open Common
+ open Packet
+
++let unix_socket = Unix.socket
+ module Unix = UnixLabels
+ module Map = PMap.Map
+
+@@ -37,10 +38,10 @@ open DbMessages
+
+ (** send DbMessages message and wait for response *)
+ let send_dbmsg msg =
+- let s = Unix.socket
+- ~domain:(Unix.domain_of_sockaddr db_command_addr)
+- ~kind:Unix.SOCK_STREAM
+- ~protocol:0 in
++ let s = unix_socket
++ (Unix.domain_of_sockaddr db_command_addr)
++ Unix.SOCK_STREAM
++ 0 in
+ protect ~f:(fun () ->
+ Unix.connect s ~addr:db_command_addr;
+ let cin = Channel.sys_in_from_fd s in
+@@ -54,10 +55,10 @@ let send_dbmsg msg =
+
+ (** send DbMessages message, don't wait for response *)
+ let send_dbmsg_noreply msg =
+- let s = Unix.socket
+- ~domain:(Unix.domain_of_sockaddr db_command_addr)
+- ~kind:Unix.SOCK_STREAM
+- ~protocol:0 in
++ let s = unix_socket
++ (Unix.domain_of_sockaddr db_command_addr)
++ Unix.SOCK_STREAM
++ 0 in
+ protect ~f:(fun () ->
+ Unix.connect s ~addr:db_command_addr;
+ let cout = Channel.sys_out_from_fd s in
+@@ -75,10 +76,10 @@ let is_content_type line =
+ let http_status_ok_regexp = Str.regexp "^HTTP/[0-9]+\\.[0-9]+ 2"
+
+ let get_keystrings_via_http addr hashes =
+- let s = Unix.socket
+- ~domain:(Unix.domain_of_sockaddr addr)
+- ~kind:Unix.SOCK_STREAM
+- ~protocol:0 in
++ let s = unix_socket
++ (Unix.domain_of_sockaddr addr)
++ Unix.SOCK_STREAM
++ 0 in
+ protect ~f:(fun () ->
+ Unix.bind s ~addr:(match_client_recon_addr addr);
+ Unix.connect s ~addr;
+--- sks-1.1.6.orig/sks_do.ml
++++ sks-1.1.6/sks_do.ml
+@@ -27,6 +27,7 @@ open Printf
+ open Common
+ open Packet
+ open DbMessages
++let unix_socket = Unix.socket
+ module Unix = UnixLabels
+ module PTree = PrefixTree
+ module Map = PMap.Map
+@@ -37,10 +38,10 @@ let fail reason =
+ exit (-1)
+
+ let send_dbmsg msg =
+- let s = Unix.socket
+- ~domain:(Unix.domain_of_sockaddr db_command_addr)
+- ~kind:Unix.SOCK_STREAM
+- ~protocol:0 in
++ let s = unix_socket
++ (Unix.domain_of_sockaddr db_command_addr)
++ Unix.SOCK_STREAM
++ 0 in
+ protect ~f:(fun () ->
+ Unix.connect s ~addr:db_command_addr;
+ let cin = Channel.sys_in_from_fd s in
+--- sks-1.1.6.orig/tester.ml
++++ sks-1.1.6/tester.ml
+@@ -26,6 +26,7 @@ open Printf
+ open Common
+ open Packet
+ open DbMessages
++let unix_socket = Unix.socket
+ module Unix = UnixLabels
+
+ let settings = {
+@@ -46,10 +47,10 @@ module Keydb = Keydb.Safe
+
+
+ let send_msg addr msg =
+- let s = Unix.socket
+- ~domain:(Unix.domain_of_sockaddr addr)
+- ~kind:Unix.SOCK_STREAM
+- ~protocol:0 in
++ let s = unix_socket
++ (Unix.domain_of_sockaddr addr)
++ Unix.SOCK_STREAM
++ 0 in
+ protect ~f:( fun () ->
+ Unix.connect s ~addr:addr;
+ let cin = Channel.sys_in_from_fd s
+@@ -62,10 +63,10 @@ let send_msg addr msg =
+ ~finally:(fun () -> Unix.close s)
+
+ let send_msg_noreply addr msg =
+- let s = Unix.socket
+- ~domain:(Unix.domain_of_sockaddr addr)
+- ~kind:Unix.SOCK_STREAM
+- ~protocol:0 in
++ let s = unix_socket
++ (Unix.domain_of_sockaddr addr)
++ Unix.SOCK_STREAM
++ 0 in
+ protect ~f:(fun () ->
+ Unix.connect s ~addr:addr;
+ let cout = Channel.sys_out_from_fd s in
diff --git a/security/sks/files/patch-Makefile b/security/sks/files/patch-Makefile
new file mode 100644
index 000000000000..86d7c495fa7a
--- /dev/null
+++ b/security/sks/files/patch-Makefile
@@ -0,0 +1,50 @@
+--- Makefile.orig 2019-06-06 15:28:32 UTC
++++ Makefile
+@@ -15,9 +15,8 @@
+ # USA
+ #
+ CINCLUDES=-I`ocamlc -where`
+-CC=gcc
+ CXX=g++
+-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
++CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+ CXXFLAGS=-O3 $(CINCLUDES) -I .
+
+ ifndef OCAMLC
+@@ -135,16 +134,16 @@ keyMerge.cmx: keyMerge.ml
+ # Special targets
+
+ install:
+- mkdir -p $(PREFIX)/bin
+- install sks_build.sh sks sks_add_mail $(PREFIX)/bin
+- mkdir -p $(MANDIR)/man8
+- install sks.8.gz $(MANDIR)/man8
++ mkdir -p $(DESTDIR)$(PREFIX)/bin
++ install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin
++ mkdir -p $(DESTDIR)$(MANDIR)/man8
++ install sks.8.gz $(DESTDIR)$(MANDIR)/man8
+
+ install.bc:
+- mkdir -p $(PREFIX)/bin
+- install sks_build.bc.sh sks.bc sks_add_mail.bc $(PREFIX)/bin
+- mkdir -p $(MANDIR)/man8
+- install sks.8.gz $(MANDIR)/man8
++ mkdir -p $(DESTDIR)$(PREFIX)/bin
++ install sks_build.bc.sh sks.bc sks_add_mail.bc $(DESTDIR)$(PREFIX)/bin
++ mkdir -p $(DESTDIR)$(MANDIR)/man8
++ install sks.8.gz $(DESTDIR)$(MANDIR)/man8
+
+
+ Makefile.local:
+@@ -285,8 +284,9 @@ CKDIR=$(CKVER)/src
+
+ $(CKVER)/README.txt:
+ tar xmvfz $(CKVER).tar.gz
+- patch -p 0 < $(CKVER)-sks.patch
+- patch -p 0 < $(CKVER)-sks-custom_compare.patch
++ patch -p0 < $(CKVER)-sks.patch
++ patch -p0 < $(CKVER)-sks-custom_compare.patch
++ sed -i.bak -e 's,uint32,&_t,' $(CKDIR)/stubs-md5.c
+
+ $(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
+ cd $(CKDIR) && $(MAKE) all
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 2037e1225780..fba0a7edfee5 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= danilo@FreeBSD.org
COMMENT= Convert LaTeX to HTML
-BUILD_DEPENDS= ocamlc:lang/ocaml
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
OPTIONS_DEFINE= DOCS
diff --git a/textproc/ocaml-text/Makefile b/textproc/ocaml-text/Makefile
index 68109dd37c2d..068e9eaa0b08 100644
--- a/textproc/ocaml-text/Makefile
+++ b/textproc/ocaml-text/Makefile
@@ -9,6 +9,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
COMMENT= OCaml library for dealing with text
+BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
+
USE_GITHUB= yes
GH_ACCOUNT= vbmithr
GH_PROJECT= ${PKGNAMEPREFIX}${PORTNAME}
diff --git a/x11-toolkits/ocaml-labltk/Makefile b/x11-toolkits/ocaml-labltk/Makefile
index 6fbd5cee87b1..c1ac58a6ad38 100644
--- a/x11-toolkits/ocaml-labltk/Makefile
+++ b/x11-toolkits/ocaml-labltk/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= labltk
-PORTVERSION= 8.06.0
-PORTREVISION= 2
+PORTVERSION= 8.06.3
CATEGORIES= x11-toolkits
-MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1455/
+MASTER_SITES= https://download.ocamlcore.org/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/ocaml-labltk/distinfo b/x11-toolkits/ocaml-labltk/distinfo
index bb6b59570482..453a615ba5e5 100644
--- a/x11-toolkits/ocaml-labltk/distinfo
+++ b/x11-toolkits/ocaml-labltk/distinfo
@@ -1,2 +1,3 @@
-SHA256 (labltk-8.06.0.tar.gz) = 71997dbd6c36e4eb064484dc73037d4bd10e465e180fead07a4b193d21af9764
-SIZE (labltk-8.06.0.tar.gz) = 368790
+TIMESTAMP = 1559830627
+SHA256 (labltk-8.06.3.tar.gz) = b6b7076f6a2a7b2f63095013cb4e37a1f2a6eb3d4abb57dbb1b8cff1ae4c6ae6
+SIZE (labltk-8.06.3.tar.gz) = 369924