diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2023-07-05 09:51:47 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2023-07-05 09:55:16 +0000 |
| commit | 2b40e4609399858e2bfbddcf961bd7c947f6ed2c (patch) | |
| tree | 4860d454db5b6442d4afbf6ae54684b8611d01f8 | |
| parent | 57afac98ba83843ddce1a5b719af3e3861dfaed4 (diff) | |
| download | ports-2b40e4609399858e2bfbddcf961bd7c947f6ed2c.tar.gz ports-2b40e4609399858e2bfbddcf961bd7c947f6ed2c.zip | |
lang/ocaml: Update to 4.08.1
This update allows (and for some requires) to also update dependencies
to newer versions. Where possible I updated to the latest version.
The ocaml port now is MAKE_JOBS safe.
Changes to dependent ports included in this commit:
- devel/ocaml-sexplib: Rename to devel/ocaml-sexplib0 adapting to
upstream. Update to 0.16.0
- devel/coccinelle: Update to 1.1.1, moved to github
- devel/ocaml-camlp4: Update to 4.08+1
- devel/ocaml-camomile: Use dune for build, adapt port
- devel/ocaml-cppo: Fix lib files installation [1]
- devel/ocaml-dune: Update to 3.7.1 [2]
- devel/ocaml-findlib: Update to 1.9.6 [3]
- devel/ocaml-ipaddr: Update to 3.1.0
- devel/ocaml-parmap: Update to 1.2.4, use dune for build [4]
- devel/ocaml-ppx-tools: Update to 6.6, use dune for build
- graphics/ocaml-cairo: Update to 0.6.4
- net-p2p/mldonkey: Update to 3.1.7-2 [2]
- net/unison: Remove ocaml 4.07 compatibility patches
- net/unison232: Mark broken, fails to build with newer ocaml [5]
- security/ocaml-ssl: Update to 0.5.13 [2]
- x11-toolkits/ocaml-labltk: Update to 8.06.7 [2]
Dune now requires full path as argument to --libdir, so various
ports have been patched accordingly.
Bumping PORTREVISION for all dependent ports that were not updated.
PR: 272067
Approved by: michipili@gmail.com (maintainer timeout),
eduardo (maintainer timeout) [1],
danfe [2],
hrs (maintainer timeout) [3],
dumbbell (maintainer timeout) [4],
mandree (implicit) [5]
Differential Revision: https://reviews.freebsd.org/D40599
166 files changed, 3493 insertions, 2526 deletions
@@ -7762,3 +7762,4 @@ www/kristall||2023-07-02|Has expired: Requires older openssl sysutils/cfengine-masterfiles318||2023-07-02|Has expired: Expire one year after cfengine-masterfiles 3.19.0 released sysutils/cfengine318||2023-07-02|Has expired: Expire one year after cfengine 3.19.0 released devel/linux-c7-dbus-glib||2023-07-02|Merged into devel/linux-c7-dbus-libs +devel/ocaml-sexplib|devel/ocaml-sexplib0|2023-07-05|Project renamed diff --git a/archivers/ocaml-bz2/Makefile b/archivers/ocaml-bz2/Makefile index 16c8390f1b5a..70677015eae5 100644 --- a/archivers/ocaml-bz2/Makefile +++ b/archivers/ocaml-bz2/Makefile @@ -1,6 +1,6 @@ PORTNAME= bz2 PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/72/ PKGNAMEPREFIX= ocaml- diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile index 883ecfa8d9b5..4dd002cc680f 100644 --- a/archivers/ocaml-zip/Makefile +++ b/archivers/ocaml-zip/Makefile @@ -1,5 +1,6 @@ PORTNAME= zip PORTVERSION= 1.11 +PORTREVISION= 1 CATEGORIES= archivers PKGNAMEPREFIX= ocaml- DISTNAME= caml${PORTNAME}-${PORTVERSION} diff --git a/converters/ocaml-base64/Makefile b/converters/ocaml-base64/Makefile index 7d8b66c37998..f62e531ee15b 100644 --- a/converters/ocaml-base64/Makefile +++ b/converters/ocaml-base64/Makefile @@ -1,6 +1,7 @@ PORTNAME= base64 PORTVERSION= 2.0.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= converters PKGNAMEPREFIX= ocaml- diff --git a/converters/ocaml-jsonm/Makefile b/converters/ocaml-jsonm/Makefile index ec12fb46581d..0a59c3023ca6 100644 --- a/converters/ocaml-jsonm/Makefile +++ b/converters/ocaml-jsonm/Makefile @@ -1,5 +1,6 @@ PORTNAME= jsonm PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= converters MASTER_SITES= https://erratique.ch/software/jsonm/releases/ PKGNAMEPREFIX= ocaml- diff --git a/databases/ocaml-dbm/Makefile b/databases/ocaml-dbm/Makefile index f97ad179a8c0..b6bf839ba0b2 100644 --- a/databases/ocaml-dbm/Makefile +++ b/databases/ocaml-dbm/Makefile @@ -1,5 +1,6 @@ PORTNAME= dbm PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/728/ PKGNAMEPREFIX= ocaml- diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile index ec0a5fe0efe1..6dee49ad6204 100644 --- a/databases/ocaml-mysql/Makefile +++ b/databases/ocaml-mysql/Makefile @@ -1,5 +1,6 @@ PORTNAME= mysql PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://ygrek.org.ua/p/release/ocaml-mysql/ PKGNAMEPREFIX= ocaml- diff --git a/databases/ocaml-sqlite3/Makefile b/databases/ocaml-sqlite3/Makefile index 8d6cf40486cb..a039f89f262f 100644 --- a/databases/ocaml-sqlite3/Makefile +++ b/databases/ocaml-sqlite3/Makefile @@ -1,6 +1,7 @@ PORTNAME= sqlite3 PORTVERSION= 4.0.5 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= ocaml- diff --git a/devel/Makefile b/devel/Makefile index 1a2248c180d2..030c48db7822 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1678,7 +1678,7 @@ SUBDIR += ocaml-result SUBDIR += ocaml-sdl SUBDIR += ocaml-sem - SUBDIR += ocaml-sexplib + SUBDIR += ocaml-sexplib0 SUBDIR += ocaml-topkg SUBDIR += ocaml-type_conv SUBDIR += ocaml-uchar diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile index 8bf62541be9e..7fe14314525d 100644 --- a/devel/aifad/Makefile +++ b/devel/aifad/Makefile @@ -1,6 +1,7 @@ PORTNAME= aifad PORTVERSION= 2.0.8 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/devel/cil/Makefile b/devel/cil/Makefile index 845676c66da2..022598bdf106 100644 --- a/devel/cil/Makefile +++ b/devel/cil/Makefile @@ -1,6 +1,6 @@ PORTNAME= cil PORTVERSION= 1.7.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME} diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile index fa27ae000c23..3b7663c2bf58 100644 --- a/devel/coccinelle/Makefile +++ b/devel/coccinelle/Makefile @@ -1,8 +1,6 @@ PORTNAME= coccinelle -PORTVERSION= 1.0.7 -PORTREVISION= 1 +PORTVERSION= 1.1.1 CATEGORIES= devel -MASTER_SITES= http://coccinelle.lip6.fr/distrib/ MAINTAINER= ports@FreeBSD.org COMMENT= Program matching and transformation engine @@ -27,6 +25,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= PYTHON="${PYTHON_CMD}" PYVER="${PYTHON_VER}" MAKE_ARGS= PYTHON_VERSION="${PYTHON_VER}" +USE_GITHUB= yes + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spatch ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spgen diff --git a/devel/coccinelle/distinfo b/devel/coccinelle/distinfo index 6abf7c79309d..95cc097a296d 100644 --- a/devel/coccinelle/distinfo +++ b/devel/coccinelle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1578014897 -SHA256 (coccinelle-1.0.7.tar.gz) = 475e2bed5486023d19d9e0dec5e109b04b872a9917b62faf83ce3521676f728b -SIZE (coccinelle-1.0.7.tar.gz) = 6607407 +TIMESTAMP = 1683065204 +SHA256 (coccinelle-coccinelle-1.1.1_GH0.tar.gz) = 095919e129ac563586d880ebbc5aac829fec224177090aebe34dc34ed5f142bf +SIZE (coccinelle-coccinelle-1.1.1_GH0.tar.gz) = 2743457 diff --git a/devel/coccinelle/files/patch-bundles_pyml_Makefile b/devel/coccinelle/files/patch-bundles_pyml_Makefile deleted file mode 100644 index 36ec14a119d9..000000000000 --- a/devel/coccinelle/files/patch-bundles_pyml_Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- bundles/pyml/Makefile.orig 2018-08-31 14:36:59 UTC -+++ bundles/pyml/Makefile -@@ -21,16 +21,18 @@ CLEANOTHERS=pyml-current/generate pyml-current/generat - pyml-current/pyml.cma pyml-current/pyml.cmxa \ - pyml-current/dllpyml_stubs.so - --ARCH:=$(shell uname) -+UNAME_ARCH:=$(shell uname) - --ifeq ($(ARCH),Linux) -+ifeq ($(UNAME_ARCH),Linux) - PYML_ARCH=pyml_arch_linux.ml --else ifeq ($(ARCH),Darwin) -+else ifeq ($(UNAME_ARCH),Darwin) - PYML_ARCH=pyml_arch_darwin.ml --else ifeq ($(findstring CYGWIN,$(ARCH)),CYGWIN) -+else ifeq ($(UNAME_ARCH),FreeBSD) -+ PYML_ARCH=pyml_arch_freebsd.ml -+else ifeq ($(findstring CYGWIN,$(UNAME_ARCH)),CYGWIN) - PYML_ARCH=pyml_arch_cygwin.ml - else -- $(error Unsupported OS $(ARCH) -+ $(error Unsupported OS $(UNAME_ARCH)) - endif - - include ../Makefile.bundles diff --git a/devel/coccinelle/files/patch-bundles_pyml_pyml-current_pyml__arch__freebsd.ml b/devel/coccinelle/files/patch-bundles_pyml_pyml-current_pyml__arch__freebsd.ml deleted file mode 100644 index 28e8a3f67f41..000000000000 --- a/devel/coccinelle/files/patch-bundles_pyml_pyml-current_pyml__arch__freebsd.ml +++ /dev/null @@ -1,15 +0,0 @@ ---- bundles/pyml/pyml-current/pyml_arch_freebsd.ml.orig 2020-01-03 01:59:43 UTC -+++ bundles/pyml/pyml-current/pyml_arch_freebsd.ml -@@ -0,0 +1,12 @@ -+let library_patterns: (int -> int -> string, unit, string) format list = -+ ["libpython%d.%dm.so"; "libpython%d.%d.so"] -+ -+let library_suffix = ".so" -+ -+let ensure_executable_suffix executable = executable -+ -+let which = "which" -+ -+external fd_of_int: int -> Unix.file_descr = "%identity" -+ -+let path_separator = ":" diff --git a/devel/coccinelle/files/patch-stdcompat-fix b/devel/coccinelle/files/patch-stdcompat-fix new file mode 100644 index 000000000000..16e0167634a1 --- /dev/null +++ b/devel/coccinelle/files/patch-stdcompat-fix @@ -0,0 +1,39 @@ +From fa4d4abc816a1fe1d0ac98a0b9520bae5ea559d6 Mon Sep 17 00:00:00 2001 +From: Thierry Martinez <Thierry.Martinez@inria.fr> +Date: Thu, 4 Nov 2021 14:22:08 +0100 +Subject: [PATCH] Add empty rule to make .cmt targets depend on .cmx + +Fix bug reported by Sabyrzhan Tasbolatov +--- + bundles/stdcompat/stdcompat-current/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/bundles/stdcompat/stdcompat-current/Makefile.am b/bundles/stdcompat/stdcompat-current/Makefile.am +index f0d8dbc38..1b955cf86 100644 +--- bundles/stdcompat/stdcompat-current/Makefile.am ++++ bundles/stdcompat/stdcompat-current/Makefile.am +@@ -71,10 +71,12 @@ mypkg_SCRIPTS = META $(MODULES_native) $(MODULES_native:.ml=.cmi) \ + + if OCAML_SUPPORTS_BYTECODE + mypkg_SCRIPTS += stdcompat.cma ++BEST_SUFFIX := .cmo + endif + + if OCAML_SUPPORTS_NATIVE + mypkg_SCRIPTS += stdcompat.cmxa stdcompat.a $(MODULES_native:.ml=.cmx) ++BEST_SUFFIX := .cmx + endif + + if OCAML_SUPPORTS_SHARED +@@ -113,6 +115,8 @@ SUFFIXES = .ml .mli .cmi .cmo .cmx .cmxa .cmxs .cmt + .ml.cmx : + $(OCAMLOPT) -c $(OCAMLCFLAGS) $< -o $@ + ++$(BEST_SUFFIX).cmt : ; ++ + stdcompat__stubs.$(OBJEXT) : stdcompat__stubs.c + $(OCAMLC) -c $< + +-- +GitLab + diff --git a/devel/coccinelle/pkg-plist b/devel/coccinelle/pkg-plist index 1893c4d1b32f..f5d15e871d96 100644 --- a/devel/coccinelle/pkg-plist +++ b/devel/coccinelle/pkg-plist @@ -54,15 +54,6 @@ lib/coccinelle/ocaml/visitor_c.cmx lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmx lib/coccinelle/python/coccilib/__init__.py -lib/coccinelle/python/coccilib/coccigui/__init__.py -lib/coccinelle/python/coccilib/coccigui/coccigui.py -lib/coccinelle/python/coccilib/coccigui/pycoccimodel.py -lib/coccinelle/python/coccilib/coccigui/pygui.glade -lib/coccinelle/python/coccilib/coccigui/pygui.gladep -lib/coccinelle/python/coccilib/coccigui/vim.py -lib/coccinelle/python/coccilib/coccigui/vimcom.py -lib/coccinelle/python/coccilib/coccigui/vimeditor.py -lib/coccinelle/python/coccilib/coccigui/vimembed.py lib/coccinelle/python/coccilib/elems.py lib/coccinelle/python/coccilib/iteration.py lib/coccinelle/python/coccilib/org.py diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile index 44eafc7751d0..858663616ade 100644 --- a/devel/menhir/Makefile +++ b/devel/menhir/Makefile @@ -1,5 +1,6 @@ PORTNAME= menhir PORTVERSION= 20170712 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://cristal.inria.fr/~fpottier/menhir/ diff --git a/devel/ocaml-annexlib/Makefile b/devel/ocaml-annexlib/Makefile index fcfb0d8d0c70..9fa166c4b6c2 100644 --- a/devel/ocaml-annexlib/Makefile +++ b/devel/ocaml-annexlib/Makefile @@ -1,6 +1,6 @@ PORTNAME= annexlib PORTVERSION= 0.13.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://raevnos.pennmush.org/code/extlib/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-calendar/Makefile b/devel/ocaml-calendar/Makefile index 3166086e41ae..8460ec8bce2e 100644 --- a/devel/ocaml-calendar/Makefile +++ b/devel/ocaml-calendar/Makefile @@ -1,5 +1,6 @@ PORTNAME= calendar PORTVERSION= 2.03.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/915/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile index 464c91623b28..0a19fa16bbb9 100644 --- a/devel/ocaml-camljava/Makefile +++ b/devel/ocaml-camljava/Makefile @@ -1,6 +1,6 @@ PORTNAME= camljava PORTVERSION= 0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel java MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-camlp4/Makefile b/devel/ocaml-camlp4/Makefile index b9742642deac..370fe1b15a4e 100644 --- a/devel/ocaml-camlp4/Makefile +++ b/devel/ocaml-camlp4/Makefile @@ -1,5 +1,5 @@ PORTNAME= camlp4 -PORTVERSION= 4.07+1 +PORTVERSION= 4.08+1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-camlp4/distinfo b/devel/ocaml-camlp4/distinfo index 3978cf2d529d..aac47793f324 100644 --- a/devel/ocaml-camlp4/distinfo +++ b/devel/ocaml-camlp4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520427832 -SHA256 (ocaml-camlp4-4.07+1_GH0.tar.gz) = ecdb8963063f41b387412317685f79823a26b3f53744f0472058991876877090 -SIZE (ocaml-camlp4-4.07+1_GH0.tar.gz) = 648842 +TIMESTAMP = 1681674686 +SHA256 (ocaml-camlp4-4.08+1_GH0.tar.gz) = 655cd3bdcafbf8435877f60f4b47dd2eb69feef5afd8881291ef01ba12bd9d88 +SIZE (ocaml-camlp4-4.08+1_GH0.tar.gz) = 649830 diff --git a/devel/ocaml-camlp4/files/patch-camlp4_Camlp4_Debug.ml b/devel/ocaml-camlp4/files/patch-camlp4_Camlp4_Debug.ml new file mode 100644 index 000000000000..24347edbac68 --- /dev/null +++ b/devel/ocaml-camlp4/files/patch-camlp4_Camlp4_Debug.ml @@ -0,0 +1,11 @@ +--- camlp4/Camlp4/Debug.ml.orig 2019-08-07 13:03:46 UTC ++++ camlp4/Camlp4/Debug.ml +@@ -29,7 +29,7 @@ value out_channel = + open_out_gen [Open_wronly; Open_creat; Open_append; Open_text] + 0o666 f + with +- [ Not_found -> Pervasives.stderr ]; ++ [ Not_found -> Stdlib.stderr ]; + + module StringSet = Set.Make String; + diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile index 157697937512..a36071d4d3e3 100644 --- a/devel/ocaml-camlp5/Makefile +++ b/devel/ocaml-camlp5/Makefile @@ -1,5 +1,6 @@ PORTNAME= camlp5 PORTVERSION= 7.14 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-camomile-examples/Makefile b/devel/ocaml-camomile-examples/Makefile index a2063156293a..3d98900692af 100644 --- a/devel/ocaml-camomile-examples/Makefile +++ b/devel/ocaml-camomile-examples/Makefile @@ -1,5 +1,6 @@ PORTNAME= camomile PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/OldFiles PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-camomile/Makefile b/devel/ocaml-camomile/Makefile index b22e85c545ea..79414328d45b 100644 --- a/devel/ocaml-camomile/Makefile +++ b/devel/ocaml-camomile/Makefile @@ -1,5 +1,6 @@ PORTNAME= camomile PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -9,7 +10,7 @@ WWW= http://camomile.sourceforge.net/ LICENSE= LGPL21 -BUILD_DEPENDS= jbuilder:devel/ocaml-dune +BUILD_DEPENDS= dune:devel/ocaml-dune USES= gmake USE_GITHUB= yes @@ -17,7 +18,7 @@ GH_ACCOUNT= yoriyuki GH_PROJECT= Camomile USE_OCAML= yes -MAKE_ENV= LIBDIR="${OCAML_SITELIBDIR}" +MAKE_ENV= LIBDIR="${PREFIX}/${OCAML_SITELIBDIR}" DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= CHANGES.md LICENSE.md README.md diff --git a/devel/ocaml-camomile/files/patch-Camomile_internal_byte__labeled__dag.ml b/devel/ocaml-camomile/files/patch-Camomile_internal_byte__labeled__dag.ml new file mode 100644 index 000000000000..1c54e490dcdb --- /dev/null +++ b/devel/ocaml-camomile/files/patch-Camomile_internal_byte__labeled__dag.ml @@ -0,0 +1,11 @@ +--- Camomile/internal/byte_labeled_dag.ml.orig 2019-08-08 07:10:33 UTC ++++ Camomile/internal/byte_labeled_dag.ml +@@ -87,7 +87,7 @@ let make_bytes def vs = + branch.(Char.code c') <- Some node; + scan d c leaf branch rest + in +- let comp (s1, _) (s2, _) = Pervasives.compare s1 s2 in ++ let comp (s1, _) (s2, _) = Stdlib.compare s1 s2 in + let vs = List.sort comp vs in + match vs with + (_, _) :: _ -> diff --git a/devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.ml b/devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.ml new file mode 100644 index 000000000000..2184d2265b87 --- /dev/null +++ b/devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.ml @@ -0,0 +1,17 @@ +--- Camomile/public/charEncoding.ml.orig 2019-08-08 07:10:33 UTC ++++ Camomile/public/charEncoding.ml +@@ -131,12 +131,12 @@ module type Interface = sig + {!OOChannel.obj_output_channel} which + receives Unicode characters and outputs them to [outchan] using + the encoding [enc]. *) +- class out_channel : t -> Pervasives.out_channel -> [UChar.t] obj_output_channel ++ class out_channel : t -> Stdlib.out_channel -> [UChar.t] obj_output_channel + + (** [new in_channel enc inchan] creates the intput channel object + {!OOChannel.obj_input_channel} which + reads bytes from [inchan] and converts them to Unicode characters. *) +- class in_channel : t -> Pervasives.in_channel -> [UChar.t] obj_input_channel ++ class in_channel : t -> Stdlib.in_channel -> [UChar.t] obj_input_channel + + (** [ustream_of enc chars] converts the byte stream [chars] + to the Unicode character stream by the encoding [enc]. *) diff --git a/devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.mli b/devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.mli new file mode 100644 index 000000000000..6eeda087d6ea --- /dev/null +++ b/devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.mli @@ -0,0 +1,17 @@ +--- Camomile/public/charEncoding.mli.orig 2019-08-08 07:10:33 UTC ++++ Camomile/public/charEncoding.mli +@@ -130,12 +130,12 @@ module type Interface = sig + {!OOChannel.obj_output_channel} which + receives Unicode characters and outputs them to [outchan] using + the encoding [enc]. *) +- class out_channel : t -> Pervasives.out_channel -> [UChar.t] obj_output_channel ++ class out_channel : t -> Stdlib.out_channel -> [UChar.t] obj_output_channel + + (** [new in_channel enc inchan] creates the intput channel object + {!OOChannel.obj_input_channel} which + reads bytes from [inchan] and converts them to Unicode characters. *) +- class in_channel : t -> Pervasives.in_channel -> [UChar.t] obj_input_channel ++ class in_channel : t -> Stdlib.in_channel -> [UChar.t] obj_input_channel + + (** [ustream_of enc chars] converts the byte stream [chars] + to the Unicode character stream by the encoding [enc]. *) diff --git a/devel/ocaml-camomile/files/patch-Camomile_public_oOChannel.mli b/devel/ocaml-camomile/files/patch-Camomile_public_oOChannel.mli new file mode 100644 index 000000000000..51fd55e6ddcb --- /dev/null +++ b/devel/ocaml-camomile/files/patch-Camomile_public_oOChannel.mli @@ -0,0 +1,12 @@ +--- Camomile/public/oOChannel.mli.orig 2019-08-08 07:10:33 UTC ++++ Camomile/public/oOChannel.mli +@@ -113,7 +113,7 @@ class char_obj_output_channel_of : char_output_channel + [char] obj_output_channel + + (** Convert an OCaml input channel to an OO-based character input channel *) +-class of_in_channel : Pervasives.in_channel -> char_input_channel ++class of_in_channel : Stdlib.in_channel -> char_input_channel + + (** Convert an OCaml output channel to an OO-based character output channel *) +-class of_out_channel : Pervasives.out_channel -> char_output_channel ++class of_out_channel : Stdlib.out_channel -> char_output_channel diff --git a/devel/ocaml-camomile/files/patch-Camomile_public_uCS4.ml b/devel/ocaml-camomile/files/patch-Camomile_public_uCS4.ml new file mode 100644 index 000000000000..f4b3e2b8e4ca --- /dev/null +++ b/devel/ocaml-camomile/files/patch-Camomile_public_uCS4.ml @@ -0,0 +1,9 @@ +--- Camomile/public/uCS4.ml.orig 2019-08-08 07:10:33 UTC ++++ Camomile/public/uCS4.ml +@@ -140,5 +140,5 @@ let compare (a:t) (b:t) = + + let compare (a:t) (b:t) = + match Array1.dim a - Array1.dim b with +- 0 -> Pervasives.compare a b ++ 0 -> Stdlib.compare a b + | sgn -> sgn diff --git a/devel/ocaml-camomile/files/patch-Camomile_public_uCol.ml b/devel/ocaml-camomile/files/patch-Camomile_public_uCol.ml new file mode 100644 index 000000000000..00a2a8fe4e56 --- /dev/null +++ b/devel/ocaml-camomile/files/patch-Camomile_public_uCol.ml @@ -0,0 +1,37 @@ +--- Camomile/public/uCol.ml.orig 2019-08-08 07:10:33 UTC ++++ Camomile/public/uCol.ml +@@ -52,14 +52,14 @@ sig + If [prec] is omitted, the maximum possible strength is used. + If [variable] is omitted, the default of the locale + (usually [`Shifted]) is used. +- The meaning of the returned value is similar to Pervasives.compare *) ++ The meaning of the returned value is similar to Stdlib.compare *) + val compare : + ?locale:string -> ?prec:precision -> ?variable:variable_option -> + text -> text -> int + + (** Binary comparison of sort_key gives the same result as [compare]. + i.e. +- [compare t1 t2 = Pervasives.compare (sort_key t1) (sort_key t2)] ++ [compare t1 t2 = Stdlib.compare (sort_key t1) (sort_key t2)] + If the same texts are repeatedly compared, + pre-computation of sort_key gives better performance. *) + val sort_key : +@@ -731,7 +731,7 @@ module Make (Config : ConfigInt.Type) (Text : UnicodeS + | _ -> + let key1 = key_of_inc prec col_info x1 in + let key2 = key_of_inc prec col_info x2 in +- Pervasives.compare key1 key2 ++ Stdlib.compare key1 key2 + + let compare ?locale ?prec ?variable t1 t2 = + let col_info = +@@ -782,7 +782,7 @@ module Make (Config : ConfigInt.Type) (Text : UnicodeS + | _ -> + let key = key_of_inc prec col_info x in + (* Printf.printf "key_of_inc %s\n" (String.escaped key);*) +- Pervasives.compare k key ++ Stdlib.compare k key + + let compare_with_key ?locale ?prec ?variable k t = + let col_info = diff --git a/devel/ocaml-camomile/files/patch-Camomile_public_uCol.mli b/devel/ocaml-camomile/files/patch-Camomile_public_uCol.mli new file mode 100644 index 000000000000..2371257a94e6 --- /dev/null +++ b/devel/ocaml-camomile/files/patch-Camomile_public_uCol.mli @@ -0,0 +1,19 @@ +--- Camomile/public/uCol.mli.orig 2019-08-08 07:10:33 UTC ++++ Camomile/public/uCol.mli +@@ -65,14 +65,14 @@ sig + If [prec] is omitted, the maximum possible strength is used. + If [variable] is omitted, the default of the locale + (usually [`Shifted]) is used. +- The meaning of the returned value is similar to Pervasives.compare *) ++ The meaning of the returned value is similar to Stdlib.compare *) + val compare : + ?locale:string -> ?prec:precision -> ?variable:variable_option -> + text -> text -> int + + (** Binary comparison of sort_key gives the same result as [compare]. + i.e. +- [compare t1 t2 = Pervasives.compare (sort_key t1) (sort_key t2)] ++ [compare t1 t2 = Stdlib.compare (sort_key t1) (sort_key t2)] + If the same texts are repeatedly compared, + pre-computation of sort_key gives better performance. *) + val sort_key : diff --git a/devel/ocaml-camomile/files/patch-Camomile_public_uTF8.ml b/devel/ocaml-camomile/files/patch-Camomile_public_uTF8.ml new file mode 100644 index 000000000000..7dc23995c424 --- /dev/null +++ b/devel/ocaml-camomile/files/patch-Camomile_public_uTF8.ml @@ -0,0 +1,11 @@ +--- Camomile/public/uTF8.ml.orig 2019-08-08 07:10:33 UTC ++++ Camomile/public/uTF8.ml +@@ -194,7 +194,7 @@ let iter proc s = iter_aux proc s 0 + + let iter proc s = iter_aux proc s 0 + +-let compare s1 s2 = Pervasives.compare s1 s2 ++let compare s1 s2 = Stdlib.compare s1 s2 + + exception Malformed_code + diff --git a/devel/ocaml-camomile/files/patch-Camomile_toolslib_absCe.ml b/devel/ocaml-camomile/files/patch-Camomile_toolslib_absCe.ml new file mode 100644 index 000000000000..24edea2b7c70 --- /dev/null +++ b/devel/ocaml-camomile/files/patch-Camomile_toolslib_absCe.ml @@ -0,0 +1,11 @@ +--- Camomile/toolslib/absCe.ml.orig 2019-08-08 07:10:33 UTC ++++ Camomile/toolslib/absCe.ml +@@ -49,7 +49,7 @@ type elt = + | `FirstImplicit + | `FirstTrailing ] + +-module Elt = struct type t = elt let compare = Pervasives.compare end ++module Elt = struct type t = elt let compare = Stdlib.compare end + module EltMap = Map.Make (Elt) + + type ce = AbsOrd.point * AbsOrd.point * AbsOrd.point diff --git a/devel/ocaml-camomile/pkg-plist b/devel/ocaml-camomile/pkg-plist index 69dcd440b95d..81fafd4c6df5 100644 --- a/devel/ocaml-camomile/pkg-plist +++ b/devel/ocaml-camomile/pkg-plist @@ -32,6 +32,38 @@ %%OCAML_SITELIBDIR%%/camomile/dyn/camomileLibraryDyn.cmxa %%OCAML_SITELIBDIR%%/camomile/dyn/camomileLibraryDyn.cmxs %%OCAML_SITELIBDIR%%/camomile/dyn/camomileLibraryDyn.ml +%%OCAML_SITELIBDIR%%/camomile/internal/avlTree.ml +%%OCAML_SITELIBDIR%%/camomile/internal/avlTree.mli +%%OCAML_SITELIBDIR%%/camomile/internal/bitsvect.ml +%%OCAML_SITELIBDIR%%/camomile/internal/bitsvect.mli +%%OCAML_SITELIBDIR%%/camomile/internal/byte_labeled_dag.ml +%%OCAML_SITELIBDIR%%/camomile/internal/byte_labeled_dag.mli +%%OCAML_SITELIBDIR%%/camomile/internal/bytesvect.ml +%%OCAML_SITELIBDIR%%/camomile/internal/bytesvect.mli +%%OCAML_SITELIBDIR%%/camomile/internal/charmap.ml +%%OCAML_SITELIBDIR%%/camomile/internal/charmap.mli +%%OCAML_SITELIBDIR%%/camomile/internal/database.ml +%%OCAML_SITELIBDIR%%/camomile/internal/database.mli +%%OCAML_SITELIBDIR%%/camomile/internal/hangul.ml +%%OCAML_SITELIBDIR%%/camomile/internal/hangul.mli +%%OCAML_SITELIBDIR%%/camomile/internal/iMap.ml +%%OCAML_SITELIBDIR%%/camomile/internal/iMap.mli +%%OCAML_SITELIBDIR%%/camomile/internal/iSet.ml +%%OCAML_SITELIBDIR%%/camomile/internal/iSet.mli +%%OCAML_SITELIBDIR%%/camomile/internal/stringPrep_data.ml +%%OCAML_SITELIBDIR%%/camomile/internal/stringPrep_data.mli +%%OCAML_SITELIBDIR%%/camomile/internal/tbl31.ml +%%OCAML_SITELIBDIR%%/camomile/internal/tbl31.mli +%%OCAML_SITELIBDIR%%/camomile/internal/uReStrLexer.ml +%%OCAML_SITELIBDIR%%/camomile/internal/uReStrParser.ml +%%OCAML_SITELIBDIR%%/camomile/internal/uReStrParser.mli +%%OCAML_SITELIBDIR%%/camomile/internal/uReStrParserType.ml +%%OCAML_SITELIBDIR%%/camomile/internal/unidata.ml +%%OCAML_SITELIBDIR%%/camomile/internal/unidata.mli +%%OCAML_SITELIBDIR%%/camomile/internal/unimap.ml +%%OCAML_SITELIBDIR%%/camomile/internal/unimap.mli +%%OCAML_SITELIBDIR%%/camomile/internal/xArray.ml +%%OCAML_SITELIBDIR%%/camomile/internal/xArray.mli %%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.a %%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.cma %%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.cmi @@ -40,14 +72,6 @@ %%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.cmxa %%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.cmxs %%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.ml -%%OCAML_SITELIBDIR%%/camomile/library/avlTree.ml -%%OCAML_SITELIBDIR%%/camomile/library/avlTree.mli -%%OCAML_SITELIBDIR%%/camomile/library/bitsvect.ml -%%OCAML_SITELIBDIR%%/camomile/library/bitsvect.mli -%%OCAML_SITELIBDIR%%/camomile/library/byte_labeled_dag.ml -%%OCAML_SITELIBDIR%%/camomile/library/byte_labeled_dag.mli -%%OCAML_SITELIBDIR%%/camomile/library/bytesvect.ml -%%OCAML_SITELIBDIR%%/camomile/library/bytesvect.mli %%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary.a %%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary.cma %%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary.cmi @@ -220,77 +244,53 @@ %%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary__XString.cmt %%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary__XString.cmti %%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary__XString.cmx -%%OCAML_SITELIBDIR%%/camomile/library/caseMap.ml -%%OCAML_SITELIBDIR%%/camomile/library/caseMap.mli -%%OCAML_SITELIBDIR%%/camomile/library/charEncoding.ml -%%OCAML_SITELIBDIR%%/camomile/library/charEncoding.mli -%%OCAML_SITELIBDIR%%/camomile/library/charmap.ml -%%OCAML_SITELIBDIR%%/camomile/library/charmap.mli %%OCAML_SITELIBDIR%%/camomile/library/configInt.ml -%%OCAML_SITELIBDIR%%/camomile/library/database.ml -%%OCAML_SITELIBDIR%%/camomile/library/database.mli -%%OCAML_SITELIBDIR%%/camomile/library/hangul.ml -%%OCAML_SITELIBDIR%%/camomile/library/hangul.mli -%%OCAML_SITELIBDIR%%/camomile/library/iMap.ml -%%OCAML_SITELIBDIR%%/camomile/library/iMap.mli -%%OCAML_SITELIBDIR%%/camomile/library/iSet.ml -%%OCAML_SITELIBDIR%%/camomile/library/iSet.mli -%%OCAML_SITELIBDIR%%/camomile/library/locale.ml -%%OCAML_SITELIBDIR%%/camomile/library/locale.mli -%%OCAML_SITELIBDIR%%/camomile/library/oOChannel.ml -%%OCAML_SITELIBDIR%%/camomile/library/oOChannel.mli -%%OCAML_SITELIBDIR%%/camomile/library/stringPrep.ml -%%OCAML_SITELIBDIR%%/camomile/library/stringPrep.mli -%%OCAML_SITELIBDIR%%/camomile/library/stringPrep_data.ml -%%OCAML_SITELIBDIR%%/camomile/library/stringPrep_data.mli -%%OCAML_SITELIBDIR%%/camomile/library/subText.ml -%%OCAML_SITELIBDIR%%/camomile/library/subText.mli -%%OCAML_SITELIBDIR%%/camomile/library/tbl31.ml -%%OCAML_SITELIBDIR%%/camomile/library/tbl31.mli -%%OCAML_SITELIBDIR%%/camomile/library/uCS4.ml -%%OCAML_SITELIBDIR%%/camomile/library/uCS4.mli -%%OCAML_SITELIBDIR%%/camomile/library/uChar.ml -%%OCAML_SITELIBDIR%%/camomile/library/uChar.mli -%%OCAML_SITELIBDIR%%/camomile/library/uCharInfo.ml -%%OCAML_SITELIBDIR%%/camomile/library/uCharInfo.mli -%%OCAML_SITELIBDIR%%/camomile/library/uCharTbl.ml -%%OCAML_SITELIBDIR%%/camomile/library/uCharTbl.mli -%%OCAML_SITELIBDIR%%/camomile/library/uCol.ml -%%OCAML_SITELIBDIR%%/camomile/library/uCol.mli -%%OCAML_SITELIBDIR%%/camomile/library/uLine.ml -%%OCAML_SITELIBDIR%%/camomile/library/uLine.mli -%%OCAML_SITELIBDIR%%/camomile/library/uMap.ml -%%OCAML_SITELIBDIR%%/camomile/library/uMap.mli -%%OCAML_SITELIBDIR%%/camomile/library/uNF.ml -%%OCAML_SITELIBDIR%%/camomile/library/uNF.mli -%%OCAML_SITELIBDIR%%/camomile/library/uPervasives.ml -%%OCAML_SITELIBDIR%%/camomile/library/uPervasives.mli -%%OCAML_SITELIBDIR%%/camomile/library/uRe.ml -%%OCAML_SITELIBDIR%%/camomile/library/uRe.mli -%%OCAML_SITELIBDIR%%/camomile/library/uReStr.ml -%%OCAML_SITELIBDIR%%/camomile/library/uReStr.mli -%%OCAML_SITELIBDIR%%/camomile/library/uReStrLexer.ml -%%OCAML_SITELIBDIR%%/camomile/library/uReStrParser.ml -%%OCAML_SITELIBDIR%%/camomile/library/uReStrParser.mli -%%OCAML_SITELIBDIR%%/camomile/library/uReStrParserType.ml -%%OCAML_SITELIBDIR%%/camomile/library/uSet.ml -%%OCAML_SITELIBDIR%%/camomile/library/uSet.mli -%%OCAML_SITELIBDIR%%/camomile/library/uTF16.ml -%%OCAML_SITELIBDIR%%/camomile/library/uTF16.mli -%%OCAML_SITELIBDIR%%/camomile/library/uTF8.ml -%%OCAML_SITELIBDIR%%/camomile/library/uTF8.mli -%%OCAML_SITELIBDIR%%/camomile/library/uText.ml -%%OCAML_SITELIBDIR%%/camomile/library/uText.mli -%%OCAML_SITELIBDIR%%/camomile/library/unicodeString.ml -%%OCAML_SITELIBDIR%%/camomile/library/unidata.ml -%%OCAML_SITELIBDIR%%/camomile/library/unidata.mli -%%OCAML_SITELIBDIR%%/camomile/library/unimap.ml -%%OCAML_SITELIBDIR%%/camomile/library/unimap.mli -%%OCAML_SITELIBDIR%%/camomile/library/xArray.ml -%%OCAML_SITELIBDIR%%/camomile/library/xArray.mli -%%OCAML_SITELIBDIR%%/camomile/library/xString.ml -%%OCAML_SITELIBDIR%%/camomile/library/xString.mli %%OCAML_SITELIBDIR%%/camomile/opam +%%OCAML_SITELIBDIR%%/camomile/public/caseMap.ml +%%OCAML_SITELIBDIR%%/camomile/public/caseMap.mli +%%OCAML_SITELIBDIR%%/camomile/public/charEncoding.ml +%%OCAML_SITELIBDIR%%/camomile/public/charEncoding.mli +%%OCAML_SITELIBDIR%%/camomile/public/locale.ml +%%OCAML_SITELIBDIR%%/camomile/public/locale.mli +%%OCAML_SITELIBDIR%%/camomile/public/oOChannel.ml +%%OCAML_SITELIBDIR%%/camomile/public/oOChannel.mli +%%OCAML_SITELIBDIR%%/camomile/public/stringPrep.ml +%%OCAML_SITELIBDIR%%/camomile/public/stringPrep.mli +%%OCAML_SITELIBDIR%%/camomile/public/subText.ml +%%OCAML_SITELIBDIR%%/camomile/public/subText.mli +%%OCAML_SITELIBDIR%%/camomile/public/uCS4.ml +%%OCAML_SITELIBDIR%%/camomile/public/uCS4.mli +%%OCAML_SITELIBDIR%%/camomile/public/uChar.ml +%%OCAML_SITELIBDIR%%/camomile/public/uChar.mli +%%OCAML_SITELIBDIR%%/camomile/public/uCharInfo.ml +%%OCAML_SITELIBDIR%%/camomile/public/uCharInfo.mli +%%OCAML_SITELIBDIR%%/camomile/public/uCharTbl.ml +%%OCAML_SITELIBDIR%%/camomile/public/uCharTbl.mli +%%OCAML_SITELIBDIR%%/camomile/public/uCol.ml +%%OCAML_SITELIBDIR%%/camomile/public/uCol.mli +%%OCAML_SITELIBDIR%%/camomile/public/uLine.ml +%%OCAML_SITELIBDIR%%/camomile/public/uLine.mli +%%OCAML_SITELIBDIR%%/camomile/public/uMap.ml +%%OCAML_SITELIBDIR%%/camomile/public/uMap.mli +%%OCAML_SITELIBDIR%%/camomile/public/uNF.ml +%%OCAML_SITELIBDIR%%/camomile/public/uNF.mli +%%OCAML_SITELIBDIR%%/camomile/public/uPervasives.ml +%%OCAML_SITELIBDIR%%/camomile/public/uPervasives.mli +%%OCAML_SITELIBDIR%%/camomile/public/uRe.ml +%%OCAML_SITELIBDIR%%/camomile/public/uRe.mli +%%OCAML_SITELIBDIR%%/camomile/public/uReStr.ml +%%OCAML_SITELIBDIR%%/camomile/public/uReStr.mli +%%OCAML_SITELIBDIR%%/camomile/public/uSet.ml +%%OCAML_SITELIBDIR%%/camomile/public/uSet.mli +%%OCAML_SITELIBDIR%%/camomile/public/uTF16.ml +%%OCAML_SITELIBDIR%%/camomile/public/uTF16.mli +%%OCAML_SITELIBDIR%%/camomile/public/uTF8.ml +%%OCAML_SITELIBDIR%%/camomile/public/uTF8.mli +%%OCAML_SITELIBDIR%%/camomile/public/uText.ml +%%OCAML_SITELIBDIR%%/camomile/public/uText.mli +%%OCAML_SITELIBDIR%%/camomile/public/unicodeString.ml +%%OCAML_SITELIBDIR%%/camomile/public/xString.ml +%%OCAML_SITELIBDIR%%/camomile/public/xString.mli %%DATADIR%%/charmaps/1026.mar %%DATADIR%%/charmaps/1047.mar %%DATADIR%%/charmaps/437.mar diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile index 7ade07268158..a31b0fe69501 100644 --- a/devel/ocaml-cfg/Makefile +++ b/devel/ocaml-cfg/Makefile @@ -1,5 +1,6 @@ PORTNAME= cfg PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -26,7 +27,7 @@ do-build: do-install: cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \ - --prefix=${PREFIX} --libdir=${OCAML_SITELIBDIR} + --libdir=${PREFIX}/${OCAML_SITELIBDIR} post-install-EXAMPLES-on: @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) diff --git a/devel/ocaml-classes/Makefile b/devel/ocaml-classes/Makefile index 632973e8c0c4..cb5f3034f938 100644 --- a/devel/ocaml-classes/Makefile +++ b/devel/ocaml-classes/Makefile @@ -1,5 +1,6 @@ PORTNAME= classes PORTVERSION= 4.00 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile index 35590b7cf730..b206944441e4 100644 --- a/devel/ocaml-cmdliner/Makefile +++ b/devel/ocaml-cmdliner/Makefile @@ -1,6 +1,6 @@ PORTNAME= cmdliner PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://erratique.ch/software/cmdliner/releases/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-cppo/Makefile b/devel/ocaml-cppo/Makefile index 036c0797a4f9..dbcfb9d6dc68 100644 --- a/devel/ocaml-cppo/Makefile +++ b/devel/ocaml-cppo/Makefile @@ -1,6 +1,7 @@ PORTNAME= cppo DISTVERSIONPREFIX= v DISTVERSION= 1.6.9 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -22,6 +23,6 @@ OPTIONS_DEFINE= DOCS post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cppo - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib:${PREFIX}/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs .include <bsd.port.mk> diff --git a/devel/ocaml-cppo/pkg-plist b/devel/ocaml-cppo/pkg-plist index a58ecee23530..44a5e9724ef4 100644 --- a/devel/ocaml-cppo/pkg-plist +++ b/devel/ocaml-cppo/pkg-plist @@ -1,20 +1,20 @@ bin/cppo -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo/META -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo/dune-package -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo/opam -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/META -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.a -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cma -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxa -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/dune-package -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmi -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmt -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmti -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmx -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.ml -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.mli -%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/opam +lib/ocaml/cppo/META +lib/ocaml/cppo/dune-package +lib/ocaml/cppo/opam +lib/ocaml/cppo_ocamlbuild/META +lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.a +lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cma +lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxa +lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs +lib/ocaml/cppo_ocamlbuild/dune-package +lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmi +lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmt +lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmti +lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmx +lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.ml +lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.mli +lib/ocaml/cppo_ocamlbuild/opam %%PORTDOCS%%share/doc/ocaml/cppo/LICENSE.md %%PORTDOCS%%share/doc/ocaml/cppo/README.md %%PORTDOCS%%share/doc/ocaml/cppo_ocamlbuild/LICENSE.md diff --git a/devel/ocaml-dune/Makefile b/devel/ocaml-dune/Makefile index 503ce580dcfd..fc788d16c232 100644 --- a/devel/ocaml-dune/Makefile +++ b/devel/ocaml-dune/Makefile @@ -1,5 +1,5 @@ PORTNAME= dune -PORTVERSION= 1.11.4 +PORTVERSION= 3.7.1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -14,21 +14,27 @@ USE_GITHUB= yes GH_ACCOUNT= ocaml USE_OCAML= yes USE_OCAML_FINDLIB= yes +SUB_FILES= setup.ml +SUB_LIST= OCAML_SITELIBDIR="${PREFIX}/${OCAML_SITELIBDIR}" \ + OCAML_LIBDIR="${PREFIX}/${OCAML_LIBDIR}" \ + OCAML_DOCSDIR="${OCAML_DOCSDIR}" \ + MANPREFIX="${MANPREFIX}" CONFLICTS_INSTALL= wdune ALL_TARGET= release -MAKE_ENV= LIBDIR="${OCAML_SITELIBDIR}" +MAKE_ENV= LIBDIR="${PREFIX}/${OCAML_SITELIBDIR}" DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} -PORTDOCS= *.md - OPTIONS_DEFINE= DOCS post-patch: # FreeBSD-specific hack, do not nag upstream (for now) - @${REINPLACE_CMD} -e '/let doc_root/ \ + @${REINPLACE_CMD} -e '/doc_root = Path.relative/ \ s:"doc:"${OCAML_DOCSDIR:S,^${PREFIX}/,,}:' \ - ${WRKSRC}/src/install.ml + ${WRKSRC}/src/dune_rules/install.ml + +pre-configure: + @${MV} ${WRKDIR}/setup.ml ${WRKSRC}/src/dune_rules/setup.ml .include <bsd.port.mk> diff --git a/devel/ocaml-dune/distinfo b/devel/ocaml-dune/distinfo index e6867f43cdb5..8463624b40f8 100644 --- a/devel/ocaml-dune/distinfo +++ b/devel/ocaml-dune/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1570592252 -SHA256 (ocaml-dune-1.11.4_GH0.tar.gz) = 325e6744a55b9b2033dc92b562196337bf9cd99b86bd153f5e7941f6fbfbf9fb -SIZE (ocaml-dune-1.11.4_GH0.tar.gz) = 849090 +TIMESTAMP = 1683281166 +SHA256 (ocaml-dune-3.7.1_GH0.tar.gz) = 9ddc1dae09e7be6d0bf22b7d1584d95a1b3d4f5d1bae1d4095dc4e1833fa86b2 +SIZE (ocaml-dune-3.7.1_GH0.tar.gz) = 2011275 diff --git a/devel/ocaml-dune/files/patch-Makefile b/devel/ocaml-dune/files/patch-Makefile new file mode 100644 index 000000000000..452944db4485 --- /dev/null +++ b/devel/ocaml-dune/files/patch-Makefile @@ -0,0 +1,29 @@ +--- Makefile.orig 2023-04-04 11:30:10 UTC ++++ Makefile +@@ -44,7 +44,7 @@ release: $(BIN) + + .PHONY: release + release: $(BIN) +- @$(BIN) build @install -p dune --profile dune-bootstrap ++ @$(BIN) build @install -p dune,dune-action-plugin,dune-build-info,dune-configurator,dune-glob,dune-private-libs,dune-site,dune-rpc,dyn,stdune,ordering,xdg --profile dune-bootstrap + + $(BIN): + @ocaml boot/bootstrap.ml +@@ -58,6 +58,17 @@ install: + .PHONY: install + install: + $(BIN) install $(INSTALL_ARGS) dune ++ $(BIN) install $(INSTALL_ARGS) dune-action-plugin ++ $(BIN) install $(INSTALL_ARGS) dune-build-info ++ $(BIN) install $(INSTALL_ARGS) dune-configurator ++ $(BIN) install $(INSTALL_ARGS) dune-glob ++ $(BIN) install $(INSTALL_ARGS) dune-private-libs ++ $(BIN) install $(INSTALL_ARGS) dune-site ++ $(BIN) install $(INSTALL_ARGS) dune-rpc ++ $(BIN) install $(INSTALL_ARGS) dyn ++ $(BIN) install $(INSTALL_ARGS) stdune ++ $(BIN) install $(INSTALL_ARGS) ordering ++ $(BIN) install $(INSTALL_ARGS) xdg + + .PHONY: uninstall + uninstall: diff --git a/devel/ocaml-dune/files/setup.ml.in b/devel/ocaml-dune/files/setup.ml.in new file mode 100644 index 000000000000..0ba5d60aa58b --- /dev/null +++ b/devel/ocaml-dune/files/setup.ml.in @@ -0,0 +1,12 @@ +let library_path = ["%%OCAML_LIBDIR%%"; "%%OCAML_SITELIBDIR%%"] + +let roots : string option Install.Section.Paths.Roots.t = + { lib_root = Some "%%OCAML_LIBDIR%%" + ; man = Some "%%MANPREFIX%%/man" + ; doc_root = Some "%%OCAML_DOCSDIR%%" + ; etc_root = Some "%%PREFIX%%/etc" + ; share_root = Some "%%PREFIX%%/share" + ; bin = Some "%%PREFIX%%/bin" + ; sbin = Some "%%PREFIX%%/sbin" + ; libexec_root = Some "%%OCAML_LIBDIR%%" + } diff --git a/devel/ocaml-dune/pkg-plist b/devel/ocaml-dune/pkg-plist index d622bf34cca5..a3b0ef9841b8 100644 --- a/devel/ocaml-dune/pkg-plist +++ b/devel/ocaml-dune/pkg-plist @@ -1,583 +1,1023 @@ bin/dune -bin/jbuilder -bin/ocaml-syntax-shims +%%OCAML_SITELIBDIR%%/dune-action-plugin/META +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune-package +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.a +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.cma +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.cmi +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.cmt +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.cmti +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.cmx +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.cmxa +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.cmxs +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.ml +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin.mli +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__.cmi +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__.cmt +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__.cmx +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__.ml +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Import.cmi +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Import.cmt +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Import.cmx +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Path.cmi +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Path.cmt +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Path.cmti +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Path.cmx +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Protocol.cmi +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Protocol.cmt +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Protocol.cmti +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Protocol.cmx +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Sexpable_intf.cmi +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Sexpable_intf.cmt +%%OCAML_SITELIBDIR%%/dune-action-plugin/dune_action_plugin__Sexpable_intf.cmx +%%OCAML_SITELIBDIR%%/dune-action-plugin/import.ml +%%OCAML_SITELIBDIR%%/dune-action-plugin/opam +%%OCAML_SITELIBDIR%%/dune-action-plugin/path.ml +%%OCAML_SITELIBDIR%%/dune-action-plugin/path.mli +%%OCAML_SITELIBDIR%%/dune-action-plugin/protocol.ml +%%OCAML_SITELIBDIR%%/dune-action-plugin/protocol.mli +%%OCAML_SITELIBDIR%%/dune-action-plugin/sexpable_intf.ml +%%OCAML_SITELIBDIR%%/dune-build-info/META +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.a +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.cma +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.cmi +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.cmt +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.cmti +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.cmx +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.cmxa +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.cmxs +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.ml +%%OCAML_SITELIBDIR%%/dune-build-info/build_info.mli +%%OCAML_SITELIBDIR%%/dune-build-info/build_info__.cmi +%%OCAML_SITELIBDIR%%/dune-build-info/build_info__.cmt +%%OCAML_SITELIBDIR%%/dune-build-info/build_info__.cmx +%%OCAML_SITELIBDIR%%/dune-build-info/build_info__.ml +%%OCAML_SITELIBDIR%%/dune-build-info/build_info__Build_info_data.cmi +%%OCAML_SITELIBDIR%%/dune-build-info/build_info__Build_info_data.cmti +%%OCAML_SITELIBDIR%%/dune-build-info/build_info_data.mli +%%OCAML_SITELIBDIR%%/dune-build-info/dune-package +%%OCAML_SITELIBDIR%%/dune-build-info/opam +%%OCAML_SITELIBDIR%%/dune-configurator/.private/configurator__Dune_lang.cmi +%%OCAML_SITELIBDIR%%/dune-configurator/.private/configurator__Dune_lang.cmt +%%OCAML_SITELIBDIR%%/dune-configurator/.private/configurator__Dune_lang.cmti +%%OCAML_SITELIBDIR%%/dune-configurator/.private/configurator__Import.cmi +%%OCAML_SITELIBDIR%%/dune-configurator/.private/configurator__Import.cmt +%%OCAML_SITELIBDIR%%/dune-configurator/.private/configurator__Ocaml_config.cmi +%%OCAML_SITELIBDIR%%/dune-configurator/.private/configurator__Ocaml_config.cmt +%%OCAML_SITELIBDIR%%/dune-configurator/.private/configurator__Ocaml_config.cmti +%%OCAML_SITELIBDIR%%/dune-configurator/META +%%OCAML_SITELIBDIR%%/dune-configurator/configurator.a +%%OCAML_SITELIBDIR%%/dune-configurator/configurator.cma +%%OCAML_SITELIBDIR%%/dune-configurator/configurator.cmi +%%OCAML_SITELIBDIR%%/dune-configurator/configurator.cmt +%%OCAML_SITELIBDIR%%/dune-configurator/configurator.cmx +%%OCAML_SITELIBDIR%%/dune-configurator/configurator.cmxa +%%OCAML_SITELIBDIR%%/dune-configurator/configurator.cmxs +%%OCAML_SITELIBDIR%%/dune-configurator/configurator.ml +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__.cmi +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__.cmt +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__.cmx +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__.ml +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__Dune_lang.cmx +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__Extract_obj.cmi +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__Extract_obj.cmt +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__Extract_obj.cmti +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__Extract_obj.cmx +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__Import.cmx +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__Ocaml_config.cmx +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__V1.cmi +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__V1.cmt +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__V1.cmti +%%OCAML_SITELIBDIR%%/dune-configurator/configurator__V1.cmx +%%OCAML_SITELIBDIR%%/dune-configurator/dune-package +%%OCAML_SITELIBDIR%%/dune-configurator/dune_lang.ml +%%OCAML_SITELIBDIR%%/dune-configurator/dune_lang.mli +%%OCAML_SITELIBDIR%%/dune-configurator/extract_obj.ml +%%OCAML_SITELIBDIR%%/dune-configurator/extract_obj.mli +%%OCAML_SITELIBDIR%%/dune-configurator/import.ml +%%OCAML_SITELIBDIR%%/dune-configurator/ocaml_config.ml +%%OCAML_SITELIBDIR%%/dune-configurator/ocaml_config.mli +%%OCAML_SITELIBDIR%%/dune-configurator/opam +%%OCAML_SITELIBDIR%%/dune-configurator/v1.ml +%%OCAML_SITELIBDIR%%/dune-configurator/v1.mli +%%OCAML_SITELIBDIR%%/dune-glob/META +%%OCAML_SITELIBDIR%%/dune-glob/dune-package +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob.a +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob.cma +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob.cmi +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob.cmt +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob.cmx +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob.cmxa +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob.cmxs +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob.ml +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__.cmi +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__.cmt +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__.cmx +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__.ml +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__Glob.cmi +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__Glob.cmt +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__Glob.cmti +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__Glob.cmx +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__Lexer.cmi +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__Lexer.cmt +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__Lexer.cmti +%%OCAML_SITELIBDIR%%/dune-glob/dune_glob__Lexer.cmx +%%OCAML_SITELIBDIR%%/dune-glob/glob.ml +%%OCAML_SITELIBDIR%%/dune-glob/glob.mli +%%OCAML_SITELIBDIR%%/dune-glob/lexer.ml +%%OCAML_SITELIBDIR%%/dune-glob/lexer.mli +%%OCAML_SITELIBDIR%%/dune-glob/opam +%%OCAML_SITELIBDIR%%/dune-private-libs/META +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-package +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.a +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.cma +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.cmxa +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.cmxs +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune-section/dune_section.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/automata.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/automata.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/category.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/category.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/color_map.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/color_map.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/core.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/core.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/cset.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/cset.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re.a +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re.cma +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re.cmxa +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re.cmxs +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Automata.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Automata.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Automata.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Automata.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Category.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Category.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Category.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Category.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Color_map.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Color_map.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Color_map.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Color_map.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Core.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Core.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Core.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Core.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Cset.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Cset.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Cset.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Cset.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Emacs.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Emacs.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Emacs.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Emacs.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Fmt.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Fmt.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Fmt.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Glob.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Glob.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Glob.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Glob.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Group.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Group.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Group.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Group.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Pcre.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Pcre.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Pcre.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Pcre.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Perl.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Perl.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Perl.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Perl.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Pmark.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Pmark.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Pmark.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Pmark.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Posix.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Posix.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Posix.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Posix.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Re.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Re.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Re.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Str.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Str.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Str.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/dune_re__Str.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/emacs.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/emacs.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/fmt.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/glob.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/glob.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/group.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/group.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/pcre.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/pcre.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/perl.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/perl.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/pmark.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/pmark.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/posix.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/posix.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/re.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/str.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/dune_re/str.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser.a +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser.cma +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser.cmxa +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser.cmxs +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser__Meta_lexer.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser__Meta_lexer.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser__Meta_lexer.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser__Meta_lexer.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser__Meta_parser.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser__Meta_parser.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/dune_meta_parser__Meta_parser.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/meta_lexer.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/meta_lexer.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/meta_parser/meta_parser.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.a +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.cma +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.cmi +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.cmt +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.cmti +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.cmx +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.cmxa +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.cmxs +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.ml +%%OCAML_SITELIBDIR%%/dune-private-libs/ocaml-config/ocaml_config.mli +%%OCAML_SITELIBDIR%%/dune-private-libs/opam +%%OCAML_SITELIBDIR%%/dune-rpc/META +%%OCAML_SITELIBDIR%%/dune-rpc/dune-package +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.a +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.cma +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.cmxa +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.cmxs +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.ml +%%OCAML_SITELIBDIR%%/dune-rpc/dune_rpc.mli +%%OCAML_SITELIBDIR%%/dune-rpc/opam +%%OCAML_SITELIBDIR%%/dune-rpc/private/conv.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/conv.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/dbus_address.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/dbus_address.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.a +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.cma +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.cmxa +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.cmxs +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Conv.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Conv.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Conv.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Conv.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Dbus_address.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Dbus_address.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Dbus_address.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Dbus_address.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Exported_types.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Exported_types.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Exported_types.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Exported_types.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Fiber_intf.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Fiber_intf.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Fiber_intf.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Import.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Import.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Import.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Menu.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Menu.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Menu.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Menu.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Procedures.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Procedures.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Procedures.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Procedures.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Registry.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Registry.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Registry.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Registry.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Sub.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Sub.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Sub.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Sub.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Types.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Types.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Types.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Types.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Versioned.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Versioned.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Versioned.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Versioned.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Where.cmi +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Where.cmt +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Where.cmti +%%OCAML_SITELIBDIR%%/dune-rpc/private/dune_rpc_private__Where.cmx +%%OCAML_SITELIBDIR%%/dune-rpc/private/exported_types.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/exported_types.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/fiber_intf.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/import.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/menu.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/menu.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/procedures.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/procedures.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/registry.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/registry.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/sub.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/sub.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/types.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/types.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/versioned.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/versioned.mli +%%OCAML_SITELIBDIR%%/dune-rpc/private/where.ml +%%OCAML_SITELIBDIR%%/dune-rpc/private/where.mli +%%OCAML_SITELIBDIR%%/dune-site/META +%%OCAML_SITELIBDIR%%/dune-site/dune-package +%%OCAML_SITELIBDIR%%/dune-site/dune_site.a +%%OCAML_SITELIBDIR%%/dune-site/dune_site.cma +%%OCAML_SITELIBDIR%%/dune-site/dune_site.cmi +%%OCAML_SITELIBDIR%%/dune-site/dune_site.cmt +%%OCAML_SITELIBDIR%%/dune-site/dune_site.cmx +%%OCAML_SITELIBDIR%%/dune-site/dune_site.cmxa +%%OCAML_SITELIBDIR%%/dune-site/dune_site.cmxs +%%OCAML_SITELIBDIR%%/dune-site/dune_site.ml +%%OCAML_SITELIBDIR%%/dune-site/dune_site__.cmi +%%OCAML_SITELIBDIR%%/dune-site/dune_site__.cmt +%%OCAML_SITELIBDIR%%/dune-site/dune_site__.cmx +%%OCAML_SITELIBDIR%%/dune-site/dune_site__.ml +%%OCAML_SITELIBDIR%%/dune-site/dune_site__Dune_site_data.cmi +%%OCAML_SITELIBDIR%%/dune-site/dune_site__Dune_site_data.cmti +%%OCAML_SITELIBDIR%%/dune-site/dune_site__Helpers.cmi +%%OCAML_SITELIBDIR%%/dune-site/dune_site__Helpers.cmt +%%OCAML_SITELIBDIR%%/dune-site/dune_site__Helpers.cmti +%%OCAML_SITELIBDIR%%/dune-site/dune_site__Helpers.cmx +%%OCAML_SITELIBDIR%%/dune-site/dune_site_data.mli +%%OCAML_SITELIBDIR%%/dune-site/helpers.ml +%%OCAML_SITELIBDIR%%/dune-site/helpers.mli +%%OCAML_SITELIBDIR%%/dune-site/opam +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.a +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.cma +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.cmi +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.cmt +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.cmti +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.cmx +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.cmxa +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.cmxs +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.ml +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins.mli +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__.cmi +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__.cmt +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__.cmx +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__.ml +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Dune_site_plugins_data.cmi +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Dune_site_plugins_data.cmti +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Meta_parser.cmi +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Meta_parser.cmt +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Meta_parser.cmti +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Meta_parser.cmx +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Plugins.cmi +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Plugins.cmt +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Plugins.cmti +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins__Plugins.cmx +%%OCAML_SITELIBDIR%%/dune-site/plugins/dune_site_plugins_data.mli +%%OCAML_SITELIBDIR%%/dune-site/plugins/meta_parser.ml +%%OCAML_SITELIBDIR%%/dune-site/plugins/meta_parser.mli +%%OCAML_SITELIBDIR%%/dune-site/plugins/plugins.ml +%%OCAML_SITELIBDIR%%/dune-site/plugins/plugins.mli +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.a +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.cma +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.cmi +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.cmt +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.cmti +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.cmx +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.cmxa +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.cmxs +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.ml +%%OCAML_SITELIBDIR%%/dune-site/private/dune_site_private.mli %%OCAML_SITELIBDIR%%/dune/META -%%OCAML_SITELIBDIR%%/dune/_caml/dune_caml.a -%%OCAML_SITELIBDIR%%/dune/_caml/dune_caml.cma -%%OCAML_SITELIBDIR%%/dune/_caml/dune_caml.cmi -%%OCAML_SITELIBDIR%%/dune/_caml/dune_caml.cmt -%%OCAML_SITELIBDIR%%/dune/_caml/dune_caml.cmx -%%OCAML_SITELIBDIR%%/dune/_caml/dune_caml.cmxa -%%OCAML_SITELIBDIR%%/dune/_caml/dune_caml.cmxs -%%OCAML_SITELIBDIR%%/dune/_caml/dune_caml.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/atom.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/atom.mli -%%OCAML_SITELIBDIR%%/dune/_dune_lang/combinators.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.a -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.cma -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.cmti -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.cmxa -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.cmxs -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang.mli -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Atom.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Atom.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Atom.cmti -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Atom.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Combinators.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Combinators.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Combinators.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Dune_lexer.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Dune_lexer.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Dune_lexer.cmti -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Dune_lexer.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Escape.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Escape.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Escape.cmti -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Escape.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__File_syntax.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__File_syntax.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__File_syntax.cmti -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__File_syntax.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Jbuild_lexer.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Jbuild_lexer.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Jbuild_lexer.cmti -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Jbuild_lexer.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Lexer.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Lexer.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Lexer.cmti -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Lexer.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Lexer_shared.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Lexer_shared.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Lexer_shared.cmti -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Lexer_shared.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Template.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Template.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Template.cmti -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Template.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Types.cmi -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Types.cmt -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lang__Types.cmx -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lexer.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/dune_lexer.mli -%%OCAML_SITELIBDIR%%/dune/_dune_lang/escape.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/escape.mli -%%OCAML_SITELIBDIR%%/dune/_dune_lang/file_syntax.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/file_syntax.mli -%%OCAML_SITELIBDIR%%/dune/_dune_lang/jbuild_lexer.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/jbuild_lexer.mli -%%OCAML_SITELIBDIR%%/dune/_dune_lang/lexer.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/lexer.mli -%%OCAML_SITELIBDIR%%/dune/_dune_lang/lexer_shared.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/lexer_shared.mli -%%OCAML_SITELIBDIR%%/dune/_dune_lang/template.ml -%%OCAML_SITELIBDIR%%/dune/_dune_lang/template.mli -%%OCAML_SITELIBDIR%%/dune/_dune_lang/types.ml -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.a -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.cma -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.cmi -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.cmt -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.cmti -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.cmx -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.cmxa -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.cmxs -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.ml -%%OCAML_SITELIBDIR%%/dune/_ocaml_config/ocaml_config.mli -%%OCAML_SITELIBDIR%%/dune/_result/dune_result.a -%%OCAML_SITELIBDIR%%/dune/_result/dune_result.cma -%%OCAML_SITELIBDIR%%/dune/_result/dune_result.cmi -%%OCAML_SITELIBDIR%%/dune/_result/dune_result.cmt -%%OCAML_SITELIBDIR%%/dune/_result/dune_result.cmx -%%OCAML_SITELIBDIR%%/dune/_result/dune_result.cmxa -%%OCAML_SITELIBDIR%%/dune/_result/dune_result.cmxs -%%OCAML_SITELIBDIR%%/dune/_result/dune_result.ml -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__.cmi -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__.cmt -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__.cmx -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__.ml -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__Result.cmi -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__Result.cmt -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__Result.cmti -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__Result.cmx -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__Result_compat.cmi -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__Result_compat.cmt -%%OCAML_SITELIBDIR%%/dune/_result/dune_result__Result_compat.cmx -%%OCAML_SITELIBDIR%%/dune/_result/result.ml -%%OCAML_SITELIBDIR%%/dune/_result/result.mli -%%OCAML_SITELIBDIR%%/dune/_result/result_compat.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/ansi_color.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/ansi_color.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/appendable_list.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/appendable_list.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/array.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/bin.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/bin.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/bool.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/bool.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/bytes.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/bytes.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/char.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/code_error.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/code_error.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/common.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/comparable.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/comparable.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/comparable_intf.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/comparator.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/comparator.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/console.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/console.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/csexp.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/csexp.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/digest.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/digest.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/dyn.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/dyn.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/either.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/either.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/env.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/env.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/escape.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/escape.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/exn.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/exn.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/exn_with_backtrace.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/exn_with_backtrace.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/fdecl.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/fdecl.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/filename.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/filename.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/float.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/float.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/fmt.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/fmt.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/fn.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/fn.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/hashable.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/hashtbl.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/hashtbl.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/hashtbl_intf.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/id.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/id.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/int.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/int.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/interned.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/interned.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/io.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/io.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/lexbuf.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/lexbuf.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/list.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/list.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/loc.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/loc.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/loc0.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/log.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/log.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/map.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/map.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/map_intf.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/monad.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/monad.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/nothing.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/nothing.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/option.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/option.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/or_exn.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/or_exn.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/ordered.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/ordered.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/ordering.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/ordering.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/path.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/path.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/path_intf.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/poly.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/poly.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/pp.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/pp.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/proc.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/proc.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/result.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/result.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/set.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/set.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/set_intf.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/sexp.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/sexp.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/signal.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/signal.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/staged.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/staged.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune.a -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune.cma -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune.cmxa -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune.cmxs -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ansi_color.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ansi_color.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ansi_color.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ansi_color.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Appendable_list.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Appendable_list.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Appendable_list.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Appendable_list.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Array.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Array.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Array.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bin.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bin.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bin.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bin.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bool.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bool.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bool.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bool.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bytes.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bytes.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bytes.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Bytes.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Char.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Char.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Char.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Code_error.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Code_error.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Code_error.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Code_error.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Common.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Common.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Common.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparable.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparable.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparable.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparable.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparable_intf.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparable_intf.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparable_intf.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparator.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparator.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparator.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Comparator.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Console.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Console.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Console.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Console.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Csexp.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Csexp.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Csexp.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Csexp.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Digest.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Digest.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Digest.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Digest.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Dyn.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Dyn.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Dyn.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Dyn.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Either.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Either.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Either.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Either.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Env.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Env.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Env.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Env.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Escape.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Escape.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Escape.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Escape.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Exn.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Exn.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Exn.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Exn.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Exn_with_backtrace.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Exn_with_backtrace.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Exn_with_backtrace.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Exn_with_backtrace.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fdecl.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fdecl.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fdecl.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fdecl.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Filename.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Filename.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Filename.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Filename.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Float.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Float.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Float.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Float.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fmt.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fmt.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fmt.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fmt.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fn.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fn.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fn.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Fn.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashable.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashable.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashable.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashtbl.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashtbl.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashtbl.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashtbl.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashtbl_intf.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashtbl_intf.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Hashtbl_intf.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Id.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Id.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Id.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Id.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Int.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Int.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Int.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Int.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Interned.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Interned.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Interned.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Interned.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Io.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Io.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Io.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Io.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Lexbuf.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Lexbuf.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Lexbuf.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Lexbuf.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__List.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__List.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__List.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__List.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Loc.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Loc.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Loc.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Loc.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Loc0.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Loc0.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Loc0.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Log.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Log.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Log.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Log.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Map.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Map.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Map.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Map.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Map_intf.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Map_intf.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Map_intf.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Monad.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Monad.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Monad.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Monad.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Nothing.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Nothing.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Nothing.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Nothing.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Option.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Option.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Option.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Option.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Or_exn.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Or_exn.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Or_exn.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Or_exn.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ordered.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ordered.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ordered.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ordered.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ordering.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ordering.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ordering.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Ordering.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Path.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Path.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Path.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Path.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Path_intf.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Path_intf.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Path_intf.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Poly.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Poly.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Poly.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Poly.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Pp.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Pp.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Pp.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Pp.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Proc.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Proc.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Proc.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Proc.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Result.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Result.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Result.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Result.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Set.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Set.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Set.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Set.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Set_intf.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Set_intf.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Set_intf.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Sexp.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Sexp.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Sexp.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Sexp.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Signal.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Signal.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Signal.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Signal.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Staged.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Staged.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Staged.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Staged.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__String.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__String.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__String.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__String.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__String_split.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__String_split.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__String_split.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__String_split.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Table.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Table.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Table.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Table.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Tuple.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Tuple.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Tuple.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Tuple.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Type_eq.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Type_eq.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Type_eq.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Type_eq.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Unit.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Unit.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Unit.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Unit.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Univ_map.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Univ_map.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Univ_map.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__Univ_map.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_error.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_error.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_error.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_error.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_message.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_message.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_message.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_message.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_warning.cmi -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_warning.cmt -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_warning.cmti -%%OCAML_SITELIBDIR%%/dune/_stdune/stdune__User_warning.cmx -%%OCAML_SITELIBDIR%%/dune/_stdune/string.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/string.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/string_split.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/string_split.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/table.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/table.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/tuple.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/tuple.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/type_eq.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/type_eq.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/unit.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/unit.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/univ_map.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/univ_map.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/user_error.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/user_error.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/user_message.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/user_message.mli -%%OCAML_SITELIBDIR%%/dune/_stdune/user_warning.ml -%%OCAML_SITELIBDIR%%/dune/_stdune/user_warning.mli -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp.cmi -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp.cmt -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp.cmx -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp.ml -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp__wp_dune__.cmi -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp__wp_dune__.cmt -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp__wp_dune__.cmx -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp__wp_dune__.ml -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp_dune.a -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp_dune.cma -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp_dune.cmxa -%%OCAML_SITELIBDIR%%/dune/_wp/dune/wp_dune.cmxs -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp.cmi -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp.cmt -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp.cmx -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp.ml -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp__wp_jbuilder__.cmi -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp__wp_jbuilder__.cmt -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp__wp_jbuilder__.cmx -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp__wp_jbuilder__.ml -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp_jbuilder.a -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp_jbuilder.cma -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp_jbuilder.cmxa -%%OCAML_SITELIBDIR%%/dune/_wp/jbuilder/wp_jbuilder.cmxs -%%OCAML_SITELIBDIR%%/dune/_wp/wp.cmi -%%OCAML_SITELIBDIR%%/dune/_wp/wp.cmti -%%OCAML_SITELIBDIR%%/dune/_wp/wp.mli -%%OCAML_SITELIBDIR%%/dune/configurator/configurator.a -%%OCAML_SITELIBDIR%%/dune/configurator/configurator.cma -%%OCAML_SITELIBDIR%%/dune/configurator/configurator.cmi -%%OCAML_SITELIBDIR%%/dune/configurator/configurator.cmt -%%OCAML_SITELIBDIR%%/dune/configurator/configurator.cmx -%%OCAML_SITELIBDIR%%/dune/configurator/configurator.cmxa -%%OCAML_SITELIBDIR%%/dune/configurator/configurator.cmxs -%%OCAML_SITELIBDIR%%/dune/configurator/configurator.ml -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__.cmi -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__.cmt -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__.cmx -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__.ml -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__Extract_obj.cmi -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__Extract_obj.cmt -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__Extract_obj.cmti -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__Extract_obj.cmx -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__V1.cmi -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__V1.cmt -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__V1.cmti -%%OCAML_SITELIBDIR%%/dune/configurator/configurator__V1.cmx -%%OCAML_SITELIBDIR%%/dune/configurator/extract_obj.ml -%%OCAML_SITELIBDIR%%/dune/configurator/extract_obj.mli -%%OCAML_SITELIBDIR%%/dune/configurator/v1.ml -%%OCAML_SITELIBDIR%%/dune/configurator/v1.mli %%OCAML_SITELIBDIR%%/dune/dune-package %%OCAML_SITELIBDIR%%/dune/opam +%%OCAML_SITELIBDIR%%/dyn/META +%%OCAML_SITELIBDIR%%/dyn/dune-package +%%OCAML_SITELIBDIR%%/dyn/dyn.a +%%OCAML_SITELIBDIR%%/dyn/dyn.cma +%%OCAML_SITELIBDIR%%/dyn/dyn.cmi +%%OCAML_SITELIBDIR%%/dyn/dyn.cmt +%%OCAML_SITELIBDIR%%/dyn/dyn.cmti +%%OCAML_SITELIBDIR%%/dyn/dyn.cmx +%%OCAML_SITELIBDIR%%/dyn/dyn.cmxa +%%OCAML_SITELIBDIR%%/dyn/dyn.cmxs +%%OCAML_SITELIBDIR%%/dyn/dyn.ml +%%OCAML_SITELIBDIR%%/dyn/dyn.mli +%%OCAML_SITELIBDIR%%/dyn/opam +%%OCAML_SITELIBDIR%%/dyn/pp/pp.a +%%OCAML_SITELIBDIR%%/dyn/pp/pp.cma +%%OCAML_SITELIBDIR%%/dyn/pp/pp.cmi +%%OCAML_SITELIBDIR%%/dyn/pp/pp.cmt +%%OCAML_SITELIBDIR%%/dyn/pp/pp.cmti +%%OCAML_SITELIBDIR%%/dyn/pp/pp.cmx +%%OCAML_SITELIBDIR%%/dyn/pp/pp.cmxa +%%OCAML_SITELIBDIR%%/dyn/pp/pp.cmxs +%%OCAML_SITELIBDIR%%/dyn/pp/pp.ml +%%OCAML_SITELIBDIR%%/dyn/pp/pp.mli +%%OCAML_SITELIBDIR%%/ordering/META +%%OCAML_SITELIBDIR%%/ordering/dune-package +%%OCAML_SITELIBDIR%%/ordering/opam +%%OCAML_SITELIBDIR%%/ordering/ordering.a +%%OCAML_SITELIBDIR%%/ordering/ordering.cma +%%OCAML_SITELIBDIR%%/ordering/ordering.cmi +%%OCAML_SITELIBDIR%%/ordering/ordering.cmt +%%OCAML_SITELIBDIR%%/ordering/ordering.cmti +%%OCAML_SITELIBDIR%%/ordering/ordering.cmx +%%OCAML_SITELIBDIR%%/ordering/ordering.cmxa +%%OCAML_SITELIBDIR%%/ordering/ordering.cmxs +%%OCAML_SITELIBDIR%%/ordering/ordering.ml +%%OCAML_SITELIBDIR%%/ordering/ordering.mli +%%OCAML_SITELIBDIR%%/stdune/META +%%OCAML_SITELIBDIR%%/stdune/ansi_color.ml +%%OCAML_SITELIBDIR%%/stdune/ansi_color.mli +%%OCAML_SITELIBDIR%%/stdune/appendable_list.ml +%%OCAML_SITELIBDIR%%/stdune/appendable_list.mli +%%OCAML_SITELIBDIR%%/stdune/applicative.ml +%%OCAML_SITELIBDIR%%/stdune/applicative.mli +%%OCAML_SITELIBDIR%%/stdune/applicative_intf.ml +%%OCAML_SITELIBDIR%%/stdune/array.ml +%%OCAML_SITELIBDIR%%/stdune/bin.ml +%%OCAML_SITELIBDIR%%/stdune/bin.mli +%%OCAML_SITELIBDIR%%/stdune/bool.ml +%%OCAML_SITELIBDIR%%/stdune/bool.mli +%%OCAML_SITELIBDIR%%/stdune/bytes.ml +%%OCAML_SITELIBDIR%%/stdune/bytes.mli +%%OCAML_SITELIBDIR%%/stdune/bytes_unit.ml +%%OCAML_SITELIBDIR%%/stdune/bytes_unit.mli +%%OCAML_SITELIBDIR%%/stdune/caller_id.ml +%%OCAML_SITELIBDIR%%/stdune/caller_id.mli +%%OCAML_SITELIBDIR%%/stdune/char.ml +%%OCAML_SITELIBDIR%%/stdune/char.mli +%%OCAML_SITELIBDIR%%/stdune/code_error.ml +%%OCAML_SITELIBDIR%%/stdune/code_error.mli +%%OCAML_SITELIBDIR%%/stdune/comparable.ml +%%OCAML_SITELIBDIR%%/stdune/comparable.mli +%%OCAML_SITELIBDIR%%/stdune/comparable_intf.ml +%%OCAML_SITELIBDIR%%/stdune/comparator.ml +%%OCAML_SITELIBDIR%%/stdune/comparator.mli +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.a +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.cma +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.cmi +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.cmt +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.cmti +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.cmx +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.cmxa +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.cmxs +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.ml +%%OCAML_SITELIBDIR%%/stdune/csexp/csexp.mli +%%OCAML_SITELIBDIR%%/stdune/dune-package +%%OCAML_SITELIBDIR%%/stdune/either.ml +%%OCAML_SITELIBDIR%%/stdune/either.mli +%%OCAML_SITELIBDIR%%/stdune/env.ml +%%OCAML_SITELIBDIR%%/stdune/env.mli +%%OCAML_SITELIBDIR%%/stdune/env_path.ml +%%OCAML_SITELIBDIR%%/stdune/env_path.mli +%%OCAML_SITELIBDIR%%/stdune/escape.ml +%%OCAML_SITELIBDIR%%/stdune/escape.mli +%%OCAML_SITELIBDIR%%/stdune/exn.ml +%%OCAML_SITELIBDIR%%/stdune/exn.mli +%%OCAML_SITELIBDIR%%/stdune/exn_with_backtrace.ml +%%OCAML_SITELIBDIR%%/stdune/exn_with_backtrace.mli +%%OCAML_SITELIBDIR%%/stdune/fdecl.ml +%%OCAML_SITELIBDIR%%/stdune/fdecl.mli +%%OCAML_SITELIBDIR%%/stdune/filename.ml +%%OCAML_SITELIBDIR%%/stdune/filename.mli +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.a +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.cma +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.cmi +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.cmt +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.cmti +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.cmx +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.cmxa +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.cmxs +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.ml +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/dune_filesystem_stubs.mli +%%OCAML_SITELIBDIR%%/stdune/filesystem_stubs/libdune_filesystem_stubs_stubs.a +%%OCAML_SITELIBDIR%%/stdune/float.ml +%%OCAML_SITELIBDIR%%/stdune/float.mli +%%OCAML_SITELIBDIR%%/stdune/fpath.ml +%%OCAML_SITELIBDIR%%/stdune/fpath.mli +%%OCAML_SITELIBDIR%%/stdune/hashable.ml +%%OCAML_SITELIBDIR%%/stdune/hashtbl.ml +%%OCAML_SITELIBDIR%%/stdune/hashtbl.mli +%%OCAML_SITELIBDIR%%/stdune/hashtbl_intf.ml +%%OCAML_SITELIBDIR%%/stdune/id.ml +%%OCAML_SITELIBDIR%%/stdune/id.mli +%%OCAML_SITELIBDIR%%/stdune/int.ml +%%OCAML_SITELIBDIR%%/stdune/int.mli +%%OCAML_SITELIBDIR%%/stdune/io.ml +%%OCAML_SITELIBDIR%%/stdune/io.mli +%%OCAML_SITELIBDIR%%/stdune/io_intf.ml +%%OCAML_SITELIBDIR%%/stdune/lexbuf.ml +%%OCAML_SITELIBDIR%%/stdune/lexbuf.mli +%%OCAML_SITELIBDIR%%/stdune/libstdune_stubs.a +%%OCAML_SITELIBDIR%%/stdune/list.ml +%%OCAML_SITELIBDIR%%/stdune/list.mli +%%OCAML_SITELIBDIR%%/stdune/loc.ml +%%OCAML_SITELIBDIR%%/stdune/loc.mli +%%OCAML_SITELIBDIR%%/stdune/loc0.ml +%%OCAML_SITELIBDIR%%/stdune/map.ml +%%OCAML_SITELIBDIR%%/stdune/map.mli +%%OCAML_SITELIBDIR%%/stdune/map_intf.ml +%%OCAML_SITELIBDIR%%/stdune/monad.ml +%%OCAML_SITELIBDIR%%/stdune/monad.mli +%%OCAML_SITELIBDIR%%/stdune/monad_intf.ml +%%OCAML_SITELIBDIR%%/stdune/monoid.ml +%%OCAML_SITELIBDIR%%/stdune/monoid.mli +%%OCAML_SITELIBDIR%%/stdune/monoid_intf.ml +%%OCAML_SITELIBDIR%%/stdune/nonempty_list.ml +%%OCAML_SITELIBDIR%%/stdune/nonempty_list.mli +%%OCAML_SITELIBDIR%%/stdune/nothing.ml +%%OCAML_SITELIBDIR%%/stdune/nothing.mli +%%OCAML_SITELIBDIR%%/stdune/opam +%%OCAML_SITELIBDIR%%/stdune/option.ml +%%OCAML_SITELIBDIR%%/stdune/option.mli +%%OCAML_SITELIBDIR%%/stdune/or_exn.ml +%%OCAML_SITELIBDIR%%/stdune/or_exn.mli +%%OCAML_SITELIBDIR%%/stdune/path.ml +%%OCAML_SITELIBDIR%%/stdune/path.mli +%%OCAML_SITELIBDIR%%/stdune/path_intf.ml +%%OCAML_SITELIBDIR%%/stdune/pid.ml +%%OCAML_SITELIBDIR%%/stdune/pid.mli +%%OCAML_SITELIBDIR%%/stdune/poly.ml +%%OCAML_SITELIBDIR%%/stdune/poly.mli +%%OCAML_SITELIBDIR%%/stdune/predicate.ml +%%OCAML_SITELIBDIR%%/stdune/predicate.mli +%%OCAML_SITELIBDIR%%/stdune/proc.ml +%%OCAML_SITELIBDIR%%/stdune/proc.mli +%%OCAML_SITELIBDIR%%/stdune/queue.ml +%%OCAML_SITELIBDIR%%/stdune/queue.mli +%%OCAML_SITELIBDIR%%/stdune/result.ml +%%OCAML_SITELIBDIR%%/stdune/result.mli +%%OCAML_SITELIBDIR%%/stdune/scanf.ml +%%OCAML_SITELIBDIR%%/stdune/scanf.mli +%%OCAML_SITELIBDIR%%/stdune/seq.ml +%%OCAML_SITELIBDIR%%/stdune/seq.mli +%%OCAML_SITELIBDIR%%/stdune/set.ml +%%OCAML_SITELIBDIR%%/stdune/set.mli +%%OCAML_SITELIBDIR%%/stdune/set_intf.ml +%%OCAML_SITELIBDIR%%/stdune/sexp.ml +%%OCAML_SITELIBDIR%%/stdune/sexp.mli +%%OCAML_SITELIBDIR%%/stdune/signal.ml +%%OCAML_SITELIBDIR%%/stdune/signal.mli +%%OCAML_SITELIBDIR%%/stdune/staged.ml +%%OCAML_SITELIBDIR%%/stdune/staged.mli +%%OCAML_SITELIBDIR%%/stdune/state.ml +%%OCAML_SITELIBDIR%%/stdune/state.mli +%%OCAML_SITELIBDIR%%/stdune/stdune.a +%%OCAML_SITELIBDIR%%/stdune/stdune.cma +%%OCAML_SITELIBDIR%%/stdune/stdune.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune.cmxa +%%OCAML_SITELIBDIR%%/stdune/stdune.cmxs +%%OCAML_SITELIBDIR%%/stdune/stdune.ml +%%OCAML_SITELIBDIR%%/stdune/stdune__.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__.ml +%%OCAML_SITELIBDIR%%/stdune/stdune__Ansi_color.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Ansi_color.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Ansi_color.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Ansi_color.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Appendable_list.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Appendable_list.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Appendable_list.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Appendable_list.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Applicative.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Applicative.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Applicative.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Applicative.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Applicative_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Applicative_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Applicative_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Array.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Array.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Array.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Bin.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Bin.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Bin.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Bin.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Bool.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Bool.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Bool.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Bool.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Bytes.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Bytes.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Bytes.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Bytes.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Bytes_unit.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Bytes_unit.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Bytes_unit.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Bytes_unit.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Caller_id.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Caller_id.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Caller_id.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Caller_id.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Char.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Char.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Char.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Char.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Code_error.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Code_error.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Code_error.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Code_error.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparable.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparable.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparable.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparable.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparable_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparable_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparable_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparator.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparator.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparator.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Comparator.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Either.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Either.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Either.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Either.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Env.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Env.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Env.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Env.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Env_path.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Env_path.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Env_path.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Env_path.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Escape.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Escape.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Escape.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Escape.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Exn.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Exn.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Exn.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Exn.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Exn_with_backtrace.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Exn_with_backtrace.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Exn_with_backtrace.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Exn_with_backtrace.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Fdecl.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Fdecl.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Fdecl.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Fdecl.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Filename.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Filename.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Filename.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Filename.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Float.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Float.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Float.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Float.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Fpath.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Fpath.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Fpath.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Fpath.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashable.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashable.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashable.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashtbl.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashtbl.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashtbl.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashtbl.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashtbl_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashtbl_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Hashtbl_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Id.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Id.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Id.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Id.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Int.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Int.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Int.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Int.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Io.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Io.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Io.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Io.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Io_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Io_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Io_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Lexbuf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Lexbuf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Lexbuf.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Lexbuf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__List.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__List.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__List.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__List.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Loc.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Loc.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Loc.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Loc.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Loc0.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Loc0.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Loc0.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Map.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Map.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Map.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Map.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Map_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Map_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Map_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Monad.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Monad.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Monad.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Monad.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Monad_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Monad_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Monad_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Monoid.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Monoid.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Monoid.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Monoid.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Monoid_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Monoid_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Monoid_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Nonempty_list.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Nonempty_list.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Nonempty_list.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Nonempty_list.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Nothing.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Nothing.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Nothing.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Nothing.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Option.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Option.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Option.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Option.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Or_exn.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Or_exn.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Or_exn.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Or_exn.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Path.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Path.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Path.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Path.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Path_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Path_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Path_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Pid.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Pid.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Pid.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Pid.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Poly.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Poly.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Poly.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Poly.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Predicate.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Predicate.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Predicate.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Predicate.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Proc.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Proc.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Proc.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Proc.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Queue.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Queue.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Queue.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Queue.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Result.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Result.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Result.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Result.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Scanf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Scanf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Scanf.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Scanf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Seq.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Seq.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Seq.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Seq.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Set.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Set.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Set.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Set.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Set_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Set_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Set_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Sexp.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Sexp.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Sexp.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Sexp.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Signal.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Signal.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Signal.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Signal.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Staged.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Staged.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Staged.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Staged.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__State.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__State.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__State.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__State.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__String.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__String.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__String.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__String.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__String_split.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__String_split.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__String_split.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__String_split.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Sys.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Sys.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Sys.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Sys.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Table.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Table.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Table.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Table.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Temp.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Temp.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Temp.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Temp.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Top_closure.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Top_closure.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Top_closure.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Top_closure.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Top_closure_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Top_closure_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Top_closure_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Tuple.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Tuple.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Tuple.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Tuple.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Type_eq.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Type_eq.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Type_eq.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Type_eq.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Unit.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Unit.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Unit.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Unit.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Univ_map.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Univ_map.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Univ_map.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__Univ_map.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__Univ_map_intf.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__Univ_map_intf.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__Univ_map_intf.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__User_error.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__User_error.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__User_error.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__User_error.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__User_message.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__User_message.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__User_message.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__User_message.cmx +%%OCAML_SITELIBDIR%%/stdune/stdune__User_warning.cmi +%%OCAML_SITELIBDIR%%/stdune/stdune__User_warning.cmt +%%OCAML_SITELIBDIR%%/stdune/stdune__User_warning.cmti +%%OCAML_SITELIBDIR%%/stdune/stdune__User_warning.cmx +%%OCAML_SITELIBDIR%%/stdune/string.ml +%%OCAML_SITELIBDIR%%/stdune/string.mli +%%OCAML_SITELIBDIR%%/stdune/string_split.ml +%%OCAML_SITELIBDIR%%/stdune/string_split.mli +%%OCAML_SITELIBDIR%%/stdune/sys.ml +%%OCAML_SITELIBDIR%%/stdune/sys.mli +%%OCAML_SITELIBDIR%%/stdune/table.ml +%%OCAML_SITELIBDIR%%/stdune/table.mli +%%OCAML_SITELIBDIR%%/stdune/temp.ml +%%OCAML_SITELIBDIR%%/stdune/temp.mli +%%OCAML_SITELIBDIR%%/stdune/top_closure.ml +%%OCAML_SITELIBDIR%%/stdune/top_closure.mli +%%OCAML_SITELIBDIR%%/stdune/top_closure_intf.ml +%%OCAML_SITELIBDIR%%/stdune/tuple.ml +%%OCAML_SITELIBDIR%%/stdune/tuple.mli +%%OCAML_SITELIBDIR%%/stdune/type_eq.ml +%%OCAML_SITELIBDIR%%/stdune/type_eq.mli +%%OCAML_SITELIBDIR%%/stdune/unit.ml +%%OCAML_SITELIBDIR%%/stdune/unit.mli +%%OCAML_SITELIBDIR%%/stdune/univ_map.ml +%%OCAML_SITELIBDIR%%/stdune/univ_map.mli +%%OCAML_SITELIBDIR%%/stdune/univ_map_intf.ml +%%OCAML_SITELIBDIR%%/stdune/user_error.ml +%%OCAML_SITELIBDIR%%/stdune/user_error.mli +%%OCAML_SITELIBDIR%%/stdune/user_message.ml +%%OCAML_SITELIBDIR%%/stdune/user_message.mli +%%OCAML_SITELIBDIR%%/stdune/user_warning.ml +%%OCAML_SITELIBDIR%%/stdune/user_warning.mli +%%OCAML_SITELIBDIR%%/stublibs/dlldune_filesystem_stubs_stubs.so +%%OCAML_SITELIBDIR%%/stublibs/dllstdune_stubs.so +%%OCAML_SITELIBDIR%%/stublibs/dllxdg_stubs.so +%%OCAML_SITELIBDIR%%/xdg/META +%%OCAML_SITELIBDIR%%/xdg/dune-package +%%OCAML_SITELIBDIR%%/xdg/libxdg_stubs.a +%%OCAML_SITELIBDIR%%/xdg/opam +%%OCAML_SITELIBDIR%%/xdg/xdg.a +%%OCAML_SITELIBDIR%%/xdg/xdg.cma +%%OCAML_SITELIBDIR%%/xdg/xdg.cmi +%%OCAML_SITELIBDIR%%/xdg/xdg.cmt +%%OCAML_SITELIBDIR%%/xdg/xdg.cmti +%%OCAML_SITELIBDIR%%/xdg/xdg.cmx +%%OCAML_SITELIBDIR%%/xdg/xdg.cmxa +%%OCAML_SITELIBDIR%%/xdg/xdg.cmxs +%%OCAML_SITELIBDIR%%/xdg/xdg.ml +%%OCAML_SITELIBDIR%%/xdg/xdg.mli man/man1/dune-build.1.gz +man/man1/dune-cache.1.gz man/man1/dune-clean.1.gz -man/man1/dune-compute.1.gz +man/man1/dune-coq.1.gz +man/man1/dune-describe.1.gz +man/man1/dune-diagnostics.1.gz man/man1/dune-exec.1.gz man/man1/dune-external-lib-deps.1.gz +man/man1/dune-fmt.1.gz man/man1/dune-format-dune-file.1.gz man/man1/dune-help.1.gz man/man1/dune-init.1.gz man/man1/dune-install.1.gz man/man1/dune-installed-libraries.1.gz +man/man1/dune-internal.1.gz +man/man1/dune-ocaml-merlin.1.gz +man/man1/dune-ocaml.1.gz man/man1/dune-printenv.1.gz man/man1/dune-promote.1.gz +man/man1/dune-promotion.1.gz +man/man1/dune-rpc.1.gz man/man1/dune-rules.1.gz man/man1/dune-runtest.1.gz +man/man1/dune-shutdown.1.gz man/man1/dune-subst.1.gz +man/man1/dune-test.1.gz +man/man1/dune-top.1.gz man/man1/dune-uninstall.1.gz man/man1/dune-upgrade.1.gz man/man1/dune-utop.1.gz man/man1/dune.1.gz man/man5/dune-config.5.gz +%%PORTDOCS%%share/doc/ocaml/dune-action-plugin/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/dune-action-plugin/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/dune-action-plugin/README.md +%%PORTDOCS%%share/doc/ocaml/dune-build-info/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/dune-build-info/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/dune-build-info/README.md +%%PORTDOCS%%share/doc/ocaml/dune-configurator/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/dune-configurator/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/dune-configurator/README.md +%%PORTDOCS%%share/doc/ocaml/dune-glob/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/dune-glob/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/dune-glob/README.md +%%PORTDOCS%%share/doc/ocaml/dune-private-libs/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/dune-private-libs/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/dune-private-libs/README.md +%%PORTDOCS%%share/doc/ocaml/dune-rpc/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/dune-rpc/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/dune-rpc/README.md +%%PORTDOCS%%share/doc/ocaml/dune-site/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/dune-site/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/dune-site/README.md +%%PORTDOCS%%share/doc/ocaml/dune/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/dune/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/dune/README.md +%%PORTDOCS%%share/doc/ocaml/dyn/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/dyn/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/dyn/README.md +%%PORTDOCS%%share/doc/ocaml/ordering/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/ordering/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/ordering/README.md +%%PORTDOCS%%share/doc/ocaml/stdune/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/stdune/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/stdune/README.md +%%PORTDOCS%%share/doc/ocaml/xdg/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/xdg/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/xdg/README.md share/emacs/site-lisp/dune-flymake.el +share/emacs/site-lisp/dune-watch.el share/emacs/site-lisp/dune.el diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile index 2b83df70ba01..ffcf3a7f3fae 100644 --- a/devel/ocaml-extlib/Makefile +++ b/devel/ocaml-extlib/Makefile @@ -1,5 +1,6 @@ PORTNAME= extlib DISTVERSION= 1.7.9 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/ygrek/ocaml-extlib/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index be0d706510c2..c96bad16f230 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -1,5 +1,5 @@ PORTNAME= findlib -PORTVERSION= 1.8.1 +PORTVERSION= 1.9.6 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo index f83e1fbb2219..f8a3a95a52c6 100644 --- a/devel/ocaml-findlib/distinfo +++ b/devel/ocaml-findlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564402014 -SHA256 (findlib-1.8.1.tar.gz) = 8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303 -SIZE (findlib-1.8.1.tar.gz) = 261544 +TIMESTAMP = 1683284992 +SHA256 (findlib-1.9.6.tar.gz) = 2df996279ae16b606db5ff5879f93dbfade0898db9f1a3e82f7f845faa2930a2 +SIZE (findlib-1.9.6.tar.gz) = 271246 diff --git a/devel/ocaml-findlib/files/patch-Makefile b/devel/ocaml-findlib/files/patch-Makefile index 55fa741e5c06..338ed1e1cd79 100644 --- a/devel/ocaml-findlib/files/patch-Makefile +++ b/devel/ocaml-findlib/files/patch-Makefile @@ -1,64 +1,11 @@ ---- Makefile.orig 2016-11-18 13:04:45 UTC +--- Makefile.orig 2022-09-24 15:13:16 UTC +++ Makefile -@@ -17,14 +17,14 @@ opt: - for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done - - install: -- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" -- mkdir -p "$(prefix)$(OCAMLFIND_MAN)" -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)" - $(MAKE) install-config - for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done - $(MAKE) install-meta - test -z "$(NUMTOP)" || { cd src/findlib; $(MAKE) install-num-top; } - if [ $(INSTALL_CAMLP4) -eq 1 ]; then \ -- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \ -+ ${BSD_INSTALL_SCRIPT} tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \ - fi - $(MAKE) install-doc - @@ -55,7 +55,7 @@ findlib.conf: findlib.conf.in - USE_CYGPATH="$(USE_CYGPATH)"; \ export USE_CYGPATH; \ cat findlib.conf.in | \ -- $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf -+ $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB):$(OCAML_LIBDIR)' >findlib.conf + $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' | \ +- $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' -p >findlib.conf ++ $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH):$(OCAML_LIBDIR)' -p >findlib.conf if ./tools/cmd_from_same_dir ocamlc; then \ echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ fi -@@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in - - .PHONY: install-doc - install-doc: -- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5" -- -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1" -- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5" -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5" -+ -cp doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" -+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5" - - .PHONY: uninstall-doc - uninstall-doc: -@@ -86,7 +86,7 @@ uninstall-doc: - - .PHONY: install-meta - install-meta: -- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done -+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done - - .PHONY: uninstall-meta - uninstall-meta: -@@ -94,9 +94,9 @@ uninstall-meta: - - .PHONY: install-config - install-config: -- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`" -- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi -- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)" -+ mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`" -+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi -+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || ${BSD_INSTALL_DATA} findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" - - .PHONY: uninstall-config - uninstall-config: diff --git a/devel/ocaml-findlib/files/patch-src__bytes__Makefile b/devel/ocaml-findlib/files/patch-src__bytes__Makefile deleted file mode 100644 index 4758def89193..000000000000 --- a/devel/ocaml-findlib/files/patch-src__bytes__Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- src/bytes/Makefile.orig 2016-11-18 13:04:46 UTC -+++ src/bytes/Makefile -@@ -19,9 +19,9 @@ opt: - $(OCAMLBUILD) $$files - - install: all -- mkdir -p "$(prefix)$(OCAML_SITELIB)/bytes" -- cd _build/ && cp ../META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes" -- cd _build/ && for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ]; then cp $$f "$(prefix)$(OCAML_SITELIB)/bytes"; fi; done -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes" -+ cd _build/ && cp ../META $(BYTE_FILES) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes" -+ cd _build/ && for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ]; then cp $$f "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes"; fi; done - - uninstall: - rm -rf "$(prefix)$(OCAML_SITELIB)/bytes" diff --git a/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile b/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile deleted file mode 100644 index c3458e3b3a86..000000000000 --- a/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- src/findlib-toolbox/Makefile.orig 2016-11-18 13:04:46 UTC -+++ src/findlib-toolbox/Makefile -@@ -13,7 +13,8 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m - findlib.cma make_wizard.ml - - install: -- cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib -+ mkdir -p $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib -+ ${BSD_INSTALL_DATA} make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib - - # uninstall: Nothing to do, because the removal of the findlib core also - # deinstalls the make_wizard diff --git a/devel/ocaml-findlib/files/patch-src_findlib_Makefile b/devel/ocaml-findlib/files/patch-src_findlib_Makefile deleted file mode 100644 index b370954773a3..000000000000 --- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile +++ /dev/null @@ -1,42 +0,0 @@ ---- src/findlib/Makefile.orig 2016-11-18 13:04:46 UTC -+++ src/findlib/Makefile -@@ -19,6 +19,7 @@ OCAMLDEP = ocamldep - OCAMLLEX = ocamllex - #CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo -- - #CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo -- -+OCAML_LIBBIN=${PREFIX}/lib/ocaml - - - OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \ -@@ -119,23 +120,23 @@ clean: - ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX) - - install: all -- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" -- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" -- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" -+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" - files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ -- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" -+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" - f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ -- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" -+ cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" - # the following "if" block is only needed for 4.00beta2 - if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \ - cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \ -- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ -+ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ - fi - - install-num-top: -- mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top" -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top" - cp num_top.cma num_top.cmi num_top_printers.cmi \ -- "$(prefix)$(OCAML_SITELIB)/num-top" -+ "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top" - - # Note: uninstall-num-top is part of the removal of the META files. - diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist index fe8db7125078..b083eb701969 100644 --- a/devel/ocaml-findlib/pkg-plist +++ b/devel/ocaml-findlib/pkg-plist @@ -8,12 +8,15 @@ bin/safe_camlp4 %%OCAML_SITELIBDIR%%/dynlink/META %%OCAML_SITELIBDIR%%/findlib/META %%OCAML_SITELIBDIR%%/findlib/Makefile.config +%%OCAML_SITELIBDIR%%/findlib/Makefile.packages %%OCAML_SITELIBDIR%%/findlib/findlib.a %%OCAML_SITELIBDIR%%/findlib/findlib.cma %%OCAML_SITELIBDIR%%/findlib/findlib.cmi %%OCAML_SITELIBDIR%%/findlib/findlib.cmxa %%OCAML_SITELIBDIR%%/findlib/findlib.cmxs %%OCAML_SITELIBDIR%%/findlib/findlib.mli +%%OCAML_SITELIBDIR%%/findlib/findlib_config.cmi +%%OCAML_SITELIBDIR%%/findlib/findlib_config.ml %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.a %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cma %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxa @@ -22,13 +25,19 @@ bin/safe_camlp4 %%OCAML_SITELIBDIR%%/findlib/findlib_top.cma %%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxa %%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxs +%%OCAML_SITELIBDIR%%/findlib/fl_args.cmi %%OCAML_SITELIBDIR%%/findlib/fl_dynload.cmi %%OCAML_SITELIBDIR%%/findlib/fl_dynload.mli +%%OCAML_SITELIBDIR%%/findlib/fl_lint.cmi +%%OCAML_SITELIBDIR%%/findlib/fl_meta.cmi %%OCAML_SITELIBDIR%%/findlib/fl_metascanner.cmi %%OCAML_SITELIBDIR%%/findlib/fl_metascanner.mli %%OCAML_SITELIBDIR%%/findlib/fl_metatoken.cmi %%OCAML_SITELIBDIR%%/findlib/fl_package_base.cmi %%OCAML_SITELIBDIR%%/findlib/fl_package_base.mli +%%OCAML_SITELIBDIR%%/findlib/fl_split.cmi +%%OCAML_SITELIBDIR%%/findlib/fl_topo.cmi +%%OCAML_SITELIBDIR%%/findlib/ocaml_args.cmi %%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard %%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern %%OCAML_SITELIBDIR%%/findlib/topfind.cmi @@ -37,7 +46,6 @@ bin/safe_camlp4 %%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/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 2165d829fd58..dc894031e18b 100644 --- a/devel/ocaml-ipaddr/Makefile +++ b/devel/ocaml-ipaddr/Makefile @@ -1,35 +1,33 @@ PORTNAME= ipaddr -PORTVERSION= 2.6.1 +DISTVERSIONPREFIX= v +PORTVERSION= 3.1.0 CATEGORIES= devel PKGNAMEPREFIX= ocaml- 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 +BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib0/sexplib0.a:devel/ocaml-sexplib0 \ + dune:devel/ocaml-dune +RUN_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib0/sexplib0.a:devel/ocaml-sexplib0 USE_GITHUB= yes GH_ACCOUNT= mirage GH_PROJECT= ocaml-ipaddr USES= gmake -HAS_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_CAMLP4= yes -USE_OCAMLFIND_PLIST= yes USE_OCAML_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e '/^SETUP =/s,ocaml,& -unsafe-string,' \ ${WRKSRC}/Makefile -do-configure: - cd ${CONFIGURE_WRKSRC} && ocaml -unsafe-string setup.ml \ - -configure ${CONFIGURE_ARGS} +do-install: + cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \ + --prefix=${PREFIX} --libdir=${PREFIX}/${OCAML_SITELIBDIR} .include <bsd.port.mk> diff --git a/devel/ocaml-ipaddr/distinfo b/devel/ocaml-ipaddr/distinfo index 098161f6d8e5..aa5952789eeb 100644 --- a/devel/ocaml-ipaddr/distinfo +++ b/devel/ocaml-ipaddr/distinfo @@ -1,2 +1,3 @@ -SHA256 (mirage-ocaml-ipaddr-2.6.1_GH0.tar.gz) = 7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0 -SIZE (mirage-ocaml-ipaddr-2.6.1_GH0.tar.gz) = 64458 +TIMESTAMP = 1684858044 +SHA256 (mirage-ocaml-ipaddr-v3.1.0_GH0.tar.gz) = 707d5f9bb6659ff1cb5850aa20f6424cbf60b681033264c4c2049af75bd923c2 +SIZE (mirage-ocaml-ipaddr-v3.1.0_GH0.tar.gz) = 25889 diff --git a/devel/ocaml-ipaddr/files/patch-lib_ipaddr.ml b/devel/ocaml-ipaddr/files/patch-lib_ipaddr.ml new file mode 100644 index 000000000000..bfd7d0f2b3a4 --- /dev/null +++ b/devel/ocaml-ipaddr/files/patch-lib_ipaddr.ml @@ -0,0 +1,33 @@ +--- lib/ipaddr.ml.orig 2019-03-03 17:12:39 UTC ++++ lib/ipaddr.ml +@@ -69,9 +69,9 @@ let int_of_char c = match c with + let char_A = int_of_char 'A' + + let int_of_char c = match c with +- | '0'..'9' -> Pervasives.int_of_char c - char_0 +- | 'a'..'f' -> 10 + Pervasives.int_of_char c - char_a +- | 'A'..'F' -> 10 + Pervasives.int_of_char c - char_A ++ | '0'..'9' -> Stdlib.int_of_char c - char_0 ++ | 'a'..'f' -> 10 + Stdlib.int_of_char c - char_a ++ | 'A'..'F' -> 10 + Stdlib.int_of_char c - char_A + | _ -> -1 + + let bad_char i s = +@@ -258,7 +258,7 @@ module V4 = struct + + let compare (pre,sz) (pre',sz') = + let c = compare pre pre' in +- if c = 0 then Pervasives.compare sz sz' else c ++ if c = 0 then Stdlib.compare sz sz' else c + + let ip = make + +@@ -706,7 +706,7 @@ module V6 = struct + + let compare (pre,sz) (pre',sz') = + let c = compare pre pre' in +- if c = 0 then Pervasives.compare sz sz' else c ++ if c = 0 then Stdlib.compare sz sz' else c + + let ip = make + diff --git a/devel/ocaml-ipaddr/pkg-plist b/devel/ocaml-ipaddr/pkg-plist new file mode 100644 index 000000000000..08a422df4a53 --- /dev/null +++ b/devel/ocaml-ipaddr/pkg-plist @@ -0,0 +1,80 @@ +%%OCAML_SITELIBDIR%%/ipaddr/META +%%OCAML_SITELIBDIR%%/ipaddr/dune-package +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.a +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cma +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmi +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmt +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmti +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmx +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmxa +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmxs +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.ml +%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.mli +%%OCAML_SITELIBDIR%%/ipaddr/opam +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.a +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cma +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmi +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmt +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmti +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmx +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmxa +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmxs +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.ml +%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.mli +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.a +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cma +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmi +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmt +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmti +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmx +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmxa +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmxs +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.ml +%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.mli +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.a +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cma +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmi +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmt +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmti +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmx +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmxa +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmxs +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.ml +%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.mli +%%OCAML_SITELIBDIR%%/macaddr/META +%%OCAML_SITELIBDIR%%/macaddr/dune-package +%%OCAML_SITELIBDIR%%/macaddr/macaddr.a +%%OCAML_SITELIBDIR%%/macaddr/macaddr.cma +%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmi +%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmt +%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmti +%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmx +%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmxa +%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmxs +%%OCAML_SITELIBDIR%%/macaddr/macaddr.ml +%%OCAML_SITELIBDIR%%/macaddr/macaddr.mli +%%OCAML_SITELIBDIR%%/macaddr/opam +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.a +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cma +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmi +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmt +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmti +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmx +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmxa +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmxs +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.ml +%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.mli +%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.a +%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cma +%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmi +%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmt +%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmx +%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmxa +%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmxs +%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.ml +share/doc/ocaml/ipaddr/CHANGES.md +share/doc/ocaml/ipaddr/LICENSE.md +share/doc/ocaml/ipaddr/README.md +share/doc/ocaml/macaddr/CHANGES.md +share/doc/ocaml/macaddr/LICENSE.md +share/doc/ocaml/macaddr/README.md diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile index 4d3ab9697cab..7ac4e285e337 100644 --- a/devel/ocaml-lacaml/Makefile +++ b/devel/ocaml-lacaml/Makefile @@ -1,6 +1,6 @@ PORTNAME= lacaml PORTVERSION= 8.0.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel MASTER_SITES= https://github.com/mmottl/lacaml/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile index 22621a758dbe..ea8e70e5115d 100644 --- a/devel/ocaml-lwt/Makefile +++ b/devel/ocaml-lwt/Makefile @@ -1,5 +1,6 @@ PORTNAME= lwt PORTVERSION= 2.5.2 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-lwt/files/patch-src_unix_lwt__bytes.ml b/devel/ocaml-lwt/files/patch-src_unix_lwt__bytes.ml new file mode 100644 index 000000000000..8bb709e1ac73 --- /dev/null +++ b/devel/ocaml-lwt/files/patch-src_unix_lwt__bytes.ml @@ -0,0 +1,12 @@ +--- src/unix/lwt_bytes.ml.orig 2016-04-25 14:32:43 UTC ++++ src/unix/lwt_bytes.ml +@@ -219,7 +219,8 @@ let map_file ~fd ?pos ~shared ?(size=(-1)) () = + +-----------------------------------------------------------------+ *) + + let map_file ~fd ?pos ~shared ?(size=(-1)) () = +- Array1.map_file fd ?pos char c_layout shared size ++ Unix.map_file fd ?pos char c_layout shared [|size|] ++ |> Bigarray.array1_of_genarray + + external mapped : t -> bool = "lwt_unix_mapped" "noalloc" + diff --git a/devel/ocaml-magic/Makefile b/devel/ocaml-magic/Makefile index 313a7604fd06..2c197bc480ee 100644 --- a/devel/ocaml-magic/Makefile +++ b/devel/ocaml-magic/Makefile @@ -1,6 +1,6 @@ PORTNAME= magic PORTVERSION= 0.7.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF/ocaml-${PORTNAME}/ocaml-${PORTNAME}/0.7 PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-ocamlbuild/Makefile b/devel/ocaml-ocamlbuild/Makefile index 8aa3e64db878..a9bae5c501e3 100644 --- a/devel/ocaml-ocamlbuild/Makefile +++ b/devel/ocaml-ocamlbuild/Makefile @@ -1,5 +1,6 @@ PORTNAME= ocamlbuild PORTVERSION= 0.14.2 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile index 7452bf3fb013..d7e060451647 100644 --- a/devel/ocaml-opam/Makefile +++ b/devel/ocaml-opam/Makefile @@ -1,5 +1,6 @@ PORTNAME= opam DISTVERSION= 2.1.5 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-ounit/Makefile b/devel/ocaml-ounit/Makefile index eddacc473c0f..65b162d4b094 100644 --- a/devel/ocaml-ounit/Makefile +++ b/devel/ocaml-ounit/Makefile @@ -1,6 +1,6 @@ PORTNAME= ounit PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.xs4all.nl/~mmzeeman/ocaml/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-parmap/Makefile b/devel/ocaml-parmap/Makefile index d58e577979eb..e9f79c67349e 100644 --- a/devel/ocaml-parmap/Makefile +++ b/devel/ocaml-parmap/Makefile @@ -1,5 +1,5 @@ PORTNAME= parmap -DISTVERSION= 1.0-rc9 +DISTVERSION= 1.2.4 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -10,19 +10,23 @@ WWW= https://github.com/rdicosmo/parmap LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild +BUILD_DEPENDS= dune:devel/ocaml-dune USE_GITHUB= yes GH_ACCOUNT= rdicosmo USES= gmake -GNU_CONFIGURE= yes USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_LDCONFIG= yes -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/parmap/*.cmxs - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/*.so +TARGETS= ${PORTNAME} + +do-build: + cd ${BUILD_WRKSRC} && dune build --verbose -p ${TARGETS:ts,} -j ${MAKE_JOBS_NUMBER} + +do-install: + cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \ + --libdir=${PREFIX}/${OCAML_SITELIBDIR} ${TARGETS} .include <bsd.port.mk> diff --git a/devel/ocaml-parmap/distinfo b/devel/ocaml-parmap/distinfo index 29b6be795de0..c6d0c755a799 100644 --- a/devel/ocaml-parmap/distinfo +++ b/devel/ocaml-parmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519649954 -SHA256 (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 8bccdb269e955b7ae6ab981117bfe64abf0f832788e4138c79b83385c9c9e16a -SIZE (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 99394 +TIMESTAMP = 1684362358 +SHA256 (rdicosmo-parmap-1.2.4_GH0.tar.gz) = 3c8835dc6dfc74bc9ad9b68ba5b3e6287434555bb09a27b3910c73f9b70ce140 +SIZE (rdicosmo-parmap-1.2.4_GH0.tar.gz) = 47584 diff --git a/devel/ocaml-parmap/files/patch-Makefile.in b/devel/ocaml-parmap/files/patch-Makefile.in deleted file mode 100644 index f38746ebb422..000000000000 --- a/devel/ocaml-parmap/files/patch-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in.orig 2015-02-09 10:42:28 UTC -+++ Makefile.in -@@ -20,9 +20,9 @@ INSTALL = $(OCAMLFIND) install - UNINSTALL = $(OCAMLFIND) remove - else - export OCAMLLIBDIR := lib/ocaml --LIBDIR=$(DESTDIR)/$(OCAMLLIBDIR) --BINDIR=$(DESTDIR)/bin --MANDIR=$(DESTDIR)/man/man3 -+LIBDIR=$(DESTDIR)$(prefix)/$(OCAMLLIBDIR) -+BINDIR=$(DESTDIR)$(exec_prefix)/bin -+MANDIR=$(DESTDIR)$(prefix)/man/man3 - INSTALL = $(OCAMLFIND) install -destdir $(LIBDIR) - UNINSTALL = $(OCAMLFIND) remove -destdir $(LIBDIR) - endif diff --git a/devel/ocaml-parmap/pkg-plist b/devel/ocaml-parmap/pkg-plist index 24182b6a84c4..6cbc2cc89e6f 100644 --- a/devel/ocaml-parmap/pkg-plist +++ b/devel/ocaml-parmap/pkg-plist @@ -1,22 +1,39 @@ -lib/ocaml/parmap/META -lib/ocaml/parmap/bytearray.cmi -lib/ocaml/parmap/bytearray.cmx -lib/ocaml/parmap/bytearray.mli -lib/ocaml/parmap/libparmap_stubs.a -lib/ocaml/parmap/myocamlbuild.cmx -lib/ocaml/parmap/parmap_utils.cmi -lib/ocaml/parmap/parmap_utils.cmx -lib/ocaml/parmap/parmap_utils.mli -lib/ocaml/parmap/parmap.a -lib/ocaml/parmap/parmap.cma -lib/ocaml/parmap/parmap.cmi -lib/ocaml/parmap/parmap.cmx -lib/ocaml/parmap/parmap.cmxa -lib/ocaml/parmap/parmap.cmxs -lib/ocaml/parmap/parmap.mli -lib/ocaml/parmap/setcore.cmi -lib/ocaml/parmap/setcore.cmx -lib/ocaml/stublibs/dllparmap_stubs.so -lib/ocaml/stublibs/dllparmap_stubs.so.owner -man/man3/Parmap.3o.gz -@dir %%OCAML_SITELIBDIR%% +%%OCAML_SITELIBDIR%%/parmap/META +%%OCAML_SITELIBDIR%%/parmap/bytearray.cmi +%%OCAML_SITELIBDIR%%/parmap/bytearray.cmt +%%OCAML_SITELIBDIR%%/parmap/bytearray.cmti +%%OCAML_SITELIBDIR%%/parmap/bytearray.cmx +%%OCAML_SITELIBDIR%%/parmap/bytearray.ml +%%OCAML_SITELIBDIR%%/parmap/bytearray.mli +%%OCAML_SITELIBDIR%%/parmap/dune-package +%%OCAML_SITELIBDIR%%/parmap/libparmap_stubs.a +%%OCAML_SITELIBDIR%%/parmap/opam +%%OCAML_SITELIBDIR%%/parmap/parmap.a +%%OCAML_SITELIBDIR%%/parmap/parmap.cma +%%OCAML_SITELIBDIR%%/parmap/parmap.cmi +%%OCAML_SITELIBDIR%%/parmap/parmap.cmt +%%OCAML_SITELIBDIR%%/parmap/parmap.cmti +%%OCAML_SITELIBDIR%%/parmap/parmap.cmx +%%OCAML_SITELIBDIR%%/parmap/parmap.cmxa +%%OCAML_SITELIBDIR%%/parmap/parmap.cmxs +%%OCAML_SITELIBDIR%%/parmap/parmap.ml +%%OCAML_SITELIBDIR%%/parmap/parmap.mli +%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmi +%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmt +%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmx +%%OCAML_SITELIBDIR%%/parmap/parmap_compat.ml +%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmi +%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmt +%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmti +%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmx +%%OCAML_SITELIBDIR%%/parmap/parmap_utils.ml +%%OCAML_SITELIBDIR%%/parmap/parmap_utils.mli +%%OCAML_SITELIBDIR%%/parmap/setcore.cmi +%%OCAML_SITELIBDIR%%/parmap/setcore.cmt +%%OCAML_SITELIBDIR%%/parmap/setcore.cmx +%%OCAML_SITELIBDIR%%/parmap/setcore.ml +%%OCAML_SITELIBDIR%%/stublibs/dllparmap_stubs.so +share/doc/ocaml/parmap/CHANGES +share/doc/ocaml/parmap/LICENSE +share/doc/ocaml/parmap/README.md +share/doc/ocaml/parmap/odoc-pages/index.mld diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile index e5c24e4cca0e..135d07b78a60 100644 --- a/devel/ocaml-pcre/Makefile +++ b/devel/ocaml-pcre/Makefile @@ -1,7 +1,7 @@ PORTNAME= pcre PORTVERSION= 7.2.3 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-pomap/Makefile b/devel/ocaml-pomap/Makefile index 3de554c286bf..03e292283e57 100644 --- a/devel/ocaml-pomap/Makefile +++ b/devel/ocaml-pomap/Makefile @@ -1,5 +1,6 @@ PORTNAME= pomap PORTVERSION= 4.1.1 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -26,7 +27,7 @@ do-build: do-install: cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \ - --libdir=${OCAML_SITELIBDIR} + --libdir=${PREFIX}/${OCAML_SITELIBDIR} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/pomap/pomap.cmxs diff --git a/devel/ocaml-ppx-tools/Makefile b/devel/ocaml-ppx-tools/Makefile index c25430e74e3e..0113247e8ea0 100644 --- a/devel/ocaml-ppx-tools/Makefile +++ b/devel/ocaml-ppx-tools/Makefile @@ -1,6 +1,5 @@ PORTNAME= ppx-tools -PORTVERSION= 5.1 -DISTVERSIONSUFFIX=+4.06.0 +PORTVERSION= 6.6 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -10,15 +9,20 @@ WWW= https://github.com/ocaml-ppx/ppx_tools LICENSE= MIT +BUILD_DEPENDS= dune:devel/ocaml-dune \ + cppo:devel/ocaml-cppo + USES= gmake +ALL_TARGET= release USE_OCAML= yes USE_OCAML_FINDLIB=yes -MAKE_JOBS_UNSAFE=yes USE_GITHUB= yes GH_ACCOUNT= ocaml-ppx GH_PROJECT= ${PORTNAME:C/-/_/} +DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME:C/-/_/} + +PORTDOCS= CHANGES LICENSE README.md -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/ppx_tools/ppx_tools.cmxs +OPTIONS_DEFINE= DOCS .include <bsd.port.mk> diff --git a/devel/ocaml-ppx-tools/distinfo b/devel/ocaml-ppx-tools/distinfo index 604be0e977c4..1185af704f6c 100644 --- a/devel/ocaml-ppx-tools/distinfo +++ b/devel/ocaml-ppx-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508834585 -SHA256 (ocaml-ppx-ppx_tools-5.1+4.06.0_GH0.tar.gz) = 413e01444bdef2c4a231ddb1281b29bbc7b0c4bd780b7da47d9255b193bfcc56 -SIZE (ocaml-ppx-ppx_tools-5.1+4.06.0_GH0.tar.gz) = 17943 +TIMESTAMP = 1683062036 +SHA256 (ocaml-ppx-ppx_tools-6.6_GH0.tar.gz) = 7a38f6dcd475dbdbb775fc1e9e1f4542de6d26737776b11391b16274b7cf651d +SIZE (ocaml-ppx-ppx_tools-6.6_GH0.tar.gz) = 19265 diff --git a/devel/ocaml-ppx-tools/pkg-plist b/devel/ocaml-ppx-tools/pkg-plist index cd599c4530fb..779712c12955 100644 --- a/devel/ocaml-ppx-tools/pkg-plist +++ b/devel/ocaml-ppx-tools/pkg-plist @@ -1,19 +1,41 @@ -%%OCAML_SITELIBDIR%%/ppx_tools/META -%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmi -%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmt -%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmti -%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmx -%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.mli -%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmi -%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmt -%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmti -%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmx -%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.mli -%%OCAML_SITELIBDIR%%/ppx_tools/dumpast -%%OCAML_SITELIBDIR%%/ppx_tools/genlifter -%%OCAML_SITELIBDIR%%/ppx_tools/ppx_metaquot -%%OCAML_SITELIBDIR%%/ppx_tools/ppx_tools.a -%%OCAML_SITELIBDIR%%/ppx_tools/ppx_tools.cma -%%OCAML_SITELIBDIR%%/ppx_tools/ppx_tools.cmxa -%%OCAML_SITELIBDIR%%/ppx_tools/ppx_tools.cmxs -%%OCAML_SITELIBDIR%%/ppx_tools/rewriter +lib/ppx_tools/META +lib/ppx_tools/ast_convenience.cmi +lib/ppx_tools/ast_convenience.cmt +lib/ppx_tools/ast_convenience.cmti +lib/ppx_tools/ast_convenience.cmx +lib/ppx_tools/ast_convenience.ml +lib/ppx_tools/ast_convenience.mli +lib/ppx_tools/ast_lifter/ast_lifter.a +lib/ppx_tools/ast_lifter/ast_lifter.cma +lib/ppx_tools/ast_lifter/ast_lifter.cmi +lib/ppx_tools/ast_lifter/ast_lifter.cmt +lib/ppx_tools/ast_lifter/ast_lifter.cmx +lib/ppx_tools/ast_lifter/ast_lifter.cmxa +lib/ppx_tools/ast_lifter/ast_lifter.cmxs +lib/ppx_tools/ast_lifter/ast_lifter.ml +lib/ppx_tools/ast_mapper_class.cmi +lib/ppx_tools/ast_mapper_class.cmt +lib/ppx_tools/ast_mapper_class.cmti +lib/ppx_tools/ast_mapper_class.cmx +lib/ppx_tools/ast_mapper_class.ml +lib/ppx_tools/ast_mapper_class.mli +lib/ppx_tools/dumpast +lib/ppx_tools/dune-package +lib/ppx_tools/genlifter +lib/ppx_tools/metaquot/ppx.exe +lib/ppx_tools/metaquot/ppx_metaquot.a +lib/ppx_tools/metaquot/ppx_metaquot.cma +lib/ppx_tools/metaquot/ppx_metaquot.cmi +lib/ppx_tools/metaquot/ppx_metaquot.cmt +lib/ppx_tools/metaquot/ppx_metaquot.cmx +lib/ppx_tools/metaquot/ppx_metaquot.cmxa +lib/ppx_tools/metaquot/ppx_metaquot.cmxs +lib/ppx_tools/metaquot/ppx_metaquot.ml +lib/ppx_tools/opam +lib/ppx_tools/ppx_metaquot +lib/ppx_tools/ppx_tools.a +lib/ppx_tools/ppx_tools.cma +lib/ppx_tools/ppx_tools.cmxa +lib/ppx_tools/ppx_tools.cmxs +lib/ppx_tools/rewriter +@dir %%OCAML_SITELIBDIR%% diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile index 2d6134db0f6a..5b529d7135f2 100644 --- a/devel/ocaml-re/Makefile +++ b/devel/ocaml-re/Makefile @@ -1,6 +1,7 @@ PORTNAME= re PORTVERSION= 1.4.1 DISTVERSIONPREFIX= ${PKGNAMEPREFIX}${PORTNAME}- +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile index 85eb497b6ad1..8971d62d0851 100644 --- a/devel/ocaml-react/Makefile +++ b/devel/ocaml-react/Makefile @@ -1,5 +1,6 @@ PORTNAME= react PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://erratique.ch/software/react/releases/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-res/Makefile b/devel/ocaml-res/Makefile index e2a5e174f9a5..05f7fab8531b 100644 --- a/devel/ocaml-res/Makefile +++ b/devel/ocaml-res/Makefile @@ -1,5 +1,6 @@ PORTNAME= res PORTVERSION= 5.0.1 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -26,7 +27,7 @@ do-build: do-install: cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \ - --libdir=${OCAML_SITELIBDIR} + --libdir=${PREFIX}/${OCAML_SITELIBDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/devel/ocaml-result/Makefile b/devel/ocaml-result/Makefile index 286c161533eb..f4310ece2792 100644 --- a/devel/ocaml-result/Makefile +++ b/devel/ocaml-result/Makefile @@ -1,5 +1,6 @@ PORTNAME= result PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -18,7 +19,7 @@ USE_GITHUB= yes GH_ACCOUNT= janestreet ALL_TARGET= default -MAKE_ENV= LIBDIR=${OCAML_SITELIBDIR} +MAKE_ENV= LIBDIR=${PREFIX}/${OCAML_SITELIBDIR} OPTIONS_DEFINE= DOCS diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile index dc0f51c1b176..31ed832be273 100644 --- a/devel/ocaml-sdl/Makefile +++ b/devel/ocaml-sdl/Makefile @@ -1,6 +1,6 @@ PORTNAME= sdl PORTVERSION= 0.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= SF/ocaml${PORTNAME}/OCamlSDL/ocaml${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-sem/Makefile b/devel/ocaml-sem/Makefile index 2cccd7ed74cb..51887bf1ba48 100644 --- a/devel/ocaml-sem/Makefile +++ b/devel/ocaml-sem/Makefile @@ -1,6 +1,6 @@ PORTNAME= sem PORTVERSION= 0.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://ocaml-sem.sourceforge.net/files/ \ SF/ocaml-${PORTNAME}/${PORTNAME}/${PORTVERSION} diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile deleted file mode 100644 index 060c2505bc81..000000000000 --- a/devel/ocaml-sexplib/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -PORTNAME= sexplib -PORTVERSION= 113.00.00 -MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/${PORTVERSION:R}/files/ -CATEGORIES= devel -PKGNAMEPREFIX= ocaml- - -MAINTAINER= ports@FreeBSD.org -COMMENT= OCaml library for working with S-expressions -WWW= https://janestreet.github.io/ - -LICENSE= APACHE20 BSD3CLAUSE -LICENSE_COMB= multi -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 -BUILD_DEPENDS+= ${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num -RUN_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv - -OPTIONS_DEFINE= DOCS - -CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX} -HAS_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes -USE_OCAML= yes -USE_OCAML_FINDLIB= yes -USE_OCAML_CAMLP4= yes -USE_OCAMLFIND_PLIST= yes -USES= gmake - -DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} -OCAML_PKGDIRS= ${PORTNAME} ${PORTNAME}_num ${PORTNAME}_unix -PORTDOCS= * - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/sexplib*/*.cmxs - -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR}/ - cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES.md README.md ${STAGEDIR}${DOCSDIR}/ - -.include <bsd.port.mk> diff --git a/devel/ocaml-sexplib/distinfo b/devel/ocaml-sexplib/distinfo deleted file mode 100644 index 0ed067e03ae3..000000000000 --- a/devel/ocaml-sexplib/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (sexplib-113.00.00.tar.gz) = df91f1b4aae3936856cbb00a621a2c40f6b56c06670e1513b2b60698ab8240e4 -SIZE (sexplib-113.00.00.tar.gz) = 136960 diff --git a/devel/ocaml-sexplib/files/patch-lib_conv.ml b/devel/ocaml-sexplib/files/patch-lib_conv.ml deleted file mode 100644 index 60f5ec3cb17e..000000000000 --- a/devel/ocaml-sexplib/files/patch-lib_conv.ml +++ /dev/null @@ -1,54 +0,0 @@ ---- lib/conv.ml.orig 2015-08-18 11:17:27 UTC -+++ lib/conv.ml -@@ -92,9 +92,9 @@ let sexp_of_float_vec vec = - - let sexp_of_bigstring (bstr : bigstring) = - let n = Array1.dim bstr in -- let str = String.create n in -- for i = 0 to n - 1 do str.[i] <- bstr.{i} done; -- Atom str -+ let str = Bytes.create n in -+ for i = 0 to n - 1 do Bytes.set str i bstr.{i} done; -+ Atom (Bytes.unsafe_to_string str) - - let sexp_of_float32_vec (vec : float32_vec) = sexp_of_float_vec vec - let sexp_of_float64_vec (vec : float64_vec) = sexp_of_float_vec vec -@@ -183,7 +183,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 -@@ -194,7 +194,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 -@@ -203,13 +203,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-sexplib/files/patch-lib_lexer.mll b/devel/ocaml-sexplib/files/patch-lib_lexer.mll deleted file mode 100644 index f531544ee1df..000000000000 --- a/devel/ocaml-sexplib/files/patch-lib_lexer.mll +++ /dev/null @@ -1,29 +0,0 @@ ---- lib/lexer.mll.orig 2015-08-18 11:17:27 UTC -+++ lib/lexer.mll -@@ -54,7 +54,7 @@ - type t - val create : int -> t - val add_char : t -> char -> unit -- val add_substring : t -> string -> int -> int -> unit -+ val add_subbytes : t -> bytes -> int -> int -> unit - val add_lexeme : t -> lexbuf -> unit - val clear : t -> unit - val of_buffer : Buffer.t -> t -@@ -189,7 +189,7 @@ and scan_string buf start = parse - { - let ofs = lexbuf.lex_start_pos in - let len = lexbuf.lex_curr_pos - ofs in -- Quoted_string_buffer.add_substring buf lexbuf.lex_buffer ofs len; -+ Quoted_string_buffer.add_subbytes buf lexbuf.lex_buffer ofs len; - Quoted_string_buffer.add_lexeme buf lexbuf; - scan_string buf start lexbuf - } -@@ -294,7 +294,7 @@ and scan_block_comment buf locs = parse - let create n = {contents = Buffer.create n; lexeme = Buffer.create n} - let of_buffer contents = { contents; lexeme = Buffer.create 64 } - let add_char t ch = Buffer.add_char t.contents ch -- let add_substring t str ofs len = Buffer.add_substring t.contents str ofs len -+ let add_subbytes t str ofs len = Buffer.add_subbytes t.contents str ofs len - let add_lexeme t lexbuf = Buffer.add_string t.lexeme (Lexing.lexeme lexbuf) - let clear t = Buffer.clear t.lexeme; Buffer.clear t.contents - end diff --git a/devel/ocaml-sexplib/files/patch-lib_path.ml b/devel/ocaml-sexplib/files/patch-lib_path.ml deleted file mode 100644 index 551bbf75f2c8..000000000000 --- a/devel/ocaml-sexplib/files/patch-lib_path.ml +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/path.ml.orig 2015-08-18 11:17:27 UTC -+++ lib/path.ml -@@ -74,10 +74,10 @@ and subst_path sexp = function - - let implode lst = - let len = List.length lst in -- let str = String.create len in -+ let str = Bytes.create len in - let rec loop ix = function -- | h :: t -> str.[ix] <- h; loop (ix + 1) t -- | [] -> str in -+ | h :: t -> Bytes.set str ix h; loop (ix + 1) t -+ | [] -> Bytes.unsafe_to_string str in - loop 0 lst - - let fail_parse msg = failwith ("Path.parse: " ^ msg) diff --git a/devel/ocaml-sexplib/files/patch-lib_pre__sexp.ml b/devel/ocaml-sexplib/files/patch-lib_pre__sexp.ml deleted file mode 100644 index bbc40c44febb..000000000000 --- a/devel/ocaml-sexplib/files/patch-lib_pre__sexp.ml +++ /dev/null @@ -1,139 +0,0 @@ ---- lib/pre_sexp.ml.orig 2015-08-18 11:17:27 UTC -+++ lib/pre_sexp.ml -@@ -32,11 +32,11 @@ let must_escape str = - let esc_str str = - let estr = String.escaped str in - let elen = String.length estr in -- let res = String.create (elen + 2) in -+ let res = Bytes.create (elen + 2) in - String.blit estr 0 res 1 elen; -- res.[0] <- '"'; -- res.[elen + 1] <- '"'; -- res -+ Bytes.set res 0 '"'; -+ Bytes.set res (elen + 1) '"'; -+ Bytes.unsafe_to_string res - - let index_of_newline str start = - try Some (String.index_from str start '\n') -@@ -898,7 +898,7 @@ let mk_cont_parser cont_parse = (); fun _state str ~ma - PARSE state str ~max_pos ~pos - - MK_PARSER( -- string, String.length, parse_str, str.[pos], -+ string, String.length, parse_str, String.get str pos, - state.pstack, state.pstack <- pstack, - ,, - Atom pbuf_str, List sexp_lst, [], `Sexp -@@ -906,7 +906,6 @@ MK_PARSER( - - let parse = parse_str - -- - (* Annot parsers *) - - let get_glob_ofs parse_pos pos = -@@ -954,7 +953,7 @@ let mk_annot_list parse_state annot_lst pos = - let init_annot_pstate () = { Annot.positions = []; stack = [] } - - MK_PARSER( -- string, String.length, parse_str_annot, str.[pos], -+ string, String.length, parse_str_annot, String.get str pos, - state.pstack.Annot.stack, state.pstack.Annot.stack <- pstack, - add_annot_pos state pos;,add_annot_pos1 state pos;, - mk_annot_atom state pbuf_str pos, mk_annot_list state sexp_lst pos, -@@ -995,11 +994,11 @@ let mk_this_parse ?parse_pos my_parse = (); fun ~pos ~ - my_parse ?parse_pos:(Some parse_pos) ?len:(Some len) str - - let gen_input_sexp my_parse ?parse_pos ic = -- let buf = String.create 1 in -+ let buf = Bytes.create 1 in - let rec loop this_parse = - let c = input_char ic in -- buf.[0] <- c; -- match this_parse ~pos:0 ~len:1 buf with -+ Bytes.set buf 0 c; -+ match this_parse ~pos:0 ~len:1 (Bytes.unsafe_to_string buf) with - | Done (sexp, _) -> sexp - | Cont (_, this_parse) -> loop this_parse - in -@@ -1007,12 +1006,12 @@ let gen_input_sexp my_parse ?parse_pos ic = - - let input_sexp ?parse_pos ic = gen_input_sexp parse ?parse_pos ic - --let gen_input_rev_sexps my_parse ?parse_pos ?(buf = String.create 8192) ic = -+let gen_input_rev_sexps my_parse ?parse_pos ?(buf = Bytes.create 8192) ic = - let rev_sexps_ref = ref [] in -- let buf_len = String.length buf in -+ let buf_len = Bytes.length buf in - let rec loop this_parse ~pos ~len ~cont_state = - if len > 0 then -- match this_parse ~pos ~len buf with -+ match this_parse ~pos ~len (Bytes.unsafe_to_string buf) with - | Done (sexp, ({ Parse_pos.buf_pos; _ } as parse_pos)) -> - rev_sexps_ref := sexp :: !rev_sexps_ref; - let n_parsed = buf_pos - pos in -@@ -1073,9 +1072,9 @@ let of_string str = - of_string_bigstring "of_string" parse " " String.length String.sub str - - let get_bstr_sub_str bstr pos len = -- let str = String.create len in -- for i = 0 to len - 1 do str.[i] <- bstr.{pos + i} done; -- str -+ let str = Bytes.create len in -+ for i = 0 to len - 1 do Bytes.set str i (bstr.{pos + i}) done; -+ Bytes.unsafe_to_string str - - let bstr_ws_buf = Array1.create char c_layout 1 - let () = bstr_ws_buf.{0} <- ' ' -@@ -1101,8 +1100,8 @@ let load_sexps ?buf file = List.rev (load_rev_sexps ?b - - let gen_load_sexp_loc = "Sexplib.Sexp.gen_load_sexp" - --let gen_load_sexp my_parse ?(strict = true) ?(buf = String.create 8192) file = -- let buf_len = String.length buf in -+let gen_load_sexp my_parse ?(strict = true) ?(buf = Bytes.create 8192) file = -+ let buf_len = Bytes.length buf in - let ic = open_in file in - let rec loop this_parse ~cont_state = - let len = input ic buf 0 buf_len in -@@ -1111,10 +1110,10 @@ let gen_load_sexp my_parse ?(strict = true) ?(buf = St - sprintf "%s: EOF in %s while in state %s" - gen_load_sexp_loc file (Cont_state.to_string cont_state)) - else -- match this_parse ~pos:0 ~len buf with -+ match this_parse ~pos:0 ~len (Bytes.unsafe_to_string buf) with - | Done (sexp, ({ Parse_pos.buf_pos; _ } as parse_pos)) when strict -> - let rec strict_loop this_parse ~pos ~len = -- match this_parse ~pos ~len buf with -+ match this_parse ~pos ~len (Bytes.unsafe_to_string buf) with - | Done _ -> - failwith ( - sprintf "%s: more than one S-expression in file %s" -@@ -1186,7 +1185,7 @@ module Annotated = struct - Of_sexp_error (Annot.Conv_exn (loc, exc), get_sexp annot_sexp) - end - --let load_sexp_conv ?(strict = true) ?(buf = String.create 8192) file f = -+let load_sexp_conv ?(strict = true) ?(buf = Bytes.create 8192) file f = - let sexp = load_sexp ~strict ~buf file in - try `Result (f sexp) - with Of_sexp_error _ -> -@@ -1200,7 +1199,7 @@ let raise_conv_exn ~file = function - let load_sexp_conv_exn ?strict ?buf file f = - raise_conv_exn ~file (load_sexp_conv ?strict ?buf file f) - --let load_sexps_conv ?(buf = String.create 8192) file f = -+let load_sexps_conv ?(buf = Bytes.create 8192) file f = - let rev_sexps = load_rev_sexps ~buf file in - try List.rev_map (fun sexp -> `Result (f sexp)) rev_sexps - with Of_sexp_error _ as e -> -@@ -1212,7 +1211,7 @@ let load_sexps_conv ?(buf = String.create 8192) file f - List.rev_map (fun annot_sexp -> Annotated.conv f annot_sexp) - rev_annot_sexps - --let load_sexps_conv_exn ?(buf = String.create 8192) file f = -+let load_sexps_conv_exn ?(buf = Bytes.create 8192) file f = - let rev_sexps = load_rev_sexps ~buf file in - try List.rev_map f rev_sexps - with Of_sexp_error _ as e -> diff --git a/devel/ocaml-sexplib/files/patch-lib_sexp__intf.ml b/devel/ocaml-sexplib/files/patch-lib_sexp__intf.ml deleted file mode 100644 index 725cdd7d5138..000000000000 --- a/devel/ocaml-sexplib/files/patch-lib_sexp__intf.ml +++ /dev/null @@ -1,133 +0,0 @@ ---- lib/sexp_intf.ml.orig 2015-08-18 11:17:27 UTC -+++ lib/sexp_intf.ml -@@ -192,12 +192,12 @@ module type S = sig - annotated S-expression instead. *) - - val input_sexps : -- ?parse_pos : Parse_pos.t -> ?buf : string -> in_channel -> t list -+ ?parse_pos : Parse_pos.t -> ?buf : bytes -> in_channel -> t list - (** [input_sexps ?parse_pos ?buf ic] like {!input_sexps}, but returns - a list of annotated S-expressions. *) - - val input_rev_sexps : -- ?parse_pos : Parse_pos.t -> ?buf : string -> in_channel -> t list -+ ?parse_pos : Parse_pos.t -> ?buf : bytes -> in_channel -> t list - (** [input_sexps ?parse_pos ?buf ic] like {!input_rev_sexps}, but - returns a list of annotated S-expressions. *) - -@@ -207,15 +207,15 @@ module type S = sig - (** NOTE: these functions should only be used if an annotated S-expression - is required. *) - -- val load_sexp : ?strict : bool -> ?buf : string -> string -> t -+ val load_sexp : ?strict : bool -> ?buf : bytes -> string -> t - (** [load_sexp ?strict ?buf file] like {!load_sexp}, but returns an - annotated S-expression. *) - -- val load_sexps : ?buf : string -> string -> t list -+ val load_sexps : ?buf : bytes -> string -> t list - (** [load_sexps ?buf file] like {!load_sexps}, but returns a list of - annotated S-expressions. *) - -- val load_rev_sexps : ?buf : string -> string -> t list -+ val load_rev_sexps : ?buf : bytes -> string -> t list - (** [load_rev_sexps ?buf file] like {!load_rev_sexps}, but returns a - list of annotated S-expressions. *) - -@@ -311,7 +311,7 @@ module type S = sig - *) - - val input_sexps : -- ?parse_pos : Parse_pos.t -> ?buf : string -> in_channel -> t list -+ ?parse_pos : Parse_pos.t -> ?buf : bytes -> in_channel -> t list - (** [input_sexps ?parse_pos ?buf ic] parses whitespace separated - S-expressions from input channel [ic] until EOF is reached. Faster than - the scan-functions. -@@ -320,7 +320,7 @@ module type S = sig - *) - - val input_rev_sexps : -- ?parse_pos : Parse_pos.t -> ?buf : string -> in_channel -> t list -+ ?parse_pos : Parse_pos.t -> ?buf : bytes -> in_channel -> t list - (** [input_rev_sexps ?parse_pos ?buf ic] same as {!Sexp.input_sexps}, - but returns a reversed list of S-expressions, which is slightly more - efficient. *) -@@ -328,7 +328,7 @@ module type S = sig - - (** {6 Loading of (converted) S-expressions} *) - -- val load_sexp : ?strict : bool -> ?buf : string -> string -> t -+ val load_sexp : ?strict : bool -> ?buf : bytes -> string -> t - (** [load_sexp ?strict ?buf file] reads one S-expression from [file] using - buffer [buf] for storing intermediate data. Faster than the - scan-functions. -@@ -344,7 +344,7 @@ module type S = sig - @param strict default = [true] - *) - -- val load_sexps : ?buf : string -> string -> t list -+ val load_sexps : ?buf : bytes -> string -> t list - (** [load_sexps ?buf file] reads a list of whitespace separated S-expressions - from [file] using buffer [buf] for storing intermediate data. - Faster than the scan-functions. -@@ -355,12 +355,12 @@ module type S = sig - S-expression could be fully read. - *) - -- val load_rev_sexps : ?buf : string -> string -> t list -+ val load_rev_sexps : ?buf : bytes -> string -> t list - (** [load_rev_sexps ?buf file] same as {!Sexp.load_sexps}, but returns a - reversed list of S-expressions, which is slightly more efficient. *) - - val load_sexp_conv : -- ?strict : bool -> ?buf : string -> string -> (t -> 'a) -> 'a Annotated.conv -+ ?strict : bool -> ?buf : bytes -> string -> (t -> 'a) -> 'a Annotated.conv - (** [load_sexp_conv ?strict ?buf file f] like {!Sexp.load_sexp}, but - performs a conversion on the fly using [f]. Performance is equivalent - to executing {!Sexp.load_sexp} and performing conversion when there -@@ -375,13 +375,13 @@ module type S = sig - *) - - val load_sexp_conv_exn : -- ?strict : bool -> ?buf : string -> string -> (t -> 'a) -> 'a -+ ?strict : bool -> ?buf : bytes -> string -> (t -> 'a) -> 'a - (** [load_sexp_conv_exn ?strict ?buf file f] like {!load_sexp_conv}, - but returns the converted value or raises [Of_sexp_error] with exact - location information in the case of a conversion error. *) - - val load_sexps_conv : -- ?buf : string -> string -> (t -> 'a) -> 'a Annotated.conv list -+ ?buf : bytes -> string -> (t -> 'a) -> 'a Annotated.conv list - (** [load_sexps_conv ?buf file f] like {!Sexp.load_sexps}, but performs - a conversion on the fly using [f]. Performance is equivalent to - executing {!Sexp.load_sexps} and performing conversion when there -@@ -395,7 +395,7 @@ module type S = sig - S-expression could be fully read. - *) - -- val load_sexps_conv_exn : ?buf : string -> string -> (t -> 'a) -> 'a list -+ val load_sexps_conv_exn : ?buf : bytes -> string -> (t -> 'a) -> 'a list - (** [load_sexps_conv_exn ?buf file f] like {!load_sexps_conv}, but returns - the converted value or raises [Of_sexp_error] with exact location - information in the case of a conversion error. *) -@@ -611,14 +611,16 @@ module type S = sig - type pos = Src_pos.Relative.t = { row : int; col : int } - val sexp_of_pos : pos -> Type.t - -- (** S-expressions annotated with relative source positions and comments *) -- type t = -+ (** S-expressions annotated with relative source positions and comments. All the -+ positions are relative to the opening paren of the enclosing list, or the first -+ character of the file. *) -+ type t = Type_with_layout.t = - | Atom of pos * string * string option (* second is quoted representation *) - | List of pos * t_or_comment list * pos (* positions of left and right parens *) -- and t_or_comment = -+ and t_or_comment = Type_with_layout.t_or_comment = - | Sexp of t - | Comment of comment -- and comment = -+ and comment = Type_with_layout.comment = - | Plain_comment of pos * string (* line or block comment *) - | Sexp_comment of pos * comment list * t (* position of #; *) - diff --git a/devel/ocaml-sexplib0/Makefile b/devel/ocaml-sexplib0/Makefile new file mode 100644 index 000000000000..7d55d297d57e --- /dev/null +++ b/devel/ocaml-sexplib0/Makefile @@ -0,0 +1,47 @@ +PORTNAME= sexplib0 +DISTVERSIONPREFIX= v +DISTVERSION= 0.16.0 +CATEGORIES= devel +PKGNAMEPREFIX= ocaml- + +MAINTAINER= ports@FreeBSD.org +COMMENT= OCaml library for working with S-expressions +WWW= https://janestreet.github.io/ + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +BUILD_DEPENDS= dune:devel/ocaml-dune \ + ocaml-type_conv>=0:devel/ocaml-type_conv \ + ${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num +RUN_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv + +USES= gmake +ALL_TARGET= default +USE_OCAML= yes +USE_OCAML_FINDLIB= yes +USE_OCAML_CAMLP4= yes +USE_OCAMLFIND_PLIST= yes +CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX} + +USE_GITHUB= yes +GH_ACCOUNT= janestreet + +OPTIONS_DEFINE= DOCS + +DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} +OCAML_PKGDIRS= ${PORTNAME} ${PORTNAME}_num ${PORTNAME}_unix +PORTDOCS= * + +do-install: + cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \ + --prefix=${PREFIX} --libdir=${PREFIX}/${OCAML_SITELIBDIR} + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/sexplib*/*.cmxs + +#post-install-DOCS-on: +# ${MKDIR} ${STAGEDIR}${DOCSDIR}/ +# cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES.md README.md ${STAGEDIR}${DOCSDIR}/ + +.include <bsd.port.mk> diff --git a/devel/ocaml-sexplib0/distinfo b/devel/ocaml-sexplib0/distinfo new file mode 100644 index 000000000000..f0c29bf06cc6 --- /dev/null +++ b/devel/ocaml-sexplib0/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1684854162 +SHA256 (janestreet-sexplib0-v0.16.0_GH0.tar.gz) = 73002106488074187a174992da6e76f36f543e6daa80dbf6039a3e10e46adc80 +SIZE (janestreet-sexplib0-v0.16.0_GH0.tar.gz) = 22171 diff --git a/devel/ocaml-sexplib/pkg-descr b/devel/ocaml-sexplib0/pkg-descr index a2df5b5460c5..a2df5b5460c5 100644 --- a/devel/ocaml-sexplib/pkg-descr +++ b/devel/ocaml-sexplib0/pkg-descr diff --git a/devel/ocaml-topkg/Makefile b/devel/ocaml-topkg/Makefile index ba99951bccc4..62093b947d61 100644 --- a/devel/ocaml-topkg/Makefile +++ b/devel/ocaml-topkg/Makefile @@ -1,5 +1,6 @@ PORTNAME= topkg PORTVERSION= 1.0.7 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://erratique.ch/software/topkg/releases/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-type_conv/Makefile b/devel/ocaml-type_conv/Makefile index 35902c0ed821..03ac03fdc094 100644 --- a/devel/ocaml-type_conv/Makefile +++ b/devel/ocaml-type_conv/Makefile @@ -1,5 +1,6 @@ PORTNAME= type_conv PORTVERSION= 113.00.02 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/${PORTVERSION:R}/files/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-uchar/Makefile b/devel/ocaml-uchar/Makefile index 08f876d65fb4..5eddd32d3cf4 100644 --- a/devel/ocaml-uchar/Makefile +++ b/devel/ocaml-uchar/Makefile @@ -1,6 +1,6 @@ PORTNAME= uchar PORTVERSION= 0.0.2 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-ulex/Makefile b/devel/ocaml-ulex/Makefile index 8e675f0d2fd3..9b5b8720afad 100644 --- a/devel/ocaml-ulex/Makefile +++ b/devel/ocaml-ulex/Makefile @@ -1,6 +1,6 @@ PORTNAME= ulex PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.cduce.org/download/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-uutf/Makefile b/devel/ocaml-uutf/Makefile index ea83555ea122..03b036ad8d82 100644 --- a/devel/ocaml-uutf/Makefile +++ b/devel/ocaml-uutf/Makefile @@ -1,5 +1,6 @@ PORTNAME= uutf PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://erratique.ch/software/uutf/releases/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-xstr/Makefile b/devel/ocaml-xstr/Makefile index cd64c0f4e229..a9ecefc747bb 100644 --- a/devel/ocaml-xstr/Makefile +++ b/devel/ocaml-xstr/Makefile @@ -1,6 +1,6 @@ PORTNAME= xstr PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-xstrp4/Makefile b/devel/ocaml-xstrp4/Makefile index bb06caddbb28..0c9e0cc61044 100644 --- a/devel/ocaml-xstrp4/Makefile +++ b/devel/ocaml-xstrp4/Makefile @@ -1,5 +1,6 @@ PORTNAME= xstrp4 PORTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- diff --git a/devel/omake/Makefile b/devel/omake/Makefile index aa6efafc6b00..3358ec1e3e3a 100644 --- a/devel/omake/Makefile +++ b/devel/omake/Makefile @@ -1,5 +1,6 @@ PORTNAME= omake DISTVERSION= 0.10.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ diff --git a/ftp/ocaml-ocurl/Makefile b/ftp/ocaml-ocurl/Makefile index 6d23ce9a34bb..08bced3c5d90 100644 --- a/ftp/ocaml-ocurl/Makefile +++ b/ftp/ocaml-ocurl/Makefile @@ -1,5 +1,6 @@ PORTNAME= ocurl PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= ftp PKGNAMEPREFIX= ocaml- diff --git a/games/freetennis/Makefile b/games/freetennis/Makefile index 7ffb31cc0c8a..2a32fd67755f 100644 --- a/games/freetennis/Makefile +++ b/games/freetennis/Makefile @@ -1,6 +1,6 @@ PORTNAME= freetennis PORTVERSION= 0.4.8 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= games MASTER_SITES= SF diff --git a/graphics/ocaml-cairo/Makefile b/graphics/ocaml-cairo/Makefile index 1285f883c22d..a5068dbdefcf 100644 --- a/graphics/ocaml-cairo/Makefile +++ b/graphics/ocaml-cairo/Makefile @@ -1,5 +1,5 @@ PORTNAME= cairo -PORTVERSION= 0.6.1 +PORTVERSION= 0.6.4 CATEGORIES= graphics PKGNAMEPREFIX= ocaml- @@ -32,7 +32,7 @@ do-build: do-install: cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \ - --libdir=${OCAML_SITELIBDIR} cairo2 + --libdir=${PREFIX}/${OCAML_SITELIBDIR} cairo2 post-install-EXAMPLES-on: @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) diff --git a/graphics/ocaml-cairo/distinfo b/graphics/ocaml-cairo/distinfo index 47a0b8e02d71..ea937e96bed4 100644 --- a/graphics/ocaml-cairo/distinfo +++ b/graphics/ocaml-cairo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669022120 -SHA256 (Chris00-ocaml-cairo-0.6.1_GH0.tar.gz) = 2d4492b62b31e714a7a98fcf54b98a46ae5f6430ebc7f1620568a9a28498ad11 -SIZE (Chris00-ocaml-cairo-0.6.1_GH0.tar.gz) = 109786 +TIMESTAMP = 1684362477 +SHA256 (Chris00-ocaml-cairo-0.6.4_GH0.tar.gz) = 4be272a05a5d5282fc45cac8a560ea082b8fad4896bf7466173cc88af4bfbde8 +SIZE (Chris00-ocaml-cairo-0.6.4_GH0.tar.gz) = 110090 diff --git a/graphics/ocaml-cairo/files/patch-issue-19 b/graphics/ocaml-cairo/files/patch-issue-19 deleted file mode 100644 index 23a1a684d73e..000000000000 --- a/graphics/ocaml-cairo/files/patch-issue-19 +++ /dev/null @@ -1,64 +0,0 @@ -From 3c70f2ff18650c4794556049cd4ea22a58cc719e Mon Sep 17 00:00:00 2001 -From: Christophe Troestler <Christophe.Troestler@umons.ac.be> -Date: Sun, 27 Sep 2020 23:20:52 +0200 -Subject: [PATCH] Do not store the Caml_ba_array_val pointer during surface - creation - -Fixes https://github.com/Chris00/ocaml-cairo/issues/19 ---- - src/cairo_stubs.c | 3 ++- - tests/image_create.ml | 5 +++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/cairo_stubs.c b/src/cairo_stubs.c -index 641ee2c..200abf3 100644 ---- src/cairo_stubs.c -+++ src/cairo_stubs.c -@@ -1580,6 +1580,7 @@ static cairo_status_t caml_cairo_image_bigarray_attach_proxy - caml_cairo_image_bigarray_finalize); - } - -+#define b (Caml_ba_array_val(vb)) - #define SURFACE_CREATE_DATA(name) \ - CAMLexport value caml_cairo_image_surface_create_for_##name \ - (value vb, value vformat, value vwidth, value vheight, value vstride) \ -@@ -1588,7 +1589,6 @@ static cairo_status_t caml_cairo_image_bigarray_attach_proxy - CAMLlocal1(vsurf); \ - cairo_surface_t* surf; \ - const int width = Int_val(vwidth); \ -- struct caml_ba_array *b = Caml_ba_array_val(vb); \ - cairo_status_t status; \ - \ - if ((b->flags & CAML_BA_MANAGED_MASK) == CAML_BA_MAPPED_FILE) \ -@@ -1610,6 +1610,7 @@ static cairo_status_t caml_cairo_image_bigarray_attach_proxy - - SURFACE_CREATE_DATA(data8) - SURFACE_CREATE_DATA(data32) -+#undef b - - #define SURFACE_GET_DATA(type, num_dims, dims ...) \ - CAMLexport value caml_cairo_image_surface_get_##type(value vsurf) \ -diff --git a/tests/image_create.ml b/tests/image_create.ml -index eec98d6..b13c206 100644 ---- tests/image_create.ml -+++ tests/image_create.ml -@@ -10,6 +10,7 @@ let create() = - - let () = - let cr = create() in -+ printf "With Cairo handle:\n%!"; - set_source_rgb cr 1. 1. 1.; - rectangle cr 0. 0. ~w:300. ~h:300.; - fill cr; -@@ -21,9 +22,9 @@ let () = - show_text cr "Hello"; - Gc.compact(); Gc.compact(); - -- eprintf "Write image\n%!"; -+ eprintf "- Write image\n%!"; - PNG.write (get_target cr) "test_image.png"; -- eprintf "Finish surface\n%!"; -+ eprintf "- Finish surface\n%!"; - Surface.finish (get_target cr); - Gc.compact() - diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index 4e049cb5ccf4..44c1f949d714 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -1,6 +1,6 @@ PORTNAME= images PORTVERSION= 4.0.1 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/camlspotter/camlimages/get/ diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile index 804993ce3821..d42088005a9f 100644 --- a/graphics/ocaml-lablgl/Makefile +++ b/graphics/ocaml-lablgl/Makefile @@ -1,6 +1,6 @@ PORTNAME= lablgl PORTVERSION= 1.05 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \ diff --git a/lang/mtasc/Makefile b/lang/mtasc/Makefile index 8eadd5390a7b..3c608a23d524 100644 --- a/lang/mtasc/Makefile +++ b/lang/mtasc/Makefile @@ -1,6 +1,6 @@ PORTNAME= mtasc PORTVERSION= 1.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang www MASTER_SITES= LOCAL/chinsan diff --git a/lang/ocaml-autoconf/Makefile b/lang/ocaml-autoconf/Makefile index c627161f798f..09c8976248de 100644 --- a/lang/ocaml-autoconf/Makefile +++ b/lang/ocaml-autoconf/Makefile @@ -1,5 +1,6 @@ PORTNAME= autoconf PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/181/ PKGNAMEPREFIX= ocaml- diff --git a/lang/ocaml-camlidl/Makefile b/lang/ocaml-camlidl/Makefile index 2773138b45d1..a1b50fc5dda7 100644 --- a/lang/ocaml-camlidl/Makefile +++ b/lang/ocaml-camlidl/Makefile @@ -1,6 +1,6 @@ PORTNAME= camlidl PORTVERSION= 1.05 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/ PKGNAMEPREFIX= ocaml- diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index c8209d389aa6..3e4b22ddb1dc 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,7 +1,7 @@ # for committer: bump PORTREVISION for math/facile whenever ocaml gets updated PORTNAME= ocaml -PORTVERSION= 4.07.1 +PORTVERSION= 4.08.1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \ http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs @@ -30,12 +30,11 @@ RUN_DEPENDS= as:devel/binutils USES= cpe compiler:c11 gmake shebangfix tar:xz USE_LDCONFIG= yes CPE_VENDOR= inria -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes ALL_TARGET= world.opt STRIP= PIE_UNSAFE= yes SSP_UNSAFE= yes -MAKE_JOBS_UNSAFE= yes LDFLAGS_armv6= -Wl,-znotext LDFLAGS_armv7= -Wl,-znotext LDFLAGS_i386= -Wl,-znotext @@ -45,56 +44,45 @@ awk_OLD_CMD= /bin/awk awk_CMD= /usr/bin/awk SHEBANG_FILES= tools/ocaml-instr-graph tools/ocaml-instr-report -CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \ - -cc "${CC}" \ - -aspp "${CC} -c" \ - -partialld "${LD} -r" +CONFIGURE_ARGS= --prefix="${PREFIX}" +CONFIGURE_ENV= CC="${CC}" \ + LDFLAGS="${LDFLAGS}" \ + ASPP="${CC} -c" \ + PARTIALLD="${LD} -r" +MAKE_ENV= SYSTEM_ARCH="${ARCH}" OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES OPTIONS_DEFAULT=X11 THREADS +OPTIONS_SUB= yes + +THREADS_CONFIGURE_ENABLE= systhreads + +X11_USES= xorg +X11_CONFLICTS= ocaml-nox11 +X11_CONFLICTS_OFF= ocaml +X11_USE= XORG=x11 +X11_CONFIGURE_WITH= x +X11_CONFIGURE_ON= --x-includes="${LOCALBASE}/include" \ + --x-libraries="${LOCALBASE}/lib" + CONFLICTS= metaocaml -PORTDOCS= htmlman ${DISTNAME:R}-refman.ps.gz ${DISTNAME:R}-refman.pdf +PORTDOCS= htmlman ${DISTNAME:R}-refman.pdf DOCS_DISTFILES= ${DISTNAME:R}-refman-html.tar.gz:docs \ - ${DISTNAME:R}-refman.ps.gz:docs \ ${DISTNAME:R}-refman.pdf:docs -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> .if ${ARCH} == armv6 || ${ARCH} == armv7 -CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS} -meabi=5" +CONFIGURE_ENV+= AS="${AS} ${ASFLAGS} -meabi=5" .elif ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le LLD_UNSAFE= yes .else -CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS}" -.endif - -.if ${PORT_OPTIONS:MTHREADS} -PLIST_SUB+= THREADS="" -THR_LD= -lpthread -.else -PLIST_SUB+= THREADS="@comment " -THR_LD= #empty -CONFIGURE_ARGS+=-no-pthread +CONFIGURE_ENV+= AS="${AS} ${ASFLAGS}" .endif -.if ${PORT_OPTIONS:MX11} -PLIST_SUB+= X11="" -USES+= xorg -USE_XORG= x11 -CONFLICTS+= ocaml-nox11 -CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib -.else -PLIST_SUB+= X11="@comment " -SFX= -nox11 -CONFLICTS+= ocaml -CONFIGURE_ARGS+=-no-graph -.endif - -.include <bsd.port.pre.mk> - .if defined(NO_PROFILE) || ${ARCH:Mpowerpc} || ${ARCH:Mamd64} PLIST_SUB+= PROF="@comment " .else @@ -113,15 +101,9 @@ post-patch: ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \ ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tools \ - ${WRKSRC}/asmrun/Makefile \ + ${WRKSRC}/runtime/Makefile \ ${WRKSRC}/ocamltest/Makefile \ - ${WRKSRC}/otherlibs/systhreads/Makefile \ - ${WRKSRC}/testsuite/tests/asmgen/Makefile - -post-configure: - @${REINPLACE_CMD} -E \ - -e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \ - ${WRKSRC}/config/Makefile + ${WRKSRC}/otherlibs/systhreads/Makefile check-test: do-install @cd ${WRKSRC}/testsuite; ${RM} _log; for d in tests/* ; do \ @@ -133,7 +115,6 @@ post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR}) - ${INSTALL_DATA} ${_DISTDIR}${DISTNAME:R}-refman.ps.gz ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DISTDIR}${DISTNAME:R}-refman.pdf ${STAGEDIR}${DOCSDIR} .endif # Spacetime profiling is only available for native code on 64-bit targets diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 0d6fce398705..d4fc1a4d65cf 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,9 +1,7 @@ -TIMESTAMP = 1538663036 -SHA256 (ocaml-4.07.1.tar.xz) = dfe48b1da31da9c82d77612582fae74c80e8d1ac650e1c24f5ac9059e48307b8 -SIZE (ocaml-4.07.1.tar.xz) = 2935928 -SHA256 (ocaml-4.07-refman-html.tar.gz) = 6d97c1131a281aab57593602a19b2b4714dbf2663d513ae63abce2e5c02e8db8 -SIZE (ocaml-4.07-refman-html.tar.gz) = 1003312 -SHA256 (ocaml-4.07-refman.ps.gz) = e487b397548f54e279c9d9055611eaf05d812e14240a4c6a8d334a5e4549c99d -SIZE (ocaml-4.07-refman.ps.gz) = 1300498 -SHA256 (ocaml-4.07-refman.pdf) = 99bfa85aefa0ee7a8be1f24a270fc5d778bb077cbc4e75282f69c479acf1e707 -SIZE (ocaml-4.07-refman.pdf) = 1863450 +TIMESTAMP = 1681369878 +SHA256 (ocaml-4.08.1.tar.xz) = cd4f180453ffd7cc6028bb18954b3d7c3f715af13157df2f7c68bdfa07655ea3 +SIZE (ocaml-4.08.1.tar.xz) = 3382960 +SHA256 (ocaml-4.08-refman-html.tar.gz) = 7e27bfb9e45b1618ab7c8461cb6c6244b006125593475c87ba49dd09746b5e77 +SIZE (ocaml-4.08-refman-html.tar.gz) = 1704609 +SHA256 (ocaml-4.08-refman.pdf) = 805f5128a99a180be0e2f11c28ddbd92af3cf48965669f67407353750e272a68 +SIZE (ocaml-4.08-refman.pdf) = 2161226 diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure index df53ede3357f..2cf280415341 100644 --- a/lang/ocaml/files/patch-configure +++ b/lang/ocaml/files/patch-configure @@ -1,77 +1,100 @@ ---- configure.orig 2017-07-13 08:56:44 UTC +--- configure.orig 2019-08-05 17:32:44 UTC +++ configure -@@ -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;; - i686-*-kfreebsd*) natdynlink=true;; - x86_64-*-kfreebsd*) natdynlink=true;; - x86_64-*-dragonfly*) 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 +@@ -9857,7 +9857,7 @@ fi -@@ -921,6 +923,10 @@ case "$target" in - powerpc*-*-linux*) arch=power; - if $arch64; then model=ppc64; else model=ppc; fi - system=elf;; -+ powerpc64le*-*-freebsd*) arch=power; model=ppc64le; system=bsd_elf;; -+ powerpc*-*-freebsd*) arch=power; -+ if $arch64; then model=ppc64; else model=ppc; fi -+ system=bsd_elf;; - powerpc-*-netbsd*) arch=power; model=ppc; system=netbsd;; - powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; - s390x*-*-linux*) arch=s390x; model=z10; system=elf;; -@@ -930,6 +936,7 @@ case "$target" in - armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;; - armv6*-*-linux-gnueabi) arch=arm; model=armv6; system=linux_eabi;; - armv6*-*-freebsd*) arch=arm; model=armv6; system=freebsd;; -+ armv7*-*-freebsd*) arch=arm; model=armv7; system=freebsd;; - earmv6*-*-netbsd*) arch=arm; model=armv6; system=netbsd;; - earmv7*-*-netbsd*) arch=arm; model=armv7; system=netbsd;; - armv5te*-*-linux-gnueabi) arch=arm; model=armv5te; system=linux_eabi;; -@@ -946,6 +953,7 @@ case "$target" in - x86_64-*-darwin*) arch=amd64; system=macosx;; - x86_64-*-mingw*) arch=amd64; system=mingw;; - aarch64-*-linux*) arch=arm64; system=linux;; -+ aarch64-*-freebsd*) arch=arm64; system=freebsd;; - x86_64-*-cygwin*) arch=amd64; system=cygwin;; + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $LDFLAGS $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no +@@ -13342,7 +13342,7 @@ esac ;; #( + *-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\ + |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*) : + sharedlib_cflags="-fPIC" +- mksharedlib="$CC -shared" ++ mksharedlib="$CC -shared $LDFLAGS" + oc_ldflags="$oc_ldflags -Wl,-E" + rpath="-Wl,-rpath," + mksharedlibrpath="-Wl,-rpath," +@@ -13385,6 +13385,8 @@ fi ;; #( + natdynlink=true ;; #( + powerpc*-*-linux*) : + natdynlink=true ;; #( ++ powerpc*-*-freebsd*) : ++ natdynlink=true ;; #( + i686-*-kfreebsd*) : + natdynlink=true ;; #( + x86_64-*-kfreebsd*) : +@@ -13395,6 +13397,8 @@ fi ;; #( + natdynlink=true ;; #( + x86_64-*-freebsd*) : + natdynlink=true ;; #( ++ amd64-*-freebsd*) : ++ natdynlink=true ;; #( + i[3456]86-*-openbsd*) : + natdynlink=true ;; #( + x86_64-*-openbsd*) : +@@ -13415,6 +13419,8 @@ fi ;; #( + natdynlink=true ;; #( + aarch64-*-linux*) : + natdynlink=true ;; #( ++ aarch64-*-freebsd*) : ++ natdynlink=true ;; #( + *) : + ;; esac - -@@ -1086,10 +1094,13 @@ case "$arch,$system" in - i386,macosx) profiling='true';; - 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';; -+ arm64,freebsd) profiling='true';; -+ arm,freebsd) profiling='true';; - arm,linux*) profiling='true';; - power,elf) profiling='true';; - power,bsd*) profiling='true';; -@@ -2029,7 +2037,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 --config ARCH "$arch" -+config SYSTEM_ARCH "$arch" - config MODEL "$model" - config SYSTEM "$system" - config OCAMLOPT_CFLAGS "$common_cflags" -@@ -2112,7 +2122,7 @@ config NATDYNLINK "$natdynlink" - config CMXS "$cmxs" - config MKEXE "$mkexe" - config MKEXEDEBUGFLAG "$mkexedebugflag" --config MKDLL "$mksharedlib" -+config MKDLL "$mksharedlib \$(LDFLAGS)" - config MKMAINDLL "$mkmaindll" - config RUNTIMED "${debugruntime}" - config RUNTIMEI "${with_instrumented_runtime}" +@@ -13488,6 +13494,14 @@ fi; system=elf ;; #( + else + model=ppc + fi; system=elf ;; #( ++ powerpc64le*-*-freebsd*) : ++ arch=power; model=ppc64le; system=bsd_elf;; #( ++ powerpc*-*-freebsd*) : ++ arch=power; if $arch64; then : ++ model=ppc64 ++else ++ model=ppc ++fi; system=bsd_elf ;; #( + powerpc-*-netbsd*) : + arch=power; model=ppc; system=netbsd ;; #( + powerpc-*-openbsd*) : +@@ -13510,6 +13524,8 @@ fi; system=elf ;; #( + arch=arm; model=armv6; system=linux_eabi ;; #( + armv6*-*-freebsd*) : + arch=arm; model=armv6; system=freebsd ;; #( ++ armv7*-*-freebsd*) : ++ arch=arm; model=armv7; system=freebsd ;; #( + earmv6*-*-netbsd*) : + arch=arm; model=armv6; system=netbsd ;; #( + earmv7*-*-netbsd*) : +@@ -13544,6 +13560,8 @@ fi; system=elf ;; #( + arch=amd64; system=mingw64 ;; #( + aarch64-*-linux*) : + arch=arm64; system=linux ;; #( ++ aarch64-*-freebsd*) : ++ arch=arm64; system=freebsd ;; #( + x86_64-*-cygwin*) : + arch=amd64; system=cygwin + ;; #( +@@ -13714,6 +13732,8 @@ case "$arch,$system" in #( + profiling=true ;; #( + amd64,openbsd) : + profiling=true ;; #( ++ amd64,dragonfly) : ++ profiling=true ;; #( + amd64,freebsd) : + profiling=true ;; #( + amd64,netbsd) : +@@ -13721,6 +13741,10 @@ case "$arch,$system" in #( + arm,netbsd) : + profiling=true ;; #( + amd64,gnu) : ++ profiling=true ;; #( ++ arm64,freebsd*) : ++ profiling=true ;; #( ++ arm,freebsd*) : + profiling=true ;; #( + arm,linux*) : + profiling=true ;; #( diff --git a/lang/ocaml/files/patch-asmrun_amd64.S b/lang/ocaml/files/patch-runtime_amd64.S index de7c538080ed..2d7da5f47cea 100644 --- a/lang/ocaml/files/patch-asmrun_amd64.S +++ b/lang/ocaml/files/patch-runtime_amd64.S @@ -1,6 +1,6 @@ ---- asmrun/amd64.S.orig 2020-08-22 20:02:29 UTC -+++ asmrun/amd64.S -@@ -725,7 +725,7 @@ G(caml_system__spacetime_shapes): +--- runtime/amd64.S.orig 2019-08-05 17:32:44 UTC ++++ runtime/amd64.S +@@ -724,7 +724,7 @@ G(caml_system__spacetime_shapes): #elif defined(SYS_mingw64) || defined(SYS_cygwin) .section .rdata,"dr" #else diff --git a/lang/ocaml/files/patch-byterun_backtrace.c b/lang/ocaml/files/patch-runtime_backtrace.c index 3adbd9513c1b..6f76ad108013 100644 --- a/lang/ocaml/files/patch-byterun_backtrace.c +++ b/lang/ocaml/files/patch-runtime_backtrace.c @@ -1,5 +1,5 @@ ---- byterun/backtrace.c.orig 2020-08-22 14:46:44 UTC -+++ byterun/backtrace.c +--- runtime/backtrace.c.orig 2019-08-05 17:32:44 UTC ++++ runtime/backtrace.c @@ -27,9 +27,6 @@ #include "caml/backtrace_prim.h" #include "caml/fail.h" diff --git a/lang/ocaml/files/patch-byterun_caml_stack.h b/lang/ocaml/files/patch-runtime_caml_stack.h index 49f429aecf7d..6f62b053b955 100644 --- a/lang/ocaml/files/patch-byterun_caml_stack.h +++ b/lang/ocaml/files/patch-runtime_caml_stack.h @@ -1,6 +1,6 @@ ---- byterun/caml/stack.h.orig 2017-07-13 08:56:44 UTC -+++ byterun/caml/stack.h -@@ -40,10 +40,10 @@ +--- runtime/caml/stack.h.orig 2019-08-05 17:32:44 UTC ++++ runtime/caml/stack.h +@@ -35,10 +35,10 @@ #if defined(MODEL_ppc) #define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 16)) diff --git a/lang/ocaml/files/patch-asmrun_power.S b/lang/ocaml/files/patch-runtime_power.S index dfaa21dd0b61..0155af6a4e1c 100644 --- a/lang/ocaml/files/patch-asmrun_power.S +++ b/lang/ocaml/files/patch-runtime_power.S @@ -1,6 +1,6 @@ ---- asmrun/power.S.orig 2019-12-02 12:34:04 UTC -+++ asmrun/power.S -@@ -13,7 +13,7 @@ +--- runtime/power.S.orig 2019-08-05 17:32:44 UTC ++++ runtime/power.S +@@ -13,11 +13,11 @@ /* */ /**************************************************************************/ @@ -9,6 +9,11 @@ .abiversion 2 #endif +-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) ++#if _CALL_ELF == 1 || _CALL_ELF == 2 + #define EITHER(a,b) b + #else + #define EITHER(a,b) a @@ -42,7 +42,7 @@ #define CALLBACK_LINK_SIZE 16 #define CALLBACK_LINK_OFFSET 0 @@ -45,6 +50,15 @@ #define FUNCTION(name) \ .section ".text"; \ .globl name; \ +@@ -136,7 +136,7 @@ + + #endif + +-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) ++#if _CALL_ELF == 1 || _CALL_ELF == 2 + + #define LSYMB(glob) .L##glob + @@ -157,7 +157,7 @@ #endif @@ -54,6 +68,15 @@ .section ".opd","aw" #else .section ".text" +@@ -244,7 +244,7 @@ FUNCTION(caml_call_gc) + stfdu 31, 8(11) + /* Call the GC */ + bl caml_garbage_collection +-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) ++#if _CALL_ELF == 1 || _CALL_ELF == 2 + nop + #endif + /* Reload new allocation pointer and allocation limit */ @@ -338,14 +338,14 @@ FUNCTION(caml_c_call) #if defined(MODEL_ppc) mtctr 28 @@ -71,6 +94,24 @@ mtctr 28 mr 12, 28 mr 26, 2 /* save current TOC in a callee-save register */ +@@ -388,7 +388,7 @@ FUNCTION(caml_raise_exn) + addi 1, 1, -(PARAM_SAVE_AREA + RESERVED_STACK) + /* reserve stack space for C call */ + bl caml_stash_backtrace +-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) ++#if _CALL_ELF == 1 || _CALL_ELF == 2 + nop + #endif + mr 3, 28 /* restore exn bucket */ +@@ -424,7 +424,7 @@ FUNCTION(caml_raise_exception) + addi 1, 1, -(PARAM_SAVE_AREA + RESERVED_STACK) + /* reserve stack space for C call */ + bl caml_stash_backtrace +-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) ++#if _CALL_ELF == 1 || _CALL_ELF == 2 + nop + #endif + mr 3, 28 /* restore exn bucket */ @@ -514,14 +514,14 @@ FUNCTION(caml_start_program) #if defined(MODEL_ppc) mtctr 12 @@ -88,7 +129,7 @@ mtctr 12 std 2, TOC_SAVE(1) .L105: bctrl -@@ -634,7 +634,7 @@ FUNCTION(caml_callback3_exn) +@@ -634,7 +634,7 @@ ENDFUNCTION(caml_callback3_exn) b .L102 ENDFUNCTION(caml_callback3_exn) @@ -97,3 +138,12 @@ .section ".opd","aw" #else .section ".text" +@@ -656,7 +656,7 @@ caml_system__frametable: + + /* TOC entries */ + +-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) ++#if _CALL_ELF == 1 || _CALL_ELF == 2 + + .section ".toc", "aw" + diff --git a/lang/ocaml/files/patch-675e98a2.c b/lang/ocaml/files/patch-runtime_startup__nat.c index 007b349dd5d2..eef3606be79c 100644 --- a/lang/ocaml/files/patch-675e98a2.c +++ b/lang/ocaml/files/patch-runtime_startup__nat.c @@ -1,6 +1,6 @@ ---- asmrun/startup.c.orig 2017-07-13 08:56:44 UTC -+++ asmrun/startup.c -@@ -44,7 +44,6 @@ +--- runtime/startup_nat.c.orig 2019-08-05 17:32:44 UTC ++++ runtime/startup_nat.c +@@ -44,7 +44,6 @@ extern int caml_parser_trace; #endif extern int caml_parser_trace; diff --git a/lang/ocaml/files/patch-testsuite_tests_asmcomp_power.S b/lang/ocaml/files/patch-testsuite_tools_asmgen__power.S index eaf73a084d5b..fc23f1a1bd61 100644 --- a/lang/ocaml/files/patch-testsuite_tests_asmcomp_power.S +++ b/lang/ocaml/files/patch-testsuite_tools_asmgen__power.S @@ -1,5 +1,5 @@ ---- testsuite/tests/asmgen/power.S.orig 2019-12-02 12:36:28 UTC -+++ testsuite/tests/asmgen/power.S +--- testsuite/tools/asmgen_power.S.orig 2019-08-05 17:32:44 UTC ++++ testsuite/tools/asmgen_power.S @@ -26,11 +26,11 @@ #define RESERVED_STACK 16 #define LR_SAVE_AREA 4 diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist index 8c9e10b5dd2d..279c64a18e83 100644 --- a/lang/ocaml/pkg-plist +++ b/lang/ocaml/pkg-plist @@ -62,6 +62,8 @@ lib/ocaml/bytes.ml lib/ocaml/bytes.mli lib/ocaml/bytesLabels.ml lib/ocaml/bytesLabels.mli +lib/ocaml/bool.ml +lib/ocaml/bool.mli lib/ocaml/callback.ml lib/ocaml/callback.mli lib/ocaml/caml/address_class.h @@ -132,7 +134,7 @@ lib/ocaml/camlinternalFormat.cmti lib/ocaml/camlinternalFormat.cmx lib/ocaml/camlinternalFormat.ml lib/ocaml/camlinternalFormat.mli -lib/ocaml/camlinternalFormat.p.cmt +%%PROF%%lib/ocaml/camlinternalFormat.p.cmt %%PROF%%lib/ocaml/camlinternalFormat.p.cmx lib/ocaml/camlinternalFormatBasics.cmi lib/ocaml/camlinternalFormatBasics.cmt @@ -140,7 +142,7 @@ lib/ocaml/camlinternalFormatBasics.cmti lib/ocaml/camlinternalFormatBasics.cmx lib/ocaml/camlinternalFormatBasics.ml lib/ocaml/camlinternalFormatBasics.mli -lib/ocaml/camlinternalFormatBasics.p.cmt +%%PROF%%lib/ocaml/camlinternalFormatBasics.p.cmt %%PROF%%lib/ocaml/camlinternalFormatBasics.p.cmx lib/ocaml/camlinternalLazy.cmi lib/ocaml/camlinternalLazy.cmt @@ -148,7 +150,7 @@ lib/ocaml/camlinternalLazy.cmti lib/ocaml/camlinternalLazy.cmx lib/ocaml/camlinternalLazy.ml lib/ocaml/camlinternalLazy.mli -lib/ocaml/camlinternalLazy.p.cmt +%%PROF%%lib/ocaml/camlinternalLazy.p.cmt %%PROF%%lib/ocaml/camlinternalLazy.p.cmx lib/ocaml/camlinternalMod.cmi lib/ocaml/camlinternalMod.cmt @@ -156,7 +158,7 @@ lib/ocaml/camlinternalMod.cmti lib/ocaml/camlinternalMod.cmx lib/ocaml/camlinternalMod.ml lib/ocaml/camlinternalMod.mli -lib/ocaml/camlinternalMod.p.cmt +%%PROF%%lib/ocaml/camlinternalMod.p.cmt %%PROF%%lib/ocaml/camlinternalMod.p.cmx lib/ocaml/camlinternalOO.cmi lib/ocaml/camlinternalOO.cmt @@ -164,7 +166,7 @@ lib/ocaml/camlinternalOO.cmti lib/ocaml/camlinternalOO.cmx lib/ocaml/camlinternalOO.ml lib/ocaml/camlinternalOO.mli -lib/ocaml/camlinternalOO.p.cmt +%%PROF%%lib/ocaml/camlinternalOO.p.cmt %%PROF%%lib/ocaml/camlinternalOO.p.cmx lib/ocaml/char.ml lib/ocaml/char.mli @@ -184,10 +186,12 @@ 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.cmx 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.cmx lib/ocaml/compiler-libs/allocated_const.mli lib/ocaml/compiler-libs/annot.cmi lib/ocaml/compiler-libs/annot.cmti @@ -251,10 +255,16 @@ 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.cmx 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/backend_var.cmi +lib/ocaml/compiler-libs/backend_var.cmt +lib/ocaml/compiler-libs/backend_var.cmti +lib/ocaml/compiler-libs/backend_var.cmx +lib/ocaml/compiler-libs/backend_var.mli lib/ocaml/compiler-libs/branch_relaxation.cmi lib/ocaml/compiler-libs/branch_relaxation.cmt lib/ocaml/compiler-libs/branch_relaxation.cmti @@ -308,6 +318,11 @@ 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/camlinternalMenhirLib.cmi +lib/ocaml/compiler-libs/camlinternalMenhirLib.cmt +lib/ocaml/compiler-libs/camlinternalMenhirLib.cmti +lib/ocaml/compiler-libs/camlinternalMenhirLib.cmx +lib/ocaml/compiler-libs/camlinternalMenhirLib.mli lib/ocaml/compiler-libs/ccomp.cmi lib/ocaml/compiler-libs/ccomp.cmt lib/ocaml/compiler-libs/ccomp.cmti @@ -331,18 +346,22 @@ 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.cmx 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.cmx 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.cmx 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.cmx lib/ocaml/compiler-libs/closure_id.mli lib/ocaml/compiler-libs/closure_offsets.cmi lib/ocaml/compiler-libs/closure_offsets.cmt @@ -352,6 +371,7 @@ lib/ocaml/compiler-libs/closure_offsets.mli lib/ocaml/compiler-libs/closure_origin.cmi lib/ocaml/compiler-libs/closure_origin.cmt lib/ocaml/compiler-libs/closure_origin.cmti +lib/ocaml/compiler-libs/closure_origin.cmx lib/ocaml/compiler-libs/closure_origin.mli lib/ocaml/compiler-libs/cmi_format.cmi lib/ocaml/compiler-libs/cmi_format.cmt @@ -394,6 +414,21 @@ 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/compdynlink_common.cmi +lib/ocaml/compiler-libs/compdynlink_common.cmt +lib/ocaml/compiler-libs/compdynlink_common.cmti +lib/ocaml/compiler-libs/compdynlink_common.cmx +lib/ocaml/compiler-libs/compdynlink_common.mli +lib/ocaml/compiler-libs/compdynlink_platform_intf.cmi +lib/ocaml/compiler-libs/compdynlink_platform_intf.cmt +lib/ocaml/compiler-libs/compdynlink_platform_intf.cmti +lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx +lib/ocaml/compiler-libs/compdynlink_platform_intf.mli +lib/ocaml/compiler-libs/compdynlink_types.cmi +lib/ocaml/compiler-libs/compdynlink_types.cmt +lib/ocaml/compiler-libs/compdynlink_types.cmti +lib/ocaml/compiler-libs/compdynlink_types.cmx +lib/ocaml/compiler-libs/compdynlink_types.mli lib/ocaml/compiler-libs/compenv.cmi lib/ocaml/compiler-libs/compenv.cmt lib/ocaml/compiler-libs/compenv.cmti @@ -402,12 +437,18 @@ 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.cmx 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/compile_common.cmi +lib/ocaml/compiler-libs/compile_common.cmt +lib/ocaml/compiler-libs/compile_common.cmti +lib/ocaml/compiler-libs/compile_common.cmx +lib/ocaml/compiler-libs/compile_common.mli lib/ocaml/compiler-libs/compilenv.cmi lib/ocaml/compiler-libs/compilenv.cmt lib/ocaml/compiler-libs/compilenv.cmti @@ -451,6 +492,7 @@ 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.cmx lib/ocaml/compiler-libs/debuginfo.mli lib/ocaml/compiler-libs/depend.cmi lib/ocaml/compiler-libs/depend.cmt @@ -470,6 +512,7 @@ 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.cmx lib/ocaml/compiler-libs/effect_analysis.mli lib/ocaml/compiler-libs/emit.cmi lib/ocaml/compiler-libs/emit.cmt @@ -504,6 +547,7 @@ 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.cmx lib/ocaml/compiler-libs/export_id.mli lib/ocaml/compiler-libs/export_info.cmi lib/ocaml/compiler-libs/export_info.cmt @@ -520,22 +564,27 @@ 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.cmx 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.cmx 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.cmx 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.cmx 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.cmx lib/ocaml/compiler-libs/flambda_iterators.mli lib/ocaml/compiler-libs/flambda_to_clambda.cmi lib/ocaml/compiler-libs/flambda_to_clambda.cmt @@ -545,10 +594,12 @@ 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.cmx 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.cmx lib/ocaml/compiler-libs/freshening.mli lib/ocaml/compiler-libs/genprintval.cmi lib/ocaml/compiler-libs/genprintval.cmt @@ -557,6 +608,7 @@ 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.cmx lib/ocaml/compiler-libs/id_types.mli lib/ocaml/compiler-libs/ident.cmi lib/ocaml/compiler-libs/ident.cmt @@ -591,26 +643,32 @@ 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.cmx 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.cmx 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.cmx 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.cmx 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.cmx 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.cmx lib/ocaml/compiler-libs/inlining_decision.mli lib/ocaml/compiler-libs/inlining_decision_intf.cmi lib/ocaml/compiler-libs/inlining_decision_intf.cmti @@ -618,20 +676,28 @@ 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.cmx 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.cmx 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.cmx 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/int_replace_polymorphic_compare.cmi +lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmt +lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmti +lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmx +lib/ocaml/compiler-libs/int_replace_polymorphic_compare.mli lib/ocaml/compiler-libs/interf.cmi lib/ocaml/compiler-libs/interf.cmt lib/ocaml/compiler-libs/interf.cmti @@ -640,6 +706,7 @@ lib/ocaml/compiler-libs/interf.mli lib/ocaml/compiler-libs/internal_variable_names.cmi lib/ocaml/compiler-libs/internal_variable_names.cmt lib/ocaml/compiler-libs/internal_variable_names.cmti +lib/ocaml/compiler-libs/internal_variable_names.cmx lib/ocaml/compiler-libs/internal_variable_names.mli lib/ocaml/compiler-libs/interval.cmi lib/ocaml/compiler-libs/interval.cmt @@ -649,6 +716,7 @@ lib/ocaml/compiler-libs/interval.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.cmx lib/ocaml/compiler-libs/invariant_params.mli lib/ocaml/compiler-libs/lambda.cmi lib/ocaml/compiler-libs/lambda.cmt @@ -663,14 +731,17 @@ 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.cmx 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.cmx 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.cmx lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli lib/ocaml/compiler-libs/linearize.cmi lib/ocaml/compiler-libs/linearize.cmt @@ -680,6 +751,7 @@ 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.cmx lib/ocaml/compiler-libs/linkage_name.mli lib/ocaml/compiler-libs/linscan.cmi lib/ocaml/compiler-libs/linscan.cmt @@ -691,6 +763,11 @@ lib/ocaml/compiler-libs/liveness.cmt lib/ocaml/compiler-libs/liveness.cmti lib/ocaml/compiler-libs/liveness.cmx lib/ocaml/compiler-libs/liveness.mli +lib/ocaml/compiler-libs/load_path.cmi +lib/ocaml/compiler-libs/load_path.cmt +lib/ocaml/compiler-libs/load_path.cmti +lib/ocaml/compiler-libs/load_path.cmx +lib/ocaml/compiler-libs/load_path.mli lib/ocaml/compiler-libs/location.cmi lib/ocaml/compiler-libs/location.cmt lib/ocaml/compiler-libs/location.cmti @@ -736,6 +813,7 @@ 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.cmx lib/ocaml/compiler-libs/middle_end.mli lib/ocaml/compiler-libs/misc.cmi lib/ocaml/compiler-libs/misc.cmt @@ -750,6 +828,7 @@ 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.cmx lib/ocaml/compiler-libs/mutable_variable.mli lib/ocaml/compiler-libs/numbers.cmi lib/ocaml/compiler-libs/numbers.cmt @@ -800,6 +879,7 @@ lib/ocaml/compiler-libs/outcometree.mli lib/ocaml/compiler-libs/parameter.cmi lib/ocaml/compiler-libs/parameter.cmt lib/ocaml/compiler-libs/parameter.cmti +lib/ocaml/compiler-libs/parameter.cmx lib/ocaml/compiler-libs/parameter.mli lib/ocaml/compiler-libs/parmatch.cmi lib/ocaml/compiler-libs/parmatch.cmt @@ -822,6 +902,7 @@ 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.cmx lib/ocaml/compiler-libs/pass_wrapper.mli lib/ocaml/compiler-libs/path.cmi lib/ocaml/compiler-libs/path.cmt @@ -911,10 +992,17 @@ lib/ocaml/compiler-libs/profile.mli lib/ocaml/compiler-libs/projection.cmi lib/ocaml/compiler-libs/projection.cmt lib/ocaml/compiler-libs/projection.cmti +lib/ocaml/compiler-libs/projection.cmx lib/ocaml/compiler-libs/projection.mli +lib/ocaml/compiler-libs/rec_check.cmi +lib/ocaml/compiler-libs/rec_check.cmt +lib/ocaml/compiler-libs/rec_check.cmti +lib/ocaml/compiler-libs/rec_check.cmx +lib/ocaml/compiler-libs/rec_check.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.cmx lib/ocaml/compiler-libs/ref_to_variables.mli lib/ocaml/compiler-libs/reg.cmi lib/ocaml/compiler-libs/reg.cmt @@ -934,18 +1022,22 @@ 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.cmx 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.cmx 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.cmx 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.cmx lib/ocaml/compiler-libs/remove_unused_program_constructs.mli lib/ocaml/compiler-libs/runtimedef.cmi lib/ocaml/compiler-libs/runtimedef.cmt @@ -980,18 +1072,22 @@ 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.cmx 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.cmx 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.cmx 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.cmx lib/ocaml/compiler-libs/simple_value_approx.mli lib/ocaml/compiler-libs/simplif.cmi lib/ocaml/compiler-libs/simplif.cmt @@ -1001,6 +1097,7 @@ 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.cmx 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 @@ -1008,10 +1105,12 @@ 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.cmx 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.cmx lib/ocaml/compiler-libs/simplify_primitives.mli lib/ocaml/compiler-libs/spacetime_profiling.cmi lib/ocaml/compiler-libs/spacetime_profiling.cmt @@ -1031,6 +1130,7 @@ 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.cmx lib/ocaml/compiler-libs/static_exception.mli lib/ocaml/compiler-libs/strmatch.cmi lib/ocaml/compiler-libs/strmatch.cmt @@ -1060,6 +1160,7 @@ 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.cmx lib/ocaml/compiler-libs/symbol.mli lib/ocaml/compiler-libs/symtable.cmi lib/ocaml/compiler-libs/symtable.cmt @@ -1074,6 +1175,7 @@ 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.cmx lib/ocaml/compiler-libs/tag.mli lib/ocaml/compiler-libs/targetint.cmi lib/ocaml/compiler-libs/targetint.cmt @@ -1085,11 +1187,6 @@ 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 @@ -1164,6 +1261,26 @@ 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/typedecl_immediacy.cmi +lib/ocaml/compiler-libs/typedecl_immediacy.cmt +lib/ocaml/compiler-libs/typedecl_immediacy.cmti +lib/ocaml/compiler-libs/typedecl_immediacy.cmx +lib/ocaml/compiler-libs/typedecl_immediacy.mli +lib/ocaml/compiler-libs/typedecl_properties.cmi +lib/ocaml/compiler-libs/typedecl_properties.cmt +lib/ocaml/compiler-libs/typedecl_properties.cmti +lib/ocaml/compiler-libs/typedecl_properties.cmx +lib/ocaml/compiler-libs/typedecl_properties.mli +lib/ocaml/compiler-libs/typedecl_unboxed.cmi +lib/ocaml/compiler-libs/typedecl_unboxed.cmt +lib/ocaml/compiler-libs/typedecl_unboxed.cmti +lib/ocaml/compiler-libs/typedecl_unboxed.cmx +lib/ocaml/compiler-libs/typedecl_unboxed.mli +lib/ocaml/compiler-libs/typedecl_variance.cmi +lib/ocaml/compiler-libs/typedecl_variance.cmt +lib/ocaml/compiler-libs/typedecl_variance.cmti +lib/ocaml/compiler-libs/typedecl_variance.cmx +lib/ocaml/compiler-libs/typedecl_variance.mli lib/ocaml/compiler-libs/typedtree.cmi lib/ocaml/compiler-libs/typedtree.cmt lib/ocaml/compiler-libs/typedtree.cmti @@ -1174,11 +1291,6 @@ 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 @@ -1207,14 +1319,17 @@ 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.cmx 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.cmx 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.cmx lib/ocaml/compiler-libs/unbox_specialised_args.mli lib/ocaml/compiler-libs/untypeast.cmi lib/ocaml/compiler-libs/untypeast.cmt @@ -1224,10 +1339,12 @@ 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.cmx 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.cmx lib/ocaml/compiler-libs/variable.mli lib/ocaml/compiler-libs/warnings.cmi lib/ocaml/compiler-libs/warnings.cmt @@ -1259,7 +1376,6 @@ lib/ocaml/compiler-libs/x86_proc.cmx lib/ocaml/compiler-libs/x86_proc.mli lib/ocaml/complex.ml lib/ocaml/complex.mli -%%THREADS%%lib/ocaml/condition.mli lib/ocaml/digest.ml lib/ocaml/digest.mli lib/ocaml/dynlink.a @@ -1269,15 +1385,19 @@ lib/ocaml/dynlink.cmti lib/ocaml/dynlink.cmx lib/ocaml/dynlink.cmxa lib/ocaml/dynlink.mli +lib/ocaml/dynlink_common.cmx +lib/ocaml/dynlink_platform_intf.cmx +lib/ocaml/dynlink_types.cmx lib/ocaml/ephemeron.ml lib/ocaml/ephemeron.mli -%%THREADS%%lib/ocaml/event.mli lib/ocaml/filename.ml lib/ocaml/filename.mli lib/ocaml/float.ml lib/ocaml/float.mli lib/ocaml/format.ml lib/ocaml/format.mli +lib/ocaml/fun.ml +lib/ocaml/fun.mli lib/ocaml/gc.ml lib/ocaml/gc.mli lib/ocaml/genlex.ml @@ -1296,6 +1416,8 @@ lib/ocaml/genlex.mli %%X11%%lib/ocaml/graphicsX11.mli lib/ocaml/hashtbl.ml lib/ocaml/hashtbl.mli +lib/ocaml/int.ml +lib/ocaml/int.mli lib/ocaml/int32.ml lib/ocaml/int32.mli lib/ocaml/int64.ml @@ -1310,8 +1432,7 @@ lib/ocaml/libasmrun_pic.a lib/ocaml/libasmrun_shared.so lib/ocaml/libasmrund.a lib/ocaml/libasmruni.a -lib/ocaml/libasmrunp.a -lib/ocaml/libbigarray.a +%%PROF%%lib/ocaml/libasmrunp.a lib/ocaml/libcamlrun.a lib/ocaml/libcamlrun_pic.a lib/ocaml/libcamlrun_shared.so @@ -1319,7 +1440,6 @@ lib/ocaml/libcamlrund.a lib/ocaml/libcamlruni.a lib/ocaml/libcamlstr.a %%X11%%lib/ocaml/libgraphics.a -lib/ocaml/libraw_spacetime_lib.a %%THREADS%%lib/ocaml/libthreads.a %%THREADS%%lib/ocaml/libthreadsnat.a lib/ocaml/libunix.a @@ -1333,7 +1453,6 @@ lib/ocaml/marshal.ml lib/ocaml/marshal.mli lib/ocaml/moreLabels.ml lib/ocaml/moreLabels.mli -%%THREADS%%lib/ocaml/mutex.mli lib/ocaml/nativeint.ml lib/ocaml/nativeint.mli lib/ocaml/obj.ml @@ -1443,8 +1562,11 @@ lib/ocaml/ocamldoc/odoc_value.cmi lib/ocaml/ocamldoc/odoc_value.cmx lib/ocaml/oo.ml lib/ocaml/oo.mli +lib/ocaml/option.ml +lib/ocaml/option.mli lib/ocaml/parsing.ml lib/ocaml/parsing.mli +lib/ocaml/pervasives.ml lib/ocaml/printexc.ml lib/ocaml/printexc.mli lib/ocaml/printf.ml @@ -1459,22 +1581,14 @@ lib/ocaml/queue.ml lib/ocaml/queue.mli lib/ocaml/random.ml lib/ocaml/random.mli -lib/ocaml/raw_spacetime_lib.a -lib/ocaml/raw_spacetime_lib.cma -lib/ocaml/raw_spacetime_lib.cmi -lib/ocaml/raw_spacetime_lib.cmti -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/result.ml +lib/ocaml/result.mli lib/ocaml/scanf.ml lib/ocaml/scanf.mli lib/ocaml/seq.ml lib/ocaml/seq.mli lib/ocaml/set.ml lib/ocaml/set.mli -lib/ocaml/sort.ml -lib/ocaml/sort.mli lib/ocaml/spacetime.ml lib/ocaml/spacetime.mli lib/ocaml/stack.ml @@ -1487,9 +1601,9 @@ lib/ocaml/std_exit.cmt lib/ocaml/std_exit.cmx lib/ocaml/std_exit.ml lib/ocaml/std_exit.o -lib/ocaml/std_exit.p.cmt -lib/ocaml/std_exit.p.cmx -lib/ocaml/std_exit.p.o +%%PROF%%lib/ocaml/std_exit.p.cmt +%%PROF%%lib/ocaml/std_exit.p.cmx +%%PROF%%lib/ocaml/std_exit.p.o lib/ocaml/stdlib.a lib/ocaml/stdlib.cma lib/ocaml/stdlib.cmi @@ -1499,298 +1613,334 @@ lib/ocaml/stdlib.cmx lib/ocaml/stdlib.cmxa lib/ocaml/stdlib.ml lib/ocaml/stdlib.mli -lib/ocaml/stdlib.p.a -lib/ocaml/stdlib.p.cmt -lib/ocaml/stdlib.p.cmx -lib/ocaml/stdlib.p.cmxa +%%PROF%%lib/ocaml/stdlib.p.a +%%PROF%%lib/ocaml/stdlib.p.cmt +%%PROF%%lib/ocaml/stdlib.p.cmx +%%PROF%%lib/ocaml/stdlib.p.cmxa lib/ocaml/stdlib__arg.cmi lib/ocaml/stdlib__arg.cmt lib/ocaml/stdlib__arg.cmti lib/ocaml/stdlib__arg.cmx -lib/ocaml/stdlib__arg.p.cmt -lib/ocaml/stdlib__arg.p.cmx +%%PROF%%lib/ocaml/stdlib__arg.p.cmt +%%PROF%%lib/ocaml/stdlib__arg.p.cmx lib/ocaml/stdlib__array.cmi lib/ocaml/stdlib__array.cmt lib/ocaml/stdlib__array.cmti lib/ocaml/stdlib__array.cmx -lib/ocaml/stdlib__array.p.cmt -lib/ocaml/stdlib__array.p.cmx +%%PROF%%lib/ocaml/stdlib__array.p.cmt +%%PROF%%lib/ocaml/stdlib__array.p.cmx lib/ocaml/stdlib__arrayLabels.cmi lib/ocaml/stdlib__arrayLabels.cmt lib/ocaml/stdlib__arrayLabels.cmti lib/ocaml/stdlib__arrayLabels.cmx -lib/ocaml/stdlib__arrayLabels.p.cmt -lib/ocaml/stdlib__arrayLabels.p.cmx +%%PROF%%lib/ocaml/stdlib__arrayLabels.p.cmt +%%PROF%%lib/ocaml/stdlib__arrayLabels.p.cmx lib/ocaml/stdlib__bigarray.cmi lib/ocaml/stdlib__bigarray.cmt lib/ocaml/stdlib__bigarray.cmti lib/ocaml/stdlib__bigarray.cmx -lib/ocaml/stdlib__bigarray.p.cmt -lib/ocaml/stdlib__bigarray.p.cmx +%%PROF%%lib/ocaml/stdlib__bigarray.p.cmt +%%PROF%%lib/ocaml/stdlib__bigarray.p.cmx +lib/ocaml/stdlib__bool.cmi +lib/ocaml/stdlib__bool.cmt +lib/ocaml/stdlib__bool.cmti +lib/ocaml/stdlib__bool.cmx +%%PROF%%lib/ocaml/stdlib__bool.p.cmt +%%PROF%%lib/ocaml/stdlib__bool.p.cmx lib/ocaml/stdlib__buffer.cmi lib/ocaml/stdlib__buffer.cmt lib/ocaml/stdlib__buffer.cmti lib/ocaml/stdlib__buffer.cmx -lib/ocaml/stdlib__buffer.p.cmt -lib/ocaml/stdlib__buffer.p.cmx +%%PROF%%lib/ocaml/stdlib__buffer.p.cmt +%%PROF%%lib/ocaml/stdlib__buffer.p.cmx lib/ocaml/stdlib__bytes.cmi lib/ocaml/stdlib__bytes.cmt lib/ocaml/stdlib__bytes.cmti lib/ocaml/stdlib__bytes.cmx -lib/ocaml/stdlib__bytes.p.cmt -lib/ocaml/stdlib__bytes.p.cmx +%%PROF%%lib/ocaml/stdlib__bytes.p.cmt +%%PROF%%lib/ocaml/stdlib__bytes.p.cmx lib/ocaml/stdlib__bytesLabels.cmi lib/ocaml/stdlib__bytesLabels.cmt lib/ocaml/stdlib__bytesLabels.cmti lib/ocaml/stdlib__bytesLabels.cmx -lib/ocaml/stdlib__bytesLabels.p.cmt -lib/ocaml/stdlib__bytesLabels.p.cmx +%%PROF%%lib/ocaml/stdlib__bytesLabels.p.cmt +%%PROF%%lib/ocaml/stdlib__bytesLabels.p.cmx lib/ocaml/stdlib__callback.cmi lib/ocaml/stdlib__callback.cmt lib/ocaml/stdlib__callback.cmti lib/ocaml/stdlib__callback.cmx -lib/ocaml/stdlib__callback.p.cmt -lib/ocaml/stdlib__callback.p.cmx +%%PROF%%lib/ocaml/stdlib__callback.p.cmt +%%PROF%%lib/ocaml/stdlib__callback.p.cmx lib/ocaml/stdlib__char.cmi lib/ocaml/stdlib__char.cmt lib/ocaml/stdlib__char.cmti lib/ocaml/stdlib__char.cmx -lib/ocaml/stdlib__char.p.cmt -lib/ocaml/stdlib__char.p.cmx +%%PROF%%lib/ocaml/stdlib__char.p.cmt +%%PROF%%lib/ocaml/stdlib__char.p.cmx lib/ocaml/stdlib__complex.cmi lib/ocaml/stdlib__complex.cmt lib/ocaml/stdlib__complex.cmti lib/ocaml/stdlib__complex.cmx -lib/ocaml/stdlib__complex.p.cmt -lib/ocaml/stdlib__complex.p.cmx +%%PROF%%lib/ocaml/stdlib__complex.p.cmt +%%PROF%%lib/ocaml/stdlib__complex.p.cmx lib/ocaml/stdlib__digest.cmi lib/ocaml/stdlib__digest.cmt lib/ocaml/stdlib__digest.cmti lib/ocaml/stdlib__digest.cmx -lib/ocaml/stdlib__digest.p.cmt -lib/ocaml/stdlib__digest.p.cmx +%%PROF%%lib/ocaml/stdlib__digest.p.cmt +%%PROF%%lib/ocaml/stdlib__digest.p.cmx lib/ocaml/stdlib__ephemeron.cmi lib/ocaml/stdlib__ephemeron.cmt lib/ocaml/stdlib__ephemeron.cmti lib/ocaml/stdlib__ephemeron.cmx -lib/ocaml/stdlib__ephemeron.p.cmt -lib/ocaml/stdlib__ephemeron.p.cmx +%%PROF%%lib/ocaml/stdlib__ephemeron.p.cmt +%%PROF%%lib/ocaml/stdlib__ephemeron.p.cmx lib/ocaml/stdlib__filename.cmi lib/ocaml/stdlib__filename.cmt lib/ocaml/stdlib__filename.cmti lib/ocaml/stdlib__filename.cmx -lib/ocaml/stdlib__filename.p.cmt -lib/ocaml/stdlib__filename.p.cmx +%%PROF%%lib/ocaml/stdlib__filename.p.cmt +%%PROF%%lib/ocaml/stdlib__filename.p.cmx lib/ocaml/stdlib__float.cmi lib/ocaml/stdlib__float.cmt lib/ocaml/stdlib__float.cmti lib/ocaml/stdlib__float.cmx -lib/ocaml/stdlib__float.p.cmt -lib/ocaml/stdlib__float.p.cmx +%%PROF%%lib/ocaml/stdlib__float.p.cmt +%%PROF%%lib/ocaml/stdlib__float.p.cmx lib/ocaml/stdlib__format.cmi lib/ocaml/stdlib__format.cmt lib/ocaml/stdlib__format.cmti lib/ocaml/stdlib__format.cmx -lib/ocaml/stdlib__format.p.cmt -lib/ocaml/stdlib__format.p.cmx +%%PROF%%lib/ocaml/stdlib__format.p.cmt +%%PROF%%lib/ocaml/stdlib__format.p.cmx +lib/ocaml/stdlib__fun.cmi +lib/ocaml/stdlib__fun.cmt +lib/ocaml/stdlib__fun.cmti +lib/ocaml/stdlib__fun.cmx +%%PROF%%lib/ocaml/stdlib__fun.p.cmt +%%PROF%%lib/ocaml/stdlib__fun.p.cmx lib/ocaml/stdlib__gc.cmi lib/ocaml/stdlib__gc.cmt lib/ocaml/stdlib__gc.cmti lib/ocaml/stdlib__gc.cmx -lib/ocaml/stdlib__gc.p.cmt -lib/ocaml/stdlib__gc.p.cmx +%%PROF%%lib/ocaml/stdlib__gc.p.cmt +%%PROF%%lib/ocaml/stdlib__gc.p.cmx lib/ocaml/stdlib__genlex.cmi lib/ocaml/stdlib__genlex.cmt lib/ocaml/stdlib__genlex.cmti lib/ocaml/stdlib__genlex.cmx -lib/ocaml/stdlib__genlex.p.cmt -lib/ocaml/stdlib__genlex.p.cmx +%%PROF%%lib/ocaml/stdlib__genlex.p.cmt +%%PROF%%lib/ocaml/stdlib__genlex.p.cmx lib/ocaml/stdlib__hashtbl.cmi lib/ocaml/stdlib__hashtbl.cmt lib/ocaml/stdlib__hashtbl.cmti lib/ocaml/stdlib__hashtbl.cmx -lib/ocaml/stdlib__hashtbl.p.cmt -lib/ocaml/stdlib__hashtbl.p.cmx +%%PROF%%lib/ocaml/stdlib__hashtbl.p.cmt +%%PROF%%lib/ocaml/stdlib__hashtbl.p.cmx +lib/ocaml/stdlib__int.cmi +lib/ocaml/stdlib__int.cmt +lib/ocaml/stdlib__int.cmti +lib/ocaml/stdlib__int.cmx +%%PROF%%lib/ocaml/stdlib__int.p.cmt +%%PROF%%lib/ocaml/stdlib__int.p.cmx lib/ocaml/stdlib__int32.cmi lib/ocaml/stdlib__int32.cmt lib/ocaml/stdlib__int32.cmti lib/ocaml/stdlib__int32.cmx -lib/ocaml/stdlib__int32.p.cmt -lib/ocaml/stdlib__int32.p.cmx +%%PROF%%lib/ocaml/stdlib__int32.p.cmt +%%PROF%%lib/ocaml/stdlib__int32.p.cmx lib/ocaml/stdlib__int64.cmi lib/ocaml/stdlib__int64.cmt lib/ocaml/stdlib__int64.cmti lib/ocaml/stdlib__int64.cmx -lib/ocaml/stdlib__int64.p.cmt -lib/ocaml/stdlib__int64.p.cmx +%%PROF%%lib/ocaml/stdlib__int64.p.cmt +%%PROF%%lib/ocaml/stdlib__int64.p.cmx lib/ocaml/stdlib__lazy.cmi lib/ocaml/stdlib__lazy.cmt lib/ocaml/stdlib__lazy.cmti lib/ocaml/stdlib__lazy.cmx -lib/ocaml/stdlib__lazy.p.cmt -lib/ocaml/stdlib__lazy.p.cmx +%%PROF%%lib/ocaml/stdlib__lazy.p.cmt +%%PROF%%lib/ocaml/stdlib__lazy.p.cmx lib/ocaml/stdlib__lexing.cmi lib/ocaml/stdlib__lexing.cmt lib/ocaml/stdlib__lexing.cmti lib/ocaml/stdlib__lexing.cmx -lib/ocaml/stdlib__lexing.p.cmt -lib/ocaml/stdlib__lexing.p.cmx +%%PROF%%lib/ocaml/stdlib__lexing.p.cmt +%%PROF%%lib/ocaml/stdlib__lexing.p.cmx lib/ocaml/stdlib__list.cmi lib/ocaml/stdlib__list.cmt lib/ocaml/stdlib__list.cmti lib/ocaml/stdlib__list.cmx -lib/ocaml/stdlib__list.p.cmt -lib/ocaml/stdlib__list.p.cmx +%%PROF%%lib/ocaml/stdlib__list.p.cmt +%%PROF%%lib/ocaml/stdlib__list.p.cmx lib/ocaml/stdlib__listLabels.cmi lib/ocaml/stdlib__listLabels.cmt lib/ocaml/stdlib__listLabels.cmti lib/ocaml/stdlib__listLabels.cmx -lib/ocaml/stdlib__listLabels.p.cmt -lib/ocaml/stdlib__listLabels.p.cmx +%%PROF%%lib/ocaml/stdlib__listLabels.p.cmt +%%PROF%%lib/ocaml/stdlib__listLabels.p.cmx lib/ocaml/stdlib__map.cmi lib/ocaml/stdlib__map.cmt lib/ocaml/stdlib__map.cmti lib/ocaml/stdlib__map.cmx -lib/ocaml/stdlib__map.p.cmt -lib/ocaml/stdlib__map.p.cmx +%%PROF%%lib/ocaml/stdlib__map.p.cmt +%%PROF%%lib/ocaml/stdlib__map.p.cmx lib/ocaml/stdlib__marshal.cmi lib/ocaml/stdlib__marshal.cmt lib/ocaml/stdlib__marshal.cmti lib/ocaml/stdlib__marshal.cmx -lib/ocaml/stdlib__marshal.p.cmt -lib/ocaml/stdlib__marshal.p.cmx +%%PROF%%lib/ocaml/stdlib__marshal.p.cmt +%%PROF%%lib/ocaml/stdlib__marshal.p.cmx lib/ocaml/stdlib__moreLabels.cmi lib/ocaml/stdlib__moreLabels.cmt lib/ocaml/stdlib__moreLabels.cmti lib/ocaml/stdlib__moreLabels.cmx -lib/ocaml/stdlib__moreLabels.p.cmt -lib/ocaml/stdlib__moreLabels.p.cmx +%%PROF%%lib/ocaml/stdlib__moreLabels.p.cmt +%%PROF%%lib/ocaml/stdlib__moreLabels.p.cmx lib/ocaml/stdlib__nativeint.cmi lib/ocaml/stdlib__nativeint.cmt lib/ocaml/stdlib__nativeint.cmti lib/ocaml/stdlib__nativeint.cmx -lib/ocaml/stdlib__nativeint.p.cmt -lib/ocaml/stdlib__nativeint.p.cmx +%%PROF%%lib/ocaml/stdlib__nativeint.p.cmt +%%PROF%%lib/ocaml/stdlib__nativeint.p.cmx lib/ocaml/stdlib__obj.cmi lib/ocaml/stdlib__obj.cmt lib/ocaml/stdlib__obj.cmti lib/ocaml/stdlib__obj.cmx -lib/ocaml/stdlib__obj.p.cmt -lib/ocaml/stdlib__obj.p.cmx +%%PROF%%lib/ocaml/stdlib__obj.p.cmt +%%PROF%%lib/ocaml/stdlib__obj.p.cmx lib/ocaml/stdlib__oo.cmi lib/ocaml/stdlib__oo.cmt lib/ocaml/stdlib__oo.cmti lib/ocaml/stdlib__oo.cmx -lib/ocaml/stdlib__oo.p.cmt -lib/ocaml/stdlib__oo.p.cmx +%%PROF%%lib/ocaml/stdlib__oo.p.cmt +%%PROF%%lib/ocaml/stdlib__oo.p.cmx +lib/ocaml/stdlib__option.cmi +lib/ocaml/stdlib__option.cmt +lib/ocaml/stdlib__option.cmti +lib/ocaml/stdlib__option.cmx +%%PROF%%lib/ocaml/stdlib__option.p.cmt +%%PROF%%lib/ocaml/stdlib__option.p.cmx lib/ocaml/stdlib__parsing.cmi lib/ocaml/stdlib__parsing.cmt lib/ocaml/stdlib__parsing.cmti lib/ocaml/stdlib__parsing.cmx -lib/ocaml/stdlib__parsing.p.cmt -lib/ocaml/stdlib__parsing.p.cmx +%%PROF%%lib/ocaml/stdlib__parsing.p.cmt +%%PROF%%lib/ocaml/stdlib__parsing.p.cmx +lib/ocaml/stdlib__pervasives.cmi +lib/ocaml/stdlib__pervasives.cmt +lib/ocaml/stdlib__pervasives.cmx +%%PROF%%lib/ocaml/stdlib__pervasives.p.cmi +%%PROF%%lib/ocaml/stdlib__pervasives.p.cmt +%%PROF%%lib/ocaml/stdlib__pervasives.p.cmx lib/ocaml/stdlib__printexc.cmi lib/ocaml/stdlib__printexc.cmt lib/ocaml/stdlib__printexc.cmti lib/ocaml/stdlib__printexc.cmx -lib/ocaml/stdlib__printexc.p.cmt -lib/ocaml/stdlib__printexc.p.cmx +%%PROF%%lib/ocaml/stdlib__printexc.p.cmt +%%PROF%%lib/ocaml/stdlib__printexc.p.cmx lib/ocaml/stdlib__printf.cmi lib/ocaml/stdlib__printf.cmt lib/ocaml/stdlib__printf.cmti lib/ocaml/stdlib__printf.cmx -lib/ocaml/stdlib__printf.p.cmt -lib/ocaml/stdlib__printf.p.cmx +%%PROF%%lib/ocaml/stdlib__printf.p.cmt +%%PROF%%lib/ocaml/stdlib__printf.p.cmx lib/ocaml/stdlib__queue.cmi lib/ocaml/stdlib__queue.cmt lib/ocaml/stdlib__queue.cmti lib/ocaml/stdlib__queue.cmx -lib/ocaml/stdlib__queue.p.cmt -lib/ocaml/stdlib__queue.p.cmx +%%PROF%%lib/ocaml/stdlib__queue.p.cmt +%%PROF%%lib/ocaml/stdlib__queue.p.cmx lib/ocaml/stdlib__random.cmi lib/ocaml/stdlib__random.cmt lib/ocaml/stdlib__random.cmti lib/ocaml/stdlib__random.cmx -lib/ocaml/stdlib__random.p.cmt -lib/ocaml/stdlib__random.p.cmx +%%PROF%%lib/ocaml/stdlib__random.p.cmt +%%PROF%%lib/ocaml/stdlib__random.p.cmx +lib/ocaml/stdlib__result.cmi +lib/ocaml/stdlib__result.cmt +lib/ocaml/stdlib__result.cmti +lib/ocaml/stdlib__result.cmx +%%PROF%%lib/ocaml/stdlib__result.p.cmt +%%PROF%%lib/ocaml/stdlib__result.p.cmx lib/ocaml/stdlib__scanf.cmi lib/ocaml/stdlib__scanf.cmt lib/ocaml/stdlib__scanf.cmti lib/ocaml/stdlib__scanf.cmx -lib/ocaml/stdlib__scanf.p.cmt -lib/ocaml/stdlib__scanf.p.cmx +%%PROF%%lib/ocaml/stdlib__scanf.p.cmt +%%PROF%%lib/ocaml/stdlib__scanf.p.cmx lib/ocaml/stdlib__seq.cmi lib/ocaml/stdlib__seq.cmt lib/ocaml/stdlib__seq.cmti lib/ocaml/stdlib__seq.cmx -lib/ocaml/stdlib__seq.p.cmt -lib/ocaml/stdlib__seq.p.cmx +%%PROF%%lib/ocaml/stdlib__seq.p.cmt +%%PROF%%lib/ocaml/stdlib__seq.p.cmx lib/ocaml/stdlib__set.cmi lib/ocaml/stdlib__set.cmt lib/ocaml/stdlib__set.cmti lib/ocaml/stdlib__set.cmx -lib/ocaml/stdlib__set.p.cmt -lib/ocaml/stdlib__set.p.cmx -lib/ocaml/stdlib__sort.cmi -lib/ocaml/stdlib__sort.cmt -lib/ocaml/stdlib__sort.cmti -lib/ocaml/stdlib__sort.cmx -lib/ocaml/stdlib__sort.p.cmt -lib/ocaml/stdlib__sort.p.cmx +%%PROF%%lib/ocaml/stdlib__set.p.cmt +%%PROF%%lib/ocaml/stdlib__set.p.cmx lib/ocaml/stdlib__spacetime.cmi lib/ocaml/stdlib__spacetime.cmt lib/ocaml/stdlib__spacetime.cmti lib/ocaml/stdlib__spacetime.cmx -lib/ocaml/stdlib__spacetime.p.cmt -lib/ocaml/stdlib__spacetime.p.cmx +%%PROF%%lib/ocaml/stdlib__spacetime.p.cmt +%%PROF%%lib/ocaml/stdlib__spacetime.p.cmx lib/ocaml/stdlib__stack.cmi lib/ocaml/stdlib__stack.cmt lib/ocaml/stdlib__stack.cmti lib/ocaml/stdlib__stack.cmx -lib/ocaml/stdlib__stack.p.cmt -lib/ocaml/stdlib__stack.p.cmx +%%PROF%%lib/ocaml/stdlib__stack.p.cmt +%%PROF%%lib/ocaml/stdlib__stack.p.cmx lib/ocaml/stdlib__stdLabels.cmi lib/ocaml/stdlib__stdLabels.cmt lib/ocaml/stdlib__stdLabels.cmti lib/ocaml/stdlib__stdLabels.cmx -lib/ocaml/stdlib__stdLabels.p.cmt -lib/ocaml/stdlib__stdLabels.p.cmx +%%PROF%%lib/ocaml/stdlib__stdLabels.p.cmt +%%PROF%%lib/ocaml/stdlib__stdLabels.p.cmx lib/ocaml/stdlib__stream.cmi lib/ocaml/stdlib__stream.cmt lib/ocaml/stdlib__stream.cmti lib/ocaml/stdlib__stream.cmx -lib/ocaml/stdlib__stream.p.cmt -lib/ocaml/stdlib__stream.p.cmx +%%PROF%%lib/ocaml/stdlib__stream.p.cmt +%%PROF%%lib/ocaml/stdlib__stream.p.cmx lib/ocaml/stdlib__string.cmi lib/ocaml/stdlib__string.cmt lib/ocaml/stdlib__string.cmti lib/ocaml/stdlib__string.cmx -lib/ocaml/stdlib__string.p.cmt -lib/ocaml/stdlib__string.p.cmx +%%PROF%%lib/ocaml/stdlib__string.p.cmt +%%PROF%%lib/ocaml/stdlib__string.p.cmx lib/ocaml/stdlib__stringLabels.cmi lib/ocaml/stdlib__stringLabels.cmt lib/ocaml/stdlib__stringLabels.cmti lib/ocaml/stdlib__stringLabels.cmx -lib/ocaml/stdlib__stringLabels.p.cmt -lib/ocaml/stdlib__stringLabels.p.cmx +%%PROF%%lib/ocaml/stdlib__stringLabels.p.cmt +%%PROF%%lib/ocaml/stdlib__stringLabels.p.cmx lib/ocaml/stdlib__sys.cmi lib/ocaml/stdlib__sys.cmt lib/ocaml/stdlib__sys.cmti lib/ocaml/stdlib__sys.cmx -lib/ocaml/stdlib__sys.p.cmt -lib/ocaml/stdlib__sys.p.cmx +%%PROF%%lib/ocaml/stdlib__sys.p.cmt +%%PROF%%lib/ocaml/stdlib__sys.p.cmx lib/ocaml/stdlib__uchar.cmi lib/ocaml/stdlib__uchar.cmt lib/ocaml/stdlib__uchar.cmti lib/ocaml/stdlib__uchar.cmx -lib/ocaml/stdlib__uchar.p.cmt -lib/ocaml/stdlib__uchar.p.cmx +%%PROF%%lib/ocaml/stdlib__uchar.p.cmt +%%PROF%%lib/ocaml/stdlib__uchar.p.cmx +lib/ocaml/stdlib__unit.cmi +lib/ocaml/stdlib__unit.cmt +lib/ocaml/stdlib__unit.cmti +lib/ocaml/stdlib__unit.cmx +%%PROF%%lib/ocaml/stdlib__unit.p.cmt +%%PROF%%lib/ocaml/stdlib__unit.p.cmx lib/ocaml/stdlib__weak.cmi lib/ocaml/stdlib__weak.cmt lib/ocaml/stdlib__weak.cmti lib/ocaml/stdlib__weak.cmx -lib/ocaml/stdlib__weak.p.cmt -lib/ocaml/stdlib__weak.p.cmx +%%PROF%%lib/ocaml/stdlib__weak.p.cmt +%%PROF%%lib/ocaml/stdlib__weak.p.cmx lib/ocaml/str.a lib/ocaml/str.cma lib/ocaml/str.cmi @@ -1805,10 +1955,8 @@ lib/ocaml/string.ml lib/ocaml/string.mli lib/ocaml/stringLabels.ml lib/ocaml/stringLabels.mli -lib/ocaml/stublibs/dllbigarray.so lib/ocaml/stublibs/dllcamlstr.so %%X11%%lib/ocaml/stublibs/dllgraphics.so -lib/ocaml/stublibs/dllraw_spacetime_lib.so %%THREADS%%lib/ocaml/stublibs/dllthreads.so lib/ocaml/stublibs/dllunix.so lib/ocaml/stublibs/dllvmthreads.so @@ -1816,23 +1964,26 @@ lib/ocaml/sys.ml lib/ocaml/sys.mli lib/ocaml/target_camlheaderd lib/ocaml/target_camlheaderi -%%THREADS%%lib/ocaml/thread.mli -%%THREADS%%lib/ocaml/threadUnix.mli %%THREADS%%lib/ocaml/threads/condition.cmi %%THREADS%%lib/ocaml/threads/condition.cmti %%THREADS%%lib/ocaml/threads/condition.cmx +%%THREADS%%lib/ocaml/threads/condition.mli %%THREADS%%lib/ocaml/threads/event.cmi %%THREADS%%lib/ocaml/threads/event.cmti %%THREADS%%lib/ocaml/threads/event.cmx +%%THREADS%%lib/ocaml/threads/event.mli %%THREADS%%lib/ocaml/threads/mutex.cmi %%THREADS%%lib/ocaml/threads/mutex.cmti %%THREADS%%lib/ocaml/threads/mutex.cmx +%%THREADS%%lib/ocaml/threads/mutex.mli %%THREADS%%lib/ocaml/threads/thread.cmi %%THREADS%%lib/ocaml/threads/thread.cmti %%THREADS%%lib/ocaml/threads/thread.cmx +%%THREADS%%lib/ocaml/threads/thread.mli %%THREADS%%lib/ocaml/threads/threadUnix.cmi %%THREADS%%lib/ocaml/threads/threadUnix.cmti %%THREADS%%lib/ocaml/threads/threadUnix.cmx +%%THREADS%%lib/ocaml/threads/threadUnix.mli %%THREADS%%lib/ocaml/threads/threads.a %%THREADS%%lib/ocaml/threads/threads.cma %%THREADS%%lib/ocaml/threads/threads.cmxa @@ -1842,6 +1993,8 @@ lib/ocaml/topdirs.cmti lib/ocaml/topdirs.mli lib/ocaml/uchar.ml lib/ocaml/uchar.mli +lib/ocaml/unit.ml +lib/ocaml/unit.mli lib/ocaml/unix.a lib/ocaml/unix.cma lib/ocaml/unix.cmi @@ -1898,6 +2051,7 @@ man/man3/Arg_helper.Make.3o.gz man/man3/Array.3o.gz man/man3/ArrayLabels.3o.gz man/man3/Ast_helper.3o.gz +man/man3/Ast_helper.Attr.3o.gz man/man3/Ast_helper.Cf.3o.gz man/man3/Ast_helper.Ci.3o.gz man/man3/Ast_helper.Cl.3o.gz @@ -1911,10 +2065,13 @@ man/man3/Ast_helper.Incl.3o.gz man/man3/Ast_helper.Mb.3o.gz man/man3/Ast_helper.Md.3o.gz man/man3/Ast_helper.Mod.3o.gz +man/man3/Ast_helper.Ms.3o.gz man/man3/Ast_helper.Mtd.3o.gz man/man3/Ast_helper.Mty.3o.gz +man/man3/Ast_helper.Of.3o.gz man/man3/Ast_helper.Opn.3o.gz man/man3/Ast_helper.Pat.3o.gz +man/man3/Ast_helper.Rf.3o.gz man/man3/Ast_helper.Sig.3o.gz man/man3/Ast_helper.Str.3o.gz man/man3/Ast_helper.Te.3o.gz @@ -1933,6 +2090,7 @@ 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/Bool.3o.gz man/man3/Buffer.3o.gz man/man3/Build_path_prefix_map.3o.gz man/man3/Builtin_attributes.3o.gz @@ -1942,22 +2100,58 @@ man/man3/Callback.3o.gz man/man3/CamlinternalFormat.3o.gz man/man3/CamlinternalFormatBasics.3o.gz man/man3/CamlinternalLazy.3o.gz +man/man3/CamlinternalMenhirLib.3o.gz +man/man3/CamlinternalMenhirLib.Convert.3o.gz +man/man3/CamlinternalMenhirLib.Convert.Simplified.3o.gz +man/man3/CamlinternalMenhirLib.Engine.3o.gz +man/man3/CamlinternalMenhirLib.Engine.Make.3o.gz +man/man3/CamlinternalMenhirLib.EngineTypes.3o.gz +man/man3/CamlinternalMenhirLib.EngineTypes.ENGINE.3o.gz +man/man3/CamlinternalMenhirLib.EngineTypes.INCREMENTAL_ENGINE_START.3o.gz +man/man3/CamlinternalMenhirLib.EngineTypes.MONOLITHIC_ENGINE.3o.gz +man/man3/CamlinternalMenhirLib.EngineTypes.TABLE.3o.gz +man/man3/CamlinternalMenhirLib.EngineTypes.TABLE.Log.3o.gz +man/man3/CamlinternalMenhirLib.ErrorReports.3o.gz +man/man3/CamlinternalMenhirLib.General.3o.gz +man/man3/CamlinternalMenhirLib.IncrementalEngine.3o.gz +man/man3/CamlinternalMenhirLib.IncrementalEngine.EVERYTHING.3o.gz +man/man3/CamlinternalMenhirLib.IncrementalEngine.INCREMENTAL_ENGINE.3o.gz +man/man3/CamlinternalMenhirLib.IncrementalEngine.INSPECTION.3o.gz +man/man3/CamlinternalMenhirLib.IncrementalEngine.SYMBOLS.3o.gz +man/man3/CamlinternalMenhirLib.InfiniteArray.3o.gz +man/man3/CamlinternalMenhirLib.InspectionTableFormat.3o.gz +man/man3/CamlinternalMenhirLib.InspectionTableFormat.TABLES.3o.gz +man/man3/CamlinternalMenhirLib.InspectionTableInterpreter.3o.gz +man/man3/CamlinternalMenhirLib.InspectionTableInterpreter.Make.3o.gz +man/man3/CamlinternalMenhirLib.InspectionTableInterpreter.Symbols.3o.gz +man/man3/CamlinternalMenhirLib.LinearizedArray.3o.gz +man/man3/CamlinternalMenhirLib.PackedIntArray.3o.gz +man/man3/CamlinternalMenhirLib.Printers.3o.gz +man/man3/CamlinternalMenhirLib.Printers.Make.3o.gz +man/man3/CamlinternalMenhirLib.RowDisplacement.3o.gz +man/man3/CamlinternalMenhirLib.StaticVersion.3o.gz +man/man3/CamlinternalMenhirLib.TableFormat.3o.gz +man/man3/CamlinternalMenhirLib.TableFormat.TABLES.3o.gz +man/man3/CamlinternalMenhirLib.TableInterpreter.3o.gz +man/man3/CamlinternalMenhirLib.TableInterpreter.MakeEngineTable.3o.gz man/man3/CamlinternalMod.3o.gz man/man3/CamlinternalOO.3o.gz man/man3/Ccomp.3o.gz man/man3/Char.3o.gz man/man3/Clflags.3o.gz +man/man3/Clflags.Compiler_pass.3o.gz man/man3/Clflags.Float_arg_helper.3o.gz man/man3/Clflags.Int_arg_helper.3o.gz +man/man3/Compiler_libs.3o.gz man/man3/Complex.3o.gz man/man3/Condition.3o.gz man/man3/Config.3o.gz man/man3/Consistbl.3o.gz man/man3/Depend.3o.gz -man/man3/Depend.StringMap.3o.gz -man/man3/Depend.StringSet.3o.gz +man/man3/Depend.String.3o.gz man/man3/Digest.3o.gz man/man3/Docstrings.3o.gz +man/man3/Docstrings.WithMenhir.3o.gz man/man3/Dynlink.3o.gz man/man3/Ephemeron.3o.gz man/man3/Ephemeron.GenHashTable.3o.gz @@ -1977,7 +2171,9 @@ man/man3/Event.3o.gz man/man3/Filename.3o.gz man/man3/Float.3o.gz man/man3/Float.Array.3o.gz +man/man3/Float.ArrayLabels.3o.gz man/man3/Format.3o.gz +man/man3/Fun.3o.gz man/man3/Gc.3o.gz man/man3/Genlex.3o.gz man/man3/Graphics.3o.gz @@ -2004,6 +2200,7 @@ man/man3/Identifiable.Set.T.3o.gz man/man3/Identifiable.Tbl.3o.gz man/man3/Identifiable.Tbl.T.3o.gz man/man3/Identifiable.Thing.3o.gz +man/man3/Int.3o.gz man/man3/Int32.3o.gz man/man3/Int64.3o.gz man/man3/Lazy.3o.gz @@ -2011,6 +2208,8 @@ man/man3/Lexer.3o.gz man/man3/Lexing.3o.gz man/man3/List.3o.gz man/man3/ListLabels.3o.gz +man/man3/Load_path.3o.gz +man/man3/Load_path.Dir.3o.gz man/man3/Location.3o.gz man/man3/Longident.3o.gz man/man3/Map.3o.gz @@ -2020,6 +2219,7 @@ man/man3/Map.S.3o.gz man/man3/Marshal.3o.gz man/man3/Misc.3o.gz man/man3/Misc.Color.3o.gz +man/man3/Misc.Error_style.3o.gz man/man3/Misc.HookSig.3o.gz man/man3/Misc.Int_literal_converter.3o.gz man/man3/Misc.LongString.3o.gz @@ -2028,8 +2228,10 @@ man/man3/Misc.Stdlib.3o.gz man/man3/Misc.Stdlib.Array.3o.gz man/man3/Misc.Stdlib.List.3o.gz man/man3/Misc.Stdlib.Option.3o.gz -man/man3/Misc.StringMap.3o.gz -man/man3/Misc.StringSet.3o.gz +man/man3/Misc.Stdlib.String.3o.gz +man/man3/Misc.Stdlib.String.Map.3o.gz +man/man3/Misc.Stdlib.String.Set.3o.gz +man/man3/Misc.Stdlib.String.Tbl.3o.gz man/man3/MoreLabels.3o.gz man/man3/MoreLabels.Hashtbl.3o.gz man/man3/MoreLabels.Hashtbl.HashedType.3o.gz @@ -2055,9 +2257,14 @@ man/man3/Numbers.Int16.3o.gz man/man3/Numbers.Int8.3o.gz man/man3/Obj.3o.gz man/man3/Obj.Ephemeron.3o.gz +man/man3/Obj.Extension_constructor.3o.gz +man/man3/Ocaml_operators.3o.gz man/man3/Oo.3o.gz +man/man3/Option.3o.gz man/man3/Parse.3o.gz man/man3/Parser.3o.gz +man/man3/Parser.Incremental.3o.gz +man/man3/Parser.MenhirInterpreter.3o.gz man/man3/Parsetree.3o.gz man/man3/Parsing.3o.gz man/man3/Pervasives.3o.gz @@ -2074,6 +2281,7 @@ man/man3/Profile.3o.gz man/man3/Queue.3o.gz man/man3/Random.3o.gz man/man3/Random.State.3o.gz +man/man3/Result.3o.gz man/man3/Scanf.3o.gz man/man3/Scanf.Scanning.3o.gz man/man3/Seq.3o.gz @@ -2083,7 +2291,6 @@ man/man3/Set.OrderedType.3o.gz man/man3/Set.S.3o.gz man/man3/Simplif.3o.gz man/man3/Simplif.Hooks.3o.gz -man/man3/Sort.3o.gz man/man3/Spacetime.3o.gz man/man3/Spacetime.Series.3o.gz man/man3/Spacetime.Snapshot.3o.gz @@ -2093,6 +2300,62 @@ man/man3/StdLabels.Array.3o.gz man/man3/StdLabels.Bytes.3o.gz man/man3/StdLabels.List.3o.gz man/man3/StdLabels.String.3o.gz +man/man3/Stdlib.3o.gz +man/man3/Stdlib.Arg.3o.gz +man/man3/Stdlib.Array.3o.gz +man/man3/Stdlib.ArrayLabels.3o.gz +man/man3/Stdlib.Bigarray.3o.gz +man/man3/Stdlib.Bool.3o.gz +man/man3/Stdlib.Buffer.3o.gz +man/man3/Stdlib.Bytes.3o.gz +man/man3/Stdlib.BytesLabels.3o.gz +man/man3/Stdlib.Callback.3o.gz +man/man3/Stdlib.Char.3o.gz +man/man3/Stdlib.Complex.3o.gz +man/man3/Stdlib.Digest.3o.gz +man/man3/Stdlib.Ephemeron.3o.gz +man/man3/Stdlib.Filename.3o.gz +man/man3/Stdlib.Float.3o.gz +man/man3/Stdlib.Format.3o.gz +man/man3/Stdlib.Fun.3o.gz +man/man3/Stdlib.Gc.3o.gz +man/man3/Stdlib.Genlex.3o.gz +man/man3/Stdlib.Hashtbl.3o.gz +man/man3/Stdlib.Int.3o.gz +man/man3/Stdlib.Int32.3o.gz +man/man3/Stdlib.Int64.3o.gz +man/man3/Stdlib.LargeFile.3o.gz +man/man3/Stdlib.Lazy.3o.gz +man/man3/Stdlib.Lexing.3o.gz +man/man3/Stdlib.List.3o.gz +man/man3/Stdlib.ListLabels.3o.gz +man/man3/Stdlib.Map.3o.gz +man/man3/Stdlib.Marshal.3o.gz +man/man3/Stdlib.MoreLabels.3o.gz +man/man3/Stdlib.Nativeint.3o.gz +man/man3/Stdlib.Obj.3o.gz +man/man3/Stdlib.Oo.3o.gz +man/man3/Stdlib.Option.3o.gz +man/man3/Stdlib.Parsing.3o.gz +man/man3/Stdlib.Pervasives.3o.gz +man/man3/Stdlib.Printexc.3o.gz +man/man3/Stdlib.Printf.3o.gz +man/man3/Stdlib.Queue.3o.gz +man/man3/Stdlib.Random.3o.gz +man/man3/Stdlib.Result.3o.gz +man/man3/Stdlib.Scanf.3o.gz +man/man3/Stdlib.Seq.3o.gz +man/man3/Stdlib.Set.3o.gz +man/man3/Stdlib.Spacetime.3o.gz +man/man3/Stdlib.Stack.3o.gz +man/man3/Stdlib.StdLabels.3o.gz +man/man3/Stdlib.Stream.3o.gz +man/man3/Stdlib.String.3o.gz +man/man3/Stdlib.StringLabels.3o.gz +man/man3/Stdlib.Sys.3o.gz +man/man3/Stdlib.Uchar.3o.gz +man/man3/Stdlib.Unit.3o.gz +man/man3/Stdlib.Weak.3o.gz man/man3/Str.3o.gz man/man3/Stream.3o.gz man/man3/String.3o.gz @@ -2104,14 +2367,16 @@ man/man3/Strongly_connected_components.S.Id.3o.gz man/man3/Syntaxerr.3o.gz man/man3/Sys.3o.gz man/man3/Targetint.3o.gz -man/man3/Tbl.3o.gz man/man3/Terminfo.3o.gz man/man3/Thread.3o.gz man/man3/ThreadUnix.3o.gz man/man3/Typemod.3o.gz man/man3/Typemod.ImplementationHooks.3o.gz man/man3/Typemod.InterfaceHooks.3o.gz +man/man3/Typemod.Sig_component_kind.3o.gz +man/man3/Typemod.Signature_names.3o.gz man/man3/Uchar.3o.gz +man/man3/Unit.3o.gz man/man3/Unix.3o.gz man/man3/Unix.LargeFile.3o.gz man/man3/UnixLabels.3o.gz diff --git a/lang/ott/Makefile b/lang/ott/Makefile index 77094db54318..a9b98f77a508 100644 --- a/lang/ott/Makefile +++ b/lang/ott/Makefile @@ -1,5 +1,6 @@ PORTNAME= ott PORTVERSION= 0.28 +PORTREVISION= 1 CATEGORIES= lang MAINTAINER= domagoj.stolfa@cl.cam.ac.uk diff --git a/math/alt-ergo/Makefile b/math/alt-ergo/Makefile index 0eb4c007e0cc..7fc95e14929f 100644 --- a/math/alt-ergo/Makefile +++ b/math/alt-ergo/Makefile @@ -1,6 +1,6 @@ PORTNAME= alt-ergo PORTVERSION= 0.95.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= http://alt-ergo.ocamlpro.com/http/alt-ergo-${PORTVERSION}/ diff --git a/math/coq/Makefile b/math/coq/Makefile index 1a9360d81df7..90145272748b 100644 --- a/math/coq/Makefile +++ b/math/coq/Makefile @@ -1,6 +1,6 @@ PORTNAME= coq PORTVERSION= 8.6 -PORTREVISION= 17 +PORTREVISION= 18 PORTEPOCH= 3 CATEGORIES= math MASTER_SITES= http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \ diff --git a/math/facile/Makefile b/math/facile/Makefile index dd1e78c35299..e3bbb53da74e 100644 --- a/math/facile/Makefile +++ b/math/facile/Makefile @@ -1,6 +1,6 @@ PORTNAME= facile PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://opti.recherche.enac.fr/facile/distrib/ diff --git a/math/ocaml-num/Makefile b/math/ocaml-num/Makefile index 9587ea7e0c7c..1a628eb6f4c7 100644 --- a/math/ocaml-num/Makefile +++ b/math/ocaml-num/Makefile @@ -1,6 +1,7 @@ PORTNAME= num PORTVERSION= 1.4 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= math PKGNAMEPREFIX= ocaml- diff --git a/math/ocaml-ocamlgraph/Makefile b/math/ocaml-ocamlgraph/Makefile index 5426cb9812f8..b305379a0e2a 100644 --- a/math/ocaml-ocamlgraph/Makefile +++ b/math/ocaml-ocamlgraph/Makefile @@ -1,5 +1,6 @@ PORTNAME= ocamlgraph PORTVERSION= 1.8.8 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://ocamlgraph.lri.fr/download/ \ ftp://ftp.stack.nl/pub/users/johans/ocamlgraph/ diff --git a/math/ocaml-zarith/Makefile b/math/ocaml-zarith/Makefile index c5620a507973..ab95d248427a 100644 --- a/math/ocaml-zarith/Makefile +++ b/math/ocaml-zarith/Makefile @@ -1,6 +1,7 @@ PORTNAME= ${GH_PROJECT:tl} PORTVERSION= 1.12 DISTVERSIONPREFIX= release- +PORTREVISION= 1 CATEGORIES= math PKGNAMEPREFIX= ocaml- diff --git a/math/ocamlgsl/Makefile b/math/ocamlgsl/Makefile index 72e81eb64def..48dbfef36d1f 100644 --- a/math/ocamlgsl/Makefile +++ b/math/ocamlgsl/Makefile @@ -1,7 +1,7 @@ PORTNAME= ocaml-gsl DISTVERSIONPREFIX=v DISTVERSION= 1.19.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= math MAINTAINER= michipili@gmail.com diff --git a/math/orpie/Makefile b/math/orpie/Makefile index 16f3bf3bb169..9c10c84dca83 100644 --- a/math/orpie/Makefile +++ b/math/orpie/Makefile @@ -1,6 +1,6 @@ PORTNAME= orpie PORTVERSION= 1.5.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES+= math MASTER_SITES= https://github.com/pelzlpj/orpie/releases/download/release-${PORTVERSION}/ diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 0168f1710ff6..f41c7c33ab4b 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,6 +1,6 @@ PORTNAME= scilab PORTVERSION= 6.1.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= math cad java MASTER_SITES= https://cgit.scilab.org/scilab/snapshot/ diff --git a/math/teyjus/Makefile b/math/teyjus/Makefile index d00dc5e3f374..cca9570b6563 100644 --- a/math/teyjus/Makefile +++ b/math/teyjus/Makefile @@ -2,6 +2,7 @@ PORTNAME= teyjus DISTVERSIONPREFIX= v DISTVERSION= 2.1-7 DISTVERSIONSUFFIX= -ge63f40a +PORTREVISION= 1 CATEGORIES= math lang MAINTAINER= yuri@FreeBSD.org diff --git a/net-p2p/liberator/Makefile b/net-p2p/liberator/Makefile index 9502f106abd6..5789b669fb93 100644 --- a/net-p2p/liberator/Makefile +++ b/net-p2p/liberator/Makefile @@ -1,6 +1,6 @@ PORTNAME= liberator PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/ofcp/ofcp-${PORTVERSION} DISTNAME= ofcp-${PORTVERSION} diff --git a/net-p2p/mldonkey-gui/Makefile b/net-p2p/mldonkey-gui/Makefile index c83f48fafb89..c5480668f470 100644 --- a/net-p2p/mldonkey-gui/Makefile +++ b/net-p2p/mldonkey-gui/Makefile @@ -1,5 +1,4 @@ OPTIONS_EXCLUDE=CORE -PORTREVISION= 1 COMMENT= OCAML/GTK GUI for the MLdonkey peer-to-peer network client diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile index 357ea416c3b7..3667759da4b4 100644 --- a/net-p2p/mldonkey/Makefile +++ b/net-p2p/mldonkey/Makefile @@ -1,10 +1,7 @@ PORTNAME= mldonkey -PORTVERSION= 3.1.5 -PORTREVISION= 5 +DISTVERSION= 3.1.7-2 CATEGORIES+= net-p2p -MASTER_SITES= SF - -EXTRA_PATCHES= ${FILESDIR}/git-30e77e2:-p1 +MASTER_SITES= https://github.com/ygrek/${PORTNAME}/releases/download/release-3-1-7-2/ MAINTAINER?= danfe@FreeBSD.org COMMENT?= Multi-protocol peer-to-peer client written in OCaml @@ -122,13 +119,6 @@ post-patch: -e 's|http://www.bluetack.co.uk/config/antip2p.txt|http://www.bluetack.co.uk/config/level1.gz|' \ ${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 \ - ${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/fst_hash.c do-install: .if ${PORT_OPTIONS:MCORE} diff --git a/net-p2p/mldonkey/distinfo b/net-p2p/mldonkey/distinfo index 8d2db7c64632..ccf4527bd4a6 100644 --- a/net-p2p/mldonkey/distinfo +++ b/net-p2p/mldonkey/distinfo @@ -1,2 +1,3 @@ -SHA256 (mldonkey-3.1.5.tar.bz2) = 74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb -SIZE (mldonkey-3.1.5.tar.bz2) = 2847382 +TIMESTAMP = 1683036654 +SHA256 (mldonkey-3.1.7-2.tar.bz2) = b926e7aa3de4b4525af73c88f1724d576b4add56ef070f025941dd51cb24a794 +SIZE (mldonkey-3.1.7-2.tar.bz2) = 2801815 diff --git a/net-p2p/mldonkey/files/patch-src_utils_net_terminal.ml b/net-p2p/mldonkey/files/patch-src_utils_net_terminal.ml index a6ddea71a87d..acc3bff7b546 100644 --- a/net-p2p/mldonkey/files/patch-src_utils_net_terminal.ml +++ b/net-p2p/mldonkey/files/patch-src_utils_net_terminal.ml @@ -1,10 +1,10 @@ ---- src/utils/net/terminal.ml.orig 2005-11-19 17:19:45 UTC +--- src/utils/net/terminal.ml.orig 2020-07-05 18:23:19 UTC +++ src/utils/net/terminal.ml -@@ -185,7 +185,7 @@ module Output = struct +@@ -183,7 +183,7 @@ module Output = struct let canal = List.assoc chan !chanmap in etat.chan <- Some (chan, canal); info (sprintf "connecte au canal '%s'" chan); -- (* {| canal ALL } *) +- (* { | canal ALL } *) + with Not_found -> (* pas encore de recepteur pour ce canal *) try (* on en cree un *) diff --git a/net/unison/Makefile b/net/unison/Makefile index a3988171bdcc..f5730eecc308 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -1,5 +1,6 @@ PORTNAME= unison PORTVERSION= 2.53.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/unison/files/patch-ocaml_4.07-compat b/net/unison/files/patch-ocaml_4.07-compat deleted file mode 100644 index cfaabd107123..000000000000 --- a/net/unison/files/patch-ocaml_4.07-compat +++ /dev/null @@ -1,475 +0,0 @@ -From ad79ecf3c42e0f10b05c7cb8eb5671c66b8a09e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?T=C3=B5ivo=20Leedj=C3=A4rv?= <toivol@gmail.com> -Date: Thu, 17 Nov 2022 11:53:35 +0100 -Subject: [PATCH] Restore compatibility with OCaml 4.06 and 4.07 (temporary - patch) - -This patch should not break compilation with OCaml 4.x but it is -recommended to drop the patch for OCaml > 4.07. - -It will break compilation with OCaml >= 5.0 (due to the change in -Makefile.OCaml). ---- - src/fswatchold.ml | 25 +++-- - src/remote.ml | 3 +- - src/system/system_generic.ml | 204 +++++++++++++++++++++++++++++++++++ - src/ubase/umarshal.ml | 105 ++++++++++++++++++ - src/uicommon.ml | 12 +-- - src/uitext.ml | 3 +- - 6 files changed, 332 insertions(+), 20 deletions(-) - -diff --git a/src/fswatchold.ml b/src/fswatchold.ml -index 84912071a..5b266f519 100644 ---- fswatchold.ml -+++ fswatchold.ml -@@ -113,19 +113,22 @@ let readChanges wi = - let watcherRunning archHash = - RootMap.mem archHash !watchers && - let wi = RootMap.find archHash !watchers in -+ let cleanup () = -+ watchers := RootMap.remove archHash !watchers; -+ begin -+ try ignore (System.close_process_out wi.proc) -+ with Unix.Unix_error _ -> () -+ end; -+ begin match wi.ch with -+ | Some ch -> close_in_noerr ch -+ | None -> () -+ end; -+ false -+ in - match Unix.waitpid [Unix.WNOHANG] (System.process_out_pid wi.proc) with -+ | exception Unix.Unix_error (ECHILD, _, _) -> cleanup () - | (0, _) -> true -- | _ | exception Unix.Unix_error (ECHILD, _, _) -> -- watchers := RootMap.remove archHash !watchers; -- begin -- try ignore (System.close_process_out wi.proc) -- with Unix.Unix_error _ -> () -- end; -- begin match wi.ch with -- | Some ch -> close_in_noerr ch -- | None -> () -- end; -- false -+ | _ -> cleanup () - - let getChanges archHash = - if StringSet.mem archHash !newWatchers then -diff --git a/src/remote.ml b/src/remote.ml -index d101c3903..bedf2e3ba 100644 ---- remote.ml -+++ remote.ml -@@ -1887,11 +1887,12 @@ let buildShellConnection shell host userOpt portOpt rootName termInteract = - let kill_noerr si = try Unix.kill pid si - with Unix.Unix_error _ -> () | Invalid_argument _ -> () in - match Unix.waitpid [WNOHANG] pid with -+ | exception Unix.Unix_error _ -> () - | (0, _) -> - (* Grace period before killing. Important to give ssh a chance - to restore terminal settings, should that be needed. *) - kill_noerr Sys.sigterm; Unix.sleepf 0.01; kill_noerr Sys.sigkill -- | _ | exception Unix.Unix_error _ -> () -+ | _ -> () - in - let () = at_exit end_ssh in - (None, pid) -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index 6f6c6895a..15509abd5 100644 ---- system/system_generic.ml -+++ system/system_generic.ml -@@ -15,6 +15,210 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. - *) - -+(* OCaml 4.07 compatibility ONLY *) -+module Unix = struct -+ -+include Unix -+ -+(* The following code is taken from OCaml sources. -+ Authors of code snippets: Xavier Leroy, Damien Doligez and Romain Beauxis *) -+ -+(**************************************************************************) -+(* *) -+(* OCaml *) -+(* *) -+(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *) -+(* *) -+(* Copyright 1996 Institut National de Recherche en Informatique et *) -+(* en Automatique. *) -+(* *) -+(* All rights reserved. This file is distributed under the terms of *) -+(* the GNU Lesser General Public License version 2.1, with the *) -+(* special exception on linking described in the file LICENSE. *) -+(* *) -+(**************************************************************************) -+ -+external dumpFd : Unix.file_descr -> int = "%identity" -+ -+external sys_exit : int -> 'a = "caml_sys_exit" -+ -+let rec waitpid_non_intr pid = -+ try waitpid [] pid -+ with Unix_error (EINTR, _, _) -> waitpid_non_intr pid -+ -+(* Duplicate [fd] if needed to make sure it isn't one of the -+ standard descriptors (stdin, stdout, stderr). -+ Note that this function always leaves the standard descriptors open, -+ the caller must take care of closing them if needed. -+ The "cloexec" mode doesn't matter, because -+ the descriptor returned by [dup] will be closed before the [exec], -+ and because no other thread is running concurrently -+ (we are in the child process of a fork). -+ *) -+let rec file_descr_not_standard fd = -+ if dumpFd fd >= 3 then fd else file_descr_not_standard (dup fd) -+ -+let safe_close fd = -+ try close fd with Unix_error(_,_,_) -> () -+ -+let perform_redirections new_stdin new_stdout new_stderr = -+ let new_stdin = file_descr_not_standard new_stdin in -+ let new_stdout = file_descr_not_standard new_stdout in -+ let new_stderr = file_descr_not_standard new_stderr in -+ (* The three dup2 close the original stdin, stdout, stderr, -+ which are the descriptors possibly left open -+ by file_descr_not_standard *) -+ dup2 ~cloexec:false new_stdin stdin; -+ dup2 ~cloexec:false new_stdout stdout; -+ dup2 ~cloexec:false new_stderr stderr; -+ safe_close new_stdin; -+ safe_close new_stdout; -+ safe_close new_stderr -+ -+type popen_process = -+ Process of in_channel * out_channel -+ | Process_in of in_channel -+ | Process_out of out_channel -+ | Process_full of in_channel * out_channel * in_channel -+ -+let popen_processes = (Hashtbl.create 7 : (popen_process, int) Hashtbl.t) -+ -+let open_proc cmd envopt proc input output error = -+ match fork() with -+ 0 -> perform_redirections input output error; -+ let shell = "/bin/sh" in -+ let argv = [| shell; "-c"; cmd |] in -+ begin try -+ match envopt with -+ | Some env -> execve shell argv env -+ | None -> execv shell argv -+ with _ -> -+ sys_exit 127 -+ end -+ | id -> Hashtbl.add popen_processes proc id -+ -+let open_process_in cmd = -+ let (in_read, in_write) = pipe ~cloexec:true () in -+ let inchan = in_channel_of_descr in_read in -+ begin -+ try -+ open_proc cmd None (Process_in inchan) stdin in_write stderr -+ with e -> -+ close_in inchan; -+ close in_write; -+ raise e -+ end; -+ close in_write; -+ inchan -+ -+let open_process_out cmd = -+ let (out_read, out_write) = pipe ~cloexec:true () in -+ let outchan = out_channel_of_descr out_write in -+ begin -+ try -+ open_proc cmd None (Process_out outchan) out_read stdout stderr -+ with e -> -+ close_out outchan; -+ close out_read; -+ raise e -+ end; -+ close out_read; -+ outchan -+ -+let open_process cmd = -+ let (in_read, in_write) = pipe ~cloexec:true () in -+ let (out_read, out_write) = -+ try pipe ~cloexec:true () -+ with e -> close in_read; close in_write; raise e in -+ let inchan = in_channel_of_descr in_read in -+ let outchan = out_channel_of_descr out_write in -+ begin -+ try -+ open_proc cmd None (Process(inchan, outchan)) out_read in_write stderr -+ with e -> -+ close out_read; close out_write; -+ close in_read; close in_write; -+ raise e -+ end; -+ close out_read; -+ close in_write; -+ (inchan, outchan) -+ -+let open_process_full cmd env = -+ let (in_read, in_write) = pipe ~cloexec:true () in -+ let (out_read, out_write) = -+ try pipe ~cloexec:true () -+ with e -> close in_read; close in_write; raise e in -+ let (err_read, err_write) = -+ try pipe ~cloexec:true () -+ with e -> close in_read; close in_write; -+ close out_read; close out_write; raise e in -+ let inchan = in_channel_of_descr in_read in -+ let outchan = out_channel_of_descr out_write in -+ let errchan = in_channel_of_descr err_read in -+ begin -+ try -+ open_proc cmd (Some env) (Process_full(inchan, outchan, errchan)) -+ out_read in_write err_write -+ with e -> -+ close out_read; close out_write; -+ close in_read; close in_write; -+ close err_read; close err_write; -+ raise e -+ end; -+ close out_read; -+ close in_write; -+ close err_write; -+ (inchan, outchan, errchan) -+ -+let find_proc_id fun_name proc = -+ try -+ let pid = Hashtbl.find popen_processes proc in -+ Hashtbl.remove popen_processes proc; -+ pid -+ with Not_found -> -+ raise(Unix_error(EBADF, fun_name, "")) -+ -+let close_process_in inchan = -+ let pid = find_proc_id "close_process_in" (Process_in inchan) in -+ close_in inchan; -+ snd(waitpid_non_intr pid) -+ -+let close_process_out outchan = -+ let pid = find_proc_id "close_process_out" (Process_out outchan) in -+ (* The application may have closed [outchan] already to signal -+ end-of-input to the process. *) -+ begin try close_out outchan with Sys_error _ -> () end; -+ snd(waitpid_non_intr pid) -+ -+let close_process (inchan, outchan) = -+ let pid = find_proc_id "close_process" (Process(inchan, outchan)) in -+ close_in inchan; -+ begin try close_out outchan with Sys_error _ -> () end; -+ snd(waitpid_non_intr pid) -+ -+let close_process_full (inchan, outchan, errchan) = -+ let pid = -+ find_proc_id "close_process_full" -+ (Process_full(inchan, outchan, errchan)) in -+ close_in inchan; -+ begin try close_out outchan with Sys_error _ -> () end; -+ close_in errchan; -+ snd(waitpid_non_intr pid) -+ -+let process_in_pid inchan = -+ find_proc_id "process_in_pid" (Process_in inchan) -+let process_out_pid outchan = -+ find_proc_id "process_out_pid" (Process_out outchan) -+let process_pid (inchan, outchan) = -+ find_proc_id "process_pid" (Process(inchan, outchan)) -+let process_full_pid (inchan, outchan, errchan) = -+ find_proc_id "process_full_pid" -+ (Process_full(inchan, outchan, errchan)) -+ -+end -+(* / *) -+ - type fspath = string - - let mfspath = Umarshal.string -diff --git a/src/ubase/umarshal.ml b/src/ubase/umarshal.ml -index 5c5f061ad..d65e1a7c5 100644 ---- ubase/umarshal.ml -+++ ubase/umarshal.ml -@@ -15,6 +15,111 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. - *) - -+(* OCaml 4.07 compatibility ONLY *) -+module Bytes = struct -+ -+include Bytes -+ -+(* The following code is taken from OCaml sources. -+ Authors of the code snippet: Alain Frisch and Daniel Bünzli *) -+ -+(**************************************************************************) -+(* *) -+(* OCaml *) -+(* *) -+(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *) -+(* *) -+(* Copyright 1996 Institut National de Recherche en Informatique et *) -+(* en Automatique. *) -+(* *) -+(* All rights reserved. This file is distributed under the terms of *) -+(* the GNU Lesser General Public License version 2.1, with the *) -+(* special exception on linking described in the file LICENSE. *) -+(* *) -+(**************************************************************************) -+ -+(** {6 Binary encoding/decoding of integers} *) -+ -+external get_uint8 : bytes -> int -> int = "%string_safe_get" -+external get_uint16_ne : bytes -> int -> int = "%caml_string_get16" -+external get_int32_ne : bytes -> int -> int32 = "%caml_string_get32" -+external get_int64_ne : bytes -> int -> int64 = "%caml_string_get64" -+external set_int8 : bytes -> int -> int -> unit = "%string_safe_set" -+external set_int16_ne : bytes -> int -> int -> unit = "%caml_string_set16" -+external set_int32_ne : bytes -> int -> int32 -> unit = "%caml_string_set32" -+external set_int64_ne : bytes -> int -> int64 -> unit = "%caml_string_set64" -+external swap16 : int -> int = "%bswap16" -+external swap32 : int32 -> int32 = "%bswap_int32" -+external swap64 : int64 -> int64 = "%bswap_int64" -+ -+let get_int8 b i = -+ ((get_uint8 b i) lsl (Sys.int_size - 8)) asr (Sys.int_size - 8) -+ -+let get_uint16_le b i = -+ if Sys.big_endian then swap16 (get_uint16_ne b i) -+ else get_uint16_ne b i -+ -+let get_uint16_be b i = -+ if not Sys.big_endian then swap16 (get_uint16_ne b i) -+ else get_uint16_ne b i -+ -+let get_int16_ne b i = -+ ((get_uint16_ne b i) lsl (Sys.int_size - 16)) asr (Sys.int_size - 16) -+ -+let get_int16_le b i = -+ ((get_uint16_le b i) lsl (Sys.int_size - 16)) asr (Sys.int_size - 16) -+ -+let get_int16_be b i = -+ ((get_uint16_be b i) lsl (Sys.int_size - 16)) asr (Sys.int_size - 16) -+ -+let get_int32_le b i = -+ if Sys.big_endian then swap32 (get_int32_ne b i) -+ else get_int32_ne b i -+ -+let get_int32_be b i = -+ if not Sys.big_endian then swap32 (get_int32_ne b i) -+ else get_int32_ne b i -+ -+let get_int64_le b i = -+ if Sys.big_endian then swap64 (get_int64_ne b i) -+ else get_int64_ne b i -+ -+let get_int64_be b i = -+ if not Sys.big_endian then swap64 (get_int64_ne b i) -+ else get_int64_ne b i -+ -+let set_int16_le b i x = -+ if Sys.big_endian then set_int16_ne b i (swap16 x) -+ else set_int16_ne b i x -+ -+let set_int16_be b i x = -+ if not Sys.big_endian then set_int16_ne b i (swap16 x) -+ else set_int16_ne b i x -+ -+let set_int32_le b i x = -+ if Sys.big_endian then set_int32_ne b i (swap32 x) -+ else set_int32_ne b i x -+ -+let set_int32_be b i x = -+ if not Sys.big_endian then set_int32_ne b i (swap32 x) -+ else set_int32_ne b i x -+ -+let set_int64_le b i x = -+ if Sys.big_endian then set_int64_ne b i (swap64 x) -+ else set_int64_ne b i x -+ -+let set_int64_be b i x = -+ if not Sys.big_endian then set_int64_ne b i (swap64 x) -+ else set_int64_ne b i x -+ -+let set_uint8 = set_int8 -+let set_uint16_ne = set_int16_ne -+let set_uint16_be = set_int16_be -+let set_uint16_le = set_int16_le -+ -+end -+(* / *) -+ - exception Error of string - - type 'a t = { -diff --git a/src/uicommon.ml b/src/uicommon.ml -index 94fbc66ef..8a16270c3 100644 ---- uicommon.ml -+++ uicommon.ml -@@ -484,7 +484,7 @@ let addIgnorePattern theRegExp = - module Stats = struct - - let calcETA rem rate = -- if Float.is_nan rate || Float.is_nan rem || rem < 0. then "" else -+ if rate <> rate || rem <> rem || rem < 0. then "" else - let t = truncate (rem /. rate +. 0.5) in - (* Estimating the remaining time is not accurate. Reduce the display - precision (and reduce more when longer time remaining). *) -@@ -501,8 +501,8 @@ let calcETA rem rate = - Printf.sprintf "%02d:%02d:%02d" h m sec - - let movAvg curr prev ?(c = 1.) deltaTime avgPeriod = -- if Float.is_nan prev then curr else -- let a = c *. Float.min (1. -. exp (-. deltaTime /. avgPeriod)) 1. in -+ if prev <> prev then curr else -+ let a = c *. min (1. -. exp (-. deltaTime /. avgPeriod)) 1. in - (* Simplified from a *. curr +. (1. -. a) *. prev *) - prev +. a *. (curr -. prev) - -@@ -525,7 +525,7 @@ let init totalToTransfer = - let t0 = 0. in - { t0; t = t0; totalToComplete = Uutil.Filesize.toInt64 totalToTransfer; - completed = 0L; -- curRate = Float.nan; avgRateS = Float.nan; avgRateDoubleSGauss = Float.nan; -+ curRate = nan; avgRateS = nan; avgRateDoubleSGauss = nan; - } - - let calcAvgRate' sta totTime deltaCompleted deltaTime = -@@ -534,11 +534,11 @@ let calcAvgRate' sta totTime deltaCompleted deltaTime = - changes (like switching from cache to disk or from disk to network - of from receiving to sending or with wildly variable network speed). *) - let avgRateS = movAvg curRate sta.avgRateS deltaTime -- (Float.min_num totTime avgPeriodS) in -+ (min totTime avgPeriodS) in - let cpr = (avgRateS -. sta.avgRateDoubleSGauss) /. sta.avgRateDoubleSGauss in - let c = 1. -. exp (-.(cpr ** 2.) /. gaussC) in - let avgRateDoubleSGauss = movAvg avgRateS sta.avgRateDoubleSGauss ~c deltaTime -- (Float.min_num totTime avgPeriodD) in -+ (min totTime avgPeriodD) in - sta.curRate <- curRate; - sta.avgRateS <- avgRateS; - sta.avgRateDoubleSGauss <- avgRateDoubleSGauss -diff --git a/src/uitext.ml b/src/uitext.ml -index 5d1513a03..fc1f8c716 100644 ---- uitext.ml -+++ uitext.ml -@@ -833,7 +833,7 @@ let doTransport reconItemList numskip isSkip = - else if v >= 100. then "00:00:00" - else - let rate = Uicommon.Stats.avgRate1 sta in -- if Float.is_nan rate then "--:--" -+ if rate <> rate then "--:--" - else - Format.sprintf "%8s/s %s" - (Util.bytes2string (Int64.of_float rate)) -@@ -1692,7 +1692,6 @@ and breakRepeat = function - | Assert_failure _ - | Match_failure _ - | Invalid_argument _ -- | Fun.Finally_raised _ - (* Async exceptions *) - | Out_of_memory - | Stack_overflow diff --git a/net/unison/files/patch-ocaml_4.07-compat-copyquoterem-01 b/net/unison/files/patch-ocaml_4.07-compat-copyquoterem-01 deleted file mode 100644 index 2fb4193f76fa..000000000000 --- a/net/unison/files/patch-ocaml_4.07-compat-copyquoterem-01 +++ /dev/null @@ -1,209 +0,0 @@ -From accfb998cc9afc95c0b13dac20d9b49ef9af7e8d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?T=C3=B5ivo=20Leedj=C3=A4rv?= <toivol@gmail.com> -Date: Fri, 14 Apr 2023 14:48:48 +0200 -Subject: [PATCH] Revert "Avoid problems with quoting arguments to copyprog" - -This reverts commit e737106fbbd541c5d9536606fb15b04cb165f5d2. ---- - src/copy.ml | 38 ++++++++++++++++++++++-------- - src/external.ml | 45 +++--------------------------------- - src/external.mli | 1 - - src/system/system_generic.ml | 2 -- - src/system/system_intf.ml | 3 --- - 6 files changed, 31 insertions(+), 58 deletions(-) - -diff --git a/src/copy.ml b/src/copy.ml -index 21e22743d..fa704f35c 100644 ---- copy.ml -+++ copy.ml -@@ -911,8 +911,17 @@ let copythreshold = - ^ "See \\sectionref{speeding}{Making Unison Faster on Large Files} " - ^ "for more information.") - --(* Pref copyquoterem removed since 2.53.3 *) --let () = Prefs.markRemoved "copyquoterem" -+let copyquoterem = -+ Prefs.createBoolWithDefault "copyquoterem" -+ ~category:(`Advanced `General) -+ "add quotes to remote file name for copyprog (true/false/default)" -+ ("When set to {\\tt true}, this flag causes Unison to add an extra layer " -+ ^ "of quotes to the remote path passed to the external copy program. " -+ ^ "This is needed by rsync, for example, which internally uses an ssh " -+ ^ "connection requiring an extra level of quoting for paths containing " -+ ^ "spaces. When this flag is set to {\\tt default}, extra quotes are " -+ ^ "added if the value of {\\tt copyprog} contains the string " -+ ^ "{\\tt rsync}.") - - let copymax = - Prefs.createInt "copymax" 1 -@@ -1022,25 +1031,34 @@ let transferFileUsingExternalCopyprog - rootFrom pathFrom rootTo fspathTo pathTo realPathTo - update desc fp ress id useExistingTarget = - Uutil.showProgress id Uutil.Filesize.zero "ext"; -- let progWithArgs = -+ let prog = - if useExistingTarget then - Prefs.read copyprogrest - else - Prefs.read copyprog - in -+ let extraquotes = Prefs.read copyquoterem = `True -+ || ( Prefs.read copyquoterem = `Default -+ && Util.findsubstring "rsync" prog <> None) in -+ let addquotes root s = -+ match root with -+ | Common.Local, _ -> s -+ | Common.Remote _, _ -> if extraquotes then Uutil.quotes s else s in - let fromSpec = - (formatConnectionInfo rootFrom) -- ^ (Fspath.toString (Fspath.concat (snd rootFrom) pathFrom)) in -+ ^ (addquotes rootFrom -+ (Fspath.toString (Fspath.concat (snd rootFrom) pathFrom))) in - let toSpec = - (formatConnectionInfo rootTo) -- ^ (Fspath.toString (Fspath.concat fspathTo pathTo)) in -- Trace.log (progWithArgs ^ " " ^ fromSpec ^ " " ^ toSpec ^ "\n"); -+ ^ (addquotes rootTo -+ (Fspath.toString (Fspath.concat fspathTo pathTo))) in -+ let cmd = prog ^ " " -+ ^ (Uutil.quotes fromSpec) ^ " " -+ ^ (Uutil.quotes toSpec) in -+ Trace.log (Printf.sprintf "%s\n" cmd); - Lwt_util.resize_region !copyprogReg (Prefs.read copymax); -- let args = Str.split (Str.regexp "[ \t]+") progWithArgs in -- let prog = match args with [] -> assert false | h :: _ -> h in - Lwt_util.run_in_region !copyprogReg 1 -- (fun () -> External.runExternalProgramArgs prog -- (Array.of_list (args @ [fromSpec; toSpec]))) >>= fun (_, log) -> -+ (fun () -> External.runExternalProgram cmd) >>= fun (_, log) -> - debug (fun() -> - let l = Util.trimWhitespace log in - Util.msg "transferFileUsingExternalCopyprog %s: returned...\n%s%s" -diff --git a/src/external.ml b/src/external.ml -index f13368231..cefb9ea98 100644 ---- external.ml -+++ external.ml -@@ -25,26 +25,6 @@ let debug = Util.debug "external" - let (>>=) = Lwt.bind - open Lwt - --(* For backwards compatibility with OCaml < 4.12 *) --let path = -- try -- Str.split (Str.regexp (if Util.osType = `Win32 then ";" else ":")) -- (Sys.getenv "PATH") -- with Not_found -> -- [] -- --let search_in_path ?(path = path) name = -- if String.contains name '/' then name else -- Filename.concat -- (List.find (fun dir -> -- let p = Filename.concat dir name in -- let found = System.file_exists p in -- debug (fun () -> Util.msg "'%s' ...%s\n" p -- (match found with true -> "found" | false -> "not found")); -- found) -- path) -- name -- - (* Make sure external process resources are collected and zombie processes - reaped when the Lwt thread calling the external program is stopped - suddenly due to remote connection being closed. *) -@@ -66,17 +46,9 @@ let fullProcRes = - let openProcessIn cmd = inProcRes.register (System.open_process_in cmd) - let closeProcessIn = inProcRes.release - --(* Remove call to search_in_path once we require OCaml >= 4.12. *) --let openProcessArgsIn cmd args = inProcRes.register (System.open_process_args_in (search_in_path cmd) args) --let closeProcessArgsIn = inProcRes.release -- - let openProcessFull cmd = fullProcRes.register (System.open_process_full cmd) - let closeProcessFull = fullProcRes.release - --(* Remove call to search_in_path once we require OCaml >= 4.12. *) --let openProcessArgsFull cmd args = fullProcRes.register (System.open_process_args_full (search_in_path cmd) args) --let closeProcessArgsFull = fullProcRes.release -- - let readChannelTillEof c = - let lst = ref [] in - let rec loop () = -@@ -108,11 +80,10 @@ let readChannelsTillEof l = - >>= (fun res -> return (String.concat "\n" (Safelist.rev res)))) - l - -- --let runExternalProgramAux ~winProc ~posixProc = -+let runExternalProgram cmd = - if Util.osType = `Win32 && not Util.isCygwin then begin - debug (fun()-> Util.msg "Executing external program windows-style\n"); -- let c = winProc () in -+ let c = openProcessIn ("\"" ^ cmd ^ "\"") in - let log = Util.trimWhitespace (readChannelTillEof c) in - let returnValue = closeProcessIn c in - let resultLog = -@@ -124,7 +95,7 @@ let runExternalProgramAux ~winProc ~posixProc = - "") in - Lwt.return (returnValue, resultLog) - end else -- let (out, ipt, err) as desc = posixProc () in -+ let (out, ipt, err) as desc = openProcessFull cmd in - let out = Lwt_unix.intern_in_channel out in - let err = Lwt_unix.intern_in_channel err in - readChannelsTillEof [out;err] -@@ -143,13 +114,3 @@ let runExternalProgramAux ~winProc ~posixProc = - else "\n\n" ^ Util.process_status_to_string returnValue))) - (* Stop typechechecker from complaining about non-exhaustive pattern above *) - | _ -> assert false) -- --let runExternalProgram cmd = -- runExternalProgramAux -- ~winProc:(fun () -> openProcessIn ("\"" ^ cmd ^ "\"")) -- ~posixProc:(fun () -> openProcessFull cmd) -- --let runExternalProgramArgs cmd args = -- runExternalProgramAux -- ~winProc:(fun () -> openProcessArgsIn cmd args) -- ~posixProc:(fun () -> openProcessArgsFull cmd args) -diff --git a/src/external.mli b/src/external.mli -index d2d0bae5b..30d2dbd05 100644 ---- external.mli -+++ external.mli -@@ -2,5 +2,4 @@ - (* Copyright 1999-2020, Benjamin C. Pierce (see COPYING for details) *) - - val runExternalProgram : string -> (Unix.process_status * string) Lwt.t --val runExternalProgramArgs : string -> string array -> (Unix.process_status * string) Lwt.t - val readChannelTillEof : in_channel -> string -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index 15509abd5..3ef4fb09b 100644 ---- system/system_generic.ml -+++ system/system_generic.ml -@@ -272,10 +272,8 @@ let open_in_bin = open_in_bin - - let create_process = Unix.create_process - let open_process_in = Unix.open_process_in --let open_process_args_in = Unix.open_process_args_in - let open_process_out = Unix.open_process_out - let open_process_full cmd = Unix.open_process_full cmd (Unix.environment ()) --let open_process_args_full cmd args = Unix.open_process_args_full cmd args (Unix.environment ()) - let process_in_pid = Unix.process_in_pid - let process_out_pid = Unix.process_out_pid - let process_full_pid = Unix.process_full_pid -diff --git a/src/system/system_intf.ml b/src/system/system_intf.ml -index 873f4ca57..4dc60dd3b 100644 ---- system/system_intf.ml -+++ system/system_intf.ml -@@ -99,12 +99,9 @@ val create_process : - string -> string array -> - Unix.file_descr -> Unix.file_descr -> Unix.file_descr -> int - val open_process_in : string -> in_channel --val open_process_args_in : string -> string array -> in_channel - val open_process_out : string -> out_channel - val open_process_full : - string -> in_channel * out_channel * in_channel --val open_process_args_full : -- string -> string array -> in_channel * out_channel * in_channel - val process_in_pid : in_channel -> int - val process_out_pid : out_channel -> int - val process_full_pid : in_channel * out_channel * in_channel -> int diff --git a/net/unison/files/patch-ocaml_4.07-compat-copyquoterem-02 b/net/unison/files/patch-ocaml_4.07-compat-copyquoterem-02 deleted file mode 100644 index cdd50a67e1d3..000000000000 --- a/net/unison/files/patch-ocaml_4.07-compat-copyquoterem-02 +++ /dev/null @@ -1,54 +0,0 @@ -From f9191b19dfaba01f5903ce36eb0258edef09964e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?T=C3=B5ivo=20Leedj=C3=A4rv?= <toivol@gmail.com> -Date: Tue, 25 Apr 2023 09:35:14 +0200 -Subject: [PATCH] Revert "Regen strings.ml" - -This reverts commit 63963d80157346c2f3c9073f741bbd58e5c32545. ---- - src/strings.ml | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/src/strings.ml b/src/strings.ml -index 6e853eb07..eb00eac5f 100644 ---- strings.ml -+++ strings.ml -@@ -1286,6 +1286,8 @@ let docs = - \032 -copymax n maximum number of simultaneous copyprog transfers\n\ - \032 -copyprog xxx external program for copying large files\n\ - \032 -copyprogrest xxx variant of copyprog for resuming partial transfers\n\ -+ \032 -copyquoterem xxx add quotes to remote file name for copyprog\n\ -+ \032 (true/false/default)\n\ - \032 -copythreshold n use copyprog on files bigger than this (if >=0, in Kb)\n\ - \032 -diff xxx set command for showing differences between files\n\ - \032 -ignorelocks ignore locks left over from previous run (dangerous!)\n\ -@@ -1502,6 +1504,15 @@ let docs = - \032 rsync). The default setting invokes rsync with appropriate\n\ - \032 options\226\128\148most users should not need to change it.\n\ - \n\ -+ \032 copyquoterem xxx\n\ -+ \032 When set to true, this flag causes Unison to add an extra layer\n\ -+ \032 of quotes to the remote path passed to the external copy\n\ -+ \032 program. This is needed by rsync, for example, which internally\n\ -+ \032 uses an ssh connection requiring an extra level of quoting for\n\ -+ \032 paths containing spaces. When this flag is set to default, extra\n\ -+ \032 quotes are added if the value of copyprog contains the string\n\ -+ \032 rsync.\n\ -+ \n\ - \032 copythreshold n\n\ - \032 A number indicating above what filesize (in kilobytes) Unison\n\ - \032 should use the external copying utility specified by copyprog.\n\ -@@ -3113,6 +3124,14 @@ let docs = - \032 copyprog = rsync --inplace --compress\n\ - \032 copyprogrest = rsync --partial --inplace --compress\n\ - \n\ -+ \032 You may also need to set the copyquoterem preference. When it is set to\n\ -+ \032 true, this causes Unison to add an extra layer of quotes to the remote\n\ -+ \032 path passed to the external copy program. This is is needed by rsync,\n\ -+ \032 for example, which internally uses an ssh connection, requiring an\n\ -+ \032 extra level of quoting for paths containing spaces. When this flag is\n\ -+ \032 set to default, extra quotes are added if the value of copyprog\n\ -+ \032 contains the string rsync. The default value is default, naturally.\n\ -+ \n\ - \032 If a directory transfer is interrupted, the next run of Unison will\n\ - \032 automatically skip any files that were completely transferred before\n\ - \032 the interruption. (This behavior is always on: it does not depend on\n\ diff --git a/net/unison232/Makefile b/net/unison232/Makefile index dc2fb3f0217d..a99b37609165 100644 --- a/net/unison232/Makefile +++ b/net/unison232/Makefile @@ -15,6 +15,8 @@ WWW= https://www.cis.upenn.edu/~bcpierce/unison/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN= fails to build with ocaml 4.08 + FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} diff --git a/net/unison240/Makefile b/net/unison240/Makefile index e3a94dd89d8f..b238d6e0dbb6 100644 --- a/net/unison240/Makefile +++ b/net/unison240/Makefile @@ -1,6 +1,6 @@ PORTNAME= unison PORTVERSION= 2.40.128 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} diff --git a/net/unison240/files/patch-ocaml8 b/net/unison240/files/patch-ocaml8 new file mode 100644 index 000000000000..446c260564d7 --- /dev/null +++ b/net/unison240/files/patch-ocaml8 @@ -0,0 +1,52 @@ +From 23fa129254a3304902739fc989950cc747d1e0b3 Mon Sep 17 00:00:00 2001 +From: Jaap Boender <jaapb@kerguelen.org> +Date: Thu, 21 Mar 2019 12:26:51 +0000 +Subject: [PATCH] Compatibility with OCaml 4.08 + +--- + src/files.ml | 2 +- + src/recon.ml | 4 ++-- + src/system/system_generic.ml | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/files.ml b/src/files.ml +index 72cd33875..bc162b12e 100644 +--- files.ml ++++ files.ml +@@ -734,7 +734,7 @@ let get_files_in_directory dir = + with End_of_file -> + dirh.System.closedir () + end; +- Sort.list (<) !files ++ List.sort String.compare !files + + let ls dir pattern = + Util.convertUnixErrorsToTransient +diff --git a/src/recon.ml b/src/recon.ml +index 490baf15a..7a6186bb8 100644 +--- recon.ml ++++ recon.ml +@@ -662,8 +662,8 @@ let rec reconcile + + (* Sorts the paths so that they will be displayed in order *) + let sortPaths pathUpdatesList = +- Sort.list +- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) ++ List.sort ++ Path.compare + pathUpdatesList + + let rec enterPath p1 p2 t = +diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml +index 453027d06..c2288b82b 100755 +--- system/system_generic.ml ++++ system/system_generic.ml +@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen + let chmod = Unix.chmod + let chown = Unix.chown + let utimes = Unix.utimes +-let link = Unix.link ++let link s d = Unix.link s d + let openfile = Unix.openfile + let opendir f = + let h = Unix.opendir f in diff --git a/net/unison248/Makefile b/net/unison248/Makefile index bbe282bbd72f..44cdcabe527e 100644 --- a/net/unison248/Makefile +++ b/net/unison248/Makefile @@ -1,6 +1,6 @@ PORTNAME= unison PORTVERSION= 2.48.15 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= v4 CATEGORIES= net diff --git a/net/unison248/files/patch-ocaml8 b/net/unison248/files/patch-ocaml8 new file mode 100644 index 000000000000..446c260564d7 --- /dev/null +++ b/net/unison248/files/patch-ocaml8 @@ -0,0 +1,52 @@ +From 23fa129254a3304902739fc989950cc747d1e0b3 Mon Sep 17 00:00:00 2001 +From: Jaap Boender <jaapb@kerguelen.org> +Date: Thu, 21 Mar 2019 12:26:51 +0000 +Subject: [PATCH] Compatibility with OCaml 4.08 + +--- + src/files.ml | 2 +- + src/recon.ml | 4 ++-- + src/system/system_generic.ml | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/files.ml b/src/files.ml +index 72cd33875..bc162b12e 100644 +--- files.ml ++++ files.ml +@@ -734,7 +734,7 @@ let get_files_in_directory dir = + with End_of_file -> + dirh.System.closedir () + end; +- Sort.list (<) !files ++ List.sort String.compare !files + + let ls dir pattern = + Util.convertUnixErrorsToTransient +diff --git a/src/recon.ml b/src/recon.ml +index 490baf15a..7a6186bb8 100644 +--- recon.ml ++++ recon.ml +@@ -662,8 +662,8 @@ let rec reconcile + + (* Sorts the paths so that they will be displayed in order *) + let sortPaths pathUpdatesList = +- Sort.list +- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) ++ List.sort ++ Path.compare + pathUpdatesList + + let rec enterPath p1 p2 t = +diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml +index 453027d06..c2288b82b 100755 +--- system/system_generic.ml ++++ system/system_generic.ml +@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen + let chmod = Unix.chmod + let chown = Unix.chown + let utimes = Unix.utimes +-let link = Unix.link ++let link s d = Unix.link s d + let openfile = Unix.openfile + let opendir f = + let h = Unix.opendir f in diff --git a/net/unison251/Makefile b/net/unison251/Makefile index 9d764b79e5f2..26d9e230d9e4 100644 --- a/net/unison251/Makefile +++ b/net/unison251/Makefile @@ -1,6 +1,6 @@ PORTNAME= unison PORTVERSION= 2.51.5 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/print/texvc/Makefile b/print/texvc/Makefile index fb6414e3915e..64a8f239fbea 100644 --- a/print/texvc/Makefile +++ b/print/texvc/Makefile @@ -1,6 +1,6 @@ PORTNAME= texvc PORTVERSION= 20050202 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= print MASTER_SITES= SF/wikipedia/Support%20files/${PORTNAME}%20Linux-x86%20source%20%2B%20binary DISTNAME= ${PORTNAME}-linux-x86-${PORTVERSION} diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile index 3b6ee7652626..06b711900f7e 100644 --- a/science/kalzium/Makefile +++ b/science/kalzium/Makefile @@ -1,5 +1,6 @@ PORTNAME= kalzium DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= science education kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/security/ocaml-cryptgps/Makefile b/security/ocaml-cryptgps/Makefile index 168e099aae4a..e546b892818c 100644 --- a/security/ocaml-cryptgps/Makefile +++ b/security/ocaml-cryptgps/Makefile @@ -1,6 +1,6 @@ PORTNAME= cryptgps PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile index f4fbf0f9b704..fd9c49ca02ca 100644 --- a/security/ocaml-cryptokit/Makefile +++ b/security/ocaml-cryptokit/Makefile @@ -1,5 +1,6 @@ PORTNAME= cryptokit PORTVERSION= 1.11 +PORTREVISION= 1 CATEGORIES= security PKGNAMEPREFIX= ocaml- diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile index 138791b8a337..9bf7ed9c26bb 100644 --- a/security/ocaml-ssl/Makefile +++ b/security/ocaml-ssl/Makefile @@ -1,5 +1,5 @@ PORTNAME= ssl -PORTVERSION= 0.5.9 +PORTVERSION= 0.5.13 CATEGORIES= security devel PKGNAMEPREFIX= ocaml- @@ -28,7 +28,7 @@ do-build: do-install: cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \ - --libdir=${OCAML_SITELIBDIR} + --libdir=${PREFIX}/${OCAML_SITELIBDIR} do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/security/ocaml-ssl/distinfo b/security/ocaml-ssl/distinfo index 12c9a3995701..3014e5484547 100644 --- a/security/ocaml-ssl/distinfo +++ b/security/ocaml-ssl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563180443 -SHA256 (savonet-ocaml-ssl-0.5.9_GH0.tar.gz) = 1f3d66aaf9af5cc9c1fceb8e4bc00ad022035fb44416f6d7cebbad2c963161ea -SIZE (savonet-ocaml-ssl-0.5.9_GH0.tar.gz) = 32721 +TIMESTAMP = 1684362228 +SHA256 (savonet-ocaml-ssl-0.5.13_GH0.tar.gz) = d84e1d25a60a766a9ccc30a3a46229fd83414252f502ff27acba037b473dec7c +SIZE (savonet-ocaml-ssl-0.5.13_GH0.tar.gz) = 40604 diff --git a/security/ocaml-ssl/pkg-plist b/security/ocaml-ssl/pkg-plist index 9a0cb8472a91..5050f84d3a6f 100644 --- a/security/ocaml-ssl/pkg-plist +++ b/security/ocaml-ssl/pkg-plist @@ -19,7 +19,7 @@ %%OCAML_SITELIBDIR%%/ssl/ssl_threads.ml %%OCAML_SITELIBDIR%%/ssl/ssl_threads.mli %%OCAML_SITELIBDIR%%/stublibs/dllssl_stubs.so -%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpn.ml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dune diff --git a/security/sks/Makefile b/security/sks/Makefile index 1e9eed74fb3c..61fd8c7430c6 100644 --- a/security/sks/Makefile +++ b/security/sks/Makefile @@ -1,5 +1,6 @@ PORTNAME= sks PORTVERSION= 1.1.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://bitbucket.org/skskeyserver/sks-keyserver/downloads/ diff --git a/security/sks/files/patch-ocaml408 b/security/sks/files/patch-ocaml408 new file mode 100644 index 000000000000..e423502d534b --- /dev/null +++ b/security/sks/files/patch-ocaml408 @@ -0,0 +1,1001 @@ +From e4ebec61064ba85941acec02efe60b98b54eddb1 Mon Sep 17 00:00:00 2001 +From: Phil Pennock <codehacks@spodhuis.org> +Date: Mon, 16 Jan 2017 15:31:36 -0500 +Subject: [PATCH] Compile with ocaml 4.02.3 (dev-mode fatal warnings) + +--- + .hgignore | 3 ++- + add_mail.ml | 2 +- + bitstring.ml | 73 ++++++++++++++++++++++++++------------------------- + channel.ml | 18 ++++++------- + dbserver.ml | 6 ++--- + heap.ml | 8 +++--- + keyHash.ml | 8 +++--- + linearAlg.ml | 4 +-- + mList.ml | 4 +-- + number.ml | 20 +++++++------- + prefixTree.ml | 20 +++++++------- + rMisc.ml | 35 +++++++++--------------- + rMisc.mli | 3 --- + utils.ml | 36 +++++++++++-------------- + utils.mli | 1 - + wserver.ml | 68 +++++++++++++++++++++++------------------------ + 16 files changed, 147 insertions(+), 162 deletions(-) + +diff --git a/add_mail.ml b/add_mail.ml +index 3233af6..f0f54d6 100644 +--- add_mail.ml ++++ add_mail.ml +@@ -54,7 +54,7 @@ let dirname = + (** dumps contents of one file into another *) + let pipe_file = + let blocksize = 100 * 1024 in +- let buf = String.create blocksize in ++ let buf = BytesLabels.create blocksize in + let rec pipe_file file1 file2 = + let bytes_read = input file1 buf 0 blocksize in + if bytes_read <> 0 then ( +diff --git a/bitstring.ml b/bitstring.ml +index a6d3dad..5e89dbc 100644 +--- bitstring.ml ++++ bitstring.ml +@@ -20,7 +20,8 @@ + (* USA or see <http://www.gnu.org/licenses/>. *) + (***********************************************************************) + +-open StdLabels ++open ArrayLabels ++open BytesLabels + open MoreLabels + + module Unix=UnixLabels +@@ -40,14 +41,14 @@ let bytelength bits = + let create bits = + let bytes = bytelength bits + in +- { a = String.create bytes; ++ { a = BytesLabels.create bytes; + bitlength = bits; + } + + let get ba bit = + let byte_pos = bit / width + and bit_pos = bit mod width in +- let intval = int_of_char (String.get ba.a byte_pos) in ++ let intval = int_of_char (BytesLabels.get ba.a byte_pos) in + (intval lsr (width - bit_pos - 1)) land 1 + + let lget ba bit = get ba bit = 1 +@@ -55,27 +56,27 @@ let lget ba bit = get ba bit = 1 + let flip ba bit = + let byte_pos = bit / width + and bit_pos = bit mod width in +- let intval = int_of_char (String.get ba.a byte_pos) in ++ let intval = int_of_char (BytesLabels.get ba.a byte_pos) in + let new_char = char_of_int ((1 lsl (width - bit_pos - 1)) lxor intval) + in +- String.set ba.a byte_pos new_char ++ BytesLabels.set ba.a byte_pos new_char + + let set ba bit = + let byte_pos = bit / width + and bit_pos = bit mod width in +- let intval = int_of_char (String.get ba.a byte_pos) in ++ let intval = int_of_char (BytesLabels.get ba.a byte_pos) in + let new_char = char_of_int ((1 lsl (width - bit_pos - 1)) lor intval) + in +- String.set ba.a byte_pos new_char ++ BytesLabels.set ba.a byte_pos new_char + + let unset ba bit = + let byte_pos = bit / width + and bit_pos = bit mod width in +- let intval = int_of_char (String.get ba.a byte_pos) in ++ let intval = int_of_char (BytesLabels.get ba.a byte_pos) in + let new_char = char_of_int ((lnot (1 lsl (width - bit_pos - 1))) + land intval) + in +- String.set ba.a byte_pos new_char ++ BytesLabels.set ba.a byte_pos new_char + + let setval ba bit bool = + if bool then set ba bit else unset ba bit +@@ -95,12 +96,12 @@ let hexprint ba = + print_string (Utils.hexstring ba.a) + + let to_bool_array ba = +- Array.init ~f:(fun i -> lget ba i) ba.bitlength ++ ArrayLabels.init ~f:(fun i -> lget ba i) ba.bitlength + + let to_string ba = +- let string = String.create ba.bitlength in ++ let string = BytesLabels.create ba.bitlength in + for i = 0 to ba.bitlength -1 do +- if get ba i = 0 then string.[i] <- '0' else string.[i] <- '1' ++ if get ba i = 0 then BytesLabels.set string i '0' else BytesLabels.set string i '1' + done; + string + +@@ -109,21 +110,21 @@ let to_bytes ba = + for i = ba.bitlength to lastbit do + unset ba i + done; +- String.sub ~pos:0 ~len:(bytelength ba.bitlength) ba.a ++ BytesLabels.sub ~pos:0 ~len:(bytelength ba.bitlength) ba.a + + let of_bytes string bitlength = + { bitlength = bitlength; +- a = String.copy string; ++ a = BytesLabels.copy string; + } + + let of_byte b = + { bitlength = width; +- a = String.make 1 (char_of_int (b land 0xFF)); ++ a = BytesLabels.make 1 (char_of_int (b land 0xFF)); + } + + let of_bytes_all string = +- { bitlength = (String.length string) * width; +- a = String.copy string; ++ { bitlength = (BytesLabels.length string) * width; ++ a = BytesLabels.copy string; + } + + let of_int i = +@@ -137,7 +138,7 @@ let of_bytes_nocopy string bitlength = + } + + let of_bytes_all_nocopy string = +- { bitlength = (String.length string) * width; ++ { bitlength = (BytesLabels.length string) * width; + a = string; + } + +@@ -152,7 +153,7 @@ let to_bytes_nocopy ba = + (************************************************************) + (************************************************************) + +-let copy ba = { ba with a = String.copy ba.a } ++let copy ba = { ba with a = BytesLabels.copy ba.a } + + (** returns a copy of bitstring copied into a new bitstring of a new length. + No guarantees are made as to the contents of the remainder of the bitstring +@@ -160,9 +161,9 @@ let copy ba = { ba with a = String.copy ba.a } + *) + let copy_len ba bitlength = + let bytes = bytelength bitlength in +- let str = String.create bytes in +- String.blit ~src:ba.a ~src_pos:0 +- ~dst:str ~dst_pos:0 ~len:(String.length ba.a); ++ let str = BytesLabels.create bytes in ++ BytesLabels.blit ~src:ba.a ~src_pos:0 ++ ~dst:str ~dst_pos:0 ~len:(BytesLabels.length ba.a); + { a = str; bitlength = bitlength } + + (********************************************************************) +@@ -191,17 +192,17 @@ let shift_left_small ba bits = + if bits > 0 then + let bytes = bytelength ba.bitlength in + for i = 0 to bytes-2 do +- ba.a.[i] <- shift_pair_left ba.a.[i] ba.a.[i+1] bits ++ BytesLabels.set ba.a i (shift_pair_left ba.a.[i] ba.a.[i+1] bits) + done; +- ba.a.[bytes-1] <- shift_pair_left ba.a.[bytes-1] '\000' bits ++ BytesLabels.set ba.a (bytes-1) (shift_pair_left ba.a.[bytes-1] '\000' bits) + + let shift_right_small ba bits = + if bits > 0 then + let bytes = bytelength ba.bitlength in + for i = bytes-1 downto 1 do +- ba.a.[i] <- shift_pair_right ba.a.[i-1] ba.a.[i] bits ++ BytesLabels.set ba.a i (shift_pair_right ba.a.[i-1] ba.a.[i] bits) + done; +- ba.a.[0] <- shift_pair_right '\000' ba.a.[0] bits ++ BytesLabels.set ba.a 0 (shift_pair_right '\000' ba.a.[0] bits) + + (**********************************) + +@@ -216,10 +217,10 @@ let rec shift_left ba bits = + then + begin + for i = 0 to bytelength - 1 - bytes do +- ba.a.[i] <- ba.a.[i+bytes]; ++ BytesLabels.set ba.a i ba.a.[i+bytes]; + done; + for i = bytelength - bytes to bytelength - 1 do +- ba.a.[i] <- '\000' ++ BytesLabels.set ba.a i '\000' + done + end; + shift_left_small ba bits +@@ -235,10 +236,10 @@ and shift_right ba bits = + then + begin + for i = bytelength - 1 downto bytes do +- ba.a.[i] <- ba.a.[i-bytes]; ++ BytesLabels.set ba.a i ba.a.[i-bytes]; + done; + for i = bytes - 1 downto 0 do +- ba.a.[i] <- '\000' ++ BytesLabels.set ba.a i '\000' + done + end; + shift_right_small ba bits +@@ -251,7 +252,7 @@ let num_bytes ba = bytelength ba.bitlength + (********************************************************************) + + let rmasks = +- Array.init width ~f:(fun i -> 0xFF lsl (width - i)) ++ ArrayLabels.init width ~f:(fun i -> 0xFF lsl (width - i)) + + (* Later, extend to have optional initial-position arguments *) + let blit ~src ~dst ~len = +@@ -266,23 +267,23 @@ let blit ~src ~dst ~len = + then raise (Invalid_argument "Bitstring.blit: src too short"); + let bytelen = len / width + and bitlen = len mod width in +- String.blit ++ BytesLabels.blit + ~src:src.a ~src_pos:0 + ~dst:dst.a ~dst_pos:0 ~len:bytelen; + if bitlen > 0 then +- let srcval = int_of_char (String.get src.a bytelen) +- and dstval = int_of_char (String.get dst.a bytelen) in ++ let srcval = int_of_char (BytesLabels.get src.a bytelen) ++ and dstval = int_of_char (BytesLabels.get dst.a bytelen) in + let newdst = (rmasks.(bitlen) land srcval) lor + ((lnot rmasks.(bitlen)) land dstval) + in +- dst.a.[bytelen] <- char_of_int newdst ++ BytesLabels.set dst.a bytelen (char_of_int newdst) + + + (* let full_blit ~src ~src_pos ~dst ~dst_pos ~len = *) + + + let zero_out bs = +- String.fill bs.a ~pos:0 ~len:(String.length bs.a) '\000' ++ BytesLabels.fill bs.a ~pos:0 ~len:(BytesLabels.length bs.a) '\000' + + (* + let extract bs ~pos ~len = +diff --git a/channel.ml b/channel.ml +index 95b599b..3c340d7 100644 +--- channel.ml ++++ channel.ml +@@ -20,7 +20,7 @@ + (* USA or see <http://www.gnu.org/licenses/>. *) + (***********************************************************************) + +-open StdLabels ++open BytesLabels + open MoreLabels + open Common + module Unix=UnixLabels +@@ -50,13 +50,13 @@ let create_nb_really_input inchan = + let string = + match !stringopt with + None -> +- let string = String.create len in ++ let string = BytesLabels.create len in + stringopt := Some string; + pos := 0; + string + | Some string -> string + in +- if String.length string <> len then ++ if BytesLabels.length string <> len then + failwith ("create_nb_really_input: attempt to redo incomplete " ^ + "read with different size"); + +@@ -125,7 +125,7 @@ let read_all cin ?len ()= + None -> 1024 * 100 + | Some x -> x + in +- let sbuf = String.create len ++ let sbuf = BytesLabels.create len + and buf = Buffer.create len in + read_all_rec cin sbuf buf; + Buffer.contents buf +@@ -167,7 +167,7 @@ object (self) + method virtual read_string_pos : buf:string -> pos:int -> len:int -> unit + method virtual read_char : char + method read_string len = +- let buf = String.create len in ++ let buf = BytesLabels.create len in + self#read_string_pos ~buf ~pos:0 ~len; + buf + method read_byte = int_of_char self#read_char +@@ -217,7 +217,7 @@ object (self) + method read_string len = input len + method read_string_pos ~buf ~pos ~len = + let s = input len in +- String.blit ~src:s ~dst:buf ~src_pos:0 ~dst_pos:pos ~len ++ BytesLabels.blit ~src:s ~dst:buf ~src_pos:0 ~dst_pos:pos ~len + + method read_char = + input_char cin +@@ -257,20 +257,20 @@ object (self) + + method read_string len = + if pos + len > slength then raise End_of_file; +- let rval = String.sub string ~pos ~len in ++ let rval = BytesLabels.sub string ~pos ~len in + pos <- pos + len; + rval + + method read_rest = + if pos >= slength then "" + else +- let rval = String.sub string ~pos ~len:(slength - pos) in ++ let rval = BytesLabels.sub string ~pos ~len:(slength - pos) in + pos <- slength; + rval + + method read_string_pos ~buf ~pos:dst_pos ~len = + if pos + len > slength then raise End_of_file; +- String.blit ~src:string ~src_pos:pos ++ BytesLabels.blit ~src:string ~src_pos:pos + ~dst:buf ~dst_pos ~len; + pos <- pos + len + +diff --git a/dbserver.ml b/dbserver.ml +index 583c484..6fbaedb 100644 +--- dbserver.ml ++++ dbserver.ml +@@ -149,8 +149,8 @@ struct + [] + + let get_keys_by_keyid keyid = +- let keyid_length = String.length keyid in +- let short_keyid = String.sub ~pos:(keyid_length - 4) ~len:4 keyid in ++ let keyid_length = BytesLabels.length keyid in ++ let short_keyid = BytesLabels.sub ~pos:(keyid_length - 4) ~len:4 keyid in + let keys = Keydb.get_by_short_subkeyid short_keyid in + match keyid_length with + | 4 -> (* 32-bit keyid. No further filtering required. *) +@@ -396,7 +396,7 @@ struct + let f = (if binary then open_in_bin else open_in) fname in + protect ~f:(fun () -> + let length = in_channel_length f in +- let buf = String.create length in ++ let buf = BytesLabels.create length in + really_input f buf 0 length; + buf + ) +diff --git a/heap.ml b/heap.ml +index 292f432..1cd5646 100644 +--- heap.ml ++++ heap.ml +@@ -20,7 +20,7 @@ + (* USA or see <http://www.gnu.org/licenses/>. *) + (***********************************************************************) + +-open StdLabels ++open ArrayLabels + open MoreLabels + + (* Adapted from CLR *) +@@ -57,7 +57,7 @@ let exchange heap i j = + let resize heap = + if heap.length > Array.length heap.a + then heap.a <- +- Array.init ((Array.length heap.a) * 2) ++ ArrayLabels.init ((Array.length heap.a) * 2) + ~f:(fun i -> + if i < (Array.length heap.a) + then heap.a.(i) +@@ -67,7 +67,7 @@ let resize heap = + if heap.length <= (Array.length heap.a)/3 + && (Array.length heap.a)/2 >= heap.minsize + then heap.a <- +- Array.init ((Array.length heap.a)/ 2) ~f:(fun i -> heap.a.(i)) ++ ArrayLabels.init ((Array.length heap.a)/ 2) ~f:(fun i -> heap.a.(i)) + + + (***************************************************************) +@@ -146,7 +146,7 @@ let push heap ~key ~data = + (***************************************************************) + + let empty cmp i = +- { a = Array.create i None; ++ { a = Array.make i None; + length = 0; + minsize = i; + cmp = cmp; +diff --git a/keyHash.ml b/keyHash.ml +index ca7c6d6..0a85b6d 100644 +--- keyHash.ml ++++ keyHash.ml +@@ -72,12 +72,12 @@ let hexchar_to_int c = + ) + + let dehexify s = +- let s = String.uppercase s in +- let ns = String.create (String.length s / 2) in (* new string *) +- for i = 0 to String.length ns - 1 do ++ let s = BytesLabels.uppercase s in ++ let ns = BytesLabels.create (BytesLabels.length s / 2) in (* new string *) ++ for i = 0 to BytesLabels.length ns - 1 do + let first = hexchar_to_int s.[2 * i] + and second = hexchar_to_int s.[2 * i + 1] + in +- ns.[i] <- char_of_int ((first lsl 4) + second) ++ BytesLabels.set ns i (char_of_int ((first lsl 4) + second)) + done; + ns +diff --git a/linearAlg.ml b/linearAlg.ml +index 81a9d88..a4aba71 100644 +--- linearAlg.ml ++++ linearAlg.ml +@@ -20,9 +20,9 @@ + (* USA or see <http://www.gnu.org/licenses/>. *) + (***********************************************************************) + +-open StdLabels + open MoreLabels + module Unix=UnixLabels ++module Array=ArrayLabels + open Printf + open ZZp.Infix + +@@ -62,7 +62,7 @@ struct + let copy m = { m with array = Array.copy m.array; } + + let make ~columns ~rows init = +- let array = Array.create (columns * rows) init in ++ let array = Array.make (columns * rows) init in + { columns = columns; + rows = rows; + array = array; +diff --git a/mList.ml b/mList.ml +index f473a64..c0d4c79 100644 +--- mList.ml ++++ mList.ml +@@ -200,7 +200,7 @@ let pri_split pri list = + (low,exact,high) + + let has_dups list = +- let slist = Sort.list (fun x y -> x < y) list in ++ let slist = List.sort compare list in + let rec dup_scan list = match list with + [] -> false + | hd::[] -> false +@@ -208,7 +208,7 @@ let has_dups list = + in dup_scan slist + + let dedup list = +- let slist = Sort.list (fun x y -> x < y) list in ++ let slist = List.sort compare list in + let rec dedup ~list ~partial = match list with + [] -> partial + | hd::[] -> dedup ~list:[] ~partial:(hd::partial) +diff --git a/number.ml b/number.ml +index 3e33077..fc9d5ba 100644 +--- number.ml ++++ number.ml +@@ -22,7 +22,7 @@ + (***********************************************************************) + + open Big_int +-open StdLabels ++open BytesLabels + open MoreLabels + open Printf + open Common +@@ -59,31 +59,31 @@ let width = 8 + let width_pow = power_int_positive_int 2 width + + let revstring s = +- let len = String.length s in +- let copy = String.create len in ++ let len = BytesLabels.length s in ++ let copy = BytesLabels.create len in + for i = 0 to len - 1 do +- copy.[i] <- s.[len - 1 - i] ++ BytesLabels.set copy i s.[len - 1 - i] + done; + copy + + let revstring_inplace s = +- let len = String.length s in ++ let len = BytesLabels.length s in + for i = 0 to (len - 2)/2 do + let j = len - 1 - i in + let tmp = s.[i] in +- s.[i] <- s.[j]; +- s.[j] <- tmp ++ BytesLabels.set s i s.[j]; ++ BytesLabels.set s j tmp + done + + let to_bytes ~nbytes n = + if sign_big_int n = -1 + then raise (Invalid_argument "N.to_bytes: negative argument"); +- let string = String.create nbytes in ++ let string = BytesLabels.create nbytes in + let rec loop n i = + if i < 0 then string + else + let (a,b) = quomod_big_int n width_pow in +- string.[i] <- char_of_int (int_of_big_int b); ++ BytesLabels.set string i (char_of_int (int_of_big_int b)); + loop a (i - 1) + in + let str = loop n (nbytes - 1) in +@@ -92,7 +92,7 @@ let to_bytes ~nbytes n = + + let of_bytes str = + let str = revstring str in +- let nbytes = String.length str in ++ let nbytes = BytesLabels.length str in + let rec loop n i = + if i >= nbytes then n + else +diff --git a/prefixTree.ml b/prefixTree.ml +index 4aa4fbb..6721c28 100644 +--- prefixTree.ml ++++ prefixTree.ml +@@ -20,11 +20,13 @@ + (* USA or see <http://www.gnu.org/licenses/>. *) + (***********************************************************************) + +-open StdLabels ++open BytesLabels + open MoreLabels + open Printf + open Common + module Unix=UnixLabels ++module Array=ArrayLabels ++module List=ListLabels + (*module ZZp = RMisc.ZZp *) + module Set = PSet.Set + module ZSet = ZZp.Set +@@ -161,7 +163,7 @@ let unmarshal_of_string ~f s = + + let samesize set = + let sizes = Set.fold ~init:Set.empty set +- ~f:(fun string set -> Set.add (String.length string) set) ++ ~f:(fun string set -> Set.add (BytesLabels.length string) set) + in + let nsizes = Set.cardinal sizes in + nsizes = 1 || nsizes = 0 +@@ -728,11 +730,11 @@ let split_at_depth t zz zzs node depth = + (******************************************************************) + + let pad string bytes = +- let len = String.length string in ++ let len = BytesLabels.length string in + if bytes > len then +- let nstr = String.create bytes in +- String.fill nstr ~pos:len ~len:(bytes - len) '\000'; +- String.blit ~src:string ~dst:nstr ~src_pos:0 ~dst_pos:0 ~len; ++ let nstr = BytesLabels.create bytes in ++ BytesLabels.fill nstr ~pos:len ~len:(bytes - len) '\000'; ++ BytesLabels.blit ~src:string ~dst:nstr ~src_pos:0 ~dst_pos:0 ~len; + nstr + else + string +@@ -819,11 +821,11 @@ let rec insert_at_depth t zz zzs node marray depth = + + let insert_both t txn zz zzs = + let zzs = pad zzs (ZZp.num_bytes ()) in +- if String.length zzs <> ZZp.num_bytes () ++ if BytesLabels.length zzs <> ZZp.num_bytes () + then raise (Invalid_argument + (sprintf "%s. %d found, %d expected" + "PrefixTree.insert_both: zzs has wrong length" +- (String.length zzs) (ZZp.num_bytes ()) ++ (BytesLabels.length zzs) (ZZp.num_bytes ()) + )); + let marray = ZZp.add_el_array ~points:t.points zz in + let root = t.root in +@@ -875,7 +877,7 @@ let rec delete_at_depth t txn zz zzs node marray depth = + + let delete_both t txn zz zzs = + let zzs = pad zzs (ZZp.num_bytes ()) in +- if String.length zzs <> ZZp.num_bytes () ++ if BytesLabels.length zzs <> ZZp.num_bytes () + then raise (Invalid_argument + "PrefixTree.delete_both: zzs has wrong length"); + let marray = ZZp.del_el_array ~points:t.points zz in +diff --git a/rMisc.ml b/rMisc.ml +index 63792c1..e8278fc 100644 +--- rMisc.ml ++++ rMisc.ml +@@ -22,9 +22,10 @@ + (* USA or see <http://www.gnu.org/licenses/>. *) + (***********************************************************************) + +-open StdLabels ++open BytesLabels + open MoreLabels + module Unix=UnixLabels ++module List=ListLabels + + (** deterministic RNG *) + let det_rng = Random.State.make [|104|] +@@ -56,15 +57,15 @@ let rec fill_random_string rfunc string ~pos ~len = + (* CR yminsky: I think this has the same bug as the function with the same name in Utils *) + let _bits = rfunc () in + for i = 0 to steps - 1 do +- string.[pos + i] <- +- char_of_int (0xFF land ((rfunc ()) lsr (8 * i))) ++ BytesLabels.set string (pos + i) ( ++ char_of_int (0xFF land ((rfunc ()) lsr (8 * i)))) + done; + fill_random_string rfunc string ~pos:(pos + steps) ~len + else + () + + let random_string rfunc len = +- let string = String.create len in ++ let string = BytesLabels.create len in + fill_random_string rfunc string ~pos:0 ~len; + string + +@@ -114,19 +115,15 @@ let print_string_set set = + List.iter ~f:(fun string -> print_string string; print_newline ()) + *) + +-let add_sarray ~data sarray = +- Array.fold_right ~f:(fun string set -> Set.add string set) +- sarray ~init:data +- + (*****************************************************************) + (*****************************************************************) + + let pad string bytes = +- let len = String.length string in ++ let len = BytesLabels.length string in + if bytes > len then +- let nstr = String.create bytes in +- String.fill nstr ~pos:len ~len:(bytes - len) '\000'; +- String.blit ~src:string ~dst:nstr ~src_pos:0 ~dst_pos:0 ~len; ++ let nstr = BytesLabels.create bytes in ++ BytesLabels.fill nstr ~pos:len ~len:(bytes - len) '\000'; ++ BytesLabels.blit ~src:string ~dst:nstr ~src_pos:0 ~dst_pos:0 ~len; + nstr + else + string +@@ -137,10 +134,10 @@ let padset stringset bytes = + ~init:Set.empty stringset + + let truncate string bytes = +- let len = String.length string in ++ let len = BytesLabels.length string in + if bytes < len then +- let nstr = String.create bytes in +- String.blit ~src:string ~dst:nstr ~src_pos:0 ~dst_pos:0 ~len:bytes; ++ let nstr = BytesLabels.create bytes in ++ BytesLabels.blit ~src:string ~dst:nstr ~src_pos:0 ~dst_pos:0 ~len:bytes; + nstr + else + string +@@ -157,14 +154,6 @@ let truncset stringset bytes = + + let order_string = "530512889551602322505127520352579437339" + +-(** Printing Functions *) +- +-let print_ZZp_list list = +- let list = Sort.list (fun x y -> compare x y < 0) list in +- MList.print2 ~f:ZZp.print list +- +-let print_ZZp_set set = print_ZZp_list (Set.elements set) +- + + (************* Initialization code ****************************) + +diff --git a/rMisc.mli b/rMisc.mli +index cc7b6e1..6ddddad 100644 +--- rMisc.mli ++++ rMisc.mli +@@ -15,11 +15,8 @@ val det_string_set : bytes:int -> size:int -> string PSet.Set.t + val rand_string_set : bytes:int -> size:int -> string PSet.Set.t + val localize_string_set : + bytes:int -> diff:int -> string PSet.Set.t -> string PSet.Set.t +-val add_sarray : data:'a PSet.Set.t -> 'a array -> 'a PSet.Set.t + val pad : string -> int -> string + val padset : string PSet.Set.t -> int -> string PSet.Set.t + val truncate : string -> int -> string + val truncset : string PSet.Set.t -> int -> string PSet.Set.t + val order_string : string +-val print_ZZp_list : ZZp.zz list -> unit +-val print_ZZp_set : ZZp.zz PSet.Set.t -> unit +diff --git a/utils.ml b/utils.ml +index b9b4347..38a642c 100644 +--- utils.ml ++++ utils.ml +@@ -20,11 +20,12 @@ + (* USA or see <http://www.gnu.org/licenses/>. *) + (***********************************************************************) + +-open StdLabels ++open BytesLabels + open MoreLabels + module Unix=UnixLabels + module Set = PSet.Set + module Map = PMap.Map ++module List = StdLabels.List + + open Printf + +@@ -104,8 +105,8 @@ let is_alnum char = + + + let rec extract_words_rec s ~start ~len partial = +- let one () = Set.add (String.lowercase (String.sub s start len)) partial in +- if start + len = String.length s ++ let one () = Set.add (BytesLabels.lowercase (BytesLabels.sub s start len)) partial in ++ if start + len = BytesLabels.length s + then ( if len = 0 then partial + else one ()) + else ( +@@ -173,12 +174,12 @@ let random_int low high = + let char_width = 8 + + let hexstring digest = +- let result = String.create (String.length digest * 2) in ++ let result = BytesLabels.create (BytesLabels.length digest * 2) in + let hex = "0123456789ABCDEF" in +- for i = 0 to String.length digest - 1 do ++ for i = 0 to BytesLabels.length digest - 1 do + let c = Char.code digest.[i] in +- result.[2*i] <- hex.[c lsr 4]; +- result.[2*i+1] <- hex.[c land 0xF] ++ set result (2*i) hex.[c lsr 4]; ++ set result (2*i+1) hex.[c land 0xF] + done; + result + +@@ -192,11 +193,11 @@ let int_from_bstring string ~pos ~len = + int_from_bstring_rec string ~pos ~len 0 + + let bstring_of_int i = +- let s = String.create 4 in +- s.[3] <- char_of_int (i land 0xFF); +- s.[2] <- char_of_int ((i lsr 8) land 0xFF); +- s.[1] <- char_of_int ((i lsr 16) land 0xFF); +- s.[0] <- char_of_int ((i lsr 24) land 0xFF); ++ let s = BytesLabels.create 4 in ++ set s 3 (char_of_int (i land 0xFF)); ++ set s 2 (char_of_int ((i lsr 8) land 0xFF)); ++ set s 1 (char_of_int ((i lsr 16) land 0xFF)); ++ set s 0 (char_of_int ((i lsr 24) land 0xFF)); + s + + (* tail recursive *) +@@ -220,12 +221,6 @@ let create_rand_bits () = + + let rbit = create_rand_bits () + +-(* FIX: this depends on the interals of the sort mechanism. +- A rather cheap trick, really. It does work at present, though *) +-let permute list = +- let cmp i j = (rbit ()) * 2 - 1 in +- List.sort ~cmp list +- + (* Exception Handling *) + + exception FinalDouble of exn * exn +@@ -265,15 +260,16 @@ let rec fill_random_string rfunc string ~pos ~len = + the random generation being deterministic *) + let _bits = rfunc () in + for i = 0 to steps - 1 do +- string.[pos + i] <- ++ set string (pos + i) ( + char_of_int (0xFF land ((rfunc ()) lsr (8 * i))) ++ ) + done; + fill_random_string rfunc string ~pos:(pos + steps) ~len + else + () + + let random_string rfunc len = +- let string = String.create len in ++ let string = BytesLabels.create len in + fill_random_string rfunc string ~pos:0 ~len; + string + +diff --git a/utils.mli b/utils.mli +index bcc6aed..3924541 100644 +--- utils.mli ++++ utils.mli +@@ -24,7 +24,6 @@ val apply : int -> ('a -> 'a) -> 'a -> 'a + val get_bit : pos:int -> int -> int + val create_rand_bits : unit -> unit -> int + val rbit : unit -> int +-val permute : 'a list -> 'a list + exception FinalDouble of exn * exn + exception Final of exn + val try_finally : f:(unit -> 'a) -> finally:(unit -> 'b) -> 'a +diff --git a/wserver.ml b/wserver.ml +index 6ccfc62..e04a201 100644 +--- wserver.ml ++++ wserver.ml +@@ -53,49 +53,49 @@ let hexa_val conf = + + let decode s = + let rec need_decode i = +- if i < String.length s then ++ if i < BytesLabels.length s then + match s.[i] with + '%' | '+' -> true + | _ -> need_decode (succ i) + else false + in + let rec compute_len i i1 = +- if i < String.length s then ++ if i < BytesLabels.length s then + let i = + match s.[i] with +- '%' when i + 2 < String.length s -> i + 3 ++ '%' when i + 2 < BytesLabels.length s -> i + 3 + | _ -> succ i + in + compute_len i (succ i1) + else i1 + in + let rec copy_decode_in s1 i i1 = +- if i < String.length s then ++ if i < BytesLabels.length s then + let i = + match s.[i] with +- '%' when i + 2 < String.length s -> ++ '%' when i + 2 < BytesLabels.length s -> + let v = hexa_val s.[i + 1] * 16 + hexa_val s.[i + 2] in +- s1.[i1] <- Char.chr v; i + 3 +- | '+' -> s1.[i1] <- ' '; succ i +- | x -> s1.[i1] <- x; succ i ++ BytesLabels.set s1 i1 (Char.chr v); i + 3 ++ | '+' -> BytesLabels.set s1 i1 ' '; succ i ++ | x -> BytesLabels.set s1 i1 x; succ i + in + copy_decode_in s1 i (succ i1) + else s1 + in + let rec strip_heading_and_trailing_spaces s = +- if String.length s > 0 then ++ if BytesLabels.length s > 0 then + if s.[0] == ' ' then + strip_heading_and_trailing_spaces +- (String.sub s 1 (String.length s - 1)) +- else if s.[String.length s - 1] == ' ' then ++ (BytesLabels.sub s 1 (BytesLabels.length s - 1)) ++ else if s.[BytesLabels.length s - 1] == ' ' then + strip_heading_and_trailing_spaces +- (String.sub s 0 (String.length s - 1)) ++ (BytesLabels.sub s 0 (BytesLabels.length s - 1)) + else s + else s + in + if need_decode 0 then + let len = compute_len 0 0 in +- let s1 = String.create len in ++ let s1 = BytesLabels.create len in + strip_heading_and_trailing_spaces (copy_decode_in s1 0 0) + else s + +@@ -104,54 +104,54 @@ let special x = List.mem x ['='; '&'; '"'; '\r'; '\n'; '+'] + + let encode s = + let rec need_code i = +- if i < String.length s then ++ if i < BytesLabels.length s then + match s.[i] with + ' ' -> true + | x -> if special x then true else need_code (succ i) + else false + in + let rec compute_len i i1 = +- if i < String.length s then ++ if i < BytesLabels.length s then + let i1 = if special s.[i] then i1 + 3 else succ i1 in + compute_len (succ i) i1 + else i1 + in + let rec copy_code_in s1 i i1 = +- if i < String.length s then ++ if i < BytesLabels.length s then + let i1 = + match s.[i] with +- ' ' -> s1.[i1] <- '+'; succ i1 ++ ' ' -> BytesLabels.set s1 i1 '+'; succ i1 + | c -> + if special c then + begin +- s1.[i1] <- '%'; +- s1.[i1 + 1] <- hexa_digit (Char.code c / 16); +- s1.[i1 + 2] <- hexa_digit (Char.code c mod 16); ++ BytesLabels.set s1 i1 '%'; ++ BytesLabels.set s1 (i1 + 1) (hexa_digit (Char.code c / 16)); ++ BytesLabels.set s1 (i1 + 2) (hexa_digit (Char.code c mod 16)); + i1 + 3 + end +- else begin s1.[i1] <- c; succ i1 end ++ else begin BytesLabels.set s1 i1 c; succ i1 end + in + copy_code_in s1 (succ i) i1 + else s1 + in + if need_code 0 then +- let len = compute_len 0 0 in copy_code_in (String.create len) 0 0 ++ let len = compute_len 0 0 in copy_code_in (BytesLabels.create len) 0 0 + else s + + let stripchars = Set.of_list [ ' '; '\t'; '\n'; '\r' ] + + let strip s = + let start = ref 0 in +- while (!start < String.length s ++ while (!start < BytesLabels.length s + && Set.mem s.[!start] stripchars) do + incr start + done; +- let stop = ref (String.length s - 1) in ++ let stop = ref (BytesLabels.length s - 1) in + while (!stop >= 0 && Set.mem s.[!stop] stripchars) do + decr stop + done; + if !stop >= !start then +- String.sub s ~pos:!start ~len:(!stop - !start + 1) ++ BytesLabels.sub s ~pos:!start ~len:(!stop - !start + 1) + else + "" + +@@ -180,7 +180,7 @@ let parse_post headers cin = + if len > max_post_length + then raise (Entity_too_large (sprintf "POST data too long: %f megs" + (float len /. 1024. /. 1024.))); +- let rest = String.create len in ++ let rest = BytesLabels.create len in + really_input cin rest 0 len; + rest + with +@@ -188,20 +188,20 @@ let parse_post headers cin = + failwith "parse_post failed for lack of a content-length header" + + let is_blank line = +- String.length line = 0 || line.[0] = '\r' ++ BytesLabels.length line = 0 || line.[0] = '\r' + + let rec parse_headers map cin = + let line = input_line cin in (* DoS attack: input_line is unsafe on sockets *) + if is_blank line then map + else +- let colonpos = try String.index line ':' with ++ let colonpos = try BytesLabels.index line ':' with + Not_found -> failwith "Error parsing headers: no colon found" + in +- let key = String.sub line ~pos:0 ~len:colonpos +- and data = String.sub line ~pos:(colonpos + 1) +- ~len:(String.length line - colonpos - 1) ++ let key = BytesLabels.sub line ~pos:0 ~len:colonpos ++ and data = BytesLabels.sub line ~pos:(colonpos + 1) ++ ~len:(BytesLabels.length line - colonpos - 1) + in +- parse_headers (map |< (String.lowercase key, strip data)) cin ++ parse_headers (map |< (BytesLabels.lowercase key, strip data)) cin + + let parse_request cin = + let line = input_line cin in (* DoS attack: input_line is unsafe on sockets *) +@@ -217,7 +217,7 @@ let headers_to_string map = + let pieces = List.map ~f:(fun (x,y) -> sprintf "%s:%s" x y) + (Map.to_alist map) + in +- "\n" ^ (String.concat "\n" pieces) ++ "\n" ^ (BytesLabels.concat "\n" pieces) + + let request_to_string request = + let (kind,req,headers) = +@@ -296,7 +296,7 @@ let send_result cout ?(error_code = 200) ?(content_type = "text/html; charset=UT + fprintf cout "Cache-Control: no-cache\r\n"; + fprintf cout "Pragma: no-cache\r\n"; + fprintf cout "Expires: 0\r\n"; +- fprintf cout "Content-length: %u\r\n" (String.length body + 2); ++ fprintf cout "Content-length: %u\r\n" (BytesLabels.length body + 2); + if count >= 0 then + fprintf cout "X-HKP-Results-Count: %d\r\n" count; + fprintf cout "Content-type: %s\r\n" content_type; diff --git a/sysutils/ledit/Makefile b/sysutils/ledit/Makefile index 7400a9a813f2..8dbcab6f22a6 100644 --- a/sysutils/ledit/Makefile +++ b/sysutils/ledit/Makefile @@ -1,5 +1,6 @@ PORTNAME= ledit PORTVERSION= 2.04 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://cristal.inria.fr/%SUBDIR%/ \ http://pauillac.inria.fr/%SUBDIR%/ diff --git a/textproc/bibtex2html/Makefile b/textproc/bibtex2html/Makefile index 0dd8cd983514..c7b90625343f 100644 --- a/textproc/bibtex2html/Makefile +++ b/textproc/bibtex2html/Makefile @@ -1,5 +1,6 @@ PORTNAME= bibtex2html PORTVERSION= 1.99 +PORTREVISION= 1 CATEGORIES= textproc print MASTER_SITES= http://www.lri.fr/~filliatr/ftp/bibtex2html/ diff --git a/textproc/htmlc/Makefile b/textproc/htmlc/Makefile index b8e5fe740c52..f68e0abd7d6b 100644 --- a/textproc/htmlc/Makefile +++ b/textproc/htmlc/Makefile @@ -1,5 +1,6 @@ PORTNAME= htmlc PORTVERSION= 2.21.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://htmlc.inria.fr/ \ http://caml.inria.fr/distrib/bazar-ocaml/htmlc/ diff --git a/textproc/ocaml-csv/Makefile b/textproc/ocaml-csv/Makefile index bb70111d7eb2..d3ece45f4eaa 100644 --- a/textproc/ocaml-csv/Makefile +++ b/textproc/ocaml-csv/Makefile @@ -1,6 +1,6 @@ PORTNAME= ocaml-csv PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/420/ diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile index 340b83ac5c20..6e24d2d687d9 100644 --- a/textproc/ocaml-expat/Makefile +++ b/textproc/ocaml-expat/Makefile @@ -1,6 +1,6 @@ PORTNAME= expat PORTVERSION= 0.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= http://www.xs4all.nl/~mmzeeman/ocaml/ PKGNAMEPREFIX= ocaml- diff --git a/textproc/ocaml-text/Makefile b/textproc/ocaml-text/Makefile index 4cba73e56340..c50774fd5f43 100644 --- a/textproc/ocaml-text/Makefile +++ b/textproc/ocaml-text/Makefile @@ -1,5 +1,6 @@ PORTNAME= text PORTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= ocaml- diff --git a/textproc/pdfsandwich/Makefile b/textproc/pdfsandwich/Makefile index 0366de6c878c..0a74bac97ca9 100644 --- a/textproc/pdfsandwich/Makefile +++ b/textproc/pdfsandwich/Makefile @@ -1,6 +1,6 @@ PORTNAME= pdfsandwich DISTVERSION= 0.1.7 -PORTREVISION= 38 +PORTREVISION= 39 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/pdfsandwich%20${DISTVERSION}/ diff --git a/www/geneweb/Makefile b/www/geneweb/Makefile index 5903086b9cab..02ae50e10432 100644 --- a/www/geneweb/Makefile +++ b/www/geneweb/Makefile @@ -1,7 +1,7 @@ PORTNAME= geneweb DISTVERSIONPREFIX= distrib- DISTVERSION= 6-08 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= alex@stangl.us diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile index 2bf27cbb3752..5ecec15763d7 100644 --- a/x11-toolkits/ocaml-lablgtk2/Makefile +++ b/x11-toolkits/ocaml-lablgtk2/Makefile @@ -1,5 +1,6 @@ PORTNAME= lablgtk2 PORTVERSION= 2.18.13 +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= ocaml- diff --git a/x11-toolkits/ocaml-lablgtk3/Makefile b/x11-toolkits/ocaml-lablgtk3/Makefile index 3098148b6aae..8be4c8cd42b5 100644 --- a/x11-toolkits/ocaml-lablgtk3/Makefile +++ b/x11-toolkits/ocaml-lablgtk3/Makefile @@ -1,6 +1,6 @@ PORTNAME= lablgtk3 PORTVERSION= 3.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= ocaml- @@ -56,7 +56,7 @@ do-build: do-install: cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \ - --libdir=${OCAML_SITELIBDIR} ${TARGETS} + --libdir=${PREFIX}/${OCAML_SITELIBDIR} ${TARGETS} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/x11-toolkits/ocaml-labltk/Makefile b/x11-toolkits/ocaml-labltk/Makefile index b9d40157ac5d..7b4941fae228 100644 --- a/x11-toolkits/ocaml-labltk/Makefile +++ b/x11-toolkits/ocaml-labltk/Makefile @@ -1,7 +1,6 @@ PORTNAME= labltk -PORTVERSION= 8.06.5 +PORTVERSION= 8.06.7 CATEGORIES= x11-toolkits -MASTER_SITES= https://download.ocamlcore.org/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= ocaml- MAINTAINER= danfe@FreeBSD.org @@ -21,6 +20,9 @@ USE_OCAML= yes ALL_TARGET= all opt +USE_GITHUB= yes +GH_ACCOUNT= garrigue + post-patch: @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} \ -e 's/$$(INSTALLDIR)/$$(DESTDIR)$$(INSTALLDIR)/g' \ diff --git a/x11-toolkits/ocaml-labltk/distinfo b/x11-toolkits/ocaml-labltk/distinfo index 092fdc575b75..62adc5c3c9f2 100644 --- a/x11-toolkits/ocaml-labltk/distinfo +++ b/x11-toolkits/ocaml-labltk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559830611 -SHA256 (labltk-8.06.5.tar.gz) = 92ff3358cd28d6b0c60d17367a875cd895741dbebae20ba310ee4d1e7c31fd71 -SIZE (labltk-8.06.5.tar.gz) = 370149 +TIMESTAMP = 1681675195 +SHA256 (garrigue-labltk-8.06.7_GH0.tar.gz) = e20a41a644d3c8a877409f5a8f3f7eab9261655410875d3f4da680f5fc864b3e +SIZE (garrigue-labltk-8.06.7_GH0.tar.gz) = 370870 |