diff options
| author | Ernst de Haan <znerd@FreeBSD.org> | 2004-04-03 11:30:54 +0000 |
|---|---|---|
| committer | Ernst de Haan <znerd@FreeBSD.org> | 2004-04-03 11:30:54 +0000 |
| commit | 3ed68067d8afb7427174276d80c43537ef386a3a (patch) | |
| tree | 2a9a7c21da56b1ac7e4a5a1e6da7fa398a02aab2 /devel/apache-ant | |
| parent | ba82dd52dffa25436b4787a9b3f73ae4eb291235 (diff) | |
| download | ports-3ed68067d8afb7427174276d80c43537ef386a3a.tar.gz ports-3ed68067d8afb7427174276d80c43537ef386a3a.zip | |
Log:
- fixed the location of EXTRACT_ONLY in Makefile so now
portlint does not complain
- changed the 'ant(1)' script so that it now uses the
'classpath' command provided by java/javavmwrapper
(command added recently)
PR: 65063
Submitted by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
Notes
Notes:
svn path=/head/; revision=106025
Diffstat (limited to 'devel/apache-ant')
| -rw-r--r-- | devel/apache-ant/Makefile | 5 | ||||
| -rw-r--r-- | devel/apache-ant/files/ant | 20 | ||||
| -rw-r--r-- | devel/apache-ant/files/ant.sh.in | 20 |
3 files changed, 22 insertions, 23 deletions
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index 62cba60e10bd..4f319e244f08 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache-ant PORTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= http://apache.mirror.trueserver.nl/dist/ant/binaries/:bin \ http://apache.proserve.nl/dist/ant/binaries/:bin \ @@ -15,14 +16,16 @@ MASTER_SITES= http://apache.mirror.trueserver.nl/dist/ant/binaries/:bin \ http://www.esil.univ-mrs.fr/~hquiroz/:man DISTFILES= ${ANT_DISTFILE}:bin \ ${MANPAGE_DISTFILE}:man +EXTRACT_ONLY= ${ANT_DISTFILE} MAINTAINER= znerd@FreeBSD.org COMMENT= Java- and XML-based build tool, conceptually similar to make +RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper + ANT_DISTFILE= ${PORTNAME}-${PORTVERSION}-bin.tar.bz2 MANPAGE_DISTFILE= ${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz MANPAGE_VERSION= 20030908 -EXTRACT_ONLY= ${ANT_DISTFILE} USE_BZIP2= yes USE_JAVA= 1.2+ diff --git a/devel/apache-ant/files/ant b/devel/apache-ant/files/ant index 10d0a490a360..34e80b5c8249 100644 --- a/devel/apache-ant/files/ant +++ b/devel/apache-ant/files/ant @@ -69,17 +69,15 @@ fi # FreeBSD-specific: Add the .jar files from ${PREFIX}/share/java/classes 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 - done + CLASSPATH_CMD=/usr/local/bin/classpath + if [ -x "${CLASSPATH_CMD}" ]; then + SHARED_JARS=`${CLASSPATH_CMD}` + LOCALCLASSPATH=${SHARED_JARS}:"${LOCALCLASSPATH}" + else + echo "Error: ${CLASSPATH_CMD} is not present on your system" + echo " you should install the java/javavmwrapper port" + exit 1 + fi fi diff --git a/devel/apache-ant/files/ant.sh.in b/devel/apache-ant/files/ant.sh.in index 10d0a490a360..34e80b5c8249 100644 --- a/devel/apache-ant/files/ant.sh.in +++ b/devel/apache-ant/files/ant.sh.in @@ -69,17 +69,15 @@ fi # FreeBSD-specific: Add the .jar files from ${PREFIX}/share/java/classes 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 - done + CLASSPATH_CMD=/usr/local/bin/classpath + if [ -x "${CLASSPATH_CMD}" ]; then + SHARED_JARS=`${CLASSPATH_CMD}` + LOCALCLASSPATH=${SHARED_JARS}:"${LOCALCLASSPATH}" + else + echo "Error: ${CLASSPATH_CMD} is not present on your system" + echo " you should install the java/javavmwrapper port" + exit 1 + fi fi |