- Update Google's Abseil to LTS version 20210324.0

- Patch one consumer port so it builds against it

4 files changed, 213 insertions, 6 deletions

diff --git a/devel/abseil/Makefile b/devel/abseil/Makefile
index edb14a36a387..fc88593b47bc 100644
--- a/devel/abseil/Makefile
+++ b/devel/abseil/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	abseil
-PORTVERSION=	20200923.3
+PORTVERSION=	20210324.0
 CATEGORIES=	devel
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -16,4 +16,6 @@ GH_PROJECT=	${PORTNAME}-cpp
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON \
 		-DCMAKE_CXX_STANDARD=17 # force the same highest C++ standard because of ABI differences: see https://github.com/abseil/abseil-cpp/issues/819
 
+PLIST_SUB+=	LIBSUFX=${PORTVERSION:C/^..(....).*/\1/}.0.0
+
 .include <bsd.port.mk>
diff --git a/devel/abseil/distinfo b/devel/abseil/distinfo
index 23f9e6b3c378..b54c3d7adc75 100644
--- a/devel/abseil/distinfo
+++ b/devel/abseil/distinfo
@@ -1,3 +1,2 @@
-TIMESTAMP = 1611082155
-SHA256 (abseil-abseil-cpp-20200923.3_GH0.tar.gz) = ebe2ad1480d27383e4bf4211e2ca2ef312d5e6a09eba869fd2e8a5c5d553ded2
-SIZE (abseil-abseil-cpp-20200923.3_GH0.tar.gz) = 1783980
+SHA256 (abseil-abseil-cpp-20210324.0_GH0.tar.gz) = dd7db6815204c2a62a2160e32c55e97113b0a0178b2f090d6bab5ce36111db4b
+SIZE (abseil-abseil-cpp-20210324.0_GH0.tar.gz) = 1774094
diff --git a/devel/abseil/pkg-plist b/devel/abseil/pkg-plist
index 1edcd9b59d96..ec82a13eda8d 100644
--- a/devel/abseil/pkg-plist
+++ b/devel/abseil/pkg-plist
@@ -8,7 +8,6 @@ include/absl/base/const_init.h
 include/absl/base/dynamic_annotations.h
 include/absl/base/internal/atomic_hook.h
 include/absl/base/internal/atomic_hook_test_helper.h
-include/absl/base/internal/bits.h
 include/absl/base/internal/cycleclock.h
 include/absl/base/internal/direct_mmap.h
 include/absl/base/internal/dynamic_annotations.h
@@ -52,6 +51,8 @@ include/absl/base/options.h
 include/absl/base/policy_checks.h
 include/absl/base/port.h
 include/absl/base/thread_annotations.h
+include/absl/cleanup/cleanup.h
+include/absl/cleanup/internal/cleanup.h
 include/absl/container/btree_map.h
 include/absl/container/btree_set.h
 include/absl/container/btree_test.h
@@ -124,6 +125,7 @@ include/absl/flags/internal/path_util.h
 include/absl/flags/internal/private_handle_accessor.h
 include/absl/flags/internal/program_name.h
 include/absl/flags/internal/registry.h
+include/absl/flags/internal/sequence_lock.h
 include/absl/flags/internal/usage.h
 include/absl/flags/marshalling.h
 include/absl/flags/parse.h
@@ -139,11 +141,15 @@ include/absl/hash/hash_testing.h
 include/absl/hash/internal/city.h
 include/absl/hash/internal/hash.h
 include/absl/hash/internal/spy_hash_state.h
+include/absl/hash/internal/wyhash.h
 include/absl/memory/memory.h
 include/absl/meta/type_traits.h
+include/absl/numeric/bits.h
 include/absl/numeric/int128.h
 include/absl/numeric/int128_have_intrinsic.inc
 include/absl/numeric/int128_no_intrinsic.inc
+include/absl/numeric/internal/bits.h
+include/absl/numeric/internal/representation.h
 include/absl/random/bernoulli_distribution.h
 include/absl/random/beta_distribution.h
 include/absl/random/bit_gen_ref.h
@@ -202,6 +208,9 @@ 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_internal.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
 include/absl/strings/internal/escaping.h
 include/absl/strings/internal/escaping_test_common.h
 include/absl/strings/internal/memutil.h
@@ -219,6 +228,7 @@ include/absl/strings/internal/str_format/output.h
 include/absl/strings/internal/str_format/parser.h
 include/absl/strings/internal/str_join_internal.h
 include/absl/strings/internal/str_split_internal.h
+include/absl/strings/internal/string_constant.h
 include/absl/strings/internal/utf8.h
 include/absl/strings/match.h
 include/absl/strings/numbers.h
@@ -233,9 +243,9 @@ include/absl/strings/substitute.h
 include/absl/synchronization/barrier.h
 include/absl/synchronization/blocking_counter.h
 include/absl/synchronization/internal/create_thread_identity.h
+include/absl/synchronization/internal/futex.h
 include/absl/synchronization/internal/graphcycles.h
 include/absl/synchronization/internal/kernel_timeout.h
-include/absl/synchronization/internal/mutex_nonprod.inc
 include/absl/synchronization/internal/per_thread_sem.h
 include/absl/synchronization/internal/thread_pool.h
 include/absl/synchronization/internal/waiter.h
@@ -279,65 +289,254 @@ include/absl/types/span.h
 include/absl/types/variant.h
 include/absl/utility/utility.h
 lib/cmake/absl/abslConfig.cmake
+lib/cmake/absl/abslConfigVersion.cmake
 lib/cmake/absl/abslTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/absl/abslTargets.cmake
 lib/libabsl_bad_any_cast_impl.so
+lib/libabsl_bad_any_cast_impl.so.%%LIBSUFX%%
 lib/libabsl_bad_optional_access.so
+lib/libabsl_bad_optional_access.so.%%LIBSUFX%%
 lib/libabsl_bad_variant_access.so
+lib/libabsl_bad_variant_access.so.%%LIBSUFX%%
 lib/libabsl_base.so
+lib/libabsl_base.so.%%LIBSUFX%%
 lib/libabsl_city.so
+lib/libabsl_city.so.%%LIBSUFX%%
 lib/libabsl_civil_time.so
+lib/libabsl_civil_time.so.%%LIBSUFX%%
 lib/libabsl_cord.so
+lib/libabsl_cord.so.%%LIBSUFX%%
 lib/libabsl_debugging_internal.so
+lib/libabsl_debugging_internal.so.%%LIBSUFX%%
 lib/libabsl_demangle_internal.so
+lib/libabsl_demangle_internal.so.%%LIBSUFX%%
 lib/libabsl_examine_stack.so
+lib/libabsl_examine_stack.so.%%LIBSUFX%%
 lib/libabsl_exponential_biased.so
+lib/libabsl_exponential_biased.so.%%LIBSUFX%%
 lib/libabsl_failure_signal_handler.so
+lib/libabsl_failure_signal_handler.so.%%LIBSUFX%%
 lib/libabsl_flags.so
+lib/libabsl_flags.so.%%LIBSUFX%%
 lib/libabsl_flags_commandlineflag.so
+lib/libabsl_flags_commandlineflag.so.%%LIBSUFX%%
 lib/libabsl_flags_commandlineflag_internal.so
+lib/libabsl_flags_commandlineflag_internal.so.%%LIBSUFX%%
 lib/libabsl_flags_config.so
+lib/libabsl_flags_config.so.%%LIBSUFX%%
 lib/libabsl_flags_internal.so
+lib/libabsl_flags_internal.so.%%LIBSUFX%%
 lib/libabsl_flags_marshalling.so
+lib/libabsl_flags_marshalling.so.%%LIBSUFX%%
 lib/libabsl_flags_parse.so
+lib/libabsl_flags_parse.so.%%LIBSUFX%%
 lib/libabsl_flags_private_handle_accessor.so
+lib/libabsl_flags_private_handle_accessor.so.%%LIBSUFX%%
 lib/libabsl_flags_program_name.so
+lib/libabsl_flags_program_name.so.%%LIBSUFX%%
 lib/libabsl_flags_reflection.so
+lib/libabsl_flags_reflection.so.%%LIBSUFX%%
 lib/libabsl_flags_usage.so
+lib/libabsl_flags_usage.so.%%LIBSUFX%%
 lib/libabsl_flags_usage_internal.so
+lib/libabsl_flags_usage_internal.so.%%LIBSUFX%%
 lib/libabsl_graphcycles_internal.so
+lib/libabsl_graphcycles_internal.so.%%LIBSUFX%%
 lib/libabsl_hash.so
+lib/libabsl_hash.so.%%LIBSUFX%%
 lib/libabsl_hashtablez_sampler.so
+lib/libabsl_hashtablez_sampler.so.%%LIBSUFX%%
 lib/libabsl_int128.so
+lib/libabsl_int128.so.%%LIBSUFX%%
 lib/libabsl_leak_check.so
+lib/libabsl_leak_check.so.%%LIBSUFX%%
 lib/libabsl_leak_check_disable.so
+lib/libabsl_leak_check_disable.so.%%LIBSUFX%%
 lib/libabsl_log_severity.so
+lib/libabsl_log_severity.so.%%LIBSUFX%%
 lib/libabsl_malloc_internal.so
+lib/libabsl_malloc_internal.so.%%LIBSUFX%%
 lib/libabsl_periodic_sampler.so
+lib/libabsl_periodic_sampler.so.%%LIBSUFX%%
 lib/libabsl_random_distributions.so
+lib/libabsl_random_distributions.so.%%LIBSUFX%%
 lib/libabsl_random_internal_distribution_test_util.so
+lib/libabsl_random_internal_distribution_test_util.so.%%LIBSUFX%%
 lib/libabsl_random_internal_platform.so
+lib/libabsl_random_internal_platform.so.%%LIBSUFX%%
 lib/libabsl_random_internal_pool_urbg.so
+lib/libabsl_random_internal_pool_urbg.so.%%LIBSUFX%%
 lib/libabsl_random_internal_randen.so
+lib/libabsl_random_internal_randen.so.%%LIBSUFX%%
 lib/libabsl_random_internal_randen_hwaes.so
+lib/libabsl_random_internal_randen_hwaes.so.%%LIBSUFX%%
 lib/libabsl_random_internal_randen_hwaes_impl.so
+lib/libabsl_random_internal_randen_hwaes_impl.so.%%LIBSUFX%%
 lib/libabsl_random_internal_randen_slow.so
+lib/libabsl_random_internal_randen_slow.so.%%LIBSUFX%%
 lib/libabsl_random_internal_seed_material.so
+lib/libabsl_random_internal_seed_material.so.%%LIBSUFX%%
 lib/libabsl_random_seed_gen_exception.so
+lib/libabsl_random_seed_gen_exception.so.%%LIBSUFX%%
 lib/libabsl_random_seed_sequences.so
+lib/libabsl_random_seed_sequences.so.%%LIBSUFX%%
 lib/libabsl_raw_hash_set.so
+lib/libabsl_raw_hash_set.so.%%LIBSUFX%%
 lib/libabsl_raw_logging_internal.so
+lib/libabsl_raw_logging_internal.so.%%LIBSUFX%%
 lib/libabsl_scoped_set_env.so
+lib/libabsl_scoped_set_env.so.%%LIBSUFX%%
 lib/libabsl_spinlock_wait.so
+lib/libabsl_spinlock_wait.so.%%LIBSUFX%%
 lib/libabsl_stacktrace.so
+lib/libabsl_stacktrace.so.%%LIBSUFX%%
 lib/libabsl_status.so
+lib/libabsl_status.so.%%LIBSUFX%%
 lib/libabsl_statusor.so
+lib/libabsl_statusor.so.%%LIBSUFX%%
 lib/libabsl_str_format_internal.so
+lib/libabsl_str_format_internal.so.%%LIBSUFX%%
 lib/libabsl_strerror.so
+lib/libabsl_strerror.so.%%LIBSUFX%%
 lib/libabsl_strings.so
+lib/libabsl_strings.so.%%LIBSUFX%%
 lib/libabsl_strings_internal.so
+lib/libabsl_strings_internal.so.%%LIBSUFX%%
 lib/libabsl_symbolize.so
+lib/libabsl_symbolize.so.%%LIBSUFX%%
 lib/libabsl_synchronization.so
+lib/libabsl_synchronization.so.%%LIBSUFX%%
 lib/libabsl_throw_delegate.so
+lib/libabsl_throw_delegate.so.%%LIBSUFX%%
 lib/libabsl_time.so
+lib/libabsl_time.so.%%LIBSUFX%%
 lib/libabsl_time_zone.so
+lib/libabsl_time_zone.so.%%LIBSUFX%%
+lib/libabsl_wyhash.so
+lib/libabsl_wyhash.so.%%LIBSUFX%%
+libdata/pkgconfig/absl_algorithm.pc
+libdata/pkgconfig/absl_algorithm_container.pc
+libdata/pkgconfig/absl_any.pc
+libdata/pkgconfig/absl_atomic_hook.pc
+libdata/pkgconfig/absl_bad_any_cast.pc
+libdata/pkgconfig/absl_bad_any_cast_impl.pc
+libdata/pkgconfig/absl_bad_optional_access.pc
+libdata/pkgconfig/absl_bad_variant_access.pc
+libdata/pkgconfig/absl_base.pc
+libdata/pkgconfig/absl_base_internal.pc
+libdata/pkgconfig/absl_bind_front.pc
+libdata/pkgconfig/absl_bits.pc
+libdata/pkgconfig/absl_btree.pc
+libdata/pkgconfig/absl_city.pc
+libdata/pkgconfig/absl_civil_time.pc
+libdata/pkgconfig/absl_compare.pc
+libdata/pkgconfig/absl_compressed_tuple.pc
+libdata/pkgconfig/absl_config.pc
+libdata/pkgconfig/absl_container_common.pc
+libdata/pkgconfig/absl_container_memory.pc
+libdata/pkgconfig/absl_cord.pc
+libdata/pkgconfig/absl_core_headers.pc
+libdata/pkgconfig/absl_counting_allocator.pc
+libdata/pkgconfig/absl_debugging.pc
+libdata/pkgconfig/absl_debugging_internal.pc
+libdata/pkgconfig/absl_demangle_internal.pc
+libdata/pkgconfig/absl_dynamic_annotations.pc
+libdata/pkgconfig/absl_endian.pc
+libdata/pkgconfig/absl_errno_saver.pc
+libdata/pkgconfig/absl_examine_stack.pc
+libdata/pkgconfig/absl_exponential_biased.pc
+libdata/pkgconfig/absl_failure_signal_handler.pc
+libdata/pkgconfig/absl_fast_type_id.pc
+libdata/pkgconfig/absl_fixed_array.pc
+libdata/pkgconfig/absl_flags.pc
+libdata/pkgconfig/absl_flags_commandlineflag.pc
+libdata/pkgconfig/absl_flags_commandlineflag_internal.pc
+libdata/pkgconfig/absl_flags_config.pc
+libdata/pkgconfig/absl_flags_internal.pc
+libdata/pkgconfig/absl_flags_marshalling.pc
+libdata/pkgconfig/absl_flags_parse.pc
+libdata/pkgconfig/absl_flags_path_util.pc
+libdata/pkgconfig/absl_flags_private_handle_accessor.pc
+libdata/pkgconfig/absl_flags_program_name.pc
+libdata/pkgconfig/absl_flags_reflection.pc
+libdata/pkgconfig/absl_flags_usage.pc
+libdata/pkgconfig/absl_flags_usage_internal.pc
+libdata/pkgconfig/absl_flat_hash_map.pc
+libdata/pkgconfig/absl_flat_hash_set.pc
+libdata/pkgconfig/absl_function_ref.pc
+libdata/pkgconfig/absl_graphcycles_internal.pc
+libdata/pkgconfig/absl_hash.pc
+libdata/pkgconfig/absl_hash_function_defaults.pc
+libdata/pkgconfig/absl_hash_policy_traits.pc
+libdata/pkgconfig/absl_hashtable_debug.pc
+libdata/pkgconfig/absl_hashtable_debug_hooks.pc
+libdata/pkgconfig/absl_hashtablez_sampler.pc
+libdata/pkgconfig/absl_have_sse.pc
+libdata/pkgconfig/absl_inlined_vector.pc
+libdata/pkgconfig/absl_inlined_vector_internal.pc
+libdata/pkgconfig/absl_int128.pc
+libdata/pkgconfig/absl_kernel_timeout_internal.pc
+libdata/pkgconfig/absl_layout.pc
+libdata/pkgconfig/absl_leak_check.pc
+libdata/pkgconfig/absl_leak_check_disable.pc
+libdata/pkgconfig/absl_log_severity.pc
+libdata/pkgconfig/absl_malloc_internal.pc
+libdata/pkgconfig/absl_memory.pc
+libdata/pkgconfig/absl_meta.pc
+libdata/pkgconfig/absl_node_hash_map.pc
+libdata/pkgconfig/absl_node_hash_policy.pc
+libdata/pkgconfig/absl_node_hash_set.pc
+libdata/pkgconfig/absl_numeric.pc
+libdata/pkgconfig/absl_numeric_representation.pc
+libdata/pkgconfig/absl_optional.pc
+libdata/pkgconfig/absl_periodic_sampler.pc
+libdata/pkgconfig/absl_pretty_function.pc
+libdata/pkgconfig/absl_random_bit_gen_ref.pc
+libdata/pkgconfig/absl_random_distributions.pc
+libdata/pkgconfig/absl_random_internal_distribution_caller.pc
+libdata/pkgconfig/absl_random_internal_distribution_test_util.pc
+libdata/pkgconfig/absl_random_internal_fast_uniform_bits.pc
+libdata/pkgconfig/absl_random_internal_fastmath.pc
+libdata/pkgconfig/absl_random_internal_generate_real.pc
+libdata/pkgconfig/absl_random_internal_iostream_state_saver.pc
+libdata/pkgconfig/absl_random_internal_mock_helpers.pc
+libdata/pkgconfig/absl_random_internal_nonsecure_base.pc
+libdata/pkgconfig/absl_random_internal_pcg_engine.pc
+libdata/pkgconfig/absl_random_internal_platform.pc
+libdata/pkgconfig/absl_random_internal_pool_urbg.pc
+libdata/pkgconfig/absl_random_internal_randen.pc
+libdata/pkgconfig/absl_random_internal_randen_engine.pc
+libdata/pkgconfig/absl_random_internal_randen_hwaes.pc
+libdata/pkgconfig/absl_random_internal_randen_hwaes_impl.pc
+libdata/pkgconfig/absl_random_internal_randen_slow.pc
+libdata/pkgconfig/absl_random_internal_salted_seed_seq.pc
+libdata/pkgconfig/absl_random_internal_seed_material.pc
+libdata/pkgconfig/absl_random_internal_traits.pc
+libdata/pkgconfig/absl_random_internal_uniform_helper.pc
+libdata/pkgconfig/absl_random_internal_wide_multiply.pc
+libdata/pkgconfig/absl_random_random.pc
+libdata/pkgconfig/absl_random_seed_gen_exception.pc
+libdata/pkgconfig/absl_random_seed_sequences.pc
+libdata/pkgconfig/absl_raw_hash_map.pc
+libdata/pkgconfig/absl_raw_hash_set.pc
+libdata/pkgconfig/absl_raw_logging_internal.pc
+libdata/pkgconfig/absl_scoped_set_env.pc
+libdata/pkgconfig/absl_span.pc
+libdata/pkgconfig/absl_spinlock_wait.pc
+libdata/pkgconfig/absl_stacktrace.pc
+libdata/pkgconfig/absl_status.pc
+libdata/pkgconfig/absl_statusor.pc
+libdata/pkgconfig/absl_str_format.pc
+libdata/pkgconfig/absl_str_format_internal.pc
+libdata/pkgconfig/absl_strerror.pc
+libdata/pkgconfig/absl_strings.pc
+libdata/pkgconfig/absl_strings_internal.pc
+libdata/pkgconfig/absl_symbolize.pc
+libdata/pkgconfig/absl_synchronization.pc
+libdata/pkgconfig/absl_throw_delegate.pc
+libdata/pkgconfig/absl_time.pc
+libdata/pkgconfig/absl_time_zone.pc
+libdata/pkgconfig/absl_type_traits.pc
+libdata/pkgconfig/absl_utility.pc
+libdata/pkgconfig/absl_variant.pc
+libdata/pkgconfig/absl_wyhash.pc
diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile
index d117f44241fa..7a5104c01b7d 100644
--- a/math/or-tools/Makefile
+++ b/math/or-tools/Makefile
@@ -33,6 +33,13 @@ SCIP_DESC=		Use the SCIP solver # SCIP package isn't built because of licensing
 SCIP_CMAKE_BOOL=	USE_SCIP
 SCIP_LIB_DEPENDS=	libscip.so:math/SCIP
 
+post-patch:
+	@${REINPLACE_CMD} -e '/absl::container/s,^,#,' \
+		${WRKSRC}/ortools/constraint_solver/CMakeLists.txt \
+		${WRKSRC}/ortools/glop/CMakeLists.txt \
+		${WRKSRC}/ortools/linear_solver/CMakeLists.txt \
+		${WRKSRC}/ortools/sat/CMakeLists.txt
+
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete