diff options
| author | swills <swills@FreeBSD.org> | 2015-10-12 21:27:17 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2015-10-12 21:27:17 +0800 |
| commit | e9cca8cc959a658f9cbf028fbeb21935f651457a (patch) | |
| tree | 3ca40bdcd4a140f9b16a94162042c31277e8f350 /graphics/jogl | |
| parent | 192944f5fe0d940a88ede9e0e8319257bc131699 (diff) | |
| download | freebsd-ports-gnome-e9cca8cc959a658f9cbf028fbeb21935f651457a.tar.gz freebsd-ports-gnome-e9cca8cc959a658f9cbf028fbeb21935f651457a.tar.zst freebsd-ports-gnome-e9cca8cc959a658f9cbf028fbeb21935f651457a.zip | |
graphics/jogl: fix build with OpenJDK8
PR: 203495
Approved by: peterj (maintainer)
Diffstat (limited to 'graphics/jogl')
| -rw-r--r-- | graphics/jogl/Makefile | 13 | ||||
| -rw-r--r-- | graphics/jogl/files/extra-patch-build.xml | 10 |
2 files changed, 21 insertions, 2 deletions
diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile index c9fae26869e8..590c79175634 100644 --- a/graphics/jogl/Makefile +++ b/graphics/jogl/Makefile @@ -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' \ diff --git a/graphics/jogl/files/extra-patch-build.xml b/graphics/jogl/files/extra-patch-build.xml new file mode 100644 index 000000000000..2f69144ad9f7 --- /dev/null +++ b/graphics/jogl/files/extra-patch-build.xml @@ -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}" > |