Thu Feb 16 10:32:36 2023 UTC ()
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


(abs)
diff -r1.56 -r1.57 pkgsrc/devel/apache-ant/Makefile
diff -r1.40 -r1.41 pkgsrc/devel/apache-ant/distinfo
diff -r1.6 -r0 pkgsrc/devel/apache-ant/patches/patch-aa
diff -r0 -r1.1 pkgsrc/devel/apache-ant/patches/patch-bin_ant
cvs diff -r1.56 -r1.57 pkgsrc/devel/apache-ant/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/apache-ant/Makefile 2023/01/17 09:45:48 1.56
+++ pkgsrc/devel/apache-ant/Makefile 2023/02/16 10:32:36 1.57
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.56 2023/01/17 09:45:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.57 2023/02/16 10:32:36 abs Exp $
2 2
3DISTNAME= apache-ant-1.10.13-bin 3DISTNAME= apache-ant-1.10.13-bin
4PKGNAME= ${DISTNAME:S/-bin//} 4PKGNAME= ${DISTNAME:S/-bin//}
 5PKGREVISION= 1
5CATEGORIES= devel java 6CATEGORIES= devel java
6MASTER_SITES= ${MASTER_SITE_APACHE:=ant/binaries/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=ant/binaries/}
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= tonio@NetBSD.org 10MAINTAINER= tonio@NetBSD.org
10HOMEPAGE= https://ant.apache.org/ 11HOMEPAGE= https://ant.apache.org/
11COMMENT= Apache Project's Java-Based make(1) replacement 12COMMENT= Apache Project's Java-Based make(1) replacement
12LICENSE= apache-2.0 13LICENSE= apache-2.0
13 14
14# Up to version 1.5.1 inclusive this was known as "jakarta-ant". 15# Up to version 1.5.1 inclusive this was known as "jakarta-ant".
15CONFLICTS= jakarta-ant>=0 16CONFLICTS= jakarta-ant>=0
16 17
17WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
cvs diff -r1.40 -r1.41 pkgsrc/devel/apache-ant/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/apache-ant/distinfo 2023/01/17 09:45:48 1.40
+++ pkgsrc/devel/apache-ant/distinfo 2023/02/16 10:32:36 1.41
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.40 2023/01/17 09:45:48 wiz Exp $ 1$NetBSD: distinfo,v 1.41 2023/02/16 10:32:36 abs Exp $
2 2
3BLAKE2s (apache-ant-1.10.13-bin.tar.xz) = 91e6bad1f10e7d95b521ab8fce9ce81cf7bd12464579219ec27fc9b54ed8933e 3BLAKE2s (apache-ant-1.10.13-bin.tar.xz) = 91e6bad1f10e7d95b521ab8fce9ce81cf7bd12464579219ec27fc9b54ed8933e
4SHA512 (apache-ant-1.10.13-bin.tar.xz) = 26e56bf670c22c8093fe51ec952fa51e813b1ab4200cb09fcd68fa291c5f6f626d7c6a42b4d3358b38111466e249d4bc6089b8c4093383759d6f8a08d39bc32d 4SHA512 (apache-ant-1.10.13-bin.tar.xz) = 26e56bf670c22c8093fe51ec952fa51e813b1ab4200cb09fcd68fa291c5f6f626d7c6a42b4d3358b38111466e249d4bc6089b8c4093383759d6f8a08d39bc32d
5Size (apache-ant-1.10.13-bin.tar.xz) = 4852532 bytes 5Size (apache-ant-1.10.13-bin.tar.xz) = 4852532 bytes
6SHA1 (patch-aa) = 5f614ed545c7cca33096af1f4975f7947439286f 6SHA1 (patch-bin_ant) = 4087064f78ad86bc209c777f717f63d5e612cfd6
File Deleted: pkgsrc/devel/apache-ant/patches/Attic/patch-aa
File Added: pkgsrc/devel/apache-ant/patches/patch-bin_ant
$NetBSD: patch-bin_ant,v 1.1 2023/02/16 10:32:36 abs Exp $

Adjust to use the pkgsrc ${PREFIX}/bin/java wrapper by default,
but still 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)

--- bin/ant.orig	2023-01-04 09:33:13.000000000 +0000
+++ bin/ant
@@ -115,6 +115,11 @@ if $rpm_mode; then
   fi
 fi
 
+# pkgsrc: use ${PREFIX}/bin/java (wrapper)
+if [ -z "$JAVA_HOME" ] && [ -z "$JAVACMD" ] && [ -x @PREFIX@/bin/java ]; then
+  JAVACMD=@PREFIX@/bin/java
+fi
+
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false;
 darwin=false;
@@ -172,7 +177,7 @@ if $mingw; then
 fi
 
 # set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
+ANT_LIB="${ANT_HOME}/lib/java/ant"
 
 if [ -z "$JAVACMD" ]; then
   if [ -n "$JAVA_HOME" ]; then