Update to Scala 2.8.0

Changes in Version 2.8.0 (14-Jul-2010)

Scala 2.8.0 is a significantly innovative release, which
contains a large amount of fixes and introduces many new
features:

  * Redesigned collection library
  * New array implementation, manifests for polymorphic arrays
  * Type specialization
  * Named and default arguments
  * Package objects
  * Beefed up Scala Swing libraries, better documentation
  * Revamped REPL
  * Implicits changes
  * Improved equality
  * Packrat parser combinators
  * Improved XML library
  * Type constructor inference
  * Improved Annotations
  * Enhanced actors
  * Support for continuations

Internal improvements

  * New presentation compiler
  * New build manager
  * Speed improvements

Additional tools

  * Scaladoc 2
  * Sbaz 2
  * Scalap
  * Scala IDE for Eclipse

9 files changed, 196 insertions, 249 deletions

diff --git a/lang/scala/Makefile b/lang/scala/Makefile
index 1a0e401df48..fd10b73028f 100644
--- a/lang/scala/Makefile
+++ b/lang/scala/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/02/03 13:01:04 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/08/12 12:31:46 asau Exp $
 
-DISTNAME=	scala-2.7.7
+DISTNAME=	scala-2.8.0
 CATEGORIES=	lang
 MASTER_SITES=	http://www.scala-lang.org/downloads/distrib/files/
 EXTRACT_SUFX=	.tgz
diff --git a/lang/scala/PLIST b/lang/scala/PLIST
index 50b532b3b2a..d4813fc7cb6 100644
--- a/lang/scala/PLIST
+++ b/lang/scala/PLIST
@@ -1,108 +1,114 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/08/12 12:31:46 asau Exp $
 bin/fsc
 bin/sbaz
 bin/sbaz-setup
 bin/scala
 bin/scalac
 bin/scaladoc
+bin/scalap
 man/man1/fsc.1
 man/man1/sbaz.1
 man/man1/scala.1
 man/man1/scalac.1
 man/man1/scaladoc.1
-share/${DISTNAME}/lib/sbaz-tests.jar
-share/${DISTNAME}/lib/sbaz.jar
-share/${DISTNAME}/lib/scala-compiler.jar
-share/${DISTNAME}/lib/scala-dbc.jar
-share/${DISTNAME}/lib/scala-library.jar
-share/${DISTNAME}/lib/scala-swing.jar
-share/${DISTNAME}/meta/available
-share/${DISTNAME}/meta/description
-share/${DISTNAME}/meta/installed
-share/${DISTNAME}/meta/universe
-share/${DISTNAME}/src/sbaz-src.jar
-share/${DISTNAME}/src/scala-compiler-src.jar
-share/${DISTNAME}/src/scala-dbc-src.jar
-share/${DISTNAME}/src/scala-library-src.jar
-share/${DISTNAME}/src/scala-swing-src.jar
-share/${DISTNAME}/doc/sbaz/manual.pdf
-share/${DISTNAME}/doc/sbaz/manual.html
-share/${DISTNAME}/doc/sbaz-setup/README.txt
-share/${DISTNAME}/doc/LICENSE
-share/${DISTNAME}/doc/README
-share/${DISTNAME}/misc/scala-tool-support/xcode/Specifications/Scala.pbfilespec
-share/${DISTNAME}/misc/scala-tool-support/xcode/Specifications/Scala.pblangspec
-share/${DISTNAME}/misc/scala-tool-support/xcode/README
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-lib.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/README
-share/${DISTNAME}/misc/scala-tool-support/emacs/contrib/dot-ctags
-share/${DISTNAME}/misc/scala-tool-support/emacs/contrib/README
-share/${DISTNAME}/misc/scala-tool-support/emacs/FUTURE
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-feature-tags.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/AUTHORS
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-fontlock.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-ui.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-navigation.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/Makefile
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-feature-speedbar.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-auto.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-feature-electric.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-variables.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-constants.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-inf.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-feature.el
-share/${DISTNAME}/misc/scala-tool-support/emacs/scala-mode-indent.el
-share/${DISTNAME}/misc/scala-tool-support/latex/verbfilterScala.java
-share/${DISTNAME}/misc/scala-tool-support/latex/tweaklist.sty
-share/${DISTNAME}/misc/scala-tool-support/latex/scalatex.scm
-share/${DISTNAME}/misc/scala-tool-support/latex/scaladefs.sty
-share/${DISTNAME}/misc/scala-tool-support/latex/scaladoc.sty
-share/${DISTNAME}/misc/scala-tool-support/a2ps/scala.ssh
-share/${DISTNAME}/misc/scala-tool-support/a2ps/README
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/InfoPlist.strings
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/Localizable.strings
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/Scripts/Rot13.scpt
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/AutocompleteAdditions.txt
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/SyntaxDefinition.xml
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/mytemplate.scala
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/RegexSymbols.xml
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/ModeSettings.xml
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Info.plist
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/artwork/readme.txt
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/artwork/SymbolM.psd
-share/${DISTNAME}/misc/scala-tool-support/subethaedit/Documentation.webloc
-share/${DISTNAME}/misc/scala-tool-support/scite/README
-share/${DISTNAME}/misc/scala-tool-support/scite/scala.properties
-share/${DISTNAME}/misc/scala-tool-support/enscript/scala.st
-share/${DISTNAME}/misc/scala-tool-support/enscript/README
-share/${DISTNAME}/misc/scala-tool-support/intellij/scala.xml
-share/${DISTNAME}/misc/scala-tool-support/intellij/README
-share/${DISTNAME}/misc/scala-tool-support/notepad-plus/userDefineLang.xml
-share/${DISTNAME}/misc/scala-tool-support/notepad-plus/README
-share/${DISTNAME}/misc/scala-tool-support/vim/ftdetect/scala.vim
-share/${DISTNAME}/misc/scala-tool-support/vim/plugin/31-create-scala.vim
-share/${DISTNAME}/misc/scala-tool-support/vim/syntax/scala.vim
-share/${DISTNAME}/misc/scala-tool-support/vim/indent/scala.vim
-share/${DISTNAME}/misc/scala-tool-support/vim/README
-share/${DISTNAME}/misc/scala-tool-support/gedit/scala.lang
-share/${DISTNAME}/misc/scala-tool-support/gedit/README
-share/${DISTNAME}/misc/scala-tool-support/jedit/modes/scala.xml
-share/${DISTNAME}/misc/scala-tool-support/jedit/modes/README
-share/${DISTNAME}/misc/scala-tool-support/jedit/console/commando/scala.xml
-share/${DISTNAME}/misc/scala-tool-support/jedit/console/commando/scalac.xml
-share/${DISTNAME}/misc/scala-tool-support/jedit/console/README
-share/${DISTNAME}/misc/scala-tool-support/geshi/scala-alt.php
-share/${DISTNAME}/misc/scala-tool-support/geshi/scala.php
-share/${DISTNAME}/misc/scala-tool-support/bluefish/highlighting
-share/${DISTNAME}/misc/scala-tool-support/bluefish/README
-share/${DISTNAME}/misc/scala-tool-support/textwrangler/README
-share/${DISTNAME}/misc/scala-tool-support/textwrangler/Scala_Configuration.plist
-share/${DISTNAME}/misc/scala-tool-support/textmate/Bundles/Scala.tmbundle.zip
-share/${DISTNAME}/misc/scala-tool-support/kate/scala.xml
-share/${DISTNAME}/misc/scala-tool-support/kate/README
-share/${DISTNAME}/misc/sbaz/descriptors/scala-dev
-share/${DISTNAME}/misc/sbaz/descriptors/README
-share/${DISTNAME}/misc/sbaz/descriptors/lamp-rc
-share/${DISTNAME}/misc/sbaz/scala-library.jar
-share/${DISTNAME}/misc/sbaz-testall/tests/sbaz
+man/man1/scalap.1
+share/${PKGNAME}/doc/LICENSE
+share/${PKGNAME}/doc/README
+share/${PKGNAME}/doc/sbaz-setup/README.txt
+share/${PKGNAME}/doc/sbaz/manual.html
+share/${PKGNAME}/doc/sbaz/manual.pdf
+share/${PKGNAME}/lib/jline.jar
+share/${PKGNAME}/lib/scala-compiler.jar
+share/${PKGNAME}/lib/scala-dbc.jar
+share/${PKGNAME}/lib/scala-library.jar
+share/${PKGNAME}/lib/scala-swing.jar
+share/${PKGNAME}/lib/scalap.jar
+share/${PKGNAME}/meta/available
+share/${PKGNAME}/meta/description
+share/${PKGNAME}/meta/installed
+share/${PKGNAME}/meta/universe
+share/${PKGNAME}/misc/sbaz-testall/tests/sbaz
+share/${PKGNAME}/misc/sbaz/config/sbaz.properties.example
+share/${PKGNAME}/misc/sbaz/descriptors/README
+share/${PKGNAME}/misc/sbaz/descriptors/lamp-rc
+share/${PKGNAME}/misc/sbaz/descriptors/scala-dev
+share/${PKGNAME}/misc/sbaz/sbaz-tests.jar
+share/${PKGNAME}/misc/sbaz/scala-bazaars.jar
+share/${PKGNAME}/misc/scala-devel/plugins/continuations.jar
+share/${PKGNAME}/misc/scala-tool-support/a2ps/README
+share/${PKGNAME}/misc/scala-tool-support/a2ps/scala.ssh
+share/${PKGNAME}/misc/scala-tool-support/bash-completion/scala_completion.sh
+share/${PKGNAME}/misc/scala-tool-support/bluefish/README
+share/${PKGNAME}/misc/scala-tool-support/bluefish/highlighting
+share/${PKGNAME}/misc/scala-tool-support/emacs/AUTHORS
+share/${PKGNAME}/misc/scala-tool-support/emacs/FUTURE
+share/${PKGNAME}/misc/scala-tool-support/emacs/Makefile
+share/${PKGNAME}/misc/scala-tool-support/emacs/README
+share/${PKGNAME}/misc/scala-tool-support/emacs/contrib/README
+share/${PKGNAME}/misc/scala-tool-support/emacs/contrib/dot-ctags
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-auto.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-constants.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-feature-electric.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-feature-speedbar.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-feature-tags.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-feature.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-fontlock.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-indent.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-inf.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-lib.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-navigation.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-ui.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-variables.el
+share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode.el
+share/${PKGNAME}/misc/scala-tool-support/enscript/README
+share/${PKGNAME}/misc/scala-tool-support/enscript/scala.st
+share/${PKGNAME}/misc/scala-tool-support/gedit/README
+share/${PKGNAME}/misc/scala-tool-support/gedit/scala.lang
+share/${PKGNAME}/misc/scala-tool-support/geshi/scala-alt.php
+share/${PKGNAME}/misc/scala-tool-support/geshi/scala.php
+share/${PKGNAME}/misc/scala-tool-support/intellij/README
+share/${PKGNAME}/misc/scala-tool-support/intellij/scala.xml
+share/${PKGNAME}/misc/scala-tool-support/jedit/console/README
+share/${PKGNAME}/misc/scala-tool-support/jedit/console/commando/scala.xml
+share/${PKGNAME}/misc/scala-tool-support/jedit/console/commando/scalac.xml
+share/${PKGNAME}/misc/scala-tool-support/jedit/modes/README
+share/${PKGNAME}/misc/scala-tool-support/jedit/modes/scala.xml
+share/${PKGNAME}/misc/scala-tool-support/kate/README
+share/${PKGNAME}/misc/scala-tool-support/kate/scala.xml
+share/${PKGNAME}/misc/scala-tool-support/latex/scaladefs.sty
+share/${PKGNAME}/misc/scala-tool-support/latex/scaladoc.sty
+share/${PKGNAME}/misc/scala-tool-support/latex/scalatex.scm
+share/${PKGNAME}/misc/scala-tool-support/latex/tweaklist.sty
+share/${PKGNAME}/misc/scala-tool-support/latex/verbfilterScala.java
+share/${PKGNAME}/misc/scala-tool-support/notepad-plus/README
+share/${PKGNAME}/misc/scala-tool-support/notepad-plus/userDefineLang.xml
+share/${PKGNAME}/misc/scala-tool-support/scite/README
+share/${PKGNAME}/misc/scala-tool-support/scite/scala.properties
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Documentation.webloc
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Info.plist
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/AutocompleteAdditions.txt
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/InfoPlist.strings
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/Localizable.strings
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/ModeSettings.xml
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/RegexSymbols.xml
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/Scripts/Rot13.scpt
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/SyntaxDefinition.xml
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/mytemplate.scala
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/artwork/SymbolM.psd
+share/${PKGNAME}/misc/scala-tool-support/subethaedit/artwork/readme.txt
+share/${PKGNAME}/misc/scala-tool-support/textmate/Bundles/Scala.tmbundle.zip
+share/${PKGNAME}/misc/scala-tool-support/textwrangler/README
+share/${PKGNAME}/misc/scala-tool-support/textwrangler/Scala_Configuration.plist
+share/${PKGNAME}/misc/scala-tool-support/vim/README
+share/${PKGNAME}/misc/scala-tool-support/vim/ftdetect/scala.vim
+share/${PKGNAME}/misc/scala-tool-support/vim/indent/scala.vim
+share/${PKGNAME}/misc/scala-tool-support/vim/plugin/31-create-scala.vim
+share/${PKGNAME}/misc/scala-tool-support/vim/syntax/scala.vim
+share/${PKGNAME}/misc/scala-tool-support/xcode/README
+share/${PKGNAME}/misc/scala-tool-support/xcode/Specifications/Scala.pbfilespec
+share/${PKGNAME}/misc/scala-tool-support/xcode/Specifications/Scala.pblangspec
+share/${PKGNAME}/src/sbaz-src.jar
+share/${PKGNAME}/src/scala-compiler-src.jar
+share/${PKGNAME}/src/scala-dbc-src.jar
+share/${PKGNAME}/src/scala-library-src.jar
+share/${PKGNAME}/src/scala-swing-src.jar
diff --git a/lang/scala/distinfo b/lang/scala/distinfo
index 85914dbaf5a..87b73148523 100644
--- a/lang/scala/distinfo
+++ b/lang/scala/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $
+$NetBSD: distinfo,v 1.2 2010/08/12 12:31:46 asau Exp $
 
-SHA1 (scala-2.7.7.final.tgz) = 2197475c8d137cb9f05614807e7d4f18ad8db7e3
-RMD160 (scala-2.7.7.final.tgz) = ea590b9e25fd0ede59cc6ccd5e9d3bba99885b0f
-Size (scala-2.7.7.final.tgz) = 15619192 bytes
-SHA1 (patch-aa) = ba7c9f1b154ed045ed29b6aa0ad85163db035034
-SHA1 (patch-ab) = 21cd2709f0f6669804ecfbac328df9d99572319c
-SHA1 (patch-ac) = 88ffdf598abc3a8c25f59d425cf149e6747829d2
-SHA1 (patch-ad) = de64edd3e5b9bd0f3e8ea8b6e9316a8344984907
-SHA1 (patch-ae) = 9030e246d502a9728ee20b4a2896559da3895ff3
-SHA1 (patch-af) = d5523354654cefd1e85233b2aa142b1d14fe5dc1
+SHA1 (scala-2.8.0.final.tgz) = 9f06c56718b43a14e8dff412f532e3bfe36f3128
+RMD160 (scala-2.8.0.final.tgz) = 647774d2eea5625796ecf0893d55e2081940afb7
+Size (scala-2.8.0.final.tgz) = 19406847 bytes
+SHA1 (patch-aa) = bfacfb3d88cc8358859970af80d04a22c7e8f5c8
+SHA1 (patch-ab) = 56a0f61f5123c34c4ed5cb3b5c1390189fc0c3c1
+SHA1 (patch-ac) = 2555f20cc67eefdd0b63fb08f9fd7c46ad21763a
+SHA1 (patch-ad) = ba9f67babef90bb5b518a2b04a39a7186d5f8583
+SHA1 (patch-ae) = 358abd34055d208ce3df5a81408ff9239577707f
+SHA1 (patch-af) = c9be38ccf7fe34e0637f3d90a289f3df4f621982
diff --git a/lang/scala/patches/patch-aa b/lang/scala/patches/patch-aa
index b8390214068..44c9e59a9aa 100644
--- a/lang/scala/patches/patch-aa
+++ b/lang/scala/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $
+$NetBSD: patch-aa,v 1.2 2010/08/12 12:31:47 asau Exp $
 
---- bin/fsc.orig	2009-10-28 06:19:04.000000000 -0700
-+++ bin/fsc
-@@ -14,20 +14,21 @@ case "`uname`" in
+Hardwire paths to installed files and Java binary.
+
+--- bin/fsc.orig	2010-07-13 19:48:47.000000000 +0400
++++ bin/fsc	2010-08-12 16:20:49.000000000 +0400
+@@ -14,23 +14,7 @@
  esac
  
  # Finding the root folder for this Scala distribution
@@ -18,29 +20,18 @@ $NetBSD: patch-aa,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.CompileClient  "$@"
+-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS"  scala.tools.nsc.CompileClient  "$@"
 +exec "${JAVACMD:=@JAVA_HOME@/bin/java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  scala.tools.nsc.CompileClient  "$@"
diff --git a/lang/scala/patches/patch-ab b/lang/scala/patches/patch-ab
index f7f120ee81a..7bf42cc8415 100644
--- a/lang/scala/patches/patch-ab
+++ b/lang/scala/patches/patch-ab
@@ -1,14 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $
+$NetBSD: patch-ab,v 1.2 2010/08/12 12:31:47 asau Exp $
 
---- bin/sbaz-setup.orig	2009-10-28 06:19:05.000000000 -0700
-+++ bin/sbaz-setup
+Hardwire paths to installed files and Java binary.
+Fix shell.
+
+--- bin/sbaz-setup.orig	2010-07-13 19:48:47.000000000 +0400
++++ bin/sbaz-setup	2010-08-12 16:21:31.000000000 +0400
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  
  set -e
  
-@@ -10,23 +10,24 @@ case "`uname`" in
+@@ -10,23 +10,7 @@
  esac
  
  
@@ -29,23 +32,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $
 -    SCALA_HOME=`dirname "$SOURCE"`/..;
 -    SCALA_HOME=`cd "$SCALA_HOME"; pwd`;
 -fi
-+#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
 +SCALA_HOME=@SCALA_HOME@
  
  SBAZ="$SCALA_HOME/bin/sbaz"
diff --git a/lang/scala/patches/patch-ac b/lang/scala/patches/patch-ac
index 37f29717cb6..668b72a7ddc 100644
--- a/lang/scala/patches/patch-ac
+++ b/lang/scala/patches/patch-ac
@@ -1,8 +1,10 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $
+$NetBSD: patch-ac,v 1.2 2010/08/12 12:31:47 asau Exp $
 
---- bin/sbaz.orig	2009-10-28 06:19:03.000000000 -0700
-+++ bin/sbaz
-@@ -14,20 +14,21 @@ case "`uname`" in
+Hardwire paths to installed files and Java binary.
+
+--- bin/sbaz.orig	2010-07-13 19:48:47.000000000 +0400
++++ bin/sbaz	2010-08-12 16:22:14.000000000 +0400
+@@ -14,23 +14,7 @@
  esac
  
  # Finding the root folder for this Scala distribution
@@ -18,29 +20,18 @@ $NetBSD: patch-ac,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"`
-     SCALA_HOME=`cygpath --unix "$SCALA_HOME"`
-@@ -58,4 +59,4 @@ fi
- # Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris
- [ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx256M -Xms16M"
+@@ -83,4 +67,4 @@
+     JAVACMD="$JAVA_HOME/bin/java"
+ fi
  
--${JAVACMD:=java} $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  sbaz.clui.CommandLine  "$@"
-+${JAVACMD:=@JAVA_HOME@/bin/java} $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  sbaz.clui.CommandLine  "$@"
+-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  "$@"
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  "$@"
diff --git a/lang/scala/patches/patch-ae b/lang/scala/patches/patch-ae
index 295a72c3d29..4ccd4f0d526 100644
--- a/lang/scala/patches/patch-ae
+++ b/lang/scala/patches/patch-ae
@@ -1,8 +1,10 @@
-$NetBSD: patch-ae,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $
+$NetBSD: patch-ae,v 1.2 2010/08/12 12:31:47 asau Exp $
 
---- bin/scalac.orig	2009-10-28 06:19:04.000000000 -0700
-+++ bin/scalac
-@@ -14,20 +14,21 @@ case "`uname`" in
+Hardwire paths to installed files and Java binary.
+
+--- bin/scalac.orig	2010-07-13 19:48:47.000000000 +0400
++++ bin/scalac	2010-08-12 16:24:05.000000000 +0400
+@@ -14,23 +14,7 @@
  esac
  
  # Finding the root folder for this Scala distribution
@@ -18,29 +20,18 @@ $NetBSD: patch-ae,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.Main  "$@"
+-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS"  scala.tools.nsc.Main  "$@"
 +exec "${JAVACMD:=@JAVA_HOME@/bin/java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  scala.tools.nsc.Main  "$@"
diff --git a/lang/scala/patches/patch-af b/lang/scala/patches/patch-af
index 3ba1bbf4424..fefaf159b27 100644
--- a/lang/scala/patches/patch-af
+++ b/lang/scala/patches/patch-af
@@ -1,8 +1,10 @@
-$NetBSD: patch-af,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $
+$NetBSD: patch-af,v 1.2 2010/08/12 12:31:47 asau Exp $
 
---- bin/scaladoc.orig	2009-10-28 06:19:03.000000000 -0700
-+++ bin/scaladoc
-@@ -14,20 +14,21 @@ case "`uname`" in
+Hardwire paths to installed files and Java binary.
+
+--- bin/scaladoc.orig	2010-07-13 19:48:46.000000000 +0400
++++ bin/scaladoc	2010-08-12 16:25:02.000000000 +0400
+@@ -14,23 +14,7 @@
  esac
  
  # Finding the root folder for this Scala distribution
@@ -18,29 +20,18 @@ $NetBSD: patch-af,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.ScalaDoc  "$@"
+-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS"  scala.tools.nsc.ScalaDoc  "$@"
 +exec "${JAVACMD:=@JAVA_HOME@/bin/java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  scala.tools.nsc.ScalaDoc  "$@"