<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8e1c254a76374311fdae4d183d1b687abc521337">https://github.com/macports/macports-ports/commit/8e1c254a76374311fdae4d183d1b687abc521337</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8e1c254a76374311fdae4d183d1b687abc521337
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sun Jan 28 15:32:09 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R PG: fix port phases following Macports update to 2.9.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/69211
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67282
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67229
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67299
</span>---
_resources/port1.0/group/R-1.0.tcl | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 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 f652eb2d81e..db1323cc30a 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;'>@@ -174,6 +174,7 @@ set branch [join [lrange [split ${Rversion} .] 0 1] .]
</span> set packages ${frameworks_dir}/R.framework/Versions/${branch}/Resources/library
set suffix .tar.gz
set r.cmd ${prefix}/bin/R
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set builddir ${workpath}/build
</span>
# Get rid of unrecognized args:
configure.pre_args-delete \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,26 +185,23 @@ configure.cmd ${r.cmd} CMD build .
</span>
# Re --keep-empty-dirs see discussion in: https://github.com/Bioconductor/BSgenomeForge/issues/35
configure.post_args --no-manual --no-build-vignettes --keep-empty-dirs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# We build in destroot.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build { }
</span>
global package version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${packages}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/${R.package}_${version}${suffix} ${destroot}${packages}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${builddir}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.cmd ${r.cmd} CMD INSTALL .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${r.cmd} CMD INSTALL .
</span>
# Notice that while we install tests to make them available to the user,
# in a case of testthat running test_check("${R.package}") from within R session will not work.
# It has been left broken by upstream for years, see: https://github.com/r-lib/testthat/issues/205
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.post_args --library=${destroot}${packages} --install-tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.post_args --library=${builddir} --install-tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${packages}/${R.package}_${version}${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${packages}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${builddir}/${R.package} ${destroot}${packages}
</span> }
# Default can be changed once the majority of packages implement testing:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,5 +210,5 @@ default test.run no
</span> # We do not need to check rebuilding vignettes, since that often requires Tex and even Pandoc,
# and we do not want these as dependencies for tests. It also wastes time.
test {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${r.cmd} CMD check ./${R.package}_${version}${suffix} --ignore-vignettes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${r.cmd} CMD check ./${R.package}_${version}${suffix} --no-manual --no-build-vignettes"
</span> }
</pre><pre style='margin:0'>
</pre>