Update devel/apache-ant to 1.8.1

Fixes PR pkg/43752

Changes from Ant 1.8.0 TO Ant 1.8.1:
- Changes that could break older environments:
 * ant-trax.jar is no longer produced since TrAX is included in JDK 1.4+.
 * Ant no longer ships with Apache Xerces-J or the XML APIs but relies
   on the Java runtime to provide a parser and matching API versions.
 * The stylebook ant task and the ant-stylebook.jar are removed.

- Fixed bugs:
 * Tasks that iterate over task or type definitions, references or
   targets now iterate over copies instead of the live maps to avoid
   ConcurrentModificationExceptions if another thread changes the
   maps.
 * The filesmatch condition threw a NullPointerException when
   comparing text files and the second file contained fewer lines than
   the first one.
 * Regression: The <ear> task would allow multiple
   META-INF/application.xml files to be added.
 * VectorSet#remove(Object) would fail if the size of the vector
   equaled its capacity.
 * Regression : ant -diagnostics was returning with exit code 1
 * Fix for exec task sometimes inserts extraneous newlines
 * SymlinkTest#testSymbolicLinkUtilsMethods failing on MacOS
 * If <concat>'s first resourcecollection child is a <resources>,
   any subsequently added child resourcecollection joins the first.
 * <get> with an invalid URL could trigger an NPE in some JVMs.
 * Broken Pipe issue under Ubuntu Linux
 * Properties wrongly read from file or not update during read
 * AntClassLoader in Ant 1.8.0 has been considerably slower than in
   1.7.1
 * ANT_CMD_LINE_ARGS are rippling through lower level Ant usage
 * email : IO error sending mail with plain mimetype
 * the complete-ant-cmd.pl script failed to create a proper cache of
   target if "ant -p" failed.
 * <rmic>'s sourcebase attribute was broken.
 * <copy>'s failonerror didn't work as expected when copying a single
   element resource collection to a file.
 * <get> no longer followed redirects if the redirect URL was relative
   and not an absolute URL.
 * fixed a performance degradation in the code that expands property
   references.
 * <jar filesetmanifest="merge"> was broken on Windows.
 * <symlink> delete failed if the link attribute was a relative path
   to a link inside the current directory without a leading ".".
 * <telnet> and <rexec> failed to find the expected strings when
   waiting for responses and thus always failed.

- Other changes:
 * Project provides new get methods that return copies instead of the
   live maps of task and type definitions, references and targets.
 * Ant is now more lenient with ZIP extra fields and will be able to
   read archives that it failed to read in earlier versions.
 * The <zip> family of tasks has been sped up for bigger archives.
 * Add removeKeepExtension option to NetRexxC task.
 * Add prefix attribute to loadproperties task.
 * Add resource attribute to length task.
 * PropertyResource will effectively proxy another Resource if ${name}
   evaluates to a Resource object.
 * Added forcestring attribute to equals condition to force evaluation
   of Object args as strings; previously only API-level usage of the
   equals condition allowed Object args, but Ant 1.8.x+ property
   evaluation may yield values of any type.
 * BuildFileTest.assertPropertyUnset() fails with a slightly more
   meaningful error message
 * <junit> will now throw an exception if a test name is empty.  This
   used to manifest itself in unrelated errors like
 * A change that made <exec> more reliable on Windows (Bugzilla Report
   5003) strongly impacts the performance for commands that execute
   quickly, like attrib.  Basically no single execution of a command
   could take less than a second on Windows.
   A few timeouts have been tweaked to allow these commands to finish
   more quickly but still they will take longer than they did with Ant
   1.7.1.
 * Added SimpleBigProjectLogger, intermediate between NoBannerLogger and
   BigProjectLogger.
 * <mappedresources> supports new attributes enablemultiplemappings
   and cache.
 * Added the augment task to manipulate existing references via Ant's basic
   introspection mechanisms.

3 files changed, 21 insertions, 19 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 54df5b9e066..285aec48a20 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,22 +1,25 @@
-# $NetBSD: Makefile,v 1.27 2010/04/13 21:05:41 tonio Exp $
+# $NetBSD: Makefile,v 1.28 2010/12/05 10:05:06 tonio Exp $
 #
 
-DISTNAME=	apache-ant-1.8.0
-#PKGREVISION=	1
+DISTNAME=	apache-ant-1.8.1-bin
+PKGNAME=	${DISTNAME:S/-bin//}
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=ant/binaries/}
 EXTRACT_SUFX=	.tar.bz2
-DISTFILES=	${DISTNAME}-bin${EXTRACT_SUFX}
 
 MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	http://ant.apache.org/
-COMMENT=	Apache Project's Java-Based make(1) replacement
+COMMENT=	"Apache Project's Java-Based make(1) replacement"
+
+LICENSE=	apache-2.0
 
 # Up to version 1.5.1 inclusive this was known as "jakarta-ant".
 CONFLICTS=	jakarta-ant>=0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+WRKSRC=		${WRKDIR}/${PKGNAME}
+
 USE_JAVA=	run
 USE_JAVA2=	yes
 USE_TOOLS+=	pax
@@ -35,8 +38,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/lib/ant.jar ${DESTDIR}${PREFIX}/lib/java/ant
 	${INSTALL_DATA} ${WRKSRC}/lib/ant-*.jar ${DESTDIR}${PREFIX}/lib/java/ant
-	${INSTALL_DATA} ${WRKSRC}/lib/xercesImpl.jar ${DESTDIR}${PREFIX}/lib/java/ant
-	${INSTALL_DATA} ${WRKSRC}/lib/xml-apis.jar ${DESTDIR}${PREFIX}/lib/java/ant
 	cd ${WRKSRC}/docs && pax -rw -pmp * ${DESTDIR}${PREFIX}/share/doc/java/ant
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/java/ant
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${DESTDIR}${PREFIX}/share/doc/java/ant
diff --git a/devel/apache-ant/PLIST b/devel/apache-ant/PLIST
index e864362afcd..50ae40df529 100644
--- a/devel/apache-ant/PLIST
+++ b/devel/apache-ant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2010/04/13 21:05:41 tonio Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/12/05 10:05:06 tonio Exp $
 bin/ant
 bin/antRun
 lib/java/ant/ant-antlr.jar
@@ -20,13 +20,9 @@ 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-stylebook.jar
 lib/java/ant/ant-swing.jar
 lib/java/ant/ant-testutil.jar
-lib/java/ant/ant-trax.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
@@ -96,6 +92,7 @@ share/doc/java/ant/manual/CoreTasks/antstructure.html
 share/doc/java/ant/manual/CoreTasks/antversion.html
 share/doc/java/ant/manual/CoreTasks/apply.html
 share/doc/java/ant/manual/CoreTasks/apt.html
+share/doc/java/ant/manual/CoreTasks/augment.html
 share/doc/java/ant/manual/CoreTasks/available.html
 share/doc/java/ant/manual/CoreTasks/basename.html
 share/doc/java/ant/manual/CoreTasks/buildnumber.html
@@ -265,7 +262,6 @@ 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
@@ -425,6 +421,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/listener/CommonsLoggingListen
 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/SimpleBigProjectLogger.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
@@ -460,6 +457,7 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Antlib.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/AntlibDefinition.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Apt.Option.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Apt.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/AugmentReference.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Available.FileDir.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Available.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/BUnzip2.html
@@ -749,7 +747,6 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Rpm.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/SchemaValidate.SchemaLocation.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/SchemaValidate.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Script.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/StyleBook.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/TraXLiaison.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Attribute.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Property.html
@@ -950,7 +947,6 @@ share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/TearD
 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
-share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-tree.html
@@ -1495,11 +1491,13 @@ 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.UnparseableExtraField.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/UnparseableExtraFieldData.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
@@ -1508,6 +1506,7 @@ 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/ZipUtil.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/package-frame.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/package-summary.html
 share/doc/java/ant/manual/api/org/apache/tools/zip/package-tree.html
@@ -1570,6 +1569,8 @@ 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/local.cgi
+share/doc/java/ant/webtest/gettest/testlocal.txt
 share/doc/java/ant/webtest/gettest/testother.txt
 share/doc/java/ant/webtest/gettest/testperm.txt
 share/doc/java/ant/webtest/gettest/testredir5.txt
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index 29dccd3b08f..68901f01909 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2010/04/13 21:05:42 tonio Exp $
+$NetBSD: distinfo,v 1.12 2010/12/05 10:05:06 tonio Exp $
 
-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 (apache-ant-1.8.1-bin.tar.bz2) = 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1
+RMD160 (apache-ant-1.8.1-bin.tar.bz2) = 2666bd4ca16228a09a7c696cdb7c6108404f21b5
+Size (apache-ant-1.8.1-bin.tar.bz2) = 6702817 bytes
 SHA1 (patch-aa) = 7271790e4c59095db60473b3e559eaed360f233b