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: 
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}"