git: cda35b358121 - main - devel/R-cran-rJava: switch to JDK21

The branch main has been updated by thierry:

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

commit cda35b358121fd31080601123eb0e772a9b1223d
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2026-03-24 13:43:04 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2026-03-24 13:44:41 +0000

    devel/R-cran-rJava: switch to JDK21
---
 devel/R-cran-rJava/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile
index 5c436f266cec..e759c15af14a 100644
--- a/devel/R-cran-rJava/Makefile
+++ b/devel/R-cran-rJava/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rJava
 DISTVERSION=	1.0-15
+PORTREVISION=	1
 CATEGORIES=	devel java
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
@@ -16,20 +17,22 @@ LIB_DEPENDS=	libicuuc.so:devel/icu	\
 
 USES=		cran:compiles java
 # On JDK11+: checking whether JNI programs can be compiled... configure: error: Cannot compile a simple JNI program. See config.log for details.
-JAVA_VERSION=	8
+#JAVA_VERSION=	8
 
-JRE_LIBS=	${JAVA_HOME}/jre/lib/${ARCH:S/armv6/arm/:S/armv7/arm/:S/powerpc/ppc/}/server	# JDK8
-#JRE_LIBS=	${JAVA_HOME}/jre/lib/server	# JDK11
-LDFLAGS=	"-Wl,-rpath=${JRE_LIBS} "
+#JRE_LIBS=	${JAVA_HOME}/jre/lib/${ARCH:S/armv6/arm/:S/armv7/arm/:S/powerpc/ppc/}/server	# JDK8
+JRE_LIBS=	${JAVA_HOME}/lib/server	# JDK21
+CPPFLAGS+=	-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OPSYS:tl}
+LDFLAGS+=	"-Wl,-rpath=${JRE_LIBS} "
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}	\
 		JAVA=${JAVA}	\
 		JAVAC=${JAVA_HOME}/bin/javac \
 		JAVAH=${JAVAH}	\
 		JAR=${JAR}	\
+		LDFLAGS="${LDFLAGS}"	\
 		LD_LIBRARY_PATH="${JRE_LIBS}"	\
 		JAVA_LD_LIBRARY_PATH="${JRE_LIBS}"	\
 		JAVA_LIBS="-Wl,-rpath=${JRE_LIBS} -L${JRE_LIBS} -ljvm -lpthread"	\
-		JAVA_CPPFLAGS="-I${JAVA_HOME}/jre/../include -I${JAVA_HOME}/jre/../include/${OPSYS:tl}" \
+		JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:tl}" \
 		${TEST_ENV}
 # Mk/Uses/cran.mk does not use TEST_ENV for test but MAKE_ENV
 TEST_ENV=	DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}