Update this package to jakarta-ant-1.4.1.

In addition to changes in the package as distributed, we no longer install
the optional tasks from this package -- what tasks got included in the
optional task jarfile was highly dependent on what other packages the user
had installed.  It is neither reasonable to depend on all of these packages
(many of them themselves built with ant!) in the ant package, nor reasonable
for two builds of the ant optional tasks to vary so widely.

In a few days, I will import a jakarta-ant-optional package, which depends
on a wide range of other packages, and builds all those optional tasks
currently supportable by pkgsrc.

Relevant changes since jakarta-ant 1.3 (the last pkgsrc version):
(For full changes, see ${LOCALBASE}/share/doc/java/ant/WHATSNEW)

* XmlLogger and <antstructure> now add an encoding declaration to the
  XML files they generate.

* <fileset> has a new attribute "casesensitive" to make it match
  filenames in a case insensitive way (if you set it to false) - by
  default filesets remain case sensitive.

* <rmic> is now implemented using a factory. This makes extending
  rmic to use a new compiler a lot easier but may break custom
  versions of this task that rely on the old implementation.

* several Zip methods have changed their signature as we now use a Zip
  package of our own that handles Unix permissions for directories.
  Furthermore <zip> will now use the platform's default character
  encoding for filenames - this is consistent with the command line
  ZIP tools, but causes problems if you try to open them from within
  Java and your filenames contain non US-ASCII characters. Use the new
  encoding attribute of the task and set it to UTF8 to get the old
  behavior.

* Ant will no longer use the canonical version of a path internally -
  this may yield different results on filesystems that support
  symbolic links.

* Pattern matching rules have changes slightly, the pattern foo*
  doesn't match files contained in a directory named foo - use foo/*
  instead.

* <fixcrlf> will not remove trailing whitespace at the end of lines anymore.

* Invalid manifest files will now cause build failures in the <jar> task.

* A delete task like
  <delete includeEmptyFilesets="true">
    <fileset dir="somedir" />
  </delete>
  will now remove "somedir" as well, unless there are still files left
  in it (matched by the default excludes).

* The copy task will now fail if the file to be copied is not found.

* Ant properties defined in properties files now behave the same way as
  properties defined in the build file. In particular the $ character needs
  to be escaped in property values by doubling it to $$. So, to define a
  property with the value $hello, you need to define it in a properties file
  as
    test.prop=$$hello
  This was not the case in Ant 1.3

* <tar> will now add empty directories as well

* <touch> can now work on <fileset>s

* <uptodate> now supports a value attribute

* <fail> supports nested text

* <fixcrlf> won't override files that are already in the correct
   format.

* <sql> now supports REM comments as well as // and --

* <jar> now has a nested <metainf> element following the same idea as
  <war>'s <webinf>.

* <available> now has a "type" attribute you can use in conjunction
  with the "file" attribute to specify whether the "file" you're
  looking for is a file or a directory.

* Allow the <sql> Delimiter to be set in the so that Oracle stored procs may be
  entered

* <execon> and <apply> can now optionally skip empty filesets.

* <javadoc> has a new useexternalfile attribute that makes it use a
  temporary file for sourcefile and package names - helps to defeat
  command line length limitations.

* Data types like <path> can now be defined inside of <target>s

* New filesonly attribute for <zip> and friends to suppress directory
  entries.

* New update attribute for <zip> and friends - update an existing
  archive instead of creating a new one.

* <apply> and <execon> have been merged into a single task.

* <available> has a new filepath attribute/nested element that allows
  you top search for a file in a given path.

* <taskdef> can now define several tasks at once, reading the
  name/classname pairs from a property file or resource.

* <unzip/unjar/unwar> and <untar> now have an overwrite attribute that
  defaults to true.  If set to false, files that are newer than the
  files in the archive will not be replaced.

* <patternset> and <fileset> now support nested <in/excludesfile>
  elements - using these you can have more than one in/excludes file
  per <patternset>.

* <fixcrlf> can now with CR only line-ends and can use an arbitrary
  between 2 and 80.

* <move> will now try to rename() files before copying them byte by
  byte - only if filtering is of, of course.

* <ant> and <antcall> tasks now support a new attribute inheritAll. When set to
  false, only user properties are passed through to the target Ant instance.
  This includes properties set on the command line and properties explicitly
  passed

* <javadoc> now skips off line links if the package list cannot be found.

* <java> task will set the Thread contextClassLoader under JDKs 1.2+ to the
  classloader for the class being executed.

* Introduce the concept of a TaskContainer - a task or element which can contain
  Ant Tasks.

* Add new tasks implementing the TaskContainer interface <parallel> and
  <sequential> which allow parallel execution of tasks to be specified.

* <depend> task will now take into account dependencies on jar files and class
  files from a given classpath.

* <jar> manifest entries may now be specified in the build file either
  completely or to be merged with a manifest file.

* <tstamp> task custom formats now support locales.

* Introduced the concept of <filtersets> to allow for more control in which
  filters get applied in a <copy> or <move> operation.

* The <depend> task cache format has changed and all dependency information is
  now stored in a single file.

5 files changed, 185 insertions, 98 deletions

diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile
index f9b3247b7ea..80edf5cb1aa 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -1,23 +1,27 @@
-# $NetBSD: Makefile,v 1.9 2002/01/04 16:56:08 jwise Exp $
+# $NetBSD: Makefile,v 1.10 2002/04/13 21:12:15 jwise Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
-# the ant team has CHANGED the version numbering scheme.  The previous version
+# 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}-src
-PKGNAME=	jakarta-ant-1.3
+PKGNAME=	jakarta-ant-1.4.1
 CATEGORIES=	devel
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-ant/release/v1.3/src/
+MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-ant/release/v1.4.1/src/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 COMMENT=	Apache Project's Java-Based make(1) replacement
 
 USE_JAVA=	yes
+DEPENDS+=	crimson>=1.1.3:../../textproc/crimson
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
+post-extract:
+	@${RM} ${WRKSRC}/lib/*.jar
+
 do-build:
 	${_PKG_SILENT}${_PKG_DEBUG} cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ${SH} bootstrap.sh
 
@@ -29,16 +33,11 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/ant ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/antRun ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-	${INSTALL_DATA} ${WRKSRC}/lib/jaxp.jar ${PREFIX}/lib/java
-	${INSTALL_DATA} ${WRKSRC}/lib/parser.jar ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/build/lib/ant.jar ${PREFIX}/lib/java
-	${INSTALL_DATA} ${WRKSRC}/build/lib/optional.jar ${PREFIX}/lib/java/ant-optional.jar
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant/manual
+	cd ${WRKSRC}/docs && ${PAX} -rwpp * ${PREFIX}/share/doc/java/ant
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/java/ant
-	(cd ${WRKSRC}/docs/manual && ${GTAR} pcf - .) | \
-		(cd ${PREFIX}/share/doc/java/ant/manual && ${GTAR} pxvf -)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/ant
 
 .include "../../mk/bsd.pkg.mk"
+CLASSPATH:=	${CLASSPATH}:${LOCALBASE}/lib/java/crimson.jar
diff --git a/devel/jakarta-ant/PLIST b/devel/jakarta-ant/PLIST
index f496b79b1cc..fef32ee29a7 100644
--- a/devel/jakarta-ant/PLIST
+++ b/devel/jakarta-ant/PLIST
@@ -1,108 +1,185 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:16 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/04/13 21:12:15 jwise Exp $
 bin/ant
 bin/antRun
 lib/java/ant.jar
-lib/java/ant-optional.jar
-lib/java/jaxp.jar
-lib/java/parser.jar
-share/doc/java/ant/manual/coretasklist.html
-share/doc/java/ant/manual/CoreTasks/ant.html
-share/doc/java/ant/manual/CoreTasks/antcall.html
-share/doc/java/ant/manual/CoreTasks/antstructure.html
-share/doc/java/ant/manual/CoreTasks/apply.html
+share/doc/java/ant/README
+share/doc/java/ant/WHATSNEW
+share/doc/java/ant/manual/OptionalTasks/ccm.html
+share/doc/java/ant/manual/OptionalTasks/netrexxc.html
+share/doc/java/ant/manual/OptionalTasks/javacc.html
+share/doc/java/ant/manual/OptionalTasks/native2ascii.html
+share/doc/java/ant/manual/OptionalTasks/propertyfile.html
+share/doc/java/ant/manual/OptionalTasks/rpm.html
+share/doc/java/ant/manual/OptionalTasks/maudit.html
+share/doc/java/ant/manual/OptionalTasks/cab.html
+share/doc/java/ant/manual/OptionalTasks/script.html
+share/doc/java/ant/manual/OptionalTasks/ftp.html
+share/doc/java/ant/manual/OptionalTasks/mparse.html
+share/doc/java/ant/manual/OptionalTasks/starteam.html
+share/doc/java/ant/manual/OptionalTasks/telnet.html
+share/doc/java/ant/manual/OptionalTasks/mmetrics.html
+share/doc/java/ant/manual/OptionalTasks/sound.html
+share/doc/java/ant/manual/OptionalTasks/BorlandGenerateClient.html
+share/doc/java/ant/manual/OptionalTasks/clearcase.html
+share/doc/java/ant/manual/OptionalTasks/depend.html
+share/doc/java/ant/manual/OptionalTasks/pvcstask.html
+share/doc/java/ant/manual/OptionalTasks/icontract.html
+share/doc/java/ant/manual/OptionalTasks/wljspc.html
+share/doc/java/ant/manual/OptionalTasks/junit.html
+share/doc/java/ant/manual/OptionalTasks/javah.html
+share/doc/java/ant/manual/OptionalTasks/renameextensions.html
+share/doc/java/ant/manual/OptionalTasks/antlr.html
+share/doc/java/ant/manual/OptionalTasks/ejb.html
+share/doc/java/ant/manual/OptionalTasks/jlink.html
+share/doc/java/ant/manual/OptionalTasks/jdepend.html
+share/doc/java/ant/manual/OptionalTasks/dotnet.html
+share/doc/java/ant/manual/OptionalTasks/xmlvalidate.html
+share/doc/java/ant/manual/OptionalTasks/stylebook.html
+share/doc/java/ant/manual/OptionalTasks/perforce.html
+share/doc/java/ant/manual/OptionalTasks/BorlandEJBTasks.html
+share/doc/java/ant/manual/OptionalTasks/mimemail.html
+share/doc/java/ant/manual/OptionalTasks/junitreport.html
+share/doc/java/ant/manual/OptionalTasks/test.html
+share/doc/java/ant/manual/OptionalTasks/vss.html
+share/doc/java/ant/manual/OptionalTasks/jjtree.html
+share/doc/java/ant/manual/OptionalTasks/jpcoverage.html
+share/doc/java/ant/manual/CoreTypes/patternset.html
+share/doc/java/ant/manual/CoreTypes/description.html
+share/doc/java/ant/manual/CoreTypes/mapper.html
+share/doc/java/ant/manual/CoreTypes/fileset.html
+share/doc/java/ant/manual/CoreTypes/filterset.html
+share/doc/java/ant/manual/CoreTypes/filelist.html
+share/doc/java/ant/manual/CoreTasks/sql.html
 share/doc/java/ant/manual/CoreTasks/available.html
-share/doc/java/ant/manual/CoreTasks/chmod.html
-share/doc/java/ant/manual/CoreTasks/copy.html
-share/doc/java/ant/manual/CoreTasks/copydir.html
-share/doc/java/ant/manual/CoreTasks/copyfile.html
-share/doc/java/ant/manual/CoreTasks/cvs.html
+share/doc/java/ant/manual/CoreTasks/tstamp.html
+share/doc/java/ant/manual/CoreTasks/fail.html
 share/doc/java/ant/manual/CoreTasks/delete.html
-share/doc/java/ant/manual/CoreTasks/deltree.html
+share/doc/java/ant/manual/CoreTasks/common.html
+share/doc/java/ant/manual/CoreTasks/war.html
+share/doc/java/ant/manual/CoreTasks/javac.html
 share/doc/java/ant/manual/CoreTasks/echo.html
-share/doc/java/ant/manual/CoreTasks/exec.html
-share/doc/java/ant/manual/CoreTasks/execon.html
-share/doc/java/ant/manual/CoreTasks/fail.html
-share/doc/java/ant/manual/CoreTasks/filter.html
+share/doc/java/ant/manual/CoreTasks/dependset.html
+share/doc/java/ant/manual/CoreTasks/sequential.html
+share/doc/java/ant/manual/CoreTasks/taskdef.html
 share/doc/java/ant/manual/CoreTasks/fixcrlf.html
+share/doc/java/ant/manual/CoreTasks/signjar.html
+share/doc/java/ant/manual/CoreTasks/javadoc.html
 share/doc/java/ant/manual/CoreTasks/genkey.html
-share/doc/java/ant/manual/CoreTasks/get.html
-share/doc/java/ant/manual/CoreTasks/gunzip.html
-share/doc/java/ant/manual/CoreTasks/gzip.html
-share/doc/java/ant/manual/CoreTasks/jar.html
+share/doc/java/ant/manual/CoreTasks/rmic.html
 share/doc/java/ant/manual/CoreTasks/java.html
-share/doc/java/ant/manual/CoreTasks/javac.html
-share/doc/java/ant/manual/CoreTasks/javadoc.html
+share/doc/java/ant/manual/CoreTasks/jar.html
+share/doc/java/ant/manual/CoreTasks/tar.html
+share/doc/java/ant/manual/CoreTasks/property.html
+share/doc/java/ant/manual/CoreTasks/zip.html
+share/doc/java/ant/manual/CoreTasks/recorder.html
+share/doc/java/ant/manual/CoreTasks/deltree.html
 share/doc/java/ant/manual/CoreTasks/mail.html
-share/doc/java/ant/manual/CoreTasks/mkdir.html
-share/doc/java/ant/manual/CoreTasks/move.html
+share/doc/java/ant/manual/CoreTasks/exec.html
+share/doc/java/ant/manual/CoreTasks/style.html
 share/doc/java/ant/manual/CoreTasks/patch.html
-share/doc/java/ant/manual/CoreTasks/property.html
-share/doc/java/ant/manual/CoreTasks/rename.html
+share/doc/java/ant/manual/CoreTasks/move.html
+share/doc/java/ant/manual/CoreTasks/copy.html
+share/doc/java/ant/manual/CoreTasks/antstructure.html
 share/doc/java/ant/manual/CoreTasks/replace.html
-share/doc/java/ant/manual/CoreTasks/rmic.html
-share/doc/java/ant/manual/CoreTasks/signjar.html
-share/doc/java/ant/manual/CoreTasks/sql.html
-share/doc/java/ant/manual/CoreTasks/style.html
-share/doc/java/ant/manual/CoreTasks/tar.html
-share/doc/java/ant/manual/CoreTasks/taskdef.html
+share/doc/java/ant/manual/CoreTasks/antcall.html
+share/doc/java/ant/manual/CoreTasks/overview.html
 share/doc/java/ant/manual/CoreTasks/touch.html
-share/doc/java/ant/manual/CoreTasks/tstamp.html
+share/doc/java/ant/manual/CoreTasks/get.html
+share/doc/java/ant/manual/CoreTasks/uptodate.html
+share/doc/java/ant/manual/CoreTasks/rename.html
+share/doc/java/ant/manual/CoreTasks/copydir.html
+share/doc/java/ant/manual/CoreTasks/parallel.html
+share/doc/java/ant/manual/CoreTasks/ear.html
+share/doc/java/ant/manual/CoreTasks/sleep.html
+share/doc/java/ant/manual/CoreTasks/apply.html
+share/doc/java/ant/manual/CoreTasks/ant.html
+share/doc/java/ant/manual/CoreTasks/cvspass.html
 share/doc/java/ant/manual/CoreTasks/untar.html
+share/doc/java/ant/manual/CoreTasks/condition.html
+share/doc/java/ant/manual/CoreTasks/copyfile.html
+share/doc/java/ant/manual/CoreTasks/typedef.html
+share/doc/java/ant/manual/CoreTasks/pathconvert.html
+share/doc/java/ant/manual/CoreTasks/filter.html
+share/doc/java/ant/manual/CoreTasks/gzip.html
 share/doc/java/ant/manual/CoreTasks/unzip.html
-share/doc/java/ant/manual/CoreTasks/uptodate.html
-share/doc/java/ant/manual/CoreTasks/war.html
-share/doc/java/ant/manual/CoreTasks/zip.html
-share/doc/java/ant/manual/CoreTypes/fileset.html
-share/doc/java/ant/manual/CoreTypes/mapper.html
-share/doc/java/ant/manual/CoreTypes/patternset.html
-share/doc/java/ant/manual/credits.html
-share/doc/java/ant/manual/develop.html
-share/doc/java/ant/manual/dirtasks.html
-share/doc/java/ant/manual/feedback.html
-share/doc/java/ant/manual/ide.html
-share/doc/java/ant/manual/index.html
-share/doc/java/ant/manual/install.html
-share/doc/java/ant/manual/Integration/Antidote.html
-share/doc/java/ant/manual/Integration/anttool1.gif
+share/doc/java/ant/manual/CoreTasks/cvs.html
+share/doc/java/ant/manual/CoreTasks/gunzip.html
+share/doc/java/ant/manual/CoreTasks/mkdir.html
+share/doc/java/ant/manual/CoreTasks/chmod.html
+share/doc/java/ant/manual/Integration/jext-plugin.html
 share/doc/java/ant/manual/Integration/toolmenu.gif
 share/doc/java/ant/manual/Integration/VAJAntTool.html
+share/doc/java/ant/manual/Integration/Antidote.html
+share/doc/java/ant/manual/Integration/anttool1.gif
+share/doc/java/ant/manual/running.html
 share/doc/java/ant/manual/intro.html
-share/doc/java/ant/manual/LICENSE
+share/doc/java/ant/manual/coretasklist.html
+share/doc/java/ant/manual/ide.html
+share/doc/java/ant/manual/develop.html
+share/doc/java/ant/manual/install.html
+share/doc/java/ant/manual/sysclasspath.html
+share/doc/java/ant/manual/dirtasks.html
 share/doc/java/ant/manual/optionaltasklist.html
-share/doc/java/ant/manual/OptionalTasks/antlr.html
-share/doc/java/ant/manual/OptionalTasks/cab.html
-share/doc/java/ant/manual/OptionalTasks/clearcase.html
-share/doc/java/ant/manual/OptionalTasks/depend.html
-share/doc/java/ant/manual/OptionalTasks/dotnet.html
-share/doc/java/ant/manual/OptionalTasks/ejb.html
-share/doc/java/ant/manual/OptionalTasks/ftp.html
-share/doc/java/ant/manual/OptionalTasks/javacc.html
-share/doc/java/ant/manual/OptionalTasks/javah.html
-share/doc/java/ant/manual/OptionalTasks/jjtree.html
-share/doc/java/ant/manual/OptionalTasks/jlink.html
-share/doc/java/ant/manual/OptionalTasks/junit.html
-share/doc/java/ant/manual/OptionalTasks/junitreport.html
-share/doc/java/ant/manual/OptionalTasks/mparse.html
-share/doc/java/ant/manual/OptionalTasks/native2ascii.html
-share/doc/java/ant/manual/OptionalTasks/netrexxc.html
-share/doc/java/ant/manual/OptionalTasks/perforce.html
-share/doc/java/ant/manual/OptionalTasks/propertyfile.html
-share/doc/java/ant/manual/OptionalTasks/renameextensions.html
-share/doc/java/ant/manual/OptionalTasks/script.html
-share/doc/java/ant/manual/OptionalTasks/sound.html
-share/doc/java/ant/manual/OptionalTasks/telnet.html
-share/doc/java/ant/manual/OptionalTasks/stylebook.html
-share/doc/java/ant/manual/OptionalTasks/test.html
-share/doc/java/ant/manual/OptionalTasks/vssget.html
-share/doc/java/ant/manual/OptionalTasks/vsslabel.html
-share/doc/java/ant/manual/resources.html
-share/doc/java/ant/manual/toc.html
 share/doc/java/ant/manual/using.html
-share/doc/java/ant/README
-share/doc/java/ant/WHATSNEW
+share/doc/java/ant/manual/credits.html
+share/doc/java/ant/manual/toc.html
+share/doc/java/ant/manual/feedback.html
+share/doc/java/ant/manual/index.html
+share/doc/java/ant/manual/LICENSE
+share/doc/java/ant/ant2/requested-features.html
+share/doc/java/ant/ant2/original-specification.html
+share/doc/java/ant/ant2/features.html
+share/doc/java/ant/ant2/requested-features.txt
+share/doc/java/ant/ant2/FunctionalRequirements.html
+share/doc/java/ant/images/blairhughes_germ6.jpg
+share/doc/java/ant/images/blairhughes_ant4.jpg
+share/doc/java/ant/images/antLogo2.png
+share/doc/java/ant/images/blairhughes_germ2.jpg
+share/doc/java/ant/images/blairhughes_keis2.jpg
+share/doc/java/ant/images/schloemer.gif
+share/doc/java/ant/images/duggins.gif
+share/doc/java/ant/images/blairhughes_germ5.jpg
+share/doc/java/ant/images/lecho.jpg
+share/doc/java/ant/images/blairhughes_ant3.jpg
+share/doc/java/ant/images/kolesnikova.gif
+share/doc/java/ant/images/blairhughes_keis5.jpg
+share/doc/java/ant/images/duggins2.gif
+share/doc/java/ant/images/antLogo1.png
+share/doc/java/ant/images/blairhughes_germ1.jpg
+share/doc/java/ant/images/ant2_logo.gif
+share/doc/java/ant/images/blairhughes_ant6.jpg
+share/doc/java/ant/images/ripley.jpg
+share/doc/java/ant/images/blairhughes_keis1.jpg
+share/doc/java/ant/images/ant-logo2.gif
+share/doc/java/ant/images/schloemer2.gif
+share/doc/java/ant/images/petroff.jpg
+share/doc/java/ant/images/cheesman.jpg
+share/doc/java/ant/images/blairhughes_germ4.jpg
+share/doc/java/ant/images/blairhughes_ant2.jpg
+share/doc/java/ant/images/hughes2.gif
+share/doc/java/ant/images/coleman.gif
+share/doc/java/ant/images/trogdon.gif
+share/doc/java/ant/images/blairhughes_keis4.jpg
+share/doc/java/ant/images/blairhughes_ant.jpg
+share/doc/java/ant/images/blairhughes_ant5.jpg
+share/doc/java/ant/images/blairhughes_germ3.jpg
+share/doc/java/ant/images/wilhelms3.gif
+share/doc/java/ant/images/hughes1.gif
+share/doc/java/ant/images/blairhughes_keis3.jpg
+share/doc/java/ant/images/ant_logo.gif
+share/doc/java/ant/external.html
+share/doc/java/ant/problems.html
+share/doc/java/ant/ant_in_anger.html
+share/doc/java/ant/index.html
+share/doc/java/ant/logos.html
+share/doc/java/ant/antnews.html
+share/doc/java/ant/faq.html
+share/doc/java/ant/resources.html
+share/doc/java/ant/ant_task_guidelines.html
 @dirrm share/doc/java/ant/manual/OptionalTasks
 @dirrm share/doc/java/ant/manual/Integration
 @dirrm share/doc/java/ant/manual/CoreTypes
 @dirrm share/doc/java/ant/manual/CoreTasks
 @dirrm share/doc/java/ant/manual
-@dirrm share/doc/java/ant
+@dirrm share/doc/java/ant/images
+@dirrm share/doc/java/ant/ant2
diff --git a/devel/jakarta-ant/distinfo b/devel/jakarta-ant/distinfo
index 41dc7abff74..312dca531c6 100644
--- a/devel/jakarta-ant/distinfo
+++ b/devel/jakarta-ant/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:24 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/04/13 21:12:15 jwise Exp $
 
-SHA1 (jakarta-ant-1.3-src.tar.gz) = b4d259d07ebbd7c7d6aa67b93a4696c623809fb0
-Size (jakarta-ant-1.3-src.tar.gz) = 1017752 bytes
+SHA1 (jakarta-ant-1.4.1-src.tar.gz) = dbd67d522b07018329c31a49d7ff2a4098ccbeed
+Size (jakarta-ant-1.4.1-src.tar.gz) = 1328414 bytes
+SHA1 (patch-aa) = 7a6acb94bff5c5ae82ea7045ad6a1a6d42fae0fe
diff --git a/devel/jakarta-ant/files/ant b/devel/jakarta-ant/files/ant
index 42bd44d4b30..79a64989394 100644
--- a/devel/jakarta-ant/files/ant
+++ b/devel/jakarta-ant/files/ant
@@ -21,7 +21,7 @@ else
 fi
  
 # add in the dependency .jar files
-DIRLIBS="${ANT_HOME}/lib/java/ant.jar ${ANT_HOME}/lib/java/ant-optional.jar ${ANT_HOME}/lib/java/parser.jar ${ANT_HOME}/lib/java/jaxp.jar"
+DIRLIBS="${ANT_HOME}/lib/java/ant.jar ${ANT_HOME}/lib/java/ant-optional.jar ${ANT_HOME}/lib/java/crimson.jar"
 for i in ${DIRLIBS}
 do
     # if the directory is empty, then it will return the input string
diff --git a/devel/jakarta-ant/patches/patch-aa b/devel/jakarta-ant/patches/patch-aa
new file mode 100644
index 00000000000..d55ac4a3eaf
--- /dev/null
+++ b/devel/jakarta-ant/patches/patch-aa
@@ -0,0 +1,10 @@
+--- build.xml.orig	Wed Apr  3 15:37:20 2002
++++ build.xml	Wed Apr  3 15:40:10 2002
+@@ -248,6 +248,7 @@
+       <exclude name="${optional.package}/sitraka/**" unless="jakarta.oro.present"/>
+       <exclude name="${optional.package}/metamata/MAudit*" unless="jakarta.oro.present"/>
+       <exclude name="${optional.package}/metamata/**" unless="jdk1.2+" />
++      <exclude name="${optional.package}/TraXLiaison.java" unless="trax.impl.present" />
+     </javac>
+     
+     <copy todir="${build.classes}">