From nobody Fri Oct 21 20:58:50 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MvGzG5JhWz4gnQf; Fri, 21 Oct 2022 20:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MvGzG4q0pz3Y75; Fri, 21 Oct 2022 20:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666385930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TX1wQSiHABmAqJXqW/sZ1Ww9++AoJJ/XzCfZk1WWAuc=; b=Wt/XuHsf9d6rVaC38oox/P0HIlplzLtl9PYI85QNOLbQcvosfy1I5Xl92pqnw1V1Ap2P02 fOH4L4s4hHDHatHXGhynq7glKVejOdc+Ur6aKAN9rS9GJCQRn6G0Qidm21ERNOh9giu7Pl qqbae6rEpGSgI10Le1UDCkE/10yKVrJdIbWDHyCH6pvlOviJx5Nf2KCOFl0Ku760tbvHf2 dPT2yZd4coQoEOKRGl+fML+/qmVRP8O/iVic6BDgw0A0WM4za61rLaiNJZ/NPCiCy6XB91 ngLrhJxl9wjQtlQsk9rJCNdgbSjiS4oLYec4GWS1b+ADRHt06HTdvuGhGckF3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MvGzG3kvBzL1G; Fri, 21 Oct 2022 20:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29LKwoZ1018068; Fri, 21 Oct 2022 20:58:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LKwoc4018067; Fri, 21 Oct 2022 20:58:50 GMT (envelope-from git) Date: Fri, 21 Oct 2022 20:58:50 GMT Message-Id: <202210212058.29LKwoc4018067@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: e916f2a0104c - main - math/R-cran-XLConnect: upgrade to 1.0.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e916f2a0104cbbea17c6faf5fb52b24d4377fe79 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666385930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TX1wQSiHABmAqJXqW/sZ1Ww9++AoJJ/XzCfZk1WWAuc=; b=MZ/Eyt2bXu+3skUw5Cw3e5mFfKJoT8VyozWCmFlt5mVSDMwXtR84JnmwFVDvIcc6oZxlGk F0SWniaCGesW+RfJKsjoge0SFUTq3MCBYxcbF3ZCGpxPvK3v8op3WkemwGHtOSAvqB4VGa b5hNYzsIca7UjDcan6m2MQCC7UaYX6PGA1c0zMR/2xUEcGwodxV8wD70fXZf+P+lcv1yYT kkJ+RiH83tmAi7hgijdsYfbojE6BVgbYo1+oMQOwtqqONigNIIcgR+ZEbndwwzuMRpWSiE Kc0UL6EcNq0e/1kgAVEPDJjXkDqcfqjz17gsw2OIqDzL26+W4PtS2wfY4nqQjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666385930; a=rsa-sha256; cv=none; b=I3qoMmBA6O5bU1RWNBuESJo1dE+Ny9kde2LGtyB8fPJ8wYMW8Hl1SzYT65NS5f8m97oO1f 3HP0J2S14ju0PJMBL7l8JiXCOmO6a1dw9XF7Cy5gGAtos9F6Yh8WDWAMxtvYVKh42UNeLX wP2tVUgZpkwFOCopqwAq4NTUmzSA6/Z5D9rDGIdh4F3vffljefm7wHGP6f++jfbZiM9pHT ofypcXZLQ4mwzHnOI9dxgZMTPbwmOSdv8oBFo3XIR9UI26g/A15tlf/TtNSkmbNaw+lYNT 61V+WSB/m/xSI+DMMS63r21jJEgfshIdaHVCKI7BNqAi049le/FnXPVOug7Rbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=e916f2a0104cbbea17c6faf5fb52b24d4377fe79 commit e916f2a0104cbbea17c6faf5fb52b24d4377fe79 Author: Thierry Thomas AuthorDate: 2022-10-21 20:52:42 +0000 Commit: Thierry Thomas CommitDate: 2022-10-21 20:57:49 +0000 math/R-cran-XLConnect: upgrade to 1.0.6 Changelog at . --- math/R-cran-XLConnect/Makefile | 4 ++-- math/R-cran-XLConnect/distinfo | 6 +++--- math/R-cran-XLConnect/files/patch-R_onLoad.R | 31 +++++++++++++++------------- math/R-cran-XLConnect/pkg-plist | 10 ++++++--- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile index 8be339726e75..7c27bb530350 100644 --- a/math/R-cran-XLConnect/Makefile +++ b/math/R-cran-XLConnect/Makefile @@ -1,5 +1,5 @@ PORTNAME= XLConnect -PORTVERSION= 1.0.5 +PORTVERSION= 1.0.6 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -23,7 +23,7 @@ USES= cran USE_JAVA= yes DEP_JARS= commons-codec commons-collections4 commons-compress \ - ooxml-schemas poi poi-ooxml poi-ooxml-schemas \ + ooxml-schemas poi poi-ooxml poi-ooxml-full \ SparseBitSet xmlbeans post-install: diff --git a/math/R-cran-XLConnect/distinfo b/math/R-cran-XLConnect/distinfo index 48108ec25e6a..1b908d34a344 100644 --- a/math/R-cran-XLConnect/distinfo +++ b/math/R-cran-XLConnect/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651219653 -SHA256 (XLConnect_1.0.5.tar.gz) = 975c2ef57f28ccfac79ae5d285b7e82e60791fb121052616c10bc52e2bca16ad -SIZE (XLConnect_1.0.5.tar.gz) = 1406818 +TIMESTAMP = 1666384262 +SHA256 (XLConnect_1.0.6.tar.gz) = b233b9f74d1464b78d5dd28bd8a1fa46ca6254518da2d3bda3c978a3f4aaa4f9 +SIZE (XLConnect_1.0.6.tar.gz) = 1467604 diff --git a/math/R-cran-XLConnect/files/patch-R_onLoad.R b/math/R-cran-XLConnect/files/patch-R_onLoad.R index 6ac40d1aeecb..82613296ce0c 100644 --- a/math/R-cran-XLConnect/files/patch-R_onLoad.R +++ b/math/R-cran-XLConnect/files/patch-R_onLoad.R @@ -1,26 +1,26 @@ ---- R/onLoad.R.orig 2021-09-30 08:28:06 UTC +--- R/onLoad.R.orig 2022-10-20 08:32:02 UTC +++ R/onLoad.R -@@ -54,44 +54,7 @@ +@@ -55,47 +55,7 @@ repo <- "https://repo1.maven.org/maven2" } apachePrefix <- paste0(repo, "/org/apache") - sharedPaths <- tryCatch({ - c( - xlcEnsureDependenciesFor( -- paste0(apachePrefix, "/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2.jar"), "poi-ooxml-schemas.jar", -- "4\\.[1-9].*", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"), +- 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/4.1.2/poi-ooxml-4.1.2.jar"), "poi-ooxml.jar", -- "4\\.[1-9].*", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"), +- 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/4.1.2/poi-4.1.2.jar"), "poi.jar", -- "4\\.[1-9].*", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"), +- 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.20/commons-compress-1.20.jar"), "commons-compress.jar", +- 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/3.1.0/xmlbeans-3.1.0.jar"), "xmlbeans.jar", -- "3\\..*", libname, pkgname, debianpkg="libxmlbeans-java"), +- paste0(apachePrefix, "/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3.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"), @@ -28,11 +28,14 @@ - 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", +- "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(apachePrefix, "/poi/ooxml-schemas/1.4/ooxml-schemas-1.4.jar"), "ooxml-schemas.jar", -- "1\\.([4-9]|[1-9][0-9]).*", libname, pkgname), +- 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) @@ -43,6 +46,6 @@ - } - ) + sharedPaths <- "" - .jpackage(name = pkgname, jars = "*", morePaths = 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 ae3c443b865f..c58b2c9c5380 100644 --- a/math/R-cran-XLConnect/pkg-plist +++ b/math/R-cran-XLConnect/pkg-plist @@ -57,19 +57,20 @@ %%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.3.jar +%%R_MOD_DIR%%/java/XLConnect-1.0.6.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-math3.jar -%%R_MOD_DIR%%/java/curvesapi-1.06.jar +%%R_MOD_DIR%%/java/curvesapi-1.07.jar %%R_MOD_DIR%%/java/ooxml-schemas.jar -%%R_MOD_DIR%%/java/poi-ooxml-schemas.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/testBug49.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug52.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug53.xlsx @@ -93,6 +94,8 @@ %%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 @@ -123,6 +126,7 @@ %%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.writeNamedRegion.R