git: ae151e331161 - main - java/java3d: Various fixes

The branch main has been updated by tijl:

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

commit ae151e331161de22352a63ea9718ba4029411612
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2025-09-27 18:22:40 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2025-09-27 18:41:26 +0000

    java/java3d: Various fixes
    
    - Add dependency on libX11 and libXext.
    - Replace ${SETENV} with ${SETENVI} ${WRK_ENV} to build with a clean
      environment.
    - Install the library with ${INSTALL_LIB} so it is stripped.
    - Link with C compiler because ld doesn't always search /usr/lib.
    
    Reported by:    vvd
---
 java/java3d/Makefile            | 24 +++++++++++++-----------
 java/java3d/files/patch-freebsd |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index 2e0870bdef76..8875e3748e5e 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	java3d
 PORTVERSION=	1.5.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	java graphics games devel
 MASTER_SITES=	https://sites.google.com/site/daemonwizard/
 
@@ -18,7 +18,7 @@ BROKEN_armv7=		fails to compile: build.xml: Compile failed; see the compiler err
 USES=		compiler:c11 gl java:ant,run tar:bzip2 xorg
 JAVA_VERSION=	8
 USE_GL=		gl
-USE_XORG=	xt
+USE_XORG=	x11 xext xt
 JAVA_VENDOR=	openjdk
 NO_SHLIB_REQUIRES_GLOB=	libjawt.so libjvm.so
 
@@ -36,18 +36,20 @@ post-patch:
 		${WRKSRC}/j3d-core/src/native/ogl/build-freebsd.xml
 
 do-build:
-	cd ${WRKSRC}/vecmath && ${SETENV} ${MAKE_ENV} ${ANT} dist
+	cd ${WRKSRC}/vecmath && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${ANT} dist
 	cd ${WRKSRC}/j3d-core \
-		&& ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \
-						-Dis${OPSYS}=yes \
-						-Dports.localbase=${LOCALBASE} \
-						jar-opt
+		&& ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${ANT} \
+			-Dbuild.type=fcs \
+			-Dis${OPSYS}=yes \
+			-Dports.localbase=${LOCALBASE} \
+			jar-opt
 
 post-build-DOCS-on:
 	cd ${WRKSRC}/j3d-core \
-		&& ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \
-						-Dis${OPSYS}=yes \
-						docs-public
+		&& ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${ANT} \
+			-Dbuild.type=fcs \
+			-Dis${OPSYS}=yes \
+			docs-public
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext
@@ -57,7 +59,7 @@ do-install:
 		${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dutils.jar \
 		${STAGEDIR}${JAVA_HOME}/jre/lib/ext
 	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
-	${INSTALL} \
+	${INSTALL_LIB} \
 		${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \
 		${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
 
diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd
index 51aeaa4399a5..7e5635a72e8e 100644
--- a/java/java3d/files/patch-freebsd
+++ b/java/java3d/files/patch-freebsd
@@ -130,7 +130,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
 +    </exec>
 +
 +    <!-- Create the library file-->
-+    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
++    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
 +	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -shared -z defs -L${ports.localbase}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm  -o libj3dcore-ogl.so"/>
 +    </exec>
 +
@@ -143,7 +143,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
 +    </exec>
 +
 +    <!-- Create the wrapper library -->
-+    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
++    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
 +	<arg line="CgWrapper.o -shared -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
 +    </exec>
 +