- Update to 1.8.1

- Add LICENSE
- Cleanup MASTER_SITES
- Sort PLIST

PR:		ports/151906
Submitted by:	sunpoet (myself)

3 files changed, 34 insertions, 97 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 265772c0b68b..3d98b735c87b 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	apache-ant
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%/,hq/:man,} \
-		http://www.esil.univ-mrs.fr/~hquiroz/:man
+		LOCAL/hq:man
 DISTFILES=	${ANT_DISTFILE}:bin \
 		${MANPAGE_DISTFILE}:man
 EXTRACT_ONLY=	${ANT_DISTFILE}
@@ -20,6 +19,8 @@ COMMENT=	Java- and XML-based build tool, conceptually similar to make
 
 RUN_DEPENDS=	classpath:${PORTSDIR}/java/javavmwrapper
 
+LICENSE=	ASL
+
 ANT_DISTFILE=	${PORTNAME}-${PORTVERSION}-bin.tar.bz2
 MANPAGE_DISTFILE=	${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz
 MANPAGE_VERSION=	20030908
@@ -30,12 +31,10 @@ JAVA_VERSION=	1.2+
 NO_BUILD=	YES
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-PLIST_SUB+=	ANT_VERSION="${PORTVERSION}"
-
 READMES=	LICENSE README WHATSNEW
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	* .htaccess
+PORTDOCS=	*
 .endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index 999e634f1268..5c424a38d33a 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,6 +1,4 @@
-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-1.8.1-bin.tar.bz2) = e0c4e1133b0cb80dc4b29fc48f11b8f57e845e16474472f2749625be5cc66ca9
+SIZE (apache-ant-1.8.1-bin.tar.bz2) = 6702817
 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 9a9896baa54a..96f43ef9cbd0 100644
--- a/devel/apache-ant/pkg-plist
+++ b/devel/apache-ant/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+bin/ant
 %%DATADIR%%/bin/antRun
 %%DATADIR%%/etc/ant-bootstrap.jar
 %%DATADIR%%/etc/changelog.xsl
@@ -16,115 +17,54 @@
 %%DATADIR%%/etc/mmetrics-frames.xsl
 %%DATADIR%%/etc/tagdiff.xsl
 %%DATADIR%%/lib/README
-%%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-%%ANT_VERSION%%.pom
-%%DATADIR%%/lib/ant-apache-bcel-%%ANT_VERSION%%.pom.md5
-%%DATADIR%%/lib/ant-apache-bcel-%%ANT_VERSION%%.pom.sha1
+%%DATADIR%%/lib/ant-antlr.pom
 %%DATADIR%%/lib/ant-apache-bcel.jar
-%%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-bcel.pom
 %%DATADIR%%/lib/ant-apache-bsf.jar
-%%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-bsf.pom
 %%DATADIR%%/lib/ant-apache-log4j.jar
-%%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-log4j.pom
 %%DATADIR%%/lib/ant-apache-oro.jar
-%%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-oro.pom
 %%DATADIR%%/lib/ant-apache-regexp.jar
-%%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-regexp.pom
 %%DATADIR%%/lib/ant-apache-resolver.jar
-%%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-apache-resolver.pom
+%%DATADIR%%/lib/ant-apache-xalan2.jar
+%%DATADIR%%/lib/ant-apache-xalan2.pom
 %%DATADIR%%/lib/ant-commons-logging.jar
-%%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-logging.pom
 %%DATADIR%%/lib/ant-commons-net.jar
-%%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-commons-net.pom
 %%DATADIR%%/lib/ant-jai.jar
-%%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-jai.pom
 %%DATADIR%%/lib/ant-javamail.jar
-%%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-javamail.pom
 %%DATADIR%%/lib/ant-jdepend.jar
-%%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-jdepend.pom
 %%DATADIR%%/lib/ant-jmf.jar
-%%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-jmf.pom
 %%DATADIR%%/lib/ant-jsch.jar
-%%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-jsch.pom
 %%DATADIR%%/lib/ant-junit.jar
-%%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-junit.pom
 %%DATADIR%%/lib/ant-launcher.jar
-%%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-launcher.pom
 %%DATADIR%%/lib/ant-netrexx.jar
-%%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-netrexx.pom
 %%DATADIR%%/lib/ant-nodeps.jar
-%%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-%%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-%%ANT_VERSION%%.pom
-%%DATADIR%%/lib/ant-swing-%%ANT_VERSION%%.pom.md5
-%%DATADIR%%/lib/ant-swing-%%ANT_VERSION%%.pom.sha1
+%%DATADIR%%/lib/ant-nodeps.pom
+%%DATADIR%%/lib/ant-parent.pom
 %%DATADIR%%/lib/ant-swing.jar
-%%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-swing.pom
 %%DATADIR%%/lib/ant-testutil.jar
-%%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-%%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-testutil.pom
 %%DATADIR%%/lib/ant.jar
+%%DATADIR%%/lib/ant.pom
 %%DATADIR%%/lib/libraries.properties
-%%DATADIR%%/lib/xercesImpl.jar
-%%DATADIR%%/lib/xml-apis.jar
-bin/ant
-@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/etc/checkstyle
 @dirrm %%DATADIR%%/etc
-@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%