<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/e3672ae286dd9a94fdf205e3c6efa1917ed68e38">https://github.com/macports/macports-ports/commit/e3672ae286dd9a94fdf205e3c6efa1917ed68e38</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e3672ae286dd9a94fdf205e3c6efa1917ed68e38
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Sep 28 01:06:54 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> R-dbx, R-dplyr, R-quantmod, R-sqldf: support testing
</span>---
R/R-RMySQL/Portfile | 35 +++++++++++++++++++++++++++++++
R/R-RMySQL/files/patch-configure.diff | 39 +++++++++++++++++++++++++++++++++++
R/R-dbx/Portfile | 14 +++++++++++++
R/R-dplyr/Portfile | 24 +++++++++++++++++++++
R/R-quantmod/Portfile | 9 ++++++++
R/R-sqldf/Portfile | 11 +++++++++-
R/R-sqldf/files/patch-no-RH2.diff | 11 ++++++++++
7 files changed, 142 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RMySQL/Portfile b/R/R-RMySQL/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..87c7885c8c5
</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-RMySQL/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</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 RMySQL 0.10.26
</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 {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description SQLite interface for R
</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 25948dbb03d9b9f2c00e6a30956cefcaef32f231 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 45bb5b20a38b1f7d3a58a1c15c9d57707d603b01a3021423d1d57367a4ef637a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 53383
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set mariadb_ver 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:mariadb-${mariadb_ver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-DBI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --configure-vars=' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIR=${prefix}/include/mariadb-${mariadb_ver}/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_DIR=${prefix}/lib/mariadb-${mariadb_ver}/mysql'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-curl \
</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;'>+# This is intended for now; what works for destroot does not work with running tests.
</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-RMySQL/files/patch-configure.diff b/R/R-RMySQL/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..113c92b10d0
</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-RMySQL/files/patch-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-09-26 19:00:17.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-09-28 01:00:44.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_DEB_NAME="libmariadbclient-dev | libmariadb-client-lgpl-dev"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_RPM_NAME="mariadb-connector-c-devel | mariadb-devel | mysql-devel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CSW_NAME="mysql56_dev"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_BREW_NAME="mariadb-connector-c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_MP_NAME="mariadb-connector-c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_TEST_HEADER="<mysql.h>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_LIBS="-lmysqlclient"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,18 +30,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Found mysql_config cflags and libs!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CFLAGS=${PKGCONFIG_CFLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_LIBS=${PKGCONFIG_LIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Workaround for homebrew linkin bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ `uname` = "Darwin" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_LIBS="-L/usr/local/opt/openssl/lib $PKG_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elif [ `uname` = "Darwin" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test ! "$CI" && 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;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- curl -sfL "https://autobrew.github.io/scripts/$PKG_BREW_NAME" > 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;'>+ # Find compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +51,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, CentOS, RHEL)"
</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 you already have a mysql client library installed, verify that either"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "mariadb_config or mysql_config is on your PATH. If these are unavailable"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "you can also set INCLUDE_DIR and LIB_DIR manually via:"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-dbx/Portfile b/R/R-dbx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 87e14f023c6..ef5ff526d69 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-dbx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-dbx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,3 +18,17 @@ github.tarball_from archive
</span> supported_archs noarch
depends_lib-append port:R-DBI
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-blob \
</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-jsonlite \
</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-RMySQL \
</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;'>+ port:R-urltools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-dplyr/Portfile b/R/R-dplyr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a899321442..eea18302271 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-dplyr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-dplyr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,3 +26,27 @@ depends_lib-append port:R-cli \
</span> port:R-tibble \
port:R-tidyselect \
port:R-vctrs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-bench \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-broom \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-callr \
</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-DBI \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-dbplyr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-ggplot2 \
</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-lobstr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-microbenchmark \
</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-purrr \
</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-RMySQL \
</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-stringi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-testthat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-tidyr \
</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;'>+test.run yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-quantmod/Portfile b/R/R-quantmod/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 312e01fac20..63ca6a1ade6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-quantmod/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-quantmod/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,3 +21,12 @@ depends_lib-append port:R-curl \
</span> port:R-TTR \
port:R-xts \
port:R-zoo
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-DBI \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-downloader \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-RMySQL \
</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-timeSeries \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-xml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-sqldf/Portfile b/R/R-sqldf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ca9ee8e402..e1c8848ff92 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-sqldf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-sqldf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,8 @@ PortSystem 1.0
</span> PortGroup R 1.0
R.setup cran ggrothendieck sqldf 0.4-11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append databases
</span> maintainers nomaintainer
license GPL-2
description Manipulate R data frames using SQL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,3 +20,11 @@ depends_lib-append port:R-chron \
</span> port:R-gsubfn \
port:R-proto \
port:R-RSQLite
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-no-RH2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-RMySQL \
</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-svUnit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-sqldf/files/patch-no-RH2.diff b/R/R-sqldf/files/patch-no-RH2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b216dc159f2
</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-sqldf/files/patch-no-RH2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DESCRIPTION 2017-06-28 13:43:10.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DESCRIPTION 2023-09-28 02:54:58.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'RSQLite', 'RH2', 'RMySQL' and 'RPostgreSQL' backends are supported.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ByteCompile: true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Depends: R (>= 3.1.0), gsubfn (>= 0.6), proto, RSQLite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Suggests: RH2, RMySQL, RPostgreSQL, svUnit, tcltk, MASS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Suggests: RMySQL, RPostgreSQL, svUnit, tcltk, MASS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Imports: DBI, chron
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ License: GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BugReports: https://github.com/ggrothendieck/sqldf/issues
</span></pre><pre style='margin:0'>
</pre>