<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c94cc82e1adb0b13173c933f105aaa558a8fe510">https://github.com/macports/macports-ports/commit/c94cc82e1adb0b13173c933f105aaa558a8fe510</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 c94cc82  ola: don't set default variant if conflicting
</span>c94cc82 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c94cc82e1adb0b13173c933f105aaa558a8fe510
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Sep 14 14:44:54 2018 +1000

<span style='display:block; white-space:pre;color:#404040;'>    ola: don't set default variant if conflicting
</span>---
 net/ola/Portfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ola/Portfile b/net/ola/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e3d85d..bf04648 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ola/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ola/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,10 @@ variant osc description {Build with OSC support} {
</span>     configure.args-delete   --disable-osc
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants    +http +libftdi0 +libusb +osc +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants    +http +libusb +osc +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset libftdi1]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants-append +libftdi0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 test.run            yes
 test.target         check
</pre><pre style='margin:0'>

</pre>