NetBSD Problem Report #29038

From tonio@arcelot.loria.fr  Fri Jan 21 18:32:43 2005
Return-Path: <tonio@arcelot.loria.fr>
Received: from arcelot.loria.fr (unknown [152.81.9.88])
	by narn.netbsd.org (Postfix) with ESMTP id E3DAC63B400
	for <gnats-bugs@gnats.NetBSD.org>; Fri, 21 Jan 2005 18:32:42 +0000 (UTC)
Message-Id: <200501211831.j0LIVVGY000616@arcelot.loria.fr>
Date: Fri, 21 Jan 2005 19:31:31 +0100 (CET)
From: reilles@loria.fr
Reply-To: reilles@loria.fr
To: gnats-bugs@netbsd.org
Cc: jwise@NetBSD.org
Subject: update for apache-ant
X-Send-Pr-Version: 3.95

>Number:         29038
>Category:       pkg
>Synopsis:       update for apache-ant, allowing the use of ant plugins
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jwise
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 21 18:33:00 +0000 2005
>Closed-Date:    Wed May 25 13:07:50 +0000 2005
>Last-Modified:  Sun Sep 04 08:53:01 +0000 2005
>Originator:     Antoine Reilles
>Release:        NetBSD 2.99.14 20/01/05
>Organization:

>Environment:


System: NetBSD arcelot.loria.fr 2.99.14 NetBSD 2.99.14 (MYKERNEL) #1: Fri Jan 21 15:39:59 CET 2005 tonio@arcelot.loria.fr:/usr/src/sys/arch/i386/compile/MYKERNEL i386
Architecture: i386
Machine: i386
>Description:
	An update proposition for apache-ant.
	The version 1.6.2 of ant is shipped with a lot of additional tasks, allowing
	to use additional tools like antlr, junit, and so on from ant builds.

	This is possible because "wrappers" are provided, in the form of jar files.
	This update adds to the install all these wrappers (it does not add a
	dependancy, since the wrapper makes it fully dynamic). Also, i reworked the
	files/ant script to use the launcher facility offered by ant 1.6.2. This allows
	the user to use his own ant tasks if needed.

	This is needed to build complex software with ant, using antlr, junit and
	some custom tasks.

>How-To-Repeat:
	Patch devel/apache-ant with http://www.loria.fr/~reilles/divers/ant.diff
>Fix:

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->jwise
Responsible-Changed-By: reed@netbsd.org
Responsible-Changed-When: Fri, 21 Jan 2005 18:38:09 +0000
Responsible-Changed-Why:
Assigned to maintainer.


From: Antoine Reilles <Antoine.Reilles@loria.fr>
To: gnats-bugs@netbsd.org
Cc: jwise@netbsd.org, reed@netbsd.org
Subject: Re: pkg/29038
Date: Wed, 23 Mar 2005 11:49:20 +0100

 --fdj2RfSjLxBAspz7
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline

 Hi,

 I have updated my change proposition for apache-ant, to make it behave properly
 with pkg_alternatives for java

 Thanks,
 antoine

 --fdj2RfSjLxBAspz7
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="ant.diff"

 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/apache-ant/Makefile,v
 retrieving revision 1.14
 diff -r1.14 Makefile
 8a9
 > PKGREVISION=1
 41c42,44
 < 	${INSTALL_DATA} ${WRKSRC}/lib/ant-nodeps.jar ${PREFIX}/lib/java/ant
 ---
 > 	${INSTALL_DATA} ${WRKSRC}/lib/ant-*.jar ${PREFIX}/lib/java/ant
 > 	${INSTALL_DATA} ${WRKSRC}/lib/xercesImpl.jar ${PREFIX}/lib/java/ant
 > 	${INSTALL_DATA} ${WRKSRC}/lib/xml-apis.jar ${PREFIX}/lib/java/ant
 Index: PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/apache-ant/PLIST,v
 retrieving revision 1.5
 diff -r1.5 PLIST
 4d3
 < lib/java/ant/ant-nodeps.jar
 5a5,33
 > lib/java/ant/ant-antlr.jar
 > lib/java/ant/ant-apache-bcel.jar
 > lib/java/ant/ant-apache-bsf.jar
 > lib/java/ant/ant-apache-log4j.jar
 > lib/java/ant/ant-apache-oro.jar
 > lib/java/ant/ant-apache-regexp.jar
 > lib/java/ant/ant-apache-resolver.jar
 > lib/java/ant/ant-commons-logging.jar
 > lib/java/ant/ant-commons-net.jar
 > lib/java/ant/ant-icontract.jar
 > lib/java/ant/ant-jai.jar
 > lib/java/ant/ant-javamail.jar
 > lib/java/ant/ant-jdepend.jar
 > lib/java/ant/ant-jmf.jar
 > lib/java/ant/ant-jsch.jar
 > lib/java/ant/ant-junit.jar
 > lib/java/ant/ant-launcher.jar
 > lib/java/ant/ant-netrexx.jar
 > lib/java/ant/ant-nodeps.jar
 > lib/java/ant/ant-starteam.jar
 > lib/java/ant/ant-stylebook.jar
 > lib/java/ant/ant-swing.jar
 > lib/java/ant/ant-trax.jar
 > lib/java/ant/ant-vaj.jar
 > lib/java/ant/ant-weblogic.jar
 > lib/java/ant/ant-xalan1.jar
 > lib/java/ant/ant-xslp.jar
 > lib/java/ant/xercesImpl.jar
 > lib/java/ant/xml-apis.jar
 Index: files/ant
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/apache-ant/files/ant,v
 retrieving revision 1.3
 diff -r1.3 ant
 12,20c12,19
 < if [ "$JAVA_HOME" != "" ] ; then
 <   if [ "$JAVACMD" = "" ] ; then 
 <     JAVACMD=$JAVA_HOME/bin/java
 <   fi
 < else
 <   JAVA_HOME=@JAVA_HOME@
 <   if [ "$JAVACMD" = "" ] ; then 
 <     JAVACMD=$JAVA_HOME/bin/java
 <   fi
 ---
 > if [ "$ANT_LIB" = "" ] ; then
 >   # try to find ANT_LIB
 >   ANT_LIB=${ANT_HOME}/lib/java/ant
 > fi
 > 
 > # use ${PREFIX}/bin/java (wrapper)
 > if [ "$JAVACMD" = "" ] ; then 
 >   JAVACMD=@PREFIX@/bin/java
 24c23
 < DIRLIBS="${ANT_HOME}/lib/java/ant/ant.jar ${ANT_HOME}/lib/java/ant/ant-nodeps.jar ${ANT_HOME}/lib/java/crimson.jar"
 ---
 > DIRLIBS="${ANT_HOME}/lib/java/ant/ant-launcher.jar"
 27,31c26
 <     # if the directory is empty, then it will return the input string
 <     # this is stupid, so case for it
 <     if [ "$i" != "${DIRLIBS}" ] ; then
 <         LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
 <     fi
 ---
 >   LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
 47,50c42,49
 <   echo "Warning: JAVA_HOME environment variable is not set."
 <   echo "  If build fails because sun.* classes could not be found"
 <   echo "  you will need to set the JAVA_HOME environment variable"
 <   echo "  to the installation directory of java."
 ---
 >   JAVA_HOME=@JAVA_HOME@
 >   if test -f $JAVA_HOME/lib/tools.jar ; then
 >     LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
 >   fi
 > 
 >   if test -f $JAVA_HOME/lib/classes.zip ; then
 >     LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
 >   fi
 62c61
 < exec $JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main "$@"
 ---
 > exec $JAVACMD $ANT_OPTS -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Dant.library.dir="${ANT_LIB}" org.apache.tools.ant.launch.Launcher "$@" -lib "${CLASSPATH}"

 --fdj2RfSjLxBAspz7--

From: Antoine Reilles <Antoine.Reilles@loria.fr>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/29038
Date: Sat, 9 Apr 2005 19:09:37 +0200

 Hi,

 I just noticed that the latest patch i sent was done without the -u flag for
 diff.
 Here an updated patch, with some cleanup.


 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/apache-ant/Makefile,v
 retrieving revision 1.14
 diff -u -r1.14 Makefile
 --- Makefile	13 Nov 2004 21:28:28 -0000	1.14
 +++ Makefile	9 Apr 2005 16:37:56 -0000
 @@ -6,6 +6,7 @@
  # up this version by mistake.

  DISTNAME=	apache-ant-1.6.2
 +PKGREVISION=1
  CATEGORIES=	devel java
  MASTER_SITES=	${MASTER_SITE_APACHE:=ant/binaries/}
  EXTRACT_SUFX=	.tar.bz2
 @@ -38,7 +39,9 @@
  	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
  	${INSTALL_DATA_DIR} ${PREFIX}/lib/java/ant
  	${INSTALL_DATA} ${WRKSRC}/lib/ant.jar ${PREFIX}/lib/java/ant
 -	${INSTALL_DATA} ${WRKSRC}/lib/ant-nodeps.jar ${PREFIX}/lib/java/ant
 +	${INSTALL_DATA} ${WRKSRC}/lib/ant-*.jar ${PREFIX}/lib/java/ant
 +	${INSTALL_DATA} ${WRKSRC}/lib/xercesImpl.jar ${PREFIX}/lib/java/ant
 +	${INSTALL_DATA} ${WRKSRC}/lib/xml-apis.jar ${PREFIX}/lib/java/ant
  	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant
  	cd ${WRKSRC}/docs && ${PAX} -rw -pmp * ${PREFIX}/share/doc/java/ant
  	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant
 Index: PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/apache-ant/PLIST,v
 retrieving revision 1.5
 diff -u -r1.5 PLIST
 --- PLIST	4 Aug 2004 08:49:09 -0000	1.5
 +++ PLIST	9 Apr 2005 16:37:57 -0000
 @@ -1,8 +1,36 @@
  @comment $NetBSD: PLIST,v 1.5 2004/08/04 08:49:09 recht Exp $
  bin/ant
  bin/antRun
 -lib/java/ant/ant-nodeps.jar
  lib/java/ant/ant.jar
 +lib/java/ant/ant-antlr.jar
 +lib/java/ant/ant-apache-bcel.jar
 +lib/java/ant/ant-apache-bsf.jar
 +lib/java/ant/ant-apache-log4j.jar
 +lib/java/ant/ant-apache-oro.jar
 +lib/java/ant/ant-apache-regexp.jar
 +lib/java/ant/ant-apache-resolver.jar
 +lib/java/ant/ant-commons-logging.jar
 +lib/java/ant/ant-commons-net.jar
 +lib/java/ant/ant-icontract.jar
 +lib/java/ant/ant-jai.jar
 +lib/java/ant/ant-javamail.jar
 +lib/java/ant/ant-jdepend.jar
 +lib/java/ant/ant-jmf.jar
 +lib/java/ant/ant-jsch.jar
 +lib/java/ant/ant-junit.jar
 +lib/java/ant/ant-launcher.jar
 +lib/java/ant/ant-netrexx.jar
 +lib/java/ant/ant-nodeps.jar
 +lib/java/ant/ant-starteam.jar
 +lib/java/ant/ant-stylebook.jar
 +lib/java/ant/ant-swing.jar
 +lib/java/ant/ant-trax.jar
 +lib/java/ant/ant-vaj.jar
 +lib/java/ant/ant-weblogic.jar
 +lib/java/ant/ant-xalan1.jar
 +lib/java/ant/ant-xslp.jar
 +lib/java/ant/xercesImpl.jar
 +lib/java/ant/xml-apis.jar
  share/doc/java/ant/LICENSE
  share/doc/java/ant/README
  share/doc/java/ant/WHATSNEW
 Index: files/ant
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/apache-ant/files/ant,v
 retrieving revision 1.3
 diff -u -r1.3 ant
 --- files/ant	1 Apr 2004 14:35:17 -0000	1.3
 +++ files/ant	9 Apr 2005 16:37:57 -0000
 @@ -9,26 +9,21 @@
    ANT_HOME=@PREFIX@
  fi

 -if [ "$JAVA_HOME" != "" ] ; then
 -  if [ "$JAVACMD" = "" ] ; then 
 -    JAVACMD=$JAVA_HOME/bin/java
 -  fi
 -else
 -  JAVA_HOME=@JAVA_HOME@
 -  if [ "$JAVACMD" = "" ] ; then 
 -    JAVACMD=$JAVA_HOME/bin/java
 -  fi
 +if [ "$ANT_LIB" = "" ] ; then
 +  # try to find ANT_LIB
 +  ANT_LIB=${ANT_HOME}/lib/java/ant
 +fi
 +
 +# use ${PREFIX}/bin/java (wrapper)
 +if [ "$JAVACMD" = "" ] ; then 
 +  JAVACMD=@PREFIX@/bin/java
  fi

  # add in the dependency .jar files
 -DIRLIBS="${ANT_HOME}/lib/java/ant/ant.jar ${ANT_HOME}/lib/java/ant/ant-nodeps.jar ${ANT_HOME}/lib/java/crimson.jar"
 +DIRLIBS="${ANT_HOME}/lib/java/ant/ant-launcher.jar"
  for i in ${DIRLIBS}
  do
 -    # if the directory is empty, then it will return the input string
 -    # this is stupid, so case for it
 -    if [ "$i" != "${DIRLIBS}" ] ; then
 -        LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
 -    fi
 +  LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
  done

  if [ "$CLASSPATH" != "" ] ; then
 @@ -44,10 +39,14 @@
      LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
    fi
  else
 -  echo "Warning: JAVA_HOME environment variable is not set."
 -  echo "  If build fails because sun.* classes could not be found"
 -  echo "  you will need to set the JAVA_HOME environment variable"
 -  echo "  to the installation directory of java."
 +  JAVA_HOME=@JAVA_HOME@
 +  if test -f $JAVA_HOME/lib/tools.jar ; then
 +    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
 +  fi
 +
 +  if test -f $JAVA_HOME/lib/classes.zip ; then
 +    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
 +  fi
  fi

  # supply JIKESPATH to Ant as jikes.class.path
 @@ -59,4 +58,4 @@
    fi
  fi

 -exec $JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main "$@"
 +exec $JAVACMD $ANT_OPTS -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Dant.library.dir="${ANT_LIB}" org.apache.tools.ant.launch.Launcher "$@" -lib "${CLASSPATH}"

State-Changed-From-To: open->closed
State-Changed-By: wiz@netbsd.org
State-Changed-When: Wed, 25 May 2005 13:07:50 +0000
State-Changed-Why:
Superseded by 30332.


From: Antoine Reilles <tonio@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: PR/29038 CVS commit: pkgsrc/devel/apache-ant
Date: Sat,  3 Sep 2005 22:59:25 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	tonio
 Date:		Sat Sep  3 22:59:25 UTC 2005

 Modified Files:
 	pkgsrc/devel/apache-ant: Makefile PLIST distinfo
 Added Files:
 	pkgsrc/devel/apache-ant/patches: patch-aa

 Log Message:
 Update apache-ant to 1.6.5
 Remove the files/ant script, by patching the bin/ant script, as ant people
 worked on it.
 I'm taking maintainership for this one

 Fix PR 29038 and PR 29338, apache-ant now can use plugins
 Fix PR 30332 (update to 1.6.5)

 Approved by jwise@


 To generate a diff of this commit:
 cvs rdiff -r1.17 -r1.18 pkgsrc/devel/apache-ant/Makefile
 cvs rdiff -r1.5 -r1.6 pkgsrc/devel/apache-ant/PLIST
 cvs rdiff -r1.6 -r1.7 pkgsrc/devel/apache-ant/distinfo
 cvs rdiff -r0 -r1.1 pkgsrc/devel/apache-ant/patches/patch-aa

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.