<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/69ab42c031bf1d831f3ba6f32d043f5088a4de1d">https://github.com/macports/macports-ports/commit/69ab42c031bf1d831f3ba6f32d043f5088a4de1d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 69ab42c031bf1d831f3ba6f32d043f5088a4de1d
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Sep 28 00:43:55 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> R-dbplyr: update to 2.3.4, support testing
</span>---
R/R-Lahman/Portfile | 17 +++++
R/R-RPostgres/Portfile | 39 +++++++++++
R/R-RPostgres/files/patch-unbreak-configure.diff | 84 ++++++++++++++++++++++++
R/R-dbplyr/Portfile | 23 +++++--
4 files changed, 159 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-Lahman/Portfile b/R/R-Lahman/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f9bd11b1db7
</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-Lahman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup R 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran cdalzell Lahman 11.0-0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Sean Lahman baseball database
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 98267b13f23901a14cf00ec04219d4e9f5d92a06 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7ba1395469e92964ddbd59e3697d3205a0bd9ef10d37251cef9554397d9afd4b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6278194
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:R-dplyr
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RPostgres/Portfile b/R/R-RPostgres/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..605505e5f5f
</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-RPostgres/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup R 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran r-dbi RPostgres 1.4.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append databases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Rcpp Interface to PostgreSQL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://rpostgres.r-dbi.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4098cdc2b94d5168bb342e6149820e27d9a3cb8c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 70ff848cba51ddad4642a20e01cda1033e6f218b015a13380c30604bbd18c797 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1473682
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Keep in sync with R-RPostgreSQL, so that we do not need multiple postgresql ports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Make sure a chosen version is supported for all archs, including powerpc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgsql postgresql15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure script is fancy but totally defunct; fix it:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-unbreak-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:${pgsql} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-bit64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-blob \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-DBI \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-hms \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-lubridate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-plogr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-Rcpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-withr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd-append --configure-vars=' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIR=${prefix}/include/${pgsql} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_DIR=${prefix}/lib/${pgsql} '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run no
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RPostgres/files/patch-unbreak-configure.diff b/R/R-RPostgres/files/patch-unbreak-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c6005419604
</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-RPostgres/files/patch-unbreak-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,84 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2023-01-20 03:16:26.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-09-27 20:04:20.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,54 +12,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_RPM_NAME="postgresql-devel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_AMZ_RPM_NAMES="postgreql8-devel, psstgresql92-devel, postgresql93-devel, or postgresql94-devel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CSW_NAME="postgresql_dev"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_BREW_NAME="libpq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_MP_NAME="libpq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_TEST_HEADER="<libpq-fe.h>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_LIBS="-lpq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Extra checks on MacOS for SSL support in libpq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# command -v is probably fine: https://stackoverflow.com/a/677212/946850
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ `uname` = "Darwin" ] && [ `command -v pkg-config` ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if pkg-config --atleast-version=12 libpq; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case "`pkg-config --libs --static libpq`" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *crypto*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "Local libpq has SSL support"
</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;'>+- echo "Local libpq does not have SSL support"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FORCE_AUTOBREW=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FORCE_AUTOBREW=1
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# pkg-config values (if available)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -z "$FORCE_AUTOBREW" ] && [ `command -v pkg-config` ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKGCONFIG_CFLAGS=`pkg-config --cflags --silence-errors ${PKG_CONFIG_NAME}`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKGCONFIG_LIBS=`pkg-config --libs --silence-errors ${PKG_CONFIG_NAME}`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKGCONFIG_MODVERSION=`pkg-config --modversion --silence-errors ${PKG_CONFIG_NAME}`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Workaround for broken libpq.pc files on some systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ `uname` = "Darwin" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case "$PKGCONFIG_CFLAGS" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *"Internal.sdk"*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unset PKGCONFIG_CFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unset PKGCONFIG_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -z "$PKGCONFIG_CFLAGS" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unset PKGCONFIG_LIBS
</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;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pg_config values (if available)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -z "$FORCE_AUTOBREW" ] && [ `command -v pg_config` ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PG_INC_DIR=`pg_config --includedir`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PG_LIB_DIR=`pg_config --libdir`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PG_VERSION=`pg_config --version`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</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;'>+@@ -82,16 +42,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CFLAGS="-I${PG_INC_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_LIBS="-L${PG_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 ] && [ -z "$FORCE_AUTOBREW" ]; 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/opt/$PKG_BREW_NAME/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/libpq" > 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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$R_PLOGR_ENABLE" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,7 +69,7 @@
</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 " * rpm: $PKG_AMZ_RPM_NAMES (Amazon Linux)"
</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_MP_NAME (OSX)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "If $PKG_CONFIG_NAME is already installed, check that either:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "(i) 'pkg-config' is in your PATH AND PKG_CONFIG_PATH contains"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " a $PKG_CONFIG_NAME.pc file; or"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-dbplyr/Portfile b/R/R-dbplyr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 104d81b6c2a..93ea3becc70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-dbplyr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-dbplyr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup github tidyverse dbplyr 2.3.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup github tidyverse dbplyr 2.3.4 v
</span> revision 0
categories-append databases
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,9 +11,9 @@ license MIT
</span> description dplyr back-end for databases
long_description {*}${description}
homepage https://dbplyr.tidyverse.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7f221b0d4cd32b7c4af444c08aea6a9b6ec88ea9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57fc65e49a88337729715782cfed0ac8b0b42e8a8118b5e754389d1f5b5ac117 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 538582
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e6a1b0f8244bbffc29065c178b27f51e03fa726a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9c356575549000a7f1dfa9de65575be4b1e8539c826d02fbe1aae0c2e7b56e43 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 538585
</span> supported_archs noarch
depends_lib-append port:R-blob \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,3 +32,18 @@ depends_lib-append port:R-blob \
</span> port:R-tidyselect \
port:R-vctrs \
port:R-withr
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-bit64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-covr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-knitr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-Lahman \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-nycflights13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-odbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-RMariaDB \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-rmarkdown \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-RPostgres \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-RPostgreSQL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-RSQLite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-testthat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span></pre><pre style='margin:0'>
</pre>