diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile index 17b9f8c4927e..938d7a59e11c 100644 --- a/devel/R-cran-rJava/Makefile +++ b/devel/R-cran-rJava/Makefile @@ -1,44 +1,45 @@ PORTNAME= rJava DISTVERSION= 1.0-15 -PORTREVISION= 2 +PORTREVISION= 3 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/graphics/jogamp-jogl/Makefile b/graphics/jogamp-jogl/Makefile index 6907c555398b..7ceb8d7f8668 100644 --- a/graphics/jogamp-jogl/Makefile +++ b/graphics/jogamp-jogl/Makefile @@ -1,59 +1,60 @@ PORTNAME= jogamp-jogl PORTVERSION= 2.3.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics devel java MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ \ http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/ DISTFILES= jogl-v${PORTVERSION}.tar.xz \ gluegen-v${PORTVERSION}.tar.xz \ jcpp-v${PORTVERSION}.tar.xz MAINTAINER= ports@FreeBSD.org COMMENT= Java bindings for OpenGL WWW= https://jogamp.org/jogl BUILD_DEPENDS= ${JAVALIBDIR}/swt.jar:x11-toolkits/swt RUN_DEPENDS= ${JAVALIBDIR}/swt.jar:x11-toolkits/swt ONLY_FOR_ARCHS= i386 amd64 powerpc64 powerpc64le USES= compiler java:ant,run tar:xz xorg USE_XORG= x11 xcursor xrandr xrender xxf86vm # jdk11+ does not have /usr/local/openjdk8/jre/lib/rt.jar: jogamp-env.xml:186: No target.rt.jar specified not found. JAVA_VERSION= 8 +NO_SHLIB_REQUIRES_GLOB= libjawt.so libjvm.so PATCH_WRKSRC= ${WRKDIR} BUILD_WRKSRC= ${WRKDIR}/jogl/make # compiler must be literally "gcc" or "clang" BINARY_ALIAS= ${CHOSEN_COMPILER_TYPE}=${CC} MAKE_ARGS= -Dgcc.compat.compiler=${CHOSEN_COMPILER_TYPE} post-extract: ${MV} ${WRKDIR}/gluegen-v${PORTVERSION} ${WRKDIR}/gluegen ${MV} ${WRKDIR}/jcpp-v${PORTVERSION}/src ${WRKDIR}/gluegen/jcpp/src ${MV} ${WRKDIR}/jogl-v${PORTVERSION} ${WRKDIR}/jogl post-patch: ${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \ ${BUILD_WRKSRC}/build-common.xml ${REINPLACE_CMD} -e '/name="all"/s|,test.compile||g' \ ${BUILD_WRKSRC}/build.xml pre-build: @(cd ${WRKDIR}/gluegen/make; \ ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} all.no_junit) do-install: ${INSTALL_LIB} \ ${WRKDIR}/gluegen/build/obj/libgluegen2-rt.so \ ${WRKDIR}/jogl/build/lib/*.so \ ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} \ ${WRKDIR}/gluegen/build/gluegen2-rt.jar \ ${WRKDIR}/gluegen/build/gluegen2.jar \ ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${WRKDIR}/jogl/build/jar/jogl-all.jar \ ${STAGEDIR}${JAVAJARDIR}/jogl2.jar .include diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile index 8d95d4bbc7d2..7be45ec336a4 100644 --- a/graphics/jogl/Makefile +++ b/graphics/jogl/Makefile @@ -1,95 +1,96 @@ PORTNAME= jogl PORTVERSION= 1.1.1 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics devel java MASTER_SITES= http://download.java.net/media/jogl/builds/archive/jsr-231-1.1.1/ EXTRACT_SUFX= -src.zip MAINTAINER= peterj@FreeBSD.org COMMENT= Java bindings for OpenGL WWW= https://jogl.dev.java.net/ LIB_DEPENDS= libdrm.so:graphics/libdrm BUILD_DEPENDS= ${JAVALIBDIR}/antlr.jar:devel/antlr NO_WRKSUBDIR= yes DOCSDIR= ${JAVASHAREDIR}/${PORTNAME} ALL_TARGET= all # Java currently only supports i386 and amd64. Supporting additional # architectures will need patches to at least # gluegen/src/java/com/sun/gluegen/StructLayout.java # gluegen/src/java/com/sun/gluegen/runtime/CPU.java # gluegen/make/gluegen-cpptasks.xml # jogl/make/build.xml ONLY_FOR_ARCHS= i386 amd64 USES= gl java:ant,run xorg zip USE_XORG= x11 xau xdamage xdmcp xext xfixes xorgproto xt xxf86vm USE_GL= gl USE_LDCONFIG= yes USE_LOCALE= en_US.UTF-8 # gluegen/src/java/net/highteq/nativetaglet/NativeTaglet.java:3: error: package com.sun.tools.doclets does not exist JAVA_VERSION= 8 +NO_SHLIB_REQUIRES_GLOB= libjawt.so libjvm.so BUILD_WRKSRC= ${WRKSRC}/jogl/make BUILD_BINPATH= ${WRKSRC}/bin MAKE_ENV+= PATH="${BUILD_BINPATH}:${PATH}" OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= javadoc .endif .include .if ${JAVA_PORT_VERSION:M*6*} PLIST_SUB+= JDK6="" PLIST_SUB+= JDK7="@comment " .endif .if ${JAVA_PORT_VERSION:M*7*} PLIST_SUB+= JDK6="@comment " PLIST_SUB+= JDK7="" .endif .if ${JAVA_PORT_VERSION:M*8*} PLIST_SUB+= JDK6="@comment " PLIST_SUB+= JDK7="@comment " .endif .if ${JAVA_PORT_VERSION:M*8*} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-build.xml .endif post-patch: @${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \ ${WRKSRC}/gluegen/make/build.xml @${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/jogl/make/build.xml pre-build: ${MKDIR} ${BUILD_BINPATH} ${SED} -e 's|%%CC%%|${CC}|' < ${FILESDIR}/gcc.in > \ ${BUILD_BINPATH}/gcc ${CHMOD} 755 ${BUILD_BINPATH}/gcc do-install: ${INSTALL_DATA} ${WRKSRC}/gluegen/build/obj/libgluegen-rt.so \ ${WRKSRC}/jogl/build/obj/libjogl.so \ ${WRKSRC}/jogl/build/obj/libjogl_awt.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/gluegen/build/gluegen-rt.jar \ ${WRKSRC}/jogl/build/jogl.jar ${STAGEDIR}${JAVAJARDIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/jogl/doc/userguide/index.html \ ${STAGEDIR}${DOCSDIR}/UserGuide.html cd ${BUILD_WRKSRC}/../javadoc_public && \ ${FIND} . -print | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR} .include