mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Do not use DATADIR in ant.sh it is too much common in build system and can lead to failures.

Browse Source 
Instead use ANT_HOME. (The fixes build with upcoming libreoffice with JAVA enabled)

bump portrevision
This commit is contained in:
Baptiste Daroussin 2011-08-22 06:50:02 +00:00
parent 594c60cd17
commit 6ced6b533b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=280160
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devel/apache-ant/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= apache-ant
PORTVERSION= 1.8.2
PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \
LOCAL/hq:man

6
devel/apache-ant/files/ant.sh.in
View File

@ -12,7 +12,7 @@
DEFAULT_JIKES=false
DATADIR=${DATADIR:-"%%DATADIR%%"}
ANT_HOME=${ANT_HOME:-"%%DATADIR%%"}
#-----------------------------------------------------------------------------
@ -33,7 +33,7 @@ fi
usejikes=${usejikes:-${DEFAULT_JIKES}};
# Set ANT_LIB location
ANT_LIB="${DATADIR}/lib"
ANT_LIB="${ANT_HOME}/lib"
#-----------------------------------------------------------------------------
# Determine CLASSPATH
@ -79,4 +79,4 @@ if [ ! -x "${JAVACMD}" ]; then
exit 1
fi
exec "${JAVACMD}" ${ANT_OPTS} -classpath "${LOCALCLASSPATH}" -Dant.home="${DATADIR}" org.apache.tools.ant.launch.Launcher ${ANT_ARGS} -lib "${CLASSPATH}" "$@"
exec "${JAVACMD}" ${ANT_OPTS} -classpath "${LOCALCLASSPATH}" -Dant.home="${ANT_HOME}" org.apache.tools.ant.launch.Launcher ${ANT_ARGS} -lib "${CLASSPATH}" "$@"