svn commit: r399125 - in head/graphics/jogl: . files
Steve Wills
swills at FreeBSD.org
Mon Oct 12 13:27:18 UTC 2015
Author: swills
Date: Mon Oct 12 13:27:17 2015
New Revision: 399125
URL: https://svnweb.freebsd.org/changeset/ports/399125
Log:
graphics/jogl: fix build with OpenJDK8
PR: 203495
Approved by: peterj (maintainer)
Added:
head/graphics/jogl/files/extra-patch-build.xml (contents, props changed)
Modified:
head/graphics/jogl/Makefile
Modified: head/graphics/jogl/Makefile
==============================================================================
--- head/graphics/jogl/Makefile Mon Oct 12 13:14:12 2015 (r399124)
+++ head/graphics/jogl/Makefile Mon Oct 12 13:27:17 2015 (r399125)
@@ -52,13 +52,22 @@ ALL_TARGET+= javadoc
.include <bsd.port.pre.mk>
-.if ${JAVA_PORT_VERSION} == "1.6.0"
+.if ${JAVA_PORT_VERSION:M1.6.*}
PLIST_SUB+= JDK6=""
PLIST_SUB+= JDK7="@comment "
-.else
+.endif
+.if ${JAVA_PORT_VERSION:M1.7.*}
PLIST_SUB+= JDK6="@comment "
PLIST_SUB+= JDK7=""
.endif
+.if ${JAVA_PORT_VERSION:M1.8.*}
+PLIST_SUB+= JDK6="@comment "
+PLIST_SUB+= JDK7="@comment "
+.endif
+
+.if ${JAVA_PORT_VERSION:M1.8.*}
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-build.xml
+.endif
post-patch:
@${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \
Added: head/graphics/jogl/files/extra-patch-build.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/jogl/files/extra-patch-build.xml Mon Oct 12 13:27:17 2015 (r399125)
@@ -0,0 +1,10 @@
+--- jogl/make/build.xml.orig 2015-10-01 22:40:34.563042000 +0000
++++ jogl/make/build.xml 2015-10-01 22:40:53.793693000 +0000
+@@ -1058,6 +1058,7 @@
+ sourcepath="${src.java};${src.generated.java}"
+ destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
+ overview="${javadoc.overview}"
++ additionalparam="-Xdoclint:none"
+ source="1.4"
+ linkoffline="${javadoc.link} 142-packages"
+ bottom="${javadoc.bottom}" >
More information about the svn-ports-all
mailing list