svn commit: r415723 - head/databases/mysql-connector-java

[Matthew Seaman]

Author: matthew
Date: Mon May 23 14:23:28 2016
New Revision: 415723
URL: https://svnweb.freebsd.org/changeset/ports/415723

Log:
  Update to 5.1.39
   - Modernize port: use option depended make targets
   - Add PORTSCOUT config
   - Support OpenJDK8
   - Consequently make building the javadoc API docs contingent on the
     version of java used: only build when java 1.6 or 1.7 is in use.
     javadoc in OpenJDK 1.8 is much less forgiving than in earlier
     versions of java, and would require substantion patching of the
     sources to generate javadoc successfully.
   - Use COPYTREE_SHARE to install javadocs rather than rolling our own
  
  ChangeLog:	http://dev.mysql.com/doc/relnotes/connector-j/5.1/en/news-5-1-39.html

Modified:
  head/databases/mysql-connector-java/Makefile
  head/databases/mysql-connector-java/distinfo

Modified: head/databases/mysql-connector-java/Makefile
==============================================================================
--- head/databases/mysql-connector-java/Makefile	Mon May 23 14:03:49 2016	(r415722)
+++ head/databases/mysql-connector-java/Makefile	Mon May 23 14:23:28 2016	(r415723)
@@ -1,9 +1,8 @@
 # Created by: Matthew Seaman
 # $FreeBSD$
 
-
 PORTNAME=	mysql-connector-java
-PORTVERSION=	5.1.38
+PORTVERSION=	5.1.39
 CATEGORIES=	databases java
 MASTER_SITES=	MYSQL/Connector-J
 
@@ -14,12 +13,16 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:devel/log4j
 
+# 6.0 is currently in beta.
+PORTSCOUT=	limit:^5\.1\..*
+
 USES=		cpe
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	mysql_connector_j
 
+NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6 1.7
+JAVA_VERSION=	1.6 1.7 1.8
 BUILDDIR=	${WRKDIR}/${DISTNAME}
 APIDOCSDIR=	${STAGEDIR}${DOCSDIR}/javadoc
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
@@ -33,43 +36,39 @@ PLIST_FILES=	${JAVAJARDIR}/${DESTJARFILE
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
-.endif
+
+.include <bsd.port.pre.mk>
 
 do-build:
-.if ${PORT_OPTIONS:MDOCS}
+	@${DO_NADA}
+
+do-build-DOCS-on:
+.if ${JAVA_PORT_VERSION:M1.8.*}
+	@${ECHO_MSG} "NOTE>>> Generating javadoc is broken with JDK 1.8+"
+.else
 	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR};               \
 	    ${JAVADOC} -quiet -breakiterator -encoding utf8     \
 	    -d ${JAVADOCDIR} -package -classpath ${JDCLASSPATH}	\
 	    com.mysql.jdbc org.gjt.mm.mysql)
 .endif
 
-do-install: do-install-jar do-install-apidocs
-
-do-install-jar:
+# Don't build the javadoc using JDK 1.8+ as it generates many errors
+do-install:
 	@${ECHO_MSG} -n ">> Installing .jar files..."
-	@${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
+	${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
 	@${ECHO_MSG} " [ DONE ]"
 
-do-install-apidocs:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${APIDOCSDIR}
-	@cd ${JAVADOCDIR} && for src in $$( ${FIND} . ) ; do \
-	    dst=${APIDOCSDIR}$${src#.} ; \
-	    if ${TEST} -d $$src ; then \
-	        ${MKDIR} $$dst ; \
-	    else \
-	        ${INSTALL_DATA} $$src $$dst ; \
-	    fi \
-	done
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@for extradoc in ${EXTRADOCS} ; do                          \
 	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
 	done
-	@${ECHO_MSG} " [ DONE ]"
+.if ${JAVA_PORT_VERSION:N1.8.*}
+	@${MKDIR} ${STAGEDIR}${APIDOCSDIR}
+	@cd ${JAVADOCDIR} && ${COPYTREE_SHARE} . ${APIDOCSDIR}
 .endif
+	@${ECHO_MSG} " [ DONE ]"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/databases/mysql-connector-java/distinfo
==============================================================================
--- head/databases/mysql-connector-java/distinfo	Mon May 23 14:03:49 2016	(r415722)
+++ head/databases/mysql-connector-java/distinfo	Mon May 23 14:23:28 2016	(r415723)
@@ -1,2 +1,3 @@
-SHA256 (mysql-connector-java-5.1.38.tar.gz) = fa6232a0bcf67dc7d9acac9dc58910644e50790cbd8cc2f854e2c17f91b2c224
-SIZE (mysql-connector-java-5.1.38.tar.gz) = 3938241
+TIMESTAMP = 1463998110
+SHA256 (mysql-connector-java-5.1.39.tar.gz) = fa1bdc9ee5323642c5a533fa73fbcf537b26a979e5981c486c24256c433c7718
+SIZE (mysql-connector-java-5.1.39.tar.gz) = 3899019