Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/apache-ant/Makefile,v retrieving revision 1.32 diff -d -u -r1.32 Makefile --- Makefile 22 Dec 2003 07:26:20 -0000 1.32 +++ Makefile 6 Jan 2004 07:04:50 -0000 @@ -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 \ Index: files/ant =================================================================== RCS file: /home/pcvs/ports/devel/apache-ant/files/ant,v retrieving revision 1.1 diff -d -u -r1.1 ant --- files/ant 11 Oct 2002 15:12:57 -0000 1.1 +++ files/ant 6 Jan 2004 07:04:50 -0000 @@ -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: ports/devel/apache-ant/files/ant,v 1.1 2002/10/11 15:12:57 znerd Exp $ # @@ -81,17 +84,19 @@ done # FreeBSD-specific: Add the .jar files from ${PREFIX}/share/java/classes -for JAR_FILE in "%%PREFIX%%/share/java/classes"/*.jar; do +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}" + # 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