<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e75563b7f431a2cb21c0bc03ff483bc1f970d64d">https://github.com/macports/macports-ports/commit/e75563b7f431a2cb21c0bc03ff483bc1f970d64d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e75563b unison: Fix build with ocaml 4.08
</span>e75563b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e75563b7f431a2cb21c0bc03ff483bc1f970d64d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Dec 23 10:01:52 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> unison: Fix build with ocaml 4.08
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I don't know if this changes the installed files so revbump just in case.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58852
</span>---
net/unison/Portfile | 5 ++++-
net/unison/files/patch-ocaml-4.08.diff | 37 ++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/Portfile b/net/unison/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 66548e2..2e3b73d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/unison/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup bcpierce00 unison 2.51.2 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories net
maintainers nomaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,9 @@ patchfiles-append patch-Makefile.OCaml.diff \
</span> # see https://github.com/bcpierce00/unison/commit/2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06
patchfiles-append patch-lablgtk.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/bcpierce00/unison/commit/23fa129254a3304902739fc989950cc747d1e0b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ocaml-4.08.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" ${worksrcpath}/src/uimac14/MyController.m
set deployment_version [join [split ${macosx_deployment_target} .] ""]0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/patch-ocaml-4.08.diff b/net/unison/files/patch-ocaml-4.08.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..897c426
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/unison/files/patch-ocaml-4.08.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Compatibility with OCaml 4.08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/bcpierce00/unison/commit/23fa129254a3304902739fc989950cc747d1e0b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/files.ml.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/files.ml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -734,7 +734,7 @@ let get_files_in_directory dir =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with End_of_file ->
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dirh.System.closedir ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Sort.list (<) !files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ List.sort String.compare !files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let ls dir pattern =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Util.convertUnixErrorsToTransient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/recon.ml.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/recon.ml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -662,8 +662,8 @@ let rec reconcile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (* Sorts the paths so that they will be displayed in order *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let sortPaths pathUpdatesList =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Sort.list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ List.sort
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Path.compare
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pathUpdatesList
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let rec enterPath p1 p2 t =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/system/system_generic.ml.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/system/system_generic.ml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let chmod = Unix.chmod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let chown = Unix.chown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let utimes = Unix.utimes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-let link = Unix.link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++let link s d = Unix.link s d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let openfile = Unix.openfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let opendir f =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let h = Unix.opendir f in
</span></pre><pre style='margin:0'>
</pre>