1 files changed, 27 insertions, 87 deletions
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%%