aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2015-11-06 19:28:42 +0000
committerKurt Jaeger <pi@FreeBSD.org>2015-11-06 19:28:42 +0000
commit8b65e8a6ed117e7201476c35b7f6e263e37948b6 (patch)
treee1a7c8e286e65a8aa6c274bc88cf2fc22570665b /devel
parent85eac3e7a70faf75ebcc2ac33e77c3abbcaab007 (diff)
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/maven33/Makefile1
-rw-r--r--devel/maven33/files/mvn.sh.in20
2 files changed, 8 insertions, 13 deletions
diff --git a/devel/maven33/Makefile b/devel/maven33/Makefile
index 3656454395b8..7489dd3cb1c8 100644
--- a/devel/maven33/Makefile
+++ b/devel/maven33/Makefile
@@ -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
diff --git a/devel/maven33/files/mvn.sh.in b/devel/maven33/files/mvn.sh.in
index 03fb6399acc3..b3a8b896c5ce 100644
--- a/devel/maven33/files/mvn.sh.in
+++ b/devel/maven33/files/mvn.sh.in
@@ -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 "$@"