git: 2b40e4609399 - main - lang/ocaml: Update to 4.08.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Jul 2023 09:55:30 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2b40e4609399858e2bfbddcf961bd7c947f6ed2c
commit 2b40e4609399858e2bfbddcf961bd7c947f6ed2c
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-07-05 09:51:47 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-07-05 09:55:16 +0000
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
---
MOVED | 1 +
archivers/ocaml-bz2/Makefile | 2 +-
archivers/ocaml-zip/Makefile | 1 +
converters/ocaml-base64/Makefile | 1 +
converters/ocaml-jsonm/Makefile | 1 +
databases/ocaml-dbm/Makefile | 1 +
databases/ocaml-mysql/Makefile | 1 +
databases/ocaml-sqlite3/Makefile | 1 +
devel/Makefile | 2 +-
devel/aifad/Makefile | 1 +
devel/cil/Makefile | 2 +-
devel/coccinelle/Makefile | 6 +-
devel/coccinelle/distinfo | 6 +-
devel/coccinelle/files/patch-bundles_pyml_Makefile | 26 -
...undles_pyml_pyml-current_pyml__arch__freebsd.ml | 15 -
devel/coccinelle/files/patch-stdcompat-fix | 39 +
devel/coccinelle/pkg-plist | 9 -
devel/menhir/Makefile | 1 +
devel/ocaml-annexlib/Makefile | 2 +-
devel/ocaml-calendar/Makefile | 1 +
devel/ocaml-camljava/Makefile | 2 +-
devel/ocaml-camlp4/Makefile | 2 +-
devel/ocaml-camlp4/distinfo | 6 +-
.../files/patch-camlp4_Camlp4_Debug.ml | 11 +
devel/ocaml-camlp5/Makefile | 1 +
devel/ocaml-camomile-examples/Makefile | 1 +
devel/ocaml-camomile/Makefile | 5 +-
.../patch-Camomile_internal_byte__labeled__dag.ml | 11 +
.../files/patch-Camomile_public_charEncoding.ml | 17 +
.../files/patch-Camomile_public_charEncoding.mli | 17 +
.../files/patch-Camomile_public_oOChannel.mli | 12 +
.../files/patch-Camomile_public_uCS4.ml | 9 +
.../files/patch-Camomile_public_uCol.ml | 37 +
.../files/patch-Camomile_public_uCol.mli | 19 +
.../files/patch-Camomile_public_uTF8.ml | 11 +
.../files/patch-Camomile_toolslib_absCe.ml | 11 +
devel/ocaml-camomile/pkg-plist | 154 +-
devel/ocaml-cfg/Makefile | 3 +-
devel/ocaml-classes/Makefile | 1 +
devel/ocaml-cmdliner/Makefile | 2 +-
devel/ocaml-cppo/Makefile | 3 +-
devel/ocaml-cppo/pkg-plist | 32 +-
devel/ocaml-dune/Makefile | 18 +-
devel/ocaml-dune/distinfo | 6 +-
devel/ocaml-dune/files/patch-Makefile | 29 +
devel/ocaml-dune/files/setup.ml.in | 12 +
devel/ocaml-dune/pkg-plist | 1556 +++++++++++++-------
devel/ocaml-extlib/Makefile | 1 +
devel/ocaml-findlib/Makefile | 2 +-
devel/ocaml-findlib/distinfo | 6 +-
devel/ocaml-findlib/files/patch-Makefile | 61 +-
.../ocaml-findlib/files/patch-src__bytes__Makefile | 15 -
.../files/patch-src_findlib-toolbox_Makefile | 12 -
.../ocaml-findlib/files/patch-src_findlib_Makefile | 42 -
devel/ocaml-findlib/pkg-plist | 10 +-
devel/ocaml-ipaddr/Makefile | 18 +-
devel/ocaml-ipaddr/distinfo | 5 +-
devel/ocaml-ipaddr/files/patch-lib_ipaddr.ml | 33 +
devel/ocaml-ipaddr/pkg-plist | 80 +
devel/ocaml-lacaml/Makefile | 2 +-
devel/ocaml-lwt/Makefile | 1 +
devel/ocaml-lwt/files/patch-src_unix_lwt__bytes.ml | 12 +
devel/ocaml-magic/Makefile | 2 +-
devel/ocaml-ocamlbuild/Makefile | 1 +
devel/ocaml-opam/Makefile | 1 +
devel/ocaml-ounit/Makefile | 2 +-
devel/ocaml-parmap/Makefile | 16 +-
devel/ocaml-parmap/distinfo | 6 +-
devel/ocaml-parmap/files/patch-Makefile.in | 15 -
devel/ocaml-parmap/pkg-plist | 61 +-
devel/ocaml-pcre/Makefile | 2 +-
devel/ocaml-pomap/Makefile | 3 +-
devel/ocaml-ppx-tools/Makefile | 14 +-
devel/ocaml-ppx-tools/distinfo | 6 +-
devel/ocaml-ppx-tools/pkg-plist | 60 +-
devel/ocaml-re/Makefile | 1 +
devel/ocaml-react/Makefile | 1 +
devel/ocaml-res/Makefile | 3 +-
devel/ocaml-result/Makefile | 3 +-
devel/ocaml-sdl/Makefile | 2 +-
devel/ocaml-sem/Makefile | 2 +-
devel/ocaml-sexplib/Makefile | 43 -
devel/ocaml-sexplib/distinfo | 2 -
devel/ocaml-sexplib/files/patch-lib_conv.ml | 54 -
devel/ocaml-sexplib/files/patch-lib_lexer.mll | 29 -
devel/ocaml-sexplib/files/patch-lib_path.ml | 16 -
devel/ocaml-sexplib/files/patch-lib_pre__sexp.ml | 139 --
devel/ocaml-sexplib/files/patch-lib_sexp__intf.ml | 133 --
devel/ocaml-sexplib0/Makefile | 47 +
devel/ocaml-sexplib0/distinfo | 3 +
devel/{ocaml-sexplib => ocaml-sexplib0}/pkg-descr | 0
devel/ocaml-topkg/Makefile | 1 +
devel/ocaml-type_conv/Makefile | 1 +
devel/ocaml-uchar/Makefile | 2 +-
devel/ocaml-ulex/Makefile | 2 +-
devel/ocaml-uutf/Makefile | 1 +
devel/ocaml-xstr/Makefile | 2 +-
devel/ocaml-xstrp4/Makefile | 1 +
devel/omake/Makefile | 1 +
ftp/ocaml-ocurl/Makefile | 1 +
games/freetennis/Makefile | 2 +-
graphics/ocaml-cairo/Makefile | 4 +-
graphics/ocaml-cairo/distinfo | 6 +-
graphics/ocaml-cairo/files/patch-issue-19 | 64 -
graphics/ocaml-images/Makefile | 2 +-
graphics/ocaml-lablgl/Makefile | 2 +-
lang/mtasc/Makefile | 2 +-
lang/ocaml-autoconf/Makefile | 1 +
lang/ocaml-camlidl/Makefile | 2 +-
lang/ocaml/Makefile | 71 +-
lang/ocaml/distinfo | 16 +-
lang/ocaml/files/patch-configure | 171 ++-
...{patch-asmrun_amd64.S => patch-runtime_amd64.S} | 6 +-
...terun_backtrace.c => patch-runtime_backtrace.c} | 4 +-
...run_caml_stack.h => patch-runtime_caml_stack.h} | 6 +-
...{patch-asmrun_power.S => patch-runtime_power.S} | 58 +-
...tch-675e98a2.c => patch-runtime_startup__nat.c} | 6 +-
...wer.S => patch-testsuite_tools_asmgen__power.S} | 4 +-
lang/ocaml/pkg-plist | 561 +++++--
lang/ott/Makefile | 1 +
math/alt-ergo/Makefile | 2 +-
math/coq/Makefile | 2 +-
math/facile/Makefile | 2 +-
math/ocaml-num/Makefile | 1 +
math/ocaml-ocamlgraph/Makefile | 1 +
math/ocaml-zarith/Makefile | 1 +
math/ocamlgsl/Makefile | 2 +-
math/orpie/Makefile | 2 +-
math/scilab/Makefile | 2 +-
math/teyjus/Makefile | 1 +
net-p2p/liberator/Makefile | 2 +-
net-p2p/mldonkey-gui/Makefile | 1 -
net-p2p/mldonkey/Makefile | 14 +-
net-p2p/mldonkey/distinfo | 5 +-
.../mldonkey/files/patch-src_utils_net_terminal.ml | 6 +-
net/unison/Makefile | 1 +
net/unison/files/patch-ocaml_4.07-compat | 475 ------
.../files/patch-ocaml_4.07-compat-copyquoterem-01 | 209 ---
.../files/patch-ocaml_4.07-compat-copyquoterem-02 | 54 -
net/unison232/Makefile | 2 +
net/unison240/Makefile | 2 +-
net/unison240/files/patch-ocaml8 | 52 +
net/unison248/Makefile | 2 +-
net/unison248/files/patch-ocaml8 | 52 +
net/unison251/Makefile | 2 +-
print/texvc/Makefile | 2 +-
science/kalzium/Makefile | 1 +
security/ocaml-cryptgps/Makefile | 2 +-
security/ocaml-cryptokit/Makefile | 1 +
security/ocaml-ssl/Makefile | 4 +-
security/ocaml-ssl/distinfo | 6 +-
security/ocaml-ssl/pkg-plist | 2 +-
security/sks/Makefile | 1 +
security/sks/files/patch-ocaml408 | 1001 +++++++++++++
sysutils/ledit/Makefile | 1 +
textproc/bibtex2html/Makefile | 1 +
textproc/htmlc/Makefile | 1 +
textproc/ocaml-csv/Makefile | 2 +-
textproc/ocaml-expat/Makefile | 2 +-
textproc/ocaml-text/Makefile | 1 +
textproc/pdfsandwich/Makefile | 2 +-
www/geneweb/Makefile | 2 +-
x11-toolkits/ocaml-lablgtk2/Makefile | 1 +
x11-toolkits/ocaml-lablgtk3/Makefile | 4 +-
x11-toolkits/ocaml-labltk/Makefile | 6 +-
x11-toolkits/ocaml-labltk/distinfo | 6 +-
166 files changed, 3493 insertions(+), 2526 deletions(-)
diff --git a/MOVED b/MOVED
index f66feb183f2e..39dc3401318e 100644
--- a/MOVED
+++ b/MOVED
@@ -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
*** 7871 LINES SKIPPED ***