forked from Lainports/freebsd-ports
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
33 lines
1,015 B
OCaml
33 lines
1,015 B
OCaml
--- 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
|
|
|