1 files changed, 58 insertions, 59 deletions

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 <dglo@ssec.wisc.edu>
+# New ports collection makefile for:	mysql-connector-java
+# Date created:		8 October 2003
+# Whom:			Matthew Seaman <m.seaman@infracaninophile.co.uk>
 #
 # $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 <bsd.port.pre.mk>
 
-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 <bsd.port.mk>
+.include <bsd.port.post.mk>