CVS commit: pkgsrc/textproc

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jul 10 15:07:26 UTC 2023

Modified Files:
        pkgsrc/textproc/p5-Xapian: Makefile PLIST
        pkgsrc/textproc/py-xapian: Makefile
        pkgsrc/textproc/xapian: Makefile.common buildlink3.mk distinfo
            distinfo-bindings
        pkgsrc/textproc/xapian/patches: patch-common_safesyssocket.h
Removed Files:
        pkgsrc/textproc/xapian/patches-bindings: patch-perl_Makefile.in

Log Message:
Update to 1.4.23. From the changelog:

API:

* Add `FLAG_NGRAMS` as a preferred new alias for `FLAG_CJK_NGRAM` and
  `SNIPPET_NGRAMS` as a preferred new alias for `SNIPPET_CJK_NGRAM`.
  In the next release series these features have been expanded to cover many
  more languages so the "CJK" in the name has become inaccurate as it stands
  for "Chinese, Japanese and Korean").

* Database::check(): Improve the exception message for an empty filename from
  "Failed to rewind file descriptor -1 (Bad file descriptor)" to "Couldn't find
  Xapian database or table to check (No such file or directory)".

testsuite:

* The test harness now supports generated databases for all backends and
  all testcases which can use generated databases now do, which together
  improve test coverage as we now run many testcases under more backends.
  Generated databases can also be cached, which helps speed up the test
  suite.

* Remove some testcases which are now redundant with other testcases or
  no longer useful for other reasons.

* Add regression test for #781, reported by Germán M. Bravo.  This bug was
  fixed 4 years in 1.4.12 but a clean regression test only became possible
  thanks to changes in this release.

* The test harness would attempt to throw a Xapian::Database (rather than
  Xapian::DatabaseError) if it failed to rename a temporary database to its
  final name.  This would fail because there wasn't a database called "rename
  failed".  Reported by stark3y on #xapian.

* apitest: Fix exceed32bitcombineddb1 testcase (which only runs with
  --enable-64bit-docid).

* apitest: Fix nomoredocids1 when configured with --enable-64bit-docid.

* Add testcase for removal of positions for replaced doc (regression test for
  bug in git master not present in 1.4.x).

* unittest: Unit test block file functions

* Stop using std::endl in tests since this seems to be C++ best practice
  as it causes a flush of the stream, which is rarely actually wanted.  Also
  often the replacement \n can be combined with a string literal.

* Use Xapian::docid for document ids in testcases.  Using `int` or `size_t`
  works, but is less correct and can trigger compiler warnings because not all
  values are representable.

matcher:

* BM25PlusWeight: With some parameter combinations we were requesting stats we
  didn't actually need.  Confirmed with Vivek Pal on IRC.

glass backend:

* Avoid unnecessary copying of data when adding an item to a B-tree table which
  should speed up indexing a bit.

* xapian-check: If the first chunk for a term is a continuation chunk, the
  affected term was missing from the error message.

* xapian-check: We now report the document id as context in many more error
  messages.

chert backend:

* Fix wdf upper bounds used when search a modified chert-format
  WritableDatabase object.  A bug introduced in 1.4.19 meant we were using the
  wdf upper bounds from the last committed version of the database.  This bug
  could cause assertion failures when configured with --enable-assertions.

remote backend:

* Fix thread-safety issue starting remote prog server.  Previously we did some
  memory allocation in the child process after fork() but before we exec-ed the
  specified program, but in a multi-threaded program (which libxapian might be
  used in) it's only safe to call async-signal-safe functions in the child
  process after fork() until exec, and malloc, etc aren't async-signal-safe.

* If we failed to open /dev/null in the child process while starting a remote
  prog server, we would try to throw an exception.  That's not going to work
  well so now we just call `_exit(-1)`.

inmemory backend:

* Throw exception on docid overflow like we do in other backends.

build system:

* configure: When probing for socklen_t or equivalent include the same headers
  as we do in the code to reduce the risk of configure deciding to use
  socklen_t but it not getting defined in the code.

* configure: When probing if a particular compiler or linker option is
  supported, we were relying on the compiler exit status but some compilers
  only warn about unknown options.  We now inspect the compiler's stderr
  output to try to detect such cases.

* configure: Avoid compiler warning during GCC version check when compiler
  needs an option to enable C++11 support.

* Avoid running pwd since the directories we need are available in automake
  variables.

documentation:

* Suggest protocol buffers for structured document data.  Fixes #53.

* Clarify documentation for release() methods.

* Fix typo "shared database" to "sharded database" in API docs.

* Document that transactions aren't atomic across shards.

tools:

* xapian-progsrv,xapian-tcpsrv: Support multiple DBs with --writable.

* xapian-tcpsrv: Fix default timeouts in --help output which have been reported
  as the name of the constant rather than its value since 1.3.3.

* xapian-tcpsrv: When --one-shot is specified, don't do the usual test open of
  the specified database(s) as it doesn't really seem useful in this case.  The
  test harness uses --one-shot so this reduces overhead when running remote
  tests.

* Stop using std::endl in tools since this seems to be C++ best practice
  as it causes a flush of the stream, which is rarely actually wanted.  Also
  often the replacement \n can be combined with a string literal.

portability:

* Don't pass mode to open when it's unused as this triggers "missing O_CREAT or
  O_TMPFILE?" warnings when compiling for Android.

* Stop using INFINITY macro.  If the implementation supports floating point
  infinities then HUGE_VAL gives us infinity as a double directly.  If not,
  then it's the maximum finite value of a double.

* Don't auto-enable _FORTIFY_SOURCE on mingw or mingw-w64.  Enabling
  _FORTIFY_SOURCE on newer mingw-w64 requires linking with -lssp so we
  attempted to stop automatically enabling it there in 1.4.19 but this fix
  didn't actually work.  Trying to get this to work automatically has proved
  difficult and I couldn't find evidence that _FORTIFY_SOURCE was actually
  supported on mingw.  If it is, enabling manually will still work.

* Fix mingw32 build with C++17 compiler, which ends up with std::byte
  conflicting with byte typedefs in system headers, due to us having `using
  namespace std;` in some of our internal headers.  Switch the ones which
  are causing problems to more targetted `using std::string;`, etc instead.

* Fix WIN32 build with --disable-backend-remote which was failing because we
  were always trying to build common/socket_utils.cc which fails because
  SOCKLEN_T hasn't been probed.  Fixes #821, reported by mgautier.

* soaktest: Use C++11 <random> which is more portable than random().

* In WIN32 builds, pass the program pathname separately to CreateProcess()
  which is apparently more robust if the program pathname contains spaces.

* Stop trying to set Microsoft-specific SO_EXCLUSIVEADDRUSE option on our
  listening sockets.  It's not possible to set both SO_REUSEADDR and
  SO_EXCLUSIVEADDRUSE so this call will always fail with WSAEINVAL, but we
  were ignoring these errors because SO_EXCLUSIVEADDRUSE required admin
  privileges in older OS versions.

* Suppress MSVC deprecation warning for GetVersionEx since none of the
  suggested replacements seems to actually provide the functionality we are
  using from it.

* Fix some warnings from MSVC in the fallback code for overflow-checked
  arithmetic.

* Support Enquire::set_time_limit() on GNU Hurd since Hurd now implements
  timer_create().

* Remove lingering traces of IRIX support as it's been dead for many years.

debug code:

* Fix build failure with --enable-assertions due to incorrect variable name in
  assertion.  Patch from Alexei Kharchev in
  https://github.com/xapian/xapian/pull/327.

* Fix GCC warning with --enable-log.

* Fix debug logging for 3 GlassDatabase methods to log their parameter.

* Add a mechanism to support debug logging templated return types containing
  commas.  This was added to fix a build failure on master with --enable-log
  reported by ttyS3.

Bindings:

Documentation:

* Where we document how to build the bindings, link to the download page so
  the reader can easily find the source to download.  Reported by John G. Heim.

* Update lists of debian packages to install for bindings development to
  show be for the latest stable release and the one before (bookworm and
  bullseye).

* HACKING: Fix typos in deprecation warning section

* HACKING: Update link to Pike bindings

* HACKING: Document issues caused by macOS SIP.  Fixes #732.

General:

* Add `FLAG_NGRAMS` as a preferred new alias for `FLAG_CJK_NGRAM` and
  `SNIPPET_NGRAMS` as a preferred new alias for `SNIPPET_CJK_NGRAM`.
  In the next release series these features have been expanded to cover many
  more languages so the "CJK" in the name has become inaccurate as it stands
  for "Chinese, Japanese and Korean").

* Avoid running pwd in makefiles since the directories we need are available in
  automake variables.

CSharp:

* SmokeTest.cs: Fix some incorrect messages if testcases fail.

* Smoketest.cs: Test stemmer description.

Lua:

* Update docs for supported Lua versions.

Perl:

* Generate HTML docs for each class.

* Document all QueryParser FLAG_* constants.

* Update one place which didn't correctly indicate the current status of the
  Perl bindings.  Fixes #523.

Python:

* Fix bug in wrapper for xapian.Query when constructing OP_WILDCARD queries.
  A workaround for this bug which works with existing releases is to pass
  0 for the third and fourth optional parameters like so:

  xapian.Query(xapian.Query.OP_WILDCARD, "xyz", 0, 0)

Python3:

* Fix bug in wrapper for xapian.Query when constructing OP_WILDCARD queries.
  A workaround for this bug which works with existing releases is to pass
  0 for the third and fourth optional parameters like so:

  xapian.Query(xapian.Query.OP_WILDCARD, "xyz", 0, 0)

Ruby:

* Improve documentation about __call__ methods.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/p5-Xapian/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/p5-Xapian/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/py-xapian/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/xapian/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/xapian/buildlink3.mk
cvs rdiff -u -r1.48 -r1.49 pkgsrc/textproc/xapian/distinfo
cvs rdiff -u -r1.26 -r1.27 pkgsrc/textproc/xapian/distinfo-bindings
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/xapian/patches/patch-common_safesyssocket.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/textproc/xapian/patches-bindings/patch-perl_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/p5-Xapian/Makefile
diff -u pkgsrc/textproc/p5-Xapian/Makefile:1.13 pkgsrc/textproc/p5-Xapian/Makefile:1.14
--- pkgsrc/textproc/p5-Xapian/Makefile:1.13     Thu Jul  6 09:42:06 2023
+++ pkgsrc/textproc/p5-Xapian/Makefile  Mon Jul 10 15:07:26 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2023/07/06 09:42:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2023/07/10 15:07:26 schmonz Exp $
 
 PKGNAME=               p5-${PKGNAME_MODULE:S/^x/X/}
-PKGREVISION=           1
 COMMENT=               Perl bindings for Xapian search engine
 HOMEPAGE=              https://xapian.org/docs/bindings/perl/
 

Index: pkgsrc/textproc/p5-Xapian/PLIST
diff -u pkgsrc/textproc/p5-Xapian/PLIST:1.5 pkgsrc/textproc/p5-Xapian/PLIST:1.6
--- pkgsrc/textproc/p5-Xapian/PLIST:1.5 Wed Jun 10 17:54:30 2020
+++ pkgsrc/textproc/p5-Xapian/PLIST     Mon Jul 10 15:07:26 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/06/10 17:54:30 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/07/10 15:07:26 schmonz Exp $
 ${PERL5_SUB_INSTALLVENDORLIB}/Xapian.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Xapian/AssertionError.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Xapian/BM25Weight.pm
@@ -47,10 +47,55 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Xapian/Wei
 ${PERL5_SUB_INSTALLVENDORLIB}/Xapian/WritableDatabase.pm
 ${PERL5_SUB_INSTALLVENDORARCH}/auto/Xapian/Xapian.a
 ${PERL5_SUB_INSTALLVENDORARCH}/auto/Xapian/Xapian.${PERL_DLEXT}
+share/doc/xapian-bindings/perl/Xapian.html
+share/doc/xapian-bindings/perl/Xapian/AssertionError.html
+share/doc/xapian-bindings/perl/Xapian/BM25Weight.html
+share/doc/xapian-bindings/perl/Xapian/BoolWeight.html
+share/doc/xapian-bindings/perl/Xapian/Database.html
+share/doc/xapian-bindings/perl/Xapian/DatabaseCorruptError.html
+share/doc/xapian-bindings/perl/Xapian/DatabaseCreateError.html
+share/doc/xapian-bindings/perl/Xapian/DatabaseError.html
+share/doc/xapian-bindings/perl/Xapian/DatabaseLockError.html
+share/doc/xapian-bindings/perl/Xapian/DatabaseModifiedError.html
+share/doc/xapian-bindings/perl/Xapian/DatabaseOpeningError.html
+share/doc/xapian-bindings/perl/Xapian/DatabaseVersionError.html
+share/doc/xapian-bindings/perl/Xapian/DocNotFoundError.html
+share/doc/xapian-bindings/perl/Xapian/Document.html
+share/doc/xapian-bindings/perl/Xapian/ESet.html
+share/doc/xapian-bindings/perl/Xapian/ESetIterator.html
+share/doc/xapian-bindings/perl/Xapian/Enquire.html
+share/doc/xapian-bindings/perl/Xapian/Error.html
+share/doc/xapian-bindings/perl/Xapian/FeatureUnavailableError.html
+share/doc/xapian-bindings/perl/Xapian/InternalError.html
+share/doc/xapian-bindings/perl/Xapian/InvalidArgumentError.html
+share/doc/xapian-bindings/perl/Xapian/InvalidOperationError.html
+share/doc/xapian-bindings/perl/Xapian/LogicError.html
+share/doc/xapian-bindings/perl/Xapian/MSet.html
+share/doc/xapian-bindings/perl/Xapian/MSetIterator.html
+share/doc/xapian-bindings/perl/Xapian/MultiValueSorter.html
+share/doc/xapian-bindings/perl/Xapian/NetworkError.html
+share/doc/xapian-bindings/perl/Xapian/NetworkTimeoutError.html
+share/doc/xapian-bindings/perl/Xapian/PositionIterator.html
+share/doc/xapian-bindings/perl/Xapian/PostingIterator.html
+share/doc/xapian-bindings/perl/Xapian/Query.html
+share/doc/xapian-bindings/perl/Xapian/QueryParser.html
+share/doc/xapian-bindings/perl/Xapian/QueryParserError.html
+share/doc/xapian-bindings/perl/Xapian/RSet.html
+share/doc/xapian-bindings/perl/Xapian/RangeError.html
+share/doc/xapian-bindings/perl/Xapian/RuntimeError.html
+share/doc/xapian-bindings/perl/Xapian/SimpleStopper.html
+share/doc/xapian-bindings/perl/Xapian/Stem.html
+share/doc/xapian-bindings/perl/Xapian/Stopper.html
+share/doc/xapian-bindings/perl/Xapian/TermGenerator.html
+share/doc/xapian-bindings/perl/Xapian/TermIterator.html
+share/doc/xapian-bindings/perl/Xapian/TradWeight.html
+share/doc/xapian-bindings/perl/Xapian/UnimplementedError.html
+share/doc/xapian-bindings/perl/Xapian/ValueIterator.html
+share/doc/xapian-bindings/perl/Xapian/Weight.html
+share/doc/xapian-bindings/perl/Xapian/WritableDatabase.html
 share/doc/xapian-bindings/perl/examples/full-indexer.pl
 share/doc/xapian-bindings/perl/examples/full-searcher.pl
 share/doc/xapian-bindings/perl/examples/simpleexpand.pl
 share/doc/xapian-bindings/perl/examples/simpleindex.pl
 share/doc/xapian-bindings/perl/examples/simplematchdecider.pl
 share/doc/xapian-bindings/perl/examples/simplesearch.pl
-share/doc/xapian-bindings/perl/index.html

Index: pkgsrc/textproc/py-xapian/Makefile
diff -u pkgsrc/textproc/py-xapian/Makefile:1.11 pkgsrc/textproc/py-xapian/Makefile:1.12
--- pkgsrc/textproc/py-xapian/Makefile:1.11     Sun May  7 10:53:22 2023
+++ pkgsrc/textproc/py-xapian/Makefile  Mon Jul 10 15:07:26 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2023/05/07 10:53:22 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2023/07/10 15:07:26 schmonz Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-${PKGNAME_MODULE}
-PKGREVISION=   1
 COMMENT=       Python bindings for Xapian search engine
 HOMEPAGE=      https://xapian.org/docs/bindings/python/
 

Index: pkgsrc/textproc/xapian/Makefile.common
diff -u pkgsrc/textproc/xapian/Makefile.common:1.20 pkgsrc/textproc/xapian/Makefile.common:1.21
--- pkgsrc/textproc/xapian/Makefile.common:1.20 Sat Feb  4 14:28:18 2023
+++ pkgsrc/textproc/xapian/Makefile.common      Mon Jul 10 15:07:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2023/02/04 14:28:18 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.21 2023/07/10 15:07:26 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.22
+VERSION=               1.4.23
 CATEGORIES=            textproc
 MASTER_SITES=          http://oligarchy.co.uk/xapian/${VERSION}/
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/textproc/xapian/buildlink3.mk
diff -u pkgsrc/textproc/xapian/buildlink3.mk:1.8 pkgsrc/textproc/xapian/buildlink3.mk:1.9
--- pkgsrc/textproc/xapian/buildlink3.mk:1.8    Thu Jan 14 18:17:09 2021
+++ pkgsrc/textproc/xapian/buildlink3.mk        Mon Jul 10 15:07:26 2023
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2021/01/14 18:17:09 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2023/07/10 15:07:26 schmonz Exp $
 
 BUILDLINK_TREE+=       xapian
 
 .if !defined(XAPIAN_BUILDLINK3_MK)
 XAPIAN_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xapian+= xapian>=1.4.18
-BUILDLINK_ABI_DEPENDS.xapian+= xapian>=1.4.18
+BUILDLINK_API_DEPENDS.xapian+= xapian>=1.4.23
+BUILDLINK_ABI_DEPENDS.xapian+= xapian>=1.4.23
 BUILDLINK_PKGSRCDIR.xapian?=   ../../textproc/xapian
 
 .include "../../devel/libuuid/buildlink3.mk"

Index: pkgsrc/textproc/xapian/distinfo
diff -u pkgsrc/textproc/xapian/distinfo:1.48 pkgsrc/textproc/xapian/distinfo:1.49
--- pkgsrc/textproc/xapian/distinfo:1.48        Sat Feb  4 14:28:18 2023
+++ pkgsrc/textproc/xapian/distinfo     Mon Jul 10 15:07:26 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.48 2023/02/04 14:28:18 schmonz Exp $
+$NetBSD: distinfo,v 1.49 2023/07/10 15:07:26 schmonz Exp $
 
-BLAKE2s (xapian-core-1.4.22.tar.xz) = ef21a1eed426b804be88c6ebd1c74e3d72fca3374d0d17467f392849ad374093
-SHA512 (xapian-core-1.4.22.tar.xz) = 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29
-Size (xapian-core-1.4.22.tar.xz) = 3019608 bytes
+BLAKE2s (xapian-core-1.4.23.tar.xz) = 295624746b6dc03a6d4f7f9878e51591d2becebb0317e62d47ba7032a736e3a6
+SHA512 (xapian-core-1.4.23.tar.xz) = 52dffc93301f99aa150dda8ecd5fb7cc7d0f2ce30e60f393b1058055ade24281af16cf5b5c0e6b08e4754e3d18c39bb5bc068b19330a294ad460ef8a6bc56380
+Size (xapian-core-1.4.23.tar.xz) = 3024644 bytes
 SHA1 (patch-common_errno__to__string.cc) = c5d9613e6676e1dcd3d9caabf113046d5e471454
-SHA1 (patch-common_safesyssocket.h) = 032d441853914d510bc285bb682a98c4ee264d52
+SHA1 (patch-common_safesyssocket.h) = 6a619a91975283419d2c1ac70cf62e6b417fe981
 SHA1 (patch-xapian-config.in) = 470d1de7f04b8b8817abbcf56b5b71a36948de97

Index: pkgsrc/textproc/xapian/distinfo-bindings
diff -u pkgsrc/textproc/xapian/distinfo-bindings:1.26 pkgsrc/textproc/xapian/distinfo-bindings:1.27
--- pkgsrc/textproc/xapian/distinfo-bindings:1.26       Sat Feb  4 14:28:18 2023
+++ pkgsrc/textproc/xapian/distinfo-bindings    Mon Jul 10 15:07:26 2023
@@ -1,9 +1,8 @@
-$NetBSD: distinfo-bindings,v 1.26 2023/02/04 14:28:18 schmonz Exp $
+$NetBSD: distinfo-bindings,v 1.27 2023/07/10 15:07:26 schmonz Exp $
 
-BLAKE2s (xapian-bindings-1.4.22.tar.xz) = 178c0c7414795f0be3b02dec756e95b55de920240711d7823f279707c8e1dd24
-SHA512 (xapian-bindings-1.4.22.tar.xz) = 0d1b615646d1bdf383e4e32ae152c1493a23ad173232929c8153bb311b3f5b6c6728f29f46f703854c9249ffb35cb620eda1d68cf742c2150f628c19ed55c10f
-Size (xapian-bindings-1.4.22.tar.xz) = 1074840 bytes
+BLAKE2s (xapian-bindings-1.4.23.tar.xz) = 131f15c9f4f509cd570fd359fd05c1076136397adcd52f7eca6b835bed87008d
+SHA512 (xapian-bindings-1.4.23.tar.xz) = 25ac17baf1f288dedce70b983cba294d4ce100f6f5b607c76f5b697c04f6b08c276a55ccd5b9cc9c429664e1bb86f0fc31d88c72481a9cc951942efdfa9726a2
+Size (xapian-bindings-1.4.23.tar.xz) = 1076480 bytes
 SHA1 (patch-configure) = 60ff2a667b174879a0ae3d327a9f2467bce31b89
 SHA1 (patch-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330
-SHA1 (patch-perl_Makefile.in) = 993b137b319d7d28c2b3a70d2e46e1a38d380578
 SHA1 (patch-ruby_Makefile.in) = ddbf3ca92b11ff6955d80f6a5609e3ce36798b0b

Index: pkgsrc/textproc/xapian/patches/patch-common_safesyssocket.h
diff -u pkgsrc/textproc/xapian/patches/patch-common_safesyssocket.h:1.1 pkgsrc/textproc/xapian/patches/patch-common_safesyssocket.h:1.2
--- pkgsrc/textproc/xapian/patches/patch-common_safesyssocket.h:1.1     Mon Nov  7 13:02:17 2016
+++ pkgsrc/textproc/xapian/patches/patch-common_safesyssocket.h Mon Jul 10 15:07:26 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-common_safesyssocket.h,v 1.1 2016/11/07 13:02:17 schmonz Exp $
+$NetBSD: patch-common_safesyssocket.h,v 1.2 2023/07/10 15:07:26 schmonz Exp $
 
 Fix compilation error on NetBSD-current (as of 2015-05-26).
 
---- common/safesyssocket.h.orig        2016-10-21 04:54:32.000000000 +0000
+--- common/safesyssocket.h.orig        2023-07-07 01:59:19.000000000 +0000
 +++ common/safesyssocket.h
-@@ -25,6 +25,7 @@
- // Some older BSDs require sys/types.h to be included first.
- # include <sys/types.h>
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #ifndef __WIN32__
  # include <sys/socket.h>
 +# include <sys/time.h>
  #else