Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_149795942887910"
MIME-Version: 1.0
Date: Tue, 20 Jun 2017 11:50:28 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/devel/apache-maven
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20170620115028.3B645FAE8@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_149795942887910
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Tue Jun 20 11:50:28 UTC 2017

Modified Files:
	pkgsrc/devel/apache-maven: distinfo
	pkgsrc/devel/apache-maven/patches: patch-bin_mvn

Log Message:
Find native Java on Darwin correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/apache-maven/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/apache-maven/patches/patch-bin_mvn

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


--_----------=_149795942887910
Content-Disposition: inline
Content-Length: 2308
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/apache-maven/distinfo
diff -u pkgsrc/devel/apache-maven/distinfo:1.11 pkgsrc/devel/apache-maven/distinfo:1.12
--- pkgsrc/devel/apache-maven/distinfo:1.11	Tue Nov  3 03:27:14 2015
+++ pkgsrc/devel/apache-maven/distinfo	Tue Jun 20 11:50:28 2017
@@ -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

Index: pkgsrc/devel/apache-maven/patches/patch-bin_mvn
diff -u pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.3 pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.4
--- pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.3	Tue Dec  9 11:43:40 2014
+++ pkgsrc/devel/apache-maven/patches/patch-bin_mvn	Tue Jun 20 11:50:28 2017
@@ -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 \


--_----------=_149795942887910--