<pre style='margin:0'>
rainbow (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f8ea31611075b0c9a3aa9a096993f730fe8a4916">https://github.com/macports/macports-ports/commit/f8ea31611075b0c9a3aa9a096993f730fe8a4916</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f8ea31611075b0c9a3aa9a096993f730fe8a4916
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Wed Apr 8 04:58:01 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> r: add quartz variant
</span>---
math/R/Portfile | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R/Portfile b/math/R/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f22c9d..5c73946 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +153,8 @@ variant tests description {include tests of R installation} {
</span> destroot.target-append install-tests
}
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants tk x11
</span> depends_lib-append port:xorg-libsm \
port:xorg-libice \
port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,18 +165,34 @@ variant x11 {
</span> --x-lib=${prefix}/lib
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants tk quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Note that +quartz will not work with R.app because of\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts over the macOS menu."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant java description {enable Java} {
PortGroup java 1.0
configure.args-replace --disable-java --enable-java
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +cairo +recommended +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +cairo +recommended
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {[variant_isset cairo] && [variant_isset x11]} {
require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
require_active_variants path:lib/pkgconfig/pango.pc:pango x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset cairo] && [variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/pango.pc:pango quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset builtin_lapack]} {
default_variants-append +builtin_lapack
}
</pre><pre style='margin:0'>
</pre>