diff -ruN /usr/ports/devel/apache-ant/files/ant apache-ant/files/ant --- /usr/ports/devel/apache-ant/files/ant Sat Apr 3 14:30:54 2004 +++ apache-ant/files/ant Wed Oct 5 00:19:49 2005 @@ -11,8 +11,8 @@ # -DEFAULT_JAVACMD=%%JAVA%% -DEFAULT_JAVA_HOME=%%JAVA_HOME%% +DEFAULT_JAVACMD=java +DEFAULT_JAVA_HOME=%%PREFIX%% DEFAULT_JIKES=false ANT_HOME=%%ANT_HOME%% @@ -38,6 +38,11 @@ # Set ANT_LIB location ANT_LIB="${ANT_HOME}/lib" + +# Determine the JDK home directory +if [ -z "${JAVA_HOME}" ]; then + JAVA_HOME=${DEFAULT_JAVA_HOME} +fi # Determine 'java' executable if [ -z "${JAVACMD}" ]; then