Install as a gem using the pkgsrc rubygem.mk framework instead of

directly into site_ruby.

14 files changed, 168 insertions, 101 deletions

diff --git a/textproc/ruby-redcloth/Makefile b/textproc/ruby-redcloth/Makefile
index 0f27662d0cd..9ff7db85549 100644
--- a/textproc/ruby-redcloth/Makefile
+++ b/textproc/ruby-redcloth/Makefile
@@ -1,26 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2007/10/03 14:45:42 heinz Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/04 15:30:01 jlam Exp $
 
-DISTNAME=	RedCloth-${VERSION}
-PKGNAME=	${RUBY_PKGPREFIX}-redcloth-${VERSION}
-PKGREVISION=	1
+DISTNAME=	RedCloth-3.0.4
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:tl}
+PKGREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	http://rubyforge.org/frs/download.php/6064/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.whytheluckystiff.net/ruby/redcloth/
 COMMENT=	Textile library for Ruby
 
-VERSION=	3.0.4
-REPLACE_RUBY=	${WRKSRC}/bin/redcloth
-USE_RUBY_SETUP=	yes
+GEM_BUILD=	gemspec
 
-DOCS=		CHANGELOG README REFERENCE
-
-post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/redcloth
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${RUBY_DOCDIR}/redcloth
-.endfor
-
-.include "../../lang/ruby/modules.mk"
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-redcloth/PLIST b/textproc/ruby-redcloth/PLIST
index 1646f2ab22d..eaa5e59a0cf 100644
--- a/textproc/ruby-redcloth/PLIST
+++ b/textproc/ruby-redcloth/PLIST
@@ -1,7 +1,29 @@
-@comment $NetBSD: PLIST,v 1.5 2006/09/07 15:55:50 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/04 15:30:01 jlam Exp $
 bin/redcloth
-${RUBY_SITELIBDIR}/redcloth.rb
-${RUBY_DOCDIR}/redcloth/CHANGELOG
-${RUBY_DOCDIR}/redcloth/README
-${RUBY_DOCDIR}/redcloth/REFERENCE
-@dirrm ${RUBY_DOCDIR}/redcloth
+${GEM_HOME}/cache/RedCloth-${PKGVERSION}.gem
+${GEM_LIBDIR}/bin/redcloth
+${GEM_LIBDIR}/doc/CHANGELOG
+${GEM_LIBDIR}/doc/COPYING
+${GEM_LIBDIR}/doc/README
+${GEM_LIBDIR}/doc/REFERENCE
+${GEM_LIBDIR}/doc/make.rb
+${GEM_LIBDIR}/lib/redcloth.rb
+${GEM_LIBDIR}/run-tests.rb
+${GEM_LIBDIR}/setup.rb
+${GEM_LIBDIR}/tests/code.yml
+${GEM_LIBDIR}/tests/hard_breaks.yml
+${GEM_LIBDIR}/tests/images.yml
+${GEM_LIBDIR}/tests/instiki.yml
+${GEM_LIBDIR}/tests/links.yml
+${GEM_LIBDIR}/tests/lists.yml
+${GEM_LIBDIR}/tests/markdown.yml
+${GEM_LIBDIR}/tests/poignant.yml
+${GEM_LIBDIR}/tests/table.yml
+${GEM_LIBDIR}/tests/textism.yml
+${GEM_HOME}/specifications/RedCloth-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/tests
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/doc
+@dirrm ${GEM_LIBDIR}/bin
+@dirrm ${GEM_LIBDIR}
+@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/textproc/ruby-redcloth/distinfo b/textproc/ruby-redcloth/distinfo
index b4a2c8f6d70..8d9c5d68b7b 100644
--- a/textproc/ruby-redcloth/distinfo
+++ b/textproc/ruby-redcloth/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2006/01/03 14:25:51 taca Exp $
+$NetBSD: distinfo,v 1.6 2008/04/04 15:30:01 jlam Exp $
 
-SHA1 (RedCloth-3.0.4.tar.gz) = 44b320f34512a747ac60fe9d80a8e325ac1270e8
-RMD160 (RedCloth-3.0.4.tar.gz) = 1bbb5039940a861818eab685aa1be63b357f6a5e
-Size (RedCloth-3.0.4.tar.gz) = 38666 bytes
+SHA1 (RedCloth-3.0.4.gem) = cfc69c6648b5f1b7b4fd426ccefda4d016bc850f
+RMD160 (RedCloth-3.0.4.gem) = 6e925e2c598d8ce6bdfc8a0de63e56f2d263be35
+Size (RedCloth-3.0.4.gem) = 41984 bytes
diff --git a/textproc/ruby-simple-rss/Makefile b/textproc/ruby-simple-rss/Makefile
index 02f28446f60..8639253c39c 100644
--- a/textproc/ruby-simple-rss/Makefile
+++ b/textproc/ruby-simple-rss/Makefile
@@ -1,23 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/06/11 04:03:51 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/04 15:30:01 jlam Exp $
 
 DISTNAME=	simple-rss-1.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=	textproc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/8346/
-EXTRACT_SUFX=	.tgz
+PKGREVISION=	1
+CATEGORIES=	textproc
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://simple-rss.rubyforge.org/
 COMMENT=	Simple, flexible, extensible, and liberal RSS and Atom reader
 
-NO_BUILD=	yes
-USE_LANGUAGES=	# none
-
-.include "../../lang/ruby/modules.mk"
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/simple-rss.rb ${RUBY_SITELIBDIR}
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/simple-rss
-	cd ${WRKSRC}/html && pax -rwppm . ${RUBY_DOCDIR}/simple-rss
-
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-simple-rss/PLIST b/textproc/ruby-simple-rss/PLIST
index 96dd554a589..bd93890c8b6 100644
--- a/textproc/ruby-simple-rss/PLIST
+++ b/textproc/ruby-simple-rss/PLIST
@@ -1,24 +1,40 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/11 04:03:51 minskim Exp $
-${RUBY_SITELIBDIR}/simple-rss.rb
-${RUBY_DOCDIR}/simple-rss/classes/SimpleRSS.html
-${RUBY_DOCDIR}/simple-rss/classes/SimpleRSS.src/M000001.html
-${RUBY_DOCDIR}/simple-rss/classes/SimpleRSS.src/M000002.html
-${RUBY_DOCDIR}/simple-rss/classes/SimpleRSS.src/M000004.html
-${RUBY_DOCDIR}/simple-rss/classes/SimpleRSS.src/M000005.html
-${RUBY_DOCDIR}/simple-rss/classes/SimpleRSS.src/M000006.html
-${RUBY_DOCDIR}/simple-rss/classes/SimpleRSS.src/M000007.html
-${RUBY_DOCDIR}/simple-rss/classes/SimpleRSS.src/M000008.html
-${RUBY_DOCDIR}/simple-rss/classes/SimpleRSSError.html
-${RUBY_DOCDIR}/simple-rss/created.rid
-${RUBY_DOCDIR}/simple-rss/files/README.html
-${RUBY_DOCDIR}/simple-rss/files/lib/simple-rss_rb.html
-${RUBY_DOCDIR}/simple-rss/fr_class_index.html
-${RUBY_DOCDIR}/simple-rss/fr_file_index.html
-${RUBY_DOCDIR}/simple-rss/fr_method_index.html
-${RUBY_DOCDIR}/simple-rss/index.html
-${RUBY_DOCDIR}/simple-rss/rdoc-style.css
-@dirrm ${RUBY_DOCDIR}/simple-rss/files/lib
-@dirrm ${RUBY_DOCDIR}/simple-rss/files
-@dirrm ${RUBY_DOCDIR}/simple-rss/classes/SimpleRSS.src
-@dirrm ${RUBY_DOCDIR}/simple-rss/classes
-@dirrm ${RUBY_DOCDIR}/simple-rss
+@comment $NetBSD: PLIST,v 1.2 2008/04/04 15:30:01 jlam Exp $
+${GEM_HOME}/cache/simple-rss-${PKGVERSION}.gem
+${GEM_LIBDIR}/LICENSE
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/html/classes/SimpleRSS.html
+${GEM_LIBDIR}/html/classes/SimpleRSS.src/M000001.html
+${GEM_LIBDIR}/html/classes/SimpleRSS.src/M000002.html
+${GEM_LIBDIR}/html/classes/SimpleRSS.src/M000004.html
+${GEM_LIBDIR}/html/classes/SimpleRSS.src/M000005.html
+${GEM_LIBDIR}/html/classes/SimpleRSS.src/M000006.html
+${GEM_LIBDIR}/html/classes/SimpleRSS.src/M000007.html
+${GEM_LIBDIR}/html/classes/SimpleRSS.src/M000008.html
+${GEM_LIBDIR}/html/classes/SimpleRSSError.html
+${GEM_LIBDIR}/html/created.rid
+${GEM_LIBDIR}/html/files/README.html
+${GEM_LIBDIR}/html/files/lib/simple-rss_rb.html
+${GEM_LIBDIR}/html/fr_class_index.html
+${GEM_LIBDIR}/html/fr_file_index.html
+${GEM_LIBDIR}/html/fr_method_index.html
+${GEM_LIBDIR}/html/index.html
+${GEM_LIBDIR}/html/rdoc-style.css
+${GEM_LIBDIR}/lib/simple-rss.rb
+${GEM_LIBDIR}/test/base/base_test.rb
+${GEM_LIBDIR}/test/data/atom.xml
+${GEM_LIBDIR}/test/data/not-rss.xml
+${GEM_LIBDIR}/test/data/rss09.rdf
+${GEM_LIBDIR}/test/data/rss20.xml
+${GEM_LIBDIR}/test/test_helper.rb
+${GEM_HOME}/specifications/simple-rss-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test/data
+@dirrm ${GEM_LIBDIR}/test/base
+@dirrm ${GEM_LIBDIR}/test
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/html/files/lib
+@dirrm ${GEM_LIBDIR}/html/files
+@dirrm ${GEM_LIBDIR}/html/classes/SimpleRSS.src
+@dirrm ${GEM_LIBDIR}/html/classes
+@dirrm ${GEM_LIBDIR}/html
+@dirrm ${GEM_LIBDIR}
diff --git a/textproc/ruby-simple-rss/distinfo b/textproc/ruby-simple-rss/distinfo
index b99b544ad67..4cc175209ca 100644
--- a/textproc/ruby-simple-rss/distinfo
+++ b/textproc/ruby-simple-rss/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/06/11 04:03:51 minskim Exp $
+$NetBSD: distinfo,v 1.2 2008/04/04 15:30:01 jlam Exp $
 
-SHA1 (simple-rss-1.1.tgz) = de6b0900f2a5a2f2f4e2450f2893178664e4b6ea
-RMD160 (simple-rss-1.1.tgz) = 6b41140ff78af6689ed481c63c25c009c826010e
-Size (simple-rss-1.1.tgz) = 33010 bytes
+SHA1 (simple-rss-1.1.gem) = a2a7ed12040c446fc9bc1d8070e7c8e9949ca01b
+RMD160 (simple-rss-1.1.gem) = 90c4d324e10daba59555ac7b4074bc2ca600f34d
+Size (simple-rss-1.1.gem) = 35840 bytes
diff --git a/textproc/ruby-syntax/Makefile b/textproc/ruby-syntax/Makefile
index 23797114b12..8ffe17f75ec 100644
--- a/textproc/ruby-syntax/Makefile
+++ b/textproc/ruby-syntax/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/24 10:48:11 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/04 15:30:01 jlam Exp $
 
 DISTNAME=	syntax-1.0.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=	textproc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/4952/
-EXTRACT_SUFX=	.tar.bz2
+PKGREVISION=	1
+CATEGORIES=	textproc
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://syntax.rubyforge.org/
 COMMENT=	Ruby lexical analysis framework
 
-USE_LANGUAGES=	# none
-USE_RUBY_SETUP= yes
+GEM_BUILD=	gemspec
 
-.include "../../lang/ruby/modules.mk"
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-syntax/PLIST b/textproc/ruby-syntax/PLIST
index 6eb1e53f5a4..a7c59a76c3e 100644
--- a/textproc/ruby-syntax/PLIST
+++ b/textproc/ruby-syntax/PLIST
@@ -1,12 +1,28 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/24 10:48:11 minskim Exp $
-${RUBY_SITELIBDIR}/syntax.rb
-${RUBY_SITELIBDIR}/syntax/common.rb
-${RUBY_SITELIBDIR}/syntax/convertors/abstract.rb
-${RUBY_SITELIBDIR}/syntax/convertors/html.rb
-${RUBY_SITELIBDIR}/syntax/lang/ruby.rb
-${RUBY_SITELIBDIR}/syntax/lang/xml.rb
-${RUBY_SITELIBDIR}/syntax/lang/yaml.rb
-${RUBY_SITELIBDIR}/syntax/version.rb
-@dirrm ${RUBY_SITELIBDIR}/syntax/lang
-@dirrm ${RUBY_SITELIBDIR}/syntax/convertors
-@dirrm ${RUBY_SITELIBDIR}/syntax
+@comment $NetBSD: PLIST,v 1.2 2008/04/04 15:30:01 jlam Exp $
+${GEM_HOME}/cache/syntax-${PKGVERSION}.gem
+${GEM_LIBDIR}/data/ruby.css
+${GEM_LIBDIR}/data/xml.css
+${GEM_LIBDIR}/data/yaml.css
+${GEM_LIBDIR}/lib/syntax.rb
+${GEM_LIBDIR}/lib/syntax/common.rb
+${GEM_LIBDIR}/lib/syntax/convertors/abstract.rb
+${GEM_LIBDIR}/lib/syntax/convertors/html.rb
+${GEM_LIBDIR}/lib/syntax/lang/ruby.rb
+${GEM_LIBDIR}/lib/syntax/lang/xml.rb
+${GEM_LIBDIR}/lib/syntax/lang/yaml.rb
+${GEM_LIBDIR}/lib/syntax/version.rb
+${GEM_LIBDIR}/test/ALL-TESTS.rb
+${GEM_LIBDIR}/test/syntax/tc_ruby.rb
+${GEM_LIBDIR}/test/syntax/tc_xml.rb
+${GEM_LIBDIR}/test/syntax/tc_yaml.rb
+${GEM_LIBDIR}/test/syntax/tokenizer_testcase.rb
+${GEM_LIBDIR}/test/tc_syntax.rb
+${GEM_HOME}/specifications/syntax-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test/syntax
+@dirrm ${GEM_LIBDIR}/test
+@dirrm ${GEM_LIBDIR}/lib/syntax/lang
+@dirrm ${GEM_LIBDIR}/lib/syntax/convertors
+@dirrm ${GEM_LIBDIR}/lib/syntax
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/data
+@dirrm ${GEM_LIBDIR}
diff --git a/textproc/ruby-syntax/distinfo b/textproc/ruby-syntax/distinfo
index f68ba8d8eee..40d38328802 100644
--- a/textproc/ruby-syntax/distinfo
+++ b/textproc/ruby-syntax/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/24 10:48:11 minskim Exp $
+$NetBSD: distinfo,v 1.2 2008/04/04 15:30:01 jlam Exp $
 
-SHA1 (syntax-1.0.0.tar.bz2) = c5c28bdb60c756120568a7c96347d6690058e9f7
-RMD160 (syntax-1.0.0.tar.bz2) = 3c34ce247b535416c8f09664209793e9089bdab2
-Size (syntax-1.0.0.tar.bz2) = 43126 bytes
+SHA1 (syntax-1.0.0.gem) = ae2e98abdd5d2a96c30aab75f37c2780bfc066de
+RMD160 (syntax-1.0.0.gem) = 60c943c8ced9418c018bad7bc4919a95f6912222
+Size (syntax-1.0.0.gem) = 15360 bytes
diff --git a/textproc/xhtmldiff/DESCR b/textproc/xhtmldiff/DESCR
index 3fbee6cfedc..b1e2532afff 100644
--- a/textproc/xhtmldiff/DESCR
+++ b/textproc/xhtmldiff/DESCR
@@ -1,2 +1,4 @@
-xhtmldiff is a tool for generating valid XHTML redline documents from
-valid XHTML documents.
+XHTMLDiff is a tool and library for taking valid XHTML documents as
+input, and generating redlined, valid XHTML text highlighting the
+changes between them as output.
+
diff --git a/textproc/xhtmldiff/Makefile b/textproc/xhtmldiff/Makefile
index 3e660310f65..98675f1f40d 100644
--- a/textproc/xhtmldiff/Makefile
+++ b/textproc/xhtmldiff/Makefile
@@ -1,15 +1,21 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/26 00:56:50 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/04 15:30:01 jlam Exp $
 
 DISTNAME=	xhtmldiff-1.2.2
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://theinternetco.net/projects/ruby/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://theinternetco.net/projects/ruby/xhtmldiff.html
 COMMENT=	Tool for generating valid XHTML redline documents
 
-USE_LANGUAGES=	# none
-USE_RUBY_SETUP= yes
+DEPENDS+=	${RUBY_PKGPREFIX}-diff-lcs>=1.1.1:../../textproc/ruby-diff-lcs
 
-.include "../../lang/ruby/modules.mk"
+GEM_BUILD=	gemspec
+
+post-extract:
+	cp ${WRKSRC}/packaging/xhtmldiff.gemspec ${GEM_SPECFILE}
+
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xhtmldiff/PLIST b/textproc/xhtmldiff/PLIST
index b6146bd25b6..455093f8e99 100644
--- a/textproc/xhtmldiff/PLIST
+++ b/textproc/xhtmldiff/PLIST
@@ -1,3 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/26 00:56:50 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/04 15:30:01 jlam Exp $
 bin/xhtmldiff
-${RUBY_SITELIBDIR}/xhtmldiff.rb
+${GEM_HOME}/cache/xhtmldiff-${PKGVERSION}.gem
+${GEM_LIBDIR}/CHANGES
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/bin/xhtmldiff
+${GEM_LIBDIR}/examples/a.html
+${GEM_LIBDIR}/examples/b.html
+${GEM_LIBDIR}/examples/example.css
+${GEM_LIBDIR}/lib/xhtmldiff.rb
+${GEM_LIBDIR}/packaging/xhtmldiff.gemspec
+${GEM_LIBDIR}/setup.rb
+${GEM_HOME}/specifications/xhtmldiff-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/packaging
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/examples
+@dirrm ${GEM_LIBDIR}/bin
+@dirrm ${GEM_LIBDIR}
diff --git a/textproc/xhtmldiff/distinfo b/textproc/xhtmldiff/distinfo
index ae6cec30ed6..c03749b7710 100644
--- a/textproc/xhtmldiff/distinfo
+++ b/textproc/xhtmldiff/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/26 00:56:50 minskim Exp $
+$NetBSD: distinfo,v 1.2 2008/04/04 15:30:01 jlam Exp $
 
 SHA1 (xhtmldiff-1.2.2.tar.gz) = 72692677f214c5e275077b7ce7b32a8fe59436f5
 RMD160 (xhtmldiff-1.2.2.tar.gz) = 81bca58acfd60f985a66564e4fbbc63d6a7af39d
 Size (xhtmldiff-1.2.2.tar.gz) = 10457 bytes
+SHA1 (patch-aa) = f3bc25f87613e021d121d857080e48678c69d63d
diff --git a/textproc/xhtmldiff/patches/patch-aa b/textproc/xhtmldiff/patches/patch-aa
new file mode 100644
index 00000000000..f30f4073da3
--- /dev/null
+++ b/textproc/xhtmldiff/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2008/04/04 15:30:01 jlam Exp $
+
+--- ../xhtmldiff-1.2.2.gemspec.orig	2008-03-20 02:49:25.000000000 -0400
++++ ../xhtmldiff-1.2.2.gemspec
+@@ -1,6 +1,6 @@
+ Gem::Specification.new do |s|
+   s.name = %q{xhtmldiff}
+-  s.version = "1.0.0"
++  s.version = "1.2.2"
+   s.date = Time.now
+   s.summary = %q{XHTMLDiff is a tool and library for taking valid XHTML documents as input, and generating redlined valid XHTML text highlighting the changes between them as output.}
+   s.author = %q{Aredridel}