diff options
| author | jwise <jwise@pkgsrc.org> | 2000-07-03 03:50:11 +0000 |
|---|---|---|
| committer | jwise <jwise@pkgsrc.org> | 2000-07-03 03:50:11 +0000 |
| commit | 58f4e98c04ec6b6e88eed785717e3038e73992ed (patch) | |
| tree | be85133f8f7e07d70925c60ba0107b8dac65c982 /devel/jakarta-ant/patches | |
| parent | 16f87cf78726aa85ebd7144d0636f9623d3e7ae2 (diff) | |
| download | pkgsrc-58f4e98c04ec6b6e88eed785717e3038e73992ed.tar.gz | |
Reimport this in the right place:
Initial import of jakarta-ant-3.1, a java-based make(1) replacement which
is starting to be used by a lot of java-based projects.
Diffstat (limited to 'devel/jakarta-ant/patches')
| -rw-r--r-- | devel/jakarta-ant/patches/patch-aa | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/devel/jakarta-ant/patches/patch-aa b/devel/jakarta-ant/patches/patch-aa new file mode 100644 index 00000000000..cc37f30fc14 --- /dev/null +++ b/devel/jakarta-ant/patches/patch-aa @@ -0,0 +1,58 @@ +$NetBSD: patch-aa,v 1.1.1.1 2000/07/03 03:50:12 jwise Exp $ +--- src/bin/ant.orig Thu Jan 13 05:41:40 2000 ++++ src/bin/ant Sun Jul 2 17:13:06 2000 +@@ -6,35 +6,18 @@ + + if [ "$ANT_HOME" = "" ] ; then + # try to find ANT +- if [ -d /opt/ant ] ; then +- ANT_HOME=/opt/ant ++ if [ -d @PREFIX@ ] ; then ++ ANT_HOME=@PREFIX@ + fi + +- if [ -d ${HOME}/opt/ant ] ; then +- ANT_HOME=${HOME}/opt/ant ++ if [ -d ${HOME}/ant ] ; then ++ ANT_HOME=${HOME}/ant + fi +- +- ## resolve links - $0 may be a link to ant's home +- PRG=$0 +- progname=`basename $0` +- +- while [ -h "$PRG" ] ; do +- ls=`ls -ld "$PRG"` +- link=`expr "$ls" : '.*-> \(.*\)$'` +- if expr "$link" : '.*/.*' > /dev/null; then +- PRG="$link" +- else +- PRG="`dirname $PRG`/$link" +- fi +- done +- +- ANT_HOME=`dirname "$PRG"`/.. +- + fi + + # Allow .antrc to specifiy flags to java cmd + if [ "$JAVACMD" = "" ] ; then +- JAVACMD=java ++ JAVACMD=@JAVA_HOME@/bin/java + fi + + # Use the original tools.jar if available +@@ -43,10 +26,9 @@ + CLASSPATH=${JAVA_HOME}/lib/classes.zip:$CLASSPATH + fi + +- +-CLASSPATH=${ANT_HOME}/lib/xml.jar:$CLASSPATH +-CLASSPATH=${ANT_HOME}/lib/ant.jar:$CLASSPATH +-CLASSPATH=${ANT_HOME}/lib/moo.jar:$CLASSPATH ++CLASSPATH=${ANT_HOME}/lib/java/xml.jar:$CLASSPATH ++CLASSPATH=${ANT_HOME}/lib/java/ant.jar:$CLASSPATH ++#CLASSPATH=${ANT_HOME}/lib/java/moo.jar:$CLASSPATH + export CLASSPATH + + $JAVACMD -Dant.home=${ANT_HOME} org.apache.tools.ant.Main $@ |