abseil: updated to 20220623.0

Abseil LTS 20220623

What's New:

Added absl::AnyInvocable, a move-only function type.
Added absl::CordBuffer, a type for buffering data for eventual inclusion an absl::Cord, which is useful for writing zero-copy code.
Added support for command-line flags of type absl::optional<T>.

Breaking Changes:

CMake builds now use the flag ABSL_BUILD_TESTING (default: OFF) to control whether or not unit tests are built.
The ABSL_DEPRECATED macro now works with the GCC compiler. GCC users that are experiencing new warnings can use -Wno-deprecated-declatations silence the warnings or use -Wno-error=deprecated-declarations to see warnings but not fail the build.
ABSL_CONST_INIT uses the C++20 keyword constinit when available. Some compilers are more strict about where this keyword must appear compared to the pre-C++20 implementation.
Bazel builds now depend on the bazelbuild/bazel-skylib repository. See Abseil's WORKSPACE file for an example of how to add this dependency.

Other:

This will be the last release to support C++11. Future releases will require at least C++14.

7 files changed, 98 insertions, 155 deletions

diff --git a/devel/abseil/Makefile b/devel/abseil/Makefile
index c43365d62af..25ae37e0a83 100644
--- a/devel/abseil/Makefile
+++ b/devel/abseil/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2021/11/18 13:57:34 adam Exp $
+# $NetBSD: Makefile,v 1.11 2022/07/06 15:16:59 adam Exp $
 
-DISTNAME=	abseil-20211102.0
+DISTNAME=	abseil-20220623.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=abseil/}
 GITHUB_PROJECT=	abseil-cpp
@@ -15,5 +15,13 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c++11
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+.  if exists(${OSX_SDK_PATH}/usr/include/execinfo.h)
+BUILDLINK_TRANSFORM+=	rm:-lexecinfo
+.  endif
+.endif
+
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/abseil/PLIST b/devel/abseil/PLIST
index 04cba414653..d1abd9adfe0 100644
--- a/devel/abseil/PLIST
+++ b/devel/abseil/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2021/11/18 13:57:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/07/06 15:16:59 adam Exp $
 include/absl/algorithm/algorithm.h
 include/absl/algorithm/container.h
 include/absl/base/attributes.h
@@ -25,6 +25,7 @@ include/absl/base/internal/invoke.h
 include/absl/base/internal/low_level_alloc.h
 include/absl/base/internal/low_level_scheduling.h
 include/absl/base/internal/per_thread_tls.h
+include/absl/base/internal/prefetch.h
 include/absl/base/internal/pretty_function.h
 include/absl/base/internal/raw_logging.h
 include/absl/base/internal/scheduling_mode.h
@@ -72,10 +73,9 @@ include/absl/container/internal/hash_policy_traits.h
 include/absl/container/internal/hashtable_debug.h
 include/absl/container/internal/hashtable_debug_hooks.h
 include/absl/container/internal/hashtablez_sampler.h
-include/absl/container/internal/have_sse.h
 include/absl/container/internal/inlined_vector.h
 include/absl/container/internal/layout.h
-include/absl/container/internal/node_hash_policy.h
+include/absl/container/internal/node_slot_policy.h
 include/absl/container/internal/raw_hash_map.h
 include/absl/container/internal/raw_hash_set.h
 include/absl/container/internal/test_instance_tracker.h
@@ -135,8 +135,10 @@ include/absl/flags/parse.h
 include/absl/flags/reflection.h
 include/absl/flags/usage.h
 include/absl/flags/usage_config.h
+include/absl/functional/any_invocable.h
 include/absl/functional/bind_front.h
 include/absl/functional/function_ref.h
+include/absl/functional/internal/any_invocable.h
 include/absl/functional/internal/front_binder.h
 include/absl/functional/internal/function_ref.h
 include/absl/hash/hash.h
@@ -208,17 +210,21 @@ include/absl/status/statusor.h
 include/absl/strings/ascii.h
 include/absl/strings/charconv.h
 include/absl/strings/cord.h
+include/absl/strings/cord_analysis.h
+include/absl/strings/cord_buffer.h
 include/absl/strings/cord_test_helpers.h
 include/absl/strings/cordz_test_helpers.h
 include/absl/strings/escaping.h
 include/absl/strings/internal/char_map.h
 include/absl/strings/internal/charconv_bigint.h
 include/absl/strings/internal/charconv_parse.h
+include/absl/strings/internal/cord_data_edge.h
 include/absl/strings/internal/cord_internal.h
 include/absl/strings/internal/cord_rep_btree.h
 include/absl/strings/internal/cord_rep_btree_navigator.h
 include/absl/strings/internal/cord_rep_btree_reader.h
 include/absl/strings/internal/cord_rep_consume.h
+include/absl/strings/internal/cord_rep_crc.h
 include/absl/strings/internal/cord_rep_flat.h
 include/absl/strings/internal/cord_rep_ring.h
 include/absl/strings/internal/cord_rep_ring_reader.h
@@ -312,140 +318,139 @@ lib/cmake/absl/abslConfigVersion.cmake
 lib/cmake/absl/abslTargets-noconfig.cmake
 lib/cmake/absl/abslTargets.cmake
 lib/libabsl_bad_any_cast_impl.so
-lib/libabsl_bad_any_cast_impl.so.2111.0.0
+lib/libabsl_bad_any_cast_impl.so.2206.0.0
 lib/libabsl_bad_optional_access.so
-lib/libabsl_bad_optional_access.so.2111.0.0
+lib/libabsl_bad_optional_access.so.2206.0.0
 lib/libabsl_bad_variant_access.so
-lib/libabsl_bad_variant_access.so.2111.0.0
+lib/libabsl_bad_variant_access.so.2206.0.0
 lib/libabsl_base.so
-lib/libabsl_base.so.2111.0.0
+lib/libabsl_base.so.2206.0.0
 lib/libabsl_city.so
-lib/libabsl_city.so.2111.0.0
+lib/libabsl_city.so.2206.0.0
 lib/libabsl_civil_time.so
-lib/libabsl_civil_time.so.2111.0.0
+lib/libabsl_civil_time.so.2206.0.0
 lib/libabsl_cord.so
-lib/libabsl_cord.so.2111.0.0
+lib/libabsl_cord.so.2206.0.0
 lib/libabsl_cord_internal.so
-lib/libabsl_cord_internal.so.2111.0.0
+lib/libabsl_cord_internal.so.2206.0.0
 lib/libabsl_cordz_functions.so
-lib/libabsl_cordz_functions.so.2111.0.0
+lib/libabsl_cordz_functions.so.2206.0.0
 lib/libabsl_cordz_handle.so
-lib/libabsl_cordz_handle.so.2111.0.0
+lib/libabsl_cordz_handle.so.2206.0.0
 lib/libabsl_cordz_info.so
-lib/libabsl_cordz_info.so.2111.0.0
+lib/libabsl_cordz_info.so.2206.0.0
 lib/libabsl_cordz_sample_token.so
-lib/libabsl_cordz_sample_token.so.2111.0.0
+lib/libabsl_cordz_sample_token.so.2206.0.0
 lib/libabsl_debugging_internal.so
-lib/libabsl_debugging_internal.so.2111.0.0
+lib/libabsl_debugging_internal.so.2206.0.0
 lib/libabsl_demangle_internal.so
-lib/libabsl_demangle_internal.so.2111.0.0
+lib/libabsl_demangle_internal.so.2206.0.0
 lib/libabsl_examine_stack.so
-lib/libabsl_examine_stack.so.2111.0.0
+lib/libabsl_examine_stack.so.2206.0.0
 lib/libabsl_exponential_biased.so
-lib/libabsl_exponential_biased.so.2111.0.0
+lib/libabsl_exponential_biased.so.2206.0.0
 lib/libabsl_failure_signal_handler.so
-lib/libabsl_failure_signal_handler.so.2111.0.0
+lib/libabsl_failure_signal_handler.so.2206.0.0
 lib/libabsl_flags.so
-lib/libabsl_flags.so.2111.0.0
+lib/libabsl_flags.so.2206.0.0
 lib/libabsl_flags_commandlineflag.so
-lib/libabsl_flags_commandlineflag.so.2111.0.0
+lib/libabsl_flags_commandlineflag.so.2206.0.0
 lib/libabsl_flags_commandlineflag_internal.so
-lib/libabsl_flags_commandlineflag_internal.so.2111.0.0
+lib/libabsl_flags_commandlineflag_internal.so.2206.0.0
 lib/libabsl_flags_config.so
-lib/libabsl_flags_config.so.2111.0.0
+lib/libabsl_flags_config.so.2206.0.0
 lib/libabsl_flags_internal.so
-lib/libabsl_flags_internal.so.2111.0.0
+lib/libabsl_flags_internal.so.2206.0.0
 lib/libabsl_flags_marshalling.so
-lib/libabsl_flags_marshalling.so.2111.0.0
+lib/libabsl_flags_marshalling.so.2206.0.0
 lib/libabsl_flags_parse.so
-lib/libabsl_flags_parse.so.2111.0.0
+lib/libabsl_flags_parse.so.2206.0.0
 lib/libabsl_flags_private_handle_accessor.so
-lib/libabsl_flags_private_handle_accessor.so.2111.0.0
+lib/libabsl_flags_private_handle_accessor.so.2206.0.0
 lib/libabsl_flags_program_name.so
-lib/libabsl_flags_program_name.so.2111.0.0
+lib/libabsl_flags_program_name.so.2206.0.0
 lib/libabsl_flags_reflection.so
-lib/libabsl_flags_reflection.so.2111.0.0
+lib/libabsl_flags_reflection.so.2206.0.0
 lib/libabsl_flags_usage.so
-lib/libabsl_flags_usage.so.2111.0.0
+lib/libabsl_flags_usage.so.2206.0.0
 lib/libabsl_flags_usage_internal.so
-lib/libabsl_flags_usage_internal.so.2111.0.0
+lib/libabsl_flags_usage_internal.so.2206.0.0
 lib/libabsl_graphcycles_internal.so
-lib/libabsl_graphcycles_internal.so.2111.0.0
+lib/libabsl_graphcycles_internal.so.2206.0.0
 lib/libabsl_hash.so
-lib/libabsl_hash.so.2111.0.0
+lib/libabsl_hash.so.2206.0.0
 lib/libabsl_hashtablez_sampler.so
-lib/libabsl_hashtablez_sampler.so.2111.0.0
+lib/libabsl_hashtablez_sampler.so.2206.0.0
 lib/libabsl_int128.so
-lib/libabsl_int128.so.2111.0.0
+lib/libabsl_int128.so.2206.0.0
 lib/libabsl_leak_check.so
-lib/libabsl_leak_check.so.2111.0.0
-lib/libabsl_leak_check_disable.so
-lib/libabsl_leak_check_disable.so.2111.0.0
+lib/libabsl_leak_check.so.2206.0.0
 lib/libabsl_log_severity.so
-lib/libabsl_log_severity.so.2111.0.0
+lib/libabsl_log_severity.so.2206.0.0
 lib/libabsl_low_level_hash.so
-lib/libabsl_low_level_hash.so.2111.0.0
+lib/libabsl_low_level_hash.so.2206.0.0
 lib/libabsl_malloc_internal.so
-lib/libabsl_malloc_internal.so.2111.0.0
+lib/libabsl_malloc_internal.so.2206.0.0
 lib/libabsl_periodic_sampler.so
-lib/libabsl_periodic_sampler.so.2111.0.0
+lib/libabsl_periodic_sampler.so.2206.0.0
 lib/libabsl_random_distributions.so
-lib/libabsl_random_distributions.so.2111.0.0
+lib/libabsl_random_distributions.so.2206.0.0
 lib/libabsl_random_internal_distribution_test_util.so
-lib/libabsl_random_internal_distribution_test_util.so.2111.0.0
+lib/libabsl_random_internal_distribution_test_util.so.2206.0.0
 lib/libabsl_random_internal_platform.so
-lib/libabsl_random_internal_platform.so.2111.0.0
+lib/libabsl_random_internal_platform.so.2206.0.0
 lib/libabsl_random_internal_pool_urbg.so
-lib/libabsl_random_internal_pool_urbg.so.2111.0.0
+lib/libabsl_random_internal_pool_urbg.so.2206.0.0
 lib/libabsl_random_internal_randen.so
-lib/libabsl_random_internal_randen.so.2111.0.0
+lib/libabsl_random_internal_randen.so.2206.0.0
 lib/libabsl_random_internal_randen_hwaes.so
-lib/libabsl_random_internal_randen_hwaes.so.2111.0.0
+lib/libabsl_random_internal_randen_hwaes.so.2206.0.0
 lib/libabsl_random_internal_randen_hwaes_impl.so
-lib/libabsl_random_internal_randen_hwaes_impl.so.2111.0.0
+lib/libabsl_random_internal_randen_hwaes_impl.so.2206.0.0
 lib/libabsl_random_internal_randen_slow.so
-lib/libabsl_random_internal_randen_slow.so.2111.0.0
+lib/libabsl_random_internal_randen_slow.so.2206.0.0
 lib/libabsl_random_internal_seed_material.so
-lib/libabsl_random_internal_seed_material.so.2111.0.0
+lib/libabsl_random_internal_seed_material.so.2206.0.0
 lib/libabsl_random_seed_gen_exception.so
-lib/libabsl_random_seed_gen_exception.so.2111.0.0
+lib/libabsl_random_seed_gen_exception.so.2206.0.0
 lib/libabsl_random_seed_sequences.so
-lib/libabsl_random_seed_sequences.so.2111.0.0
+lib/libabsl_random_seed_sequences.so.2206.0.0
 lib/libabsl_raw_hash_set.so
-lib/libabsl_raw_hash_set.so.2111.0.0
+lib/libabsl_raw_hash_set.so.2206.0.0
 lib/libabsl_raw_logging_internal.so
-lib/libabsl_raw_logging_internal.so.2111.0.0
+lib/libabsl_raw_logging_internal.so.2206.0.0
 lib/libabsl_scoped_set_env.so
-lib/libabsl_scoped_set_env.so.2111.0.0
+lib/libabsl_scoped_set_env.so.2206.0.0
 lib/libabsl_spinlock_wait.so
-lib/libabsl_spinlock_wait.so.2111.0.0
+lib/libabsl_spinlock_wait.so.2206.0.0
 lib/libabsl_stacktrace.so
-lib/libabsl_stacktrace.so.2111.0.0
+lib/libabsl_stacktrace.so.2206.0.0
 lib/libabsl_status.so
-lib/libabsl_status.so.2111.0.0
+lib/libabsl_status.so.2206.0.0
 lib/libabsl_statusor.so
-lib/libabsl_statusor.so.2111.0.0
+lib/libabsl_statusor.so.2206.0.0
 lib/libabsl_str_format_internal.so
-lib/libabsl_str_format_internal.so.2111.0.0
+lib/libabsl_str_format_internal.so.2206.0.0
 lib/libabsl_strerror.so
-lib/libabsl_strerror.so.2111.0.0
+lib/libabsl_strerror.so.2206.0.0
 lib/libabsl_strings.so
-lib/libabsl_strings.so.2111.0.0
+lib/libabsl_strings.so.2206.0.0
 lib/libabsl_strings_internal.so
-lib/libabsl_strings_internal.so.2111.0.0
+lib/libabsl_strings_internal.so.2206.0.0
 lib/libabsl_symbolize.so
-lib/libabsl_symbolize.so.2111.0.0
+lib/libabsl_symbolize.so.2206.0.0
 lib/libabsl_synchronization.so
-lib/libabsl_synchronization.so.2111.0.0
+lib/libabsl_synchronization.so.2206.0.0
 lib/libabsl_throw_delegate.so
-lib/libabsl_throw_delegate.so.2111.0.0
+lib/libabsl_throw_delegate.so.2206.0.0
 lib/libabsl_time.so
-lib/libabsl_time.so.2111.0.0
+lib/libabsl_time.so.2206.0.0
 lib/libabsl_time_zone.so
-lib/libabsl_time_zone.so.2111.0.0
+lib/libabsl_time_zone.so.2206.0.0
 lib/pkgconfig/absl_algorithm.pc
 lib/pkgconfig/absl_algorithm_container.pc
 lib/pkgconfig/absl_any.pc
+lib/pkgconfig/absl_any_invocable.pc
 lib/pkgconfig/absl_atomic_hook.pc
 lib/pkgconfig/absl_bad_any_cast.pc
 lib/pkgconfig/absl_bad_any_cast_impl.pc
@@ -510,26 +515,25 @@ lib/pkgconfig/absl_hash_policy_traits.pc
 lib/pkgconfig/absl_hashtable_debug.pc
 lib/pkgconfig/absl_hashtable_debug_hooks.pc
 lib/pkgconfig/absl_hashtablez_sampler.pc
-lib/pkgconfig/absl_have_sse.pc
 lib/pkgconfig/absl_inlined_vector.pc
 lib/pkgconfig/absl_inlined_vector_internal.pc
 lib/pkgconfig/absl_int128.pc
 lib/pkgconfig/absl_kernel_timeout_internal.pc
 lib/pkgconfig/absl_layout.pc
 lib/pkgconfig/absl_leak_check.pc
-lib/pkgconfig/absl_leak_check_disable.pc
 lib/pkgconfig/absl_log_severity.pc
 lib/pkgconfig/absl_low_level_hash.pc
 lib/pkgconfig/absl_malloc_internal.pc
 lib/pkgconfig/absl_memory.pc
 lib/pkgconfig/absl_meta.pc
 lib/pkgconfig/absl_node_hash_map.pc
-lib/pkgconfig/absl_node_hash_policy.pc
 lib/pkgconfig/absl_node_hash_set.pc
+lib/pkgconfig/absl_node_slot_policy.pc
 lib/pkgconfig/absl_numeric.pc
 lib/pkgconfig/absl_numeric_representation.pc
 lib/pkgconfig/absl_optional.pc
 lib/pkgconfig/absl_periodic_sampler.pc
+lib/pkgconfig/absl_prefetch.pc
 lib/pkgconfig/absl_pretty_function.pc
 lib/pkgconfig/absl_random_bit_gen_ref.pc
 lib/pkgconfig/absl_random_distributions.pc
diff --git a/devel/abseil/buildlink3.mk b/devel/abseil/buildlink3.mk
index d17e1ce8d34..380730ddde4 100644
--- a/devel/abseil/buildlink3.mk
+++ b/devel/abseil/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/02/06 20:11:35 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2022/07/06 15:16:59 adam Exp $
 
 BUILDLINK_TREE+=	abseil
 
 .if !defined(ABSEIL_BUILDLINK3_MK)
 ABSEIL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.abseil+=	abseil>=20190808
+BUILDLINK_API_DEPENDS.abseil+=	abseil>=20220623.0
 BUILDLINK_PKGSRCDIR.abseil?=	../../devel/abseil
 .endif	# ABSEIL_BUILDLINK3_MK
 
diff --git a/devel/abseil/distinfo b/devel/abseil/distinfo
index ac48399fb58..d021aad3096 100644
--- a/devel/abseil/distinfo
+++ b/devel/abseil/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.12 2022/03/26 22:50:18 tnn Exp $
+$NetBSD: distinfo,v 1.13 2022/07/06 15:16:59 adam Exp $
 
-BLAKE2s (abseil-20211102.0-20211102.0.tar.gz) = a4d9e13332297a49cc2c2e17c4123afb184fe7d23e2c564587e42b95411570b9
-SHA512 (abseil-20211102.0-20211102.0.tar.gz) = fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
-Size (abseil-20211102.0-20211102.0.tar.gz) = 1884080 bytes
-SHA1 (patch-absl_base_config.h) = 3d72772dc00b95fcad3d36230b6e3145a6a41e7c
-SHA1 (patch-absl_debugging_internal_elf__mem__image.cc) = b1ce3fda13188cd9b3a9096e243bae7142d1c67c
-SHA1 (patch-absl_debugging_internal_vdso__support.cc) = 112d7c0d1b041cefaa9866de40031b28aa6575fa
+BLAKE2s (abseil-20220623.0-20220623.0.tar.gz) = 6d266cfbbdabc9047de29dcd6a164d35d2ea0139f43638a7a67d767d8ce4e996
+SHA512 (abseil-20220623.0-20220623.0.tar.gz) = 6a84254927cac285c77f6b2e77de23ce4f65c28acc0289228f3db552e247fb1dedf2c6e51a98da7df700c062612e27e6acd029122e8abc3fff12f3f5502c8c10
+Size (abseil-20220623.0-20220623.0.tar.gz) = 1957466 bytes
+SHA1 (patch-absl_debugging_internal_vdso__support.cc) = af3feea0938193b35be19b9d0bf581a973343ed9
 SHA1 (patch-absl_time_internal_cctz_src_time__zone__format.cc) = 501736490edc62afb8b82e16f9a88e7fab6f5552
diff --git a/devel/abseil/patches/patch-absl_base_config.h b/devel/abseil/patches/patch-absl_base_config.h
deleted file mode 100644
index a2061909820..00000000000
--- a/devel/abseil/patches/patch-absl_base_config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-absl_base_config.h,v 1.4 2022/03/06 09:34:06 wiz Exp $
-
-Add support for NetBSD.
-https://github.com/abseil/abseil-cpp/pull/1121
-
---- absl/base/config.h.orig	2021-11-03 15:26:14.000000000 +0000
-+++ absl/base/config.h
-@@ -411,6 +411,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES
- #ifdef ABSL_HAVE_MMAP
- #error ABSL_HAVE_MMAP cannot be directly set
- #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
-+    defined(__NetBSD__) || \
-     defined(_AIX) || defined(__ros__) || defined(__native_client__) ||    \
-     defined(__asmjs__) || defined(__wasm__) || defined(__Fuchsia__) ||    \
-     defined(__sun) || defined(__ASYLO__) || defined(__myriad2__) ||       \
-@@ -425,6 +426,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES
- #ifdef ABSL_HAVE_PTHREAD_GETSCHEDPARAM
- #error ABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set
- #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
-+    defined(__NetBSD__) || \
-     defined(_AIX) || defined(__ros__)
- #define ABSL_HAVE_PTHREAD_GETSCHEDPARAM 1
- #endif
diff --git a/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc b/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc
deleted file mode 100644
index 58236bcbc83..00000000000
--- a/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-absl_debugging_internal_elf__mem__image.cc,v 1.2 2022/03/06 09:34:06 wiz Exp $
-
-Support NetBSD.
-https://github.com/abseil/abseil-cpp/pull/1121
-
---- absl/debugging/internal/elf_mem_image.cc.orig	2021-11-18 09:35:34.106564193 +0000
-+++ absl/debugging/internal/elf_mem_image.cc
-@@ -351,7 +351,11 @@ void ElfMemImage::SymbolIterator::Update
-   const ElfW(Versym) *version_symbol = image->GetVersym(index_);
-   ABSL_RAW_CHECK(symbol && version_symbol, "");
-   const char *const symbol_name = image->GetDynstr(symbol->st_name);
-+#if defined(__NetBSD__)
-+  int version_index = version_symbol->vs_vers & VERSYM_VERSION;
-+#else
-   const ElfW(Versym) version_index = version_symbol[0] & VERSYM_VERSION;
-+#endif
-   const ElfW(Verdef) *version_definition = nullptr;
-   const char *version_name = "";
-   if (symbol->st_shndx == SHN_UNDEF) {
diff --git a/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc b/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc
index fcfe8703f8f..f8c031bcf5f 100644
--- a/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc
+++ b/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc
@@ -1,23 +1,12 @@
-$NetBSD: patch-absl_debugging_internal_vdso__support.cc,v 1.3 2022/03/26 22:50:18 tnn Exp $
+$NetBSD: patch-absl_debugging_internal_vdso__support.cc,v 1.4 2022/07/06 15:16:59 adam Exp $
 
 Support NetBSD.
 https://github.com/abseil/abseil-cpp/pull/1121
 No support for SunOS yet, so disable for the time being.
 
---- absl/debugging/internal/vdso_support.cc.orig	2021-11-03 15:26:14.000000000 +0000
+--- absl/debugging/internal/vdso_support.cc.orig	2022-06-23 18:22:47.000000000 +0000
 +++ absl/debugging/internal/vdso_support.cc
-@@ -50,6 +50,10 @@
- #define AT_SYSINFO_EHDR 33  // for crosstoolv10
- #endif
- 
-+#if defined(__NetBSD__)
-+using Elf32_auxv_t = Aux32Info;
-+using Elf64_auxv_t = Aux64Info;
-+#endif
- #if defined(__FreeBSD__)
- using Elf64_auxv_t = Elf64_Auxinfo;
- using Elf32_auxv_t = Elf32_Auxinfo;
-@@ -93,6 +97,9 @@ const void *VDSOSupport::Init() {
+@@ -101,6 +101,9 @@ const void *VDSOSupport::Init() {
      }
    }
  #endif  // ABSL_HAVE_GETAUXVAL
@@ -27,21 +16,7 @@ No support for SunOS yet, so disable for the time being.
    if (vdso_base_.load(std::memory_order_relaxed) == kInvalidBase) {
      int fd = open("/proc/self/auxv", O_RDONLY);
      if (fd == -1) {
-@@ -104,8 +111,13 @@ const void *VDSOSupport::Init() {
-     ElfW(auxv_t) aux;
-     while (read(fd, &aux, sizeof(aux)) == sizeof(aux)) {
-       if (aux.a_type == AT_SYSINFO_EHDR) {
-+#if defined(__NetBSD__)
-+        vdso_base_.store(reinterpret_cast<void *>(aux.a_v),
-+                         std::memory_order_relaxed);
-+#else
-         vdso_base_.store(reinterpret_cast<void *>(aux.a_un.a_val),
-                          std::memory_order_relaxed);
-+#endif
-         break;
-       }
-     }
-@@ -127,6 +139,7 @@ const void *VDSOSupport::Init() {
+@@ -140,6 +143,7 @@ const void *VDSOSupport::Init() {
    // from assigning to getcpu_fn_ more than once.
    getcpu_fn_.store(fn, std::memory_order_relaxed);
    return vdso_base_.load(std::memory_order_relaxed);