<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/0d65a0ba8ed7c405a8648857a52f25ded49e8380">https://github.com/macports/macports-ports/commit/0d65a0ba8ed7c405a8648857a52f25ded49e8380</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0d65a0ba8ed7c405a8648857a52f25ded49e8380
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed May 29 12:53:20 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-arrow: update to 16.1.0
</span>---
R/R-arrow/Portfile | 14 ++++++++----
R/R-arrow/files/patch-fix-configure.diff | 39 ++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-arrow/Portfile b/R/R-arrow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ec455dac59..18d7896ce42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-arrow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-arrow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,17 +4,17 @@ PortSystem 1.0
</span> PortGroup openssl 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran apache arrow 13.0.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran apache arrow 16.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append devel
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license Apache-2
description Integration with Apache Arrow
long_description {*}${description}
homepage https://arrow.apache.org/docs/r
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6142cc5690da001071917d638c74811bedef9656 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a6f0d325db5c82f180a504a0cc74b1182fe1c1bcc07a14eb5951d70d4fff08c0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4170533
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1e84e1f5ffaaa9dabca85c7f4049d73aaa9952f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 66c1586ee7becd65b4d21b11ffcd157dc19f75c3c10ff5c5b3610689aadce7ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4439675
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,10 +30,14 @@ depends_lib-append port:apache-arrow \
</span> port:R-tidyselect \
port:R-vctrs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/apache/arrow/issues/38769
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2017
depends_test-append port:R-blob \
port:R-cli \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-curl \
</span> port:R-DBI \
port:R-dbplyr \
port:R-decor \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-arrow/files/patch-fix-configure.diff b/R/R-arrow/files/patch-fix-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9e463d00206
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-arrow/files/patch-fix-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2023-11-15 11:37:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-11-18 15:48:57.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,13 +64,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Some env vars that control the build (all logical, case insensitive)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Development mode, also increases verbosity in the bundled build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ARROW_R_DEV=`echo $ARROW_R_DEV | tr '[:upper:]' '[:lower:]'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARROW_R_DEV="true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The bundled build compiles arrow C++ from source; FORCE ensures we don't pick up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # any other packages that may be found on the system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FORCE_BUNDLED_BUILD=`echo $FORCE_BUNDLED_BUILD | tr '[:upper:]' '[:lower:]'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FORCE_BUNDLED_BUILD="false"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If present, `pkg-config` will be used to find libarrow on the system,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unless this is set to false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ARROW_USE_PKG_CONFIG=`echo $ARROW_USE_PKG_CONFIG | tr '[:upper:]' '[:lower:]'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARROW_USE_PKG_CONFIG="true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Just used in testing: whether or not it is ok to download dependencies (in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bundled build)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_OFFLINE_BUILD=`echo $TEST_OFFLINE_BUILD | tr '[:upper:]' '[:lower:]'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,10 +130,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # generally not linked. We can over-ride this and find
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # openssl by setting OPENSSL_ROOT_DIR (which cmake will pick up later in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the installation process).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ "${OPENSSL_ROOT_DIR}" = "" ] && brew --prefix openssl >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export OPENSSL_ROOT_DIR="`brew --prefix openssl`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export PKG_CONFIG_PATH="${OPENSSL_ROOT_DIR}/lib/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Look for openssl with pkg-config for non-brew sources(e.g. CRAN) and Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "${OPENSSL_ROOT_DIR}" = "" ] && [ "${PKG_CONFIG_AVAILABLE}" = "true" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ${PKG_CONFIG} --exists openssl; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -190,7 +186,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Error means the versions don't line up and we shouldn't use it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # More specific messaging to the user is in the R script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ! ${R_HOME}/bin/Rscript tools/check-versions.R $VERSION $PC_LIB_VERSION 2> /dev/null; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _LIBARROW_FOUND="false"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "*** Warning: versions of apache-arrow and R-arrow do not match."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>