<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1882eb6ef317afefc7307b1cd9e4f4defa5a3586">https://github.com/macports/macports-ports/commit/1882eb6ef317afefc7307b1cd9e4f4defa5a3586</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1882eb6ef317afefc7307b1cd9e4f4defa5a3586
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Sun Mar 3 17:45:29 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> R: new aqua variant
</span>---
math/R/Portfile | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 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 23139e103ad..65ad6a437e6 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;'>@@ -9,7 +9,7 @@ name R
</span> # Remember to set revision to 0 when bumping version
# And also to update Rversion in R PortGroup
version 4.3.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories math science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,6 +157,7 @@ configure.args --disable-openmp \
</span> --enable-memory-profiling \
--enable-R-shlib \
--enable-BLAS-shlib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-aqua \
</span> --without-tcltk \
--without-cairo \
--disable-java \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,12 +174,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span> configure.args-append --disable-openmp
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Temporary fix for: https://bugs.r-project.org/show_bug.cgi?id=18683
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://trac.macports.org/ticket/69437
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-aqua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin 13 {
configure.cflags-append -flax-vector-conversions
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -262,7 +257,12 @@ variant x11 conflicts quartz {
</span> --x-lib=${prefix}/lib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant aqua description {Enable native macOS graphics support, needed by R.app and quartz variant} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-aqua \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz requires aqua conflicts x11 {
</span> require_active_variants tk quartz
notes-append "
Note that R with quartz variant will not work with R.app because\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,6 +281,12 @@ if {![variant_isset quartz]} {
</span> default_variants-append +x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Version 4.3.3 with aqua won't build on 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/69437
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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
</pre><pre style='margin:0'>
</pre>