From 24e8be5fcfddd0da98b58a63cd918849787fb06f Mon Sep 17 00:00:00 2001
From: yurybura <yurybura@gmail.com>
Date: Wed, 13 May 2020 20:26:05 +0300
Subject: [PATCH] [boost] update to 1.73.0 (#11221)

* [boost] update to 1.73

* [ompl] remove dependency to boost-disjoint-sets

* [libtorrent] include fixes from RC_1_2 branch

* [liblas] fix boost headers

* [freeopcua] fix std headers

* [pcl] fix build with Boost 1.73.0

* [hpx] fix build with Boost 1.73.0

* [libmysql] fix conflict with C++20 header <version>

* [boost-modular-build-helper] move port-specific b2 options to the file `<port_dir>/b2-options.cmake`
[boost-python] support Python2 (fixes #3495)

* [boost-python] remove Python executable from user-config

* [libtorrent] update version after merge

* [libtorrent] add boost-variant dependency
---
 ports/boost-accumulators/CONTROL              |    2 +-
 ports/boost-accumulators/portfile.cmake       |    6 +-
 ports/boost-algorithm/CONTROL                 |    2 +-
 ports/boost-algorithm/portfile.cmake          |    6 +-
 ports/boost-align/CONTROL                     |    2 +-
 ports/boost-align/portfile.cmake              |    6 +-
 ports/boost-any/CONTROL                       |    2 +-
 ports/boost-any/portfile.cmake                |    6 +-
 ports/boost-array/CONTROL                     |    2 +-
 ports/boost-array/portfile.cmake              |    6 +-
 ports/boost-asio/CONTROL                      |    2 +-
 ports/boost-asio/portfile.cmake               |    6 +-
 ports/boost-assert/CONTROL                    |    2 +-
 ports/boost-assert/portfile.cmake             |    6 +-
 ports/boost-assign/CONTROL                    |    2 +-
 ports/boost-assign/portfile.cmake             |    6 +-
 ports/boost-atomic/CONTROL                    |    4 +-
 ports/boost-atomic/portfile.cmake             |    6 +-
 ports/boost-beast/0002-beast-coroutines.patch | 1466 +++++++++++++++++
 ports/boost-beast/CONTROL                     |    2 +-
 ports/boost-beast/portfile.cmake              |    7 +-
 ports/boost-bimap/CONTROL                     |    2 +-
 ports/boost-bimap/portfile.cmake              |    6 +-
 ports/boost-bind/CONTROL                      |    2 +-
 ports/boost-bind/portfile.cmake               |    6 +-
 ports/boost-build/CONTROL                     |    2 +-
 ports/boost-build/portfile.cmake              |    6 +-
 ports/boost-callable-traits/CONTROL           |    2 +-
 ports/boost-callable-traits/portfile.cmake    |    6 +-
 ports/boost-chrono/CONTROL                    |    2 +-
 ports/boost-chrono/portfile.cmake             |    6 +-
 ports/boost-circular-buffer/CONTROL           |    2 +-
 ports/boost-circular-buffer/portfile.cmake    |    6 +-
 ports/boost-compatibility/CONTROL             |    2 +-
 ports/boost-compatibility/portfile.cmake      |    6 +-
 ports/boost-compute/CONTROL                   |    2 +-
 ports/boost-compute/portfile.cmake            |    6 +-
 ports/boost-concept-check/CONTROL             |    2 +-
 ports/boost-concept-check/portfile.cmake      |    6 +-
 ports/boost-config/CONTROL                    |    2 +-
 ports/boost-config/portfile.cmake             |    6 +-
 ports/boost-container-hash/CONTROL            |    2 +-
 ports/boost-container-hash/portfile.cmake     |    6 +-
 ports/boost-container/CONTROL                 |    2 +-
 ports/boost-container/portfile.cmake          |    6 +-
 ports/boost-context/CONTROL                   |    2 +-
 ports/boost-context/portfile.cmake            |    6 +-
 ports/boost-contract/CONTROL                  |    2 +-
 ports/boost-contract/portfile.cmake           |    6 +-
 ports/boost-conversion/CONTROL                |    4 +-
 ports/boost-conversion/portfile.cmake         |    6 +-
 ports/boost-convert/CONTROL                   |    2 +-
 ports/boost-convert/portfile.cmake            |    6 +-
 ports/boost-core/CONTROL                      |    2 +-
 ports/boost-core/portfile.cmake               |    6 +-
 ...001-revert-cease-dependence-on-range.patch |   49 -
 ports/boost-coroutine/CONTROL                 |    4 +-
 ports/boost-coroutine/portfile.cmake          |    6 +-
 ports/boost-coroutine2/CONTROL                |    2 +-
 ports/boost-coroutine2/portfile.cmake         |    6 +-
 ports/boost-crc/CONTROL                       |    2 +-
 ports/boost-crc/portfile.cmake                |    6 +-
 ports/boost-date-time/CONTROL                 |    2 +-
 ports/boost-date-time/portfile.cmake          |    6 +-
 ports/boost-detail/CONTROL                    |    2 +-
 ports/boost-detail/portfile.cmake             |    6 +-
 ports/boost-disjoint-sets/CONTROL             |    6 -
 ports/boost-dll/CONTROL                       |    4 +-
 ports/boost-dll/portfile.cmake                |    6 +-
 ports/boost-dynamic-bitset/CONTROL            |    4 +-
 ports/boost-dynamic-bitset/portfile.cmake     |    6 +-
 ports/boost-endian/CONTROL                    |    4 +-
 ports/boost-endian/portfile.cmake             |    6 +-
 ports/boost-exception/CONTROL                 |    2 +-
 ports/boost-exception/portfile.cmake          |    6 +-
 ports/boost-fiber/CONTROL                     |    2 +-
 ports/boost-fiber/portfile.cmake              |    6 +-
 ports/boost-filesystem/CONTROL                |    2 +-
 ports/boost-filesystem/portfile.cmake         |    6 +-
 ports/boost-flyweight/CONTROL                 |    2 +-
 ports/boost-flyweight/portfile.cmake          |    6 +-
 ports/boost-foreach/CONTROL                   |    2 +-
 ports/boost-foreach/portfile.cmake            |    6 +-
 ports/boost-format/CONTROL                    |    2 +-
 ports/boost-format/portfile.cmake             |    6 +-
 ports/boost-function-types/CONTROL            |    2 +-
 ports/boost-function-types/portfile.cmake     |    6 +-
 ports/boost-function/CONTROL                  |    2 +-
 ports/boost-function/portfile.cmake           |    6 +-
 ports/boost-functional/CONTROL                |    2 +-
 ports/boost-functional/portfile.cmake         |    6 +-
 ports/boost-fusion/CONTROL                    |    2 +-
 ports/boost-fusion/portfile.cmake             |    6 +-
 ports/boost-geometry/CONTROL                  |    2 +-
 ports/boost-geometry/portfile.cmake           |    6 +-
 ports/boost-gil/CONTROL                       |    4 +-
 ports/boost-gil/portfile.cmake                |    6 +-
 ports/boost-graph-parallel/CONTROL            |    2 +-
 ports/boost-graph-parallel/portfile.cmake     |    6 +-
 ports/boost-graph/CONTROL                     |    2 +-
 ports/boost-graph/portfile.cmake              |    6 +-
 ports/boost-hana/CONTROL                      |    2 +-
 ports/boost-hana/portfile.cmake               |    6 +-
 ports/boost-heap/CONTROL                      |    2 +-
 ports/boost-heap/portfile.cmake               |    6 +-
 ports/boost-histogram/CONTROL                 |    2 +-
 ports/boost-histogram/portfile.cmake          |    6 +-
 ports/boost-hof/CONTROL                       |    2 +-
 ports/boost-hof/portfile.cmake                |    6 +-
 ports/boost-icl/CONTROL                       |    2 +-
 ports/boost-icl/portfile.cmake                |    6 +-
 ports/boost-integer/CONTROL                   |    2 +-
 ports/boost-integer/portfile.cmake            |    6 +-
 ports/boost-interprocess/CONTROL              |    2 +-
 ports/boost-interprocess/portfile.cmake       |    6 +-
 ports/boost-interval/CONTROL                  |    2 +-
 ports/boost-interval/portfile.cmake           |    6 +-
 ports/boost-intrusive/CONTROL                 |    2 +-
 ports/boost-intrusive/portfile.cmake          |    6 +-
 ports/boost-io/CONTROL                        |    4 +-
 ports/boost-io/portfile.cmake                 |    6 +-
 ports/boost-iostreams/CONTROL                 |    2 +-
 ports/boost-iostreams/portfile.cmake          |    6 +-
 ports/boost-iterator/CONTROL                  |    2 +-
 ports/boost-iterator/portfile.cmake           |    6 +-
 ports/boost-lambda/CONTROL                    |    2 +-
 ports/boost-lambda/portfile.cmake             |    6 +-
 ports/boost-lexical-cast/CONTROL              |    2 +-
 ports/boost-lexical-cast/portfile.cmake       |    6 +-
 ports/boost-local-function/CONTROL            |    2 +-
 ports/boost-local-function/portfile.cmake     |    6 +-
 ports/boost-locale/CONTROL                    |    4 +-
 ports/boost-locale/b2-options.cmake           |   25 +
 ports/boost-locale/cmake-fragment.cmake       |   10 -
 ports/boost-locale/portfile.cmake             |   19 +-
 ports/boost-lockfree/CONTROL                  |    2 +-
 ports/boost-lockfree/portfile.cmake           |    6 +-
 ports/boost-log/CONTROL                       |    2 +-
 ports/boost-log/portfile.cmake                |    6 +-
 ports/boost-logic/CONTROL                     |    2 +-
 ports/boost-logic/portfile.cmake              |    6 +-
 ports/boost-math/CONTROL                      |    4 +-
 ports/boost-math/portfile.cmake               |    6 +-
 ports/boost-metaparse/CONTROL                 |    2 +-
 ports/boost-metaparse/portfile.cmake          |    6 +-
 .../boost-modular-build-helper/CMakeLists.txt |    1 +
 ports/boost-modular-build-helper/CONTROL      |    2 +-
 ports/boost-modular-build-helper/Jamroot.jam  |    6 +-
 .../boost-modular-build.cmake                 |   97 +-
 .../user-config.jam                           |    6 +-
 ports/boost-move/CONTROL                      |    2 +-
 ports/boost-move/portfile.cmake               |    6 +-
 ports/boost-mp11/CONTROL                      |    2 +-
 ports/boost-mp11/portfile.cmake               |    6 +-
 ports/boost-mpi/CONTROL                       |    2 +-
 ports/boost-mpi/portfile.cmake                |    6 +-
 ports/boost-mpl/CONTROL                       |    2 +-
 ports/boost-mpl/portfile.cmake                |    6 +-
 ports/boost-msm/CONTROL                       |    2 +-
 ports/boost-msm/portfile.cmake                |    6 +-
 ports/boost-multi-array/CONTROL               |    2 +-
 ports/boost-multi-array/portfile.cmake        |    6 +-
 ports/boost-multi-index/CONTROL               |    2 +-
 ports/boost-multi-index/portfile.cmake        |    6 +-
 ports/boost-multiprecision/CONTROL            |    4 +-
 ports/boost-multiprecision/portfile.cmake     |    6 +-
 ports/boost-nowide/CONTROL                    |    6 +
 ports/boost-nowide/portfile.cmake             |   14 +
 ports/boost-numeric-conversion/CONTROL        |    2 +-
 ports/boost-numeric-conversion/portfile.cmake |    6 +-
 ports/boost-odeint/CONTROL                    |    2 +-
 ports/boost-odeint/portfile.cmake             |    6 +-
 ports/boost-optional/CONTROL                  |    2 +-
 ports/boost-optional/portfile.cmake           |    6 +-
 ports/boost-outcome/0001-outcome-assert.patch |   11 +
 ports/boost-outcome/CONTROL                   |    2 +-
 ports/boost-outcome/portfile.cmake            |    7 +-
 ports/boost-parameter-python/CONTROL          |    2 +-
 ports/boost-parameter-python/portfile.cmake   |    6 +-
 ports/boost-parameter/CONTROL                 |    2 +-
 ports/boost-parameter/portfile.cmake          |    6 +-
 ports/boost-phoenix/CONTROL                   |    2 +-
 ports/boost-phoenix/portfile.cmake            |    6 +-
 ports/boost-poly-collection/CONTROL           |    2 +-
 ports/boost-poly-collection/portfile.cmake    |    6 +-
 ports/boost-polygon/CONTROL                   |    2 +-
 ports/boost-polygon/portfile.cmake            |    6 +-
 ports/boost-pool/CONTROL                      |    2 +-
 ports/boost-pool/portfile.cmake               |    6 +-
 ports/boost-predef/CONTROL                    |    2 +-
 ports/boost-predef/portfile.cmake             |    6 +-
 ports/boost-preprocessor/CONTROL              |    2 +-
 ports/boost-preprocessor/portfile.cmake       |    6 +-
 ports/boost-process/CONTROL                   |    2 +-
 ports/boost-process/async_pipe_header.patch   |   37 -
 ports/boost-process/portfile.cmake            |    7 +-
 ports/boost-program-options/CONTROL           |    2 +-
 ports/boost-program-options/portfile.cmake    |    6 +-
 ports/boost-property-map/CONTROL              |    2 +-
 ports/boost-property-map/portfile.cmake       |    6 +-
 ports/boost-property-tree/CONTROL             |    2 +-
 ports/boost-property-tree/portfile.cmake      |    6 +-
 ports/boost-proto/CONTROL                     |    2 +-
 ports/boost-proto/portfile.cmake              |    6 +-
 ports/boost-ptr-container/CONTROL             |    2 +-
 ports/boost-ptr-container/portfile.cmake      |    6 +-
 ports/boost-python/CONTROL                    |    6 +-
 ports/boost-python/b2-options.cmake           |   23 +
 ports/boost-python/portfile.cmake             |   19 +-
 ports/boost-qvm/CONTROL                       |    2 +-
 ports/boost-qvm/portfile.cmake                |    6 +-
 ports/boost-random/CONTROL                    |    2 +-
 ports/boost-random/portfile.cmake             |    6 +-
 ports/boost-range/CONTROL                     |    4 +-
 ports/boost-range/portfile.cmake              |    6 +-
 ports/boost-ratio/CONTROL                     |    2 +-
 ports/boost-ratio/portfile.cmake              |    6 +-
 ports/boost-rational/CONTROL                  |    2 +-
 ports/boost-rational/portfile.cmake           |    6 +-
 ports/boost-regex/CONTROL                     |    4 +-
 ports/boost-regex/b2-options.cmake            |    3 +
 ports/boost-regex/portfile.cmake              |   17 +-
 ports/boost-safe-numerics/CONTROL             |    2 +-
 ports/boost-safe-numerics/portfile.cmake      |    6 +-
 ports/boost-scope-exit/CONTROL                |    2 +-
 ports/boost-scope-exit/portfile.cmake         |    6 +-
 ports/boost-serialization/CONTROL             |    2 +-
 ports/boost-serialization/portfile.cmake      |    6 +-
 ports/boost-signals2/CONTROL                  |    2 +-
 ports/boost-signals2/portfile.cmake           |    6 +-
 ports/boost-smart-ptr/CONTROL                 |    4 +-
 ports/boost-smart-ptr/portfile.cmake          |    6 +-
 ports/boost-sort/CONTROL                      |    2 +-
 ports/boost-sort/portfile.cmake               |    6 +-
 ports/boost-spirit/CONTROL                    |    4 +-
 ports/boost-spirit/portfile.cmake             |    6 +-
 ports/boost-stacktrace/CONTROL                |    2 +-
 ports/boost-stacktrace/portfile.cmake         |    6 +-
 ports/boost-statechart/CONTROL                |    2 +-
 ports/boost-statechart/portfile.cmake         |    6 +-
 ports/boost-static-assert/CONTROL             |    2 +-
 ports/boost-static-assert/portfile.cmake      |    6 +-
 ports/boost-static-string/CONTROL             |    6 +
 .../portfile.cmake                            |    8 +-
 ports/boost-system/CONTROL                    |    2 +-
 ports/boost-system/portfile.cmake             |    6 +-
 ports/boost-test/CONTROL                      |    2 +-
 ports/boost-test/portfile.cmake               |    6 +-
 ports/boost-thread/CONTROL                    |    4 +-
 ports/boost-thread/b2-options.cmake           |    1 +
 ports/boost-thread/portfile.cmake             |   10 +-
 ports/boost-throw-exception/CONTROL           |    4 +-
 ports/boost-throw-exception/portfile.cmake    |    6 +-
 ports/boost-timer/CONTROL                     |    2 +-
 ports/boost-timer/portfile.cmake              |    6 +-
 ports/boost-tokenizer/CONTROL                 |    2 +-
 ports/boost-tokenizer/portfile.cmake          |    6 +-
 ports/boost-tti/CONTROL                       |    2 +-
 ports/boost-tti/portfile.cmake                |    6 +-
 ports/boost-tuple/CONTROL                     |    2 +-
 ports/boost-tuple/portfile.cmake              |    6 +-
 ports/boost-type-erasure/CONTROL              |    2 +-
 ports/boost-type-erasure/portfile.cmake       |    6 +-
 ports/boost-type-index/CONTROL                |    2 +-
 ports/boost-type-index/portfile.cmake         |    6 +-
 ports/boost-type-traits/CONTROL               |    2 +-
 ports/boost-type-traits/portfile.cmake        |    6 +-
 ports/boost-typeof/CONTROL                    |    2 +-
 ports/boost-typeof/portfile.cmake             |    6 +-
 ports/boost-ublas/CONTROL                     |    2 +-
 ports/boost-ublas/portfile.cmake              |    6 +-
 ports/boost-units/CONTROL                     |    2 +-
 ports/boost-units/portfile.cmake              |    6 +-
 ports/boost-unordered/CONTROL                 |    2 +-
 ports/boost-unordered/portfile.cmake          |    6 +-
 ports/boost-utility/CONTROL                   |    4 +-
 ports/boost-utility/portfile.cmake            |    6 +-
 ports/boost-uuid/CONTROL                      |    4 +-
 ports/boost-uuid/portfile.cmake               |    6 +-
 ports/boost-variant/CONTROL                   |    2 +-
 ports/boost-variant/portfile.cmake            |    6 +-
 ports/boost-variant2/CONTROL                  |    4 +-
 ports/boost-variant2/portfile.cmake           |    6 +-
 .../boost-modular-headers.cmake               |    2 +-
 ports/boost-vmd/CONTROL                       |    2 +-
 ports/boost-vmd/portfile.cmake                |    6 +-
 ports/boost-wave/CONTROL                      |    2 +-
 ports/boost-wave/portfile.cmake               |    6 +-
 ports/boost-winapi/CONTROL                    |    2 +-
 ports/boost-winapi/portfile.cmake             |    6 +-
 ports/boost-xpressive/CONTROL                 |    2 +-
 ports/boost-xpressive/portfile.cmake          |    6 +-
 ports/boost-yap/CONTROL                       |    2 +-
 ports/boost-yap/portfile.cmake                |    6 +-
 ports/boost/CONTROL                           |    4 +-
 ports/freeopcua/CONTROL                       |    2 +-
 ports/freeopcua/fix-std-headers.patch         |   24 +
 ports/freeopcua/portfile.cmake                |    3 +-
 ports/hpx/CONTROL                             |    2 +-
 ports/hpx/boost-1.73.patch                    |   13 +
 ports/hpx/portfile.cmake                      |    2 +
 ports/liblas/CONTROL                          |    2 +-
 ports/liblas/fix-boost-headers.patch          |   55 +
 ports/liblas/portfile.cmake                   |   27 +-
 ports/libmysql/CONTROL                        |    2 +-
 ports/libmysql/portfile.cmake                 |    1 +
 ports/libmysql/rename-version.patch           |   26 +
 ports/libtorrent/CONTROL                      |    4 +-
 ports/libtorrent/portfile.cmake               |    6 +-
 ports/ompl/CONTROL                            |    2 +-
 ports/pcl/boost-1.73.patch                    |   50 +
 ports/pcl/portfile.cmake                      |    1 +
 scripts/boost/generate-ports.ps1              |  102 +-
 scripts/boost/post-source-stubs/python.cmake  |    8 -
 314 files changed, 2304 insertions(+), 995 deletions(-)
 create mode 100644 ports/boost-beast/0002-beast-coroutines.patch
 delete mode 100644 ports/boost-coroutine/0001-revert-cease-dependence-on-range.patch
 delete mode 100644 ports/boost-disjoint-sets/CONTROL
 create mode 100644 ports/boost-locale/b2-options.cmake
 delete mode 100644 ports/boost-locale/cmake-fragment.cmake
 create mode 100644 ports/boost-nowide/CONTROL
 create mode 100644 ports/boost-nowide/portfile.cmake
 create mode 100644 ports/boost-outcome/0001-outcome-assert.patch
 delete mode 100644 ports/boost-process/async_pipe_header.patch
 create mode 100644 ports/boost-python/b2-options.cmake
 create mode 100644 ports/boost-regex/b2-options.cmake
 create mode 100644 ports/boost-static-string/CONTROL
 rename ports/{boost-disjoint-sets => boost-static-string}/portfile.cmake (53%)
 create mode 100644 ports/freeopcua/fix-std-headers.patch
 create mode 100644 ports/hpx/boost-1.73.patch
 create mode 100644 ports/liblas/fix-boost-headers.patch
 create mode 100644 ports/libmysql/rename-version.patch
 create mode 100644 ports/pcl/boost-1.73.patch
 delete mode 100644 scripts/boost/post-source-stubs/python.cmake

diff --git a/ports/boost-accumulators/CONTROL b/ports/boost-accumulators/CONTROL
index 4ef0132e51..7b101e55bc 100644
--- a/ports/boost-accumulators/CONTROL
+++ b/ports/boost-accumulators/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-accumulators
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-interval, boost-iterator, boost-mpl, boost-numeric-conversion, boost-odeint, boost-parameter, boost-preprocessor, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-ublas, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/accumulators
 Description: Boost accumulators module
diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake
index fb5c417527..2094b72bf2 100644
--- a/ports/boost-accumulators/portfile.cmake
+++ b/ports/boost-accumulators/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/accumulators
-    REF boost-1.72.0
-    SHA512 3e232de2d32bffc5483edf201dd2cfbc8c6584c0be877c8234c2bd21eee118eaf9b96050b26bc8237ba552a2dca3f313ace8264d45ef7e9035732ce1ee74384d
+    REF boost-1.73.0
+    SHA512 f13e85e464509987a58f955bdf4a167460fe1dbd87bf189c121a0bd7176cf37889a28b812a837770b0aff5f1e80ed0be45c7c8fd3a86672427cbb52e236e7071
     HEAD_REF master
 )
 
diff --git a/ports/boost-algorithm/CONTROL b/ports/boost-algorithm/CONTROL
index 701b405da8..09a190692a 100644
--- a/ports/boost-algorithm/CONTROL
+++ b/ports/boost-algorithm/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-algorithm
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/algorithm
 Description: Boost algorithm module
diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake
index 9c2c241fc8..dd3fc82584 100644
--- a/ports/boost-algorithm/portfile.cmake
+++ b/ports/boost-algorithm/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/algorithm
-    REF boost-1.72.0
-    SHA512 503fb782faad0e68e58841b098162a32f08a5f125ceb1af46272096daf223056fbf5b3e1011773ad8ef1dc9dfd301feef82ce6ce870fe4741ee838ca5f5bc6f7
+    REF boost-1.73.0
+    SHA512 b8437e9a800ada66babc81fadce67ccffa9dd426e0ffe7c4b54fed73dd0bf19d00ae2c2911837b8b79225f0ed4e43c9810f3ba5a33b9afb2fbbb7dcb70a96efe
     HEAD_REF master
 )
 
diff --git a/ports/boost-align/CONTROL b/ports/boost-align/CONTROL
index ba2c35a673..0e772f983a 100644
--- a/ports/boost-align/CONTROL
+++ b/ports/boost-align/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-align
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/align
 Description: Boost align module
diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake
index 5785a6997f..2ffdd8d299 100644
--- a/ports/boost-align/portfile.cmake
+++ b/ports/boost-align/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/align
-    REF boost-1.72.0
-    SHA512 5044b1faeca09ed88aa529092805d359c3e82ddf1be8e227a020acf8d21a4c1a670381bbd7024271e86407da2702c6f9705d76dfd889cecdf301ccea5e0aaa09
+    REF boost-1.73.0
+    SHA512 16c3ca5cadbe3466903b6b1a93cdf5bc6b3fa4f92e3a933caadabf3fbb3f06ca114d811b177a771315ca1f5883d5bde57059f43fffd04e66ffef50487efe7b87
     HEAD_REF master
 )
 
diff --git a/ports/boost-any/CONTROL b/ports/boost-any/CONTROL
index 67e42ebeab..a26552ffe7 100644
--- a/ports/boost-any/CONTROL
+++ b/ports/boost-any/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-any
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/any
 Description: Boost any module
diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake
index 7c3accef0e..a519cf317e 100644
--- a/ports/boost-any/portfile.cmake
+++ b/ports/boost-any/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/any
-    REF boost-1.72.0
-    SHA512 5b1f35356f1ec8f48ddf534a13fc99a0da5579c0ff7d08b444888d18961b2f16fbf0f12ed099c9c53653df92cd7ea3a9f98a9fc4bbf865df91deb7085294ca9e
+    REF boost-1.73.0
+    SHA512 71a6f4b5862b2e2d989ad9c46c8ea24a689e5fc4e7de857e40dfb8b1e484a28631012d7e3df545a3bdb36f6bb9b4c0184e3506906c5e92b35d9aaad8f9830f21
     HEAD_REF master
 )
 
diff --git a/ports/boost-array/CONTROL b/ports/boost-array/CONTROL
index d2e38b11aa..0a0192a4a3 100644
--- a/ports/boost-array/CONTROL
+++ b/ports/boost-array/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-array
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/array
 Description: Boost array module
diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake
index 66a3f639e3..69b13047fd 100644
--- a/ports/boost-array/portfile.cmake
+++ b/ports/boost-array/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/array
-    REF boost-1.72.0
-    SHA512 61252106866227256045d438a64a64083068ae258590ce1e16909b46106c73d0492624aaf477f04b1b6f787ded3527786ecc93af79b90b8356a8c1dcd9917908
+    REF boost-1.73.0
+    SHA512 020eabd6bd57988a773656f5c41c17457e4f03d90bc3aa34b1f875e8af91d77f2911db5baeaf295c57cdc9e4df2687b659c6cee2a175504ca6cdabc73c028694
     HEAD_REF master
 )
 
diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL
index dd9cc6366d..641ca4aa91 100644
--- a/ports/boost-asio/CONTROL
+++ b/ports/boost-asio/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-asio
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!uwp), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl
 Homepage: https://github.com/boostorg/asio
 Description: Boost asio module
diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake
index b0bd10ed77..89c2093b62 100644
--- a/ports/boost-asio/portfile.cmake
+++ b/ports/boost-asio/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/asio
-    REF boost-1.72.0
-    SHA512 5d3ae95cf0261fddd037beb6225c51b6a575779f10e8125c7e2f069642f54c0935f6b048187f55c10569874b7d4de488efae058d43d92caf5b8661e13dbcaae5
+    REF boost-1.73.0
+    SHA512 662e7ea329110492062cc4d5275df5984ff59e9cf3824c1199c46fc3e76b366235865bde9d36504277bd209ae2c1fccd3b9e0d51195a88129473a26d14c26baa
     HEAD_REF master
     PATCHES windows_alloca_header.patch
 )
diff --git a/ports/boost-assert/CONTROL b/ports/boost-assert/CONTROL
index 234bf034ca..33a4bfdd7e 100644
--- a/ports/boost-assert/CONTROL
+++ b/ports/boost-assert/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-assert
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/assert
 Description: Boost assert module
diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake
index 5c07464218..ab172fbdb3 100644
--- a/ports/boost-assert/portfile.cmake
+++ b/ports/boost-assert/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/assert
-    REF boost-1.72.0
-    SHA512 ae83ce78bb247a521f06b3c22835456ebbca05eae89c78c4657010df58e5c923e65e00c772e89e16e2c9ce9eea8f5b5fb2e1700883bb3d5796f4108075634bdc
+    REF boost-1.73.0
+    SHA512 8fb474210da9ebbc57fbb4c1df5e8eea25d9e4c4345fa86a4d28ce13e3cfaa6f49323d3fd5695bcc290c715f5a2c8f8890794550330a6312a3f77db5eacb9031
     HEAD_REF master
 )
 
diff --git a/ports/boost-assign/CONTROL b/ports/boost-assign/CONTROL
index c1544939ce..25f868bdce 100644
--- a/ports/boost-assign/CONTROL
+++ b/ports/boost-assign/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-assign
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-config, boost-detail, boost-move, boost-mpl, boost-preprocessor, boost-ptr-container, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/assign
 Description: Boost assign module
diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake
index 2d79c13438..74c82131a5 100644
--- a/ports/boost-assign/portfile.cmake
+++ b/ports/boost-assign/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/assign
-    REF boost-1.72.0
-    SHA512 71913c0612e3b0a4204b0f23e9c9848a37a7bdc028965c040c4bf65cdb4e884f67d39304ef5b41045643664e1e29da4d56cddac3b1bde5af0f058faa3efa1e18
+    REF boost-1.73.0
+    SHA512 69e75e42176a40bea8a208f2bebb4701678f1410aacd647a19f4d55aa12c851f53ee359e895af93dbb67ba3ec25a47eac871c54a8d645017a615fc810bd60ba7
     HEAD_REF master
 )
 
diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL
index 153477b74b..f0f138ad95 100644
--- a/ports/boost-atomic/CONTROL
+++ b/ports/boost-atomic/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-atomic
-Version: 1.72.0
-Build-Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/atomic
 Description: Boost atomic module
diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake
index 4c5de55ee5..40037c721e 100644
--- a/ports/boost-atomic/portfile.cmake
+++ b/ports/boost-atomic/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/atomic
-    REF boost-1.72.0
-    SHA512 dc8f20520b91d9691318cdb09654294105522c4367e823b4a2c54fbd1ebf818bd59edd92f7cd37634bc09dc341cc0a6664ce8a240dd860674f115be162a6b30f
+    REF boost-1.73.0
+    SHA512 2dc22e06364e8962a745b64f66f60235236ebba301ebfa4c0cac37b6581cb1df0fb85913e30a15437b587d858292e0a793588d8d898eeba641be753c4dc4899a
     HEAD_REF master
 )
 
diff --git a/ports/boost-beast/0002-beast-coroutines.patch b/ports/boost-beast/0002-beast-coroutines.patch
new file mode 100644
index 0000000000..1646a07f39
--- /dev/null
+++ b/ports/boost-beast/0002-beast-coroutines.patch
@@ -0,0 +1,1466 @@
+diff -aruN a/include/boost/beast/core/detail/impl/read.hpp b/include/boost/beast/core/detail/impl/read.hpp
+--- a/include/boost/beast/core/detail/impl/read.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/core/detail/impl/read.hpp	2020-05-02 13:50:11.141761700 -0400
+@@ -214,7 +214,7 @@
+     class AsyncReadStream,
+     class DynamicBuffer,
+     class CompletionCondition,
+-    class ReadHandler,
++    BOOST_BEAST_ASYNC_TPARAM2 ReadHandler,
+     class>
+ BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
+ async_read(
+diff -aruN a/include/boost/beast/core/detail/is_invocable.hpp b/include/boost/beast/core/detail/is_invocable.hpp
+--- a/include/boost/beast/core/detail/is_invocable.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/core/detail/is_invocable.hpp	2020-05-02 13:50:11.141761700 -0400
+@@ -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>
+ 
+@@ -51,6 +53,26 @@
+ };
+ /** @} */
+ 
++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
+ } // boost
+diff -aruN a/include/boost/beast/core/detail/read.hpp b/include/boost/beast/core/detail/read.hpp
+--- a/include/boost/beast/core/detail/read.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/core/detail/read.hpp	2020-05-02 13:50:11.142761711 -0400
+@@ -219,7 +219,7 @@
+     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 &&
+diff -aruN a/include/boost/beast/core/detect_ssl.hpp b/include/boost/beast/core/detect_ssl.hpp
+--- a/include/boost/beast/core/detect_ssl.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/core/detect_ssl.hpp	2020-05-02 13:50:11.143761722 -0400
+@@ -374,13 +374,13 @@
+     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 @@
+             detail::run_detect_ssl_op{},
+             token,
+             &stream, // pass the reference by pointer
+-            buffer);
++            &buffer);
+ }
+ 
+ //]
+diff -aruN a/include/boost/beast/core/impl/basic_stream.hpp b/include/boost/beast/core/impl/basic_stream.hpp
+--- a/include/boost/beast/core/impl/basic_stream.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/core/impl/basic_stream.hpp	2020-05-02 13:50:11.144761733 -0400
+@@ -776,7 +776,7 @@
+ //------------------------------------------------------------------------------
+ 
+ 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 @@
+ 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 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 @@
+ 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 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 @@
+ //------------------------------------------------------------------------------
+ 
+ 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 @@
+ }
+ 
+ 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(
+diff -aruN a/include/boost/beast/core/impl/buffered_read_stream.hpp b/include/boost/beast/core/impl/buffered_read_stream.hpp
+--- a/include/boost/beast/core/impl/buffered_read_stream.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/core/impl/buffered_read_stream.hpp	2020-05-02 13:50:11.144761733 -0400
+@@ -110,7 +110,7 @@
+     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 @@
+         read_op<
+             Buffers,
+             typename std::decay<ReadHandler>::type>(
+-                std::forward<ReadHandler>(h), *s, b);
++                std::forward<ReadHandler>(h), *s, *b);
+     }
+ };
+ 
+@@ -141,7 +141,7 @@
+ }
+ 
+ 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 @@
+     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 @@
+ }
+ 
+ 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 @@
+             typename ops::run_read_op{},
+             handler,
+             this,
+-            buffers);
++            &buffers);
+ }
+ 
+ } // beast
+diff -aruN a/include/boost/beast/core/impl/flat_stream.hpp b/include/boost/beast/core/impl/flat_stream.hpp
+--- a/include/boost/beast/core/impl/flat_stream.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/core/impl/flat_stream.hpp	2020-05-02 13:50:11.145761743 -0400
+@@ -144,7 +144,7 @@
+ 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 @@
+ template<class NextLayer>
+ template<
+     class ConstBufferSequence,
+-    class WriteHandler>
++    BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ flat_stream<NextLayer>::
+ async_write_some(
+diff -aruN a/include/boost/beast/_experimental/http/impl/icy_stream.hpp b/include/boost/beast/_experimental/http/impl/icy_stream.hpp
+--- a/include/boost/beast/_experimental/http/impl/icy_stream.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/_experimental/http/impl/icy_stream.hpp	2020-05-02 13:50:11.146761754 -0400
+@@ -259,7 +259,7 @@
+ 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 @@
+ template<class NextLayer>
+ template<
+     class MutableBufferSequence,
+-    class WriteHandler>
++    BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ icy_stream<NextLayer>::
+ async_write_some(
+diff -aruN a/include/boost/beast/_experimental/test/impl/stream.hpp b/include/boost/beast/_experimental/test/impl/stream.hpp
+--- a/include/boost/beast/_experimental/test/impl/stream.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/_experimental/test/impl/stream.hpp	2020-05-02 13:50:11.147761765 -0400
+@@ -306,7 +306,7 @@
+     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 @@
+     return n;
+ }
+ 
+-template<class ConstBufferSequence, class WriteHandler>
++template<class ConstBufferSequence, BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
+ BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
+ stream::
+ async_write_some(
+diff -aruN a/include/boost/beast/http/field.hpp b/include/boost/beast/http/field.hpp
+--- a/include/boost/beast/http/field.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/http/field.hpp	2020-05-02 13:50:11.149761786 -0400
+@@ -396,12 +396,9 @@
+ 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
+diff -aruN a/include/boost/beast/http/impl/field.ipp b/include/boost/beast/http/impl/field.ipp
+--- a/include/boost/beast/http/impl/field.ipp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/http/impl/field.ipp	2020-05-02 13:50:11.150761798 -0400
+@@ -11,10 +11,12 @@
+ #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 {
+@@ -565,6 +567,12 @@
+     return detail::get_field_table().string_to_field(s);
+ }
+ 
++std::ostream&
++operator<<(std::ostream& os, field f)
++{
++    return os << to_string(f);
++}
++
+ } // http
+ } // beast
+ } // boost
+diff -aruN a/include/boost/beast/http/impl/file_body_win32.hpp b/include/boost/beast/http/impl/file_body_win32.hpp
+--- a/include/boost/beast/http/impl/file_body_win32.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/http/impl/file_body_win32.hpp	2020-05-02 13:50:11.150761798 -0400
+@@ -597,7 +597,7 @@
+ 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<
+diff -aruN a/include/boost/beast/http/impl/read.hpp b/include/boost/beast/http/impl/read.hpp
+--- a/include/boost/beast/http/impl/read.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/http/impl/read.hpp	2020-05-02 13:50:11.150761798 -0400
+@@ -304,7 +304,7 @@
+     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 @@
+     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 @@
+     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 @@
+     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,
+diff -aruN a/include/boost/beast/http/impl/write.hpp b/include/boost/beast/http/impl/write.hpp
+--- a/include/boost/beast/http/impl/write.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/http/impl/write.hpp	2020-05-02 13:50:11.150761798 -0400
+@@ -463,7 +463,7 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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,
+diff -aruN a/include/boost/beast/http/span_body.hpp b/include/boost/beast/http/span_body.hpp
+--- a/include/boost/beast/http/span_body.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/http/span_body.hpp	2020-05-02 13:50:11.151761808 -0400
+@@ -36,8 +36,10 @@
+ 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
+diff -aruN a/include/boost/beast/ssl/ssl_stream.hpp b/include/boost/beast/ssl/ssl_stream.hpp
+--- a/include/boost/beast/ssl/ssl_stream.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/ssl/ssl_stream.hpp	2020-05-02 13:50:11.151761808 -0400
+@@ -555,7 +555,7 @@
+         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 @@
+         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)
+diff -aruN a/include/boost/beast/version.hpp b/include/boost/beast/version.hpp
+--- a/include/boost/beast/version.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/version.hpp	2020-05-02 13:50:11.151761808 -0400
+@@ -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)
+ 
+diff -aruN a/include/boost/beast/websocket/impl/accept.hpp b/include/boost/beast/websocket/impl/accept.hpp
+--- a/include/boost/beast/websocket/impl/accept.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/websocket/impl/accept.hpp	2020-05-02 13:50:11.153761830 -0400
+@@ -542,7 +542,7 @@
+ 
+ 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 @@
+ 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 @@
+ 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 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 @@
+ 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 Body, class Allocator,
+     class ResponseDecorator,
+-    class AcceptHandler>
++    BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler>
+ BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
+ stream<NextLayer, deflateSupported>::
+ async_accept_ex(
+diff -aruN a/include/boost/beast/websocket/impl/close.hpp b/include/boost/beast/websocket/impl/close.hpp
+--- a/include/boost/beast/websocket/impl/close.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/websocket/impl/close.hpp	2020-05-02 13:50:11.153761830 -0400
+@@ -382,7 +382,7 @@
+ }
+ 
+ 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)
+diff -aruN a/include/boost/beast/websocket/impl/handshake.hpp b/include/boost/beast/websocket/impl/handshake.hpp
+--- a/include/boost/beast/websocket/impl/handshake.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/websocket/impl/handshake.hpp	2020-05-02 13:50:11.153761830 -0400
+@@ -268,7 +268,7 @@
+ //------------------------------------------------------------------------------
+ 
+ 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 @@
+ }
+ 
+ template<class NextLayer, bool deflateSupported>
+-template<class HandshakeHandler>
++template<BOOST_BEAST_ASYNC_TPARAM1 HandshakeHandler>
+ BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
+ stream<NextLayer, deflateSupported>::
+ async_handshake(
+diff -aruN a/include/boost/beast/websocket/impl/ping.hpp b/include/boost/beast/websocket/impl/ping.hpp
+--- a/include/boost/beast/websocket/impl/ping.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/websocket/impl/ping.hpp	2020-05-02 13:50:11.153761830 -0400
+@@ -288,7 +288,7 @@
+ }
+ 
+ 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 @@
+ }
+ 
+ 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)
+diff -aruN a/include/boost/beast/websocket/impl/read.hpp b/include/boost/beast/websocket/impl/read.hpp
+--- a/include/boost/beast/websocket/impl/read.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/websocket/impl/read.hpp	2020-05-02 13:50:11.153761830 -0400
+@@ -804,7 +804,7 @@
+ }
+ 
+ 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 @@
+ }
+ 
+ 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 @@
+ }
+ 
+ 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(
+diff -aruN a/include/boost/beast/websocket/impl/write.hpp b/include/boost/beast/websocket/impl/write.hpp
+--- a/include/boost/beast/websocket/impl/write.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/websocket/impl/write.hpp	2020-05-02 13:50:11.153761830 -0400
+@@ -700,7 +700,7 @@
+ }
+ 
+ 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 @@
+ }
+ 
+ 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(
+diff -aruN a/include/boost/beast/websocket/stream.hpp b/include/boost/beast/websocket/stream.hpp
+--- a/include/boost/beast/websocket/stream.hpp	2020-04-22 09:34:50.000000000 -0400
++++ b/include/boost/beast/websocket/stream.hpp	2020-05-02 13:50:11.154761841 -0400
+@@ -2634,7 +2634,7 @@
+ 
+     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 @@
+     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 @@
+     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,
+diff -aruN a/CHANGELOG.md b/CHANGELOG.md
+--- a/CHANGELOG.md	2020-04-22 09:34:50.000000000 -0400
++++ b/CHANGELOG.md	2020-05-02 13:51:02.388315008 -0400
+@@ -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
+diff -aruN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2020-04-22 09:34:50.000000000 -0400
++++ b/CMakeLists.txt	2020-05-02 13:51:02.389315019 -0400
+@@ -40,7 +40,7 @@
+ #
+ #-------------------------------------------------------------------------------
+ 
+-project (Beast VERSION 290)
++project (Beast VERSION 292)
+ 
+ set_property (GLOBAL PROPERTY USE_FOLDERS ON)
+ option (Beast_BUILD_EXAMPLES "Build examples" ON)
+diff -aruN a/doc/qbk/01_intro/_intro.qbk b/doc/qbk/01_intro/_intro.qbk
+--- a/doc/qbk/01_intro/_intro.qbk	2020-04-22 09:34:50.000000000 -0400
++++ b/doc/qbk/01_intro/_intro.qbk	2020-05-02 13:51:02.391315040 -0400
+@@ -58,7 +58,7 @@
+ 
+ * [*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+.
+ 
+diff -aruN a/test/beast/core/async_base.cpp b/test/beast/core/async_base.cpp
+--- a/test/beast/core/async_base.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/core/async_base.cpp	2020-05-02 13:51:02.470315892 -0400
+@@ -585,7 +585,7 @@
+     //--------------------------------------------------------------------------
+ 
+     // 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)
+     {
+diff -aruN a/test/beast/core/basic_stream.cpp b/test/beast/core/basic_stream.cpp
+--- a/test/beast/core/basic_stream.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/core/basic_stream.cpp	2020-05-02 13:51:02.470315892 -0400
+@@ -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 @@
+     {
+         string_view s_;
+         net::ip::tcp::socket socket_;
+-        
++
+     public:
+         session(
+             string_view s,
+@@ -1297,6 +1304,52 @@
+ 
+     //--------------------------------------------------------------------------
+ 
++#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 @@
+         testMembers();
+         testJavadocs();
+         testIssue1589();
++
++#if BOOST_ASIO_HAS_CO_AWAIT
++        // test for compilation success only
++        boost::ignore_unused(&basic_stream_test::testAwaitableCompilation);
++#endif
+     }
+ };
+ 
+diff -aruN a/test/beast/core/buffered_read_stream.cpp b/test/beast/core/buffered_read_stream.cpp
+--- a/test/beast/core/buffered_read_stream.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/core/buffered_read_stream.cpp	2020-05-02 13:51:02.470315892 -0400
+@@ -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 @@
+         }
+     };
+ 
++#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 @@
+         });
+ 
+         testAsyncLoop();
++
++#if BOOST_ASIO_HAS_CO_AWAIT
++        boost::ignore_unused(&buffered_read_stream_test::testAwaitableCompiles);
++#endif
+     }
+ };
+ 
+diff -aruN a/test/beast/core/detect_ssl.cpp b/test/beast/core/detect_ssl.cpp
+--- a/test/beast/core/detect_ssl.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/core/detect_ssl.cpp	2020-05-02 13:51:02.470315892 -0400
+@@ -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 @@
+         }
+     }
+ 
++#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
+     }
+ };
+ 
+diff -aruN a/test/beast/core/flat_stream.cpp b/test/beast/core/flat_stream.cpp
+--- a/test/beast/core/flat_stream.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/core/flat_stream.cpp	2020-05-02 13:51:02.471315902 -0400
+@@ -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 @@
+         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
+     }
+ };
+ 
+diff -aruN a/test/beast/core/stream_traits.cpp b/test/beast/core/stream_traits.cpp
+--- a/test/beast/core/stream_traits.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/core/stream_traits.cpp	2020-05-02 13:51:02.471315902 -0400
+@@ -214,14 +214,14 @@
+     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 @@
+     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&&);
+     };
+ 
+diff -aruN a/test/beast/http/CMakeLists.txt b/test/beast/http/CMakeLists.txt
+--- a/test/beast/http/CMakeLists.txt	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/http/CMakeLists.txt	2020-05-02 13:51:02.472315914 -0400
+@@ -26,6 +26,7 @@
+     empty_body.cpp
+     error.cpp
+     field.cpp
++    field_compiles.cpp
+     fields.cpp
+     file_body.cpp
+     message.cpp
+diff -aruN a/test/beast/http/field_compiles.cpp b/test/beast/http/field_compiles.cpp
+--- a/test/beast/http/field_compiles.cpp	1969-12-31 19:00:00.000000000 -0500
++++ b/test/beast/http/field_compiles.cpp	2020-05-02 13:51:02.473315924 -0400
+@@ -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>
+diff -aruN a/test/beast/http/Jamfile b/test/beast/http/Jamfile
+--- a/test/beast/http/Jamfile	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/http/Jamfile	2020-05-02 13:51:02.472315914 -0400
+@@ -16,6 +16,7 @@
+     dynamic_body.cpp
+     error.cpp
+     field.cpp
++    field_compiles.cpp
+     fields.cpp
+     file_body.cpp
+     message.cpp
+diff -aruN a/test/beast/http/read.cpp b/test/beast/http/read.cpp
+--- a/test/beast/http/read.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/http/read.cpp	2020-05-02 13:51:02.472315914 -0400
+@@ -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 @@
+         }
+     }
+ 
++#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 @@
+         testRegression430();
+         testReadGrind();
+         testAsioHandlerInvoke();
++#if BOOST_ASIO_HAS_CO_AWAIT
++        boost::ignore_unused(&read_test::testAwaitableCompiles);
++#endif
+     }
+ };
+ 
+diff -aruN a/test/beast/http/write.cpp b/test/beast/http/write.cpp
+--- a/test/beast/http/write.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/http/write.cpp	2020-05-02 13:51:02.473315924 -0400
+@@ -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 @@
+         }
+     }
+ 
++#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 @@
+             });
+         testAsioHandlerInvoke();
+         testBodyWriters();
++#if BOOST_ASIO_HAS_CO_AWAIT
++        boost::ignore_unused(&write_test::testAwaitableCompiles);
++#endif
+     }
+ };
+ 
+diff -aruN a/test/beast/websocket/accept.cpp b/test/beast/websocket/accept.cpp
+--- a/test/beast/websocket/accept.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/websocket/accept.cpp	2020-05-02 13:51:02.473315924 -0400
+@@ -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 @@
+         }
+     }
+ 
++#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 @@
+         testInvalidInputs();
+         testEndOfStream();
+         testAsync();
++#if BOOST_ASIO_HAS_CO_AWAIT
++        boost::ignore_unused(&accept_test::testAwaitableCompiles);
++#endif
+     }
+ };
+ 
+diff -aruN a/test/beast/websocket/close.cpp b/test/beast/websocket/close.cpp
+--- a/test/beast/websocket/close.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/websocket/close.cpp	2020-05-02 13:51:02.473315924 -0400
+@@ -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 @@
+         }
+     };
+ 
++#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 @@
+         testTimeout();
+         testSuspend();
+         testMoveOnly();
++#if BOOST_ASIO_HAS_CO_AWAIT
++        boost::ignore_unused(&close_test::testAwaitableCompiles);
++#endif
+     }
+ };
+ 
+diff -aruN a/test/beast/websocket/handshake.cpp b/test/beast/websocket/handshake.cpp
+--- a/test/beast/websocket/handshake.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/websocket/handshake.cpp	2020-05-02 13:51:02.473315924 -0400
+@@ -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 @@
+         }
+     }
+ 
++#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 @@
+         testMoveOnly();
+         testAsync();
+         testIssue1460();
++#if BOOST_ASIO_HAS_CO_AWAIT
++        boost::ignore_unused(&handshake_test::testAwaitableCompiles);
++#endif
+     }
+ };
+ 
+diff -aruN a/test/beast/websocket/ping.cpp b/test/beast/websocket/ping.cpp
+--- a/test/beast/websocket/ping.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/websocket/ping.cpp	2020-05-02 13:51:02.474315935 -0400
+@@ -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 @@
+         }
+     };
+ 
++#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
+     }
+ };
+ 
+diff -aruN a/test/beast/websocket/read2.cpp b/test/beast/websocket/read2.cpp
+--- a/test/beast/websocket/read2.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/websocket/read2.cpp	2020-05-02 13:51:02.474315935 -0400
+@@ -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 @@
+         }
+     }
+ 
++#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
+     }
+ };
+ 
+diff -aruN a/test/beast/websocket/write.cpp b/test/beast/websocket/write.cpp
+--- a/test/beast/websocket/write.cpp	2020-04-22 09:34:50.000000000 -0400
++++ b/test/beast/websocket/write.cpp	2020-05-02 13:51:02.474315935 -0400
+@@ -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 @@
+         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 @@
+         testMoveOnly();
+         testIssue300();
+         testIssue1666();
++#if BOOST_ASIO_HAS_CO_AWAIT
++        boost::ignore_unused(&write_test::testAwaitableCompiles);
++#endif
+     }
+ };
+ 
diff --git a/ports/boost-beast/CONTROL b/ports/boost-beast/CONTROL
index d5757961f7..800a13ce8e 100644
--- a/ports/boost-beast/CONTROL
+++ b/ports/boost-beast/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-beast
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-asio, boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-logic, boost-mp11, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/beast
 Description: Boost beast module
diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake
index 1342d89f22..231d96d363 100644
--- a/ports/boost-beast/portfile.cmake
+++ b/ports/boost-beast/portfile.cmake
@@ -1,13 +1,12 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/beast
-    REF boost-1.72.0
-    SHA512 beffe921767466830089ce20cec4dfb27f6d2b7864fde990a682349d0944037d5fa517f2dfeb5d4c22d3f3410aa3803012fbf4220311367d95a0238d84a2f24c
+    REF boost-1.73.0
+    SHA512 b1f0d2b1a8576d8bea953ce92aa9970590f91451f19d059818eb1c7a2b21c39fe384526c65b324c6c6142f4eac9bb649bdc6b2b9eff946c7f348f11332b9753c
     HEAD_REF master
+    PATCHES 0002-beast-coroutines.patch
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/boost-bimap/CONTROL b/ports/boost-bimap/CONTROL
index 5ac8a937f1..412dc84e46 100644
--- a/ports/boost-bimap/CONTROL
+++ b/ports/boost-bimap/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-bimap
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-concept-check, boost-config, boost-container-hash, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/bimap
 Description: Boost bimap module
diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake
index 0c4eddf9ff..8c7c52db15 100644
--- a/ports/boost-bimap/portfile.cmake
+++ b/ports/boost-bimap/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/bimap
-    REF boost-1.72.0
-    SHA512 150b1abba1d2f17ddd4fc0c52b3e601ce80208437b8df4e4fe44b9a020838617cdb184947d63f8552e6c0d94436b52688dfa7b4c98f847aa954b626df704cf9a
+    REF boost-1.73.0
+    SHA512 63b3fb5926ee7e1d86872f766213a6d31d146f0db349c676754cc0c4d5050f8690773ec694cc2e820b96f278907e63d0e32c3e588b74ea415359955f4ec3d9b8
     HEAD_REF master
 )
 
diff --git a/ports/boost-bind/CONTROL b/ports/boost-bind/CONTROL
index 36ba4da77c..8db3ebf8df 100644
--- a/ports/boost-bind/CONTROL
+++ b/ports/boost-bind/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-bind
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/bind
 Description: Boost bind module
diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake
index 781ea5551d..6c9f472cd8 100644
--- a/ports/boost-bind/portfile.cmake
+++ b/ports/boost-bind/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/bind
-    REF boost-1.72.0
-    SHA512 b09942be125de1fb07399414a48d3ea7694fe3eb51691d0dab0278ca973d1d80c31ea98f64f007d483d2953f0162db33e88578596619f284ac0c0cbf60977a3f
+    REF boost-1.73.0
+    SHA512 5ec2535ac4452edbc10faf2d16e61ee09b12d6dc9d013015798c67bfdd5308e219e534aeae56549a5890aff70956573f5e4633a8261472e242de3314f027d563
     HEAD_REF master
 )
 
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL
index 4ccff7bc87..ddeebcd136 100644
--- a/ports/boost-build/CONTROL
+++ b/ports/boost-build/CONTROL
@@ -1,4 +1,4 @@
 Source: boost-build
-Version: 1.72.0
+Version: 1.73.0
 Homepage: https://github.com/boostorg/build
 Description: Boost.Build
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake
index be076d422a..5823afc4e7 100644
--- a/ports/boost-build/portfile.cmake
+++ b/ports/boost-build/portfile.cmake
@@ -8,13 +8,13 @@ elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_N
     return()
 endif()
 
-set(BOOST_VERSION 1.72.0)
+set(BOOST_VERSION 1.73.0)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/build
     REF boost-${BOOST_VERSION}
-    SHA512 744816ba805013a49029373a4d2aa5b5f543275a1cdef2812c2120c868c55bf36a0bb0fb891cd955ad7319e582fd5212bd52ff071703a8654b345c478e810a19
+    SHA512 68e132c480c3063f99ddae48177ff5a35369e49e7f497d51d758a9bf760c5b20c1c040cb212fad94b1f27fb140054b0ef14ac0b32c6d7d246e921787ff58a037
     HEAD_REF master
 )
 
@@ -27,7 +27,7 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_download_distfile(BOOSTCPP_ARCHIVE
     URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/boostcpp.jam"
     FILENAME "boost-${BOOST_VERSION}-boostcpp.jam"
-    SHA512 7fac16c1f082821dd52cae39601f60bbdbd5ce043fbd19699da54c74fc5df1ed2ad6d3cefd3ae9a0a7697a2c34737f0c9e2b4bd3590c1f45364254875289cd17
+    SHA512 8cf929fa4a602342c859a6bbd5f9dda783ac29431d951bcf6cae4cb14377c1b3aed90bacd902b0f7d1807591cf5e1a244cf8fc3c6cc6e0a4056db145b58f51df
 )
 
 file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build RENAME copyright)
diff --git a/ports/boost-callable-traits/CONTROL b/ports/boost-callable-traits/CONTROL
index af4a7664b8..705a2eb72b 100644
--- a/ports/boost-callable-traits/CONTROL
+++ b/ports/boost-callable-traits/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-callable-traits
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/callable_traits
 Description: Boost callable_traits module
diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake
index 7f0612fefa..c364f57b22 100644
--- a/ports/boost-callable-traits/portfile.cmake
+++ b/ports/boost-callable-traits/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/callable_traits
-    REF boost-1.72.0
-    SHA512 ad32e155e0d2d1a0ed88d34bc5772e8756bb6a73335f4c207710ac22efb5fb77b1199b3df128c1f4164e87a7aafaa14c604864047d1a49ede3475eba169eb449
+    REF boost-1.73.0
+    SHA512 4d9d59b353fc4d7c6661ee71c53e9b279fc727d9e6d0767ef9e9c53e307deb8c4975347d84329c67b0ee93be8140946270a1617c4f49e2b20aabd4c37829eba1
     HEAD_REF master
 )
 
diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL
index dcd35dbb48..c48184538d 100644
--- a/ports/boost-chrono/CONTROL
+++ b/ports/boost-chrono/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-chrono
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/chrono
 Description: Boost chrono module
diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake
index 18908e8f63..ea75c46b7a 100644
--- a/ports/boost-chrono/portfile.cmake
+++ b/ports/boost-chrono/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/chrono
-    REF boost-1.72.0
-    SHA512 7cd2596101767d9dde63ff6af527680211442272f9ac96b758712872dcc4e0d5d3be0e8cfab99601abe22caf3c3501a1b5385ba1fe69d8a2d3527bbaa5a36cc8
+    REF boost-1.73.0
+    SHA512 81c40845939172b8d33f05e7e16c6be9bd0e83eedb5ac8712090043a0309f5ddb377a8b9686ef79363c917fb74ac626268078ff5068998981ce043d006d1461a
     HEAD_REF master
 )
 
diff --git a/ports/boost-circular-buffer/CONTROL b/ports/boost-circular-buffer/CONTROL
index 09fa7c0677..6a7c387663 100644
--- a/ports/boost-circular-buffer/CONTROL
+++ b/ports/boost-circular-buffer/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-circular-buffer
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/circular_buffer
 Description: Boost circular_buffer module
diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake
index e1aca6ded6..b60bfe3ba8 100644
--- a/ports/boost-circular-buffer/portfile.cmake
+++ b/ports/boost-circular-buffer/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/circular_buffer
-    REF boost-1.72.0
-    SHA512 bbd4927cc0cb065c62d9d310921894f0d62d088c0a246eae85eb27b9b24ce45f7b4816c6c1bf1049f0e6a3b188611569ee6386afef0d15e1b5df37202b7d992d
+    REF boost-1.73.0
+    SHA512 602ab96a2b5189cc37a3cac85fc663fec497674f19ead202170ebe1fc416587b50d8deff5ad274579c75e2ef30f0c832366b3f9bf54733ea659247923cf7d8ad
     HEAD_REF master
 )
 
diff --git a/ports/boost-compatibility/CONTROL b/ports/boost-compatibility/CONTROL
index 399a56dff7..fc08a189d1 100644
--- a/ports/boost-compatibility/CONTROL
+++ b/ports/boost-compatibility/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-compatibility
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/compatibility
 Description: Boost compatibility module
diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake
index 69f0c0989f..d842c499e9 100644
--- a/ports/boost-compatibility/portfile.cmake
+++ b/ports/boost-compatibility/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/compatibility
-    REF boost-1.72.0
-    SHA512 3fec934f448568c75bb9f40ce91650a949f07bd222c9bd3c0845c6b5748b8dddc4b0e3df19cbf9cbc6ffefe3ed9b26a145e531dd70e8e1305ed56d66d1f20fb6
+    REF boost-1.73.0
+    SHA512 ce2b5f908c878cc34694b024c1f4609098bf1e8801df90e067bcf535e267632142639653230588e92819c8b579c59d0703bb8d9ec06ec8a4fc3d103634673724
     HEAD_REF master
 )
 
diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL
index dd888faab4..8468ee6713 100644
--- a/ports/boost-compute/CONTROL
+++ b/ports/boost-compute/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-compute
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-algorithm, boost-array, boost-assert, boost-chrono, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-function-types, boost-fusion, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-preprocessor, boost-property-tree, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-uuid, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/compute
 Description: Boost compute module
diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake
index 6d029795d4..d8c6e157c9 100644
--- a/ports/boost-compute/portfile.cmake
+++ b/ports/boost-compute/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/compute
-    REF boost-1.72.0
-    SHA512 549165f83cd184a4ac77dcd467b92d571d7754aafd011d7bad9cfbef9ef3b3bfad9e0f2fa9a2a419bc2cf58f5d2f27ce1cf829c18e460b8d5552a6a2ae6648a9
+    REF boost-1.73.0
+    SHA512 c6877630ce15dfa56f71d784e10264e24f0029ed28345ed6d1421b13e5c020511251129990f4a368dcaad9765936cab6d4364556e826335ac64788c3d87951dd
     HEAD_REF master
 )
 
diff --git a/ports/boost-concept-check/CONTROL b/ports/boost-concept-check/CONTROL
index 9d5f520ed2..df7e3be35e 100644
--- a/ports/boost-concept-check/CONTROL
+++ b/ports/boost-concept-check/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-concept-check
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/concept_check
 Description: Boost concept_check module
diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake
index d2ffd798be..196d69175f 100644
--- a/ports/boost-concept-check/portfile.cmake
+++ b/ports/boost-concept-check/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/concept_check
-    REF boost-1.72.0
-    SHA512 8b3ebefa86eab167205a616dbde25fabf850c859b562f71b67b5ddabb15de6020a60440c3191e664bad3058f97476674467d4651e9fcd5412452bcc29a269e7e
+    REF boost-1.73.0
+    SHA512 78612011a3f0f4ee0c055661e4a72745a9a6ef4734cd49600d37e5f3b04e13c96195150e4cf7f5a48c2b8f2af2c89e40de7d21ee3a4a7a12110a554f494f39ed
     HEAD_REF master
 )
 
diff --git a/ports/boost-config/CONTROL b/ports/boost-config/CONTROL
index fce345db7d..efad3a6637 100644
--- a/ports/boost-config/CONTROL
+++ b/ports/boost-config/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-config
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-compatibility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/config
 Description: Boost config module
diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake
index 592fd1e8be..35c350f8d5 100644
--- a/ports/boost-config/portfile.cmake
+++ b/ports/boost-config/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/config
-    REF boost-1.72.0
-    SHA512 918f8936ced087ab89b32648fdf7194e025043c799f7750623e387a0c5d4f17581614cb8318cac07c5b70ed0e5f14ab94eb69999870cf2cada7ef3bf2503dd40
+    REF boost-1.73.0
+    SHA512 39448c9371be8c7bc613c4f507d6cb65a684be2e4ea3cd218f6a8635d60e748db6008d2cd874dbadee183ea5d22b1296e0f66da5dc384a7dfc12ac2128f7bb64
     HEAD_REF master
 )
 
diff --git a/ports/boost-container-hash/CONTROL b/ports/boost-container-hash/CONTROL
index 7926d6c38a..c81d3ef2d9 100644
--- a/ports/boost-container-hash/CONTROL
+++ b/ports/boost-container-hash/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-container-hash
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/container_hash
 Description: Boost container_hash module
diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake
index 14038a44ea..c0eff90006 100644
--- a/ports/boost-container-hash/portfile.cmake
+++ b/ports/boost-container-hash/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/container_hash
-    REF boost-1.72.0
-    SHA512 8e739b2876488a081774a6b70c82430bb5949d5c6f4c6e2c05964adfcebf848f56da007d64fc13189a0e6ef6305d2e50d702f4d87d7908fb0e2c6feccba85c1b
+    REF boost-1.73.0
+    SHA512 c5cd2d85eb79c7524c22e7be51241654f9dba16786cb83366164f4bbef2b8a24258401d88b79a9eb647c73eea2a379389c5075be743a27ca25eeb89e4bed01dc
     HEAD_REF master
 )
 
diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL
index 83c05201f9..ead3c29f13 100644
--- a/ports/boost-container/CONTROL
+++ b/ports/boost-container/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-container
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-container-hash, boost-core, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/container
 Description: Boost container module
diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake
index 6962ac293e..ce65a7566c 100644
--- a/ports/boost-container/portfile.cmake
+++ b/ports/boost-container/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/container
-    REF boost-1.72.0
-    SHA512 1fccb1ccd017ebcffed60e646f9038e91c17b5ba3867062f245ae0702eef3fa86a8b73a5aebe47e81a24fe927da5c999d580c608d44109b14147a273d7b7e398
+    REF boost-1.73.0
+    SHA512 419a141138047baa649a3e1d0edcd55dfe5cf189b6ac9b9b0bc8da4d8e50971ff4619b5b811a3b1e17658c2573f32d926166d0ad260e036b736d8a615e4a1682
     HEAD_REF master
 )
 
diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL
index f628c87693..66bbbcf0af 100644
--- a/ports/boost-context/CONTROL
+++ b/ports/boost-context/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-context
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-thread, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/context
 Description: Boost context module
diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake
index a9b5d4f638..66ed9f50fa 100644
--- a/ports/boost-context/portfile.cmake
+++ b/ports/boost-context/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/context
-    REF boost-1.72.0
-    SHA512 3009fddb29ab31caa40fd7d03b13b820ac0c638c026e1d9b510f719ffc66436dafba5bcf537418ac090c721d1e21022043a7ef4ef597b4bd853e693f3c0d3ded
+    REF boost-1.73.0
+    SHA512 cb460e9d7f5b2782164e49820b097402f6a443718d689b2f793f5ab7030012a80418dfc51154f299c9f987d6864d87f7536476ffa97da1089bf6b70f2990ebea
     HEAD_REF master
 )
 
diff --git a/ports/boost-contract/CONTROL b/ports/boost-contract/CONTROL
index 6f9f6131eb..c384a47fbf 100644
--- a/ports/boost-contract/CONTROL
+++ b/ports/boost-contract/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-contract
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-any, boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-function-types, boost-modular-build-helper, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-thread, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/contract
 Description: Boost contract module
diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake
index abd7223c3d..c27c4d8518 100644
--- a/ports/boost-contract/portfile.cmake
+++ b/ports/boost-contract/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/contract
-    REF boost-1.72.0
-    SHA512 f76871e3769f15cea97e2b60d2ca32a03f15b4a3492b24debe95536fdc1c98543bacf171f46f78a9f49410ec1e55e8baf15d0629d96aa94f8d64dfefae567643
+    REF boost-1.73.0
+    SHA512 670e7d9e64d838bda32ec8748213961b8b7ee96d2918f2e6b71005b488de22b5f69c113de01908c88ab9dcdba6f69a0a2f64b10a4b5d5d319a7e76de17be2d72
     HEAD_REF master
 )
 
diff --git a/ports/boost-conversion/CONTROL b/ports/boost-conversion/CONTROL
index 69bb57656a..e12a8974cd 100644
--- a/ports/boost-conversion/CONTROL
+++ b/ports/boost-conversion/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-conversion
-Version: 1.72.0
-Build-Depends: boost-assert, boost-config, boost-throw-exception, boost-typeof, boost-utility, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-assert, boost-config, boost-core, boost-smart-ptr, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/conversion
 Description: Boost conversion module
diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake
index abdcafc988..e60f002c27 100644
--- a/ports/boost-conversion/portfile.cmake
+++ b/ports/boost-conversion/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/conversion
-    REF boost-1.72.0
-    SHA512 bef4ca0c37f3f259bab9e280fea685898299c37fcd0bc198549c0524612be5d8100a0a5d7799fbd44ad68c4d82682c5970ce700b65294908fd78784e5f96e865
+    REF boost-1.73.0
+    SHA512 b452b75c97d183ce75e1923711de5338926a118ff947352753a9e2426a74bfb26b922b195d5fad52ff56ab1e1fd0e6a79bff3e672c67ab5f0bad7909369d3b38
     HEAD_REF master
 )
 
diff --git a/ports/boost-convert/CONTROL b/ports/boost-convert/CONTROL
index dbf7e94c50..7882746e5d 100644
--- a/ports/boost-convert/CONTROL
+++ b/ports/boost-convert/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-convert
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-function-types, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-parameter, boost-range, boost-spirit, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/convert
 Description: Boost convert module
diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake
index b1cd31905d..056df71349 100644
--- a/ports/boost-convert/portfile.cmake
+++ b/ports/boost-convert/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/convert
-    REF boost-1.72.0
-    SHA512 2c9632d58e11a3b086c2cf191b4ec2d34c0d331347926798222cb742eac0ff97afb62581d3b2347c64c70d86ccc866d3a91a291a5db7e0e2d41d11bdc4fb9032
+    REF boost-1.73.0
+    SHA512 e2237c6113fe1d81fda851ec82d16b1645f41cac32cfd09c1169517517dfa29b63e0dd85c1bd781718414ef80002c194db3fe6c71c8eda27d8161bbf8966badf
     HEAD_REF master
 )
 
diff --git a/ports/boost-core/CONTROL b/ports/boost-core/CONTROL
index 2ca7782882..c6673ecc8e 100644
--- a/ports/boost-core/CONTROL
+++ b/ports/boost-core/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-core
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/core
 Description: Boost core module
diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake
index 25a329fe5d..86aa9ee95d 100644
--- a/ports/boost-core/portfile.cmake
+++ b/ports/boost-core/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/core
-    REF boost-1.72.0
-    SHA512 6b691ef85c161e93382a30d3bfe7bf45bdff5c27ac5dcec9933cc27f78af1b6c09752f245002e3edcabfd0c67de738756b9027fbb996eba675c9ebd3f9212f01
+    REF boost-1.73.0
+    SHA512 a050d08d97c41c8685458eb8171ed45e36b756dfe090af66afca62a48718bde1ad7f08b579cfc3a891c499acc19897c45c2e9c7ce907af70f7894867fd8be0e7
     HEAD_REF master
 )
 
diff --git a/ports/boost-coroutine/0001-revert-cease-dependence-on-range.patch b/ports/boost-coroutine/0001-revert-cease-dependence-on-range.patch
deleted file mode 100644
index 4e67c1827d..0000000000
--- a/ports/boost-coroutine/0001-revert-cease-dependence-on-range.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001
-From: Oliver Kowalke <oliver.kowalke@gmail.com>
-Date: Sun, 1 Dec 2019 20:40:28 +0100
-Subject: [PATCH] Revert "Cease dependence on Range"
-
-This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
-
-see #44 (One test fails to compile after boostorg/coroutine submodule updated)
----
- boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/include/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
-index ea96981..640896f 100644
---- a/include/boost/coroutine/asymmetric_coroutine.hpp
-+++ b/include/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>
- 
-@@ -2354,19 +2355,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; };
- 
- }
--- 
-2.24.1
-
diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL
index c1ff1dc721..b8a67d5b82 100644
--- a/ports/boost-coroutine/CONTROL
+++ b/ports/boost-coroutine/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-coroutine
-Version: 1.72.0-1
-Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp), boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-system, boost-thread, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp), boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-range, boost-system, boost-thread, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/coroutine
 Description: Boost coroutine module
diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake
index fe61715936..fc1e0409ea 100644
--- a/ports/boost-coroutine/portfile.cmake
+++ b/ports/boost-coroutine/portfile.cmake
@@ -3,11 +3,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/coroutine
-    REF boost-1.72.0
-    SHA512 efd234d24692a484b3bb4fdf9790d6e0014ba87ba628768dc2710c9999da14ea4ec6fef2e55a6283d8c3cb22894bd737cadb61f788d9f5e1408785e8c32892a0
+    REF boost-1.73.0
+    SHA512 0fd70f2225b45cf85a00f51ef039fc01a10144637699b2d55dd840216d70a62979b553b0225efee50b7155cfda5dc698ad5712cbcca3a07f00aa0601d9a53eae
     HEAD_REF master
-    PATCHES
-        0001-revert-cease-dependence-on-range.patch
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL
index 7869698a71..f5d2147621 100644
--- a/ports/boost-coroutine2/CONTROL
+++ b/ports/boost-coroutine2/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-coroutine2
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-context (!uwp), boost-detail, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/coroutine2
 Description: Boost coroutine2 module
diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake
index 404907bfaa..18bd9be04d 100644
--- a/ports/boost-coroutine2/portfile.cmake
+++ b/ports/boost-coroutine2/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/coroutine2
-    REF boost-1.72.0
-    SHA512 00fbdfd6baa74ca444a45bef6cf0bf677bf0bd653c32e0688abc720720d758d2df5c8467a66daa2afa5c6b25982139fe0fc30a12798190c0f746a66d8f9b9bcc
+    REF boost-1.73.0
+    SHA512 dcb81cfda941b65b8b376abe74dc559f02e47bdd5f744b073b2d769e95c1ecf6ef4998cd4d5a67f45069e3b137d2384d7f45a41c453584a3b237da1ff42a8efc
     HEAD_REF master
 )
 
diff --git a/ports/boost-crc/CONTROL b/ports/boost-crc/CONTROL
index f5c71e2a8a..05904cfaf1 100644
--- a/ports/boost-crc/CONTROL
+++ b/ports/boost-crc/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-crc
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-compatibility, boost-config, boost-integer, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/crc
 Description: Boost crc module
diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake
index 29fc6f0fce..7a58e1c231 100644
--- a/ports/boost-crc/portfile.cmake
+++ b/ports/boost-crc/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/crc
-    REF boost-1.72.0
-    SHA512 f6fb2e5f14255e60f649389c5e9602d703a0a597499408b749a83e8c6740d1a49475583476c38f7f7810df1b332c31e4e07ce340d2519189b0f47e70792b0896
+    REF boost-1.73.0
+    SHA512 7928d1541d2a7e19bde89e0351d7b0bb952faa40de0a744856bfe867e8830799b5e835d3278b064356dcf3930f749880110935348aafd0a5248926991ceb4307
     HEAD_REF master
 )
 
diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL
index 0d4a74fa22..d7165ce6ab 100644
--- a/ports/boost-date-time/CONTROL
+++ b/ports/boost-date-time/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-date-time
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-numeric-conversion, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/date_time
 Description: Boost date_time module
diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake
index a2bb8ef2d0..42e6616595 100644
--- a/ports/boost-date-time/portfile.cmake
+++ b/ports/boost-date-time/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/date_time
-    REF boost-1.72.0
-    SHA512 bfb0c18d05742a19eeeed353f52afca594b92854480f61fa7fd21283bafc45b3301d4693da7bbf4abb2ebcbeb8d02d537d7a755cea0d6dbc3d7f83784a696a04
+    REF boost-1.73.0
+    SHA512 bfc4ffe76e451249f7b4c5c80e41f6cd3900091b491c42b1c01719eb1db29e3f324fafedb5ae15bba6b171aabcddfca6fafa6c7940b672be57342b0fdf0aa995
     HEAD_REF master
 )
 
diff --git a/ports/boost-detail/CONTROL b/ports/boost-detail/CONTROL
index eb7f3cb022..9d32473bda 100644
--- a/ports/boost-detail/CONTROL
+++ b/ports/boost-detail/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-detail
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-compatibility, boost-config, boost-preprocessor, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/detail
 Description: Boost detail module
diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake
index bab59aec53..8d3953f02e 100644
--- a/ports/boost-detail/portfile.cmake
+++ b/ports/boost-detail/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/detail
-    REF boost-1.72.0
-    SHA512 9c4541da0bb9eddad51a464dad76faf29a949657b5ae0ad003bffe4a936bf49c7fb9ee3266a51b7637343b64e446541d1359aa1d46734d07f14bd044021afcfa
+    REF boost-1.73.0
+    SHA512 d6955323769c5ec647648dc13baa18880b34c2b24cd80b10b638b410fa552819902eabf72093d464ba9582f507b7a19268d15422e4401cc0e3ce3aa93129f15d
     HEAD_REF master
 )
 
diff --git a/ports/boost-disjoint-sets/CONTROL b/ports/boost-disjoint-sets/CONTROL
deleted file mode 100644
index 14b666c474..0000000000
--- a/ports/boost-disjoint-sets/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
-Source: boost-disjoint-sets
-Version: 1.72.0
-Build-Depends: boost-graph, boost-vcpkg-helpers
-Homepage: https://github.com/boostorg/disjoint_sets
-Description: Boost disjoint_sets module
diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL
index 877ea36c66..c49ca7d9ce 100644
--- a/ports/boost-dll/CONTROL
+++ b/ports/boost-dll/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-dll
-Version: 1.72.0
-Build-Depends: boost-assert, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-mpl, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Version: 1.73.0
+Build-Depends: boost-assert, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/dll
 Description: Boost dll module
diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake
index 8542d818f5..65bb701783 100644
--- a/ports/boost-dll/portfile.cmake
+++ b/ports/boost-dll/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/dll
-    REF boost-1.72.0
-    SHA512 c724ead59194e2aea166ba4f07bf073950b03e66af61f5847f68d6d26f00a6c1f2507c49fc2757e21629e91adf0bbf78604d46b36c5f3c24727ef2a7a8b2d049
+    REF boost-1.73.0
+    SHA512 0775a5d9405efabafe23370df6bdca996bbfb27e492f4589e05608b603c029edf2c09bcee404a72174eca122a8229819b17fff184696f4961dc88fb0c5cfd435
     HEAD_REF master
 )
 
diff --git a/ports/boost-dynamic-bitset/CONTROL b/ports/boost-dynamic-bitset/CONTROL
index ce2a512ab5..97e0f2f7e6 100644
--- a/ports/boost-dynamic-bitset/CONTROL
+++ b/ports/boost-dynamic-bitset/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-dynamic-bitset
-Version: 1.72.0
-Build-Depends: boost-serialization, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-core, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/dynamic_bitset
 Description: Boost dynamic_bitset module
diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake
index b582e9a426..52c8b3eed5 100644
--- a/ports/boost-dynamic-bitset/portfile.cmake
+++ b/ports/boost-dynamic-bitset/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/dynamic_bitset
-    REF boost-1.72.0
-    SHA512 b4c84d194e71fc73be9071840caf1c9ab3a1887ab1d9aa6af63e5121783d450749b435af2f0f2545ebac9c86057b15a537926172e55255805b256d0d992bf0b5
+    REF boost-1.73.0
+    SHA512 50c7d7899f9bd9ab885477a8ad809ef0a615f74589dffe58c757fa615594393281783b9647882ea445f915493dbfd19f64b7e57c05176c903309487d0828b080
     HEAD_REF master
 )
 
diff --git a/ports/boost-endian/CONTROL b/ports/boost-endian/CONTROL
index e69f92a132..cfe3591a0b 100644
--- a/ports/boost-endian/CONTROL
+++ b/ports/boost-endian/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-endian
-Version: 1.72.0
-Build-Depends: boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-config, boost-core, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/endian
 Description: Boost endian module
diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake
index 003314493d..fb6a82e6a7 100644
--- a/ports/boost-endian/portfile.cmake
+++ b/ports/boost-endian/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/endian
-    REF boost-1.72.0
-    SHA512 bdcec1badfe7583143dc405c3eb2a3f55d5d2cc742f54265e8d6d5b156ef09523379fc49cf39eefacf22fa276c20b742b389b6dae3530fc377b5b8dc3686cf75
+    REF boost-1.73.0
+    SHA512 19b1b0076e6ac6dc6123a6e19103ac2117a25f90b93beac1101eb17c51bd209c4d1eac7d00eba982550216d24a6bc32f44228948795f7d11c8650cbddbc99268
     HEAD_REF master
 )
 
diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL
index db4f1a6842..e4467fa46a 100644
--- a/ports/boost-exception/CONTROL
+++ b/ports/boost-exception/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-exception
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/exception
 Description: Boost exception module
diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake
index 0b5a5e8096..758e22f525 100644
--- a/ports/boost-exception/portfile.cmake
+++ b/ports/boost-exception/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/exception
-    REF boost-1.72.0
-    SHA512 506ee9bec68a169b60e438bf29ed673aa8be2f745ab64dc8381a6ad1b9ca7e674a1b3009a828893c7451fd34de302fdb41d75018e1986a64543fe27ea5c7903b
+    REF boost-1.73.0
+    SHA512 6a04d8c7343775147becb40399f4ed9e717bf3c6e4f80e678f8df4c7fbfa78e53e60aa3eec32fe667816fc1d63bf3fa3ad79416ab953ebd7dc296f359691b115
     HEAD_REF master
 )
 
diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL
index 94684b32c3..22acacfbe5 100644
--- a/ports/boost-fiber/CONTROL
+++ b/ports/boost-fiber/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-fiber
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-algorithm, boost-assert, boost-build, boost-config, boost-context (!uwp), boost-core, boost-detail, boost-filesystem (!uwp), boost-format, boost-intrusive, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/fiber
 Description: Boost fiber module
diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake
index d190f8c33a..2da9696243 100644
--- a/ports/boost-fiber/portfile.cmake
+++ b/ports/boost-fiber/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/fiber
-    REF boost-1.72.0
-    SHA512 687b6f2961c76d0dbae63434fb98beaadc7a88b760e01ce222b73169733739617987d04f25f23cebdae9cbe08cb307ad8529a143e3a44429e09cfc27702fbe98
+    REF boost-1.73.0
+    SHA512 25d129e4228f3517abc641f6858572b3196c2d79945013aa45d61a544c094e83e0103c9aba04e54fc07e53d2e29379d60a0db9a1c995dcccaef2ba2b5cda94d9
     HEAD_REF master
 )
 
diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL
index 26928fb46c..09e2a8e6ce 100644
--- a/ports/boost-filesystem/CONTROL
+++ b/ports/boost-filesystem/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-filesystem
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-system, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/filesystem
 Description: Boost filesystem module
diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake
index 444c524591..9ab662a3db 100644
--- a/ports/boost-filesystem/portfile.cmake
+++ b/ports/boost-filesystem/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/filesystem
-    REF boost-1.72.0
-    SHA512 70bfed38f042982b4802228f612c4f66899466aca0e882c4202bd4574f0d4706c976caeca85ebdb9b4adcf0cb4b627790eea003376d5c1b35c534f794f0078cc
+    REF boost-1.73.0
+    SHA512 29f31b06495a240f449138e4cfc8e5f5e3af7bafdeeb1d7178625313f3c42ce7de04a7e77d6699dee0dcf1827e3bb581c9ad907fa4575d2d6dd1ef318a2e8fe4
     HEAD_REF master
 )
 
diff --git a/ports/boost-flyweight/CONTROL b/ports/boost-flyweight/CONTROL
index 351ba11103..c3b701d55d 100644
--- a/ports/boost-flyweight/CONTROL
+++ b/ports/boost-flyweight/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-flyweight
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-functional, boost-interprocess, boost-mpl, boost-multi-index, boost-parameter, boost-preprocessor, boost-serialization, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/flyweight
 Description: Boost flyweight module
diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake
index bbb58008fd..c0851a09d4 100644
--- a/ports/boost-flyweight/portfile.cmake
+++ b/ports/boost-flyweight/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/flyweight
-    REF boost-1.72.0
-    SHA512 86c09e92dbf046770d6683ae42b23bf6e37c8b9f39da69adc000d1ad36ddede40a846bd4ae5bcf08cc1ae20291b5dd33fa1fd9f882007f339e2587f1980178fb
+    REF boost-1.73.0
+    SHA512 dc58f76e413cedda8291727abddc0fada46890b0e2399f11c875ea605a5dfd567ba5df19c4c8c54cdf220da7bdaeb4a63d3df47da2f062a3cb4a0aee87869bd0
     HEAD_REF master
 )
 
diff --git a/ports/boost-foreach/CONTROL b/ports/boost-foreach/CONTROL
index 6d907c9e6e..8020ca2b0a 100644
--- a/ports/boost-foreach/CONTROL
+++ b/ports/boost-foreach/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-foreach
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/foreach
 Description: Boost foreach module
diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake
index 593a3bd707..fe11835248 100644
--- a/ports/boost-foreach/portfile.cmake
+++ b/ports/boost-foreach/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/foreach
-    REF boost-1.72.0
-    SHA512 bc7018bb63678d53df08d909a3538ef1026c7d24610874b5d3ace894eab2258d308209e866b02b1670b5cd84c3a63cea141081057767a2e5927efaa7bedec2f3
+    REF boost-1.73.0
+    SHA512 9a04aa1e180a17ab5d2c685f282e79fce2464c9267aea2d43595f82b98b19e6f269ec9744192b386097155ca9b0ea75511d9f718b406178b5f0c2af46b1422d4
     HEAD_REF master
 )
 
diff --git a/ports/boost-format/CONTROL b/ports/boost-format/CONTROL
index 9e0c7d119c..e41e308936 100644
--- a/ports/boost-format/CONTROL
+++ b/ports/boost-format/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-format
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-optional, boost-smart-ptr, boost-throw-exception, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/format
 Description: Boost format module
diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake
index 89e7b76b79..6ec97f8abd 100644
--- a/ports/boost-format/portfile.cmake
+++ b/ports/boost-format/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/format
-    REF boost-1.72.0
-    SHA512 3f34504235e400714d2ca1c152f170d68903808f22970d9372c4221881c58cf4be1f188cf1a4b2ddcd52b79881cdecb0664b7ab66fa7057d529315feedaf0db3
+    REF boost-1.73.0
+    SHA512 fa6ba7ae064d7a9d8116554729ba75cc9c52bb51e6edf76df350e47854afc2d815f0e7a12b9f9240c5b2b51e055caa2510a917b637448d8f0801b32ed0aa7b42
     HEAD_REF master
 )
 
diff --git a/ports/boost-function-types/CONTROL b/ports/boost-function-types/CONTROL
index 9b85172845..f0e1a8c7fa 100644
--- a/ports/boost-function-types/CONTROL
+++ b/ports/boost-function-types/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-function-types
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/function_types
 Description: Boost function_types module
diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake
index 75b0ffe146..964993a49a 100644
--- a/ports/boost-function-types/portfile.cmake
+++ b/ports/boost-function-types/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/function_types
-    REF boost-1.72.0
-    SHA512 d1299cd5ad3364c37c08c7432341cb12fa08d03ebe66a26308df326bf1b90114fb8509120d7c379779507a7ca7d06a93f48a0f5e9bed96c15334817afd209590
+    REF boost-1.73.0
+    SHA512 b4cd2febca5286e293fc4c8c9c234190b675a173b29eb200a745f358120b9fd26681f9f74a84a5b910a66f82834c078f718e242aa4b08753a701b2d622e47078
     HEAD_REF master
 )
 
diff --git a/ports/boost-function/CONTROL b/ports/boost-function/CONTROL
index a6cc79b663..b55155be6d 100644
--- a/ports/boost-function/CONTROL
+++ b/ports/boost-function/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-function
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-integer, boost-preprocessor, boost-throw-exception, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/function
 Description: Boost function module
diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake
index 99191e3150..e70defff5f 100644
--- a/ports/boost-function/portfile.cmake
+++ b/ports/boost-function/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/function
-    REF boost-1.72.0
-    SHA512 bc2b78954c9a0a0ebbf9513132698c67aa39da903099faf922ae769e9f3a70e78c951fca9f35d3f3e9bfc14750ab47f2ae222f9c676a55a770edd6352e91e778
+    REF boost-1.73.0
+    SHA512 5445ee22193ba369394f9a66dd47c13d89c080c7286ce12fea15f1e09b77dc036f7e037fba971dcce46a24f48824031a93d9d91ab6c4ddf841c4105c168652ac
     HEAD_REF master
 )
 
diff --git a/ports/boost-functional/CONTROL b/ports/boost-functional/CONTROL
index 4184c15397..0e1c10292b 100644
--- a/ports/boost-functional/CONTROL
+++ b/ports/boost-functional/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-functional
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-mpl, boost-preprocessor, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/functional
 Description: Boost functional module
diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake
index c4cb152e92..e2ddaf9792 100644
--- a/ports/boost-functional/portfile.cmake
+++ b/ports/boost-functional/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/functional
-    REF boost-1.72.0
-    SHA512 930c4cbd930511157e28e6587208093b3af2cd61b0657f3e08dc2628502575d2753c0c8ce87eedc5382c880bdf394666abef36833f510784f91f9d60213f998d
+    REF boost-1.73.0
+    SHA512 0f5655074e0a8fb93c52c9fa76d3ae4eb2071c9124112538bd94cce1af64059575c322f60cc92fa117b1ae17816578e7d0300d45e2000adc5ac090c44e8c2a28
     HEAD_REF master
 )
 
diff --git a/ports/boost-fusion/CONTROL b/ports/boost-fusion/CONTROL
index f1a878f529..1ad59f8ffc 100644
--- a/ports/boost-fusion/CONTROL
+++ b/ports/boost-fusion/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-fusion
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/fusion
 Description: Boost fusion module
diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake
index f4fa102110..9bc665dc5c 100644
--- a/ports/boost-fusion/portfile.cmake
+++ b/ports/boost-fusion/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/fusion
-    REF boost-1.72.0
-    SHA512 09fea2ec1c698d776555b4aecf9cff4fcfe503bcc8639574070a2ea7b5ecea26358d005e1aa3b704af96b4086e64181ccbe07e7005b16b5c307bafb15aea4949
+    REF boost-1.73.0
+    SHA512 92df3bf4169b9aa7c1fead168285db44e5b5cfb61cfcdcaab51a1c3bc78c36697a68665ef56d17d60f31f93faa4327e384b43d28e9d5f5337ad7d65b2c42410c
     HEAD_REF master
 )
 
diff --git a/ports/boost-geometry/CONTROL b/ports/boost-geometry/CONTROL
index 3bfa9f6a38..e67e7d2498 100644
--- a/ports/boost-geometry/CONTROL
+++ b/ports/boost-geometry/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-geometry
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/geometry
 Description: Boost geometry module
diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake
index f35cacccc6..81c5b9520f 100644
--- a/ports/boost-geometry/portfile.cmake
+++ b/ports/boost-geometry/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/geometry
-    REF boost-1.72.0
-    SHA512 027ebad1216d88689d3f400417f8c81600c82e18f68720fc25ee6c609a30b2e4f0810cdc08b5f72cb4e89a279970fd7523794325b6e9456e023d27cb76f35f51
+    REF boost-1.73.0
+    SHA512 0063650b1a262b6d4812aa995f7670d8ea16cce862cd9d332e5b92dce8131e629732f6a78a82eaac03d8e53c55b5a8540687a3f054557059ff8434467f77022a
     HEAD_REF master
 )
 
diff --git a/ports/boost-gil/CONTROL b/ports/boost-gil/CONTROL
index b19f7905c4..0f9972c695 100644
--- a/ports/boost-gil/CONTROL
+++ b/ports/boost-gil/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-gil
-Version: 1.72.0
-Build-Depends: boost-assert, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-mp11, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-utility, boost-variant, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-assert, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-mp11, boost-numeric-conversion, boost-preprocessor, boost-utility, boost-variant, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/gil
 Description: Boost gil module
diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake
index 09349c6436..a88ba0948d 100644
--- a/ports/boost-gil/portfile.cmake
+++ b/ports/boost-gil/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/gil
-    REF boost-1.72.0
-    SHA512 b90e6b47372b40bbc813c187e94f8263a5879e872fe06d93d90fe98f57407acf5e3b63b6382eb11df2bd5608b16e0a627251186e45305bf033c13f5497374ce8
+    REF boost-1.73.0
+    SHA512 d7466e3d7b3dfad9545fbb659a4a8e4d95b42f06dcdfa2cc12f3839de04b003ae7ce27abc4089ec90870a8e2b2d7d350ea4c02da3d18eda111fc4abb32165ff3
     HEAD_REF master
 )
 
diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL
index 192c59948d..d08ab59fb4 100644
--- a/ports/boost-graph-parallel/CONTROL
+++ b/ports/boost-graph-parallel/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-graph-parallel
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, boost-filesystem (!uwp), boost-foreach, boost-function, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/graph_parallel
 Description: Boost graph_parallel module
diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake
index d76362bb7c..6da99a5912 100644
--- a/ports/boost-graph-parallel/portfile.cmake
+++ b/ports/boost-graph-parallel/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/graph_parallel
-    REF boost-1.72.0
-    SHA512 8ef6e2df93a6df52f03cde0ea42cb028c97c4f0be668b8baaf7f3447eef577f8272824afd9c990c61338bc2816824cb01fc7568906f1f621a0b2bb4bfcb48d26
+    REF boost-1.73.0
+    SHA512 95c7bee7ad2317a0b673d1c6179c7245fcd7f3176ab781dabe53cb16c021ef44b438763b4e97fb5139329102f7f65fc9c4a08b4f4d6d5b795a7821ea96473597
     HEAD_REF master
 )
 
diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL
index 672a188d77..9431f99833 100644
--- a/ports/boost-graph/CONTROL
+++ b/ports/boost-graph/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-graph
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test (!uwp), boost-throw-exception, boost-tti, boost-tuple, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive
 Homepage: https://github.com/boostorg/graph
 Description: Boost graph module
diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake
index db6b6ab40c..17d56c7493 100644
--- a/ports/boost-graph/portfile.cmake
+++ b/ports/boost-graph/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/graph
-    REF boost-1.72.0
-    SHA512 2ee57a6f418f3da68024dce4684f3b7541eed44b694d85f1fc71e784baee19e4c91234bfc198462937f8ce0625027fc5b51db956756dc07e17ec33b049d04c8f
+    REF boost-1.73.0
+    SHA512 689b9243cf9d36946f48ba0f880d7a09c6ef6a1e3a84a5fb2ea40f06c48adcd6f76aaab2c65372f24a961ca67041750ca8a16416c55b5e2a9a3a56d6537a482f
     HEAD_REF master
 )
 
diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL
index d9240c29f3..757901ddd9 100644
--- a/ports/boost-hana/CONTROL
+++ b/ports/boost-hana/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-hana
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/hana
 Description: Boost hana module
diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake
index db29d0bc4f..ddae23148b 100644
--- a/ports/boost-hana/portfile.cmake
+++ b/ports/boost-hana/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/hana
-    REF boost-1.72.0
-    SHA512 aeb76085f7f37cb9c862c0aadddef6710123abf263e1b1ea2911c93a8fe0b9541baac01b5dfdf6fb5b35a77f9f225b810feba6c59c02f49eb440fc906043e3ed
+    REF boost-1.73.0
+    SHA512 24b34acaae623d23898041cc5350f47ae801601138c2380f8e36ca7f7527a83ffa7f62e5082ee1c60e461fd804d3cb7af5465a354d7aba393ad0be74cec4abf0
     HEAD_REF master
 )
 
diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL
index f785322b8b..743b928119 100644
--- a/ports/boost-heap/CONTROL
+++ b/ports/boost-heap/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-heap
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-integer, boost-intrusive, boost-iterator, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/heap
 Description: Boost heap module
diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake
index bde09f4c2a..d9c6256086 100644
--- a/ports/boost-heap/portfile.cmake
+++ b/ports/boost-heap/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/heap
-    REF boost-1.72.0
-    SHA512 97afd5a1081deace5cdfbabb58d0b1d3fda09c496e086aa38de29efcd6253ce491db21c64267b01c7f6d2c67ba508447dcdee0949c4ef8141010e0e2c97d66bb
+    REF boost-1.73.0
+    SHA512 5607f3b9601f08e52fd03d04fe7b78604af96641d48d48ddd9b78443065f700f3317efcb0c0ff600e13a08ea6292938993f71964c2c6ec87589c1f27bac5c0d7
     HEAD_REF master
 )
 
diff --git a/ports/boost-histogram/CONTROL b/ports/boost-histogram/CONTROL
index 439a50983d..047b90eac0 100644
--- a/ports/boost-histogram/CONTROL
+++ b/ports/boost-histogram/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-histogram
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-mp11, boost-serialization, boost-throw-exception, boost-variant2, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/histogram
 Description: Boost histogram module
diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake
index 4ed3dc97eb..07961a17cc 100644
--- a/ports/boost-histogram/portfile.cmake
+++ b/ports/boost-histogram/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/histogram
-    REF boost-1.72.0
-    SHA512 b33a8728012eaa98d9b7da9cfb20baecbdc53f08dad150a669ba3c94a13d08f3b5ffab803dd961124e7ed2c9d6c4de8ae3c71ef317fa97eb8a7383f76cf06d6a
+    REF boost-1.73.0
+    SHA512 b070f0fcbf5e285fda47861db903bc11f60122415dfb212c81b8eaafcf346364dfaf201ab2c759fb5547a5c34825ec528c8b19b88a7840fe51cc28b10f8f1d92
     HEAD_REF master
 )
 
diff --git a/ports/boost-hof/CONTROL b/ports/boost-hof/CONTROL
index 67555de696..dd09c384f2 100644
--- a/ports/boost-hof/CONTROL
+++ b/ports/boost-hof/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-hof
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/hof
 Description: Boost hof module
diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake
index 5076a57a5d..0734676d76 100644
--- a/ports/boost-hof/portfile.cmake
+++ b/ports/boost-hof/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/hof
-    REF boost-1.72.0
-    SHA512 69395b84e8deecb636b81654c6957f159d22505c50a2e96510e412bc0e4bfee2bb14c030b292d4dc8902740e6e5a5ee63ea3b018598ceb77d012fa0ff29ef795
+    REF boost-1.73.0
+    SHA512 20284cf8f887a28842244955bf2d8cc4fa4b519f27ef7bed93308c5bddd8a3f19a58627cdc0d4f6e6c7798be64491604f961bef05329dedd79a689316a2e93e2
     HEAD_REF master
 )
 
diff --git a/ports/boost-icl/CONTROL b/ports/boost-icl/CONTROL
index 10bd520c16..29947c371b 100644
--- a/ports/boost-icl/CONTROL
+++ b/ports/boost-icl/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-icl
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-concept-check, boost-config, boost-container, boost-date-time, boost-detail, boost-iterator, boost-move, boost-mpl, boost-range, boost-rational, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/icl
 Description: Boost icl module
diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake
index e75c57a76a..58ba3409ad 100644
--- a/ports/boost-icl/portfile.cmake
+++ b/ports/boost-icl/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/icl
-    REF boost-1.72.0
-    SHA512 dd5666d04a3c849a5f59eccba767e2b733673a39851b67cab0e6cfb708be5f6fc1fdda6f9e1d29def1ca267533586ed0fdc2ece47048fb601556edfa1357131b
+    REF boost-1.73.0
+    SHA512 806caed377cf0bb70fd65fe1d9524f5cac834094cbfbec8f874ec1f742887837033c53ddd4036bd733d5758e67ffc0a9f5d389dfc0fa3dc06fda6ab82f21e750
     HEAD_REF master
 )
 
diff --git a/ports/boost-integer/CONTROL b/ports/boost-integer/CONTROL
index 4b21567f33..bb7400c9bf 100644
--- a/ports/boost-integer/CONTROL
+++ b/ports/boost-integer/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-integer
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/integer
 Description: Boost integer module
diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake
index 246ac0e116..276c6c0449 100644
--- a/ports/boost-integer/portfile.cmake
+++ b/ports/boost-integer/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/integer
-    REF boost-1.72.0
-    SHA512 942d0b402ae206908c8fa0a5b0705196acf5c9d1068d3e5aba92a11257afbe5fd4d95aaf6c50353bdde6346c6cf5e336db461b81faa3ff81f12b729c4af1fff6
+    REF boost-1.73.0
+    SHA512 053d900e23ab58496cbfa3d05dd41f46f3ba3ab0e50719166c2cb239cbdfc0ad6966f67c0e8b688cffaec29b674451d1f99f211107a8cab92cb10d8ac99c478f
     HEAD_REF master
 )
 
diff --git a/ports/boost-interprocess/CONTROL b/ports/boost-interprocess/CONTROL
index 8f336d69c1..313b7dcf83 100644
--- a/ports/boost-interprocess/CONTROL
+++ b/ports/boost-interprocess/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-interprocess
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-integer, boost-intrusive, boost-move, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/interprocess
 Description: Boost interprocess module
diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake
index e394de9a55..554fe2587d 100644
--- a/ports/boost-interprocess/portfile.cmake
+++ b/ports/boost-interprocess/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/interprocess
-    REF boost-1.72.0
-    SHA512 8fddddfe852d8ee34be5d604c18f6922ca3f80cff97437cbc07250e976825876b491d1f3567d83ababa590fcb749e51876a7712ba3431237d5dda980feea8f40
+    REF boost-1.73.0
+    SHA512 7f95cea60be57e9019028a994aae785313b9cc480ab89eda68d7312ec7bef18c06597fa1f24bb007a40cc3d9f091f5cf17a0c9144b37f3a9d7d15bb78e36c15f
     HEAD_REF master
 )
 
diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL
index 0f2de0c453..6379c23192 100644
--- a/ports/boost-interval/CONTROL
+++ b/ports/boost-interval/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-interval
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-compatibility, boost-config, boost-logic, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/interval
 Description: Boost interval module
diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake
index 363dcbb44d..5f873f57f4 100644
--- a/ports/boost-interval/portfile.cmake
+++ b/ports/boost-interval/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/interval
-    REF boost-1.72.0
-    SHA512 f23960679409b1a23feb80eaba02a22902dcb1296317730b43a000c6cf94b2738b2a1e5323f9d1ec3ecc8f64d09ce646b40b529cebe7d733a22d3548c0f80589
+    REF boost-1.73.0
+    SHA512 f9bf091cbd81c6a3d30873207c2596b960487df6cdd9048535d37b9bbbaf60799298fc49feaf8553f04b7c8d19dd9cdb537df2f2300accb85862451d60e492da
     HEAD_REF master
 )
 
diff --git a/ports/boost-intrusive/CONTROL b/ports/boost-intrusive/CONTROL
index 50952bba14..6148aa65e0 100644
--- a/ports/boost-intrusive/CONTROL
+++ b/ports/boost-intrusive/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-intrusive
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-container-hash, boost-core, boost-integer, boost-move, boost-static-assert, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/intrusive
 Description: Boost intrusive module
diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake
index 3d13589870..aa53f02816 100644
--- a/ports/boost-intrusive/portfile.cmake
+++ b/ports/boost-intrusive/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/intrusive
-    REF boost-1.72.0
-    SHA512 f9c944cb189674ab8841def895c6b2213d6d500e9e366abe3a8ff91245561f3752411ff1ba29ad8bc0db37807ebc7fea4feccc6ad6ea04ebe43b928d384340ff
+    REF boost-1.73.0
+    SHA512 cbcb7238aee3609b2838d427fe2436915bc39f363320099592908765a1e143469e02383e0fb51c1f05f7f935fadd3738130c362bb6ba1da74a74f74daaee4d02
     HEAD_REF master
 )
 
diff --git a/ports/boost-io/CONTROL b/ports/boost-io/CONTROL
index 67c9ac8347..246a29dba8 100644
--- a/ports/boost-io/CONTROL
+++ b/ports/boost-io/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-io
-Version: 1.72.0
-Build-Depends: boost-detail, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-config, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/io
 Description: Boost io module
diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake
index ac0d93d799..f293e66d58 100644
--- a/ports/boost-io/portfile.cmake
+++ b/ports/boost-io/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/io
-    REF boost-1.72.0
-    SHA512 256549487e7cff387005eca8b654bc23664921800c94f71555119506b6dd10ba947d73c01171d9acc6cb867f6feb0e4b9c9e3c43371fa8ec82e321a40a5949b3
+    REF boost-1.73.0
+    SHA512 4217a043ef961e31c329b85ccf6c8fd48dfa44692d8f4c4b76e380580cc977d65b4f94a3efaaf880078c98d77056d76a8cd63f35fd95e6d9eb75865694c50740
     HEAD_REF master
 )
 
diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL
index eea49e6f02..b62a07c060 100644
--- a/ports/boost-iostreams/CONTROL
+++ b/ports/boost-iostreams/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-iostreams
-Version: 1.72.0-1
+Version: 1.73.0
 Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, liblzma, zlib, zstd
 Homepage: https://github.com/boostorg/iostreams
 Description: Boost iostreams module
diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake
index 634a8e2d82..b82b5fc144 100644
--- a/ports/boost-iostreams/portfile.cmake
+++ b/ports/boost-iostreams/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/iostreams
-    REF boost-1.72.0
-    SHA512 a1a57e7cd985f5962a96fc93d286a64065611dea1a17fdfe696455556f176b9429e4aaf2a5035808a40d0fb7e8dfb874ac6f2ddc33ecc44c25a8089034960403
+    REF boost-1.73.0
+    SHA512 0bfafdf0bd202a958b353c2b575957061427cd0e6c66ab7e826c2a7958ed57d89dc8a49b0e01e63689703404f335f964f390241fdc1982f374f10c4583fd89a2
     HEAD_REF master
     PATCHES Removeseekpos.patch
 )
diff --git a/ports/boost-iterator/CONTROL b/ports/boost-iterator/CONTROL
index ced432dae8..2bfefd0f96 100644
--- a/ports/boost-iterator/CONTROL
+++ b/ports/boost-iterator/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-iterator
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/iterator
 Description: Boost iterator module
diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake
index 2412c3312f..32cef07336 100644
--- a/ports/boost-iterator/portfile.cmake
+++ b/ports/boost-iterator/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/iterator
-    REF boost-1.72.0
-    SHA512 67f703777a0995263855af69a80ded81e151700a18daf141bea86243c0f9443c3a0110248c3c95c0bd0b575004eac618faff4f8a66820aac42d83ac03a152e3a
+    REF boost-1.73.0
+    SHA512 1f778d7bf3938756f2e31b062dd1dc4053714de2efc341f076c387ce60c2d03f76a19af38bc035fb41cdea93bc9355e3a4dc052b87004214bc3ac4d777125da1
     HEAD_REF master
 )
 
diff --git a/ports/boost-lambda/CONTROL b/ports/boost-lambda/CONTROL
index 2854625231..7401048ebb 100644
--- a/ports/boost-lambda/CONTROL
+++ b/ports/boost-lambda/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-lambda
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/lambda
 Description: Boost lambda module
diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake
index 0275fb93c1..7a5329c6c3 100644
--- a/ports/boost-lambda/portfile.cmake
+++ b/ports/boost-lambda/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lambda
-    REF boost-1.72.0
-    SHA512 b3b8cdc06742e17a53bef0c778c826803654052151c53cc22364078ed8fc12a2054bdf76f9926367b0017e1caca1058c6502260796a9a91124531bd8b506ca45
+    REF boost-1.73.0
+    SHA512 db3ccbdcd8763110c52be6c83ed80dd13dfe2fe6b24c615e334e0f9b2b282b6cb507794911922b275802530042e7a5ff1b536ae98c4454051c362682e3a8e229
     HEAD_REF master
 )
 
diff --git a/ports/boost-lexical-cast/CONTROL b/ports/boost-lexical-cast/CONTROL
index 0a38532ba8..7dba808a0e 100644
--- a/ports/boost-lexical-cast/CONTROL
+++ b/ports/boost-lexical-cast/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-lexical-cast
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/lexical_cast
 Description: Boost lexical_cast module
diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake
index 067954b96e..9aa4e994bb 100644
--- a/ports/boost-lexical-cast/portfile.cmake
+++ b/ports/boost-lexical-cast/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lexical_cast
-    REF boost-1.72.0
-    SHA512 6bd9006eaf146f727017560ce570468c41456752687d4fc2067985828113c56fdcd8e73eb26418dac30f992def99fa042f42cfadcd992f45d4c802909c6f53f6
+    REF boost-1.73.0
+    SHA512 ea6e8f58f38b8e45171f85b7983257ae920bdc2d77a9e9f5c12fcc1e899ecefcaf98278183233262540704cdb4f036b1d4f1cff73c40c38e16a8498117e97b31
     HEAD_REF master
 )
 
diff --git a/ports/boost-local-function/CONTROL b/ports/boost-local-function/CONTROL
index 9ea917c5e4..419c59dfd5 100644
--- a/ports/boost-local-function/CONTROL
+++ b/ports/boost-local-function/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-local-function
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-scope-exit, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/local_function
 Description: Boost local_function module
diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake
index 7104038ad8..42ed612d17 100644
--- a/ports/boost-local-function/portfile.cmake
+++ b/ports/boost-local-function/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/local_function
-    REF boost-1.72.0
-    SHA512 548e0be8f20e9920a5a7868224e723885a251ba3685759630a1f4025682ac1df54a3d6641192fc03a3b48a89039bef8dab4812957fd9ed5873b9124edb589b97
+    REF boost-1.73.0
+    SHA512 1d86cd356f91b295b011e15fc88118b452556ee27f33f16deb8b636c535ef1b4024533f5430ac43dab44ca6322a29accfe1d875ac4443af26832bab297dc0024
     HEAD_REF master
 )
 
diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL
index bd20f12833..cb63e046f4 100644
--- a/ports/boost-locale/CONTROL
+++ b/ports/boost-locale/CONTROL
@@ -1,10 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-locale
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
 Homepage: https://github.com/boostorg/locale
 Description: Boost locale module
 
 Feature: icu
-Description: ICU backend for Boost.Locale
 Build-Depends: icu
+Description: ICU backend for Boost.Locale
diff --git a/ports/boost-locale/b2-options.cmake b/ports/boost-locale/b2-options.cmake
new file mode 100644
index 0000000000..0a7deddca0
--- /dev/null
+++ b/ports/boost-locale/b2-options.cmake
@@ -0,0 +1,25 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    if("icu" IN_LIST FEATURES)
+        set(BOOST_LOCALE_ICU on)
+    else()
+        set(BOOST_LOCALE_ICU off)
+    endif()
+
+    list(APPEND B2_OPTIONS
+        boost.locale.iconv=off
+        boost.locale.posix=off
+        /boost/locale//boost_locale
+        boost.locale.icu=${BOOST_LOCALE_ICU}
+    )
+else()
+    find_library(LIBICONV_LIBRARY iconv)
+    get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY)
+
+    list(APPEND B2_OPTIONS
+        boost.locale.iconv=on
+        boost.locale.posix=on
+        /boost/locale//boost_locale
+        boost.locale.icu=off
+        -sICONV_PATH=${LIBICONV_DIR}
+    )
+endif()
\ No newline at end of file
diff --git a/ports/boost-locale/cmake-fragment.cmake b/ports/boost-locale/cmake-fragment.cmake
deleted file mode 100644
index 11d3ed70ed..0000000000
--- a/ports/boost-locale/cmake-fragment.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-find_library(LIBICONV_LIBRARY iconv)
-get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY)
-
-list(APPEND B2_OPTIONS
-    boost.locale.iconv=on
-    boost.locale.posix=on
-    /boost/locale//boost_locale
-    boost.locale.icu=off
-    -sICONV_PATH=${LIBICONV_LIBRARY}
-)
diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake
index 569e0acdf0..7bc25c7670 100644
--- a/ports/boost-locale/portfile.cmake
+++ b/ports/boost-locale/portfile.cmake
@@ -1,30 +1,17 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/locale
-    REF boost-1.72.0
-    SHA512 a32a92b4d393f31ca6ba35ceb3d8802b4764e8aa9c8ff5417f3a0f0c886f473b635d613af743764d244459dccb4e285ac6fa50a9eed8d10183fa9954c131b85d
+    REF boost-1.73.0
+    SHA512 0af88d8db7b18395a2b3668bcb51a5f32cd0de9acb9633572c2fb7edcdf06f354802392606394cf75ec4fd4d9cfe5c96351db766e55f8ef30f746b0a7017ad1f
     HEAD_REF master
 )
 
-if("icu" IN_LIST FEATURES)
-    set(BOOST_LOCALE_ICU on)
-else()
-    set(BOOST_LOCALE_ICU off)
-endif()
-
 include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(
     SOURCE_PATH ${SOURCE_PATH}
-    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/cmake-fragment.cmake"
-    OPTIONS
-        boost.locale.iconv=off
-        boost.locale.posix=off
-        /boost/locale//boost_locale
-        boost.locale.icu=${BOOST_LOCALE_ICU}
+    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
 )
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-lockfree/CONTROL b/ports/boost-lockfree/CONTROL
index c98dd8e168..1902d7fbcf 100644
--- a/ports/boost-lockfree/CONTROL
+++ b/ports/boost-lockfree/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-lockfree
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-align, boost-array, boost-assert, boost-atomic, boost-config, boost-core, boost-integer, boost-mpl, boost-parameter, boost-predef, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/lockfree
 Description: Boost lockfree module
diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake
index 73b225a119..d772790bc8 100644
--- a/ports/boost-lockfree/portfile.cmake
+++ b/ports/boost-lockfree/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lockfree
-    REF boost-1.72.0
-    SHA512 c77d8e8f4aa78b06ba67992352cbdc49203ea8ec56adcf535ce9b17f1126c08baf903b07cbf3023c7ce49ebb6d8ded094a30b74a6418fe1588c8feb972f22c01
+    REF boost-1.73.0
+    SHA512 3e32b3b56d505a1afa88abcca0cd17b7be5d63e9eb8953dbd26e503d20c6b4930bfb22392a6523add733a6ebabc3932b24344d700444c58bc625e5ee614759f8
     HEAD_REF master
 )
 
diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL
index f04a5309c3..c4aa6be65d 100644
--- a/ports/boost-log/CONTROL
+++ b/ports/boost-log/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-log
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-align, boost-array, boost-asio, boost-assert, boost-atomic, boost-bind, boost-build, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-filesystem (!uwp), boost-function-types, boost-fusion, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-parameter, boost-phoenix, boost-predef, boost-preprocessor, boost-property-tree, boost-proto, boost-random, boost-range, boost-regex, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-thread, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive
 Homepage: https://github.com/boostorg/log
 Description: Boost log module
diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake
index f6b1208abc..e4eb85f815 100644
--- a/ports/boost-log/portfile.cmake
+++ b/ports/boost-log/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/log
-    REF boost-1.72.0
-    SHA512 e6f0d5cdad916e8afc07129ab92b8d0b4e3290708e019fce242d0efa1cbc6a2390d58e19fc01a4044ea5317d5f896d8286bf6a83a99151bc1faf6c162755f44b
+    REF boost-1.73.0
+    SHA512 150013753d5060618c431ed9a819e3ec666bdba42cf3d463335ca49d66b8d6e800d5419332011f5ce05f19bc9c67a1cebc547279bf2931258ff7753a67796f2f
     HEAD_REF master
 )
 
diff --git a/ports/boost-logic/CONTROL b/ports/boost-logic/CONTROL
index d9c55e9d9e..78b62f1e34 100644
--- a/ports/boost-logic/CONTROL
+++ b/ports/boost-logic/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-logic
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/logic
 Description: Boost logic module
diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake
index 83dd01e4a2..cff0379f8b 100644
--- a/ports/boost-logic/portfile.cmake
+++ b/ports/boost-logic/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/logic
-    REF boost-1.72.0
-    SHA512 33ab03b3f6dd040ba79001040e4580d5fb1844c6dd42200103de2866f3a4074926b59df48763adb3333f7479f0f4f6e833e8908ae2a756dcd5ddfc7c8ddf93bc
+    REF boost-1.73.0
+    SHA512 2ef43bbd47f105d1eb6542838777fd66925d82a98475da2b10c967779cc621cbe75f1432cab55fd713e99b7c01ce3dfe483b97f1b91b016e4d491a3f094ff6ae
     HEAD_REF master
 )
 
diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL
index bd2e5d2300..b36f020e33 100644
--- a/ports/boost-math/CONTROL
+++ b/ports/boost-math/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-math
-Version: 1.72.0
-Build-Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-chrono, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mp11, boost-mpl, boost-predef, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mp11, boost-mpl, boost-predef, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/math
 Description: Boost math module
diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake
index 946dc10aa2..5d76c0007c 100644
--- a/ports/boost-math/portfile.cmake
+++ b/ports/boost-math/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/math
-    REF boost-1.72.0
-    SHA512 8d3372675d8943fa08b4fb5461947e8c909917307dad674edd6e695dd17b249fa18b1653346fe31d1c54445fa23a6658c5967008f6bd3e6ff831c03b08b1545d
+    REF boost-1.73.0
+    SHA512 9f264988efaa55865fed57e36243212fc0dbda42d00b42d712fc2eaa9581f9fee5af2f3c3ae645ff03fffcb626dbf96ea53c9dbffead755e758b90eb292420b3
     HEAD_REF master
 )
 
diff --git a/ports/boost-metaparse/CONTROL b/ports/boost-metaparse/CONTROL
index 0f42ea9c1b..f926b8e5e9 100644
--- a/ports/boost-metaparse/CONTROL
+++ b/ports/boost-metaparse/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-metaparse
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-mpl, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/metaparse
 Description: Boost metaparse module
diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake
index e86e54f6c7..4005234d93 100644
--- a/ports/boost-metaparse/portfile.cmake
+++ b/ports/boost-metaparse/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/metaparse
-    REF boost-1.72.0
-    SHA512 a52d7587f5988e14cad52d1720a7d380db4cf4253e0fb3f5b049a512f46a49c52536d7a5b56be7b48548c8bbbad80e74db64c07e8377399667221212af7aa27a
+    REF boost-1.73.0
+    SHA512 1f6ffc3bee835fa3b52309647d1253cb8a75cc6bbbe1a832928b0571d88dede0f28bd9364e84415d0a9146698a07cac41c51b69f449d56e15a2e6732a0411258
     HEAD_REF master
 )
 
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index 23a0de50f1..ef33db8823 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -10,6 +10,7 @@ set(VCPKG_PLATFORM_TOOLSET external)
 set(B2_OPTIONS)
 
 if(DEFINED BOOST_CMAKE_FRAGMENT)
+    message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}")
     include(${BOOST_CMAKE_FRAGMENT})
 endif()
 
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index b3a9559244..9265240854 100644
--- a/ports/boost-modular-build-helper/CONTROL
+++ b/ports/boost-modular-build-helper/CONTROL
@@ -1,2 +1,2 @@
 Source: boost-modular-build-helper
-Version: 1.72.0-2
+Version: 1.73.0
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam
index 688303b197..884284b499 100644
--- a/ports/boost-modular-build-helper/Jamroot.jam
+++ b/ports/boost-modular-build-helper/Jamroot.jam
@@ -1,5 +1,5 @@
-constant BOOST_VERSION : 1.72.0 ;
-constant BOOST_VERSION_ABI_TAG : 1_72 ;
+constant BOOST_VERSION : 1.73.0 ;
+constant BOOST_VERSION_ABI_TAG : 1_73 ;
 constant BOOST_JAMROOT_MODULE : $(__name__) ;
 
 import boostcpp ;
@@ -11,7 +11,7 @@ project boost : requirements
     <include>include&&"@CURRENT_INSTALLED_DIR@/include"
     <define>BOOST_ALL_NO_LIB=1
     <tag>@$(__name__).tag
-    @REQUIREMENTS@
+    @B2_REQUIREMENTS@
     ;
 
 rule boost-install ( libraries * )
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index 765d882b80..d166a35ca4 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -1,9 +1,20 @@
 function(boost_modular_build)
-    cmake_parse_arguments(_bm "" "SOURCE_PATH;REQUIREMENTS;BOOST_CMAKE_FRAGMENT" "OPTIONS" ${ARGN})
+    cmake_parse_arguments(_bm "" "SOURCE_PATH;BOOST_CMAKE_FRAGMENT" "" ${ARGN})
 
     if(NOT DEFINED _bm_SOURCE_PATH)
         message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_build.")
     endif()
+    
+    # Next CMake variables may be overridden in the file specified in ${_bm_BOOST_CMAKE_FRAGMENT}
+    set(B2_OPTIONS)
+    set(B2_OPTIONS_DBG)
+    set(B2_OPTIONS_REL)
+    set(B2_REQUIREMENTS) # this variable is used in the Jamroot.jam
+
+    if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)
+        message(STATUS "Including ${_bm_BOOST_CMAKE_FRAGMENT}")
+        include(${_bm_BOOST_CMAKE_FRAGMENT})
+    endif()
 
     # Todo: this serves too similar a purpose as vcpkg_find_acquire_program()
     if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
@@ -17,11 +28,11 @@ function(boost_modular_build)
     endif()
 
     if(NOT EXISTS "${BOOST_BUILD_PATH}")
-	if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+        if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
             message(FATAL_ERROR "The x64 boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:x64-linux`.") 
-	else()
+        else()
             message(FATAL_ERROR "The x86 boost-build tools must be installed to build for non-x86/x64 platforms. Please run `vcpkg install boost-build:x86-windows`.")
-	endif()
+        endif()
     endif()
 
     if(EXISTS "${BOOST_BUILD_PATH}/b2.exe")
@@ -33,13 +44,11 @@ function(boost_modular_build)
     endif()
 
     if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-        list(APPEND _bm_OPTIONS windows-api=store)
+        list(APPEND B2_OPTIONS windows-api=store)
     endif()
 
     set(_bm_DIR ${CURRENT_INSTALLED_DIR}/share/boost-build)
 
-    set(REQUIREMENTS ${_bm_REQUIREMENTS})
-
     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
         set(BOOST_LIB_PREFIX)
         set(BOOST_LIB_RELEASE_SUFFIX -vc140-mt.lib)
@@ -85,26 +94,12 @@ function(boost_modular_build)
         if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)
             list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")
         endif()
-        if(DEFINED VCPKG_PYTHON_EXECUTABLE)
-            list(APPEND configure_option "-DVCPKG_PYTHON_EXECUTABLE=${VCPKG_PYTHON_EXECUTABLE}")
-        endif()
-        if(DEFINED VCPKG_PYTHON_INCLUDE)
-            list(APPEND configure_option "-DVCPKG_PYTHON_INCLUDE=${VCPKG_PYTHON_INCLUDE}")
-        endif()
-        if(DEFINED VCPKG_PYTHON_LIBS_RELEASE)
-            list(APPEND configure_option "-DVCPKG_PYTHON_LIBS_RELEASE=${VCPKG_PYTHON_LIBS_RELEASE}")
-        endif()
-        if(DEFINED VCPKG_PYTHON_LIBS_DEBUG)
-            list(APPEND configure_option "-DVCPKG_PYTHON_LIBS_DEBUG=${VCPKG_PYTHON_LIBS_DEBUG}")
-        endif()
-        if(DEFINED VCPKG_PYTHON_VERSION)
-            list(APPEND configure_option "-DVCPKG_PYTHON_VERSION=${VCPKG_PYTHON_VERSION}")
-        endif()
         vcpkg_configure_cmake(
             SOURCE_PATH ${CURRENT_INSTALLED_DIR}/share/boost-build
             PREFER_NINJA
             OPTIONS
                 "-DPORT=${PORT}"
+                "-DFEATURES=${FEATURES}"
                 "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}"
                 "-DB2_EXE=${B2_EXE}"
                 "-DSOURCE_PATH=${_bm_SOURCE_PATH}"
@@ -159,7 +154,7 @@ function(boost_modular_build)
     ######################
     # Generate configuration
     ######################
-    list(APPEND _bm_OPTIONS
+    list(APPEND B2_OPTIONS
         -j${NUMBER_OF_PROCESSORS}
         --debug-configuration
         --debug-building
@@ -175,11 +170,11 @@ function(boost_modular_build)
         threading=multi
     )
     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-        list(APPEND _bm_OPTIONS threadapi=win32)
+        list(APPEND B2_OPTIONS threadapi=win32)
     else()
-        list(APPEND _bm_OPTIONS threadapi=pthread)
+        list(APPEND B2_OPTIONS threadapi=pthread)
     endif()
-    set(_bm_OPTIONS_DBG
+    set(B2_OPTIONS_DBG
          -sZLIB_BINARY=zlibd
          "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"
          -sBZIP2_BINARY=bz2d
@@ -190,7 +185,7 @@ function(boost_modular_build)
          "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"
     )
  
-    set(_bm_OPTIONS_REL
+    set(B2_OPTIONS_REL
          -sZLIB_BINARY=zlib
          "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"
          -sBZIP2_BINARY=bz2
@@ -203,62 +198,62 @@ function(boost_modular_build)
 
     # Properly handle compiler and linker flags passed by VCPKG
     if(VCPKG_CXX_FLAGS)
-        list(APPEND _bm_OPTIONS "cxxflags=${VCPKG_CXX_FLAGS}")
+        list(APPEND B2_OPTIONS "cxxflags=${VCPKG_CXX_FLAGS}")
     endif()
 
     if(VCPKG_CXX_FLAGS_RELEASE)
-        list(APPEND _bm_OPTIONS_REL "cxxflags=${VCPKG_CXX_FLAGS_RELEASE}")
+        list(APPEND B2_OPTIONS_REL "cxxflags=${VCPKG_CXX_FLAGS_RELEASE}")
     endif()
 
     if(VCPKG_CXX_FLAGS_DEBUG)
-        list(APPEND _bm_OPTIONS_DBG "cxxflags=${VCPKG_CXX_FLAGS_DEBUG}")
+        list(APPEND B2_OPTIONS_DBG "cxxflags=${VCPKG_CXX_FLAGS_DEBUG}")
     endif()
 
     if(VCPKG_C_FLAGS)
-        list(APPEND _bm_OPTIONS "cflags=${VCPKG_C_FLAGS}")
+        list(APPEND B2_OPTIONS "cflags=${VCPKG_C_FLAGS}")
     endif()
 
     if(VCPKG_C_FLAGS_RELEASE)
-        list(APPEND _bm_OPTIONS_REL "cflags=${VCPKG_C_FLAGS_RELEASE}")
+        list(APPEND B2_OPTIONS_REL "cflags=${VCPKG_C_FLAGS_RELEASE}")
     endif()
 
     if(VCPKG_C_FLAGS_DEBUG)
-        list(APPEND _bm_OPTIONS_DBG "cflags=${VCPKG_C_FLAGS_DEBUG}")
+        list(APPEND B2_OPTIONS_DBG "cflags=${VCPKG_C_FLAGS_DEBUG}")
     endif()
 
     if(VCPKG_LINKER_FLAGS)
-        list(APPEND _bm_OPTIONS "linkflags=${VCPKG_LINKER_FLAGS}")
+        list(APPEND B2_OPTIONS "linkflags=${VCPKG_LINKER_FLAGS}")
     endif()
 
     if(VCPKG_LINKER_FLAGS_RELEASE)
-        list(APPEND _bm_OPTIONS_REL "linkflags=${VCPKG_LINKER_FLAGS_RELEASE}")
+        list(APPEND B2_OPTIONS_REL "linkflags=${VCPKG_LINKER_FLAGS_RELEASE}")
     endif()
 
     if(VCPKG_LINKER_FLAGS_DEBUG)
-        list(APPEND _bm_OPTIONS_DBG "linkflags=${VCPKG_LINKER_FLAGS_DEBUG}")
+        list(APPEND B2_OPTIONS_DBG "linkflags=${VCPKG_LINKER_FLAGS_DEBUG}")
     endif()
 
     # Add build type specific options
     if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-        list(APPEND _bm_OPTIONS runtime-link=shared)
+        list(APPEND B2_OPTIONS runtime-link=shared)
     else()
-        list(APPEND _bm_OPTIONS runtime-link=static)
+        list(APPEND B2_OPTIONS runtime-link=static)
     endif()
 
     if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        list(APPEND _bm_OPTIONS link=shared)
+        list(APPEND B2_OPTIONS link=shared)
     else()
-        list(APPEND _bm_OPTIONS link=static)
+        list(APPEND B2_OPTIONS link=static)
     endif()
 
     if(VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
-        list(APPEND _bm_OPTIONS address-model=64 architecture=x86)
+        list(APPEND B2_OPTIONS address-model=64 architecture=x86)
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-        list(APPEND _bm_OPTIONS address-model=32 architecture=arm)
+        list(APPEND B2_OPTIONS address-model=32 architecture=arm)
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-        list(APPEND _bm_OPTIONS address-model=64 architecture=arm)
+        list(APPEND B2_OPTIONS address-model=64 architecture=arm)
     else()
-        list(APPEND _bm_OPTIONS address-model=32 architecture=x86)
+        list(APPEND B2_OPTIONS address-model=32 architecture=x86)
     endif()
 
     file(TO_CMAKE_PATH "${_bm_DIR}/nothing.bat" NOTHING_BAT)
@@ -286,9 +281,9 @@ function(boost_modular_build)
     configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)
 
     if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.")
-        list(APPEND _bm_OPTIONS toolset=msvc)
+        list(APPEND B2_OPTIONS toolset=msvc)
     elseif(VCPKG_PLATFORM_TOOLSET MATCHES "external")
-        list(APPEND _bm_OPTIONS toolset=gcc)
+        list(APPEND B2_OPTIONS toolset=gcc)
     else()
         message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'")
     endif()
@@ -304,8 +299,8 @@ function(boost_modular_build)
                 --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage
                 --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
                 --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam
-                ${_bm_OPTIONS}
-                ${_bm_OPTIONS_REL}
+                ${B2_OPTIONS}
+                ${B2_OPTIONS_REL}
                 variant=release
                 debug-symbols=on
             WORKING_DIRECTORY ${_bm_SOURCE_PATH}/build
@@ -322,8 +317,8 @@ function(boost_modular_build)
                 --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage
                 --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
                 --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam
-                ${_bm_OPTIONS}
-                ${_bm_OPTIONS_DBG}
+                ${B2_OPTIONS}
+                ${B2_OPTIONS_DBG}
                 variant=debug
             WORKING_DIRECTORY ${_bm_SOURCE_PATH}/build
             LOGNAME build-${TARGET_TRIPLET}-dbg
@@ -381,7 +376,7 @@ function(boost_modular_build)
         string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
         string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
         string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
-        string(REPLACE "-1_72" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
+        string(REPLACE "-1_73" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
         if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
             # nothing to do
         elseif(EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam
index 9f485fee20..685c26c4ed 100644
--- a/ports/boost-modular-build-helper/user-config.jam
+++ b/ports/boost-modular-build-helper/user-config.jam
@@ -24,8 +24,10 @@ else
 
 if "@PORT@" = "boost-python"
 {
-    using python : @VCPKG_PYTHON_VERSION@ : "@VCPKG_PYTHON_EXECUTABLE@" : "@VCPKG_PYTHON_INCLUDE@" : "@VCPKG_PYTHON_LIBS_RELEASE@" ;
-    using python : @VCPKG_PYTHON_VERSION@ : "@VCPKG_PYTHON_EXECUTABLE@" : "@VCPKG_PYTHON_INCLUDE@" : "@VCPKG_PYTHON_LIBS_DEBUG@" : <python-debugging>on ;
+    using python : @VCPKG_PYTHON3_VERSION@ : : "@VCPKG_PYTHON3_INCLUDE@" : "@VCPKG_PYTHON3_LIBS_RELEASE@" ;
+    using python : @VCPKG_PYTHON3_VERSION@ : : "@VCPKG_PYTHON3_INCLUDE@" : "@VCPKG_PYTHON3_LIBS_DEBUG@" : <python-debugging>on ;
+    using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_RELEASE@" ;
+    using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_DEBUG@" : <python-debugging>on ;
 }
 
 if "@PORT@" = "boost-mpi"
diff --git a/ports/boost-move/CONTROL b/ports/boost-move/CONTROL
index 0c05fa9629..062cb28023 100644
--- a/ports/boost-move/CONTROL
+++ b/ports/boost-move/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-move
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-static-assert, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/move
 Description: Boost move module
diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake
index ab131e299d..1ac77aa7d8 100644
--- a/ports/boost-move/portfile.cmake
+++ b/ports/boost-move/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/move
-    REF boost-1.72.0
-    SHA512 91bef5ad3b3d99ca90915a443e9fe2e8a21a8bed13446b3a9c57a3d9518f75a366cea171e727bdeee974dba5d7753aa1a42a4ec49de92a72c67d1a09acccd339
+    REF boost-1.73.0
+    SHA512 e8f096ab8fcde8905db80727f3f7405d64d3e03f6f865e0860943cb425bf3754baa9885854e40ff08b299dbff8bc1b7b605649bfd4073ec3d51b4cc4dddbe848
     HEAD_REF master
 )
 
diff --git a/ports/boost-mp11/CONTROL b/ports/boost-mp11/CONTROL
index a9dd74d580..61c956236f 100644
--- a/ports/boost-mp11/CONTROL
+++ b/ports/boost-mp11/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-mp11
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/mp11
 Description: Boost mp11 module
diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake
index 0824889fd1..855da9c5fe 100644
--- a/ports/boost-mp11/portfile.cmake
+++ b/ports/boost-mp11/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/mp11
-    REF boost-1.72.0
-    SHA512 289ad059add62f7f52a4de2602072d1162202646a4d634b450874fd6484342e8f7dd9e4d239f217c0c90852a2b57a0b6bc119ac811ec9837068ffebdcacc5ad3
+    REF boost-1.73.0
+    SHA512 04b2e3efbb75c29be19716fa985b90f47ecad9055a4ae24b18e49018317ec9d850322cc402f13f29a6187fc98943f41409dd39be3286dc61e2ee7a4e2f357547
     HEAD_REF master
 )
 
diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL
index 8592841935..e50c43848c 100644
--- a/ports/boost-mpi/CONTROL
+++ b/ports/boost-mpi/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-mpi
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-python, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, mpi
 Homepage: https://github.com/boostorg/mpi
 Description: Boost mpi module
diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake
index 7738b9d238..cd368ca5d5 100644
--- a/ports/boost-mpi/portfile.cmake
+++ b/ports/boost-mpi/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/mpi
-    REF boost-1.72.0
-    SHA512 84cbf590478a205379a9bd5b77c352265937297ff34a07926f279ebc39b779d4ac0cdfb87a069ccae7255f0ed2128a0d03e67b60058af61633bd45ca7b39e033
+    REF boost-1.73.0
+    SHA512 e731e0d6b4f047bf899cf8e88a9bd8da660cee54330a23c882d01f51e02e9e103f681fc6d067e4d125e17789b20821d09710a93598fd6c0792427ab709144b6f
     HEAD_REF master
 )
 
diff --git a/ports/boost-mpl/CONTROL b/ports/boost-mpl/CONTROL
index 2e3e701f94..a8ace29ef3 100644
--- a/ports/boost-mpl/CONTROL
+++ b/ports/boost-mpl/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-mpl
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/mpl
 Description: Boost mpl module
diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake
index 54541a8db9..1387c9082b 100644
--- a/ports/boost-mpl/portfile.cmake
+++ b/ports/boost-mpl/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/mpl
-    REF boost-1.72.0
-    SHA512 3baa17bbdeb8774ab583b4b3f42d7cd147eaef0f9188c45b6d18361b4cf10dcba679553b61dd2cbeae997ee77f94f0080a859516541121bcda16517983046296
+    REF boost-1.73.0
+    SHA512 1d3a131d589e8c2bea4637c5bb3d42beee60289201ee946435a797b4953cae6338b739b8c0abb0d8b1fb1ffacbdc6c609139424090e433a4f5aa98f6158a5c8d
     HEAD_REF master
 )
 
diff --git a/ports/boost-msm/CONTROL b/ports/boost-msm/CONTROL
index ef2ca0f283..93ca01a271 100644
--- a/ports/boost-msm/CONTROL
+++ b/ports/boost-msm/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-msm
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-any, boost-assert, boost-bind, boost-circular-buffer, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-parameter, boost-phoenix, boost-preprocessor, boost-proto, boost-serialization, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/msm
 Description: Boost msm module
diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake
index bf0a612f27..a019b49fa0 100644
--- a/ports/boost-msm/portfile.cmake
+++ b/ports/boost-msm/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/msm
-    REF boost-1.72.0
-    SHA512 24ed94cb47810286595acd53b139528db155c9044c85e4c886dd001afd98fd03ef261cca497e6c94b9c92fc695f3f82d87960ba09866bc2813cdb5dbe3f7dacf
+    REF boost-1.73.0
+    SHA512 b91810bf79cc22c1a3fb8a4554192b416099ea091bd5b55bc303d4baea86cceddd8e2a65515897920cf5b6975030ddf057a1f3540e6291e7a14729996c6060c2
     HEAD_REF master
 )
 
diff --git a/ports/boost-multi-array/CONTROL b/ports/boost-multi-array/CONTROL
index 7421325ccd..87a0f59920 100644
--- a/ports/boost-multi-array/CONTROL
+++ b/ports/boost-multi-array/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-multi-array
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-compatibility, boost-config, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/multi_array
 Description: Boost multi_array module
diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake
index 1596e67b20..63fcd9ad77 100644
--- a/ports/boost-multi-array/portfile.cmake
+++ b/ports/boost-multi-array/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/multi_array
-    REF boost-1.72.0
-    SHA512 478fd78df7862ddfae4d0a05b465766f3fda228a06ad9ef9e57bd8a1a5dc363599a92b5252d0eb1bf5bc1c4e3da234b78a07661bae6289344d1733d0411f4835
+    REF boost-1.73.0
+    SHA512 72e200ed03eaa25e354461f8f4bcddb0a216902e3198d5d653ce4f1dfe6aa637f4f81608e98e2e736ecfd42466dd62ffd10907b908daa4735dadef23bb5950b4
     HEAD_REF master
 )
 
diff --git a/ports/boost-multi-index/CONTROL b/ports/boost-multi-index/CONTROL
index 80bb1c1299..e1e212f817 100644
--- a/ports/boost-multi-index/CONTROL
+++ b/ports/boost-multi-index/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-multi-index
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-bind, boost-compatibility, boost-config, boost-container-hash, boost-core, boost-detail, boost-foreach, boost-functional, boost-integer, boost-iterator, boost-move, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/multi_index
 Description: Boost multi_index module
diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake
index 7adc679785..d9f72eeb9e 100644
--- a/ports/boost-multi-index/portfile.cmake
+++ b/ports/boost-multi-index/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/multi_index
-    REF boost-1.72.0
-    SHA512 bcab9d525948feb864b803eada609dd4d9483700d81d6f20b6beef4e7206c366b46ccc956cd399a9f6f3e3a3a44e693b94778e638050beeb74e8af832af2ec08
+    REF boost-1.73.0
+    SHA512 c0e7fa0a0970eaa285836218c4c283cfbb250dfaf5b88c487aa4913921bc9703982a73594c5b6c7b6f66790276219fa65c6522503286790522319c0b78656418
     HEAD_REF master
 )
 
diff --git a/ports/boost-multiprecision/CONTROL b/ports/boost-multiprecision/CONTROL
index c6d64221f8..f79abdf737 100644
--- a/ports/boost-multiprecision/CONTROL
+++ b/ports/boost-multiprecision/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-multiprecision
-Version: 1.72.0
-Build-Depends: boost-array, boost-assert, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-mpl, boost-predef, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-array, boost-assert, boost-atomic, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-mpl, boost-predef, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/multiprecision
 Description: Boost multiprecision module
diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake
index 41f3cb00a2..73afe33e98 100644
--- a/ports/boost-multiprecision/portfile.cmake
+++ b/ports/boost-multiprecision/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/multiprecision
-    REF boost-1.72.0
-    SHA512 c9ad9eab980d32c6676950352716eb5efadd621e208c856195a3ef4849cbf87fcc531f6f5a6e1c7d0d0cc9a00db455a0d25e2b1382408e8c5db163064ed52833
+    REF boost-1.73.0
+    SHA512 d6fffa67b9d00bdda81d52aee897274cb05fff45cd4238e4a58ab6de0342962415e022eed1c3c7164806cade2a218cdedde7a5062808d385b055ea24f3cc7658
     HEAD_REF master
 )
 
diff --git a/ports/boost-nowide/CONTROL b/ports/boost-nowide/CONTROL
new file mode 100644
index 0000000000..6408fa8a9b
--- /dev/null
+++ b/ports/boost-nowide/CONTROL
@@ -0,0 +1,6 @@
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+Source: boost-nowide
+Version: 1.73.0
+Build-Depends: boost-build, boost-config, boost-filesystem (!uwp), boost-integer, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/nowide
+Description: Boost nowide module
diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake
new file mode 100644
index 0000000000..e3a10d8626
--- /dev/null
+++ b/ports/boost-nowide/portfile.cmake
@@ -0,0 +1,14 @@
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO boostorg/nowide
+    REF boost-1.73.0
+    SHA512 2ef89ee386dbce7c88d78dba15b8301601cd83660acf1f5841e2297df92fd6b3d83999c7ae6d1d19cc06bc6ad721df1d206f7473b70c3ba6dc26aa1507ca5b5a
+    HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-numeric-conversion/CONTROL b/ports/boost-numeric-conversion/CONTROL
index 8a7df86c82..2854c6364a 100644
--- a/ports/boost-numeric-conversion/CONTROL
+++ b/ports/boost-numeric-conversion/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-numeric-conversion
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/numeric_conversion
 Description: Boost numeric_conversion module
diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake
index 485b4d781f..e00c81011b 100644
--- a/ports/boost-numeric-conversion/portfile.cmake
+++ b/ports/boost-numeric-conversion/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/numeric_conversion
-    REF boost-1.72.0
-    SHA512 23a6c380cf19e8509972a41d5ad2cddfcb4d65e50f1ba4832d80664ea0fb190cdaf7ef52bb625ee9f801989cc061f3e878ceeda59650072377e333d47f0be9e3
+    REF boost-1.73.0
+    SHA512 1486a47eeef33e9db44215e0d6bde6ce409bffdaa7d5384b223bb30c2d6f8902bbe08a1b0f4a619527846875637c6fb0c80a57c2988cb8df63c54d5a3adf4a3c
     HEAD_REF master
 )
 
diff --git a/ports/boost-odeint/CONTROL b/ports/boost-odeint/CONTROL
index 1a3c5e080e..a9855888bb 100644
--- a/ports/boost-odeint/CONTROL
+++ b/ports/boost-odeint/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-odeint
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-assert, boost-bind, boost-compute, boost-config, boost-core, boost-function, boost-fusion, boost-iterator, boost-math, boost-mpl, boost-multi-array, boost-preprocessor, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-units, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/odeint
 Description: Boost odeint module
diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake
index 021a0ec581..e3e797fd93 100644
--- a/ports/boost-odeint/portfile.cmake
+++ b/ports/boost-odeint/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/odeint
-    REF boost-1.72.0
-    SHA512 452a20edfe70dcc4db3409d97e1d6ff28a9dda8cb63b41a883a6d2a7c9e0b05069f7dfe2bddf9583e3df30508c397a187ec578ae117a556d2b4ae945f4dd1a32
+    REF boost-1.73.0
+    SHA512 b433d5693da30677ecae28ce529a2a4d53076a6ad46a7b0f6e523f17b2e3e713c7a1fe5dad426950a25465893a78c33cbced4463eb64b86499d2521950a7b436
     HEAD_REF master
 )
 
diff --git a/ports/boost-optional/CONTROL b/ports/boost-optional/CONTROL
index c1d04babb7..f81cfdca0c 100644
--- a/ports/boost-optional/CONTROL
+++ b/ports/boost-optional/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-optional
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/optional
 Description: Boost optional module
diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake
index bb076cb618..8ea05d2a90 100644
--- a/ports/boost-optional/portfile.cmake
+++ b/ports/boost-optional/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/optional
-    REF boost-1.72.0
-    SHA512 fa43a4458b8a08191be8bf6e9cd7e389b89ec74fb14fa1b66b0c444a1f552e41129224561ed834eedb63f2aa114340fdb9a3e59c49fe3b25f329bb26df80303b
+    REF boost-1.73.0
+    SHA512 07b4df2e20a5d4d9048786458b97bf59de414b46efc7dec89119064ca215cc4b755b950e0dc1212eacce79e78f95342caeb2a8e9fd067157f5f3d0be9f82f019
     HEAD_REF master
 )
 
diff --git a/ports/boost-outcome/0001-outcome-assert.patch b/ports/boost-outcome/0001-outcome-assert.patch
new file mode 100644
index 0000000000..68ea5a50ab
--- /dev/null
+++ b/ports/boost-outcome/0001-outcome-assert.patch
@@ -0,0 +1,11 @@
+--- a/include/boost/outcome/experimental/status-code/status_code_ptr.hpp     2020-04-28 09:23:14.792565200 +0100
++++ b/include/boost/outcome/experimental/status-code/status_code_ptr.hpp     2020-04-28 09:24:34.311741000 +0100
+@@ -103,7 +103,7 @@
+ #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
diff --git a/ports/boost-outcome/CONTROL b/ports/boost-outcome/CONTROL
index 2a04d14df1..e0e798af49 100644
--- a/ports/boost-outcome/CONTROL
+++ b/ports/boost-outcome/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-outcome
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-throw-exception, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/outcome
 Description: Boost outcome module
diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake
index b9e0d52d2e..8a6a94a7c7 100644
--- a/ports/boost-outcome/portfile.cmake
+++ b/ports/boost-outcome/portfile.cmake
@@ -1,13 +1,12 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/outcome
-    REF boost-1.72.0
-    SHA512 3de487dfcdb07cbf3184cf7a75c4ce476ea905ee24bfb967dff30ec8b1b29e57f1d52858ec9ef3ed4f865696a2ce768aedea406bdf4e6147c631138ffa5d3858
+    REF boost-1.73.0
+    SHA512 992518afaea71cdf0531675f2c3bc5329c2ebd79b65998c1f774bd913d5135ccf48f2f831c3d9481e33375f7df3c637da45a3bd75298e1d6637d517793c8cb86
     HEAD_REF master
+    PATCHES 0001-outcome-assert.patch
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/boost-parameter-python/CONTROL b/ports/boost-parameter-python/CONTROL
index b516fd5553..2b33da2879 100644
--- a/ports/boost-parameter-python/CONTROL
+++ b/ports/boost-parameter-python/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-parameter-python
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/parameter_python
 Description: Boost parameter_python module
diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake
index cdcf69fdcc..f570f63885 100644
--- a/ports/boost-parameter-python/portfile.cmake
+++ b/ports/boost-parameter-python/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/parameter_python
-    REF boost-1.72.0
-    SHA512 3d230ca500169fffb6c18b491bf94bf8091b56458621149710157e0386c2c6e01571c52170e4226bf6e86f2c8bf7f587da51b7e79f69a7653e0846e8dfdcc2fe
+    REF boost-1.73.0
+    SHA512 a2c05d5840465ed042dc2144d18b917cd68d1f89d0f616203663abbdf0d28c075b5bd2615384202e2584a4fbb663aa7fdee05d534a04c5c08f9a98fd901affbf
     HEAD_REF master
 )
 
diff --git a/ports/boost-parameter/CONTROL b/ports/boost-parameter/CONTROL
index 1479473ce8..14300e5054 100644
--- a/ports/boost-parameter/CONTROL
+++ b/ports/boost-parameter/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-parameter
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-function, boost-fusion, boost-mp11, boost-mpl, boost-optional, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/parameter
 Description: Boost parameter module
diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake
index 19f676f7f6..fd833d03c9 100644
--- a/ports/boost-parameter/portfile.cmake
+++ b/ports/boost-parameter/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/parameter
-    REF boost-1.72.0
-    SHA512 3f04d8f5b41aed4bc22a17cfa39ce75605d8a8d65fa6403dd16ee45bd960632869145ed5afce2af73b2cc12fa708fc6765d0fe6d9a11bda2efea07259007b558
+    REF boost-1.73.0
+    SHA512 63da1ec9dae999dac3542344a67b58e40928c453f87d7cd71fda858eeb2df48ff0056fe3eee550dff9912602d0595e0c90939dc2fad7851c90285abb72f57087
     HEAD_REF master
 )
 
diff --git a/ports/boost-phoenix/CONTROL b/ports/boost-phoenix/CONTROL
index 4afb397d68..f1c3495ce1 100644
--- a/ports/boost-phoenix/CONTROL
+++ b/ports/boost-phoenix/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-phoenix
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/phoenix
 Description: Boost phoenix module
diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake
index 83cea091f8..45209d5a59 100644
--- a/ports/boost-phoenix/portfile.cmake
+++ b/ports/boost-phoenix/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/phoenix
-    REF boost-1.72.0
-    SHA512 b35e523a4a0c6d42a12344c47131b6eb6f9f568a5bc06db826d5bb3bc64561856080a99c5e45b51d3fe7816153558936c5e9234771a5bbca852678341457eb8d
+    REF boost-1.73.0
+    SHA512 6919ea20e6bafac0a10024f3823badd23147cf4923ff0e2678bea6951cafc66ce08d12569bb273d6cd1cc15d104fabff6115e64033f446dc5ccb29d095ac6627
     HEAD_REF master
 )
 
diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL
index 92a6003273..9c98aae6cf 100644
--- a/ports/boost-poly-collection/CONTROL
+++ b/ports/boost-poly-collection/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-poly-collection
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mp11, boost-mpl, boost-type-erasure (!arm), boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/poly_collection
 Description: Boost poly_collection module
diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake
index 58f2e07db2..246f1fd793 100644
--- a/ports/boost-poly-collection/portfile.cmake
+++ b/ports/boost-poly-collection/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/poly_collection
-    REF boost-1.72.0
-    SHA512 4dda6cedc15f2f1ca1eb83735adcb275a91430e8c617513ecce121f4bfbf2d99d02206a3b45cbab80c34f3befa89615cb4b4cdb10234f58ab70e5fbe0d2ae134
+    REF boost-1.73.0
+    SHA512 6d04153c03634748ebe35509359c882a766dc8ed5a880cd927bfc3488d3364229140e87da6ada157fd7d4ade86a9d1f5d503a098eb2aa3773949722dea6f3ad6
     HEAD_REF master
 )
 
diff --git a/ports/boost-polygon/CONTROL b/ports/boost-polygon/CONTROL
index 242ccecffc..8bcf26dd8f 100644
--- a/ports/boost-polygon/CONTROL
+++ b/ports/boost-polygon/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-polygon
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-integer, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/polygon
 Description: Boost polygon module
diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake
index e37865d85c..fd57403034 100644
--- a/ports/boost-polygon/portfile.cmake
+++ b/ports/boost-polygon/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/polygon
-    REF boost-1.72.0
-    SHA512 a553975eacb0863f15540dc65e6ea34961aeab44e55ec2813cc03986d4bffeb8d726f6947ae410eea67ec4bf9e225f4763b0c0bf202077100dbeb857eafacd67
+    REF boost-1.73.0
+    SHA512 22e61f411a011ff5f77fc358b415dee57c2eb0297f9810de8fb8fd4c07a5a89ce03d51b827e3efe52a226d231a4ec85bdd6fc50fc0286c28116653926b525130
     HEAD_REF master
 )
 
diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL
index b966a3607b..bf069b92c4 100644
--- a/ports/boost-pool/CONTROL
+++ b/ports/boost-pool/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-pool
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/pool
 Description: Boost pool module
diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake
index 48ed69bb1b..0549c721a2 100644
--- a/ports/boost-pool/portfile.cmake
+++ b/ports/boost-pool/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/pool
-    REF boost-1.72.0
-    SHA512 87202bc193ee4d2de443b266f7bd786b6869691a164a8ec48949ce99a6101668153cc66d5cf407c4b55043d327fbc71b6c003ecdeb8965a976f8b4fb51610b0b
+    REF boost-1.73.0
+    SHA512 922c1caddc06cccd82b7137cc50e1ea2e5b02b227c3d568f06096c4237138a1345101e96d0450b5d2ff3ba55f89ae9a45200433e8e811efb3b3ae9c579f8466b
     HEAD_REF master
 )
 
diff --git a/ports/boost-predef/CONTROL b/ports/boost-predef/CONTROL
index cc9742439e..3a7c4700d4 100644
--- a/ports/boost-predef/CONTROL
+++ b/ports/boost-predef/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-predef
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/predef
 Description: Boost predef module
diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake
index 9e3ac2b7e1..981b4580e8 100644
--- a/ports/boost-predef/portfile.cmake
+++ b/ports/boost-predef/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/predef
-    REF boost-1.72.0
-    SHA512 794aac881b6ddc1605025b038dcd403d154c3919fe0c2fe1598775ef2ac58de7a1d7598ed552769818701e204586065adf5cb4d40d71072212e2f77e2fe86af7
+    REF boost-1.73.0
+    SHA512 f08b712296bfa7045208e094bbef80880368a334fef0ea6aa05c75a2312bc1543c0e95f045fa087e3d9e35fb006e0b07070ce5a21d274cbdc2e2bba55eec0a21
     HEAD_REF master
 )
 
diff --git a/ports/boost-preprocessor/CONTROL b/ports/boost-preprocessor/CONTROL
index a14caf68ef..418bf29553 100644
--- a/ports/boost-preprocessor/CONTROL
+++ b/ports/boost-preprocessor/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-preprocessor
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/preprocessor
 Description: Boost preprocessor module
diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake
index de531bd781..ececbba322 100644
--- a/ports/boost-preprocessor/portfile.cmake
+++ b/ports/boost-preprocessor/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/preprocessor
-    REF boost-1.72.0
-    SHA512 d7c96596edae7ab6282ce2bc53a1a7316fd60423a328904419cbd6836e4d86e0cf4d5948a1b2268b87de00b9c338f0435df12ddb540552d39ffa3b6c030d465c
+    REF boost-1.73.0
+    SHA512 80341ca2dd62b0fda2f89609f062d9a93b6865c25d86f8f30c8f49848d8ce563b92c2d424e5181994b32603111a06869367a801fca29dea3f5bc6c6ed2fedf2b
     HEAD_REF master
 )
 
diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL
index fd36ac0879..e67c76f933 100644
--- a/ports/boost-process/CONTROL
+++ b/ports/boost-process/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-process
-Version: 1.72.0-1
+Version: 1.73.0
 Build-Depends: boost-algorithm, boost-asio, boost-config, boost-core, boost-filesystem (!uwp), boost-fusion, boost-iterator, boost-move, boost-optional, boost-system, boost-tokenizer, boost-type-index, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/process
 Description: Boost process module
diff --git a/ports/boost-process/async_pipe_header.patch b/ports/boost-process/async_pipe_header.patch
deleted file mode 100644
index 7308f4b9da..0000000000
--- a/ports/boost-process/async_pipe_header.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/include/boost/process/async_pipe.hpp b/include/boost/process/async_pipe.hpp
-index 101fe1d59..a562432c0 100644
---- a/include/boost/process/async_pipe.hpp
-+++ b/include/boost/process/async_pipe.hpp
-@@ -47,6 +47,8 @@ class async_pipe
-      */
-     typedef platform_specific handle_type;
- 
-+    typedef typename handle_type::executor_type executor_type;
-+
-     /** Construct a new async_pipe, does automatically open the pipe.
-      * Initializes source and sink with the same io_context.
-      * @note Windows creates a named pipe here, where the name is automatically generated.
-diff --git a/include/boost/process/detail/posix/async_pipe.hpp b/include/boost/process/detail/posix/async_pipe.hpp
-index 725a07890..a82c057b9 100644
---- a/include/boost/process/detail/posix/async_pipe.hpp
-+++ b/include/boost/process/detail/posix/async_pipe.hpp
-@@ -23,6 +23,7 @@ class async_pipe
- public:
-     typedef int native_handle_type;
-     typedef ::boost::asio::posix::stream_descriptor handle_type;
-+    typedef typename handle_type::executor_type executor_type;
- 
-     inline async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios) {}
- 
-diff --git a/include/boost/process/detail/windows/async_pipe.hpp b/include/boost/process/detail/windows/async_pipe.hpp
-index 06d5f2d85..0b447f9b8 100644
---- a/include/boost/process/detail/windows/async_pipe.hpp
-+++ b/include/boost/process/detail/windows/async_pipe.hpp
-@@ -48,6 +48,7 @@ class async_pipe
- public:
-     typedef ::boost::winapi::HANDLE_ native_handle_type;
-     typedef ::boost::asio::windows::stream_handle   handle_type;
-+    typedef typename handle_type::executor_type executor_type;
- 
-     async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios, make_pipe_name(), true) {}
-     async_pipe(boost::asio::io_context & ios_source, boost::asio::io_context & ios_sink)
diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake
index e07c778e86..ae80396e7d 100644
--- a/ports/boost-process/portfile.cmake
+++ b/ports/boost-process/portfile.cmake
@@ -1,14 +1,11 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/process
-    REF boost-1.72.0
-    SHA512 bc881bcfa817e848151d90a0837683b9833395a7f7b76de76c40c96615bb1da7d10c0dae84f6b70b47fdf762a62869cb1700730a74fe123901803128f9194a52
+    REF boost-1.73.0
+    SHA512 6f03f492ebe7b4ceb6ee15f50767c43200f0d0a9237df53d9f893964eed9d28d5784b591b348425d4972d47742fcc78049753ac28a79afd0ca13e2824b2f4690
     HEAD_REF master
-    PATCHES async_pipe_header.patch
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL
index ea4ca76ee4..aed8ed80a5 100644
--- a/ports/boost-program-options/CONTROL
+++ b/ports/boost-program-options/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-program-options
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-any, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/program_options
 Description: Boost program_options module
diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake
index f86c70c258..8a173ea331 100644
--- a/ports/boost-program-options/portfile.cmake
+++ b/ports/boost-program-options/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/program_options
-    REF boost-1.72.0
-    SHA512 7bb2f7e81618ac815c1a53e5804b069fd7adfa448fbbf58d488691d38a84ffa59e6187313f7b24cb9bf954626c4e62a901c0c4f5452d9f156b0f6058a941cf66
+    REF boost-1.73.0
+    SHA512 d89963d46dd2bb65de1b15b2a1d707b5824724faad34afb649393fb4a80dbc227ee80918c1b8747f8e1ede5e80bcf908a39baea2590d879b9e776354755293b8
     HEAD_REF master
 )
 
diff --git a/ports/boost-property-map/CONTROL b/ports/boost-property-map/CONTROL
index f7b8266188..58c59141e9 100644
--- a/ports/boost-property-map/CONTROL
+++ b/ports/boost-property-map/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-property-map
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-multi-index, boost-optional, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/property_map
 Description: Boost property_map module
diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake
index a545697e59..17800f14b2 100644
--- a/ports/boost-property-map/portfile.cmake
+++ b/ports/boost-property-map/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/property_map
-    REF boost-1.72.0
-    SHA512 7e9433810073a78be7e6e1b41ec5b605747ae582c76b1d2f8a9dde005b8ca175a01a9f6e9075bc85647b163a81a97fe2ee5537e0554bd82a393e73a3ecdb2202
+    REF boost-1.73.0
+    SHA512 e79ec94f850ebfcbb85c29536d552299c8d81e328b22a2690dbef1665ac2b4c2e2c33cf2577fd0800a04fc94fbf4b9b8aeafb3646736abf7739373d0760d4e91
     HEAD_REF master
 )
 
diff --git a/ports/boost-property-tree/CONTROL b/ports/boost-property-tree/CONTROL
index 0b9036d7e9..ed7e3a47a9 100644
--- a/ports/boost-property-tree/CONTROL
+++ b/ports/boost-property-tree/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-property-tree
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-any, boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-format, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/property_tree
 Description: Boost property_tree module
diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake
index a4ed458473..21a6169747 100644
--- a/ports/boost-property-tree/portfile.cmake
+++ b/ports/boost-property-tree/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/property_tree
-    REF boost-1.72.0
-    SHA512 dfe8cb719c0f14515dfcc017b25081dc61b140e82b3733c1f4485725405ac58bb29f068a9e1e601c60270d591af16d28c033f04b819efae9cf2f329041595985
+    REF boost-1.73.0
+    SHA512 67cdc239ea2535b4f2d364342b7cc4bac212ec2e97d4fcb624518b32cd9d014cf3f8c5d0f21d15f97c118b55c5c2a157e794f6a4c5698ac7e52ee2fc1fdaa4ac
     HEAD_REF master
 )
 
diff --git a/ports/boost-proto/CONTROL b/ports/boost-proto/CONTROL
index a54095148a..f1ab493789 100644
--- a/ports/boost-proto/CONTROL
+++ b/ports/boost-proto/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-proto
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/proto
 Description: Boost proto module
diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake
index 4753f89482..3187f0c255 100644
--- a/ports/boost-proto/portfile.cmake
+++ b/ports/boost-proto/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/proto
-    REF boost-1.72.0
-    SHA512 a725ad97f837758bc9ea2b7523f34074144c95d548eae330cd8eaa8f6b9eaa4c0107f65849f5af050f3005cc0ab1ea529c87b443c471b040ef9318e8597674bd
+    REF boost-1.73.0
+    SHA512 e5faf783ed1f8830f641e42265ed50f5eb634ff6f0f3783268add5278889145e9c1554838b653d45770b5dfdfaa577f37567f40ab6c0f615d3d811229e18794a
     HEAD_REF master
 )
 
diff --git a/ports/boost-ptr-container/CONTROL b/ports/boost-ptr-container/CONTROL
index 3e747d138a..248a3318b7 100644
--- a/ports/boost-ptr-container/CONTROL
+++ b/ports/boost-ptr-container/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-ptr-container
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/ptr_container
 Description: Boost ptr_container module
diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake
index 8e08e5406a..dc0861d038 100644
--- a/ports/boost-ptr-container/portfile.cmake
+++ b/ports/boost-ptr-container/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/ptr_container
-    REF boost-1.72.0
-    SHA512 6b46f3a7f8a1291fb7fbc52915a34d33c411a0c2408a657658554bac73c8f1f538496d205ca34ef5f1919061676b8c3d43c06d63dfe71f34f72c1c6f1aa11f7d
+    REF boost-1.73.0
+    SHA512 342c9067dbeddc0a2b20b8493cd21ea9f65836260643a0e36fc6bff5ff3cb9c452382a2e4101fe8f472518dd49fffc915423bad7bc3edb5ebc915a917edb5d61
     HEAD_REF master
 )
 
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL
index b1e0cba236..011f68fcde 100644
--- a/ports/boost-python/CONTROL
+++ b/ports/boost-python/CONTROL
@@ -1,6 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-python
-Version: 1.72.0-1
+Version: 1.73.0
 Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3
 Homepage: https://github.com/boostorg/python
 Description: Boost python module
+
+Feature: python2
+Build-Depends: python2 (windows)
+Description: Build with Python2 support
diff --git a/ports/boost-python/b2-options.cmake b/ports/boost-python/b2-options.cmake
new file mode 100644
index 0000000000..5cc0a8da01
--- /dev/null
+++ b/ports/boost-python/b2-options.cmake
@@ -0,0 +1,23 @@
+set(BUILD_PYTHON_VERSIONS)
+
+if("python2" IN_LIST FEATURES)
+    # Find Python2 libraries. Can't use find_package here, but we already know where everything is
+    file(GLOB VCPKG_PYTHON2_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python2.*")
+    set(VCPKG_PYTHON2_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
+    set(VCPKG_PYTHON2_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
+    string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON2_VERSION "${VCPKG_PYTHON2_INCLUDE}")
+    list(APPEND BUILD_PYTHON_VERSIONS "${VCPKG_PYTHON2_VERSION}")
+endif()
+
+# Find Python3 libraries. Can't use find_package here, but we already know where everything is
+file(GLOB VCPKG_PYTHON3_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python3.*")
+set(VCPKG_PYTHON3_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
+set(VCPKG_PYTHON3_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
+string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON3_VERSION "${VCPKG_PYTHON3_INCLUDE}")
+list(APPEND BUILD_PYTHON_VERSIONS "${VCPKG_PYTHON3_VERSION}")
+
+string(REPLACE ";" "," BUILD_PYTHON_VERSIONS "${BUILD_PYTHON_VERSIONS}")
+
+list(APPEND B2_OPTIONS
+    python=${BUILD_PYTHON_VERSIONS}
+)
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake
index d81d6889cd..ee7885d5e7 100644
--- a/ports/boost-python/portfile.cmake
+++ b/ports/boost-python/portfile.cmake
@@ -1,24 +1,17 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/python
-    REF boost-1.72.0
-    SHA512 9e2214f45b6b7e269caeba3decf2b79df9d1addc711aa65b75273e5fef9ff7423d400e4f11a904f932759b32a5c7e699441961494e061c8dd9c966da1f5b8fef
+    REF boost-1.73.0
+    SHA512 de3523e39814ab6d1bfd69e77983e31f43be16e57c2ad2fe0ff5b67bfcc03ed35ee90a0365acd62c05640e25de223e2885401d03fce62cde47ba3329ada6f495
     HEAD_REF master
 )
 
-# Find Python3 executable
-vcpkg_find_acquire_program(PYTHON3)
-set(VCPKG_PYTHON_EXECUTABLE "${PYTHON3}")
-# Find Python3 libraries. Can't use find_package here, but we already know where everything is
-file(GLOB VCPKG_PYTHON_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python3.*")
-set(VCPKG_PYTHON_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
-set(VCPKG_PYTHON_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
-string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON_VERSION "${VCPKG_PYTHON_INCLUDE}")
 include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
-boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
+boost_modular_build(
+    SOURCE_PATH ${SOURCE_PATH}
+    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
+)
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-qvm/CONTROL b/ports/boost-qvm/CONTROL
index 3cd1cc43f5..e9ab139c87 100644
--- a/ports/boost-qvm/CONTROL
+++ b/ports/boost-qvm/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-qvm
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/qvm
 Description: Boost qvm module
diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake
index 478fda446e..575c8f80c1 100644
--- a/ports/boost-qvm/portfile.cmake
+++ b/ports/boost-qvm/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/qvm
-    REF boost-1.72.0
-    SHA512 8609b636d27934c6bc9eb7fc1123a3f231f60055348fbfe542ce6507c29e511364b1ea3b5a21cb2a57576e489f724221663ecdcdf09e0a9e6c739d80d83aaed7
+    REF boost-1.73.0
+    SHA512 c604bbabaae2edbc3a7a4fd86b7ae3698d3a69252d3e50c6c9f883e07e3639b0679a3c1ec6af07aaa34ae8e1d7ec2da3cac02a01ec9ba9b36b11e1738a149f45
     HEAD_REF master
 )
 
diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL
index a6c202b48b..f0d942eaf3 100644
--- a/ports/boost-random/CONTROL
+++ b/ports/boost-random/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-random
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-dynamic-bitset, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-multiprecision, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/random
 Description: Boost random module
diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake
index 68b52d0a33..eb7faf1649 100644
--- a/ports/boost-random/portfile.cmake
+++ b/ports/boost-random/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/random
-    REF boost-1.72.0
-    SHA512 825f74d302fb5aa6b1380cc767857c489c3f758c9553d5adecfdac399ec672f69a01de7071f138ef7ac0ae1aeeef7adbbded73e3def12f960ef248118bebf10f
+    REF boost-1.73.0
+    SHA512 ec6a1ea0bbc989f646f59b41286f578554b9c8c02489b3eca8af8affb3882ce4649a64403cef876f7b74b1b7cc3c64e57692634e0c75eb3c2a2a2811986d2bf8
     HEAD_REF master
 )
 
diff --git a/ports/boost-range/CONTROL b/ports/boost-range/CONTROL
index a62de18fa3..e422cf7633 100644
--- a/ports/boost-range/CONTROL
+++ b/ports/boost-range/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-range
-Version: 1.72.0
-Build-Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-integer, boost-iterator, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/range
 Description: Boost range module
diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake
index cd3af2323c..b75b6193c4 100644
--- a/ports/boost-range/portfile.cmake
+++ b/ports/boost-range/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/range
-    REF boost-1.72.0
-    SHA512 6f815133807bca94c57b3013060bd7d5a23a7f06255fcc1dec4a11dc3b9611c9962aae80029583c2b0ff0aa31a2e195ce8c781d956d8d1a16db2320a60edefa6
+    REF boost-1.73.0
+    SHA512 39f5358b50f65df6e8fe69e940bf22e149e1ad1810d9b982918f812f73568e4dd001f3ce04ce248f2c472801efe5cf667f6342b01e01f64c726107ee1a143c7e
     HEAD_REF master
 )
 
diff --git a/ports/boost-ratio/CONTROL b/ports/boost-ratio/CONTROL
index 32b39a37a0..944b8ad2e8 100644
--- a/ports/boost-ratio/CONTROL
+++ b/ports/boost-ratio/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-ratio
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/ratio
 Description: Boost ratio module
diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake
index 39941a2f15..448611029d 100644
--- a/ports/boost-ratio/portfile.cmake
+++ b/ports/boost-ratio/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/ratio
-    REF boost-1.72.0
-    SHA512 2f2b288c6288801f59a3c966fbcd7cd9c300566eb96d1a536ba4986fc570c8e5c98396948a8dbfc2efaba7f55840bf70809d0d5ef5fed424076c6427d6d95965
+    REF boost-1.73.0
+    SHA512 8e3b203d120447c346b25272da821e8579e39427f5f6d66442ed10d0741c3fa80c4fc9b97a96cf15a22261d43a66ccc9700c390e34bda2ed3ae880c2ea7d04e3
     HEAD_REF master
 )
 
diff --git a/ports/boost-rational/CONTROL b/ports/boost-rational/CONTROL
index 6240c08ea5..ea951f5770 100644
--- a/ports/boost-rational/CONTROL
+++ b/ports/boost-rational/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-rational
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/rational
 Description: Boost rational module
diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake
index 3ae45c25cc..5b8b093cfc 100644
--- a/ports/boost-rational/portfile.cmake
+++ b/ports/boost-rational/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/rational
-    REF boost-1.72.0
-    SHA512 971c52ccc78e21f7fcbc87e7eb5f4097dfe855aebb09c940aae5997dc7b420a652166374980d8218ad9daa8e81ffb81102968ea0281e80b5a65ae9d86c1087db
+    REF boost-1.73.0
+    SHA512 4682947e78f2812346a299c561e36582540c8920801b120656883cc9f2d31654efdebe8698ce38c00637a38db761e85015806c0d6e6b1dad51419b047de5157b
     HEAD_REF master
 )
 
diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL
index d3acd2daa8..16d9feafcd 100644
--- a/ports/boost-regex/CONTROL
+++ b/ports/boost-regex/CONTROL
@@ -1,10 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-regex
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-predef, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/regex
 Description: Boost regex module
 
 Feature: icu
-Description: ICU backend for Boost.Regex
 Build-Depends: icu
+Description: ICU backend for Boost.Regex
diff --git a/ports/boost-regex/b2-options.cmake b/ports/boost-regex/b2-options.cmake
new file mode 100644
index 0000000000..2ab54b7d94
--- /dev/null
+++ b/ports/boost-regex/b2-options.cmake
@@ -0,0 +1,3 @@
+if("icu" IN_LIST FEATURES)
+    set(B2_REQUIREMENTS "<library>/user-config//icuuc <library>/user-config//icudt <library>/user-config//icuin <define>BOOST_HAS_ICU=1")
+endif()
diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake
index adb7f05b51..7ef90f0f03 100644
--- a/ports/boost-regex/portfile.cmake
+++ b/ports/boost-regex/portfile.cmake
@@ -1,22 +1,17 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/regex
-    REF boost-1.72.0
-    SHA512 a5026e5c992698d6a41baee9e64ee3751eafc6aeba9aa79b90b62e5806185d0c230a08aaceaa89929c8fd0c3f36c1f1c54a9b9734eff3c11a34a4c9d1684a193
+    REF boost-1.73.0
+    SHA512 4ff9559b925a4901bc98762ed0fa21fe19f27bdf3c49932285bac830d52ddcb0d3e3d3197581b655bc0ed720916d9d2242ace4567cc4d457d0eafdd822114418
     HEAD_REF master
 )
 
-if("icu" IN_LIST FEATURES)
-    set(REQUIREMENTS "<library>/user-config//icuuc <library>/user-config//icudt <library>/user-config//icuin <define>BOOST_HAS_ICU=1")
-else()
-    set(REQUIREMENTS)
-endif()
-
 include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
-boost_modular_build(SOURCE_PATH ${SOURCE_PATH} REQUIREMENTS "${REQUIREMENTS}")
+boost_modular_build(
+    SOURCE_PATH ${SOURCE_PATH}
+    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
+)
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-safe-numerics/CONTROL b/ports/boost-safe-numerics/CONTROL
index 0ebda1fe91..ec3fb47d42 100644
--- a/ports/boost-safe-numerics/CONTROL
+++ b/ports/boost-safe-numerics/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-safe-numerics
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/safe_numerics
 Description: Boost safe_numerics module
diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake
index e55a7f44f2..79138569fd 100644
--- a/ports/boost-safe-numerics/portfile.cmake
+++ b/ports/boost-safe-numerics/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/safe_numerics
-    REF boost-1.72.0
-    SHA512 db76e87bbde2333e1c42181ce03f226013f2ee5a732d974a07ff364fc402956962dc6bfec2a67f5d2748fe057c00c19231d34a0e576042d572c501e2af284c6e
+    REF boost-1.73.0
+    SHA512 1046d8f8a69137d260dc57dc183c1761dbfcf89479ef4e7112d91de82ff858e57f919db35729a648f972d946bfeaa3d8a9f80f85a9544d1a4b144f8c888a2ef8
     HEAD_REF master
 )
 
diff --git a/ports/boost-scope-exit/CONTROL b/ports/boost-scope-exit/CONTROL
index ed06dded0a..3ce5556848 100644
--- a/ports/boost-scope-exit/CONTROL
+++ b/ports/boost-scope-exit/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-scope-exit
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-detail, boost-function, boost-preprocessor, boost-typeof, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/scope_exit
 Description: Boost scope_exit module
diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake
index f6bc41000c..6939227ba3 100644
--- a/ports/boost-scope-exit/portfile.cmake
+++ b/ports/boost-scope-exit/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/scope_exit
-    REF boost-1.72.0
-    SHA512 8837579911066863209efe739019993335f2ab1d40da42215016c63fe82aabdb9247d525633508f33e9547977807a388e0ff613210fb463bb8cd3fc9fc6132a5
+    REF boost-1.73.0
+    SHA512 ede97c68a1132fb20d410fa1700c8e7bf32b1a3821d24cc6829886fa2523ec5cc32ea4287902d9a3dda5aae34acf87030341a228677d558837dd864dd0f4dcc3
     HEAD_REF master
 )
 
diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL
index 8fcca87232..98643d815a 100644
--- a/ports/boost-serialization/CONTROL
+++ b/ports/boost-serialization/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-serialization
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/serialization
 Description: Boost serialization module
diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake
index c2ad392348..c25fc4fc9b 100644
--- a/ports/boost-serialization/portfile.cmake
+++ b/ports/boost-serialization/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/serialization
-    REF boost-1.72.0
-    SHA512 669297c64481721a16e679783cda319a375d18df9fb922fcb324060f08bdaa25a0713416005bfc6012d01a0f9523989732a3f213037a094c9626352a2ce40b6d
+    REF boost-1.73.0
+    SHA512 eb190ec91cfaa0de8a1060bf45f6dc6480e8a3844d59123722f1e8900cfda3080c919a542d3c4322ed4a6147acd5240d789e6d38f653507af61fedd77000c10f
     HEAD_REF master
 )
 
diff --git a/ports/boost-signals2/CONTROL b/ports/boost-signals2/CONTROL
index 167851591a..0b14606f5f 100644
--- a/ports/boost-signals2/CONTROL
+++ b/ports/boost-signals2/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-signals2
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-mpl, boost-optional, boost-parameter, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/signals2
 Description: Boost signals2 module
diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake
index bbfb544055..cc6d34b0b5 100644
--- a/ports/boost-signals2/portfile.cmake
+++ b/ports/boost-signals2/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/signals2
-    REF boost-1.72.0
-    SHA512 11305c225d184f1b3da1530c06493c2a65362f26c35938cbc3f6685500e7ee9c1abfcab4f5de161b33900e3bc102300d1fb80c2e68dac69b10fdcd25b3742124
+    REF boost-1.73.0
+    SHA512 a725caf89733b9180360d3d04747f8ef7fd68e5862814545a49f2bf1f2b262df77c4fa64b2434a876cb333be13916c8d2ec4e3a01bf877f0220240801fd87543
     HEAD_REF master
 )
 
diff --git a/ports/boost-smart-ptr/CONTROL b/ports/boost-smart-ptr/CONTROL
index d62deedc5c..9432dbd8d1 100644
--- a/ports/boost-smart-ptr/CONTROL
+++ b/ports/boost-smart-ptr/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-smart-ptr
-Version: 1.72.0
-Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/smart_ptr
 Description: Boost smart_ptr module
diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake
index 11c8c0df8b..4403d246c3 100644
--- a/ports/boost-smart-ptr/portfile.cmake
+++ b/ports/boost-smart-ptr/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/smart_ptr
-    REF boost-1.72.0
-    SHA512 c42b9179c596fe063be2416c7f0617cc2bfaf9719215d826de501f36f61a754a79898a0af7d1ce5286364a4f3ab153a85b8ada134f9feda959c7281d21ee4e09
+    REF boost-1.73.0
+    SHA512 af5c90fc24e92055afd47b35d5ea30712f76347843eeafd934801fc06a0563feddefc3989b086d86d9935e02c33f2ad00af84d726b2c91f70d5f170642c589cf
     HEAD_REF master
 )
 
diff --git a/ports/boost-sort/CONTROL b/ports/boost-sort/CONTROL
index 6f9121c853..e03f5a2e2f 100644
--- a/ports/boost-sort/CONTROL
+++ b/ports/boost-sort/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-sort
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-integer, boost-range, boost-serialization, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/sort
 Description: Boost sort module
diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake
index 4a74f3cdb9..7deff366b4 100644
--- a/ports/boost-sort/portfile.cmake
+++ b/ports/boost-sort/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/sort
-    REF boost-1.72.0
-    SHA512 79b26b004c01fd10443f07692913d13a3e38fb70f7efa46ba2d1f41e11ea474a4abeb4c0c5d0df70fa15a4f2f028b8b7e2a33e0c331b3bcbf11f7bf1a4a808d0
+    REF boost-1.73.0
+    SHA512 7a771fc0f49815b7df4213a92ed2a0ca6897523ebe28a5d00608949c94839ce167e9c8220f227b3dbbd04f300d915cc53a1501fcfb0f7ca9c7dc7fd2f3b26b1e
     HEAD_REF master
 )
 
diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL
index 5322241abf..b7fef0c183 100644
--- a/ports/boost-spirit/CONTROL
+++ b/ports/boost-spirit/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-spirit
-Version: 1.72.0
-Build-Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem (!uwp), boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem (!uwp), boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams (!uwp), boost-iterator, boost-locale (!uwp), boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread, boost-throw-exception, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/spirit
 Description: Boost spirit module
diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake
index 2a6e9c1a88..587cef8dc5 100644
--- a/ports/boost-spirit/portfile.cmake
+++ b/ports/boost-spirit/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/spirit
-    REF boost-1.72.0
-    SHA512 1454a5e11426af7fb8ab25fc7ae65ff05bd4d4e2aa58fe126666fcbd0dd9ad48b1a23a8530f46bd2d2fba35424d0817f4e00cde96018880479f4093a7a26c866
+    REF boost-1.73.0
+    SHA512 8080ebc70e590b98ffda162dcb36c45e2d0b654455f389ccb92643e9410915ec1a36c1c24fbd903d28832f965f3df22a08c56566d4a4023bb9feca1c9d548227
     HEAD_REF master
 )
 
diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL
index 4c4e64d2f4..6b726dbad7 100644
--- a/ports/boost-stacktrace/CONTROL
+++ b/ports/boost-stacktrace/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-stacktrace
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-predef, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/stacktrace
 Description: Boost stacktrace module
diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake
index 0d10f00f2f..6d55d293f6 100644
--- a/ports/boost-stacktrace/portfile.cmake
+++ b/ports/boost-stacktrace/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/stacktrace
-    REF boost-1.72.0
-    SHA512 91659618fbe49b1706b6adda865bcd733cfedae0b70849ca2c436412644b369a76b60df46160b5e7092a5f086c0c051459d8f9ca104e64469711b536805b4a0e
+    REF boost-1.73.0
+    SHA512 9d42d9aa57ed12b8f2004d576a77f63ebf8b8f620c2ca319a77d75a55376a4fbbc360413ae25bbfeb63071abcaeabb3fc58031ca1103acce212de4cc35d1652d
     HEAD_REF master
 )
 
diff --git a/ports/boost-statechart/CONTROL b/ports/boost-statechart/CONTROL
index 9368b6b9e1..7a670909ea 100644
--- a/ports/boost-statechart/CONTROL
+++ b/ports/boost-statechart/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-statechart
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-bind, boost-config, boost-conversion, boost-core, boost-detail, boost-function, boost-mpl, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/statechart
 Description: Boost statechart module
diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake
index 711058d634..ed0753f213 100644
--- a/ports/boost-statechart/portfile.cmake
+++ b/ports/boost-statechart/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/statechart
-    REF boost-1.72.0
-    SHA512 a0ad4bb97f23df477ba7852927a3bbc5a1877f6adcb784fc384c9c0d816cdd87eecc9dad4a7cf16433c81df8914858eb6eaae9456f69c763876e9cfc8700b609
+    REF boost-1.73.0
+    SHA512 911a4fc91281506b8d002bc965e547a2a7a2e2ecbcb9241cad2eee7aa59b35738061c68d82e0dc7f9ee0a44941f2c3ac264582769068a7804a3b9b00745b9255
     HEAD_REF master
 )
 
diff --git a/ports/boost-static-assert/CONTROL b/ports/boost-static-assert/CONTROL
index 5d726a3f36..94b4db7db8 100644
--- a/ports/boost-static-assert/CONTROL
+++ b/ports/boost-static-assert/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-static-assert
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/static_assert
 Description: Boost static_assert module
diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake
index f99310d63c..8df72cb32c 100644
--- a/ports/boost-static-assert/portfile.cmake
+++ b/ports/boost-static-assert/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/static_assert
-    REF boost-1.72.0
-    SHA512 7d1b70b6dcf34f661987180a2b4ae2662729f503761c4897e1f1b2869da7042f9102acfc8a95a8351dff0ebad5b1aea69be049f168aea3525db8cfab442fcdfa
+    REF boost-1.73.0
+    SHA512 5087a93e277c4b40c61182add7daa9891adab992a3b06f3e587772565f4a59b9b0a0163d11278d10f8e58e7b73340386644e91fd86522e0d7dc14ee295801978
     HEAD_REF master
 )
 
diff --git a/ports/boost-static-string/CONTROL b/ports/boost-static-string/CONTROL
new file mode 100644
index 0000000000..189847e527
--- /dev/null
+++ b/ports/boost-static-string/CONTROL
@@ -0,0 +1,6 @@
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+Source: boost-static-string
+Version: 1.73.0
+Build-Depends: boost-assert, boost-container-hash, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/static_string
+Description: Boost static_string module
diff --git a/ports/boost-disjoint-sets/portfile.cmake b/ports/boost-static-string/portfile.cmake
similarity index 53%
rename from ports/boost-disjoint-sets/portfile.cmake
rename to ports/boost-static-string/portfile.cmake
index a87d37e9a2..9582647c36 100644
--- a/ports/boost-disjoint-sets/portfile.cmake
+++ b/ports/boost-static-string/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO boostorg/disjoint_sets
-    REF boost-1.72.0
-    SHA512 aa48fed3cd909fbe9362e8173639c9ad9f3a0cce1809a7db12f8eaafaddb5bb1c295aa74ea0dc87d1fff1576587d7cfd3ddf7c8c7e475182d88397a56608df6a
+    REPO boostorg/static_string
+    REF boost-1.73.0
+    SHA512 b929dcbacebe9e754acb12a823078f79c5969636e208d7f050f8f80783f6fa86e57ae5591c0d424cd72438d26453d1f9337fbb3d5805185f244f17235ef36016
     HEAD_REF master
 )
 
diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL
index 7be055962d..65ab14b2a4 100644
--- a/ports/boost-system/CONTROL
+++ b/ports/boost-system/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-system
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/system
 Description: Boost system module
diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake
index 03f739a7a7..de154b860b 100644
--- a/ports/boost-system/portfile.cmake
+++ b/ports/boost-system/portfile.cmake
@@ -1,14 +1,12 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_buildpath_length_warning(37)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/system
-    REF boost-1.72.0
-    SHA512 b406d6f618feca96c098a053765b9f9b26fa4361e57bb6069eff9b379a758361be8010b479e8fdc21cbbad70f5918991ff07ffb730443c1e993c122a86107766
+    REF boost-1.73.0
+    SHA512 dd295f0388991b4957187e899d28bfa49a867b0887a3941784bf22fa01cb2028fbf453e341f1641260f6d360500f324ff8b43b92a0e15d876f45c28b415fdd86
     HEAD_REF master
 )
 
diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL
index e15fdb300d..e20a2c3430 100644
--- a/ports/boost-test/CONTROL
+++ b/ports/boost-test/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-test
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/test
 Description: Boost test module
diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake
index 2864d8ffb7..2a15e57f2f 100644
--- a/ports/boost-test/portfile.cmake
+++ b/ports/boost-test/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/test
-    REF boost-1.72.0
-    SHA512 3718942ae0e6e2a490723cfbd80b9d471f9798b8acb27b91b6581c6eada507b7f48c4725d1cfa693a101d80063dcf36cf7d007f631f1bf0033e69d15edc3c4eb
+    REF boost-1.73.0
+    SHA512 153c58b1f94e85efd2c0c0561f9701ff69006936659eb8f2f416399c57ab6b7eca6ea70ba74c7837789eef13dccdfeb6dab641d65f1af94effd6ff831b31c53c
     HEAD_REF master
 )
 
diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL
index 0f85b5c7fe..634ab045d6 100644
--- a/ports/boost-thread/CONTROL
+++ b/ports/boost-thread/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-thread
-Version: 1.72.0
-Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Version: 1.73.0
+Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/thread
 Description: Boost thread module
diff --git a/ports/boost-thread/b2-options.cmake b/ports/boost-thread/b2-options.cmake
index 07acc10b5c..198b23084e 100644
--- a/ports/boost-thread/b2-options.cmake
+++ b/ports/boost-thread/b2-options.cmake
@@ -1 +1,2 @@
+set(B2_REQUIREMENTS "<library>/boost/date_time//boost_date_time")
 list(APPEND B2_OPTIONS /boost/thread//boost_thread)
diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake
index 34c523bb76..de74f48d6d 100644
--- a/ports/boost-thread/portfile.cmake
+++ b/ports/boost-thread/portfile.cmake
@@ -1,21 +1,17 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/thread
-    REF boost-1.72.0
-    SHA512 2a149952bea4bf58b571de69fd81f9b0fbded75c762883f8611e9478ac853d9ba229f8fbb2168b8194f897465e77fd06bdcf75b140ad5d64defdadaccf56ce5a
+    REF boost-1.73.0
+    SHA512 732bf64b0c5ea8db327a429ba470e620ec0a8771e3fdaba9baf7080d0f4eb93f718813b7062881d3971bdf2b9254b460f82175d3f9fbd453a29153f87caa6c58
     HEAD_REF master
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(
     SOURCE_PATH ${SOURCE_PATH}
-    REQUIREMENTS "<library>/boost/date_time//boost_date_time"
-    OPTIONS /boost/thread//boost_thread
-    BOOST_CMAKE_FRAGMENT ${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake
+    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
 )
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-throw-exception/CONTROL b/ports/boost-throw-exception/CONTROL
index 7ece73b1e2..3f4d632c7a 100644
--- a/ports/boost-throw-exception/CONTROL
+++ b/ports/boost-throw-exception/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-throw-exception
-Version: 1.72.0
-Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/throw_exception
 Description: Boost throw_exception module
diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake
index 86a553943a..51f819711d 100644
--- a/ports/boost-throw-exception/portfile.cmake
+++ b/ports/boost-throw-exception/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/throw_exception
-    REF boost-1.72.0
-    SHA512 89df12b58fe10ec042ac91de21568f99463107291eed8e52810f5e220972b5ad5f7b4e9937455f8dfd60b0f68bae9e3e55c2213ba0586085b32642fa9dc02694
+    REF boost-1.73.0
+    SHA512 3188f7ce95a14aa791ce75914d5c03efb09f2138b694de93ce42eb54492c9f4b2fb8f98d8fe9944a60902f67949de5da741f7b3979617ad7e26d5f505d96274d
     HEAD_REF master
 )
 
diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL
index bfaa7f1c4e..063f50f1e1 100644
--- a/ports/boost-timer/CONTROL
+++ b/ports/boost-timer/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-timer
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-predef, boost-system, boost-throw-exception, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/timer
 Description: Boost timer module
diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake
index afe2e23e2d..ee109b9aa2 100644
--- a/ports/boost-timer/portfile.cmake
+++ b/ports/boost-timer/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/timer
-    REF boost-1.72.0
-    SHA512 e1ea0df4be43d68ed830a5ab9148af834328bd65457d40bb6449eab03768e7db165faa891f7e19d83ca330fc5160f21ab8299665056d46ab6cc8c8b017288919
+    REF boost-1.73.0
+    SHA512 4449b93cb45e861348e071b90fec68e08ec9abe2628709db494904a52ac33f5bdc02306cc501f5ac8b7c561de3a656979002ba5c0c4b862e393f1fc77ebc5f28
     HEAD_REF master
 )
 
diff --git a/ports/boost-tokenizer/CONTROL b/ports/boost-tokenizer/CONTROL
index 6942676806..e487b3d05c 100644
--- a/ports/boost-tokenizer/CONTROL
+++ b/ports/boost-tokenizer/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-tokenizer
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/tokenizer
 Description: Boost tokenizer module
diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake
index 60f834d0a9..505c613bf5 100644
--- a/ports/boost-tokenizer/portfile.cmake
+++ b/ports/boost-tokenizer/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/tokenizer
-    REF boost-1.72.0
-    SHA512 863c9a6382dd256f44060ff6b477b2a2c003f943b127961be3c24a05d18cf1c797a22649f478604b402009813606be7f1a9b25259ac1704cdd2d3ffeeb20237a
+    REF boost-1.73.0
+    SHA512 cef77b4fb338dfefac3dc0f7eeef99acc07dc7ae66795697f10b8ad595bec93ad5f3f0fe0c802651415ae2620856f6e3bbf1b0ed28dac9baa7685c2a98d581e4
     HEAD_REF master
 )
 
diff --git a/ports/boost-tti/CONTROL b/ports/boost-tti/CONTROL
index b3d0ea4334..9bdc4671ae 100644
--- a/ports/boost-tti/CONTROL
+++ b/ports/boost-tti/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-tti
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/tti
 Description: Boost tti module
diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake
index 0dee17ad64..4e0a8c1ae5 100644
--- a/ports/boost-tti/portfile.cmake
+++ b/ports/boost-tti/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/tti
-    REF boost-1.72.0
-    SHA512 ee68bc34266f44f597fcefb4485732f2790b81a7fe93a35fb5ad9c4bc23b1801503f8985508b3c3ddeaa64099ed046ea89f12c150e093e5925d72f78b001bb25
+    REF boost-1.73.0
+    SHA512 3f478dfa89102fcaa316fca0ad1d514a0dcc9408c48e4182d788949b13f318b237de53d41f1ba843c892522023d5d8efda8ae446672389d84f27d5d150a98ef7
     HEAD_REF master
 )
 
diff --git a/ports/boost-tuple/CONTROL b/ports/boost-tuple/CONTROL
index fd3afd27fa..840cbe2c14 100644
--- a/ports/boost-tuple/CONTROL
+++ b/ports/boost-tuple/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-tuple
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/tuple
 Description: Boost tuple module
diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake
index 3a42dd724e..965b172451 100644
--- a/ports/boost-tuple/portfile.cmake
+++ b/ports/boost-tuple/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/tuple
-    REF boost-1.72.0
-    SHA512 fd330e0796021bc4f358ab57cacf9feb47a729d15bb4ca86e97b87d6ba605ff118f56d53ae1ed1c230045dd1b04110be6705ea969ca94cd956947282ed199131
+    REF boost-1.73.0
+    SHA512 2c49dacacc6b59a3cf4d35987700901f33f705e0bff323ae86a1b629a7d2d9cb366adfc08cc3c7eafd28b819938bc14cc4887e7b60c1448c369ecfe795ed1600
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL
index b1a918ffb2..40a10f2422 100644
--- a/ports/boost-type-erasure/CONTROL
+++ b/ports/boost-type-erasure/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-type-erasure
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-fusion, boost-iterator, boost-modular-build-helper, boost-mp11, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-vmd
 Homepage: https://github.com/boostorg/type_erasure
 Description: Boost type_erasure module
diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake
index 7f99740801..3e427b1112 100644
--- a/ports/boost-type-erasure/portfile.cmake
+++ b/ports/boost-type-erasure/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_erasure
-    REF boost-1.72.0
-    SHA512 cf1a239a53265eb028beccf625b6917fb7918324cfa92ddffa460e246eb99df61be5ef3fc3f5303d013acd971efe4b28c504661d79f2bcd564c2470a715dae52
+    REF boost-1.73.0
+    SHA512 69026dc42bbbf64378a3ca51e5493978dfc596fda21c7e246424ca9b914c3cb61cd49bbe85bbb04b32cd4bc8826052b212c267f2882195ecf22bb2dc1ea77be7
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-index/CONTROL b/ports/boost-type-index/CONTROL
index 0d3c2fd381..4b819a5411 100644
--- a/ports/boost-type-index/CONTROL
+++ b/ports/boost-type-index/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-type-index
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-container-hash, boost-core, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/type_index
 Description: Boost type_index module
diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake
index b84119cbfd..0d5f780b54 100644
--- a/ports/boost-type-index/portfile.cmake
+++ b/ports/boost-type-index/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_index
-    REF boost-1.72.0
-    SHA512 f7c3a78d5114fb4f8752a11b798f6826fda79345fad679b945240a0552358659cd83fb2182d5fbb6892bf971c2125bb4b7f527d05e3f6a17cb5521b1bfb280b7
+    REF boost-1.73.0
+    SHA512 154336bc6c6c3161e5aeda10eb5bdf33dd543ba80c890cbad58ba9957c36766d7721c9c9f56b705806e2212687ed95ec8fdfe7b9585239d08916f80ab895b696
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-traits/CONTROL b/ports/boost-type-traits/CONTROL
index 74c0f636c5..fcfe066d77 100644
--- a/ports/boost-type-traits/CONTROL
+++ b/ports/boost-type-traits/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-type-traits
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-detail, boost-static-assert, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/type_traits
 Description: Boost type_traits module
diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake
index 0dd03588c3..198906601e 100644
--- a/ports/boost-type-traits/portfile.cmake
+++ b/ports/boost-type-traits/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_traits
-    REF boost-1.72.0
-    SHA512 6f9959b53b2cc60539f065256e7efd78c8dad89d73803cea17bec82559f1045d069a6762a0665b5813ef397d3cf516b8897e2ea7be6177c5828f6d867869f367
+    REF boost-1.73.0
+    SHA512 30a2c147c24f2fb94fafde5b359f0b71636a3b33067791f303bd51acb844c81787899ee177e68dffab23af89b578ba0b8dc778faff257075aafc72ca7e2b07c1
     HEAD_REF master
 )
 
diff --git a/ports/boost-typeof/CONTROL b/ports/boost-typeof/CONTROL
index 39c32cae11..e199940673 100644
--- a/ports/boost-typeof/CONTROL
+++ b/ports/boost-typeof/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-typeof
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/typeof
 Description: Boost typeof module
diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake
index b0e9a723ac..ddb292ac91 100644
--- a/ports/boost-typeof/portfile.cmake
+++ b/ports/boost-typeof/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/typeof
-    REF boost-1.72.0
-    SHA512 21001375757411fdab8bde9abbdc96895db51746cba3f50b9c65f5142f248f90d8b93d9df3c734030c03469cbfb871f6f1a54ee354168034ee58ea5c39d31f41
+    REF boost-1.73.0
+    SHA512 c5f113eeadf779f496870bb99d379d6659b3b0a89d184dc4711063686909391ce85bd96b87c5c05f7e60d05a73853318204851d37f5ea05d339a0ab9a7a6910f
     HEAD_REF master
 )
 
diff --git a/ports/boost-ublas/CONTROL b/ports/boost-ublas/CONTROL
index c34374843c..8d8d071b8f 100644
--- a/ports/boost-ublas/CONTROL
+++ b/ports/boost-ublas/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-ublas
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-compute, boost-concept-check, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/ublas
 Description: Boost ublas module
diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake
index 403d6fd69b..81afb95eec 100644
--- a/ports/boost-ublas/portfile.cmake
+++ b/ports/boost-ublas/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/ublas
-    REF boost-1.72.0
-    SHA512 08419b9e3c0ee29a59080a0c901fcc80265c6bd5c1f2bebd2f2c54609e276fe0da2429fa1dc3b5f42bead8ab55cea1e41fd86b74f05b7ce4ee12fa507e5e6240
+    REF boost-1.73.0
+    SHA512 5d007facbdf6188e9e712bf016955792fff7d528fc68e9708574d1d4c9818e250aecbc1bd42eced85c2a580f29d9d87bd35cbed4d9cfe50d18cd1377b723db29
     HEAD_REF master
 )
 
diff --git a/ports/boost-units/CONTROL b/ports/boost-units/CONTROL
index 4a8061a36e..6ef9d96854 100644
--- a/ports/boost-units/CONTROL
+++ b/ports/boost-units/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-units
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-io, boost-lambda, boost-math, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/units
 Description: Boost units module
diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake
index 802b8df8ee..ee16b7fb5c 100644
--- a/ports/boost-units/portfile.cmake
+++ b/ports/boost-units/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/units
-    REF boost-1.72.0
-    SHA512 c8cc0df4e71f31e8491a771db42d7ba236e27185a9de511d43be9e490c6a0b9b91e19c9dca256f11071f60ebee3e6cb7ffa12af019c449cde5bbced86673ff0a
+    REF boost-1.73.0
+    SHA512 8137a82f4fdc3b204cc2879b2fc929b5c6937235bc3cdcda6419e84cc0b69ac523e6d18024c00bbff643a1f8561db4a46c00d3247314ad229c2b30f16676bc82
     HEAD_REF master
 )
 
diff --git a/ports/boost-unordered/CONTROL b/ports/boost-unordered/CONTROL
index 41402f9a6c..18a671b10c 100644
--- a/ports/boost-unordered/CONTROL
+++ b/ports/boost-unordered/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-unordered
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-container-hash, boost-core, boost-detail, boost-functional, boost-move, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/unordered
 Description: Boost unordered module
diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake
index 64424e0bab..f1feb4663e 100644
--- a/ports/boost-unordered/portfile.cmake
+++ b/ports/boost-unordered/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/unordered
-    REF boost-1.72.0
-    SHA512 ad41c43e5eb82a57b3d2b21aa794a84c6241c7e3078eb6cd331910c6402eca1ddb46d687aefe80d67cde72711853516e7367ebe61d7af7d903d158c9c57ad891
+    REF boost-1.73.0
+    SHA512 81bc6f4bfcdf6d75ac59e3bb726789281c022a3d306d59e086cbeb84eec2b0f264df7127a5c65dd19ca872bae635ba2219f9914b2d7056373779f1c00a8313df
     HEAD_REF master
 )
 
diff --git a/ports/boost-utility/CONTROL b/ports/boost-utility/CONTROL
index 7d68924577..ea7aed66bc 100644
--- a/ports/boost-utility/CONTROL
+++ b/ports/boost-utility/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-utility
-Version: 1.72.0
-Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-io, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/utility
 Description: Boost utility module
diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake
index a5f3976566..33ee50f4c3 100644
--- a/ports/boost-utility/portfile.cmake
+++ b/ports/boost-utility/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/utility
-    REF boost-1.72.0
-    SHA512 4630263d13239d5ce548821038277138268dcbc82a161196147e91147efbab289f71679449a35eb242c540be22ad5595fc0cd88b4dafb2e9b9e651bf398ed8b6
+    REF boost-1.73.0
+    SHA512 0f125259b1a23473b14dc45ad459d9bce1188b97747cbb0dec05bbea55babbf46fa7767a99f9e4eafce777edc11af5d8d5be408832c79dbcfa6568eab2596ce7
     HEAD_REF master
 )
 
diff --git a/ports/boost-uuid/CONTROL b/ports/boost-uuid/CONTROL
index 853b9466e2..439db78a31 100644
--- a/ports/boost-uuid/CONTROL
+++ b/ports/boost-uuid/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-uuid
-Version: 1.72.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-core, boost-integer, boost-io, boost-move, boost-numeric-conversion, boost-predef, boost-random, boost-serialization, boost-static-assert, boost-throw-exception, boost-tti, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Version: 1.73.0
+Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-conversion, boost-core, boost-integer, boost-io, boost-move, boost-numeric-conversion, boost-predef, boost-random, boost-serialization, boost-static-assert, boost-throw-exception, boost-tti, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/uuid
 Description: Boost uuid module
diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake
index 5fd18f09b3..384c3d65ac 100644
--- a/ports/boost-uuid/portfile.cmake
+++ b/ports/boost-uuid/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/uuid
-    REF boost-1.72.0
-    SHA512 f2f614841b562620507d3b758e3c760b68af22812559caa181743bdc03c152d46680c6c7d4be9b217ae127686083d0110a81d9c03ff4ecffce4119a6fd8d0b1a
+    REF boost-1.73.0
+    SHA512 68e4cb97d3e4080a6f1e72c91b823f423c9f4119bd2570086dcd14b723ea8500a8a2872d6ba4adf7a8a1119c6ac1f15dabd35795c00ba736cfb13933df75bd0a
     HEAD_REF master
 )
 
diff --git a/ports/boost-variant/CONTROL b/ports/boost-variant/CONTROL
index 174995e8b2..a86a2889a3 100644
--- a/ports/boost-variant/CONTROL
+++ b/ports/boost-variant/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-variant
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/variant
 Description: Boost variant module
diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake
index e57e830649..8f7164dc03 100644
--- a/ports/boost-variant/portfile.cmake
+++ b/ports/boost-variant/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/variant
-    REF boost-1.72.0
-    SHA512 8313dcff4d227c5e8ccdc25dd0831c126846d9c3a55acfa1316a20884894613ce55d3784c090cc115f628d3c0cce1b35e65a7547cd10ce168f5dc0b970d62f10
+    REF boost-1.73.0
+    SHA512 008e8bbefd30a4dfe33d43b549cbd8897e434080816ceb7e74aee801b05e2ba2e3931c5533a06b56033ebc6b21b47f2c1f77379b82c0f1a5211f07301c0ab73b
     HEAD_REF master
 )
 
diff --git a/ports/boost-variant2/CONTROL b/ports/boost-variant2/CONTROL
index 4cbe58af0c..4dd1a19285 100644
--- a/ports/boost-variant2/CONTROL
+++ b/ports/boost-variant2/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-variant2
-Version: 1.72.0
-Build-Depends: boost-config, boost-detail, boost-mp11, boost-vcpkg-helpers
+Version: 1.73.0
+Build-Depends: boost-config, boost-detail, boost-integer, boost-mp11, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/variant2
 Description: Boost variant2 module
diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake
index 75f9a153fd..7fa405d721 100644
--- a/ports/boost-variant2/portfile.cmake
+++ b/ports/boost-variant2/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/variant2
-    REF boost-1.72.0
-    SHA512 88ce9129a4fe9d6e8273936483fa3d102a44ffdfc6a5385f5ffdb744a4ca13f0a552830b53f1aca3869fded703890d6921cc15658cc7cfe1dc6283f106e8fad4
+    REF boost-1.73.0
+    SHA512 5f5195ebcfc8f9a266541e9556332bb61a1a99c5636e59c9e4fd42525c9f06856cd64bd0aa975cc77321e181c3490b2cef7dc55c5eb43666ca3ca0c606a27ec5
     HEAD_REF master
 )
 
diff --git a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake
index 140e432153..bb29615bce 100644
--- a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake
+++ b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake
@@ -15,7 +15,7 @@ function(boost_modular_headers)
     message(STATUS "Packaging headers done")
 
     vcpkg_download_distfile(ARCHIVE
-        URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.72.0/LICENSE_1_0.txt"
+        URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.73.0/LICENSE_1_0.txt"
         FILENAME "boost_LICENSE_1_0.txt"
         SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
     )
diff --git a/ports/boost-vmd/CONTROL b/ports/boost-vmd/CONTROL
index 017e5563e8..6dc0ae4bcd 100644
--- a/ports/boost-vmd/CONTROL
+++ b/ports/boost-vmd/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-vmd
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-preprocessor, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/vmd
 Description: Boost vmd module
diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake
index 2dd2a0a915..e36dca113f 100644
--- a/ports/boost-vmd/portfile.cmake
+++ b/ports/boost-vmd/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/vmd
-    REF boost-1.72.0
-    SHA512 1bc8122889dc80aece871021530c626de480bf2854eb1f7582520d345cd31ea4d068b84e4c43c47f018796fbaa5ed49746a3b1806cdcb3957fe40b5d79abbb04
+    REF boost-1.73.0
+    SHA512 84c693988230f1f0e77d098157ed3d47b7c196a26515f4d0a7f8884affa206a5f9baee46a8e1c611dc34d1b6b2675cadd5aa25f97c11421404d1ea6e4473ba09
     HEAD_REF master
 )
 
diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL
index fe2e5e67f4..538e8772ca 100644
--- a/ports/boost-wave/CONTROL
+++ b/ports/boost-wave/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-wave
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-build, boost-concept-check, boost-config, boost-core, boost-detail, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-multi-index, boost-pool, boost-preprocessor, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/wave
 Description: Boost wave module
diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake
index 8cb09191df..0f78bcdeb0 100644
--- a/ports/boost-wave/portfile.cmake
+++ b/ports/boost-wave/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/wave
-    REF boost-1.72.0
-    SHA512 cfbef392d37b15c1c8b5c6629ac307bddceafc986ae59561c64fbb06f4b5e48d6faf7092dbebdabdbf5c28bb483693669024b1c1677e17ea820fe504e7e8d993
+    REF boost-1.73.0
+    SHA512 e3afd44ae4a15456592660f87c0f2cbe8b23a3084efeacbb33efa039766eaa7e197f4f8ac64477d9667b6be81a4cf97ac85e8eaac7ba369900dce3ad3436b6e4
     HEAD_REF master
 )
 
diff --git a/ports/boost-winapi/CONTROL b/ports/boost-winapi/CONTROL
index 6e47e2ef41..808385e4d2 100644
--- a/ports/boost-winapi/CONTROL
+++ b/ports/boost-winapi/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-winapi
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-config, boost-predef, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/winapi
 Description: Boost winapi module
diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake
index 9575702cc3..ec133df477 100644
--- a/ports/boost-winapi/portfile.cmake
+++ b/ports/boost-winapi/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/winapi
-    REF boost-1.72.0
-    SHA512 de9292bd10d393ed68066c77af335d7799c205761942d567391f2099a089f7ff77c65681156aa4c568d1ec39f1e1556b6816e903a945a81ebb43971840eb3c53
+    REF boost-1.73.0
+    SHA512 468c6f3403f1535dad26c122b8c405597eb0c1d58cbc39b646367110b07cc925a6e992ed92976874c2df0f8c1b848d82c3f4252124ed122e9513f9502ec5dfef
     HEAD_REF master
 )
 
diff --git a/ports/boost-xpressive/CONTROL b/ports/boost-xpressive/CONTROL
index 4deb788fa2..9c660df620 100644
--- a/ports/boost-xpressive/CONTROL
+++ b/ports/boost-xpressive/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-xpressive
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/xpressive
 Description: Boost xpressive module
diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake
index 435fee2cd9..7e9e3e915a 100644
--- a/ports/boost-xpressive/portfile.cmake
+++ b/ports/boost-xpressive/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/xpressive
-    REF boost-1.72.0
-    SHA512 214ab38c493a53b97c2f153d2c45b71ddf9b06995af781f51e814c0b03526a9be402aeb5bcbcf69baaea49df760fa79b6d8abc5b91744afb4bc2e6be7a04a1a3
+    REF boost-1.73.0
+    SHA512 1d2cab3db72502d7d926861bc468a1266eb9031a64816a88b61f669bfe370237a4836962af6afe565d51435e924809ca41f46fecfc99464e88053699eec9a4b6
     HEAD_REF master
 )
 
diff --git a/ports/boost-yap/CONTROL b/ports/boost-yap/CONTROL
index 6b36f54963..e10364287c 100644
--- a/ports/boost-yap/CONTROL
+++ b/ports/boost-yap/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-yap
-Version: 1.72.0
+Version: 1.73.0
 Build-Depends: boost-hana, boost-preprocessor, boost-type-index, boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/yap
 Description: Boost yap module
diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake
index 6dd2281781..f2fbaecd1c 100644
--- a/ports/boost-yap/portfile.cmake
+++ b/ports/boost-yap/portfile.cmake
@@ -1,12 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/yap
-    REF boost-1.72.0
-    SHA512 682ae560b2fc31e8173914a8f59e263b2a64b9064faa2a15b5692926a28f5940d261368b7cc061dd696bfc76a36e74a153310951fd24a4e81346cca2b9f936bd
+    REF boost-1.73.0
+    SHA512 f228ba3255f91cdd503a8fdf9f881dc608f1730bda685aca0e1638cd96add9194a250da154b4ce1ae3438ba92c88572f666eda2893ac9d53e6a4b1827d55a06b
     HEAD_REF master
 )
 
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 1584cb9091..5094237daa 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,9 +1,9 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost
-Version: 1.72.0
+Version: 1.73.0
 Homepage: https://boost.org
 Description: Peer-reviewed portable C++ source libraries
-Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp), boost-contract (!arm), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python, boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python, boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-system, boost-test (!uwp), boost-thread, boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!arm), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-variant2, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap
+Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp), boost-contract (!arm), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-nowide, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python, boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python, boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-static-string, boost-system, boost-test (!uwp), boost-thread, boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!arm), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-variant2, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap
 
 Feature: mpi
 Description: Build with MPI support
diff --git a/ports/freeopcua/CONTROL b/ports/freeopcua/CONTROL
index 9ff4392413..29a273f009 100644
--- a/ports/freeopcua/CONTROL
+++ b/ports/freeopcua/CONTROL
@@ -1,4 +1,4 @@
 Source: freeopcua
-Version: 20190125-2
+Version: 20190125-3
 Description: OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.
 Build-Depends: boost-asio,boost-system,boost-program-options,boost-filesystem,boost-thread,boost-format,boost-foreach,boost-property-tree,boost-date-time
diff --git a/ports/freeopcua/fix-std-headers.patch b/ports/freeopcua/fix-std-headers.patch
new file mode 100644
index 0000000000..d846a6176c
--- /dev/null
+++ b/ports/freeopcua/fix-std-headers.patch
@@ -0,0 +1,24 @@
+diff --git a/include/opc/ua/protocol/utils.h b/include/opc/ua/protocol/utils.h
+index e23bffe..5c8c2ad 100644
+--- a/include/opc/ua/protocol/utils.h
++++ b/include/opc/ua/protocol/utils.h
+@@ -22,6 +22,7 @@
+ #include <iomanip>
+ #include <sstream>
+ #include <vector>
++#include <algorithm>
+ 
+ namespace OpcUa
+ {
+diff --git a/src/core/model_impl.h b/src/core/model_impl.h
+index 0f548c5..c29626b 100644
+--- a/src/core/model_impl.h
++++ b/src/core/model_impl.h
+@@ -20,6 +20,7 @@
+ #pragma once
+ 
+ #include <opc/ua/model.h>
++#include <algorithm>
+ 
+ namespace OpcUa
+ {
diff --git a/ports/freeopcua/portfile.cmake b/ports/freeopcua/portfile.cmake
index 57ca771ce2..76e9508370 100644
--- a/ports/freeopcua/portfile.cmake
+++ b/ports/freeopcua/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeOpcUa/freeopcua
@@ -14,6 +12,7 @@ vcpkg_from_github(
         serverObj.patch
         include_asio_first.patch
         boost-1.70.patch
+        fix-std-headers.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL
index f98540c70d..4bc7d7b628 100644
--- a/ports/hpx/CONTROL
+++ b/ports/hpx/CONTROL
@@ -1,5 +1,5 @@
 Source: hpx
-Version: 1.4.1
+Version: 1.4.1-1
 Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-bimap, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
 Homepage: https://github.com/STEllAR-GROUP/hpx
 Description: The C++ Standards Library for Concurrency and Parallelism
diff --git a/ports/hpx/boost-1.73.patch b/ports/hpx/boost-1.73.patch
new file mode 100644
index 0000000000..d45e5cc7fe
--- /dev/null
+++ b/ports/hpx/boost-1.73.patch
@@ -0,0 +1,13 @@
+diff --git a/src/runtime/agas/addressing_service.cpp b/src/runtime/agas/addressing_service.cpp
+index f30760c..7c2785e 100644
+--- a/src/runtime/agas/addressing_service.cpp
++++ b/src/runtime/agas/addressing_service.cpp
+@@ -2356,6 +2356,8 @@ void addressing_service::register_counter_types()
+         util::bind_front(
+             &addressing_service::get_cache_erase_entry_time, this));
+ 
++    using util::placeholders::_1;
++    using util::placeholders::_2;
+     performance_counters::generic_counter_type_data const counter_types[] =
+     {
+         { "/agas/count/cache/entries", performance_counters::counter_raw,
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake
index cabab3b8f6..6c369e0a29 100644
--- a/ports/hpx/portfile.cmake
+++ b/ports/hpx/portfile.cmake
@@ -7,6 +7,8 @@ vcpkg_from_github(
     REF 1.4.1
     SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582
     HEAD_REF stable
+    PATCHES
+        boost-1.73.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/liblas/CONTROL b/ports/liblas/CONTROL
index a084014481..f441925372 100644
--- a/ports/liblas/CONTROL
+++ b/ports/liblas/CONTROL
@@ -1,5 +1,5 @@
 Source: liblas
-Version: 1.8.1-3
+Version: 1.8.1-4
 Build-Depends: boost, boost-thread, boost-system, boost-iostreams, boost-filesystem, libgeotiff
 Description: A C/C++ library for reading and writing the very common LAS LiDAR format.
 
diff --git a/ports/liblas/fix-boost-headers.patch b/ports/liblas/fix-boost-headers.patch
new file mode 100644
index 0000000000..4725a6ceb2
--- /dev/null
+++ b/ports/liblas/fix-boost-headers.patch
@@ -0,0 +1,55 @@
+diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp
+index d3116a1..ab20e06 100644
+--- a/include/liblas/detail/binary.hpp
++++ b/include/liblas/detail/binary.hpp
+@@ -17,6 +17,8 @@
+ #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ 
++#include <liblas/detail/endian.hpp>
++
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
+@@ -25,7 +27,6 @@
+ 
+ #include <boost/config.hpp>
+ #include <boost/static_assert.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/type_traits/is_signed.hpp>
+ 
+ #if CHAR_BIT != 8
+@@ -43,7 +44,7 @@ namespace detail { namespace binary {
+ struct big_endian_tag {};
+ struct little_endian_tag {};
+ 
+-#ifdef BOOST_BIG_ENDIAN
++#ifdef LIBLAS_BIG_ENDIAN
+ typedef big_endian_tag native_endian_tag;
+ #else
+ typedef little_endian_tag native_endian_tag;
+diff --git a/src/c_api.cpp b/src/c_api.cpp
+index a70fe74..e8be785 100644
+--- a/src/c_api.cpp
++++ b/src/c_api.cpp
+@@ -96,6 +96,7 @@ using namespace liblas;
+ #endif
+ 
+ #include <boost/lambda/lambda.hpp>
++#include <boost/bind.hpp>
+ 
+ bool IsReprojectionTransform(liblas::TransformPtr const& p)
+ {
+diff --git a/src/header.cpp b/src/header.cpp
+index 9987ce1..a5c8f7d 100644
+--- a/src/header.cpp
++++ b/src/header.cpp
+@@ -54,7 +54,7 @@
+ // boost
+ #include <boost/cstdint.hpp>
+ #include <boost/lambda/lambda.hpp>
+-
++#include <boost/bind.hpp>
+ //std
+ #include <algorithm>
+ #include <fstream>
diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake
index 32fdd7c7eb..f1416ec932 100644
--- a/ports/liblas/portfile.cmake
+++ b/ports/liblas/portfile.cmake
@@ -3,31 +3,32 @@ include(vcpkg_common_functions)
 set(VERSION 1.8.1)
                                               
 vcpkg_download_distfile(ARCHIVE
-	URLS "http://download.osgeo.org/liblas/libLAS-${VERSION}.tar.bz2"
-	FILENAME "libLAS-${VERSION}-src.tar.bz2"
+    URLS "http://download.osgeo.org/liblas/libLAS-${VERSION}.tar.bz2"
+    FILENAME "libLAS-${VERSION}-src.tar.bz2"
     SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf  
-	HEAD_REF master
+    HEAD_REF master
 )
 
 vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
     OUT_SOURCE_PATH SOURCE_PATH
-    PATCHES fix-BuildError.patch
+    PATCHES
+        fix-BuildError.patch
+        fix-boost-headers.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake)
 file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake)
 
 vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
-  OPTIONS 
-  
-	-DBUILD_OSGEO4W=OFF # Disable osgeo4w
-	-DWITH_TESTS=OFF
-	-DWITH_UTILITIES=OFF
-	-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB}
-	-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG}
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS 
+        -DBUILD_OSGEO4W=OFF # Disable osgeo4w
+        -DWITH_TESTS=OFF
+        -DWITH_UTILITIES=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB}
+        -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL
index f3791e9d56..84dc4a974d 100644
--- a/ports/libmysql/CONTROL
+++ b/ports/libmysql/CONTROL
@@ -1,5 +1,5 @@
 Source: libmysql
-Version: 8.0.4-6
+Version: 8.0.4-7
 Homepage: https://github.com/mysql/mysql-server
 Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
 Description: A MySQL client library for C development.
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
index 791a9c5db5..bdf5a2440f 100644
--- a/ports/libmysql/portfile.cmake
+++ b/ports/libmysql/portfile.cmake
@@ -19,6 +19,7 @@ vcpkg_from_github(
         system-libs.patch
         linux_libmysql.patch
         re2_add_compile_flags.patch
+        rename-version.patch
 )
 
 file(REMOVE_RECURSE ${SOURCE_PATH}/include/boost_1_65_0)
diff --git a/ports/libmysql/rename-version.patch b/ports/libmysql/rename-version.patch
new file mode 100644
index 0000000000..1559838257
--- /dev/null
+++ b/ports/libmysql/rename-version.patch
@@ -0,0 +1,26 @@
+diff --git a/VERSION b/VERSION.txt
+similarity index 100%
+rename from VERSION
+rename to VERSION.txt
+diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
+index bed6e9f02e2..a924ef09bac 100644
+--- a/cmake/mysql_version.cmake
++++ b/cmake/mysql_version.cmake
+@@ -30,7 +30,7 @@ SET(PROTOCOL_VERSION "10")
+ 
+ # Generate "something" to trigger cmake rerun when VERSION changes
+ CONFIGURE_FILE(
+-  ${CMAKE_SOURCE_DIR}/VERSION
++  ${CMAKE_SOURCE_DIR}/VERSION.txt
+   ${CMAKE_BINARY_DIR}/VERSION.dep
+ )
+ 
+@@ -38,7 +38,7 @@ CONFIGURE_FILE(
+ 
+ MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
+  IF(NOT ${var})
+-   FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
++   FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=")
+    IF(str)
+      STRING(REPLACE "${keyword}=" "" str ${str})
+      STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL
index 943708ee5d..12427cd8e7 100644
--- a/ports/libtorrent/CONTROL
+++ b/ports/libtorrent/CONTROL
@@ -1,8 +1,8 @@
 Source: libtorrent
-Version: 1.2.6-1
+Version: 1.2.6-2
 Homepage: https://github.com/arvidn/libtorrent
 Description: An efficient feature complete C++ BitTorrent implementation
-Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision
+Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision, boost-variant
 Supports: !uwp
 
 Feature: deprfun
diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
index 6fc6d263a9..05f5d82959 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -45,9 +45,9 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arvidn/libtorrent
-    REF libtorrent-1_2_6
-    SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
-    HEAD_REF master
+    REF d8be9312ec47c1c54849f846aa92530ec66266b9 # based on libtorrent-1.2.6 plus fixes from RC_1_2 branch
+    SHA512 b51593f090064da877a604c3bce5c3b8313aab8e7b3b14e33e5b3d9bbe9798f47948fecf5af390bba34750f13b3773a3b6a9ab04375961238d5056fe7a06c298
+    HEAD_REF RC_1_2
     PATCHES
         add-datetime-to-boost-libs.patch
         fix_python_cmake.patch
diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL
index e926b82eb2..97867f6c35 100644
--- a/ports/ompl/CONTROL
+++ b/ports/ompl/CONTROL
@@ -2,7 +2,7 @@ Source: ompl
 Version: 1.4.2-3
 Homepage: https://bitbucket.org/ompl
 Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms
-Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3
+Build-Depends: boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3
 
 Feature: app
 Description: Add support for reading meshes and performing collision checking
diff --git a/ports/pcl/boost-1.73.patch b/ports/pcl/boost-1.73.patch
new file mode 100644
index 0000000000..d634d84bb2
--- /dev/null
+++ b/ports/pcl/boost-1.73.patch
@@ -0,0 +1,50 @@
+diff --git a/common/include/pcl/PCLPointCloud2.h b/common/include/pcl/PCLPointCloud2.h
+index 6a00c1f..5d4ac1c 100644
+--- a/common/include/pcl/PCLPointCloud2.h
++++ b/common/include/pcl/PCLPointCloud2.h
+@@ -8,7 +8,7 @@
+ #include <string>
+ #include <vector>
+ #include <ostream>
+-#include <boost/detail/endian.hpp>
++#include <boost/predef/other/endian.h>
+ 
+ // Include the correct Header path here
+ #include <pcl/PCLHeader.h>
+@@ -23,9 +23,9 @@ namespace pcl
+                      is_bigendian (false), point_step (0), row_step (0),
+                      data (), is_dense (false)
+     {
+-#if defined(BOOST_BIG_ENDIAN)
++#if BOOST_ENDIAN_BIG_BYTE
+       is_bigendian = true;
+-#elif defined(BOOST_LITTLE_ENDIAN)
++#elif BOOST_ENDIAN_LITTLE_BYTE
+       is_bigendian = false;
+ #else
+ #error "unable to determine system endianness"
+diff --git a/io/include/pcl/io/ply/byte_order.h b/io/include/pcl/io/ply/byte_order.h
+index 2af95d0..8328015 100644
+--- a/io/include/pcl/io/ply/byte_order.h
++++ b/io/include/pcl/io/ply/byte_order.h
+@@ -40,7 +40,7 @@
+ #ifndef PCL_IO_PLY_BYTE_ORDER_H
+ #define PCL_IO_PLY_BYTE_ORDER_H
+ 
+-#include <boost/detail/endian.hpp>
++#include <boost/predef/other/endian.h>
+ 
+ namespace pcl
+ {
+@@ -58,9 +58,9 @@ namespace pcl
+       {
+         little_endian_byte_order,
+         big_endian_byte_order,
+-#if defined(BOOST_BIG_ENDIAN)
++#if BOOST_ENDIAN_BIG_BYTE
+         host_byte_order = big_endian_byte_order,
+-#elif defined(BOOST_LITTLE_ENDIAN)
++#elif BOOST_ENDIAN_LITTLE_BYTE
+         host_byte_order = little_endian_byte_order,
+ #else
+ #error "unable to determine system endianness"
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 0f4c30127e..ef3cf959ed 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
         # Patch for https://github.com/microsoft/vcpkg/issues/7660
         use_target_link_libraries_in_pclconfig.patch
         fix-link-libpng.patch
+        boost-1.73.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake)
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index e154bd38d9..619ba00615 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -1,7 +1,7 @@
 [CmdletBinding()]
 param (
     $libraries = @(),
-    $version = "1.72.0",
+    $version = "1.73.0",
     $portsDir = $null
 )
 
@@ -50,10 +50,11 @@ function Generate()
     $controlDeps = ($Depends | sort) -join ", "
 
     $versionSuffix = ""
-    if ($PortName -eq "iostreams" -or $PortName -eq "process" -or $PortName -eq "python")
-    {
-        $versionSuffix = "-1"
-    }
+
+    # if ($PortName -eq "<modified_libname>")
+    # {
+    #    $versionSuffix = "-1"
+    # }
 
     mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null
     $controlLines = @(
@@ -69,8 +70,17 @@ function Generate()
         $controlLines += @(
             ""
             "Feature: icu"
-            "Description: ICU backend for Boost.Locale"
             "Build-Depends: icu"
+            "Description: ICU backend for Boost.Locale"
+        )
+    }
+    if ($PortName -eq "python")
+    {
+        $controlLines += @(
+            ""
+            "Feature: python2"
+            "Build-Depends: python2 (windows)"
+            "Description: Build with Python2 support"
         )
     }
     if ($PortName -eq "regex")
@@ -78,8 +88,8 @@ function Generate()
         $controlLines += @(
             ""
             "Feature: icu"
-            "Description: ICU backend for Boost.Regex"
             "Build-Depends: icu"
+            "Description: ICU backend for Boost.Regex"
         )
     }
     $controlLines | out-file -enc ascii "$portsDir/boost-$PortName/CONTROL"
@@ -87,8 +97,6 @@ function Generate()
     $portfileLines = @(
         "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1"
         ""
-        "include(vcpkg_common_functions)"
-        ""
     )
 
     if ($PortName -eq "system")
@@ -115,9 +123,15 @@ function Generate()
     {
         $portfileLines += @("    PATCHES Removeseekpos.patch")
     }
-    if ($PortName -eq "process")
+    if ($PortName -eq "outcome")
     {
-        $portfileLines += @("    PATCHES async_pipe_header.patch")
+        # 1.73 Known Issue
+        $portfileLines += @("    PATCHES 0001-outcome-assert.patch")
+    }
+    if ($PortName -eq "beast")
+    {
+        # 1.73 Known Issue
+        $portfileLines += @("    PATCHES 0002-beast-coroutines.patch")
     }
     $portfileLines += @(
         ")"
@@ -131,58 +145,24 @@ function Generate()
 
     if ($NeedsBuild)
     {
-        if ($PortName -eq "locale")
+        $portfileLines += @(
+            "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
+        )
+        # b2-options.cmake contains port-specific build options
+        if (Test-Path "$portsDir/boost-$PortName/b2-options.cmake")
         {
             $portfileLines += @(
-                "if(`"icu`" IN_LIST FEATURES)"
-                "    set(BOOST_LOCALE_ICU on)"
-                "else()"
-                "    set(BOOST_LOCALE_ICU off)"
-                "endif()"
-                ""
-                "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
                 "boost_modular_build("
                 "    SOURCE_PATH `${SOURCE_PATH}"
-                "    BOOST_CMAKE_FRAGMENT `"`${CMAKE_CURRENT_LIST_DIR}/cmake-fragment.cmake`""
-                "    OPTIONS"
-                "        boost.locale.iconv=off"
-                "        boost.locale.posix=off"
-                "        /boost/locale//boost_locale"
-                "        boost.locale.icu=`${BOOST_LOCALE_ICU}"
-                ")"
-            )
-        }
-        elseif ($PortName -eq "regex")
-        {
-            $portfileLines += @(
-                "if(`"icu`" IN_LIST FEATURES)"
-                "    set(REQUIREMENTS `"<library>/user-config//icuuc <library>/user-config//icudt <library>/user-config//icuin <define>BOOST_HAS_ICU=1`")"
-                "else()"
-                "    set(REQUIREMENTS)"
-                "endif()"
-                ""
-                "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
-                "boost_modular_build(SOURCE_PATH `${SOURCE_PATH} REQUIREMENTS `"`${REQUIREMENTS}`")"
-            )
-        }
-        elseif ($PortName -eq "thread")
-        {
-            $portfileLines += @(
-                "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
-                "boost_modular_build("
-                "    SOURCE_PATH `${SOURCE_PATH}"
-                "    REQUIREMENTS `"<library>/boost/date_time//boost_date_time`""
-                "    OPTIONS /boost/thread//boost_thread"
-                "    BOOST_CMAKE_FRAGMENT `${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
+                "    BOOST_CMAKE_FRAGMENT `"`${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake`""
                 ")"
             )
         }
         else
         {
             $portfileLines += @(
-                "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
                 "boost_modular_build(SOURCE_PATH `${SOURCE_PATH})"
-                )
+            )
         }
     }
 
@@ -298,30 +278,32 @@ foreach ($library in $libraries)
             elseif ($_ -match "noncopyable|ref|swap|get_pointer|checked_delete|visit_each") { "core" }
             elseif ($_ -eq "type") { "core" }
             elseif ($_ -match "unordered_") { "unordered" }
-            elseif ($_ -match "cstdint") { "integer" }
+            elseif ($_ -match "cstdint|integer_fwd|integer_traits") { "integer" }
             elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior|compressed_pair") { "utility" }
             elseif ($_ -match "^version|^workaround") { "config" }
-            elseif ($_ -match "enable_shared_from_this|shared_ptr|make_shared|make_unique|intrusive_ptr|scoped_ptr|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" }
+            elseif ($_ -match "enable_shared_from_this|shared_ptr|make_shared|make_unique|intrusive_ptr|scoped_ptr|pointer_cast|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" }
             elseif ($_ -match "iterator_adaptors|generator_iterator|pointee") { "iterator" }
             elseif ($_ -eq "regex_fwd") { "regex" }
             elseif ($_ -eq "make_default") { "convert" }
             elseif ($_ -eq "foreach_fwd") { "foreach" }
             elseif ($_ -eq "cerrno") { "system" }
+            elseif ($_ -eq "circular_buffer_fwd") { "circular_buffer" }
             elseif ($_ -eq "archive") { "serialization" }
-            elseif ($_ -eq "none") { "optional" }
-            elseif ($_ -eq "integer_traits") { "integer" }
+            elseif ($_ -match "none|none_t") { "optional" }
             elseif ($_ -eq "limits") { "compatibility" }
-            elseif ($_ -eq "math_fwd") { "math" }
+            elseif ($_ -match "cstdfloat|math_fwd") { "math" }
+            elseif ($_ -eq "cast") { "conversion"; "numeric_conversion" } # DEPRECATED header file, includes <boost/polymorphic_cast.hpp> and <boost/numeric/conversion/cast.hpp> 
             elseif ($_ -match "polymorphic_cast|implicit_cast") { "conversion" }
             elseif ($_ -eq "nondet_random") { "random" }
             elseif ($_ -eq "memory_order") { "atomic" }
-            elseif ($_ -eq "blank") { "detail" }
+            elseif ($_ -match "blank|blank_fwd|numeric_traits") { "detail" }
             elseif ($_ -match "is_placeholder|mem_fn") { "bind" }
             elseif ($_ -eq "exception_ptr") { "exception" }
-            elseif ($_ -eq "multi_index_container") { "multi_index" }
+            elseif ($_ -match "multi_index_container|multi_index_container_fwd") { "multi_index" }
             elseif ($_ -eq "lexical_cast") { "lexical_cast"; "math" }
             elseif ($_ -match "token_iterator|token_functions") { "tokenizer" }
             elseif ($_ -eq "numeric" -and $library -notmatch "numeric_conversion|interval|odeint|ublas") { "numeric_conversion"; "interval"; "odeint"; "ublas" }
+            elseif ($_ -eq "io_fwd") { "io" }
             else { $_ }
         } | group | % name | ? { $_ -ne $library }
 
@@ -335,6 +317,8 @@ foreach ($library in $libraries)
             # Boost contains cycles, so remove a few dependencies to break the loop.
             (($library -notmatch "core|assert|mpl|detail|throw_exception|type_traits|^exception") -or ($_ -notmatch "utility")) `
             -and `
+            (($library -notmatch "assert") -or ($_ -notmatch "integer"))`
+            -and `
             (($library -notmatch "range") -or ($_ -notmatch "algorithm"))`
             -and `
             (($library -ne "config") -or ($_ -notmatch "integer"))`
diff --git a/scripts/boost/post-source-stubs/python.cmake b/scripts/boost/post-source-stubs/python.cmake
deleted file mode 100644
index 5e2ae2b765..0000000000
--- a/scripts/boost/post-source-stubs/python.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-# Find Python3 executable
-vcpkg_find_acquire_program(PYTHON3)
-set(VCPKG_PYTHON_EXECUTABLE "${PYTHON3}")
-# Find Python3 libraries. Can't use find_package here, but we already know where everything is
-file(GLOB VCPKG_PYTHON_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python3.*")
-set(VCPKG_PYTHON_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
-set(VCPKG_PYTHON_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
-string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON_VERSION "${VCPKG_PYTHON_INCLUDE}")