[pkgsrc/trunk]: pkgsrc/devel/gradle gradle: allow overriding JAVA_HOME with e...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a198b2fda250
branches:  trunk
changeset: 376816:a198b2fda250
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Mar 08 21:00:29 2018 +0000

description:
gradle: allow overriding JAVA_HOME with env variables.

from Nathan Arthur in PR pkg/53083

diffstat:

 devel/gradle/Makefile              |  3 ++-
 devel/gradle/files/gradle-launcher |  2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 3cd6d3d6d970 -r a198b2fda250 devel/gradle/Makefile
--- a/devel/gradle/Makefile     Thu Mar 08 19:39:35 2018 +0000
+++ b/devel/gradle/Makefile     Thu Mar 08 21:00:29 2018 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2018/03/02 10:28:58 fhajny Exp $
+# $NetBSD: Makefile,v 1.12 2018/03/08 21:00:29 maya Exp $
 
 DISTNAME=      gradle-4.6-bin
 PKGNAME=       ${DISTNAME:S/-bin//}
+PKGREVISION=   1
 CATEGORIES=    devel java
 MASTER_SITES=  http://services.gradle.org/distributions/
 EXTRACT_SUFX=  .zip
diff -r 3cd6d3d6d970 -r a198b2fda250 devel/gradle/files/gradle-launcher
--- a/devel/gradle/files/gradle-launcher        Thu Mar 08 19:39:35 2018 +0000
+++ b/devel/gradle/files/gradle-launcher        Thu Mar 08 21:00:29 2018 +0000
@@ -11,7 +11,7 @@
 APP_BASE_NAME=`basename "$0"`
 APP_HOME="@APP_HOME@"
 APP_LAUNCHER="@APP_LAUNCHER@"
-JAVA_HOME="@JAVA_HOME@"
+JAVA_HOME="${JAVA_HOME:-@JAVA_HOME@}"
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"