From owner-freebsd-java@FreeBSD.ORG Thu Jan 29 22:32:14 2009 Return-Path: Delivered-To: java@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B2E310656E1 for ; Thu, 29 Jan 2009 22:32:14 +0000 (UTC) (envelope-from hq@freebsd.org) Received: from 30.mail-out.ovh.net (30.mail-out.ovh.net [213.186.62.213]) by mx1.freebsd.org (Postfix) with SMTP id BD9E68FC21 for ; Thu, 29 Jan 2009 22:32:13 +0000 (UTC) (envelope-from hq@freebsd.org) Received: (qmail 29517 invoked by uid 503); 29 Jan 2009 22:32:34 -0000 Received: from gw2.ovh.net (HELO mail98.ha.ovh.net) (213.251.189.202) by 30.mail-out.ovh.net with SMTP; 29 Jan 2009 22:32:34 -0000 Received: from b0.ovh.net (HELO queue-out) (213.186.33.50) by b0.ovh.net with SMTP; 29 Jan 2009 22:32:12 -0000 Received: from amarseille-256-1-103-20.w90-10.abo.wanadoo.fr (HELO ?192.168.1.15?) (herve.quiroz@trancecode.org@90.10.226.20) by ns0.ovh.net with SMTP; 29 Jan 2009 22:32:11 -0000 Message-ID: <49822E6A.7020807@FreeBSD.org> Date: Thu, 29 Jan 2009 23:32:10 +0100 From: Herve Quiroz User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: andy.lavr@gmail.com References: <49749D98.4080402@reactor-xg.kiev.ua> <49779F59.6050209@FreeBSD.org> <49784E41.7070006@reactor-xg.kiev.ua> <4978A11A.1040408@FreeBSD.org> <49822AE8.9020608@FreeBSD.org> In-Reply-To: <49822AE8.9020608@FreeBSD.org> Content-Type: multipart/mixed; boundary="------------030008090006000906090105" X-Ovh-Tracer-Id: 3344767149453322759 X-Ovh-Remote: 90.10.226.20 (amarseille-256-1-103-20.w90-10.abo.wanadoo.fr) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|H 0.5/N Cc: java@FreeBSD.org Subject: Re: New patch ant.sh.in for FreeBSD ports devel/apache-ant X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jan 2009 22:32:16 -0000 This is a multi-part message in MIME format. --------------030008090006000906090105 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Herve Quiroz wrote: > I believe this patch enforces the expected behavior of the mainstream > ant(1) script. Oops, forgot to bump PORTREVISION. --------------030008090006000906090105 Content-Type: text/x-patch; name="apache-ant.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="apache-ant.diff" ? work Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/apache-ant/Makefile,v retrieving revision 1.48 diff -u -r1.48 Makefile --- Makefile 6 Jun 2008 13:20:59 -0000 1.48 +++ Makefile 29 Jan 2009 22:18:33 -0000 @@ -7,7 +7,7 @@ PORTNAME= apache-ant PORTVERSION= 1.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \ ${MASTER_SITE_LOCAL:S,%SUBDIR%/,hq/:man,} \ Index: files/ant.sh.in =================================================================== RCS file: /home/pcvs/ports/devel/apache-ant/files/ant.sh.in,v retrieving revision 1.6 diff -u -r1.6 ant.sh.in --- files/ant.sh.in 6 Sep 2006 21:52:18 -0000 1.6 +++ files/ant.sh.in 29 Jan 2009 22:18:33 -0000 @@ -79,4 +79,4 @@ exit 1 fi -exec "${JAVACMD}" ${ANT_OPTS} -classpath "${LOCALCLASSPATH}" -Dant.home="${DATADIR}" org.apache.tools.ant.launch.Launcher ${ANT_ARGS} -lib "${CLASSPATH}" "$@" +exec "${JAVACMD}" ${ANT_OPTS} -classpath "${LOCALCLASSPATH}" -Dant.home="${DATADIR}" -Dant.library.dir="${ANT_LIB}" org.apache.tools.ant.launch.Launcher ${ANT_ARGS} "$@" --------------030008090006000906090105--