Tue May 1 22:22:02 2012 UTC ()
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


(yyamano)
diff -r1.5 -r1.6 pkgsrc/lang/scala/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/scala/PLIST
diff -r1.4 -r1.5 pkgsrc/lang/scala/distinfo
diff -r1.1 -r0 pkgsrc/lang/scala/patches/patch-bin_sbaz
diff -r1.1 -r0 pkgsrc/lang/scala/patches/patch-bin_sbaz-setup
cvs diff -r1.5 -r1.6 pkgsrc/lang/scala/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/scala/Makefile 2011/09/30 07:56:13 1.5
+++ pkgsrc/lang/scala/Makefile 2012/05/01 22:22:01 1.6
@@ -1,49 +1,45 @@ @@ -1,49 +1,45 @@
1# $NetBSD: Makefile,v 1.5 2011/09/30 07:56:13 yyamano Exp $ 1# $NetBSD: Makefile,v 1.6 2012/05/01 22:22:01 yyamano Exp $
2 2
3DISTNAME= scala-2.9.1 3DISTNAME= scala-2.9.2
4CATEGORIES= lang 4CATEGORIES= lang
5MASTER_SITES= http://www.scala-lang.org/downloads/distrib/files/ 5MASTER_SITES= http://www.scala-lang.org/downloads/distrib/files/
6EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
7DISTFILES= ${DISTNAME}.final${EXTRACT_SUFX} 
8 7
9MAINTAINER= yyamano@NetBSD.org 8MAINTAINER= yyamano@NetBSD.org
10HOMEPAGE= http://www.scala-lang.org/ 9HOMEPAGE= http://www.scala-lang.org/
11COMMENT= Scala is a multi-paradigm programming language 10COMMENT= Scala is a multi-paradigm programming language
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15WRKSRC= ${WRKDIR}/${DISTNAME}.final 
16 
17USE_JAVA= run 14USE_JAVA= run
18USE_JAVA2= 1.5 15USE_JAVA2= 1.5
19NO_BUILD= yes 16NO_BUILD= yes
20 17
21USE_TOOLS+= bash:run 18USE_TOOLS+= bash:run
22REPLACE_BASH+= bin/fsc bin/sbaz-setup bin/scala bin/scalac \ 19REPLACE_BASH+= bin/fsc bin/scala bin/scalac \
23 bin/scaladoc bin/scalap 20 bin/scaladoc bin/scalap
24 21
25SCALA_HOME= ${PREFIX}/share/${DISTNAME} 22SCALA_HOME= ${PREFIX}/share/${DISTNAME}
26 23
27SUBST_CLASSES+= scala 24SUBST_CLASSES+= scala
28SUBST_FILES.scala= bin/fsc bin/sbaz bin/sbaz-setup 25SUBST_FILES.scala= bin/fsc bin/scala bin/scalac bin/scaladoc bin/scalap
29SUBST_FILES.scala+= bin/scala bin/scalac bin/scaladoc bin/scalap 
30SUBST_STAGE.scala= pre-configure 26SUBST_STAGE.scala= pre-configure
31SUBST_SED.scala= -e 's,@PREFIX@,${PREFIX},g' 27SUBST_SED.scala= -e 's,@PREFIX@,${PREFIX},g'
32SUBST_SED.scala+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' 28SUBST_SED.scala+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
33SUBST_SED.scala+= -e 's,@SCALA_HOME@,${SCALA_HOME},g' 29SUBST_SED.scala+= -e 's,@SCALA_HOME@,${SCALA_HOME},g'
34 30
35PLIST_SUBST+= DISTNAME=${DISTNAME} 31PLIST_SUBST+= DISTNAME=${DISTNAME}
36 32
37INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/${DISTNAME} 33INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/${DISTNAME}
38 34
39post-extract: 35post-extract:
40 @${RM} ${WRKSRC}/bin/*.bat 36 @${RM} ${WRKSRC}/bin/*.bat
41 37
42do-install: 38do-install:
43 @${RM} ${WRKSRC}/bin/*.orig 39 @${RM} ${WRKSRC}/bin/*.orig
44 ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/bin 40 ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/bin
45 ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 41 ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
46 @cd ${WRKSRC} && ${TAR} cf - doc lib meta misc src | ${TAR} xf - -C ${DESTDIR}${SCALA_HOME} 42 @cd ${WRKSRC} && ${TAR} cf - doc lib misc src | ${TAR} xf - -C ${DESTDIR}${SCALA_HOME}
47 43
48.include "../../mk/java-vm.mk" 44.include "../../mk/java-vm.mk"
49.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/lang/scala/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/scala/PLIST 2010/08/12 12:31:46 1.2
+++ pkgsrc/lang/scala/PLIST 2012/05/01 22:22:01 1.3
@@ -1,114 +1,37 @@ @@ -1,114 +1,37 @@
1@comment $NetBSD: PLIST,v 1.2 2010/08/12 12:31:46 asau Exp $ 1@comment $NetBSD: PLIST,v 1.3 2012/05/01 22:22:01 yyamano Exp $
2bin/fsc 2bin/fsc
3bin/sbaz 
4bin/sbaz-setup 
5bin/scala 3bin/scala
6bin/scalac 4bin/scalac
7bin/scaladoc 5bin/scaladoc
8bin/scalap 6bin/scalap
9man/man1/fsc.1 7man/man1/fsc.1
10man/man1/sbaz.1 
11man/man1/scala.1 8man/man1/scala.1
12man/man1/scalac.1 9man/man1/scalac.1
13man/man1/scaladoc.1 10man/man1/scaladoc.1
14man/man1/scalap.1 11man/man1/scalap.1
15share/${PKGNAME}/doc/LICENSE 12share/${PKGNAME}/doc/LICENSE
16share/${PKGNAME}/doc/README 13share/${PKGNAME}/doc/README
17share/${PKGNAME}/doc/sbaz-setup/README.txt 14share/${PKGNAME}/doc/tools/css/style.css
18share/${PKGNAME}/doc/sbaz/manual.html 15share/${PKGNAME}/doc/tools/fsc.html
19share/${PKGNAME}/doc/sbaz/manual.pdf 16share/${PKGNAME}/doc/tools/images/external.gif
 17share/${PKGNAME}/doc/tools/images/scala_logo.png
 18share/${PKGNAME}/doc/tools/index.html
 19share/${PKGNAME}/doc/tools/scala.html
 20share/${PKGNAME}/doc/tools/scalac.html
 21share/${PKGNAME}/doc/tools/scaladoc.html
 22share/${PKGNAME}/doc/tools/scalap.html
20share/${PKGNAME}/lib/jline.jar 23share/${PKGNAME}/lib/jline.jar
21share/${PKGNAME}/lib/scala-compiler.jar 24share/${PKGNAME}/lib/scala-compiler.jar
22share/${PKGNAME}/lib/scala-dbc.jar 25share/${PKGNAME}/lib/scala-dbc.jar
23share/${PKGNAME}/lib/scala-library.jar 26share/${PKGNAME}/lib/scala-library.jar
 27share/${PKGNAME}/lib/scala-partest.jar
24share/${PKGNAME}/lib/scala-swing.jar 28share/${PKGNAME}/lib/scala-swing.jar
 29share/${PKGNAME}/lib/scalacheck.jar
25share/${PKGNAME}/lib/scalap.jar 30share/${PKGNAME}/lib/scalap.jar
26share/${PKGNAME}/meta/available 
27share/${PKGNAME}/meta/description 
28share/${PKGNAME}/meta/installed 
29share/${PKGNAME}/meta/universe 
30share/${PKGNAME}/misc/sbaz-testall/tests/sbaz 
31share/${PKGNAME}/misc/sbaz/config/sbaz.properties.example 
32share/${PKGNAME}/misc/sbaz/descriptors/README 
33share/${PKGNAME}/misc/sbaz/descriptors/lamp-rc 
34share/${PKGNAME}/misc/sbaz/descriptors/scala-dev 
35share/${PKGNAME}/misc/sbaz/sbaz-tests.jar 
36share/${PKGNAME}/misc/sbaz/scala-bazaars.jar 
37share/${PKGNAME}/misc/scala-devel/plugins/continuations.jar 31share/${PKGNAME}/misc/scala-devel/plugins/continuations.jar
38share/${PKGNAME}/misc/scala-tool-support/a2ps/README 
39share/${PKGNAME}/misc/scala-tool-support/a2ps/scala.ssh 
40share/${PKGNAME}/misc/scala-tool-support/bash-completion/scala_completion.sh 
41share/${PKGNAME}/misc/scala-tool-support/bluefish/README 
42share/${PKGNAME}/misc/scala-tool-support/bluefish/highlighting 
43share/${PKGNAME}/misc/scala-tool-support/emacs/AUTHORS 
44share/${PKGNAME}/misc/scala-tool-support/emacs/FUTURE 
45share/${PKGNAME}/misc/scala-tool-support/emacs/Makefile 
46share/${PKGNAME}/misc/scala-tool-support/emacs/README 
47share/${PKGNAME}/misc/scala-tool-support/emacs/contrib/README 
48share/${PKGNAME}/misc/scala-tool-support/emacs/contrib/dot-ctags 
49share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-auto.el 
50share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-constants.el 
51share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-feature-electric.el 
52share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-feature-speedbar.el 
53share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-feature-tags.el 
54share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-feature.el 
55share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-fontlock.el 
56share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-indent.el 
57share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-inf.el 
58share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-lib.el 
59share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-navigation.el 
60share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-ui.el 
61share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode-variables.el 
62share/${PKGNAME}/misc/scala-tool-support/emacs/scala-mode.el 
63share/${PKGNAME}/misc/scala-tool-support/enscript/README 
64share/${PKGNAME}/misc/scala-tool-support/enscript/scala.st 
65share/${PKGNAME}/misc/scala-tool-support/gedit/README 
66share/${PKGNAME}/misc/scala-tool-support/gedit/scala.lang 
67share/${PKGNAME}/misc/scala-tool-support/geshi/scala-alt.php 
68share/${PKGNAME}/misc/scala-tool-support/geshi/scala.php 
69share/${PKGNAME}/misc/scala-tool-support/intellij/README 
70share/${PKGNAME}/misc/scala-tool-support/intellij/scala.xml 
71share/${PKGNAME}/misc/scala-tool-support/jedit/console/README 
72share/${PKGNAME}/misc/scala-tool-support/jedit/console/commando/scala.xml 
73share/${PKGNAME}/misc/scala-tool-support/jedit/console/commando/scalac.xml 
74share/${PKGNAME}/misc/scala-tool-support/jedit/modes/README 
75share/${PKGNAME}/misc/scala-tool-support/jedit/modes/scala.xml 
76share/${PKGNAME}/misc/scala-tool-support/kate/README 
77share/${PKGNAME}/misc/scala-tool-support/kate/scala.xml 
78share/${PKGNAME}/misc/scala-tool-support/latex/scaladefs.sty 
79share/${PKGNAME}/misc/scala-tool-support/latex/scaladoc.sty 
80share/${PKGNAME}/misc/scala-tool-support/latex/scalatex.scm 
81share/${PKGNAME}/misc/scala-tool-support/latex/tweaklist.sty 
82share/${PKGNAME}/misc/scala-tool-support/latex/verbfilterScala.java 
83share/${PKGNAME}/misc/scala-tool-support/notepad-plus/README 
84share/${PKGNAME}/misc/scala-tool-support/notepad-plus/userDefineLang.xml 
85share/${PKGNAME}/misc/scala-tool-support/scite/README 
86share/${PKGNAME}/misc/scala-tool-support/scite/scala.properties 
87share/${PKGNAME}/misc/scala-tool-support/subethaedit/Documentation.webloc 
88share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Info.plist 
89share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/AutocompleteAdditions.txt 
90share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/InfoPlist.strings 
91share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/Localizable.strings 
92share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/ModeSettings.xml 
93share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/RegexSymbols.xml 
94share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/Scripts/Rot13.scpt 
95share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/SyntaxDefinition.xml 
96share/${PKGNAME}/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/mytemplate.scala 
97share/${PKGNAME}/misc/scala-tool-support/subethaedit/artwork/SymbolM.psd 
98share/${PKGNAME}/misc/scala-tool-support/subethaedit/artwork/readme.txt 
99share/${PKGNAME}/misc/scala-tool-support/textmate/Bundles/Scala.tmbundle.zip 
100share/${PKGNAME}/misc/scala-tool-support/textwrangler/README 
101share/${PKGNAME}/misc/scala-tool-support/textwrangler/Scala_Configuration.plist 
102share/${PKGNAME}/misc/scala-tool-support/vim/README 
103share/${PKGNAME}/misc/scala-tool-support/vim/ftdetect/scala.vim 
104share/${PKGNAME}/misc/scala-tool-support/vim/indent/scala.vim 
105share/${PKGNAME}/misc/scala-tool-support/vim/plugin/31-create-scala.vim 
106share/${PKGNAME}/misc/scala-tool-support/vim/syntax/scala.vim 
107share/${PKGNAME}/misc/scala-tool-support/xcode/README 
108share/${PKGNAME}/misc/scala-tool-support/xcode/Specifications/Scala.pbfilespec 
109share/${PKGNAME}/misc/scala-tool-support/xcode/Specifications/Scala.pblangspec 
110share/${PKGNAME}/src/sbaz-src.jar 
111share/${PKGNAME}/src/scala-compiler-src.jar 32share/${PKGNAME}/src/scala-compiler-src.jar
112share/${PKGNAME}/src/scala-dbc-src.jar 33share/${PKGNAME}/src/scala-dbc-src.jar
113share/${PKGNAME}/src/scala-library-src.jar 34share/${PKGNAME}/src/scala-library-src.jar
 35share/${PKGNAME}/src/scala-partest-src.jar
114share/${PKGNAME}/src/scala-swing-src.jar 36share/${PKGNAME}/src/scala-swing-src.jar
 37share/${PKGNAME}/src/scalap-src.jar
cvs diff -r1.4 -r1.5 pkgsrc/lang/scala/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/scala/distinfo 2011/09/30 07:56:13 1.4
+++ pkgsrc/lang/scala/distinfo 2012/05/01 22:22:01 1.5
@@ -1,12 +1,10 @@ @@ -1,12 +1,10 @@
1$NetBSD: distinfo,v 1.4 2011/09/30 07:56:13 yyamano Exp $ 1$NetBSD: distinfo,v 1.5 2012/05/01 22:22:01 yyamano Exp $
2 2
3SHA1 (scala-2.9.1.final.tgz) = 2e75559e6b9215cbee2bc71e53495bdefdb48b69 3SHA1 (scala-2.9.2.tgz) = 806fc1d91bda82d6a584172d7742531386ae68fb
4RMD160 (scala-2.9.1.final.tgz) = 5056577f06fdb6a19a217a20f72d3dd9aa54ddb6 4RMD160 (scala-2.9.2.tgz) = bf720870939d7b36ecf4212f8389835ab2817533
5Size (scala-2.9.1.final.tgz) = 24993458 bytes 5Size (scala-2.9.2.tgz) = 24408278 bytes
6SHA1 (patch-bin_fsc) = 2a207a1aed392d27b9afa0bb801952428be98e24 6SHA1 (patch-bin_fsc) = 2a207a1aed392d27b9afa0bb801952428be98e24
7SHA1 (patch-bin_sbaz) = b262a0890078e53e5cb7ead283b31ec171ff8e28 
8SHA1 (patch-bin_sbaz-setup) = 88a4e3d61c02d04010773c9fae6512a80f116f3d 
9SHA1 (patch-bin_scala) = da6d1a8d4b1a2ccc2e8a031816d37e5b8c31987c 7SHA1 (patch-bin_scala) = da6d1a8d4b1a2ccc2e8a031816d37e5b8c31987c
10SHA1 (patch-bin_scalac) = 9f94052187549a5cd7d37c21cfae811fcbb73d9e 8SHA1 (patch-bin_scalac) = 9f94052187549a5cd7d37c21cfae811fcbb73d9e
11SHA1 (patch-bin_scaladoc) = e95eb071692f5f938433fd864cf84c89ede3bc38 9SHA1 (patch-bin_scaladoc) = e95eb071692f5f938433fd864cf84c89ede3bc38
12SHA1 (patch-bin_scalap) = 183119ec731733a923514f372e68d47cf187586b 10SHA1 (patch-bin_scalap) = 183119ec731733a923514f372e68d47cf187586b
File Deleted: pkgsrc/lang/scala/patches/Attic/patch-bin_sbaz
File Deleted: pkgsrc/lang/scala/patches/Attic/patch-bin_sbaz-setup