Update to Scala 2.9.2.

Scala 2.9.2 addresses several bugs, and introduces additional improvements. Here's a list of the issues that have been fixed since 2.9.1-1:

c9e254ec27 	Backport fix for SI-4545, SI-5633.
11cb359863 	Document regex replacement strings behavior.
125b5037c8 	Fix for a bug in CharArrayReader which made tri...
a26dd939b8 	Revert attempt to limit private types in lubs.
3cfbfa3d0e 	Fixes SI-5380: non-local return of try expression (cherry picked from commit 02e260a8e67e2b2b6f876aafe76cd61248a89374)
1864e6d1c1 	Add test case for SI-4835 (https://issues.scala-lang.org/browse/SI-4835)
841f074e2b 	Fixed SI-4835 (https://issues.scala-lang.org/browse/SI-4835).
da794bb4ee 	Fixes NPE using iterator with an XML attribute ...
b783e17319 	Fix various InnerClasses bugs.
28be69e263 	Close file descriptor leak in sys.process.
2e66a13e26 	fixes SI-5506. better cps type propagation for polymorphic and multi-argument list methods.
9c3cbde0fd 	Fix for error printing regression.
e1810d1e88 	Migration message and version cleanup
b57f68f34e 	Improve description of flatten, flatMap
0fcc5ce9c5 	Explain Function1 vs PartialFunction
634382969a 	Fixes SI-4507.
d1870c2162 	Fixes to javascript in Scaladoc, contributed by...
f4dec8a8af 	Scaladoc now hides members with @bridge annotat...
4f6cd102de 	Improves the usability of Scaladoc when images ...
1fb3760f96 	Minor changes to the Scaladoc stylesheets, as s...
be067ac8de 	Scaladoc shouldn't drop type arguments to alias...
e54aa8c7bf 	Fixes SI-4641 again.
2701d7fa47 	Backported commit 7a99c03da1d31ac5950eecb30f422f43c5e3d04e from master

Scala 2.9.1-1 fixes a critical Java-Scala interoperability issue that arose in 2.9.1. Here is the change list:

Don't mark mixed-in methods as bridges.
Add SYNTHETIC flag for BRIDGE methods.
Update build for publishing to sonatype OSSRH

5 files changed, 23 insertions, 177 deletions

diff --git a/lang/scala/Makefile b/lang/scala/Makefile
index 6c10319ea4e..eb7b23f45bc 100644
--- a/lang/scala/Makefile
+++ b/lang/scala/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2011/09/30 07:56:13 yyamano Exp $
+# $NetBSD: Makefile,v 1.6 2012/05/01 22:22:01 yyamano Exp $
 
-DISTNAME=	scala-2.9.1
+DISTNAME=	scala-2.9.2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.scala-lang.org/downloads/distrib/files/
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}.final${EXTRACT_SUFX}
 
 MAINTAINER=	yyamano@NetBSD.org
 HOMEPAGE=	http://www.scala-lang.org/
@@ -12,21 +11,18 @@ COMMENT=	Scala is a multi-paradigm programming language
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/${DISTNAME}.final
-
 USE_JAVA=	run
 USE_JAVA2=	1.5
 NO_BUILD=	yes
 
 USE_TOOLS+=	bash:run
-REPLACE_BASH+=	bin/fsc bin/sbaz-setup bin/scala bin/scalac \
+REPLACE_BASH+=	bin/fsc bin/scala bin/scalac \
 		bin/scaladoc bin/scalap
 
 SCALA_HOME=	${PREFIX}/share/${DISTNAME}
 
 SUBST_CLASSES+=		scala
-SUBST_FILES.scala=	bin/fsc bin/sbaz bin/sbaz-setup
-SUBST_FILES.scala+=	bin/scala bin/scalac bin/scaladoc bin/scalap
+SUBST_FILES.scala=	bin/fsc bin/scala bin/scalac bin/scaladoc bin/scalap
 SUBST_STAGE.scala=	pre-configure
 SUBST_SED.scala=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.scala+=	-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
@@ -43,7 +39,7 @@ do-install:
 	@${RM}  ${WRKSRC}/bin/*.orig
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	@cd ${WRKSRC} && ${TAR} cf - doc lib meta misc src | ${TAR} xf - -C ${DESTDIR}${SCALA_HOME}
+	@cd ${WRKSRC} && ${TAR} cf - doc lib misc src | ${TAR} xf - -C ${DESTDIR}${SCALA_HOME}
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/scala/PLIST b/lang/scala/PLIST
index d4813fc7cb6..00c676012d6 100644
--- a/lang/scala/PLIST
+++ b/lang/scala/PLIST
@@ -1,114 +1,37 @@
-@comment $NetBSD: PLIST,v 1.2 2010/08/12 12:31:46 asau Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/05/01 22:22:01 yyamano 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
 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}/doc/tools/css/style.css
+share/${PKGNAME}/doc/tools/fsc.html
+share/${PKGNAME}/doc/tools/images/external.gif
+share/${PKGNAME}/doc/tools/images/scala_logo.png
+share/${PKGNAME}/doc/tools/index.html
+share/${PKGNAME}/doc/tools/scala.html
+share/${PKGNAME}/doc/tools/scalac.html
+share/${PKGNAME}/doc/tools/scaladoc.html
+share/${PKGNAME}/doc/tools/scalap.html
 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-partest.jar
 share/${PKGNAME}/lib/scala-swing.jar
+share/${PKGNAME}/lib/scalacheck.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-partest-src.jar
 share/${PKGNAME}/src/scala-swing-src.jar
+share/${PKGNAME}/src/scalap-src.jar
diff --git a/lang/scala/distinfo b/lang/scala/distinfo
index c755b694781..f3804de4a62 100644
--- a/lang/scala/distinfo
+++ b/lang/scala/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.4 2011/09/30 07:56:13 yyamano Exp $
+$NetBSD: distinfo,v 1.5 2012/05/01 22:22:01 yyamano Exp $
 
-SHA1 (scala-2.9.1.final.tgz) = 2e75559e6b9215cbee2bc71e53495bdefdb48b69
-RMD160 (scala-2.9.1.final.tgz) = 5056577f06fdb6a19a217a20f72d3dd9aa54ddb6
-Size (scala-2.9.1.final.tgz) = 24993458 bytes
+SHA1 (scala-2.9.2.tgz) = 806fc1d91bda82d6a584172d7742531386ae68fb
+RMD160 (scala-2.9.2.tgz) = bf720870939d7b36ecf4212f8389835ab2817533
+Size (scala-2.9.2.tgz) = 24408278 bytes
 SHA1 (patch-bin_fsc) = 2a207a1aed392d27b9afa0bb801952428be98e24
-SHA1 (patch-bin_sbaz) = b262a0890078e53e5cb7ead283b31ec171ff8e28
-SHA1 (patch-bin_sbaz-setup) = 88a4e3d61c02d04010773c9fae6512a80f116f3d
 SHA1 (patch-bin_scala) = da6d1a8d4b1a2ccc2e8a031816d37e5b8c31987c
 SHA1 (patch-bin_scalac) = 9f94052187549a5cd7d37c21cfae811fcbb73d9e
 SHA1 (patch-bin_scaladoc) = e95eb071692f5f938433fd864cf84c89ede3bc38
diff --git a/lang/scala/patches/patch-bin_sbaz b/lang/scala/patches/patch-bin_sbaz
deleted file mode 100644
index 3e658e039a9..00000000000
--- a/lang/scala/patches/patch-bin_sbaz
+++ /dev/null
@@ -1,37 +0,0 @@
-$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  "$@"
diff --git a/lang/scala/patches/patch-bin_sbaz-setup b/lang/scala/patches/patch-bin_sbaz-setup
deleted file mode 100644
index 8d947a6c516..00000000000
--- a/lang/scala/patches/patch-bin_sbaz-setup
+++ /dev/null
@@ -1,34 +0,0 @@
-$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