<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/01c9d38cc67a245e842a794d5a1ae7faf5adcc99">https://github.com/macports/macports-ports/commit/01c9d38cc67a245e842a794d5a1ae7faf5adcc99</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 01c9d38cc67a245e842a794d5a1ae7faf5adcc99
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Oct 4 22:49:03 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R: non-functional: add myself as a co-maintainer; minor portfile fixes
</span>---
_resources/port1.0/group/R-1.0.tcl | 9 ++++-----
math/R/Portfile | 27 +++++++++++++--------------
2 files changed, 17 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/R-1.0.tcl b/_resources/port1.0/group/R-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 685c5d6ecb2..14999fcccf8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/R-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/R-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,11 +83,10 @@ compiler.cxx_standard 2011
</span>
# Avoid Apple clangs:
compiler.blacklist-append {clang}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Blacklist macports-clang-16+. See discussion in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/67144
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for rationale. The decision when to migrate to a new compiler is then in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# hands of the R maintainers and will not change from the current defaults when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# these get bumped centrally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Blacklist macports-clang-16+. See discussion: https://trac.macports.org/ticket/67144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# for rationale. The decision when to migrate to a new compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# is then in the hands of the R maintainers and will not change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# from the current defaults when these get bumped centrally.
</span> # NOTE : Keep this setting in sync with the one in the R port.
compiler.blacklist-append {macports-clang-1[6-9]}
# Similarly, for gcc select the gcc12 variant of the compilers PG.
<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 e18c62501c2..98667b24cf5 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;'>@@ -1,10 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
name R
# Remember to set revision to 0 when bumping version
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +13,8 @@ revision 3
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories math science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {me.com:kjell.konis @kjellpk} {i0ntempest @i0ntempest} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {me.com:kjell.konis @kjellpk} {i0ntempest @i0ntempest} {@barracuda156 gmail.com:vital.had} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span> license {GPL-2 GPL-3}
platforms macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,11 +38,10 @@ checksums rmd160 cf8c659211eee877966308890a7125e41c39b82c \
</span>
# Avoid Apple clangs:
compiler.blacklist-append {clang}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Blacklist macports-clang-16+. See discussion in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/67144
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for rationale. The decision when to migrate to a new compiler is then in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# hands of the R maintainers and will not change from the current defaults when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# these get bumped centrally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Blacklist macports-clang-16+. See discussion: https://trac.macports.org/ticket/67144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# for rationale. The decision when to migrate to a new compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# is then in the hands of the R maintainers and will not change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# from the current defaults when these get bumped centrally.
</span> # NOTE : Keep this setting in sync with the one in the R portgroup.
compiler.blacklist-append {macports-clang-1[6-9]}
# Similarly, for gcc select the gcc12 variant of the compilers PG.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,9 +201,9 @@ variant openmp description {enable parallelism support using OpenMP} {
</span> compiler.blacklist-append {macports-clang-[0-9].*}
configure.args-replace --disable-openmp --enable-openmp
notes-append "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Clang compilers provided by Xcode do not support OpenMP. Some R packages using\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OpenMP may require additional flags in the Makevar file (e.g. data.table) to\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build. Please consult package documentation."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Some R packages using OpenMP may require additional flags\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in the Makevar file (e.g. data.table) to build with OpenMP support.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Please consult package documentation."
</span> }
variant cairo description {use cairo and pango} {
</pre><pre style='margin:0'>
</pre>