Index: head/databases/mysql-connector-java/Makefile
===================================================================
--- head/databases/mysql-connector-java/Makefile	(revision 504388)
+++ head/databases/mysql-connector-java/Makefile	(revision 504389)
@@ -1,48 +1,48 @@
 # Created by: Matthew Seaman
 # $FreeBSD$
 
 PORTNAME=	mysql-connector-java
 PORTVERSION=	8.0.16
 CATEGORIES=	databases java
 MASTER_SITES=	MYSQL/Connector-J
 
-MAINTAINER=	matthew@FreeBSD.org
+MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \
 		${JAVALIBDIR}/c3p0.jar:databases/c3p0 \
 		${JAVALIBDIR}/protobuf-java.jar:devel/protobuf-java
 
 USES=		cpe
 USE_JAVA=	yes
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	mysql_connector_j
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 CONFLICTS_INSTALL=	mysql-connector-java51-*
 
 JAVA_VERSION=	1.8+
 EXTRADOCS=	CHANGES
 
 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
 
 OPTIONS_DEFINE= DOCS
 
 PORTDOCS=	*
 
 do-install:
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@for extradoc in ${EXTRADOCS} ; do \
 	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
 	done
 
 .include <bsd.port.mk>
Index: head/databases/mysql-connector-java51/Makefile
===================================================================
--- head/databases/mysql-connector-java51/Makefile	(revision 504388)
+++ head/databases/mysql-connector-java51/Makefile	(revision 504389)
@@ -1,76 +1,76 @@
 # Created by: Matthew Seaman
 # $FreeBSD$
 
 PORTNAME=	mysql-connector-java
 PORTVERSION=	5.1.47
 CATEGORIES=	databases java
 MASTER_SITES=	MYSQL/Connector-J
 PKGNAMESUFFIX=	51
 
-MAINTAINER=	matthew@FreeBSD.org
+MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:devel/log4j
 
 # 8.0.x is now the GA release, but drops support for java 1.6 and 1.7
 PORTSCOUT=	limit:^5\.1\..*
 
 USES=		cpe
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	mysql_connector_j
 
 CONFLICTS_INSTALL=	mysql-connector-java-8*
 
 NO_ARCH=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6 1.7 1.8
 BUILDDIR=	${WRKDIR}/${DISTNAME}
 APIDOCSDIR=	${STAGEDIR}${DOCSDIR}/javadoc
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
 JAVADOCDIR=	${WRKDIR}/${DISTNAME}/javadoc
 DESTJARFILE=	${PORTNAME}.jar
 EXTRADOCS=	CHANGES
 JARFILE=	${DISTNAME}-bin.jar
 JDCLASSPATH=	${SRCDIR}:${CLASSPATH}
 
 PLIST_FILES=	${JAVAJARDIR}/${DESTJARFILE}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 do-build:
 	@${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:
 	@${ECHO_MSG} -n ">> Installing .jar files..."
 	${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
 	@${ECHO_MSG} " [ DONE ]"
 
 do-install-DOCS-on:
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@for extradoc in ${EXTRADOCS} ; do                          \
 	  ${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 ]"
 
 .include <bsd.port.post.mk>