5 files changed, 50 insertions, 26 deletions
diff --git a/development/apache-ant/apache-ant.SlackBuild b/development/apache-ant/apache-ant.SlackBuild
index 08083b78b5..65a3a49684 100644
--- a/development/apache-ant/apache-ant.SlackBuild
+++ b/development/apache-ant/apache-ant.SlackBuild
@@ -1,39 +1,69 @@
 #!/bin/sh
 
-# Slackware build script for Apache Ant
-# Written by Dugan Chen (dugan_c@fastmail.fm)
-
-set -e
+# Slackware build script for apache-ant
+# Started by Dugan Chen (dugan_c@fastmail.fm)
+# Taken over by Vincent Batts (vbatts@hashbangbash.com)
 
 PRGNAM=apache-ant
 VERSION=1.7.1
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
+TEAM=$(echo $PRGNAM | cut -d- -f1)
+PROJECT=$(echo $PRGNAM | cut -d- -f2)
+ANT_HOME=${ANT_HOME:-/usr/share/$PROJECT}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 rm -rf $PKG
-mkdir -p $TMP $PKG/opt/$PRGNAM $OUTPUT
+mkdir -p $TMP $PKG/usr/share/java $PKG/$ANT_HOME $OUTPUT $PKG/usr/bin
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-bin.tar.bz2
-cd $PRGNAM-$VERSION
-cp -a bin lib etc $PKG/opt/$PRGNAM
+rm -rf ${PRGNAM}-$VERSION
+tar xvf $CWD/${PRGNAM}-$VERSION-bin.tar.bz2
+cd ${PRGNAM}-$VERSION
+chown -R root:root .
+
+cp -a bin lib etc $PKG/$ANT_HOME/
+rm $PKG/$ANT_HOME/lib/x*jar
 
 mkdir -p $PKG/etc/profile.d/
-cp $CWD/profile.d/* $PKG/etc/profile.d/
+cat << EOF > $PKG/etc/profile.d/$PRGNAM.csh
+#!/bin/csh
+setenv ANT_HOME ${ANT_HOME}
+EOF
+cat << EOF > $PKG/etc/profile.d/$PRGNAM.sh
+#!/bin/sh
+export ANT_HOME=${ANT_HOME}
+EOF
 chmod 0755 $PKG/etc/profile.d/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cd $PKG/usr/share/java
+  for jar in ../../../$ANT_HOME/lib/*.jar ; do
+    ln -s $jar
+  done
+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
+cd -
+
+mkdir -p $PKG/usr/doc/${PRGNAM}-$VERSION
 cp -a INSTALL KEYS NOTICE README \
-  WHATSNEW docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  WHATSNEW docs/* $PKG/usr/doc/${PRGNAM}-$VERSION
+cat $CWD/${PRGNAM}.SlackBuild > $PKG/usr/doc/${PRGNAM}-$VERSION/${PRGNAM}.SlackBuild
 
 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.tgz
diff --git a/development/apache-ant/apache-ant.info b/development/apache-ant/apache-ant.info
index ee283b093f..85465200ab 100644
--- a/development/apache-ant/apache-ant.info
+++ b/development/apache-ant/apache-ant.info
@@ -3,6 +3,6 @@ VERSION="1.7.1"
 HOMEPAGE="http://ant.apache.org/"
 DOWNLOAD="http://apache.mirror.rafal.ca/ant/binaries/apache-ant-1.7.1-bin.tar.bz2"
 MD5SUM="9330447f3763b87570dd1118c49a8efd"
-MAINTAINER="Dugan Chen"
-EMAIL="dugan (underscore) c (at) fastmail (dot) fm"
-APPROVED="Erik Hanson"
+MAINTAINER="Vincent Batts"
+EMAIL="vbatts@hashbangbash.com"
+APPROVED="rworkman"
diff --git a/development/apache-ant/profile.d/apache-ant.csh b/development/apache-ant/profile.d/apache-ant.csh
deleted file mode 100644
index d487656f03..0000000000
--- a/development/apache-ant/profile.d/apache-ant.csh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/csh
-setenv ANT_HOME /opt/apache-ant
-setenv PATH ${PATH}:${ANT_HOME}/bin
diff --git a/development/apache-ant/profile.d/apache-ant.sh b/development/apache-ant/profile.d/apache-ant.sh
deleted file mode 100644
index db8a244ac9..0000000000
--- a/development/apache-ant/profile.d/apache-ant.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export ANT_HOME=/opt/apache-ant
-export PATH=$PATH:$ANT_HOME/bin
diff --git a/development/apache-ant/slack-desc b/development/apache-ant/slack-desc
index 559e8c1f65..9a484bb9d2 100644
--- a/development/apache-ant/slack-desc
+++ b/development/apache-ant/slack-desc
@@ -5,12 +5,12 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-          |-----handy-ruler-------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 apache-ant: Apache Ant (Java-based build tool)
 apache-ant:
 apache-ant: Apache Ant is a Java-based build tool - like make but without 
 apache-ant: make's wrinkles.
-apache-ant: 
+apache-ant:
 apache-ant: Ant is extended using Java classes. The configuration files are
 apache-ant: XML-based, calling out a target tree where tasks get executed.
 apache-ant: Each task is run by an object that implements a Task interface.