pkg/42990: Update apache-ant to 1.8.0

[rambiusparkisanius%gmail.com@localhost]

>Number:         42990
>Category:       pkg
>Synopsis:       Update apache-ant to 1.8.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Mar 17 17:50:00 +0000 2010
>Originator:     Ivan "Rambius" Ivanov
>Release:        NetBSD 5.0.2
>Organization:
>Environment:
System: NetBSD medusa 5.0.2 NetBSD 5.0.2 (GENERIC) #0: Thu Mar 11 16:54:23 EET 
2010 rambius@medusa:/usr/obj/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
Please update apache-ant in pkgsrc to 1.8.0.
>How-To-Repeat:
The version of apache-ant in pkgsrc is 1.7.1. The version of apache-ant 
available on its web site is 1.8.0.

>Fix:
Patch attached:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apache-ant/Makefile,v
retrieving revision 1.26
diff -r1.26 Makefile
4c4
< DISTNAME=     apache-ant-1.7.1
---
> DISTNAME=     apache-ant-1.8.0
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apache-ant/PLIST,v
retrieving revision 1.9
diff -r1.9 PLIST
1c1
< @comment $NetBSD: PLIST,v 1.9 2009/06/14 17:48:32 joerg Exp $
---
> @comment $NetBSD$
10a11
> lib/java/ant/ant-apache-xalan2.jar
22d22
< lib/java/ant/ant-starteam.jar
27d26
< lib/java/ant/ant-weblogic.jar
46a46
> share/doc/java/ant/antlibs/compress/index.html
49a50
> share/doc/java/ant/antlibs/props/index.html
104a106
> share/doc/java/ant/manual/CoreTasks/componentdef.html
131a134
> share/doc/java/ant/manual/CoreTasks/hostinfo.html
132a136
> share/doc/java/ant/manual/CoreTasks/include.html
141a146
> share/doc/java/ant/manual/CoreTasks/local.html
155a161
> share/doc/java/ant/manual/CoreTasks/propertyhelper.html
221d226
< share/doc/java/ant/manual/OptionalTasks/csc.html
223d227
< share/doc/java/ant/manual/OptionalTasks/dotnet.html
227,228d230
< share/doc/java/ant/manual/OptionalTasks/ilasm.html
< share/doc/java/ant/manual/OptionalTasks/ildasm.html
231d232
< share/doc/java/ant/manual/OptionalTasks/importtypelib.html
242d242
< share/doc/java/ant/manual/OptionalTasks/jsharpc.html
265a266
> share/doc/java/ant/manual/OptionalTasks/sshsession.html
271d271
< share/doc/java/ant/manual/OptionalTasks/vbc.html
274d273
< share/doc/java/ant/manual/OptionalTasks/wsdltodotnet.html
308a308
> share/doc/java/ant/manual/api/org/apache/tools/ant/ExtensionPoint.html
319a320,323
> share/doc/java/ant/manual/api/org/apache/tools/ant/ProjectHelperRepository.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/PropertyHelper.Delegate.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/PropertyHelper.PropertyEvaluator.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/PropertyHelper.PropertySetter.html
325a330
> share/doc/java/ant/manual/api/org/apache/tools/ant/TaskConfigurationChecker.html
354a360
> share/doc/java/ant/manual/api/org/apache/tools/ant/filters/SortFilter.html
359a366
> share/doc/java/ant/manual/api/org/apache/tools/ant/filters/SuffixLines.html
373a381
> share/doc/java/ant/manual/api/org/apache/tools/ant/filters/UniqFilter.html
418a427
> share/doc/java/ant/manual/api/org/apache/tools/ant/listener/ProfileLogger.html
423a433
> share/doc/java/ant/manual/api/org/apache/tools/ant/loader/AntClassLoader5.html
429a440,451
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/GetProperty.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/LocalProperties.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/LocalPropertyStack.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/NullReturn.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/ParseNextProperty.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/ParseProperties.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/PropertyExpander.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/ResolvePropertyMap.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/package-frame.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/package-summary.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/property/package-tree.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.Module.html
452a475,476
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/CloseResources.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Componentdef.html
473a498
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/EchoXML.NamespacePolicy.html
499a525
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/HostInfo.html
531a558
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Local.html
562a590,592
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PropertyHelperTask.DelegateElement.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PropertyHelperTask.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/PumpStreamHandler.ThreadWithPumper.html
596a627
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Touch.DateFormatFactory.html
621a653
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.TraceConfiguration.html
625a658
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.UnicodeExtraField.html
656a690,691
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsLastModified.CompareMode.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsLastModified.html
667a703
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ResourceExists.html
721a758,759
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XSLTTraceSupport.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.html
776,796d813
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.TargetTypes.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.TargetTypes.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.EncodingTypes.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.VisibilityOptions.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.Compiler.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.Schema.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-frame.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-summary.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-tree.html
799,800d815
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.html
807,808d821
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.html
817,818d829
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.html
915a927,928
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.TestInfos.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.html
935a949
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.html
954a969
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPFileProxy.html
958a974,983
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTask.Action.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTask.FTPSystemType.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTask.Granularity.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTask.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirror.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.FTPDirectoryScanner.AntFTPFile.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.FTPDirectoryScanner.AntFTPRootFile.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.FTPDirectoryScanner.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.FTPFileProxy.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.html
1007,1010d1031
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-frame.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-summary.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-tree.html
1041a1063,1066
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.LocalTunnel.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.NestedSequential.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.RemoteTunnel.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.html
1051,1060c1076,1081
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.UnmatchedFileMap.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-frame.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-summary.html
< 
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-tree.html
---
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/BlockFor.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/BuildTimeoutException.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/Funtest.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/package-frame.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/package-summary.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/package-tree.html
1203a1225,1227
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/AbstractClasspathResource.ClassLoaderWithFlag.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/AbstractClasspathResource.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Appendable.html
1204a1229
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/Archives.html
1209a1235
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/ContentTransformingResource.html
1210a1237
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/FileProvider.html
1217a1245
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/JavaConstantResource.html
1219a1248,1250
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/LogOutputResource.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/MappedResource.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/MappedResourceCollection.html
1220a1252,1253
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/ResourceDecorator.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/ResourceList.html
1228a1262
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/resources/URLProvider.html
1288a1323
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/ReadableSelector.html
1296a1332,1333
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/TokenizedPath.html
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/TokenizedPattern.html
1298a1336
> share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/WritableSelector.html
1338a1377
> share/doc/java/ant/manual/api/org/apache/tools/ant/util/FirstMatchMapper.html
1346a1386
> share/doc/java/ant/manual/api/org/apache/tools/ant/util/LayoutPreservingProperties.html
1361a1402
> share/doc/java/ant/manual/api/org/apache/tools/ant/util/ResourceUtils.ResourceSelectorProvider.html
1370a1412
> share/doc/java/ant/manual/api/org/apache/tools/ant/util/SplitClassLoader.html
1372a1415
> share/doc/java/ant/manual/api/org/apache/tools/ant/util/SymbolicLinkUtils.html
1378a1422
> share/doc/java/ant/manual/api/org/apache/tools/ant/util/VectorSet.html
1381a1426
> share/doc/java/ant/manual/api/org/apache/tools/ant/util/WorkerAnt.html
1449a1495
> share/doc/java/ant/manual/api/org/apache/tools/zip/AbstractUnicodeExtraField.html
1450a1497
> share/doc/java/ant/manual/api/org/apache/tools/zip/CentralDirectoryParsingZipExtraField.html
1452a1500,1501
> share/doc/java/ant/manual/api/org/apache/tools/zip/UnicodeCommentExtraField.html
> share/doc/java/ant/manual/api/org/apache/tools/zip/UnicodePathExtraField.html
1458a1508
> share/doc/java/ant/manual/api/org/apache/tools/zip/ZipOutputStream.UnicodeExtraFieldPolicy.html
1491a1542,1543
> share/doc/java/ant/manual/projecthelper.html
> share/doc/java/ant/manual/properties.html
1497a1550
> share/doc/java/ant/manual/targets.html
1514a1568
> share/doc/java/ant/projects/ivyde.html
1517a1572,1576
> share/doc/java/ant/webtest/gettest/.htaccess
> share/doc/java/ant/webtest/gettest/testother.txt
> share/doc/java/ant/webtest/gettest/testperm.txt
> share/doc/java/ant/webtest/gettest/testredir5.txt
> share/doc/java/ant/webtest/gettest/testtemp.txt
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apache-ant/distinfo,v
retrieving revision 1.10
diff -r1.10 distinfo
3,6c3,6
< SHA1 (apache-ant-1.7.1-bin.tar.bz2) = b078ba89301687662f100da7b059105f32004f7c
< RMD160 (apache-ant-1.7.1-bin.tar.bz2) = 
e3244035f0e3ac756a741d6d4fb5a91cfff4f0dd
< Size (apache-ant-1.7.1-bin.tar.bz2) = 7641928 bytes
< SHA1 (patch-aa) = 87a048e639a8a4df3de56b5d473dba6bd4f1d23d
---
> SHA1 (apache-ant-1.8.0-bin.tar.bz2) = 08f20b0bfaeeb800694b967282e11bb7edbb3a2c
> RMD160 (apache-ant-1.8.0-bin.tar.bz2) = 
> 4cb46e6c33b27b4a2626bfc24161f11a4b0a6ccc
> Size (apache-ant-1.8.0-bin.tar.bz2) = 7950832 bytes
> SHA1 (patch-aa) = f6caa5356e8ce435d4977fdd458ae61ea296a673
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apache-ant/patches/patch-aa,v
retrieving revision 1.2
diff -r1.2 patch-aa
3,21c3,5
< --- bin/ant.orig      2005-05-19 14:37:16.000000000 +0200
< +++ bin/ant   2005-05-25 14:38:03.000000000 +0200
< @@ -86,6 +86,15 @@
<             ;;
<  esac
<  
< +if [ "$ANT_HOME" = "" ] ; then
< +  # try to find ANT
< +  ANT_HOME=@PREFIX@
< +fi
< +
< +if [ "$JAVA_HOME" = "" ] ; then
< +  JAVA_HOME=@JAVA_HOME@
< +fi
< +
<  if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
<    ## resolve links - $0 may be a link to ant's home
<    PRG="$0"
< @@ -117,7 +126,12 @@
---
> --- bin/ant.orig      2010-02-02 00:35:22.000000000 +0000
> +++ bin/ant
> @@ -129,7 +129,7 @@ if $mingw ; then
27,31d10
< +
< +# use ${PREFIX}/bin/java (wrapper)
< +if [ "$JAVACMD" = "" ]  && [ -f @PREFIX@/bin/java ] ; then
< +  JAVACMD=@PREFIX@/bin/java
< +fi