<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/153932b105a45bdd4b414627165c361a3df293c2">https://github.com/macports/macports-ports/commit/153932b105a45bdd4b414627165c361a3df293c2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 153932b105a45bdd4b414627165c361a3df293c2
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Oct 25 06:19:16 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> unison: remove broken aqua variant on older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56785
</span>---
net/unison/Portfile | 6 +++++-
1 file changed, 5 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 5c426aa..c072c74 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,6 +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:#e0ffe0;'>+revision 1
</span> categories net
maintainers nomaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,6 +73,8 @@ unison -ui graphic
</span> "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/56785
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 17} {
</span> variant aqua description {Build Aqua front-end} conflicts gtk {
build.args-replace UISTYLE=text \
UISTYLE=mac14
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,8 +87,9 @@ variant aqua description {Build Aqua front-end} conflicts gtk {
</span> ln -s ${applications_dir}/Unison.app/Contents/MacOS/cltool ${destroot}${prefix}/bin/unison
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset gtk] && ![variant_isset aqua]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset gtk] && !([variant_exists aqua] && [variant_isset aqua])} {
</span> default_variants +gtk
}
</pre><pre style='margin:0'>
</pre>