Update to 1.9.4. Add comment to patch.

Changes from Ant 1.9.3 TO Ant 1.9.4
===================================

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

 * the prefixValues attribute of <property> didn't work as expected
   when set to false (the default).
   It is quite likely existing build files relied on the wrong
   behavior and expect Ant to resolve the value side against the
   properties defined in the property file itself - these build files
   must now explicitly set the prefixValues attribute to true.
   Bugzilla Report 54769

 * when matching an entry of a zip/tarfileset against a pattern a
   leading slash will be stripped from the entry name.  Most archives
   don't contain paths with leading slashes anyway.
   This may cause include/exclude patterns that start with a / to stop
   matching anything.  Such patterns only used to work by accident and
   only on platforms with multiple file system roots.
   Bugzilla Report 53949

 * DirectoryScanner and thus fileset/dirset will now silently drop all
   filesystem objects that are neither files nor directories according
   to java.io.File.  This prevents Ant from reading named pipes which
   might lead to blocking or other undefined behavior.
   Bugzilla Report 56149

 * BuildFileTest and BaseSelectorTest have both been deprecated in
   favour of BuildFileRule and BaseSelectorRule respectively, and the
   tests that previously extended these base tests have been converted to
   JUnit 4 tests using the new "rule"s. Any external test that sub-classed
   a test in the Ant workspace, rather than BuildFileTest, will need
   changed to either use JUnit4's annotations, or be modified to
   extend BuildFileTest directly. This will not affect any tests that are
   being executed by Ant's junit or batchtest tasks that are not specifically
   testing Ant's code.

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

 * <import>/<include> failed when the importing file was loaded from an
   URI or a jar and it imported a file from the local file system via
   an absolute path.
   Bugzilla Report 50953

 * <import> could import the same resource twice when imported via
   different resource types.
   Bugzilla Report 55097

 * several calls to File#mkdirs could fall victim to a race condition
   where another thread already created the same directory.
   Bugzilla Report 55290

 * <manifestclasspath> created '/' rather than './' for the parent
   directory of the given jarfile.
   Bugzilla Report 55049

 * <concat>'s fixlastline="true" didn't work when using certain filter
   readers.
   Bugzilla Report 54672

 * several places where resources are read from jars will now
   explicitly disable caching to avoid problems with reloading jars.
   Bugzilla Report 54473

 * AntClassloader will now ignore files that are part of the classpath
   but not zip files when scanning for resources.  It used to throw an
   exception.
   Bugzilla Report 53964

 * <javadoc> caused a NullPointerException when no destdir was set.
   Bugzilla Report 55949

 * <jar filesetmanifest="mergewithoutmain"> would still include the
   Main section of the fileset manifests if there was no nested
   manifest or manifest attribute.
   Bugzilla Report 54171

 * reading of compiler args has become more defensive
   Bugzilla Report 53754

 * <copy> without force="true" would not only fail to overwrite a
   read-only file as expected but also remove the existing file.
   Bugzilla Report 53095

 * <delete removeNotFollowedSymlinks="true"> would remove symbolic
   links to not-included files.  It will still delete symlinks to
   directories that would have been followed even if they are not
   explicitly included.  exclude-Patterns can still be used to
   preserve symbolic links.
   Bugzilla Report 53959

 * Sometimes copy-operations using NIO FileChannels fail.  Ant will
   now try to use a Stream based copy operation as fallback when the
   Channel based copy fails.
   Bugzilla Reports 53102 and 54397

 * Javadoc.postProcessGeneratedJavadocs() fails for Classes that
   extend Javadoc
   Bugzilla Report 56047

 * TarInputStream will now read archives created by tar
   implementations that encode big numbers by not adding a trailing
   NUL.

 * the isExists() method of URLResource returned false positives for
   HTTP and FTP URLs.

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

 * initial support for Java 1.9

 * <sshexec> can optionally pass System.in to the remote process
   Bugzilla Report 55393

 * <sshexec> now supports capturing error output of the executed
   process and setting a property from the return code.
   Bugzilla Report 48478

 * <javadoc> now has an option to fail if javadoc issues warnings.
   Bugzilla Report 55015

 * <sql> has a new outputencoding attribute.
   Bugzilla Report 39541

 * changes to JUnitTestRunner and PlainJUnitResultFormatter to make
   OutOfMemoryErrors less likely.
   Bugzilla Report 45536

 * changes to DOMElementWriter to make OutOfMemoryErrors less likely.
   Bugzilla Report 54147

 * <redirector> has a new attribute binaryOutput that prevents Ant
   from splitting the output into lines.  This prevents binary output
   from being corrupted but may lead to error and normal output being
   mixed up.
   Bugzilla Report 55667
   Bugzilla Report 56156

 * the nested <message> elements of <mail> now have an optional
   inputEncoding attribute that can be used to specify the encoding of
   files read that don't use the platform's default encoding.
   Bugzilla Report 56258

 * The <get> task now explicitly accepts and supports the gzip content encoding.
   Bugzilla Report 49453

 * A new resourcecollection type <multirootfileset> acts like a union
   of <fileset>s and <dirset>s that share the same configuration but
   have different base directories.
   Bugzilla Report 48621

 * <get> has a quiet attribute that makes the task log errors only
   when enabled.
   GitHub Pull Request #1

* <junit> has now a threads attribute allowing to run the tests in several threads.
  Bugzilla Report 55925

* addition of a new ProcessUtil class providing the process id of the current process

* changes to allow to run the JUnit testcases of Ant in parallel,
  by making them use unique temporary directories

4 files changed, 16 insertions, 9 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 71e8d5b6960..3401c8fa63f 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2014/05/02 12:16:38 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/05/07 18:23:31 wiz Exp $
 
-DISTNAME=	apache-ant-1.9.3-bin
+DISTNAME=	apache-ant-1.9.4-bin
 PKGNAME=	${DISTNAME:S/-bin//}
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=ant/binaries/}
diff --git a/devel/apache-ant/PLIST b/devel/apache-ant/PLIST
index d20bdf10e36..367ea93da01 100644
--- a/devel/apache-ant/PLIST
+++ b/devel/apache-ant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/05/02 12:16:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/05/07 18:23:31 wiz Exp $
 bin/ant
 bin/antRun
 lib/java/ant/ant-antlr.jar
@@ -198,6 +198,7 @@ share/doc/java/ant/Types/fileset.html
 share/doc/java/ant/Types/filterchain.html
 share/doc/java/ant/Types/filterset.html
 share/doc/java/ant/Types/mapper.html
+share/doc/java/ant/Types/multirootfileset.html
 share/doc/java/ant/Types/namespace.html
 share/doc/java/ant/Types/patternset.html
 share/doc/java/ant/Types/permissions.html
@@ -1212,6 +1213,8 @@ share/doc/java/ant/api/org/apache/tools/ant/types/resources/LazyResourceCollecti
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/LogOutputResource.html
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/MappedResource.html
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/MappedResourceCollection.html
+share/doc/java/ant/api/org/apache/tools/ant/types/resources/MultiRootFileSet.SetType.html
+share/doc/java/ant/api/org/apache/tools/ant/types/resources/MultiRootFileSet.html
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/PropertyResource.html
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/ResourceDecorator.html
 share/doc/java/ant/api/org/apache/tools/ant/types/resources/ResourceList.html
@@ -1359,12 +1362,14 @@ share/doc/java/ant/api/org/apache/tools/ant/util/LoaderUtils.html
 share/doc/java/ant/api/org/apache/tools/ant/util/MergingMapper.html
 share/doc/java/ant/api/org/apache/tools/ant/util/OutputStreamFunneler.html
 share/doc/java/ant/api/org/apache/tools/ant/util/PackageNameMapper.html
+share/doc/java/ant/api/org/apache/tools/ant/util/ProcessUtil.html
 share/doc/java/ant/api/org/apache/tools/ant/util/PropertyOutputStream.html
 share/doc/java/ant/api/org/apache/tools/ant/util/ProxySetup.html
 share/doc/java/ant/api/org/apache/tools/ant/util/ReaderInputStream.html
 share/doc/java/ant/api/org/apache/tools/ant/util/ReflectUtil.html
 share/doc/java/ant/api/org/apache/tools/ant/util/ReflectWrapper.html
 share/doc/java/ant/api/org/apache/tools/ant/util/RegexpPatternMapper.html
+share/doc/java/ant/api/org/apache/tools/ant/util/ResourceUtils.ReadOnlyTargetFileException.html
 share/doc/java/ant/api/org/apache/tools/ant/util/ResourceUtils.ResourceSelectorProvider.html
 share/doc/java/ant/api/org/apache/tools/ant/util/ResourceUtils.html
 share/doc/java/ant/api/org/apache/tools/ant/util/RetryHandler.html
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index c8b0799071a..97ec3271f82 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2014/05/02 12:16:38 wiz Exp $
+$NetBSD: distinfo,v 1.19 2014/05/07 18:23:31 wiz Exp $
 
-SHA1 (apache-ant-1.9.3-bin.tar.bz2) = efcf206e24b0dd1583c501182ad163af277951a4
-RMD160 (apache-ant-1.9.3-bin.tar.bz2) = 872597dcf59d64d7b2d6182ab78912ca3cb5f3a1
-Size (apache-ant-1.9.3-bin.tar.bz2) = 4320310 bytes
-SHA1 (patch-aa) = 7271790e4c59095db60473b3e559eaed360f233b
+SHA1 (apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
+RMD160 (apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
+Size (apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes
+SHA1 (patch-aa) = 18ce5479a9f8bb6011407661d710a26eb6d3e023
diff --git a/devel/apache-ant/patches/patch-aa b/devel/apache-ant/patches/patch-aa
index 40a773e72dc..3a9f6808ab6 100644
--- a/devel/apache-ant/patches/patch-aa
+++ b/devel/apache-ant/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2010/04/13 21:05:42 tonio Exp $
+$NetBSD: patch-aa,v 1.4 2014/05/07 18:23:31 wiz Exp $
+
+Initialize paths to appropriate defaults for pkgsrc.
 
 --- bin/ant.orig	2010-02-02 01:35:22.000000000 +0100
 +++ bin/ant	2010-04-13 22:52:56.000000000 +0200