<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/2c06f6c2359db33dbb3dfc84706c94651b1ffb4f">https://github.com/macports/macports-ports/commit/2c06f6c2359db33dbb3dfc84706c94651b1ffb4f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2c06f6c2359db33dbb3dfc84706c94651b1ffb4f
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Sep 21 22:02:11 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> R-jqr: update to 1.3.0
</span>---
R/R-jqr/Portfile | 20 ++++++++++++----
R/R-jqr/files/patch-fix-configure.diff | 43 ++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-jqr/Portfile b/R/R-jqr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cbb6cb7acf9..71727483c02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-jqr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-jqr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,22 +3,32 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup github ropensci jqr 1.2.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Revert to GitHub once updated there.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran ropensci jqr 1.3.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 MIT
description Client for jq, a JSON processor
long_description {*}${description}
homepage https://docs.ropensci.org/jqr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6f398ca15610f021e8938507fe05d7241a062769 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9345eecf2ceb91a5bd8e0145cfef93288ad0cc39c7cbc97bbe86a7ab270b96f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 45930
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 015f288c93484d78232df1e08667ee1933d4eb3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 30c7aad2d9e3210bd548a0cb2c8a3e88621eff5731c95913a9d5a9e8c40ada3f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 33954
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span> depends_lib-append port:jq \
port:R-magrittr \
port:R-lazyeval
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure script is broken: https://github.com/ropensci/jqr/issues/88
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@PREFIX@,${prefix},g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_test-append port:R-jsonlite \
port:R-testthat
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-jqr/files/patch-fix-configure.diff b/R/R-jqr/files/patch-fix-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f4f9bc26e28
</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-jqr/files/patch-fix-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2023-09-20 23:25:54.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-09-21 21:58:08.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,28 +8,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_DEB_NAME="libjq-dev"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_RPM_NAME="jq-devel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CSW_NAME="libjq_dev"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_BREW_NAME="jq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_MACPORTS_NAME="jq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_TEST_HEADER="<jq.h>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_LIBS="-ljq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_LIBS_STATIC="-ljq -lonig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CFLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Note that cflags may be empty in case of success
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "Found INCLUDE_DIR and/or LIB_DIR!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CFLAGS="-I$INCLUDE_DIR $PKG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_LIBS="-L$LIB_DIR $PKG_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elif [ `uname` = "Darwin" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- brew --version 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ $? -eq 0 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BREWDIR=`brew --prefix`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CFLAGS="-I$BREWDIR/opt/$PKG_BREW_NAME/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_LIBS="-L$BREWDIR/lib $PKG_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- curl -sfL "https://autobrew.github.io/scripts/jq" > autobrew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- . autobrew
</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;'>++PKG_CFLAGS="-I@PREFIX@/include $PKG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_LIBS="-L@PREFIX@/lib $PKG_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For debugging
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Using PKG_CFLAGS=$PKG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " * deb: $PKG_DEB_NAME (Debian, Ubuntu)".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " * rpm: $PKG_RPM_NAME (Fedora, EPEL)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " * csw: $PKG_CSW_NAME (Solaris)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo " * brew: $PKG_BREW_NAME (OSX)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo " * port: $PKG_MACPORTS_NAME (OS X)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "If $PKG_CONFIG_NAME is already installed set INCLUDE_DIR and LIB_DIR manually via:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "R CMD INSTALL --configure-vars='INCLUDE_DIR=... LIB_DIR=...'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "-------------------------- [ERROR MESSAGE] ---------------------------"
</span></pre><pre style='margin:0'>
</pre>