Apply patches provided by ryoon@ with some modifications to upgrade to
Scala 2.9.1 from 2.8.1. PR pkg/45379

Scala 2.9.0 final

The Scala 2.9.0 codebase includes several additions, notably the new
Parallel Collections, but it also introduces improvements on many
existing features, and contains many bug fixes:

  * Parallel Collections
  * The App Trait
  * The DelayedInit Trait
  * Repl Improvements
  * Scala Runner
  * Java Interop
  * Generalized try-catch-finally
  * New packages: scala.sys and scala.sys.process, which are imported
    from sbt.Process.
  * New methods in collections: collectFirst, maxBy, minBy, span, inits,
    tails, permutations, combinations, subsets
  * AnyRef specialization:

See http://www.scala-lang.org/node/9483 for more details.

Scala 2.9.1 final

The 2.9.1 release of Scala includes many bug fixes and improvements,
in particular to the interpreter: most of the interpreter changes
available in the development mainline have been ported to the 2.9.x
release branch.

See http://www.scala-lang.org/node/10780 for more details.

Note: the interpreter option '-i' may behave incorrectly in this
version. In case you require it, please just add the option
'-Yrepl-sync' to your command line as well.


(yyamano)

$NetBSD: patch-bin_fsc,v 1.1 2011/09/30 07:56:14 yyamano Exp $

Hardwire paths to installed files and Java binary.

--- bin/fsc.orig	2011-08-29 16:44:20.000000000 +0000
+++ bin/fsc
@@ -48,23 +48,7 @@ case "`uname`" in
 esac
 
 # 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
 
-"${JAVACMD:=java}" \
+"${JAVACMD:=@JAVA_HOME@/bin/java}" \
   $JAVA_OPTS \
   "${java_args[@]}" \
   ${CPSELECT}${TOOL_CLASSPATH} \

$NetBSD: patch-bin_sbaz,v 1.1 2011/09/30 07:56:14 yyamano Exp $

Hardwire paths to installed files and Java binary.

--- bin/sbaz.orig	2011-08-29 16:44:19.000000000 +0000
+++ bin/sbaz
@@ -14,23 +14,7 @@ case "`uname`" in
 esac
 
 # 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
@@ -83,4 +67,4 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a
     JAVACMD="$JAVA_HOME/bin/java"
 fi
 
-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  sbaz.clui.CommandLine  "$@"
+exec "${JAVACMD:=@JAVA_HOME@/bin/java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  sbaz.clui.CommandLine  "$@"

$NetBSD: patch-bin_sbaz-setup,v 1.1 2011/09/30 07:56:14 yyamano Exp $

Hardwire paths to installed files and Java binary.

--- bin/sbaz-setup.orig	2011-08-29 16:44:20.000000000 +0000
+++ bin/sbaz-setup
@@ -10,25 +10,8 @@ case "`uname`" in
 esac
 
 
-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;
-if [ "$SCALA_HOME" = "" ]
-then
-    SCALA_HOME=`dirname "$SOURCE"`/..;
-    SCALA_HOME=`cd "$SCALA_HOME"; pwd`;
-fi
-
-SBAZ="$SCALA_HOME/bin/sbaz"
+SCALA_HOME=@SCALA_HOME@
+SBAZ="@PREFIX@/bin/sbaz"
 
 if [ "$1" = "" ]
 then

$NetBSD: patch-bin_scala,v 1.1 2011/09/30 07:56:14 yyamano Exp $

Hardwire paths to installed files and Java binary.

--- bin/scala.orig	2011-08-29 16:44:19.000000000 +0000
+++ bin/scala
@@ -48,23 +48,7 @@ case "`uname`" in
 esac
 
 # 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
 
-"${JAVACMD:=java}" \
+"${JAVACMD:=@JAVA_HOME@/bin/java}" \
   $JAVA_OPTS \
   "${java_args[@]}" \
   ${CPSELECT}${TOOL_CLASSPATH} \

$NetBSD: patch-bin_scalac,v 1.1 2011/09/30 07:56:14 yyamano Exp $

Hardwire paths to installed files and Java binary.

--- bin/scalac.orig	2011-08-29 16:44:20.000000000 +0000
+++ bin/scalac
@@ -48,23 +48,7 @@ case "`uname`" in
 esac
 
 # 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
 
-"${JAVACMD:=java}" \
+"${JAVACMD:=@JAVA_HOME@/bin/java}" \
   $JAVA_OPTS \
   "${java_args[@]}" \
   ${CPSELECT}${TOOL_CLASSPATH} \

$NetBSD: patch-bin_scaladoc,v 1.1 2011/09/30 07:56:14 yyamano Exp $

Hardwire paths to installed files and Java binary.

--- bin/scaladoc.orig	2011-08-29 16:44:19.000000000 +0000
+++ bin/scaladoc
@@ -48,23 +48,7 @@ case "`uname`" in
 esac
 
 # 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
 
-"${JAVACMD:=java}" \
+"${JAVACMD:=@JAVA_HOME@/bin/java}" \
   $JAVA_OPTS \
   "${java_args[@]}" \
   ${CPSELECT}${TOOL_CLASSPATH} \

$NetBSD: patch-bin_scalap,v 1.1 2011/09/30 07:56:14 yyamano Exp $

Hardwire paths to installed files and Java binary.

--- bin/scalap.orig	2011-08-29 16:44:19.000000000 +0000
+++ bin/scalap
@@ -48,23 +48,7 @@ case "`uname`" in
 esac
 
 # 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
 
-"${JAVACMD:=java}" \
+"${JAVACMD:=@JAVA_HOME@/bin/java}" \
   $JAVA_OPTS \
   "${java_args[@]}" \
   ${CPSELECT}${TOOL_CLASSPATH} \