Update "ant" to 1.5.3-1. The program was, up until version 1.5.1 known

as "jakarta-ant", and is now known as "apache-ant".  Changes since 1.4.1
are too many to list here.

6 files changed, 378 insertions, 0 deletions

diff --git a/devel/apache-ant/DESCR b/devel/apache-ant/DESCR
new file mode 100644
index 00000000000..46a6f89cf28
--- /dev/null
+++ b/devel/apache-ant/DESCR
@@ -0,0 +1,6 @@
+Ant is a Java based build tool. In theory it is kind of like
+"make" without make's wrinkles and with the full portability
+of pure java code.
+
+Ant uses XML to specify build actions to be taken, and new
+build actions are implemented in Java.
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
new file mode 100644
index 00000000000..9caf702b508
--- /dev/null
+++ b/devel/apache-ant/Makefile
@@ -0,0 +1,49 @@
+# $NetBSD: Makefile,v 1.1 2003/06/03 17:00:11 jschauma Exp $
+#
+# NOTE: if you are depending on ant from another package, please be aware that
+# the ant team has CHANGED the version numbering scheme.  A previous version
+# of ant was 3.1.  Do NOT use dependency patterns such as >=1.3 which could pick
+# up this version by mistake.
+
+DISTNAME=	${PKGNAME:C/.([0-9])$/-\1/}-src
+PKGNAME=	apache-ant-1.5.3.1
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/.([0-9])$/-\1/}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_APACHE:=ant/source/}
+EXTRACT_SUFX=	.zip
+
+MAINTAINER=	jwise@netbsd.org
+HOMEPAGE=	http://ant.apache.org/
+COMMENT=	Apache Project's Java-Based make(1) replacement
+
+DEPENDS+=	crimson>=1.1.3:../../textproc/crimson
+
+# Up to version 1.5.1 inclusive this was known as "jakarta-ant".
+CONFLICTS=	jakarta-ant*
+
+USE_BUILDLINK2=	# defined
+
+EXTRACT_CMD.zip=	${LOCALBASE}/bin/unzip -Caq $${extract_file}
+
+do-build:
+	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ${SH} bootstrap.sh
+
+post-build:
+	${SED}	-e 's,@PREFIX@,${PREFIX},g'				\
+		-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'			\
+		< ${FILESDIR}/ant > ${WRKDIR}/ant
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/ant ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/antRun ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/build/lib/ant.jar ${PREFIX}/lib/java
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant
+	cd ${WRKSRC}/docs && ${PAX} -rw -pp * ${PREFIX}/share/doc/java/ant
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant
+	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/java/ant
+
+.include "../../mk/java-vm.mk"
+.include "../../mk/bsd.pkg.mk"
+
+CLASSPATH:=	${CLASSPATH}:${LOCALBASE}/lib/java/crimson.jar
diff --git a/devel/apache-ant/PLIST b/devel/apache-ant/PLIST
new file mode 100644
index 00000000000..6c96fb27bcc
--- /dev/null
+++ b/devel/apache-ant/PLIST
@@ -0,0 +1,248 @@
+@comment $NetBSD: PLIST,v 1.1 2003/06/03 17:00:11 jschauma Exp $
+bin/ant
+bin/antRun
+lib/java/ant.jar
+share/doc/java/ant/LICENSE
+share/doc/java/ant/README
+share/doc/java/ant/WHATSNEW
+share/doc/java/ant/ant15_todo.html
+share/doc/java/ant/ant2/FunctionalRequirements.html
+share/doc/java/ant/ant2/VFS.txt
+share/doc/java/ant/ant2/actionlist.html
+share/doc/java/ant/ant2/features.html
+share/doc/java/ant/ant2/original-specification.html
+share/doc/java/ant/ant2/requested-features.html
+share/doc/java/ant/ant2/requested-features.txt
+share/doc/java/ant/ant_in_anger.html
+share/doc/java/ant/ant_task_guidelines.html
+share/doc/java/ant/antnews.html
+share/doc/java/ant/appendix_e.pdf
+share/doc/java/ant/breadcrumbs.js
+share/doc/java/ant/contributors.html
+share/doc/java/ant/cvs.html
+share/doc/java/ant/external.html
+share/doc/java/ant/faq.html
+share/doc/java/ant/guidelines.html
+share/doc/java/ant/images/ant_logo.ico
+share/doc/java/ant/images/ant_logo_large.gif
+share/doc/java/ant/images/ant_logo_medium.gif
+share/doc/java/ant/images/ant_logo_small.gif
+share/doc/java/ant/images/current.gif
+share/doc/java/ant/images/group-logo.gif
+share/doc/java/ant/images/jw_ec_logo_winner2002.gif
+share/doc/java/ant/images/label.gif
+share/doc/java/ant/images/menu-left.gif
+share/doc/java/ant/images/menu-right.gif
+share/doc/java/ant/images/page.gif
+share/doc/java/ant/images/printer.gif
+share/doc/java/ant/images/project-logo.gif
+share/doc/java/ant/images/sdm_productivity_award.gif
+share/doc/java/ant/images/search-left.gif
+share/doc/java/ant/images/search-right.gif
+share/doc/java/ant/images/spacer.gif
+share/doc/java/ant/images/tab-left.gif
+share/doc/java/ant/images/tab-right.gif
+share/doc/java/ant/images/tabSel-left.gif
+share/doc/java/ant/images/tabSel-right.gif
+share/doc/java/ant/index.html
+share/doc/java/ant/legal.html
+share/doc/java/ant/license.html
+share/doc/java/ant/logocontest.html
+share/doc/java/ant/mail.html
+share/doc/java/ant/manual/CoreTasks/ant.html
+share/doc/java/ant/manual/CoreTasks/antcall.html
+share/doc/java/ant/manual/CoreTasks/antstructure.html
+share/doc/java/ant/manual/CoreTasks/apply.html
+share/doc/java/ant/manual/CoreTasks/available.html
+share/doc/java/ant/manual/CoreTasks/basename.html
+share/doc/java/ant/manual/CoreTasks/buildnumber.html
+share/doc/java/ant/manual/CoreTasks/changelog.html
+share/doc/java/ant/manual/CoreTasks/checksum.html
+share/doc/java/ant/manual/CoreTasks/chmod.html
+share/doc/java/ant/manual/CoreTasks/common.html
+share/doc/java/ant/manual/CoreTasks/concat.html
+share/doc/java/ant/manual/CoreTasks/condition.html
+share/doc/java/ant/manual/CoreTasks/conditions.html
+share/doc/java/ant/manual/CoreTasks/copy.html
+share/doc/java/ant/manual/CoreTasks/copydir.html
+share/doc/java/ant/manual/CoreTasks/copyfile.html
+share/doc/java/ant/manual/CoreTasks/cvs.html
+share/doc/java/ant/manual/CoreTasks/cvspass.html
+share/doc/java/ant/manual/CoreTasks/cvstagdiff.html
+share/doc/java/ant/manual/CoreTasks/delete.html
+share/doc/java/ant/manual/CoreTasks/deltree.html
+share/doc/java/ant/manual/CoreTasks/dependset.html
+share/doc/java/ant/manual/CoreTasks/dirname.html
+share/doc/java/ant/manual/CoreTasks/ear.html
+share/doc/java/ant/manual/CoreTasks/echo.html
+share/doc/java/ant/manual/CoreTasks/exec.html
+share/doc/java/ant/manual/CoreTasks/fail.html
+share/doc/java/ant/manual/CoreTasks/filter.html
+share/doc/java/ant/manual/CoreTasks/fixcrlf.html
+share/doc/java/ant/manual/CoreTasks/genkey.html
+share/doc/java/ant/manual/CoreTasks/get.html
+share/doc/java/ant/manual/CoreTasks/gunzip.html
+share/doc/java/ant/manual/CoreTasks/gzip.html
+share/doc/java/ant/manual/CoreTasks/input.html
+share/doc/java/ant/manual/CoreTasks/jar.html
+share/doc/java/ant/manual/CoreTasks/java.html
+share/doc/java/ant/manual/CoreTasks/javac.html
+share/doc/java/ant/manual/CoreTasks/javadoc.html
+share/doc/java/ant/manual/CoreTasks/loadfile.html
+share/doc/java/ant/manual/CoreTasks/loadproperties.html
+share/doc/java/ant/manual/CoreTasks/mail.html
+share/doc/java/ant/manual/CoreTasks/manifest.html
+share/doc/java/ant/manual/CoreTasks/mkdir.html
+share/doc/java/ant/manual/CoreTasks/move.html
+share/doc/java/ant/manual/CoreTasks/pack.html
+share/doc/java/ant/manual/CoreTasks/parallel.html
+share/doc/java/ant/manual/CoreTasks/patch.html
+share/doc/java/ant/manual/CoreTasks/pathconvert.html
+share/doc/java/ant/manual/CoreTasks/property.html
+share/doc/java/ant/manual/CoreTasks/recorder.html
+share/doc/java/ant/manual/CoreTasks/rename.html
+share/doc/java/ant/manual/CoreTasks/replace.html
+share/doc/java/ant/manual/CoreTasks/rmic.html
+share/doc/java/ant/manual/CoreTasks/sequential.html
+share/doc/java/ant/manual/CoreTasks/signjar.html
+share/doc/java/ant/manual/CoreTasks/sleep.html
+share/doc/java/ant/manual/CoreTasks/sql.html
+share/doc/java/ant/manual/CoreTasks/style.html
+share/doc/java/ant/manual/CoreTasks/tar.html
+share/doc/java/ant/manual/CoreTasks/taskdef.html
+share/doc/java/ant/manual/CoreTasks/tempfile.html
+share/doc/java/ant/manual/CoreTasks/touch.html
+share/doc/java/ant/manual/CoreTasks/tstamp.html
+share/doc/java/ant/manual/CoreTasks/typedef.html
+share/doc/java/ant/manual/CoreTasks/unpack.html
+share/doc/java/ant/manual/CoreTasks/untar.html
+share/doc/java/ant/manual/CoreTasks/unzip.html
+share/doc/java/ant/manual/CoreTasks/uptodate.html
+share/doc/java/ant/manual/CoreTasks/waitfor.html
+share/doc/java/ant/manual/CoreTasks/war.html
+share/doc/java/ant/manual/CoreTasks/xmlproperty.html
+share/doc/java/ant/manual/CoreTasks/zip.html
+share/doc/java/ant/manual/CoreTypes/description.html
+share/doc/java/ant/manual/CoreTypes/dirset.html
+share/doc/java/ant/manual/CoreTypes/filelist.html
+share/doc/java/ant/manual/CoreTypes/fileset.html
+share/doc/java/ant/manual/CoreTypes/filterchain.html
+share/doc/java/ant/manual/CoreTypes/filterset.html
+share/doc/java/ant/manual/CoreTypes/mapper.html
+share/doc/java/ant/manual/CoreTypes/patternset.html
+share/doc/java/ant/manual/CoreTypes/selectors-program.html
+share/doc/java/ant/manual/CoreTypes/selectors.html
+share/doc/java/ant/manual/CoreTypes/xmlcatalog.html
+share/doc/java/ant/manual/Integration/Antidote.html
+share/doc/java/ant/manual/Integration/VAJAntTool.html
+share/doc/java/ant/manual/Integration/anttool1.gif
+share/doc/java/ant/manual/Integration/jext-plugin.html
+share/doc/java/ant/manual/Integration/remacc.gif
+share/doc/java/ant/manual/Integration/toolmenu.gif
+share/doc/java/ant/manual/LICENSE
+share/doc/java/ant/manual/OptionalTasks/BorlandEJBTasks.html
+share/doc/java/ant/manual/OptionalTasks/BorlandGenerateClient.html
+share/doc/java/ant/manual/OptionalTasks/antlr.html
+share/doc/java/ant/manual/OptionalTasks/cab.html
+share/doc/java/ant/manual/OptionalTasks/ccm.html
+share/doc/java/ant/manual/OptionalTasks/clearcase.html
+share/doc/java/ant/manual/OptionalTasks/depend.html
+share/doc/java/ant/manual/OptionalTasks/dotnet.html
+share/doc/java/ant/manual/OptionalTasks/echoproperties.html
+share/doc/java/ant/manual/OptionalTasks/ejb.html
+share/doc/java/ant/manual/OptionalTasks/ftp.html
+share/doc/java/ant/manual/OptionalTasks/icontract.html
+share/doc/java/ant/manual/OptionalTasks/jarlib-available.html
+share/doc/java/ant/manual/OptionalTasks/jarlib-display.html
+share/doc/java/ant/manual/OptionalTasks/jarlib-manifest.html
+share/doc/java/ant/manual/OptionalTasks/jarlib-resolve.html
+share/doc/java/ant/manual/OptionalTasks/javacc.html
+share/doc/java/ant/manual/OptionalTasks/javah.html
+share/doc/java/ant/manual/OptionalTasks/jdepend.html
+share/doc/java/ant/manual/OptionalTasks/jjtree.html
+share/doc/java/ant/manual/OptionalTasks/jlink.html
+share/doc/java/ant/manual/OptionalTasks/jpcoverage.html
+share/doc/java/ant/manual/OptionalTasks/jspc.html
+share/doc/java/ant/manual/OptionalTasks/junit.html
+share/doc/java/ant/manual/OptionalTasks/junitreport.html
+share/doc/java/ant/manual/OptionalTasks/maudit.html
+share/doc/java/ant/manual/OptionalTasks/mimemail.html
+share/doc/java/ant/manual/OptionalTasks/mmetrics.html
+share/doc/java/ant/manual/OptionalTasks/mparse.html
+share/doc/java/ant/manual/OptionalTasks/native2ascii.html
+share/doc/java/ant/manual/OptionalTasks/netrexxc.html
+share/doc/java/ant/manual/OptionalTasks/perforce.html
+share/doc/java/ant/manual/OptionalTasks/propertyfile.html
+share/doc/java/ant/manual/OptionalTasks/pvcstask.html
+share/doc/java/ant/manual/OptionalTasks/renameextensions.html
+share/doc/java/ant/manual/OptionalTasks/replaceregexp.html
+share/doc/java/ant/manual/OptionalTasks/rpm.html
+share/doc/java/ant/manual/OptionalTasks/script.html
+share/doc/java/ant/manual/OptionalTasks/serverdeploy.html
+share/doc/java/ant/manual/OptionalTasks/setproxy.html
+share/doc/java/ant/manual/OptionalTasks/sos.html
+share/doc/java/ant/manual/OptionalTasks/sound.html
+share/doc/java/ant/manual/OptionalTasks/splash.html
+share/doc/java/ant/manual/OptionalTasks/starteam.html
+share/doc/java/ant/manual/OptionalTasks/stylebook.html
+share/doc/java/ant/manual/OptionalTasks/telnet.html
+share/doc/java/ant/manual/OptionalTasks/test.html
+share/doc/java/ant/manual/OptionalTasks/translate.html
+share/doc/java/ant/manual/OptionalTasks/vss.html
+share/doc/java/ant/manual/OptionalTasks/wljspc.html
+share/doc/java/ant/manual/OptionalTasks/xmlvalidate.html
+share/doc/java/ant/manual/OptionalTypes/classfileset.html
+share/doc/java/ant/manual/OptionalTypes/extension.html
+share/doc/java/ant/manual/OptionalTypes/extensionset.html
+share/doc/java/ant/manual/antexternal.html
+share/doc/java/ant/manual/anttaskslist.html
+share/doc/java/ant/manual/base_task_classes.html
+share/doc/java/ant/manual/conceptstypeslist.html
+share/doc/java/ant/manual/coretasklist.html
+share/doc/java/ant/manual/cover.html
+share/doc/java/ant/manual/credits.html
+share/doc/java/ant/manual/develop.html
+share/doc/java/ant/manual/developlist.html
+share/doc/java/ant/manual/dirtasks.html
+share/doc/java/ant/manual/favicon.ico
+share/doc/java/ant/manual/feedback.html
+share/doc/java/ant/manual/ide.html
+share/doc/java/ant/manual/index.html
+share/doc/java/ant/manual/inputhandler.html
+share/doc/java/ant/manual/install.html
+share/doc/java/ant/manual/installlist.html
+share/doc/java/ant/manual/intro.html
+share/doc/java/ant/manual/listeners.html
+share/doc/java/ant/manual/optionaltasklist.html
+share/doc/java/ant/manual/platform.html
+share/doc/java/ant/manual/running.html
+share/doc/java/ant/manual/runninglist.html
+share/doc/java/ant/manual/sysclasspath.html
+share/doc/java/ant/manual/tasksoverview.html
+share/doc/java/ant/manual/toc.html
+share/doc/java/ant/manual/using.html
+share/doc/java/ant/manual/usinglist.html
+share/doc/java/ant/mission.html
+share/doc/java/ant/page.css
+share/doc/java/ant/problems.html
+share/doc/java/ant/projects.html
+share/doc/java/ant/projects/antidote/design.html
+share/doc/java/ant/projects/antidote/images/screenshot.jpg
+share/doc/java/ant/projects/antidote/index.html
+share/doc/java/ant/projects/antidote/module.html
+share/doc/java/ant/projects/index.html
+share/doc/java/ant/resources.html
+@dirrm share/doc/java/ant/projects/antidote/images
+@dirrm share/doc/java/ant/projects/antidote
+@dirrm share/doc/java/ant/projects
+@dirrm share/doc/java/ant/manual/OptionalTasks
+@dirrm share/doc/java/ant/manual/OptionalTypes
+@dirrm share/doc/java/ant/manual/Integration
+@dirrm share/doc/java/ant/manual/CoreTypes
+@dirrm share/doc/java/ant/manual/CoreTasks
+@dirrm share/doc/java/ant/manual
+@dirrm share/doc/java/ant/images
+@dirrm share/doc/java/ant/ant2
+@dirrm share/doc/java/ant
+@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/doc/java 2>/dev/null || ${TRUE}
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
new file mode 100644
index 00000000000..ab0f5860497
--- /dev/null
+++ b/devel/apache-ant/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1 2003/06/03 17:00:12 jschauma Exp $
+
+SHA1 (apache-ant-1.5.3-1-src.zip) = f7b36df66761a59e52e1cd52fd481abd351ff5c0
+Size (apache-ant-1.5.3-1-src.zip) = 6568503 bytes
diff --git a/devel/apache-ant/files/ant b/devel/apache-ant/files/ant
new file mode 100644
index 00000000000..6175a6d0cf4
--- /dev/null
+++ b/devel/apache-ant/files/ant
@@ -0,0 +1,62 @@
+#! /bin/sh
+
+if [ -f $HOME/.antrc ] ; then 
+  . $HOME/.antrc
+fi
+
+if [ "$ANT_HOME" = "" ] ; then
+  # try to find ANT
+  ANT_HOME=@PREFIX@
+fi
+
+if [ "$JAVA_HOME" != "" ] ; then
+  if [ "$JAVACMD" = "" ] ; then 
+    JAVACMD=$JAVA_HOME/bin/java
+  fi
+else
+  JAVA_HOME=@JAVA_HOME@
+  if [ "$JAVACMD" = "" ] ; then 
+    JAVACMD=$JAVA_HOME/bin/java
+  fi
+fi
+ 
+# add in the dependency .jar files
+DIRLIBS="${ANT_HOME}/lib/java/ant.jar ${ANT_HOME}/lib/java/ant-optional.jar ${ANT_HOME}/lib/java/crimson.jar"
+for i in ${DIRLIBS}
+do
+    # if the directory is empty, then it will return the input string
+    # this is stupid, so case for it
+    if [ "$i" != "${DIRLIBS}" ] ; then
+        LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
+    fi
+done
+
+if [ "$CLASSPATH" != "" ] ; then
+  LOCALCLASSPATH=$LOCALCLASSPATH:$CLASSPATH
+fi
+
+if [ "$JAVA_HOME" != "" ] ; then
+  if test -f $JAVA_HOME/lib/tools.jar ; then
+    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
+  fi
+
+  if test -f $JAVA_HOME/lib/classes.zip ; then
+    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
+  fi
+else
+  echo "Warning: JAVA_HOME environment variable is not set."
+  echo "  If build fails because sun.* classes could not be found"
+  echo "  you will need to set the JAVA_HOME environment variable"
+  echo "  to the installation directory of java."
+fi
+
+# supply JIKESPATH to Ant as jikes.class.path
+if [ "$JIKESPATH" != "" ] ; then
+  if [ "$ANT_OPTS" != "" ] ; then
+    ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
+  else
+    ANT_OPTS=-Djikes.class.path=$JIKESPATH
+  fi
+fi
+
+$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main "$@"
diff --git a/devel/apache-ant/files/antRun b/devel/apache-ant/files/antRun
new file mode 100644
index 00000000000..f0a18f16531
--- /dev/null
+++ b/devel/apache-ant/files/antRun
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+# Args: DIR command
+cd "$1"
+CMD="$2"
+shift
+shift
+
+exec $CMD "$@"