Update ruby-haml from version 1.8.2 to version 2.2.10.

Pkgsrc changes:
- Update HOMEPAGE
- Build using gemspec

Upstream changes:
A lot! Please see http://haml-lang.com/docs/yardoc/HAML_CHANGELOG.md.html
for the list of changes since version 2.2.0. The changes from version
1.8.2 to version 2.0.10 are a little bit more difficult to get, it
seems you have to explore the commit logs of haml's git repository
or the haml mailing list.

3 files changed, 89 insertions, 21 deletions

diff --git a/textproc/ruby-haml/Makefile b/textproc/ruby-haml/Makefile
index eabf18ead1f..cad8a793667 100644
--- a/textproc/ruby-haml/Makefile
+++ b/textproc/ruby-haml/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:21:33 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/31 06:18:16 seb Exp $
 
-DISTNAME=	haml-1.8.2
+DISTNAME=	haml-2.2.10
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://haml.hamptoncatlin.com/
+HOMEPAGE=	http://haml-lang.com/
 COMMENT=	XHTML & CSS markup language & template engine
 
+GEM_BUILD=	gemspec
+
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-haml/PLIST b/textproc/ruby-haml/PLIST
index 4f53bb26693..f15b9e7699b 100644
--- a/textproc/ruby-haml/PLIST
+++ b/textproc/ruby-haml/PLIST
@@ -1,17 +1,24 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/10/31 06:18:16 seb Exp $
 bin/css2sass
 bin/haml
 bin/html2haml
 bin/sass
 ${GEM_HOME}/cache/haml-${PKGVERSION}.gem
+${GEM_LIBDIR}/.yardopts
+${GEM_LIBDIR}/CONTRIBUTING
 ${GEM_LIBDIR}/MIT-LICENSE
-${GEM_LIBDIR}/README
+${GEM_LIBDIR}/README.md
+${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}/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
@@ -22,31 +29,53 @@ ${GEM_LIBDIR}/lib/haml/filters.rb
 ${GEM_LIBDIR}/lib/haml/helpers.rb
 ${GEM_LIBDIR}/lib/haml/helpers/action_view_extensions.rb
 ${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/precompiler.rb
+${GEM_LIBDIR}/lib/haml/shared.rb
 ${GEM_LIBDIR}/lib/haml/template.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/version.rb
 ${GEM_LIBDIR}/lib/sass.rb
-${GEM_LIBDIR}/lib/sass/constant.rb
-${GEM_LIBDIR}/lib/sass/constant/color.rb
-${GEM_LIBDIR}/lib/sass/constant/literal.rb
-${GEM_LIBDIR}/lib/sass/constant/number.rb
-${GEM_LIBDIR}/lib/sass/constant/operation.rb
-${GEM_LIBDIR}/lib/sass/constant/string.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/plugin.rb
 ${GEM_LIBDIR}/lib/sass/plugin/merb.rb
 ${GEM_LIBDIR}/lib/sass/plugin/rails.rb
-${GEM_LIBDIR}/lib/sass/tree/attr_node.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/funcall.rb
+${GEM_LIBDIR}/lib/sass/script/functions.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/unary_operation.rb
+${GEM_LIBDIR}/lib/sass/script/variable.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/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/rule_node.rb
-${GEM_LIBDIR}/lib/sass/tree/value_node.rb
+${GEM_LIBDIR}/lib/sass/tree/variable_node.rb
+${GEM_LIBDIR}/lib/sass/tree/while_node.rb
+${GEM_LIBDIR}/rails/init.rb
 ${GEM_LIBDIR}/test/benchmark.rb
 ${GEM_LIBDIR}/test/haml/engine_test.rb
 ${GEM_LIBDIR}/test/haml/helper_test.rb
@@ -60,8 +89,12 @@ ${GEM_LIBDIR}/test/haml/results/helpers.xhtml
 ${GEM_LIBDIR}/test/haml/results/helpful.xhtml
 ${GEM_LIBDIR}/test/haml/results/just_stuff.xhtml
 ${GEM_LIBDIR}/test/haml/results/list.xhtml
+${GEM_LIBDIR}/test/haml/results/nuke_inner_whitespace.xhtml
+${GEM_LIBDIR}/test/haml/results/nuke_outer_whitespace.xhtml
 ${GEM_LIBDIR}/test/haml/results/original_engine.xhtml
+${GEM_LIBDIR}/test/haml/results/partial_layout.xhtml
 ${GEM_LIBDIR}/test/haml/results/partials.xhtml
+${GEM_LIBDIR}/test/haml/results/render_layout.xhtml
 ${GEM_LIBDIR}/test/haml/results/silent_script.xhtml
 ${GEM_LIBDIR}/test/haml/results/standard.xhtml
 ${GEM_LIBDIR}/test/haml/results/tag_parsing.xhtml
@@ -71,13 +104,21 @@ ${GEM_LIBDIR}/test/haml/rhtml/_av_partial_1.rhtml
 ${GEM_LIBDIR}/test/haml/rhtml/_av_partial_2.rhtml
 ${GEM_LIBDIR}/test/haml/rhtml/action_view.rhtml
 ${GEM_LIBDIR}/test/haml/rhtml/standard.rhtml
-${GEM_LIBDIR}/test/haml/runner.rb
+${GEM_LIBDIR}/test/haml/spec/README.md
+${GEM_LIBDIR}/test/haml/spec/lua_haml_spec.lua
+${GEM_LIBDIR}/test/haml/spec/ruby_haml_test.rb
+${GEM_LIBDIR}/test/haml/spec/tests.json
 ${GEM_LIBDIR}/test/haml/template_test.rb
 ${GEM_LIBDIR}/test/haml/templates/_av_partial_1.haml
+${GEM_LIBDIR}/test/haml/templates/_av_partial_1_ugly.haml
 ${GEM_LIBDIR}/test/haml/templates/_av_partial_2.haml
+${GEM_LIBDIR}/test/haml/templates/_av_partial_2_ugly.haml
+${GEM_LIBDIR}/test/haml/templates/_layout.erb
+${GEM_LIBDIR}/test/haml/templates/_layout_for_partial.haml
 ${GEM_LIBDIR}/test/haml/templates/_partial.haml
 ${GEM_LIBDIR}/test/haml/templates/_text_area.haml
 ${GEM_LIBDIR}/test/haml/templates/action_view.haml
+${GEM_LIBDIR}/test/haml/templates/action_view_ugly.haml
 ${GEM_LIBDIR}/test/haml/templates/breakage.haml
 ${GEM_LIBDIR}/test/haml/templates/content_for_layout.haml
 ${GEM_LIBDIR}/test/haml/templates/eval_suppressed.haml
@@ -86,29 +127,48 @@ ${GEM_LIBDIR}/test/haml/templates/helpers.haml
 ${GEM_LIBDIR}/test/haml/templates/helpful.haml
 ${GEM_LIBDIR}/test/haml/templates/just_stuff.haml
 ${GEM_LIBDIR}/test/haml/templates/list.haml
+${GEM_LIBDIR}/test/haml/templates/nuke_inner_whitespace.haml
+${GEM_LIBDIR}/test/haml/templates/nuke_outer_whitespace.haml
 ${GEM_LIBDIR}/test/haml/templates/original_engine.haml
+${GEM_LIBDIR}/test/haml/templates/partial_layout.haml
 ${GEM_LIBDIR}/test/haml/templates/partialize.haml
 ${GEM_LIBDIR}/test/haml/templates/partials.haml
+${GEM_LIBDIR}/test/haml/templates/render_layout.haml
 ${GEM_LIBDIR}/test/haml/templates/silent_script.haml
 ${GEM_LIBDIR}/test/haml/templates/standard.haml
+${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/profile.rb
+${GEM_LIBDIR}/test/haml/util_test.rb
+${GEM_LIBDIR}/test/linked_rails.rb
+${GEM_LIBDIR}/test/sass/css2sass_test.rb
 ${GEM_LIBDIR}/test/sass/engine_test.rb
+${GEM_LIBDIR}/test/sass/functions_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/constants.css
 ${GEM_LIBDIR}/test/sass/results/expanded.css
 ${GEM_LIBDIR}/test/sass/results/import.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/parent_ref.css
+${GEM_LIBDIR}/test/sass/results/script.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/script_test.rb
 ${GEM_LIBDIR}/test/sass/templates/_partial.sass
 ${GEM_LIBDIR}/test/sass/templates/alt.sass
 ${GEM_LIBDIR}/test/sass/templates/basic.sass
@@ -117,12 +177,18 @@ ${GEM_LIBDIR}/test/sass/templates/bork2.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/constants.sass
 ${GEM_LIBDIR}/test/sass/templates/expanded.sass
 ${GEM_LIBDIR}/test/sass/templates/import.sass
 ${GEM_LIBDIR}/test/sass/templates/importee.sass
+${GEM_LIBDIR}/test/sass/templates/line_numbers.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/parent_ref.sass
+${GEM_LIBDIR}/test/sass/templates/script.sass
+${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/test_helper.rb
 ${GEM_HOME}/specifications/haml-${PKGVERSION}.gemspec
diff --git a/textproc/ruby-haml/distinfo b/textproc/ruby-haml/distinfo
index 952b239188d..a38b9254975 100644
--- a/textproc/ruby-haml/distinfo
+++ b/textproc/ruby-haml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/04/04 15:21:33 jlam Exp $
+$NetBSD: distinfo,v 1.2 2009/10/31 06:18:16 seb Exp $
 
-SHA1 (haml-1.8.2.gem) = cd9177de87f613f3d6bfbd021e4be2f19da97d32
-RMD160 (haml-1.8.2.gem) = 4135d71a3f3206d50ecc7a82e8c79827cdf02dbb
-Size (haml-1.8.2.gem) = 81920 bytes
+SHA1 (haml-2.2.10.gem) = 389560b6e15f82b03c392eb71f0f6efdf52ffb96
+RMD160 (haml-2.2.10.gem) = 43f9c62d44f25bfcd971ac2f65843006d402b387
+Size (haml-2.2.10.gem) = 143872 bytes