Update ruby-maruku to version 0.5.8. Chanages from version 0.5.6 include:

+ Install as a Ruby gem.

* Fixed bugs:
  * Fix bug in which links `<http://..>` at beginning of lines could
    sometimes be mistaken for HTML.
  * Empty cells in table are now allowed.
  * Now this is accepted (Maruku did not like the "." inside the link)
	[a. b] is a link.

	[a. b]: http://site.com/
* Fix bug about double-encoding of ampersands in code blocks.
* Fixed compatibility bug with Ruby 1.8.6 patchlevel 110.

3 files changed, 241 insertions, 72 deletions

diff --git a/textproc/ruby-maruku/Makefile b/textproc/ruby-maruku/Makefile
index 651fb5e4a4f..e0fb6dbeb4a 100644
--- a/textproc/ruby-maruku/Makefile
+++ b/textproc/ruby-maruku/Makefile
@@ -1,21 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2007/06/15 01:10:21 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/04 15:22:09 jlam Exp $
 
-DISTNAME=	maruku-0.5.6
+DISTNAME=	maruku-0.5.8
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=	textproc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/21120/
-EXTRACT_SUFX=	.tgz
+CATEGORIES=	textproc
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://maruku.rubyforge.org/
 COMMENT=	Markdown-superset interpreter
 
-NO_BUILD=	yes
-USE_LANGUAGES=	# none
-
-.include "../../lang/ruby/modules.mk"
-
-do-install:
-	cd ${WRKSRC}/lib && pax -rwppm . ${RUBY_SITELIBDIR}
+DEPENDS+=	${RUBY_PKGPREFIX}-syntax>=1.0.0:../../textproc/ruby-syntax
 
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-maruku/PLIST b/textproc/ruby-maruku/PLIST
index c1a4cc9f124..85efd8d8277 100644
--- a/textproc/ruby-maruku/PLIST
+++ b/textproc/ruby-maruku/PLIST
@@ -1,56 +1,232 @@
-@comment $NetBSD: PLIST,v 1.2 2007/06/15 01:10:21 minskim Exp $
-${RUBY_SITELIBDIR}/maruku.rb
-${RUBY_SITELIBDIR}/maruku/attributes.rb
-${RUBY_SITELIBDIR}/maruku/defaults.rb
-${RUBY_SITELIBDIR}/maruku/errors_management.rb
-${RUBY_SITELIBDIR}/maruku/ext/math.rb
-${RUBY_SITELIBDIR}/maruku/ext/math/elements.rb
-${RUBY_SITELIBDIR}/maruku/ext/math/mathml_engines/blahtex.rb
-${RUBY_SITELIBDIR}/maruku/ext/math/mathml_engines/itex2mml.rb
-${RUBY_SITELIBDIR}/maruku/ext/math/mathml_engines/none.rb
-${RUBY_SITELIBDIR}/maruku/ext/math/mathml_engines/ritex.rb
-${RUBY_SITELIBDIR}/maruku/ext/math/parsing.rb
-${RUBY_SITELIBDIR}/maruku/ext/math/to_html.rb
-${RUBY_SITELIBDIR}/maruku/ext/math/to_latex.rb
-${RUBY_SITELIBDIR}/maruku/helpers.rb
-${RUBY_SITELIBDIR}/maruku/input/charsource.rb
-${RUBY_SITELIBDIR}/maruku/input/extensions.rb
-${RUBY_SITELIBDIR}/maruku/input/html_helper.rb
-${RUBY_SITELIBDIR}/maruku/input/linesource.rb
-${RUBY_SITELIBDIR}/maruku/input/parse_block.rb
-${RUBY_SITELIBDIR}/maruku/input/parse_doc.rb
-${RUBY_SITELIBDIR}/maruku/input/parse_span_better.rb
-${RUBY_SITELIBDIR}/maruku/input/rubypants.rb
-${RUBY_SITELIBDIR}/maruku/input/type_detection.rb
-${RUBY_SITELIBDIR}/maruku/input_textile2/t2_parser.rb
-${RUBY_SITELIBDIR}/maruku/maruku.rb
-${RUBY_SITELIBDIR}/maruku/output/s5/fancy.rb
-${RUBY_SITELIBDIR}/maruku/output/s5/to_s5.rb
-${RUBY_SITELIBDIR}/maruku/output/to_html.rb
-${RUBY_SITELIBDIR}/maruku/output/to_latex.rb
-${RUBY_SITELIBDIR}/maruku/output/to_latex_entities.rb
-${RUBY_SITELIBDIR}/maruku/output/to_latex_strings.rb
-${RUBY_SITELIBDIR}/maruku/output/to_markdown.rb
-${RUBY_SITELIBDIR}/maruku/output/to_s.rb
-${RUBY_SITELIBDIR}/maruku/string_utils.rb
-${RUBY_SITELIBDIR}/maruku/structures.rb
-${RUBY_SITELIBDIR}/maruku/structures_inspect.rb
-${RUBY_SITELIBDIR}/maruku/structures_iterators.rb
-${RUBY_SITELIBDIR}/maruku/tests/benchmark.rb
-${RUBY_SITELIBDIR}/maruku/tests/new_parser.rb
-${RUBY_SITELIBDIR}/maruku/tests/tests.rb
-${RUBY_SITELIBDIR}/maruku/textile2.rb
-${RUBY_SITELIBDIR}/maruku/toc.rb
-${RUBY_SITELIBDIR}/maruku/usage/example1.rb
-${RUBY_SITELIBDIR}/maruku/version.rb
-${RUBY_SITELIBDIR}/sort_prof.rb
-@dirrm ${RUBY_SITELIBDIR}/maruku/usage
-@dirrm ${RUBY_SITELIBDIR}/maruku/tests
-@dirrm ${RUBY_SITELIBDIR}/maruku/output/s5
-@dirrm ${RUBY_SITELIBDIR}/maruku/output
-@dirrm ${RUBY_SITELIBDIR}/maruku/input_textile2
-@dirrm ${RUBY_SITELIBDIR}/maruku/input
-@dirrm ${RUBY_SITELIBDIR}/maruku/ext/math/mathml_engines
-@dirrm ${RUBY_SITELIBDIR}/maruku/ext/math
-@dirrm ${RUBY_SITELIBDIR}/maruku/ext
-@dirrm ${RUBY_SITELIBDIR}/maruku
+@comment $NetBSD: PLIST,v 1.3 2008/04/04 15:22:09 jlam Exp $
+bin/maruku
+bin/marutex
+${GEM_HOME}/cache/maruku-${PKGVERSION}.gem
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/bin/marudown
+${GEM_LIBDIR}/bin/maruku
+${GEM_LIBDIR}/bin/marutest
+${GEM_LIBDIR}/bin/marutex
+${GEM_LIBDIR}/docs/changelog.html
+${GEM_LIBDIR}/docs/changelog.md
+${GEM_LIBDIR}/docs/div_syntax.md
+${GEM_LIBDIR}/docs/entity_test.html
+${GEM_LIBDIR}/docs/entity_test.md
+${GEM_LIBDIR}/docs/exd.html
+${GEM_LIBDIR}/docs/index.html
+${GEM_LIBDIR}/docs/markdown_syntax.html
+${GEM_LIBDIR}/docs/markdown_syntax.md
+${GEM_LIBDIR}/docs/maruku.html
+${GEM_LIBDIR}/docs/maruku.md
+${GEM_LIBDIR}/docs/math.md
+${GEM_LIBDIR}/docs/other_stuff.md
+${GEM_LIBDIR}/docs/proposal.html
+${GEM_LIBDIR}/docs/proposal.md
+${GEM_LIBDIR}/docs/tmp.md
+${GEM_LIBDIR}/lib/maruku.rb
+${GEM_LIBDIR}/lib/maruku/attributes.rb
+${GEM_LIBDIR}/lib/maruku/defaults.rb
+${GEM_LIBDIR}/lib/maruku/errors_management.rb
+${GEM_LIBDIR}/lib/maruku/ext/math.rb
+${GEM_LIBDIR}/lib/maruku/ext/math/elements.rb
+${GEM_LIBDIR}/lib/maruku/ext/math/latex_fix.rb
+${GEM_LIBDIR}/lib/maruku/ext/math/mathml_engines/blahtex.rb
+${GEM_LIBDIR}/lib/maruku/ext/math/mathml_engines/itex2mml.rb
+${GEM_LIBDIR}/lib/maruku/ext/math/mathml_engines/none.rb
+${GEM_LIBDIR}/lib/maruku/ext/math/mathml_engines/ritex.rb
+${GEM_LIBDIR}/lib/maruku/ext/math/parsing.rb
+${GEM_LIBDIR}/lib/maruku/ext/math/to_html.rb
+${GEM_LIBDIR}/lib/maruku/ext/math/to_latex.rb
+${GEM_LIBDIR}/lib/maruku/helpers.rb
+${GEM_LIBDIR}/lib/maruku/input/charsource.rb
+${GEM_LIBDIR}/lib/maruku/input/extensions.rb
+${GEM_LIBDIR}/lib/maruku/input/html_helper.rb
+${GEM_LIBDIR}/lib/maruku/input/linesource.rb
+${GEM_LIBDIR}/lib/maruku/input/parse_block.rb
+${GEM_LIBDIR}/lib/maruku/input/parse_doc.rb
+${GEM_LIBDIR}/lib/maruku/input/parse_span_better.rb
+${GEM_LIBDIR}/lib/maruku/input/rubypants.rb
+${GEM_LIBDIR}/lib/maruku/input/type_detection.rb
+${GEM_LIBDIR}/lib/maruku/input_textile2/t2_parser.rb
+${GEM_LIBDIR}/lib/maruku/maruku.rb
+${GEM_LIBDIR}/lib/maruku/output/s5/fancy.rb
+${GEM_LIBDIR}/lib/maruku/output/s5/to_s5.rb
+${GEM_LIBDIR}/lib/maruku/output/to_html.rb
+${GEM_LIBDIR}/lib/maruku/output/to_latex.rb
+${GEM_LIBDIR}/lib/maruku/output/to_latex_entities.rb
+${GEM_LIBDIR}/lib/maruku/output/to_latex_strings.rb
+${GEM_LIBDIR}/lib/maruku/output/to_markdown.rb
+${GEM_LIBDIR}/lib/maruku/output/to_s.rb
+${GEM_LIBDIR}/lib/maruku/string_utils.rb
+${GEM_LIBDIR}/lib/maruku/structures.rb
+${GEM_LIBDIR}/lib/maruku/structures_inspect.rb
+${GEM_LIBDIR}/lib/maruku/structures_iterators.rb
+${GEM_LIBDIR}/lib/maruku/tests/benchmark.rb
+${GEM_LIBDIR}/lib/maruku/tests/new_parser.rb
+${GEM_LIBDIR}/lib/maruku/tests/tests.rb
+${GEM_LIBDIR}/lib/maruku/textile2.rb
+${GEM_LIBDIR}/lib/maruku/toc.rb
+${GEM_LIBDIR}/lib/maruku/usage/example1.rb
+${GEM_LIBDIR}/lib/maruku/version.rb
+${GEM_LIBDIR}/lib/sort_prof.rb
+${GEM_LIBDIR}/maruku_gem.rb
+${GEM_LIBDIR}/tests/bugs/code_in_links.md
+${GEM_LIBDIR}/tests/bugs/complex_escaping.md
+${GEM_LIBDIR}/tests/diagrams/diagrams.md
+${GEM_LIBDIR}/tests/math/syntax.md
+${GEM_LIBDIR}/tests/math_usage/document.md
+${GEM_LIBDIR}/tests/others/abbreviations.md
+${GEM_LIBDIR}/tests/others/blank.md
+${GEM_LIBDIR}/tests/others/code.md
+${GEM_LIBDIR}/tests/others/code2.md
+${GEM_LIBDIR}/tests/others/code3.md
+${GEM_LIBDIR}/tests/others/email.md
+${GEM_LIBDIR}/tests/others/entities.md
+${GEM_LIBDIR}/tests/others/escaping.md
+${GEM_LIBDIR}/tests/others/extra_dl.md
+${GEM_LIBDIR}/tests/others/extra_header_id.md
+${GEM_LIBDIR}/tests/others/extra_table1.md
+${GEM_LIBDIR}/tests/others/footnotes.md
+${GEM_LIBDIR}/tests/others/headers.md
+${GEM_LIBDIR}/tests/others/hrule.md
+${GEM_LIBDIR}/tests/others/images.md
+${GEM_LIBDIR}/tests/others/inline_html.md
+${GEM_LIBDIR}/tests/others/links.md
+${GEM_LIBDIR}/tests/others/list1.md
+${GEM_LIBDIR}/tests/others/list2.md
+${GEM_LIBDIR}/tests/others/list3.md
+${GEM_LIBDIR}/tests/others/lists.md
+${GEM_LIBDIR}/tests/others/lists_after_paragraph.md
+${GEM_LIBDIR}/tests/others/lists_ol.md
+${GEM_LIBDIR}/tests/others/misc_sw.md
+${GEM_LIBDIR}/tests/others/one.md
+${GEM_LIBDIR}/tests/others/paragraphs.md
+${GEM_LIBDIR}/tests/others/sss06.md
+${GEM_LIBDIR}/tests/others/test.md
+${GEM_LIBDIR}/tests/s5/a.md
+${GEM_LIBDIR}/tests/s5/instiki+s5.md
+${GEM_LIBDIR}/tests/s5/s5profiling.md
+${GEM_LIBDIR}/tests/unittest/abbreviations.md
+${GEM_LIBDIR}/tests/unittest/alt.md
+${GEM_LIBDIR}/tests/unittest/attributes/att2.md
+${GEM_LIBDIR}/tests/unittest/attributes/att3.md
+${GEM_LIBDIR}/tests/unittest/attributes/attributes.md
+${GEM_LIBDIR}/tests/unittest/attributes/circular.md
+${GEM_LIBDIR}/tests/unittest/attributes/default.md
+${GEM_LIBDIR}/tests/unittest/blank.md
+${GEM_LIBDIR}/tests/unittest/blanks_in_code.md
+${GEM_LIBDIR}/tests/unittest/bug_def.md
+${GEM_LIBDIR}/tests/unittest/bug_table.md
+${GEM_LIBDIR}/tests/unittest/code.md
+${GEM_LIBDIR}/tests/unittest/code2.md
+${GEM_LIBDIR}/tests/unittest/code3.md
+${GEM_LIBDIR}/tests/unittest/data_loss.md
+${GEM_LIBDIR}/tests/unittest/easy.md
+${GEM_LIBDIR}/tests/unittest/email.md
+${GEM_LIBDIR}/tests/unittest/encoding/iso-8859-1.md
+${GEM_LIBDIR}/tests/unittest/encoding/utf-8.md
+${GEM_LIBDIR}/tests/unittest/entities.md
+${GEM_LIBDIR}/tests/unittest/escaping.md
+${GEM_LIBDIR}/tests/unittest/extra_dl.md
+${GEM_LIBDIR}/tests/unittest/extra_header_id.md
+${GEM_LIBDIR}/tests/unittest/extra_table1.md
+${GEM_LIBDIR}/tests/unittest/footnotes.md
+${GEM_LIBDIR}/tests/unittest/headers.md
+${GEM_LIBDIR}/tests/unittest/hex_entities.md
+${GEM_LIBDIR}/tests/unittest/hrule.md
+${GEM_LIBDIR}/tests/unittest/html2.md
+${GEM_LIBDIR}/tests/unittest/html3.md
+${GEM_LIBDIR}/tests/unittest/html4.md
+${GEM_LIBDIR}/tests/unittest/html5.md
+${GEM_LIBDIR}/tests/unittest/ie.md
+${GEM_LIBDIR}/tests/unittest/images.md
+${GEM_LIBDIR}/tests/unittest/images2.md
+${GEM_LIBDIR}/tests/unittest/inline_html.md
+${GEM_LIBDIR}/tests/unittest/inline_html2.md
+${GEM_LIBDIR}/tests/unittest/links.md
+${GEM_LIBDIR}/tests/unittest/links2.md
+${GEM_LIBDIR}/tests/unittest/list1.md
+${GEM_LIBDIR}/tests/unittest/list12.md
+${GEM_LIBDIR}/tests/unittest/list2.md
+${GEM_LIBDIR}/tests/unittest/list3.md
+${GEM_LIBDIR}/tests/unittest/list4.md
+${GEM_LIBDIR}/tests/unittest/lists.md
+${GEM_LIBDIR}/tests/unittest/lists10.md
+${GEM_LIBDIR}/tests/unittest/lists11.md
+${GEM_LIBDIR}/tests/unittest/lists6.md
+${GEM_LIBDIR}/tests/unittest/lists7.md
+${GEM_LIBDIR}/tests/unittest/lists7b.md
+${GEM_LIBDIR}/tests/unittest/lists8.md
+${GEM_LIBDIR}/tests/unittest/lists9.md
+${GEM_LIBDIR}/tests/unittest/lists_after_paragraph.md
+${GEM_LIBDIR}/tests/unittest/lists_ol.md
+${GEM_LIBDIR}/tests/unittest/loss.md
+${GEM_LIBDIR}/tests/unittest/math/equations.md
+${GEM_LIBDIR}/tests/unittest/math/inline.md
+${GEM_LIBDIR}/tests/unittest/math/math2.md
+${GEM_LIBDIR}/tests/unittest/math/notmath.md
+${GEM_LIBDIR}/tests/unittest/math/table.md
+${GEM_LIBDIR}/tests/unittest/math/table2.md
+${GEM_LIBDIR}/tests/unittest/misc_sw.md
+${GEM_LIBDIR}/tests/unittest/notyet/escape.md
+${GEM_LIBDIR}/tests/unittest/notyet/header_after_par.md
+${GEM_LIBDIR}/tests/unittest/notyet/ticks.md
+${GEM_LIBDIR}/tests/unittest/notyet/triggering.md
+${GEM_LIBDIR}/tests/unittest/olist.md
+${GEM_LIBDIR}/tests/unittest/one.md
+${GEM_LIBDIR}/tests/unittest/paragraph.md
+${GEM_LIBDIR}/tests/unittest/paragraph_rules/dont_merge_ref.md
+${GEM_LIBDIR}/tests/unittest/paragraph_rules/tab_is_blank.md
+${GEM_LIBDIR}/tests/unittest/paragraphs.md
+${GEM_LIBDIR}/tests/unittest/pending/amps.md
+${GEM_LIBDIR}/tests/unittest/pending/empty_cells.md
+${GEM_LIBDIR}/tests/unittest/pending/link.md
+${GEM_LIBDIR}/tests/unittest/pending/ref.md
+${GEM_LIBDIR}/tests/unittest/recover/recover_links.md
+${GEM_LIBDIR}/tests/unittest/references/long_example.md
+${GEM_LIBDIR}/tests/unittest/references/spaces_and_numbers.md
+${GEM_LIBDIR}/tests/unittest/smartypants.md
+${GEM_LIBDIR}/tests/unittest/syntax_hl.md
+${GEM_LIBDIR}/tests/unittest/table_attributes.md
+${GEM_LIBDIR}/tests/unittest/test.md
+${GEM_LIBDIR}/tests/unittest/wrapping.md
+${GEM_LIBDIR}/tests/unittest/xml.md
+${GEM_LIBDIR}/tests/unittest/xml2.md
+${GEM_LIBDIR}/tests/unittest/xml3.md
+${GEM_LIBDIR}/tests/unittest/xml_instruction.md
+${GEM_LIBDIR}/tests/utf8-files/simple.md
+${GEM_LIBDIR}/unit_test_block.sh
+${GEM_LIBDIR}/unit_test_span.sh
+${GEM_HOME}/specifications/maruku-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/tests/utf8-files
+@dirrm ${GEM_LIBDIR}/tests/unittest/references
+@dirrm ${GEM_LIBDIR}/tests/unittest/recover
+@dirrm ${GEM_LIBDIR}/tests/unittest/pending
+@dirrm ${GEM_LIBDIR}/tests/unittest/paragraph_rules
+@dirrm ${GEM_LIBDIR}/tests/unittest/notyet
+@dirrm ${GEM_LIBDIR}/tests/unittest/math
+@dirrm ${GEM_LIBDIR}/tests/unittest/encoding
+@dirrm ${GEM_LIBDIR}/tests/unittest/attributes
+@dirrm ${GEM_LIBDIR}/tests/unittest
+@dirrm ${GEM_LIBDIR}/tests/s5
+@dirrm ${GEM_LIBDIR}/tests/others
+@dirrm ${GEM_LIBDIR}/tests/math_usage
+@dirrm ${GEM_LIBDIR}/tests/math
+@dirrm ${GEM_LIBDIR}/tests/diagrams
+@dirrm ${GEM_LIBDIR}/tests/bugs
+@dirrm ${GEM_LIBDIR}/tests
+@dirrm ${GEM_LIBDIR}/lib/maruku/usage
+@dirrm ${GEM_LIBDIR}/lib/maruku/tests
+@dirrm ${GEM_LIBDIR}/lib/maruku/output/s5
+@dirrm ${GEM_LIBDIR}/lib/maruku/output
+@dirrm ${GEM_LIBDIR}/lib/maruku/input_textile2
+@dirrm ${GEM_LIBDIR}/lib/maruku/input
+@dirrm ${GEM_LIBDIR}/lib/maruku/ext/math/mathml_engines
+@dirrm ${GEM_LIBDIR}/lib/maruku/ext/math
+@dirrm ${GEM_LIBDIR}/lib/maruku/ext
+@dirrm ${GEM_LIBDIR}/lib/maruku
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/docs
+@dirrm ${GEM_LIBDIR}/bin
+@dirrm ${GEM_LIBDIR}
+@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/textproc/ruby-maruku/distinfo b/textproc/ruby-maruku/distinfo
index b3114377dfe..b145fb2e17a 100644
--- a/textproc/ruby-maruku/distinfo
+++ b/textproc/ruby-maruku/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/06/15 01:05:05 minskim Exp $
+$NetBSD: distinfo,v 1.2 2008/04/04 15:22:09 jlam Exp $
 
-SHA1 (maruku-0.5.6.tgz) = 464e52823eff128b7e6c3211c032959ac0e980f1
-RMD160 (maruku-0.5.6.tgz) = 0ac021003a10f9dac2ef5959499f5286a0ae01bb
-Size (maruku-0.5.6.tgz) = 161463 bytes
+SHA1 (maruku-0.5.8.gem) = b44aee07ab211c90418feed71cdec5de64d54a6b
+RMD160 (maruku-0.5.8.gem) = 8f2ca6f2d2cc3a975656151c28f88bbf3e606e47
+Size (maruku-0.5.8.gem) = 172544 bytes