diff options
| author | Ernst de Haan <znerd@FreeBSD.org> | 2004-01-06 07:16:46 +0000 |
|---|---|---|
| committer | Ernst de Haan <znerd@FreeBSD.org> | 2004-01-06 07:16:46 +0000 |
| commit | cf79061ad0f85fd7faaf373749d1dc716ac53cc0 (patch) | |
| tree | 54b0859f50a0f0382958465dbe868b530a1b5fac /devel/apache-ant | |
| parent | e7d05a7642ef3299fd2a7f182be1ae50e4bf6120 (diff) | |
| download | ports-cf79061ad0f85fd7faaf373749d1dc716ac53cc0.tar.gz ports-cf79061ad0f85fd7faaf373749d1dc716ac53cc0.zip | |
By default disable FreeBSD-specific behaviour to include all
JAR files in ${PREFIX}/share/java/classes in the CLASSPATH.
To re-enable the non-compatible behaviour, set
ANT_INCLUDE_SHARED_JARS to YES (case-sensitive).
The old, non-compatible behaviour has been a cause of much
discussion and frustration.
Bumped PORTREVISION.
See:
http://lists.freebsd.org/pipermail/freebsd-java/2003-September/000744.html
Requested by: Jonathan Chen <jonc@chen.org.nz> and others
Notes
Notes:
svn path=/head/; revision=97443
Diffstat (limited to 'devel/apache-ant')
| -rw-r--r-- | devel/apache-ant/Makefile | 1 | ||||
| -rw-r--r-- | devel/apache-ant/files/ant | 29 | ||||
| -rw-r--r-- | devel/apache-ant/files/ant.sh.in | 29 |
3 files changed, 35 insertions, 24 deletions
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index dd3d69cb9a3e..971369c32b92 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache-ant PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= http://apache.mirror.trueserver.nl/dist/ant/binaries/:bin \ http://apache.proserve.nl/dist/ant/binaries/:bin \ diff --git a/devel/apache-ant/files/ant b/devel/apache-ant/files/ant index 4927ef8832a4..2e3f332951bf 100644 --- a/devel/apache-ant/files/ant +++ b/devel/apache-ant/files/ant @@ -1,8 +1,11 @@ #!/bin/sh # -# FreeBSD-specific startup script for Jakarta Ant. +#-*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 # -# See: http://jakarta.apache.org/ant/ +# FreeBSD-specific startup script for Apache Ant. +# +# See: http://ant.apache.org/ # # $FreeBSD$ # @@ -81,17 +84,19 @@ for JAR_FILE in "${ANT_LIB}"/*.jar; do done # FreeBSD-specific: Add the .jar files from ${PREFIX}/share/java/classes -for JAR_FILE in "%%PREFIX%%/share/java/classes"/*.jar; do - - # If the directory is empty, then the input string is returned - if [ -f "${JAR_FILE}" ]; then - if [ -z "${LOCALCLASSPATH}" ]; then - LOCALCLASSPATH="${JAR_FILE}" - else - LOCALCLASSPATH="${JAR_FILE}":"${LOCALCLASSPATH}" +if [ "${ANT_INCLUDE_SHARED_JARS}" = "YES" ]; then + for JAR_FILE in "%%PREFIX%%/share/java/classes"/*.jar; do + + # If the directory is empty, then the input string is returned + if [ -f "${JAR_FILE}" ]; then + if [ -z "${LOCALCLASSPATH}" ]; then + LOCALCLASSPATH="${JAR_FILE}" + else + LOCALCLASSPATH="${JAR_FILE}":"${LOCALCLASSPATH}" + fi fi - fi -done + done +fi # Add the JDK tools.jar or classes.zip file to the CLASSPATH if [ -n "${JAVA_HOME}" ]; then diff --git a/devel/apache-ant/files/ant.sh.in b/devel/apache-ant/files/ant.sh.in index 4927ef8832a4..2e3f332951bf 100644 --- a/devel/apache-ant/files/ant.sh.in +++ b/devel/apache-ant/files/ant.sh.in @@ -1,8 +1,11 @@ #!/bin/sh # -# FreeBSD-specific startup script for Jakarta Ant. +#-*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 # -# See: http://jakarta.apache.org/ant/ +# FreeBSD-specific startup script for Apache Ant. +# +# See: http://ant.apache.org/ # # $FreeBSD$ # @@ -81,17 +84,19 @@ for JAR_FILE in "${ANT_LIB}"/*.jar; do done # FreeBSD-specific: Add the .jar files from ${PREFIX}/share/java/classes -for JAR_FILE in "%%PREFIX%%/share/java/classes"/*.jar; do - - # If the directory is empty, then the input string is returned - if [ -f "${JAR_FILE}" ]; then - if [ -z "${LOCALCLASSPATH}" ]; then - LOCALCLASSPATH="${JAR_FILE}" - else - LOCALCLASSPATH="${JAR_FILE}":"${LOCALCLASSPATH}" +if [ "${ANT_INCLUDE_SHARED_JARS}" = "YES" ]; then + for JAR_FILE in "%%PREFIX%%/share/java/classes"/*.jar; do + + # If the directory is empty, then the input string is returned + if [ -f "${JAR_FILE}" ]; then + if [ -z "${LOCALCLASSPATH}" ]; then + LOCALCLASSPATH="${JAR_FILE}" + else + LOCALCLASSPATH="${JAR_FILE}":"${LOCALCLASSPATH}" + fi fi - fi -done + done +fi # Add the JDK tools.jar or classes.zip file to the CLASSPATH if [ -n "${JAVA_HOME}" ]; then |