<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/18a15d0cad677e9bc1937b323f5b46d5e0a0d519">https://github.com/macports/macports-ports/commit/18a15d0cad677e9bc1937b323f5b46d5e0a0d519</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 18a15d0cad677e9bc1937b323f5b46d5e0a0d519
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Dec 23 00:27:17 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-odbc: update to 1.4.1; support both libiodbc and unixODBC
</span>---
R/R-odbc/Portfile | 37 ++++++++++++++++++++++++++++++-------
R/R-odbc/files/patch-configure.diff | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-odbc/Portfile b/R/R-odbc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1752b055ad4..fe7599e37d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-odbc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-odbc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup R 1.0
# Revert to GitHub once updated there.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran r-dbi odbc 1.4.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran r-dbi odbc 1.4.1 v
</span> revision 0
categories-append databases
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,14 +12,35 @@ license MIT
</span> description DBI-compatible interface to ODBC databases
long_description {*}${description}
homepage https://r-dbi.github.io/odbc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2bcaa0914b1f107c859ecf38188c73874d50da1f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 707037eb043cc87ed128e2f082793ee24bd8d724952775319275e39f931be273 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 426332
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 92b2086aa229c149167a3c93da6ea0ab4e313274 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ad7f570658c4a6e587f6c5f84036e4dabc1b4b85a205567e1499483a4d7034af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 430662
</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;'>+variant libiodbc description "Use libiodbc" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiodbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@ODBC@|libiodbc|g" ${worksrcpath}/configure
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant unixODBC description "Use unixODBC" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:unixODBC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@ODBC@|unixODBC|g" ${worksrcpath}/configure
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset libiodbc] && ![variant_isset unixODBC]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +libiodbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:libiodbc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:R-bit64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:R-bit64 \
</span> port:R-blob \
port:R-DBI \
port:R-hms \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +50,10 @@ depends_lib-append port:libiodbc \
</span> depends_test-append port:R-covr \
port:R-DBItest \
port:R-magrittr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-rmarkdown \
</span> port:R-RSQLite \
port:R-testthat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:R-tibble
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-tibble \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-withr
</span>
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-odbc/files/patch-configure.diff b/R/R-odbc/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..94aa7f05d3f
</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-odbc/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2023-12-21 04:23:48.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-12-23 00:07:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_RPM_NAME="unixODBC-devel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CSW_NAME="unixodbc_dev"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_PACMAN_NAME="unixodbc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_BREW_NAME="unixodbc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_MP_NAME="@ODBC@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_TEST_HEADER="<sql.h>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_LIBS="${PKG_LIBS:--lodbc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,15 +40,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$PKGCONFIG_CFLAGS" ] || [ "$PKGCONFIG_LIBS" ]; then
</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;'>+- elif [ "`uname`" = 'Darwin' ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ "`command -v brew`" ]; 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/unixodbc" > 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;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +66,7 @@
</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 " * pacman: $PKG_PACMAN_NAME (Archlinux, Manjaro, etc)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo " * brew: $PKG_BREW_NAME (Mac OSX)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo " * port: $PKG_MP_NAME (MacOS)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "To use a custom $PKG_CONFIG_NAME set INCLUDE_DIR and LIB_DIR and PKG_LIBS manually via:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "R CMD INSTALL --configure-vars='INCLUDE_DIR=... LIB_DIR=... PKG_LIBS=...'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "--------------------------------------------------------------------"
</span></pre><pre style='margin:0'>
</pre>