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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6efde1e11cfd4f26c804698f3bdc96f90a3fb4c3">https://github.com/macports/macports-ports/commit/6efde1e11cfd4f26c804698f3bdc96f90a3fb4c3</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 6efde1e  qwt61: solve conflict linked to default variant.
</span>6efde1e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6efde1e11cfd4f26c804698f3bdc96f90a3fb4c3
</span>Author: Veence <vince@macports.org>
AuthorDate: Thu May 18 15:37:44 2017 +0200

<span style='display:block; white-space:pre;color:#404040;'>    qwt61: solve conflict linked to default variant.
</span>---
 graphics/qwt/Portfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/qwt/Portfile b/graphics/qwt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 24212c9..cf36849 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/qwt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/qwt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,8 +68,12 @@ subport qwt61 {
</span>     conflicts       qwt qwt52 qwt60
     checksums       rmd160 1e36e79dab0ecc4df89d9fb20607925fe261c6b3 \
                     sha256 f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     use_parallel_build  yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants    +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![variant_isset qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        default_variants    +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     patchfiles      patch-designer_designer.pro.61.diff \
                     patch-qwtconfig.pri.61.diff \
</pre><pre style='margin:0'>

</pre>