From owner-svn-ports-all@freebsd.org Tue Jan 8 20:36:05 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AA551148A392; Tue, 8 Jan 2019 20:36:05 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C2987693E; Tue, 8 Jan 2019 20:36:05 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FE78510A; Tue, 8 Jan 2019 20:36:05 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x08Ka5sx012383; Tue, 8 Jan 2019 20:36:05 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x08Ka3t9012377; Tue, 8 Jan 2019 20:36:03 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201901082036.x08Ka3t9012377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Tue, 8 Jan 2019 20:36:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489740 - in head: . databases databases/mysql-connector-java databases/mysql-connector-java51 X-SVN-Group: ports-head X-SVN-Commit-Author: matthew X-SVN-Commit-Paths: in head: . databases databases/mysql-connector-java databases/mysql-connector-java51 X-SVN-Commit-Revision: 489740 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4C2987693E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2019 20:36:05 -0000 Author: matthew Date: Tue Jan 8 20:36:03 2019 New Revision: 489740 URL: https://svnweb.freebsd.org/changeset/ports/489740 Log: Update databases/mysql-connector-java to 8.0.13 This now requires Java 1.8+ Repo-copy the orgiginal port to databases/mysql-connector-java51 to provide continued support for Java 1,6 and 1.7 users. Hook up to the tree. Summary of Changes: https://insidemysql.com/connector-j-8-0-11-the-face-for-your-brand-new-document-oriented-database/ ChangeLogs: https://dev.mysql.com/doc/relnotes/connector-j/8.0/en/ Added: head/databases/mysql-connector-java51/ - copied from r489307, head/databases/mysql-connector-java/ Modified: head/UPDATING head/databases/Makefile head/databases/mysql-connector-java/Makefile head/databases/mysql-connector-java/distinfo head/databases/mysql-connector-java/pkg-descr head/databases/mysql-connector-java51/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Jan 8 20:34:50 2019 (r489739) +++ head/UPDATING Tue Jan 8 20:36:03 2019 (r489740) @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20190108: + AFFECTS: users of databases/mysql-connector-java + AUTHOR: matthew@FreeBSD.org + + The databases/mysql-connector-java port has been updated to 8.0.13, + which requires a minimum of Java 1.8, so dropping support for Java + 1.6 and 1.7. Users of those versions of Java should substitute the + databases/mysql-connector-java51 port which remains at version + 5.1.47 + 20190103: AFFECTS: users of multimedia/vlc* AUTHOR: riggs@FreeBSD.org Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Tue Jan 8 20:34:50 2019 (r489739) +++ head/databases/Makefile Tue Jan 8 20:36:03 2019 (r489740) @@ -215,6 +215,7 @@ SUBDIR += mysql-connector-c SUBDIR += mysql-connector-c++ SUBDIR += mysql-connector-java + SUBDIR += mysql-connector-java51 SUBDIR += mysql-connector-odbc SUBDIR += mysql-q4m SUBDIR += mysql-udf Modified: head/databases/mysql-connector-java/Makefile ============================================================================== --- head/databases/mysql-connector-java/Makefile Tue Jan 8 20:34:50 2019 (r489739) +++ head/databases/mysql-connector-java/Makefile Tue Jan 8 20:36:03 2019 (r489740) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql-connector-java -PORTVERSION= 5.1.47 +PORTVERSION= 8.0.13 CATEGORIES= databases java MASTER_SITES= MYSQL/Connector-J @@ -10,64 +10,43 @@ MAINTAINER= matthew@FreeBSD.org COMMENT= MySQL Connector/J: JDBC interface for MySQL LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${JAVALIBDIR}/log4j.jar:devel/log4j +RUN_DEPENDS= ${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \ + ${JAVALIBDIR}/c3p0.jar:databases/c3p0 -# 6.0 is currently in beta. -PORTSCOUT= limit:^5\.1\..* - USES= cpe +USE_JAVA= yes + CPE_VENDOR= oracle CPE_PRODUCT= mysql_connector_j 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 +NO_BUILD= yes + +CONFLICTS_INSTALL= mysql-connector-java51-* + +JAVA_VERSION= 1.8+ EXTRADOCS= CHANGES -JARFILE= ${DISTNAME}-bin.jar -JDCLASSPATH= ${SRCDIR}:${CLASSPATH} +EXTRAJARS= protobuf-java-3.6.1.jar -PLIST_FILES= ${JAVAJARDIR}/${DESTJARFILE} +PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \ + ${EXTRAJARS:C,^.*$,${JAVAJARDIR}/&,g} -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS PORTDOCS= * -.include - -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 ]" + ${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: - @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${STAGEDIR}${DOCSDIR} - @for extradoc in ${EXTRADOCS} ; do \ + @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 +.include Modified: head/databases/mysql-connector-java/distinfo ============================================================================== --- head/databases/mysql-connector-java/distinfo Tue Jan 8 20:34:50 2019 (r489739) +++ head/databases/mysql-connector-java/distinfo Tue Jan 8 20:36:03 2019 (r489740) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535796903 -SHA256 (mysql-connector-java-5.1.47.tar.gz) = 4ae79214b2f1b5fc600fc867a4d27dcfcb467813c38bf3eee87789ba400349c6 -SIZE (mysql-connector-java-5.1.47.tar.gz) = 4452049 +TIMESTAMP = 1546682403 +SHA256 (mysql-connector-java-8.0.13.tar.gz) = 99501fbc74b4cb80cd75a4d06c38b662be01bfd39c409efa3c747ec83216329b +SIZE (mysql-connector-java-8.0.13.tar.gz) = 5980103 Modified: head/databases/mysql-connector-java/pkg-descr ============================================================================== --- head/databases/mysql-connector-java/pkg-descr Tue Jan 8 20:34:50 2019 (r489739) +++ head/databases/mysql-connector-java/pkg-descr Tue Jan 8 20:36:03 2019 (r489740) @@ -1,13 +1,7 @@ -MySQL Connector/J is a native Java driver that converts JDBC (Java -Database Connectivity) calls into the network protocol used by the -MySQL database. It lets developers working with the Java programming -language easily build programs and applets that interact with MySQL -and connect all corporate data, even in a heterogeneous -environment. MySQL Connector/J is a Type IV JDBC driver and has a -complete JDBC feature set that supports the capabilities of MySQL. - -This port is derived from the original databases/mysql-jdbc-mm port of -the mm.mysql JDBC connector by dglo@ssec.wisc.edu. +MySQL Connector/J is the official JDBC driver for MySQL. MySQL +Connector/J 8.0 is compatible with all MySQL versions starting with +MySQL 5.5. Additionally, MySQL Connector/J 8.0 supports the new X +DevAPI for development with MySQL Server 8.0. WWW: https://dev.mysql.com/downloads/connector/j/ Modified: head/databases/mysql-connector-java51/Makefile ============================================================================== --- head/databases/mysql-connector-java/Makefile Sat Jan 5 08:25:10 2019 (r489307) +++ head/databases/mysql-connector-java51/Makefile Tue Jan 8 20:36:03 2019 (r489740) @@ -5,6 +5,7 @@ PORTNAME= mysql-connector-java PORTVERSION= 5.1.47 CATEGORIES= databases java MASTER_SITES= MYSQL/Connector-J +PKGNAMESUFFIX= 51 MAINTAINER= matthew@FreeBSD.org COMMENT= MySQL Connector/J: JDBC interface for MySQL @@ -13,12 +14,14 @@ LICENSE= GPLv2 RUN_DEPENDS= ${JAVALIBDIR}/log4j.jar:devel/log4j -# 6.0 is currently in beta. +# 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