Upgrade from 1.5.0.b1 to 1.5.0.b2.

See:
http://jakarta.apache.org/builds/jakarta-ant/release/v1.5Beta2/

6 files changed, 40 insertions, 22 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index ee1b892d97d1..e7e0d043976c 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-ant
-PORTVERSION=	1.5.0.b1
+PORTVERSION=	1.5.0.b2
 CATEGORIES=	devel java
 MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \
 		http://www.metaverse.nl/~ernst/
@@ -25,7 +25,7 @@ PLIST_SUB+=	T=${PORTDESTDIR:S/^${PREFIX}\///}
 
 READMES=	LICENSE README WHATSNEW
 SCRIPTS=	bin/ant bin/antRun bin/runant.pl
-ANT_VERSION=	1.5Beta1
+ANT_VERSION=	1.5Beta2
 
 DATADIRS=	lib
 .if !defined(NOPORTDOCS)
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index a2a255db78e1..5d813be45264 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1 +1 @@
-MD5 (jakarta/jakarta-ant-1.5Beta1-bin.tar.gz) = 0dfc58ef4a7d603df7212ef8ea1e0f1c
+MD5 (jakarta/jakarta-ant-1.5Beta2-bin.tar.gz) = 797f2468b63acd568340d0cdc01932ff
diff --git a/devel/apache-ant/pkg-plist b/devel/apache-ant/pkg-plist
index ad68c21e9c9b..7e9dc1a27721 100644
--- a/devel/apache-ant/pkg-plist
+++ b/devel/apache-ant/pkg-plist
@@ -3,12 +3,12 @@ bin/ant
 %%T%%/bin/antRun
 %%T%%/bin/runant.pl
 %%T%%/lib/ant.jar
-%%T%%/lib/jaxp.jar
-%%T%%/lib/crimson.jar
-%%T%%/lib/README
 %%T%%/lib/optional.jar
+%%T%%/lib/README
 %%T%%/lib/xercesImpl.jar
-%%T%%/lib/xmlParserAPIs.jar
+%%T%%/lib/xml-apis.jar
+%%T%%/lib/jaxp.jar
+%%T%%/lib/crimson.jar
 %%T%%/LICENSE
 %%T%%/README
 %%T%%/WHATSNEW
@@ -196,12 +196,13 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-frame.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-summary.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-tree.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.html
-%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatability.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Extension.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.html
@@ -643,6 +644,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SelectorContainer.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SelectorScanner.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SelectorUtils.html
+%%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SelectSelector.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.ByteUnits.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.SizeComparisons.html
@@ -860,6 +862,7 @@ bin/ant
 %%T%%/docs/manual/CoreTasks/loadfile.html
 %%T%%/docs/manual/CoreTasks/loadproperties.html
 %%T%%/docs/manual/CoreTasks/mail.html
+%%T%%/docs/manual/CoreTasks/mail.html.orig
 %%T%%/docs/manual/CoreTasks/manifest.html
 %%T%%/docs/manual/CoreTasks/mkdir.html
 %%T%%/docs/manual/CoreTasks/move.html
@@ -879,6 +882,7 @@ bin/ant
 %%T%%/docs/manual/CoreTasks/style.html
 %%T%%/docs/manual/CoreTasks/tar.html
 %%T%%/docs/manual/CoreTasks/taskdef.html
+%%T%%/docs/manual/CoreTasks/tempfile.html
 %%T%%/docs/manual/CoreTasks/touch.html
 %%T%%/docs/manual/CoreTasks/tstamp.html
 %%T%%/docs/manual/CoreTasks/typedef.html
@@ -898,6 +902,8 @@ bin/ant
 %%T%%/docs/manual/CoreTypes/filterset.html
 %%T%%/docs/manual/CoreTypes/mapper.html
 %%T%%/docs/manual/CoreTypes/patternset.html
+%%T%%/docs/manual/CoreTypes/selectors-program.html
+%%T%%/docs/manual/CoreTypes/selectors.html
 %%T%%/docs/manual/CoreTypes/xmlcatalog.html
 %%T%%/docs/manual/Integration/Antidote.html
 %%T%%/docs/manual/Integration/anttool1.gif
@@ -940,6 +946,7 @@ bin/ant
 %%T%%/docs/manual/OptionalTasks/rpm.html
 %%T%%/docs/manual/OptionalTasks/script.html
 %%T%%/docs/manual/OptionalTasks/serverdeploy.html
+%%T%%/docs/manual/OptionalTasks/setproxy.html
 %%T%%/docs/manual/OptionalTasks/sos.html
 %%T%%/docs/manual/OptionalTasks/sound.html
 %%T%%/docs/manual/OptionalTasks/splash.html
@@ -947,12 +954,14 @@ bin/ant
 %%T%%/docs/manual/OptionalTasks/stylebook.html
 %%T%%/docs/manual/OptionalTasks/telnet.html
 %%T%%/docs/manual/OptionalTasks/test.html
-%%T%%/docs/manual/OptionalTasks/vss.html
 %%T%%/docs/manual/OptionalTasks/translate.html
+%%T%%/docs/manual/OptionalTasks/vss.html
 %%T%%/docs/manual/OptionalTasks/wljspc.html
 %%T%%/docs/manual/OptionalTasks/xmlvalidate.html
 %%T%%/docs/manual/OptionalTypes/classfileset.html
+%%T%%/docs/manual/antexternal.html
 %%T%%/docs/manual/anttaskslist.html
+%%T%%/docs/manual/base_task_classes.html
 %%T%%/docs/manual/conceptstypeslist.html
 %%T%%/docs/manual/coretasklist.html
 %%T%%/docs/manual/cover.html
@@ -964,11 +973,11 @@ bin/ant
 %%T%%/docs/manual/feedback.html
 %%T%%/docs/manual/ide.html
 %%T%%/docs/manual/index.html
+%%T%%/docs/manual/LICENSE
 %%T%%/docs/manual/inputhandler.html
 %%T%%/docs/manual/install.html
-%%T%%/docs/manual/intro.html
 %%T%%/docs/manual/installlist.html
-%%T%%/docs/manual/LICENSE
+%%T%%/docs/manual/intro.html
 %%T%%/docs/manual/listeners.html
 %%T%%/docs/manual/optionaltasklist.html
 %%T%%/docs/manual/platform.html
diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile
index ee1b892d97d1..e7e0d043976c 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-ant
-PORTVERSION=	1.5.0.b1
+PORTVERSION=	1.5.0.b2
 CATEGORIES=	devel java
 MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \
 		http://www.metaverse.nl/~ernst/
@@ -25,7 +25,7 @@ PLIST_SUB+=	T=${PORTDESTDIR:S/^${PREFIX}\///}
 
 READMES=	LICENSE README WHATSNEW
 SCRIPTS=	bin/ant bin/antRun bin/runant.pl
-ANT_VERSION=	1.5Beta1
+ANT_VERSION=	1.5Beta2
 
 DATADIRS=	lib
 .if !defined(NOPORTDOCS)
diff --git a/devel/jakarta-ant/distinfo b/devel/jakarta-ant/distinfo
index a2a255db78e1..5d813be45264 100644
--- a/devel/jakarta-ant/distinfo
+++ b/devel/jakarta-ant/distinfo
@@ -1 +1 @@
-MD5 (jakarta/jakarta-ant-1.5Beta1-bin.tar.gz) = 0dfc58ef4a7d603df7212ef8ea1e0f1c
+MD5 (jakarta/jakarta-ant-1.5Beta2-bin.tar.gz) = 797f2468b63acd568340d0cdc01932ff
diff --git a/devel/jakarta-ant/pkg-plist b/devel/jakarta-ant/pkg-plist
index ad68c21e9c9b..7e9dc1a27721 100644
--- a/devel/jakarta-ant/pkg-plist
+++ b/devel/jakarta-ant/pkg-plist
@@ -3,12 +3,12 @@ bin/ant
 %%T%%/bin/antRun
 %%T%%/bin/runant.pl
 %%T%%/lib/ant.jar
-%%T%%/lib/jaxp.jar
-%%T%%/lib/crimson.jar
-%%T%%/lib/README
 %%T%%/lib/optional.jar
+%%T%%/lib/README
 %%T%%/lib/xercesImpl.jar
-%%T%%/lib/xmlParserAPIs.jar
+%%T%%/lib/xml-apis.jar
+%%T%%/lib/jaxp.jar
+%%T%%/lib/crimson.jar
 %%T%%/LICENSE
 %%T%%/README
 %%T%%/WHATSNEW
@@ -196,12 +196,13 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-frame.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-summary.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-tree.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.html
-%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatability.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Extension.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.html
@@ -643,6 +644,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SelectorContainer.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SelectorScanner.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SelectorUtils.html
+%%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SelectSelector.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.ByteUnits.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.SizeComparisons.html
@@ -860,6 +862,7 @@ bin/ant
 %%T%%/docs/manual/CoreTasks/loadfile.html
 %%T%%/docs/manual/CoreTasks/loadproperties.html
 %%T%%/docs/manual/CoreTasks/mail.html
+%%T%%/docs/manual/CoreTasks/mail.html.orig
 %%T%%/docs/manual/CoreTasks/manifest.html
 %%T%%/docs/manual/CoreTasks/mkdir.html
 %%T%%/docs/manual/CoreTasks/move.html
@@ -879,6 +882,7 @@ bin/ant
 %%T%%/docs/manual/CoreTasks/style.html
 %%T%%/docs/manual/CoreTasks/tar.html
 %%T%%/docs/manual/CoreTasks/taskdef.html
+%%T%%/docs/manual/CoreTasks/tempfile.html
 %%T%%/docs/manual/CoreTasks/touch.html
 %%T%%/docs/manual/CoreTasks/tstamp.html
 %%T%%/docs/manual/CoreTasks/typedef.html
@@ -898,6 +902,8 @@ bin/ant
 %%T%%/docs/manual/CoreTypes/filterset.html
 %%T%%/docs/manual/CoreTypes/mapper.html
 %%T%%/docs/manual/CoreTypes/patternset.html
+%%T%%/docs/manual/CoreTypes/selectors-program.html
+%%T%%/docs/manual/CoreTypes/selectors.html
 %%T%%/docs/manual/CoreTypes/xmlcatalog.html
 %%T%%/docs/manual/Integration/Antidote.html
 %%T%%/docs/manual/Integration/anttool1.gif
@@ -940,6 +946,7 @@ bin/ant
 %%T%%/docs/manual/OptionalTasks/rpm.html
 %%T%%/docs/manual/OptionalTasks/script.html
 %%T%%/docs/manual/OptionalTasks/serverdeploy.html
+%%T%%/docs/manual/OptionalTasks/setproxy.html
 %%T%%/docs/manual/OptionalTasks/sos.html
 %%T%%/docs/manual/OptionalTasks/sound.html
 %%T%%/docs/manual/OptionalTasks/splash.html
@@ -947,12 +954,14 @@ bin/ant
 %%T%%/docs/manual/OptionalTasks/stylebook.html
 %%T%%/docs/manual/OptionalTasks/telnet.html
 %%T%%/docs/manual/OptionalTasks/test.html
-%%T%%/docs/manual/OptionalTasks/vss.html
 %%T%%/docs/manual/OptionalTasks/translate.html
+%%T%%/docs/manual/OptionalTasks/vss.html
 %%T%%/docs/manual/OptionalTasks/wljspc.html
 %%T%%/docs/manual/OptionalTasks/xmlvalidate.html
 %%T%%/docs/manual/OptionalTypes/classfileset.html
+%%T%%/docs/manual/antexternal.html
 %%T%%/docs/manual/anttaskslist.html
+%%T%%/docs/manual/base_task_classes.html
 %%T%%/docs/manual/conceptstypeslist.html
 %%T%%/docs/manual/coretasklist.html
 %%T%%/docs/manual/cover.html
@@ -964,11 +973,11 @@ bin/ant
 %%T%%/docs/manual/feedback.html
 %%T%%/docs/manual/ide.html
 %%T%%/docs/manual/index.html
+%%T%%/docs/manual/LICENSE
 %%T%%/docs/manual/inputhandler.html
 %%T%%/docs/manual/install.html
-%%T%%/docs/manual/intro.html
 %%T%%/docs/manual/installlist.html
-%%T%%/docs/manual/LICENSE
+%%T%%/docs/manual/intro.html
 %%T%%/docs/manual/listeners.html
 %%T%%/docs/manual/optionaltasklist.html
 %%T%%/docs/manual/platform.html