--- a/components/ant/Makefile	Mon Jul 28 01:59:34 2014 -0700
+++ b/components/ant/Makefile	Tue May 27 03:24:03 2014 -0700
@@ -26,17 +26,17 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		ant
-COMPONENT_VERSION=	1.8.4
+COMPONENT_VERSION=	1.9.3
 COMPONENT_PROJECT_URL=	http://ant.apache.org/
 COMPONENT_SRC_NAME=	apache-ant
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1
+    sha256:eb9306e8b8322bb09b78cc3d8e288398f9cb657d76ffc61ee3fb175e786e8365
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/ant/source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/ant
 
-TPNO=			6147
+TPNO=			16382
 
 include ../../make-rules/prep.mk
 include ../../make-rules/justmake.mk

--- a/components/ant/ant.p5m	Mon Jul 28 01:59:34 2014 -0700
+++ b/components/ant/ant.p5m	Tue May 27 03:24:03 2014 -0700
@@ -155,7 +155,6 @@
 file path=usr/share/doc/ant/manual/Tasks/parallel.html
 file path=usr/share/doc/ant/manual/Tasks/patch.html
 file path=usr/share/doc/ant/manual/Tasks/pathconvert.html
-file path=usr/share/doc/ant/manual/Tasks/perforce.html
 file path=usr/share/doc/ant/manual/Tasks/presetdef.html
 file path=usr/share/doc/ant/manual/Tasks/projecthelper.html
 file path=usr/share/doc/ant/manual/Tasks/property.html
@@ -204,6 +203,7 @@
 file path=usr/share/doc/ant/manual/Tasks/untar.html
 file path=usr/share/doc/ant/manual/Tasks/unzip.html
 file path=usr/share/doc/ant/manual/Tasks/uptodate.html
+file path=usr/share/doc/ant/manual/Tasks/verifyjar.html
 file path=usr/share/doc/ant/manual/Tasks/vss.html
 file path=usr/share/doc/ant/manual/Tasks/waitfor.html
 file path=usr/share/doc/ant/manual/Tasks/war.html
@@ -250,6 +250,10 @@
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/AntClassLoader.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/AntTypeDefinition.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ArgumentProcessor.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ArgumentProcessorRegistry.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildEvent.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildException.html
@@ -257,6 +261,8 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildLogger.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ComponentHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DefaultDefinitions.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DefaultLogger.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DemuxInputStream.html
@@ -277,6 +283,10 @@
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicElement.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicElementNS.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicObjectAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Evaluable.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Executor.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ExitException.html
 file \
@@ -329,6 +339,30 @@
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/UnsupportedElementException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/XmlLogger.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/AttributeNamespace.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/BaseIfAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/EnableAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfBlankAttribute.Unless.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfBlankAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfSetAttribute.Unless.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfSetAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfTrueAttribute.Unless.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfTrueAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/package-tree.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/DispatchTask.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/DispatchUtils.html
@@ -511,6 +545,8 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/ProfileLogger.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/SilentLogger.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/SimpleBigProjectLogger.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/TimestampedLogger.html
@@ -579,6 +615,8 @@
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Apt.Option.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Apt.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AugmentReference.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Available.FileDir.html
@@ -609,6 +647,8 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CloseResources.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CommandLauncherTask.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Componentdef.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Concat.TextElement.html
@@ -936,6 +976,8 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison3.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison4.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLogger.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLoggerAware.html
@@ -948,6 +990,8 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Param.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.ParamType.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.TraceConfiguration.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.html
@@ -961,6 +1005,8 @@
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.UnicodeExtraField.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.WhenEmpty.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.Zip64ModeAttribute.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.html
@@ -1105,6 +1151,30 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-tree.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/CommandLauncherProxy.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/Java13CommandLauncher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/MacCommandLauncher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/OS2CommandLauncher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/PerlScriptCommandLauncher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/ScriptCommandLauncher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/WinNTCommandLauncher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/package-tree.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ANTLR.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Cab.html
@@ -1247,10 +1317,18 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InvokeDynamicCPInfo.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodHandleCPInfo.ReferenceKind.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodHandleCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.html
@@ -1489,6 +1567,8 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Constants.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.NodeFilter.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.NodeListImpl.html
@@ -1505,6 +1585,10 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.html
@@ -1545,6 +1629,10 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.html
 file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/TestIgnored.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/TestListenerWrapper.html
+file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.html
@@ -1647,56 +1735,6 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-tree.html
 file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputStream.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.P4SubmitAdapter.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-frame.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-summary.html
-file \
-    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-tree.html
-file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.html
@@ -2618,6 +2656,7 @@
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-tree.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarArchiveSparseEntry.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarBuffer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarConstants.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarEntry.html
@@ -2639,6 +2678,8 @@
     path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ExtraFieldUtils.UnparseableExtraField.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ExtraFieldUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/GeneralPurposeBit.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/JarMarker.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnicodeCommentExtraField.html
@@ -2649,6 +2690,22 @@
     path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnparseableExtraFieldData.html
 file \
     path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnrecognizedExtraField.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnsupportedZipFeatureException.Feature.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnsupportedZipFeatureException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/Zip64ExtendedInformationExtraField.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/Zip64Mode.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/Zip64RequiredException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipEightByteInteger.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipEncoding.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipEncodingHelper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipEntry.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipFile.html
@@ -2673,6 +2730,7 @@
 file path=usr/share/doc/ant/manual/api/resources/titlebar_end.gif
 file path=usr/share/doc/ant/manual/api/serialized-form.html
 file path=usr/share/doc/ant/manual/api/stylesheet.css
+file path=usr/share/doc/ant/manual/argumentprocessor.html
 file path=usr/share/doc/ant/manual/base_task_classes.html
 file path=usr/share/doc/ant/manual/clonevm.html
 file path=usr/share/doc/ant/manual/conceptstypeslist.html
@@ -2684,6 +2742,7 @@
 file path=usr/share/doc/ant/manual/favicon.ico
 file path=usr/share/doc/ant/manual/feedback.html
 file path=usr/share/doc/ant/manual/ide.html
+file path=usr/share/doc/ant/manual/ifunless.html
 file path=usr/share/doc/ant/manual/images/ant_logo_large.gif
 file path=usr/share/doc/ant/manual/index.html
 file path=usr/share/doc/ant/manual/inputhandler.html

--- a/components/ant/patches/tests.patch	Mon Jul 28 01:59:34 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-https://issues.apache.org/bugzilla/show_bug.cgi?id=50507#c10
-http://svn.apache.org/viewvc?view=revision&revision=1297113
-
---- trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java	2012/03/05 16:08:43	1297112
-+++ trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java	2012/03/05 16:09:56	1297113
-@@ -103,10 +103,12 @@
-         logFile = new File(logFile.getAbsolutePath());
-         assertTrue("log file found after spawn", logFile.exists());
-     }
--    
-+
-+    /* XXX #50507 - fails at least on Linux
-     public void testOutAndErr() {
-         project.executeTarget("test-out-and-err");
-     }
-+    */
- 
-     private static class MonitoredBuild implements Runnable {
-         private Thread worker;