mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 13:20:32 -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
52 lines
1.5 KiB
Text
52 lines
1.5 KiB
Text
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
|