3 files changed, 149 insertions, 149 deletions

diff --git a/lang/scala/Makefile b/lang/scala/Makefile
index 374e3ebc3307..1332c1395dba 100644
--- a/lang/scala/Makefile
+++ b/lang/scala/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	scala
-PORTVERSION=	2.9.0.1
-PORTREVISION=	1
+PORTVERSION=	2.9.1
 CATEGORIES=	lang java
 MASTER_SITES=	http://www.scala-lang.org/downloads/distrib/files/ \
 		LOCAL/glarkin
+DISTNAME=	${PORTNAME}-${PORTVERSION}.final
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mitsururike@gmail.com
@@ -24,7 +24,7 @@ JAVA_VERSION=	1.5+
 
 MAN1=		fsc.1 sbaz.1 scala.1 scalac.1 scaladoc.1 scalap.1
 
-SCALA_HOME=	${PREFIX}/share/${PORTNAME}
+SCALA_HOME=	${DATADIR}
 SCALA_SHRDIRS=	lib meta misc
 SCALA_BINS=	fsc \
 		sbaz \
diff --git a/lang/scala/distinfo b/lang/scala/distinfo
index 43c515836fb2..f140352b1f3a 100644
--- a/lang/scala/distinfo
+++ b/lang/scala/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scala-2.9.0.1.tgz) = 0db61068d831c3416e19846d9f090df748e08dfbba78030f90fcb5ca355fd407
-SIZE (scala-2.9.0.1.tgz) = 25368402
+SHA256 (scala-2.9.1.final.tgz) = 0bfc99143c63f5f1e3be71a1837b4c8e376e04d801bea4c887ce81661d9c5f13
+SIZE (scala-2.9.1.final.tgz) = 24993458
diff --git a/lang/scala/pkg-plist b/lang/scala/pkg-plist
index 4f736a70e2fa..e922c2cc518e 100644
--- a/lang/scala/pkg-plist
+++ b/lang/scala/pkg-plist
@@ -10,150 +10,150 @@ bin/scala
 bin/scalac
 bin/scaladoc
 bin/scalap
-share/scala/bin/fsc
-share/scala/bin/sbaz
-share/scala/bin/sbaz-setup
-share/scala/bin/scala
-share/scala/bin/scalac
-share/scala/bin/scaladoc
-share/scala/bin/scalap
-share/scala/lib/jline.jar
-share/scala/lib/scala-compiler.jar
-share/scala/lib/scala-dbc.jar
-share/scala/lib/scala-library.jar
-share/scala/lib/scala-swing.jar
-share/scala/lib/scalap.jar
-share/scala/meta/available
-share/scala/meta/description
-share/scala/meta/installed
-share/scala/meta/universe
-share/scala/misc/sbaz-testall/tests/sbaz
-share/scala/misc/sbaz/config/sbaz.properties.example
-share/scala/misc/sbaz/descriptors/README
-share/scala/misc/sbaz/descriptors/lamp-rc
-share/scala/misc/sbaz/descriptors/scala-dev
-share/scala/misc/sbaz/sbaz-tests.jar
-share/scala/misc/sbaz/scala-bazaars.jar
-share/scala/misc/scala-devel/plugins/continuations.jar
-share/scala/misc/scala-tool-support/a2ps/README
-share/scala/misc/scala-tool-support/a2ps/scala.ssh
-share/scala/misc/scala-tool-support/bash-completion/scala_completion.sh
-share/scala/misc/scala-tool-support/bluefish/README
-share/scala/misc/scala-tool-support/bluefish/highlighting
-share/scala/misc/scala-tool-support/emacs/AUTHORS
-share/scala/misc/scala-tool-support/emacs/FUTURE
-share/scala/misc/scala-tool-support/emacs/Makefile
-share/scala/misc/scala-tool-support/emacs/README
-share/scala/misc/scala-tool-support/emacs/contrib/README
-share/scala/misc/scala-tool-support/emacs/contrib/dot-ctags
-share/scala/misc/scala-tool-support/emacs/scala-mode-auto.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-constants.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-feature-electric.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-feature-speedbar.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-feature-tags.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-feature.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-fontlock.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-indent.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-inf.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-lib.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-navigation.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-ui.el
-share/scala/misc/scala-tool-support/emacs/scala-mode-variables.el
-share/scala/misc/scala-tool-support/emacs/scala-mode.el
-share/scala/misc/scala-tool-support/enscript/README
-share/scala/misc/scala-tool-support/enscript/scala.st
-share/scala/misc/scala-tool-support/gedit/README
-share/scala/misc/scala-tool-support/gedit/scala.lang
-share/scala/misc/scala-tool-support/geshi/scala-alt.php
-share/scala/misc/scala-tool-support/geshi/scala.php
-share/scala/misc/scala-tool-support/intellij/README
-share/scala/misc/scala-tool-support/intellij/scala.xml
-share/scala/misc/scala-tool-support/jedit/console/README
-share/scala/misc/scala-tool-support/jedit/console/commando/scala.xml
-share/scala/misc/scala-tool-support/jedit/console/commando/scalac.xml
-share/scala/misc/scala-tool-support/jedit/modes/README
-share/scala/misc/scala-tool-support/jedit/modes/scala.xml
-share/scala/misc/scala-tool-support/kate/README
-share/scala/misc/scala-tool-support/kate/scala.xml
-share/scala/misc/scala-tool-support/latex/scaladefs.sty
-share/scala/misc/scala-tool-support/latex/scaladoc.sty
-share/scala/misc/scala-tool-support/latex/scalatex.scm
-share/scala/misc/scala-tool-support/latex/tweaklist.sty
-share/scala/misc/scala-tool-support/latex/verbfilterScala.java
-share/scala/misc/scala-tool-support/notepad-plus/README
-share/scala/misc/scala-tool-support/notepad-plus/userDefineLang.xml
-share/scala/misc/scala-tool-support/scite/README
-share/scala/misc/scala-tool-support/scite/scala.properties
-share/scala/misc/scala-tool-support/subethaedit/Documentation.webloc
-share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Info.plist
-share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/AutocompleteAdditions.txt
-share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/InfoPlist.strings
-share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/Localizable.strings
-share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/ModeSettings.xml
-share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/RegexSymbols.xml
-share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/Scripts/Rot13.scpt
-share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/SyntaxDefinition.xml
-share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/mytemplate.scala
-share/scala/misc/scala-tool-support/subethaedit/artwork/SymbolM.psd
-share/scala/misc/scala-tool-support/subethaedit/artwork/readme.txt
-share/scala/misc/scala-tool-support/textmate/Bundles/Scala.tmbundle.zip
-share/scala/misc/scala-tool-support/textwrangler/README
-share/scala/misc/scala-tool-support/textwrangler/Scala_Configuration.plist
-share/scala/misc/scala-tool-support/vim/README
-share/scala/misc/scala-tool-support/vim/ftdetect/scala.vim
-share/scala/misc/scala-tool-support/vim/indent/scala.vim
-share/scala/misc/scala-tool-support/vim/plugin/31-create-scala.vim
-share/scala/misc/scala-tool-support/vim/syntax/scala.vim
-share/scala/misc/scala-tool-support/xcode/README
-share/scala/misc/scala-tool-support/xcode/Specifications/Scala.pbfilespec
-share/scala/misc/scala-tool-support/xcode/Specifications/Scala.pblangspec
-@dirrm share/scala/misc/scala-tool-support/xcode/Specifications
-@dirrm share/scala/misc/scala-tool-support/xcode
-@dirrm share/scala/misc/scala-tool-support/vim/syntax
-@dirrm share/scala/misc/scala-tool-support/vim/plugin
-@dirrm share/scala/misc/scala-tool-support/vim/indent
-@dirrm share/scala/misc/scala-tool-support/vim/ftdetect
-@dirrm share/scala/misc/scala-tool-support/vim
-@dirrm share/scala/misc/scala-tool-support/textwrangler
-@dirrm share/scala/misc/scala-tool-support/textmate/Bundles
-@dirrm share/scala/misc/scala-tool-support/textmate
-@dirrm share/scala/misc/scala-tool-support/subethaedit/artwork
-@dirrm share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/Scripts
-@dirrm share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj
-@dirrm share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources
-@dirrm share/scala/misc/scala-tool-support/subethaedit/Scala.mode/Contents
-@dirrm share/scala/misc/scala-tool-support/subethaedit/Scala.mode
-@dirrm share/scala/misc/scala-tool-support/subethaedit
-@dirrm share/scala/misc/scala-tool-support/scite
-@dirrm share/scala/misc/scala-tool-support/notepad-plus
-@dirrm share/scala/misc/scala-tool-support/latex
-@dirrm share/scala/misc/scala-tool-support/kate
-@dirrm share/scala/misc/scala-tool-support/jedit/modes
-@dirrm share/scala/misc/scala-tool-support/jedit/console/commando
-@dirrm share/scala/misc/scala-tool-support/jedit/console
-@dirrm share/scala/misc/scala-tool-support/jedit
-@dirrm share/scala/misc/scala-tool-support/intellij
-@dirrm share/scala/misc/scala-tool-support/geshi
-@dirrm share/scala/misc/scala-tool-support/gedit
-@dirrm share/scala/misc/scala-tool-support/enscript
-@dirrm share/scala/misc/scala-tool-support/emacs/contrib
-@dirrm share/scala/misc/scala-tool-support/emacs
-@dirrm share/scala/misc/scala-tool-support/bluefish
-@dirrm share/scala/misc/scala-tool-support/bash-completion
-@dirrm share/scala/misc/scala-tool-support/a2ps
-@dirrm share/scala/misc/scala-tool-support
-@dirrm share/scala/misc/scala-devel/plugins
-@dirrm share/scala/misc/scala-devel
-@dirrm share/scala/misc/sbaz/descriptors
-@dirrm share/scala/misc/sbaz/config
-@dirrm share/scala/misc/sbaz-testall/tests
-@dirrm share/scala/misc/sbaz-testall
-@dirrm share/scala/misc/sbaz
-@dirrm share/scala/misc
-@dirrm share/scala/meta
-@dirrm share/scala/lib
-@dirrm share/scala/bin
-@dirrmtry share/scala
+%%DATADIR%%/bin/fsc
+%%DATADIR%%/bin/sbaz
+%%DATADIR%%/bin/sbaz-setup
+%%DATADIR%%/bin/scala
+%%DATADIR%%/bin/scalac
+%%DATADIR%%/bin/scaladoc
+%%DATADIR%%/bin/scalap
+%%DATADIR%%/lib/jline.jar
+%%DATADIR%%/lib/scala-compiler.jar
+%%DATADIR%%/lib/scala-dbc.jar
+%%DATADIR%%/lib/scala-library.jar
+%%DATADIR%%/lib/scala-swing.jar
+%%DATADIR%%/lib/scalap.jar
+%%DATADIR%%/meta/available
+%%DATADIR%%/meta/description
+%%DATADIR%%/meta/installed
+%%DATADIR%%/meta/universe
+%%DATADIR%%/misc/sbaz-testall/tests/sbaz
+%%DATADIR%%/misc/sbaz/config/sbaz.properties.example
+%%DATADIR%%/misc/sbaz/descriptors/README
+%%DATADIR%%/misc/sbaz/descriptors/lamp-rc
+%%DATADIR%%/misc/sbaz/descriptors/scala-dev
+%%DATADIR%%/misc/sbaz/sbaz-tests.jar
+%%DATADIR%%/misc/sbaz/scala-bazaars.jar
+%%DATADIR%%/misc/scala-devel/plugins/continuations.jar
+%%DATADIR%%/misc/scala-tool-support/a2ps/README
+%%DATADIR%%/misc/scala-tool-support/a2ps/scala.ssh
+%%DATADIR%%/misc/scala-tool-support/bash-completion/scala_completion.sh
+%%DATADIR%%/misc/scala-tool-support/bluefish/README
+%%DATADIR%%/misc/scala-tool-support/bluefish/highlighting
+%%DATADIR%%/misc/scala-tool-support/emacs/AUTHORS
+%%DATADIR%%/misc/scala-tool-support/emacs/FUTURE
+%%DATADIR%%/misc/scala-tool-support/emacs/Makefile
+%%DATADIR%%/misc/scala-tool-support/emacs/README
+%%DATADIR%%/misc/scala-tool-support/emacs/contrib/README
+%%DATADIR%%/misc/scala-tool-support/emacs/contrib/dot-ctags
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-auto.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-constants.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-feature-electric.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-feature-speedbar.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-feature-tags.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-feature.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-fontlock.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-indent.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-inf.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-lib.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-navigation.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-ui.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-variables.el
+%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode.el
+%%DATADIR%%/misc/scala-tool-support/enscript/README
+%%DATADIR%%/misc/scala-tool-support/enscript/scala.st
+%%DATADIR%%/misc/scala-tool-support/gedit/README
+%%DATADIR%%/misc/scala-tool-support/gedit/scala.lang
+%%DATADIR%%/misc/scala-tool-support/geshi/scala-alt.php
+%%DATADIR%%/misc/scala-tool-support/geshi/scala.php
+%%DATADIR%%/misc/scala-tool-support/intellij/README
+%%DATADIR%%/misc/scala-tool-support/intellij/scala.xml
+%%DATADIR%%/misc/scala-tool-support/jedit/console/README
+%%DATADIR%%/misc/scala-tool-support/jedit/console/commando/scala.xml
+%%DATADIR%%/misc/scala-tool-support/jedit/console/commando/scalac.xml
+%%DATADIR%%/misc/scala-tool-support/jedit/modes/README
+%%DATADIR%%/misc/scala-tool-support/jedit/modes/scala.xml
+%%DATADIR%%/misc/scala-tool-support/kate/README
+%%DATADIR%%/misc/scala-tool-support/kate/scala.xml
+%%DATADIR%%/misc/scala-tool-support/latex/scaladefs.sty
+%%DATADIR%%/misc/scala-tool-support/latex/scaladoc.sty
+%%DATADIR%%/misc/scala-tool-support/latex/scalatex.scm
+%%DATADIR%%/misc/scala-tool-support/latex/tweaklist.sty
+%%DATADIR%%/misc/scala-tool-support/latex/verbfilterScala.java
+%%DATADIR%%/misc/scala-tool-support/notepad-plus/README
+%%DATADIR%%/misc/scala-tool-support/notepad-plus/userDefineLang.xml
+%%DATADIR%%/misc/scala-tool-support/scite/README
+%%DATADIR%%/misc/scala-tool-support/scite/scala.properties
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Documentation.webloc
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Info.plist
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/AutocompleteAdditions.txt
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/InfoPlist.strings
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/Localizable.strings
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/ModeSettings.xml
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/RegexSymbols.xml
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/Scripts/Rot13.scpt
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/SyntaxDefinition.xml
+%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/mytemplate.scala
+%%DATADIR%%/misc/scala-tool-support/subethaedit/artwork/SymbolM.psd
+%%DATADIR%%/misc/scala-tool-support/subethaedit/artwork/readme.txt
+%%DATADIR%%/misc/scala-tool-support/textmate/Bundles/Scala.tmbundle.zip
+%%DATADIR%%/misc/scala-tool-support/textwrangler/README
+%%DATADIR%%/misc/scala-tool-support/textwrangler/Scala_Configuration.plist
+%%DATADIR%%/misc/scala-tool-support/vim/README
+%%DATADIR%%/misc/scala-tool-support/vim/ftdetect/scala.vim
+%%DATADIR%%/misc/scala-tool-support/vim/indent/scala.vim
+%%DATADIR%%/misc/scala-tool-support/vim/plugin/31-create-scala.vim
+%%DATADIR%%/misc/scala-tool-support/vim/syntax/scala.vim
+%%DATADIR%%/misc/scala-tool-support/xcode/README
+%%DATADIR%%/misc/scala-tool-support/xcode/Specifications/Scala.pbfilespec
+%%DATADIR%%/misc/scala-tool-support/xcode/Specifications/Scala.pblangspec
+@dirrm %%DATADIR%%/misc/scala-tool-support/xcode/Specifications
+@dirrm %%DATADIR%%/misc/scala-tool-support/xcode
+@dirrm %%DATADIR%%/misc/scala-tool-support/vim/syntax
+@dirrm %%DATADIR%%/misc/scala-tool-support/vim/plugin
+@dirrm %%DATADIR%%/misc/scala-tool-support/vim/indent
+@dirrm %%DATADIR%%/misc/scala-tool-support/vim/ftdetect
+@dirrm %%DATADIR%%/misc/scala-tool-support/vim
+@dirrm %%DATADIR%%/misc/scala-tool-support/textwrangler
+@dirrm %%DATADIR%%/misc/scala-tool-support/textmate/Bundles
+@dirrm %%DATADIR%%/misc/scala-tool-support/textmate
+@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/artwork
+@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/Scripts
+@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj
+@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources
+@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents
+@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode
+@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit
+@dirrm %%DATADIR%%/misc/scala-tool-support/scite
+@dirrm %%DATADIR%%/misc/scala-tool-support/notepad-plus
+@dirrm %%DATADIR%%/misc/scala-tool-support/latex
+@dirrm %%DATADIR%%/misc/scala-tool-support/kate
+@dirrm %%DATADIR%%/misc/scala-tool-support/jedit/modes
+@dirrm %%DATADIR%%/misc/scala-tool-support/jedit/console/commando
+@dirrm %%DATADIR%%/misc/scala-tool-support/jedit/console
+@dirrm %%DATADIR%%/misc/scala-tool-support/jedit
+@dirrm %%DATADIR%%/misc/scala-tool-support/intellij
+@dirrm %%DATADIR%%/misc/scala-tool-support/geshi
+@dirrm %%DATADIR%%/misc/scala-tool-support/gedit
+@dirrm %%DATADIR%%/misc/scala-tool-support/enscript
+@dirrm %%DATADIR%%/misc/scala-tool-support/emacs/contrib
+@dirrm %%DATADIR%%/misc/scala-tool-support/emacs
+@dirrm %%DATADIR%%/misc/scala-tool-support/bluefish
+@dirrm %%DATADIR%%/misc/scala-tool-support/bash-completion
+@dirrm %%DATADIR%%/misc/scala-tool-support/a2ps
+@dirrm %%DATADIR%%/misc/scala-tool-support
+@dirrm %%DATADIR%%/misc/scala-devel/plugins
+@dirrm %%DATADIR%%/misc/scala-devel
+@dirrm %%DATADIR%%/misc/sbaz/descriptors
+@dirrm %%DATADIR%%/misc/sbaz/config
+@dirrm %%DATADIR%%/misc/sbaz-testall/tests
+@dirrm %%DATADIR%%/misc/sbaz-testall
+@dirrm %%DATADIR%%/misc/sbaz
+@dirrm %%DATADIR%%/misc
+@dirrm %%DATADIR%%/meta
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/bin
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/sbaz-setup
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/sbaz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%