pkg/45379: Please update lang scala to 2.9.1

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/45379: Please update lang scala to 2.9.1
From: ryoon%NetBSD.org@localhost
Date: Mon, 19 Sep 2011 12:10:01 +0000 (UTC)
>Number:         45379
>Category:       pkg
>Synopsis:       Please update lang scala to 2.9.1
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 19 12:10:00 +0000 2011
>Originator:     Ryo ONODERA
>Release:        NetBSD 5.99.55
>Organization:
        
>Environment:
        
        
System: NetBSD hydrogen.elements.tetera.org 5.99.55 NetBSD 5.99.55 (LEAFGIRL7) 
#0: Fri Aug 19 17:16:41 JST 2011 
root%hydrogen.elements.tetera.org@localhost:/usr/obj/sys/arch/i386/compile/LEAFGIRL7
 i386
Architecture: i386
Machine: i386
>Description:
Please update lang/scala to 2.9.1
        
>How-To-Repeat:
        
>Fix:
        
diff -ur /usr/pkgsrc/lang/scala/Makefile /mnt/nfs/cvs/pkgsrc/lang/scala/Makefile
--- /usr/pkgsrc/lang/scala/Makefile     2010-11-13 05:20:33.000000000 +0900
+++ /mnt/nfs/cvs/pkgsrc/lang/scala/Makefile     2011-09-19 20:51:04.000000000 
+0900
@@ -1,11 +1,10 @@
 # $NetBSD: Makefile,v 1.4 2010/11/12 20:20:33 yyamano Exp $
 
-DISTNAME=      scala-2.8.1
+DISTNAME=      scala-2.9.1
 CATEGORIES=    lang
 MASTER_SITES=  http://www.scala-lang.org/downloads/distrib/files/
 EXTRACT_SUFX=  .tgz
 DISTFILES=     ${DISTNAME}.final${EXTRACT_SUFX}
-WRKSRC=                ${WRKDIR}/${DISTNAME}.final
 
 MAINTAINER=    yyamano%NetBSD.org@localhost
 HOMEPAGE=      http://www.scala-lang.org/
@@ -13,17 +12,22 @@
 
 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 bin/sbaz-setup bin/scala bin/scalac \
+               bin/scaladoc bin/scalap
+
 SCALA_HOME=    ${DESTDIR}${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
+SUBST_FILES.scala+=    bin/scala bin/scalac bin/scaladoc bin/scalap
 SUBST_STAGE.scala=     pre-configure
-SUBST_SED.scala=       -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
 SUBST_SED.scala+=      -e 's,@SCALA_HOME@,${SCALA_HOME},g'
 
 PLIST_SUBST+=  DISTNAME=${DISTNAME}
@@ -36,7 +40,7 @@
 do-install:
        @${RM}  ${WRKSRC}/bin/*.orig
        ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${DESTDIR}${PREFIX}/man/man1
+       ${INSTALL_MAN} ${WRKSRC}/man/man1/* 
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        @cd ${WRKSRC} && ${TAR} cf - doc lib meta misc src | ${TAR} xf - -C 
${SCALA_HOME}
 
 .include "../../mk/java-vm.mk"
diff -ur /usr/pkgsrc/lang/scala/distinfo /mnt/nfs/cvs/pkgsrc/lang/scala/distinfo
--- /usr/pkgsrc/lang/scala/distinfo     2010-11-13 05:20:33.000000000 +0900
+++ /mnt/nfs/cvs/pkgsrc/lang/scala/distinfo     2011-09-19 20:39:28.000000000 
+0900
@@ -1,11 +1,12 @@
 $NetBSD: distinfo,v 1.3 2010/11/12 20:20:33 yyamano Exp $
 
-SHA1 (scala-2.8.1.final.tgz) = b225e97652e06a3881de64321a46a488eaa3a15e
-RMD160 (scala-2.8.1.final.tgz) = 92e063f0f7ca71d0353b155ba86f018e4d024abe
-Size (scala-2.8.1.final.tgz) = 20203153 bytes
-SHA1 (patch-aa) = bfacfb3d88cc8358859970af80d04a22c7e8f5c8
-SHA1 (patch-ab) = 56a0f61f5123c34c4ed5cb3b5c1390189fc0c3c1
-SHA1 (patch-ac) = 2555f20cc67eefdd0b63fb08f9fd7c46ad21763a
-SHA1 (patch-ad) = ba9f67babef90bb5b518a2b04a39a7186d5f8583
-SHA1 (patch-ae) = 358abd34055d208ce3df5a81408ff9239577707f
-SHA1 (patch-af) = c9be38ccf7fe34e0637f3d90a289f3df4f621982
+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 (patch-aa) = 2c6fb98d5e0e26e65de0a2c1d9042b4efebfe192
+SHA1 (patch-ab) = 62a37932f80194ca5a28c6d279cf41599cbb1bf0
+SHA1 (patch-ac) = 8cf98e827a37c3443573c3d5121522e42636642e
+SHA1 (patch-ad) = 28261f34d6957b2f86e258d08324510848dadfbc
+SHA1 (patch-ae) = 7e9c2f8ac06a8c46153bd69cd47562ee055513cb
+SHA1 (patch-af) = a35c85e6a38b54145fac1fa7b2bb243fcca20eb4
+SHA1 (patch-bin_scalap) = c8cffa01b1cc442d0e6045062508a21f3c11369f
diff -ur /usr/pkgsrc/lang/scala/patches/patch-aa 
/mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-aa
--- /usr/pkgsrc/lang/scala/patches/patch-aa     2010-08-12 21:31:47.000000000 
+0900
+++ /mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-aa     2011-09-19 
20:36:47.000000000 +0900
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2010/08/12 12:31:47 asau Exp $
+$NetBSD$
 
 Hardwire paths to installed files and Java binary.
 
---- bin/fsc.orig       2010-07-13 19:48:47.000000000 +0400
-+++ bin/fsc    2010-08-12 16:20:49.000000000 +0400
-@@ -14,23 +14,7 @@
+--- bin/fsc.orig       2011-08-29 16:44:20.000000000 +0000
++++ bin/fsc
+@@ -48,23 +48,7 @@ case "`uname`" in
  esac
  
  # Finding the root folder for this Scala distribution
@@ -29,9 +29,3 @@
  
  # Remove spaces from SCALA_HOME on windows
  if $cygwin; then
-@@ -80,4 +64,4 @@
-     JAVACMD="$JAVA_HOME/bin/java"
- fi
- 
--exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" 
-Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS"  scala.tools.nsc.CompileClient  
"$@"
-+exec "${JAVACMD:=@JAVA_HOME@/bin/java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" 
-Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  
scala.tools.nsc.CompileClient  "$@"
diff -ur /usr/pkgsrc/lang/scala/patches/patch-ab 
/mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-ab
--- /usr/pkgsrc/lang/scala/patches/patch-ab     2010-08-12 21:31:47.000000000 
+0900
+++ /mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-ab     2011-09-19 
20:36:52.000000000 +0900
@@ -1,17 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2010/08/12 12:31:47 asau Exp $
+$NetBSD$
 
 Hardwire paths to installed files and Java binary.
-Fix shell.
 
---- bin/sbaz-setup.orig        2010-07-13 19:48:47.000000000 +0400
-+++ bin/sbaz-setup     2010-08-12 16:21:31.000000000 +0400
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- set -e
- 
-@@ -10,23 +10,7 @@
+--- bin/sbaz-setup.orig        2011-08-29 16:44:20.000000000 +0000
++++ bin/sbaz-setup
+@@ -10,24 +10,7 @@ case "`uname`" in
  esac
  
  
@@ -32,7 +25,8 @@
 -    SCALA_HOME=`dirname "$SOURCE"`/..;
 -    SCALA_HOME=`cd "$SCALA_HOME"; pwd`;
 -fi
+-
 +SCALA_HOME=@SCALA_HOME@
- 
  SBAZ="$SCALA_HOME/bin/sbaz"
  
+ if [ "$1" = "" ]
diff -ur /usr/pkgsrc/lang/scala/patches/patch-ac 
/mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-ac
--- /usr/pkgsrc/lang/scala/patches/patch-ac     2010-08-12 21:31:47.000000000 
+0900
+++ /mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-ac     2011-09-19 
20:37:16.000000000 +0900
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2010/08/12 12:31:47 asau Exp $
+$NetBSD$
 
 Hardwire paths to installed files and Java binary.
 
---- bin/sbaz.orig      2010-07-13 19:48:47.000000000 +0400
-+++ bin/sbaz   2010-08-12 16:22:14.000000000 +0400
-@@ -14,23 +14,7 @@
+--- 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
@@ -29,9 +29,3 @@
  
  # Remove spaces from SCALA_HOME on windows
  if $cygwin; then
-@@ -83,4 +67,4 @@
-     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 -ur /usr/pkgsrc/lang/scala/patches/patch-ad 
/mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-ad
--- /usr/pkgsrc/lang/scala/patches/patch-ad     2010-08-12 21:31:47.000000000 
+0900
+++ /mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-ad     2011-09-19 
20:37:57.000000000 +0900
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.2 2010/08/12 12:31:47 asau Exp $
+$NetBSD$
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scala.orig     2010-07-13 19:48:47.000000000 +0400
-+++ bin/scala  2010-08-12 16:23:06.000000000 +0400
-@@ -14,23 +14,7 @@
+--- bin/scala.orig     2011-08-29 16:44:19.000000000 +0000
++++ bin/scala
+@@ -48,23 +48,7 @@ case "`uname`" in
  esac
  
  # Finding the root folder for this Scala distribution
@@ -29,9 +29,3 @@
  
  # Remove spaces from SCALA_HOME on windows
  if $cygwin; then
-@@ -80,4 +64,4 @@
-     JAVACMD="$JAVA_HOME/bin/java"
- fi
- 
--exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" 
-Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS"  
scala.tools.nsc.MainGenericRunner  "$@"
-+exec "${JAVACMD:=@JAVA_HOME@/bin/java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" 
-Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  
scala.tools.nsc.MainGenericRunner  "$@"
diff -ur /usr/pkgsrc/lang/scala/patches/patch-ae 
/mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-ae
--- /usr/pkgsrc/lang/scala/patches/patch-ae     2010-08-12 21:31:47.000000000 
+0900
+++ /mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-ae     2011-09-19 
20:38:16.000000000 +0900
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.2 2010/08/12 12:31:47 asau Exp $
+$NetBSD$
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scalac.orig    2010-07-13 19:48:47.000000000 +0400
-+++ bin/scalac 2010-08-12 16:24:05.000000000 +0400
-@@ -14,23 +14,7 @@
+--- bin/scalac.orig    2011-08-29 16:44:20.000000000 +0000
++++ bin/scalac
+@@ -48,23 +48,7 @@ case "`uname`" in
  esac
  
  # Finding the root folder for this Scala distribution
@@ -29,9 +29,3 @@
  
  # Remove spaces from SCALA_HOME on windows
  if $cygwin; then
-@@ -80,4 +64,4 @@
-     JAVACMD="$JAVA_HOME/bin/java"
- fi
- 
--exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" 
-Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS"  scala.tools.nsc.Main  "$@"
-+exec "${JAVACMD:=@JAVA_HOME@/bin/java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" 
-Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  
scala.tools.nsc.Main  "$@"
diff -ur /usr/pkgsrc/lang/scala/patches/patch-af 
/mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-af
--- /usr/pkgsrc/lang/scala/patches/patch-af     2010-08-12 21:31:47.000000000 
+0900
+++ /mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-af     2011-09-19 
20:38:39.000000000 +0900
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.2 2010/08/12 12:31:47 asau Exp $
+$NetBSD$
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scaladoc.orig  2010-07-13 19:48:46.000000000 +0400
-+++ bin/scaladoc       2010-08-12 16:25:02.000000000 +0400
-@@ -14,23 +14,7 @@
+--- bin/scaladoc.orig  2011-08-29 16:44:19.000000000 +0000
++++ bin/scaladoc
+@@ -48,23 +48,7 @@ case "`uname`" in
  esac
  
  # Finding the root folder for this Scala distribution
@@ -29,9 +29,3 @@
  
  # Remove spaces from SCALA_HOME on windows
  if $cygwin; then
-@@ -80,4 +64,4 @@
-     JAVACMD="$JAVA_HOME/bin/java"
- fi
- 
--exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" 
-Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS"  scala.tools.nsc.ScalaDoc  "$@"
-+exec "${JAVACMD:=@JAVA_HOME@/bin/java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" 
-Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS"  
scala.tools.nsc.ScalaDoc  "$@"
diff -ur /usr/pkgsrc/lang/scala/patches/patch-bin_scalap 
/mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-bin_scalap
--- /usr/pkgsrc/lang/scala/patches/patch-bin_scalap     2011-09-19 
20:57:56.000000000 +0900
+++ /mnt/nfs/cvs/pkgsrc/lang/scala/patches/patch-bin_scalap     2011-09-19 
20:39:20.000000000 +0900
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Hardwire paths to installed files and Java binary.
+
+--- bin/scalap.orig    2011-08-29 16:44:19.000000000 +0000
++++ bin/scalap
+@@ -48,23 +48,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


>Unformatted:
Follow-Ups:
- Re: pkg/45379: Please update lang scala to 2.9.1
  - From: Yuji Yamano
Prev by Date: Re: pkg/45378 (p5-PerlMagick does not build)
Next by Date: pkg/45380: gnash does nto build.
Previous by Thread: Re: pkg/45378 (p5-PerlMagick does not build)
Next by Thread: Re: pkg/45379: Please update lang scala to 2.9.1
Indexes:
Home | Main Index | Thread Index | Old Index