[pkgsrc/trunk]: pkgsrc/devel/apache-ant Updated apache-ant to 1.6.1:

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/af9de1a5a33b
branches:  trunk
changeset: 471874:af9de1a5a33b
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Apr 01 14:35:17 2004 +0000

description:
Updated apache-ant to 1.6.1:
        Many changes since 1.5.4, most notable is that apache-ant now requires
        JDK 1.2 or later. For 1.1 use the apache-ant15 package.

diffstat:

 devel/apache-ant/Makefile  |     7 +-
 devel/apache-ant/PLIST     |  1246 ++++++++++++++++++++++++++-----------------
 devel/apache-ant/distinfo  |     6 +-
 devel/apache-ant/files/ant |     2 +-
 4 files changed, 765 insertions(+), 496 deletions(-)

diffs (truncated from 1846 to 300 lines):

diff -r dd3b241d96d3 -r af9de1a5a33b devel/apache-ant/Makefile
--- a/devel/apache-ant/Makefile Thu Apr 01 14:29:59 2004 +0000
+++ b/devel/apache-ant/Makefile Thu Apr 01 14:35:17 2004 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2004/03/30 18:32:33 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/01 14:35:17 abs 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=      apache-ant-1.5.4
-PKGREVISION=   1
+DISTNAME=      apache-ant-1.6.1
 CATEGORIES=    devel java
 MASTER_SITES=  ${MASTER_SITE_APACHE:=ant/binaries/}
 EXTRACT_SUFX=  .tar.bz2
@@ -37,7 +36,7 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/java
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/java/ant
        ${INSTALL_DATA} ${WRKSRC}/lib/ant.jar ${PREFIX}/lib/java/ant
-       ${INSTALL_DATA} ${WRKSRC}/lib/optional.jar ${PREFIX}/lib/java/ant
+       ${INSTALL_DATA} ${WRKSRC}/lib/ant-nodeps.jar ${PREFIX}/lib/java/ant
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant
        cd ${WRKSRC}/docs && ${PAX} -rw -pmp * ${PREFIX}/share/doc/java/ant
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant
diff -r dd3b241d96d3 -r af9de1a5a33b devel/apache-ant/PLIST
--- a/devel/apache-ant/PLIST    Thu Apr 01 14:29:59 2004 +0000
+++ b/devel/apache-ant/PLIST    Thu Apr 01 14:35:17 2004 +0000
@@ -1,58 +1,54 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/29 17:28:33 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/01 14:35:17 abs Exp $
 bin/ant
 bin/antRun
 lib/java/ant/ant.jar
-lib/java/ant/optional.jar
-share/doc/java/ant/LICENSE
-share/doc/java/ant/README
-share/doc/java/ant/WHATSNEW
+lib/java/ant/ant-nodeps.jar
+share/doc/java/ant/ant2/requested-features.html
+share/doc/java/ant/ant2/actionlist.html
+share/doc/java/ant/ant2/VFS.txt
 share/doc/java/ant/ant2/FunctionalRequirements.html
-share/doc/java/ant/ant2/VFS.txt
-share/doc/java/ant/ant2/actionlist.html
 share/doc/java/ant/ant2/features.html
 share/doc/java/ant/ant2/original-specification.html
-share/doc/java/ant/ant2/requested-features.html
 share/doc/java/ant/ant2/requested-features.txt
+share/doc/java/ant/LICENSE
+share/doc/java/ant/ant_task_guidelines.html
 share/doc/java/ant/ant_in_anger.html
-share/doc/java/ant/ant_task_guidelines.html
+share/doc/java/ant/appendix_e.pdf
 share/doc/java/ant/antnews.html
-share/doc/java/ant/appendix_e.pdf
+share/doc/java/ant/contributors.html
 share/doc/java/ant/breadcrumbs.js
 share/doc/java/ant/bylaws.html
-share/doc/java/ant/contributors.html
+share/doc/java/ant/external.html
+share/doc/java/ant/favicon.ico
 share/doc/java/ant/cvs.html
-share/doc/java/ant/external.html
-share/doc/java/ant/faq.html
+share/doc/java/ant/images/ant_logo_large.gif
+share/doc/java/ant/images/current.gif
+share/doc/java/ant/images/beta.png
 share/doc/java/ant/images/ant_logo.ico
-share/doc/java/ant/images/ant_logo_large.gif
+share/doc/java/ant/images/printer.gif
+share/doc/java/ant/images/JDJEditorsChoiceAward.jpg
+share/doc/java/ant/images/jw_ec_logo_winner2002.gif
 share/doc/java/ant/images/ant_logo_medium.gif
 share/doc/java/ant/images/ant_logo_small.gif
-share/doc/java/ant/images/current.gif
+share/doc/java/ant/images/jp_rcwinner_2003.gif
 share/doc/java/ant/images/group-logo.gif
-share/doc/java/ant/images/jp_rcwinner_2003.gif
-share/doc/java/ant/images/jw_ec_logo_winner2002.gif
+share/doc/java/ant/images/page.gif
 share/doc/java/ant/images/jw_ec_logo_winner2003.gif
 share/doc/java/ant/images/label.gif
 share/doc/java/ant/images/menu-left.gif
 share/doc/java/ant/images/menu-right.gif
-share/doc/java/ant/images/page.gif
-share/doc/java/ant/images/printer.gif
 share/doc/java/ant/images/project-logo.gif
+share/doc/java/ant/images/search-left.gif
+share/doc/java/ant/images/spacer.gif
+share/doc/java/ant/images/search-right.gif
 share/doc/java/ant/images/sdm_productivity_award.gif
-share/doc/java/ant/images/search-left.gif
-share/doc/java/ant/images/search-right.gif
-share/doc/java/ant/images/spacer.gif
 share/doc/java/ant/images/tab-left.gif
 share/doc/java/ant/images/tab-right.gif
 share/doc/java/ant/images/tabSel-left.gif
 share/doc/java/ant/images/tabSel-right.gif
-share/doc/java/ant/index.html
-share/doc/java/ant/legal.html
-share/doc/java/ant/license.html
-share/doc/java/ant/logocontest.html
-share/doc/java/ant/mail.html
+share/doc/java/ant/manual/CoreTasks/tempfile.html
+share/doc/java/ant/manual/CoreTasks/antcall.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/manual/CoreTasks/available.html
@@ -69,6 +65,9 @@
 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/subant.html
+share/doc/java/ant/manual/CoreTasks/defaultexcludes.html
+share/doc/java/ant/manual/CoreTasks/cvsversion.html
 share/doc/java/ant/manual/CoreTasks/cvspass.html
 share/doc/java/ant/manual/CoreTasks/cvstagdiff.html
 share/doc/java/ant/manual/CoreTasks/delete.html
@@ -84,6 +83,7 @@
 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/import.html
 share/doc/java/ant/manual/CoreTasks/gzip.html
 share/doc/java/ant/manual/CoreTasks/input.html
 share/doc/java/ant/manual/CoreTasks/jar.html
@@ -91,39 +91,46 @@
 share/doc/java/ant/manual/CoreTasks/javac.html
 share/doc/java/ant/manual/CoreTasks/javadoc.html
 share/doc/java/ant/manual/CoreTasks/loadfile.html
+share/doc/java/ant/manual/CoreTasks/mail.html
+share/doc/java/ant/manual/CoreTasks/macrodef.html
 share/doc/java/ant/manual/CoreTasks/loadproperties.html
-share/doc/java/ant/manual/CoreTasks/mail.html
 share/doc/java/ant/manual/CoreTasks/manifest.html
 share/doc/java/ant/manual/CoreTasks/mkdir.html
 share/doc/java/ant/manual/CoreTasks/move.html
 share/doc/java/ant/manual/CoreTasks/pack.html
 share/doc/java/ant/manual/CoreTasks/parallel.html
 share/doc/java/ant/manual/CoreTasks/patch.html
+share/doc/java/ant/manual/CoreTasks/rename.html
+share/doc/java/ant/manual/CoreTasks/presetdef.html
 share/doc/java/ant/manual/CoreTasks/pathconvert.html
 share/doc/java/ant/manual/CoreTasks/property.html
 share/doc/java/ant/manual/CoreTasks/recorder.html
-share/doc/java/ant/manual/CoreTasks/rename.html
 share/doc/java/ant/manual/CoreTasks/replace.html
 share/doc/java/ant/manual/CoreTasks/rmic.html
 share/doc/java/ant/manual/CoreTasks/sequential.html
 share/doc/java/ant/manual/CoreTasks/signjar.html
 share/doc/java/ant/manual/CoreTasks/sleep.html
 share/doc/java/ant/manual/CoreTasks/sql.html
+share/doc/java/ant/manual/CoreTasks/sync.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/tempfile.html
+share/doc/java/ant/manual/CoreTasks/uptodate.html
 share/doc/java/ant/manual/CoreTasks/touch.html
 share/doc/java/ant/manual/CoreTasks/tstamp.html
 share/doc/java/ant/manual/CoreTasks/typedef.html
 share/doc/java/ant/manual/CoreTasks/unpack.html
 share/doc/java/ant/manual/CoreTasks/untar.html
+share/doc/java/ant/manual/CoreTasks/whichresource.html
 share/doc/java/ant/manual/CoreTasks/unzip.html
-share/doc/java/ant/manual/CoreTasks/uptodate.html
 share/doc/java/ant/manual/CoreTasks/waitfor.html
 share/doc/java/ant/manual/CoreTasks/war.html
 share/doc/java/ant/manual/CoreTasks/xmlproperty.html
 share/doc/java/ant/manual/CoreTasks/zip.html
+share/doc/java/ant/manual/CoreTypes/custom-programming.html
+share/doc/java/ant/manual/CoreTypes/assertions.html
+share/doc/java/ant/manual/CoreTypes/antlib.html
+share/doc/java/ant/manual/CoreTypes/selectors-program.html
 share/doc/java/ant/manual/CoreTypes/description.html
 share/doc/java/ant/manual/CoreTypes/dirset.html
 share/doc/java/ant/manual/CoreTypes/filelist.html
@@ -131,39 +138,53 @@
 share/doc/java/ant/manual/CoreTypes/filterchain.html
 share/doc/java/ant/manual/CoreTypes/filterset.html
 share/doc/java/ant/manual/CoreTypes/mapper.html
+share/doc/java/ant/manual/CoreTypes/namespace.html
 share/doc/java/ant/manual/CoreTypes/patternset.html
-share/doc/java/ant/manual/CoreTypes/selectors-program.html
+share/doc/java/ant/manual/CoreTypes/permissions.html
+share/doc/java/ant/manual/CoreTypes/propertyset.html
 share/doc/java/ant/manual/CoreTypes/selectors.html
 share/doc/java/ant/manual/CoreTypes/xmlcatalog.html
+share/doc/java/ant/manual/CoreTypes/zipfileset.html
 share/doc/java/ant/manual/Integration/Antidote.html
 share/doc/java/ant/manual/Integration/VAJAntTool.html
 share/doc/java/ant/manual/Integration/anttool1.gif
 share/doc/java/ant/manual/Integration/jext-plugin.html
 share/doc/java/ant/manual/Integration/remacc.gif
 share/doc/java/ant/manual/Integration/toolmenu.gif
-share/doc/java/ant/manual/LICENSE
-share/doc/java/ant/manual/OptionalTasks/BorlandEJBTasks.html
+share/doc/java/ant/manual/OptionalTasks/chgrp.html
+share/doc/java/ant/manual/OptionalTasks/depend.html
+share/doc/java/ant/manual/OptionalTasks/cab.html
 share/doc/java/ant/manual/OptionalTasks/BorlandGenerateClient.html
+share/doc/java/ant/manual/OptionalTasks/BorlandEJBTasks.html
 share/doc/java/ant/manual/OptionalTasks/antlr.html
-share/doc/java/ant/manual/OptionalTasks/cab.html
-share/doc/java/ant/manual/OptionalTasks/ccm.html
+share/doc/java/ant/manual/OptionalTasks/attrib.html
 share/doc/java/ant/manual/OptionalTasks/clearcase.html
-share/doc/java/ant/manual/OptionalTasks/depend.html
+share/doc/java/ant/manual/OptionalTasks/ccm.html
+share/doc/java/ant/manual/OptionalTasks/chown.html
 share/doc/java/ant/manual/OptionalTasks/dotnet.html
+share/doc/java/ant/manual/OptionalTasks/csc.html
+share/doc/java/ant/manual/OptionalTasks/javacc.html
+share/doc/java/ant/manual/OptionalTasks/ejb.html
+share/doc/java/ant/manual/OptionalTasks/ilasm.html
 share/doc/java/ant/manual/OptionalTasks/echoproperties.html
-share/doc/java/ant/manual/OptionalTasks/ejb.html
+share/doc/java/ant/manual/OptionalTasks/icontract.html
 share/doc/java/ant/manual/OptionalTasks/ftp.html
-share/doc/java/ant/manual/OptionalTasks/icontract.html
+share/doc/java/ant/manual/OptionalTasks/javah.html
+share/doc/java/ant/manual/OptionalTasks/image-classdiagram.gif
+share/doc/java/ant/manual/OptionalTasks/ildasm.html
+share/doc/java/ant/manual/OptionalTasks/importtypelib.html
+share/doc/java/ant/manual/OptionalTasks/image.html
+share/doc/java/ant/manual/OptionalTasks/renameextensions.html
 share/doc/java/ant/manual/OptionalTasks/jarlib-available.html
 share/doc/java/ant/manual/OptionalTasks/jarlib-display.html
 share/doc/java/ant/manual/OptionalTasks/jarlib-manifest.html
 share/doc/java/ant/manual/OptionalTasks/jarlib-resolve.html
-share/doc/java/ant/manual/OptionalTasks/javacc.html
-share/doc/java/ant/manual/OptionalTasks/javah.html
 share/doc/java/ant/manual/OptionalTasks/jdepend.html
+share/doc/java/ant/manual/OptionalTasks/jjdoc.html
 share/doc/java/ant/manual/OptionalTasks/jjtree.html
 share/doc/java/ant/manual/OptionalTasks/jlink.html
 share/doc/java/ant/manual/OptionalTasks/jpcoverage.html
+share/doc/java/ant/manual/OptionalTasks/jsharpc.html
 share/doc/java/ant/manual/OptionalTasks/jspc.html
 share/doc/java/ant/manual/OptionalTasks/junit.html
 share/doc/java/ant/manual/OptionalTasks/junitreport.html
@@ -175,19 +196,25 @@
 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/scriptdef.html
+share/doc/java/ant/manual/OptionalTasks/rexec.html
+share/doc/java/ant/manual/OptionalTasks/rpm.html
+share/doc/java/ant/manual/OptionalTasks/scp.html
+share/doc/java/ant/manual/OptionalTasks/script.html
+share/doc/java/ant/manual/OptionalTasks/wsdltodotnet.html
 share/doc/java/ant/manual/OptionalTasks/pvcstask.html
-share/doc/java/ant/manual/OptionalTasks/renameextensions.html
 share/doc/java/ant/manual/OptionalTasks/replaceregexp.html
-share/doc/java/ant/manual/OptionalTasks/rpm.html
-share/doc/java/ant/manual/OptionalTasks/script.html
 share/doc/java/ant/manual/OptionalTasks/serverdeploy.html
 share/doc/java/ant/manual/OptionalTasks/setproxy.html
 share/doc/java/ant/manual/OptionalTasks/sos.html
+share/doc/java/ant/manual/OptionalTasks/sshexec.html
 share/doc/java/ant/manual/OptionalTasks/sound.html
 share/doc/java/ant/manual/OptionalTasks/splash.html
+share/doc/java/ant/manual/OptionalTasks/symlink.html
 share/doc/java/ant/manual/OptionalTasks/starteam.html
 share/doc/java/ant/manual/OptionalTasks/stylebook.html
 share/doc/java/ant/manual/OptionalTasks/telnet.html
+share/doc/java/ant/manual/OptionalTasks/vbc.html
 share/doc/java/ant/manual/OptionalTasks/test.html
 share/doc/java/ant/manual/OptionalTasks/translate.html
 share/doc/java/ant/manual/OptionalTasks/vss.html
@@ -196,360 +223,214 @@
 share/doc/java/ant/manual/OptionalTypes/classfileset.html
 share/doc/java/ant/manual/OptionalTypes/extension.html
 share/doc/java/ant/manual/OptionalTypes/extensionset.html
-share/doc/java/ant/manual/antexternal.html
-share/doc/java/ant/manual/anttaskslist.html
-share/doc/java/ant/manual/api/allclasses-frame.html
-share/doc/java/ant/manual/api/allclasses-noframe.html
-share/doc/java/ant/manual/api/constant-values.html
-share/doc/java/ant/manual/api/deprecated-list.html
-share/doc/java/ant/manual/api/help-doc.html
-share/doc/java/ant/manual/api/index-all.html
-share/doc/java/ant/manual/api/index.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/AntClassLoader.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/BuildEvent.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/BuildException.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/BuildListener.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/BuildLogger.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/DefaultLogger.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/DemuxOutputStream.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/Diagnostics.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/DirectoryScanner.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/DynamicConfigurator.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/ExitException.html
-share/doc/java/ant/manual/api/org/apache/tools/ant/FileScanner.html