From nobody Sun Feb 4 21:17:12 2024 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 4TSj546nH0z58qQn; Sun, 4 Feb 2024 21:17:12 +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 4TSj544fYMz4Q65; Sun, 4 Feb 2024 21:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707081432; 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=xWALsLS4w2Udqfd8G6rc5OJtiMeoN9iws79zOxqFlSY=; b=f1+DvCjOonSXuNaWIx9kph7N2wVntEkOmhQD0XIOdFVDU/OLULyshAatgDPiXZ37+UKPPi 7X7rxKK+2lCaWUbUYkYTpMxNMCyKdZwGv3k0cD3uRjcdO2gbUyusd97xsOTFNdxs2kxh6n PKMOk6i1oE5gbqQf/6zb7CcIqfVlJ9iXxJ6qJZloOejMFe2k3TUK8l8JIAUuHrONd7BuAX VQocG1GuWNGav/wMp0+bsH5OxERbT0PNFejgtzWzzpU71skQbdxzsgy3n4TYv/njMj72Fx /3zwbWDqmAg0wa8vwQt2f6OcOHP9Cq/V05R3mvShJp7okaJESPLZ1N6kdLRstg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707081432; 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=xWALsLS4w2Udqfd8G6rc5OJtiMeoN9iws79zOxqFlSY=; b=Cx8lxoHKhtKIkJwLinYhAczpqvwgZxSXcZ3X/JfxTIPrVzwXUvRQvtOlQK12VuBUbLvG89 sTQ1jppVI7fIUm34Cb/Bk8tmLrpQ8yeUIqrV8nwCqKwfT/HAcAFbK/gBIly2eJUIjqAOaa bvXUjAJzXTX0Iv5L7AedgT6Lct1JLGe3Bd+YkrVQ74iNKT9C+wlySOv4SKCKHWBrZEiMlC AlJXrajCywXHj9Lnf00KGyEd/Sxux35GI4IoBsghjx5W3wxt7nJQAsYVgCz3Lqs0Fgf+Cf 5pJ7S/KSbmTxIykz925pYsBullNLAkX/LY1QvEf3y7U9Blf1VE8CdswYyLRwmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707081432; a=rsa-sha256; cv=none; b=pckiAGFe7gu2kt30V5F+/WrHCkoPTyoHZstx0YiRlbG2nd4lpWHNrgaTvsGwDQ/Zkgr7B/ f+da69no9xO0bh8PIB4LaESHdcEYbyloAmEK8tbEOLOJW9Dlfnw815zal0ttMbdtBNEQfs xDNKVy1NHg10SCcUlDffp9n7SN6/iYCkOlPm++MWh+YUIjZGO6n3s4N0EDRYUsY4mxC05Q xC4Y2nkDfWTP8VkIvXJDjopuJLcAyu105Rx/ImMjXjuIF9rYv6cvrD+bfjCq39DzJnO/KO ozt6T78PoBwofdAEO/OS82qTaJCko57CmA1yn/YCVGNVNwlwDGB0PufEK0Xl5A== 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 4TSj543k6bz1CKW; Sun, 4 Feb 2024 21:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 414LHCqr018145; Sun, 4 Feb 2024 21:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 414LHCb3018142; Sun, 4 Feb 2024 21:17:12 GMT (envelope-from git) Date: Sun, 4 Feb 2024 21:17:12 GMT Message-Id: <202402042117.414LHCb3018142@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: 8d00842d6d2b - main - math/R-cran-XLConnect: upgrade to 1.0.8 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: 8d00842d6d2b6b2134d49a5051ac64083be5434d Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d00842d6d2b6b2134d49a5051ac64083be5434d commit 8d00842d6d2b6b2134d49a5051ac64083be5434d Author: Thierry Thomas AuthorDate: 2024-02-04 21:04:18 +0000 Commit: Thierry Thomas CommitDate: 2024-02-04 21:13:08 +0000 math/R-cran-XLConnect: upgrade to 1.0.8 Changelog at . --- math/R-cran-XLConnect/Makefile | 14 +++++++----- math/R-cran-XLConnect/distinfo | 6 +++--- math/R-cran-XLConnect/files/patch-R_onLoad.R | 32 ++++++++++++++-------------- math/R-cran-XLConnect/pkg-plist | 11 +++++----- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile index f483af17e2a3..1799356e8a74 100644 --- a/math/R-cran-XLConnect/Makefile +++ b/math/R-cran-XLConnect/Makefile @@ -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 diff --git a/math/R-cran-XLConnect/distinfo b/math/R-cran-XLConnect/distinfo index 1b7064d003a2..69b92190ebda 100644 --- a/math/R-cran-XLConnect/distinfo +++ b/math/R-cran-XLConnect/distinfo @@ -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 diff --git a/math/R-cran-XLConnect/files/patch-R_onLoad.R b/math/R-cran-XLConnect/files/patch-R_onLoad.R index 02d90e47d8de..95b0d55395a3 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 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) - ) - }, diff --git a/math/R-cran-XLConnect/pkg-plist b/math/R-cran-XLConnect/pkg-plist index a90de1f1ad9b..330283bc035f 100644 --- a/math/R-cran-XLConnect/pkg-plist +++ b/math/R-cran-XLConnect/pkg-plist @@ -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