Thu Aug 12 12:31:47 2010 UTC ()
Update to Scala 2.8.0

Changes in Version 2.8.0 (14-Jul-2010)

Scala 2.8.0 is a significantly innovative release, which
contains a large amount of fixes and introduces many new
features:

  * Redesigned collection library
  * New array implementation, manifests for polymorphic arrays
  * Type specialization
  * Named and default arguments
  * Package objects
  * Beefed up Scala Swing libraries, better documentation
  * Revamped REPL
  * Implicits changes
  * Improved equality
  * Packrat parser combinators
  * Improved XML library
  * Type constructor inference
  * Improved Annotations
  * Enhanced actors
  * Support for continuations

Internal improvements

  * New presentation compiler
  * New build manager
  * Speed improvements

Additional tools

  * Scaladoc 2
  * Sbaz 2
  * Scalap
  * Scala IDE for Eclipse


(asau)
diff -r1.2 -r1.3 pkgsrc/lang/scala/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/patch-ab
diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/patch-ac
diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/patch-ad
diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/patch-ae
diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/patch-af
cvs diff -r1.2 -r1.3 pkgsrc/lang/scala/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/scala/Makefile 2010/02/03 13:01:04 1.2
+++ pkgsrc/lang/scala/Makefile 2010/08/12 12:31:46 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.2 2010/02/03 13:01:04 joerg Exp $ 1# $NetBSD: Makefile,v 1.3 2010/08/12 12:31:46 asau Exp $
2 2
3DISTNAME= scala-2.7.7 3DISTNAME= scala-2.8.0
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} 7DISTFILES= ${DISTNAME}.final${EXTRACT_SUFX}
8WRKSRC= ${WRKDIR}/${DISTNAME}.final 8WRKSRC= ${WRKDIR}/${DISTNAME}.final
9 9
10MAINTAINER= yyamano@NetBSD.org 10MAINTAINER= yyamano@NetBSD.org
11HOMEPAGE= http://www.scala-lang.org/ 11HOMEPAGE= http://www.scala-lang.org/
12COMMENT= Scala is a multi-paradigm programming language 12COMMENT= Scala is a multi-paradigm programming language
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_JAVA= run 16USE_JAVA= run
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/PLIST (expand / switch to unified diff)

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

--- pkgsrc/lang/scala/distinfo 2010/01/23 10:50:45 1.1.1.1
+++ pkgsrc/lang/scala/distinfo 2010/08/12 12:31:46 1.2
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $ 1$NetBSD: distinfo,v 1.2 2010/08/12 12:31:46 asau Exp $
2 2
3SHA1 (scala-2.7.7.final.tgz) = 2197475c8d137cb9f05614807e7d4f18ad8db7e3 3SHA1 (scala-2.8.0.final.tgz) = 9f06c56718b43a14e8dff412f532e3bfe36f3128
4RMD160 (scala-2.7.7.final.tgz) = ea590b9e25fd0ede59cc6ccd5e9d3bba99885b0f 4RMD160 (scala-2.8.0.final.tgz) = 647774d2eea5625796ecf0893d55e2081940afb7
5Size (scala-2.7.7.final.tgz) = 15619192 bytes 5Size (scala-2.8.0.final.tgz) = 19406847 bytes
6SHA1 (patch-aa) = ba7c9f1b154ed045ed29b6aa0ad85163db035034 6SHA1 (patch-aa) = bfacfb3d88cc8358859970af80d04a22c7e8f5c8
7SHA1 (patch-ab) = 21cd2709f0f6669804ecfbac328df9d99572319c 7SHA1 (patch-ab) = 56a0f61f5123c34c4ed5cb3b5c1390189fc0c3c1
8SHA1 (patch-ac) = 88ffdf598abc3a8c25f59d425cf149e6747829d2 8SHA1 (patch-ac) = 2555f20cc67eefdd0b63fb08f9fd7c46ad21763a
9SHA1 (patch-ad) = de64edd3e5b9bd0f3e8ea8b6e9316a8344984907 9SHA1 (patch-ad) = ba9f67babef90bb5b518a2b04a39a7186d5f8583
10SHA1 (patch-ae) = 9030e246d502a9728ee20b4a2896559da3895ff3 10SHA1 (patch-ae) = 358abd34055d208ce3df5a81408ff9239577707f
11SHA1 (patch-af) = d5523354654cefd1e85233b2aa142b1d14fe5dc1 11SHA1 (patch-af) = c9be38ccf7fe34e0637f3d90a289f3df4f621982
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/scala/patches/Attic/patch-aa 2010/01/23 10:50:45 1.1.1.1
+++ pkgsrc/lang/scala/patches/Attic/patch-aa 2010/08/12 12:31:47 1.2
@@ -1,46 +1,37 @@ @@ -1,46 +1,37 @@
1$NetBSD: patch-aa,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $ 1$NetBSD: patch-aa,v 1.2 2010/08/12 12:31:47 asau Exp $
2 2
3--- bin/fsc.orig 2009-10-28 06:19:04.000000000 -0700 3Hardwire paths to installed files and Java binary.
4+++ bin/fsc 4
5@@ -14,20 +14,21 @@ case "`uname`" in 5--- bin/fsc.orig 2010-07-13 19:48:47.000000000 +0400
 6+++ bin/fsc 2010-08-12 16:20:49.000000000 +0400
 7@@ -14,23 +14,7 @@
6 esac 8 esac
7  9
8 # Finding the root folder for this Scala distribution 10 # Finding the root folder for this Scala distribution
9-SOURCE=$0; 11-SOURCE=$0;
10-SCRIPT=`basename "$SOURCE"`; 12-SCRIPT=`basename "$SOURCE"`;
11-while [ -h "$SOURCE" ]; do 13-while [ -h "$SOURCE" ]; do
12- SCRIPT=`basename "$SOURCE"`; 14- SCRIPT=`basename "$SOURCE"`;
13- LOOKUP=`ls -ld "$SOURCE"`; 15- LOOKUP=`ls -ld "$SOURCE"`;
14- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 16- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
15- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 17- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
16- SOURCE=${TARGET:-.}; 18- SOURCE=${TARGET:-.};
17- else 19- else
18- SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 20- SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
19- fi; 21- fi;
20-done; 22-done;
21-SCALA_HOME=`dirname "$SOURCE"`/..; 23-
22-SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 24-# see #2092
23+#SOURCE=$0; 25-SCALA_HOME=`dirname "$SOURCE"`
24+#SCRIPT=`basename "$SOURCE"`; 26-SCALA_HOME=`cd "$SCALA_HOME"; pwd -P`
25+#while [ -h "$SOURCE" ]; do 27-SCALA_HOME=`cd "$SCALA_HOME"/..; pwd`
26+# SCRIPT=`basename "$SOURCE"`; 
27+# LOOKUP=`ls -ld "$SOURCE"`; 
28+# TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 
29+# if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 
30+# SOURCE=${TARGET:-.}; 
31+# else 
32+# SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 
33+# fi; 
34+#done; 
35+#SCALA_HOME=`dirname "$SOURCE"`/..; 
36+#SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 
37+SCALA_HOME=@SCALA_HOME@ 28+SCALA_HOME=@SCALA_HOME@
 29
38 # Remove spaces from SCALA_HOME on windows 30 # Remove spaces from SCALA_HOME on windows
39 if $cygwin; then 31 if $cygwin; then
40 SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` 32@@ -80,4 +64,4 @@
41@@ -63,4 +64,4 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a 
42 JAVACMD="$JAVA_HOME/bin/java" 33 JAVACMD="$JAVA_HOME/bin/java"
43 fi 34 fi
44  35
45-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" scala.tools.nsc.CompileClient "$@" 36-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" scala.tools.nsc.CompileClient "$@"
46+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 "$@" 37+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 "$@"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/scala/patches/Attic/patch-ab 2010/01/23 10:50:45 1.1.1.1
+++ pkgsrc/lang/scala/patches/Attic/patch-ab 2010/08/12 12:31:47 1.2
@@ -1,52 +1,38 @@ @@ -1,52 +1,38 @@
1$NetBSD: patch-ab,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $ 1$NetBSD: patch-ab,v 1.2 2010/08/12 12:31:47 asau Exp $
2 2
3--- bin/sbaz-setup.orig 2009-10-28 06:19:05.000000000 -0700 3Hardwire paths to installed files and Java binary.
4+++ bin/sbaz-setup 4Fix shell.
 5
 6--- bin/sbaz-setup.orig 2010-07-13 19:48:47.000000000 +0400
 7+++ bin/sbaz-setup 2010-08-12 16:21:31.000000000 +0400
5@@ -1,4 +1,4 @@ 8@@ -1,4 +1,4 @@
6-#!/bin/bash 9-#!/bin/bash
7+#!/bin/sh 10+#!/bin/sh
8  11
9 set -e 12 set -e
10  13
11@@ -10,23 +10,24 @@ case "`uname`" in 14@@ -10,23 +10,7 @@
12 esac 15 esac
13  16
14  17
15-SOURCE=$0; 18-SOURCE=$0;
16-SCRIPT=`basename "$SOURCE"`; 19-SCRIPT=`basename "$SOURCE"`;
17-while [ -h "$SOURCE" ]; do 20-while [ -h "$SOURCE" ]; do
18- SCRIPT=`basename "$SOURCE"`; 21- SCRIPT=`basename "$SOURCE"`;
19- LOOKUP=`ls -ld "$SOURCE"`; 22- LOOKUP=`ls -ld "$SOURCE"`;
20- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 23- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
21- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 24- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
22- SOURCE=${TARGET:-.}; 25- SOURCE=${TARGET:-.};
23- else 26- else
24- SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 27- SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
25- fi; 28- fi;
26-done; 29-done;
27-if [ "$SCALA_HOME" = "" ] 30-if [ "$SCALA_HOME" = "" ]
28-then 31-then
29- SCALA_HOME=`dirname "$SOURCE"`/..; 32- SCALA_HOME=`dirname "$SOURCE"`/..;
30- SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 33- SCALA_HOME=`cd "$SCALA_HOME"; pwd`;
31-fi 34-fi
32+#SOURCE=$0; 
33+#SCRIPT=`basename "$SOURCE"`; 
34+#while [ -h "$SOURCE" ]; do 
35+# SCRIPT=`basename "$SOURCE"`; 
36+# LOOKUP=`ls -ld "$SOURCE"`; 
37+# TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 
38+# if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 
39+# SOURCE=${TARGET:-.}; 
40+# else 
41+# SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 
42+# fi; 
43+#done; 
44+#if [ "$SCALA_HOME" = "" ] 
45+#then 
46+# SCALA_HOME=`dirname "$SOURCE"`/..; 
47+# SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 
48+#fi 
49+SCALA_HOME=@SCALA_HOME@ 35+SCALA_HOME=@SCALA_HOME@
50  36
51 SBAZ="$SCALA_HOME/bin/sbaz" 37 SBAZ="$SCALA_HOME/bin/sbaz"
52  38
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/lang/scala/patches/Attic/patch-ac 2010/01/23 10:50:45 1.1.1.1
+++ pkgsrc/lang/scala/patches/Attic/patch-ac 2010/08/12 12:31:47 1.2
@@ -1,46 +1,37 @@ @@ -1,46 +1,37 @@
1$NetBSD: patch-ac,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $ 1$NetBSD: patch-ac,v 1.2 2010/08/12 12:31:47 asau Exp $
2 2
3--- bin/sbaz.orig 2009-10-28 06:19:03.000000000 -0700 3Hardwire paths to installed files and Java binary.
4+++ bin/sbaz 4
5@@ -14,20 +14,21 @@ case "`uname`" in 5--- bin/sbaz.orig 2010-07-13 19:48:47.000000000 +0400
 6+++ bin/sbaz 2010-08-12 16:22:14.000000000 +0400
 7@@ -14,23 +14,7 @@
6 esac 8 esac
7  9
8 # Finding the root folder for this Scala distribution 10 # Finding the root folder for this Scala distribution
9-SOURCE=$0; 11-SOURCE=$0;
10-SCRIPT=`basename "$SOURCE"`; 12-SCRIPT=`basename "$SOURCE"`;
11-while [ -h "$SOURCE" ]; do 13-while [ -h "$SOURCE" ]; do
12- SCRIPT=`basename "$SOURCE"`; 14- SCRIPT=`basename "$SOURCE"`;
13- LOOKUP=`ls -ld "$SOURCE"`; 15- LOOKUP=`ls -ld "$SOURCE"`;
14- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 16- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
15- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 17- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
16- SOURCE=${TARGET:-.}; 18- SOURCE=${TARGET:-.};
17- else 19- else
18- SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 20- SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
19- fi; 21- fi;
20-done; 22-done;
21-SCALA_HOME=`dirname "$SOURCE"`/..; 23-
22-SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 24-# see #2092
23+#SOURCE=$0; 25-SCALA_HOME=`dirname "$SOURCE"`
24+#SCRIPT=`basename "$SOURCE"`; 26-SCALA_HOME=`cd "$SCALA_HOME"; pwd -P`
25+#while [ -h "$SOURCE" ]; do 27-SCALA_HOME=`cd "$SCALA_HOME"/..; pwd`
26+# SCRIPT=`basename "$SOURCE"`; 
27+# LOOKUP=`ls -ld "$SOURCE"`; 
28+# TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 
29+# if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 
30+# SOURCE=${TARGET:-.}; 
31+# else 
32+# SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 
33+# fi; 
34+#done; 
35+#SCALA_HOME=`dirname "$SOURCE"`/..; 
36+#SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 
37+SCALA_HOME=@SCALA_HOME@ 28+SCALA_HOME=@SCALA_HOME@
 29
 30 # Remove spaces from SCALA_HOME on windows
38 if $cygwin; then 31 if $cygwin; then
39 SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` 32@@ -83,4 +67,4 @@
40 SCALA_HOME=`cygpath --unix "$SCALA_HOME"` 33 JAVACMD="$JAVA_HOME/bin/java"
41@@ -58,4 +59,4 @@ fi 34 fi
42 # Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris 
43 [ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx256M -Xms16M" 
44  35
45-${JAVACMD:=java} $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" sbaz.clui.CommandLine "$@" 36-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" sbaz.clui.CommandLine "$@"
46+${JAVACMD:=@JAVA_HOME@/bin/java} $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" sbaz.clui.CommandLine "$@" 37+exec ${JAVACMD:=@JAVA_HOME@/bin/java} $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" sbaz.clui.CommandLine "$@"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/lang/scala/patches/Attic/patch-ad 2010/01/23 10:50:45 1.1.1.1
+++ pkgsrc/lang/scala/patches/Attic/patch-ad 2010/08/12 12:31:47 1.2
@@ -1,46 +1,37 @@ @@ -1,46 +1,37 @@
1$NetBSD: patch-ad,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $ 1$NetBSD: patch-ad,v 1.2 2010/08/12 12:31:47 asau Exp $
2 2
3--- bin/scala.orig 2009-10-28 06:19:03.000000000 -0700 3Hardwire paths to installed files and Java binary.
4+++ bin/scala 4
5@@ -14,20 +14,21 @@ case "`uname`" in 5--- bin/scala.orig 2010-07-13 19:48:47.000000000 +0400
 6+++ bin/scala 2010-08-12 16:23:06.000000000 +0400
 7@@ -14,23 +14,7 @@
6 esac 8 esac
7  9
8 # Finding the root folder for this Scala distribution 10 # Finding the root folder for this Scala distribution
9-SOURCE=$0; 11-SOURCE=$0;
10-SCRIPT=`basename "$SOURCE"`; 12-SCRIPT=`basename "$SOURCE"`;
11-while [ -h "$SOURCE" ]; do 13-while [ -h "$SOURCE" ]; do
12- SCRIPT=`basename "$SOURCE"`; 14- SCRIPT=`basename "$SOURCE"`;
13- LOOKUP=`ls -ld "$SOURCE"`; 15- LOOKUP=`ls -ld "$SOURCE"`;
14- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 16- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
15- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 17- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
16- SOURCE=${TARGET:-.}; 18- SOURCE=${TARGET:-.};
17- else 19- else
18- SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 20- SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
19- fi; 21- fi;
20-done; 22-done;
21-SCALA_HOME=`dirname "$SOURCE"`/..; 23-
22-SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 24-# see #2092
23+#SOURCE=$0; 25-SCALA_HOME=`dirname "$SOURCE"`
24+#SCRIPT=`basename "$SOURCE"`; 26-SCALA_HOME=`cd "$SCALA_HOME"; pwd -P`
25+#while [ -h "$SOURCE" ]; do 27-SCALA_HOME=`cd "$SCALA_HOME"/..; pwd`
26+# SCRIPT=`basename "$SOURCE"`; 
27+# LOOKUP=`ls -ld "$SOURCE"`; 
28+# TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 
29+# if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 
30+# SOURCE=${TARGET:-.}; 
31+# else 
32+# SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 
33+# fi; 
34+#done; 
35+#SCALA_HOME=`dirname "$SOURCE"`/..; 
36+#SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 
37+SCALA_HOME=@SCALA_HOME@ 28+SCALA_HOME=@SCALA_HOME@
 29
38 # Remove spaces from SCALA_HOME on windows 30 # Remove spaces from SCALA_HOME on windows
39 if $cygwin; then 31 if $cygwin; then
40 SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` 32@@ -80,4 +64,4 @@
41@@ -63,4 +64,4 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a 
42 JAVACMD="$JAVA_HOME/bin/java" 33 JAVACMD="$JAVA_HOME/bin/java"
43 fi 34 fi
44  35
45-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" scala.tools.nsc.MainGenericRunner "$@" 36-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" scala.tools.nsc.MainGenericRunner "$@"
46+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 "$@" 37+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 "$@"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/lang/scala/patches/Attic/patch-ae 2010/01/23 10:50:45 1.1.1.1
+++ pkgsrc/lang/scala/patches/Attic/patch-ae 2010/08/12 12:31:47 1.2
@@ -1,46 +1,37 @@ @@ -1,46 +1,37 @@
1$NetBSD: patch-ae,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $ 1$NetBSD: patch-ae,v 1.2 2010/08/12 12:31:47 asau Exp $
2 2
3--- bin/scalac.orig 2009-10-28 06:19:04.000000000 -0700 3Hardwire paths to installed files and Java binary.
4+++ bin/scalac 4
5@@ -14,20 +14,21 @@ case "`uname`" in 5--- bin/scalac.orig 2010-07-13 19:48:47.000000000 +0400
 6+++ bin/scalac 2010-08-12 16:24:05.000000000 +0400
 7@@ -14,23 +14,7 @@
6 esac 8 esac
7  9
8 # Finding the root folder for this Scala distribution 10 # Finding the root folder for this Scala distribution
9-SOURCE=$0; 11-SOURCE=$0;
10-SCRIPT=`basename "$SOURCE"`; 12-SCRIPT=`basename "$SOURCE"`;
11-while [ -h "$SOURCE" ]; do 13-while [ -h "$SOURCE" ]; do
12- SCRIPT=`basename "$SOURCE"`; 14- SCRIPT=`basename "$SOURCE"`;
13- LOOKUP=`ls -ld "$SOURCE"`; 15- LOOKUP=`ls -ld "$SOURCE"`;
14- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 16- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
15- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 17- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
16- SOURCE=${TARGET:-.}; 18- SOURCE=${TARGET:-.};
17- else 19- else
18- SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 20- SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
19- fi; 21- fi;
20-done; 22-done;
21-SCALA_HOME=`dirname "$SOURCE"`/..; 23-
22-SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 24-# see #2092
23+#SOURCE=$0; 25-SCALA_HOME=`dirname "$SOURCE"`
24+#SCRIPT=`basename "$SOURCE"`; 26-SCALA_HOME=`cd "$SCALA_HOME"; pwd -P`
25+#while [ -h "$SOURCE" ]; do 27-SCALA_HOME=`cd "$SCALA_HOME"/..; pwd`
26+# SCRIPT=`basename "$SOURCE"`; 
27+# LOOKUP=`ls -ld "$SOURCE"`; 
28+# TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 
29+# if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 
30+# SOURCE=${TARGET:-.}; 
31+# else 
32+# SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 
33+# fi; 
34+#done; 
35+#SCALA_HOME=`dirname "$SOURCE"`/..; 
36+#SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 
37+SCALA_HOME=@SCALA_HOME@ 28+SCALA_HOME=@SCALA_HOME@
 29
38 # Remove spaces from SCALA_HOME on windows 30 # Remove spaces from SCALA_HOME on windows
39 if $cygwin; then 31 if $cygwin; then
40 SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` 32@@ -80,4 +64,4 @@
41@@ -63,4 +64,4 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a 
42 JAVACMD="$JAVA_HOME/bin/java" 33 JAVACMD="$JAVA_HOME/bin/java"
43 fi 34 fi
44  35
45-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" scala.tools.nsc.Main "$@" 36-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" scala.tools.nsc.Main "$@"
46+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 "$@" 37+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 "$@"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/scala/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/lang/scala/patches/Attic/patch-af 2010/01/23 10:50:45 1.1.1.1
+++ pkgsrc/lang/scala/patches/Attic/patch-af 2010/08/12 12:31:47 1.2
@@ -1,46 +1,37 @@ @@ -1,46 +1,37 @@
1$NetBSD: patch-af,v 1.1.1.1 2010/01/23 10:50:45 yyamano Exp $ 1$NetBSD: patch-af,v 1.2 2010/08/12 12:31:47 asau Exp $
2 2
3--- bin/scaladoc.orig 2009-10-28 06:19:03.000000000 -0700 3Hardwire paths to installed files and Java binary.
4+++ bin/scaladoc 4
5@@ -14,20 +14,21 @@ case "`uname`" in 5--- bin/scaladoc.orig 2010-07-13 19:48:46.000000000 +0400
 6+++ bin/scaladoc 2010-08-12 16:25:02.000000000 +0400
 7@@ -14,23 +14,7 @@
6 esac 8 esac
7  9
8 # Finding the root folder for this Scala distribution 10 # Finding the root folder for this Scala distribution
9-SOURCE=$0; 11-SOURCE=$0;
10-SCRIPT=`basename "$SOURCE"`; 12-SCRIPT=`basename "$SOURCE"`;
11-while [ -h "$SOURCE" ]; do 13-while [ -h "$SOURCE" ]; do
12- SCRIPT=`basename "$SOURCE"`; 14- SCRIPT=`basename "$SOURCE"`;
13- LOOKUP=`ls -ld "$SOURCE"`; 15- LOOKUP=`ls -ld "$SOURCE"`;
14- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 16- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
15- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 17- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
16- SOURCE=${TARGET:-.}; 18- SOURCE=${TARGET:-.};
17- else 19- else
18- SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 20- SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
19- fi; 21- fi;
20-done; 22-done;
21-SCALA_HOME=`dirname "$SOURCE"`/..; 23-
22-SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 24-# see #2092
23+#SOURCE=$0; 25-SCALA_HOME=`dirname "$SOURCE"`
24+#SCRIPT=`basename "$SOURCE"`; 26-SCALA_HOME=`cd "$SCALA_HOME"; pwd -P`
25+#while [ -h "$SOURCE" ]; do 27-SCALA_HOME=`cd "$SCALA_HOME"/..; pwd`
26+# SCRIPT=`basename "$SOURCE"`; 
27+# LOOKUP=`ls -ld "$SOURCE"`; 
28+# TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; 
29+# if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then 
30+# SOURCE=${TARGET:-.}; 
31+# else 
32+# SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; 
33+# fi; 
34+#done; 
35+#SCALA_HOME=`dirname "$SOURCE"`/..; 
36+#SCALA_HOME=`cd "$SCALA_HOME"; pwd`; 
37+SCALA_HOME=@SCALA_HOME@ 28+SCALA_HOME=@SCALA_HOME@
 29
38 # Remove spaces from SCALA_HOME on windows 30 # Remove spaces from SCALA_HOME on windows
39 if $cygwin; then 31 if $cygwin; then
40 SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` 32@@ -80,4 +64,4 @@
41@@ -63,4 +64,4 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a 
42 JAVACMD="$JAVA_HOME/bin/java" 33 JAVACMD="$JAVA_HOME/bin/java"
43 fi 34 fi
44  35
45-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" scala.tools.nsc.ScalaDoc "$@" 36-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" scala.tools.nsc.ScalaDoc "$@"
46+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 "$@" 37+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 "$@"