diff options
| -rw-r--r-- | UPDATING | 10 | ||||
| -rw-r--r-- | databases/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql-connector-java/Makefile | 63 | ||||
| -rw-r--r-- | databases/mysql-connector-java/distinfo | 6 | ||||
| -rw-r--r-- | databases/mysql-connector-java/pkg-descr | 14 | ||||
| -rw-r--r-- | databases/mysql-connector-java51/Makefile | 76 | ||||
| -rw-r--r-- | databases/mysql-connector-java51/distinfo | 3 | ||||
| -rw-r--r-- | databases/mysql-connector-java51/pkg-descr | 13 |
8 files changed, 131 insertions, 55 deletions
@@ -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 diff --git a/databases/Makefile b/databases/Makefile index 47c628343e96..f52de61e8f69 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -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 diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile index 55d6667e5b46..8b892abb513a 100644 --- a/databases/mysql-connector-java/Makefile +++ b/databases/mysql-connector-java/Makefile @@ -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 - -# 6.0 is currently in beta. -PORTSCOUT= limit:^5\.1\..* +RUN_DEPENDS= ${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \ + ${JAVALIBDIR}/c3p0.jar:databases/c3p0 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 -EXTRADOCS= CHANGES -JARFILE= ${DISTNAME}-bin.jar -JDCLASSPATH= ${SRCDIR}:${CLASSPATH} +NO_BUILD= yes -PLIST_FILES= ${JAVAJARDIR}/${DESTJARFILE} +CONFLICTS_INSTALL= mysql-connector-java51-* -OPTIONS_DEFINE= DOCS - -PORTDOCS= * +JAVA_VERSION= 1.8+ +EXTRADOCS= CHANGES +EXTRAJARS= protobuf-java-3.6.1.jar -.include <bsd.port.pre.mk> +PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \ + ${EXTRAJARS:C,^.*$,${JAVAJARDIR}/&,g} -do-build: - @${DO_NADA} +OPTIONS_DEFINE= DOCS -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 +PORTDOCS= * 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 <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo index fd4681e99a02..a512bc7edf85 100644 --- a/databases/mysql-connector-java/distinfo +++ b/databases/mysql-connector-java/distinfo @@ -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 diff --git a/databases/mysql-connector-java/pkg-descr b/databases/mysql-connector-java/pkg-descr index ed9bd89df272..1c2cc60dea83 100644 --- a/databases/mysql-connector-java/pkg-descr +++ b/databases/mysql-connector-java/pkg-descr @@ -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/ diff --git a/databases/mysql-connector-java51/Makefile b/databases/mysql-connector-java51/Makefile new file mode 100644 index 000000000000..c403de3f91d0 --- /dev/null +++ b/databases/mysql-connector-java51/Makefile @@ -0,0 +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 +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> diff --git a/databases/mysql-connector-java51/distinfo b/databases/mysql-connector-java51/distinfo new file mode 100644 index 000000000000..fd4681e99a02 --- /dev/null +++ b/databases/mysql-connector-java51/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1535796903 +SHA256 (mysql-connector-java-5.1.47.tar.gz) = 4ae79214b2f1b5fc600fc867a4d27dcfcb467813c38bf3eee87789ba400349c6 +SIZE (mysql-connector-java-5.1.47.tar.gz) = 4452049 diff --git a/databases/mysql-connector-java51/pkg-descr b/databases/mysql-connector-java51/pkg-descr new file mode 100644 index 000000000000..ed9bd89df272 --- /dev/null +++ b/databases/mysql-connector-java51/pkg-descr @@ -0,0 +1,13 @@ + +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. + +WWW: https://dev.mysql.com/downloads/connector/j/ |