diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-07-05 14:40:33 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-07-05 14:40:33 +0000 |
| commit | d23250e09d1f250351e1b2e0027a3fc5eb118b59 (patch) | |
| tree | e714500099f2a24dde5b1c4578ec9ff4a61a31d7 /lang/scala/patches/patch-bin_scalac | |
| parent | 1d52e11306ef3a1a82fa7383e5678c0e8b539271 (diff) | |
| download | pkgsrc-d23250e09d1f250351e1b2e0027a3fc5eb118b59.tar.gz | |
Update to 2.10.2
Changelog:
* Bug fixes.
* New features.
See http://www.scala-lang.org/2.10.2 etc in detail.
Diffstat (limited to 'lang/scala/patches/patch-bin_scalac')
| -rw-r--r-- | lang/scala/patches/patch-bin_scalac | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/lang/scala/patches/patch-bin_scalac b/lang/scala/patches/patch-bin_scalac index 0f53a6a5f83..946a4fdc656 100644 --- a/lang/scala/patches/patch-bin_scalac +++ b/lang/scala/patches/patch-bin_scalac @@ -1,40 +1,24 @@ -$NetBSD: patch-bin_scalac,v 1.1 2011/09/30 07:56:14 yyamano Exp $ +$NetBSD: patch-bin_scalac,v 1.2 2013/07/05 14:40:33 ryoon Exp $ Hardwire paths to installed files and Java binary. ---- bin/scalac.orig 2011-08-29 16:44:20.000000000 +0000 +--- bin/scalac.orig 2013-06-06 18:41:45.000000000 +0000 +++ bin/scalac -@@ -48,23 +48,7 @@ case "`uname`" in - esac +@@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then + fi # Finding the root folder for this Scala distribution --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; -- --# 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 -@@ -150,7 +134,7 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a - JAVACMD="$JAVA_HOME/bin/java" - fi +-SCALA_HOME="$(findScalaHome)" ++SCALA_HOME="@SCALA_HOME@" + SEP=":" --"${JAVACMD:=java}" \ -+"${JAVACMD:=@JAVA_HOME@/bin/java}" \ + # Possible additional command line options +@@ -192,7 +192,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[@]}" \ - ${CPSELECT}${TOOL_CLASSPATH} \ + $(classpathArgs) \ |