3 files changed, 20 insertions, 15 deletions
diff --git a/development/apache-ant/README b/development/apache-ant/README
index 8b0cbb02bd..f96e1a8640 100644
--- a/development/apache-ant/README
+++ b/development/apache-ant/README
@@ -4,3 +4,6 @@ wrinkles.  :-)
 Ant is extended using Java classes. The configuration files are XML- based,
 calling out a target tree where tasks get executed. Each task is run by an
 object that implements a Task interface.
+
+This package, and others available from Slackbuilds.org, are using the 
+upstream recommendation of $ANT_HOME being /usr/share/ant.
diff --git a/development/apache-ant/apache-ant.SlackBuild b/development/apache-ant/apache-ant.SlackBuild
index 65a3a49684..58527bab7d 100644
--- a/development/apache-ant/apache-ant.SlackBuild
+++ b/development/apache-ant/apache-ant.SlackBuild
@@ -1,18 +1,18 @@
 #!/bin/sh
 
 # Slackware build script for apache-ant
-# Started by Dugan Chen (dugan_c@fastmail.fm)
+# Started by Dugan Chen (dugan[underscore]c[at]fastmail[dot]fm)
 # Taken over by Vincent Batts (vbatts@hashbangbash.com)
 
 PRGNAM=apache-ant
-VERSION=1.7.1
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+VERSION=1.8.0
+ARCH=noarch
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 TEAM=$(echo $PRGNAM | cut -d- -f1)
 PROJECT=$(echo $PRGNAM | cut -d- -f2)
-ANT_HOME=${ANT_HOME:-/usr/share/$PROJECT}
+ANT_HOME=/usr/share/$PROJECT
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -50,11 +50,11 @@ cd $PKG/usr/share/java
 cd -
 
 cd $PKG/usr/bin
-  ln -s ../share/$PROJECT/bin/ant
-  ln -s ../share/$PROJECT/bin/antRun
-  ln -s ../share/$PROJECT/bin/antRun.pl
-  ln -s ../share/$PROJECT/bin/runant.pl
-  ln -s ../share/$PROJECT/bin/runant.py
+  ln -s $ANT_HOME/bin/ant
+  ln -s $ANT_HOME/bin/antRun
+  ln -s $ANT_HOME/bin/antRun.pl
+  ln -s $ANT_HOME/bin/runant.pl
+  ln -s $ANT_HOME/bin/runant.py
 cd -
 
 mkdir -p $PKG/usr/doc/${PRGNAM}-$VERSION
@@ -66,4 +66,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/apache-ant/apache-ant.info b/development/apache-ant/apache-ant.info
index 85465200ab..8bcfa1b366 100644
--- a/development/apache-ant/apache-ant.info
+++ b/development/apache-ant/apache-ant.info
@@ -1,8 +1,10 @@
 PRGNAM="apache-ant"
-VERSION="1.7.1"
+VERSION="1.8.0"
 HOMEPAGE="http://ant.apache.org/"
-DOWNLOAD="http://apache.mirror.rafal.ca/ant/binaries/apache-ant-1.7.1-bin.tar.bz2"
-MD5SUM="9330447f3763b87570dd1118c49a8efd"
+DOWNLOAD="http://www.reverse.net/pub/apache/ant/binaries/apache-ant-1.8.0-bin.tar.bz2"
+MD5SUM="f0cd9b3cfd1d969656971f055ea2e06f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
-APPROVED="rworkman"
+APPROVED="dsomero"