<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/1eb91c9ad3a135e8dd199e45cef8c93346f337e5">https://github.com/macports/macports-ports/commit/1eb91c9ad3a135e8dd199e45cef8c93346f337e5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1eb91c9ad3a135e8dd199e45cef8c93346f337e5
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue May 28 13:55:06 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-RPostgres: update to 1.4.7
</span>---
R/R-RPostgres/Portfile | 13 +++++++------
R/R-RPostgres/files/patch-unbreak-configure.diff | 20 +++++++++++++-------
2 files changed, 20 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RPostgres/Portfile b/R/R-RPostgres/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index adb7d496ba1..f53c8e2f791 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-RPostgres/Portfile
</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;'>@@ -3,17 +3,17 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran r-dbi RPostgres 1.4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran r-dbi RPostgres 1.4.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append databases
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license GPL-3
description Rcpp Interface to PostgreSQL
long_description {*}${description}
homepage https://rpostgres.r-dbi.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 98dac5c669f102086e2044526e9547eef4859c7d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d9ee4b67e35dbe574afafd36cf53c3e2ea743f94c8fae1ff33bdbb9f531ea0d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1474867
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d51a723837e8079ebcb7a4e62b601d6eb4b94b95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3dd1f1d83bd8a25a0a86532c6971072fccea7b1769f601ad9daa8c9aa8f66924 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1476313
</span>
# Keep in sync with R-RPostgreSQL, so that we do not need multiple postgresql ports.
# Make sure a chosen version is supported for all archs, including powerpc.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +25,11 @@ patchfiles patch-unbreak-configure.diff
</span> depends_lib-append port:${pgsql} \
port:R-bit64 \
port:R-blob \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-cpp11 \
</span> port:R-DBI \
port:R-hms \
port:R-lubridate \
port:R-plogr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:R-Rcpp \
</span> port:R-withr
build.args-append --configure-vars=' \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,7 @@ depends_test-append port:R-callr \
</span> port:R-covr \
port:R-DBItest \
port:R-knitr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-rlang \
</span> port:R-rmarkdown \
port:R-testthat
<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><span style='display:block; white-space:pre;color:#808080;'>index 6b68382c81e..01d6205c2c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-RPostgres/files/patch-unbreak-configure.diff
</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;'>@@ -1,8 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure 2023-10-23 02:23:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-10-23 09:52:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,54 +12,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2024-05-27 04:04:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-05-28 13:32:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Anticonf script by Jeroen Ooms (2020)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# But fixed by MacPorts (2023).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This script will prefer cflags (specifically includefile dirs) and lib dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in the following order of precedence:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (1) INCLUDE_DIR or LIB_DIR entered explicitly on the command line, e.g.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,54 +13,14 @@
</span> PKG_RPM_NAME="postgresql-devel"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_AMZ_RPM_NAMES="postgreql8-devel, psstgresql92-devel, postgresql93-devel, or postgresql94-devel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_AMZ_RPM_NAMES="postgreql8-devel, postgresql92-devel, postgresql93-devel, or postgresql94-devel"
</span> PKG_CSW_NAME="postgresql_dev"
-PKG_BREW_NAME="libpq"
+PKG_MP_NAME="libpq"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +18,7 @@
</span> -# Extra checks on MacOS for SSL support in libpq
-# command -v is probably fine: https://stackoverflow.com/a/677212/946850
-if [ "`uname`" = Darwin ] && [ "`command -v pkg-config`" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if pkg-config --atleast-version=12 libpq; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if pkg-config --atleast-version=15 libpq; then
</span> - case "`pkg-config --libs --static libpq`" in
- *crypto*)
- echo "Local libpq has SSL support"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +62,7 @@
</span>
# Note that cflags may be empty in case of success
if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,16 +42,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,16 +43,6 @@
</span>
PKG_CFLAGS="-I${PG_INC_DIR}"
PKG_LIBS="-L${PG_LIB_DIR} ${PKG_LIBS}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +79,7 @@
</span> fi
if [ "$R_PLOGR_ENABLE" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,7 +69,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,7 +70,7 @@
</span> echo " * rpm: $PKG_RPM_NAME (Fedora, EPEL)"
echo " * rpm: $PKG_AMZ_RPM_NAMES (Amazon Linux)"
echo " * csw: $PKG_CSW_NAME (Solaris)"
</pre><pre style='margin:0'>
</pre>