4 files changed, 44 insertions, 31 deletions

diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 2f155735abb5..a737a603d39e 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -6,28 +6,62 @@
 #
 
 PORTNAME=	mysql-jdbc-mm
-PORTVERSION=	1.2c
+PORTVERSION=	2.0.14
 CATEGORIES=	databases java
-MASTER_SITES=	http://mmmysql.sourceforge.net/dist/
-DISTNAME=	mm.mysql.jdbc-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	mmmysql
+DISTNAME=	mm.mysql-${PORTVERSION}
+EXTRACT_SUFX=	-you-must-unjar-me.jar
 
 MAINTAINER=	dglo@SSEC.WISC.EDU
 
-BUILD_DEPENDS=	${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk
+USE_JAVA=	1.2+
+NEED_JAVAC=	YES
 
-ALL_TARGET=	jar
+EXTRACT_CMD=	${JAR}
+EXTRACT_BEFORE_ARGS=	-xf
+
+post-patch:
+	@(cd ${WRKSRC}; ${MV} build.xml build.xml.patched; \
+	 ${SED} -e "s;%%WRKSRC%%;${WRKSRC};g" -e "s;%%PREFIX%%;${PREFIX};g" \
+		< build.xml.patched > build.xml)
+	@(cd ${WRKSRC}; ${MV} j1c j1c.patched; \
+	 ${SED} "s;%%PREFIX%%;${PREFIX};g" < j1c.patched > j1c; \
+	 ${CHMOD} 555 j1c)
+
+do-build:
+	@(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} ant clean dist)
+.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)
+.endif
 
 do-install:
 	@${MKDIR} ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${WRKSRC}/mysql_comp.jar ${LOCALBASE}/share/java/classes
-
-post-install:
+	@${INSTALL_DATA} ${WRKSRC}/build/mm.mysql-${PORTVERSION}/mm.mysql-${PORTVERSION}-bin.jar \
+		${PREFIX}/share/java/classes/mm.mysql-${PORTVERSION}.jar
+	@${INSTALL_DATA} ${WRKSRC}/lib/jdbc2_0-stdext.jar \
+		${PREFIX}/share/java/classes/
+	@${INSTALL_DATA} ${WRKSRC}/lib/jta-spec1_0_1.jar \
+		${PREFIX}/share/java/classes/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/mysql-jdbc
 	@(cd ${WRKSRC}/doc && ${TAR} -c -f - .) \
 		| (cd ${PREFIX}/share/doc/mysql-jdbc && ${TAR} --unlink -x -f -)
+.endif
+
+post-install:
+	@${ECHO} share/java/classes/mm.mysql-${PORTVERSION}.jar >> ${TMPPLIST}
+	@${ECHO} share/java/classes/jdbc2_0-stdext.jar >> ${TMPPLIST}
+	@${ECHO} share/java/classes/jta-spec1_0_1.jar >> ${TMPPLIST}
+.if !defined(NOPORTDOCS)
 	@(cd ${PREFIX} \
 		&& find share/doc/mysql-jdbc -type f -print >> ${TMPPLIST})
+	@${ECHO} "@dirrm share/doc/mysql-jdbc" >> ${TMPPLIST}
 .endif
+	@${ECHO} "@unexec ${RMDIR} %D/share/java/classes 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO} "@unexec ${RMDIR} %D/share/java 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo
index 50d1fb7e58c4..a791ccefccb4 100644
--- a/databases/mysql-connector-java/distinfo
+++ b/databases/mysql-connector-java/distinfo
@@ -1 +1 @@
-MD5 (mm.mysql.jdbc-1.2c.tar.gz) = b04aa7f3048c2ebb169ee88ce19a6a4c
+MD5 (mm.mysql-2.0.14-you-must-unjar-me.jar) = 6c8a23dd49ca29d6d9d1de4808195d19
diff --git a/databases/mysql-connector-java/files/patch-Makefile b/databases/mysql-connector-java/files/patch-Makefile
deleted file mode 100644
index 6d64d84b104c..000000000000
--- a/databases/mysql-connector-java/files/patch-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	Sun May 27 12:10:22 2001
-+++ Makefile	Sun May 27 12:16:18 2001
-@@ -3,14 +3,16 @@
- # $Id: Makefile,v 1.2 1998/08/25 04:02:25 mmatthew Exp $
- #
- 
--JAVAC = /usr/local/jdk118/bin/javac
-+JAVA_HOME = /usr/local/jdk1.1.8
-+JAVAC = JAVA_HOME=$(JAVA_HOME) CLASSPATH= $(JAVA_HOME)/bin/javac
-+JAR = JAVA_HOME=$(JAVA_HOME) CLASSPATH= $(JAVA_HOME)/bin/jar
- JAVAC_FLAGS =-O -g 
- 
- all:
- 	$(JAVAC) $(JAVAC_FLAGS) org/gjt/mm/mysql/*.java
- 
- jar: all
--	jar -cv0f mysql_uncomp.jar org/gjt/mm/mysql/*.class; jar -cvf mysql_comp.jar org/gjt/mm/mysql/*.class
-+	$(JAR) -cv0f mysql_uncomp.jar org/gjt/mm/mysql/*.class; $(JAR) -cvf mysql_comp.jar org/gjt/mm/mysql/*.class
- 
- clean:
- 	rm -f org/gjt/mm/mysql/*.class org/gjt/mm/mysql/*~
diff --git a/databases/mysql-connector-java/pkg-plist b/databases/mysql-connector-java/pkg-plist
index 588e250f4f52..8b137891791f 100644
--- a/databases/mysql-connector-java/pkg-plist
+++ b/databases/mysql-connector-java/pkg-plist
@@ -1 +1 @@
-share/java/classes/mysql_comp.jar
+