mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-04 02:08:49 -04:00
25 lines
711 B
Plaintext
25 lines
711 B
Plaintext
$NetBSD: patch-bin_scala,v 1.3 2015/04/07 14:21:44 yyamano Exp $
|
|
|
|
Hardwire paths to installed files and Java binary.
|
|
|
|
--- bin/scala.orig 2015-02-26 01:09:38.000000000 +0000
|
|
+++ bin/scala
|
|
@@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
|
|
fi
|
|
|
|
# Finding the root folder for this Scala distribution
|
|
-SCALA_HOME="$(findScalaHome)"
|
|
+SCALA_HOME="@SCALA_HOME@"
|
|
SEP=":"
|
|
|
|
# Possible additional command line options
|
|
@@ -201,7 +201,7 @@ fi
|
|
# be quoted: otherwise an empty string will appear as a command line
|
|
# argument, and java will think that is the program to run.
|
|
execCommand \
|
|
- "${JAVACMD:=java}" \
|
|
+ "${JAVACMD:=@JAVA_HOME@/bin/java}" \
|
|
$JAVA_OPTS \
|
|
"${java_args[@]}" \
|
|
"${classpath_args[@]}" \
|