3 files changed, 84 insertions, 9 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 0882c6f11a39..bd787b97d752 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache-ant
-PORTVERSION=	1.6.5
-PORTREVISION=	2
+PORTVERSION=	1.7.0
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%/,hq/:man,} \
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index aeb6791e87b1..d86e7374d23d 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,6 +1,6 @@
-MD5 (apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
-SHA256 (apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
-SIZE (apache-ant-1.6.5-bin.tar.bz2) = 6743024
+MD5 (apache-ant-1.7.0-bin.tar.bz2) = 6df38ed01474d6e7c1570d2d8cb5c110
+SHA256 (apache-ant-1.7.0-bin.tar.bz2) = e4dc1a1774640d5587a9cf50bc6d84d21ec2c995eda5833120d3ba571f5fb314
+SIZE (apache-ant-1.7.0-bin.tar.bz2) = 7467376
 MD5 (apache-ant-manpage-20030908.tgz) = 1fe1fdab6cce4def62005d67d929a9c9
 SHA256 (apache-ant-manpage-20030908.tgz) = 721981f64fae3577c04c527232edab9bfa0755af08319049cec206584dc8830c
 SIZE (apache-ant-manpage-20030908.tgz) = 9735
diff --git a/devel/apache-ant/pkg-plist b/devel/apache-ant/pkg-plist
index 862d3baa36b9..247d5e8876a6 100644
--- a/devel/apache-ant/pkg-plist
+++ b/devel/apache-ant/pkg-plist
@@ -16,34 +16,110 @@
 %%DATADIR%%/etc/mmetrics-frames.xsl
 %%DATADIR%%/etc/tagdiff.xsl
 %%DATADIR%%/lib/README
+%%DATADIR%%/lib/ant-1.7.0.pom
+%%DATADIR%%/lib/ant-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-1.7.0.pom.sha1
+%%DATADIR%%/lib/ant-antlr-1.7.0.pom
+%%DATADIR%%/lib/ant-antlr-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-antlr-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-antlr.jar
+%%DATADIR%%/lib/ant-apache-bcel-1.7.0.pom
+%%DATADIR%%/lib/ant-apache-bcel-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-apache-bcel-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-apache-bcel.jar
+%%DATADIR%%/lib/ant-apache-bsf-1.7.0.pom
+%%DATADIR%%/lib/ant-apache-bsf-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-apache-bsf-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-apache-bsf.jar
+%%DATADIR%%/lib/ant-apache-log4j-1.7.0.pom
+%%DATADIR%%/lib/ant-apache-log4j-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-apache-log4j-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-apache-log4j.jar
+%%DATADIR%%/lib/ant-apache-oro-1.7.0.pom
+%%DATADIR%%/lib/ant-apache-oro-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-apache-oro-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-apache-oro.jar
+%%DATADIR%%/lib/ant-apache-regexp-1.7.0.pom
+%%DATADIR%%/lib/ant-apache-regexp-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-apache-regexp-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-apache-regexp.jar
+%%DATADIR%%/lib/ant-apache-resolver-1.7.0.pom
+%%DATADIR%%/lib/ant-apache-resolver-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-apache-resolver-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-apache-resolver.jar
+%%DATADIR%%/lib/ant-commons-logging-1.7.0.pom
+%%DATADIR%%/lib/ant-commons-logging-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-commons-logging-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-commons-logging.jar
+%%DATADIR%%/lib/ant-commons-net-1.7.0.pom
+%%DATADIR%%/lib/ant-commons-net-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-commons-net-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-commons-net.jar
-%%DATADIR%%/lib/ant-icontract.jar
+%%DATADIR%%/lib/ant-jai-1.7.0.pom
+%%DATADIR%%/lib/ant-jai-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-jai-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-jai.jar
+%%DATADIR%%/lib/ant-javamail-1.7.0.pom
+%%DATADIR%%/lib/ant-javamail-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-javamail-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-javamail.jar
+%%DATADIR%%/lib/ant-jdepend-1.7.0.pom
+%%DATADIR%%/lib/ant-jdepend-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-jdepend-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-jdepend.jar
+%%DATADIR%%/lib/ant-jmf-1.7.0.pom
+%%DATADIR%%/lib/ant-jmf-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-jmf-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-jmf.jar
+%%DATADIR%%/lib/ant-jsch-1.7.0.pom
+%%DATADIR%%/lib/ant-jsch-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-jsch-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-jsch.jar
+%%DATADIR%%/lib/ant-junit-1.7.0.pom
+%%DATADIR%%/lib/ant-junit-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-junit-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-junit.jar
+%%DATADIR%%/lib/ant-launcher-1.7.0.pom
+%%DATADIR%%/lib/ant-launcher-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-launcher-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-launcher.jar
+%%DATADIR%%/lib/ant-netrexx-1.7.0.pom
+%%DATADIR%%/lib/ant-netrexx-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-netrexx-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-netrexx.jar
+%%DATADIR%%/lib/ant-nodeps-1.7.0.pom
+%%DATADIR%%/lib/ant-nodeps-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-nodeps-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-nodeps.jar
+%%DATADIR%%/lib/ant-parent-1.7.0.pom
+%%DATADIR%%/lib/ant-parent-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-parent-1.7.0.pom.sha1
+%%DATADIR%%/lib/ant-starteam-1.7.0.pom
+%%DATADIR%%/lib/ant-starteam-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-starteam-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-starteam.jar
+%%DATADIR%%/lib/ant-stylebook-1.7.0.pom
+%%DATADIR%%/lib/ant-stylebook-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-stylebook-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-stylebook.jar
+%%DATADIR%%/lib/ant-swing-1.7.0.pom
+%%DATADIR%%/lib/ant-swing-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-swing-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-swing.jar
+%%DATADIR%%/lib/ant-testutil-1.7.0.pom
+%%DATADIR%%/lib/ant-testutil-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-testutil-1.7.0.pom.sha1
+%%DATADIR%%/lib/ant-testutil.jar
+%%DATADIR%%/lib/ant-trax-1.7.0.pom
+%%DATADIR%%/lib/ant-trax-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-trax-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-trax.jar
-%%DATADIR%%/lib/ant-vaj.jar
+%%DATADIR%%/lib/ant-weblogic-1.7.0.pom
+%%DATADIR%%/lib/ant-weblogic-1.7.0.pom.md5
+%%DATADIR%%/lib/ant-weblogic-1.7.0.pom.sha1
 %%DATADIR%%/lib/ant-weblogic.jar
-%%DATADIR%%/lib/ant-xalan1.jar
-%%DATADIR%%/lib/ant-xslp.jar
 %%DATADIR%%/lib/ant.jar
+%%DATADIR%%/lib/libraries.properties
 %%DATADIR%%/lib/xercesImpl.jar
 %%DATADIR%%/lib/xml-apis.jar
 bin/ant