Thu Jun 12 17:35:46 2014 UTC ()
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.


(yyamano)
diff -r1.9 -r1.10 pkgsrc/lang/scala/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/scala/PLIST
diff -r1.7 -r1.8 pkgsrc/lang/scala/distinfo
cvs diff -r1.9 -r1.10 pkgsrc/lang/scala/Makefile (expand / switch to unified diff)

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

--- pkgsrc/lang/scala/PLIST 2013/07/05 14:40:33 1.4
+++ pkgsrc/lang/scala/PLIST 2014/06/12 17:35:46 1.5
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1@comment $NetBSD: PLIST,v 1.4 2013/07/05 14:40:33 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.5 2014/06/12 17:35:46 yyamano Exp $
2bin/fsc 2bin/fsc
3bin/scala 3bin/scala
4bin/scalac 4bin/scalac
5bin/scaladoc 5bin/scaladoc
6bin/scalap 6bin/scalap
7man/man1/fsc.1 7man/man1/fsc.1
8man/man1/scala.1 8man/man1/scala.1
9man/man1/scalac.1 9man/man1/scalac.1
10man/man1/scaladoc.1 10man/man1/scaladoc.1
11man/man1/scalap.1 11man/man1/scalap.1
12share/${PKGNAME}/doc/LICENSE 12share/${PKGNAME}/doc/LICENSE.md
 13share/${PKGNAME}/doc/License.rtf
13share/${PKGNAME}/doc/README 14share/${PKGNAME}/doc/README
 15share/${PKGNAME}/doc/licenses/apache_jansi.txt
 16share/${PKGNAME}/doc/licenses/bsd_asm.txt
 17share/${PKGNAME}/doc/licenses/bsd_jline.txt
 18share/${PKGNAME}/doc/licenses/mit_jquery-layout.txt
 19share/${PKGNAME}/doc/licenses/mit_jquery-ui.txt
 20share/${PKGNAME}/doc/licenses/mit_jquery.txt
 21share/${PKGNAME}/doc/licenses/mit_sizzle.txt
 22share/${PKGNAME}/doc/licenses/mit_tools.tooltip.txt
14share/${PKGNAME}/doc/tools/css/style.css 23share/${PKGNAME}/doc/tools/css/style.css
15share/${PKGNAME}/doc/tools/fsc.html 24share/${PKGNAME}/doc/tools/fsc.html
16share/${PKGNAME}/doc/tools/images/external.gif 25share/${PKGNAME}/doc/tools/images/external.gif
17share/${PKGNAME}/doc/tools/images/scala_logo.png 26share/${PKGNAME}/doc/tools/images/scala_logo.png
18share/${PKGNAME}/doc/tools/index.html 27share/${PKGNAME}/doc/tools/index.html
19share/${PKGNAME}/doc/tools/scala.html 28share/${PKGNAME}/doc/tools/scala.html
20share/${PKGNAME}/doc/tools/scalac.html 29share/${PKGNAME}/doc/tools/scalac.html
21share/${PKGNAME}/doc/tools/scaladoc.html 30share/${PKGNAME}/doc/tools/scaladoc.html
22share/${PKGNAME}/doc/tools/scalap.html 31share/${PKGNAME}/doc/tools/scalap.html
23share/${PKGNAME}/lib/akka-actors.jar 32share/${PKGNAME}/lib/akka-actor_2.11-2.3.3.jar
24share/${PKGNAME}/lib/diffutils.jar 33share/${PKGNAME}/lib/config-1.2.1.jar
25share/${PKGNAME}/lib/jline.jar 34share/${PKGNAME}/lib/jline-2.11.jar
26share/${PKGNAME}/lib/scala-actors-migration.jar 35share/${PKGNAME}/lib/scala-actors-2.11.0.jar
27share/${PKGNAME}/lib/scala-actors.jar 36share/${PKGNAME}/lib/scala-actors-migration_2.11-1.1.0.jar
28share/${PKGNAME}/lib/scala-compiler.jar 37share/${PKGNAME}/lib/scala-compiler.jar
 38share/${PKGNAME}/lib/scala-continuations-library_2.11-1.0.2.jar
 39share/${PKGNAME}/lib/scala-continuations-plugin_${PKGVERSION}-1.0.2.jar
29share/${PKGNAME}/lib/scala-library.jar 40share/${PKGNAME}/lib/scala-library.jar
30share/${PKGNAME}/lib/scala-partest.jar 41share/${PKGNAME}/lib/scala-parser-combinators_2.11-1.0.1.jar
31share/${PKGNAME}/lib/scala-reflect.jar 42share/${PKGNAME}/lib/scala-reflect.jar
32share/${PKGNAME}/lib/scala-swing.jar 43share/${PKGNAME}/lib/scala-swing_2.11-1.0.1.jar
33share/${PKGNAME}/lib/scalap.jar 44share/${PKGNAME}/lib/scala-xml_2.11-1.0.2.jar
34share/${PKGNAME}/lib/typesafe-config.jar 
35share/${PKGNAME}/misc/scala-devel/plugins/continuations.jar 
36share/${PKGNAME}/src/fjbg-src.jar 
37share/${PKGNAME}/src/msil-src.jar 
38share/${PKGNAME}/src/scala-actors-src.jar 
39share/${PKGNAME}/src/scala-compiler-src.jar 
40share/${PKGNAME}/src/scala-library-src.jar 
41share/${PKGNAME}/src/scala-partest-src.jar 
42share/${PKGNAME}/src/scala-reflect-src.jar 
43share/${PKGNAME}/src/scala-swing-src.jar 
44share/${PKGNAME}/src/scalap-src.jar 
cvs diff -r1.7 -r1.8 pkgsrc/lang/scala/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/scala/distinfo 2013/10/02 06:59:08 1.7
+++ pkgsrc/lang/scala/distinfo 2014/06/12 17:35:46 1.8
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.7 2013/10/02 06:59:08 yyamano Exp $ 1$NetBSD: distinfo,v 1.8 2014/06/12 17:35:46 yyamano Exp $
2 2
3SHA1 (scala-2.10.3.tgz) = 04cd6237f164940e1e993a127e7cb21297f3b7ae 3SHA1 (scala-2.11.1.tgz) = 058281d9ed7738c99a9d5cd4988370448a12d0c1
4RMD160 (scala-2.10.3.tgz) = 942b6a3fb881cbc2b2efa505954e0d6e8c446728 4RMD160 (scala-2.11.1.tgz) = cbed803654c6be609627ffcac30768e49f010261
5Size (scala-2.10.3.tgz) = 30531249 bytes 5Size (scala-2.11.1.tgz) = 25685521 bytes
6SHA1 (patch-bin_fsc) = 577aed4693be77a44068115038d3d6a823444d3b 6SHA1 (patch-bin_fsc) = 577aed4693be77a44068115038d3d6a823444d3b
7SHA1 (patch-bin_scala) = d341ccc17a3ee270f36d1b63f3ac46204df1b1fd 7SHA1 (patch-bin_scala) = d341ccc17a3ee270f36d1b63f3ac46204df1b1fd
8SHA1 (patch-bin_scalac) = 05e1a8dbc0c2e072f9dd93fc0ecf32b6a18133dd 8SHA1 (patch-bin_scalac) = 05e1a8dbc0c2e072f9dd93fc0ecf32b6a18133dd
9SHA1 (patch-bin_scaladoc) = 180af81f7d2842b633e81697bccb276b44a869b2 9SHA1 (patch-bin_scaladoc) = 180af81f7d2842b633e81697bccb276b44a869b2
10SHA1 (patch-bin_scalap) = 9388d658cd882e6627050b040cea13135ea7e0b0 10SHA1 (patch-bin_scalap) = 9388d658cd882e6627050b040cea13135ea7e0b0