diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-06-20 11:50:28 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-06-20 11:50:28 +0000 |
| commit | abfe97bf1f9dba2e9cd75569ef1b05ead4629558 (patch) | |
| tree | e719d8af5d59a571e596b890c3e5b9e841db3d43 | |
| parent | 9206fb4251993063f9c8d3d20f4be10470a264bf (diff) | |
| download | pkgsrc-abfe97bf1f9dba2e9cd75569ef1b05ead4629558.tar.gz | |
Find native Java on Darwin correctly.
| -rw-r--r-- | devel/apache-maven/distinfo | 4 | ||||
| -rw-r--r-- | devel/apache-maven/patches/patch-bin_mvn | 18 |
2 files changed, 16 insertions, 6 deletions
diff --git a/devel/apache-maven/distinfo b/devel/apache-maven/distinfo index 26c062a6a96..b1b0729fe97 100644 --- a/devel/apache-maven/distinfo +++ b/devel/apache-maven/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2015/11/03 03:27:14 agc Exp $ +$NetBSD: distinfo,v 1.12 2017/06/20 11:50:28 jperkin Exp $ SHA1 (apache-maven-3.2.3-bin.tar.gz) = 1ce6641f7dcb4fd5785bedcdca2979da83f6d23f RMD160 (apache-maven-3.2.3-bin.tar.gz) = 45d5e349f232ba6ec32239bda107e59d31a1a231 SHA512 (apache-maven-3.2.3-bin.tar.gz) = 9c211b17a8109939a776a4ad0e833ce9b301941eb0cfd4e8978634589ea48227cb979b5819c4b151184cff46bb44139c09477e904daa00ac769b0c756859f6f0 Size (apache-maven-3.2.3-bin.tar.gz) = 6956162 bytes SHA1 (patch-bin_m2.conf) = e267855998ee06efa649aee9e30a28833b7223cb -SHA1 (patch-bin_mvn) = 3c70f0f6b50df1e001945155e08b9d8b90319955 +SHA1 (patch-bin_mvn) = 933d10a7064e84c2f51af779ccea57c7a9a2d2bf diff --git a/devel/apache-maven/patches/patch-bin_mvn b/devel/apache-maven/patches/patch-bin_mvn index 18f6c4a4c84..2fdf6f974d4 100644 --- a/devel/apache-maven/patches/patch-bin_mvn +++ b/devel/apache-maven/patches/patch-bin_mvn @@ -1,10 +1,20 @@ -$NetBSD: patch-bin_mvn,v 1.3 2014/12/09 11:43:40 fhajny Exp $ +$NetBSD: patch-bin_mvn,v 1.4 2017/06/20 11:50:28 jperkin Exp $ +Darwin's java_home needs to be evaluated not set. Follow pkgsrc path convention. ---- bin/mvn.orig 2013-02-19 13:54:21.000000000 +0000 +--- bin/mvn.orig 2014-08-11 20:59:27.000000000 +0000 +++ bin/mvn -@@ -69,6 +69,15 @@ if [ -z "$JAVA_HOME" ] ; then +@@ -83,7 +83,7 @@ case "`uname`" in + # + # Apple JDKs + # +- export JAVA_HOME=/usr/libexec/java_home ++ export JAVA_HOME=`/usr/libexec/java_home` + fi + ;; + esac +@@ -94,6 +94,15 @@ if [ -z "$JAVA_HOME" ] ; then fi fi @@ -20,7 +30,7 @@ Follow pkgsrc path convention. if [ -z "$M2_HOME" ] ; then ## resolve links - $0 may be a link to maven's home PRG="$0" -@@ -166,7 +175,9 @@ fi +@@ -196,7 +205,9 @@ export MAVEN_CMD_LINE_ARGS exec "$JAVACMD" \ $MAVEN_OPTS \ |