Update ruby-hpricot to version 0.6. Changes from version 0.5.140 include:

+ Install as a Ruby gem.

* Hpricot for JRuby

* Inline Markaby for Hpricot documents.

* XML tags and attributes are no longer downcased like HTML is.

* new syntax for grabbing everything between two elements using a
  Range in the s earch method: (doc/("font".."font/br")) or in nodes_at
  like so: (doc/"font").nod es_at("*".."br"). Only works with either
  a pair of siblings or a set of a parent and a sibling.

* Ignore self-closing endings on tags (such as form) which are
  containers. Treat them like open parent tags.

* Escaping of attributes.

* Element#raw_attributes gives unescaped data.  Element#attributes
  gives escaped.

* Added: Elements#attr, Elements#remove_attr, Elements#remove_class.

* Added: Traverse#preceding, Traverse#following, Traverse#previous,
  Traverse#next.

4 files changed, 75 insertions, 116 deletions

diff --git a/textproc/ruby-hpricot/Makefile b/textproc/ruby-hpricot/Makefile
index 4dc44490311..c68ac03dd66 100644
--- a/textproc/ruby-hpricot/Makefile
+++ b/textproc/ruby-hpricot/Makefile
@@ -1,35 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2007/06/09 00:58:51 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/04 15:21:39 jlam Exp $
 
-DISTNAME=	hpricot-0.5.140
+DISTNAME=	hpricot-0.6
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
-CATEGORIES=	textproc ruby
-MASTER_SITES=	http://code.whytheluckystiff.net/dist/
-EXTRACT_SUFX=	.tgz
+CATEGORIES=	textproc
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://code.whytheluckystiff.net/hpricot/
 COMMENT=	Fast, enjoyable HTML parser for Ruby
 
-BUILD_DEPENDS+=	ragel-[0-9]*:../../devel/ragel
-BUILD_DEPENDS+=	rake>=0.7.3:../../devel/rake
-
-RUBY_HAS_ARCHLIB=	yes
-
-FIND_PREFIX:=	RAKE_PREFIX=rake
-.include "../../mk/find-prefix.mk"
-
-.include "../../lang/ruby/modules.mk"
-
-do-build:
-	cd ${WRKSRC} && ${RAKE_PREFIX}/bin/rake
-
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/lib/hpricot_scan.${RUBY_DLEXT}		\
-		${RUBY_SITEARCHLIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/lib/hpricot.rb ${RUBY_SITELIBDIR}
-	${INSTALL_DATA_DIR} ${RUBY_SITELIBDIR}/hpricot
-	${INSTALL_DATA} ${WRKSRC}/lib/hpricot/*.rb			\
-		${RUBY_SITELIBDIR}/hpricot
-
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-hpricot/PLIST b/textproc/ruby-hpricot/PLIST
index ebf35588e2e..00181763fba 100644
--- a/textproc/ruby-hpricot/PLIST
+++ b/textproc/ruby-hpricot/PLIST
@@ -1,15 +1,55 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/26 01:34:44 minskim Exp $
-${RUBY_SITELIBDIR}/hpricot.rb
-${RUBY_SITELIBDIR}/hpricot/blankslate.rb
-${RUBY_SITELIBDIR}/hpricot/builder.rb
-${RUBY_SITELIBDIR}/hpricot/elements.rb
-${RUBY_SITELIBDIR}/hpricot/htmlinfo.rb
-${RUBY_SITELIBDIR}/hpricot/inspect.rb
-${RUBY_SITELIBDIR}/hpricot/modules.rb
-${RUBY_SITELIBDIR}/hpricot/parse.rb
-${RUBY_SITELIBDIR}/hpricot/tag.rb
-${RUBY_SITELIBDIR}/hpricot/tags.rb
-${RUBY_SITELIBDIR}/hpricot/traverse.rb
-${RUBY_SITELIBDIR}/hpricot/xchar.rb
-${RUBY_SITEARCHLIBDIR}/hpricot_scan.${RUBY_DLEXT}
-@dirrm ${RUBY_SITELIBDIR}/hpricot
+@comment $NetBSD: PLIST,v 1.2 2008/04/04 15:21:39 jlam Exp $
+${GEM_HOME}/cache/hpricot-${PKGVERSION}.gem
+${GEM_LIBDIR}/.require_paths
+${GEM_LIBDIR}/CHANGELOG
+${GEM_LIBDIR}/COPYING
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/ext/hpricot_scan/HpricotScanService.java
+${GEM_LIBDIR}/ext/hpricot_scan/extconf.rb
+${GEM_LIBDIR}/ext/hpricot_scan/hpricot_common.rl
+${GEM_LIBDIR}/ext/hpricot_scan/hpricot_scan.c
+${GEM_LIBDIR}/ext/hpricot_scan/hpricot_scan.h
+${GEM_LIBDIR}/ext/hpricot_scan/hpricot_scan.java.rl
+${GEM_LIBDIR}/ext/hpricot_scan/hpricot_scan.rl
+${GEM_LIBDIR}/extras/mingw-rbconfig.rb
+${GEM_LIBDIR}/lib/hpricot.rb
+${GEM_LIBDIR}/lib/hpricot/blankslate.rb
+${GEM_LIBDIR}/lib/hpricot/builder.rb
+${GEM_LIBDIR}/lib/hpricot/elements.rb
+${GEM_LIBDIR}/lib/hpricot/htmlinfo.rb
+${GEM_LIBDIR}/lib/hpricot/inspect.rb
+${GEM_LIBDIR}/lib/hpricot/modules.rb
+${GEM_LIBDIR}/lib/hpricot/parse.rb
+${GEM_LIBDIR}/lib/hpricot/tag.rb
+${GEM_LIBDIR}/lib/hpricot/tags.rb
+${GEM_LIBDIR}/lib/hpricot/traverse.rb
+${GEM_LIBDIR}/lib/hpricot/xchar.rb
+${GEM_LIBDIR}/lib/${RUBY_ARCH}/hpricot_scan.${RUBY_DLEXT}
+${GEM_LIBDIR}/test/files/basic.xhtml
+${GEM_LIBDIR}/test/files/boingboing.html
+${GEM_LIBDIR}/test/files/cy0.html
+${GEM_LIBDIR}/test/files/immob.html
+${GEM_LIBDIR}/test/files/pace_application.html
+${GEM_LIBDIR}/test/files/tenderlove.html
+${GEM_LIBDIR}/test/files/uswebgen.html
+${GEM_LIBDIR}/test/files/utf8.html
+${GEM_LIBDIR}/test/files/week9.html
+${GEM_LIBDIR}/test/files/why.xml
+${GEM_LIBDIR}/test/load_files.rb
+${GEM_LIBDIR}/test/test_alter.rb
+${GEM_LIBDIR}/test/test_builder.rb
+${GEM_LIBDIR}/test/test_parser.rb
+${GEM_LIBDIR}/test/test_paths.rb
+${GEM_LIBDIR}/test/test_preserved.rb
+${GEM_LIBDIR}/test/test_xml.rb
+${GEM_HOME}/specifications/hpricot-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test/files
+@dirrm ${GEM_LIBDIR}/test
+@dirrm ${GEM_LIBDIR}/lib/${RUBY_ARCH}
+@dirrm ${GEM_LIBDIR}/lib/hpricot
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/extras
+@dirrm ${GEM_LIBDIR}/ext/hpricot_scan
+@dirrm ${GEM_LIBDIR}/ext
+@dirrm ${GEM_LIBDIR}
diff --git a/textproc/ruby-hpricot/distinfo b/textproc/ruby-hpricot/distinfo
index dd214b57c66..fefeb719430 100644
--- a/textproc/ruby-hpricot/distinfo
+++ b/textproc/ruby-hpricot/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/06/09 00:48:43 minskim Exp $
+$NetBSD: distinfo,v 1.3 2008/04/04 15:21:39 jlam Exp $
 
-SHA1 (hpricot-0.5.140.tgz) = c30ba9a0217bf0d43bc2d8ee0876845aa3f521c6
-RMD160 (hpricot-0.5.140.tgz) = ee011a8d8dbb9991acbf6c38c1175fc756faf0f1
-Size (hpricot-0.5.140.tgz) = 212870 bytes
-SHA1 (patch-aa) = 13410ce5c80a3150c57fbe1a836a1e0817fa7542
+SHA1 (hpricot-0.6.gem) = 4be23c83200d8446f25d2441a5154f53d41a34f2
+RMD160 (hpricot-0.6.gem) = 80f785afd1d25219b6769271201733a934b52450
+Size (hpricot-0.6.gem) = 217088 bytes
+SHA1 (patch-aa) = f43bdb71f1810181320f58c0b0d9f0a7227b08af
diff --git a/textproc/ruby-hpricot/patches/patch-aa b/textproc/ruby-hpricot/patches/patch-aa
index 133dbd5ce02..2545d064254 100644
--- a/textproc/ruby-hpricot/patches/patch-aa
+++ b/textproc/ruby-hpricot/patches/patch-aa
@@ -1,80 +1,22 @@
-$NetBSD: patch-aa,v 1.2 2007/06/09 00:48:43 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2008/04/04 15:21:39 jlam Exp $
 
---- Rakefile.orig	2007-04-03 14:26:53.000000000 -0700
+--- Rakefile.orig	1969-12-31 19:00:00.000000000 -0500
 +++ Rakefile
-@@ -1,13 +1,12 @@
- require 'rake'
- require 'rake/clean'
--require 'rake/gempackagetask'
- require 'rake/rdoctask'
- require 'rake/testtask'
- require 'fileutils'
+@@ -7,7 +7,7 @@ require 'fileutils'
  include FileUtils
  
  NAME = "hpricot"
 -REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
-+REV = "140"
- VERS = ENV['VERSION'] || "0.5" + (REV ? ".#{REV}" : "")
++REV = nil
+ VERS = ENV['VERSION'] || "0.6" + (REV ? ".#{REV}" : "")
  PKG = "#{NAME}-#{VERS}"
  BIN = "*.{bundle,jar,so,obj,pdb,lib,def,exp}"
-@@ -18,24 +17,6 @@ PKG_FILES = %w(CHANGELOG COPYING README 
-       Dir.glob("{bin,doc,test,lib,extras}/**/*") + 
-       Dir.glob("ext/**/*.{h,java,c,rb,rl}") + 
-       %w[ext/hpricot_scan/hpricot_scan.c] # needed because it's generated later
--SPEC =
--  Gem::Specification.new do |s|
--    s.name = NAME
--    s.version = VERS
--    s.platform = Gem::Platform::RUBY
--    s.has_rdoc = true
--    s.rdoc_options += RDOC_OPTS
--    s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
--    s.summary = "a swift, liberal HTML parser with a fantastic library"
--    s.description = s.summary
--    s.author = "why the lucky stiff"
--    s.email = 'why@ruby-lang.org'
--    s.homepage = 'http://code.whytheluckystiff.net/hpricot/'
--    s.files = PKG_FILES
--    s.require_path = "lib"
--    s.extensions = FileList["ext/**/extconf.rb"].to_a
--    s.bindir = "bin"
--  end
- 
- desc "Does a full compile, test run"
- task :default => [:compile, :test]
-@@ -60,11 +41,6 @@ Rake::RDocTask.new do |rdoc|
-     rdoc.rdoc_files.add ['README', 'CHANGELOG', 'COPYING', 'lib/**/*.rb']
- end
- 
--Rake::GemPackageTask.new(SPEC) do |p|
--    p.need_tar = true
--    p.gem_spec = SPEC
--end
--
- extension = "hpricot_scan"
- ext = "ext/hpricot_scan"
- ext_so = "#{ext}/#{extension}.#{Config::CONFIG['DLEXT']}"
-@@ -124,11 +100,6 @@ end
- 
+@@ -127,7 +127,7 @@ end
  ### Win32 Packages ###
  
--Win32Spec = SPEC.dup
+ Win32Spec = SPEC.dup
 -Win32Spec.platform = Gem::Platform::WIN32
--Win32Spec.files = PKG_FILES + ['lib/hpricot_scan.so']
--Win32Spec.extensions = []
--  
- WIN32_PKG_DIR = "#{PKG}-mswin32"
- 
- desc "Package up the Win32 distribution."
-@@ -168,11 +139,6 @@ task :hpricot_scan_java => [:ragel_java]
-   Dir.chdir("ext/hpricot_scan", &compile_java)
- end
- 
--JRubySpec = SPEC.dup
--JRubySpec.platform = 'jruby'
--JRubySpec.files = PKG_FILES + ['lib/hpricot_scan.jar']
--JRubySpec.extensions = []
--
- JRUBY_PKG_DIR = "#{PKG}-jruby"
- 
- desc "Package up the JRuby distribution."
++Win32Spec.platform = Gem::Platform::CURRENT
+ Win32Spec.files = PKG_FILES + ["#{ARCHLIB}/hpricot_scan.so"]
+ Win32Spec.extensions = []
+