diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile index 938d7a59e11c..1836212cfce4 100644 --- a/devel/R-cran-rJava/Makefile +++ b/devel/R-cran-rJava/Makefile @@ -1,45 +1,44 @@ PORTNAME= rJava -DISTVERSION= 1.0-15 -PORTREVISION= 3 +DISTVERSION= 1.0-18 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 \ 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}/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}/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} NO_SHLIB_REQUIRES_GLOB= libjvm.so #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 5467aa955876..0a1e3236a08b 100644 --- a/devel/R-cran-rJava/distinfo +++ b/devel/R-cran-rJava/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1773514585 -SHA256 (rJava_1.0-15.tar.gz) = ab3e9f7f4cbfa2de9bf990fcd667149502e39eb0f213777c0110786e3ff6f23a -SIZE (rJava_1.0-15.tar.gz) = 637981 +TIMESTAMP = 1776876286 +SHA256 (rJava_1.0-18.tar.gz) = a4db39f39cdb05dbfa667ea6e4db9fd3402f395d9ec1a50a18d0397927f1f552 +SIZE (rJava_1.0-18.tar.gz) = 638626