git: 99efde59694a - main - databases/py-xapian: Update to 1.4.22

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=99efde59694a9cea2d3778f6576e69098d47321f

commit 99efde59694a9cea2d3778f6576e69098d47321f
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-03-21 18:41:03 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-03-21 19:20:13 +0000

    databases/py-xapian: Update to 1.4.22
    
    - Convert REINPLACE_CMD to patch file
    
    Changes:        https://trac.xapian.org/wiki/ReleaseOverview
---
 databases/py-xapian/Makefile              |  5 +----
 databases/py-xapian/distinfo              |  6 +++---
 databases/py-xapian/files/patch-configure | 33 ++++++++++---------------------
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/databases/py-xapian/Makefile b/databases/py-xapian/Makefile
index 6044e5a6ade5..c0a536413fef 100644
--- a/databases/py-xapian/Makefile
+++ b/databases/py-xapian/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xapian
-PORTVERSION=	1.4.21
+PORTVERSION=	1.4.22
 DISTVERSIONPREFIX=	bindings-
 CATEGORIES=	databases python
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
@@ -48,9 +48,6 @@ OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure
-
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's| all-local||; s| install-data-local install-dist_exampledataDATA||' ${WRKSRC}/python/Makefile.in ${WRKSRC}/python3/Makefile.in
 
diff --git a/databases/py-xapian/distinfo b/databases/py-xapian/distinfo
index 4b1b8ff7f2f2..61197b51ff24 100644
--- a/databases/py-xapian/distinfo
+++ b/databases/py-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1664767854
-SHA256 (xapian-bindings-1.4.21.tar.xz) = e7bf1e4982b91f841289d19214021d88371ca2a6c7304df59049d7da78b83ced
-SIZE (xapian-bindings-1.4.21.tar.xz) = 1151620
+TIMESTAMP = 1677771075
+SHA256 (xapian-bindings-1.4.22.tar.xz) = 6b5454833ac52a3e32c0bb3a7290a5a2b50488d8918f2a45269557e4de9a31e5
+SIZE (xapian-bindings-1.4.22.tar.xz) = 1074840
diff --git a/databases/py-xapian/files/patch-configure b/databases/py-xapian/files/patch-configure
index 3679c157133e..6b9dce2bb21b 100644
--- a/databases/py-xapian/files/patch-configure
+++ b/databases/py-xapian/files/patch-configure
@@ -1,24 +1,11 @@
---- configure.orig	2022-07-04 06:00:37 UTC
+--- configure.orig	2023-02-02 01:01:44 UTC
 +++ configure
-@@ -18084,10 +18084,6 @@ printf "%s\n" "yes" >&6; }
-     else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
- printf "%s\n" "no" >&6; }
--      if test yes = "$with_python" ; then
--	as_fn_error $? "Couldn't import sphinx module and call sphinx.main() for Python2 - try package python-sphinx" "$LINENO" 5
--      fi
--      PYTHON2=
-     fi
-     if test -n "$PYTHON2" ; then
-                   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PYTHON2_INC/Python.h" >&5
-@@ -18271,10 +18267,6 @@ printf "%s\n" "yes" >&6; }
-     else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
- printf "%s\n" "no" >&6; }
--      if test yes = "$with_python3" ; then
--	as_fn_error $? "Couldn't import sphinx module for Python3 - try package python3-sphinx" "$LINENO" 5
--      fi
--      PYTHON3=
-     fi
-     if test -n "$PYTHON3" ; then
-                   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PYTHON3_INC/Python.h" >&5
+@@ -21048,7 +21048,7 @@ SWIG_CXXFLAGS=
+ if test yes = "$GXX" ; then
+                     SWIG_CXXFLAGS="-fno-strict-aliasing"
+ 
+-              XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++"
++              XAPIAN_LIBS="$XAPIAN_LIBS "
+ 
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext