Update to 1.2.17. From the changelog:

API:
* Enquire::set_sort_by_relevance_then_value() and
  Enquire::set_sort_by_relevance_then_key(): Fix sense of reverse parameter.
  Reported by "boomboo" on IRC.
* BM25Weight: Fix case where (k1 == 0 || b == 0) but k2 != 0.  Reported by
  "boomboo" on IRC.
* Unicode::tolower(): Fix to give correct results for U+01C5, U+01C8, U+01CB,
  and U+01F2 (previously these were left unchanged).
* PositionIterator,PostingIterator,TermIterator,ValueIterator: Don't segfault
  if skip_to() or check() is called on an iterator which is already at_end().
  Reported by David Bremner.
* ValueCountMatchSpy: get_description() on a default-constructed
  ValueCountMatchSpy object no longer fails when xapian-core is built with
  --enable-log.
* ValueCountMatchSpy: get_total() on a default-constructed ValueCountMatchSpy
  object now returns 0 rather than segfaulting.

testsuite:
* Automatically probe for and hook in eatmydata to the testsuite using the
  wrapper script it now includes.
* Fix apitest to build when brass, chert or flint are disabled.
* If -v/--verbose is specified more than once to a test program, show the
  diagnostic output for passing tests as well as failing/skipped ones.
* queryparsertest: Change qp_scale1 to time 5 repetitions of the large query to
  help average out variations.
* queryparsertest: Add test coverage for explicit synonym of a term with a
  prefix (e.g. ~foo:search).
* apitest: Remove code from registry* testcases which tries to test the
  consequences of throwing an exception from a destructor - it's complex to
  ensure we don't leak memory while doing this (it seems GCC doesn't release
  the object in this case, but clang does), and it's generally frowned upon,
  plus C++11 makes destructors noexcept by default.
* Fix "make check" to actually removed cached databases first, as is
  intended.

brass backend:
* Fix handling of invalid block sizes passed to Xapian::Brass::open() - the
  size gets fixed as documented, but the uncorrected size was passed to the
  base file (and abort() was called if 0 was passed).
* Validate "dir_end" when reading a block.  (fixes #592)
* When moving a cursor on a read-only table, check if the block we want is in
  the internal cursor.  We already do this for a writable table, as it is
  necessary for correctness, but it's a cheap check and may avoid asking the
  OS for a block we actually already have.
* Correctly report the database as closed rather than 'Bad file descriptor'
  in certain cases.
* Reuse a cursor for reading values from valuestreams rather than creating
  a new one each time.  This can dramatically reduce the number of blocks
  redundantly reread when sorting by value.  The rereads will generally get
  served from VM cache, but there's still an overhead to that.

chert backend:
* Fix handling of invalid block sizes passed to Xapian::Chert::open() - the
  size gets fixed as documented, but the uncorrected size was passed to the
  base file (and abort() was called if 0 was passed).
* Validate "dir_end" when reading a block.  (fixes #592)
* When moving a cursor on a read-only table, check if the block we want is in
  the internal cursor.  We already do this for a writable table, as it is
  necessary for correctness, but it's a cheap check and may avoid asking the
  OS for a block we actually already have.
* Correctly report the database as closed rather than 'Bad file descriptor'
  in certain cases.
* Reuse a cursor for reading values from valuestreams rather than creating
  a new one each time.  This can dramatically reduce the number of blocks
  redundantly reread when sorting by value.  The rereads will generally get
  served from VM cache, but there's still an overhead to that.

flint backend:
* Fix handling of invalid block sizes passed to Xapian::Flint::open() - the
  size gets fixed as documented, but the uncorrected size was passed to the
  base file (and abort() was called if 0 was passed).
* Validate "dir_end" when reading a block.  (fixes #592)
* When moving a cursor on a read-only table, check if the block we want is in
  the internal cursor.  We already do this for a writable table, as it is
  necessary for correctness, but it's a cheap check and may avoid asking the
  OS for a block we actually already have.
* Correctly report the database as closed rather than 'Bad file descriptor'
  in certain cases.

build system:
* configure: Improve reporting of GCC version.
* Use -no-fast-install on platforms where -no-install causes libtool to emit a
  warning.
* docs/Makefile.am: Fix handling of MAINTAINER_NO_DOCS.
* Include UnicodeData.txt and the script to generate the unicode tables from
  it.
* Compress source tarballs with xz instead of gzip.
* Split XAPIAN_LIBS out of XAPIAN_LDFLAGS so that -l flags for libraries
  configure detects are needed appear after -L flags specified by the user
  that may be needed to find such libraries.  (fixes#626)
* XO_LIB_XAPIAN now handles the user specifying a relative path in
  XAPIAN_CONFIG, e.g.: "./configure XAPIAN_CONFIG=../xapian-core/xapian-config"
* Adjust XO_LIB_XAPIAN to strip _gitNNN suffix from snapshot versions.
* configure: Handle git snapshot naming when calculating REVISION.
* configure: Enable -fshow-column for GCC - things like vim's quickfix mode
  will then jump to the appropriate column for a compiler error or warning, not
  just the appropriate line.
* configure: Report GCC version in configure output.

documentation:
* postingsource.rst: Clarify a couple of points (reported by "vHanda" on IRC).
* The API documentation shipped with the release is now generated with
  doxygen 1.8.5 instead of 1.5.9, which is most evident in the different
  HTML styling newer doxygen uses.
* Document how Utf8Iterator handles invalid UTF-8 in API documentation.
* Improve how descriptions of deprecated features appear in the API
  documentation.
* docs/remote_protocol.rst: Correct error in documentation of REPLY_DOCDATA
  message.
* docs/overview.rst: Correct documentation for how to specify "prog" remote
  databases in stub files.
* Direct users to git in preference to SVN - we'll be switching entirely in
  the near future.

portability:
* Protect the ValueIterator::check() method against Mac OS X SDK headers
  which define a check() macro.
* Fix warning from xlC compiler.
* Avoid use of grep -e in configure, as /usr/bin/grep on Solaris doesn't
  support -e.
* Fix check for flags which might be needed for ANSI mode for compilers called
  'cxx'.
* configure: Improve handling of Sun's C++ compiler - trick libtool into not
  adding -library=Cstd, and prefer -library=stdcxx4 if supported.  Explicitly
  add -library=Crun which seems to be required, even though the documentation
  suggests otherwise.
* configure: clang doesn't support -Wstrict-null-sentinel or -Wlogical-op, so
  don't pass it these options.
* Fix build errors and warnings with mingw.
* Suppress "unused local typedef" warnings from GCC 4.8.
* If the compiler supports C++11, use static_assert to implement
  CompileTimeAssert.
* tests/zlib-vg.c: Fix two warnings when compiled with clang.
* Fix failure when built with -D_GLIBCXX_DEBUG - we were modifying the top()
  element of a heap before calling pop(), such that the heap comparison
  operation (which is called when -D_GLIBCXX_DEBUG is on to verify the heap is
  valid) would read off the end of the data.  In a normal build, this issue
  would likely never manifest.
* configure: When generating ABI compatibility checks in xapian/version.h, pass
  $CXXFLAGS and $CPPFLAGS to $CXXCPP as they could contain options which affect
  the ABI (such as -fabi-version for GCC).  (Fixes #622)
* Microsoft GUIDs in binary form have reversed byte order in the first three
  components compared to standard UUIDs, so the same database would report a
  different UUID on Windows to on other platforms.  We now swap the bytes to
  match the standard order.  With this fix, the UUIDs of existing databases
  will appear to change on Windows (except in rare "palindronic" cases).
* Fix a couple of issues to get Xapian to build and work on AIX.
* common/safeuuid.h: Remove bogus take-address-of from uuid handling code for
  NetBSD and OpenBSD.
* Under cygwin, use cygwin_conv_path() if using a new enough cygwin version,
  rather than the now deprecated cygwin_conv_to_win32_path().  Reported by
  "Haroogan" on the xapian-devel mailing list.
* common/safeuuid.h: Add missing '#include <cstdlib>' and qualify free with std.
* Fix 'unused label' warning when chert backend is disabled.
* xapian.h: Add check for Wt headers being included before us and defining
  'slots' as a macro - if they are, give a clear error advising how to work
  around this (previously compilation would fail with a confusing error).

tools:
* xapian-chert-update: Fix -b to work rather than always segfaulting (reported
  in http://bugs.debian.org/716484).
* xapian-chert-update: The documented alias --blocksize for -b has never
  actually been supported, so just drop mentions of it from --help and the man
  page.
* xapian-check:
  + Fix chert database check that first docid in each doclength chunk is more
    than the last docid in the previous chunk - previously this didn't actually
    work.
  + Fix database check not to falsely report "position table: Junk after
    position data" whenever there are 7 unused bits (7 is OK, *more* than 7
    isn't).
  + Fix to report block numbers correctly for links within the B-tree.
  + If the METAINFO key is missing, only report it once per table.
  + Fix database consistency checking to always open all the tables at the same
    revision - not doing this could lead to false errors being reported after a
    commit interrupted by the process being killed or the machine crashing.
    Reported by Joey Hess in http://bugs.debian.org/724610

examples:
* quest: Add --check-at-least option.

debug code:
* Fix assertion failure for when an OrPostList decays to an AndPostList - the
  ordering of the subqueries by estimated termfreq may not be the same as it
  was when the OrPostList was constructed, as the subqueries may themselves
  have decayed.  Reported by Michel Pelletier.
* Fix -Wcast-qual warning from GCC 4.7 when configured with --enable-log.

4 files changed, 69 insertions, 57 deletions

diff --git a/textproc/xapian/Makefile b/textproc/xapian/Makefile
index db8586f1d2c..f11fa013bb9 100644
--- a/textproc/xapian/Makefile
+++ b/textproc/xapian/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.18 2013/06/04 21:27:02 schmonz Exp $
+# $NetBSD: Makefile,v 1.19 2014/02/20 19:15:14 schmonz Exp $
 #
 
 DISTNAME=		xapian-core-${VERSION}
-VERSION=		1.2.15
+VERSION=		1.2.17
 PKGNAME=		xapian-${VERSION}
 CATEGORIES=		textproc
 MASTER_SITES=		http://oligarchy.co.uk/xapian/${VERSION}/
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://xapian.org/
diff --git a/textproc/xapian/PLIST b/textproc/xapian/PLIST
index d4c1d033584..22d6277fc33 100644
--- a/textproc/xapian/PLIST
+++ b/textproc/xapian/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2012/01/10 01:03:28 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/02/20 19:15:14 schmonz Exp $
 bin/copydatabase
 bin/delve
 bin/quest
@@ -254,11 +254,15 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1WritableDatabase-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1WritableDatabase.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1WritableDatabase__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classes.html
-share/doc/xapian-core/apidoc/html/closed.gif
+share/doc/xapian-core/apidoc/html/bc_s.png
+share/doc/xapian-core/apidoc/html/bdwn.png
+share/doc/xapian-core/apidoc/html/closed.png
 share/doc/xapian-core/apidoc/html/compactor_8h.html
 share/doc/xapian-core/apidoc/html/database_8h.html
 share/doc/xapian-core/apidoc/html/dbfactory_8h.html
 share/doc/xapian-core/apidoc/html/deprecated.html
+share/doc/xapian-core/apidoc/html/dir_168225033f613bf58e19d0630bef5c8b.html
+share/doc/xapian-core/apidoc/html/dir_3c504f51550cb9fcc49223adf2dc9606.html
 share/doc/xapian-core/apidoc/html/document_8h.html
 share/doc/xapian-core/apidoc/html/doxygen.css
 share/doc/xapian-core/apidoc/html/doxygen.png
@@ -267,6 +271,22 @@ share/doc/xapian-core/apidoc/html/error_8h.html
 share/doc/xapian-core/apidoc/html/errorhandler_8h.html
 share/doc/xapian-core/apidoc/html/expanddecider_8h.html
 share/doc/xapian-core/apidoc/html/files.html
+share/doc/xapian-core/apidoc/html/ftv2blank.png
+share/doc/xapian-core/apidoc/html/ftv2cl.png
+share/doc/xapian-core/apidoc/html/ftv2doc.png
+share/doc/xapian-core/apidoc/html/ftv2folderclosed.png
+share/doc/xapian-core/apidoc/html/ftv2folderopen.png
+share/doc/xapian-core/apidoc/html/ftv2lastnode.png
+share/doc/xapian-core/apidoc/html/ftv2link.png
+share/doc/xapian-core/apidoc/html/ftv2mlastnode.png
+share/doc/xapian-core/apidoc/html/ftv2mnode.png
+share/doc/xapian-core/apidoc/html/ftv2mo.png
+share/doc/xapian-core/apidoc/html/ftv2node.png
+share/doc/xapian-core/apidoc/html/ftv2ns.png
+share/doc/xapian-core/apidoc/html/ftv2plastnode.png
+share/doc/xapian-core/apidoc/html/ftv2pnode.png
+share/doc/xapian-core/apidoc/html/ftv2splitbar.png
+share/doc/xapian-core/apidoc/html/ftv2vertline.png
 share/doc/xapian-core/apidoc/html/functions.html
 share/doc/xapian-core/apidoc/html/functions_0x62.html
 share/doc/xapian-core/apidoc/html/functions_0x63.html
@@ -324,36 +344,36 @@ share/doc/xapian-core/apidoc/html/graph_legend.html
 share/doc/xapian-core/apidoc/html/graph_legend.png
 share/doc/xapian-core/apidoc/html/hierarchy.html
 share/doc/xapian-core/apidoc/html/index.html
-share/doc/xapian-core/apidoc/html/inherit__graph__0.png
-share/doc/xapian-core/apidoc/html/inherit__graph__1.png
-share/doc/xapian-core/apidoc/html/inherit__graph__10.png
-share/doc/xapian-core/apidoc/html/inherit__graph__11.png
-share/doc/xapian-core/apidoc/html/inherit__graph__12.png
-share/doc/xapian-core/apidoc/html/inherit__graph__13.png
-share/doc/xapian-core/apidoc/html/inherit__graph__14.png
-share/doc/xapian-core/apidoc/html/inherit__graph__15.png
-share/doc/xapian-core/apidoc/html/inherit__graph__16.png
-share/doc/xapian-core/apidoc/html/inherit__graph__17.png
-share/doc/xapian-core/apidoc/html/inherit__graph__18.png
-share/doc/xapian-core/apidoc/html/inherit__graph__19.png
-share/doc/xapian-core/apidoc/html/inherit__graph__2.png
-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__27.png
-share/doc/xapian-core/apidoc/html/inherit__graph__28.png
-share/doc/xapian-core/apidoc/html/inherit__graph__29.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
-share/doc/xapian-core/apidoc/html/inherit__graph__6.png
-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/inherit_graph_0.png
+share/doc/xapian-core/apidoc/html/inherit_graph_1.png
+share/doc/xapian-core/apidoc/html/inherit_graph_10.png
+share/doc/xapian-core/apidoc/html/inherit_graph_11.png
+share/doc/xapian-core/apidoc/html/inherit_graph_12.png
+share/doc/xapian-core/apidoc/html/inherit_graph_13.png
+share/doc/xapian-core/apidoc/html/inherit_graph_14.png
+share/doc/xapian-core/apidoc/html/inherit_graph_15.png
+share/doc/xapian-core/apidoc/html/inherit_graph_16.png
+share/doc/xapian-core/apidoc/html/inherit_graph_17.png
+share/doc/xapian-core/apidoc/html/inherit_graph_18.png
+share/doc/xapian-core/apidoc/html/inherit_graph_19.png
+share/doc/xapian-core/apidoc/html/inherit_graph_2.png
+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_27.png
+share/doc/xapian-core/apidoc/html/inherit_graph_28.png
+share/doc/xapian-core/apidoc/html/inherit_graph_29.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
+share/doc/xapian-core/apidoc/html/inherit_graph_6.png
+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/keymaker_8h.html
 share/doc/xapian-core/apidoc/html/matchspy_8h.html
@@ -371,7 +391,10 @@ share/doc/xapian-core/apidoc/html/namespacemembers_func.html
 share/doc/xapian-core/apidoc/html/namespacemembers_type.html
 share/doc/xapian-core/apidoc/html/namespacemembers_vars.html
 share/doc/xapian-core/apidoc/html/namespaces.html
-share/doc/xapian-core/apidoc/html/open.gif
+share/doc/xapian-core/apidoc/html/nav_f.png
+share/doc/xapian-core/apidoc/html/nav_g.png
+share/doc/xapian-core/apidoc/html/nav_h.png
+share/doc/xapian-core/apidoc/html/open.png
 share/doc/xapian-core/apidoc/html/pages.html
 share/doc/xapian-core/apidoc/html/positioniterator_8h.html
 share/doc/xapian-core/apidoc/html/postingiterator_8h.html
@@ -385,9 +408,12 @@ share/doc/xapian-core/apidoc/html/structXapian_1_1StemImplementation.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
-share/doc/xapian-core/apidoc/html/tab_b.gif
-share/doc/xapian-core/apidoc/html/tab_l.gif
-share/doc/xapian-core/apidoc/html/tab_r.gif
+share/doc/xapian-core/apidoc/html/sync_off.png
+share/doc/xapian-core/apidoc/html/sync_on.png
+share/doc/xapian-core/apidoc/html/tab_a.png
+share/doc/xapian-core/apidoc/html/tab_b.png
+share/doc/xapian-core/apidoc/html/tab_h.png
+share/doc/xapian-core/apidoc/html/tab_s.png
 share/doc/xapian-core/apidoc/html/tabs.css
 share/doc/xapian-core/apidoc/html/termgenerator_8h.html
 share/doc/xapian-core/apidoc/html/termiterator_8h.html
diff --git a/textproc/xapian/distinfo b/textproc/xapian/distinfo
index 722a19b20f9..e0bd5078857 100644
--- a/textproc/xapian/distinfo
+++ b/textproc/xapian/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.14 2013/06/04 21:27:02 schmonz Exp $
+$NetBSD: distinfo,v 1.15 2014/02/20 19:15:14 schmonz Exp $
 
-SHA1 (xapian-core-1.2.15.tar.gz) = 3d2ea66e9930451dcac4b96f321284f3dee98d51
-RMD160 (xapian-core-1.2.15.tar.gz) = 42845187297cb978eff958ed1d74108f68c6664b
-Size (xapian-core-1.2.15.tar.gz) = 4158987 bytes
-SHA1 (patch-common_safeuuid.h) = 55b95c2157355aad6b136ded6bda4133fa3569a1
+SHA1 (xapian-core-1.2.17.tar.xz) = ee8df16fe2fba1b12badfc91ecdb94ffd0bbc8ef
+RMD160 (xapian-core-1.2.17.tar.xz) = d701ee7f99a9ef9288aacf6eac12bf7b7f9239e8
+Size (xapian-core-1.2.17.tar.xz) = 3165256 bytes
diff --git a/textproc/xapian/patches/patch-common_safeuuid.h b/textproc/xapian/patches/patch-common_safeuuid.h
deleted file mode 100644
index bd488e3b991..00000000000
--- a/textproc/xapian/patches/patch-common_safeuuid.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-common_safeuuid.h,v 1.3 2013/06/04 21:27:02 schmonz Exp $
-
-Fix build with newer GCC.
-
---- common/safeuuid.h.orig	2013-04-17 00:03:07.000000000 +0000
-+++ common/safeuuid.h
-@@ -55,6 +55,7 @@ inline void uuid_unparse_lower(uuid_t uu
- 
- // FreeBSD/NetBSD UUID API.
- # include <uuid.h>
-+# include <cstdlib>
- # include <cstring>
- # include <exception>
-