ports/53617: Update databases/mysql-jdbc-mm to mysql-connector-j-3.0.8

[Matthew Seaman]

>Number:         53617
>Category:       ports
>Synopsis:       Update databases/mysql-jdbc-mm to mysql-connector-j-3.0.8
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 22 15:10:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 4.8-STABLE FreeBSD 4.8-STABLE #12: Sat Jun 21 21:04:31 BST 2003 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386

>Description:

Update the databases/mysql-jdbc-mm port to MySQL Connector/J 3.0.8
Stable -- it's the same project, except MySQL AB changed the name when
they adopted it as their standard JDBC driver.

Main changes:

    - Port name change from mysql-jdbc-mm to mysql-connector-j

    - Download distfile from one of the MySQL mirror sites (copied the
      list from mysql41-server port: perhaps it's time for
      MASTER_SITE_MYSQL?)

    - Add BUILD_DEPENDS on the java/junit port

    - Delete files/patch-build.xml, files/patch-j1c and the files
      directory.

    - Delete the pkg-plist file as it's not used: PLIST built
      automatically.

    - Various fiddles to cope with the way the build.xml writes the
      compiled output to ../build-mysql-jdbc

    - Change the javadoc build to look at the com.mysql.jdbc as well
      as org.gjt.mm.mysql object hierarchies
    
    - Take maintainership

>How-To-Repeat:

>Fix:

--- mysql-connector-j.diff begins here ---
diff -Nur mysql-jdbc-mm/Makefile mysql-connector-java/Makefile
--- mysql-jdbc-mm/Makefile	Fri Feb 21 23:38:10 2003
+++ mysql-connector-java/Makefile	Sat Jun 14 18:26:10 2003
@@ -5,48 +5,47 @@
 # $FreeBSD: ports/databases/mysql-jdbc-mm/Makefile,v 1.11 2003/02/21 11:15:00 knu Exp $
 #
 
-PORTNAME=	mysql-jdbc-mm
-PORTVERSION=	2.0.14
+PORTNAME=	mysql-connector-java
+PORTVERSION=	3.0.8
 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 at ssec.wisc.edu
-COMMENT=	The mm JDBC interface for MySQL
-
-BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
-
-USE_REINPLACE=	YES
+MAINTAINER=	m.seaman at infracaninophile.co.uk
+COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant \
+		${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit
 USE_JAVA=	1.2+
 NEED_JAVAC=	YES
 
-EXTRACT_CMD=	${JAR}
-EXTRACT_BEFORE_ARGS=	-xf
-
-PLIST= ${WRKDIR}/PLIST
-
-JAVALIBNAME=   ${PORTNAME}-${PORTVERSION}
-APIDOCSDIR=    ${DOCSDIR}/${JAVALIBNAME}
+USE_REINPLACE=	YES
 
-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
+PLIST=		${WRKDIR}/PLIST
+BUILDDIR=	${WRKDIR}/build-mysql-jdbc/${DISTNAME}
+JAVALIBNAME=	${PORTNAME}-${PORTVERSION}
+APIDOCSDIR=	${DOCSDIR}/${JAVALIBNAME}
 
 do-build:
 	@cd ${WRKSRC} && \
-		${SETENV} JAVA_HOME=${JAVA_HOME} ant clean dist
+		${SETENV} JAVA_HOME=${JAVA_HOME} ant clean compile-driver
 .if !defined(NOPORTDOCS)
-	@cd ${WRKSRC} && ${MKDIR} doc && \
-	 ${JAVADOC} -d doc -package \
+	@${MKDIR} ${BUILDDIR}/doc && cd ${WRKSRC} && \
+	 ${JAVADOC} -d ${BUILDDIR}/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
+	      com.mysql.jdbc org.gjt.mm.mysql
 .endif
 
 pre-install:
@@ -57,7 +56,7 @@
 
 do-install-jar:
 	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/build/mm.mysql-${PORTVERSION}/mm.mysql-${PORTVERSION}-bin.jar ${JAVAJARDIR}/${PORTNAME}.jar
+	@${INSTALL_DATA} ${BUILDDIR}/${DISTNAME}-bin.jar ${JAVAJARDIR}/${PORTNAME}.jar
 	@${INSTALL_DATA} ${WRKSRC}/lib/jdbc2_0-stdext.jar \
 		${JAVAJARDIR}
 	@${INSTALL_DATA} ${WRKSRC}/lib/jta-spec1_0_1.jar \
@@ -68,13 +67,13 @@
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
 	@${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
-	@${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \
+	@${ECHO} "@unexec rmdir ${JAVAJARDIR} 2>/dev/null || true" | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
 
 do-install-apidocs:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${APIDOCSDIR}
-	@${CP} -r ${WRKSRC}/doc/* ${APIDOCSDIR}
+	@${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR}
 	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR}
 	@${FIND} ${APIDOCSDIR} -type f -print | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
diff -Nur mysql-jdbc-mm/distinfo mysql-connector-java/distinfo
--- mysql-jdbc-mm/distinfo	Fri May 24 18:17:00 2002
+++ mysql-connector-java/distinfo	Sat Jun 14 13:17:08 2003
@@ -1 +1 @@
-MD5 (mm.mysql-2.0.14-you-must-unjar-me.jar) = 6c8a23dd49ca29d6d9d1de4808195d19
+MD5 (mysql-connector-java-3.0.8-stable.tar.gz) = 4b0385ccb2cae8fcbc5a55bd2639dc38
diff -Nur mysql-jdbc-mm/files/patch-build.xml mysql-connector-java/files/patch-build.xml
--- mysql-jdbc-mm/files/patch-build.xml	Fri Jul 12 20:12:02 2002
+++ mysql-connector-java/files/patch-build.xml	Thu Jan  1 01:00:00 1970
@@ -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 @@
- <project name="MM.MySQL" default="dist" basedir=".">
- 	<property name="version" value="2.0.14"/>
--	<property name="java1.1.home" value="c:/jdk1.1.8"/>
--	<property name="javac.1.1" value="${java1.1.home}/bin/javac"/>
-+	<property name="java1.1.home" value="%%PREFIX%%/jdk1.1.8"/>
-+	<property name="javac.1.1" value="%%WRKSRC%%/j1c"/>
- 	
- 	<target name="init">
- 		<filter token="VERSION" value="${version}"/>
-@@ -62,7 +62,7 @@
- 
- 	<target name="compile-jdbc1" depends="init, compile-core">
- 		<exec dir="./build/mm.mysql-${version}/org/gjt/mm/mysql/jdbc1" executable="${javac.1.1}">
--			<arg line="-g -classpath ${basedir}/build/mm.mysql-${version};${java1.1.home}/lib/classes.zip *.java"/>
-+			<arg line="-g -classpath ${basedir}/build/mm.mysql-${version}:${java1.1.home}/lib/classes.zip *.java"/>
- 		</exec>
- 	</target>
- 	
diff -Nur mysql-jdbc-mm/files/patch-j1c mysql-connector-java/files/patch-j1c
--- mysql-jdbc-mm/files/patch-j1c	Fri Jul 12 20:12:02 2002
+++ mysql-connector-java/files/patch-j1c	Thu Jan  1 01:00:00 1970
@@ -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 -Nur mysql-jdbc-mm/pkg-descr mysql-connector-java/pkg-descr
--- mysql-jdbc-mm/pkg-descr	Sat Jan 29 22:23:06 2000
+++ mysql-connector-java/pkg-descr	Sat Jun 14 16:19:20 2003
@@ -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 at ssec.wisc.edu
+This port is derived from the original databases/mysql-jdbc-mm port of
+the mm.mysql JDBC connector by dglo at ssec.wisc.edu.
+
+WWW: http://www.mysql.com/products/connector-j/index.html
+- m.seaman at infracaninophile.co.uk
diff -Nur mysql-jdbc-mm/pkg-plist mysql-connector-java/pkg-plist
--- mysql-jdbc-mm/pkg-plist	Fri May 24 18:17:00 2002
+++ mysql-connector-java/pkg-plist	Thu Jan  1 01:00:00 1970
@@ -1 +0,0 @@
-
--- mysql-connector-j.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: