diff options
Diffstat (limited to 'databases/mysql-connector-java/Makefile')
| -rw-r--r-- | databases/mysql-connector-java/Makefile | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile index d4e57b8a240e..1a54f3041861 100644 --- a/databases/mysql-connector-java/Makefile +++ b/databases/mysql-connector-java/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mysql-connector-java -PORTVERSION= 3.1.6 +PORTVERSION= 3.1.7 CATEGORIES= databases java MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= Connector-J @@ -14,17 +14,18 @@ MASTER_SITE_SUBDIR= Connector-J MAINTAINER= m.seaman@infracaninophile.co.uk COMMENT= MySQL Connector/J: JDBC interface for MySQL -RUN_DEPENDS= ${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/devel/log4j +RUN_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j .if !defined(WITHOUT_COMPILE) -BUILD_DEPENDS= ${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit \ - ${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/devel/log4j +BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ + ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j USE_JAVA= yes USE_ANT= yes JAVA_VERSION= 1.4+ ALL_TARGET= clean compile-driver +MAKE_ARGS= -Djavajardir=${JAVAJARDIR} BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME} .else @@ -42,9 +43,9 @@ EXTRADOCS= README CHANGES JARFILE= ${DISTNAME}-bin.jar JDCLASSPATH= ${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH} -PLIST_FILES= share/java/classes/jdbc2_0-stdext.jar \ - share/java/classes/jta-spec1_0_1.jar \ - share/java/classes/mysql-connector-java.jar +PLIST_FILES= %%JAVAJARDIR%%/jdbc2_0-stdext.jar \ + %%JAVAJARDIR%%/jta-spec1_0_1.jar \ + %%JAVAJARDIR%%/mysql-connector-java.jar .if !defined(NOPORTDOCS) PORTDOCS= * @@ -75,23 +76,23 @@ do-build: do-install: do-install-jar do-install-apidocs do-install-jar: - @${ECHO_CMD} -n ">> Installing .jar files..." + @${ECHO_MSG} -n ">> Installing .jar files..." @${MKDIR} ${JAVAJARDIR} @${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} @for extrajar in ${EXTRAJARS} ; do \ ${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/$$extrajar ${JAVAJARDIR} ; \ done - @${ECHO_CMD} " [ DONE ]" + @${ECHO_MSG} " [ DONE ]" do-install-apidocs: .if !defined(NOPORTDOCS) - @${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..." + @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${APIDOCSDIR} @${CP} -r ${BUILDDIR}/doc/* ${APIDOCSDIR} @for extradoc in ${EXTRADOCS} ; do \ ${INSTALL_DATA} ${BUILDDIR}/$$extradoc ${DOCSDIR} ; \ done - @${ECHO_CMD} " [ DONE ]" + @${ECHO_MSG} " [ DONE ]" .endif .include <bsd.port.mk> |