Update devel/apache-ant to 1.8.0

Fix PR pkg/42990

* Lexically scoped local properties, i.e. properties that are only defined
  inside a target, sequential block or similar environment.
* <import> can now import from any file- or URL-providing resource - this
  includes <javaresource>.
* Various improvements to the directory scanning code that help with symbolic
  link cycles (as can be found on MacOS X Java installations for example) and
  improve scanning performance. For big directory trees the improvement is
  dramatic.
* The way developers can extend Ant's property expansion algorithm has been
  rewritten (breaking the older API) to be easier to use and be more powerful.
  a new top level element extension-point allows build files to be extended
  with custom targets more easily
* At the same time the if and unless attributes have been rewritten to do the
  expected thing if applied to a property expansion (i.e. if="${foo}" will mean
  "yes, do it" if ${foo} expands to true, in Ant 1.7.1 it would mean "no"
  unless a property named "true" existed). This adds "testing conditions" as a
  new use-case to property expansion.
* Ant now requires Java 1.4 or later
* new task include provides an alternative to <import> that should be preferred
  when you don't want to override any targets
* numerous bug fixes and improvements as documented in Bugzilla and in WHATSNEW

4 files changed, 124 insertions, 65 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 6a9c42fedca..54df5b9e066 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2009/01/19 00:38:17 christos Exp $
+# $NetBSD: Makefile,v 1.27 2010/04/13 21:05:41 tonio Exp $
 #
 
-DISTNAME=	apache-ant-1.7.1
+DISTNAME=	apache-ant-1.8.0
 #PKGREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=ant/binaries/}
diff --git a/devel/apache-ant/PLIST b/devel/apache-ant/PLIST
index e3a409c09c6..e864362afcd 100644
--- a/devel/apache-ant/PLIST
+++ b/devel/apache-ant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:48:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/04/13 21:05:41 tonio Exp $
 bin/ant
 bin/antRun
 lib/java/ant/ant-antlr.jar
@@ -8,6 +8,7 @@ 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-apache-xalan2.jar
 lib/java/ant/ant-commons-logging.jar
 lib/java/ant/ant-commons-net.jar
 lib/java/ant/ant-jai.jar
@@ -19,12 +20,10 @@ 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-testutil.jar
 lib/java/ant/ant-trax.jar
-lib/java/ant/ant-weblogic.jar
 lib/java/ant/ant.jar
 lib/java/ant/xercesImpl.jar
 lib/java/ant/xml-apis.jar
@@ -44,9 +43,11 @@ share/doc/java/ant/antlibs/antunit/index.html
 share/doc/java/ant/antlibs/bindownload.cgi
 share/doc/java/ant/antlibs/bindownload.html
 share/doc/java/ant/antlibs/charter.html
+share/doc/java/ant/antlibs/compress/index.html
 share/doc/java/ant/antlibs/dotnet/index.html
 share/doc/java/ant/antlibs/index.html
 share/doc/java/ant/antlibs/proper.html
+share/doc/java/ant/antlibs/props/index.html
 share/doc/java/ant/antlibs/sandbox.html
 share/doc/java/ant/antlibs/srcdownload.cgi
 share/doc/java/ant/antlibs/srcdownload.html
@@ -102,6 +103,7 @@ share/doc/java/ant/manual/CoreTasks/changelog.html
 share/doc/java/ant/manual/CoreTasks/checksum.html
 share/doc/java/ant/manual/CoreTasks/chmod.html
 share/doc/java/ant/manual/CoreTasks/common.html
+share/doc/java/ant/manual/CoreTasks/componentdef.html
 share/doc/java/ant/manual/CoreTasks/concat.html
 share/doc/java/ant/manual/CoreTasks/condition.html
 share/doc/java/ant/manual/CoreTasks/conditions.html
@@ -129,7 +131,9 @@ 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/hostinfo.html
 share/doc/java/ant/manual/CoreTasks/import.html
+share/doc/java/ant/manual/CoreTasks/include.html
 share/doc/java/ant/manual/CoreTasks/input.html
 share/doc/java/ant/manual/CoreTasks/jar.html
 share/doc/java/ant/manual/CoreTasks/java.html
@@ -139,6 +143,7 @@ share/doc/java/ant/manual/CoreTasks/length.html
 share/doc/java/ant/manual/CoreTasks/loadfile.html
 share/doc/java/ant/manual/CoreTasks/loadproperties.html
 share/doc/java/ant/manual/CoreTasks/loadresource.html
+share/doc/java/ant/manual/CoreTasks/local.html
 share/doc/java/ant/manual/CoreTasks/macrodef.html
 share/doc/java/ant/manual/CoreTasks/mail.html
 share/doc/java/ant/manual/CoreTasks/makeurl.html
@@ -153,6 +158,7 @@ share/doc/java/ant/manual/CoreTasks/patch.html
 share/doc/java/ant/manual/CoreTasks/pathconvert.html
 share/doc/java/ant/manual/CoreTasks/presetdef.html
 share/doc/java/ant/manual/CoreTasks/property.html
+share/doc/java/ant/manual/CoreTasks/propertyhelper.html
 share/doc/java/ant/manual/CoreTasks/recorder.html
 share/doc/java/ant/manual/CoreTasks/rename.html
 share/doc/java/ant/manual/CoreTasks/replace.html
@@ -218,17 +224,12 @@ share/doc/java/ant/manual/OptionalTasks/ccm.html
 share/doc/java/ant/manual/OptionalTasks/chgrp.html
 share/doc/java/ant/manual/OptionalTasks/chown.html
 share/doc/java/ant/manual/OptionalTasks/clearcase.html
-share/doc/java/ant/manual/OptionalTasks/csc.html
 share/doc/java/ant/manual/OptionalTasks/depend.html
-share/doc/java/ant/manual/OptionalTasks/dotnet.html
 share/doc/java/ant/manual/OptionalTasks/echoproperties.html
 share/doc/java/ant/manual/OptionalTasks/ejb.html
 share/doc/java/ant/manual/OptionalTasks/ftp.html
-share/doc/java/ant/manual/OptionalTasks/ilasm.html
-share/doc/java/ant/manual/OptionalTasks/ildasm.html
 share/doc/java/ant/manual/OptionalTasks/image-classdiagram.gif
 share/doc/java/ant/manual/OptionalTasks/image.html
-share/doc/java/ant/manual/OptionalTasks/importtypelib.html
 share/doc/java/ant/manual/OptionalTasks/jarlib-available.html
 share/doc/java/ant/manual/OptionalTasks/jarlib-display.html
 share/doc/java/ant/manual/OptionalTasks/jarlib-manifest.html
@@ -239,7 +240,6 @@ share/doc/java/ant/manual/OptionalTasks/jdepend.html
 share/doc/java/ant/manual/OptionalTasks/jjdoc.html
 share/doc/java/ant/manual/OptionalTasks/jjtree.html
 share/doc/java/ant/manual/OptionalTasks/jlink.html
-share/doc/java/ant/manual/OptionalTasks/jsharpc.html
 share/doc/java/ant/manual/OptionalTasks/jspc.html
 share/doc/java/ant/manual/OptionalTasks/junit.html
 share/doc/java/ant/manual/OptionalTasks/junitreport.html
@@ -263,15 +263,14 @@ share/doc/java/ant/manual/OptionalTasks/sos.html
 share/doc/java/ant/manual/OptionalTasks/sound.html
 share/doc/java/ant/manual/OptionalTasks/splash.html
 share/doc/java/ant/manual/OptionalTasks/sshexec.html
+share/doc/java/ant/manual/OptionalTasks/sshsession.html
 share/doc/java/ant/manual/OptionalTasks/starteam.html
 share/doc/java/ant/manual/OptionalTasks/stylebook.html
 share/doc/java/ant/manual/OptionalTasks/symlink.html
 share/doc/java/ant/manual/OptionalTasks/telnet.html
 share/doc/java/ant/manual/OptionalTasks/translate.html
-share/doc/java/ant/manual/OptionalTasks/vbc.html
 share/doc/java/ant/manual/OptionalTasks/vss.html
 share/doc/java/ant/manual/OptionalTasks/wljspc.html
-share/doc/java/ant/manual/OptionalTasks/wsdltodotnet.html
 share/doc/java/ant/manual/OptionalTasks/xmlvalidate.html
 share/doc/java/ant/manual/OptionalTypes/classfileset.html
 share/doc/java/ant/manual/OptionalTypes/extension.html
@@ -306,6 +305,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/DynamicElementNS.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/Executor.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/ExitException.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/ExitStatusException.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/ExtensionPoint.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/FileScanner.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/IntrospectionHelper.Creator.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/IntrospectionHelper.html
@@ -317,12 +317,17 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/PathTokenizer.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/Project.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/ProjectComponent.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/ProjectHelper.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/ProjectHelperRepository.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/PropertyHelper.Delegate.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/PropertyHelper.PropertyEvaluator.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/PropertyHelper.PropertySetter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/PropertyHelper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/RuntimeConfigurable.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/SubBuildListener.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/Target.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/Task.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/TaskAdapter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/TaskConfigurationChecker.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/TaskContainer.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/TypeAdapter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/UnknownElement.html
@@ -352,11 +357,13 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/filters/LineContainsRegExp.ht
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/PrefixLines.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/ReplaceTokens.Token.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/ReplaceTokens.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/filters/SortFilter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/StringInputStream.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/StripJavaComments.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/StripLineBreaks.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/StripLineComments.Comment.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/StripLineComments.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/filters/SuffixLines.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/TabsToSpaces.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/TailFilter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ChainableReaderFilter.html
@@ -371,6 +378,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ReplaceSt
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.StringTokenizer.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.Trim.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/filters/UniqFilter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/package-tree.html
@@ -416,17 +424,31 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/listener/BigProjectLogger.htm
 share/doc/java/ant/manual/api/org/apache/tools/ant/listener/CommonsLoggingListener.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/listener/Log4jListener.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/listener/MailLogger.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/listener/ProfileLogger.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/listener/TimestampedLogger.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/listener/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/listener/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/listener/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/loader/AntClassLoader2.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/loader/AntClassLoader5.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/loader/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/loader/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/loader/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/GetProperty.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/LocalProperties.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/LocalPropertyStack.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/NullReturn.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/ParseNextProperty.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/ParseProperties.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/PropertyExpander.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/ResolvePropertyMap.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/package-frame.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/package-summary.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/property/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.Module.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.Reference.html
@@ -450,6 +472,8 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Checksum.FormatEleme
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Checksum.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Chmod.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Classloader.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/CloseResources.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Componentdef.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Concat.TextElement.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Concat.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/ConditionTask.html
@@ -471,6 +495,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Dirname.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Ear.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Echo.EchoLevel.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Echo.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/EchoXML.NamespacePolicy.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/EchoXML.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Exec.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/ExecTask.html
@@ -497,6 +522,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.DownloadProgress
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.NullProgress.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.VerboseProgress.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/HostInfo.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/ImportTask.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Input.Handler.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Input.HandlerType.html
@@ -529,6 +555,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Length.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/LoadFile.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/LoadProperties.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/LoadResource.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Local.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/LogOutputStream.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/LogStreamHandler.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.Attribute.html
@@ -560,6 +587,9 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PathConvert.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.PreSetDefinition.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Property.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PropertyHelperTask.DelegateElement.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PropertyHelperTask.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PumpStreamHandler.ThreadWithPumper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PumpStreamHandler.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Recorder.ActionChoices.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Recorder.VerbosityLevelChoices.html
@@ -594,6 +624,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Tar.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/TaskOutputStream.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Taskdef.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/TempFile.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Touch.DateFormatFactory.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Touch.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Transform.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Truncate.html
@@ -619,10 +650,12 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.OutputProperty.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Param.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.TraceConfiguration.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/XmlProperty.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.ArchiveState.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.Duplicate.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.UnicodeExtraField.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.WhenEmpty.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.html
@@ -654,6 +687,8 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Http.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFailure.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFalse.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFileSelected.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsLastModified.CompareMode.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsLastModified.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsReachable.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsReference.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsSet.html
@@ -665,6 +700,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Or.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Os.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ParserSupports.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ResourceContains.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ResourceExists.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ResourcesMatch.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Socket.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/TypeFound.html
@@ -719,6 +755,8 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidate
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Property.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.ValidatorErrorHandler.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XSLTTraceSupport.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.html
@@ -773,39 +811,14 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/cons
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-tree.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.TargetTypes.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.TargetTypes.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.EncodingTypes.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.VisibilityOptions.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.Compiler.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.Schema.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-frame.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-summary.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.CMPVersion.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.DTDLocation.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.NamingScheme.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.EjbcException.html
@@ -814,8 +827,6 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanet
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.html
@@ -913,6 +924,8 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUt
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.NodeListImpl.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.TestInfos.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.TypeAttribute.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.html
@@ -933,6 +946,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnit
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/OutErrSummaryJUnitResultFormatter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.html
@@ -952,10 +966,21 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.Act
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPFile.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPRootFile.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPFileProxy.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPSystemType.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.Granularity.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.LanguageCode.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTask.Action.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTask.FTPSystemType.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTask.Granularity.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTask.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirror.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.FTPDirectoryScanner.AntFTPFile.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.FTPDirectoryScanner.AntFTPRootFile.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.FTPDirectoryScanner.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.FTPFileProxy.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/MimeMail.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.AntRExecClient.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.RExecRead.html
@@ -1004,10 +1029,6 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsPr
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-tree.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-frame.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-summary.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.Attribute.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.NestedElement.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.html
@@ -1039,6 +1060,10 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/Directo
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.LocalTunnel.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.NestedSequential.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.RemoteTunnel.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/Scp.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.html
@@ -1048,16 +1073,12 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMe
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-tree.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.UnmatchedFileMap.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-frame.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-summary.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/BlockFor.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/BuildTimeoutException.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/Funtest.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/package-frame.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/package-summary.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Chown.html
@@ -1201,13 +1222,19 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/types/resolver/ApacheCatalogR
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resolver/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resolver/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resolver/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/AbstractClasspathResource.ClassLoaderWithFlag.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/AbstractClasspathResource.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Appendable.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/ArchiveResource.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Archives.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/BCFileSet.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/BZip2Resource.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/CompressedResource.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/ContentTransformingResource.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Difference.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/FileProvider.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/FileResource.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/FileResourceIterator.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Files.html
@@ -1215,9 +1242,15 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/First.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/GZipResource.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/ImmutableResourceException.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Intersect.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/JavaConstantResource.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/JavaResource.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Last.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/LogOutputResource.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/MappedResource.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/MappedResourceCollection.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/PropertyResource.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/ResourceDecorator.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/ResourceList.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Resources.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Restrict.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/SizeLimitCollection.html
@@ -1226,6 +1259,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/StringResourc
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/TarResource.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Tokens.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Touchable.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/URLProvider.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/URLResource.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Union.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/ZipResource.html
@@ -1286,6 +1320,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/NotSelector.h
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/OrSelector.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/PresentSelector.FilePresence.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/PresentSelector.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/ReadableSelector.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/SelectSelector.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/SelectorContainer.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/SelectorScanner.html
@@ -1294,8 +1329,11 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/SignedSelecto
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.ByteUnits.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.SizeComparisons.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/TokenizedPath.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/TokenizedPattern.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.FileType.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/WritableSelector.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Cache.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.html
@@ -1336,6 +1374,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/util/DeweyDecimal.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/FileNameMapper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/FileTokenizer.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/FileUtils.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/util/FirstMatchMapper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/FlatFileNameMapper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/GlobPatternMapper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/IdentityMapper.html
@@ -1344,6 +1383,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/util/JAXPUtils.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/JavaEnvUtils.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/KeepAliveInputStream.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/KeepAliveOutputStream.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/util/LayoutPreservingProperties.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/LazyFileOutputStream.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/LazyHashtable.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/LeadPipeInputStream.html
@@ -1359,6 +1399,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/util/ReaderInputStream.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/ReflectUtil.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/ReflectWrapper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/RegexpPatternMapper.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/util/ResourceUtils.ResourceSelectorProvider.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/ResourceUtils.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/RetryHandler.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/Retryable.html
@@ -1368,17 +1409,21 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/util/ScriptRunnerBase.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/ScriptRunnerCreator.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/ScriptRunnerHelper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/SourceFileScanner.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/util/SplitClassLoader.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/StringTokenizer.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/StringUtils.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/util/SymbolicLinkUtils.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/TaskLogger.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/TeeOutputStream.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/TimeoutObserver.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/Tokenizer.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/UUEncoder.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/UnPackageNameMapper.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/util/VectorSet.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/Watchdog.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/WeakishReference.HardReference.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/WeakishReference.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/util/WorkerAnt.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/XMLFragment.Child.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/XMLFragment.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/XmlConstants.html
@@ -1447,15 +1492,20 @@ share/doc/java/ant/manual/api/org/apache/tools/tar/TarUtils.html
 share/doc/java/ant/manual/api/org/apache/tools/tar/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/tar/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/tar/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/zip/AbstractUnicodeExtraField.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/AsiExtraField.html
+share/doc/java/ant/manual/api/org/apache/tools/zip/CentralDirectoryParsingZipExtraField.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/ExtraFieldUtils.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/JarMarker.html
+share/doc/java/ant/manual/api/org/apache/tools/zip/UnicodeCommentExtraField.html
+share/doc/java/ant/manual/api/org/apache/tools/zip/UnicodePathExtraField.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/UnixStat.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/UnrecognizedExtraField.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/ZipEntry.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/ZipExtraField.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/ZipFile.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/ZipLong.html
+share/doc/java/ant/manual/api/org/apache/tools/zip/ZipOutputStream.UnicodeExtraFieldPolicy.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/ZipOutputStream.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/ZipShort.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/package-frame.html
@@ -1489,12 +1539,15 @@ share/doc/java/ant/manual/javacprops.html
 share/doc/java/ant/manual/listeners.html
 share/doc/java/ant/manual/optionaltasklist.html
 share/doc/java/ant/manual/platform.html
+share/doc/java/ant/manual/projecthelper.html
+share/doc/java/ant/manual/properties.html
 share/doc/java/ant/manual/proxy.html
 share/doc/java/ant/manual/running.html
 share/doc/java/ant/manual/runninglist.html
 share/doc/java/ant/manual/stylesheets/antmanual.css
 share/doc/java/ant/manual/stylesheets/style.css
 share/doc/java/ant/manual/sysclasspath.html
+share/doc/java/ant/manual/targets.html
 share/doc/java/ant/manual/tasksoverview.html
 share/doc/java/ant/manual/toc.html
 share/doc/java/ant/manual/tutorial-HelloWorldWithAnt.html
@@ -1512,7 +1565,13 @@ share/doc/java/ant/problems.html
 share/doc/java/ant/projects.html
 share/doc/java/ant/projects/index.html
 share/doc/java/ant/projects/ivy.html
+share/doc/java/ant/projects/ivyde.html
 share/doc/java/ant/resources.html
 share/doc/java/ant/slides/extending_ant.odp
 share/doc/java/ant/svn.html
+share/doc/java/ant/webtest/gettest/.htaccess
+share/doc/java/ant/webtest/gettest/testother.txt
+share/doc/java/ant/webtest/gettest/testperm.txt
+share/doc/java/ant/webtest/gettest/testredir5.txt
+share/doc/java/ant/webtest/gettest/testtemp.txt
 share/doc/java/ant/webtest/testkeystore
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index c1400940abb..29dccd3b08f 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2009/01/19 00:38:17 christos Exp $
+$NetBSD: distinfo,v 1.11 2010/04/13 21:05:42 tonio Exp $
 
-SHA1 (apache-ant-1.7.1-bin.tar.bz2) = b078ba89301687662f100da7b059105f32004f7c
-RMD160 (apache-ant-1.7.1-bin.tar.bz2) = e3244035f0e3ac756a741d6d4fb5a91cfff4f0dd
-Size (apache-ant-1.7.1-bin.tar.bz2) = 7641928 bytes
-SHA1 (patch-aa) = 87a048e639a8a4df3de56b5d473dba6bd4f1d23d
+SHA1 (apache-ant-1.8.0-bin.tar.bz2) = 08f20b0bfaeeb800694b967282e11bb7edbb3a2c
+RMD160 (apache-ant-1.8.0-bin.tar.bz2) = 4cb46e6c33b27b4a2626bfc24161f11a4b0a6ccc
+Size (apache-ant-1.8.0-bin.tar.bz2) = 7950832 bytes
+SHA1 (patch-aa) = 7271790e4c59095db60473b3e559eaed360f233b
diff --git a/devel/apache-ant/patches/patch-aa b/devel/apache-ant/patches/patch-aa
index 0f4f9feddb7..40a773e72dc 100644
--- a/devel/apache-ant/patches/patch-aa
+++ b/devel/apache-ant/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2008/10/25 17:43:33 adrianp Exp $
+$NetBSD: patch-aa,v 1.3 2010/04/13 21:05:42 tonio Exp $
 
---- bin/ant.orig	2005-05-19 14:37:16.000000000 +0200
-+++ bin/ant	2005-05-25 14:38:03.000000000 +0200
-@@ -86,6 +86,15 @@
-            ;;
+--- bin/ant.orig	2010-02-02 01:35:22.000000000 +0100
++++ bin/ant	2010-04-13 22:52:56.000000000 +0200
+@@ -91,6 +91,15 @@
+   MINGW*) mingw=true ;;
  esac
  
 +if [ "$ANT_HOME" = "" ] ; then
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2008/10/25 17:43:33 adrianp Exp $
  if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
    ## resolve links - $0 may be a link to ant's home
    PRG="$0"
-@@ -117,7 +126,12 @@
+@@ -129,7 +138,12 @@
  fi
  
  # set ANT_LIB location