diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2011-08-22 06:50:02 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2011-08-22 06:50:02 +0000 |
| commit | 6ced6b533b6c8c7e52436b383dd0d7d294b601a3 (patch) | |
| tree | 7c72a31b4df340b6f9d5cc3c87aa85c5d9bd25e7 | |
| parent | Fix maintainer field for slave ports (diff) | |
Do not use DATADIR in ant.sh it is too much common in build system and can lead to failures.
Instead use ANT_HOME. (The fixes build with upcoming libreoffice with JAVA enabled)
bump portrevision
Notes
Notes:
svn path=/head/; revision=280160
| -rw-r--r-- | devel/apache-ant/Makefile | 1 | ||||
| -rw-r--r-- | devel/apache-ant/files/ant.sh.in | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index 2696302c3d6d..3d5a6cbc681f 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -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 diff --git a/devel/apache-ant/files/ant.sh.in b/devel/apache-ant/files/ant.sh.in index c9c162696f83..555a535c362b 100644 --- a/devel/apache-ant/files/ant.sh.in +++ b/devel/apache-ant/files/ant.sh.in @@ -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}" "$@" |