diff --git a/databases/p5-Xapian/Makefile b/databases/p5-Xapian/Makefile
index 5f646ae15374d..2c882206a9da6 100644
--- a/databases/p5-Xapian/Makefile
+++ b/databases/p5-Xapian/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	Xapian
-PORTVERSION=	1.4.22.0
+PORTVERSION=	1.4.23.0
 CATEGORIES=	databases perl5
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION:R}/ \
 		LOCAL/sunpoet
@@ -41,9 +41,6 @@ PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure
-
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's| install-dist_exampledataDATA install-docdataDATA||' ${WRKSRC}/perl/Makefile.in
 
diff --git a/databases/p5-Xapian/distinfo b/databases/p5-Xapian/distinfo
index 4925c3fed4608..3078dd10ea604 100644
--- a/databases/p5-Xapian/distinfo
+++ b/databases/p5-Xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677771071
-SHA256 (xapian-bindings-1.4.22.tar.xz) = 6b5454833ac52a3e32c0bb3a7290a5a2b50488d8918f2a45269557e4de9a31e5
-SIZE (xapian-bindings-1.4.22.tar.xz) = 1074840
+TIMESTAMP = 1688902025
+SHA256 (xapian-bindings-1.4.23.tar.xz) = e0bc8cc0ecf0568549c50b51fd59e4cffb5318d6f202afcd4465855ef5f33f7d
+SIZE (xapian-bindings-1.4.23.tar.xz) = 1076480
diff --git a/databases/p5-Xapian/files/patch-configure b/databases/p5-Xapian/files/patch-configure
new file mode 100644
index 0000000000000..448fb0b83e911
--- /dev/null
+++ b/databases/p5-Xapian/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2023-07-07 02:00:23 UTC
++++ configure
+@@ -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
diff --git a/databases/p5-Xapian/pkg-plist b/databases/p5-Xapian/pkg-plist
index 7eeebfc1e955e..796d866c73a17 100644
--- a/databases/p5-Xapian/pkg-plist
+++ b/databases/p5-Xapian/pkg-plist
@@ -46,10 +46,55 @@
 %%SITE_PERL%%/Xapian/WritableDatabase.pm
 %%SITE_ARCH%%/auto/Xapian/Xapian.a
 %%SITE_ARCH%%/auto/Xapian/Xapian.so
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/AssertionError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/BM25Weight.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/BoolWeight.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Database.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseCorruptError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseCreateError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseLockError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseModifiedError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseOpeningError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseVersionError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DocNotFoundError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Document.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/ESet.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/ESetIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Enquire.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Error.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/FeatureUnavailableError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/InternalError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/InvalidArgumentError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/InvalidOperationError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/LogicError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/MSet.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/MSetIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/MultiValueSorter.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/NetworkError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/NetworkTimeoutError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/PositionIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/PostingIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Query.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/QueryParser.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/QueryParserError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/RSet.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/RangeError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/RuntimeError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/SimpleStopper.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Stem.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Stopper.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/TermGenerator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/TermIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/TradWeight.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/UnimplementedError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/ValueIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Weight.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/WritableDatabase.html
 %%PORTDOCS%%%%DOCSDIR%%/perl/examples/full-indexer.pl
 %%PORTDOCS%%%%DOCSDIR%%/perl/examples/full-searcher.pl
 %%PORTDOCS%%%%DOCSDIR%%/perl/examples/simpleexpand.pl
 %%PORTDOCS%%%%DOCSDIR%%/perl/examples/simpleindex.pl
 %%PORTDOCS%%%%DOCSDIR%%/perl/examples/simplematchdecider.pl
 %%PORTDOCS%%%%DOCSDIR%%/perl/examples/simplesearch.pl
-%%PORTDOCS%%%%DOCSDIR%%/perl/index.html