Update ruby-ferret to version 0.11.6. Changes from version 0.11.4

include:

+ Install as a Ruby gem.

* Fixed major bug in term vectors which was in turn affecting
  highlighting
* Fixed memory leak in PerFieldAnalyzer
* Fixed range query highlighter
* Fixed memory alignment issues on Solaris
* Added :use_keywords option to query parser so you can now turn
  of keywords so a search for OR will work
* multiple other bug fixes

3 files changed, 232 insertions, 49 deletions

diff --git a/textproc/ruby-ferret/Makefile b/textproc/ruby-ferret/Makefile
index 6dce35f780c..4d4a9a1b0b7 100644
--- a/textproc/ruby-ferret/Makefile
+++ b/textproc/ruby-ferret/Makefile
@@ -1,22 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/06/11 17:28:17 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/04 15:21:28 jlam Exp $
 
-DISTNAME=	ferret-0.11.4
+DISTNAME=	ferret-0.11.6
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=	textproc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/19358/
-EXTRACT_SUFX=	.tgz
+CATEGORIES=	textproc
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://ferret.davebalmain.com/
 COMMENT=	Text search engine library written for Ruby
 
-RUBY_HAS_ARCHLIB=	yes
-USE_RUBY_SETUP=		yes
-
-do-install:
-	cd ${WRKSRC}/lib && pax -rwppm . ${RUBY_SITELIBDIR}
-	${INSTALL_LIB} ${WRKSRC}/ext/ferret_ext.${RUBY_DLEXT}		\
-		${RUBY_SITEARCHLIBDIR}
-
-.include "../../lang/ruby/modules.mk"
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-ferret/PLIST b/textproc/ruby-ferret/PLIST
index 932cf99380b..f20539a5c9c 100644
--- a/textproc/ruby-ferret/PLIST
+++ b/textproc/ruby-ferret/PLIST
@@ -1,31 +1,224 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/11 17:28:17 minskim Exp $
-${RUBY_SITELIBDIR}/ferret.rb
-${RUBY_SITELIBDIR}/ferret/browser.rb
-${RUBY_SITELIBDIR}/ferret/browser/s/global.js
-${RUBY_SITELIBDIR}/ferret/browser/s/style.css
-${RUBY_SITELIBDIR}/ferret/browser/views/document/list.rhtml
-${RUBY_SITELIBDIR}/ferret/browser/views/document/show.rhtml
-${RUBY_SITELIBDIR}/ferret/browser/views/error/index.rhtml
-${RUBY_SITELIBDIR}/ferret/browser/views/help/index.rhtml
-${RUBY_SITELIBDIR}/ferret/browser/views/home/index.rhtml
-${RUBY_SITELIBDIR}/ferret/browser/views/layout.rhtml
-${RUBY_SITELIBDIR}/ferret/browser/views/term-vector/index.rhtml
-${RUBY_SITELIBDIR}/ferret/browser/views/term/index.rhtml
-${RUBY_SITELIBDIR}/ferret/browser/views/term/termdocs.rhtml
-${RUBY_SITELIBDIR}/ferret/browser/webrick.rb
-${RUBY_SITELIBDIR}/ferret/document.rb
-${RUBY_SITELIBDIR}/ferret/field_infos.rb
-${RUBY_SITELIBDIR}/ferret/index.rb
-${RUBY_SITELIBDIR}/ferret/number_tools.rb
-${RUBY_SITELIBDIR}/ferret_version.rb
-${RUBY_SITEARCHLIBDIR}/ferret_ext.${RUBY_DLEXT}
-@dirrm ${RUBY_SITELIBDIR}/ferret/browser/views/term-vector
-@dirrm ${RUBY_SITELIBDIR}/ferret/browser/views/term
-@dirrm ${RUBY_SITELIBDIR}/ferret/browser/views/home
-@dirrm ${RUBY_SITELIBDIR}/ferret/browser/views/help
-@dirrm ${RUBY_SITELIBDIR}/ferret/browser/views/error
-@dirrm ${RUBY_SITELIBDIR}/ferret/browser/views/document
-@dirrm ${RUBY_SITELIBDIR}/ferret/browser/views
-@dirrm ${RUBY_SITELIBDIR}/ferret/browser/s
-@dirrm ${RUBY_SITELIBDIR}/ferret/browser
-@dirrm ${RUBY_SITELIBDIR}/ferret
+@comment $NetBSD: PLIST,v 1.2 2008/04/04 15:21:28 jlam Exp $
+bin/ferret-browser
+${GEM_HOME}/cache/ferret-${PKGVERSION}.gem
+${GEM_LIBDIR}/CHANGELOG
+${GEM_LIBDIR}/MIT-LICENSE
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/TODO
+${GEM_LIBDIR}/TUTORIAL
+${GEM_LIBDIR}/bin/ferret-browser
+${GEM_LIBDIR}/ext/analysis.c
+${GEM_LIBDIR}/ext/analysis.h
+${GEM_LIBDIR}/ext/api.c
+${GEM_LIBDIR}/ext/api.h
+${GEM_LIBDIR}/ext/array.c
+${GEM_LIBDIR}/ext/array.h
+${GEM_LIBDIR}/ext/bitvector.c
+${GEM_LIBDIR}/ext/bitvector.h
+${GEM_LIBDIR}/ext/compound_io.c
+${GEM_LIBDIR}/ext/config.h
+${GEM_LIBDIR}/ext/document.c
+${GEM_LIBDIR}/ext/document.h
+${GEM_LIBDIR}/ext/except.c
+${GEM_LIBDIR}/ext/except.h
+${GEM_LIBDIR}/ext/extconf.rb
+${GEM_LIBDIR}/ext/ferret.c
+${GEM_LIBDIR}/ext/ferret.h
+${GEM_LIBDIR}/ext/filter.c
+${GEM_LIBDIR}/ext/fs_store.c
+${GEM_LIBDIR}/ext/global.c
+${GEM_LIBDIR}/ext/global.h
+${GEM_LIBDIR}/ext/hash.c
+${GEM_LIBDIR}/ext/hash.h
+${GEM_LIBDIR}/ext/hashset.c
+${GEM_LIBDIR}/ext/hashset.h
+${GEM_LIBDIR}/ext/header.h
+${GEM_LIBDIR}/ext/helper.c
+${GEM_LIBDIR}/ext/helper.h
+${GEM_LIBDIR}/ext/inc/lang.h
+${GEM_LIBDIR}/ext/inc/threading.h
+${GEM_LIBDIR}/ext/index.c
+${GEM_LIBDIR}/ext/index.h
+${GEM_LIBDIR}/ext/lang.h
+${GEM_LIBDIR}/ext/libstemmer.c
+${GEM_LIBDIR}/ext/libstemmer.h
+${GEM_LIBDIR}/ext/mempool.c
+${GEM_LIBDIR}/ext/mempool.h
+${GEM_LIBDIR}/ext/modules.h
+${GEM_LIBDIR}/ext/multimapper.c
+${GEM_LIBDIR}/ext/multimapper.h
+${GEM_LIBDIR}/ext/posh.c
+${GEM_LIBDIR}/ext/posh.h
+${GEM_LIBDIR}/ext/priorityqueue.c
+${GEM_LIBDIR}/ext/priorityqueue.h
+${GEM_LIBDIR}/ext/q_boolean.c
+${GEM_LIBDIR}/ext/q_const_score.c
+${GEM_LIBDIR}/ext/q_filtered_query.c
+${GEM_LIBDIR}/ext/q_fuzzy.c
+${GEM_LIBDIR}/ext/q_match_all.c
+${GEM_LIBDIR}/ext/q_multi_term.c
+${GEM_LIBDIR}/ext/q_parser.c
+${GEM_LIBDIR}/ext/q_phrase.c
+${GEM_LIBDIR}/ext/q_prefix.c
+${GEM_LIBDIR}/ext/q_range.c
+${GEM_LIBDIR}/ext/q_span.c
+${GEM_LIBDIR}/ext/q_term.c
+${GEM_LIBDIR}/ext/q_wildcard.c
+${GEM_LIBDIR}/ext/r_analysis.c
+${GEM_LIBDIR}/ext/r_index.c
+${GEM_LIBDIR}/ext/r_qparser.c
+${GEM_LIBDIR}/ext/r_search.c
+${GEM_LIBDIR}/ext/r_store.c
+${GEM_LIBDIR}/ext/r_utils.c
+${GEM_LIBDIR}/ext/ram_store.c
+${GEM_LIBDIR}/ext/search.c
+${GEM_LIBDIR}/ext/search.h
+${GEM_LIBDIR}/ext/similarity.c
+${GEM_LIBDIR}/ext/similarity.h
+${GEM_LIBDIR}/ext/sort.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_danish.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_danish.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_dutch.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_dutch.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_english.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_english.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_finnish.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_finnish.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_french.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_french.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_german.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_german.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_italian.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_italian.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_norwegian.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_norwegian.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_porter.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_porter.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_portuguese.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_portuguese.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_spanish.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_spanish.h
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_swedish.c
+${GEM_LIBDIR}/ext/stem_ISO_8859_1_swedish.h
+${GEM_LIBDIR}/ext/stem_KOI8_R_russian.c
+${GEM_LIBDIR}/ext/stem_KOI8_R_russian.h
+${GEM_LIBDIR}/ext/stem_UTF_8_danish.c
+${GEM_LIBDIR}/ext/stem_UTF_8_danish.h
+${GEM_LIBDIR}/ext/stem_UTF_8_dutch.c
+${GEM_LIBDIR}/ext/stem_UTF_8_dutch.h
+${GEM_LIBDIR}/ext/stem_UTF_8_english.c
+${GEM_LIBDIR}/ext/stem_UTF_8_english.h
+${GEM_LIBDIR}/ext/stem_UTF_8_finnish.c
+${GEM_LIBDIR}/ext/stem_UTF_8_finnish.h
+${GEM_LIBDIR}/ext/stem_UTF_8_french.c
+${GEM_LIBDIR}/ext/stem_UTF_8_french.h
+${GEM_LIBDIR}/ext/stem_UTF_8_german.c
+${GEM_LIBDIR}/ext/stem_UTF_8_german.h
+${GEM_LIBDIR}/ext/stem_UTF_8_italian.c
+${GEM_LIBDIR}/ext/stem_UTF_8_italian.h
+${GEM_LIBDIR}/ext/stem_UTF_8_norwegian.c
+${GEM_LIBDIR}/ext/stem_UTF_8_norwegian.h
+${GEM_LIBDIR}/ext/stem_UTF_8_porter.c
+${GEM_LIBDIR}/ext/stem_UTF_8_porter.h
+${GEM_LIBDIR}/ext/stem_UTF_8_portuguese.c
+${GEM_LIBDIR}/ext/stem_UTF_8_portuguese.h
+${GEM_LIBDIR}/ext/stem_UTF_8_russian.c
+${GEM_LIBDIR}/ext/stem_UTF_8_russian.h
+${GEM_LIBDIR}/ext/stem_UTF_8_spanish.c
+${GEM_LIBDIR}/ext/stem_UTF_8_spanish.h
+${GEM_LIBDIR}/ext/stem_UTF_8_swedish.c
+${GEM_LIBDIR}/ext/stem_UTF_8_swedish.h
+${GEM_LIBDIR}/ext/stopwords.c
+${GEM_LIBDIR}/ext/store.c
+${GEM_LIBDIR}/ext/store.h
+${GEM_LIBDIR}/ext/term_vectors.c
+${GEM_LIBDIR}/ext/threading.h
+${GEM_LIBDIR}/ext/utilities.c
+${GEM_LIBDIR}/ext/win32.h
+${GEM_LIBDIR}/lib/ferret.rb
+${GEM_LIBDIR}/lib/ferret/browser.rb
+${GEM_LIBDIR}/lib/ferret/browser/s/global.js
+${GEM_LIBDIR}/lib/ferret/browser/s/style.css
+${GEM_LIBDIR}/lib/ferret/browser/views/document/list.rhtml
+${GEM_LIBDIR}/lib/ferret/browser/views/document/show.rhtml
+${GEM_LIBDIR}/lib/ferret/browser/views/error/index.rhtml
+${GEM_LIBDIR}/lib/ferret/browser/views/help/index.rhtml
+${GEM_LIBDIR}/lib/ferret/browser/views/home/index.rhtml
+${GEM_LIBDIR}/lib/ferret/browser/views/layout.rhtml
+${GEM_LIBDIR}/lib/ferret/browser/views/term-vector/index.rhtml
+${GEM_LIBDIR}/lib/ferret/browser/views/term/index.rhtml
+${GEM_LIBDIR}/lib/ferret/browser/views/term/termdocs.rhtml
+${GEM_LIBDIR}/lib/ferret/browser/webrick.rb
+${GEM_LIBDIR}/lib/ferret/document.rb
+${GEM_LIBDIR}/lib/ferret/field_infos.rb
+${GEM_LIBDIR}/lib/ferret/index.rb
+${GEM_LIBDIR}/lib/ferret/number_tools.rb
+${GEM_LIBDIR}/lib/ferret_ext.${RUBY_DLEXT}
+${GEM_LIBDIR}/lib/ferret_version.rb
+${GEM_LIBDIR}/setup.rb
+${GEM_LIBDIR}/test/test_all.rb
+${GEM_LIBDIR}/test/test_helper.rb
+${GEM_LIBDIR}/test/threading/number_to_spoken.rb
+${GEM_LIBDIR}/test/threading/thread_safety_index_test.rb
+${GEM_LIBDIR}/test/threading/thread_safety_read_write_test.rb
+${GEM_LIBDIR}/test/threading/thread_safety_test.rb
+${GEM_LIBDIR}/test/unit/analysis/tc_analyzer.rb
+${GEM_LIBDIR}/test/unit/analysis/tc_token_stream.rb
+${GEM_LIBDIR}/test/unit/index/tc_index.rb
+${GEM_LIBDIR}/test/unit/index/tc_index_reader.rb
+${GEM_LIBDIR}/test/unit/index/tc_index_writer.rb
+${GEM_LIBDIR}/test/unit/index/th_doc.rb
+${GEM_LIBDIR}/test/unit/largefile/tc_largefile.rb
+${GEM_LIBDIR}/test/unit/query_parser/tc_query_parser.rb
+${GEM_LIBDIR}/test/unit/search/tc_filter.rb
+${GEM_LIBDIR}/test/unit/search/tc_fuzzy_query.rb
+${GEM_LIBDIR}/test/unit/search/tc_index_searcher.rb
+${GEM_LIBDIR}/test/unit/search/tc_multi_searcher.rb
+${GEM_LIBDIR}/test/unit/search/tc_multiple_search_requests.rb
+${GEM_LIBDIR}/test/unit/search/tc_search_and_sort.rb
+${GEM_LIBDIR}/test/unit/search/tc_sort.rb
+${GEM_LIBDIR}/test/unit/search/tc_sort_field.rb
+${GEM_LIBDIR}/test/unit/search/tc_spans.rb
+${GEM_LIBDIR}/test/unit/search/tm_searcher.rb
+${GEM_LIBDIR}/test/unit/store/tc_fs_store.rb
+${GEM_LIBDIR}/test/unit/store/tc_ram_store.rb
+${GEM_LIBDIR}/test/unit/store/tm_store.rb
+${GEM_LIBDIR}/test/unit/store/tm_store_lock.rb
+${GEM_LIBDIR}/test/unit/tc_document.rb
+${GEM_LIBDIR}/test/unit/ts_analysis.rb
+${GEM_LIBDIR}/test/unit/ts_index.rb
+${GEM_LIBDIR}/test/unit/ts_largefile.rb
+${GEM_LIBDIR}/test/unit/ts_query_parser.rb
+${GEM_LIBDIR}/test/unit/ts_search.rb
+${GEM_LIBDIR}/test/unit/ts_store.rb
+${GEM_LIBDIR}/test/unit/ts_utils.rb
+${GEM_LIBDIR}/test/unit/utils/tc_bit_vector.rb
+${GEM_LIBDIR}/test/unit/utils/tc_number_tools.rb
+${GEM_LIBDIR}/test/unit/utils/tc_priority_queue.rb
+${GEM_HOME}/specifications/ferret-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test/unit/utils
+@dirrm ${GEM_LIBDIR}/test/unit/store
+@dirrm ${GEM_LIBDIR}/test/unit/search
+@dirrm ${GEM_LIBDIR}/test/unit/query_parser
+@dirrm ${GEM_LIBDIR}/test/unit/largefile
+@dirrm ${GEM_LIBDIR}/test/unit/index
+@dirrm ${GEM_LIBDIR}/test/unit/analysis
+@dirrm ${GEM_LIBDIR}/test/unit
+@dirrm ${GEM_LIBDIR}/test/threading
+@dirrm ${GEM_LIBDIR}/test
+@dirrm ${GEM_LIBDIR}/lib/ferret/browser/views/term-vector
+@dirrm ${GEM_LIBDIR}/lib/ferret/browser/views/term
+@dirrm ${GEM_LIBDIR}/lib/ferret/browser/views/home
+@dirrm ${GEM_LIBDIR}/lib/ferret/browser/views/help
+@dirrm ${GEM_LIBDIR}/lib/ferret/browser/views/error
+@dirrm ${GEM_LIBDIR}/lib/ferret/browser/views/document
+@dirrm ${GEM_LIBDIR}/lib/ferret/browser/views
+@dirrm ${GEM_LIBDIR}/lib/ferret/browser/s
+@dirrm ${GEM_LIBDIR}/lib/ferret/browser
+@dirrm ${GEM_LIBDIR}/lib/ferret
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/ext/inc
+@dirrm ${GEM_LIBDIR}/ext
+@dirrm ${GEM_LIBDIR}/bin
+@dirrm ${GEM_LIBDIR}
diff --git a/textproc/ruby-ferret/distinfo b/textproc/ruby-ferret/distinfo
index 71573762d8a..41a8a6eafeb 100644
--- a/textproc/ruby-ferret/distinfo
+++ b/textproc/ruby-ferret/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/06/11 17:28:17 minskim Exp $
+$NetBSD: distinfo,v 1.2 2008/04/04 15:21:28 jlam Exp $
 
-SHA1 (ferret-0.11.4.tgz) = 55fbf6f2b1f15dd258b993ba8abee979e651fd24
-RMD160 (ferret-0.11.4.tgz) = 5df011873266ece99f6d6470c441ad0e4ee2a723
-Size (ferret-0.11.4.tgz) = 451065 bytes
+SHA1 (ferret-0.11.6.gem) = 83e0fada54e20445fe4ed7cd1dcdf9ffe74bb953
+RMD160 (ferret-0.11.6.gem) = 8f3fb148dafea297468fdc277c94f13fd4c4e164
+Size (ferret-0.11.6.gem) = 473600 bytes