CVS commit: pkgsrc/devel/gradle

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Mar  8 21:00:29 UTC 2018

Modified Files:
        pkgsrc/devel/gradle: Makefile
        pkgsrc/devel/gradle/files: gradle-launcher

Log Message:
gradle: allow overriding JAVA_HOME with env variables.

from Nathan Arthur in PR pkg/53083


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/gradle/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gradle/files/gradle-launcher

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gradle/Makefile
diff -u pkgsrc/devel/gradle/Makefile:1.11 pkgsrc/devel/gradle/Makefile:1.12
--- pkgsrc/devel/gradle/Makefile:1.11   Fri Mar  2 10:28:58 2018
+++ pkgsrc/devel/gradle/Makefile        Thu Mar  8 21:00:29 2018
@@ -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

Index: pkgsrc/devel/gradle/files/gradle-launcher
diff -u pkgsrc/devel/gradle/files/gradle-launcher:1.1 pkgsrc/devel/gradle/files/gradle-launcher:1.2
--- pkgsrc/devel/gradle/files/gradle-launcher:1.1       Mon Feb  6 22:25:24 2017
+++ pkgsrc/devel/gradle/files/gradle-launcher   Thu Mar  8 21:00:29 2018
@@ -11,7 +11,7 @@ APP_NAME="Gradle"
 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"