Update textproc/ruby-maruku to 0.6.0.

* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.
* Add LICENSE.
* Add CONFLICTS since it will install the same name commands both
  ruby18 and ruby19 based packages.

Changes are unknown.

3 files changed, 19 insertions, 30 deletions

diff --git a/textproc/ruby-maruku/Makefile b/textproc/ruby-maruku/Makefile
index 49f3fd6aa45..0302b3a6894 100644
--- a/textproc/ruby-maruku/Makefile
+++ b/textproc/ruby-maruku/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2009/06/12 12:06:26 taca Exp $
+# $NetBSD: Makefile,v 1.6 2010/09/10 08:22:12 taca Exp $
 
-DISTNAME=	maruku-0.5.9
-PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+DISTNAME=	maruku-0.6.0
 CATEGORIES=	textproc
 
 MAINTAINER=	minskim@NetBSD.org
@@ -11,5 +10,7 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${RUBY_PKGPREFIX}-syntax>=1.0.0:../../textproc/ruby-syntax
 
-.include "../../misc/rubygems/rubygem.mk"
+CONFLICTS+=	ruby[1-9][0-9]-maruku-*
+
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-maruku/PLIST b/textproc/ruby-maruku/PLIST
index bf80a595374..c9e996069b1 100644
--- a/textproc/ruby-maruku/PLIST
+++ b/textproc/ruby-maruku/PLIST
@@ -1,28 +1,20 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:36:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/09/10 08:22:12 taca Exp $
 bin/maruku
 bin/marutex
-${GEM_HOME}/cache/maruku-${PKGVERSION}.gem
+${GEM_HOME}/cache/${GEM_NAME}.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
@@ -69,14 +61,9 @@ ${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/abbrev.md
 ${GEM_LIBDIR}/tests/bugs/code_in_links.md
 ${GEM_LIBDIR}/tests/bugs/complex_escaping.md
-${GEM_LIBDIR}/tests/bugs/html.md
-${GEM_LIBDIR}/tests/bugs/links.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
@@ -107,8 +94,6 @@ ${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
@@ -138,6 +123,7 @@ ${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/hang.md
 ${GEM_LIBDIR}/tests/unittest/headers.md
 ${GEM_LIBDIR}/tests/unittest/hex_entities.md
 ${GEM_LIBDIR}/tests/unittest/hrule.md
@@ -161,9 +147,6 @@ ${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
@@ -190,18 +173,23 @@ ${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/red_tests/abbrev.md
+${GEM_LIBDIR}/tests/unittest/red_tests/lists7.md
+${GEM_LIBDIR}/tests/unittest/red_tests/lists7b.md
+${GEM_LIBDIR}/tests/unittest/red_tests/lists8.md
+${GEM_LIBDIR}/tests/unittest/red_tests/xml.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/underscore_in_words.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
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/textproc/ruby-maruku/distinfo b/textproc/ruby-maruku/distinfo
index c05a5a00592..1dcc4edf374 100644
--- a/textproc/ruby-maruku/distinfo
+++ b/textproc/ruby-maruku/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/06/12 12:06:26 taca Exp $
+$NetBSD: distinfo,v 1.5 2010/09/10 08:22:12 taca Exp $
 
-SHA1 (maruku-0.5.9.gem) = 9b0617baa8046dbdf643ac1f9ee83cdbaf15a248
-RMD160 (maruku-0.5.9.gem) = 04de86f042cdc87732bb0e48d96deba862547972
-Size (maruku-0.5.9.gem) = 188416 bytes
+SHA1 (maruku-0.6.0.gem) = 8a300457a4c492dd2be3f3a13337147bd5b42393
+RMD160 (maruku-0.6.0.gem) = e959dd617ca3b681ec58e96c2119ed79b93d9d89
+Size (maruku-0.6.0.gem) = 151040 bytes
 SHA1 (patch-aa) = 8efb749b4372814901731bf998aa595eab9da651