blob: 9afa813cd3e7b98624c9e5ef0f1511507a6b9a01 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
$NetBSD: patch-bin_mvn,v 1.8.12.1 2021/10/16 20:29:42 tm Exp $
Reconcile JAVA_HOME evaluated at run time on Darwin vs. hardcoded
via PKG_JAVA_HOME elsewhere.
Follow pkgsrc path convention.
--- bin/mvn.orig 2021-09-27 18:25:22.000000000 +0000
+++ bin/mvn
@@ -46,9 +46,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;;
+ Darwin) darwin=true;;
esac
## resolve links - $0 may be a link to Maven's home
@@ -93,19 +95,24 @@ if $mingw ; then
# TODO classpath?
fi
+if $darwin ; then
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`/usr/libexec/java_home 2>/dev/null`"
+fi
+
if [ -z "$JAVA_HOME" ] ; then
- JAVACMD=`which java`
-else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVA_HOME="@PKG_JAVA_HOME@"
fi
+JAVACMD="$JAVA_HOME/bin/java"
+
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
exit 1
fi
-CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
+CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/lib/java/maven/boot/plexus-classworlds-*.jar`
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
# For Cygwin, switch paths to Windows format before running java
@@ -195,8 +202,10 @@ exec "$JAVACMD" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
-classpath "${CLASSWORLDS_JAR}" \
- "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
+ "-Dclassworlds.conf=@PKG_SYSCONFDIR@/m2.conf" \
"-Dmaven.home=${MAVEN_HOME}" \
"-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ "-Dorg.apache.maven.global-settings=@PKG_SYSCONFDIR@/settings.xml" \
+ "-Dorg.apache.maven.global-plugin-registry=@PKG_SYSCONFDIR@/plugin-registry.xml" \
${CLASSWORLDS_LAUNCHER} "$@"
|
