From owner-freebsd-java@FreeBSD.ORG Thu Jan 29 22:17:17 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 408351065720 for ; Thu, 29 Jan 2009 22:17:17 +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 A11308FC1F for ; Thu, 29 Jan 2009 22:17:16 +0000 (UTC) (envelope-from hq@freebsd.org) Received: (qmail 14782 invoked by uid 503); 29 Jan 2009 22:17:36 -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:17:36 -0000 Received: from b0.ovh.net (HELO queue-out) (213.186.33.50) by b0.ovh.net with SMTP; 29 Jan 2009 22:17:15 -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:17:13 -0000 Message-ID: <49822AE8.9020608@FreeBSD.org> Date: Thu, 29 Jan 2009 23:17:12 +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> In-Reply-To: <4978A11A.1040408@FreeBSD.org> Content-Type: multipart/mixed; boundary="------------090301070208070409040305" X-Ovh-Tracer-Id: 3092002621272074759 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:17:18 -0000 This is a multi-part message in MIME format. --------------090301070208070409040305 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit Herve Quiroz wrote: > I'll probably find some time to test those ports tonight. Okay, so it took me a bit more time than expected but I did run some tests and it seems nothing breaks from a ports build perspective with the attached patch applied. I believe this patch enforces the expected behavior of the mainstream ant(1) script. Any thoughts before I commit this patch? I'll fix the depending ports (or send PRs) when we're done with devel/apache-ant. Herve --------------090301070208070409040305 Content-Type: text/x-patch; name="apache-ant.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="apache-ant.diff" ? work 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:13:37 -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} "$@" --------------090301070208070409040305--