Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Apr 2024 08:37:10 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d4fe7a47308c - main - databases/R-cran-RSQLite: Update to 2.3.6
Message-ID:  <202404050837.4358bAmU098411@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d4fe7a47308c3c1be107deebfd7a799a1387a30d

commit d4fe7a47308c3c1be107deebfd7a799a1387a30d
Author:     Einar Bjarni Halldórsson <einar@isnic.is>
AuthorDate: 2024-04-05 08:32:09 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-04-05 08:36:58 +0000

    databases/R-cran-RSQLite: Update to 2.3.6
    
    While I'm here,
    
    - remove conditionals regarding llvm16 build fix as port build fine
      without it.
    - add test target
    
    ChangeLog: https://cran.r-project.org/web/packages/RSQLite/news/news.html
    
    Differential Revision:  https://reviews.freebsd.org/D44592
---
 databases/R-cran-RSQLite/Makefile                  | 26 ++++++++-------------
 databases/R-cran-RSQLite/distinfo                  |  6 ++---
 .../files/patch-tests_testthat_test-encoding.R     | 27 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/databases/R-cran-RSQLite/Makefile b/databases/R-cran-RSQLite/Makefile
index b4f1606b222b..4644618957ee 100644
--- a/databases/R-cran-RSQLite/Makefile
+++ b/databases/R-cran-RSQLite/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	RSQLite
-PORTVERSION=	2.2.19
-PORTREVISION=	1
+PORTVERSION=	2.3.6
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -8,26 +7,21 @@ MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Database Interface R driver for SQLite
 WWW=		https://cran.r-project.org/web/packages/RSQLite/
 
-LICENSE=	LGPL20
+LICENSE=	LGPL21
 
-CRAN_DEPENDS=	R-cran-DBI>=1.1.0:databases/R-cran-DBI \
-		R-cran-bit64>0:devel/R-cran-bit64 \
-		R-cran-blob>0:devel/R-cran-blob \
+CRAN_DEPENDS=	R-cran-bit64>0:devel/R-cran-bit64 \
+		R-cran-blob>=1.2.0:devel/R-cran-blob \
+		R-cran-cpp11>=0.4.0:devel/R-cran-cpp11 \
+		R-cran-DBI>=1.2.0:databases/R-cran-DBI \
 		R-cran-memoise>0:devel/R-cran-memoise \
-		R-cran-Rcpp>0:devel/R-cran-Rcpp \
 		R-cran-pkgconfig>0:devel/R-cran-pkgconfig \
-		R-cran-plogr>0:devel/R-cran-plogr
+		R-cran-plogr>=0.2.0:devel/R-cran-plogr \
+		R-cran-Rcpp>=0.4.00:devel/R-cran-Rcpp \
+		R-cran-rlang>0:devel/R-cran-rlang
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
+TEST_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist,compiles
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
-	@${REINPLACE_CMD} -e 's|PKG_CPPFLAGS=|PKG_CPPFLAGS=-Wno-error=enum-constexpr-conversion |g' \
-		${WRKSRC}/src/Makevars
-.endif
-
 .include <bsd.port.mk>
diff --git a/databases/R-cran-RSQLite/distinfo b/databases/R-cran-RSQLite/distinfo
index 766cf22b009c..70c43090fb60 100644
--- a/databases/R-cran-RSQLite/distinfo
+++ b/databases/R-cran-RSQLite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669913013
-SHA256 (RSQLite_2.2.19.tar.gz) = 720f6b3bd0f910d200f4900f90feda177d1a6da098b373f91f14abcffd785f86
-SIZE (RSQLite_2.2.19.tar.gz) = 3730412
+TIMESTAMP = 1711979278
+SHA256 (RSQLite_2.3.6.tar.gz) = fbb1b7a58ff49af30059a802a9fed0055b8cf1e401b8022382b94fc6c3c9f8f2
+SIZE (RSQLite_2.3.6.tar.gz) = 4249332
diff --git a/databases/R-cran-RSQLite/files/patch-tests_testthat_test-encoding.R b/databases/R-cran-RSQLite/files/patch-tests_testthat_test-encoding.R
new file mode 100644
index 000000000000..443e56a34ca7
--- /dev/null
+++ b/databases/R-cran-RSQLite/files/patch-tests_testthat_test-encoding.R
@@ -0,0 +1,27 @@
+Fix to skip a windows only test that does not exclude FreeBSD.
+https://github.com/r-dbi/RSQLite/pull/504
+
+--- tests/testthat/test-encoding.R.orig	2024-01-20 09:56:34 UTC
++++ tests/testthat/test-encoding.R
+@@ -34,9 +34,7 @@ test_that("list the field of tables whose colnames are
+ })
+ 
+ test_that("list the field of tables whose colnames are BIG5 encoded (#277)", {
+-  skip_on_os("linux")
+-  skip_on_os("mac")
+-  skip_on_os("solaris")
++  skip_if_not(.Platform$OS.type == "windows")
+   if (.Platform$OS.type == "windows") {
+     withr::local_collate("cht")
+   } else {
+@@ -133,9 +131,7 @@ test_that("write tables whose colnames or contents are
+ })
+ 
+ test_that("write tables whose colnames or contents are BIG5 encoded (#277)", {
+-  skip_on_os("linux")
+-  skip_on_os("mac")
+-  skip_on_os("solaris")
++  skip_if_not(.Platform$OS.type == "windows")
+ 
+   .loc <- Sys.getlocale("LC_COLLATE")
+   suppressWarnings(Sys.setlocale(locale = "cht"))



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404050837.4358bAmU098411>