svn commit: r506859 - head/databases/mysql-connector-java51

[Greg Lewis]

Author: glewis
Date: Thu Jul 18 16:39:36 2019
New Revision: 506859
URL: https://svnweb.freebsd.org/changeset/ports/506859

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:		238977
  Approved by:	maintainer timeout

Modified:
  head/databases/mysql-connector-java51/Makefile

Modified: head/databases/mysql-connector-java51/Makefile
==============================================================================
--- head/databases/mysql-connector-java51/Makefile	Thu Jul 18 16:36:35 2019	(r506858)
+++ head/databases/mysql-connector-java51/Makefile	Thu Jul 18 16:39:36 2019	(r506859)
@@ -47,7 +47,7 @@ do-build:
 	@${DO_NADA}
 
 do-build-DOCS-on:
-.if ${JAVA_PORT_VERSION:M1.8.*}
+.if ${JAVA_PORT_VERSION:M*8*}
 	@${ECHO_MSG} "NOTE>>> Generating javadoc is broken with JDK 1.8+"
 .else
 	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR};               \
@@ -67,7 +67,7 @@ do-install-DOCS-on:
 	@for extradoc in ${EXTRADOCS} ; do                          \
 	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
 	done
-.if ${JAVA_PORT_VERSION:N1.8.*}
+.if ${JAVA_PORT_VERSION:N*8*}
 	@${MKDIR} ${STAGEDIR}${APIDOCSDIR}
 	@cd ${JAVADOCDIR} && ${COPYTREE_SHARE} . ${APIDOCSDIR}
 .endif