- update to 1.6.1

Changed files:
    jakarta-ant-ANT_HOME.patch -> 1.4

diff --git a/jakarta-ant-ANT_HOME.patch b/jakarta-ant-ANT_HOME.patch
index 0dca7a2e3764ec103de9ae07244e32a858390f7e..341ea1585618c7e9b70eed26cb65de3c5568377b 100644 (file)
--- a/jakarta-ant-ANT_HOME.patch
+++ b/jakarta-ant-ANT_HOME.patch
@@ -1,42 +1,31 @@
-diff -urN jakarta-ant-1.5.1.org/src/script/ant jakarta-ant-1.5.1/src/script/ant
---- jakarta-ant-1.5.1.org/src/script/ant       Wed Nov 27 00:01:16 2002
-+++ jakarta-ant-1.5.1/src/script/ant   Wed Nov 27 00:06:27 2002
-@@ -35,13 +35,13 @@
+--- apache-ant-1.6.1/src/script/ant.fix        2004-03-31 20:54:36.093281896 +0200
++++ apache-ant-1.6.1/src/script/ant    2004-03-31 20:55:32.140761384 +0200
+@@ -47,14 +47,13 @@
  
- if [ -z "$ANT_HOME" ] ; then
+ if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
    # try to find ANT
--  if [ -d /opt/ant ] ; then 
-+  if [ -f /usr/share/java/ant.jar ] ; then 
+-  if [ -d /opt/ant ] ; then
++  if [ -f /usr/share/java/ant.jar ] ; then
 +    ANT_HOME=/usr/share/java
-+  elif [ -d /opt/ant ] ; then 
++  elif [ -d /opt/ant ] ; then
      ANT_HOME=/opt/ant
 -  fi
 -
--  if [ -d "${HOME}/opt/ant" ] ; then 
-+  elif [ -d "${HOME}/opt/ant" ] ; then 
+-  if [ -d "${HOME}/opt/ant" ] ; then
++  elif [ -d "${HOME}/opt/ant" ] ; then
      ANT_HOME="${HOME}/opt/ant"
 -  fi
+-
 +  else
- 
    ## resolve links - $0 may be a link to ant's home
    PRG="$0"
-@@ -65,6 +65,8 @@
- 
-   cd "$saveddir"
+   progname=`basename "$0"`
+@@ -71,7 +70,7 @@
+   done
  
+   ANT_HOME=`dirname "$PRG"`/..
+-
 +  fi
-+
    # make it fully qualified
    ANT_HOME=`cd "$ANT_HOME" && pwd`
  fi
-@@ -82,6 +84,10 @@
- # set ANT_LIB location
- ANT_LIB="${ANT_HOME}/lib"
- 
-+if [ -z "$JAVA_HOME" -a -x /usr/lib/java/bin/java ]; then
-+  JAVA_HOME=/usr/lib/java
-+fi
-+
- if [ -z "$JAVACMD" ] ; then 
-   if [ -n "$JAVA_HOME"  ] ; then
-     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then