Update ruby-xmlparser to version 0.6.81. Changes from version 0.6.8.1

include:

+ Install as a Ruby gem.

* Fix bug in openInputStream().

5 files changed, 87 insertions, 147 deletions

diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index bc41a9d5708..6f2a75e940c 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -1,30 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2007/01/28 15:25:11 taca Exp $
-#
+# $NetBSD: Makefile,v 1.11 2008/04/04 15:22:24 jlam Exp $
 
-DISTNAME=	xmlparser-0.6.8.1
+DISTNAME=	xmlparser-0.6.81
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	4
-CATEGORIES=	textproc ruby
+CATEGORIES=	textproc
 MASTER_SITES=	http://www.yoshidam.net/
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.yoshidam.net/Ruby.html#xmlparser
-COMMENT=	Expat interface module for Ruby
+COMMENT=	Ruby bindings to the Expat XML parsing library
 
-RUBY_HAS_ARCHLIB=	yes
-USE_RUBY_EXTCONF=	yes
-CONFIGURE_ARGS+=	--with-perl-enc-map
-WRKSRC=			${WRKDIR}/xmlparser
-REPLACE_RUBY_DIRS=	${WRKSRC}/samples
+DEPENDS+=	${RUBY_PKGPREFIX}-mkrf>=0.2.1:../../devel/ruby-mkrf
 
-pre-patch:
-	cd ${WRKSRC}/samples; ${RM} -fr */CVS
-	cd ${WRKSRC}/samples; find . -type d -exec ${CHMOD} 0755 {} \;
+.include "../../misc/rubygems/rubygem.mk"
 
-post-install:
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/xmlparser
-	${CP} -r ${WRKSRC}/samples/* ${RUBY_EXAMPLESDIR}/xmlparser
-
-.include "../../lang/ruby/modules.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-xmlparser/PLIST b/textproc/ruby-xmlparser/PLIST
index fa0e99b4457..53e8aaf91a6 100644
--- a/textproc/ruby-xmlparser/PLIST
+++ b/textproc/ruby-xmlparser/PLIST
@@ -1,110 +1,63 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/07 15:55:50 taca Exp $
-${RUBY_SITEARCHLIBDIR}/xmlparser.${RUBY_DLEXT}
-${RUBY_SITELIBDIR}/sax.rb
-${RUBY_SITELIBDIR}/saxdriver.rb
-${RUBY_SITELIBDIR}/wget.rb
-${RUBY_SITELIBDIR}/xml/dom/builder-ja.rb
-${RUBY_SITELIBDIR}/xml/dom/builder.rb
-${RUBY_SITELIBDIR}/xml/dom/core.rb
-${RUBY_SITELIBDIR}/xml/dom/digest.rb
-${RUBY_SITELIBDIR}/xml/dom/visitor.rb
-${RUBY_SITELIBDIR}/xml/dom2/attr.rb
-${RUBY_SITELIBDIR}/xml/dom2/cdatasection.rb
-${RUBY_SITELIBDIR}/xml/dom2/characterdata.rb
-${RUBY_SITELIBDIR}/xml/dom2/comment.rb
-${RUBY_SITELIBDIR}/xml/dom2/core.rb
-${RUBY_SITELIBDIR}/xml/dom2/document.rb
-${RUBY_SITELIBDIR}/xml/dom2/documentfragment.rb
-${RUBY_SITELIBDIR}/xml/dom2/documenttype.rb
-${RUBY_SITELIBDIR}/xml/dom2/dombuilder.rb
-${RUBY_SITELIBDIR}/xml/dom2/dombuilderfilter.rb
-${RUBY_SITELIBDIR}/xml/dom2/domentityresolver.rb
-${RUBY_SITELIBDIR}/xml/dom2/domentityresolverimpl.rb
-${RUBY_SITELIBDIR}/xml/dom2/domexception.rb
-${RUBY_SITELIBDIR}/xml/dom2/domimplementation.rb
-${RUBY_SITELIBDIR}/xml/dom2/dominputsource.rb
-${RUBY_SITELIBDIR}/xml/dom2/element.rb
-${RUBY_SITELIBDIR}/xml/dom2/entity.rb
-${RUBY_SITELIBDIR}/xml/dom2/entityreference.rb
-${RUBY_SITELIBDIR}/xml/dom2/namednodemap.rb
-${RUBY_SITELIBDIR}/xml/dom2/node.rb
-${RUBY_SITELIBDIR}/xml/dom2/nodelist.rb
-${RUBY_SITELIBDIR}/xml/dom2/notation.rb
-${RUBY_SITELIBDIR}/xml/dom2/processinginstruction.rb
-${RUBY_SITELIBDIR}/xml/dom2/text.rb
-${RUBY_SITELIBDIR}/xml/dom2/xpath.rb
-${RUBY_SITELIBDIR}/xml/encoding-ja.rb
-${RUBY_SITELIBDIR}/xml/parser.rb
-${RUBY_SITELIBDIR}/xml/parserns.rb
-${RUBY_SITELIBDIR}/xml/sax.rb
-${RUBY_SITELIBDIR}/xml/saxdriver.rb
-${RUBY_SITELIBDIR}/xml/xpath.rb
-${RUBY_SITELIBDIR}/xmldigest.rb
-${RUBY_SITELIBDIR}/xmlencoding-ja.rb
-${RUBY_SITELIBDIR}/xmltree.rb
-${RUBY_SITELIBDIR}/xmltreebuilder-ja.rb
-${RUBY_SITELIBDIR}/xmltreebuilder.rb
-${RUBY_SITELIBDIR}/xmltreevisitor.rb
-${RUBY_EXAMPLESDIR}/xmlparser/buildertest.rb
-${RUBY_EXAMPLESDIR}/xmlparser/buildertest2.rb
-${RUBY_EXAMPLESDIR}/xmlparser/digesttest.rb
-${RUBY_EXAMPLESDIR}/xmlparser/digesttest2.rb
-${RUBY_EXAMPLESDIR}/xmlparser/doctype.rb
-${RUBY_EXAMPLESDIR}/xmlparser/doctype.xml
-${RUBY_EXAMPLESDIR}/xmlparser/doctypei.rb
-${RUBY_EXAMPLESDIR}/xmlparser/document.dtd
-${RUBY_EXAMPLESDIR}/xmlparser/dom2/dom2test1.rb
-${RUBY_EXAMPLESDIR}/xmlparser/dom2/dom2test2.rb
-${RUBY_EXAMPLESDIR}/xmlparser/dom2/gtkxpath.rb
-${RUBY_EXAMPLESDIR}/xmlparser/dom2/test1.xml
-${RUBY_EXAMPLESDIR}/xmlparser/dom2/test2.xml
-${RUBY_EXAMPLESDIR}/xmlparser/dtd/ext1.dtd
-${RUBY_EXAMPLESDIR}/xmlparser/dtd/ext2.dtd
-${RUBY_EXAMPLESDIR}/xmlparser/dtd/extdtd.rb
-${RUBY_EXAMPLESDIR}/xmlparser/dtd/extdtd.xml
-${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2/ext.ent
-${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2/exttest.rb
-${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2/exttesti.rb
-${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2/hoge.dtd
-${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2/idattr.xml
-${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2/idtest.rb
-${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2/idtest.xml
-${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2/xmlextparser.rb
-${RUBY_EXAMPLESDIR}/xmlparser/gtktree.rb
-${RUBY_EXAMPLESDIR}/xmlparser/idattrtest.rb
-${RUBY_EXAMPLESDIR}/xmlparser/index_euc.xml
-${RUBY_EXAMPLESDIR}/xmlparser/index_jis.xml
-${RUBY_EXAMPLESDIR}/xmlparser/index_noenc.xml
-${RUBY_EXAMPLESDIR}/xmlparser/index_sjis.xml
-${RUBY_EXAMPLESDIR}/xmlparser/index_u16.xml
-${RUBY_EXAMPLESDIR}/xmlparser/index_u8.xml
-${RUBY_EXAMPLESDIR}/xmlparser/my-html.rb
-${RUBY_EXAMPLESDIR}/xmlparser/namespaces/namespace1.rb
-${RUBY_EXAMPLESDIR}/xmlparser/namespaces/namespace1.xml
-${RUBY_EXAMPLESDIR}/xmlparser/namespaces/namespace2.rb
-${RUBY_EXAMPLESDIR}/xmlparser/namespaces/namespace2.xml
-${RUBY_EXAMPLESDIR}/xmlparser/nstest.rb
-${RUBY_EXAMPLESDIR}/xmlparser/saxtest.rb
-${RUBY_EXAMPLESDIR}/xmlparser/test/featurelist.rb
-${RUBY_EXAMPLESDIR}/xmlparser/test/skippedentity.rb
-${RUBY_EXAMPLESDIR}/xmlparser/test/useforeigndtd.rb
-${RUBY_EXAMPLESDIR}/xmlparser/treetest.rb
-${RUBY_EXAMPLESDIR}/xmlparser/visitor.rb
-${RUBY_EXAMPLESDIR}/xmlparser/visitortest.rb
-${RUBY_EXAMPLESDIR}/xmlparser/writer.rb
-${RUBY_EXAMPLESDIR}/xmlparser/xmlcheck.rb
-${RUBY_EXAMPLESDIR}/xmlparser/xmlcomments.rb
-${RUBY_EXAMPLESDIR}/xmlparser/xmlevent.rb
-${RUBY_EXAMPLESDIR}/xmlparser/xmliter.rb
-${RUBY_EXAMPLESDIR}/xmlparser/xmlstats.rb
-${RUBY_EXAMPLESDIR}/xmlparser/xpointer.rb
-${RUBY_EXAMPLESDIR}/xmlparser/xpointertest.rb
-@dirrm ${RUBY_SITELIBDIR}/xml/dom
-@dirrm ${RUBY_SITELIBDIR}/xml/dom2
-@dirrm ${RUBY_SITELIBDIR}/xml
-@dirrm ${RUBY_EXAMPLESDIR}/xmlparser/dom2
-@dirrm ${RUBY_EXAMPLESDIR}/xmlparser/dtd
-@dirrm ${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2
-@dirrm ${RUBY_EXAMPLESDIR}/xmlparser/namespaces
-@dirrm ${RUBY_EXAMPLESDIR}/xmlparser/test
-@dirrm ${RUBY_EXAMPLESDIR}/xmlparser
+@comment $NetBSD: PLIST,v 1.4 2008/04/04 15:22:24 jlam Exp $
+${GEM_HOME}/cache/xmlparser-${PKGVERSION}.gem
+${GEM_LIBDIR}/MANIFEST
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/README.ja
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/ext/encoding.h
+${GEM_LIBDIR}/ext/xmlparser/mkrf_conf.rb
+${GEM_LIBDIR}/ext/xmlparser/xmlparser.c
+${GEM_LIBDIR}/lib/sax.rb
+${GEM_LIBDIR}/lib/saxdriver.rb
+${GEM_LIBDIR}/lib/wget.rb
+${GEM_LIBDIR}/lib/xml/dom/builder-ja.rb
+${GEM_LIBDIR}/lib/xml/dom/builder.rb
+${GEM_LIBDIR}/lib/xml/dom/core.rb
+${GEM_LIBDIR}/lib/xml/dom/digest.rb
+${GEM_LIBDIR}/lib/xml/dom/visitor.rb
+${GEM_LIBDIR}/lib/xml/dom2/attr.rb
+${GEM_LIBDIR}/lib/xml/dom2/cdatasection.rb
+${GEM_LIBDIR}/lib/xml/dom2/characterdata.rb
+${GEM_LIBDIR}/lib/xml/dom2/comment.rb
+${GEM_LIBDIR}/lib/xml/dom2/core.rb
+${GEM_LIBDIR}/lib/xml/dom2/document.rb
+${GEM_LIBDIR}/lib/xml/dom2/documentfragment.rb
+${GEM_LIBDIR}/lib/xml/dom2/documenttype.rb
+${GEM_LIBDIR}/lib/xml/dom2/dombuilder.rb
+${GEM_LIBDIR}/lib/xml/dom2/dombuilderfilter.rb
+${GEM_LIBDIR}/lib/xml/dom2/domentityresolver.rb
+${GEM_LIBDIR}/lib/xml/dom2/domentityresolverimpl.rb
+${GEM_LIBDIR}/lib/xml/dom2/domexception.rb
+${GEM_LIBDIR}/lib/xml/dom2/domimplementation.rb
+${GEM_LIBDIR}/lib/xml/dom2/dominputsource.rb
+${GEM_LIBDIR}/lib/xml/dom2/element.rb
+${GEM_LIBDIR}/lib/xml/dom2/entity.rb
+${GEM_LIBDIR}/lib/xml/dom2/entityreference.rb
+${GEM_LIBDIR}/lib/xml/dom2/namednodemap.rb
+${GEM_LIBDIR}/lib/xml/dom2/node.rb
+${GEM_LIBDIR}/lib/xml/dom2/nodelist.rb
+${GEM_LIBDIR}/lib/xml/dom2/notation.rb
+${GEM_LIBDIR}/lib/xml/dom2/processinginstruction.rb
+${GEM_LIBDIR}/lib/xml/dom2/text.rb
+${GEM_LIBDIR}/lib/xml/dom2/xpath.rb
+${GEM_LIBDIR}/lib/xml/encoding-ja.rb
+${GEM_LIBDIR}/lib/xml/parser.rb
+${GEM_LIBDIR}/lib/xml/parserns.rb
+${GEM_LIBDIR}/lib/xml/sax.rb
+${GEM_LIBDIR}/lib/xml/saxdriver.rb
+${GEM_LIBDIR}/lib/xml/xpath.rb
+${GEM_LIBDIR}/lib/xml/xpath.ry
+${GEM_LIBDIR}/lib/xmldigest.rb
+${GEM_LIBDIR}/lib/xmlparser.${RUBY_DLEXT}
+${GEM_LIBDIR}/lib/xmltree.rb
+${GEM_LIBDIR}/lib/xmltreebuilder.rb
+${GEM_LIBDIR}/lib/xmltreevisitor.rb
+${GEM_HOME}/specifications/xmlparser-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/lib/xml/dom2
+@dirrm ${GEM_LIBDIR}/lib/xml/dom
+@dirrm ${GEM_LIBDIR}/lib/xml
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/ext/xmlparser
+@dirrm ${GEM_LIBDIR}/ext
+@dirrm ${GEM_LIBDIR}
+@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/textproc/ruby-xmlparser/distinfo b/textproc/ruby-xmlparser/distinfo
index a3845065c09..d7f4f92fe43 100644
--- a/textproc/ruby-xmlparser/distinfo
+++ b/textproc/ruby-xmlparser/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/01/03 14:25:51 taca Exp $
+$NetBSD: distinfo,v 1.5 2008/04/04 15:22:24 jlam Exp $
 
-SHA1 (xmlparser-0.6.8.1.tar.gz) = a392d1a65b9ddf1499fb55778595e14ee686ff80
-RMD160 (xmlparser-0.6.8.1.tar.gz) = 63841ebf9f259c683eab2ed03c17b2e479c73607
-Size (xmlparser-0.6.8.1.tar.gz) = 140667 bytes
-SHA1 (patch-aa) = caf2667257f38503b6ac5094b570d19f0d16eb69
+SHA1 (xmlparser-0.6.81.gem) = 8c1000bbc5b4e7a4fd84a06f8a51955323ace594
+RMD160 (xmlparser-0.6.81.gem) = dc8e1d7801239315ae780d036a13ec6404b789ed
+Size (xmlparser-0.6.81.gem) = 91648 bytes
+SHA1 (patch-ac) = 0087db1fc0a44b22541018de4efbb4caef53f81c
diff --git a/textproc/ruby-xmlparser/patches/patch-aa b/textproc/ruby-xmlparser/patches/patch-aa
deleted file mode 100644
index 06ffb7aaa55..00000000000
--- a/textproc/ruby-xmlparser/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/28 04:51:38 taca Exp $
-
---- extconf.rb.orig	2004-02-18 22:48:06.000000000 +0900
-+++ extconf.rb
-@@ -12,7 +12,7 @@ perl= ENV['PERL'] || 'perl'
- ## Encoding maps may be stored in $perl_archlib/XML/Parser/Encodins/
- #perl_archlib = '/usr/lib/perl5/site_perl/5.005/i586-linux'
- #perl_archlib = '/usr/local/lib'
--perl_archlib = `#{perl} -e 'use Config; print $Config{"archlib"}'`
-+perl_archlib = `#{perl} -e 'use Config; print $Config{"sitelib"}'`
- xml_enc_path = with_config("perl-enc-map")
- if xml_enc_path == true
-   xml_enc_path = perl_archlib + "/XML/Parser/Encodings"
diff --git a/textproc/ruby-xmlparser/patches/patch-ac b/textproc/ruby-xmlparser/patches/patch-ac
new file mode 100644
index 00000000000..f9284741e4a
--- /dev/null
+++ b/textproc/ruby-xmlparser/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2008/04/04 15:22:24 jlam Exp $
+
+--- Rakefile.orig	1969-12-31 19:00:00.000000000 -0500
++++ Rakefile
+@@ -28,7 +28,7 @@ setup_gem(name, version) do |spec|
+   spec.extensions << "Rakefile"
+   spec.files = FileList["lib/**/*","ext/**/*"].exclude("rdoc").to_a
+   spec.has_rdoc = false
+-  spec.extra_rdoc_files=['README', 'README.ja', 'MANIFEST', 'samples']
++  spec.extra_rdoc_files=['README', 'README.ja', 'MANIFEST']
+   spec.rubyforge_project = 'xmlparser'
+ end
+