git: 0031bf40890f - main - math/R-cran-XLConnect: upgrade to 1.1.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Thu, 02 Jan 2025 15:50:51 UTC
The branch main has been updated by thierry:

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

commit 0031bf40890fa061cbd3f391f261911fd6ccc995
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2025-01-02 15:32:11 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2025-01-02 15:40:13 +0000

    math/R-cran-XLConnect: upgrade to 1.1.0
    
    Changelog at https://cran.r-project.org/web/packages/XLConnect/NEWS .
---
 math/R-cran-XLConnect/Makefile               | 14 ++++++++-----
 math/R-cran-XLConnect/distinfo               |  6 +++---
 math/R-cran-XLConnect/files/patch-R_onLoad.R | 31 +++++++++++++++-------------
 math/R-cran-XLConnect/pkg-plist              | 12 ++++++++---
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile
index 253b28251922..ef4873e3a3bb 100644
--- a/math/R-cran-XLConnect/Makefile
+++ b/math/R-cran-XLConnect/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	XLConnect
-PORTVERSION=	1.0.10
+PORTVERSION=	1.1.0
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -17,6 +17,7 @@ RUN_DEPENDS=	R-cran-rJava>0:devel/R-cran-rJava	\
 		apache-commons-io>0:devel/apache-commons-io	\
 		apache-commons-math>0:math/apache-commons-math	\
 		apache-commons-codec>0:java/apache-commons-codec	\
+		apache-commons-lang3>0:java/apache-commons-lang3	\
 		apache-commons-compress>0:archivers/apache-commons-compress \
 		apache-commons-collections4>0:java/apache-commons-collections4
 TEST_DEPENDS=	R-cran-zoo>0:math/R-cran-zoo	\
@@ -25,17 +26,20 @@ TEST_DEPENDS=	R-cran-zoo>0:math/R-cran-zoo	\
 USES=		cran java
 
 DEP_JARS=	commons-codec commons-collections4 commons-compress	\
-		log4j-api poi poi-ooxml poi-ooxml-full SparseBitSet xmlbeans
+		commons-lang3 log4j-api poi poi-ooxml poi-ooxml-full	\
+		SparseBitSet xmlbeans
 
 post-install:
 .for j in ${DEP_JARS}
 	${LN} -sf ${JAVALIBDIR}/${j}.jar ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/
 .endfor
+	${LN} -sf ${JAVALIBDIR}/commons-lang3.jar	\
+		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-lang3-3.14.0.jar
 	${LN} -sf ${JAVALIBDIR}/commons-math.jar	\
 		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-math3.jar
-	${LN} -sf ${JAVALIBDIR}/commons-io.jar	\
-		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-io-2.15.0.jar
+	${LN} -sf ${JAVALIBDIR}/commons-io-2.16.1.jar	\
+		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-io-2.16.1.jar
 	${LN} -sf ${JAVALIBDIR}/commons-codec.jar	\
-		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.16.0.jar
+		${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.17.0.jar
 
 .include <bsd.port.mk>
diff --git a/math/R-cran-XLConnect/distinfo b/math/R-cran-XLConnect/distinfo
index 744a543a83ce..6b04d613334c 100644
--- a/math/R-cran-XLConnect/distinfo
+++ b/math/R-cran-XLConnect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714673561
-SHA256 (XLConnect_1.0.10.tar.gz) = e3c267cb1e6a6fb3a9fb132e60649182ee7a28e4e9188c72786fb843aad6e2b4
-SIZE (XLConnect_1.0.10.tar.gz) = 1478532
+TIMESTAMP = 1735757735
+SHA256 (XLConnect_1.1.0.tar.gz) = 3747f1f8f8e785d291ac1c1078899c53d51dd053f1b495fda97ab598ebecc432
+SIZE (XLConnect_1.1.0.tar.gz) = 1510379
diff --git a/math/R-cran-XLConnect/files/patch-R_onLoad.R b/math/R-cran-XLConnect/files/patch-R_onLoad.R
index 95b0d55395a3..62672ce6f939 100644
--- a/math/R-cran-XLConnect/files/patch-R_onLoad.R
+++ b/math/R-cran-XLConnect/files/patch-R_onLoad.R
@@ -1,25 +1,28 @@
---- R/onLoad.R.orig	2024-01-30 12:03:57 UTC
+--- R/onLoad.R.orig	2024-08-22 06:24:41 UTC
 +++ R/onLoad.R
-@@ -55,47 +55,7 @@
+@@ -55,50 +55,7 @@
      repo <- "https://repo1.maven.org/maven2"
    }
    apachePrefix <- paste0(repo, "/org/apache")
 -  sharedPaths <- tryCatch({
 -    c(
 -      xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/poi/poi-ooxml-full/5.2.5/poi-ooxml-full-5.2.5.jar"), "poi-ooxml-full.jar", 
--      "5.2.5",  libname, pkgname),
+-      paste0(apachePrefix, "/poi/poi-ooxml-full/5.3.0/poi-ooxml-full-5.3.0.jar"), "poi-ooxml-full.jar", 
+-      "5.3.0",  libname, pkgname),
 -    xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/poi/poi-ooxml/5.2.5/poi-ooxml-5.2.5.jar"), "poi-ooxml.jar", 
--      "5.2.5",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
+-      paste0(apachePrefix, "/poi/poi-ooxml/5.3.0/poi-ooxml-5.3.0.jar"), "poi-ooxml.jar", 
+-      "5.3.0",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
 -    xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/poi/poi/5.2.5/poi-5.2.5.jar"), "poi.jar", 
--      "5.2.5",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
+-      paste0(apachePrefix, "/poi/poi/5.3.0/poi-5.3.0.jar"), "poi.jar", 
+-      "5.3.0",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
 -    xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/commons/commons-compress/1.25.0/commons-compress-1.25.0.jar"), "commons-compress.jar",
+-      paste0(apachePrefix, "/commons/commons-compress/1.26.2/commons-compress-1.26.2.jar"), "commons-compress.jar",
 -      "1\\.(2[5-9]|[2-9][0-9]).*",  libname, pkgname, debianpkg = "libcommons-compress-java", rpmpkg="apache-commons-compress"),
 -    xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/xmlbeans/xmlbeans/5.2.0/xmlbeans-5.2.0.jar"), "xmlbeans.jar",
+-      paste0(apachePrefix, "/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar"), "commons-lang3-3.14.0.jar",
+-      "3\\.(1[4-9]|[2-9][0-9])\\.*",  libname, pkgname, debianpkg="libcommons-lang3-java", rpmpkg="apache-commons-lang3"),
+-    xlcEnsureDependenciesFor(
+-      paste0(apachePrefix, "/xmlbeans/xmlbeans/5.2.1/xmlbeans-5.2.1.jar"), "xmlbeans.jar",
 -      "5\\..*",  libname, pkgname, debianpkg="libxmlbeans-java"),
 -    xlcEnsureDependenciesFor(
 -      paste0(apachePrefix, "/commons/commons-collections4/4.4/commons-collections4-4.4.jar"), "commons-collections4.jar",
@@ -28,13 +31,13 @@
 -      paste0(apachePrefix, "/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar"), "commons-math3.jar",
 -      "3\\.([6-9]|1[0-9]).*",  libname, pkgname, debianpkg="libcommons-math3-java"),
 -    xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/logging/log4j/log4j-api/2.21.1/log4j-api-2.21.1.jar"), "log4j-api.jar",
--      "2.21.1",  libname, pkgname),
+-      paste0(apachePrefix, "/logging/log4j/log4j-api/2.23.1/log4j-api-2.23.1.jar"), "log4j-api.jar",
+-      "2\\.23\\..*",  libname, pkgname),
 -    xlcEnsureDependenciesFor(
--      paste0(repo, "/commons-codec/commons-codec/1.16.0/commons-codec-1.16.0.jar"), "commons-codec-1.16.0.jar",
+-      paste0(repo, "/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.jar"), "commons-codec-1.17.0.jar",
 -      "1\\.(1[1-9]|[2-9][0-9]).*",  libname, pkgname, debianpkg="libcommons-codec-java", rpmpkg="apache-commons-codec"),
 -    xlcEnsureDependenciesFor(
--      paste0(repo, "/commons-io/commons-io/2.15.0/commons-io-2.15.0.jar"), "commons-io-2.15.0.jar",
+-      paste0(repo, "/commons-io/commons-io/2.16.1/commons-io-2.16.1.jar"), "commons-io-2.16.1.jar",
 -      "2\\.(1[5-9]|[2-9][0-9]).*",  libname, pkgname, debianpkg="libcommons-io-java", rpmpkg="apache-commons-io"),
 -    xlcEnsureDependenciesFor(
 -      paste0(repo, "/com/zaxxer/SparseBitSet/1.3/SparseBitSet-1.3.jar"), "SparseBitSet.jar",
diff --git a/math/R-cran-XLConnect/pkg-plist b/math/R-cran-XLConnect/pkg-plist
index ec6eb479ac0e..fce9ca795937 100644
--- a/math/R-cran-XLConnect/pkg-plist
+++ b/math/R-cran-XLConnect/pkg-plist
@@ -36,6 +36,7 @@
 %%R_MOD_DIR%%/demoFiles/SwitzerlandFlag.jpg
 %%R_MOD_DIR%%/demoFiles/conversion.xlsx
 %%R_MOD_DIR%%/demoFiles/errorCell.xlsx
+%%R_MOD_DIR%%/demoFiles/iris.xlsx
 %%R_MOD_DIR%%/demoFiles/mtcars.xlsx
 %%R_MOD_DIR%%/demoFiles/multiregion.xls
 %%R_MOD_DIR%%/demoFiles/multiregion.xlsx
@@ -57,12 +58,14 @@
 %%R_MOD_DIR%%/html/00Index.html
 %%R_MOD_DIR%%/html/R.css
 %%R_MOD_DIR%%/java/SparseBitSet.jar
-%%R_MOD_DIR%%/java/XLConnect-2.0.1.jar
-%%R_MOD_DIR%%/java/commons-codec-1.16.0.jar
+%%R_MOD_DIR%%/java/XLConnect-3.0.0-SNAPSHOT.jar
+%%R_MOD_DIR%%/java/commons-codec-1.17.0.jar
 %%R_MOD_DIR%%/java/commons-codec.jar
 %%R_MOD_DIR%%/java/commons-collections4.jar
 %%R_MOD_DIR%%/java/commons-compress.jar
-%%R_MOD_DIR%%/java/commons-io-2.15.0.jar
+%%R_MOD_DIR%%/java/commons-io-2.16.1.jar
+%%R_MOD_DIR%%/java/commons-lang3-3.14.0.jar
+%%R_MOD_DIR%%/java/commons-lang3.jar
 %%R_MOD_DIR%%/java/commons-math3.jar
 %%R_MOD_DIR%%/java/curvesapi-1.08.jar
 %%R_MOD_DIR%%/java/log4j-api.jar
@@ -72,6 +75,7 @@
 %%R_MOD_DIR%%/java/poi.jar
 %%R_MOD_DIR%%/java/xmlbeans.jar
 %%R_MOD_DIR%%/tests/run_tests.R
+%%R_MOD_DIR%%/unitTests/resources/test37.xlsx
 %%R_MOD_DIR%%/unitTests/resources/testBug106.xlsx
 %%R_MOD_DIR%%/unitTests/resources/testBug170.xlsx
 %%R_MOD_DIR%%/unitTests/resources/testBug181.xlsx
@@ -96,6 +100,8 @@
 %%R_MOD_DIR%%/unitTests/resources/testWorkbookExistsNameAndSheet.xlsx
 %%R_MOD_DIR%%/unitTests/resources/testWorkbookForceRecalc.xls
 %%R_MOD_DIR%%/unitTests/resources/testWorkbookForceRecalc.xlsx
+%%R_MOD_DIR%%/unitTests/resources/testWorkbookGetDefinedNamesScoped.xls
+%%R_MOD_DIR%%/unitTests/resources/testWorkbookGetDefinedNamesScoped.xlsx
 %%R_MOD_DIR%%/unitTests/resources/testWorkbookMissingValue.xls
 %%R_MOD_DIR%%/unitTests/resources/testWorkbookMissingValue.xlsx
 %%R_MOD_DIR%%/unitTests/resources/testWorkbookOverwriteFormulas.xls