Index: head/java/java3d/Makefile =================================================================== --- head/java/java3d/Makefile (revision 559609) +++ head/java/java3d/Makefile (revision 559610) @@ -1,71 +1,71 @@ # Created by: nork@FreeBSD.org # $FreeBSD$ PORTNAME= java3d PORTVERSION= 1.5.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= java graphics games devel MASTER_SITES= https://sites.google.com/site/daemonwizard/ MAINTAINER= ports@FreeBSD.org COMMENT= Provides API for creating and manipulation of 3D geometry LICENSE= BSD2CLAUSE GPLv2 LICENSE_COMB= multi BROKEN_aarch64= fails to compile: GVector.java:168: bad use of '>' BROKEN_armv6= fails to compile: build.xml: Compile failed; see the compiler error output for details BROKEN_armv7= fails to compile: build.xml: Compile failed; see the compiler error output for details USES= compiler:c11 gl tar:bzip2 xorg USE_JAVA= 8 USE_GL= gl USE_XORG= xt JAVA_VENDOR= openjdk USE_ANT= yes LLD_UNSAFE= yes PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH} DOCSSRC= ${WRKSRC}/j3d-core/build/freebsd/javadocs/docs-public PORTDOCS= * OPTIONS_DEFINE= DOCS .include post-patch: ${REINPLACE_CMD} -e 's|gcc|${CC}|g' \ ${WRKSRC}/j3d-core/src/native/ogl/build-freebsd.xml do-build: cd ${WRKSRC}/vecmath && ${SETENV} ${MAKE_ENV} ${ANT} dist cd ${WRKSRC}/j3d-core \ && ${SETENV} ${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 do-install: @${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext ${INSTALL_DATA} \ ${WRKSRC}/vecmath/dist/lib/ext/vecmath.jar \ ${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dcore.jar \ ${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dutils.jar \ ${STAGEDIR}${JAVA_HOME}/jre/lib/ext @${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH} ${INSTALL} \ ${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \ ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${DOCSSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) .include Index: head/java/java3d/files/patch-gldefs.h =================================================================== --- head/java/java3d/files/patch-gldefs.h (revision 559609) +++ head/java/java3d/files/patch-gldefs.h (nonexistent) @@ -1,13 +0,0 @@ ---- j3d-core/src/native/ogl/gldefs.h.orig 2008-02-28 15:18:01.000000000 -0500 -+++ j3d-core/src/native/ogl/gldefs.h 2015-02-20 17:51:50.420236000 -0500 -@@ -65,6 +65,10 @@ - #include - #include - -+#define GL_VERSION_1_5_TYPES_DEFINED -+typedef ptrdiff_t GLintptr; -+typedef ptrdiff_t GLsizeiptr; -+ - #include - #include - #ifdef Java3D_undef__glext_h_ Property changes on: head/java/java3d/files/patch-gldefs.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/java3d/files/patch-glext.h =================================================================== --- head/java/java3d/files/patch-glext.h (revision 559609) +++ head/java/java3d/files/patch-glext.h (nonexistent) @@ -1,15 +0,0 @@ ---- j3d-core/src/native/ogl/glext.h.orig 2007-02-26 13:37:09.000000000 -0500 -+++ j3d-core/src/native/ogl/glext.h 2015-02-20 17:50:53.517494000 -0500 -@@ -3389,10 +3389,12 @@ - #endif - - #ifndef GL_VERSION_1_5 -+#ifndef GL_VERSION_1_5_TYPES_DEFINED - /* GL types for handling large vertex buffer objects */ - typedef ptrdiff_t GLintptr; - typedef ptrdiff_t GLsizeiptr; - #endif -+#endif - - #ifndef GL_ARB_vertex_buffer_object - /* GL types for handling large vertex buffer objects */ Property changes on: head/java/java3d/files/patch-glext.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property