diff options
Diffstat (limited to 'java/java3d')
| -rw-r--r-- | java/java3d/Makefile | 25 | ||||
| -rw-r--r-- | java/java3d/files/patch-freebsd | 8 |
2 files changed, 17 insertions, 16 deletions
diff --git a/java/java3d/Makefile b/java/java3d/Makefile index a917ead6a2a3..8875e3748e5e 100644 --- a/java/java3d/Makefile +++ b/java/java3d/Makefile @@ -1,6 +1,6 @@ PORTNAME= java3d PORTVERSION= 1.5.2 -PORTREVISION= 9 +PORTREVISION= 11 CATEGORIES= java graphics games devel MASTER_SITES= https://sites.google.com/site/daemonwizard/ @@ -18,9 +18,8 @@ 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 -LLD_UNSAFE= yes NO_SHLIB_REQUIRES_GLOB= libjawt.so libjvm.so PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH} @@ -37,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 @@ -58,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 e11a2df2c13c..7e5635a72e8e 100644 --- a/java/java3d/files/patch-freebsd +++ b/java/java3d/files/patch-freebsd @@ -130,8 +130,8 @@ 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"> -+ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -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 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> + + </target> @@ -143,8 +143,8 @@ 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"> -+ <arg line="CgWrapper.o -G -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/> ++ <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> + + </target> |