From nobody Wed Jan 25 21:49:48 2023 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 4P2HYm6qqBz3bXDS; Wed, 25 Jan 2023 21:49:48 +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 4P2HYm5dt6z44lL; Wed, 25 Jan 2023 21:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674683388; 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=995C0swqL1m33cpqvFMTke69J+BQ1H5k3t3W9C+bJ6M=; b=M/VV3WVoQlVreFnokkI0TgW8bfkMjJHutARliVsGhlgmiyR0jG0Qzoz7/vD0fduMvHDb1t m+2C5TJzIA+o1tz4y9CgPWrBqwUPwI7kkjOJjWgchzhHG9sQV2kZQdHikHhUhI5do3P+qC YNP2y9KuuvhMYP3b93eIlcBCsRBR//YwtSV+mcjieTvbU6Z1gX0una4J3uPQ83T2BlIFSb 1VFC3hJXfo5ah7BVabsmj02G2dby4HIUHCYHWdpeN2Q3sl22cKV3QRJ2MQ/keouFCVFZw8 sH/Xpa+flIYPQJVFuBxe9vge2qHZerdtkbpd32+7AXXT7Kg/mdfWDxto3LJ3Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674683388; 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=995C0swqL1m33cpqvFMTke69J+BQ1H5k3t3W9C+bJ6M=; b=tbLm73hpIQ/3C71OIyetfC9R4ZP1h42NMVKKb6EH4dye+VdVy1mJOg0eyNZsujeMHkI0Ii FVfVoJ45tzuP23cBHsBUXxB1yxFNUQ0xCI27MrAdIhchislZIUKV8CheXGDtUAhz3SoFiI WnRPUyJCOaAzy8LsUi5xIxy6nAcKcDCke+bMS2OQ2qgDgN4DY1VA1RzVCw4iKN1vRr8Ybz 28OvDR0HeYuvYzfZFRceferGUuZ25w8/YgLyBAzHHR7yXVvNCjUv2LeKbDS6LmF0HY1ICy 5sYZY4XfCeJvbP6GuQnVMrwfDHsKwX/KDD1/Tod2lzd8irkyOJ43NVRvF8uxMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674683388; a=rsa-sha256; cv=none; b=WELIvjnR6vRwTZoxARyHp6q1gLyt2VjsHWNB4DJwLMdoovWUWW7ZDZxAxKV927kvHikOf3 Bimf7umcjY7MEDn/UsPTq4nKwLMF9w3jpiay7IP5KlObbRefnWOJ0FUk5OwijXBENWX4Iq 14YtfDBjBWikdm/Y5fu5NMdpv13GgwqdFqW6TAx33Ynrkvghq++/yrVInrsIVHXnVsa0iU dFvdWQGXt2x2EX7ePZHc2ZaJgvI2TjgqsbF/Uag+aToG79AflQzmT0Bxp58WO3WGlfIn1C 8oBZ2PYpTXsTOgzLfa8Jyo6fI6XYDsEBhWIYSMKB5+CbxwqEvJQ9dCpvVxHnGQ== 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 4P2HYm4ZZ4z14rB; Wed, 25 Jan 2023 21:49:48 +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 30PLnmlA021861; Wed, 25 Jan 2023 21:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30PLnmqn021860; Wed, 25 Jan 2023 21:49:48 GMT (envelope-from git) Date: Wed, 25 Jan 2023 21:49:48 GMT Message-Id: <202301252149.30PLnmqn021860@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: fe81050c2fda - main - math/R-cran-XLConnect: upgrade to 1.0.7 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: fe81050c2fda6803c96300db9faf2ccbccd77c06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe81050c2fda6803c96300db9faf2ccbccd77c06 commit fe81050c2fda6803c96300db9faf2ccbccd77c06 Author: Thierry Thomas AuthorDate: 2023-01-25 21:46:52 +0000 Commit: Thierry Thomas CommitDate: 2023-01-25 21:49:43 +0000 math/R-cran-XLConnect: upgrade to 1.0.7 Changelog at . --- math/R-cran-XLConnect/Makefile | 10 ++++++---- math/R-cran-XLConnect/distinfo | 6 +++--- math/R-cran-XLConnect/files/patch-R_onLoad.R | 6 +++--- math/R-cran-XLConnect/pkg-plist | 7 ++++++- 4 files changed, 18 insertions(+), 11 deletions(-) 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,5 +1,5 @@ PORTNAME= XLConnect -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.7 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -22,9 +22,9 @@ RUN_DEPENDS= R-cran-rJava>0:devel/R-cran-rJava \ 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} @@ -32,5 +32,7 @@ post-install: .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,4 +1,4 @@ ---- 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" @@ -19,7 +19,7 @@ - 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", @@ -28,7 +28,7 @@ - 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", 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 @@ -58,12 +58,15 @@ %%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 @@ -71,6 +74,7 @@ %%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 @@ -129,6 +133,7 @@ %%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