[Midnightbsd-cvs] mports [24750] trunk/databases/mysql-connector-java: update to 5.1.47

[laffer1 at midnightbsd.org]

Revision: 24750
          http://svnweb.midnightbsd.org/mports/?rev=24750
Author:   laffer1
Date:     2019-01-01 12:12:30 -0500 (Tue, 01 Jan 2019)
Log Message:
-----------
update to 5.1.47

Modified Paths:
--------------
    trunk/databases/mysql-connector-java/Makefile
    trunk/databases/mysql-connector-java/distinfo
    trunk/databases/mysql-connector-java/pkg-descr

Modified: trunk/databases/mysql-connector-java/Makefile
===================================================================
--- trunk/databases/mysql-connector-java/Makefile	2019-01-01 17:07:03 UTC (rev 24749)
+++ trunk/databases/mysql-connector-java/Makefile	2019-01-01 17:12:30 UTC (rev 24750)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	mysql-connector-java
-PORTVERSION=	5.1.38
+PORTVERSION=	5.1.47
 CATEGORIES=	databases java
 MASTER_SITES=	MYSQL/Connector-J
 
@@ -10,33 +10,42 @@
 
 LICENSE=	gpl2
 
-RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
+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=	${DOCSDIR}/javadoc
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
 JAVADOCDIR=	${WRKDIR}/${DISTNAME}/javadoc
 DESTJARFILE=	${PORTNAME}.jar
-EXTRADOCS=	CHANGES docs/connector-j.html docs/connector-j.pdf
+EXTRADOCS=	CHANGES
 JARFILE=	${DISTNAME}-bin.jar
 JDCLASSPATH=	${SRCDIR}:${CLASSPATH}
 
 PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
 
-.include <bsd.mport.options.mk>
+OPTIONS_DEFINE=	DOCS
 
-.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}	\
@@ -43,29 +52,21 @@
 	    com.mysql.jdbc org.gjt.mm.mysql)
 .endif
 
-do-install: do-install-jar do-install-apidocs
-
-do-install-jar:
+do-install:
 	@${ECHO_MSG} -n ">> Installing .jar files..."
-	@${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${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 ${DOCSDIR} ; \
+	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
 	done
+.if ${JAVA_PORT_VERSION:N1.8.*}
+	@${MKDIR} ${STAGEDIR}${APIDOCSDIR}
+	@cd ${JAVADOCDIR} && ${COPYTREE_SHARE} . ${APIDOCSDIR}
+.endif
 	@${ECHO_MSG} " [ DONE ]"
-.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: trunk/databases/mysql-connector-java/distinfo
===================================================================
--- trunk/databases/mysql-connector-java/distinfo	2019-01-01 17:07:03 UTC (rev 24749)
+++ trunk/databases/mysql-connector-java/distinfo	2019-01-01 17:12:30 UTC (rev 24750)
@@ -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 = 1535796903
+SHA256 (mysql-connector-java-5.1.47.tar.gz) = 4ae79214b2f1b5fc600fc867a4d27dcfcb467813c38bf3eee87789ba400349c6
+SIZE (mysql-connector-java-5.1.47.tar.gz) = 4452049

Modified: trunk/databases/mysql-connector-java/pkg-descr
===================================================================
--- trunk/databases/mysql-connector-java/pkg-descr	2019-01-01 17:07:03 UTC (rev 24749)
+++ trunk/databases/mysql-connector-java/pkg-descr	2019-01-01 17:12:30 UTC (rev 24750)
@@ -10,4 +10,4 @@
 This port is derived from the original databases/mysql-jdbc-mm port of
 the mm.mysql JDBC connector by dglo at ssec.wisc.edu.
 
-WWW: http://www.mysql.com/products/connector-j/index.html
+WWW: https://dev.mysql.com/downloads/connector/j/