pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/30332
The following reply was made to PR pkg/30332; it has been noted by GNATS.
From: Antoine Reilles <Antoine.Reilles%loria.fr@localhost>
To: gnats-bugs%netbsd.org@localhost, jwise%NetBSD.org@localhost
Cc:
Subject: Re: pkg/30332
Date: Mon, 27 Jun 2005 16:53:07 +0200
--Apple-Mail-2--157133020
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
delsp=yes;
format=flowed
Hi,
Here an updated patch for apache-1.6.5, to make it compatible with
what jlam comitted about creating directories before using them.
regards,
antoine
--Apple-Mail-2--157133020
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="ant-1.6.5.diff"
Content-Disposition: attachment;
filename=ant-1.6.5.diff
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apache-ant/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 16 Jun 2005 06:57:45 -0000 1.17
+++ Makefile 27 Jun 2005 13:45:14 -0000
@@ -5,7 +5,7 @@
# of ant was 3.1. Do NOT use dependency patterns such as >=1.3 which could
pick
# up this version by mistake.
-DISTNAME= apache-ant-1.6.2
+DISTNAME= apache-ant-1.6.5
CATEGORIES= devel java
MASTER_SITES= ${MASTER_SITE_APACHE:=ant/binaries/}
EXTRACT_SUFX= .tar.bz2
@@ -23,22 +23,22 @@
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_JAVA= run
USE_JAVA2= yes
+NO_BUILD= yes
-EXTRACT_CMD_OPTS.zip= -Caq
-INSTALLATION_DIRS= bin
-
-do-build:
- ${SED} -e 's,@PREFIX@,${PREFIX},g' \
- -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' \
- < ${FILESDIR}/ant > ${WRKDIR}/ant
+SUBST_CLASSES+= ant
+SUBST_FILES.ant= bin/ant
+SUBST_STAGE.ant= pre-configure
+SUBST_SED.ant=-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' -e
's,@PREFIX@,${PREFIX},g'
do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/ant ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/ant ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/bin/antRun ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/lib/java
${INSTALL_DATA_DIR} ${PREFIX}/lib/java/ant
${INSTALL_DATA} ${WRKSRC}/lib/ant.jar ${PREFIX}/lib/java/ant
- ${INSTALL_DATA} ${WRKSRC}/lib/ant-nodeps.jar ${PREFIX}/lib/java/ant
+ ${INSTALL_DATA} ${WRKSRC}/lib/ant-*.jar ${PREFIX}/lib/java/ant
+ ${INSTALL_DATA} ${WRKSRC}/lib/xercesImpl.jar ${PREFIX}/lib/java/ant
+ ${INSTALL_DATA} ${WRKSRC}/lib/xml-apis.jar ${PREFIX}/lib/java/ant
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant
cd ${WRKSRC}/docs && ${PAX} -rw -pmp * ${PREFIX}/share/doc/java/ant
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apache-ant/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- PLIST 4 Aug 2004 08:49:09 -0000 1.5
+++ PLIST 27 Jun 2005 13:45:15 -0000
@@ -1,8 +1,36 @@
-@comment $NetBSD: PLIST,v 1.5 2004/08/04 08:49:09 recht Exp $
+@comment $NetBSD$
bin/ant
bin/antRun
+lib/java/ant/ant-antlr.jar
+lib/java/ant/ant-apache-bcel.jar
+lib/java/ant/ant-apache-bsf.jar
+lib/java/ant/ant-apache-log4j.jar
+lib/java/ant/ant-apache-oro.jar
+lib/java/ant/ant-apache-regexp.jar
+lib/java/ant/ant-apache-resolver.jar
+lib/java/ant/ant-commons-logging.jar
+lib/java/ant/ant-commons-net.jar
+lib/java/ant/ant-icontract.jar
+lib/java/ant/ant-jai.jar
+lib/java/ant/ant-javamail.jar
+lib/java/ant/ant-jdepend.jar
+lib/java/ant/ant-jmf.jar
+lib/java/ant/ant-jsch.jar
+lib/java/ant/ant-junit.jar
+lib/java/ant/ant-launcher.jar
+lib/java/ant/ant-netrexx.jar
lib/java/ant/ant-nodeps.jar
+lib/java/ant/ant-starteam.jar
+lib/java/ant/ant-stylebook.jar
+lib/java/ant/ant-swing.jar
+lib/java/ant/ant-trax.jar
+lib/java/ant/ant-vaj.jar
+lib/java/ant/ant-weblogic.jar
+lib/java/ant/ant-xalan1.jar
+lib/java/ant/ant-xslp.jar
lib/java/ant/ant.jar
+lib/java/ant/xercesImpl.jar
+lib/java/ant/xml-apis.jar
share/doc/java/ant/LICENSE
share/doc/java/ant/README
share/doc/java/ant/WHATSNEW
@@ -95,6 +123,7 @@
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/length.html
share/doc/java/ant/manual/CoreTasks/loadfile.html
share/doc/java/ant/manual/CoreTasks/loadproperties.html
share/doc/java/ant/manual/CoreTasks/macrodef.html
@@ -150,6 +179,7 @@
share/doc/java/ant/manual/CoreTypes/permissions.html
share/doc/java/ant/manual/CoreTypes/propertyset.html
share/doc/java/ant/manual/CoreTypes/redirector.html
+share/doc/java/ant/manual/CoreTypes/regexp.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
@@ -260,6 +290,7 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/DynamicConfiguratorNS.html
share/doc/java/ant/manual/api/org/apache/tools/ant/DynamicElement.html
share/doc/java/ant/manual/api/org/apache/tools/ant/DynamicElementNS.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/Executor.html
share/doc/java/ant/manual/api/org/apache/tools/ant/ExitException.html
share/doc/java/ant/manual/api/org/apache/tools/ant/ExitStatusException.html
share/doc/java/ant/manual/api/org/apache/tools/ant/FileScanner.html
@@ -282,6 +313,8 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/TaskContainer.html
share/doc/java/ant/manual/api/org/apache/tools/ant/TypeAdapter.html
share/doc/java/ant/manual/api/org/apache/tools/ant/UnknownElement.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/UnsupportedAttributeException.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/UnsupportedElementException.html
share/doc/java/ant/manual/api/org/apache/tools/ant/XmlLogger.html
share/doc/java/ant/manual/api/org/apache/tools/ant/filters/BaseFilterReader.html
share/doc/java/ant/manual/api/org/apache/tools/ant/filters/BaseParamFilterReader.html
@@ -325,6 +358,7 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/filters/util/package-summary.html
share/doc/java/ant/manual/api/org/apache/tools/ant/filters/util/package-tree.html
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/AntXMLContext.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/helper/DefaultExecutor.html
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.AntHandler.html
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.ElementHandler.html
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.MainHandler.html
@@ -333,6 +367,7 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.TargetHandler.html
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.html
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/ProjectHelperImpl.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/helper/SingleCheckExecutor.html
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/package-frame.html
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/package-summary.html
share/doc/java/ant/manual/api/org/apache/tools/ant/helper/package-tree.html
@@ -367,6 +402,7 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/package-tree.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.Reference.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.TargetElement.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/AntStructure.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Antlib.html
@@ -419,6 +455,10 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DistinguishedName.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DnameParam.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.Base64Converter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.DownloadProgress.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.NullProgress.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.VerboseProgress.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Get.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/ImportTask.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Input.html
@@ -442,6 +482,9 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Jikes.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/JikesOutputParser.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/KeySubst.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Length.FileMode.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Length.When.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/Length.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/LoadFile.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/LoadProperties.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/LogOutputStream.html
@@ -554,6 +597,7 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/FilesMatch.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Http.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFalse.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFileSelected.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsReference.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsSet.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsTrue.html
@@ -775,6 +819,13 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-frame.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-summary.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/SunJavah.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-frame.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-summary.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-tree.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.FormatAttribute.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-frame.html
@@ -839,6 +890,14 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/metamata/package-frame.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/metamata/package-summary.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/metamata/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-frame.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-summary.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-tree.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.Action.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPFile.html
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPRootFile.html
@@ -1071,6 +1130,10 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/types/XMLCatalog.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/ZipFileSet.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/ZipScanner.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers/FilterMapper.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers/package-frame.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers/package-summary.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers/package-tree.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/ScriptFilter.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.ClassRoot.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.html
@@ -1105,6 +1168,7 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/types/resolver/package-frame.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/resolver/package-summary.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/resolver/package-tree.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/AndSelector.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/BaseExtendSelector.html
share/doc/java/ant/manual/api/org/apache/tools/ant/types/selectors/BaseSelector.html
@@ -1161,6 +1225,7 @@
share/doc/java/ant/manual/api/org/apache/tools/ant/util/ConcatFileInputStream.html
share/doc/java/ant/manual/api/org/apache/tools/ant/util/ContainerMapper.html
share/doc/java/ant/manual/api/org/apache/tools/ant/util/DOMElementWriter.html
+share/doc/java/ant/manual/api/org/apache/tools/ant/util/DOMUtils.html
share/doc/java/ant/manual/api/org/apache/tools/ant/util/DateUtils.html
share/doc/java/ant/manual/api/org/apache/tools/ant/util/FileNameMapper.html
share/doc/java/ant/manual/api/org/apache/tools/ant/util/FileUtils.html
@@ -1254,6 +1319,7 @@
share/doc/java/ant/manual/api/org/apache/tools/tar/package-tree.html
share/doc/java/ant/manual/api/org/apache/tools/zip/AsiExtraField.html
share/doc/java/ant/manual/api/org/apache/tools/zip/ExtraFieldUtils.html
+share/doc/java/ant/manual/api/org/apache/tools/zip/JarMarker.html
share/doc/java/ant/manual/api/org/apache/tools/zip/UnixStat.html
share/doc/java/ant/manual/api/org/apache/tools/zip/UnrecognizedExtraField.html
share/doc/java/ant/manual/api/org/apache/tools/zip/ZipEntry.html
@@ -1297,6 +1363,9 @@
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/tutorial-HelloWorldWithAnt.html
+share/doc/java/ant/manual/tutorial-tasks-filesets-properties.html
+share/doc/java/ant/manual/tutorial-tasks-filesets-properties.zip
share/doc/java/ant/manual/tutorial-writing-tasks-src.zip
share/doc/java/ant/manual/tutorial-writing-tasks.html
share/doc/java/ant/manual/using.html
@@ -1305,22 +1374,8 @@
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/antlib/antlib_classloaders.html
-share/doc/java/ant/projects/antlib/antlib_contract.html
-share/doc/java/ant/projects/antlib/antlib_descriptors.html
-share/doc/java/ant/projects/antlib/antlib_namespaces.html
-share/doc/java/ant/projects/antlib/antlib_roadmap.html
-share/doc/java/ant/projects/antlib/index.html
-share/doc/java/ant/projects/antlib/roles.html
share/doc/java/ant/projects/index.html
share/doc/java/ant/resources.html
-@dirrm share/doc/java/ant/projects/antlib
-@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/stylesheets
@dirrm share/doc/java/ant/manual/api/org/apache/tools/zip
@@ -1339,6 +1394,7 @@
@dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/image
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional/depend
@dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/types/optional
+@dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/types/mappers
@dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/types
@dirrm share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/rmic
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows
@@ -1357,12 +1413,14 @@
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net
+@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/metamata
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend
+@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee
@dirrm
share/doc/java/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apache-ant/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 23 Feb 2005 22:24:09 -0000 1.6
+++ distinfo 27 Jun 2005 13:45:15 -0000
@@ -1,5 +1,6 @@
$NetBSD: distinfo,v 1.6 2005/02/23 22:24:09 agc Exp $
-SHA1 (apache-ant-1.6.2-bin.tar.bz2) = 6b2fb6095a1c334d60d56ce29ef878601134051e
-RMD160 (apache-ant-1.6.2-bin.tar.bz2) =
b653b99c6785064572150372dcf84dd5f2d02d8d
-Size (apache-ant-1.6.2-bin.tar.bz2) = 6685702 bytes
+SHA1 (apache-ant-1.6.5-bin.tar.bz2) = 83997ea53351cb2cb3608358a03679c3bb56134f
+RMD160 (apache-ant-1.6.5-bin.tar.bz2) =
6591ea707b1a9c8c83202567830171620f99994f
+Size (apache-ant-1.6.5-bin.tar.bz2) = 6743024 bytes
+SHA1 (patch-aa) = a168d6660b01969e076d5dfe878d87d3d29e3caa
--- /dev/null 2005-06-27 11:19:54.000000000 +0200
+++ patches/patch-aa 2005-05-25 14:38:12.000000000 +0200
@@ -0,0 +1,32 @@
+--- bin/ant.orig 2005-05-19 14:37:16.000000000 +0200
++++ bin/ant 2005-05-25 14:38:03.000000000 +0200
+@@ -86,6 +86,15 @@
+ ;;
+ esac
+
++if [ "$ANT_HOME" = "" ] ; then
++ # try to find ANT
++ ANT_HOME=@PREFIX@
++fi
++
++if [ "$JAVA_HOME" = "" ] ; then
++ JAVA_HOME=@JAVA_HOME@
++fi
++
+ if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
+ ## resolve links - $0 may be a link to ant's home
+ PRG="$0"
+@@ -117,7 +126,12 @@
+ fi
+
+ # set ANT_LIB location
+-ANT_LIB="${ANT_HOME}/lib"
++ANT_LIB="${ANT_HOME}/lib/java/ant"
++
++# use ${PREFIX}/bin/java (wrapper)
++if [ "$JAVACMD" = "" ] ; then
++ JAVACMD=@PREFIX@/bin/java
++fi
+
+ if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
--Apple-Mail-2--157133020--
Home |
Main Index |
Thread Index |
Old Index