Date: Fri, 6 Aug 2004 17:48:43 +0100 (BST) From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: glewis@FreeBSD.org Subject: ports/70084: [Maintainer update] databases/mysql-connector-java tracking changes to bsd.java.mk Message-ID: <200408061648.i76GmhLZ090769@happy-idiot-talk.infracaninophile.co.uk> Resent-Message-ID: <200408061650.i76GoIVF021072@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70084
>Category: ports
>Synopsis: [Maintainer update] databases/mysql-connector-java tracking changes to bsd.java.mk
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 06 16:50:17 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Matthew Seaman
>Release: FreeBSD 4.10-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 4.10-STABLE FreeBSD 4.10-STABLE #80: Fri Aug 6 15:03:46 BST 2004 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386
>Description:
version 1.51 of bsd.java.mk now contains a USE_ANT target -- see PR
ports/59997
Update this port to use the new capability.
>How-To-Repeat:
>Fix:
--- mysql-connector-java.diff begins here ---
diff -Nur /usr/ports/databases/mysql-connector-java/Makefile mysql-connector-java/Makefile
--- /usr/ports/databases/mysql-connector-java/Makefile Sun May 30 23:13:54 2004
+++ mysql-connector-java/Makefile Fri Aug 6 17:39:05 2004
@@ -26,22 +26,17 @@
.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 @@
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
--- mysql-connector-java.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408061648.i76GmhLZ090769>