Update to 1.2.8. From the changelog:

1.2.8:
API:
* Add support to TermGenerator and QueryParser for indexing and searching CJK
  text using n-grams.  Currently this is only enabled when the environmental
  variable XAPIAN_CJK_NGRAM is set to a non-empty value.
portability:
+ Some fixes for warnings when cross-compiling to mingw.
* tests/soaktest/soaktest.cc: With Sun's compiler, random() and srandom()
  aren't in <cstdlib> so we need to use <stdlib.h> instead.

1.2.7:
API:
* Document objects now track whether any document positions have been modified
  so that replacing a modified document can completely skip considering
  updating positions if none have changed.  Currently the flint, chert, and
  brass backends implement this optimisation.  A common case this speeds up is
  adding and/or removing boolean filter terms to/from existing documents - for
  example this gives an 18% speedup for adding tags in notmuch.
portability:
* Fix -Wshadow warnings from GCC 4.6.
* Fix warning from GCC 3.3.

1.2.6:
API:
* QueryParser:
  + Add new set_max_wildcard_expansion() method to allow limiting the number of
    terms a wildcard can expand to.  (ticket#350)
  + If default_op is OP_NEAR or OP_PHRASE then disable stemming of the terms,
    since we don't index positional information for stemmed terms by default.
* Spelling correction was failing to correctly handle words which had the same
  trigram in an even number of times.
portability:
* Fix to build for mingw.

1.2.5:
API:
* Enquire::get_eset() now accepts a min_wt argument to allow the minimum wanted
  weight to be specified.  Default is 0, which gives the previous behaviour.
* QueryParser: Handle NEAR/<offset> and ADJ/<offset> where offset isn't an
  integer the same way at the end of the query as in the middle.
* Replication:
  + Only keep $XAPIAN_MAX_CHANGESETS changeset files when generating a new one
    (previously this variable only controlled if we generated changesets or
    not).  Closes ticket#278.
  + $XAPIAN_MAX_CHANGESETS is reread each time, rather than only when the
    database is opened.
  + If you build Xapian with DANGEROUS mode enabled, changeset files now
    actually have the appropriate flag set (the reader will currently throw an
    exception, but that's better than quietly handling them incorrectly).
portability:
* api/compactor.cc: Add missing header <ctime> for time() (ticket#530).
* api/compactor.cc: Use msvc_posix_rename() under __WIN32__ to atomically
  update stub file after compaction (ticket#525).
* Fix uninitialised variable warnings with gcc -O3.
* Eliminate std::string member of global static object used when compiled with
  --enable-log which was causes problems on Mac OS X.
* Fix some issues highlighted by clang++ warnings.

1.2.4:
API:
* QueryParser:
  + Avoid a double free if Query construction throws an exception in a
    particular case.  Fixes ticket#515.
  + Allow phrase generators between a probabilistic prefix and the term itself
    (e.g. path:/usr/local).
  + The correct window size wasn't being set in some cases when default_op was
    set to OP_PHRASE.
* Enquire::get_mset():
  + Avoid pointlessly trying to allocate lots of memory if the first document
    requested is larger than the size of the database.
  + An empty query now returns an MSet with firstitem set correctly -
    previously firstitem was always 0 in this case.
* Document: Initialise docid to 0 when creating a document from
  scratch, as documented.
* Compactor:
  + Move the database compaction and merging functionality into this new class,
    and make xapian-compact a simple wrapper around this class.  (ticket#175)
  + Inputs can now be stub database directories or files, in which case the
    databases in the stub are used as inputs.
  + Add support for compacting to a stub database, which can be one of the
    inputs (for atomic update).
  + If spellings and/or synonyms were only present in some source databases,
    they weren't copied to the output database, but now they are.
portability:
* configure: Add support for --enable-sse=sse and --enable-sse=sse2 to allow
  control of which SSE instructions to use.
* configure: Enable use of SSE maths on x86 by default with Sun's compiler.
* configure: Beef up the test for whether -lm is required and add a special
  case to force it to be for Sun's C++ compiler - there's some interaction with
  libtool and/or shared objects which means that the previous configure test
  didn't think -lm is needed here when it is.
* Fix to build on OpenBSD 4.5 with GCC 3.3.5.
* Need to avoid excess precision on m68k when targeting models 68010, 68020,
  68030 as well as 68000.
* Fix compilation with Sun's C++ compiler.
* Fix testsuite to build on Solaris < 10.

1.2.3:
API:
* Database::get_spelling_suggestion() will now suggest a correction even if the
  passed word is in the dictionary, provided the correction has at least the
  same frequency.  Partly addresses #225.
* QueryParser:
  + Fix handling of groups of terms which are all stopwords - in situations
    where this causes a problem we now disable stopword checks for such groups.
    (ticket#245)
  + Fix to be smarter about handling a boolean filter term containing ".." in
    the presence of valuerangeprocessors.
portability:
* configure: Don't pass -mtune=generic unless GCC >= 4.2 is in use
  (ticket#492).
* Fix handling of some obscure cases of resolving relative paths on Microsoft
  Windows.  (ticket#243).
* Optimise closing of all unwanted file descriptors after forking by using
  closefrom() if available, and otherwise providing our own implementation
  (optimised to some extent for many platforms).
* Fix test harness to build under Microsoft Windows (ticket#495).

1.2.2:
portability:
* Revert 1.2.1 change to visibility of Xapian::Weight's copy constructor as
  it making it private broke compilation with GCC 4.1 (which seems to be a
  bug in this compiler version).
* tests/harness/testsuite.cc: Need <cstdio> for sprintf().  Fixes compilation
  error which was masked if valgrind was installed.  (ticket#489)

pkgsrc changes:
* Remove options (the "quartz" backend was unrelated to Darwin and
  no longer exists).
* Unconditionally buildlink libuuid. If that's overzealous, improve
  its builtin detection.

5 files changed, 26 insertions, 64 deletions

diff --git a/textproc/xapian/Makefile b/textproc/xapian/Makefile
index f3e866d0d45..54c3fd9696b 100644
--- a/textproc/xapian/Makefile
+++ b/textproc/xapian/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2011/12/03 03:44:38 sbd Exp $
+# $NetBSD: Makefile,v 1.14 2012/01/10 01:03:28 schmonz Exp $
 #
 
-DISTNAME=	xapian-core-1.2.2
+DISTNAME=	xapian-core-1.2.8
 PKGNAME=	${DISTNAME:S/-core//}
-PKGREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	http://oligarchy.co.uk/xapian/1.2.2/
+MASTER_SITES=	http://oligarchy.co.uk/xapian/1.2.8/
 
 MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://xapian.org/
@@ -20,40 +19,6 @@ USE_LANGUAGES=	c c++
 
 TEST_TARGET=	check
 
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xapian
-.if ${OPSYS} == "Darwin"
-PKG_SUPPORTED_OPTIONS=	xapian-flint-backend xapian-quartz-backend
-PKG_SUGGESTED_OPTIONS=	xapian-flint-backend xapian-quartz-backend
-.else
-PKG_SUPPORTED_OPTIONS=	xapian-flint-backend
-PKG_SUGGESTED_OPTIONS=	xapian-flint-backend
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		quartz
-.if !empty(PKG_OPTIONS:Mxapian-quartz-backend)
-CONFIGURE_ARGS+=	--enable-backend-quartz
-PLIST.quartz=		yes
-.else
-CONFIGURE_ARGS+=	--disable-backend-quartz
-.endif
-
-PLIST_VARS+=		flint
-.if !empty(PKG_OPTIONS:Mxapian-flint-backend)
-CONFIGURE_ARGS+=	--enable-backend-flint
-PLIST.flint=		yes
-.else
-CONFIGURE_ARGS+=	--disable-backend-flint
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 .include "../../devel/libuuid/buildlink3.mk"
-.endif
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xapian/PLIST b/textproc/xapian/PLIST
index 62ccf9d5b1c..d4c1d033584 100644
--- a/textproc/xapian/PLIST
+++ b/textproc/xapian/PLIST
@@ -1,18 +1,15 @@
-@comment $NetBSD: PLIST,v 1.7 2010/12/03 09:55:33 abs Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/01/10 01:03:28 schmonz Exp $
 bin/copydatabase
 bin/delve
-${PLIST.quartz}bin/quartzcheck
-${PLIST.quartz}bin/quartzcompact
-${PLIST.quartz}bin/quartzdump
 bin/quest
 bin/simpleexpand
 bin/simpleindex
 bin/simplesearch
-${PLIST.flint}bin/xapian-check
-${PLIST.flint}bin/xapian-compact
+bin/xapian-check
+bin/xapian-compact
 bin/xapian-chert-update
 bin/xapian-config
-${PLIST.flint}bin/xapian-inspect
+bin/xapian-inspect
 bin/xapian-metadata
 bin/xapian-progsrv
 bin/xapian-replicate
@@ -20,6 +17,7 @@ bin/xapian-replicate-server
 bin/xapian-tcpsrv
 include/xapian.h
 include/xapian/base.h
+include/xapian/compactor.h
 include/xapian/database.h
 include/xapian/dbfactory.h
 include/xapian/deprecated.h
@@ -52,15 +50,12 @@ lib/cmake/xapian/xapian-config.cmake
 lib/libxapian.la
 man/man1/copydatabase.1
 man/man1/delve.1
-${PLIST.quartz}man/man1/quartzcheck.1
-${PLIST.quartz}man/man1/quartzcompact.1
-${PLIST.quartz}man/man1/quartzdump.1
 man/man1/quest.1
-${PLIST.flint}man/man1/xapian-check.1
-${PLIST.flint}man/man1/xapian-compact.1
+man/man1/xapian-check.1
+man/man1/xapian-compact.1
 man/man1/xapian-chert-update.1
 man/man1/xapian-config.1
-${PLIST.flint}man/man1/xapian-inspect.1
+man/man1/xapian-inspect.1
 man/man1/xapian-metadata.1
 man/man1/xapian-progsrv.1
 man/man1/xapian-replicate-server.1
@@ -79,6 +74,8 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight__inherit__graph.png
 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__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1Compactor-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1Compactor.html
 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_1DatabaseCorruptError-members.html
@@ -258,6 +255,7 @@ 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/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
@@ -348,6 +346,7 @@ 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
@@ -400,9 +399,10 @@ share/doc/xapian-core/apidoc/html/version_8h.html
 share/doc/xapian-core/apidoc/html/weight_8h.html
 share/doc/xapian-core/apidoc/html/xapian_8h.html
 share/doc/xapian-core/bm25.html
-share/doc/xapian-core/categorisation.html
 share/doc/xapian-core/code_structure.html
+share/doc/xapian-core/collapsing.html
 share/doc/xapian-core/deprecation.html
+share/doc/xapian-core/facets.html
 share/doc/xapian-core/glossary.html
 share/doc/xapian-core/index.html
 share/doc/xapian-core/install.html
@@ -411,7 +411,6 @@ share/doc/xapian-core/intro_ir.html
 share/doc/xapian-core/matcherdesign.html
 share/doc/xapian-core/overview.html
 share/doc/xapian-core/postingsource.html
-${PLIST.quartz}share/doc/xapian-core/quartzdesign.html
 share/doc/xapian-core/queryparser.html
 share/doc/xapian-core/quickstart.html
 share/doc/xapian-core/quickstartexpand.cc.html
diff --git a/textproc/xapian/buildlink3.mk b/textproc/xapian/buildlink3.mk
index 5bded119d91..b16fc03d33b 100644
--- a/textproc/xapian/buildlink3.mk
+++ b/textproc/xapian/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2011/12/03 03:44:38 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2012/01/10 01:03:28 schmonz Exp $
 
 BUILDLINK_TREE+=	xapian
 
@@ -9,11 +9,7 @@ BUILDLINK_API_DEPENDS.xapian+=	xapian>=1.0.7
 BUILDLINK_ABI_DEPENDS.xapian?=	xapian>=1.2.2nb1
 BUILDLINK_PKGSRCDIR.xapian?=	../../textproc/xapian
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 .include "../../devel/libuuid/buildlink3.mk"
-.endif
 .include "../../devel/zlib/buildlink3.mk"
 
 .endif # XAPIAN_BUILDLINK3_MK
diff --git a/textproc/xapian/distinfo b/textproc/xapian/distinfo
index 12d98189fc0..5b480a51722 100644
--- a/textproc/xapian/distinfo
+++ b/textproc/xapian/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2011/11/26 17:21:10 joerg Exp $
+$NetBSD: distinfo,v 1.12 2012/01/10 01:03:28 schmonz Exp $
 
-SHA1 (xapian-core-1.2.2.tar.gz) = 9e8036689650556428ecc605d03a695df561bfa6
-RMD160 (xapian-core-1.2.2.tar.gz) = a56912884ff302f5da2545c80c7bcd81f3bddef4
-Size (xapian-core-1.2.2.tar.gz) = 3849005 bytes
-SHA1 (patch-common_safeuuid.h) = bc5b16dbb8d670120b63270eb42fb0a355aa713d
+SHA1 (xapian-core-1.2.8.tar.gz) = 4bdd3845278812d467b8d0fb73ee27a5be05b2d9
+RMD160 (xapian-core-1.2.8.tar.gz) = f6a88984e553cbf6c56c339bcb61a68c45e905ed
+Size (xapian-core-1.2.8.tar.gz) = 4106342 bytes
+SHA1 (patch-common_safeuuid.h) = a017a88f5a82854cddc7ca89921ceec361a076b8
diff --git a/textproc/xapian/patches/patch-common_safeuuid.h b/textproc/xapian/patches/patch-common_safeuuid.h
index 0f356501ba2..2fe23054b74 100644
--- a/textproc/xapian/patches/patch-common_safeuuid.h
+++ b/textproc/xapian/patches/patch-common_safeuuid.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-common_safeuuid.h,v 1.1 2011/11/26 17:21:10 joerg Exp $
+$NetBSD: patch-common_safeuuid.h,v 1.2 2012/01/10 01:03:29 schmonz Exp $
+
+Fix build with newer GCC.
 
 --- common/safeuuid.h.orig	2011-11-26 02:56:21.000000000 +0000
 +++ common/safeuuid.h