math/R-cran-XLConnect: upgrade to 1.0.8

Changelog at <https://cran.r-project.org/web/packages/XLConnect/NEWS>.
This commit is contained in:
Thierry Thomas 2024-02-04 22:04:18 +01:00
parent c28cf6f414
commit 8d00842d6d
4 changed files with 34 additions and 29 deletions

View File

@ -1,6 +1,5 @@
PORTNAME= XLConnect
PORTVERSION= 1.0.7
PORTREVISION= 2
PORTVERSION= 1.0.8
CATEGORIES= math
DISTNAME= ${PORTNAME}_${PORTVERSION}
@ -15,16 +14,19 @@ RUN_DEPENDS= R-cran-rJava>0:devel/R-cran-rJava \
apache-poi>0:textproc/apache-poi \
SparseBitSet>0:devel/sparsebitset \
apache-xmlbeans>0:textproc/apache-xmlbeans \
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-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-ggplot2>0:graphics/R-cran-ggplot2
USES= cran
USE_JAVA= yes
DEP_JARS= commons-codec commons-collections4 commons-compress commons-io \
log4j poi poi-ooxml poi-ooxml-full SparseBitSet xmlbeans
DEP_JARS= commons-codec commons-collections4 commons-compress \
log4j-api poi poi-ooxml poi-ooxml-full SparseBitSet xmlbeans
post-install:
.for j in ${DEP_JARS}
@ -32,7 +34,9 @@ post-install:
.endfor
${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-codec.jar \
${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.15.jar
${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.16.0.jar
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1674668978
SHA256 (XLConnect_1.0.7.tar.gz) = 821dba231c3c3147455e7525119b51e5dc001984c638b7ce519d0974b32de677
SIZE (XLConnect_1.0.7.tar.gz) = 1478915
TIMESTAMP = 1707058100
SHA256 (XLConnect_1.0.8.tar.gz) = 57254e0e499d17c2b29eac1afdaf8c181dc781c71d5412efb12245b5b7a386d1
SIZE (XLConnect_1.0.8.tar.gz) = 1476729

View File

@ -1,4 +1,4 @@
--- R/onLoad.R.orig 2023-01-24 09:49:21 UTC
--- R/onLoad.R.orig 2024-01-30 12:03:57 UTC
+++ R/onLoad.R
@@ -55,47 +55,7 @@
repo <- "https://repo1.maven.org/maven2"
@ -7,19 +7,19 @@
- sharedPaths <- tryCatch({
- c(
- xlcEnsureDependenciesFor(
- paste0(apachePrefix, "/poi/poi-ooxml-full/5.2.3/poi-ooxml-full-5.2.3.jar"), "poi-ooxml-full.jar",
- "5.2.3", libname, pkgname),
- 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),
- xlcEnsureDependenciesFor(
- paste0(apachePrefix, "/poi/poi-ooxml/5.2.3/poi-ooxml-5.2.3.jar"), "poi-ooxml.jar",
- "5.2.3", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
- 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"),
- xlcEnsureDependenciesFor(
- paste0(apachePrefix, "/poi/poi/5.2.3/poi-5.2.3.jar"), "poi.jar",
- "5.2.3", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
- 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"),
- xlcEnsureDependenciesFor(
- paste0(apachePrefix, "/commons/commons-compress/1.21/commons-compress-1.21.jar"), "commons-compress.jar",
- "1\\.(1[8-9]|[2-9][0-9]).*", libname, pkgname, debianpkg = "libcommons-compress-java", rpmpkg="apache-commons-compress"),
- paste0(apachePrefix, "/commons/commons-compress/1.25.0/commons-compress-1.25.0.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.1.1/xmlbeans-5.1.1.jar"), "xmlbeans.jar",
- paste0(apachePrefix, "/xmlbeans/xmlbeans/5.2.0/xmlbeans-5.2.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",
@ -28,16 +28,16 @@
- 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.18.0/log4j-api-2.18.0.jar"), "log4j-api.jar",
- "2.17.2", libname, pkgname),
- paste0(apachePrefix, "/logging/log4j/log4j-api/2.21.1/log4j-api-2.21.1.jar"), "log4j-api.jar",
- "2.21.1", libname, pkgname),
- xlcEnsureDependenciesFor(
- paste0(repo, "/commons-codec/commons-codec/1.15/commons-codec-1.15.jar"), "commons-codec-1.15.jar",
- paste0(repo, "/commons-codec/commons-codec/1.16.0/commons-codec-1.16.0.jar"), "commons-codec-1.16.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.11.0/commons-io-2.11.0.jar"), "commons-io-2.11.0.jar",
- "2\\.(1[1-9]|[2-9][0-9]).*", libname, pkgname, debianpkg="libcommons-io-java", rpmpkg="apache-commons-io"),
- paste0(repo, "/commons-io/commons-io/2.15.0/commons-io-2.15.0.jar"), "commons-io-2.15.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.2/SparseBitSet-1.2.jar"), "SparseBitSet.jar",
- paste0(repo, "/com/zaxxer/SparseBitSet/1.3/SparseBitSet-1.3.jar"), "SparseBitSet.jar",
- "1\\.([2-9]|[1-9][0-9]).*", libname, pkgname)
- )
- },

View File

@ -57,15 +57,16 @@
%%R_MOD_DIR%%/html/00Index.html
%%R_MOD_DIR%%/html/R.css
%%R_MOD_DIR%%/java/SparseBitSet.jar
%%R_MOD_DIR%%/java/XLConnect-1.0.6.jar
%%R_MOD_DIR%%/java/commons-codec-1.15.jar
%%R_MOD_DIR%%/java/XLConnect-2.0.0-SNAPSHOT.jar
%%R_MOD_DIR%%/java/commons-codec-1.16.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.jar
%%R_MOD_DIR%%/java/commons-io-2.15.0.jar
%%R_MOD_DIR%%/java/commons-math3.jar
%%R_MOD_DIR%%/java/curvesapi-1.07.jar
%%R_MOD_DIR%%/java/log4j.jar
%%R_MOD_DIR%%/java/curvesapi-1.08.jar
%%R_MOD_DIR%%/java/log4j-api.jar
%%R_MOD_DIR%%/java/log4j2.system.properties
%%R_MOD_DIR%%/java/poi-ooxml-full.jar
%%R_MOD_DIR%%/java/poi-ooxml.jar
%%R_MOD_DIR%%/java/poi.jar