diff -Nur /usr/ports/databases/mysql-connector-java/Makefile mysql-connector-java/Makefile --- /usr/ports/databases/mysql-connector-java/Makefile 2008-10-25 08:33:38.000000000 +0100 +++ mysql-connector-java/Makefile 2009-05-21 07:39:35.000000000 +0100 @@ -14,6 +14,8 @@ MAINTAINER= m.seaman@infracaninophile.co.uk COMMENT= MySQL Connector/J: JDBC interface for MySQL +CONFLICTS= mysql-connector-java*-5.0.* + RUN_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j USE_JAVA= yes @@ -30,7 +32,7 @@ PLIST_FILES= %%JAVAJARDIR%%/jdbc2_0-stdext.jar \ %%JAVAJARDIR%%/jta-spec1_0_1.jar \ - %%JAVAJARDIR%%/mysql-connector-java.jar + %%JAVAJARDIR%%/${DESTJARFILE} .if !defined(NOPORTDOCS) PORTDOCS= *