>Number:         30332
>Category:       pkg
>Synopsis:       patch to update apache-ant to 1.6.4 (bug fix release)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed May 25 13:00:00 +0000 2005
>Originator:     Antoine Reilles
>Release:        NetBSD 3.99.3
>Organization:
	
>Environment:
	
	
System: NetBSD arcelot.loria.fr 3.99.3 NetBSD 3.99.3 (XEN0) #3: Thu May 12 09:18:48 CEST 2005 tonio@arcelot.loria.fr:/usr/obj/sys/arch/i386/compile/XEN0 i386
Architecture: i386
Machine: i386
>Description:
Here a patch to update apache-ant to 1.6.4, which is mainly a bug fix release.
It also fixes pkg/29038, and pkg/29338.
I modified the makefile to use the SUBST framework, and a patch to modify the
main script for launching ant, instead of using an additional file.

The patch is at http://www.loria.fr/~reilles/divers/ant-1.6.4.diff
and also included in the fix section.

Here the relevant part of the Changelog:
Changes from Ant 1.6.3 to Ant 1.6.4
===================================
Changes that could break older environments:
--------------------------------------------
Fixed bugs:
-----------
* Sun javah failed with java.lang.NoClassDefFoundError.
  Bugzilla report 34681.

* DirectoryScanner.slowScan() was broken. Bugzilla report 34722.

* DirectoryScanner.scan() could throw a NullPointerException on
  case-insensitive filesystems (read Windows or MacOS X).

* Get w/authentication failed with ArrayOutOfBoundsExceptions.
  Bugzilla report 34734.

* Granularity attribute for <sync> task was undocumented.
  Bugzilla report 34871.

* <unzip> and <untar> could leave file handles open on invalid
  archives.  Bugzilla report 34893.

* propertyset threw NPE with nested, mapped propertysets.

* <ftp> up to date calculations were wrong.
  Bugzilla report 34941.

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

* AntXMLContext.setCurrentTargets() is now public. Bugzilla report 34680.

Changes from Ant 1.6.2 to Ant 1.6.3
===================================

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

* The subant task used the canonical version of a file path. This
  has been changed to use the absolute path. Bugzilla 30438.

* Tar now writes two EOF blocks rather than one.
  Bugzilla report 28776

* The Reference object now has a project field which it uses in preference
  to the project passed in. This allows composite references to be
  handled to nested projects.
  Bugzilla report 25777

* <junit> with filtertrace="true" will now also swallow lines for the
  sun.reflect package.  If you need to see them in your stack trace,
  you must set filtertrace to false.
  Bugzilla Report 22758

* The jikes compiler adapter now supports -bootclasspath, -extdirs and
  -sourcepath and also uses the same logic for debug flags as javac.
  This means, the jikes compiler adapter now requires Jikes 1.15 or later.
  Bugzilla Reports 25868, 26404 and 32609.

* Targets with identical name work in imported project. Bugzilla Report 34566.

* The gcj compiler adapter used to include the Java runtime classes
  even if includeJavaRuntime was set to false, unless the
  bootclasspath has been specified as well.  It will now always adhere
  to includeJavaRuntime, you may need to set it to true explicitly now
  if you relied on the old behavior.

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

* <javadoc> can now take an attribute 'executable'. Bugzilla report 30606.

* New attribute ignorecontents for <different> selector

* Javadoc fixes for Location, Project, and RuntimeConfigurable
  Bugzilla 30160.

* Enable to choose the regexp implementation without system property.
  Bugzilla Report 15390.

* Expose objects and methods in IntrospectionHelper. Bugzilla Report 30794.

* Allow file attribute of <move> to rename a directory.
  Bugzilla Report 22863.

* Add xmlcatalog nested element to XmlProperty. Bugzilla report 27053.

* New attribute alwayslog for <redirector> type.

* Added <target> nested elements to <ant> and <antcall> to allow
  specification of multiple sub-build targets, which are executed
  with a single dependency analysis.

* Refactored Target invocation into org.apache.tools.ant.Executor
  implementations.  Bugzilla Reports 21421, 29248.

* <rmic> now also supports Kaffe's rmic version shipping with Kaffe
  1.1.2 and above.

* added casesensitive attribute to <globmapper> and <regexpmapper>
  Bugzilla report 16686

* added handledirsep attribute to <globmapper> and <regexpmapper>
  Bugzilla report 32487

* added a new mapper <filtermapper>

* When a BuildListener tried to access System.err or System.out, Ant
  would have thrown an exception - this has been changed.  Ant now
  silently ignores the message.  BuildListeners still should avoid
  accessing either stream.

* Added a comment attribute to the zip task.
  Bugzilla report 22793.

* Overloaded FileUtils.createNewFile with a boolean mkdirs attribute
  to create nonexistent parent directories.

* <apply> has a new "force" attribute that, when true, disables
  checking of target files.

* Made the dest attribute of the apply task optional; mapped target
  filenames will be interpreted as absolute pathnames when dest is omitted.

* Changed default tempdir for <javac> from user.dir to java.io.tmpdir.

* Added searchpath attribute to <exec> for searching path variable(s)
  when resolveexecutable = true.

* Added revision and userid attributes to <pvcs> documentation.

* Added support to the touch task for a mkdirs attribute to create
  nonexistent parent directories before touching new files.

* Added support to the touch task for a pattern attribute to allow
  alternate datetime formats.

* Added support to the touch task to map touched files using a nested
  mapper element.

* Added support to the touch task for a verbose attribute to suppress
  logging of new file creation.

* bad link in docs to the enhancement page in bugzilla.
  Bugzilla report 33252.

* Added length task to get strings' and files' lengths.

* <native2ascii> and <javah> now also support Kaffe's versions.

* Recursive token expansion in a filterset can now be disabled by
  setting its recurse attribute to false.

* Pathconvert no longer requires that one of (targetos|pathsep|dirsep)
  be set; platform defaults are used when this is the case.

* Added preservelastmodified attribute to fixcrlf task. Bugzilla 25770.

* Added isfileselected condition.

* Added verbose="true|false" attribute to <subant>. When verbose is enabled,
  the directory name is logged on entry and exit of the sub-build. Bugzilla 33787.

* Added -nouserlib option to allow running ant without automatically loading
  up ${user.home}/.lib/ant. This is useful when compiling ant, and antlibs.
  Modified the build.sh and build.bat to use the option.

* Added -noclasspath option to allow running ant WITHOUT using CLASSPATH env
  variable. Modified ant.bat to do this so that %CLASSPATH% is not looked at.

* Add else attribute to the condition task, which specifies an
  optional alternate value to set the property to if the nested
  condition evaluates to false. Bugzilla report 33074.

* Ant generated jar files should now be detected as jar files by
  Solaris.  Bugzilla Report 32649.

* Added two tutorials
  - beginner: introduction into Ant
  - task developers: using path, fileset etc

* <rpm> has new attributes failonerror and quiet.

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

* Do not pass on ThreadDeath when halting <java fork="false">. Bugzilla
  32941.

* Killing a thread running <java fork="true"> (e.g. from an IDE) would
  not stop the forked process. Bugzilla 31928.

* Programs run with <java fork="true"> can now accept standard input
  from the Ant console.  (Programs run with <java fork="false"> could
  already do so.)  Bugzilla 24918.

* AbstractCvsTask prematurely closed its outputStream and errorStream.
  Bugzilla 30097.

* Impossible to use implicit classpath for <taskdef>
  when Ant core loader != Java application loader and
  Path.systemClassPath taken from ${java.class.path} Bugzilla 30161.

* MacroInstance did not clean up nested elements correctly in the execute 
  method, causing multiple use of the same macro instance with nested
  elements to fail.

* checksum fileext property doc wrong. Bugzilla 30787.

* FTP task, getTimeDiff method was returning wrong value. Bugzilla 30595.

* Zip task was not zipping when only empty directories were found.
  Bugzilla 30365.

* Jar task was not including manifest files when duplicate="preserve" was
  chosen. Bugzilla 32802.

* Classpath was treated in the same way as -lib options. Bugzilla 28046.

* Manual page for cvsversion contained incorrect attributes and did not
  say since 1.6.1. Bugzilla 31408.

* Typo in definition of <cvsversion> task causing it not to be defined.
  Bugzilla 31403.

* Execution of top level tasks in imported files get delayed by targets.
  Bugzilla report 31487.

* ExecTask executes checkConfiguration() even though os does not match.
  Bugzilla report 31805.

* Concat task instance could not be run twice.
  Bugzilla report 31814.

* NPE using XmlLogger and antlib.
  Bugzilla report 31840.

* Properties.propertyNames() should be used instead of .keys().
  Bugzilla report 27261.

* Target location is not set for default target.
  Bugzilla report 32267.

* Incorrect classloader parent in junittask when using with
  ant-junit.jar and junit.jar not in the project classloader. Bugzilla
  report 28474.

* getResources() on the classloader returned by ClasspathUtils would
  see each resource twice - if the resource is in the project
  classpath and if the classloader is requested with a null path.
>How-To-Repeat:
get the patch, apply it, and make install
It can be useful to do "rm -r /usr/pkgsrc/devel/apache-ant/files/"
>Fix:
The patch:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apache-ant/Makefile,v
retrieving revision 1.16
diff -b -u -r1.16 Makefile
--- Makefile	11 Apr 2005 21:45:17 -0000	1.16
+++ Makefile	25 May 2005 12:43:59 -0000
@@ -5,7 +5,8 @@
 # of ant was 3.1.  Do NOT use dependency patterns such as >=1.3 which could pick
 # up this version by mistake.
 
-DISTNAME=	apache-ant-1.6.2
+DISTNAME=	apache-ant-1.6.4
+PKGREVISION=1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=ant/binaries/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,21 +24,22 @@
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_JAVA=	run
 USE_JAVA2=	yes
+NO_BUILD=	yes
 
-EXTRACT_CMD_OPTS.zip=	-Caq
-
-do-build:
-	${SED}	-e 's,@PREFIX@,${PREFIX},g'				\
-		-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'			\
-		< ${FILESDIR}/ant > ${WRKDIR}/ant
+SUBST_CLASSES+=  ant
+SUBST_FILES.ant= bin/ant
+SUBST_STAGE.ant= pre-configure
+SUBST_SED.ant=-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' -e 's,@PREFIX@,${PREFIX},g'
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/ant ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ant ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${PREFIX}/bin
 	${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 -b -u -r1.5 PLIST
--- PLIST	4 Aug 2004 08:49:09 -0000	1.5
+++ PLIST	25 May 2005 12:43:59 -0000
@@ -1,8 +1,36 @@
-@comment $NetBSD: PLIST,v 1.5 2004/08/04 08:49:09 recht Exp $
+@comment $NetBSD$
 bin/ant
 bin/antRun
+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/ant.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
@@ -95,6 +123,7 @@
 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/length.html
 share/doc/java/ant/manual/CoreTasks/loadfile.html
 share/doc/java/ant/manual/CoreTasks/loadproperties.html
 share/doc/java/ant/manual/CoreTasks/macrodef.html
@@ -150,6 +179,7 @@
 share/doc/java/ant/manual/CoreTypes/permissions.html
 share/doc/java/ant/manual/CoreTypes/propertyset.html
 share/doc/java/ant/manual/CoreTypes/redirector.html
+share/doc/java/ant/manual/CoreTypes/regexp.html
 share/doc/java/ant/manual/CoreTypes/selectors-program.html
 share/doc/java/ant/manual/CoreTypes/selectors.html
 share/doc/java/ant/manual/CoreTypes/xmlcatalog.html
@@ -260,6 +290,7 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/DynamicConfiguratorNS.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/DynamicElement.html
 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/FileScanner.html
@@ -282,6 +313,8 @@
 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
+share/doc/java/ant/manual/api/org/apache/tools/ant/UnsupportedAttributeException.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/UnsupportedElementException.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/XmlLogger.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/BaseFilterReader.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/BaseParamFilterReader.html
@@ -325,6 +358,7 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/util/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/filters/util/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/AntXMLContext.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/helper/DefaultExecutor.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.AntHandler.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.ElementHandler.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.MainHandler.html
@@ -333,6 +367,7 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.TargetHandler.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelperImpl.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/helper/SingleCheckExecutor.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/helper/package-tree.html
@@ -367,6 +402,7 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/package-tree.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/Ant.Reference.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.TargetElement.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/AntStructure.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Antlib.html
@@ -419,6 +455,10 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DistinguishedName.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DnameParam.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.Base64Converter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.DownloadProgress.html
+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/ImportTask.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Input.html
@@ -442,6 +482,9 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Jikes.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/JikesOutputParser.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/KeySubst.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Length.FileMode.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Length.When.html
+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/LogOutputStream.html
@@ -554,6 +597,7 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/FilesMatch.html
 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/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/IsReference.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsSet.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsTrue.html
@@ -775,6 +819,13 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/SunJavah.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-frame.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-summary.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.FormatAttribute.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-frame.html
@@ -839,6 +890,14 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/metamata/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/metamata/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/metamata/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-frame.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-summary.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.Action.html
 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
@@ -1071,6 +1130,10 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/XMLCatalog.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/ZipFileSet.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/ZipScanner.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers/FilterMapper.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers/package-frame.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers/package-summary.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/ScriptFilter.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.ClassRoot.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.html
@@ -1105,6 +1168,7 @@
 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/selectors/AbstractSelectorContainer.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/AndSelector.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/BaseExtendSelector.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/BaseSelector.html
@@ -1161,6 +1225,7 @@
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/ConcatFileInputStream.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/ContainerMapper.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/DOMElementWriter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/util/DOMUtils.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/util/DateUtils.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/FileUtils.html
@@ -1254,6 +1319,7 @@
 share/doc/java/ant/manual/api/org/apache/tools/tar/package-tree.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/AsiExtraField.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/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
@@ -1297,6 +1363,9 @@
 share/doc/java/ant/manual/sysclasspath.html
 share/doc/java/ant/manual/tasksoverview.html
 share/doc/java/ant/manual/toc.html
+share/doc/java/ant/manual/tutorial-HelloWorldWithAnt.html
+share/doc/java/ant/manual/tutorial-tasks-filesets-properties.html
+share/doc/java/ant/manual/tutorial-tasks-filesets-properties.zip
 share/doc/java/ant/manual/tutorial-writing-tasks-src.zip
 share/doc/java/ant/manual/tutorial-writing-tasks.html
 share/doc/java/ant/manual/using.html
@@ -1305,22 +1374,8 @@
 share/doc/java/ant/page.css
 share/doc/java/ant/problems.html
 share/doc/java/ant/projects.html
-share/doc/java/ant/projects/antidote/design.html
-share/doc/java/ant/projects/antidote/images/screenshot.jpg
-share/doc/java/ant/projects/antidote/index.html
-share/doc/java/ant/projects/antidote/module.html
-share/doc/java/ant/projects/antlib/antlib_classloaders.html
-share/doc/java/ant/projects/antlib/antlib_contract.html
-share/doc/java/ant/projects/antlib/antlib_descriptors.html
-share/doc/java/ant/projects/antlib/antlib_namespaces.html
-share/doc/java/ant/projects/antlib/antlib_roadmap.html
-share/doc/java/ant/projects/antlib/index.html
-share/doc/java/ant/projects/antlib/roles.html
 share/doc/java/ant/projects/index.html
 share/doc/java/ant/resources.html
-@dirrm share/doc/java/ant/projects/antlib
-@dirrm share/doc/java/ant/projects/antidote/images
-@dirrm share/doc/java/ant/projects/antidote
 @dirrm share/doc/java/ant/projects
 @dirrm share/doc/java/ant/manual/stylesheets
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/zip
@@ -1339,6 +1394,7 @@
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/image
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/depend
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional
+@dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/types
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/rmic
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows
@@ -1357,12 +1413,14 @@
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net
+@dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/metamata
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend
+@dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee
 @dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apache-ant/distinfo,v
retrieving revision 1.6
diff -b -u -r1.6 distinfo
--- distinfo	23 Feb 2005 22:24:09 -0000	1.6
+++ distinfo	25 May 2005 12:43:59 -0000
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.6 2005/02/23 22:24:09 agc Exp $
 
-SHA1 (apache-ant-1.6.2-bin.tar.bz2) = 6b2fb6095a1c334d60d56ce29ef878601134051e
-RMD160 (apache-ant-1.6.2-bin.tar.bz2) = b653b99c6785064572150372dcf84dd5f2d02d8d
-Size (apache-ant-1.6.2-bin.tar.bz2) = 6685702 bytes
+SHA1 (apache-ant-1.6.4-bin.tar.bz2) = 5ba7d6e2a24e94c749cd949700159b510ad36568
+RMD160 (apache-ant-1.6.4-bin.tar.bz2) = f4d4c3c04fe0103c302c19031db704296ab5173b
+Size (apache-ant-1.6.4-bin.tar.bz2) = 6742276 bytes
+SHA1 (patch-aa) = a168d6660b01969e076d5dfe878d87d3d29e3caa
--- /dev/null	2005-05-25 14:38:58.000000000 +0200
+++ patches/patch-aa	2005-05-25 14:38:12.000000000 +0200
@@ -0,0 +1,32 @@
+--- 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 @@
+            ;;
+ esac
+ 
++if [ "$ANT_HOME" = "" ] ; then
++  # try to find ANT
++  ANT_HOME=@PREFIX@
++fi
++
++if [ "$JAVA_HOME" = "" ] ; then
++  JAVA_HOME=@JAVA_HOME@
++fi
++
+ 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 @@
+ fi
+ 
+ # set ANT_LIB location
+-ANT_LIB="${ANT_HOME}/lib"
++ANT_LIB="${ANT_HOME}/lib/java/ant"
++
++# use ${PREFIX}/bin/java (wrapper)
++if [ "$JAVACMD" = "" ] ; then
++  JAVACMD=@PREFIX@/bin/java
++fi
+ 
+ if [ -z "$JAVACMD" ] ; then
+   if [ -n "$JAVA_HOME"  ] ; then

>Unformatted: