Received: by mail.netbsd.org (Postfix, from userid 605) id 8C61484E67; Thu, 16 Feb 2023 10:32:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B9A0C84D27 for ; Thu, 16 Feb 2023 10:32:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id KIuenF12m7aI for ; Thu, 16 Feb 2023 10:32:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1CD8084CE3 for ; Thu, 16 Feb 2023 10:32:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 161FDFA90; Thu, 16 Feb 2023 10:32:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167654355771370" MIME-Version: 1.0 Date: Thu, 16 Feb 2023 10:32:37 +0000 From: "David Brownlee" Subject: CVS commit: pkgsrc/devel/apache-ant To: pkgsrc-changes@NetBSD.org Reply-To: abs@netbsd.org X-Mailer: log_accum Message-Id: <20230216103237.161FDFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167654355771370 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: abs Date: Thu Feb 16 10:32:36 UTC 2023 Modified Files: pkgsrc/devel/apache-ant: Makefile distinfo Added Files: pkgsrc/devel/apache-ant/patches: patch-bin_ant Removed Files: pkgsrc/devel/apache-ant/patches: patch-aa Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 pkgsrc/devel/apache-ant/Makefile cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/apache-ant/distinfo cvs rdiff -u -r1.6 -r0 pkgsrc/devel/apache-ant/patches/patch-aa cvs rdiff -u -r0 -r1.1 pkgsrc/devel/apache-ant/patches/patch-bin_ant Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167654355771370 Content-Disposition: inline Content-Length: 2606 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/apache-ant/Makefile diff -u pkgsrc/devel/apache-ant/Makefile:1.56 pkgsrc/devel/apache-ant/Makefile:1.57 --- pkgsrc/devel/apache-ant/Makefile:1.56 Tue Jan 17 09:45:48 2023 +++ pkgsrc/devel/apache-ant/Makefile Thu Feb 16 10:32:36 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.56 2023/01/17 09:45:48 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2023/02/16 10:32:36 abs Exp $ DISTNAME= apache-ant-1.10.13-bin PKGNAME= ${DISTNAME:S/-bin//} +PKGREVISION= 1 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE:=ant/binaries/} EXTRACT_SUFX= .tar.xz Index: pkgsrc/devel/apache-ant/distinfo diff -u pkgsrc/devel/apache-ant/distinfo:1.40 pkgsrc/devel/apache-ant/distinfo:1.41 --- pkgsrc/devel/apache-ant/distinfo:1.40 Tue Jan 17 09:45:48 2023 +++ pkgsrc/devel/apache-ant/distinfo Thu Feb 16 10:32:36 2023 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.40 2023/01/17 09:45:48 wiz Exp $ +$NetBSD: distinfo,v 1.41 2023/02/16 10:32:36 abs Exp $ BLAKE2s (apache-ant-1.10.13-bin.tar.xz) = 91e6bad1f10e7d95b521ab8fce9ce81cf7bd12464579219ec27fc9b54ed8933e SHA512 (apache-ant-1.10.13-bin.tar.xz) = 26e56bf670c22c8093fe51ec952fa51e813b1ab4200cb09fcd68fa291c5f6f626d7c6a42b4d3358b38111466e249d4bc6089b8c4093383759d6f8a08d39bc32d Size (apache-ant-1.10.13-bin.tar.xz) = 4852532 bytes -SHA1 (patch-aa) = 5f614ed545c7cca33096af1f4975f7947439286f +SHA1 (patch-bin_ant) = 4087064f78ad86bc209c777f717f63d5e612cfd6 Added files: Index: pkgsrc/devel/apache-ant/patches/patch-bin_ant diff -u /dev/null pkgsrc/devel/apache-ant/patches/patch-bin_ant:1.1 --- /dev/null Thu Feb 16 10:32:37 2023 +++ pkgsrc/devel/apache-ant/patches/patch-bin_ant Thu Feb 16 10:32:36 2023 @@ -0,0 +1,30 @@ +$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 --_----------=_167654355771370--