From nobody Sun Sep 10 16:30:17 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 4RkFgs3q01z4sBYY; Sun, 10 Sep 2023 16:30:17 +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 4RkFgs2lQ6z3Xdd; Sun, 10 Sep 2023 16:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694363417; 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=M6qA3uS8KspH0qSxRKxVBWg3aKGBDhSU/nkyCafYXZ0=; b=kaWqHEhJ+U8d0MFJgy5XOAXAXnZccOMFhPRj+o0sIfLnrFgdO2S93xJRdEiPIiGEp2zQ99 mj186MQx74SCwmBXEZegyRYoG0+vvxBXCXP2I6Jwa4OxmGYsiSB4p7A1lC61R+riTagwUU r4nvt7JQc5/fVG7UqTXENXfMFrVpFArhKhkX6DDqb8z+xEdh1KKHaPRDitjr4LWi5qyksB c3bgNwXwHSUaGywS8KEC+XMi4EPjb+SKQ9IPbTyohDYGINI2CxzVzAyc/HRpscGVD4GVLn D5MLKVBJ+CyMZeSlpXg/MDqKFspXjBR4So6x4wTGtKjlT6dfogvJFvA8OCfK+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694363417; a=rsa-sha256; cv=none; b=j0L1oGLQqFj6amdEa2K1lpwD6tvc3ktOZhbddvzhUSVBN7SARLkGyliujJ8FDTK4WyiO1A TMo6pZwdS2SwUtuxBAXtsJFtoOIYKpVe5EDPhd9okc/V2XYY9yvCeF/l1QjGNOaOjIJUHq 9rkQRdc2BoSbpDK5QsFvbB1oXYgfl653OOuzjDJMFmDlyPuFnhNKDcx4xB6Nk35IxocWTZ ZGYNkWOGX7w8ZfEWQYyVgp0E9c/TSluIt4KdUX57Lg80lWIOtyOnb81WNJOGd+xkIKcvVH +9ubQZOtliwvBiPNSMV7MHydbOYjbEmuQpNdf3kyk7vk0PlTOpI6jTUVgWsH7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694363417; 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=M6qA3uS8KspH0qSxRKxVBWg3aKGBDhSU/nkyCafYXZ0=; b=FxDXCNRv5pW49+rB4p6JbUvgq4talhlBQFyNrZGdaC2HpNCRraMy0ZjoImnA1qw7iUEizy inrAkAxiyVnROlCs12wxcRwK3bdnbfRYcu+bk1JJ0SyqmxYEfALDqehO5cNyEL8dfcEeql FCy8LMP/Ta0TyjQ9lFPyULfqT9iFIKlXYU3NYs54c294+mYErZB74+Mk5zd3IzFaAxtoxw vtKnRx+vb4g71hPqAVlC180tJ1aG+1xig78bWSh1h3lPEBpw42pV2WwVvjMUesgqh+IwPi SHQgPQf1rHDi8LvDeiAHMv9NxnC0egaQli+6mrUKDchnM6fKj5e2uVb2kVPoLA== 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 4RkFgs1qrvzCV; Sun, 10 Sep 2023 16:30:17 +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 38AGUHAD052164; Sun, 10 Sep 2023 16:30:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AGUHqR052158; Sun, 10 Sep 2023 16:30:17 GMT (envelope-from git) Date: Sun, 10 Sep 2023 16:30:17 GMT Message-Id: <202309101630.38AGUHqR052158@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: 1772fc3f226f - main - math/R-cran-XLConnect: fix deps on log4j 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: 1772fc3f226f3f0bb1f252c9b8aac4c29ab33855 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=1772fc3f226f3f0bb1f252c9b8aac4c29ab33855 commit 1772fc3f226f3f0bb1f252c9b8aac4c29ab33855 Author: Thierry Thomas AuthorDate: 2023-09-10 14:14:36 +0000 Commit: Thierry Thomas 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