3 files changed, 56 insertions, 16 deletions

diff --git a/www/rubygem-haml/Makefile b/www/rubygem-haml/Makefile
index 01dcc6209ae8..f19ab86d8de3 100644
--- a/www/rubygem-haml/Makefile
+++ b/www/rubygem-haml/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	haml
-PORTVERSION=	1.7.2
+PORTVERSION=	2.0.3
 CATEGORIES=	www rubygems
-MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	RF
 
 MAINTAINER=	gogo@cs.uni-sb.de
 COMMENT=	Markup language to describe XHTML
diff --git a/www/rubygem-haml/distinfo b/www/rubygem-haml/distinfo
index ab4ea1fe2a64..5d93fd74a1d9 100644
--- a/www/rubygem-haml/distinfo
+++ b/www/rubygem-haml/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/haml-1.7.2.gem) = eae25372b616f2c04e5604f254ffbbe9
-SHA256 (rubygem/haml-1.7.2.gem) = 6662daf587d6eff30f8f2dfc521426ca050f21fc74df605cf96b31f050d1d583
-SIZE (rubygem/haml-1.7.2.gem) = 71168
+MD5 (rubygem/haml-2.0.3.gem) = 390d441d1f34f784058eb8acbf8d9732
+SHA256 (rubygem/haml-2.0.3.gem) = 5794822c51e509796d6d7a18405b26b8cdc1e8e1abf328d18a273420da2b4911
+SIZE (rubygem/haml-2.0.3.gem) = 98304
diff --git a/www/rubygem-haml/pkg-plist b/www/rubygem-haml/pkg-plist
index 4975be2df262..28220b2a4be7 100644
--- a/www/rubygem-haml/pkg-plist
+++ b/www/rubygem-haml/pkg-plist
@@ -1,3 +1,4 @@
+bin/css2sass
 bin/haml
 bin/html2haml
 bin/sass
@@ -6,14 +7,18 @@ bin/sass
 %%GEM_DOC_DIR%%/rdoc/classes/ActionView/Helpers.html
 %%GEM_DOC_DIR%%/rdoc/classes/Haml.html
 %%GEM_DOC_DIR%%/rdoc/classes/Haml/Engine.html
-%%GEM_DOC_DIR%%/rdoc/classes/Haml/Engine/CompiledTemplates.html
 %%GEM_DOC_DIR%%/rdoc/classes/Haml/Error.html
+%%GEM_DOC_DIR%%/rdoc/classes/Haml/Filters.html
+%%GEM_DOC_DIR%%/rdoc/classes/Haml/Filters/Base.html
 %%GEM_DOC_DIR%%/rdoc/classes/Haml/HTML.html
-%%GEM_DOC_DIR%%/rdoc/classes/Haml/HamlError.html
 %%GEM_DOC_DIR%%/rdoc/classes/Haml/Helpers.html
 %%GEM_DOC_DIR%%/rdoc/classes/Haml/Helpers/ActionViewExtensions.html
+%%GEM_DOC_DIR%%/rdoc/classes/Haml/Precompiler.html
 %%GEM_DOC_DIR%%/rdoc/classes/Haml/SyntaxError.html
 %%GEM_DOC_DIR%%/rdoc/classes/Haml/Template.html
+%%GEM_DOC_DIR%%/rdoc/classes/Merb.html
+%%GEM_DOC_DIR%%/rdoc/classes/Merb/Rack.html
+%%GEM_DOC_DIR%%/rdoc/classes/Object.html
 %%GEM_DOC_DIR%%/rdoc/classes/Sass.html
 %%GEM_DOC_DIR%%/rdoc/classes/Sass/CSS.html
 %%GEM_DOC_DIR%%/rdoc/classes/Sass/Engine.html
@@ -22,12 +27,15 @@ bin/sass
 %%GEM_DOC_DIR%%/rdoc/classes/Sass/Tree.html
 %%GEM_DOC_DIR%%/rdoc/classes/Sass/Tree/AttrNode.html
 %%GEM_DOC_DIR%%/rdoc/classes/Sass/Tree/CommentNode.html
+%%GEM_DOC_DIR%%/rdoc/classes/Sass/Tree/DirectiveNode.html
 %%GEM_DOC_DIR%%/rdoc/classes/Sass/Tree/Node.html
 %%GEM_DOC_DIR%%/rdoc/classes/Sass/Tree/RuleNode.html
 %%GEM_DOC_DIR%%/rdoc/classes/Sass/Tree/ValueNode.html
 %%GEM_DOC_DIR%%/rdoc/created.rid
+%%GEM_DOC_DIR%%/rdoc/files/FAQ.html
 %%GEM_DOC_DIR%%/rdoc/files/MIT-LICENSE.html
-%%GEM_DOC_DIR%%/rdoc/files/README.html
+%%GEM_DOC_DIR%%/rdoc/files/README_rdoc.html
+%%GEM_DOC_DIR%%/rdoc/files/REVISION.html
 %%GEM_DOC_DIR%%/rdoc/files/VERSION.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/haml/engine_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/haml/error_rb.html
@@ -37,11 +45,14 @@ bin/sass
 %%GEM_DOC_DIR%%/rdoc/files/lib/haml/helpers/action_view_mods_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/haml/helpers_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/haml/html_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/haml/precompiler_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/haml/template/patch_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/haml/template/plugin_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/haml/template_rb.html
-%%GEM_DOC_DIR%%/rdoc/files/lib/haml/util_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/haml_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/constant/color_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/constant/literal_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/sass/constant/nil_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/constant/number_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/constant/operation_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/constant/string_rb.html
@@ -54,6 +65,7 @@ bin/sass
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/plugin_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/tree/attr_node_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/tree/comment_node_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/sass/tree/directive_node_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/tree/node_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/tree/rule_node_rb.html
 %%GEM_DOC_DIR%%/rdoc/files/lib/sass/tree/value_node_rb.html
@@ -63,8 +75,10 @@ bin/sass
 %%GEM_DOC_DIR%%/rdoc/fr_method_index.html
 %%GEM_DOC_DIR%%/rdoc/index.html
 %%GEM_DOC_DIR%%/rdoc/rdoc-style.css
+%%GEM_LIB_DIR%%/FAQ
 %%GEM_LIB_DIR%%/MIT-LICENSE
-%%GEM_LIB_DIR%%/README
+%%GEM_LIB_DIR%%/README.rdoc
+%%GEM_LIB_DIR%%/REVISION
 %%GEM_LIB_DIR%%/Rakefile
 %%GEM_LIB_DIR%%/VERSION
 %%GEM_LIB_DIR%%/bin/css2sass
@@ -81,14 +95,16 @@ bin/sass
 %%GEM_LIB_DIR%%/lib/haml/helpers.rb
 %%GEM_LIB_DIR%%/lib/haml/helpers/action_view_extensions.rb
 %%GEM_LIB_DIR%%/lib/haml/helpers/action_view_mods.rb
-%%GEM_LIB_DIR%%/lib/haml/helpers/action_view_mods.rb.rej
 %%GEM_LIB_DIR%%/lib/haml/html.rb
+%%GEM_LIB_DIR%%/lib/haml/precompiler.rb
 %%GEM_LIB_DIR%%/lib/haml/template.rb
-%%GEM_LIB_DIR%%/lib/haml/util.rb
+%%GEM_LIB_DIR%%/lib/haml/template/patch.rb
+%%GEM_LIB_DIR%%/lib/haml/template/plugin.rb
 %%GEM_LIB_DIR%%/lib/sass.rb
 %%GEM_LIB_DIR%%/lib/sass/constant.rb
 %%GEM_LIB_DIR%%/lib/sass/constant/color.rb
 %%GEM_LIB_DIR%%/lib/sass/constant/literal.rb
+%%GEM_LIB_DIR%%/lib/sass/constant/nil.rb
 %%GEM_LIB_DIR%%/lib/sass/constant/number.rb
 %%GEM_LIB_DIR%%/lib/sass/constant/operation.rb
 %%GEM_LIB_DIR%%/lib/sass/constant/string.rb
@@ -100,12 +116,16 @@ bin/sass
 %%GEM_LIB_DIR%%/lib/sass/plugin/rails.rb
 %%GEM_LIB_DIR%%/lib/sass/tree/attr_node.rb
 %%GEM_LIB_DIR%%/lib/sass/tree/comment_node.rb
+%%GEM_LIB_DIR%%/lib/sass/tree/directive_node.rb
 %%GEM_LIB_DIR%%/lib/sass/tree/node.rb
 %%GEM_LIB_DIR%%/lib/sass/tree/rule_node.rb
 %%GEM_LIB_DIR%%/lib/sass/tree/value_node.rb
+%%GEM_LIB_DIR%%/rails/init.rb
 %%GEM_LIB_DIR%%/test/benchmark.rb
 %%GEM_LIB_DIR%%/test/haml/engine_test.rb
 %%GEM_LIB_DIR%%/test/haml/helper_test.rb
+%%GEM_LIB_DIR%%/test/haml/html2haml_test.rb
+%%GEM_LIB_DIR%%/test/haml/markaby/standard.mab
 %%GEM_LIB_DIR%%/test/haml/mocks/article.rb
 %%GEM_LIB_DIR%%/test/haml/results/content_for_layout.xhtml
 %%GEM_LIB_DIR%%/test/haml/results/eval_suppressed.xhtml
@@ -114,6 +134,8 @@ bin/sass
 %%GEM_LIB_DIR%%/test/haml/results/helpful.xhtml
 %%GEM_LIB_DIR%%/test/haml/results/just_stuff.xhtml
 %%GEM_LIB_DIR%%/test/haml/results/list.xhtml
+%%GEM_LIB_DIR%%/test/haml/results/nuke_inner_whitespace.xhtml
+%%GEM_LIB_DIR%%/test/haml/results/nuke_outer_whitespace.xhtml
 %%GEM_LIB_DIR%%/test/haml/results/original_engine.xhtml
 %%GEM_LIB_DIR%%/test/haml/results/partials.xhtml
 %%GEM_LIB_DIR%%/test/haml/results/silent_script.xhtml
@@ -121,11 +143,16 @@ bin/sass
 %%GEM_LIB_DIR%%/test/haml/results/tag_parsing.xhtml
 %%GEM_LIB_DIR%%/test/haml/results/very_basic.xhtml
 %%GEM_LIB_DIR%%/test/haml/results/whitespace_handling.xhtml
+%%GEM_LIB_DIR%%/test/haml/rhtml/_av_partial_1.rhtml
+%%GEM_LIB_DIR%%/test/haml/rhtml/_av_partial_2.rhtml
+%%GEM_LIB_DIR%%/test/haml/rhtml/action_view.rhtml
 %%GEM_LIB_DIR%%/test/haml/rhtml/standard.rhtml
-%%GEM_LIB_DIR%%/test/haml/runner.rb
 %%GEM_LIB_DIR%%/test/haml/template_test.rb
+%%GEM_LIB_DIR%%/test/haml/templates/_av_partial_1.haml
+%%GEM_LIB_DIR%%/test/haml/templates/_av_partial_2.haml
 %%GEM_LIB_DIR%%/test/haml/templates/_partial.haml
 %%GEM_LIB_DIR%%/test/haml/templates/_text_area.haml
+%%GEM_LIB_DIR%%/test/haml/templates/action_view.haml
 %%GEM_LIB_DIR%%/test/haml/templates/breakage.haml
 %%GEM_LIB_DIR%%/test/haml/templates/content_for_layout.haml
 %%GEM_LIB_DIR%%/test/haml/templates/eval_suppressed.haml
@@ -134,6 +161,8 @@ bin/sass
 %%GEM_LIB_DIR%%/test/haml/templates/helpful.haml
 %%GEM_LIB_DIR%%/test/haml/templates/just_stuff.haml
 %%GEM_LIB_DIR%%/test/haml/templates/list.haml
+%%GEM_LIB_DIR%%/test/haml/templates/nuke_inner_whitespace.haml
+%%GEM_LIB_DIR%%/test/haml/templates/nuke_outer_whitespace.haml
 %%GEM_LIB_DIR%%/test/haml/templates/original_engine.haml
 %%GEM_LIB_DIR%%/test/haml/templates/partialize.haml
 %%GEM_LIB_DIR%%/test/haml/templates/partials.haml
@@ -142,34 +171,41 @@ bin/sass
 %%GEM_LIB_DIR%%/test/haml/templates/tag_parsing.haml
 %%GEM_LIB_DIR%%/test/haml/templates/very_basic.haml
 %%GEM_LIB_DIR%%/test/haml/templates/whitespace_handling.haml
-%%GEM_LIB_DIR%%/test/profile.rb
 %%GEM_LIB_DIR%%/test/sass/engine_test.rb
 %%GEM_LIB_DIR%%/test/sass/plugin_test.rb
 %%GEM_LIB_DIR%%/test/sass/results/alt.css
 %%GEM_LIB_DIR%%/test/sass/results/basic.css
 %%GEM_LIB_DIR%%/test/sass/results/compact.css
 %%GEM_LIB_DIR%%/test/sass/results/complex.css
+%%GEM_LIB_DIR%%/test/sass/results/compressed.css
 %%GEM_LIB_DIR%%/test/sass/results/constants.css
 %%GEM_LIB_DIR%%/test/sass/results/expanded.css
 %%GEM_LIB_DIR%%/test/sass/results/import.css
+%%GEM_LIB_DIR%%/test/sass/results/mixins.css
+%%GEM_LIB_DIR%%/test/sass/results/multiline.css
 %%GEM_LIB_DIR%%/test/sass/results/nested.css
 %%GEM_LIB_DIR%%/test/sass/results/parent_ref.css
 %%GEM_LIB_DIR%%/test/sass/results/subdir/nested_subdir/nested_subdir.css
 %%GEM_LIB_DIR%%/test/sass/results/subdir/subdir.css
+%%GEM_LIB_DIR%%/test/sass/templates/_partial.sass
 %%GEM_LIB_DIR%%/test/sass/templates/alt.sass
 %%GEM_LIB_DIR%%/test/sass/templates/basic.sass
 %%GEM_LIB_DIR%%/test/sass/templates/bork.sass
 %%GEM_LIB_DIR%%/test/sass/templates/bork2.sass
 %%GEM_LIB_DIR%%/test/sass/templates/compact.sass
 %%GEM_LIB_DIR%%/test/sass/templates/complex.sass
+%%GEM_LIB_DIR%%/test/sass/templates/compressed.sass
 %%GEM_LIB_DIR%%/test/sass/templates/constants.sass
 %%GEM_LIB_DIR%%/test/sass/templates/expanded.sass
 %%GEM_LIB_DIR%%/test/sass/templates/import.sass
 %%GEM_LIB_DIR%%/test/sass/templates/importee.sass
+%%GEM_LIB_DIR%%/test/sass/templates/mixins.sass
+%%GEM_LIB_DIR%%/test/sass/templates/multiline.sass
 %%GEM_LIB_DIR%%/test/sass/templates/nested.sass
 %%GEM_LIB_DIR%%/test/sass/templates/parent_ref.sass
 %%GEM_LIB_DIR%%/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
 %%GEM_LIB_DIR%%/test/sass/templates/subdir/subdir.sass
+%%GEM_LIB_DIR%%/test/test_helper.rb
 %%GEM_SPEC%%
 @dirrm %%GEM_LIB_DIR%%/test/sass/templates/subdir/nested_subdir
 @dirrm %%GEM_LIB_DIR%%/test/sass/templates/subdir
@@ -182,12 +218,15 @@ bin/sass
 @dirrm %%GEM_LIB_DIR%%/test/haml/rhtml
 @dirrm %%GEM_LIB_DIR%%/test/haml/results
 @dirrm %%GEM_LIB_DIR%%/test/haml/mocks
+@dirrm %%GEM_LIB_DIR%%/test/haml/markaby
 @dirrm %%GEM_LIB_DIR%%/test/haml
 @dirrm %%GEM_LIB_DIR%%/test
+@dirrm %%GEM_LIB_DIR%%/rails
 @dirrm %%GEM_LIB_DIR%%/lib/sass/tree
 @dirrm %%GEM_LIB_DIR%%/lib/sass/plugin
 @dirrm %%GEM_LIB_DIR%%/lib/sass/constant
 @dirrm %%GEM_LIB_DIR%%/lib/sass
+@dirrm %%GEM_LIB_DIR%%/lib/haml/template
 @dirrm %%GEM_LIB_DIR%%/lib/haml/helpers
 @dirrm %%GEM_LIB_DIR%%/lib/haml
 @dirrm %%GEM_LIB_DIR%%/lib
@@ -197,14 +236,16 @@ bin/sass
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/sass/plugin
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/sass/constant
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/sass
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/haml/template
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/haml/helpers
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/haml
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib
 @dirrm %%GEM_DOC_DIR%%/rdoc/files
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/Sass/Tree
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/Sass
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/Merb
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/Haml/Helpers
-@dirrm %%GEM_DOC_DIR%%/rdoc/classes/Haml/Engine
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/Haml/Filters
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/Haml
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionView
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes