diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile index 7c27bb530350..e3983f79bb22 100644 --- a/math/R-cran-XLConnect/Makefile +++ b/math/R-cran-XLConnect/Makefile @@ -1,36 +1,38 @@ PORTNAME= XLConnect -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.7 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= R package for manipulating Microsoft Excel files WWW= https://cran.r-project.org/package=XLConnect LICENSE= GPLv3 BUILD_DEPENDS= R-cran-rJava>0:devel/R-cran-rJava 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-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 USES= cran USE_JAVA= yes -DEP_JARS= commons-codec commons-collections4 commons-compress \ - ooxml-schemas poi poi-ooxml poi-ooxml-full \ - SparseBitSet xmlbeans +DEP_JARS= commons-codec commons-collections4 commons-compress commons-io \ + log4j-api log4j-core 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-math.jar \ ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-math3.jar + ${LN} -sf ${JAVALIBDIR}/commons-codec.jar \ + ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.15.jar .include diff --git a/math/R-cran-XLConnect/distinfo b/math/R-cran-XLConnect/distinfo index 1b908d34a344..1b7064d003a2 100644 --- a/math/R-cran-XLConnect/distinfo +++ b/math/R-cran-XLConnect/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666384262 -SHA256 (XLConnect_1.0.6.tar.gz) = b233b9f74d1464b78d5dd28bd8a1fa46ca6254518da2d3bda3c978a3f4aaa4f9 -SIZE (XLConnect_1.0.6.tar.gz) = 1467604 +TIMESTAMP = 1674668978 +SHA256 (XLConnect_1.0.7.tar.gz) = 821dba231c3c3147455e7525119b51e5dc001984c638b7ce519d0974b32de677 +SIZE (XLConnect_1.0.7.tar.gz) = 1478915 diff --git a/math/R-cran-XLConnect/files/patch-R_onLoad.R b/math/R-cran-XLConnect/files/patch-R_onLoad.R index 82613296ce0c..02d90e47d8de 100644 --- a/math/R-cran-XLConnect/files/patch-R_onLoad.R +++ b/math/R-cran-XLConnect/files/patch-R_onLoad.R @@ -1,51 +1,51 @@ ---- R/onLoad.R.orig 2022-10-20 08:32:02 UTC +--- R/onLoad.R.orig 2023-01-24 09:49:21 UTC +++ R/onLoad.R @@ -55,47 +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.3/poi-ooxml-full-5.2.3.jar"), "poi-ooxml-full.jar", - "5.2.3", 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"), - 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"), - 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"), - xlcEnsureDependenciesFor( -- paste0(apachePrefix, "/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3.jar"), "xmlbeans.jar", +- paste0(apachePrefix, "/xmlbeans/xmlbeans/5.1.1/xmlbeans-5.1.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", - "4-4\\.([2-9]|1[0-9]).*", libname, pkgname, debianpkg="libcommons-collections4-java", rpmpkg="apache-commons-collections4"), - xlcEnsureDependenciesFor( - 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.17.2/log4j-api-2.17.2.jar"), "log4j-api.jar", +- paste0(apachePrefix, "/logging/log4j/log4j-api/2.18.0/log4j-api-2.18.0.jar"), "log4j-api.jar", - "2.17.2", libname, pkgname), - xlcEnsureDependenciesFor( - paste0(repo, "/commons-codec/commons-codec/1.15/commons-codec-1.15.jar"), "commons-codec-1.15.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"), - xlcEnsureDependenciesFor( - paste0(repo, "/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar"), "SparseBitSet.jar", - "1\\.([2-9]|[1-9][0-9]).*", libname, pkgname) - ) - }, - error=function(e) { - e - } - ) + sharedPaths <- "" .jpackage(name = pkgname, jars = "*", morePaths = sharedPaths, own.loader=TRUE) # Perform general XLConnect settings - pass package description XLConnectSettings(packageDescription(pkgname)) diff --git a/math/R-cran-XLConnect/pkg-plist b/math/R-cran-XLConnect/pkg-plist index c58b2c9c5380..6ac20542c769 100644 --- a/math/R-cran-XLConnect/pkg-plist +++ b/math/R-cran-XLConnect/pkg-plist @@ -1,137 +1,142 @@ %%R_MOD_DIR%%/COPYRIGHTS %%R_MOD_DIR%%/DESCRIPTION %%R_MOD_DIR%%/INDEX %%R_MOD_DIR%%/Meta/Rd.rds %%R_MOD_DIR%%/Meta/data.rds %%R_MOD_DIR%%/Meta/demo.rds %%R_MOD_DIR%%/Meta/features.rds %%R_MOD_DIR%%/Meta/hsearch.rds %%R_MOD_DIR%%/Meta/links.rds %%R_MOD_DIR%%/Meta/nsInfo.rds %%R_MOD_DIR%%/Meta/package.rds %%R_MOD_DIR%%/Meta/vignette.rds %%R_MOD_DIR%%/NAMESPACE %%R_MOD_DIR%%/NEWS %%R_MOD_DIR%%/R/XLConnect %%R_MOD_DIR%%/R/XLConnect.rdb %%R_MOD_DIR%%/R/XLConnect.rdx %%R_MOD_DIR%%/XLConnect.R %%R_MOD_DIR%%/data/Rdata.rdb %%R_MOD_DIR%%/data/Rdata.rds %%R_MOD_DIR%%/data/Rdata.rdx %%R_MOD_DIR%%/demo/addImage.R %%R_MOD_DIR%%/demo/cellsize.R %%R_MOD_DIR%%/demo/cellstyles1.R %%R_MOD_DIR%%/demo/cellstyles2.R %%R_MOD_DIR%%/demo/cellstyles3.R %%R_MOD_DIR%%/demo/dataformat.R %%R_MOD_DIR%%/demo/hideSheets.R %%R_MOD_DIR%%/demo/readNamedRegion.R %%R_MOD_DIR%%/demo/readWorksheet.R %%R_MOD_DIR%%/demo/summary.R %%R_MOD_DIR%%/demo/withWorkbook.R %%R_MOD_DIR%%/demo/writeLargeData.R %%R_MOD_DIR%%/demo/writeNamedRegion.R %%R_MOD_DIR%%/demo/writeWorksheet.R %%R_MOD_DIR%%/demoFiles/SwitzerlandFlag.jpg %%R_MOD_DIR%%/demoFiles/conversion.xlsx %%R_MOD_DIR%%/demoFiles/errorCell.xlsx %%R_MOD_DIR%%/demoFiles/mtcars.xlsx %%R_MOD_DIR%%/demoFiles/multiregion.xls %%R_MOD_DIR%%/demoFiles/multiregion.xlsx %%R_MOD_DIR%%/demoFiles/mydata.xlsx %%R_MOD_DIR%%/demoFiles/template.xlsx %%R_MOD_DIR%%/demoFiles/template2.xlsx %%R_MOD_DIR%%/doc/XLConnect.R %%R_MOD_DIR%%/doc/XLConnect.Rnw %%R_MOD_DIR%%/doc/XLConnect.pdf %%R_MOD_DIR%%/doc/XLConnectImpatient.Rnw %%R_MOD_DIR%%/doc/XLConnectImpatient.pdf %%R_MOD_DIR%%/doc/index.html %%R_MOD_DIR%%/help/AnIndex %%R_MOD_DIR%%/help/XLConnect.rdb %%R_MOD_DIR%%/help/XLConnect.rdx %%R_MOD_DIR%%/help/aliases.rds %%R_MOD_DIR%%/help/figures/logo.png %%R_MOD_DIR%%/help/paths.rds %%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/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-math3.jar %%R_MOD_DIR%%/java/curvesapi-1.07.jar -%%R_MOD_DIR%%/java/ooxml-schemas.jar +%%R_MOD_DIR%%/java/log4j-api.jar +%%R_MOD_DIR%%/java/log4j-core.jar %%R_MOD_DIR%%/java/poi-ooxml-full.jar %%R_MOD_DIR%%/java/poi-ooxml.jar %%R_MOD_DIR%%/java/poi.jar %%R_MOD_DIR%%/java/xmlbeans.jar %%R_MOD_DIR%%/tests/run_tests.R %%R_MOD_DIR%%/unitTests/resources/testBug106.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug170.xlsx +%%R_MOD_DIR%%/unitTests/resources/testBug181.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug49.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug52.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug53.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug61.xlsx %%R_MOD_DIR%%/unitTests/resources/testCachedValues.xls %%R_MOD_DIR%%/unitTests/resources/testCachedValues.xlsx %%R_MOD_DIR%%/unitTests/resources/testLoadWorkbook.xls %%R_MOD_DIR%%/unitTests/resources/testLoadWorkbook.xlsx %%R_MOD_DIR%%/unitTests/resources/testReadWorksheetSparseBitSet.xlsx %%R_MOD_DIR%%/unitTests/resources/testWithWorkbook.xls %%R_MOD_DIR%%/unitTests/resources/testWithWorkbook.xlsx %%R_MOD_DIR%%/unitTests/resources/testWorkbookCellFormula.xls %%R_MOD_DIR%%/unitTests/resources/testWorkbookCellFormula.xlsx %%R_MOD_DIR%%/unitTests/resources/testWorkbookDefinedNames.xls %%R_MOD_DIR%%/unitTests/resources/testWorkbookDefinedNames.xlsx %%R_MOD_DIR%%/unitTests/resources/testWorkbookErrorCell.xls %%R_MOD_DIR%%/unitTests/resources/testWorkbookErrorCell.xlsx %%R_MOD_DIR%%/unitTests/resources/testWorkbookExistsNameAndSheet.xls %%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/testWorkbookMissingValue.xls %%R_MOD_DIR%%/unitTests/resources/testWorkbookMissingValue.xlsx %%R_MOD_DIR%%/unitTests/resources/testWorkbookOverwriteFormulas.xls %%R_MOD_DIR%%/unitTests/resources/testWorkbookOverwriteFormulas.xlsx %%R_MOD_DIR%%/unitTests/resources/testWorkbookReadNamedRegion.xls %%R_MOD_DIR%%/unitTests/resources/testWorkbookReadNamedRegion.xlsx %%R_MOD_DIR%%/unitTests/resources/testWorkbookReadWorksheet.xls %%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/runit.arefidx.R %%R_MOD_DIR%%/unitTests/runit.colidx.R %%R_MOD_DIR%%/unitTests/runit.crefidx.R %%R_MOD_DIR%%/unitTests/runit.dataframeConversion.R %%R_MOD_DIR%%/unitTests/runit.dumpAndRestore.R %%R_MOD_DIR%%/unitTests/runit.extractSheetName.R %%R_MOD_DIR%%/unitTests/runit.loadWorkbook.R %%R_MOD_DIR%%/unitTests/runit.with.workbook.R %%R_MOD_DIR%%/unitTests/runit.workbook.cellstyles.R %%R_MOD_DIR%%/unitTests/runit.workbook.createName.R %%R_MOD_DIR%%/unitTests/runit.workbook.createSheet.R %%R_MOD_DIR%%/unitTests/runit.workbook.existsName.R %%R_MOD_DIR%%/unitTests/runit.workbook.existsSheet.R %%R_MOD_DIR%%/unitTests/runit.workbook.extraction.R %%R_MOD_DIR%%/unitTests/runit.workbook.getBoundingBox.R %%R_MOD_DIR%%/unitTests/runit.workbook.getDefinedNames.R %%R_MOD_DIR%%/unitTests/runit.workbook.getSheetPos.R %%R_MOD_DIR%%/unitTests/runit.workbook.getSheets.R %%R_MOD_DIR%%/unitTests/runit.workbook.hideSheet.R %%R_MOD_DIR%%/unitTests/runit.workbook.onErrorCell.R %%R_MOD_DIR%%/unitTests/runit.workbook.readNamedRegion.R %%R_MOD_DIR%%/unitTests/runit.workbook.readWorksheet.R %%R_MOD_DIR%%/unitTests/runit.workbook.renameSheet.R %%R_MOD_DIR%%/unitTests/runit.workbook.saveWorkbook.R %%R_MOD_DIR%%/unitTests/runit.workbook.setForceFormulaRecalculation.R %%R_MOD_DIR%%/unitTests/runit.workbook.setMissingValue.R %%R_MOD_DIR%%/unitTests/runit.workbook.setSheetPos.R +%%R_MOD_DIR%%/unitTests/runit.workbook.testBug181.R %%R_MOD_DIR%%/unitTests/runit.workbook.writeNamedRegion.R %%R_MOD_DIR%%/unitTests/runit.workbook.writeWorksheet.R %%R_MOD_DIR%%/unitTests/runit.writeAndReadNamedRegion.R %%R_MOD_DIR%%/unitTests/runit.writeAndReadWorksheet.R %%R_MOD_DIR%%/unitTests/runit.writeNamedRegionToFile.R %%R_MOD_DIR%%/unitTests/runit.writeWorksheetToFile.R