Thu Mar 8 21:00:29 2018 UTC ()
gradle: allow overriding JAVA_HOME with env variables.

from Nathan Arthur in PR pkg/53083


(maya)
diff -r1.11 -r1.12 pkgsrc/devel/gradle/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/gradle/files/gradle-launcher
cvs diff -r1.11 -r1.12 pkgsrc/devel/gradle/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gradle/Makefile 2018/03/02 10:28:58 1.11
+++ pkgsrc/devel/gradle/Makefile 2018/03/08 21:00:29 1.12
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.11 2018/03/02 10:28:58 fhajny Exp $ 1# $NetBSD: Makefile,v 1.12 2018/03/08 21:00:29 maya Exp $
2 2
3DISTNAME= gradle-4.6-bin 3DISTNAME= gradle-4.6-bin
4PKGNAME= ${DISTNAME:S/-bin//} 4PKGNAME= ${DISTNAME:S/-bin//}
 5PKGREVISION= 1
5CATEGORIES= devel java 6CATEGORIES= devel java
6MASTER_SITES= http://services.gradle.org/distributions/ 7MASTER_SITES= http://services.gradle.org/distributions/
7EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
8 9
9MAINTAINER= asiekierka@gmail.com 10MAINTAINER= asiekierka@gmail.com
10HOMEPAGE= https://gradle.org/ 11HOMEPAGE= https://gradle.org/
11COMMENT= Groovy-based Java build system 12COMMENT= Groovy-based Java build system
12LICENSE= apache-2.0 13LICENSE= apache-2.0
13 14
14WRKSRC= ${WRKDIR}/${DISTNAME:S/-bin//} 15WRKSRC= ${WRKDIR}/${DISTNAME:S/-bin//}
15 16
16USE_JAVA= run 17USE_JAVA= run
17USE_JAVA2= yes 18USE_JAVA2= yes
cvs diff -r1.1 -r1.2 pkgsrc/devel/gradle/files/gradle-launcher (expand / switch to unified diff)

--- pkgsrc/devel/gradle/files/gradle-launcher 2017/02/06 22:25:24 1.1
+++ pkgsrc/devel/gradle/files/gradle-launcher 2018/03/08 21:00:29 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1#!/bin/bash 1#!/bin/bash
2 2
3############################################################################## 3##############################################################################
4## 4##
5## A modified version of Gradle's "bin/gradle" startup script, 5## A modified version of Gradle's "bin/gradle" startup script,
6## adapted for pkgsrc. 6## adapted for pkgsrc.
7## 7##
8############################################################################## 8##############################################################################
9 9
10APP_NAME="Gradle" 10APP_NAME="Gradle"
11APP_BASE_NAME=`basename "$0"` 11APP_BASE_NAME=`basename "$0"`
12APP_HOME="@APP_HOME@" 12APP_HOME="@APP_HOME@"
13APP_LAUNCHER="@APP_LAUNCHER@" 13APP_LAUNCHER="@APP_LAUNCHER@"
14JAVA_HOME="@JAVA_HOME@" 14JAVA_HOME="${JAVA_HOME:-@JAVA_HOME@}"
15 15
16# Use the maximum available, or set MAX_FD != -1 to use that value. 16# Use the maximum available, or set MAX_FD != -1 to use that value.
17MAX_FD="maximum" 17MAX_FD="maximum"
18 18
19warn ( ) { 19warn ( ) {
20 echo "$*" 20 echo "$*"
21} 21}
22 22
23die ( ) { 23die ( ) {
24 echo 24 echo
25 echo "$*" 25 echo "$*"
26 echo 26 echo
27 exit 1 27 exit 1