Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Sep 2023 16:30:17 GMT
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1772fc3f226f - main - math/R-cran-XLConnect: fix deps on log4j
Message-ID:  <202309101630.38AGUHqR052158@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1772fc3f226f3f0bb1f252c9b8aac4c29ab33855

commit 1772fc3f226f3f0bb1f252c9b8aac4c29ab33855
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-09-10 14:14:36 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2023-09-10 16:29:49 +0000

    math/R-cran-XLConnect: fix deps on log4j
---
 math/R-cran-XLConnect/Makefile  | 5 ++---
 math/R-cran-XLConnect/pkg-plist | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile
index 3fcd6ed17de2..f483af17e2a3 100644
--- a/math/R-cran-XLConnect/Makefile
+++ b/math/R-cran-XLConnect/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	XLConnect
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -24,8 +24,7 @@ USES=		cran
 USE_JAVA=	yes
 
 DEP_JARS=	commons-codec commons-collections4 commons-compress commons-io	\
-		log4j-api log4j-core poi poi-ooxml poi-ooxml-full SparseBitSet	\
-		xmlbeans
+		log4j poi poi-ooxml poi-ooxml-full SparseBitSet	xmlbeans
 
 post-install:
 .for j in ${DEP_JARS}
diff --git a/math/R-cran-XLConnect/pkg-plist b/math/R-cran-XLConnect/pkg-plist
index 6ac20542c769..a90de1f1ad9b 100644
--- a/math/R-cran-XLConnect/pkg-plist
+++ b/math/R-cran-XLConnect/pkg-plist
@@ -65,8 +65,7 @@
 %%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/log4j-api.jar
-%%R_MOD_DIR%%/java/log4j-core.jar
+%%R_MOD_DIR%%/java/log4j.jar
 %%R_MOD_DIR%%/java/poi-ooxml-full.jar
 %%R_MOD_DIR%%/java/poi-ooxml.jar
 %%R_MOD_DIR%%/java/poi.jar



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309101630.38AGUHqR052158>