[pkgsrc/trunk]: pkgsrc/lang/scala Update to 2.10.2

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5efb792a2fc
branches:  trunk
changeset: 621160:f5efb792a2fc
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Jul 05 14:40:33 2013 +0000

description:
Update to 2.10.2

Changelog:
* Bug fixes.
* New features.
See http://www.scala-lang.org/2.10.2 etc in detail.

diffstat:

 lang/scala/Makefile                   |   6 ++--
 lang/scala/PLIST                      |  15 ++++++++---
 lang/scala/distinfo                   |  18 ++++++------
 lang/scala/patches/patch-bin_fsc      |  46 +++++++++++-----------------------
 lang/scala/patches/patch-bin_scala    |  46 +++++++++++-----------------------
 lang/scala/patches/patch-bin_scalac   |  46 +++++++++++-----------------------
 lang/scala/patches/patch-bin_scaladoc |  46 +++++++++++-----------------------
 lang/scala/patches/patch-bin_scalap   |  46 +++++++++++-----------------------
 8 files changed, 98 insertions(+), 171 deletions(-)

diffs (truncated from 377 to 300 lines):

diff -r b0d1cd4cff97 -r f5efb792a2fc lang/scala/Makefile
--- a/lang/scala/Makefile       Fri Jul 05 14:31:40 2013 +0000
+++ b/lang/scala/Makefile       Fri Jul 05 14:40:33 2013 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2012/10/02 20:11:53 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/07/05 14:40:33 ryoon Exp $
 
-DISTNAME=      scala-2.9.2
+DISTNAME=      scala-2.10.2
 CATEGORIES=    lang
 MASTER_SITES=  http://www.scala-lang.org/downloads/distrib/files/
 EXTRACT_SUFX=  .tgz
@@ -34,7 +34,7 @@
        @${RM}  ${WRKSRC}/bin/*.bat
 
 do-install:
-       @${RM}  ${WRKSRC}/bin/*.orig
+       @${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}
diff -r b0d1cd4cff97 -r f5efb792a2fc lang/scala/PLIST
--- a/lang/scala/PLIST  Fri Jul 05 14:31:40 2013 +0000
+++ b/lang/scala/PLIST  Fri Jul 05 14:40:33 2013 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/05/01 22:22:01 yyamano Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/07/05 14:40:33 ryoon Exp $
 bin/fsc
 bin/scala
 bin/scalac
@@ -20,18 +20,25 @@
 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/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-reflect.jar
 share/${PKGNAME}/lib/scala-swing.jar
-share/${PKGNAME}/lib/scalacheck.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-dbc-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
diff -r b0d1cd4cff97 -r f5efb792a2fc lang/scala/distinfo
--- a/lang/scala/distinfo       Fri Jul 05 14:31:40 2013 +0000
+++ b/lang/scala/distinfo       Fri Jul 05 14:40:33 2013 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2012/05/01 22:22:01 yyamano Exp $
+$NetBSD: distinfo,v 1.6 2013/07/05 14:40:33 ryoon Exp $
 
-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_scala) = da6d1a8d4b1a2ccc2e8a031816d37e5b8c31987c
-SHA1 (patch-bin_scalac) = 9f94052187549a5cd7d37c21cfae811fcbb73d9e
-SHA1 (patch-bin_scaladoc) = e95eb071692f5f938433fd864cf84c89ede3bc38
-SHA1 (patch-bin_scalap) = 183119ec731733a923514f372e68d47cf187586b
+SHA1 (scala-2.10.2.tgz) = 86b4e38703d511ccf045e261a0e04f6e59e3c926
+RMD160 (scala-2.10.2.tgz) = fe2afb5e8a92a28cb3623c95c0571bd604cb1bc3
+Size (scala-2.10.2.tgz) = 30463932 bytes
+SHA1 (patch-bin_fsc) = 577aed4693be77a44068115038d3d6a823444d3b
+SHA1 (patch-bin_scala) = d341ccc17a3ee270f36d1b63f3ac46204df1b1fd
+SHA1 (patch-bin_scalac) = 05e1a8dbc0c2e072f9dd93fc0ecf32b6a18133dd
+SHA1 (patch-bin_scaladoc) = 180af81f7d2842b633e81697bccb276b44a869b2
+SHA1 (patch-bin_scalap) = 9388d658cd882e6627050b040cea13135ea7e0b0
diff -r b0d1cd4cff97 -r f5efb792a2fc lang/scala/patches/patch-bin_fsc
--- a/lang/scala/patches/patch-bin_fsc  Fri Jul 05 14:31:40 2013 +0000
+++ b/lang/scala/patches/patch-bin_fsc  Fri Jul 05 14:40:33 2013 +0000
@@ -1,40 +1,24 @@
-$NetBSD: patch-bin_fsc,v 1.1 2011/09/30 07:56:14 yyamano Exp $
+$NetBSD: patch-bin_fsc,v 1.2 2013/07/05 14:40:33 ryoon Exp $
 
 Hardwire paths to installed files and Java binary.
 
---- bin/fsc.orig       2011-08-29 16:44:20.000000000 +0000
+--- bin/fsc.orig       2013-06-06 18:41:45.000000000 +0000
 +++ bin/fsc
-@@ -48,23 +48,7 @@ case "`uname`" in
- esac
+@@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
+ fi
  
  # 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@
+-SCALA_HOME="$(findScalaHome)"
++SCALA_HOME="@SCALA_HOME@"
+ SEP=":"
  
- # Remove spaces from SCALA_HOME on windows
- if $cygwin; then
-@@ -150,7 +134,7 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a
-     JAVACMD="$JAVA_HOME/bin/java"
- fi
- 
--"${JAVACMD:=java}" \
-+"${JAVACMD:=@JAVA_HOME@/bin/java}" \
+ # Possible additional command line options
+@@ -192,7 +192,7 @@ fi
+ # be quoted: otherwise an empty string will appear as a command line
+ # argument, and java will think that is the program to run.
+ execCommand \
+-  "${JAVACMD:=java}" \
++  "${JAVACMD:=@JAVA_HOME@/bin/java}" \
    $JAVA_OPTS \
    "${java_args[@]}" \
-   ${CPSELECT}${TOOL_CLASSPATH} \
+   $(classpathArgs) \
diff -r b0d1cd4cff97 -r f5efb792a2fc lang/scala/patches/patch-bin_scala
--- a/lang/scala/patches/patch-bin_scala        Fri Jul 05 14:31:40 2013 +0000
+++ b/lang/scala/patches/patch-bin_scala        Fri Jul 05 14:40:33 2013 +0000
@@ -1,40 +1,24 @@
-$NetBSD: patch-bin_scala,v 1.1 2011/09/30 07:56:14 yyamano Exp $
+$NetBSD: patch-bin_scala,v 1.2 2013/07/05 14:40:33 ryoon Exp $
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scala.orig     2011-08-29 16:44:19.000000000 +0000
+--- bin/scala.orig     2013-06-06 18:41:45.000000000 +0000
 +++ bin/scala
-@@ -48,23 +48,7 @@ case "`uname`" in
- esac
+@@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
+ fi
  
  # 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@
+-SCALA_HOME="$(findScalaHome)"
++SCALA_HOME="@SCALA_HOME@"
+ SEP=":"
  
- # Remove spaces from SCALA_HOME on windows
- if $cygwin; then
-@@ -150,7 +134,7 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a
-     JAVACMD="$JAVA_HOME/bin/java"
- fi
- 
--"${JAVACMD:=java}" \
-+"${JAVACMD:=@JAVA_HOME@/bin/java}" \
+ # Possible additional command line options
+@@ -192,7 +192,7 @@ fi
+ # be quoted: otherwise an empty string will appear as a command line
+ # argument, and java will think that is the program to run.
+ execCommand \
+-  "${JAVACMD:=java}" \
++  "${JAVACMD:=@JAVA_HOME@/bin/java}" \
    $JAVA_OPTS \
    "${java_args[@]}" \
-   ${CPSELECT}${TOOL_CLASSPATH} \
+   $(classpathArgs) \
diff -r b0d1cd4cff97 -r f5efb792a2fc lang/scala/patches/patch-bin_scalac
--- a/lang/scala/patches/patch-bin_scalac       Fri Jul 05 14:31:40 2013 +0000
+++ b/lang/scala/patches/patch-bin_scalac       Fri Jul 05 14:40:33 2013 +0000
@@ -1,40 +1,24 @@
-$NetBSD: patch-bin_scalac,v 1.1 2011/09/30 07:56:14 yyamano Exp $
+$NetBSD: patch-bin_scalac,v 1.2 2013/07/05 14:40:33 ryoon Exp $
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scalac.orig    2011-08-29 16:44:20.000000000 +0000
+--- bin/scalac.orig    2013-06-06 18:41:45.000000000 +0000
 +++ bin/scalac
-@@ -48,23 +48,7 @@ case "`uname`" in
- esac
+@@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
+ fi
  
  # 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@
+-SCALA_HOME="$(findScalaHome)"
++SCALA_HOME="@SCALA_HOME@"
+ SEP=":"
  
- # Remove spaces from SCALA_HOME on windows
- if $cygwin; then
-@@ -150,7 +134,7 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a
-     JAVACMD="$JAVA_HOME/bin/java"
- fi
- 
--"${JAVACMD:=java}" \
-+"${JAVACMD:=@JAVA_HOME@/bin/java}" \
+ # Possible additional command line options
+@@ -192,7 +192,7 @@ fi
+ # be quoted: otherwise an empty string will appear as a command line
+ # argument, and java will think that is the program to run.
+ execCommand \
+-  "${JAVACMD:=java}" \
++  "${JAVACMD:=@JAVA_HOME@/bin/java}" \
    $JAVA_OPTS \
    "${java_args[@]}" \
-   ${CPSELECT}${TOOL_CLASSPATH} \
+   $(classpathArgs) \
diff -r b0d1cd4cff97 -r f5efb792a2fc lang/scala/patches/patch-bin_scaladoc
--- a/lang/scala/patches/patch-bin_scaladoc     Fri Jul 05 14:31:40 2013 +0000
+++ b/lang/scala/patches/patch-bin_scaladoc     Fri Jul 05 14:40:33 2013 +0000
@@ -1,40 +1,24 @@
-$NetBSD: patch-bin_scaladoc,v 1.1 2011/09/30 07:56:14 yyamano Exp $
+$NetBSD: patch-bin_scaladoc,v 1.2 2013/07/05 14:40:33 ryoon Exp $
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scaladoc.orig  2011-08-29 16:44:19.000000000 +0000
+--- bin/scaladoc.orig  2013-06-06 18:41:45.000000000 +0000
 +++ bin/scaladoc
-@@ -48,23 +48,7 @@ case "`uname`" in
- esac
+@@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
+ fi
  
  # 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@
+-SCALA_HOME="$(findScalaHome)"
++SCALA_HOME="@SCALA_HOME@"
+ SEP=":"
  
- # Remove spaces from SCALA_HOME on windows