3 files changed, 85 insertions, 84 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 732706002612..265772c0b68b 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache-ant
-PORTVERSION=	1.7.0
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%/,hq/:man,} \
@@ -31,10 +30,12 @@ JAVA_VERSION=	1.2+
 NO_BUILD=	YES
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
+PLIST_SUB+=	ANT_VERSION="${PORTVERSION}"
+
 READMES=	LICENSE README WHATSNEW
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	*
+PORTDOCS=	* .htaccess
 .endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index d86e7374d23d..999e634f1268 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,6 +1,6 @@
-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-1.7.1-bin.tar.bz2) = 9330447f3763b87570dd1118c49a8efd
+SHA256 (apache-ant-1.7.1-bin.tar.bz2) = 24e54c9d90b81d1b7342695a8285a969393fd883e99ffbbc04203c106d9c2f97
+SIZE (apache-ant-1.7.1-bin.tar.bz2) = 7641928
 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 247d5e8876a6..9a9896baa54a 100644
--- a/devel/apache-ant/pkg-plist
+++ b/devel/apache-ant/pkg-plist
@@ -16,107 +16,107 @@
 %%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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-%%ANT_VERSION%%.pom.sha1
+%%DATADIR%%/lib/ant-antlr-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-antlr-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-antlr-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-apache-bcel-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-apache-bcel-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-apache-bsf-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-apache-bsf-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-apache-log4j-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-apache-log4j-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-apache-oro-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-apache-oro-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-apache-regexp-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-apache-regexp-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-apache-resolver-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-apache-resolver-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-commons-logging-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-commons-logging-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-commons-net-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-commons-net-%%ANT_VERSION%%.pom.sha1
 %%DATADIR%%/lib/ant-commons-net.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-jai-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-jai-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-javamail-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-javamail-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-jdepend-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-jdepend-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-jmf-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-jmf-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-jsch-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-jsch-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-junit-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-junit-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-launcher-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-launcher-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-netrexx-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-netrexx-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-nodeps-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-nodeps-%%ANT_VERSION%%.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-parent-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-parent-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-parent-%%ANT_VERSION%%.pom.sha1
+%%DATADIR%%/lib/ant-starteam-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-starteam-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-starteam-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-stylebook-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-stylebook-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-swing-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-swing-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-testutil-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-testutil-%%ANT_VERSION%%.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-trax-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-trax-%%ANT_VERSION%%.pom.sha1
 %%DATADIR%%/lib/ant-trax.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-%%ANT_VERSION%%.pom
+%%DATADIR%%/lib/ant-weblogic-%%ANT_VERSION%%.pom.md5
+%%DATADIR%%/lib/ant-weblogic-%%ANT_VERSION%%.pom.sha1
 %%DATADIR%%/lib/ant-weblogic.jar
 %%DATADIR%%/lib/ant.jar
 %%DATADIR%%/lib/libraries.properties