head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.62
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.60
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.58
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.56
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.54
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.52
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.50
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.48
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.46
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.44
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.42
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.40
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.38
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.36
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.34
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.32
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.30
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.28
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.26
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.24
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.22
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.20
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.18
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.16
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.12
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.14
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.10
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.8
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.6
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.4
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.2
	pkgsrc-2018Q3-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2018.07.24.16.24.50;	author jperkin;	state Exp;
branches;
next	;
commitid	RfinXkkJpFRblpLA;


desc
@@


1.1
log
@apache-ant19: Add new package, version 1.9.13.

This is the 1.9 branch of apache-ant, which is required for JDK 7.x
and older.  JDK 8.x and newer use the main apache-ant 1.10 package.
@
text
@$NetBSD$

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
@