git: 89d531ccc6ee - main - math/R-cran-XLConnect: upgrade to 1.2.0

From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Thu, 03 Apr 2025 19:46:42 UTC
The branch main has been updated by thierry:

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

commit 89d531ccc6ee37f6443d9052b04d51ee8336265e
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2025-04-03 19:29:00 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2025-04-03 19:46:31 +0000

    math/R-cran-XLConnect: upgrade to 1.2.0
    
    Release notes at https://cran.r-project.org/web/packages/XLConnect/NEWS
---
 math/R-cran-XLConnect/Makefile               |  2 +-
 math/R-cran-XLConnect/distinfo               |  6 +++---
 math/R-cran-XLConnect/files/patch-R_onLoad.R | 28 ++++++++++++++--------------
 math/R-cran-XLConnect/pkg-plist              |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile
index ef4873e3a3bb..c1b16cb4bac9 100644
--- a/math/R-cran-XLConnect/Makefile
+++ b/math/R-cran-XLConnect/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	XLConnect
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/math/R-cran-XLConnect/distinfo b/math/R-cran-XLConnect/distinfo
index 6b04d613334c..13a4525145af 100644
--- a/math/R-cran-XLConnect/distinfo
+++ b/math/R-cran-XLConnect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735757735
-SHA256 (XLConnect_1.1.0.tar.gz) = 3747f1f8f8e785d291ac1c1078899c53d51dd053f1b495fda97ab598ebecc432
-SIZE (XLConnect_1.1.0.tar.gz) = 1510379
+TIMESTAMP = 1743444718
+SHA256 (XLConnect_1.2.0.tar.gz) = 6dab078b45b691f6bac69194fd7f45b7afa3973e33ac7320c4e0797a378f046e
+SIZE (XLConnect_1.2.0.tar.gz) = 1467473
diff --git a/math/R-cran-XLConnect/files/patch-R_onLoad.R b/math/R-cran-XLConnect/files/patch-R_onLoad.R
index 62672ce6f939..bf0baeaeb521 100644
--- a/math/R-cran-XLConnect/files/patch-R_onLoad.R
+++ b/math/R-cran-XLConnect/files/patch-R_onLoad.R
@@ -1,4 +1,4 @@
---- R/onLoad.R.orig	2024-08-22 06:24:41 UTC
+--- R/onLoad.R.orig	2025-02-17 07:43:13 UTC
 +++ R/onLoad.R
 @@ -55,50 +55,7 @@
      repo <- "https://repo1.maven.org/maven2"
@@ -7,22 +7,22 @@
 -  sharedPaths <- tryCatch({
 -    c(
 -      xlcEnsureDependenciesFor(
--      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),
+-      paste0(apachePrefix, "/poi/poi-ooxml-full/5.4.0/poi-ooxml-full-5.4.0.jar"), "poi-ooxml-full.jar", 
+-      "5.4.0",  libname, pkgname),
 -    xlcEnsureDependenciesFor(
--      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"),
+-      paste0(apachePrefix, "/poi/poi-ooxml/5.4.0/poi-ooxml-5.4.0.jar"), "poi-ooxml.jar", 
+-      "5.4.0",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
 -    xlcEnsureDependenciesFor(
--      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"),
+-      paste0(apachePrefix, "/poi/poi/5.4.0/poi-5.4.0.jar"), "poi.jar", 
+-      "5.4.0",  libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
 -    xlcEnsureDependenciesFor(
--      paste0(apachePrefix, "/commons/commons-compress/1.26.2/commons-compress-1.26.2.jar"), "commons-compress.jar",
+-      paste0(apachePrefix, "/commons/commons-compress/1.27.1/commons-compress-1.27.1.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, "/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar"), "commons-lang3-3.14.0.jar",
+-      paste0(apachePrefix, "/commons/commons-lang3/3.16.0/commons-lang3-3.16.0.jar"), "commons-lang3-3.16.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",
+-      paste0(apachePrefix, "/xmlbeans/xmlbeans/5.3.0/xmlbeans-5.3.0.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",
@@ -31,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.23.1/log4j-api-2.23.1.jar"), "log4j-api.jar",
--      "2\\.23\\..*",  libname, pkgname),
+-      paste0(apachePrefix, "/logging/log4j/log4j-api/2.24.3/log4j-api-2.24.3.jar"), "log4j-api.jar",
+-      "2\\.24\\..*",  libname, pkgname),
 -    xlcEnsureDependenciesFor(
--      paste0(repo, "/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.jar"), "commons-codec-1.17.0.jar",
+-      paste0(repo, "/commons-codec/commons-codec/1.17.1/commons-codec-1.17.1.jar"), "commons-codec-1.17.1.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.16.1/commons-io-2.16.1.jar"), "commons-io-2.16.1.jar",
+-      paste0(repo, "/commons-io/commons-io/2.18.0/commons-io-2.18.0.jar"), "commons-io-2.18.0.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 fce9ca795937..1b648e2b90f2 100644
--- a/math/R-cran-XLConnect/pkg-plist
+++ b/math/R-cran-XLConnect/pkg-plist
@@ -58,7 +58,7 @@
 %%R_MOD_DIR%%/html/00Index.html
 %%R_MOD_DIR%%/html/R.css
 %%R_MOD_DIR%%/java/SparseBitSet.jar
-%%R_MOD_DIR%%/java/XLConnect-3.0.0-SNAPSHOT.jar
+%%R_MOD_DIR%%/java/XLConnect-3.1.0.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