<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/7ab4ebaa7822cc78dd1cc8fc144cc82098b4b559">https://github.com/macports/macports-ports/commit/7ab4ebaa7822cc78dd1cc8fc144cc82098b4b559</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7ab4ebaa7822cc78dd1cc8fc144cc82098b4b559
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Oct 12 05:15:14 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> avahi: improve quartz/x11 variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * default_variants should not depend on installed ports
</span><span style='display:block; white-space:pre;color:#404040;'> * variants quartz and x11 should conflict
</span><span style='display:block; white-space:pre;color:#404040;'> * require_active_variants requires gtk2 to be a direct dependency
</span>---
net/avahi/Portfile | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/avahi/Portfile b/net/avahi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bbc1daf..3035495 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/avahi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/avahi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +139,8 @@ variant test description {Build tests} {
</span> }
variant gtk description {Build with GTK2} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libglade2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libglade2
</span>
configure.args-delete --disable-gtk
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,19 +170,14 @@ if [variant_isset gtk] {
</span> configure.args-delete --disable-pygtk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 conflicts quartz {
</span> require_active_variants gtk2 x11 quartz
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {
</span> require_active_variants gtk2 quartz x11
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-catch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants gtk2 quartz x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {![variant_isset quartz]} {
default_variants-append +x11
}
</pre><pre style='margin:0'>
</pre>