Update to 1.4.20. From the changelog:

API:

* Throw DatabaseNotFoundError when the database directory doesn't exist or
  when it doesn't contain a Xapian database.  Patch from Germán Méndez Bravo
  in https://github.com/xapian/xapian/pull/258

* Improve exception message for attempting to remove an empty term (the
  exception type is still InvalidArgumentError).  Reported by David Bremner.

testsuite:

* Enable queryparser testcase for OR under NEAR, which has been supported since
  1.4.3.

* Expand some query-related testcases.

matcher:

* Optimise when a value range is a superset of the slot bounds but the value
  slot frequency is not equal to the document count by replacing the lower
  bound with an empty string to make the bounds check very cheap.

* Avoid creating a PostList tree for an empty shard.  This avoids pointless
  work in an uncommon case, but also by handling this up front the code in
  PostList subclasses for query operators can assume the shard isn't empty
  which simplifies the code in several places.

* Remove lingering handling for database backends without slot bounds since
  all backends have been required to support these since 1.4.11.

* Fix collection frequency estimates for positional operators.  This affects
  the weighting of positional operators in subqueries of OP_SYNONYM with
  weighting schemes which use the collection frequency.

glass backend:

* xapian-check: Test decompress data in the spelling and synonym tables.
  We don't have structure checking for these tables, but we can at least fetch
  each entry and check for decompression problems.

* Improve error if a block is detected as overwritten in WritableDatabase.
  Drop "are there multiple writers?" as it's rarely a useful question to ask
  since we started using fcntl() locking as it's now very hard to get multiple
  concurrent writers on a database.  Instead suggest running xapian-check,
  which is probably the best next step for a user who hits this problem.

documentation:

* Document precedence of NEAR and ADJ.

* INSTALL: Note that MSVS 2022 works.

tools:

* quest: Add --freqs option to show term frequencies.

* xapian-delve -v: Show value slot bounds and freq

portability:

* Fix to build with a C++20 compiler.

* configure now probes for a declaration of strerror_r() before using it, since
  a declaration is required in C++ code.

* MSVC: Use intrinsics to implement addition with overflow check.

Bindings:

* Enable -fvisibility-inlines-hidden option if the compiler supports it.

PHP7:

* Add missing reference tracking. XapianEnquire now keeps a reference to the
  current XapianSorter object (if any).  XapianQueryParser now keeps a
  reference to any set XapianFieldProcessor objects.  Test coverage for keeping
  references to set functor objects is now more comprehensive.

* smoketest.php: Remove bogus extra null parameters.  PHP ignores these extra
  parameters, but it's more helpful to be testing valid usage.

Python3:

* The configure probes for Python3 no longer use the deprecated distutils and
  imp modules (both of which are slated for removal in Python 3.12).  We now
  use sysconfig to get the directory to install the xapian module to, which may
  result in it being installed in a different place (it should still work, but
  if you're packaging the bindings you may need to update the list of files to
  include in the package).

5 files changed, 33 insertions, 31 deletions

diff --git a/textproc/xapian/Makefile.common b/textproc/xapian/Makefile.common
index 9583e10f55f..55c8fc700f6 100644
--- a/textproc/xapian/Makefile.common
+++ b/textproc/xapian/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2022/01/02 09:31:20 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.16 2022/07/11 18:25:18 schmonz Exp $
 # used by textproc/csharp-xapian/Makefile
 # used by textproc/lua-xapian/Makefile
 # used by textproc/p5-Xapian/Makefile
@@ -9,7 +9,7 @@
 # used by textproc/xapian/Makefile
 # used by textproc/xapian-omega/Makefile
 
-VERSION=		1.4.19
+VERSION=		1.4.20
 CATEGORIES=		textproc
 MASTER_SITES=		http://oligarchy.co.uk/xapian/${VERSION}/
 EXTRACT_SUFX=		.tar.xz
diff --git a/textproc/xapian/distinfo b/textproc/xapian/distinfo
index eb29d645e44..b32ed00e667 100644
--- a/textproc/xapian/distinfo
+++ b/textproc/xapian/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2022/01/02 09:31:20 schmonz Exp $
+$NetBSD: distinfo,v 1.46 2022/07/11 18:25:18 schmonz Exp $
 
-BLAKE2s (xapian-core-1.4.19.tar.xz) = 2e8b02d4d67f4923268f1eabf7627c69c50d05aca37ef61cb1dd6f6bfa8057bc
-SHA512 (xapian-core-1.4.19.tar.xz) = d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346
-Size (xapian-core-1.4.19.tar.xz) = 2994860 bytes
-SHA1 (patch-common_errno__to__string.cc) = 222b640aa1cdacb6f9ada78671ef414b4ca11e26
+BLAKE2s (xapian-core-1.4.20.tar.xz) = 01fe3fd73acb43e8cab478ca9e5dbd83818322bf4eccf6d340b2cc9954677433
+SHA512 (xapian-core-1.4.20.tar.xz) = e2f62eebc946cc5d0641db85d2966e6ad9e84c6a23606e705f0461ab80b012933b46ed5b7e0691fe2070ca1c0755e99895c18bc055eaad0a9376def410aa7f35
+Size (xapian-core-1.4.20.tar.xz) = 3003788 bytes
+SHA1 (patch-common_errno__to__string.cc) = c5d9613e6676e1dcd3d9caabf113046d5e471454
 SHA1 (patch-common_safesyssocket.h) = 032d441853914d510bc285bb682a98c4ee264d52
 SHA1 (patch-xapian-config.in) = 470d1de7f04b8b8817abbcf56b5b71a36948de97
diff --git a/textproc/xapian/distinfo-bindings b/textproc/xapian/distinfo-bindings
index ed6cd643860..9ed5d0bd363 100644
--- a/textproc/xapian/distinfo-bindings
+++ b/textproc/xapian/distinfo-bindings
@@ -1,9 +1,9 @@
-$NetBSD: distinfo-bindings,v 1.23 2022/01/08 16:30:35 schmonz Exp $
+$NetBSD: distinfo-bindings,v 1.24 2022/07/11 18:25:18 schmonz Exp $
 
-BLAKE2s (xapian-bindings-1.4.19.tar.xz) = 2377297ebbd26be27fe6854d3d11f7a58459f5dec6784a73c35d2c5cc2202352
-SHA512 (xapian-bindings-1.4.19.tar.xz) = c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
-Size (xapian-bindings-1.4.19.tar.xz) = 1137596 bytes
-SHA1 (patch-configure) = 0fc1882dc42eae71e32aec60dcd2478aa6b1bc5f
+BLAKE2s (xapian-bindings-1.4.20.tar.xz) = b69c6acc546b0fa5ba3ce6f4db07109ea629945a924d4020892aaa62c619f6bc
+SHA512 (xapian-bindings-1.4.20.tar.xz) = bdc876b8e1b946d27673122de6d298112c82fa41e19090a2bcbe0954905ddf66171d36e6753a1e8d46578b128edd729e2fd252311d60ff40a2aec9a4d57796ed
+Size (xapian-bindings-1.4.20.tar.xz) = 1143304 bytes
+SHA1 (patch-configure) = 60ff2a667b174879a0ae3d327a9f2467bce31b89
 SHA1 (patch-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330
 SHA1 (patch-perl_Makefile.in) = 993b137b319d7d28c2b3a70d2e46e1a38d380578
 SHA1 (patch-php7_php7_xapian__wrap.cc) = aa5ca15ef04bbd5038e23f4d1d01d1029243c68e
diff --git a/textproc/xapian/patches-bindings/patch-configure b/textproc/xapian/patches-bindings/patch-configure
index 69796c872ad..240b2828058 100644
--- a/textproc/xapian/patches-bindings/patch-configure
+++ b/textproc/xapian/patches-bindings/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.5 2021/01/14 18:18:11 schmonz Exp $
+$NetBSD: patch-configure,v 1.6 2022/07/11 18:25:18 schmonz Exp $
 
 - Remove hackaround for old OpenBSD bugs that break builds with other
   STL implementations.
@@ -6,17 +6,17 @@ $NetBSD: patch-configure,v 1.5 2021/01/14 18:18:11 schmonz Exp $
 - Remove broken cross-compile check (builds a bundle, complains it can't
   run as executable) to fix lua-xapian on Big Sur.
 
---- configure.orig	2021-01-14 00:45:37.000000000 +0000
+--- configure.orig	2022-07-04 06:00:37.000000000 +0000
 +++ configure
-@@ -3971,51 +3971,6 @@ FILE *f = fopen ("conftest.out", "w");
+@@ -4745,51 +4745,6 @@ FILE *f = fopen ("conftest.out", "w");
    return 0;
  }
  _ACEOF
 -ac_clean_files="$ac_clean_files conftest.out"
 -# Check that the compiler produces executables we can run.  If not, either
 -# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-printf %s "checking whether we are cross compiling... " >&6; }
 -if test "$cross_compiling" != yes; then
 -  { { ac_try="$ac_link"
 -case "(($ac_try" in
@@ -24,10 +24,10 @@ $NetBSD: patch-configure,v 1.5 2021/01/14 18:18:11 schmonz Exp $
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
+-printf "%s\n" "$ac_try_echo"; } >&5
 -  (eval "$ac_link") 2>&5
 -  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 -  test $ac_status = 0; }
 -  if { ac_try='./conftest$ac_cv_exeext'
 -  { { case "(($ac_try" in
@@ -35,32 +35,32 @@ $NetBSD: patch-configure,v 1.5 2021/01/14 18:18:11 schmonz Exp $
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
+-printf "%s\n" "$ac_try_echo"; } >&5
 -  (eval "$ac_try") 2>&5
 -  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 -  test $ac_status = 0; }; }; then
 -    cross_compiling=no
 -  else
 -    if test "$cross_compiling" = maybe; then
 -	cross_compiling=yes
 -    else
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run C compiled programs.
+-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error 77 "cannot run C compiled programs.
 -If you meant to cross compile, use \`--host'.
 -See \`config.log' for more details" "$LINENO" 5; }
 -    fi
 -  fi
 -fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-printf "%s\n" "$cross_compiling" >&6; }
 -
 -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
  ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
-@@ -18048,7 +18003,7 @@ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ printf %s "checking for suffix of object files... " >&6; }
+@@ -19077,7 +19032,7 @@ fi
  	    for x in "/tcl$tcl_version" "" ; do
  	      TCLCONFIG_SH=$tcl_libdir_runtime$x/tclConfig.sh
  	      if test -r "$TCLCONFIG_SH" ; then
@@ -69,7 +69,7 @@ $NetBSD: patch-configure,v 1.5 2021/01/14 18:18:11 schmonz Exp $
  		break
  	      fi
  	    done
-@@ -19524,9 +19479,6 @@ SWIG_CXXFLAGS=
+@@ -20655,9 +20610,6 @@ SWIG_CXXFLAGS=
  if test yes = "$GXX" ; then
                      SWIG_CXXFLAGS="-fno-strict-aliasing"
  
diff --git a/textproc/xapian/patches/patch-common_errno__to__string.cc b/textproc/xapian/patches/patch-common_errno__to__string.cc
index 9a3f2002129..2cd4f418bb7 100644
--- a/textproc/xapian/patches/patch-common_errno__to__string.cc
+++ b/textproc/xapian/patches/patch-common_errno__to__string.cc
@@ -1,4 +1,6 @@
-$NetBSD: patch-common_errno__to__string.cc,v 1.1 2019/12/19 22:24:39 joerg Exp $
+$NetBSD: patch-common_errno__to__string.cc,v 1.2 2022/07/11 18:25:18 schmonz Exp $
+
+Add missing include.
 
 --- common/errno_to_string.cc.orig	2019-12-19 14:19:58.476027186 +0000
 +++ common/errno_to_string.cc