Upgrade to 1.5.2. From this version on, this tool is called

'Apache Ant' instead of 'Jakarta Ant'.

8 files changed, 102 insertions, 30 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 8c07ede9b5f5..c63b0a3bb43f 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,26 +1,25 @@
-# New ports collection makefile for:	jakarta-ant
+# New ports collection makefile for:	apache-ant
 # Date created:		21 February 2001
 # Whom:			znerd@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-PORTNAME=	jakarta-ant
-PORTVERSION=	1.5.1
-PORTREVISION=	5
+PORTNAME=	apache-ant
+PORTVERSION=	1.5.2
 CATEGORIES=	devel java
-MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \
-		http://www.metaverse.nl/~ernst/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	znerd
+MASTER_SITES=	http://apache.mirror.trueserver.nl/dist/ant/binaries/ \
+		http://apache.proserve.nl/dist/ant/binaries/ \
+		http://apache.cs.uu.nl/dist/ant/binaries/ \
+		http://dist.apache.easynet.nl/ant/binaries/
 DISTNAME=	${PORTNAME}-${ANT_VERSION}-bin
-DIST_SUBDIR=	jakarta
 
 MAINTAINER=	znerd@FreeBSD.org
-COMMENT=	Java-based build tool, conceptually similar to make
+COMMENT=	Java- and XML-based build tool, conceptually similar to make
 
 RUN_DEPENDS=	${LOCALBASE}/share/java/classes/crimson.jar:${PORTSDIR}/textproc/crimson
 
+USE_BZIP2=	yes
 USE_JAVA=	1.2+
 
 NO_BUILD=	YES
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index 2cb756b455c8..bf36f8fd6db8 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1 +1 @@
-MD5 (jakarta/jakarta-ant-1.5.1-bin.tar.gz) = 2be27d9e09011bf1cc3d1967ee34f7d1
+MD5 (apache-ant-1.5.2-bin.tar.bz2) = f91504b3af51358c034fb926f4ce9895
diff --git a/devel/apache-ant/pkg-descr b/devel/apache-ant/pkg-descr
index 4b89594557d0..5a6712a314de 100644
--- a/devel/apache-ant/pkg-descr
+++ b/devel/apache-ant/pkg-descr
@@ -1,4 +1,4 @@
-Ant is a Java-based build tool, conceptually similar to make.
+Apache Ant, a Java-based build tool, conceptually similar to make.
 
 Ant uses XML build files that defines a set of targets. Each target
 has dependencies (other targets) and contains a set of tasks to
@@ -9,4 +9,4 @@ copying ("copy"), deleting ("delete"), executing other programs
 ("java", "exec", "execon", etc.), stylesheet transformations
 ("style") and so on.
 
-WWW: http://jakarta.apache.org/ant/
+WWW: http://ant.apache.org/
diff --git a/devel/apache-ant/pkg-plist b/devel/apache-ant/pkg-plist
index be827d21f6c7..a3de40290a0b 100644
--- a/devel/apache-ant/pkg-plist
+++ b/devel/apache-ant/pkg-plist
@@ -19,9 +19,23 @@ bin/ant
 %%T%%/docs/images/ant_logo_large.gif
 %%T%%/docs/images/ant_logo_medium.gif
 %%T%%/docs/images/ant_logo_small.gif
-%%T%%/docs/images/jakarta-logo.gif
+%%T%%/docs/images/current.gif
+%%T%%/docs/images/group-logo.gif
 %%T%%/docs/images/jw_ec_logo_winner2002.gif
+%%T%%/docs/images/label.gif
+%%T%%/docs/images/menu-left.gif
+%%T%%/docs/images/menu-right.gif
+%%T%%/docs/images/page.gif
+%%T%%/docs/images/printer.gif
+%%T%%/docs/images/project-logo.gif
 %%T%%/docs/images/sdm_productivity_award.gif
+%%T%%/docs/images/search-left.gif
+%%T%%/docs/images/search-right.gif
+%%T%%/docs/images/spacer.gif
+%%T%%/docs/images/tab-left.gif
+%%T%%/docs/images/tab-right.gif
+%%T%%/docs/images/tabSel-left.gif
+%%T%%/docs/images/tabSel-right.gif
 %%T%%/docs/manual/api/org/apache/tools/ant/filters/util/ChainReaderHelper.html
 %%T%%/docs/manual/api/org/apache/tools/ant/filters/util/JavaClassHelper.html
 %%T%%/docs/manual/api/org/apache/tools/ant/filters/util/package-frame.html
@@ -267,6 +281,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-frame.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-summary.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-tree.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.WebAppParameter.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.html
@@ -332,6 +347,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.Reader.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.html
@@ -417,6 +433,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.UnmatchedFileMap.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.html
@@ -681,6 +698,8 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/types/PatternSet.NameEntry.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/Reference.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/RegularExpression.html
+%%T%%/docs/manual/api/org/apache/tools/ant/types/Resource.html
+%%T%%/docs/manual/api/org/apache/tools/ant/types/ResourceFactory.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/Substitution.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/XMLCatalog.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/ZipFileSet.html
@@ -737,6 +756,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/util/package-tree.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/PackageNameMapper.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/RegexpPatternMapper.html
+%%T%%/docs/manual/api/org/apache/tools/ant/util/ResourceUtils.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/SourceFileScanner.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/StringUtils.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/TaskLogger.html
@@ -861,7 +881,6 @@ 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
@@ -993,15 +1012,30 @@ bin/ant
 %%T%%/docs/manual/toc.html
 %%T%%/docs/manual/using.html
 %%T%%/docs/manual/usinglist.html
+%%T%%/docs/projects/antidote/images/screenshot.jpg
+%%T%%/docs/projects/antidote/design.html
+%%T%%/docs/projects/antidote/index.html
+%%T%%/docs/projects/antidote/module.html
+%%T%%/docs/projects/index.html
 %%T%%/docs/ant15_todo.html
 %%T%%/docs/antnews.html
 %%T%%/docs/ant_in_anger.html
 %%T%%/docs/ant_task_guidelines.html
 %%T%%/docs/appendix_e.pdf
+%%T%%/docs/breadcrumbs.js
+%%T%%/docs/contributors.html
+%%T%%/docs/cvs.html
 %%T%%/docs/external.html
 %%T%%/docs/faq.html
+%%T%%/docs/guidelines.html
 %%T%%/docs/index.html
+%%T%%/docs/legal.html
+%%T%%/docs/LICENSE
+%%T%%/docs/license.html
 %%T%%/docs/logocontest.html
+%%T%%/docs/mail.html
+%%T%%/docs/mission.html
+%%T%%/docs/page.css
 %%T%%/docs/problems.html
 %%T%%/docs/projects.html
 %%T%%/docs/resources.html
@@ -1076,5 +1110,8 @@ bin/ant
 @dirrm %%T%%/docs/manual/OptionalTasks
 @dirrm %%T%%/docs/manual/OptionalTypes
 @dirrm %%T%%/docs/manual
+@dirrm %%T%%/docs/projects/antidote/images
+@dirrm %%T%%/docs/projects/antidote
+@dirrm %%T%%/docs/projects
 @dirrm %%T%%/docs
 @dirrm %%T%%
diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile
index 8c07ede9b5f5..c63b0a3bb43f 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -1,26 +1,25 @@
-# New ports collection makefile for:	jakarta-ant
+# New ports collection makefile for:	apache-ant
 # Date created:		21 February 2001
 # Whom:			znerd@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-PORTNAME=	jakarta-ant
-PORTVERSION=	1.5.1
-PORTREVISION=	5
+PORTNAME=	apache-ant
+PORTVERSION=	1.5.2
 CATEGORIES=	devel java
-MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${ANT_VERSION}/bin/ \
-		http://www.metaverse.nl/~ernst/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	znerd
+MASTER_SITES=	http://apache.mirror.trueserver.nl/dist/ant/binaries/ \
+		http://apache.proserve.nl/dist/ant/binaries/ \
+		http://apache.cs.uu.nl/dist/ant/binaries/ \
+		http://dist.apache.easynet.nl/ant/binaries/
 DISTNAME=	${PORTNAME}-${ANT_VERSION}-bin
-DIST_SUBDIR=	jakarta
 
 MAINTAINER=	znerd@FreeBSD.org
-COMMENT=	Java-based build tool, conceptually similar to make
+COMMENT=	Java- and XML-based build tool, conceptually similar to make
 
 RUN_DEPENDS=	${LOCALBASE}/share/java/classes/crimson.jar:${PORTSDIR}/textproc/crimson
 
+USE_BZIP2=	yes
 USE_JAVA=	1.2+
 
 NO_BUILD=	YES
diff --git a/devel/jakarta-ant/distinfo b/devel/jakarta-ant/distinfo
index 2cb756b455c8..bf36f8fd6db8 100644
--- a/devel/jakarta-ant/distinfo
+++ b/devel/jakarta-ant/distinfo
@@ -1 +1 @@
-MD5 (jakarta/jakarta-ant-1.5.1-bin.tar.gz) = 2be27d9e09011bf1cc3d1967ee34f7d1
+MD5 (apache-ant-1.5.2-bin.tar.bz2) = f91504b3af51358c034fb926f4ce9895
diff --git a/devel/jakarta-ant/pkg-descr b/devel/jakarta-ant/pkg-descr
index 4b89594557d0..5a6712a314de 100644
--- a/devel/jakarta-ant/pkg-descr
+++ b/devel/jakarta-ant/pkg-descr
@@ -1,4 +1,4 @@
-Ant is a Java-based build tool, conceptually similar to make.
+Apache Ant, a Java-based build tool, conceptually similar to make.
 
 Ant uses XML build files that defines a set of targets. Each target
 has dependencies (other targets) and contains a set of tasks to
@@ -9,4 +9,4 @@ copying ("copy"), deleting ("delete"), executing other programs
 ("java", "exec", "execon", etc.), stylesheet transformations
 ("style") and so on.
 
-WWW: http://jakarta.apache.org/ant/
+WWW: http://ant.apache.org/
diff --git a/devel/jakarta-ant/pkg-plist b/devel/jakarta-ant/pkg-plist
index be827d21f6c7..a3de40290a0b 100644
--- a/devel/jakarta-ant/pkg-plist
+++ b/devel/jakarta-ant/pkg-plist
@@ -19,9 +19,23 @@ bin/ant
 %%T%%/docs/images/ant_logo_large.gif
 %%T%%/docs/images/ant_logo_medium.gif
 %%T%%/docs/images/ant_logo_small.gif
-%%T%%/docs/images/jakarta-logo.gif
+%%T%%/docs/images/current.gif
+%%T%%/docs/images/group-logo.gif
 %%T%%/docs/images/jw_ec_logo_winner2002.gif
+%%T%%/docs/images/label.gif
+%%T%%/docs/images/menu-left.gif
+%%T%%/docs/images/menu-right.gif
+%%T%%/docs/images/page.gif
+%%T%%/docs/images/printer.gif
+%%T%%/docs/images/project-logo.gif
 %%T%%/docs/images/sdm_productivity_award.gif
+%%T%%/docs/images/search-left.gif
+%%T%%/docs/images/search-right.gif
+%%T%%/docs/images/spacer.gif
+%%T%%/docs/images/tab-left.gif
+%%T%%/docs/images/tab-right.gif
+%%T%%/docs/images/tabSel-left.gif
+%%T%%/docs/images/tabSel-right.gif
 %%T%%/docs/manual/api/org/apache/tools/ant/filters/util/ChainReaderHelper.html
 %%T%%/docs/manual/api/org/apache/tools/ant/filters/util/JavaClassHelper.html
 %%T%%/docs/manual/api/org/apache/tools/ant/filters/util/package-frame.html
@@ -267,6 +281,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-frame.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-summary.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-tree.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.WebAppParameter.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.html
@@ -332,6 +347,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.Reader.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.html
@@ -417,6 +433,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.html
+%%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.UnmatchedFileMap.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.html
 %%T%%/docs/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.html
@@ -681,6 +698,8 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/types/PatternSet.NameEntry.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/Reference.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/RegularExpression.html
+%%T%%/docs/manual/api/org/apache/tools/ant/types/Resource.html
+%%T%%/docs/manual/api/org/apache/tools/ant/types/ResourceFactory.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/Substitution.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/XMLCatalog.html
 %%T%%/docs/manual/api/org/apache/tools/ant/types/ZipFileSet.html
@@ -737,6 +756,7 @@ bin/ant
 %%T%%/docs/manual/api/org/apache/tools/ant/util/package-tree.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/PackageNameMapper.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/RegexpPatternMapper.html
+%%T%%/docs/manual/api/org/apache/tools/ant/util/ResourceUtils.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/SourceFileScanner.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/StringUtils.html
 %%T%%/docs/manual/api/org/apache/tools/ant/util/TaskLogger.html
@@ -861,7 +881,6 @@ 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
@@ -993,15 +1012,30 @@ bin/ant
 %%T%%/docs/manual/toc.html
 %%T%%/docs/manual/using.html
 %%T%%/docs/manual/usinglist.html
+%%T%%/docs/projects/antidote/images/screenshot.jpg
+%%T%%/docs/projects/antidote/design.html
+%%T%%/docs/projects/antidote/index.html
+%%T%%/docs/projects/antidote/module.html
+%%T%%/docs/projects/index.html
 %%T%%/docs/ant15_todo.html
 %%T%%/docs/antnews.html
 %%T%%/docs/ant_in_anger.html
 %%T%%/docs/ant_task_guidelines.html
 %%T%%/docs/appendix_e.pdf
+%%T%%/docs/breadcrumbs.js
+%%T%%/docs/contributors.html
+%%T%%/docs/cvs.html
 %%T%%/docs/external.html
 %%T%%/docs/faq.html
+%%T%%/docs/guidelines.html
 %%T%%/docs/index.html
+%%T%%/docs/legal.html
+%%T%%/docs/LICENSE
+%%T%%/docs/license.html
 %%T%%/docs/logocontest.html
+%%T%%/docs/mail.html
+%%T%%/docs/mission.html
+%%T%%/docs/page.css
 %%T%%/docs/problems.html
 %%T%%/docs/projects.html
 %%T%%/docs/resources.html
@@ -1076,5 +1110,8 @@ bin/ant
 @dirrm %%T%%/docs/manual/OptionalTasks
 @dirrm %%T%%/docs/manual/OptionalTypes
 @dirrm %%T%%/docs/manual
+@dirrm %%T%%/docs/projects/antidote/images
+@dirrm %%T%%/docs/projects/antidote
+@dirrm %%T%%/docs/projects
 @dirrm %%T%%/docs
 @dirrm %%T%%