From owner-svn-ports-head@freebsd.org  Fri Nov  6 19:28:43 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE1C2A28C12;
 Fri,  6 Nov 2015 19:28:43 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 73ACC15F0;
 Fri,  6 Nov 2015 19:28:43 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA6JSgap027898;
 Fri, 6 Nov 2015 19:28:42 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA6JSge1027896;
 Fri, 6 Nov 2015 19:28:42 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201511061928.tA6JSge1027896@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Fri, 6 Nov 2015 19:28:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r400953 - in head/devel/maven33: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Nov 2015 19:28:43 -0000

Author: pi
Date: Fri Nov  6 19:28:42 2015
New Revision: 400953
URL: https://svnweb.freebsd.org/changeset/ports/400953

Log:
  devel/maven33: fix mvn launcher
  
  PR:		204239
  Submitted by:	Jonathan Chen <jonc@chen.org.nz>
  Approved by:	yerenkow@gmail.com (maintainer)

Modified:
  head/devel/maven33/Makefile
  head/devel/maven33/files/mvn.sh.in

Modified: head/devel/maven33/Makefile
==============================================================================
--- head/devel/maven33/Makefile	Fri Nov  6 18:57:01 2015	(r400952)
+++ head/devel/maven33/Makefile	Fri Nov  6 19:28:42 2015	(r400953)
@@ -2,6 +2,7 @@
 
 PORTNAME=	maven33
 DISTVERSION=	3.3.3
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin

Modified: head/devel/maven33/files/mvn.sh.in
==============================================================================
--- head/devel/maven33/files/mvn.sh.in	Fri Nov  6 18:57:01 2015	(r400952)
+++ head/devel/maven33/files/mvn.sh.in	Fri Nov  6 19:28:42 2015	(r400953)
@@ -34,18 +34,12 @@ concat_lines() {
   fi
 }
 
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
-# Provide a "standardized" way to retrieve the CLI args that will 
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
-
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" \
-  $MAVEN_OPTS \
-  -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
-  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${CLASSWORLDS_LAUNCHER} "$@"
-
+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
+	-classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \
+	"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+	"-Dmaven.home=${M2_HOME}" \
+	"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+	org.codehaus.classworlds.Launcher "$@"