Re: pkg/29038

[Antoine Reilles <Antoine.Reilles%loria.fr@localhost>]

The following reply was made to PR pkg/29038; it has been noted by GNATS.

From: Antoine Reilles <Antoine.Reilles%loria.fr@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: jwise%netbsd.org@localhost, reed%netbsd.org@localhost
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--