CVS commit: pkgsrc/devel/apache-maven

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Fri May 22 04:31:48 UTC 2020

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

Log Message:
apache-maven: darwin needs to be initialised to false.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/apache-maven/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/apache-maven/distinfo
cvs rdiff -u -r1.7 -r1.8 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.

Modified files:

Index: pkgsrc/devel/apache-maven/Makefile
diff -u pkgsrc/devel/apache-maven/Makefile:1.15 pkgsrc/devel/apache-maven/Makefile:1.16
--- pkgsrc/devel/apache-maven/Makefile:1.15     Sat Jan 18 23:30:22 2020
+++ pkgsrc/devel/apache-maven/Makefile  Fri May 22 04:31:48 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2020/01/18 23:30:22 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2020/05/22 04:31:48 markd Exp $
 #
 
 DISTNAME=      apache-maven-3.5.4
+PKGREVISION=   1
 CATEGORIES=    devel java
 MASTER_SITES=  ${MASTER_SITE_APACHE:=maven/maven-3/${PKGVERSION_NOREV}/binaries/}
 DISTFILES=     ${DISTNAME}-bin${EXTRACT_SUFX}

Index: pkgsrc/devel/apache-maven/distinfo
diff -u pkgsrc/devel/apache-maven/distinfo:1.16 pkgsrc/devel/apache-maven/distinfo:1.17
--- pkgsrc/devel/apache-maven/distinfo:1.16     Tue Aug 21 15:22:01 2018
+++ pkgsrc/devel/apache-maven/distinfo  Fri May 22 04:31:48 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2018/08/21 15:22:01 prlw1 Exp $
+$NetBSD: distinfo,v 1.17 2020/05/22 04:31:48 markd Exp $
 
 SHA1 (apache-maven-3.5.4-bin.tar.gz) = 22cac91b3557586bb1eba326f2f7727543ff15e3
 RMD160 (apache-maven-3.5.4-bin.tar.gz) = d6922772982fa8f95f68d43f7faeb24a79e3cc8e
 SHA512 (apache-maven-3.5.4-bin.tar.gz) = 2a803f578f341e164f6753e410413d16ab60fabe31dc491d1fe35c984a5cce696bc71f57757d4538fe7738be04065a216f3ebad4ef7e0ce1bb4c51bc36d6be86
 Size (apache-maven-3.5.4-bin.tar.gz) = 8842660 bytes
 SHA1 (patch-bin_m2.conf) = 4fb50adbfb744635281853f0b81ec95a5fdab504
-SHA1 (patch-bin_mvn) = 3f7e19b1f1d520bc5dc7965ee3b211453b36f81b
+SHA1 (patch-bin_mvn) = 30a0eb33a803eb3ace2f602f6fbb184c9bdeb969

Index: pkgsrc/devel/apache-maven/patches/patch-bin_mvn
diff -u pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.7 pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.8
--- pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.7 Mon Jun  4 08:23:11 2018
+++ pkgsrc/devel/apache-maven/patches/patch-bin_mvn     Fri May 22 04:31:48 2020
@@ -1,12 +1,16 @@
-$NetBSD: patch-bin_mvn,v 1.7 2018/06/04 08:23:11 yyamano Exp $
+$NetBSD: patch-bin_mvn,v 1.8 2020/05/22 04:31:48 markd Exp $
 
 Reconcile JAVA_HOME evaluated at run time on Darwin vs. hardcoded
 via PKG_JAVA_HOME elsewhere.
 Follow pkgsrc path convention.
 
---- bin/mvn.orig       2018-02-24 19:46:02.000000000 +0000
+--- bin/mvn.orig       2018-06-17 18:30:11.000000000 +0000
 +++ bin/mvn
-@@ -45,6 +45,7 @@ mingw=false;
+@@ -42,9 +42,11 @@ fi
+ # OS specific support. $var _must_ be set to either true or false.
+ cygwin=false;
+ mingw=false;
++darwin=false;
  case "`uname`" in
    CYGWIN*) cygwin=true;;
    MINGW*) mingw=true;;
@@ -14,7 +18,7 @@ Follow pkgsrc path convention.
  esac
  
  ## resolve links - $0 may be a link to Maven's home
-@@ -89,12 +90,17 @@ if $mingw ; then
+@@ -89,12 +91,17 @@ if $mingw ; then
    # TODO classpath?
  fi
  
@@ -35,7 +39,7 @@ Follow pkgsrc path convention.
  if [ ! -x "$JAVACMD" ] ; then
    echo "The JAVA_HOME environment variable is not defined correctly" >&2
    echo "This environment variable is needed to run this program" >&2
-@@ -102,7 +108,7 @@ if [ ! -x "$JAVACMD" ] ; then
+@@ -102,7 +109,7 @@ if [ ! -x "$JAVACMD" ] ; then
    exit 1
  fi
  
@@ -44,7 +48,7 @@ Follow pkgsrc path convention.
  CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
  
  # For Cygwin, switch paths to Windows format before running java
-@@ -192,8 +198,10 @@ exec "$JAVACMD" \
+@@ -192,8 +199,10 @@ exec "$JAVACMD" \
    $MAVEN_OPTS \
    $MAVEN_DEBUG_OPTS \
    -classpath "${CLASSWORLDS_JAR}" \