diff options
Diffstat (limited to 'math/R-cran-XLConnect')
| -rw-r--r-- | math/R-cran-XLConnect/Makefile | 17 | ||||
| -rw-r--r-- | math/R-cran-XLConnect/distinfo | 6 | ||||
| -rw-r--r-- | math/R-cran-XLConnect/files/patch-R_XLConnectSettings.R | 12 | ||||
| -rw-r--r-- | math/R-cran-XLConnect/files/patch-R_onLoad.R | 16 | ||||
| -rw-r--r-- | math/R-cran-XLConnect/pkg-plist | 12 |
5 files changed, 40 insertions, 23 deletions
diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile index c1b16cb4bac9..69519f3650ed 100644 --- a/math/R-cran-XLConnect/Makefile +++ b/math/R-cran-XLConnect/Makefile @@ -1,5 +1,5 @@ PORTNAME= XLConnect -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.1 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -21,25 +21,26 @@ RUN_DEPENDS= R-cran-rJava>0:devel/R-cran-rJava \ 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 \ + R-cran-RUnit>0:devel/R-cran-RUnit \ R-cran-ggplot2>0:graphics/R-cran-ggplot2 USES= cran java -DEP_JARS= commons-codec commons-collections4 commons-compress \ - commons-lang3 log4j-api poi poi-ooxml poi-ooxml-full \ +DEP_JARS= commons-codec commons-collections4 commons-compress commons-io \ + commons-lang3 commons-math log4j-api poi poi-ooxml poi-ooxml-full\ SparseBitSet xmlbeans -post-install: +post-stage: .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 + ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-lang3-3.16.0.jar ${LN} -sf ${JAVALIBDIR}/commons-math.jar \ ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-math3.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-io.jar \ + ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-io-2.18.0.jar ${LN} -sf ${JAVALIBDIR}/commons-codec.jar \ - ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.17.0.jar + ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.18.0.jar .include <bsd.port.mk> diff --git a/math/R-cran-XLConnect/distinfo b/math/R-cran-XLConnect/distinfo index 13a4525145af..918d9b31c2b5 100644 --- a/math/R-cran-XLConnect/distinfo +++ b/math/R-cran-XLConnect/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743444718 -SHA256 (XLConnect_1.2.0.tar.gz) = 6dab078b45b691f6bac69194fd7f45b7afa3973e33ac7320c4e0797a378f046e -SIZE (XLConnect_1.2.0.tar.gz) = 1467473 +TIMESTAMP = 1746259385 +SHA256 (XLConnect_1.2.1.tar.gz) = 9c081baff120ca7b5af79f8f3af5b03aa97fd94739b8484f9dbbcf51dae1946e +SIZE (XLConnect_1.2.1.tar.gz) = 1474417 diff --git a/math/R-cran-XLConnect/files/patch-R_XLConnectSettings.R b/math/R-cran-XLConnect/files/patch-R_XLConnectSettings.R new file mode 100644 index 000000000000..53fcbef8efde --- /dev/null +++ b/math/R-cran-XLConnect/files/patch-R_XLConnectSettings.R @@ -0,0 +1,12 @@ +--- R/XLConnectSettings.R.orig 2025-04-29 09:58:50 UTC ++++ R/XLConnectSettings.R +@@ -46,9 +46,6 @@ XLConnectSettings <- function(pdesc) { + options(XLConnect.RownameCol = ".rownames") + + options(XLConnect.setCustomAttributes = FALSE) +- +- # Apply default POI configuration +- configurePOI() + + invisible() + } diff --git a/math/R-cran-XLConnect/files/patch-R_onLoad.R b/math/R-cran-XLConnect/files/patch-R_onLoad.R index bf0baeaeb521..c44134cc8c79 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 2025-02-17 07:43:13 UTC +--- R/onLoad.R.orig 2025-04-29 09:58:50 UTC +++ R/onLoad.R @@ -55,50 +55,7 @@ repo <- "https://repo1.maven.org/maven2" @@ -7,14 +7,14 @@ - sharedPaths <- tryCatch({ - c( - xlcEnsureDependenciesFor( -- 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), +- paste0(apachePrefix, "/poi/poi-ooxml-full/5.4.1/poi-ooxml-full-5.4.1.jar"), "poi-ooxml-full.jar", +- "5.4.1", libname, pkgname), - xlcEnsureDependenciesFor( -- 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"), +- paste0(apachePrefix, "/poi/poi-ooxml/5.4.1/poi-ooxml-5.4.1.jar"), "poi-ooxml.jar", +- "5.4.1", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"), - xlcEnsureDependenciesFor( -- 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"), +- paste0(apachePrefix, "/poi/poi/5.4.1/poi-5.4.1.jar"), "poi.jar", +- "5.4.1", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"), - xlcEnsureDependenciesFor( - 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"), @@ -34,7 +34,7 @@ - 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.1/commons-codec-1.17.1.jar"), "commons-codec-1.17.1.jar", +- paste0(repo, "/commons-codec/commons-codec/1.18.0/commons-codec-1.18.0.jar"), "commons-codec-1.18.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.18.0/commons-io-2.18.0.jar"), "commons-io-2.18.0.jar", diff --git a/math/R-cran-XLConnect/pkg-plist b/math/R-cran-XLConnect/pkg-plist index 1b648e2b90f2..c23b9d5691d5 100644 --- a/math/R-cran-XLConnect/pkg-plist +++ b/math/R-cran-XLConnect/pkg-plist @@ -58,15 +58,17 @@ %%R_MOD_DIR%%/html/00Index.html %%R_MOD_DIR%%/html/R.css %%R_MOD_DIR%%/java/SparseBitSet.jar -%%R_MOD_DIR%%/java/XLConnect-3.1.0.jar -%%R_MOD_DIR%%/java/commons-codec-1.17.0.jar +%%R_MOD_DIR%%/java/XLConnect-3.1.1.jar +%%R_MOD_DIR%%/java/commons-codec-1.18.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.16.1.jar -%%R_MOD_DIR%%/java/commons-lang3-3.14.0.jar +%%R_MOD_DIR%%/java/commons-io-2.18.0.jar +%%R_MOD_DIR%%/java/commons-io.jar +%%R_MOD_DIR%%/java/commons-lang3-3.16.0.jar %%R_MOD_DIR%%/java/commons-lang3.jar %%R_MOD_DIR%%/java/commons-math3.jar +%%R_MOD_DIR%%/java/commons-math.jar %%R_MOD_DIR%%/java/curvesapi-1.08.jar %%R_MOD_DIR%%/java/log4j-api.jar %%R_MOD_DIR%%/java/log4j2.system.properties @@ -112,8 +114,10 @@ %%R_MOD_DIR%%/unitTests/resources/testWorkbookReadWorksheet.xlsx %%R_MOD_DIR%%/unitTests/resources/testWorkbookSheets.xls %%R_MOD_DIR%%/unitTests/resources/testWorkbookSheets.xlsx +%%R_MOD_DIR%%/unitTests/resources/testZipBomb.xlsx %%R_MOD_DIR%%/unitTests/runit.arefidx.R %%R_MOD_DIR%%/unitTests/runit.colidx.R +%%R_MOD_DIR%%/unitTests/runit.configurePOI.R %%R_MOD_DIR%%/unitTests/runit.crefidx.R %%R_MOD_DIR%%/unitTests/runit.dataframeConversion.R %%R_MOD_DIR%%/unitTests/runit.dumpAndRestore.R |