Update to 1.0.12. From the changelog:

* WritableDatabase::remove_spelling() now works properly.
* The QueryParser now treats NON_SPACING_MARK Unicode characters as phrase
  generators, which improves handling of Arabic.  This is a stop-gap solution
  for 1.0.x which will work with existing databases without requiring
  reindexing - in 1.1.0, NON_SPACING_MARK will be regarded as part of a word.
  (ticket#355)
* Fix undefined behaviour in distribution of OP_NEAR and OP_PHRASE over a
  non-leaf subquery (indentified by valgrind on testcase nearsubqueries1).
  (ticket#349)
* Enhance distribution of OP_NEAR/OP_PHRASE over non-leaf subqueries to work
  when there are multiple non-leaf subqueries (ticket#201).
* Enquire::get_mset() no longer needlessly checks if the documents exist.
* PostingIterator::get_description() output improved visually in some cases.
* Enquire::get_mset():
  + Now throws UnimplementedError if there's a percentage cutoff and sorting is
    primarily by value - this has never been correctly supported and it's
    better to warn people than give incorrect results.
  + No longer needlessly copies the results internally.
  + When searching multiple databases, now recalculates the maximum attainable
    weight after each database which may allow it to terminate earlier.
    (ticket#336).
  + Fix inconsistent percentage scores when sorting primarily by value, except
    when a MatchDecider is also being used; document this remaining problem
    case.  (ticket#216)
* Enquire::set_sort_by_value() (and similar methods): Rename the wrongly named
  "ascending" parameter to "reverse", and note that its value should always be
  explicitly given since defaulting to "reverse=true" is confusing and the
  default will be deprecated in 1.1.0.  (ticket#311)
* Database::allterms_begin(): Fix memory leak when iterating all terms from
  more than one database.
* Query::get_terms_begin(): Don't return "" from the TermIterator (happened
  when the query contained or was Query::MatchAll).
* Add QueryParser::FLAG_DEFAULT to make it easier to add flags to those set by
  default.

3 files changed, 11 insertions, 37 deletions

diff --git a/textproc/xapian/Makefile b/textproc/xapian/Makefile
index 868f0ab4563..38e2a4dbd82 100644
--- a/textproc/xapian/Makefile
+++ b/textproc/xapian/Makefile
@@ -1,19 +1,22 @@
-# $NetBSD: Makefile,v 1.4 2009/01/21 06:42:32 dsainty Exp $
+# $NetBSD: Makefile,v 1.5 2009/04/20 22:25:12 schmonz Exp $
 #
 
-DISTNAME=	xapian-core-1.0.10
+DISTNAME=	xapian-core-1.0.12
 PKGNAME=	${DISTNAME:S/-core//}
 CATEGORIES=	textproc
-MASTER_SITES=	http://oligarchy.co.uk/xapian/1.0.10/
+MASTER_SITES=	http://oligarchy.co.uk/xapian/1.0.12/
 
 MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://xapian.org/
 COMMENT=	Search engine based on Probabilistic Information Retrieval
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 
+TEST_TARGET=	check
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xapian
 PKG_SUPPORTED_OPTIONS=	xapian-flint-backend xapian-quartz-backend
 PKG_SUGGESTED_OPTIONS=	xapian-flint-backend xapian-quartz-backend
diff --git a/textproc/xapian/PLIST b/textproc/xapian/PLIST
index 7e876ea1254..d18b9c101dc 100644
--- a/textproc/xapian/PLIST
+++ b/textproc/xapian/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/01/21 06:42:32 dsainty Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/04/20 22:25:12 schmonz Exp $
 bin/copydatabase
 bin/delve
 ${PLIST.quartz}bin/quartzcheck
@@ -63,10 +63,6 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight__coll__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight__inherit__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1CategorySelectMatchSpy-members.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1CategorySelectMatchSpy.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1CategorySelectMatchSpy__coll__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1CategorySelectMatchSpy__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1Database-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Database.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Database__inherit__graph.png
@@ -103,15 +99,10 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1MSetIterator.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1MSetIterator__coll__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1MatchDecider-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1MatchDecider.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1MatchDecider__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter__coll__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter__inherit__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1MultipleMatchDecider-members.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1MultipleMatchDecider.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1MultipleMatchDecider__coll__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1MultipleMatchDecider__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1NumberValueRangeProcessor-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1NumberValueRangeProcessor.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1NumberValueRangeProcessor__coll__graph.png
@@ -139,18 +130,10 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1Stem.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Stopper-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Stopper.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Stopper__inherit__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1StringListSerialiser-members.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1StringListSerialiser.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1StringListUnserialiser-members.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1StringListUnserialiser.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1StringValueRangeProcessor-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1StringValueRangeProcessor.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1StringValueRangeProcessor__coll__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1StringValueRangeProcessor__inherit__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1TermCountMatchSpy-members.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1TermCountMatchSpy.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1TermCountMatchSpy__coll__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1TermCountMatchSpy__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1TermGenerator-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1TermGenerator.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1TermIterator-members.html
@@ -161,10 +144,6 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1TradWeight__coll__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1TradWeight__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1Utf8Iterator-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Utf8Iterator.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1ValueCountMatchSpy-members.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1ValueCountMatchSpy.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1ValueCountMatchSpy__coll__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1ValueCountMatchSpy__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1ValueIterator-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ValueIterator.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ValueIterator__coll__graph.png
@@ -254,7 +233,6 @@ share/doc/xapian-core/apidoc/html/functions_func_0x76.html
 share/doc/xapian-core/apidoc/html/functions_func_0x77.html
 share/doc/xapian-core/apidoc/html/functions_func_0x78.html
 share/doc/xapian-core/apidoc/html/functions_func_0x7e.html
-share/doc/xapian-core/apidoc/html/functions_rela.html
 share/doc/xapian-core/apidoc/html/functions_type.html
 share/doc/xapian-core/apidoc/html/functions_vars.html
 share/doc/xapian-core/apidoc/html/globals.html
@@ -282,9 +260,6 @@ share/doc/xapian-core/apidoc/html/inherit__graph__20.png
 share/doc/xapian-core/apidoc/html/inherit__graph__21.png
 share/doc/xapian-core/apidoc/html/inherit__graph__22.png
 share/doc/xapian-core/apidoc/html/inherit__graph__23.png
-share/doc/xapian-core/apidoc/html/inherit__graph__24.png
-share/doc/xapian-core/apidoc/html/inherit__graph__25.png
-share/doc/xapian-core/apidoc/html/inherit__graph__26.png
 share/doc/xapian-core/apidoc/html/inherit__graph__3.png
 share/doc/xapian-core/apidoc/html/inherit__graph__4.png
 share/doc/xapian-core/apidoc/html/inherit__graph__5.png
@@ -293,8 +268,6 @@ share/doc/xapian-core/apidoc/html/inherit__graph__7.png
 share/doc/xapian-core/apidoc/html/inherit__graph__8.png
 share/doc/xapian-core/apidoc/html/inherit__graph__9.png
 share/doc/xapian-core/apidoc/html/inherits.html
-share/doc/xapian-core/apidoc/html/matchspy_8h-source.html
-share/doc/xapian-core/apidoc/html/matchspy_8h.html
 share/doc/xapian-core/apidoc/html/namespaceXapian.html
 share/doc/xapian-core/apidoc/html/namespacemembers.html
 share/doc/xapian-core/apidoc/html/namespacemembers_func.html
@@ -314,8 +287,6 @@ share/doc/xapian-core/apidoc/html/sorter_8h-source.html
 share/doc/xapian-core/apidoc/html/sorter_8h.html
 share/doc/xapian-core/apidoc/html/stem_8h-source.html
 share/doc/xapian-core/apidoc/html/stem_8h.html
-share/doc/xapian-core/apidoc/html/structXapian_1_1StringAndFrequency-members.html
-share/doc/xapian-core/apidoc/html/structXapian_1_1StringAndFrequency.html
 share/doc/xapian-core/apidoc/html/structXapian_1_1ValueRangeProcessor-members.html
 share/doc/xapian-core/apidoc/html/structXapian_1_1ValueRangeProcessor.html
 share/doc/xapian-core/apidoc/html/structXapian_1_1ValueRangeProcessor__inherit__graph.png
diff --git a/textproc/xapian/distinfo b/textproc/xapian/distinfo
index fe1fef47e86..f2e4ac889d8 100644
--- a/textproc/xapian/distinfo
+++ b/textproc/xapian/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/01/07 22:39:38 wiz Exp $
+$NetBSD: distinfo,v 1.3 2009/04/20 22:25:12 schmonz Exp $
 
-SHA1 (xapian-core-1.0.10.tar.gz) = bd87e4bb2a8097918f0f6a5de6389a1c53c76992
-RMD160 (xapian-core-1.0.10.tar.gz) = 05e3380eb0c6a6b206edb1a7085daf9c885e2277
-Size (xapian-core-1.0.10.tar.gz) = 3088931 bytes
+SHA1 (xapian-core-1.0.12.tar.gz) = 963011408a77897d73da3f28e7aaabe2525e016f
+RMD160 (xapian-core-1.0.12.tar.gz) = 7d343805f477bdc040373b7257aab7164625d744
+Size (xapian-core-1.0.12.tar.gz) = 2991522 bytes