<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/af118fde080a6778843b93e62c44b5a32ac8b500">https://github.com/macports/macports-ports/commit/af118fde080a6778843b93e62c44b5a32ac8b500</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 af118fd unison: update version 2.48.4->2.51.2
</span>af118fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af118fde080a6778843b93e62c44b5a32ac8b500
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Thu Jun 7 00:15:01 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> unison: update version 2.48.4->2.51.2
</span>---
net/unison/Portfile | 74 +++++++++++-----------
.../files/patch-Makefile.OCaml-MINOSXVERSION.diff | 11 ----
net/unison/files/patch-Makefile.OCaml.diff | 32 +++++++---
net/unison/files/patch-Makefile.diff | 21 +++---
net/unison/files/patch-check-cltool.diff | 11 ++++
net/unison/files/patch-target.diff | 26 ++++++++
...imacnew-uimacnew.xcodeproj-project.pbxproj.diff | 26 --------
7 files changed, 108 insertions(+), 93 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 4109174..7b47fde 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;'>@@ -1,10 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name unison
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.48.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup bcpierce00 unison 2.51.2 v
</span> categories net
maintainers nomaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,39 +15,41 @@ long_description Unison is a file-synchronization tool for Unix and \
</span> modified separately, and then brought up to date by \
propagating the changes in each replica to the other.
homepage http://www.cis.upenn.edu/~bcpierce/unison/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}download/releases/${name}-${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin openbsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 24050d73c3d38389816828dd8ce77b4de7c80639 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8e071e862fef675ea034f0c3e4b881d392be0889db4f04ad894cc5a931891e3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1400793
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d5a1d66caffc02832c446f375a16319779fc5e0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# from ocaml port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Makefile.OCaml-MINOSXVERSION.diff
</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;'>-worksrcdir src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:ocaml
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args UISTYLE=text NATIVE=true THREADS=true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build bin:camlp4:ocaml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args PREFIX=${prefix} UISTYLE=text NATIVE=true THREADS=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Makefile.OCaml.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-target.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-check-cltool.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" ${worksrcpath}/src/uimac14/MyController.m
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant symlink description {Create symlink to versioned binary} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/${name}-${branch} ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 conflicts aqua {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Makefile.OCaml.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args UISTYLE=text THREADS=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args UISTYLE=text THREADS=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gtk description {Build GTK front-end} conflicts aqua {
</span> depends_lib-append port:lablgtk2
build.args-replace UISTYLE=text \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,18 +64,23 @@ unison -ui graphic
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant aqua description {Build Aqua front-end} conflicts x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant aqua description {Build Aqua front-end} conflicts gtk {
</span> build.args-replace UISTYLE=text \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- UISTYLE=macnew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UISTYLE=mac14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-replace UISTYLE=text \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UISTYLE=mac14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath}/uimacnew/build && mv Default/* . || true"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/uimacnew/build/Unison.app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/src/uimac14/build/Default/Unison.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/Unison.app/Contents/MacOS/cltool ${destroot}${prefix}/bin/unison
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset gtk] && ![variant_isset aqua]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> notes "
Unison has always suggested using the same version across machines accessing the\
the same files. If you want to keep the previous version, you can reactivate\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +88,3 @@ the previous version; see:
</span>
https://trac.macports.org/wiki/howto/InstallingOlderPort
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}download/releases/stable/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {unison-(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/patch-Makefile.OCaml-MINOSXVERSION.diff b/net/unison/files/patch-Makefile.OCaml-MINOSXVERSION.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0afca42..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/files/patch-Makefile.OCaml-MINOSXVERSION.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.OCaml.orig 2015-01-20 14:51:56.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.OCaml 2015-01-20 14:53:31.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,7 +187,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MINOSXVERSION=10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MINOSXVERSION=10.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XCODEFLAGS=-sdk macosx$(MINOSXVERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OSARCH),osx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CAMLFLAGS+=-ccopt -mmacosx-version-min=$(MINOSXVERSION)
</span><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 02f6b6a..c400883 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,11 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.OCaml.orig Sun Sep 28 18:48:05 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.OCaml Fri Jan 9 15:23:59 2015
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,7 +299,7 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Gtk2 GUI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(UISTYLE), gtk2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CAMLFLAGS+=-I +lablgtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CAMLFLAGS+=-I +site-lib/lablgtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCAMLLIBS+=lablgtk.cma
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.OCaml.orig 2018-01-27 13:12:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.OCaml 2018-06-04 07:05:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buildexecutable:: $(NAME)$(EXEC_EXT)
</span> endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MINOSXVERSION=10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MINOSXVERSION=$(MACOSX_DEPLOYMENT_TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XCODEFLAGS=-sdk macosx$(MINOSXVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OSARCH),osx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CAMLFLAGS+=-ccopt -mmacosx-version-min=$(MINOSXVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,9 +194,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd $(UIMACDIR); xcodebuild $(XCODEFLAGS) OCAMLLIBDIR="$(OCAMLLIBDIR)" SYMROOT=build)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -e $(UIMACDIR)/build/Default ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>++ $(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:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>++ $(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:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OCaml objects for the bytecode version
</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 e75a268..52a9f79 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;'>---- Makefile 2016-10-10 10:04:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2016-10-10 10:04:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2018-01-27 14:12:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2018-06-06 22:50:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,7 @@
</span> ######################################################################
# Installation
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,12 +9,13 @@
</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;'>-@@ -90,8 +90,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) -C .. text
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doinstall: $(NAME)$(EXEC_EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,9 +86,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "makefile variable NAME not bound"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; fi
</span> - -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ######################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Demo
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..69c2157
</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-check-cltool.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/uimac14/MyController.m.orig 2018-01-27 14:12:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/uimac14/MyController.m 2018-06-06 23:29:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,7 +186,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (![[NSFileManager defaultManager]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* BCP 6/2016: Changed from /usr/bin/unison for El Capitan, per
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ suggestion from Alan Shutko */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fileExistsAtPath:@"/usr/local/bin/unison"]) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileExistsAtPath:@"__MACPORTS_PREFIX__/bin/unison"]) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self raiseCltoolWindow:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..892ec05
</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-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/uimac14/uimacnew.xcodeproj/project.pbxproj.orig 2018-01-27 13:12:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/uimac14/uimacnew.xcodeproj/project.pbxproj 2018-06-04 07:12:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -742,7 +742,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_FUNCTION = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_SEARCH_PATHS = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -773,7 +772,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_FUNCTION = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_SEARCH_PATHS = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -803,7 +801,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_FUNCTION = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_SEARCH_PATHS = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = macosx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff b/net/unison/files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5b97ffb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unison/files/patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.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;'>---- uimacnew/uimacnew.xcodeproj/project.pbxproj.orig Mon Sep 6 18:37:04 2010
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ uimacnew/uimacnew.xcodeproj/project.pbxproj Fri Jan 9 15:26:10 2015
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -582,7 +582,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L$(OCAMLLIBDIR)",
</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;'>-- "-lstr",
</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;'>-@@ -622,7 +621,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L$(OCAMLLIBDIR)",
</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;'>-- "-lstr",
</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;'>-@@ -659,7 +657,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L$(OCAMLLIBDIR)",
</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;'>-- "-lstr",
</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></pre><pre style='margin:0'>
</pre>