Attachment 161636 Details for Bug 203495 – updated patch

[patch] updated patch

jogl.diff (text/plain), 1.78 KB, created by Steve Wills on 2015-10-02 02:29:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2015-10-02 02:29:32 UTC

Size: 1.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 398211)
>+++ Makefile	(working copy)
>@@ -52,14 +52,23 @@
> 
> .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' \
> 		${WRKSRC}/gluegen/make/build.xml
>Index: files/extra-patch-build.xml
>===================================================================
>--- files/extra-patch-build.xml	(revision 0)
>+++ files/extra-patch-build.xml	(working copy)
>@@ -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}" >
>
>Property changes on: files/extra-patch-build.xml
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 203495: 161628 | 161636