<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/a8ddfd139ab47684e85f913f37ab726b0bb20c4d">https://github.com/macports/macports-ports/commit/a8ddfd139ab47684e85f913f37ab726b0bb20c4d</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 a8ddfd1  openocd: don't set default variant if conflicting
</span>a8ddfd1 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a8ddfd139ab47684e85f913f37ab726b0bb20c4d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jun 21 00:46:12 2018 +1000

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

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/openocd/Portfile b/cross/openocd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cbf3cbf..64df285 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/openocd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/openocd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,9 @@ configure.args-append  --disable-werror --enable-maintainer-mode
</span> 
 depends_build-append   port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +ftdi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset ft2232_ftd2xx]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants +ftdi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 variant dummy description {Enable building the dummy port driver} {
     configure.args-append --enable-dummy
</pre><pre style='margin:0'>

</pre>