svn commit: r506804 - head/graphics/jogl

[Greg Lewis]

Author: glewis
Date: Wed Jul 17 15:07:04 2019
New Revision: 506804
URL: https://svnweb.freebsd.org/changeset/ports/506804

Log:
  Adjust to proposed changes in Java versioning
  
  * Bug #238758 proposes to change the Java versioning from versions such
    as "1.6.0" to versions such as "6" (for example).  Modify the Makefile
    checks on JAVA_PORT_VERSION to cope with either format.
  
  PR:		238981
  Approved by:	peterj (maintainer)

Modified:
  head/graphics/jogl/Makefile

Modified: head/graphics/jogl/Makefile
==============================================================================
--- head/graphics/jogl/Makefile	Wed Jul 17 15:02:51 2019	(r506803)
+++ head/graphics/jogl/Makefile	Wed Jul 17 15:07:04 2019	(r506804)
@@ -51,20 +51,20 @@ ALL_TARGET+=	javadoc
 
 .include <bsd.port.pre.mk>
 
-.if ${JAVA_PORT_VERSION:M1.6.*}
+.if ${JAVA_PORT_VERSION:M*6*}
 PLIST_SUB+=	JDK6=""
 PLIST_SUB+=	JDK7="@comment "
 .endif
-.if ${JAVA_PORT_VERSION:M1.7.*}
+.if ${JAVA_PORT_VERSION:M*7*}
 PLIST_SUB+=	JDK6="@comment "
 PLIST_SUB+=	JDK7=""
 .endif
-.if ${JAVA_PORT_VERSION:M1.8.*}
+.if ${JAVA_PORT_VERSION:M*8*}
 PLIST_SUB+=	JDK6="@comment "
 PLIST_SUB+=	JDK7="@comment "
 .endif
 
-.if ${JAVA_PORT_VERSION:M1.8.*}
+.if ${JAVA_PORT_VERSION:M*8*}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-build.xml
 .endif