From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 6 16:50:18 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 648E616A4CF for ; Fri, 6 Aug 2004 16:50:18 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4634243D55 for ; Fri, 6 Aug 2004 16:50:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i76GoIC6021073 for ; Fri, 6 Aug 2004 16:50:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i76GoIVF021072; Fri, 6 Aug 2004 16:50:18 GMT (envelope-from gnats) Resent-Date: Fri, 6 Aug 2004 16:50:18 GMT Resent-Message-Id: <200408061650.i76GoIVF021072@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthew Seaman Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03CD116A4CE; Fri, 6 Aug 2004 16:48:51 +0000 (GMT) Received: from smtp.infracaninophile.co.uk (smtp.infracaninophile.co.uk [81.2.69.218]) by mx1.FreeBSD.org (Postfix) with ESMTP id B27B743D2D; Fri, 6 Aug 2004 16:48:49 +0000 (GMT) (envelope-from m.seaman@infracaninophile.co.uk) Received: from happy-idiot-talk.infracaninophile.co.uk (localhost.infracaninophile.co.uk [IPv6:::1])i76Gmi4l090770 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 6 Aug 2004 17:48:44 +0100 (BST) (envelope-from matthew@happy-idiot-talk.infracaninophile.co.uk) Received: (from matthew@localhost)id i76GmhLZ090769; Fri, 6 Aug 2004 17:48:43 +0100 (BST) (envelope-from matthew) Message-Id: <200408061648.i76GmhLZ090769@happy-idiot-talk.infracaninophile.co.uk> Date: Fri, 6 Aug 2004 17:48:43 +0100 (BST) From: Matthew Seaman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: glewis@FreeBSD.org Subject: ports/70084: [Maintainer update] databases/mysql-connector-java tracking changes to bsd.java.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Matthew Seaman List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 16:50:18 -0000 >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: