diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-08-06 18:34:36 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-08-06 18:34:36 +0000 |
| commit | 4a56e6e585736abab850cd01c8dd0155ab6ecaa7 (patch) | |
| tree | 3dda52cfac2702ccfe252b5c5163006c273fc183 /databases | |
| parent | 1e35b4cad7ba341891146001196b2a73abd40b3e (diff) | |
| download | ports-4a56e6e585736abab850cd01c8dd0155ab6ecaa7.tar.gz ports-4a56e6e585736abab850cd01c8dd0155ab6ecaa7.zip | |
Notes
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql-connector-java/Makefile | 22 | ||||
| -rw-r--r-- | databases/mysql-connector-java50/Makefile | 22 |
2 files changed, 18 insertions, 26 deletions
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile index 4bcfa365f97b..0da1358c72fa 100644 --- a/databases/mysql-connector-java/Makefile +++ b/databases/mysql-connector-java/Makefile @@ -26,22 +26,17 @@ COMMENT= MySQL Connector/J: JDBC interface for MySQL .if !defined(WITHOUT_COMPILE) -BUILD_DEPENDS= ${ANT_CMD}:${PORTSDIR}/devel/apache-ant \ - ${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit +BUILD_DEPENDS= ${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit USE_JAVA= yes +USE_ANT= yes JAVA_VERSION= 1.4+ -JAVA_BUILD= yes - -ANT_CMD?= ${LOCALBASE}/bin/ant -ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} -ANT_TARGET= clean compile-driver +ALL_TARGET= clean compile-driver BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME} .else USE_JAVA= yes JAVA_VERSION= 1.2+ -JAVA_RUN= yes BUILDDIR= ${WRKDIR}/${DISTNAME} .endif @@ -73,13 +68,14 @@ pre-fetch: do-build: .if !defined(WITHOUT_COMPILE) - @cd ${WRKSRC} && ${ANT} ${ANT_TARGET} + @(cd ${BUILD_WRKSRC}; \ + ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET}) .endif .if !defined(NOPORTDOCS) - @${MKDIR} ${BUILDDIR}/doc && cd ${WRKSRC} && \ - ${JAVADOC} -d ${BUILDDIR}/doc -package \ - -classpath ${JDCLASSPATH} \ - com.mysql.jdbc org.gjt.mm.mysql + @${MKDIR} ${BUILDDIR}/doc && (cd ${BUILD_WRKSRC}; \ + ${JAVADOC} -d ${BUILDDIR}/doc -package \ + -classpath ${JDCLASSPATH} \ + com.mysql.jdbc org.gjt.mm.mysql) .endif do-install: do-install-jar do-install-apidocs diff --git a/databases/mysql-connector-java50/Makefile b/databases/mysql-connector-java50/Makefile index 4bcfa365f97b..0da1358c72fa 100644 --- a/databases/mysql-connector-java50/Makefile +++ b/databases/mysql-connector-java50/Makefile @@ -26,22 +26,17 @@ COMMENT= MySQL Connector/J: JDBC interface for MySQL .if !defined(WITHOUT_COMPILE) -BUILD_DEPENDS= ${ANT_CMD}:${PORTSDIR}/devel/apache-ant \ - ${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit +BUILD_DEPENDS= ${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit USE_JAVA= yes +USE_ANT= yes JAVA_VERSION= 1.4+ -JAVA_BUILD= yes - -ANT_CMD?= ${LOCALBASE}/bin/ant -ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} -ANT_TARGET= clean compile-driver +ALL_TARGET= clean compile-driver BUILDDIR= ${WRKDIR}/build-mysql-jdbc/${DISTNAME} .else USE_JAVA= yes JAVA_VERSION= 1.2+ -JAVA_RUN= yes BUILDDIR= ${WRKDIR}/${DISTNAME} .endif @@ -73,13 +68,14 @@ pre-fetch: do-build: .if !defined(WITHOUT_COMPILE) - @cd ${WRKSRC} && ${ANT} ${ANT_TARGET} + @(cd ${BUILD_WRKSRC}; \ + ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET}) .endif .if !defined(NOPORTDOCS) - @${MKDIR} ${BUILDDIR}/doc && cd ${WRKSRC} && \ - ${JAVADOC} -d ${BUILDDIR}/doc -package \ - -classpath ${JDCLASSPATH} \ - com.mysql.jdbc org.gjt.mm.mysql + @${MKDIR} ${BUILDDIR}/doc && (cd ${BUILD_WRKSRC}; \ + ${JAVADOC} -d ${BUILDDIR}/doc -package \ + -classpath ${JDCLASSPATH} \ + com.mysql.jdbc org.gjt.mm.mysql) .endif do-install: do-install-jar do-install-apidocs |