- 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>
This commit is contained in:
Ernst de Haan 2004-04-03 11:30:54 +00:00
parent ba82dd52df
commit 3ed68067d8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=106025
3 changed files with 22 additions and 23 deletions

View File

@ -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+

View File

@ -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

View File

@ -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