Update apache-ant to latest available 1.5.4 (1.5.3.1 is no longer available).

Also switch over to tar.bz2 archive.

Changes since 1.5.3:

Fixed bugs:
-----------

* The Visual Age for Java tasks didn't work (at least for versions 3.0
  and higher).  Bugzilla Report 10016.

* URL-encoding in <vaj*port> didn't work properly.

* VAJRemoteUtil called getAbsolutePath instead of getPath
  causing problems when using a Windows VAJ server from a UNIX server.
  Bugzilla Report 20457.

* VAJImport task failed with NullPointerException when using DirectoryScanner.
  Bugzilla Report 22080.

Other changes:
--------------

* Shipped XML parser is now Xerces 2.5.0

* <javah> will invoke oldjavah on JDK 1.4.2.  Bugzilla Report 18667.

* The VAJ tasks now support a haltonfailure attribute to conditionally
  keep building even if they fail.

* It is now possible to use the latest (versioned or unversioned) edition
  in <vajload> by using special wildcard characters.  Also fixes
  Bugzilla Report 2236.

4 files changed, 16 insertions, 14 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index f9bd5581f2b..9bc10340177 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2003/08/23 15:09:51 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/07 09:17:29 jdolecek Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
 # the ant team has CHANGED the version numbering scheme.  A previous version
 # of ant was 3.1.  Do NOT use dependency patterns such as >=1.3 which could pick
 # up this version by mistake.
 
-DISTNAME=	${PKGNAME:C/.([0-9])$/-\1/}-src
-PKGNAME=	apache-ant-1.5.3.1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/.([0-9])$/-\1/}
+DISTNAME=	${PKGNAME}-src
+PKGNAME=	apache-ant-1.5.4
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=ant/source/}
-EXTRACT_SUFX=	.zip
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jwise@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"
 
 DEPENDS+=	crimson>=1.1.3:../../textproc/crimson
 
diff --git a/devel/apache-ant/PLIST b/devel/apache-ant/PLIST
index 6c96fb27bcc..ff04ff2ab79 100644
--- a/devel/apache-ant/PLIST
+++ b/devel/apache-ant/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2003/06/03 17:00:11 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/07 09:17:30 jdolecek Exp $
 bin/ant
 bin/antRun
 lib/java/ant.jar
 share/doc/java/ant/LICENSE
 share/doc/java/ant/README
 share/doc/java/ant/WHATSNEW
-share/doc/java/ant/ant15_todo.html
 share/doc/java/ant/ant2/FunctionalRequirements.html
 share/doc/java/ant/ant2/VFS.txt
 share/doc/java/ant/ant2/actionlist.html
@@ -17,12 +16,12 @@ share/doc/java/ant/ant_in_anger.html
 share/doc/java/ant/ant_task_guidelines.html
 share/doc/java/ant/antnews.html
 share/doc/java/ant/appendix_e.pdf
+share/doc/java/ant/bylaws.html
 share/doc/java/ant/breadcrumbs.js
 share/doc/java/ant/contributors.html
 share/doc/java/ant/cvs.html
 share/doc/java/ant/external.html
 share/doc/java/ant/faq.html
-share/doc/java/ant/guidelines.html
 share/doc/java/ant/images/ant_logo.ico
 share/doc/java/ant/images/ant_logo_large.gif
 share/doc/java/ant/images/ant_logo_medium.gif
@@ -30,6 +29,8 @@ share/doc/java/ant/images/ant_logo_small.gif
 share/doc/java/ant/images/current.gif
 share/doc/java/ant/images/group-logo.gif
 share/doc/java/ant/images/jw_ec_logo_winner2002.gif
+share/doc/java/ant/images/jw_ec_logo_winner2003.gif
+share/doc/java/ant/images/jp_rcwinner_2003.gif
 share/doc/java/ant/images/label.gif
 share/doc/java/ant/images/menu-left.gif
 share/doc/java/ant/images/menu-right.gif
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index ab0f5860497..80e27260219 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2003/06/03 17:00:12 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2003/09/07 09:17:30 jdolecek Exp $
 
-SHA1 (apache-ant-1.5.3-1-src.zip) = f7b36df66761a59e52e1cd52fd481abd351ff5c0
-Size (apache-ant-1.5.3-1-src.zip) = 6568503 bytes
+SHA1 (apache-ant-1.5.4-src.tar.bz2) = 56ffe823c7f0cef3e5bfab17e6a610eb5cef7208
+Size (apache-ant-1.5.4-src.tar.bz2) = 4537009 bytes
diff --git a/doc/CHANGES b/doc/CHANGES
index 52384e22005..7166287efb0 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3266 2003/09/06 17:03:06 magick Exp $
+$NetBSD: CHANGES,v 1.3267 2003/09/07 09:17:28 jdolecek Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -3559,4 +3559,5 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated p0f to 2.0.1 [itojun 2003-09-06]
 	Updated pkglint to 3.60 [wiz 2003-09-06]
 	Updated nawk to 20030731 [cjep 2003-09-06]
-	Updated xemacs-current to 21.5.15 [magick 2003-09-06]
\ No newline at end of file
+	Updated xemacs-current to 21.5.15 [magick 2003-09-06]
+	Updated apache-ant to 1.5.4 [jdolecek 2003-09-06]