diff options
Diffstat (limited to 'lang/scala/patches/patch-ad')
| -rw-r--r-- | lang/scala/patches/patch-ad | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/lang/scala/patches/patch-ad b/lang/scala/patches/patch-ad index 7776070942b..cca4676fdf9 100644 --- a/lang/scala/patches/patch-ad +++ b/lang/scala/patches/patch-ad @@ -1,8 +1,10 @@ -$NetBSD: patch-ad,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $ +$NetBSD: patch-ad,v 1.2 2010/08/12 12:31:47 asau Exp $ ---- bin/scala.orig 2009-10-28 06:19:03.000000000 -0700 -+++ bin/scala -@@ -14,20 +14,21 @@ case "`uname`" in +Hardwire paths to installed files and Java binary. + +--- bin/scala.orig 2010-07-13 19:48:47.000000000 +0400 ++++ bin/scala 2010-08-12 16:23:06.000000000 +0400 +@@ -14,23 +14,7 @@ esac # Finding the root folder for this Scala distribution @@ -18,29 +20,18 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $ - SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; - fi; -done; --SCALA_HOME=`dirname "$SOURCE"`/..; --SCALA_HOME=`cd "$SCALA_HOME"; pwd`; -+#SOURCE=$0; -+#SCRIPT=`basename "$SOURCE"`; -+#while [ -h "$SOURCE" ]; do -+# SCRIPT=`basename "$SOURCE"`; -+# LOOKUP=`ls -ld "$SOURCE"`; -+# TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; -+# if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then -+# SOURCE=${TARGET:-.}; -+# else -+# SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; -+# fi; -+#done; -+#SCALA_HOME=`dirname "$SOURCE"`/..; -+#SCALA_HOME=`cd "$SCALA_HOME"; pwd`; +- +-# see #2092 +-SCALA_HOME=`dirname "$SOURCE"` +-SCALA_HOME=`cd "$SCALA_HOME"; pwd -P` +-SCALA_HOME=`cd "$SCALA_HOME"/..; pwd` +SCALA_HOME=@SCALA_HOME@ + # Remove spaces from SCALA_HOME on windows if $cygwin; then - SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` -@@ -63,4 +64,4 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a +@@ -80,4 +64,4 @@ JAVACMD="$JAVA_HOME/bin/java" fi --exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" scala.tools.nsc.MainGenericRunner "$@" +-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" scala.tools.nsc.MainGenericRunner "$@" +exec "${JAVACMD:=@JAVA_HOME@/bin/java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" scala.tools.nsc.MainGenericRunner "$@" |