<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/557b6a486615f3b87810e01fb02e0ac9abf03933">https://github.com/macports/macports-ports/commit/557b6a486615f3b87810e01fb02e0ac9abf03933</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 557b6a48661 unison: Ensure we launch the MacPorts unison
</span>557b6a48661 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 557b6a486615f3b87810e01fb02e0ac9abf03933
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 27 13:21:18 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> unison: Ensure we launch the MacPorts unison
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Change ${prefix}/bin/unison from a symlink to cltool to a shell script wrapper
</span><span style='display:block; white-space:pre;color:#404040;'> that launches the application's main executable. cltool's main purpose is to
</span><span style='display:block; white-space:pre;color:#404040;'> find the application via Launch Services, but if the user has multiple copies
</span><span style='display:block; white-space:pre;color:#404040;'> of Unison installed, Launch Services might not return the one installed by
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts and that would be confusing.
</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/61060
</span>---
net/unison/Portfile | 9 +++++++--
net/unison/files/unison.in | 5 +++++
2 files changed, 12 insertions(+), 2 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 f3cd22f6816..c45738f4ff0 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 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories net
maintainers nomaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,12 @@ variant aqua description {Build Aqua front-end} conflicts gtk {
</span>
destroot {
copy ${worksrcpath}/src/uimac14/build/Default/Unison.app ${destroot}${applications_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${applications_dir}/Unison.app/Contents/MacOS/cltool ${destroot}${prefix}/bin/unison
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't use cltool. It finds Unison using Launch Services. If the user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # has multiple copies of Unison installed, Launch Services could return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # any of them, not necessarily the one installed by MacPorts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${filespath}/unison.in ${destroot}${prefix}/bin/unison
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${destroot}${prefix}/bin/unison
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unison/files/unison.in b/net/unison/files/unison.in
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a17b27a3cb4
</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/unison.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Unison must be launched via an absolute path, hence the use of this wrapper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# script instead of a symlink.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec "@APPLICATIONS_DIR@/Unison.app/Contents/MacOS/Unison" "$@"
</span></pre><pre style='margin:0'>
</pre>