<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/74cbe1d4c1f7f7e77d010504df0650e3fc990d39">https://github.com/macports/macports-ports/commit/74cbe1d4c1f7f7e77d010504df0650e3fc990d39</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 74cbe1d4c1f7f7e77d010504df0650e3fc990d39
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Dec 16 07:13:53 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-odbc: update to 1.4.0
</span>---
R/R-odbc/Portfile | 12 +++++-------
R/R-odbc/files/0001-Fix-cctz-static-lib.patch | 27 ---------------------------
2 files changed, 5 insertions(+), 34 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 acaa26fd3c6..1752b055ad4 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;'>@@ -3,7 +3,8 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup github r-dbi odbc 1.3.5 v
</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 r-dbi odbc 1.4.0 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 +12,9 @@ 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 1cc1844d72b50fbfd731f76420ba92a136c65a96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7d6299d7ba6ae09f46c090c3ec954b002bff8b84f8013941182daeb60c53cf78 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 202610
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2bcaa0914b1f107c859ecf38188c73874d50da1f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 707037eb043cc87ed128e2f082793ee24bd8d724952775319275e39f931be273 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 426332
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +26,6 @@ depends_lib-append port:libiodbc \
</span> port:R-Rcpp \
port:R-rlang
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/r-dbi/odbc/pull/594
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-Fix-cctz-static-lib.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_test-append port:R-covr \
port:R-DBItest \
port:R-magrittr \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-odbc/files/0001-Fix-cctz-static-lib.patch b/R/R-odbc/files/0001-Fix-cctz-static-lib.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8346a5b31b9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-odbc/files/0001-Fix-cctz-static-lib.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f0653ba9c8140b4513b7cf178c431da45bc7f4b9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 12 Aug 2023 00:59:42 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix cctz static lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/Makevars.in | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Makevars.in src/Makevars.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8de5226..8482ef1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makevars.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makevars.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,6 +12,10 @@ $(SHLIB): $(OBJECTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(OBJECTS): cctz/libcctz.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Makefile of libcctz has correct flags, but they are not picked, since Makevars overrides them.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Alternatively, ranlib should be run after ar. Otherwise the archive may have no ToC, and build fails.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ARFLAGS = rcs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctz/libcctz.a:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd cctz && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) libcctz.a CC="$(CC)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" AR="$(AR)" ARFLAGS=$(ARFLAGS) CXXPICFLAGS="$(CXXPICFLAGS)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>