Update jakarta-ant to version 1.3. Note that jakarta-ant has a new version

numbering scheme now -- 1.3 is three minor revs _newer_ than the previous
version 3.1.  Go figure.  This is less of a mess than it could be because
no pkgs currently depend on jakarta-ant.  Nonetheless, packages should not
depend on jakarta-ant using >=, lest they pick up the old version.

This ant package currently installs the versions of JAXP's two jar files
which are distributed with ant.  This will change (and ant will bump to
version 1.3nb1) when there is a separate jaxp package.

Changes from version 1.0 (which was derived from the old 3.1) to version
1.3:

Changes from Ant 1.2 to Ant 1.3 Beta 3
===========================================

Changes that could break older environments:
--------------------------------------------

* Ant doesn't search for the buildfile anymore, unless you use the new
  -find argument.

* <perforce> has been replaced by a number of new tasks.

* <javac> is now implemented using a factory. This makes extending
  javac to use a new compiler a lot easier but may break custom
  versions of this task that rely on the old implementation.

* The output generated by the xml formatter for <junit> has changed a
  little, it doesn't append " sec" in the time attribute anymore.

Other changes:
--------------

* A GUI Frontend: Antidote. This is currently in development. At this
  time, this is not part of the Ant release, although the source is
  included if you are interested.

* New tasks: stylebook, propertyfile, depend, antlr, telnet, csc,
  ilasm, apply, javah, several clearcase tasks, junitreport, sound

* Added output attribute to <java>.

* Added nested zipfileset element to <zip>

* Changed <sql> so that printing is at the task level rather than
  the statement level.

* javadoc task will pass -d flag to any doclet if the destDir attribute is
  given. If the doclet does not accept the -d flag then omit the destdir
  attribute.

* <cab> can work on non-Windows platforms with the help of libcabinet.
  See http://trill.cis.fordham.edu/~barbacha/cabinet_library/.

* <ftp> now supports passive mode.

* New <mapper> data type that can be used to get influence on the
  target files for some tasks like <copy> or enable new types of tasks
  like <apply>.

* <execon> provides more control over the command line now, the names
  of the source files are no longer required to be at the end of the
  command.

* Style tasks will now support TraX compliant XSL processors if one is present
  in your classpath.

* Added a failonerror to the javac task. If set to false, the build will
  continue even if there are compilation errors.

* Added nested format elements to the tstamp task allowing additional time
  formats to be defined for arbitrary properties.

* Added classpath attribute and nested classpath element to <property>
  to make the resource attribute more powerful.

* ${} property expansion will now be performed on the patterns read
  from files specified as includesfile or excludesfile attributes.

* The <tar> and <untar> tasks now support GNU format for handling paths
  which are greater than 100 characters in length. In addition the <tar>
  task now supports nested filesets through which the file permissions
  may be controlled.

* wlrun, wlstop and ejbjar now support Weblogic 6.0

* The MPasre task has been updated to work with MParse 2.0

* The documentation has been significantly updated.


Fixed bugs:
-----------

* <signjar> doesn't use deprectated methods anymore.

* javadoc's failonerror attribute works again

* javadoc's additionalparam attribute will now be split into separate
  parameters (on spaces) to allow for more than one parameter.

* Changed <sql> task so that printing result sets works on Oracle

* Changes to ddcreator and ejbc helper to respect the descriptor hierarchy
  keppgenerated in ejbc can now be turned off

* ejbjar now correctly ignores <ejb-ref> elements in the deployment descriptor.
  CMP files are included by parsing the weblogic deployment descriptor rather
  than relying on the naming convention used in ant 1.2

* ejbjar includes super classes and super interfaces into the generated ejb
  jar files. The <support> nested element allows support classes to be
  included in the EJB jar. The toplink element should now correctly locate
  the toplink descriptor.

* <vssget> now correctly deals with spaces in arguments

* <jar> fails early if a given manifest file doesn't exist

* <rmic> doesn't search for the _Skel file anymore when stubversion is
  set to 1.2.

* <rmic> uses the the same classpath to verify a class can be rmic'd
  as it passes to the compiler.

* org.apache.tools.mail.MailMessage (and therefore <mail>) can now
  handle SMTP servers sending multi line responses.

* nested <classpath> elements of <taskdef> now work for <taskdef>s not
  nested into <target> as well.

* <property> and <available> will search for the resource "foo" instead
  of "/org/apache/tools/ant/taskdefs/foo" when given a relative resource
  name foo.

* Handle build files in directories whose name contained a "#" character

* <junit> can now log to files whose name contains a comma as well.

* The AntClassLoader now refers to the loader which loaded it, any
  requests it does not handle itself. Previously these went to the
  primordial loader.

Changes from Ant 1.1 to Ant 1.2
===============================

Changes that could break older environments:
--------------------------------------------

* Semantics of <property> has changed again in the hope to be more
intuitive. ${} expansion now happens at runtime and <property> tags
living inside of targets only take effect if they are visited at
runtime.

As a side effect of this change, task's attributes get set at runtime
not at parser time as well, which might change the results of
<script>s or other custom tasks that reference other tasks by their id
attribute.

* copying of support files in <javac> has been removed - as well as
the filtering attribute.

* the <expand> and <keysubst> tasks have been removed.

* the ignore and items attributes of directory based tasks have been removed.

* the command line switches _not_ starting with - have been removed.

* Path and EnumeratedAttribute have been moved from
org.apache.tools.ant to org.apache.tools.ant.types.

* the class attributes of <available>, <java>, <rmic> and <taskdef>
have been removed.

* the src attribute of <chmod> has been removed.

* <patch> and <javadoc> have lost some of their attributes.

* <java> and <cvs> have lost some undocumented attributes.

* the Unix antRun script would search for command.sh in the directory
it changed to and invoke this instead of command if present. This
behavior has been dropped.

* <ejbjar> task syntax has been changed significantly

* <exec> is no longer implemented by org.apache.tool.ant.taskdefs.Exec.
Custom tasks that rely on Project.createTask("exec") to return an
instance of this class are going to fail.

* nested <include> and <exclude> elements expect the value of their
name attribute to be a single pattern, they don't accept multiple
patterns anymore. Split them into multiple elements of the same type.

* <delete dir="somedir" /> will now delete the directory itself as
well as all included files. If you just want to clean out the
directory and keep the empty one, use a nested fileset.

Other changes:
--------------

* New tasks: antstructure, cab, execon, fail, ftp, genkey, jlink,
junit, sql, javacc, jjtree, starteam, war, unwar, uptodate,
native2ascii, copy, move, mparse.

* copydir, copyfile, deltree and rename are now deprecated. They
should be replaced with the new copy, delete and move tasks.

* <java> uses a ClassLoader of its own in no-fork mode if a classpath is
specified.

* <style> will create the necessary target directories and reprocess
all files if the stylesheet changes.

* New data types fileset and patternset - expected to get a broader use.
They, as well as PATH like structures, can now be defined on a global
level and later be referenced by their id attribute.

* You can specify environment variables to <exec>.

* <get> can check whether a remote file is actually newer than a local
copy before it starts a download (HTTP only).

* Added a -logger option to allow the class which performs logging to be
specified on the command line.

* Added a -emacs option to tell the logger to leave out taskname adornments
on log output.

* <chmod> works on all files in parallel and supports multiple filesets.

* <replace> can now use tokens and/or values that cross line boundaries.

* build.compiler supports now jvc as well.

* project specific help can now be obtained with the -projecthelp option.

* Added a -debug option to make -verbose less verbose (and more useful)

* Ant will now search for a file named build.xml in the parent directory
and above (towards the root of the filesystem) if you didn't specify
-buildfile and there is no build.xml in the current directory.

* <echo> can now write to a file and accepts nested text.

Fixed bugs:
-----------

* <chmod> didn't work when used as a directory based task.

* Path, Available, Property didn't resolve relative filenames with
respect to the Project's basedir.

* Project didn't interpret the basedir attribute correctly in all
cases.

* Nested <src> in <javac> caused NullPointerException.

* Corrupt Zip- and Jar-files ar now deleted if the task fails.

* many more fixes we've forgotten to document here ...

7 files changed, 239 insertions, 79 deletions

diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile
index 206b6cf96ee..44f50adda58 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -1,35 +1,39 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/18 22:53:47 jwise Exp $
 
-DISTNAME=	jakarta-ant
-PKGNAME=	jakarta-ant-3.1
+DISTNAME=	${PKGNAME}-src
+PKGNAME=	jakarta-ant-1.3
 CATEGORIES=	devel
-MASTER_SITES=	http://jakarta.apache.org/builds/ant/release/v3.1/src/
+MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-ant/release/v1.3/src/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 COMMENT=	the Apache Project's Java-Based make(1) replacement
 
-DIST_SUBDIR=	jakarta-3.1
 USE_JAVA=	yes
 
-WRKSRC=		${WRKDIR}/jakarta-ant
+WRKSRC=		${WRKDIR}/${PKGNAME}
 
 do-build:
 	cd ${WRKSRC} && ${SH} bootstrap.sh
 
 post-build:
 	${SED} -e 's,@PREFIX@,${PREFIX},g' -e 's,@JAVA_HOME@,${JAVA_HOME},g' \
-		< ${WRKSRC}/bin/ant > ${WRKSRC}/bin/ant.tmp
-	${MV} ${WRKSRC}/bin/ant.tmp ${WRKSRC}/bin/ant
+		< ${FILESDIR}/ant > ${WRKDIR}/ant
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/ant ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/ant ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/antRun ${PREFIX}/bin
 	-${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-	${INSTALL_DATA} ${WRKSRC}/lib/xml.jar ${PREFIX}/lib/java
-	${INSTALL_DATA} ${WRKSRC}/lib/ant.jar ${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/lib/jaxp.jar ${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/lib/parser.jar ${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/build/lib/ant.jar ${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/build/lib/optional.jar ${PREFIX}/lib/java/ant-optional.jar
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant/manual
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant
-	${INSTALL_DATA} ${WRKSRC}/docs/index.html ${PREFIX}/share/doc/java/ant
+	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/java/ant
+	(cd ${WRKSRC}/docs/manual && ${GTAR} pcf - .) | \
+		(cd ${PREFIX}/share/doc/java/ant/manual && ${GTAR} pxvf -)
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/ant
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/jakarta-ant/files/ant b/devel/jakarta-ant/files/ant
new file mode 100644
index 00000000000..832d9c91aac
--- /dev/null
+++ b/devel/jakarta-ant/files/ant
@@ -0,0 +1,108 @@
+#! /bin/sh
+
+if [ -f $HOME/.antrc ] ; then 
+  . $HOME/.antrc
+fi
+
+# Cygwin support.  $cygwin _must_ be set to either true or false.
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  *) cygwin=false ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$ANT_HOME" ] &&
+    ANT_HOME=`cygpath --unix "$ANT_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+if [ "$ANT_HOME" = "" ] ; then
+  # try to find ANT
+  if [ -d /opt/ant ] ; then 
+    ANT_HOME=/usr/pkg
+  fi
+
+  if [ -d ${HOME}/opt/ant ] ; then 
+    ANT_HOME=${HOME}/ant
+  fi
+
+  ## resolve links - $0 may be a link to ant's home
+  PRG=$0
+  progname=`basename $0`
+  
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '.*/.*' > /dev/null; then
+	PRG="$link"
+    else
+	PRG="`dirname $PRG`/$link"
+    fi
+  done
+  
+  ANT_HOME=`dirname "$PRG"`/..
+
+fi
+
+if [ "$JAVA_HOME" != "" ] ; then
+  if [ "$JAVACMD" = "" ] ; then 
+    JAVACMD=$JAVA_HOME/bin/java
+  fi
+else
+  JAVA_HOME=/usr/pkg/java
+  if [ "$JAVACMD" = "" ] ; then 
+    JAVACMD=$JAVA_HOME/bin/java
+  fi
+fi
+ 
+# add in the dependency .jar files
+DIRLIBS=$${ANT_HOME}/lib/java/ant-optional.jar {ANT_HOME}/lib/java/parser.jar ${ANT_HOME}/lib/java/jaxp.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
+done
+
+if [ "$CLASSPATH" != "" ] ; then
+  LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH
+fi
+
+if [ "$JAVA_HOME" != "" ] ; then
+  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
+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."
+fi
+
+# supply JIKESPATH to Ant as jikes.class.path
+if [ "$JIKESPATH" != "" ] ; then
+  if [ "$ANT_OPTS" != "" ] ; then
+    ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
+  else
+    ANT_OPTS=-Djikes.class.path=$JIKESPATH
+  fi
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  ANT_HOME=`cygpath --path --windows "$ANT_HOME"`
+  JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+fi
+
+$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main "$@"
diff --git a/devel/jakarta-ant/files/antRun b/devel/jakarta-ant/files/antRun
new file mode 100644
index 00000000000..f0a18f16531
--- /dev/null
+++ b/devel/jakarta-ant/files/antRun
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+# Args: DIR command
+cd "$1"
+CMD="$2"
+shift
+shift
+
+exec $CMD "$@"
diff --git a/devel/jakarta-ant/files/md5 b/devel/jakarta-ant/files/md5
index f68eb898eea..3834d6cf82b 100644
--- a/devel/jakarta-ant/files/md5
+++ b/devel/jakarta-ant/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/07/03 03:50:11 jwise Exp $
+$NetBSD: md5,v 1.2 2001/03/18 22:53:48 jwise Exp $
 
-MD5 (jakarta-3.1/jakarta-ant.tar.gz) = f3c6f2df40562b36eed067a8b6580526
+SHA1 (jakarta-ant-1.3-src.tar.gz) = b4d259d07ebbd7c7d6aa67b93a4696c623809fb0
diff --git a/devel/jakarta-ant/files/patch-sum b/devel/jakarta-ant/files/patch-sum
deleted file mode 100644
index ec9d46ae864..00000000000
--- a/devel/jakarta-ant/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/07/03 03:50:11 jwise Exp $
-
-MD5 (patch-aa) = caf086503e039cfdb52362130887e3d5
diff --git a/devel/jakarta-ant/patches/patch-aa b/devel/jakarta-ant/patches/patch-aa
deleted file mode 100644
index cc37f30fc14..00000000000
--- a/devel/jakarta-ant/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/07/03 03:50:12 jwise Exp $
---- src/bin/ant.orig	Thu Jan 13 05:41:40 2000
-+++ src/bin/ant	Sun Jul  2 17:13:06 2000
-@@ -6,35 +6,18 @@
- 
- if [ "$ANT_HOME" = "" ] ; then
-   # try to find ANT
--  if [ -d /opt/ant ] ; then
--    ANT_HOME=/opt/ant
-+  if [ -d @PREFIX@ ] ; then
-+    ANT_HOME=@PREFIX@
-   fi
- 
--  if [ -d ${HOME}/opt/ant ] ; then
--    ANT_HOME=${HOME}/opt/ant
-+  if [ -d ${HOME}/ant ] ; then
-+    ANT_HOME=${HOME}/ant
-   fi
--
--  ## resolve links - $0 may be a link to ant's home
--  PRG=$0
--  progname=`basename $0`
--
--  while [ -h "$PRG" ] ; do
--    ls=`ls -ld "$PRG"`
--    link=`expr "$ls" : '.*-> \(.*\)$'`
--    if expr "$link" : '.*/.*' > /dev/null; then
--	PRG="$link"
--    else
--	PRG="`dirname $PRG`/$link"
--    fi
--  done
--
--  ANT_HOME=`dirname "$PRG"`/..
--
- fi
- 
- # Allow .antrc to specifiy flags to java cmd
- if [ "$JAVACMD" = "" ] ; then
--  JAVACMD=java
-+  JAVACMD=@JAVA_HOME@/bin/java
- fi
- 
- # Use the original tools.jar if available
-@@ -43,10 +26,9 @@
-    CLASSPATH=${JAVA_HOME}/lib/classes.zip:$CLASSPATH
- fi
- 
--
--CLASSPATH=${ANT_HOME}/lib/xml.jar:$CLASSPATH
--CLASSPATH=${ANT_HOME}/lib/ant.jar:$CLASSPATH
--CLASSPATH=${ANT_HOME}/lib/moo.jar:$CLASSPATH
-+CLASSPATH=${ANT_HOME}/lib/java/xml.jar:$CLASSPATH
-+CLASSPATH=${ANT_HOME}/lib/java/ant.jar:$CLASSPATH
-+#CLASSPATH=${ANT_HOME}/lib/java/moo.jar:$CLASSPATH
- export CLASSPATH
- 
- $JAVACMD -Dant.home=${ANT_HOME} org.apache.tools.ant.Main $@
diff --git a/devel/jakarta-ant/pkg/PLIST b/devel/jakarta-ant/pkg/PLIST
index 7d5778181b7..cdf307a2e14 100644
--- a/devel/jakarta-ant/pkg/PLIST
+++ b/devel/jakarta-ant/pkg/PLIST
@@ -1,8 +1,108 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/03 03:50:13 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/03/18 22:53:49 jwise Exp $
 bin/ant
 bin/antRun
-lib/java/xml.jar
 lib/java/ant.jar
+lib/java/ant-optional.jar
+lib/java/jaxp.jar
+lib/java/parser.jar
+share/doc/java/ant/manual/coretasklist.html
+share/doc/java/ant/manual/CoreTasks/ant.html
+share/doc/java/ant/manual/CoreTasks/antcall.html
+share/doc/java/ant/manual/CoreTasks/antstructure.html
+share/doc/java/ant/manual/CoreTasks/apply.html
+share/doc/java/ant/manual/CoreTasks/available.html
+share/doc/java/ant/manual/CoreTasks/chmod.html
+share/doc/java/ant/manual/CoreTasks/copy.html
+share/doc/java/ant/manual/CoreTasks/copydir.html
+share/doc/java/ant/manual/CoreTasks/copyfile.html
+share/doc/java/ant/manual/CoreTasks/cvs.html
+share/doc/java/ant/manual/CoreTasks/delete.html
+share/doc/java/ant/manual/CoreTasks/deltree.html
+share/doc/java/ant/manual/CoreTasks/echo.html
+share/doc/java/ant/manual/CoreTasks/exec.html
+share/doc/java/ant/manual/CoreTasks/execon.html
+share/doc/java/ant/manual/CoreTasks/fail.html
+share/doc/java/ant/manual/CoreTasks/filter.html
+share/doc/java/ant/manual/CoreTasks/fixcrlf.html
+share/doc/java/ant/manual/CoreTasks/genkey.html
+share/doc/java/ant/manual/CoreTasks/get.html
+share/doc/java/ant/manual/CoreTasks/gunzip.html
+share/doc/java/ant/manual/CoreTasks/gzip.html
+share/doc/java/ant/manual/CoreTasks/jar.html
+share/doc/java/ant/manual/CoreTasks/java.html
+share/doc/java/ant/manual/CoreTasks/javac.html
+share/doc/java/ant/manual/CoreTasks/javadoc.html
+share/doc/java/ant/manual/CoreTasks/mail.html
+share/doc/java/ant/manual/CoreTasks/mkdir.html
+share/doc/java/ant/manual/CoreTasks/move.html
+share/doc/java/ant/manual/CoreTasks/patch.html
+share/doc/java/ant/manual/CoreTasks/property.html
+share/doc/java/ant/manual/CoreTasks/rename.html
+share/doc/java/ant/manual/CoreTasks/replace.html
+share/doc/java/ant/manual/CoreTasks/rmic.html
+share/doc/java/ant/manual/CoreTasks/signjar.html
+share/doc/java/ant/manual/CoreTasks/sql.html
+share/doc/java/ant/manual/CoreTasks/style.html
+share/doc/java/ant/manual/CoreTasks/tar.html
+share/doc/java/ant/manual/CoreTasks/taskdef.html
+share/doc/java/ant/manual/CoreTasks/touch.html
+share/doc/java/ant/manual/CoreTasks/tstamp.html
+share/doc/java/ant/manual/CoreTasks/untar.html
+share/doc/java/ant/manual/CoreTasks/unzip.html
+share/doc/java/ant/manual/CoreTasks/uptodate.html
+share/doc/java/ant/manual/CoreTasks/war.html
+share/doc/java/ant/manual/CoreTasks/zip.html
+share/doc/java/ant/manual/CoreTypes/fileset.html
+share/doc/java/ant/manual/CoreTypes/mapper.html
+share/doc/java/ant/manual/CoreTypes/patternset.html
+share/doc/java/ant/manual/credits.html
+share/doc/java/ant/manual/develop.html
+share/doc/java/ant/manual/dirtasks.html
+share/doc/java/ant/manual/feedback.html
+share/doc/java/ant/manual/ide.html
+share/doc/java/ant/manual/index.html
+share/doc/java/ant/manual/install.html
+share/doc/java/ant/manual/Integration/Antidote.html
+share/doc/java/ant/manual/Integration/anttool1.gif
+share/doc/java/ant/manual/Integration/toolmenu.gif
+share/doc/java/ant/manual/Integration/VAJAntTool.html
+share/doc/java/ant/manual/intro.html
+share/doc/java/ant/manual/LICENSE
+share/doc/java/ant/manual/optionaltasklist.html
+share/doc/java/ant/manual/OptionalTasks/antlr.html
+share/doc/java/ant/manual/OptionalTasks/cab.html
+share/doc/java/ant/manual/OptionalTasks/clearcase.html
+share/doc/java/ant/manual/OptionalTasks/depend.html
+share/doc/java/ant/manual/OptionalTasks/dotnet.html
+share/doc/java/ant/manual/OptionalTasks/ejb.html
+share/doc/java/ant/manual/OptionalTasks/ftp.html
+share/doc/java/ant/manual/OptionalTasks/javacc.html
+share/doc/java/ant/manual/OptionalTasks/javah.html
+share/doc/java/ant/manual/OptionalTasks/jjtree.html
+share/doc/java/ant/manual/OptionalTasks/jlink.html
+share/doc/java/ant/manual/OptionalTasks/junit.html
+share/doc/java/ant/manual/OptionalTasks/junitreport.html
+share/doc/java/ant/manual/OptionalTasks/mparse.html
+share/doc/java/ant/manual/OptionalTasks/native2ascii.html
+share/doc/java/ant/manual/OptionalTasks/netrexxc.html
+share/doc/java/ant/manual/OptionalTasks/perforce.html
+share/doc/java/ant/manual/OptionalTasks/propertyfile.html
+share/doc/java/ant/manual/OptionalTasks/renameextensions.html
+share/doc/java/ant/manual/OptionalTasks/script.html
+share/doc/java/ant/manual/OptionalTasks/sound.html
+share/doc/java/ant/manual/OptionalTasks/telnet.html
+share/doc/java/ant/manual/OptionalTasks/stylebook.html
+share/doc/java/ant/manual/OptionalTasks/test.html
+share/doc/java/ant/manual/OptionalTasks/vssget.html
+share/doc/java/ant/manual/OptionalTasks/vsslabel.html
+share/doc/java/ant/manual/resources.html
+share/doc/java/ant/manual/toc.html
+share/doc/java/ant/manual/using.html
 share/doc/java/ant/README
-share/doc/java/ant/index.html
+share/doc/java/ant/WHATSNEW
+@dirrm share/doc/java/ant/manual/OptionalTasks
+@dirrm share/doc/java/ant/manual/Integration
+@dirrm share/doc/java/ant/manual/CoreTypes
+@dirrm share/doc/java/ant/manual/CoreTasks
+@dirrm share/doc/java/ant/manual
 @dirrm share/doc/java/ant