Upgrade to 1.5.0.

6 files changed, 16 insertions, 12 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index a6e42f1..4de3ddf 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-ant
-PORTVERSION=	1.5.0.b3
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	devel java
 MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \
 		http://www.metaverse.nl/~ernst/ \
@@ -28,7 +27,7 @@ PLIST_SUB+=	T=${PORTDESTDIR:S/^${PREFIX}\///}
 
 READMES=	LICENSE README WHATSNEW
 SCRIPTS=	bin/ant bin/antRun bin/runant.pl
-ANT_VERSION=	1.5Beta3
+ANT_VERSION=	1.5
 
 DATADIRS=	lib
 .if !defined(NOPORTDOCS)
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index 654a107..b99fcad 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1 +1 @@
-MD5 (jakarta/jakarta-ant-1.5Beta3-bin.tar.gz) = 1f6e115b5807ca3a80751873882b3e19
+MD5 (jakarta/jakarta-ant-1.5-bin.tar.gz) = 937abba9d58e75134a1124a1cbb86610
diff --git a/devel/apache-ant/pkg-plist b/devel/apache-ant/pkg-plist
index c2ddefb..54df9e0 100644
--- a/devel/apache-ant/pkg-plist
+++ b/devel/apache-ant/pkg-plist
@@ -548,9 +548,10 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/LogOutputStream.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/LogStreamHandler.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Attribute.html
-%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Mode.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Section.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestException.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.Mode.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/MatchingTask.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Mkdir.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Move.html
@@ -609,6 +610,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLogger.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLoggerAware.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.OutputProperty.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Param.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.Duplicate.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.html
@@ -751,13 +753,14 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/BuildLogger.html
 %%T%%/docs/manual/api/org/apache/tools/ant/DefaultLogger.html
 %%T%%/docs/manual/api/org/apache/tools/ant/DemuxOutputStream.html
+%%T%%/docs/manual/api/org/apache/tools/ant/Diagnostics.html
 %%T%%/docs/manual/api/org/apache/tools/ant/DirectoryScanner.html
 %%T%%/docs/manual/api/org/apache/tools/ant/DynamicConfigurator.html
 %%T%%/docs/manual/api/org/apache/tools/ant/ExitException.html
 %%T%%/docs/manual/api/org/apache/tools/ant/FileScanner.html
+%%T%%/docs/manual/api/org/apache/tools/ant/Main.html
 %%T%%/docs/manual/api/org/apache/tools/ant/IntrospectionHelper.html
 %%T%%/docs/manual/api/org/apache/tools/ant/Location.html
-%%T%%/docs/manual/api/org/apache/tools/ant/Main.html
 %%T%%/docs/manual/api/org/apache/tools/ant/NoBannerLogger.html
 %%T%%/docs/manual/api/org/apache/tools/ant/package-frame.html
 %%T%%/docs/manual/api/org/apache/tools/ant/package-summary.html
diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile
index a6e42f1..4de3ddf 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-ant
-PORTVERSION=	1.5.0.b3
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	devel java
 MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \
 		http://www.metaverse.nl/~ernst/ \
@@ -28,7 +27,7 @@ PLIST_SUB+=	T=${PORTDESTDIR:S/^${PREFIX}\///}
 
 READMES=	LICENSE README WHATSNEW
 SCRIPTS=	bin/ant bin/antRun bin/runant.pl
-ANT_VERSION=	1.5Beta3
+ANT_VERSION=	1.5
 
 DATADIRS=	lib
 .if !defined(NOPORTDOCS)
diff --git a/devel/jakarta-ant/distinfo b/devel/jakarta-ant/distinfo
index 654a107..b99fcad 100644
--- a/devel/jakarta-ant/distinfo
+++ b/devel/jakarta-ant/distinfo
@@ -1 +1 @@
-MD5 (jakarta/jakarta-ant-1.5Beta3-bin.tar.gz) = 1f6e115b5807ca3a80751873882b3e19
+MD5 (jakarta/jakarta-ant-1.5-bin.tar.gz) = 937abba9d58e75134a1124a1cbb86610
diff --git a/devel/jakarta-ant/pkg-plist b/devel/jakarta-ant/pkg-plist
index c2ddefb..54df9e0 100644
--- a/devel/jakarta-ant/pkg-plist
+++ b/devel/jakarta-ant/pkg-plist
@@ -548,9 +548,10 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/LogOutputStream.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/LogStreamHandler.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Attribute.html
-%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Mode.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Section.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestException.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.Mode.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/MatchingTask.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Mkdir.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Move.html
@@ -609,6 +610,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLogger.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLoggerAware.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.OutputProperty.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Param.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.Duplicate.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.html
@@ -751,13 +753,14 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/BuildLogger.html
 %%T%%/docs/manual/api/org/apache/tools/ant/DefaultLogger.html
 %%T%%/docs/manual/api/org/apache/tools/ant/DemuxOutputStream.html
+%%T%%/docs/manual/api/org/apache/tools/ant/Diagnostics.html
 %%T%%/docs/manual/api/org/apache/tools/ant/DirectoryScanner.html
 %%T%%/docs/manual/api/org/apache/tools/ant/DynamicConfigurator.html
 %%T%%/docs/manual/api/org/apache/tools/ant/ExitException.html
 %%T%%/docs/manual/api/org/apache/tools/ant/FileScanner.html
+%%T%%/docs/manual/api/org/apache/tools/ant/Main.html
 %%T%%/docs/manual/api/org/apache/tools/ant/IntrospectionHelper.html
 %%T%%/docs/manual/api/org/apache/tools/ant/Location.html
-%%T%%/docs/manual/api/org/apache/tools/ant/Main.html
 %%T%%/docs/manual/api/org/apache/tools/ant/NoBannerLogger.html
 %%T%%/docs/manual/api/org/apache/tools/ant/package-frame.html
 %%T%%/docs/manual/api/org/apache/tools/ant/package-summary.html