On Sun, Feb 07, 2021 at 09:55:34PM -0500, Brad Smith wrote:
> Here is an update to Boost 1.73.
>
> I have provided patches to fix building leatherman, gnuradio, pokerth, and
> rstudio.
>
> That leaves monotone, mongodb, and returntotheroots that need fixing.
>
> Looking for any assistance with the remaining 3.
Here is an updated diff for Boost.
I am just waiting for Brian to roll a newer snapshot release of returntotheroots
which should resolve the build issues there and we should be good to go.
Index: boost/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/boost/Makefile,v
retrieving revision 1.107
diff -u -p -u -p -r1.107 Makefile
--- boost/Makefile 1 Feb 2021 12:00:51 -0000 1.107
+++ boost/Makefile 5 Feb 2021 22:19:26 -0000
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS-md = aarch64 amd64 arm i3
COMMENT-main= free peer-reviewed portable C++ source libraries
COMMENT-md= machine-dependent libraries for boost
-VERSION= 1.72.0
+VERSION= 1.73.0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME-main= boost-${VERSION}
PKGNAME-md= boost-md-${VERSION}
@@ -14,10 +14,11 @@ MASTER_SITES= https://dl.bintray.com/boo
EXTRACT_SUFX= .tar.bz2
FIX_EXTRACT_PERMISSIONS = Yes
-SO_VERSION= 13.0
+SO_VERSION= 14.0
BOOST_LIBS= boost_atomic-mt \
boost_chrono-mt boost_chrono \
boost_container-mt boost_container \
+ boost_contract boost_contract-mt \
boost_date_time-mt boost_date_time \
boost_filesystem-mt boost_filesystem \
boost_graph-mt boost_graph \
@@ -31,6 +32,7 @@ BOOST_LIBS= boost_atomic-mt \
boost_math_tr1-mt boost_math_tr1 \
boost_math_tr1f-mt boost_math_tr1f \
boost_math_tr1l-mt boost_math_tr1l \
+ boost_nowide-mt boost_nowide \
boost_prg_exec_monitor-mt boost_prg_exec_monitor \
boost_program_options-mt boost_program_options \
boost_numpy38-mt boost_numpy38 \
@@ -44,8 +46,7 @@ BOOST_LIBS= boost_atomic-mt \
boost_unit_test_framework-mt boost_unit_test_framework \
boost_wserialization-mt boost_wserialization \
boost_wave-mt boost_wave \
- boost_type_erasure-mt boost_type_erasure \
- boost_contract boost_contract-mt
+ boost_type_erasure-mt boost_type_erasure
# MD
BOOST_LIBS+= boost_context-mt \
Index: boost/distinfo
===================================================================
RCS file: /home/cvs/ports/devel/boost/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- boost/distinfo 1 Feb 2021 12:00:51 -0000 1.13
+++ boost/distinfo 5 Feb 2021 21:05:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (boost_1_72_0.tar.bz2) = WcmydLxFHPkam6HdLH/cr11gsbOqg/LJ+hQ0F8xmByI=
-SIZE (boost_1_72_0.tar.bz2) = 106907358
+SHA256 (boost_1_73_0.tar.bz2) = TrO41EK0Jtw1NGI1yHM7WuNbpDFpDjjGqCY9zp/LtAI=
+SIZE (boost_1_73_0.tar.bz2) = 109247910
Index: boost/patches/patch-Jamroot
===================================================================
RCS file: /home/cvs/ports/devel/boost/patches/patch-Jamroot,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-Jamroot
--- boost/patches/patch-Jamroot 1 Feb 2021 12:00:51 -0000 1.9
+++ boost/patches/patch-Jamroot 5 Feb 2021 21:12:04 -0000
@@ -5,7 +5,7 @@ Index: Jamroot
+++ Jamroot
@@ -146,8 +146,9 @@ import tools/boost\_install/boost-install ;
path-constant BOOST_ROOT : . ;
- constant BOOST_VERSION : 1.72.0 ;
+ constant BOOST_VERSION : 1.73.0 ;
constant BOOST_JAMROOT_MODULE : $(__name__) ;
+constant SO_VERSION : ${SO_VERSION} ;
Index: boost/patches/patch-boost_asio_detail_config_hpp
===================================================================
RCS file:
/home/cvs/ports/devel/boost/patches/patch-boost_asio_detail_config_hpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-boost_asio_detail_config_hpp
--- boost/patches/patch-boost_asio_detail_config_hpp 1 Feb 2021 12:00:51
-0000 1.4
+++ boost/patches/patch-boost_asio_detail_config_hpp 5 Feb 2021 21:12:01
-0000
@@ -5,7 +5,7 @@ Use _POSIX_VERSION to detect support for
Index: boost/asio/detail/config.hpp
--- boost/asio/detail/config.hpp.orig
+++ boost/asio/detail/config.hpp
-@@ -1475,4 +1475,15 @@
+@@ -1480,4 +1480,15 @@
# endif // defined(__clang__)
#endif // !defined(BOOST_ASIO_HAS_CO_AWAIT)
Index: boost/patches/patch-boost_beast__experimental_http_impl_icy_stream_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast__experimental_http_impl_icy_stream_hpp
diff -N boost/patches/patch-boost_beast__experimental_http_impl_icy_stream_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast__experimental_http_impl_icy_stream_hpp
5 Feb 2021 23:19:48 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: boost/beast/_experimental/http/impl/icy_stream.hpp
+--- boost/beast/_experimental/http/impl/icy_stream.hpp.orig
++++ boost/beast/_experimental/http/impl/icy_stream.hpp
+@@ -259,7 +259,7 @@ read_some(MutableBufferSequence const& buffers, error_
+ template<class NextLayer>
+ template<
+ class MutableBufferSequence,
+- class ReadHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ icy_stream<NextLayer>::
+ async_read_some(
+@@ -311,7 +311,7 @@ write_some(MutableBufferSequence const& buffers, error
+ template<class NextLayer>
+ template<
+ class MutableBufferSequence,
+- class WriteHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ icy_stream<NextLayer>::
+ async_write_some(
Index: boost/patches/patch-boost_beast__experimental_test_impl_stream_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast__experimental_test_impl_stream_hpp
diff -N boost/patches/patch-boost_beast__experimental_test_impl_stream_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast__experimental_test_impl_stream_hpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: boost/beast/_experimental/test/impl/stream.hpp
+--- boost/beast/_experimental/test/impl/stream.hpp.orig
++++ boost/beast/_experimental/test/impl/stream.hpp
+@@ -306,7 +306,7 @@ read_some(MutableBufferSequence const& buffers,
+ return 0;
+ }
+
+-template<class MutableBufferSequence, class ReadHandler>
++template<class MutableBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ stream::
+ async_read_some(
+@@ -386,7 +386,7 @@ write_some(
+ return n;
+ }
+
+-template<class ConstBufferSequence, class WriteHandler>
++template<class ConstBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ stream::
+ async_write_some(
Index: boost/patches/patch-boost_beast_core_detail_impl_read_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_core_detail_impl_read_hpp
diff -N boost/patches/patch-boost_beast_core_detail_impl_read_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_core_detail_impl_read_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: boost/beast/core/detail/impl/read.hpp
+--- boost/beast/core/detail/impl/read.hpp.orig
++++ boost/beast/core/detail/impl/read.hpp
+@@ -214,7 +214,7 @@ template<
+ class AsyncReadStream,
+ class DynamicBuffer,
+ class CompletionCondition,
+- class ReadHandler,
++ BOOST_BEAST_ASYNC_TPARAM2 ReadHandler,
+ class>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ async_read(
Index: boost/patches/patch-boost_beast_core_detail_is_invocable_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_core_detail_is_invocable_hpp
diff -N boost/patches/patch-boost_beast_core_detail_is_invocable_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_core_detail_is_invocable_hpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+Index: boost/beast/core/detail/is_invocable.hpp
+--- boost/beast/core/detail/is_invocable.hpp.orig
++++ boost/beast/core/detail/is_invocable.hpp
+@@ -10,6 +10,8 @@
+ #ifndef BOOST_BEAST_DETAIL_IS_INVOCABLE_HPP
+ #define BOOST_BEAST_DETAIL_IS_INVOCABLE_HPP
+
++#include <boost/asio/async_result.hpp>
++#include <boost/type_traits/make_void.hpp>
+ #include <type_traits>
+ #include <utility>
+
+@@ -50,6 +52,26 @@ struct is_invocable<C, R(A...)>
+ {
+ };
+ /** @} */
++
++template<class CompletionToken, class Signature, class = void>
++struct is_completion_token_for : std::false_type
++{
++};
++
++struct any_initiation
++{
++ template<class...AnyArgs>
++ void operator()(AnyArgs&&...);
++};
++
++template<class CompletionToken, class R, class...Args>
++struct is_completion_token_for<
++ CompletionToken, R(Args...), boost::void_t<decltype(
++ boost::asio::async_initiate<CompletionToken, R(Args...)>(
++ any_initiation(), std::declval<CompletionToken&>())
++ )>> : std::true_type
++{
++};
+
+ } // detail
+ } // beast
Index: boost/patches/patch-boost_beast_core_detail_read_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_core_detail_read_hpp
diff -N boost/patches/patch-boost_beast_core_detail_read_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_core_detail_read_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: boost/beast/core/detail/read.hpp
+--- boost/beast/core/detail/read.hpp.orig
++++ boost/beast/core/detail/read.hpp
+@@ -219,7 +219,7 @@ template<
+ class AsyncReadStream,
+ class DynamicBuffer,
+ class CompletionCondition,
+- class ReadHandler
++ BOOST_BEAST_ASYNC_TPARAM2 ReadHandler
+ #if ! BOOST_BEAST_DOXYGEN
+ , class = typename std::enable_if<
+ is_async_read_stream<AsyncReadStream>::value &&
Index: boost/patches/patch-boost_beast_core_detect_ssl_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_core_detect_ssl_hpp
diff -N boost/patches/patch-boost_beast_core_detect_ssl_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_core_detect_ssl_hpp 5 Feb 2021 23:19:45
-0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+
+Index: boost/beast/core/detect_ssl.hpp
+--- boost/beast/core/detect_ssl.hpp.orig
++++ boost/beast/core/detect_ssl.hpp
+@@ -374,13 +374,13 @@ struct run_detect_ssl_op
+ void operator()(
+ DetectHandler&& h,
+ AsyncReadStream* s, // references are passed as pointers
+- DynamicBuffer& b)
++ DynamicBuffer* b)
+ {
+ detect_ssl_op<
+ typename std::decay<DetectHandler>::type,
+ AsyncReadStream,
+ DynamicBuffer>(
+- std::forward<DetectHandler>(h), *s, b);
++ std::forward<DetectHandler>(h), *s, *b);
+ }
+ };
+
+@@ -439,7 +439,7 @@ async_detect_ssl(
+ detail::run_detect_ssl_op{},
+ token,
+ &stream, // pass the reference by pointer
+- buffer);
++ &buffer);
+ }
+
+ //]
Index: boost/patches/patch-boost_beast_core_impl_basic_stream_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_core_impl_basic_stream_hpp
diff -N boost/patches/patch-boost_beast_core_impl_basic_stream_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_core_impl_basic_stream_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,68 @@
+$OpenBSD$
+
+Index: boost/beast/core/impl/basic_stream.hpp
+--- boost/beast/core/impl/basic_stream.hpp.orig
++++ boost/beast/core/impl/basic_stream.hpp
+@@ -776,7 +776,7 @@ close()
+
//------------------------------------------------------------------------------
+
+ template<class Protocol, class Executor, class RatePolicy>
+-template<class ConnectHandler>
++template<BOOST_BEAST_ASYNC_TPARAM1 ConnectHandler>
+ BOOST_BEAST_ASYNC_RESULT1(ConnectHandler)
+ basic_stream<Protocol, Executor, RatePolicy>::
+ async_connect(
+@@ -795,7 +795,7 @@ async_connect(
+ template<class Protocol, class Executor, class RatePolicy>
+ template<
+ class EndpointSequence,
+- class RangeConnectHandler,
++ BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, typename
Protocol::endpoint)) RangeConnectHandler,
+ class>
+ BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,void(error_code, typename
Protocol::endpoint))
+ basic_stream<Protocol, Executor, RatePolicy>::
+@@ -817,7 +817,7 @@ template<class Protocol, class Executor, class RatePol
+ template<
+ class EndpointSequence,
+ class ConnectCondition,
+- class RangeConnectHandler,
++ BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, typename
Protocol::endpoint)) RangeConnectHandler,
+ class>
+ BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,void (error_code, typename
Protocol::endpoint))
+ basic_stream<Protocol, Executor, RatePolicy>::
+@@ -839,7 +839,7 @@ async_connect(
+ template<class Protocol, class Executor, class RatePolicy>
+ template<
+ class Iterator,
+- class IteratorConnectHandler>
++ BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, Iterator))
IteratorConnectHandler>
+ BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,void (error_code,
Iterator))
+ basic_stream<Protocol, Executor, RatePolicy>::
+ async_connect(
+@@ -860,7 +860,7 @@ template<class Protocol, class Executor, class RatePol
+ template<
+ class Iterator,
+ class ConnectCondition,
+- class IteratorConnectHandler>
++ BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, Iterator))
IteratorConnectHandler>
+ BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,void (error_code,
Iterator))
+ basic_stream<Protocol, Executor, RatePolicy>::
+ async_connect(
+@@ -881,7 +881,7 @@ async_connect(
+
//------------------------------------------------------------------------------
+
+ template<class Protocol, class Executor, class RatePolicy>
+-template<class MutableBufferSequence, class ReadHandler>
++template<class MutableBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ basic_stream<Protocol, Executor, RatePolicy>::
+ async_read_some(
+@@ -901,7 +901,7 @@ async_read_some(
+ }
+
+ template<class Protocol, class Executor, class RatePolicy>
+-template<class ConstBufferSequence, class WriteHandler>
++template<class ConstBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ basic_stream<Protocol, Executor, RatePolicy>::
+ async_write_some(
Index: boost/patches/patch-boost_beast_core_impl_buffered_read_stream_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_core_impl_buffered_read_stream_hpp
diff -N boost/patches/patch-boost_beast_core_impl_buffered_read_stream_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_core_impl_buffered_read_stream_hpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,59 @@
+$OpenBSD$
+
+Index: boost/beast/core/impl/buffered_read_stream.hpp
+--- boost/beast/core/impl/buffered_read_stream.hpp.orig
++++ boost/beast/core/impl/buffered_read_stream.hpp
+@@ -110,7 +110,7 @@ struct run_read_op
+ operator()(
+ ReadHandler&& h,
+ buffered_read_stream* s,
+- Buffers const& b)
++ Buffers const* b)
+ {
+ // If you get an error on the following line it means
+ // that your handler does not meet the documented type
+@@ -124,7 +124,7 @@ struct run_read_op
+ read_op<
+ Buffers,
+ typename std::decay<ReadHandler>::type>(
+- std::forward<ReadHandler>(h), *s, b);
++ std::forward<ReadHandler>(h), *s, *b);
+ }
+ };
+
+@@ -141,7 +141,7 @@ buffered_read_stream(Args&&... args)
+ }
+
+ template<class Stream, class DynamicBuffer>
+-template<class ConstBufferSequence, class WriteHandler>
++template<class ConstBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ buffered_read_stream<Stream, DynamicBuffer>::
+ async_write_some(
+@@ -153,7 +153,7 @@ async_write_some(
+ static_assert(net::is_const_buffer_sequence<
+ ConstBufferSequence>::value,
+ "ConstBufferSequence type requirements not met");
+- static_assert(detail::is_invocable<WriteHandler,
++ static_assert(detail::is_completion_token_for<WriteHandler,
+ void(error_code, std::size_t)>::value,
+ "WriteHandler type requirements not met");
+ return next_layer_.async_write_some(buffers,
+@@ -212,7 +212,7 @@ read_some(MutableBufferSequence const& buffers,
+ }
+
+ template<class Stream, class DynamicBuffer>
+-template<class MutableBufferSequence, class ReadHandler>
++template<class MutableBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ buffered_read_stream<Stream, DynamicBuffer>::
+ async_read_some(
+@@ -233,7 +233,7 @@ async_read_some(
+ typename ops::run_read_op{},
+ handler,
+ this,
+- buffers);
++ &buffers);
+ }
+
+ } // beast
Index: boost/patches/patch-boost_beast_core_impl_flat_stream_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_core_impl_flat_stream_hpp
diff -N boost/patches/patch-boost_beast_core_impl_flat_stream_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_core_impl_flat_stream_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: boost/beast/core/impl/flat_stream.hpp
+--- boost/beast/core/impl/flat_stream.hpp.orig
++++ boost/beast/core/impl/flat_stream.hpp
+@@ -144,7 +144,7 @@ read_some(MutableBufferSequence const& buffers, error_
+ template<class NextLayer>
+ template<
+ class MutableBufferSequence,
+- class ReadHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ flat_stream<NextLayer>::
+ async_read_some(
+@@ -225,7 +225,7 @@ write_some(ConstBufferSequence const& buffers, error_c
+ template<class NextLayer>
+ template<
+ class ConstBufferSequence,
+- class WriteHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ flat_stream<NextLayer>::
+ async_write_some(
Index: boost/patches/patch-boost_beast_http_field_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_http_field_hpp
diff -N boost/patches/patch-boost_beast_http_field_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_http_field_hpp 5 Feb 2021 23:19:45
-0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: boost/beast/http/field.hpp
+--- boost/beast/http/field.hpp.orig
++++ boost/beast/http/field.hpp
+@@ -396,12 +396,9 @@ field
+ string_to_field(string_view s);
+
+ /// Write the text for a field name to an output stream.
+-inline
++BOOST_BEAST_DECL
+ std::ostream&
+-operator<<(std::ostream& os, field f)
+-{
+- return os << to_string(f);
+-}
++operator<<(std::ostream& os, field f);
+
+ } // http
+ } // beast
Index: boost/patches/patch-boost_beast_http_impl_field_ipp
===================================================================
RCS file: boost/patches/patch-boost_beast_http_impl_field_ipp
diff -N boost/patches/patch-boost_beast_http_impl_field_ipp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_http_impl_field_ipp 5 Feb 2021 23:19:45
-0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Index: boost/beast/http/impl/field.ipp
+--- boost/beast/http/impl/field.ipp.orig
++++ boost/beast/http/impl/field.ipp
+@@ -11,11 +11,13 @@
+ #define BOOST_BEAST_HTTP_IMPL_FIELD_IPP
+
+ #include <boost/beast/http/field.hpp>
++#include <boost/assert.hpp>
+ #include <algorithm>
+ #include <array>
+ #include <cstring>
+-#include <boost/assert.hpp>
++#include <ostream>
+
++
+ namespace boost {
+ namespace beast {
+ namespace http {
+@@ -563,6 +565,12 @@ field
+ string_to_field(string_view s)
+ {
+ return detail::get_field_table().string_to_field(s);
++}
++
++std::ostream&
++operator<<(std::ostream& os, field f)
++{
++ return os << to_string(f);
+ }
+
+ } // http
Index: boost/patches/patch-boost_beast_http_impl_file_body_win32_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_http_impl_file_body_win32_hpp
diff -N boost/patches/patch-boost_beast_http_impl_file_body_win32_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_http_impl_file_body_win32_hpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: boost/beast/http/impl/file_body_win32.hpp
+--- boost/beast/http/impl/file_body_win32.hpp.orig
++++ boost/beast/http/impl/file_body_win32.hpp
+@@ -597,7 +597,7 @@ write_some(
+ template<
+ class Protocol, class Executor,
+ bool isRequest, class Fields,
+- class WriteHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ async_write_some(
+ net::basic_stream_socket<
Index: boost/patches/patch-boost_beast_http_impl_read_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_http_impl_read_hpp
diff -N boost/patches/patch-boost_beast_http_impl_read_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_http_impl_read_hpp 5 Feb 2021 23:19:45
-0000
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+Index: boost/beast/http/impl/read.hpp
+--- boost/beast/http/impl/read.hpp.orig
++++ boost/beast/http/impl/read.hpp
+@@ -304,7 +304,7 @@ template<
+ class AsyncReadStream,
+ class DynamicBuffer,
+ bool isRequest,
+- class ReadHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ async_read_some(
+ AsyncReadStream& stream,
+@@ -373,7 +373,7 @@ template<
+ class AsyncReadStream,
+ class DynamicBuffer,
+ bool isRequest,
+- class ReadHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ async_read_header(
+ AsyncReadStream& stream,
+@@ -443,7 +443,7 @@ template<
+ class AsyncReadStream,
+ class DynamicBuffer,
+ bool isRequest,
+- class ReadHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ async_read(
+ AsyncReadStream& stream,
+@@ -531,7 +531,7 @@ template<
+ class AsyncReadStream,
+ class DynamicBuffer,
+ bool isRequest, class Body, class Allocator,
+- class ReadHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ async_read(
+ AsyncReadStream& stream,
Index: boost/patches/patch-boost_beast_http_impl_write_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_http_impl_write_hpp
diff -N boost/patches/patch-boost_beast_http_impl_write_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_http_impl_write_hpp 5 Feb 2021 23:19:45
-0000
@@ -0,0 +1,59 @@
+$OpenBSD$
+
+Index: boost/beast/http/impl/write.hpp
+--- boost/beast/http/impl/write.hpp.orig
++++ boost/beast/http/impl/write.hpp
+@@ -463,7 +463,7 @@ write_some_impl(
+ template<
+ class AsyncWriteStream,
+ bool isRequest, class Body, class Fields,
+- class WriteHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ async_write_some_impl(
+ AsyncWriteStream& stream,
+@@ -526,7 +526,7 @@ write_some(
+ template<
+ class AsyncWriteStream,
+ bool isRequest, class Body, class Fields,
+- class WriteHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ async_write_some(
+ AsyncWriteStream& stream,
+@@ -608,7 +608,7 @@ write_header(
+ template<
+ class AsyncWriteStream,
+ bool isRequest, class Body, class Fields,
+- class WriteHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ async_write_header(
+ AsyncWriteStream& stream,
+@@ -681,7 +681,7 @@ write(
+ template<
+ class AsyncWriteStream,
+ bool isRequest, class Body, class Fields,
+- class WriteHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ async_write(
+ AsyncWriteStream& stream,
+@@ -801,7 +801,7 @@ write(
+ template<
+ class AsyncWriteStream,
+ bool isRequest, class Body, class Fields,
+- class WriteHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ async_write(
+ AsyncWriteStream& stream,
+@@ -830,7 +830,7 @@ async_write(
+ template<
+ class AsyncWriteStream,
+ bool isRequest, class Body, class Fields,
+- class WriteHandler>
++ BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ async_write(
+ AsyncWriteStream& stream,
Index: boost/patches/patch-boost_beast_http_span_body_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_http_span_body_hpp
diff -N boost/patches/patch-boost_beast_http_span_body_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_http_span_body_hpp 5 Feb 2021 23:19:45
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: boost/beast/http/span_body.hpp
+--- boost/beast/http/span_body.hpp.orig
++++ boost/beast/http/span_body.hpp
+@@ -36,8 +36,10 @@ template<class T>
+ struct span_body
+ {
+ private:
+- static_assert(std::is_pod<T>::value,
+- "POD requirements not met");
++ static_assert(
++ std::is_trivial<T>::value &&
++ std::is_standard_layout<T>::value,
++ "POD requirements not met");
+
+ public:
+ /** The type of container used for the body
Index: boost/patches/patch-boost_beast_ssl_ssl_stream_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_ssl_ssl_stream_hpp
diff -N boost/patches/patch-boost_beast_ssl_ssl_stream_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_ssl_ssl_stream_hpp 5 Feb 2021 23:19:45
-0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: boost/beast/ssl/ssl_stream.hpp
+--- boost/beast/ssl/ssl_stream.hpp.orig
++++ boost/beast/ssl/ssl_stream.hpp
+@@ -555,7 +555,7 @@ class ssl_stream (public)
+ need to ensure that all data is written before the asynchronous
operation
+ completes.
+ */
+- template<class ConstBufferSequence, class WriteHandler>
++ template<class ConstBufferSequence, BOOST_BEAST_ASYNC_TPARAM2
WriteHandler>
+ BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler,
void(boost::system::error_code, std::size_t))
+ async_write_some(ConstBufferSequence const& buffers,
+ BOOST_ASIO_MOVE_ARG(WriteHandler) handler)
+@@ -636,7 +636,7 @@ class ssl_stream (public)
+ if you need to ensure that the requested amount of data is read before
+ the asynchronous operation completes.
+ */
+- template<class MutableBufferSequence, class ReadHandler>
++ template<class MutableBufferSequence, BOOST_BEAST_ASYNC_TPARAM2
ReadHandler>
+ BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler,
void(boost::system::error_code, std::size_t))
+ async_read_some(MutableBufferSequence const& buffers,
+ BOOST_ASIO_MOVE_ARG(ReadHandler) handler)
Index: boost/patches/patch-boost_beast_version_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_version_hpp
diff -N boost/patches/patch-boost_beast_version_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_version_hpp 5 Feb 2021 23:19:45 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: boost/beast/version.hpp
+--- boost/beast/version.hpp.orig
++++ boost/beast/version.hpp
+@@ -20,7 +20,7 @@
+ This is a simple integer that is incremented by one every
+ time a set of code changes is merged to the develop branch.
+ */
+-#define BOOST_BEAST_VERSION 290
++#define BOOST_BEAST_VERSION 292
+
+ #define BOOST_BEAST_VERSION_STRING "Boost.Beast/"
BOOST_STRINGIZE(BOOST_BEAST_VERSION)
+
Index: boost/patches/patch-boost_beast_websocket_impl_accept_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_websocket_impl_accept_hpp
diff -N boost/patches/patch-boost_beast_websocket_impl_accept_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_websocket_impl_accept_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,59 @@
+$OpenBSD$
+
+Index: boost/beast/websocket/impl/accept.hpp
+--- boost/beast/websocket/impl/accept.hpp.orig
++++ boost/beast/websocket/impl/accept.hpp
+@@ -542,7 +542,7 @@ accept(
+
+ template<class NextLayer, bool deflateSupported>
+ template<
+- class AcceptHandler>
++ BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ stream<NextLayer, deflateSupported>::
+ async_accept(
+@@ -564,7 +564,7 @@ async_accept(
+ template<class NextLayer, bool deflateSupported>
+ template<
+ class ResponseDecorator,
+- class AcceptHandler>
++ BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ stream<NextLayer, deflateSupported>::
+ async_accept_ex(
+@@ -590,7 +590,7 @@ async_accept_ex(
+ template<class NextLayer, bool deflateSupported>
+ template<
+ class ConstBufferSequence,
+- class AcceptHandler>
++ BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ stream<NextLayer, deflateSupported>::
+ async_accept(
+@@ -621,7 +621,7 @@ template<class NextLayer, bool deflateSupported>
+ template<
+ class ConstBufferSequence,
+ class ResponseDecorator,
+- class AcceptHandler>
++ BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ stream<NextLayer, deflateSupported>::
+ async_accept_ex(
+@@ -654,7 +654,7 @@ async_accept_ex(
+ template<class NextLayer, bool deflateSupported>
+ template<
+ class Body, class Allocator,
+- class AcceptHandler>
++ BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ stream<NextLayer, deflateSupported>::
+ async_accept(
+@@ -678,7 +678,7 @@ template<class NextLayer, bool deflateSupported>
+ template<
+ class Body, class Allocator,
+ class ResponseDecorator,
+- class AcceptHandler>
++ BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ stream<NextLayer, deflateSupported>::
+ async_accept_ex(
Index: boost/patches/patch-boost_beast_websocket_impl_close_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_websocket_impl_close_hpp
diff -N boost/patches/patch-boost_beast_websocket_impl_close_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_websocket_impl_close_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: boost/beast/websocket/impl/close.hpp
+--- boost/beast/websocket/impl/close.hpp.orig
++++ boost/beast/websocket/impl/close.hpp
+@@ -382,7 +382,7 @@ close(close_reason const& cr, error_code& ec)
+ }
+
+ template<class NextLayer, bool deflateSupported>
+-template<class CloseHandler>
++template<BOOST_BEAST_ASYNC_TPARAM1 CloseHandler>
+ BOOST_BEAST_ASYNC_RESULT1(CloseHandler)
+ stream<NextLayer, deflateSupported>::
+ async_close(close_reason const& cr, CloseHandler&& handler)
Index: boost/patches/patch-boost_beast_websocket_impl_handshake_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_websocket_impl_handshake_hpp
diff -N boost/patches/patch-boost_beast_websocket_impl_handshake_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_websocket_impl_handshake_hpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: boost/beast/websocket/impl/handshake.hpp
+--- boost/beast/websocket/impl/handshake.hpp.orig
++++ boost/beast/websocket/impl/handshake.hpp
+@@ -268,7 +268,7 @@ do_handshake(
+
//------------------------------------------------------------------------------
+
+ template<class NextLayer, bool deflateSupported>
+-template<class HandshakeHandler>
++template<BOOST_BEAST_ASYNC_TPARAM1 HandshakeHandler>
+ BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
+ stream<NextLayer, deflateSupported>::
+ async_handshake(
+@@ -293,7 +293,7 @@ async_handshake(
+ }
+
+ template<class NextLayer, bool deflateSupported>
+-template<class HandshakeHandler>
++template<BOOST_BEAST_ASYNC_TPARAM1 HandshakeHandler>
+ BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
+ stream<NextLayer, deflateSupported>::
+ async_handshake(
Index: boost/patches/patch-boost_beast_websocket_impl_ping_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_websocket_impl_ping_hpp
diff -N boost/patches/patch-boost_beast_websocket_impl_ping_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_websocket_impl_ping_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: boost/beast/websocket/impl/ping.hpp
+--- boost/beast/websocket/impl/ping.hpp.orig
++++ boost/beast/websocket/impl/ping.hpp
+@@ -288,7 +288,7 @@ pong(ping_data const& payload, error_code& ec)
+ }
+
+ template<class NextLayer, bool deflateSupported>
+-template<class WriteHandler>
++template<BOOST_BEAST_ASYNC_TPARAM1 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
+ stream<NextLayer, deflateSupported>::
+ async_ping(ping_data const& payload, WriteHandler&& handler)
+@@ -306,7 +306,7 @@ async_ping(ping_data const& payload, WriteHandler&& ha
+ }
+
+ template<class NextLayer, bool deflateSupported>
+-template<class WriteHandler>
++template<BOOST_BEAST_ASYNC_TPARAM1 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
+ stream<NextLayer, deflateSupported>::
+ async_pong(ping_data const& payload, WriteHandler&& handler)
Index: boost/patches/patch-boost_beast_websocket_impl_read_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_websocket_impl_read_hpp
diff -N boost/patches/patch-boost_beast_websocket_impl_read_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_websocket_impl_read_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: boost/beast/websocket/impl/read.hpp
+--- boost/beast/websocket/impl/read.hpp.orig
++++ boost/beast/websocket/impl/read.hpp
+@@ -804,7 +804,7 @@ read(DynamicBuffer& buffer, error_code& ec)
+ }
+
+ template<class NextLayer, bool deflateSupported>
+-template<class DynamicBuffer, class ReadHandler>
++template<class DynamicBuffer, BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ stream<NextLayer, deflateSupported>::
+ async_read(DynamicBuffer& buffer, ReadHandler&& handler)
+@@ -878,7 +878,7 @@ read_some(
+ }
+
+ template<class NextLayer, bool deflateSupported>
+-template<class DynamicBuffer, class ReadHandler>
++template<class DynamicBuffer, BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ stream<NextLayer, deflateSupported>::
+ async_read_some(
+@@ -1263,7 +1263,7 @@ loop:
+ }
+
+ template<class NextLayer, bool deflateSupported>
+-template<class MutableBufferSequence, class ReadHandler>
++template<class MutableBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ stream<NextLayer, deflateSupported>::
+ async_read_some(
Index: boost/patches/patch-boost_beast_websocket_impl_write_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_websocket_impl_write_hpp
diff -N boost/patches/patch-boost_beast_websocket_impl_write_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_websocket_impl_write_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: boost/beast/websocket/impl/write.hpp
+--- boost/beast/websocket/impl/write.hpp.orig
++++ boost/beast/websocket/impl/write.hpp
+@@ -700,7 +700,7 @@ write_some(bool fin,
+ }
+
+ template<class NextLayer, bool deflateSupported>
+-template<class ConstBufferSequence, class WriteHandler>
++template<class ConstBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ stream<NextLayer, deflateSupported>::
+ async_write_some(bool fin,
+@@ -756,7 +756,7 @@ write(ConstBufferSequence const& buffers, error_code&
+ }
+
+ template<class NextLayer, bool deflateSupported>
+-template<class ConstBufferSequence, class WriteHandler>
++template<class ConstBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ stream<NextLayer, deflateSupported>::
+ async_write(
Index: boost/patches/patch-boost_beast_websocket_stream_hpp
===================================================================
RCS file: boost/patches/patch-boost_beast_websocket_stream_hpp
diff -N boost/patches/patch-boost_beast_websocket_stream_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-boost_beast_websocket_stream_hpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: boost/beast/websocket/stream.hpp
+--- boost/beast/websocket/stream.hpp.orig
++++ boost/beast/websocket/stream.hpp
+@@ -2634,7 +2634,7 @@ class stream (public)
+
+ template<
+ class ResponseDecorator,
+- class AcceptHandler>
++ BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ async_accept_ex(
+ ResponseDecorator const& decorator,
+@@ -2643,7 +2643,7 @@ class stream (public)
+ template<
+ class ConstBufferSequence,
+ class ResponseDecorator,
+- class AcceptHandler>
++ BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ async_accept_ex(
+ ConstBufferSequence const& buffers,
+@@ -2656,7 +2656,7 @@ class stream (public)
+ template<
+ class Body, class Allocator,
+ class ResponseDecorator,
+- class AcceptHandler>
++ BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ async_accept_ex(
+ http::request<Body,
Index: boost/patches/patch-boost_coroutine_asymmetric_coroutine_hpp
===================================================================
RCS file: boost/patches/patch-boost_coroutine_asymmetric_coroutine_hpp
diff -N boost/patches/patch-boost_coroutine_asymmetric_coroutine_hpp
--- boost/patches/patch-boost_coroutine_asymmetric_coroutine_hpp 1 Feb
2021 12:00:51 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-boost_coroutine_asymmetric_coroutine_hpp,v 1.1 2021/02/01
12:00:51 rsadowski Exp $
-
-[PATCH] Revert "Cease dependence on Range"
-
-This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
-
-see #44 (One test fails to compile after boostorg/coroutine submodule updated)
-
-Index: boost/coroutine/asymmetric_coroutine.hpp
---- boost/coroutine/asymmetric_coroutine.hpp.orig
-+++ boost/coroutine/asymmetric_coroutine.hpp
-@@ -14,6 +14,7 @@
- #include <boost/assert.hpp>
- #include <boost/config.hpp>
- #include <boost/move/move.hpp>
-+#include <boost/range.hpp>
- #include <boost/throw_exception.hpp>
- #include <boost/utility/explicit_operator_bool.hpp>
-
-@@ -2390,19 +2391,12 @@ end( push_coroutine< R > & c)
-
- }
-
--// forward declaration of Boost.Range traits to break dependency on it
--template<typename C, typename Enabler>
--struct range_mutable_iterator;
--
--template<typename C, typename Enabler>
--struct range_const_iterator;
--
- template< typename Arg >
--struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
-+struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
- { typedef typename coroutines::push_coroutine< Arg >::iterator type; };
-
- template< typename R >
--struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
-+struct range_mutable_iterator< coroutines::pull_coroutine< R > >
- { typedef typename coroutines::pull_coroutine< R >::iterator type; };
-
- }
Index:
boost/patches/patch-boost_outcome_experimental_status-code_status_code_ptr_hpp
===================================================================
RCS file:
boost/patches/patch-boost_outcome_experimental_status-code_status_code_ptr_hpp
diff -N
boost/patches/patch-boost_outcome_experimental_status-code_status_code_ptr_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
boost/patches/patch-boost_outcome_experimental_status-code_status_code_ptr_hpp
5 Feb 2021 23:18:35 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+status_code_domain assertion removal.
+
+Index: boost/outcome/experimental/status-code/status_code_ptr.hpp
+--- boost/outcome/experimental/status-code/status_code_ptr.hpp.orig
++++ boost/outcome/experimental/status-code/status_code_ptr.hpp
+@@ -103,7 +103,7 @@ namespace detail
+ #endif
+ virtual void _do_erased_copy(status_code<void> &dst, const
status_code<void> &src, size_t /*unused*/) const override // NOLINT
+ {
+- assert(dst.domain() == *this);
++ // Note that dst will not have its domain set
+ assert(src.domain() == *this);
+ auto &d = static_cast<_mycode &>(dst); // NOLINT
+ const auto &_s = static_cast<const _mycode &>(src); // NOLINT
Index: boost/patches/patch-boost_predef_os_bsd_open_h
===================================================================
RCS file: /home/cvs/ports/devel/boost/patches/patch-boost_predef_os_bsd_open_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-boost_predef_os_bsd_open_h
--- boost/patches/patch-boost_predef_os_bsd_open_h 1 Feb 2021 12:00:51
-0000 1.1
+++ boost/patches/patch-boost_predef_os_bsd_open_h 5 Feb 2021 21:12:01
-0000
@@ -5,7 +5,7 @@ Fix redef of OS_BSD predef.
Index: boost/predef/os/bsd/open.h
--- boost/predef/os/bsd/open.h.orig
+++ boost/predef/os/bsd/open.h
-@@ -79,6 +79,7 @@ http://www.boost.org/LICENSE_1_0.txt)
+@@ -80,6 +80,7 @@ http://en.wikipedia.org/wiki/Openbsd[OpenBSD] operatin
defined(__OpenBSD__) \
)
# ifndef BOOST_OS_BSD_AVAILABLE
Index: boost/patches/patch-boost_predef_other_endian_h
===================================================================
RCS file:
/home/cvs/ports/devel/boost/patches/patch-boost_predef_other_endian_h,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-boost_predef_other_endian_h
--- boost/patches/patch-boost_predef_other_endian_h 1 Feb 2021 12:00:51
-0000 1.4
+++ boost/patches/patch-boost_predef_other_endian_h 5 Feb 2021 21:12:01
-0000
@@ -9,8 +9,8 @@ Index: boost/predef/other/endian.h
*/
#if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \
!BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD
--# if BOOST_LIB_C_GNU || BOOST_OS_ANDROID
-+# if BOOST_LIB_C_GNU || BOOST_OS_ANDROID || BOOST_OS_BSD_OPEN
+-# if BOOST_LIB_C_GNU || BOOST_PLAT_ANDROID
++# if BOOST_LIB_C_GNU || BOOST_PLAT_ANDROID || BOOST_OS_BSD_OPEN
# include <endian.h>
# else
# if BOOST_OS_MACOS
Index: boost/patches/patch-libs_beast_CHANGELOG_md
===================================================================
RCS file: boost/patches/patch-libs_beast_CHANGELOG_md
diff -N boost/patches/patch-libs_beast_CHANGELOG_md
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_CHANGELOG_md 5 Feb 2021 23:19:45 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+
+Index: libs/beast/CHANGELOG.md
+--- libs/beast/CHANGELOG.md.orig
++++ libs/beast/CHANGELOG.md
+@@ -1,3 +1,25 @@
++Version 292:
++
++* Fix compile errors on Visual Studio with /std:c++latest
++* Fix standalone compilation error with std::string_view
++* OpenSSL 1.0.2 or later is required
++* Fix c++20 deprecation warning in span_body
++
++--------------------------------------------------------------------------------
++
++Version 291:
++
++* Test websocket with use_awaitable
++* Test http write with use_awaitable
++* Test http read with use_awaitable
++* Fix use buffered_read_stream with use_awaitable
++* Implement is_completion_token_for trait
++* Test use_awaitable with basic_stream
++* Fix async_detect_ssl with use_awaitable
++* Add clang coroutines-ts to circleci config
++
++--------------------------------------------------------------------------------
++
+ Version 290:
+
+ * Travis build host now bionic
Index: boost/patches/patch-libs_beast_CMakeLists_txt
===================================================================
RCS file: boost/patches/patch-libs_beast_CMakeLists_txt
diff -N boost/patches/patch-libs_beast_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_CMakeLists_txt 5 Feb 2021 23:19:45
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libs/beast/CMakeLists.txt
+--- libs/beast/CMakeLists.txt.orig
++++ libs/beast/CMakeLists.txt
+@@ -40,7 +40,7 @@ endfunction()
+ #
+
#-------------------------------------------------------------------------------
+
+-project (Beast VERSION 290)
++project (Beast VERSION 292)
+
+ set_property (GLOBAL PROPERTY USE_FOLDERS ON)
+ option (Beast_BUILD_EXAMPLES "Build examples" ON)
Index: boost/patches/patch-libs_beast_doc_qbk_01_intro__intro_qbk
===================================================================
RCS file: boost/patches/patch-libs_beast_doc_qbk_01_intro__intro_qbk
diff -N boost/patches/patch-libs_beast_doc_qbk_01_intro__intro_qbk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_doc_qbk_01_intro__intro_qbk 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libs/beast/doc/qbk/01_intro/_intro.qbk
+--- libs/beast/doc/qbk/01_intro/_intro.qbk.orig
++++ libs/beast/doc/qbk/01_intro/_intro.qbk
+@@ -58,7 +58,7 @@ Beast requires:
+
+ * [*C++11:] Robust support for most language features.
+ * [*Boost:] Beast only works with Boost, not stand-alone Asio
+-* [*OpenSSL:] Required to build the tests, examples, and to use TLS/Secure
sockets.
++* [*OpenSSL:] Version 1.0.2 or higher. Required to build the tests, examples,
and to use TLS/Secure sockets.
+
+ Tested with these compilers: msvc-14+, gcc 4.8.4+, clang 3.6+.
+
Index: boost/patches/patch-libs_beast_test_beast_core_async_base_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_core_async_base_cpp
diff -N boost/patches/patch-libs_beast_test_beast_core_async_base_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_core_async_base_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/core/async_base.cpp
+--- libs/beast/test/beast/core/async_base.cpp.orig
++++ libs/beast/test/beast/core/async_base.cpp
+@@ -585,7 +585,7 @@ class async_base_test : public beast::unit_test::suite
+
//--------------------------------------------------------------------------
+
+ // Asynchronously read into a buffer until the buffer is full, or an
error occurs
+- template<class AsyncReadStream, class ReadHandler>
++ template<class AsyncReadStream, BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
+ typename net::async_result<ReadHandler, void(error_code,
std::size_t)>::return_type
+ async_read(AsyncReadStream& stream, net::mutable_buffer buffer,
ReadHandler&& handler)
+ {
Index: boost/patches/patch-libs_beast_test_beast_core_basic_stream_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_core_basic_stream_cpp
diff -N boost/patches/patch-libs_beast_test_beast_core_basic_stream_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_core_basic_stream_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,93 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/core/basic_stream.cpp
+--- libs/beast/test/beast/core/basic_stream.cpp.orig
++++ libs/beast/test/beast/core/basic_stream.cpp
+@@ -30,6 +30,13 @@
+ #include <array>
+ #include <thread>
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/awaitable.hpp>
++#include <boost/asio/co_spawn.hpp>
++#include <boost/asio/use_awaitable.hpp>
++#endif
++
++
+ namespace boost {
+ namespace beast {
+
+@@ -258,7 +265,7 @@ class test_server (private)
+ {
+ string_view s_;
+ net::ip::tcp::socket socket_;
+-
++
+ public:
+ session(
+ string_view s,
+@@ -1297,6 +1304,52 @@ class basic_stream_test (public)
+
+
//--------------------------------------------------------------------------
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompilation(
++ basic_stream<net::ip::tcp>& stream,
++ net::mutable_buffer outbuf,
++ net::const_buffer inbuf,
++ net::ip::tcp::resolver::results_type resolve_results)
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ stream.async_read_some(outbuf, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ stream.async_write_some(inbuf, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++
net::awaitable<net::ip::tcp::resolver::results_type::const_iterator>, decltype(
++ stream.async_connect(
++ resolve_results.begin(),
++ resolve_results.end(),
++ net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<net::ip::tcp::endpoint>, decltype(
++ stream.async_connect(
++ resolve_results,
++ net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<void>, decltype(
++ stream.async_connect(
++ resolve_results.begin()->endpoint(),
++ net::use_awaitable))>);
++
++ auto comparison_function = [](error_code&, net::ip::tcp::endpoint) {
return true; };
++
++ static_assert(std::is_same_v<
++
net::awaitable<net::ip::tcp::resolver::results_type::const_iterator>, decltype(
++ stream.async_connect(
++ resolve_results.begin(),
++ resolve_results.end(),
++ comparison_function,
++ net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run()
+ {
+@@ -1307,6 +1360,11 @@ class basic_stream_test (public)
+ testMembers();
+ testJavadocs();
+ testIssue1589();
++
++#if BOOST_ASIO_HAS_CO_AWAIT
++ // test for compilation success only
++ boost::ignore_unused(&basic_stream_test::testAwaitableCompilation);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_core_buffered_read_stream_cpp
===================================================================
RCS file:
boost/patches/patch-libs_beast_test_beast_core_buffered_read_stream_cpp
diff -N boost/patches/patch-libs_beast_test_beast_core_buffered_read_stream_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_core_buffered_read_stream_cpp
5 Feb 2021 23:19:45 -0000
@@ -0,0 +1,49 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/core/buffered_read_stream.cpp
+--- libs/beast/test/beast/core/buffered_read_stream.cpp.orig
++++ libs/beast/test/beast/core/buffered_read_stream.cpp
+@@ -21,6 +21,9 @@
+ #include <boost/asio/spawn.hpp>
+ #include <boost/asio/strand.hpp>
+ #include <boost/optional.hpp>
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
+
+ namespace boost {
+ namespace beast {
+@@ -211,6 +214,22 @@ class buffered_read_stream_test (public)
+ }
+ };
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(
++ buffered_read_stream<test::stream, flat_buffer>& stream,
++ net::mutable_buffer rxbuf,
++ net::const_buffer txbuf)
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ stream.async_read_some(rxbuf, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ stream.async_write_some(txbuf, net::use_awaitable))>);
++ }
++#endif
++
+ void run() override
+ {
+ testSpecialMembers();
+@@ -221,6 +240,10 @@ class buffered_read_stream_test (public)
+ });
+
+ testAsyncLoop();
++
++#if BOOST_ASIO_HAS_CO_AWAIT
++
boost::ignore_unused(&buffered_read_stream_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_core_detect_ssl_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_core_detect_ssl_cpp
diff -N boost/patches/patch-libs_beast_test_beast_core_detect_ssl_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_core_detect_ssl_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/core/detect_ssl.cpp
+--- libs/beast/test/beast/core/detect_ssl.cpp.orig
++++ libs/beast/test/beast/core/detect_ssl.cpp
+@@ -16,6 +16,11 @@
+ #include <boost/beast/core/flat_buffer.hpp>
+ #include <boost/beast/core/string.hpp>
+ #include <boost/core/exchange.hpp>
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/awaitable.hpp>
++#include <boost/asio/co_spawn.hpp>
++#include <boost/asio/use_awaitable.hpp>
++#endif
+ namespace boost {
+ namespace beast {
+
+@@ -166,12 +171,25 @@ class detect_ssl_test : public unit_test::suite (publi
+ }
+ }
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(test::stream& stream, flat_buffer& b)
++ {
++ static_assert(
++ std::is_same_v<
++ net::awaitable<bool>, decltype(
++ async_detect_ssl(stream, b, net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run() override
+ {
+ testDetect();
+ testRead();
+ testAsyncRead();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&detect_ssl_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_core_flat_stream_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_core_flat_stream_cpp
diff -N boost/patches/patch-libs_beast_test_beast_core_flat_stream_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_core_flat_stream_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/core/flat_stream.cpp
+--- libs/beast/test/beast/core/flat_stream.cpp.orig
++++ libs/beast/test/beast/core/flat_stream.cpp
+@@ -17,6 +17,9 @@
+ #include <boost/beast/core/role.hpp>
+ #include <initializer_list>
+ #include <vector>
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
+
+ namespace boost {
+ namespace beast {
+@@ -208,11 +211,30 @@ class flat_stream_test : public unit_test::suite (publ
+ check({1,2,3,4}, 3, 3, true);
+ }
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(
++ flat_stream<test::stream>& stream,
++ net::mutable_buffer rxbuf,
++ net::const_buffer txbuf)
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ stream.async_read_some(rxbuf, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ stream.async_write_some(txbuf, net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run() override
+ {
+ testMembers();
+ testSplit();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&flat_stream_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_core_stream_traits_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_core_stream_traits_cpp
diff -N boost/patches/patch-libs_beast_test_beast_core_stream_traits_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_core_stream_traits_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,34 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/core/stream_traits.cpp
+--- libs/beast/test/beast/core/stream_traits.cpp.orig
++++ libs/beast/test/beast/core/stream_traits.cpp
+@@ -214,14 +214,14 @@ class stream_traits_test (public)
+ struct async_read_stream
+ {
+ net::io_context::executor_type get_executor() noexcept;
+- template<class MutableBufferSequence, class ReadHandler>
++ template<class MutableBufferSequence, BOOST_BEAST_ASYNC_TPARAM2
ReadHandler>
+ void async_read_some(MutableBufferSequence const&, ReadHandler&&);
+ };
+
+ struct async_write_stream
+ {
+ net::io_context::executor_type get_executor() noexcept;
+- template<class ConstBufferSequence, class WriteHandler>
++ template<class ConstBufferSequence, BOOST_BEAST_ASYNC_TPARAM2
WriteHandler>
+ void async_write_some(ConstBufferSequence const&, WriteHandler&&);
+ };
+
+@@ -232,9 +232,9 @@ class stream_traits_test (public)
+ struct async_stream : async_read_stream, async_write_stream
+ {
+ net::io_context::executor_type get_executor() noexcept;
+- template<class MutableBufferSequence, class ReadHandler>
++ template<class MutableBufferSequence, BOOST_BEAST_ASYNC_TPARAM2
ReadHandler>
+ void async_read_some(MutableBufferSequence const&, ReadHandler&&);
+- template<class ConstBufferSequence, class WriteHandler>
++ template<class ConstBufferSequence, BOOST_BEAST_ASYNC_TPARAM2
WriteHandler>
+ void async_write_some(ConstBufferSequence const&, WriteHandler&&);
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_http_CMakeLists_txt
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_http_CMakeLists_txt
diff -N boost/patches/patch-libs_beast_test_beast_http_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_http_CMakeLists_txt 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/http/CMakeLists.txt
+--- libs/beast/test/beast/http/CMakeLists.txt.orig
++++ libs/beast/test/beast/http/CMakeLists.txt
+@@ -26,6 +26,7 @@ add_executable (tests-beast-http
+ empty_body.cpp
+ error.cpp
+ field.cpp
++ field_compiles.cpp
+ fields.cpp
+ file_body.cpp
+ message.cpp
Index: boost/patches/patch-libs_beast_test_beast_http_Jamfile
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_http_Jamfile
diff -N boost/patches/patch-libs_beast_test_beast_http_Jamfile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_http_Jamfile 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/http/Jamfile
+--- libs/beast/test/beast/http/Jamfile.orig
++++ libs/beast/test/beast/http/Jamfile
+@@ -16,6 +16,7 @@ local SOURCES =
+ dynamic_body.cpp
+ error.cpp
+ field.cpp
++ field_compiles.cpp
+ fields.cpp
+ file_body.cpp
+ message.cpp
Index: boost/patches/patch-libs_beast_test_beast_http_field_compiles_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_http_field_compiles_cpp
diff -N boost/patches/patch-libs_beast_test_beast_http_field_compiles_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_http_field_compiles_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/http/field_compiles.cpp
+--- libs/beast/test/beast/http/field_compiles.cpp.orig
++++ libs/beast/test/beast/http/field_compiles.cpp
+@@ -0,0 +1,11 @@
++//
++// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
++//
++// Distributed under the Boost Software License, Version 1.0. (See
accompanying
++// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
++//
++// Official repository: https://github.com/boostorg/beast
++//
++
++// Test that header file is self-contained.
++#include <boost/beast/http/field.hpp>
Index: boost/patches/patch-libs_beast_test_beast_http_read_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_http_read_cpp
diff -N boost/patches/patch-libs_beast_test_beast_http_read_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_http_read_cpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,75 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/http/read.cpp
+--- libs/beast/test/beast/http/read.cpp.orig
++++ libs/beast/test/beast/http/read.cpp
+@@ -25,6 +25,9 @@
+ #include <boost/asio/strand.hpp>
+ #include <boost/asio/ip/tcp.hpp>
+ #include <atomic>
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
+
+ namespace boost {
+ namespace beast {
+@@ -529,6 +532,49 @@ class read_test (public)
+ }
+ }
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(
++ test::stream& stream,
++ flat_buffer& dynbuf,
++ parser<true, string_body>& request_parser,
++ request<http::string_body>& request,
++ parser<false, string_body>& response_parser,
++ response<http::string_body>& response)
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_read(stream, dynbuf, request, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_read(stream, dynbuf, request_parser,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_read(stream, dynbuf, response, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_read(stream, dynbuf, response_parser,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_read_some(stream, dynbuf, request_parser,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_read_some(stream, dynbuf, response_parser,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_read_header(stream, dynbuf, request_parser,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_read_header(stream, dynbuf, response_parser,
net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run() override
+ {
+@@ -552,6 +598,9 @@ class read_test (public)
+ testRegression430();
+ testReadGrind();
+ testAsioHandlerInvoke();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&read_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_http_write_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_http_write_cpp
diff -N boost/patches/patch-libs_beast_test_beast_http_write_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_http_write_cpp 5 Feb 2021
23:19:45 -0000
@@ -0,0 +1,85 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/http/write.cpp
+--- libs/beast/test/beast/http/write.cpp.orig
++++ libs/beast/test/beast/http/write.cpp
+@@ -26,6 +26,9 @@
+ #include <boost/asio/strand.hpp>
+ #include <sstream>
+ #include <string>
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
+
+ namespace boost {
+ namespace beast {
+@@ -994,6 +997,59 @@ class write_test (public)
+ }
+ }
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(
++ test::stream& stream,
++ serializer<true, string_body>& request_serializer,
++ request<string_body>& req,
++ request<string_body> const& creq,
++ serializer<false, string_body>& response_serializer,
++ response<string_body>& resp,
++ response<string_body> const& cresp)
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write(stream, request_serializer,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write(stream, response_serializer,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write(stream, req, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write(stream, creq, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write(stream, resp, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write(stream, cresp, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write_some(stream, request_serializer,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write_some(stream, response_serializer,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write_header(stream, request_serializer,
net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ http::async_write_header(stream, response_serializer,
net::use_awaitable))>);
++ }
++#endif
++
++
+ void
+ run() override
+ {
+@@ -1017,6 +1073,9 @@ class write_test (public)
+ });
+ testAsioHandlerInvoke();
+ testBodyWriters();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&write_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_websocket_accept_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_websocket_accept_cpp
diff -N boost/patches/patch-libs_beast_test_beast_websocket_accept_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_websocket_accept_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,54 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/websocket/accept.cpp
+--- libs/beast/test/beast/websocket/accept.cpp.orig
++++ libs/beast/test/beast/websocket/accept.cpp
+@@ -14,7 +14,9 @@
+ #include <boost/beast/_experimental/test/tcp.hpp>
+ #include <boost/beast/_experimental/unit_test/suite.hpp>
+ #include "test.hpp"
+-
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
+ namespace boost {
+ namespace beast {
+ namespace websocket {
+@@ -810,6 +812,27 @@ class accept_test : public unit_test::suite //: public
+ }
+ }
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(
++ stream<net::ip::tcp::socket>& s,
++ http::request<http::empty_body>& req,
++ net::mutable_buffer buf
++ )
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<void>, decltype(
++ s.async_accept(net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<void>, decltype(
++ s.async_accept(req, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<void>, decltype(
++ s.async_accept(buf, net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run() override
+ {
+@@ -820,6 +843,9 @@ class accept_test : public unit_test::suite //: public
+ testInvalidInputs();
+ testEndOfStream();
+ testAsync();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&accept_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_websocket_close_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_websocket_close_cpp
diff -N boost/patches/patch-libs_beast_test_beast_websocket_close_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_websocket_close_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/websocket/close.cpp
+--- libs/beast/test/beast/websocket/close.cpp.orig
++++ libs/beast/test/beast/websocket/close.cpp
+@@ -16,6 +16,9 @@
+
+ #include <boost/asio/io_context.hpp>
+ #include <boost/asio/strand.hpp>
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
+
+ namespace boost {
+ namespace beast {
+@@ -735,6 +738,15 @@ class close_test : public websocket_test_suite (public
+ }
+ };
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(stream<test::stream>& s, close_reason cr )
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<void>, decltype(
++ s.async_close(cr, net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run() override
+ {
+@@ -742,6 +754,9 @@ class close_test : public websocket_test_suite (public
+ testTimeout();
+ testSuspend();
+ testMoveOnly();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&close_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_websocket_handshake_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_websocket_handshake_cpp
diff -N boost/patches/patch-libs_beast_test_beast_websocket_handshake_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_websocket_handshake_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,49 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/websocket/handshake.cpp
+--- libs/beast/test/beast/websocket/handshake.cpp.orig
++++ libs/beast/test/beast/websocket/handshake.cpp
+@@ -18,6 +18,9 @@
+ #include <boost/asio/io_context.hpp>
+ #include <boost/asio/strand.hpp>
+ #include <thread>
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
+
+ namespace boost {
+ namespace beast {
+@@ -704,6 +707,23 @@ class handshake_test : public websocket_test_suite (pu
+ }
+ }
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(
++ stream<test::stream>& s,
++ std::string host,
++ std::string port,
++ response_type& resp)
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<void>, decltype(
++ s.async_handshake(host, port, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<void>, decltype(
++ s.async_handshake(resp, host, port, net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run() override
+ {
+@@ -714,6 +734,9 @@ class handshake_test : public websocket_test_suite (pu
+ testMoveOnly();
+ testAsync();
+ testIssue1460();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&handshake_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_websocket_ping_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_websocket_ping_cpp
diff -N boost/patches/patch-libs_beast_test_beast_websocket_ping_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_websocket_ping_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,47 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/websocket/ping.cpp
+--- libs/beast/test/beast/websocket/ping.cpp.orig
++++ libs/beast/test/beast/websocket/ping.cpp
+@@ -18,6 +18,10 @@
+ #include <boost/asio/io_context.hpp>
+ #include <boost/asio/strand.hpp>
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
++
+ namespace boost {
+ namespace beast {
+ namespace websocket {
+@@ -483,12 +487,30 @@ class ping_test : public websocket_test_suite (public)
+ }
+ };
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(
++ stream<test::stream>& s,
++ ping_data& pdat)
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<void>, decltype(
++ s.async_ping(pdat, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<void>, decltype(
++ s.async_pong(pdat, net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run() override
+ {
+ testPing();
+ testSuspend();
+ testMoveOnly();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&ping_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_websocket_read2_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_websocket_read2_cpp
diff -N boost/patches/patch-libs_beast_test_beast_websocket_read2_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_websocket_read2_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,51 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/websocket/read2.cpp
+--- libs/beast/test/beast/websocket/read2.cpp.orig
++++ libs/beast/test/beast/websocket/read2.cpp
+@@ -14,6 +14,10 @@
+
+ #include <boost/asio/write.hpp>
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
++
+ #include <boost/config/workaround.hpp>
+ #if BOOST_WORKAROUND(BOOST_GCC, < 80200)
+ #define BOOST_BEAST_SYMBOL_HIDDEN __attribute__ ((visibility("hidden")))
+@@ -673,10 +677,34 @@ class BOOST_BEAST_SYMBOL_HIDDEN read2_test (public)
+ }
+ }
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(
++ stream<test::stream>& s,
++ flat_buffer& dynbuf,
++ net::mutable_buffer buf,
++ std::size_t limit)
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ s.async_read(dynbuf, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ s.async_read_some(buf, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ s.async_read_some(dynbuf, limit, net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run() override
+ {
+ testRead();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&read2_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_beast_test_beast_websocket_write_cpp
===================================================================
RCS file: boost/patches/patch-libs_beast_test_beast_websocket_write_cpp
diff -N boost/patches/patch-libs_beast_test_beast_websocket_write_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ boost/patches/patch-libs_beast_test_beast_websocket_write_cpp 5 Feb
2021 23:19:45 -0000
@@ -0,0 +1,49 @@
+$OpenBSD$
+
+Index: libs/beast/test/beast/websocket/write.cpp
+--- libs/beast/test/beast/websocket/write.cpp.orig
++++ libs/beast/test/beast/websocket/write.cpp
+@@ -13,6 +13,10 @@
+ #include <boost/asio/io_context.hpp>
+ #include <boost/asio/strand.hpp>
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++#include <boost/asio/use_awaitable.hpp>
++#endif
++
+ #include "test.hpp"
+
+ namespace boost {
+@@ -716,6 +720,22 @@ class write_test : public websocket_test_suite (public
+ BEAST_EXPECT(n1 < n0 + s.size());
+ }
+
++#if BOOST_ASIO_HAS_CO_AWAIT
++ void testAwaitableCompiles(
++ stream<test::stream>& s,
++ net::mutable_buffer buf,
++ bool fin)
++ {
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ s.async_write(buf, net::use_awaitable))>);
++
++ static_assert(std::is_same_v<
++ net::awaitable<std::size_t>, decltype(
++ s.async_write_some(fin, buf, net::use_awaitable))>);
++ }
++#endif
++
+ void
+ run() override
+ {
+@@ -726,6 +746,9 @@ class write_test : public websocket_test_suite (public
+ testMoveOnly();
+ testIssue300();
+ testIssue1666();
++#if BOOST_ASIO_HAS_CO_AWAIT
++ boost::ignore_unused(&write_test::testAwaitableCompiles);
++#endif
+ }
+ };
+
Index: boost/patches/patch-libs_context_src_asm_jump_mips64_n64_elf_gas_S
===================================================================
RCS file: boost/patches/patch-libs_context_src_asm_jump_mips64_n64_elf_gas_S
diff -N boost/patches/patch-libs_context_src_asm_jump_mips64_n64_elf_gas_S
--- boost/patches/patch-libs_context_src_asm_jump_mips64_n64_elf_gas_S 5 Nov
2020 11:23:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-libs_context_src_asm_jump_mips64_n64_elf_gas_S,v 1.1
2020/11/05 11:23:03 sthen Exp $
-
-The right align for mips64/n64 is 3 instead of 2.
-
-Index: libs/context/src/asm/jump_mips64_n64_elf_gas.S
---- libs/context/src/asm/jump_mips64_n64_elf_gas.S.orig
-+++ libs/context/src/asm/jump_mips64_n64_elf_gas.S
-@@ -48,7 +48,7 @@
- .file "jump_mips64_n64_elf_gas.S"
- .text
- .globl jump_fcontext
--.align 2
-+.align 3
- .type jump_fcontext,@function
- .ent jump_fcontext
- jump_fcontext:
Index: boost/patches/patch-libs_context_src_asm_make_mips64_n64_elf_gas_S
===================================================================
RCS file: boost/patches/patch-libs_context_src_asm_make_mips64_n64_elf_gas_S
diff -N boost/patches/patch-libs_context_src_asm_make_mips64_n64_elf_gas_S
--- boost/patches/patch-libs_context_src_asm_make_mips64_n64_elf_gas_S 5 Nov
2020 11:23:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-libs_context_src_asm_make_mips64_n64_elf_gas_S,v 1.1
2020/11/05 11:23:03 sthen Exp $
-
-The right align for mips64/n64 is 3 instead of 2.
-
-Index: libs/context/src/asm/make_mips64_n64_elf_gas.S
---- libs/context/src/asm/make_mips64_n64_elf_gas.S.orig
-+++ libs/context/src/asm/make_mips64_n64_elf_gas.S
-@@ -48,7 +48,7 @@
- .file "make_mips64_n64_elf_gas.S"
- .text
- .globl make_fcontext
--.align 2
-+.align 3
- .type make_fcontext,@function
- .ent make_fcontext
- make_fcontext:
Index: boost/patches/patch-libs_context_src_asm_ontop_mips64_n64_elf_gas_S
===================================================================
RCS file: boost/patches/patch-libs_context_src_asm_ontop_mips64_n64_elf_gas_S
diff -N boost/patches/patch-libs_context_src_asm_ontop_mips64_n64_elf_gas_S
--- boost/patches/patch-libs_context_src_asm_ontop_mips64_n64_elf_gas_S 5 Nov
2020 11:23:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-libs_context_src_asm_ontop_mips64_n64_elf_gas_S,v 1.1
2020/11/05 11:23:03 sthen Exp $
-
-The right align for mips64/n64 is 3 instead of 2.
-
-Index: libs/context/src/asm/ontop_mips64_n64_elf_gas.S
---- libs/context/src/asm/ontop_mips64_n64_elf_gas.S.orig
-+++ libs/context/src/asm/ontop_mips64_n64_elf_gas.S
-@@ -48,7 +48,7 @@
- .file "ontop_mips64_n64_elf_gas.S"
- .text
- .globl ontop_fcontext
--.align 2
-+.align 3
- .type ontop_fcontext,@function
- .ent ontop_fcontext
- ontop_fcontext:
Index: boost/patches/patch-tools_build_src_engine_build_sh
===================================================================
RCS file:
/home/cvs/ports/devel/boost/patches/patch-tools_build_src_engine_build_sh,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-tools_build_src_engine_build_sh
--- boost/patches/patch-tools_build_src_engine_build_sh 1 Feb 2021 12:00:51
-0000 1.1
+++ boost/patches/patch-tools_build_src_engine_build_sh 5 Feb 2021 21:12:01
-0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-tools_build_src_engine_b
Index: tools/build/src/engine/build.sh
--- tools/build/src/engine/build.sh.orig
+++ tools/build/src/engine/build.sh
-@@ -184,7 +184,7 @@ case $B2_TOOLSET in
+@@ -233,7 +233,7 @@ case $B2_TOOLSET in
*)
B2_CXX="${CXX} -x c++ -std=c++11"
@@ -12,12 +12,9 @@ Index: tools/build/src/engine/build.sh
B2_CXXFLAGS_DEBUG="-O0 -g"
esac
;;
-@@ -321,9 +321,9 @@ case $B2_TOOLSET in
- clang*)
- CXX=${CXX:=clang++}
+@@ -372,7 +372,7 @@ case $B2_TOOLSET in
CXX_VERSION_OPT=${CXX_VERSION_OPT:=--version}
-- B2_CXX="${CXX} -x c++ -O3 -std=c++11"
-+ B2_CXX="${CXX} -x c++ -std=c++11"
+ B2_CXX="${CXX} -x c++ -std=c++11"
B2_TOOLSET=clang
- B2_CXXFLAGS_RELEASE="-O3 -s"
+ B2_CXXFLAGS_RELEASE=""
Index: boost/patches/patch-tools_build_src_tools_gcc_jam
===================================================================
RCS file:
/home/cvs/ports/devel/boost/patches/patch-tools_build_src_tools_gcc_jam,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-tools_build_src_tools_gcc_jam
--- boost/patches/patch-tools_build_src_tools_gcc_jam 1 Feb 2021 12:00:51
-0000 1.10
+++ boost/patches/patch-tools_build_src_tools_gcc_jam 5 Feb 2021 21:12:01
-0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-tools_build_src_tools_gc
Index: tools/build/src/tools/gcc.jam
--- tools/build/src/tools/gcc.jam.orig
+++ tools/build/src/tools/gcc.jam
-@@ -705,7 +705,7 @@ actions compile.c.pch
+@@ -708,7 +708,7 @@ actions compile.c.pch
# Declare flags and action for compilation.
toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
@@ -12,7 +12,7 @@ Index: tools/build/src/tools/gcc.jam
toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
-@@ -1259,7 +1259,7 @@ cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
+@@ -1274,7 +1274,7 @@ cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
##
cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
# Sparc
Index: boost/pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/devel/boost/pkg/PLIST-main,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST-main
--- boost/pkg/PLIST-main 1 Feb 2021 12:00:51 -0000 1.12
+++ boost/pkg/PLIST-main 5 Feb 2021 22:17:49 -0000
@@ -217,6 +217,7 @@ include/boost/align/detail/align_up.hpp
include/boost/align/detail/aligned_alloc.hpp
include/boost/align/detail/aligned_alloc_android.hpp
include/boost/align/detail/aligned_alloc_macos.hpp
+include/boost/align/detail/aligned_alloc_mingw.hpp
include/boost/align/detail/aligned_alloc_msvc.hpp
include/boost/align/detail/aligned_alloc_posix.hpp
include/boost/align/detail/aligned_alloc_sunos.hpp
@@ -804,10 +805,12 @@ include/boost/asio/ssl/detail/stream_cor
include/boost/asio/ssl/detail/verify_callback.hpp
include/boost/asio/ssl/detail/write_op.hpp
include/boost/asio/ssl/error.hpp
+include/boost/asio/ssl/host_name_verification.hpp
include/boost/asio/ssl/impl/
include/boost/asio/ssl/impl/context.hpp
include/boost/asio/ssl/impl/context.ipp
include/boost/asio/ssl/impl/error.ipp
+include/boost/asio/ssl/impl/host_name_verification.ipp
include/boost/asio/ssl/impl/rfc2818_verification.ipp
include/boost/asio/ssl/impl/src.hpp
include/boost/asio/ssl/rfc2818_verification.hpp
@@ -852,7 +855,9 @@ include/boost/asio/windows/stream_handle
include/boost/asio/write.hpp
include/boost/asio/write_at.hpp
include/boost/asio/yield.hpp
+include/boost/assert/
include/boost/assert.hpp
+include/boost/assert/source_location.hpp
include/boost/assign/
include/boost/assign.hpp
include/boost/assign/assignment_exception.hpp
@@ -875,10 +880,12 @@ include/boost/atomic/
include/boost/atomic.hpp
include/boost/atomic/atomic.hpp
include/boost/atomic/atomic_flag.hpp
+include/boost/atomic/atomic_ref.hpp
include/boost/atomic/capabilities.hpp
include/boost/atomic/detail/
include/boost/atomic/detail/addressof.hpp
include/boost/atomic/detail/atomic_flag.hpp
+include/boost/atomic/detail/atomic_ref_template.hpp
include/boost/atomic/detail/atomic_template.hpp
include/boost/atomic/detail/bitwise_cast.hpp
include/boost/atomic/detail/bitwise_fp_cast.hpp
@@ -893,6 +900,7 @@ include/boost/atomic/detail/caps_linux_a
include/boost/atomic/detail/caps_msvc_arm.hpp
include/boost/atomic/detail/caps_msvc_x86.hpp
include/boost/atomic/detail/caps_windows.hpp
+include/boost/atomic/detail/classify.hpp
include/boost/atomic/detail/config.hpp
include/boost/atomic/detail/extra_fp_operations.hpp
include/boost/atomic/detail/extra_fp_operations_fwd.hpp
@@ -916,10 +924,12 @@ include/boost/atomic/detail/hwcaps_gcc_a
include/boost/atomic/detail/hwcaps_gcc_ppc.hpp
include/boost/atomic/detail/hwcaps_gcc_x86.hpp
include/boost/atomic/detail/int_sizes.hpp
-include/boost/atomic/detail/integral_extend.hpp
+include/boost/atomic/detail/integral_conversions.hpp
include/boost/atomic/detail/interlocked.hpp
+include/boost/atomic/detail/intptr.hpp
include/boost/atomic/detail/link.hpp
-include/boost/atomic/detail/lockpool.hpp
+include/boost/atomic/detail/lock_pool.hpp
+include/boost/atomic/detail/memory_order_utils.hpp
include/boost/atomic/detail/operations.hpp
include/boost/atomic/detail/operations_fwd.hpp
include/boost/atomic/detail/operations_lockfree.hpp
@@ -943,9 +953,10 @@ include/boost/atomic/detail/ops_msvc_x86
include/boost/atomic/detail/ops_windows.hpp
include/boost/atomic/detail/pause.hpp
include/boost/atomic/detail/platform.hpp
-include/boost/atomic/detail/storage_type.hpp
+include/boost/atomic/detail/storage_traits.hpp
include/boost/atomic/detail/string_ops.hpp
include/boost/atomic/detail/type_traits/
+include/boost/atomic/detail/type_traits/alignment_of.hpp
include/boost/atomic/detail/type_traits/conditional.hpp
include/boost/atomic/detail/type_traits/integral_constant.hpp
include/boost/atomic/detail/type_traits/is_floating_point.hpp
@@ -953,6 +964,7 @@ include/boost/atomic/detail/type_traits/
include/boost/atomic/detail/type_traits/is_iec559.hpp
include/boost/atomic/detail/type_traits/is_integral.hpp
include/boost/atomic/detail/type_traits/is_signed.hpp
+include/boost/atomic/detail/type_traits/is_trivially_copyable.hpp
include/boost/atomic/detail/type_traits/is_trivially_default_constructible.hpp
include/boost/atomic/detail/type_traits/make_signed.hpp
include/boost/atomic/detail/type_traits/make_unsigned.hpp
@@ -1047,6 +1059,7 @@ include/boost/beast/core/detail/tuple.hp
include/boost/beast/core/detail/type_traits.hpp
include/boost/beast/core/detail/variant.hpp
include/boost/beast/core/detail/varint.hpp
+include/boost/beast/core/detail/win32_unicode_path.hpp
include/boost/beast/core/detect_ssl.hpp
include/boost/beast/core/error.hpp
include/boost/beast/core/file.hpp
@@ -2325,6 +2338,7 @@ include/boost/date_time/date_parsing.hpp
include/boost/date_time/dst_rules.hpp
include/boost/date_time/dst_transition_generators.hpp
include/boost/date_time/filetime_functions.hpp
+include/boost/date_time/find_match.hpp
include/boost/date_time/format_date_parser.hpp
include/boost/date_time/gregorian/
include/boost/date_time/gregorian/conversion.hpp
@@ -2418,7 +2432,6 @@ include/boost/detail/call_traits.hpp
include/boost/detail/catch_exceptions.hpp
include/boost/detail/compressed_pair.hpp
include/boost/detail/container_fwd.hpp
-include/boost/detail/endian.hpp
include/boost/detail/fenv.hpp
include/boost/detail/has_default_constructor.hpp
include/boost/detail/identifier.hpp
@@ -2532,7 +2545,6 @@ include/boost/dll/detail/type_info.hpp
include/boost/dll/detail/windows/
include/boost/dll/detail/windows/path_from_handle.hpp
include/boost/dll/detail/windows/shared_library_impl.hpp
-include/boost/dll/detail/x_info_interface.hpp
include/boost/dll/import.hpp
include/boost/dll/import_class.hpp
include/boost/dll/import_mangled.hpp
@@ -4112,11 +4124,11 @@ include/boost/geometry/algorithms/detail
include/boost/geometry/algorithms/detail/expand_by_epsilon.hpp
include/boost/geometry/algorithms/detail/extreme_points.hpp
include/boost/geometry/algorithms/detail/for_each_range.hpp
-include/boost/geometry/algorithms/detail/get_left_turns.hpp
include/boost/geometry/algorithms/detail/get_max_size.hpp
include/boost/geometry/algorithms/detail/has_self_intersections.hpp
include/boost/geometry/algorithms/detail/interior_iterator.hpp
include/boost/geometry/algorithms/detail/intersection/
+include/boost/geometry/algorithms/detail/intersection/areal_areal.hpp
include/boost/geometry/algorithms/detail/intersection/box_box.hpp
include/boost/geometry/algorithms/detail/intersection/implementation.hpp
include/boost/geometry/algorithms/detail/intersection/interface.hpp
@@ -4161,7 +4173,6 @@ include/boost/geometry/algorithms/detail
include/boost/geometry/algorithms/detail/normalize.hpp
include/boost/geometry/algorithms/detail/not.hpp
include/boost/geometry/algorithms/detail/num_distinct_consecutive_points.hpp
-include/boost/geometry/algorithms/detail/occupation_info.hpp
include/boost/geometry/algorithms/detail/overlaps/
include/boost/geometry/algorithms/detail/overlaps/implementation.hpp
include/boost/geometry/algorithms/detail/overlaps/interface.hpp
@@ -4204,6 +4215,7 @@ include/boost/geometry/algorithms/detail
include/boost/geometry/algorithms/detail/overlay/needs_self_turns.hpp
include/boost/geometry/algorithms/detail/overlay/overlay.hpp
include/boost/geometry/algorithms/detail/overlay/overlay_type.hpp
+include/boost/geometry/algorithms/detail/overlay/pointlike_areal.hpp
include/boost/geometry/algorithms/detail/overlay/pointlike_linear.hpp
include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
include/boost/geometry/algorithms/detail/overlay/range_in_geometry.hpp
@@ -4258,6 +4270,7 @@ include/boost/geometry/algorithms/detail
include/boost/geometry/algorithms/detail/touches/
include/boost/geometry/algorithms/detail/touches/implementation.hpp
include/boost/geometry/algorithms/detail/touches/interface.hpp
+include/boost/geometry/algorithms/detail/tupled_output.hpp
include/boost/geometry/algorithms/detail/turns/
include/boost/geometry/algorithms/detail/turns/compare_turns.hpp
include/boost/geometry/algorithms/detail/turns/debug_turn.hpp
@@ -4422,6 +4435,7 @@ include/boost/geometry/geometries/multi_
include/boost/geometry/geometries/multi_polygon.hpp
include/boost/geometry/geometries/point.hpp
include/boost/geometry/geometries/point_xy.hpp
+include/boost/geometry/geometries/point_xyz.hpp
include/boost/geometry/geometries/pointing_segment.hpp
include/boost/geometry/geometries/polygon.hpp
include/boost/geometry/geometries/register/
@@ -4523,7 +4537,6 @@ include/boost/geometry/index/detail/rtre
include/boost/geometry/index/detail/serialization.hpp
include/boost/geometry/index/detail/tags.hpp
include/boost/geometry/index/detail/translator.hpp
-include/boost/geometry/index/detail/tuples.hpp
include/boost/geometry/index/detail/utilities.hpp
include/boost/geometry/index/detail/varray.hpp
include/boost/geometry/index/detail/varray_detail.hpp
@@ -5038,6 +5051,7 @@ include/boost/geometry/util/select_most_
include/boost/geometry/util/select_sequence_element.hpp
include/boost/geometry/util/series_expansion.hpp
include/boost/geometry/util/transform_variant.hpp
+include/boost/geometry/util/tuples.hpp
include/boost/geometry/views/
include/boost/geometry/views/box_view.hpp
include/boost/geometry/views/closeable_view.hpp
@@ -5104,7 +5118,6 @@ include/boost/gil/extension/dynamic_imag
include/boost/gil/extension/dynamic_image/dynamic_at_c.hpp
include/boost/gil/extension/dynamic_image/dynamic_image_all.hpp
include/boost/gil/extension/dynamic_image/image_view_factory.hpp
-include/boost/gil/extension/dynamic_image/reduce.hpp
include/boost/gil/extension/io/
include/boost/gil/extension/io/bmp/
include/boost/gil/extension/io/bmp.hpp
@@ -6037,6 +6050,7 @@ include/boost/histogram/
include/boost/histogram.hpp
include/boost/histogram/accumulators/
include/boost/histogram/accumulators.hpp
+include/boost/histogram/accumulators/count.hpp
include/boost/histogram/accumulators/mean.hpp
include/boost/histogram/accumulators/ostream.hpp
include/boost/histogram/accumulators/sum.hpp
@@ -6085,6 +6099,8 @@ include/boost/histogram/detail/mutex_bas
include/boost/histogram/detail/non_member_container_access.hpp
include/boost/histogram/detail/operators.hpp
include/boost/histogram/detail/optional_index.hpp
+include/boost/histogram/detail/priority.hpp
+include/boost/histogram/detail/reduce_command.hpp
include/boost/histogram/detail/relaxed_equal.hpp
include/boost/histogram/detail/replace_type.hpp
include/boost/histogram/detail/safe_comparison.hpp
@@ -6605,8 +6621,13 @@ include/boost/intrusive/unordered_set_ho
include/boost/intrusive_ptr.hpp
include/boost/io/
include/boost/io/detail/
+include/boost/io/detail/buffer_fill.hpp
+include/boost/io/detail/ostream_guard.hpp
include/boost/io/detail/quoted_manip.hpp
include/boost/io/ios_state.hpp
+include/boost/io/ostream_joiner.hpp
+include/boost/io/ostream_put.hpp
+include/boost/io/quoted.hpp
include/boost/io_fwd.hpp
include/boost/iostreams/
include/boost/iostreams/categories.hpp
@@ -7306,6 +7327,8 @@ include/boost/math/distributions/student
include/boost/math/distributions/triangular.hpp
include/boost/math/distributions/uniform.hpp
include/boost/math/distributions/weibull.hpp
+include/boost/math/filters/
+include/boost/math/filters/daubechies.hpp
include/boost/math/interpolators/
include/boost/math/interpolators/barycentric_rational.hpp
include/boost/math/interpolators/cardinal_cubic_b_spline.hpp
@@ -7314,6 +7337,7 @@ include/boost/math/interpolators/cardina
include/boost/math/interpolators/cardinal_trigonometric.hpp
include/boost/math/interpolators/catmull_rom.hpp
include/boost/math/interpolators/cubic_b_spline.hpp
+include/boost/math/interpolators/cubic_hermite.hpp
include/boost/math/interpolators/detail/
include/boost/math/interpolators/detail/barycentric_rational_detail.hpp
include/boost/math/interpolators/detail/cardinal_cubic_b_spline_detail.hpp
@@ -7321,8 +7345,15 @@ include/boost/math/interpolators/detail/
include/boost/math/interpolators/detail/cardinal_quintic_b_spline_detail.hpp
include/boost/math/interpolators/detail/cardinal_trigonometric_detail.hpp
include/boost/math/interpolators/detail/cubic_b_spline_detail.hpp
+include/boost/math/interpolators/detail/cubic_hermite_detail.hpp
+include/boost/math/interpolators/detail/quintic_hermite_detail.hpp
+include/boost/math/interpolators/detail/septic_hermite_detail.hpp
include/boost/math/interpolators/detail/vector_barycentric_rational_detail.hpp
include/boost/math/interpolators/detail/whittaker_shannon_detail.hpp
+include/boost/math/interpolators/makima.hpp
+include/boost/math/interpolators/pchip.hpp
+include/boost/math/interpolators/quintic_hermite.hpp
+include/boost/math/interpolators/septic_hermite.hpp
include/boost/math/interpolators/vector_barycentric_rational.hpp
include/boost/math/interpolators/whittaker_shannon.hpp
include/boost/math/octonion.hpp
@@ -7344,6 +7375,7 @@ include/boost/math/quadrature/ooura_four
include/boost/math/quadrature/sinh_sinh.hpp
include/boost/math/quadrature/tanh_sinh.hpp
include/boost/math/quadrature/trapezoidal.hpp
+include/boost/math/quadrature/wavelet_transforms.hpp
include/boost/math/quaternion.hpp
include/boost/math/special_functions/
include/boost/math/special_functions.hpp
@@ -7362,6 +7394,8 @@ include/boost/math/special_functions/cbr
include/boost/math/special_functions/chebyshev.hpp
include/boost/math/special_functions/chebyshev_transform.hpp
include/boost/math/special_functions/cos_pi.hpp
+include/boost/math/special_functions/daubechies_scaling.hpp
+include/boost/math/special_functions/daubechies_wavelet.hpp
include/boost/math/special_functions/detail/
include/boost/math/special_functions/detail/airy_ai_bi_zero.hpp
include/boost/math/special_functions/detail/bernoulli_details.hpp
@@ -7384,6 +7418,7 @@ include/boost/math/special_functions/det
include/boost/math/special_functions/detail/bessel_y0.hpp
include/boost/math/special_functions/detail/bessel_y1.hpp
include/boost/math/special_functions/detail/bessel_yn.hpp
+include/boost/math/special_functions/detail/daubechies_scaling_integer_grid.hpp
include/boost/math/special_functions/detail/erf_inv.hpp
include/boost/math/special_functions/detail/fp_traits.hpp
include/boost/math/special_functions/detail/gamma_inva.hpp
@@ -7477,6 +7512,7 @@ include/boost/math/special_functions/zet
include/boost/math/statistics/
include/boost/math/statistics/anderson_darling.hpp
include/boost/math/statistics/bivariate_statistics.hpp
+include/boost/math/statistics/linear_regression.hpp
include/boost/math/statistics/ljung_box.hpp
include/boost/math/statistics/runs_test.hpp
include/boost/math/statistics/signal_statistics.hpp
@@ -7490,6 +7526,7 @@ include/boost/math/tools/complex.hpp
include/boost/math/tools/condition_numbers.hpp
include/boost/math/tools/config.hpp
include/boost/math/tools/convert_from_string.hpp
+include/boost/math/tools/cxx03_warn.hpp
include/boost/math/tools/detail/
include/boost/math/tools/detail/is_const_iterable.hpp
include/boost/math/tools/detail/polynomial_horner1_10.hpp
@@ -9386,6 +9423,7 @@ include/boost/multiprecision/cpp_int/ser
include/boost/multiprecision/cpp_int/value_pack.hpp
include/boost/multiprecision/debug_adaptor.hpp
include/boost/multiprecision/detail/
+include/boost/multiprecision/detail/atomic.hpp
include/boost/multiprecision/detail/big_lanczos.hpp
include/boost/multiprecision/detail/bitscan.hpp
include/boost/multiprecision/detail/constexpr.hpp
@@ -9400,6 +9438,7 @@ include/boost/multiprecision/detail/func
include/boost/multiprecision/detail/functions/trig.hpp
include/boost/multiprecision/detail/generic_interconvert.hpp
include/boost/multiprecision/detail/integer_ops.hpp
+include/boost/multiprecision/detail/itos.hpp
include/boost/multiprecision/detail/min_max.hpp
include/boost/multiprecision/detail/no_et_ops.hpp
include/boost/multiprecision/detail/number_base.hpp
@@ -9434,6 +9473,23 @@ include/boost/noncopyable.hpp
include/boost/nondet_random.hpp
include/boost/none.hpp
include/boost/none_t.hpp
+include/boost/nowide/
+include/boost/nowide/args.hpp
+include/boost/nowide/config.hpp
+include/boost/nowide/convert.hpp
+include/boost/nowide/cstdio.hpp
+include/boost/nowide/cstdlib.hpp
+include/boost/nowide/detail/
+include/boost/nowide/detail/convert.hpp
+include/boost/nowide/detail/utf.hpp
+include/boost/nowide/filebuf.hpp
+include/boost/nowide/filesystem.hpp
+include/boost/nowide/fstream.hpp
+include/boost/nowide/iostream.hpp
+include/boost/nowide/replacement.hpp
+include/boost/nowide/stackstring.hpp
+include/boost/nowide/utf8_codecvt.hpp
+include/boost/nowide/windows.hpp
include/boost/numeric/
include/boost/numeric/conversion/
include/boost/numeric/conversion/bounds.hpp
@@ -9854,9 +9910,11 @@ include/boost/outcome/experimental/statu
include/boost/outcome/experimental/status-code/error.hpp
include/boost/outcome/experimental/status-code/errored_status_code.hpp
include/boost/outcome/experimental/status-code/generic_code.hpp
+include/boost/outcome/experimental/status-code/getaddrinfo_code.hpp
include/boost/outcome/experimental/status-code/iostream_support.hpp
include/boost/outcome/experimental/status-code/nt_code.hpp
include/boost/outcome/experimental/status-code/posix_code.hpp
+include/boost/outcome/experimental/status-code/result.hpp
include/boost/outcome/experimental/status-code/status_code.hpp
include/boost/outcome/experimental/status-code/status_code_domain.hpp
include/boost/outcome/experimental/status-code/status_code_ptr.hpp
@@ -10082,10 +10140,8 @@ include/boost/phoenix/core/detail/cpp03/
include/boost/phoenix/core/detail/cpp03/actor_result_of.hpp
include/boost/phoenix/core/detail/cpp03/call.hpp
include/boost/phoenix/core/detail/cpp03/expression.hpp
-include/boost/phoenix/core/detail/cpp03/function_equal.hpp
include/boost/phoenix/core/detail/cpp03/function_eval.hpp
include/boost/phoenix/core/detail/cpp03/function_eval_expr.hpp
-include/boost/phoenix/core/detail/cpp03/phx2_result.hpp
include/boost/phoenix/core/detail/cpp03/preprocessed/
include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator.hpp
include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_10.hpp
@@ -10122,12 +10178,6 @@ include/boost/phoenix/core/detail/cpp03/
include/boost/phoenix/core/detail/cpp03/preprocessed/expression_30.hpp
include/boost/phoenix/core/detail/cpp03/preprocessed/expression_40.hpp
include/boost/phoenix/core/detail/cpp03/preprocessed/expression_50.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_10.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_20.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_30.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_40.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_50.hpp
include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval.hpp
include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_10.hpp
include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_20.hpp
@@ -10140,16 +10190,9 @@ include/boost/phoenix/core/detail/cpp03/
include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_30.hpp
include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_40.hpp
include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_expr_50.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_10.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_20.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_30.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_40.hpp
-include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_50.hpp
include/boost/phoenix/core/detail/expression.hpp
include/boost/phoenix/core/detail/function_eval.hpp
include/boost/phoenix/core/detail/index_sequence.hpp
-include/boost/phoenix/core/detail/phx2_result.hpp
include/boost/phoenix/core/domain.hpp
include/boost/phoenix/core/environment.hpp
include/boost/phoenix/core/expression.hpp
@@ -10165,7 +10208,7 @@ include/boost/phoenix/core/terminal.hpp
include/boost/phoenix/core/terminal_fwd.hpp
include/boost/phoenix/core/v2_eval.hpp
include/boost/phoenix/core/value.hpp
-include/boost/phoenix/core/visit_each.hpp
+include/boost/phoenix/debug.hpp
include/boost/phoenix/function/
include/boost/phoenix/function.hpp
include/boost/phoenix/function/adapt_callable.hpp
@@ -10547,6 +10590,7 @@ include/boost/predef/architecture/parisc
include/boost/predef/architecture/ppc.h
include/boost/predef/architecture/ptx.h
include/boost/predef/architecture/pyramid.h
+include/boost/predef/architecture/riscv.h
include/boost/predef/architecture/rs6k.h
include/boost/predef/architecture/sparc.h
include/boost/predef/architecture/superh.h
@@ -10593,7 +10637,6 @@ include/boost/predef/detail/
include/boost/predef/detail/_cassert.h
include/boost/predef/detail/_exception.h
include/boost/predef/detail/comp_detected.h
-include/boost/predef/detail/endian_compat.h
include/boost/predef/detail/os_detected.h
include/boost/predef/detail/platform_detected.h
include/boost/predef/detail/test.h
@@ -10648,7 +10691,6 @@ include/boost/predef/os/
include/boost/predef/os.h
include/boost/predef/os/aix.h
include/boost/predef/os/amigaos.h
-include/boost/predef/os/android.h
include/boost/predef/os/beos.h
include/boost/predef/os/bsd/
include/boost/predef/os/bsd.h
@@ -12273,8 +12315,8 @@ include/boost/smart_ptr/detail/atomic_co
include/boost/smart_ptr/detail/lightweight_mutex.hpp
include/boost/smart_ptr/detail/local_counted_base.hpp
include/boost/smart_ptr/detail/local_sp_deleter.hpp
-include/boost/smart_ptr/detail/lwm_nop.hpp
include/boost/smart_ptr/detail/lwm_pthreads.hpp
+include/boost/smart_ptr/detail/lwm_std_mutex.hpp
include/boost/smart_ptr/detail/lwm_win32_cs.hpp
include/boost/smart_ptr/detail/operator_bool.hpp
include/boost/smart_ptr/detail/quick_allocator.hpp
@@ -12952,12 +12994,7 @@ include/boost/spirit/home/support/char_e
include/boost/spirit/home/support/char_encoding/standard_wide.hpp
include/boost/spirit/home/support/char_encoding/unicode/
include/boost/spirit/home/support/char_encoding/unicode.hpp
-include/boost/spirit/home/support/char_encoding/unicode/DerivedCoreProperties.txt
-include/boost/spirit/home/support/char_encoding/unicode/PropList.txt
-include/boost/spirit/home/support/char_encoding/unicode/Scripts.txt
-include/boost/spirit/home/support/char_encoding/unicode/UnicodeData.txt
include/boost/spirit/home/support/char_encoding/unicode/category_table.hpp
-include/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp
include/boost/spirit/home/support/char_encoding/unicode/lowercase_table.hpp
include/boost/spirit/home/support/char_encoding/unicode/query.hpp
include/boost/spirit/home/support/char_encoding/unicode/script_table.hpp
@@ -12973,10 +13010,7 @@ include/boost/spirit/home/support/contai
include/boost/spirit/home/support/context.hpp
include/boost/spirit/home/support/detail/
include/boost/spirit/home/support/detail/as_variant.hpp
-include/boost/spirit/home/support/detail/endian/
include/boost/spirit/home/support/detail/endian.hpp
-include/boost/spirit/home/support/detail/endian/cover_operators.hpp
-include/boost/spirit/home/support/detail/endian/endian.hpp
include/boost/spirit/home/support/detail/get_encoding.hpp
include/boost/spirit/home/support/detail/hold_any.hpp
include/boost/spirit/home/support/detail/is_spirit_tag.hpp
@@ -13650,6 +13684,10 @@ include/boost/statechart/state_machine.h
include/boost/statechart/termination.hpp
include/boost/statechart/transition.hpp
include/boost/static_assert.hpp
+include/boost/static_string/
+include/boost/static_string.hpp
+include/boost/static_string/config.hpp
+include/boost/static_string/static_string.hpp
include/boost/swap.hpp
include/boost/system/
include/boost/system/api_config.hpp
@@ -13760,7 +13798,6 @@ include/boost/test/tools/context.hpp
include/boost/test/tools/cstring_comparison_op.hpp
include/boost/test/tools/detail/
include/boost/test/tools/detail/bitwise_manip.hpp
-include/boost/test/tools/detail/expression_holder.hpp
include/boost/test/tools/detail/fwd.hpp
include/boost/test/tools/detail/indirections.hpp
include/boost/test/tools/detail/it_pair.hpp
@@ -14025,47 +14062,72 @@ include/boost/token_iterator.hpp
include/boost/tokenizer.hpp
include/boost/tti/
include/boost/tti/detail/
+include/boost/tti/detail/dclass.hpp
include/boost/tti/detail/dcomp_mem_fun.hpp
+include/boost/tti/detail/dcomp_mem_fun_template.hpp
include/boost/tti/detail/ddata.hpp
include/boost/tti/detail/ddeftype.hpp
+include/boost/tti/detail/denclosing_type.hpp
+include/boost/tti/detail/denum.hpp
include/boost/tti/detail/dftclass.hpp
include/boost/tti/detail/dfunction.hpp
+include/boost/tti/detail/dfunction_template.hpp
include/boost/tti/detail/dlambda.hpp
+include/boost/tti/detail/dmacro_fun_template.hpp
+include/boost/tti/detail/dmacro_fve.hpp
+include/boost/tti/detail/dmacro_sunfix.hpp
include/boost/tti/detail/dmem_data.hpp
include/boost/tti/detail/dmem_fun.hpp
+include/boost/tti/detail/dmem_fun_template.hpp
include/boost/tti/detail/dmem_type.hpp
include/boost/tti/detail/dmetafunc.hpp
include/boost/tti/detail/dnotype.hpp
include/boost/tti/detail/dnullptr.hpp
include/boost/tti/detail/dplaceholder.hpp
include/boost/tti/detail/dptmf.hpp
+include/boost/tti/detail/dstatic_function_tags.hpp
+include/boost/tti/detail/dstatic_function_type.hpp
include/boost/tti/detail/dstatic_mem_data.hpp
include/boost/tti/detail/dstatic_mem_fun.hpp
+include/boost/tti/detail/dstatic_mem_fun_template.hpp
include/boost/tti/detail/dtclass.hpp
include/boost/tti/detail/dtemplate.hpp
include/boost/tti/detail/dtemplate_params.hpp
include/boost/tti/detail/dtfunction.hpp
include/boost/tti/detail/dtype.hpp
+include/boost/tti/detail/dunion.hpp
include/boost/tti/detail/dvm_template_params.hpp
include/boost/tti/gen/
+include/boost/tti/gen/has_class_gen.hpp
include/boost/tti/gen/has_data_gen.hpp
+include/boost/tti/gen/has_enum_gen.hpp
include/boost/tti/gen/has_function_gen.hpp
+include/boost/tti/gen/has_function_template_gen.hpp
include/boost/tti/gen/has_member_data_gen.hpp
include/boost/tti/gen/has_member_function_gen.hpp
+include/boost/tti/gen/has_member_function_template_gen.hpp
include/boost/tti/gen/has_static_member_data_gen.hpp
include/boost/tti/gen/has_static_member_function_gen.hpp
+include/boost/tti/gen/has_static_member_function_template_gen.hpp
include/boost/tti/gen/has_template_gen.hpp
include/boost/tti/gen/has_type_gen.hpp
+include/boost/tti/gen/has_union_gen.hpp
include/boost/tti/gen/member_type_gen.hpp
include/boost/tti/gen/namespace_gen.hpp
+include/boost/tti/has_class.hpp
include/boost/tti/has_data.hpp
+include/boost/tti/has_enum.hpp
include/boost/tti/has_function.hpp
+include/boost/tti/has_function_template.hpp
include/boost/tti/has_member_data.hpp
include/boost/tti/has_member_function.hpp
+include/boost/tti/has_member_function_template.hpp
include/boost/tti/has_static_member_data.hpp
include/boost/tti/has_static_member_function.hpp
+include/boost/tti/has_static_member_function_template.hpp
include/boost/tti/has_template.hpp
include/boost/tti/has_type.hpp
+include/boost/tti/has_union.hpp
include/boost/tti/member_type.hpp
include/boost/tti/tti.hpp
include/boost/tuple/
@@ -14773,7 +14835,6 @@ include/boost/utility/enable_if.hpp
include/boost/utility/explicit_operator_bool.hpp
include/boost/utility/identity_type.hpp
include/boost/utility/in_place_factory.hpp
-include/boost/utility/ostream_string.hpp
include/boost/utility/result_of.hpp
include/boost/utility/string_ref.hpp
include/boost/utility/string_ref_fwd.hpp
@@ -15354,6 +15415,10 @@ include/boost/yap/yap.hpp
@lib lib/libboost_math_tr1l-mt.so.${LIBboost_math_tr1l-mt_VERSION}
@static-lib lib/libboost_math_tr1l.a
@lib lib/libboost_math_tr1l.so.${LIBboost_math_tr1l_VERSION}
+@static-lib lib/libboost_nowide-mt.a
+@lib lib/libboost_nowide-mt.so.${LIBboost_nowide-mt_VERSION}
+@static-lib lib/libboost_nowide.a
+@lib lib/libboost_nowide.so.${LIBboost_nowide_VERSION}
@static-lib lib/libboost_numpy38-mt.a
@lib lib/libboost_numpy38-mt.so.${LIBboost_numpy38-mt_VERSION}
@static-lib lib/libboost_numpy38.a
Index: leatherman/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/leatherman/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- leatherman/Makefile 18 Jan 2021 22:40:04 -0000 1.42
+++ leatherman/Makefile 6 Feb 2021 01:04:11 -0000
@@ -5,6 +5,7 @@ COMMENT = collection of C++ and CMake u
GH_ACCOUNT = puppetlabs
GH_PROJECT = leatherman
GH_TAGNAME = 1.12.4
+REVISION = 0
# N.B.: Upstream doesn't care about ABI, better just bump major on update
SHARED_LIBS = leatherman_curl 1.1 # 0.12
@@ -34,9 +35,9 @@ MODPY_ADJ_FILES = scripts/cpplint.py
WANTLIB = ${COMPILER_LIBCXX} m
WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
WANTLIB += boost_filesystem-mt boost_locale-mt boost_log-mt boost_log_setup-mt
-WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt curl
+WANTLIB += boost_nowide-mt boost_regex-mt boost_system-mt boost_thread-mt curl
-LIB_DEPENDS = devel/boost \
+LIB_DEPENDS = devel/boost>=1.73.0 \
net/curl
BUILD_DEPENDS = devel/gettext,-tools
Index: leatherman/patches/patch-execution_CMakeLists_txt
===================================================================
RCS file: leatherman/patches/patch-execution_CMakeLists_txt
diff -N leatherman/patches/patch-execution_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ leatherman/patches/patch-execution_CMakeLists_txt 6 Feb 2021 00:43:56
-0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Use nowide from Boost. From Fedora.
+
+Index: execution/CMakeLists.txt
+--- execution/CMakeLists.txt.orig
++++ execution/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
+@@ -10,7 +10,6 @@ endif()
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+ leatherman_dependency(util)
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(file_util)
Index: leatherman/patches/patch-file_util_CMakeLists_txt
===================================================================
RCS file: leatherman/patches/patch-file_util_CMakeLists_txt
diff -N leatherman/patches/patch-file_util_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ leatherman/patches/patch-file_util_CMakeLists_txt 6 Feb 2021 00:44:47
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Use nowide from Boost. From Fedora.
+
+Index: file_util/CMakeLists.txt
+--- file_util/CMakeLists.txt.orig
++++ file_util/CMakeLists.txt
+@@ -1,9 +1,8 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(util)
Index: leatherman/patches/patch-file_util_src_file_cc
===================================================================
RCS file: leatherman/patches/patch-file_util_src_file_cc
diff -N leatherman/patches/patch-file_util_src_file_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ leatherman/patches/patch-file_util_src_file_cc 6 Feb 2021 00:44:56
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Use nowide from Boost. From Fedora.
+
+Index: file_util/src/file.cc
+--- file_util/src/file.cc.orig
++++ file_util/src/file.cc
+@@ -1,6 +1,6 @@
+ #include <leatherman/file_util/file.hpp>
+ #include <boost/nowide/fstream.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/filesystem.hpp>
+ #include <sstream>
+ #include <leatherman/logging/logging.hpp>
Index: leatherman/patches/patch-logging_CMakeLists_txt
===================================================================
RCS file: leatherman/patches/patch-logging_CMakeLists_txt
diff -N leatherman/patches/patch-logging_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ leatherman/patches/patch-logging_CMakeLists_txt 6 Feb 2021 00:45:05
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Use nowide from Boost. From Fedora.
+
+Index: logging/CMakeLists.txt
+--- logging/CMakeLists.txt.orig
++++ logging/CMakeLists.txt
+@@ -4,7 +4,6 @@ find_package(Threads)
+ add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
Index: leatherman/patches/patch-nowide_CMakeLists_txt
===================================================================
RCS file: leatherman/patches/patch-nowide_CMakeLists_txt
diff -N leatherman/patches/patch-nowide_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ leatherman/patches/patch-nowide_CMakeLists_txt 6 Feb 2021 00:45:13
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Use nowide from Boost. From Fedora.
+
+Index: nowide/CMakeLists.txt
+--- nowide/CMakeLists.txt.orig
++++ nowide/CMakeLists.txt
+@@ -1,7 +1,5 @@
+ find_package(Boost 1.54 REQUIRED)
+
+-add_leatherman_includes(${Boost_INCLUDE_DIRS}
"${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include")
+-add_leatherman_headers(../vendor/nowide/include/boost)
+ if(WIN32)
+ add_leatherman_library(../vendor/nowide/src/iostream.cpp)
+ endif()
Index: leatherman/patches/patch-tests_CMakeLists_txt
===================================================================
RCS file: leatherman/patches/patch-tests_CMakeLists_txt
diff -N leatherman/patches/patch-tests_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ leatherman/patches/patch-tests_CMakeLists_txt 6 Feb 2021 00:45:20
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Use nowide from Boost. From Fedora.
+
+Index: tests/CMakeLists.txt
+--- tests/CMakeLists.txt.orig
++++ tests/CMakeLists.txt
+@@ -1,8 +1,8 @@
+-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread
filesystem regex)
++set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread
filesystem regex nowide)
+ if (LEATHERMAN_USE_LOCALES)
+ set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale)
+ endif()
+-find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
++find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
+
+ include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE}
${LEATHERMAN_INCLUDE_DIRS})
+ add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS})
Index: leatherman/patches/patch-util_CMakeLists_txt
===================================================================
RCS file: leatherman/patches/patch-util_CMakeLists_txt
diff -N leatherman/patches/patch-util_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ leatherman/patches/patch-util_CMakeLists_txt 6 Feb 2021 00:45:33
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Use nowide from Boost. From Fedora.
+
+Index: util/CMakeLists.txt
+--- util/CMakeLists.txt.orig
++++ util/CMakeLists.txt
+@@ -1,9 +1,7 @@
+-find_package(Boost 1.54 REQUIRED date_time chrono system)
++find_package(Boost 1.73 REQUIRED date_time chrono system nowide)
+
+ add_leatherman_deps(${Boost_LIBRARIES})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+-
+-leatherman_dependency(nowide)
+
+ if(WIN32)
+ set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc"
"src/windows/scoped_handle.cc")
Index: leatherman/patches/patch-util_src_environment_cc
===================================================================
RCS file: leatherman/patches/patch-util_src_environment_cc
diff -N leatherman/patches/patch-util_src_environment_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ leatherman/patches/patch-util_src_environment_cc 6 Feb 2021 00:45:42
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Use nowide from Boost. From Fedora.
+
+Index: util/src/environment.cc
+--- util/src/environment.cc.orig
++++ util/src/environment.cc
+@@ -1,5 +1,5 @@
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <stdexcept>
+
+ using namespace std;
Index: leatherman/patches/patch-util_tests_environment_cc
===================================================================
RCS file: leatherman/patches/patch-util_tests_environment_cc
diff -N leatherman/patches/patch-util_tests_environment_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ leatherman/patches/patch-util_tests_environment_cc 6 Feb 2021 00:45:50
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Use nowide from Boost. From Fedora.
+
+Index: util/tests/environment.cc
+--- util/tests/environment.cc.orig
++++ util/tests/environment.cc
+@@ -1,6 +1,6 @@
+ #include <catch.hpp>
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+
+ using namespace std;
+ using namespace leatherman::util;
Index: leatherman/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/leatherman/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- leatherman/pkg/PLIST 8 Sep 2017 09:53:49 -0000 1.6
+++ leatherman/pkg/PLIST 6 Feb 2021 00:49:14 -0000
@@ -1,20 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2017/09/08 09:53:49 sebastia Exp $
-include/boost/nowide/
-include/boost/nowide/args.hpp
-include/boost/nowide/cenv.hpp
-include/boost/nowide/config.hpp
-include/boost/nowide/convert.hpp
-include/boost/nowide/cstdio.hpp
-include/boost/nowide/cstdlib.hpp
-include/boost/nowide/filebuf.hpp
-include/boost/nowide/fstream.hpp
-include/boost/nowide/integration/
-include/boost/nowide/integration/filesystem.hpp
-include/boost/nowide/iostream.hpp
-include/boost/nowide/stackstring.hpp
-include/boost/nowide/system.hpp
-include/boost/nowide/utf8_codecvt.hpp
-include/boost/nowide/windows.hpp
include/leatherman/
include/leatherman/curl/
include/leatherman/curl/client.hpp
