mirror of
https://git.freebsd.org/ports.git
synced 2025-04-30 10:36:38 -04:00
2b40e46093
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
37 lines
1.5 KiB
OCaml
37 lines
1.5 KiB
OCaml
--- 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 =
|