From 27b8e8eb93087a908e8a8fc96bc18b0648371e0e Mon Sep 17 00:00:00 2001
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Mon, 29 Apr 2019 05:40:45 +0000
Subject: [PATCH] Update to 8.0.16

Upstream has unbundled all of the 3rd party jars they used to ship in
the tarball.  We already preferred installing slf4j.jar and c3p0.jar
from ports, so we just had to add a dependency (and create a port for)
protobuf-java.jar

ChangeLog:	https://dev.mysql.com/doc/relnotes/connector-j/8.0/en/news-8-0-16.html
---
 databases/mysql-connector-java/Makefile | 12 ++++--------
 databases/mysql-connector-java/distinfo |  6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 61c8a1c5f3b0..e8b59e558c9d 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql-connector-java
-PORTVERSION=	8.0.15
+PORTVERSION=	8.0.16
 CATEGORIES=	databases java
 MASTER_SITES=	MYSQL/Connector-J
 
@@ -13,7 +13,8 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \
-		${JAVALIBDIR}/c3p0.jar:databases/c3p0
+		${JAVALIBDIR}/c3p0.jar:databases/c3p0 \
+		${JAVALIBDIR}/protobuf-java.jar:devel/protobuf-java
 
 USES=		cpe
 USE_JAVA=	yes
@@ -28,10 +29,8 @@ CONFLICTS_INSTALL=	mysql-connector-java51-*
 
 JAVA_VERSION=	1.8+
 EXTRADOCS=	CHANGES
-EXTRAJARS=	protobuf-java-3.6.1.jar
 
-PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar \
-		${EXTRAJARS:C,^.*$,${JAVAJARDIR}/&,g}
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
 
 OPTIONS_DEFINE= DOCS
 
@@ -39,9 +38,6 @@ PORTDOCS=	*
 
 do-install:
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-	@for extrajar in ${EXTRAJARS} ; do \
-	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/$$extrajar ${STAGEDIR}${JAVAJARDIR}/$$extrajar ; \
-	done
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo
index 63cbc1c06d89..960fa3d254af 100644
--- a/databases/mysql-connector-java/distinfo
+++ b/databases/mysql-connector-java/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549208252
-SHA256 (mysql-connector-java-8.0.15.tar.gz) = 7c691c54095d1f6b97441b1ea76f04eb2c6c251b7e31a0f56e381582ea159d05
-SIZE (mysql-connector-java-8.0.15.tar.gz) = 5989463
+TIMESTAMP = 1556439499
+SHA256 (mysql-connector-java-8.0.16.tar.gz) = de7d7f8ce9d777c2a6c7c47695d87bfd635e621f9142467a5e56538fcaf4644a
+SIZE (mysql-connector-java-8.0.16.tar.gz) = 3777925