From a2db9dcf8b8e565449f260f351e8e71a13ec151d Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Wed, 5 Nov 2003 15:33:56 +0000 Subject: . Repo copy from mysql-jdbc-mm to reflect the change of project name due to it now being an official MySQL product. . Update to 3.0.9. PR: 57753 Submitted by: Matthew Seaman --- databases/Makefile | 1 + databases/mysql-connector-java/Makefile | 117 ++++++++++----------- databases/mysql-connector-java/distinfo | 2 +- .../mysql-connector-java/files/patch-build.xml | 21 ---- databases/mysql-connector-java/files/patch-j1c | 10 -- databases/mysql-connector-java/pkg-descr | 16 ++- databases/mysql-connector-java/pkg-plist | 84 ++++++++++++++- databases/mysql-connector-java50/Makefile | 117 ++++++++++----------- databases/mysql-connector-java50/distinfo | 2 +- .../mysql-connector-java50/files/patch-build.xml | 21 ---- databases/mysql-connector-java50/files/patch-j1c | 10 -- databases/mysql-connector-java50/pkg-descr | 16 ++- databases/mysql-connector-java50/pkg-plist | 84 ++++++++++++++- 13 files changed, 309 insertions(+), 192 deletions(-) delete mode 100644 databases/mysql-connector-java/files/patch-build.xml delete mode 100644 databases/mysql-connector-java/files/patch-j1c delete mode 100644 databases/mysql-connector-java50/files/patch-build.xml delete mode 100644 databases/mysql-connector-java50/files/patch-j1c (limited to 'databases') diff --git a/databases/Makefile b/databases/Makefile index d0670bf298d1..b9ad5d7a9555 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -66,6 +66,7 @@ SUBDIR += msql SUBDIR += myodbc SUBDIR += mysql++ + SUBDIR += mysql-connector-java SUBDIR += mysql-editor SUBDIR += mysql-gui SUBDIR += mysql-jdbc-mm diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile index fb24f754979f..32fd55f8ac75 100644 --- a/databases/mysql-connector-java/Makefile +++ b/databases/mysql-connector-java/Makefile @@ -1,85 +1,84 @@ -# New ports collection makefile for: The mm MySql JDBC interface -# Date created: 2 January 2000 -# Whom: Dave Glowacki +# New ports collection makefile for: mysql-connector-java +# Date created: 8 October 2003 +# Whom: Matthew Seaman # # $FreeBSD$ # -PORTNAME= mysql-jdbc-mm -PORTVERSION= 2.0.14 +PORTNAME= mysql-connector-java +PORTVERSION= 3.0.9 CATEGORIES= databases java -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mmmysql -DISTNAME= mm.mysql-${PORTVERSION} -EXTRACT_SUFX= -you-must-unjar-me.jar +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/Connector-J/ \ + http://mysql.tzone.it/Downloads/Connector-J/ \ + ftp://planetmirror.com/pub/mysql/Downloads/Connector-J/ \ + http://www.softagency.co.jp/MySQL/Downloads/Connector-J/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/Connector-J/ \ + http://mysql.mediatraffic.fi/Downloads/Connector-J/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/Connector-J/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/Connector-J/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/Connector-J/ \ + http://www.mysql.cz/Downloads/Connector-J/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/Connector-J/ \ + http://mysql.oms-net.nl/Downloads/Connector-J/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/Connector-J/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-stable -MAINTAINER= dglo@ssec.wisc.edu -COMMENT= The mm JDBC interface for MySQL +MAINTAINER= m.seaman@infracaninophile.co.uk +COMMENT= MySQL Connector/J: JDBC interface for MySQL -BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant - -USE_REINPLACE= YES - -USE_JAVA= 1.3 +BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant \ + ${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit +USE_JAVA= 1.2+ NEED_JAVAC= YES +USE_REINPLACE= YES -EXTRACT_CMD= ${JAR} -EXTRACT_BEFORE_ARGS= -xf - -PLIST= ${WRKDIR}/PLIST +ANT?= ${LOCALBASE}/bin/ant +ANT_TARGET= clean compile-driver +APIDOCSDIR= ${DOCSDIR}/javadoc +BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME} +DESTJARFILE= ${PORTNAME}.jar +EXTRAJARS= jdbc2_0-stdext.jar jta-spec1_0_1.jar +EXTRADOCS= README CHANGES +JARFILE= ${DISTNAME}-bin.jar +JDCLASSPATH= ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH} -JAVALIBNAME= ${PORTNAME}-${PORTVERSION} -APIDOCSDIR= ${DOCSDIR}/${JAVALIBNAME} +.include -post-patch: - @${REINPLACE_CMD} \ - -e "s;%%WRKSRC%%;${WRKSRC};g" \ - -e "s;%%PREFIX%%;${PREFIX};g" \ - ${WRKSRC}/build.xml - @${REINPLACE_CMD} "s;%%PREFIX%%;${PREFIX};g" ${WRKSRC}/j1c - @${CHMOD} 544 ${WRKSRC}/j1c +.if ${USE_JAVA:C/[.+]//g} >= 14 +PLIST_SUB+= JAVA14="" +.else +PLIST_SUB+= JAVA14="@comment " +.endif do-build: - @cd ${WRKSRC} && \ - ${SETENV} JAVA_HOME=${JAVA_HOME} ant clean dist + @cd ${WRKSRC} && ${ANT} ${ANT_TARGET} .if !defined(NOPORTDOCS) - @cd ${WRKSRC} && ${MKDIR} doc && \ - ${JAVADOC} -d doc -package \ - -classpath ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH} \ - org.gjt.mm.mysql org.gjt.mm.mysql.jdbc2 + @${MKDIR} ${BUILDDIR}/doc && cd ${WRKSRC} && \ + ${JAVADOC} -d ${BUILDDIR}/doc -package \ + -classpath ${JDCLASSPATH} \ + com.mysql.jdbc org.gjt.mm.mysql .endif -pre-install: - @${RM} -f ${PLIST} - @${TOUCH} ${PLIST} - do-install: do-install-jar do-install-apidocs do-install-jar: + @${ECHO_CMD} -n ">> Installing .jar files..." @${MKDIR} ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/build/mm.mysql-${PORTVERSION}/mm.mysql-${PORTVERSION}-bin.jar ${JAVAJARDIR}/${PORTNAME}.jar - @${INSTALL_DATA} ${WRKSRC}/lib/jdbc2_0-stdext.jar \ - ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/lib/jta-spec1_0_1.jar \ - ${JAVAJARDIR} - @${ECHO} ${JAVAJARDIR}/jta-spec1_0_1.jar | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${ECHO} ${JAVAJARDIR}/jdbc2_0-stdext.jar | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} + @${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} + @for extrajar in ${EXTRAJARS} ; do \ + ${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/$$extrajar ${JAVAJARDIR} ; \ + done + @${ECHO_CMD} " [ DONE ]" do-install-apidocs: .if !defined(NOPORTDOCS) + @${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${APIDOCSDIR} - @${CP} -r ${WRKSRC}/doc/* ${APIDOCSDIR} - @${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR} - @${FIND} ${APIDOCSDIR} -type f -print | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${FIND} ${APIDOCSDIR} -type d -print | sort -r | \ - ${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST} + @${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR} + @for extradoc in ${EXTRADOCS} ; do \ + ${INSTALL_DATA} ${BUILDDIR}/$$extradoc ${DOCSDIR} ; \ + done + @${ECHO_CMD} " [ DONE ]" .endif -.include +.include diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo index a791ccefccb4..4b314b9ed668 100644 --- a/databases/mysql-connector-java/distinfo +++ b/databases/mysql-connector-java/distinfo @@ -1 +1 @@ -MD5 (mm.mysql-2.0.14-you-must-unjar-me.jar) = 6c8a23dd49ca29d6d9d1de4808195d19 +MD5 (mysql-connector-java-3.0.9-stable.tar.gz) = a31d789843a5d333159995d2fcfa7481 diff --git a/databases/mysql-connector-java/files/patch-build.xml b/databases/mysql-connector-java/files/patch-build.xml deleted file mode 100644 index 36ede9c61672..000000000000 --- a/databases/mysql-connector-java/files/patch-build.xml +++ /dev/null @@ -1,21 +0,0 @@ ---- build.xml.orig Sat May 18 13:50:54 2002 -+++ build.xml Sat May 18 13:50:44 2002 -@@ -1,7 +1,7 @@ - - -- -- -+ -+ - - - -@@ -62,7 +62,7 @@ - - - -- -+ - - - diff --git a/databases/mysql-connector-java/files/patch-j1c b/databases/mysql-connector-java/files/patch-j1c deleted file mode 100644 index e749ca854e1c..000000000000 --- a/databases/mysql-connector-java/files/patch-j1c +++ /dev/null @@ -1,10 +0,0 @@ ---- j1c.orig Thu Nov 29 16:26:08 2001 -+++ j1c Thu Nov 29 16:26:36 2001 -@@ -0,0 +1,7 @@ -+#!/bin/sh -+ -+JAVAC_1=%%PREFIX%%/jdk1.1.8/bin/javac -+ -+unset JAVA_HOME LD_LIBRARY_PATH LD_PRELOAD CLASSPATH -+ -+exec "$JAVAC_1" "$@" diff --git a/databases/mysql-connector-java/pkg-descr b/databases/mysql-connector-java/pkg-descr index f2fcaa8d0934..6bc621760cea 100644 --- a/databases/mysql-connector-java/pkg-descr +++ b/databases/mysql-connector-java/pkg-descr @@ -1,6 +1,14 @@ -This is a port of the mm JDBC driver which is used to access MySQL -databases using a database-independant API in Java. -WWW: http://www.worldserver.com/mm.mysql/ +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. -dglo@ssec.wisc.edu +This port is derived from the original databases/mysql-jdbc-mm port of +the mm.mysql JDBC connector by dglo@ssec.wisc.edu. + +WWW: http://www.mysql.com/products/connector-j/index.html +- m.seaman@infracaninophile.co.uk diff --git a/databases/mysql-connector-java/pkg-plist b/databases/mysql-connector-java/pkg-plist index 8b137891791f..613e02e0212c 100644 --- a/databases/mysql-connector-java/pkg-plist +++ b/databases/mysql-connector-java/pkg-plist @@ -1 +1,83 @@ - +share/java/classes/jdbc2_0-stdext.jar +share/java/classes/jta-spec1_0_1.jar +share/java/classes/mysql-connector-java.jar +%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-frame.html +%%JAVA14%%%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-noframe.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/AssertionFailedException.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Blob.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Buffer.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/CharsetMapping.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Clob.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Connection.UltraDevWorkAround.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Connection.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/DatabaseMetaData.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Debug.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Driver.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/EscapeProcessor.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/EscapeTokenizer.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Field.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MiniAdmin.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MysqlDefs.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MysqlIO.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.NamedPipeSocket.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.RandomAccessFileInputStream.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.RandomAccessFileOutputStream.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NonRegisteringDriver.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NotImplemented.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NotUpdatable.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/OutputStreamWatcher.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PacketTooBigException.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.BatchParams.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.EndPoint.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/ResultSet.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/ResultSetMetaData.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowData.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataDynamic.OperationNotSupportedException.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataDynamic.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataStatic.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SQLError.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Security.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SingleByteCharsetConverter.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SocketFactory.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/StandardSocketFactory.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Statement.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/StringUtils.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/TimeUtil.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/UpdatableResultSet.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Util.RandStructcture.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Util.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WatchableOutputStream.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WatchableWriter.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WriterWatcher.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-tree.html +%%JAVA14%%%%PORTDOCS%%%%DOCSDIR%%/javadoc/constant-values.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/deprecated-list.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/help-doc.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-all.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/index.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/Driver.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/package-list +%%PORTDOCS%%%%DOCSDIR%%/javadoc/packages.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/serialized-form.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/stylesheet.css +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt/mm/mysql +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt/mm +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com/mysql/jdbc +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com/mysql +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/databases/mysql-connector-java50/Makefile b/databases/mysql-connector-java50/Makefile index fb24f754979f..32fd55f8ac75 100644 --- a/databases/mysql-connector-java50/Makefile +++ b/databases/mysql-connector-java50/Makefile @@ -1,85 +1,84 @@ -# New ports collection makefile for: The mm MySql JDBC interface -# Date created: 2 January 2000 -# Whom: Dave Glowacki +# New ports collection makefile for: mysql-connector-java +# Date created: 8 October 2003 +# Whom: Matthew Seaman # # $FreeBSD$ # -PORTNAME= mysql-jdbc-mm -PORTVERSION= 2.0.14 +PORTNAME= mysql-connector-java +PORTVERSION= 3.0.9 CATEGORIES= databases java -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mmmysql -DISTNAME= mm.mysql-${PORTVERSION} -EXTRACT_SUFX= -you-must-unjar-me.jar +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/Connector-J/ \ + http://mysql.tzone.it/Downloads/Connector-J/ \ + ftp://planetmirror.com/pub/mysql/Downloads/Connector-J/ \ + http://www.softagency.co.jp/MySQL/Downloads/Connector-J/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/Connector-J/ \ + http://mysql.mediatraffic.fi/Downloads/Connector-J/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/Connector-J/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/Connector-J/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/Connector-J/ \ + http://www.mysql.cz/Downloads/Connector-J/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/Connector-J/ \ + http://mysql.oms-net.nl/Downloads/Connector-J/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/Connector-J/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-stable -MAINTAINER= dglo@ssec.wisc.edu -COMMENT= The mm JDBC interface for MySQL +MAINTAINER= m.seaman@infracaninophile.co.uk +COMMENT= MySQL Connector/J: JDBC interface for MySQL -BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant - -USE_REINPLACE= YES - -USE_JAVA= 1.3 +BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant \ + ${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit +USE_JAVA= 1.2+ NEED_JAVAC= YES +USE_REINPLACE= YES -EXTRACT_CMD= ${JAR} -EXTRACT_BEFORE_ARGS= -xf - -PLIST= ${WRKDIR}/PLIST +ANT?= ${LOCALBASE}/bin/ant +ANT_TARGET= clean compile-driver +APIDOCSDIR= ${DOCSDIR}/javadoc +BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME} +DESTJARFILE= ${PORTNAME}.jar +EXTRAJARS= jdbc2_0-stdext.jar jta-spec1_0_1.jar +EXTRADOCS= README CHANGES +JARFILE= ${DISTNAME}-bin.jar +JDCLASSPATH= ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH} -JAVALIBNAME= ${PORTNAME}-${PORTVERSION} -APIDOCSDIR= ${DOCSDIR}/${JAVALIBNAME} +.include -post-patch: - @${REINPLACE_CMD} \ - -e "s;%%WRKSRC%%;${WRKSRC};g" \ - -e "s;%%PREFIX%%;${PREFIX};g" \ - ${WRKSRC}/build.xml - @${REINPLACE_CMD} "s;%%PREFIX%%;${PREFIX};g" ${WRKSRC}/j1c - @${CHMOD} 544 ${WRKSRC}/j1c +.if ${USE_JAVA:C/[.+]//g} >= 14 +PLIST_SUB+= JAVA14="" +.else +PLIST_SUB+= JAVA14="@comment " +.endif do-build: - @cd ${WRKSRC} && \ - ${SETENV} JAVA_HOME=${JAVA_HOME} ant clean dist + @cd ${WRKSRC} && ${ANT} ${ANT_TARGET} .if !defined(NOPORTDOCS) - @cd ${WRKSRC} && ${MKDIR} doc && \ - ${JAVADOC} -d doc -package \ - -classpath ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH} \ - org.gjt.mm.mysql org.gjt.mm.mysql.jdbc2 + @${MKDIR} ${BUILDDIR}/doc && cd ${WRKSRC} && \ + ${JAVADOC} -d ${BUILDDIR}/doc -package \ + -classpath ${JDCLASSPATH} \ + com.mysql.jdbc org.gjt.mm.mysql .endif -pre-install: - @${RM} -f ${PLIST} - @${TOUCH} ${PLIST} - do-install: do-install-jar do-install-apidocs do-install-jar: + @${ECHO_CMD} -n ">> Installing .jar files..." @${MKDIR} ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/build/mm.mysql-${PORTVERSION}/mm.mysql-${PORTVERSION}-bin.jar ${JAVAJARDIR}/${PORTNAME}.jar - @${INSTALL_DATA} ${WRKSRC}/lib/jdbc2_0-stdext.jar \ - ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/lib/jta-spec1_0_1.jar \ - ${JAVAJARDIR} - @${ECHO} ${JAVAJARDIR}/jta-spec1_0_1.jar | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${ECHO} ${JAVAJARDIR}/jdbc2_0-stdext.jar | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} + @${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} + @for extrajar in ${EXTRAJARS} ; do \ + ${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/$$extrajar ${JAVAJARDIR} ; \ + done + @${ECHO_CMD} " [ DONE ]" do-install-apidocs: .if !defined(NOPORTDOCS) + @${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${APIDOCSDIR} - @${CP} -r ${WRKSRC}/doc/* ${APIDOCSDIR} - @${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR} - @${FIND} ${APIDOCSDIR} -type f -print | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${FIND} ${APIDOCSDIR} -type d -print | sort -r | \ - ${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST} + @${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR} + @for extradoc in ${EXTRADOCS} ; do \ + ${INSTALL_DATA} ${BUILDDIR}/$$extradoc ${DOCSDIR} ; \ + done + @${ECHO_CMD} " [ DONE ]" .endif -.include +.include diff --git a/databases/mysql-connector-java50/distinfo b/databases/mysql-connector-java50/distinfo index a791ccefccb4..4b314b9ed668 100644 --- a/databases/mysql-connector-java50/distinfo +++ b/databases/mysql-connector-java50/distinfo @@ -1 +1 @@ -MD5 (mm.mysql-2.0.14-you-must-unjar-me.jar) = 6c8a23dd49ca29d6d9d1de4808195d19 +MD5 (mysql-connector-java-3.0.9-stable.tar.gz) = a31d789843a5d333159995d2fcfa7481 diff --git a/databases/mysql-connector-java50/files/patch-build.xml b/databases/mysql-connector-java50/files/patch-build.xml deleted file mode 100644 index 36ede9c61672..000000000000 --- a/databases/mysql-connector-java50/files/patch-build.xml +++ /dev/null @@ -1,21 +0,0 @@ ---- build.xml.orig Sat May 18 13:50:54 2002 -+++ build.xml Sat May 18 13:50:44 2002 -@@ -1,7 +1,7 @@ - - -- -- -+ -+ - - - -@@ -62,7 +62,7 @@ - - - -- -+ - - - diff --git a/databases/mysql-connector-java50/files/patch-j1c b/databases/mysql-connector-java50/files/patch-j1c deleted file mode 100644 index e749ca854e1c..000000000000 --- a/databases/mysql-connector-java50/files/patch-j1c +++ /dev/null @@ -1,10 +0,0 @@ ---- j1c.orig Thu Nov 29 16:26:08 2001 -+++ j1c Thu Nov 29 16:26:36 2001 -@@ -0,0 +1,7 @@ -+#!/bin/sh -+ -+JAVAC_1=%%PREFIX%%/jdk1.1.8/bin/javac -+ -+unset JAVA_HOME LD_LIBRARY_PATH LD_PRELOAD CLASSPATH -+ -+exec "$JAVAC_1" "$@" diff --git a/databases/mysql-connector-java50/pkg-descr b/databases/mysql-connector-java50/pkg-descr index f2fcaa8d0934..6bc621760cea 100644 --- a/databases/mysql-connector-java50/pkg-descr +++ b/databases/mysql-connector-java50/pkg-descr @@ -1,6 +1,14 @@ -This is a port of the mm JDBC driver which is used to access MySQL -databases using a database-independant API in Java. -WWW: http://www.worldserver.com/mm.mysql/ +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. -dglo@ssec.wisc.edu +This port is derived from the original databases/mysql-jdbc-mm port of +the mm.mysql JDBC connector by dglo@ssec.wisc.edu. + +WWW: http://www.mysql.com/products/connector-j/index.html +- m.seaman@infracaninophile.co.uk diff --git a/databases/mysql-connector-java50/pkg-plist b/databases/mysql-connector-java50/pkg-plist index 8b137891791f..613e02e0212c 100644 --- a/databases/mysql-connector-java50/pkg-plist +++ b/databases/mysql-connector-java50/pkg-plist @@ -1 +1,83 @@ - +share/java/classes/jdbc2_0-stdext.jar +share/java/classes/jta-spec1_0_1.jar +share/java/classes/mysql-connector-java.jar +%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-frame.html +%%JAVA14%%%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-noframe.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/AssertionFailedException.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Blob.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Buffer.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/CharsetMapping.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Clob.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Connection.UltraDevWorkAround.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Connection.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/DatabaseMetaData.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Debug.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Driver.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/EscapeProcessor.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/EscapeTokenizer.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Field.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MiniAdmin.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MysqlDefs.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MysqlIO.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.NamedPipeSocket.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.RandomAccessFileInputStream.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.RandomAccessFileOutputStream.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NonRegisteringDriver.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NotImplemented.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NotUpdatable.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/OutputStreamWatcher.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PacketTooBigException.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.BatchParams.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.EndPoint.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/ResultSet.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/ResultSetMetaData.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowData.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataDynamic.OperationNotSupportedException.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataDynamic.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataStatic.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SQLError.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Security.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SingleByteCharsetConverter.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SocketFactory.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/StandardSocketFactory.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Statement.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/StringUtils.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/TimeUtil.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/UpdatableResultSet.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Util.RandStructcture.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Util.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WatchableOutputStream.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WatchableWriter.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WriterWatcher.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-tree.html +%%JAVA14%%%%PORTDOCS%%%%DOCSDIR%%/javadoc/constant-values.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/deprecated-list.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/help-doc.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-all.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/index.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/Driver.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/package-list +%%PORTDOCS%%%%DOCSDIR%%/javadoc/packages.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/serialized-form.html +%%PORTDOCS%%%%DOCSDIR%%/javadoc/stylesheet.css +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt/mm/mysql +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt/mm +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com/mysql/jdbc +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com/mysql +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc +%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit v1.2.3