head 1.7; access; symbols pkgsrc-2022Q4:1.6.0.40 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.38 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.36 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.34 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.32 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.30 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.28 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.26 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.24 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.22 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.20 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.16 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.18 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.14 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.12 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.10 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.8 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.6 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.4 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.2 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.5.0.30 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.28 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.24 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.22 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.20 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.18 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.16 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.14 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.12 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.10 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.8 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.6 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.4 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.2 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.4.0.2 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.3.0.32 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.30 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.28 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.26 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.24 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.22 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.20 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.18 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.16 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.14 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.12 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.10 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.8 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.6 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.4 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.2 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.2.0.12 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.10 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.8 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.6 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.4 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.1.0.30 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.28 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.26 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.24 pkgsrc-2008Q1:1.1.0.22 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.20 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.18 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.16 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.14 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.12 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.10 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.8 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.6 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.4 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.2 pkgsrc-2005Q3-base:1.1; locks; strict; comment @# @; 1.7 date 2023.02.16.10.32.36; author abs; state dead; branches; next 1.6; commitid 5iBBMbhSratNLJdE; 1.6 date 2018.02.25.20.44.59; author wiz; state Exp; branches; next 1.5; commitid gjYw966g6PuWzhsA; 1.5 date 2014.09.03.19.36.52; author tonio; state Exp; branches; next 1.4; commitid FSLzmgE5w2Ml3WOx; 1.4 date 2014.05.07.18.23.31; author wiz; state Exp; branches; next 1.3; commitid 2dBzCaMENVCutDzx; 1.3 date 2010.04.13.21.05.42; author tonio; state Exp; branches; next 1.2; 1.2 date 2008.10.25.17.43.33; author adrianp; state Exp; branches; next 1.1; 1.1 date 2005.09.03.22.59.25; author tonio; state Exp; branches; next ; desc @@ 1.7 log @Adjust apache-ant wrapper to honour JAVA_HOME Still use the pkgsrc ${PREFIX}/bin/java wrapper by default, but allow overriding with either of JAVACMD or JAVA_HOME. The latter is particularly important for other pkgsrc packages which use ant to build and may require a specific jdk (java-jna) Drop setting of ANT_HOME (was in a non default branch anyway) Bump PKGREVISION @ text @$NetBSD: patch-aa,v 1.6 2018/02/25 20:44:59 wiz Exp $ Initialize paths to appropriate defaults for pkgsrc. --- bin/ant.orig 2018-02-03 16:51:21.000000000 +0000 +++ bin/ant @@@@ -91,6 +91,15 @@@@ else # load user ant configuration if [ -f "$HOME/.ant/ant.conf" ]; then +if [ "$ANT_HOME" = "" ] ; then + # try to find ANT + ANT_HOME=@@PREFIX@@ +fi + +if [ "$JAVA_HOME" = "" ] ; then + JAVA_HOME='@@JAVA_HOME@@' +fi + . $HOME/.ant/ant.conf fi if [ -f "$HOME/.antrc" ]; then @@@@ -172,7 +181,12 @@@@ if $mingw; then fi # set ANT_LIB location -ANT_LIB="${ANT_HOME}/lib" +ANT_LIB="${ANT_HOME}/lib/java/ant" + +# use ${PREFIX}/bin/java (wrapper) +if [ "$JAVACMD" = "" ] && [ -f @@PREFIX@@/bin/java ] ; then + JAVACMD=@@PREFIX@@/bin/java +fi if [ -z "$JAVACMD" ]; then if [ -n "$JAVA_HOME" ]; then @ 1.6 log @apache-ant: update to 1.10.2. Changes from Ant 1.10.1 TO Ant 1.10.2 ===================================== Changes that could break older environments: ------------------------------------------- * updated the dependency of BCEL to 6.2. Bugzilla Report 61196 * delete task previously would silently accept wildcard (*) value for the "file" attribute. That's no longer the case and an exception could get thrown by the underlying filesystem for such use. Usage like: should instead be changed to use resource collections like: * Commons Net 3.6 is binary-code, but not source compatible; see change list of Commons Net 3.0 for details * The Log4jListener is marked as deprecated as the required log4j library (in version 1.x) is not maintained any more. * Image task is marked as deprecated as the required JAI library is not maintained any more and internal APIs that JAI depended on are no longer available in Java 9. Fixed bugs: ----------- * 's child now skips s that lack a key or value. Bugzilla Report 60767 * bootstrapping Ant on Windows failed Bugzilla Report 61027 * Fixed the issue where the SCP based tasks would try to change the permissions on the parent directory of a transferred file, instead of changing it on the transferred file itself. Bugzilla Reports 59648 and 43271 * Fixed the issue where the source file being copied could end up being corrupted if the target of the copy happened to be the same source file (symlinked back to itself). Bugzilla Report 60644 * Fixed the issue where symlink creation with "overwrite=false", on existing symlink whose target was a directory, would end up creating a new symlink under the target directory. Bugzilla Report 58683 * Improvement to the Zip task for reduced memory usage in certain cases. Thanks to Glen Lewis for reporting the issue and suggesting the fix. Bugzilla Report 19516 * Fixed an issue where the content redirected from output/error streams of a process, could end up being truncated. Bugzilla Report 58833, 58451 * // will now throw an exception with a more useful error message when setFile is called twice on the same instance. Bugzilla Report 62071 Other changes: -------------- * Added forceCsvQuoteChar option to task. When enabled the values always get quoted. Github Pull Request #32 * Added attributes to various script related tasks and a compiled attribute to scriptdef. Github Pull Request #30 * Added support for jarsigner's -tsadigestalg to . Bugzilla Report 60665 * added "regexp" attribute to Bugzilla Report 60968 * reduced GC pressure by replacing all usage of FileInputStream and FileOutputStream. * Task can now also use attribute setters that expect a java.nio.file.Path argument. Bugzilla Report 61042 * added a new magic property ant.tstamp.now that can be used to override the current time/date used by . Bugzilla Report 61079 * added Orion support to ejbjar Github Pull Request #33 * SCP task, when configured to use SFTP protocol, now preserves last modified timestamp on files that it uploads, if the preserveLastModified attribute is set to true for that task Bugzilla Report 58589 * zip and the related tasks can now set the modification time of all entries to a fixed timestamp. Github Pull Request #36 * Jsch library dependency has now been upgraded to 0.1.54. Jsch is the library behind the sshexec and scp Ant tasks. Bugzilla Report 61718 * Added a new condition. * added "javac10+" as new supported value for javac's compiler attribute. * javah has been removed from Java 10. The task will now throw an exception if you try to use it while running Java 10 or newer. * Updated Maven Ant Tasks, Jakarta Regexp and JUnit 4 to the latest stable version (2.1.3, 1.4, and 4.12 respectively); updated JRuby to the latest Java 5 compatible version (1.6.8); added resolve target for AntUnit to facilitate updates. Github Pull Request #50 * Updated Java Mail API, Jython, Rhino and Commons Net to the latest stable version (1.6.0, 2.7.0, 1.7.7.2 and 3.6, respectively). Github Pull Request #53 @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2014/09/03 19:36:52 tonio Exp $ @ 1.5 log @Fix support for space in JAVA_HOME. Required for Darwin java7 Patch provided by J. Lewis Muir @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2014/05/07 18:23:31 wiz Exp $ d5 3 a7 5 --- bin/ant.orig 2010-02-02 01:35:22.000000000 +0100 +++ bin/ant 2010-04-13 22:52:56.000000000 +0200 @@@@ -91,6 +91,15 @@@@ MINGW*) mingw=true ;; esac d9 2 d20 4 a23 4 if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then ## resolve links - $0 may be a link to ant's home PRG="$0" @@@@ -129,7 +138,12 @@@@ d35 2 a36 2 if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then @ 1.4 log @Update to 1.9.4. Add comment to patch. Changes from Ant 1.9.3 TO Ant 1.9.4 =================================== Changes that could break older environments: ------------------------------------------- * the prefixValues attribute of didn't work as expected when set to false (the default). It is quite likely existing build files relied on the wrong behavior and expect Ant to resolve the value side against the properties defined in the property file itself - these build files must now explicitly set the prefixValues attribute to true. Bugzilla Report 54769 * when matching an entry of a zip/tarfileset against a pattern a leading slash will be stripped from the entry name. Most archives don't contain paths with leading slashes anyway. This may cause include/exclude patterns that start with a / to stop matching anything. Such patterns only used to work by accident and only on platforms with multiple file system roots. Bugzilla Report 53949 * DirectoryScanner and thus fileset/dirset will now silently drop all filesystem objects that are neither files nor directories according to java.io.File. This prevents Ant from reading named pipes which might lead to blocking or other undefined behavior. Bugzilla Report 56149 * BuildFileTest and BaseSelectorTest have both been deprecated in favour of BuildFileRule and BaseSelectorRule respectively, and the tests that previously extended these base tests have been converted to JUnit 4 tests using the new "rule"s. Any external test that sub-classed a test in the Ant workspace, rather than BuildFileTest, will need changed to either use JUnit4's annotations, or be modified to extend BuildFileTest directly. This will not affect any tests that are being executed by Ant's junit or batchtest tasks that are not specifically testing Ant's code. Fixed bugs: ----------- * / failed when the importing file was loaded from an URI or a jar and it imported a file from the local file system via an absolute path. Bugzilla Report 50953 * could import the same resource twice when imported via different resource types. Bugzilla Report 55097 * several calls to File#mkdirs could fall victim to a race condition where another thread already created the same directory. Bugzilla Report 55290 * created '/' rather than './' for the parent directory of the given jarfile. Bugzilla Report 55049 * 's fixlastline="true" didn't work when using certain filter readers. Bugzilla Report 54672 * several places where resources are read from jars will now explicitly disable caching to avoid problems with reloading jars. Bugzilla Report 54473 * AntClassloader will now ignore files that are part of the classpath but not zip files when scanning for resources. It used to throw an exception. Bugzilla Report 53964 * caused a NullPointerException when no destdir was set. Bugzilla Report 55949 * would still include the Main section of the fileset manifests if there was no nested manifest or manifest attribute. Bugzilla Report 54171 * reading of compiler args has become more defensive Bugzilla Report 53754 * without force="true" would not only fail to overwrite a read-only file as expected but also remove the existing file. Bugzilla Report 53095 * would remove symbolic links to not-included files. It will still delete symlinks to directories that would have been followed even if they are not explicitly included. exclude-Patterns can still be used to preserve symbolic links. Bugzilla Report 53959 * Sometimes copy-operations using NIO FileChannels fail. Ant will now try to use a Stream based copy operation as fallback when the Channel based copy fails. Bugzilla Reports 53102 and 54397 * Javadoc.postProcessGeneratedJavadocs() fails for Classes that extend Javadoc Bugzilla Report 56047 * TarInputStream will now read archives created by tar implementations that encode big numbers by not adding a trailing NUL. * the isExists() method of URLResource returned false positives for HTTP and FTP URLs. Other changes: -------------- * initial support for Java 1.9 * can optionally pass System.in to the remote process Bugzilla Report 55393 * now supports capturing error output of the executed process and setting a property from the return code. Bugzilla Report 48478 * now has an option to fail if javadoc issues warnings. Bugzilla Report 55015 * has a new outputencoding attribute. Bugzilla Report 39541 * changes to JUnitTestRunner and PlainJUnitResultFormatter to make OutOfMemoryErrors less likely. Bugzilla Report 45536 * changes to DOMElementWriter to make OutOfMemoryErrors less likely. Bugzilla Report 54147 * has a new attribute binaryOutput that prevents Ant from splitting the output into lines. This prevents binary output from being corrupted but may lead to error and normal output being mixed up. Bugzilla Report 55667 Bugzilla Report 56156 * the nested elements of now have an optional inputEncoding attribute that can be used to specify the encoding of files read that don't use the platform's default encoding. Bugzilla Report 56258 * The task now explicitly accepts and supports the gzip content encoding. Bugzilla Report 49453 * A new resourcecollection type acts like a union of s and s that share the same configuration but have different base directories. Bugzilla Report 48621 * has a quiet attribute that makes the task log errors only when enabled. GitHub Pull Request #1 * has now a threads attribute allowing to run the tests in several threads. Bugzilla Report 55925 * addition of a new ProcessUtil class providing the process id of the current process * changes to allow to run the JUnit testcases of Ant in parallel, by making them use unique temporary directories @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2010/04/13 21:05:42 tonio Exp $ d17 1 a17 1 + JAVA_HOME=@@JAVA_HOME@@ @ 1.3 log @Update devel/apache-ant to 1.8.0 Fix PR pkg/42990 * Lexically scoped local properties, i.e. properties that are only defined inside a target, sequential block or similar environment. * can now import from any file- or URL-providing resource - this includes . * Various improvements to the directory scanning code that help with symbolic link cycles (as can be found on MacOS X Java installations for example) and improve scanning performance. For big directory trees the improvement is dramatic. * The way developers can extend Ant's property expansion algorithm has been rewritten (breaking the older API) to be easier to use and be more powerful. a new top level element extension-point allows build files to be extended with custom targets more easily * At the same time the if and unless attributes have been rewritten to do the expected thing if applied to a property expansion (i.e. if="${foo}" will mean "yes, do it" if ${foo} expands to true, in Ant 1.7.1 it would mean "no" unless a property named "true" existed). This adds "testing conditions" as a new use-case to property expansion. * Ant now requires Java 1.4 or later * new task include provides an alternative to that should be preferred when you don't want to override any targets * numerous bug fixes and improvements as documented in Bugzilla and in WHATSNEW @ text @d1 3 a3 1 $NetBSD: patch-aa,v 1.2 2008/10/25 17:43:33 adrianp Exp $ @ 1.2 log @It's not much use specifying a path to a java wrapper that may not exist. Test for the wrapper and if it does not exist fall back to auto-detection PKGREVISION++ @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2005/09/03 22:59:25 tonio Exp $ d3 4 a6 4 --- 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 @@@@ ;; d21 1 a21 1 @@@@ -117,7 +126,12 @@@@ @ 1.1 log @Update apache-ant to 1.6.5 Remove the files/ant script, by patching the bin/ant script, as ant people worked on it. I'm taking maintainership for this one Fix PR 29038 and PR 29338, apache-ant now can use plugins Fix PR 30332 (update to 1.6.5) Approved by jwise@@ @ text @d1 1 a1 1 $NetBSD$ d29 1 a29 1 +if [ "$JAVACMD" = "" ] ; then @