diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile index 0b0b19996a3b..8b8439ab1203 100644 --- a/devel/R-cran-rJava/Makefile +++ b/devel/R-cran-rJava/Makefile @@ -1,37 +1,41 @@ PORTNAME= rJava -DISTVERSION= 1.0-11 -PORTREVISION= 1 +DISTVERSION= 1.0-14 CATEGORIES= devel java DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= R to Java interface WWW= https://cran.r-project.org/package=rJava LICENSE= LGPL21 LIB_DEPENDS= libicuuc.so:devel/icu \ - libpcre2-8.so:devel/pcre2 + libpcre2-8.so:devel/pcre2 \ + libzstd.so:archivers/zstd \ + libdeflate.so:archivers/libdeflate 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 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} " MAKE_ENV+= JAVA_HOME=${JAVA_HOME} \ JAVA=${JAVA} \ JAVAC=${JAVA_HOME}/bin/javac \ JAVAH=${JAVAH} \ JAR=${JAR} \ 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}/jre/../include -I${JAVA_HOME}/jre/../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} #pre-configure: # Just for debug purpose but this fails with new USES=java although build is OK # ${LOCALBASE}/bin/R CMD javareconf -e exit .include diff --git a/devel/R-cran-rJava/distinfo b/devel/R-cran-rJava/distinfo index 6c5b9e6af6ea..b4aa8adb1bbc 100644 --- a/devel/R-cran-rJava/distinfo +++ b/devel/R-cran-rJava/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706455334 -SHA256 (rJava_1.0-11.tar.gz) = 9ea0ccf5553d86f7de8649a8324766c4f0810f35b7be561640dd87fd37986417 -SIZE (rJava_1.0-11.tar.gz) = 634103 +TIMESTAMP = 1769083360 +SHA256 (rJava_1.0-14.tar.gz) = b9c9e324d2846e7b3ec22992271d27252d3cd6291491931f9362bbb78bc8c355 +SIZE (rJava_1.0-14.tar.gz) = 636254