Update ruby-haml package to 3.1.2.

3.1.1

* Update the vendored Sass to version 3.1.0.

3.1.0

* Don't add a type attribute to <script> and <style> tags generated by
  filters when :format is set to :html5.

* Add an :escape_attrs option that allows attributes to either remain
  unescaped (for things like embedding PHP directives in Haml) or to be always
  escaped rather than #escape_onced. This can also be used from the command
  line via --no-escape-attrs.

* Allow custom filters to be loaded from the command line.

Backwards Incompatibilities - Must Read!

* Get rid of the --rails flag for the haml executable. This flag hasn't been
  necessary since Rails 2.0. Existing Rails 2.0 installations will continue to
  work.

* Drop support for Hpricot 0.7. 0.8 has been out for nearly two years.

3.0.25

Tagged on GitHub.

* HTML-to-Haml conversion now works within Ruby even if Hpricot is loaded
  before haml/html.

3 files changed, 253 insertions, 197 deletions

diff --git a/textproc/ruby-haml/Makefile b/textproc/ruby-haml/Makefile
index 7a3d28540c1..b48ce1d12fd 100644
--- a/textproc/ruby-haml/Makefile
+++ b/textproc/ruby-haml/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2010/12/04 04:27:30 taca Exp $
+# $NetBSD: Makefile,v 1.7 2011/06/19 07:59:18 taca Exp $
 
-DISTNAME=	haml-3.0.24
+DISTNAME=	haml-3.1.2
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,7 +8,7 @@ HOMEPAGE=	http://haml-lang.com/
 COMMENT=	XHTML & CSS markup language & template engine
 LICENSE=	mit
 
-CONFLICTS+=	ruby[1-9][0-9]-haml-*
+CONFLICTS+=	ruby[1-9][0-9]-haml-[0-9]*
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-haml/PLIST b/textproc/ruby-haml/PLIST
index 2cfddfc3559..89d678e2cda 100644
--- a/textproc/ruby-haml/PLIST
+++ b/textproc/ruby-haml/PLIST
@@ -1,9 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2010/12/04 04:27:30 taca Exp $
-bin/css2sass
+@comment $NetBSD: PLIST,v 1.7 2011/06/19 07:59:18 taca Exp $
 bin/haml
 bin/html2haml
-bin/sass
-bin/sass-convert
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.yardopts
 ${GEM_LIBDIR}/CONTRIBUTING
@@ -13,17 +10,13 @@ ${GEM_LIBDIR}/REVISION
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/VERSION
 ${GEM_LIBDIR}/VERSION_NAME
-${GEM_LIBDIR}/bin/css2sass
 ${GEM_LIBDIR}/bin/haml
 ${GEM_LIBDIR}/bin/html2haml
-${GEM_LIBDIR}/bin/sass
-${GEM_LIBDIR}/bin/sass-convert
-${GEM_LIBDIR}/extra/haml-mode.el
-${GEM_LIBDIR}/extra/sass-mode.el
 ${GEM_LIBDIR}/extra/update_watch.rb
 ${GEM_LIBDIR}/init.rb
 ${GEM_LIBDIR}/lib/haml.rb
 ${GEM_LIBDIR}/lib/haml/buffer.rb
+${GEM_LIBDIR}/lib/haml/compiler.rb
 ${GEM_LIBDIR}/lib/haml/engine.rb
 ${GEM_LIBDIR}/lib/haml/error.rb
 ${GEM_LIBDIR}/lib/haml/exec.rb
@@ -34,7 +27,7 @@ ${GEM_LIBDIR}/lib/haml/helpers/action_view_mods.rb
 ${GEM_LIBDIR}/lib/haml/helpers/xss_mods.rb
 ${GEM_LIBDIR}/lib/haml/html.rb
 ${GEM_LIBDIR}/lib/haml/html/erb.rb
-${GEM_LIBDIR}/lib/haml/precompiler.rb
+${GEM_LIBDIR}/lib/haml/parser.rb
 ${GEM_LIBDIR}/lib/haml/railtie.rb
 ${GEM_LIBDIR}/lib/haml/root.rb
 ${GEM_LIBDIR}/lib/haml/shared.rb
@@ -43,73 +36,11 @@ ${GEM_LIBDIR}/lib/haml/template/options.rb
 ${GEM_LIBDIR}/lib/haml/template/patch.rb
 ${GEM_LIBDIR}/lib/haml/template/plugin.rb
 ${GEM_LIBDIR}/lib/haml/util.rb
-${GEM_LIBDIR}/lib/haml/util/subset_map.rb
 ${GEM_LIBDIR}/lib/haml/version.rb
 ${GEM_LIBDIR}/lib/sass.rb
-${GEM_LIBDIR}/lib/sass/callbacks.rb
-${GEM_LIBDIR}/lib/sass/css.rb
-${GEM_LIBDIR}/lib/sass/engine.rb
-${GEM_LIBDIR}/lib/sass/environment.rb
-${GEM_LIBDIR}/lib/sass/error.rb
-${GEM_LIBDIR}/lib/sass/files.rb
-${GEM_LIBDIR}/lib/sass/less.rb
 ${GEM_LIBDIR}/lib/sass/plugin.rb
-${GEM_LIBDIR}/lib/sass/plugin/configuration.rb
-${GEM_LIBDIR}/lib/sass/plugin/generic.rb
-${GEM_LIBDIR}/lib/sass/plugin/merb.rb
-${GEM_LIBDIR}/lib/sass/plugin/rack.rb
-${GEM_LIBDIR}/lib/sass/plugin/rails.rb
-${GEM_LIBDIR}/lib/sass/plugin/staleness_checker.rb
-${GEM_LIBDIR}/lib/sass/repl.rb
-${GEM_LIBDIR}/lib/sass/script.rb
-${GEM_LIBDIR}/lib/sass/script/bool.rb
-${GEM_LIBDIR}/lib/sass/script/color.rb
-${GEM_LIBDIR}/lib/sass/script/css_lexer.rb
-${GEM_LIBDIR}/lib/sass/script/css_parser.rb
-${GEM_LIBDIR}/lib/sass/script/funcall.rb
-${GEM_LIBDIR}/lib/sass/script/functions.rb
-${GEM_LIBDIR}/lib/sass/script/interpolation.rb
-${GEM_LIBDIR}/lib/sass/script/lexer.rb
-${GEM_LIBDIR}/lib/sass/script/literal.rb
-${GEM_LIBDIR}/lib/sass/script/node.rb
-${GEM_LIBDIR}/lib/sass/script/number.rb
-${GEM_LIBDIR}/lib/sass/script/operation.rb
-${GEM_LIBDIR}/lib/sass/script/parser.rb
-${GEM_LIBDIR}/lib/sass/script/string.rb
-${GEM_LIBDIR}/lib/sass/script/string_interpolation.rb
-${GEM_LIBDIR}/lib/sass/script/unary_operation.rb
-${GEM_LIBDIR}/lib/sass/script/variable.rb
-${GEM_LIBDIR}/lib/sass/scss.rb
-${GEM_LIBDIR}/lib/sass/scss/css_parser.rb
-${GEM_LIBDIR}/lib/sass/scss/parser.rb
-${GEM_LIBDIR}/lib/sass/scss/rx.rb
-${GEM_LIBDIR}/lib/sass/scss/sass_parser.rb
-${GEM_LIBDIR}/lib/sass/scss/script_lexer.rb
-${GEM_LIBDIR}/lib/sass/scss/script_parser.rb
-${GEM_LIBDIR}/lib/sass/scss/static_parser.rb
-${GEM_LIBDIR}/lib/sass/selector.rb
-${GEM_LIBDIR}/lib/sass/selector/abstract_sequence.rb
-${GEM_LIBDIR}/lib/sass/selector/comma_sequence.rb
-${GEM_LIBDIR}/lib/sass/selector/sequence.rb
-${GEM_LIBDIR}/lib/sass/selector/simple.rb
-${GEM_LIBDIR}/lib/sass/selector/simple_sequence.rb
-${GEM_LIBDIR}/lib/sass/tree/charset_node.rb
-${GEM_LIBDIR}/lib/sass/tree/comment_node.rb
-${GEM_LIBDIR}/lib/sass/tree/debug_node.rb
-${GEM_LIBDIR}/lib/sass/tree/directive_node.rb
-${GEM_LIBDIR}/lib/sass/tree/extend_node.rb
-${GEM_LIBDIR}/lib/sass/tree/for_node.rb
-${GEM_LIBDIR}/lib/sass/tree/if_node.rb
-${GEM_LIBDIR}/lib/sass/tree/import_node.rb
-${GEM_LIBDIR}/lib/sass/tree/mixin_def_node.rb
-${GEM_LIBDIR}/lib/sass/tree/mixin_node.rb
-${GEM_LIBDIR}/lib/sass/tree/node.rb
-${GEM_LIBDIR}/lib/sass/tree/prop_node.rb
-${GEM_LIBDIR}/lib/sass/tree/root_node.rb
-${GEM_LIBDIR}/lib/sass/tree/rule_node.rb
-${GEM_LIBDIR}/lib/sass/tree/variable_node.rb
-${GEM_LIBDIR}/lib/sass/tree/warn_node.rb
-${GEM_LIBDIR}/lib/sass/tree/while_node.rb
+${GEM_LIBDIR}/lib/sass/rails2_shim.rb
+${GEM_LIBDIR}/lib/sass/rails3_shim.rb
 ${GEM_LIBDIR}/rails/init.rb
 ${GEM_LIBDIR}/test/benchmark.rb
 ${GEM_LIBDIR}/test/haml/engine_test.rb
@@ -177,123 +108,248 @@ ${GEM_LIBDIR}/test/haml/templates/standard_ugly.haml
 ${GEM_LIBDIR}/test/haml/templates/tag_parsing.haml
 ${GEM_LIBDIR}/test/haml/templates/very_basic.haml
 ${GEM_LIBDIR}/test/haml/templates/whitespace_handling.haml
-${GEM_LIBDIR}/test/haml/util/subset_map_test.rb
 ${GEM_LIBDIR}/test/haml/util_test.rb
 ${GEM_LIBDIR}/test/linked_rails.rb
-${GEM_LIBDIR}/test/sass/callbacks_test.rb
-${GEM_LIBDIR}/test/sass/conversion_test.rb
-${GEM_LIBDIR}/test/sass/css2sass_test.rb
-${GEM_LIBDIR}/test/sass/data/hsl-rgb.txt
-${GEM_LIBDIR}/test/sass/engine_test.rb
-${GEM_LIBDIR}/test/sass/extend_test.rb
-${GEM_LIBDIR}/test/sass/functions_test.rb
-${GEM_LIBDIR}/test/sass/less_conversion_test.rb
-${GEM_LIBDIR}/test/sass/more_results/more1.css
-${GEM_LIBDIR}/test/sass/more_results/more1_with_line_comments.css
-${GEM_LIBDIR}/test/sass/more_results/more_import.css
-${GEM_LIBDIR}/test/sass/more_templates/_more_partial.sass
-${GEM_LIBDIR}/test/sass/more_templates/more1.sass
-${GEM_LIBDIR}/test/sass/more_templates/more_import.sass
-${GEM_LIBDIR}/test/sass/plugin_test.rb
-${GEM_LIBDIR}/test/sass/results/alt.css
-${GEM_LIBDIR}/test/sass/results/basic.css
-${GEM_LIBDIR}/test/sass/results/compact.css
-${GEM_LIBDIR}/test/sass/results/complex.css
-${GEM_LIBDIR}/test/sass/results/compressed.css
-${GEM_LIBDIR}/test/sass/results/expanded.css
-${GEM_LIBDIR}/test/sass/results/import.css
-${GEM_LIBDIR}/test/sass/results/import_charset.css
-${GEM_LIBDIR}/test/sass/results/import_charset_1_8.css
-${GEM_LIBDIR}/test/sass/results/import_charset_ibm866.css
-${GEM_LIBDIR}/test/sass/results/line_numbers.css
-${GEM_LIBDIR}/test/sass/results/mixins.css
-${GEM_LIBDIR}/test/sass/results/multiline.css
-${GEM_LIBDIR}/test/sass/results/nested.css
-${GEM_LIBDIR}/test/sass/results/options.css
-${GEM_LIBDIR}/test/sass/results/parent_ref.css
-${GEM_LIBDIR}/test/sass/results/script.css
-${GEM_LIBDIR}/test/sass/results/scss_import.css
-${GEM_LIBDIR}/test/sass/results/scss_importee.css
-${GEM_LIBDIR}/test/sass/results/subdir/nested_subdir/nested_subdir.css
-${GEM_LIBDIR}/test/sass/results/subdir/subdir.css
-${GEM_LIBDIR}/test/sass/results/units.css
-${GEM_LIBDIR}/test/sass/results/warn.css
-${GEM_LIBDIR}/test/sass/results/warn_imported.css
-${GEM_LIBDIR}/test/sass/script_conversion_test.rb
-${GEM_LIBDIR}/test/sass/script_test.rb
-${GEM_LIBDIR}/test/sass/scss/css_test.rb
-${GEM_LIBDIR}/test/sass/scss/rx_test.rb
-${GEM_LIBDIR}/test/sass/scss/scss_test.rb
-${GEM_LIBDIR}/test/sass/scss/test_helper.rb
-${GEM_LIBDIR}/test/sass/templates/_imported_charset_ibm866.sass
-${GEM_LIBDIR}/test/sass/templates/_imported_charset_utf8.sass
-${GEM_LIBDIR}/test/sass/templates/_partial.sass
-${GEM_LIBDIR}/test/sass/templates/alt.sass
-${GEM_LIBDIR}/test/sass/templates/basic.sass
-${GEM_LIBDIR}/test/sass/templates/bork1.sass
-${GEM_LIBDIR}/test/sass/templates/bork2.sass
-${GEM_LIBDIR}/test/sass/templates/bork3.sass
-${GEM_LIBDIR}/test/sass/templates/bork4.sass
-${GEM_LIBDIR}/test/sass/templates/compact.sass
-${GEM_LIBDIR}/test/sass/templates/complex.sass
-${GEM_LIBDIR}/test/sass/templates/compressed.sass
-${GEM_LIBDIR}/test/sass/templates/expanded.sass
-${GEM_LIBDIR}/test/sass/templates/import.sass
-${GEM_LIBDIR}/test/sass/templates/import_charset.sass
-${GEM_LIBDIR}/test/sass/templates/import_charset_1_8.sass
-${GEM_LIBDIR}/test/sass/templates/import_charset_ibm866.sass
-${GEM_LIBDIR}/test/sass/templates/importee.less
-${GEM_LIBDIR}/test/sass/templates/importee.sass
-${GEM_LIBDIR}/test/sass/templates/line_numbers.sass
-${GEM_LIBDIR}/test/sass/templates/mixin_bork.sass
-${GEM_LIBDIR}/test/sass/templates/mixins.sass
-${GEM_LIBDIR}/test/sass/templates/multiline.sass
-${GEM_LIBDIR}/test/sass/templates/nested.sass
-${GEM_LIBDIR}/test/sass/templates/nested_bork1.sass
-${GEM_LIBDIR}/test/sass/templates/nested_bork2.sass
-${GEM_LIBDIR}/test/sass/templates/nested_bork3.sass
-${GEM_LIBDIR}/test/sass/templates/nested_bork4.sass
-${GEM_LIBDIR}/test/sass/templates/nested_mixin_bork.sass
-${GEM_LIBDIR}/test/sass/templates/options.sass
-${GEM_LIBDIR}/test/sass/templates/parent_ref.sass
-${GEM_LIBDIR}/test/sass/templates/script.sass
-${GEM_LIBDIR}/test/sass/templates/scss_import.scss
-${GEM_LIBDIR}/test/sass/templates/scss_importee.scss
-${GEM_LIBDIR}/test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-${GEM_LIBDIR}/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-${GEM_LIBDIR}/test/sass/templates/subdir/subdir.sass
-${GEM_LIBDIR}/test/sass/templates/units.sass
-${GEM_LIBDIR}/test/sass/templates/warn.sass
-${GEM_LIBDIR}/test/sass/templates/warn_imported.sass
 ${GEM_LIBDIR}/test/test_helper.rb
-${GEM_LIBDIR}/vendor/fssm/LICENSE
-${GEM_LIBDIR}/vendor/fssm/README.markdown
-${GEM_LIBDIR}/vendor/fssm/Rakefile
-${GEM_LIBDIR}/vendor/fssm/VERSION.yml
-${GEM_LIBDIR}/vendor/fssm/example.rb
-${GEM_LIBDIR}/vendor/fssm/fssm.gemspec
-${GEM_LIBDIR}/vendor/fssm/lib/fssm.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/backends/fsevents.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/backends/inotify.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/backends/polling.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/monitor.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/path.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/pathname.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/state/directory.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/state/file.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/support.rb
-${GEM_LIBDIR}/vendor/fssm/lib/fssm/tree.rb
-${GEM_LIBDIR}/vendor/fssm/profile/prof-cache.rb
-${GEM_LIBDIR}/vendor/fssm/profile/prof-fssm-pathname.html
-${GEM_LIBDIR}/vendor/fssm/profile/prof-pathname.rb
-${GEM_LIBDIR}/vendor/fssm/profile/prof-plain-pathname.html
-${GEM_LIBDIR}/vendor/fssm/profile/prof.html
-${GEM_LIBDIR}/vendor/fssm/spec/path_spec.rb
-${GEM_LIBDIR}/vendor/fssm/spec/root/duck/quack.txt
-${GEM_LIBDIR}/vendor/fssm/spec/root/file.css
-${GEM_LIBDIR}/vendor/fssm/spec/root/file.rb
-${GEM_LIBDIR}/vendor/fssm/spec/root/file.yml
-${GEM_LIBDIR}/vendor/fssm/spec/root/moo/cow.txt
-${GEM_LIBDIR}/vendor/fssm/spec/spec_helper.rb
+${GEM_LIBDIR}/vendor/sass/CONTRIBUTING
+${GEM_LIBDIR}/vendor/sass/MIT-LICENSE
+${GEM_LIBDIR}/vendor/sass/README.md
+${GEM_LIBDIR}/vendor/sass/Rakefile
+${GEM_LIBDIR}/vendor/sass/TODO
+${GEM_LIBDIR}/vendor/sass/VERSION
+${GEM_LIBDIR}/vendor/sass/VERSION_NAME
+${GEM_LIBDIR}/vendor/sass/bin/sass
+${GEM_LIBDIR}/vendor/sass/bin/sass-convert
+${GEM_LIBDIR}/vendor/sass/bin/scss
+${GEM_LIBDIR}/vendor/sass/doc-src/FAQ.md
+${GEM_LIBDIR}/vendor/sass/doc-src/INDENTED_SYNTAX.md
+${GEM_LIBDIR}/vendor/sass/doc-src/SASS_CHANGELOG.md
+${GEM_LIBDIR}/vendor/sass/doc-src/SASS_REFERENCE.md
+${GEM_LIBDIR}/vendor/sass/doc-src/SCSS_FOR_SASS_USERS.md
+${GEM_LIBDIR}/vendor/sass/ext/extconf.rb
+${GEM_LIBDIR}/vendor/sass/extra/update_watch.rb
+${GEM_LIBDIR}/vendor/sass/init.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/cache_stores.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/cache_stores/base.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/cache_stores/chain.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/cache_stores/filesystem.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/cache_stores/memory.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/cache_stores/null.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/callbacks.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/css.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/engine.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/environment.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/error.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/exec.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/importers.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/importers/base.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/importers/filesystem.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/less.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/plugin.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/plugin/compiler.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/plugin/configuration.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/plugin/generic.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/plugin/merb.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/plugin/rack.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/plugin/rails.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/plugin/staleness_checker.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/railtie.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/repl.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/root.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/bool.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/color.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/css_lexer.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/css_parser.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/funcall.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/functions.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/interpolation.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/lexer.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/list.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/literal.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/number.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/operation.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/parser.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/string.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/string_interpolation.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/unary_operation.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/script/variable.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/scss.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/scss/css_parser.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/scss/parser.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/scss/rx.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/scss/sass_parser.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/scss/script_lexer.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/scss/script_parser.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/scss/static_parser.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/selector.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/selector/abstract_sequence.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/selector/comma_sequence.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/selector/sequence.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/selector/simple.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/selector/simple_sequence.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/shared.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/charset_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/comment_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/debug_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/directive_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/each_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/extend_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/for_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/function_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/if_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/import_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/media_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/mixin_def_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/mixin_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/prop_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/return_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/root_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/rule_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/variable_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/visitors/base.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/visitors/check_nesting.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/visitors/convert.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/visitors/cssize.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/visitors/perform.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/visitors/to_css.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/warn_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/tree/while_node.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/util.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/util/subset_map.rb
+${GEM_LIBDIR}/vendor/sass/lib/sass/version.rb
+${GEM_LIBDIR}/vendor/sass/rails/init.rb
+${GEM_LIBDIR}/vendor/sass/sass.gemspec
+${GEM_LIBDIR}/vendor/sass/test/sass/cache_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/callbacks_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/conversion_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/css2sass_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/data/hsl-rgb.txt
+${GEM_LIBDIR}/vendor/sass/test/sass/engine_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/extend_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/functions_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/importer_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/less_conversion_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/mock_importer.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/more_results/more1.css
+${GEM_LIBDIR}/vendor/sass/test/sass/more_results/more1_with_line_comments.css
+${GEM_LIBDIR}/vendor/sass/test/sass/more_results/more_import.css
+${GEM_LIBDIR}/vendor/sass/test/sass/more_templates/_more_partial.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/more_templates/more1.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/more_templates/more_import.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/plugin_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/results/alt.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/basic.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/compact.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/complex.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/compressed.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/expanded.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/if.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/import.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/import_charset.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/import_charset_1_8.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/import_charset_ibm866.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/line_numbers.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/mixins.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/multiline.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/nested.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/options.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/parent_ref.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/script.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/scss_import.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/scss_importee.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/subdir/nested_subdir/nested_subdir.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/subdir/subdir.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/units.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/warn.css
+${GEM_LIBDIR}/vendor/sass/test/sass/results/warn_imported.css
+${GEM_LIBDIR}/vendor/sass/test/sass/script_conversion_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/script_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/scss/css_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/scss/rx_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/scss/scss_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/scss/test_helper.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/_imported_charset_ibm866.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/_imported_charset_utf8.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/_partial.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/alt.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/basic.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/bork1.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/bork2.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/bork3.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/bork4.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/compact.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/complex.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/compressed.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/expanded.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/if.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/import.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/import_charset.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/import_charset_1_8.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/import_charset_ibm866.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/importee.less
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/importee.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/line_numbers.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/mixin_bork.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/mixins.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/multiline.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/nested.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/nested_bork1.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/nested_bork2.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/nested_bork3.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/nested_bork4.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/nested_import.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/nested_mixin_bork.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/options.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/parent_ref.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/script.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/scss_import.scss
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/scss_importee.scss
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/subdir/subdir.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/units.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/warn.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/templates/warn_imported.sass
+${GEM_LIBDIR}/vendor/sass/test/sass/test_helper.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/util/subset_map_test.rb
+${GEM_LIBDIR}/vendor/sass/test/sass/util_test.rb
+${GEM_LIBDIR}/vendor/sass/test/test_helper.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/LICENSE
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/README.markdown
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/Rakefile
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/VERSION.yml
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/example.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/fssm.gemspec
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/backends/fsevents.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/backends/inotify.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/backends/polling.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/monitor.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/path.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/pathname.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/state/directory.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/state/file.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/support.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/lib/fssm/tree.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/profile/prof-cache.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/profile/prof-fssm-pathname.html
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/profile/prof-pathname.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/profile/prof-plain-pathname.html
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/profile/prof.html
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/spec/path_spec.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/spec/root/duck/quack.txt
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/spec/root/file.css
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/spec/root/file.rb
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/spec/root/file.yml
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/spec/root/moo/cow.txt
+${GEM_LIBDIR}/vendor/sass/vendor/fssm/spec/spec_helper.rb
+${GEM_LIBDIR}/vendor/sass/yard/callbacks.rb
+${GEM_LIBDIR}/vendor/sass/yard/default/fulldoc/html/css/common.sass
+${GEM_LIBDIR}/vendor/sass/yard/default/layout/html/footer.erb
+${GEM_LIBDIR}/vendor/sass/yard/inherited_hash.rb
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/textproc/ruby-haml/distinfo b/textproc/ruby-haml/distinfo
index e0d030b290d..7db29d41f2b 100644
--- a/textproc/ruby-haml/distinfo
+++ b/textproc/ruby-haml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2010/12/04 04:27:30 taca Exp $
+$NetBSD: distinfo,v 1.7 2011/06/19 07:59:18 taca Exp $
 
-SHA1 (haml-3.0.24.gem) = 970c8c355ce2362c45aac5ea20da5495a8fd7835
-RMD160 (haml-3.0.24.gem) = 9819d312bf02587f85a8723aa36f05662625778e
-Size (haml-3.0.24.gem) = 273408 bytes
+SHA1 (haml-3.1.2.gem) = 3b983e6cb716373be6ae07ae386183dc364f003f
+RMD160 (haml-3.1.2.gem) = b36584b9dafc36e73ac7c9f3bcf0583b1ebc6a93
+Size (haml-3.1.2.gem) = 354304 bytes