<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/13c698d942a7066edddcde6188efb71fa0f71e7a">https://github.com/macports/macports-ports/commit/13c698d942a7066edddcde6188efb71fa0f71e7a</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 13c698d942a unison: update to 2.51.4
</span>13c698d942a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 13c698d942a7066edddcde6188efb71fa0f71e7a
</span>Author: someuser12 <macosx12345@yahoo.fr>
AuthorDate: Sat Oct 2 00:00:51 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> unison: update to 2.51.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62572
</span>---
net/unison/Portfile | 26 +++++++--------------
net/unison/files/patch-Makefile.OCaml.diff | 22 ++++--------------
net/unison/files/patch-Makefile.diff | 10 ++++----
net/unison/files/patch-check-cltool.diff | 4 ++--
net/unison/files/patch-lablgtk.diff | 28 ----------------------
net/unison/files/patch-libraries.diff | 26 ---------------------
net/unison/files/patch-ocaml-4.08.diff | 37 ------------------------------
net/unison/files/patch-target.diff | 30 ++++++++++++------------
8 files changed, 35 insertions(+), 148 deletions(-)
<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 c45738f4ff0..729b3784311 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;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup bcpierce00 unison 2.51.2 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup bcpierce00 unison 2.51.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
maintainers nomaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ long_description Unison is a file-synchronization tool for Unix and \
</span> homepage http://www.cis.upenn.edu/~bcpierce/unison/
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 24050d73c3d38389816828dd8ce77b4de7c80639 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8e071e862fef675ea034f0c3e4b881d392be0889db4f04ad894cc5a931891e3d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1400793
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 231cc9a56e12ef3b79f0517eeaad9db670fa3356 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 406237c9a1a0c85f8a02a05b22b17ebaa65b87ddb5b3d1f17a43f30f37f534b0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1373118
</span>
# from ocaml port
supported_archs i386 x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,20 +37,10 @@ patchfiles-append patch-Makefile.OCaml.diff \
</span> patch-Makefile.diff \
patch-check-cltool.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/bcpierce00/unison/commit/2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-lablgtk.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/bcpierce00/unison/commit/23fa129254a3304902739fc989950cc747d1e0b3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-ocaml-4.08.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# avoid:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ld: library not found for -lbigarray
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-libraries.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" ${worksrcpath}/src/uimac14/MyController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" ${worksrcpath}/src/uimac/MyController.m
</span> set deployment_version [join [split ${macosx_deployment_target} .] ""]0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_DEPLOYMENT_VERSION__|${deployment_version}|g" ${worksrcpath}/src/uimac14/English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_DEPLOYMENT_VERSION__|${deployment_version}|g" ${worksrcpath}/src/uimac/English.lproj/MainMenu.xib
</span> }
# see https://trac.macports.org/ticket/57234
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +78,7 @@ variant aqua description {Build Aqua front-end} conflicts gtk {
</span> use_xcode yes
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/src/uimac14/build/Default/Unison.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/src/uimac/build/Default/Unison.app ${destroot}${applications_dir}
</span>
# Don't use cltool. It finds Unison using Launch Services. If the user
# has multiple copies of Unison installed, Launch Services could return
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/patch-Makefile.OCaml.diff b/net/unison/files/patch-Makefile.OCaml.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c400883064e..bdcda7aded8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/files/patch-Makefile.OCaml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/unison/files/patch-Makefile.OCaml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.OCaml.orig 2018-01-27 13:12:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.OCaml 2018-06-04 07:05:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.OCaml.orig 2021-06-23 16:30:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.OCaml 2021-10-01 22:55:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +175,7 @@
</span> buildexecutable:: $(NAME)$(EXEC_EXT)
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--MINOSXVERSION=10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MINOSXVERSION=10.6
</span> +MINOSXVERSION=$(MACOSX_DEPLOYMENT_TARGET)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # XCODEFLAGS=-sdk macosx$(MINOSXVERSION)
</span> ifeq ($(OSARCH),osx)
CAMLFLAGS+=-ccopt -mmacosx-version-min=$(MINOSXVERSION)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -194,9 +194,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd $(UIMACDIR); xcodebuild $(XCODEFLAGS) OCAMLLIBDIR="$(OCAMLLIBDIR)" SYMROOT=build)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -e $(UIMACDIR)/build/Default ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gcc -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gcc -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Unison.app/Contents/MacOS/cltool -framework Carbon; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Unison.app/Contents/MacOS/cltool -framework Carbon; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OCaml objects for the bytecode version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XCODEFLAGS=-arch $(shell uname -m)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/patch-Makefile.diff b/net/unison/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 52a9f795678..2429706f89b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/unison/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2018-01-27 14:12:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2018-06-06 22:50:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2021-06-23 16:30:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2021-10-01 23:07:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@
</span> ######################################################################
# Installation
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,10 @@
</span>
# This has two names because on OSX the file INSTALL shadows the target 'install'!
install: doinstall
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,9 +86,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,9 +77,7 @@
</span> echo "makefile variable NAME not bound"; \
exit 1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ; fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; fi
</span> - -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/patch-check-cltool.diff b/net/unison/files/patch-check-cltool.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 69c2157c109..5031998ae8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/files/patch-check-cltool.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/unison/files/patch-check-cltool.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/uimac14/MyController.m.orig 2018-01-27 14:12:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/uimac14/MyController.m 2018-06-06 23:29:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/uimac/MyController.m.orig 2018-01-27 14:12:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/uimac/MyController.m 2018-06-06 23:29:07.000000000 -0700
</span> @@ -186,7 +186,7 @@
(![[NSFileManager defaultManager]
/* BCP 6/2016: Changed from /usr/bin/unison for El Capitan, per
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/patch-lablgtk.diff b/net/unison/files/patch-lablgtk.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cff9bed999d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/files/patch-lablgtk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: daviddavid <geiger.david68210@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 26 Feb 2018 13:36:36 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix for lablgtk >= 2.18.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/uigtk2.ml | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/uigtk2.ml b/src/uigtk2.ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2ba6d792..04c4da4a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/uigtk2.ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/uigtk2.ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (* This does not work with the current version of Lablgtk, due to a bug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let icon =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (Gpointer.region_of_string Pixmaps.icon_data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (Gpointer.region_of_bytes Pixmaps.icon_data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let icon =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Gpointer.blit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let leftPtrWatch =
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/patch-libraries.diff b/net/unison/files/patch-libraries.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a95636eb4fe..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/files/patch-libraries.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/uimac14/uimacnew.xcodeproj/project.pbxproj.orig 2019-12-31 11:25:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/uimac14/uimacnew.xcodeproj/project.pbxproj 2019-12-31 11:37:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -626,7 +626,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lunix",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lthreadsnat",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lcamlstr",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "-lbigarray",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lasmrun",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -665,7 +664,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lunix",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lthreadsnat",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lcamlstr",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "-lbigarray",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lasmrun",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -702,7 +700,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lunix",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lthreadsnat",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lcamlstr",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "-lbigarray",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-lasmrun",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 897c426d28b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/files/patch-ocaml-4.08.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Compatibility with OCaml 4.08
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/bcpierce00/unison/commit/23fa129254a3304902739fc989950cc747d1e0b3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/files.ml.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/files.ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -734,7 +734,7 @@ let get_files_in_directory dir =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with End_of_file ->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dirh.System.closedir ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Sort.list (<) !files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ List.sort String.compare !files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let ls dir pattern =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Util.convertUnixErrorsToTransient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/recon.ml.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/recon.ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -662,8 +662,8 @@ let rec reconcile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (* Sorts the paths so that they will be displayed in order *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let sortPaths pathUpdatesList =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Sort.list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ List.sort
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Path.compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pathUpdatesList
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let rec enterPath p1 p2 t =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/system/system_generic.ml.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/system/system_generic.ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let chmod = Unix.chmod
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let chown = Unix.chown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let utimes = Unix.utimes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--let link = Unix.link
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+let link s d = Unix.link s d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let openfile = Unix.openfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let opendir f =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let h = Unix.opendir f in
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/patch-target.diff b/net/unison/files/patch-target.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fa3e519fe7e..3c1f9f3873e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/files/patch-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/unison/files/patch-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/uimac14/uimacnew.xcodeproj/project.pbxproj.orig 2018-01-27 13:12:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/uimac14/uimacnew.xcodeproj/project.pbxproj 2018-06-04 07:12:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -742,7 +742,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/uimac/uimacnew.xcodeproj/project.pbxproj.orig 2021-06-23 16:30:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/uimac/uimacnew.xcodeproj/project.pbxproj 2021-10-01 23:16:53.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -603,7 +603,6 @@
</span> GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LIBRARY_SEARCH_PATHS = "";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,30 +8,30 @@
</span> ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
SDKROOT = macosx;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -773,7 +772,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -640,7 +639,6 @@
</span> GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LIBRARY_SEARCH_PATHS = "";
- MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
SDKROOT = macosx;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -803,7 +801,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_HEADER_SEARCH_PATHS = "$(OCAMLLIBDIR)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -676,7 +674,6 @@
</span> GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LIBRARY_SEARCH_PATHS = "";
- MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
SDKROOT = macosx;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/uimac14/English.lproj/MainMenu.xib.orig 2018-01-27 14:12:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/uimac14/English.lproj/MainMenu.xib 2018-11-17 11:35:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_HEADER_SEARCH_PATHS = "$(OCAMLLIBDIR)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/uimac/English.lproj/MainMenu.xib.orig 2021-06-23 16:30:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/uimac/English.lproj/MainMenu.xib 2021-10-01 23:02:47.000000000 +0200
</span> @@ -1,7 +1,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <?xml version="1.0" encoding="UTF-8" standalone="no"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</span> <dependencies>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- <deployment version="1050" defaultVersion="1090" identifier="macosx"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <deployment version="__MACPORTS_DEPLOYMENT_VERSION__" defaultVersion="__MACPORTS_DEPLOYMENT_VERSION__" identifier="macosx"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <deployment version="1060" identifier="macosx"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <deployment version="__MACPORTS_DEPLOYMENT_VERSION__" identifier="macosx"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</span> </dependencies>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <objects>
</span></pre><pre style='margin:0'>
</pre>