summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/apache-ant/Makefile4
-rw-r--r--devel/apache-ant/PLIST7
-rw-r--r--devel/apache-ant/distinfo10
-rw-r--r--devel/apache-ant/patches/patch-aa4
4 files changed, 16 insertions, 9 deletions
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 71e8d5b6960..3401c8fa63f 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2014/05/02 12:16:38 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/05/07 18:23:31 wiz Exp $
-DISTNAME= apache-ant-1.9.3-bin
+DISTNAME= apache-ant-1.9.4-bin
PKGNAME= ${DISTNAME:S/-bin//}
CATEGORIES= devel java
MASTER_SITES= ${MASTER_SITE_APACHE:=ant/binaries/}
diff --git a/devel/apache-ant/PLIST b/devel/apache-ant/PLIST
index d20bdf10e36..367ea93da01 100644
--- a/devel/apache-ant/PLIST
+++ b/devel/apache-ant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/05/02 12:16:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/05/07 18:23:31 wiz Exp $
bin/ant
bin/antRun
lib/java/ant/ant-antlr.jar
@@ -198,6 +198,7 @@ share/doc/java/ant/Types/fileset.html
share/doc/java/ant/Types/filterchain.html
share/doc/java/ant/Types/filterset.html
share/doc/java/ant/Types/mapper.html
+share/doc/java/ant/Types/multirootfileset.html
share/doc/java/ant/Types/namespace.html
share/doc/java/ant/Types/patternset.html
share/doc/java/ant/Types/permissions.html
@@ -1212,6 +1213,8 @@ share/doc/java/ant/api/org/apache/tools/ant/types/resources/LazyResourceCollecti
share/doc/java/ant/api/org/apache/tools/ant/types/resources/LogOutputResource.html
share/doc/java/ant/api/org/apache/tools/ant/types/resources/MappedResource.html
share/doc/java/ant/api/org/apache/tools/ant/types/resources/MappedResourceCollection.html
+share/doc/java/ant/api/org/apache/tools/ant/types/resources/MultiRootFileSet.SetType.html
+share/doc/java/ant/api/org/apache/tools/ant/types/resources/MultiRootFileSet.html
share/doc/java/ant/api/org/apache/tools/ant/types/resources/PropertyResource.html
share/doc/java/ant/api/org/apache/tools/ant/types/resources/ResourceDecorator.html
share/doc/java/ant/api/org/apache/tools/ant/types/resources/ResourceList.html
@@ -1359,12 +1362,14 @@ share/doc/java/ant/api/org/apache/tools/ant/util/LoaderUtils.html
share/doc/java/ant/api/org/apache/tools/ant/util/MergingMapper.html
share/doc/java/ant/api/org/apache/tools/ant/util/OutputStreamFunneler.html
share/doc/java/ant/api/org/apache/tools/ant/util/PackageNameMapper.html
+share/doc/java/ant/api/org/apache/tools/ant/util/ProcessUtil.html
share/doc/java/ant/api/org/apache/tools/ant/util/PropertyOutputStream.html
share/doc/java/ant/api/org/apache/tools/ant/util/ProxySetup.html
share/doc/java/ant/api/org/apache/tools/ant/util/ReaderInputStream.html
share/doc/java/ant/api/org/apache/tools/ant/util/ReflectUtil.html
share/doc/java/ant/api/org/apache/tools/ant/util/ReflectWrapper.html
share/doc/java/ant/api/org/apache/tools/ant/util/RegexpPatternMapper.html
+share/doc/java/ant/api/org/apache/tools/ant/util/ResourceUtils.ReadOnlyTargetFileException.html
share/doc/java/ant/api/org/apache/tools/ant/util/ResourceUtils.ResourceSelectorProvider.html
share/doc/java/ant/api/org/apache/tools/ant/util/ResourceUtils.html
share/doc/java/ant/api/org/apache/tools/ant/util/RetryHandler.html
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index c8b0799071a..97ec3271f82 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2014/05/02 12:16:38 wiz Exp $
+$NetBSD: distinfo,v 1.19 2014/05/07 18:23:31 wiz Exp $
-SHA1 (apache-ant-1.9.3-bin.tar.bz2) = efcf206e24b0dd1583c501182ad163af277951a4
-RMD160 (apache-ant-1.9.3-bin.tar.bz2) = 872597dcf59d64d7b2d6182ab78912ca3cb5f3a1
-Size (apache-ant-1.9.3-bin.tar.bz2) = 4320310 bytes
-SHA1 (patch-aa) = 7271790e4c59095db60473b3e559eaed360f233b
+SHA1 (apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
+RMD160 (apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
+Size (apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes
+SHA1 (patch-aa) = 18ce5479a9f8bb6011407661d710a26eb6d3e023
diff --git a/devel/apache-ant/patches/patch-aa b/devel/apache-ant/patches/patch-aa
index 40a773e72dc..3a9f6808ab6 100644
--- a/devel/apache-ant/patches/patch-aa
+++ b/devel/apache-ant/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2010/04/13 21:05:42 tonio Exp $
+$NetBSD: patch-aa,v 1.4 2014/05/07 18:23:31 wiz Exp $
+
+Initialize paths to appropriate defaults for pkgsrc.
--- bin/ant.orig 2010-02-02 01:35:22.000000000 +0100
+++ bin/ant 2010-04-13 22:52:56.000000000 +0200