Update to 2.11.1.

See http://www.scala-lang.org/news/2014/04/21/release-notes-2.11.0.html
and http://www.scala-lang.org/news/2.11.1 for changes from 2.10.3.

3 files changed, 29 insertions, 29 deletions

diff --git a/lang/scala/Makefile b/lang/scala/Makefile
index 6b33a477ed8..e6613f5db07 100644
--- a/lang/scala/Makefile
+++ b/lang/scala/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/10/02 06:59:08 yyamano Exp $
+# $NetBSD: Makefile,v 1.10 2014/06/12 17:35:46 yyamano Exp $
 
-DISTNAME=	scala-2.10.3
+DISTNAME=	scala-2.11.1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.scala-lang.org/files/archive/
 EXTRACT_SUFX=	.tgz
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.scala-lang.org/
 COMMENT=	Scala is a multi-paradigm programming language
 
 USE_JAVA=	run
-USE_JAVA2=	1.5
+USE_JAVA2=	6
 NO_BUILD=	yes
 
 USE_TOOLS+=	bash:run
@@ -37,7 +37,7 @@ do-install:
 	@${RM} -f ${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 misc src | ${TAR} xf - -C ${DESTDIR}${SCALA_HOME}
+	@cd ${WRKSRC} && ${TAR} cf - doc lib | ${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 e5436712324..97ed3c436b9 100644
--- a/lang/scala/PLIST
+++ b/lang/scala/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/07/05 14:40:33 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/06/12 17:35:46 yyamano Exp $
 bin/fsc
 bin/scala
 bin/scalac
@@ -9,8 +9,17 @@ man/man1/scala.1
 man/man1/scalac.1
 man/man1/scaladoc.1
 man/man1/scalap.1
-share/${PKGNAME}/doc/LICENSE
+share/${PKGNAME}/doc/LICENSE.md
+share/${PKGNAME}/doc/License.rtf
 share/${PKGNAME}/doc/README
+share/${PKGNAME}/doc/licenses/apache_jansi.txt
+share/${PKGNAME}/doc/licenses/bsd_asm.txt
+share/${PKGNAME}/doc/licenses/bsd_jline.txt
+share/${PKGNAME}/doc/licenses/mit_jquery-layout.txt
+share/${PKGNAME}/doc/licenses/mit_jquery-ui.txt
+share/${PKGNAME}/doc/licenses/mit_jquery.txt
+share/${PKGNAME}/doc/licenses/mit_sizzle.txt
+share/${PKGNAME}/doc/licenses/mit_tools.tooltip.txt
 share/${PKGNAME}/doc/tools/css/style.css
 share/${PKGNAME}/doc/tools/fsc.html
 share/${PKGNAME}/doc/tools/images/external.gif
@@ -20,25 +29,16 @@ 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/akka-actors.jar
-share/${PKGNAME}/lib/diffutils.jar
-share/${PKGNAME}/lib/jline.jar
-share/${PKGNAME}/lib/scala-actors-migration.jar
-share/${PKGNAME}/lib/scala-actors.jar
+share/${PKGNAME}/lib/akka-actor_2.11-2.3.3.jar
+share/${PKGNAME}/lib/config-1.2.1.jar
+share/${PKGNAME}/lib/jline-2.11.jar
+share/${PKGNAME}/lib/scala-actors-2.11.0.jar
+share/${PKGNAME}/lib/scala-actors-migration_2.11-1.1.0.jar
 share/${PKGNAME}/lib/scala-compiler.jar
+share/${PKGNAME}/lib/scala-continuations-library_2.11-1.0.2.jar
+share/${PKGNAME}/lib/scala-continuations-plugin_${PKGVERSION}-1.0.2.jar
 share/${PKGNAME}/lib/scala-library.jar
-share/${PKGNAME}/lib/scala-partest.jar
+share/${PKGNAME}/lib/scala-parser-combinators_2.11-1.0.1.jar
 share/${PKGNAME}/lib/scala-reflect.jar
-share/${PKGNAME}/lib/scala-swing.jar
-share/${PKGNAME}/lib/scalap.jar
-share/${PKGNAME}/lib/typesafe-config.jar
-share/${PKGNAME}/misc/scala-devel/plugins/continuations.jar
-share/${PKGNAME}/src/fjbg-src.jar
-share/${PKGNAME}/src/msil-src.jar
-share/${PKGNAME}/src/scala-actors-src.jar
-share/${PKGNAME}/src/scala-compiler-src.jar
-share/${PKGNAME}/src/scala-library-src.jar
-share/${PKGNAME}/src/scala-partest-src.jar
-share/${PKGNAME}/src/scala-reflect-src.jar
-share/${PKGNAME}/src/scala-swing-src.jar
-share/${PKGNAME}/src/scalap-src.jar
+share/${PKGNAME}/lib/scala-swing_2.11-1.0.1.jar
+share/${PKGNAME}/lib/scala-xml_2.11-1.0.2.jar
diff --git a/lang/scala/distinfo b/lang/scala/distinfo
index 86cb64396b3..7cf6b4fe5f9 100644
--- a/lang/scala/distinfo
+++ b/lang/scala/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2013/10/02 06:59:08 yyamano Exp $
+$NetBSD: distinfo,v 1.8 2014/06/12 17:35:46 yyamano Exp $
 
-SHA1 (scala-2.10.3.tgz) = 04cd6237f164940e1e993a127e7cb21297f3b7ae
-RMD160 (scala-2.10.3.tgz) = 942b6a3fb881cbc2b2efa505954e0d6e8c446728
-Size (scala-2.10.3.tgz) = 30531249 bytes
+SHA1 (scala-2.11.1.tgz) = 058281d9ed7738c99a9d5cd4988370448a12d0c1
+RMD160 (scala-2.11.1.tgz) = cbed803654c6be609627ffcac30768e49f010261
+Size (scala-2.11.1.tgz) = 25685521 bytes
 SHA1 (patch-bin_fsc) = 577aed4693be77a44068115038d3d6a823444d3b
 SHA1 (patch-bin_scala) = d341ccc17a3ee270f36d1b63f3ac46204df1b1fd
 SHA1 (patch-bin_scalac) = 05e1a8dbc0c2e072f9dd93fc0ecf32b6a18133dd