devel/apache-ant/patches/patch-aa

   1 $NetBSD: patch-aa,v 1.2 2008/10/25 17:43:33 adrianp Exp $
   2
   3 --- bin/ant.orig        2005-05-19 14:37:16.000000000 +0200
   4 +++ bin/ant     2005-05-25 14:38:03.000000000 +0200
   5 @@ -86,6 +86,15 @@
   6             ;;
   7  esac
   8
   9 +if [ "$ANT_HOME" = "" ] ; then
  10 +  # try to find ANT
  11 +  ANT_HOME=@PREFIX@
  12 +fi
  13 +
  14 +if [ "$JAVA_HOME" = "" ] ; then
  15 +  JAVA_HOME=@JAVA_HOME@
  16 +fi
  17 +
  18  if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
  19    ## resolve links - $0 may be a link to ant's home
  20    PRG="$0"
  21 @@ -117,7 +126,12 @@
  22  fi
  23
  24  # set ANT_LIB location
  25 -ANT_LIB="${ANT_HOME}/lib"
  26 +ANT_LIB="${ANT_HOME}/lib/java/ant"
  27 +
  28 +# use ${PREFIX}/bin/java (wrapper)
  29 +if [ "$JAVACMD" = "" ]  && [ -f @PREFIX@/bin/java ] ; then
  30 +  JAVACMD=@PREFIX@/bin/java
  31 +fi
  32
  33  if [ -z "$JAVACMD" ] ; then
  34    if [ -n "$JAVA_HOME"  ] ; then