724 files changed, 8820 insertions, 3811 deletions
diff --git a/docs/examples/patching.md b/docs/examples/patching.md
index 98115400e..b152231e2 100644
--- a/docs/examples/patching.md
+++ b/docs/examples/patching.md
@@ -147,11 +147,11 @@ Finally, we need to apply the patch after extracting the source.
 ```cmake
 # ports\libpng\portfile.cmake
 ...
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch"
+vcpkg_extract_source_archive_ex(
+  OUT_SOURCE_PATH SOURCE_PATH
+  ARCHIVE ${ARCHIVE}
+  PATCHES 
+    "use-abort-on-all-platforms.patch"
 )
 
 vcpkg_configure_cmake(
diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md
index 103c1c547..f25df89a3 100644
--- a/docs/users/config-environment.md
+++ b/docs/users/config-environment.md
@@ -26,7 +26,7 @@ This environment variable can be set to the full path of an executable to be use
 This environment variable can be set to a directory to use as the root of the vcpkg instance. Note that mixing vcpkg
 repo versions and executable versions can cause issues.
 
-#### VCPKG_DEFAULT_VS_PATH
+#### VCPKG_VISUAL_STUDIO_PATH
 
 This environment variable can be set to the full path to a Visual Studio instance on the machine. This Visual Studio instance
 will be used if the triplet does not override it via the [`VCPKG_VISUAL_STUDIO_PATH` triplet setting](triplets.md#VCPKG_VISUAL_STUDIO_PATH).
diff --git a/docs/users/integration.md b/docs/users/integration.md
index 10f5574c1..6d56c7c70 100644
--- a/docs/users/integration.md
+++ b/docs/users/integration.md
@@ -135,9 +135,16 @@ To override the automatically chosen [triplet][], you can specify the MSBuild pr
 ```
 
 #### With CMake
-Simply set `VCPKG_TARGET_TRIPLET` on the configure line.
+You can set `VCPKG_TARGET_TRIPLET` on the configure line:
 ```no-highlight
 cmake ../my/project -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=...
 ```
+If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to contoll the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option):
+
+```cmake
+if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
+  set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
+endif()
+```
 
 [triplet]: triplets.md
diff --git a/docs/users/triplets.md b/docs/users/triplets.md
index 4f23c8e27..87fa72fd3 100644
--- a/docs/users/triplets.md
+++ b/docs/users/triplets.md
@@ -53,25 +53,33 @@ This option also has forms for configuration-specific and C flags:
 
 ## Windows Variables
 
-### VCPKG_PLATFORM_TOOLSET
-Specifies the VS-based C/C++ compiler toolchain to use.
-
-This can be set to `v141`, `v140`, or left blank. If left blank, we select the latest compiler toolset available on your machine.
-
-Visual Studio 2015 platform toolset is `v140`
-Visual Studio 2017 platform toolset is `v141`
-
 <a name="VCPKG_VISUAL_STUDIO_PATH"></a>
 ### VCPKG_VISUAL_STUDIO_PATH
 Specifies the Visual Studio installation to use.
 
-When unspecified, a Visual Studio instance is selected automatically, preferring Stable 2017, then Preview 2017, then 2015.
+To select the precise combination of Visual Studio instance and toolset version, we walk through the following algorithm:
+1. Determine the setting for `VCPKG_VISUAL_STUDIO_PATH` from the triplet, or the environment variable `VCPKG_VISUAL_STUDIO_PATH`, or consider it unset
+2. Determine the setting for `VCPKG_PLATFORM_TOOLSET` from the triplet or consider it unset
+3. Gather a list of all pairs of Visual Studio Instances with all toolsets available in those instances
+    1. This is ordered first by instance type (Stable, Prerelease, Legacy) and then by toolset version (v142, v141, v140)
+4. Filter the list based on the settings for `VCPKG_VISUAL_STUDIO_PATH` and `VCPKG_PLATFORM_TOOLSET`.
+5. Select the best remaining option
 
 The path should be absolute, formatted with backslashes, and have no trailing slash:
 ```cmake
 set(VCPKG_VISUAL_STUDIO_PATH "C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Community")
 ```
 
+### VCPKG_PLATFORM_TOOLSET
+Specifies the VS-based C/C++ compiler toolchain to use.
+
+See [`VCPKG_VISUAL_STUDIO_PATH`](#VCPKG_VISUAL_STUDIO_PATH) for the full selection algorithm.
+
+Valid settings:
+* The Visual Studio 2019 platform toolset is `v142`.
+* The Visual Studio 2017 platform toolset is `v141`.
+* The Visual Studio 2015 platform toolset is `v140`.
+
 ## MacOS Variables
 
 ### VCPKG_INSTALL_NAME_DIR
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
index c1cb755b4..2e0e0b9bd 100644
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@@ -1,5 +1,5 @@
 Source: abseil
-Version: 2019-01-09-1
+Version: 2019-01-30
 Description: an open-source collection designed to augment the C++ standard library.
   Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
   In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index bd2e6a0d4..7aca199a0 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
-    REF 018b4db1d73ec8238e6dc4b17fd9e1fd7468d0ed
-    SHA512 55cd4bc801a405c9197d4d9bdd906a3742f9f7ef04a70f6f8a41aa8d2f7f6b9c38501265a4a096a12840b2e48ac0bf93d348b6ba8dea05e0801ed4013941f5dd
+    REF 540e2537b92cd4abfae6ceddfe24304345461f32
+    SHA512 3cabab23ad159592562a30531052bb18c66fce75f93f84a6de17a7488b7d6651f645950c1adb8dfbacc651f2bc0db82c316de132baab38e3ef95ea5b5a0eb6d2
     HEAD_REF master
 )
 
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 95fc09dce..f3dcbc6bf 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -23,11 +23,17 @@ else ()
     set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
 endif()
 
+if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    set(SOLUTION_TYPE vs2017)
+else()
+    set(SOLUTION_TYPE vc14)
+endif()
+
 # Add ace/config.h file
 # see http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#win32
 file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
 vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/ace_vc14.sln
+    PROJECT_PATH ${SOURCE_PATH}/ace_${SOLUTION_TYPE}.sln
     PLATFORM ${MSBUILD_PLATFORM}
 )
 
diff --git a/ports/ampl-mp/CONTROL b/ports/ampl-mp/CONTROL
new file mode 100644
index 000000000..8a8c27b3f
--- /dev/null
+++ b/ports/ampl-mp/CONTROL
@@ -0,0 +1,3 @@
+Source: ampl-mp
+Version: 2019-02-08
+Description: An open-source library for mathematical programming
diff --git a/ports/ampl-mp/disable-matlab-mex.patch b/ports/ampl-mp/disable-matlab-mex.patch
new file mode 100644
index 000000000..f1b8be443
--- /dev/null
+++ b/ports/ampl-mp/disable-matlab-mex.patch
@@ -0,0 +1,11 @@
+--- a/src/asl/CMakeLists.txt	2019-02-08 16:42:50.793071700 -0600
++++ b/src/asl/CMakeLists.txt	2019-02-08 16:44:04.960894500 -0600
+@@ -266,7 +266,7 @@ endif ()
+ 
+ target_link_libraries(asl ${CMAKE_DL_LIBS})
+ 
+-find_package(MATLAB)
++set(MATLAB_FOUND)
+ if (MATLAB_FOUND)
+   set(matlab_asl asl)
+   if (MSVC)
diff --git a/ports/ampl-mp/install-targets.patch b/ports/ampl-mp/install-targets.patch
new file mode 100644
index 000000000..8538920b7
--- /dev/null
+++ b/ports/ampl-mp/install-targets.patch
@@ -0,0 +1,44 @@
+--- a/CMakeLists.txt	2019-02-09 04:38:25.756325900 -0600
++++ b/CMakeLists.txt	2019-02-09 04:39:55.299417600 -0600
+@@ -289,6 +289,8 @@ add_prefix(MP_SOURCES src/
+ add_mp_library(mp ${MP_HEADERS} ${MP_SOURCES} ${MP_EXPR_INFO_FILE}
+   COMPILE_DEFINITIONS MP_DATE=${MP_DATE} MP_SYSINFO="${MP_SYSINFO}"
+   INCLUDE_DIRECTORIES src OBJECT_LIBRARIES format)
++set_property(TARGET mp PROPERTY
++  INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include>)
+ set_target_properties(mp PROPERTIES
+   VERSION ${MP_VERSION} SOVERSION ${MP_VERSION_MAJOR})
+ 
+@@ -385,5 +387,10 @@ if(BUILD_TESTING)
+ endif()
+ 
+ install(DIRECTORY include/mp DESTINATION include)
+-install(TARGETS mp DESTINATION lib RUNTIME DESTINATION bin)
++install(TARGETS mp EXPORT unofficial-mp-targets
++  DESTINATION lib RUNTIME DESTINATION bin)
+ install(FILES LICENSE.rst DESTINATION share/mp)
++install(EXPORT unofficial-mp-targets
++  FILE unofficial-mp-config.cmake
++  NAMESPACE unofficial::mp::
++  DESTINATION share/unofficial-mp)
+--- a/src/asl/CMakeLists.txt	2019-02-09 04:38:27.196322600 -0600
++++ b/src/asl/CMakeLists.txt	2019-02-09 04:39:32.119889500 -0600
+@@ -235,6 +235,10 @@ add_mp_library(asl-extra OBJECT ${ASL_SO
+ 
+ add_mp_library(asl STATIC OBJECT_LIBRARIES asl-core asl-extra
+   LIBRARIES mp INCLUDE_DIRECTORIES ${ASL_INCLUDE_DIRS})
++set_property(TARGET asl PROPERTY
++  INTERFACE_INCLUDE_DIRECTORIES
++  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${PROJECT_SOURCE_DIR}/src/asl/solvers>
++  $<INSTALL_INTERFACE:include>)
+ 
+ if (NOT WIN32)
+   target_link_libraries(asl m)
+@@ -353,4 +357,6 @@ endif ()
+ install(FILES ${ASL_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/arith.h
+               solvers/opcode.hd solvers/r_opn.hd
+         DESTINATION include/asl)
+-install(TARGETS asl tableproxy DESTINATION lib RUNTIME DESTINATION bin)
++install(TARGETS tableproxy DESTINATION lib RUNTIME DESTINATION bin)
++install(TARGETS asl EXPORT unofficial-mp-targets
++        DESTINATION lib RUNTIME DESTINATION bin)
diff --git a/ports/ampl-mp/portfile.cmake b/ports/ampl-mp/portfile.cmake
new file mode 100644
index 000000000..45bcb6478
--- /dev/null
+++ b/ports/ampl-mp/portfile.cmake
@@ -0,0 +1,42 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ampl/mp
+    REF d305155b047b69fc5c6e5fda8630c753d7973b9a
+    SHA512 2c8ffd6de946a6f8ea94a8e0c00f03f67753ad99534e0d5fcaaaeb472fe76a3383324bcb628a31d8c01bc5f60254790f5508c8394096a4f05672f814dbd6fe2e
+    HEAD_REF master
+    PATCHES
+    disable-matlab-mex.patch
+    workaround-msvc-optimizer-ice.patch
+    install-targets.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+    -DBUILD=asl
+    -DBUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH share/unofficial-mp
+    TARGET_PATH share/unofficial-mp
+)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/bin
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+    ${CURRENT_PACKAGES_DIR}/share/mp)
+
+configure_file(${SOURCE_PATH}/LICENSE.rst
+    ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
+vcpkg_test_cmake(PACKAGE_NAME unofficial-mp)
diff --git a/ports/ampl-mp/workaround-msvc-optimizer-ice.patch b/ports/ampl-mp/workaround-msvc-optimizer-ice.patch
new file mode 100644
index 000000000..cd55be8c0
--- /dev/null
+++ b/ports/ampl-mp/workaround-msvc-optimizer-ice.patch
@@ -0,0 +1,14 @@
+--- a/src/asl/CMakeLists.txt	2019-02-07 22:45:15.191909400 -0600
++++ b/src/asl/CMakeLists.txt	2019-02-07 22:47:10.364936600 -0600
+@@ -216,6 +216,11 @@ add_mp_library(asl-core OBJECT ${ASL_COR
+   COMPILE_DEFINITIONS ${ASL_COMPILE_DEFINITIONS}
+   INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
+ 
++if (MSVC)
++  set_source_files_properties(solvers/avltree.c solvers/sphes.c
++    PROPERTIES COMPILE_OPTIONS /Od)
++endif ()
++
+ # Public ASL headers.
+ set(ASL_HEADERS aslbuilder.h aslexpr.h aslexpr-visitor.h
+   aslproblem.h aslinterface.h ${CMAKE_CURRENT_BINARY_DIR}/stdio1.h)
diff --git a/ports/argh/CONTROL b/ports/argh/CONTROL
new file mode 100644
index 000000000..36c062da4
--- /dev/null
+++ b/ports/argh/CONTROL
@@ -0,0 +1,3 @@
+Source: argh
+Version: 2018-12-18
+Description: Argh! A minimalist argument handler.
diff --git a/ports/argh/portfile.cmake b/ports/argh/portfile.cmake
new file mode 100644
index 000000000..5e8b8bccd
--- /dev/null
+++ b/ports/argh/portfile.cmake
@@ -0,0 +1,36 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO adishavit/argh
+    REF a1edee559757e076e570b8f6c2f555d8d00b373c
+    SHA512 a100c7ff20ef9ed39d53efeac5507a6ed59fb99ccba36ac4b5f8f5aaac6782f8e951b2f26b9b50f6c6fdbc53b5bceaabbb9dd9b9539f968fc1037733342e17a6
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTS=OFF
+        -DBUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
+elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT})
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/README.md)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/args/CONTROL b/ports/args/CONTROL
index 7ab2310aa..0fbd02824 100644
--- a/ports/args/CONTROL
+++ b/ports/args/CONTROL
@@ -1,3 +1,3 @@
 Source: args
-Version: 2018-10-25
+Version: 2019-01-18
 Description: A simple header-only C++ argument parser library.
diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake
index e319975e0..76e3d5ce7 100644
--- a/ports/args/portfile.cmake
+++ b/ports/args/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Taywee/args
-    REF a82a9d6c94d7c58d8b96c65bdc1aba09a4f3e5db
-    SHA512 0a7caf231117827eb2dbbca3d51259c701c1b8da61518565e5cfe379edd03f34a2dac2d35cdba659042e19e7b3076ef4b6aa6e01d2f9b66db59d1672f9f18f12
+    REF f68b7e186cd2a020cbddfe3194c1d8ddfeeb1013
+    SHA512 affbda6f679257496de3d3f16db4d7e922ca39a0ef88f0c6b8a2803a7c89e7d12761fa8aa80e823e1c6b227936f1e3d5012b3ae82c0a64fb11179c74bb2e1d1c
     HEAD_REF master
 )
 
diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL
index 0c64640ca..06674892b 100644
--- a/ports/asmjit/CONTROL
+++ b/ports/asmjit/CONTROL
@@ -1,3 +1,3 @@
 Source: asmjit
-Version: 2018-12-14
+Version: 2019-01-30
 Description: Complete x86/x64 JIT and Remote Assembler for C++
diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake
index cfd1ed034..21b2ed894 100644
--- a/ports/asmjit/portfile.cmake
+++ b/ports/asmjit/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO asmjit/asmjit
-  REF 3092065f148d951df281d3f0f1b4922e580b3930
-  SHA512 4557bcbbe5b49e2303cfccc2ef9acdb59281a13fe9efe28ac49711736dd45db856f9f67aa9ebcf841e631fc83b8b7e14eee08e3a56d6f982fcc24e23b70b7cc5
+  REF 1e550aa568da993acb742ac19f2ab691a2806ad5
+  SHA512 e5cf195a6b94173b294cd739009128577dd687220b379490c3d1b616fb6220c085192834850913d9dc0a076b433104853ba9d4f8e48ce0705044891fea24039d
   HEAD_REF master
 )
 
diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake
index ecca87277..1dc3b7405 100644
--- a/ports/assimp/portfile.cmake
+++ b/ports/assimp/portfile.cmake
@@ -17,22 +17,29 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib ${SOURCE_PATH}/contrib/gtest ${S
 set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
 set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(BUILD_SHARED_LIBS "ON")
+else()
+    set(BUILD_SHARED_LIBS "OFF")
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS -DASSIMP_BUILD_TESTS=OFF
             -DASSIMP_BUILD_ASSIMP_VIEW=OFF
             -DASSIMP_BUILD_ZLIB=OFF
+            -DASSIMP_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
             -DASSIMP_BUILD_ASSIMP_TOOLS=OFF
             -DASSIMP_INSTALL_PDB=OFF
             -DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
             -DZLIB_FOUND=1
     OPTIONS_RELEASE
-        -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/zlib.lib
-        -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/zlib.lib
+            -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/zlib.lib
+            -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/zlib.lib
     OPTIONS_DEBUG
-        -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib
-        -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib
+            -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib
+            -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib
 )
 
 vcpkg_install_cmake()
@@ -43,6 +50,7 @@ vcpkg_copy_pdbs()
 
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake ASSIMP_CONFIG)
 string(REPLACE "get_filename_component(ASSIMP_ROOT_DIR \"\${_PREFIX}\" PATH)"
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index ac8859a7e..a888cd33e 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.7.38
+Version: 1.7.41
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
 Default-Features: dynamodb, s3, kinesis
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index c4ad3be31..153c3170c 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
-    REF 1.7.38
-    SHA512 01f06d007a5a3d65d377b14e57f864c48020e7f109c4f84caf0ef2b37a5dd4843e12de88af68030c17f2ecb1f88da0f8a021b8bea94b812d43925783d4e219d2
+    REF 1.7.41
+    SHA512 4cd6bf8aae464caadc696ff204da4d60caab3d4d95c058094b1fa499d53bd585dddc853cfc75295f7731f46a2a0e2a94339a2d83e6b21a12e9c80b7c53556ae9
     HEAD_REF master
 )
 
diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index 2ca540258..0b3a6c231 100644
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-c-shared-utility
-Version: 1.1.11-3
+Version: 1.1.11-5
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux)
 
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index 408c996db..ebfb097f5 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -6,17 +6,17 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF e885482ce32f1f77d29e85f7b8d35d74ffc69c74
-        SHA512 329101cb2ff499aa16e1df736285e2fdd8c34549d4790eaafa1df763950c2b4a5927f52e93dbf22192b240fe0445050ad99133df0405227ffe9857ff2b25014d
-        HEAD_REF public-preview
+        REF 773980d7882e4d5f1e7c9be2a0797d61fbc19da1
+        SHA512 fa374db336f5d186bcfd6ba70660167fdc87a1847376579cee894af3d2810aba097b3468e75c0b4213b68423cc07215032eeae6ee07590378237606112286ac4
+        HEAD_REF master
         PATCHES no-double-expand-cmake.patch
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF 1d622902d7842f94193fc394987f2b4e978bb700
-        SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84
+        REF 6229ecb0d49b7e75fdb88d2c477e94e5b5394c43
+        SHA512 b0426702dd7a79e149dd4f6c2b8d0b43cd06a82ce014112dcaba1de4e669157fe08a5f3748d431a9e2f559e066f658c1a62f5ac08d2da0bd1f5cf04dca2e52c2
         HEAD_REF master
         PATCHES no-double-expand-cmake.patch
     )
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index 139e72eb1..151da2b3e 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,8 +1,8 @@
 Source: azure-iot-sdk-c
-Version: 1.2.12-1
-Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson
+Version: 1.2.14-1
+Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
 
 Feature: public-preview
 Description: A version of the azure-iot-sdk-c containing public-preview features.
-Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview]
+Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview]
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 6008b0e71..c672754a9 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF 74b03316ec90f1602c20ebeab67a3b4a61065d8e
-        SHA512 78ab8d7cd6e25886e41f98500cb8cd9609ca677426a882ed0364a908e5267ec6191bb15fd65fb2c420a108df41f52a8ba6d5e6d626874bbfae4f56e8af5ca428
+        REF 6633c5b18710febf1af7713cf1a336fd38f623ed
+        SHA512 17787aa4ef52d4cf39f939fee05555fcef85cde63620036f6715b699902fd3fd766250c26ea6065f5f36572ac2b9d5293e79ba17ea9d8f4cbce267322269e7e4
         HEAD_REF public-preview
         PATCHES improve-external-deps.patch
     )
@@ -15,8 +15,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF 350b51f5abaedc975dae5419ad1fa4add7635fd2
-        SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb
+        REF a46d038a9151ff1fc7d9b70f2d7fcca03c19b972
+        SHA512 bcd9c656ab721ab15da3cb690772c84e58e09d8785b975b046d4986b5fa16fb9e74a06af00acbe91fd8d4b897cd12dba9b2318ea5465865bff98f5429d2ee618
         HEAD_REF master
         PATCHES improve-external-deps.patch
     )
@@ -32,6 +32,7 @@ vcpkg_configure_cmake(
         -Duse_installed_dependencies=ON
         -Duse_default_uuid=ON
         -Dbuild_as_dynamic=OFF
+        -Duse_edge_modules=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL
index d6e0080db..320ff71a6 100644
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 5.2.0
+Version: 6.0.0
 Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp)
 Description: Microsoft Azure Storage Client SDK for C++
   A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/
diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake
index 97f27ccee..24d59281b 100644
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@@ -7,8 +7,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-storage-cpp
-    REF v5.2.0
-    SHA512 345ddfcececc7b38e65dff96c971eadc41ce7255131f1bc9995dd8fed0c69cc3b48c6838152e30c57014bf2017bde0c819a09b7d6b4abaa089a7ae023633262e
+    REF v6.0.0
+    SHA512 e568c3c3fd10a688b4d2491987998b1e133e54853fbf94a238a0cc3955dfd4d68bedf79a0e30bb5f30e8dd3c2bf41999d7c8658571b7dca9a4058140258ca314
     HEAD_REF master
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/pplx-do-while.patch
diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL
index a903752ac..7dde811fc 100644
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-uamqp-c
-Version: 1.2.11-2
+Version: 1.2.11-4
 Build-Depends: azure-c-shared-utility
 Description: AMQP library for C
 
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index 4f4d33ee9..8490ec0d4 100644
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF bd7b85d0830634e3157da2411a6d060bf28f266e
-        SHA512 cbc2aa2765242ebe1a5e194e126f419cbd26edda5c1f72ffe9219a6c38b80aa91ef823a4fd8f78ac5d7ae0d9d471b50e5b8c4684e77c71b31e7cf35802e0cc17
-        HEAD_REF public-preview
+        REF 195f2480f31e0a9492e3ff3a7a1eed4a69205ddd
+        SHA512 fa2cab67d119018b7e28dd002641bc3e87ac2d45ecddeddb867135bac6e5eda02588f84c26283947bdc47789c90a3f9e04dab16e5eb9be8a384ef5c9bcf39572
+        HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF f29401ab5eb3853390d5f573d8fb37c0c96dba16
-        SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73
+        REF 32f53b92ab864ea9e54e7ae262dc72bdabfcfa01
+        SHA512 3a96feb3d04a2e90b59e897b6da93410de330963c75a0cb875d53b91838c977f6a801f4812b67c4e519059fd04aed9baf43f72258652832cf49b12692a47d188
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL
index 8a6857c3e..ab1b8de01 100644
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-uhttp-c
-Version: 1.1.11-2
+Version: 1.1.11-4
 Build-Depends: azure-c-shared-utility
 Description: Azure HTTP Library written in C
 
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index 0ef272a12..a4d525fae 100644
--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF e459385a811ce075f42aa7202db96ba1d1f55ac1
-        SHA512 b96382184893b49f30ad75d4c19eeb48f7a7823e9d48f2896ee4760be20f2f5b5ee3e78e39f10ae26363165360e5871c3ba82aa9edf3943b9f0ef9c0e3036ea6
-        HEAD_REF public-preview
+        REF 3a81e598caf2bd37077b7cd20bb45aaa9e694df7
+        SHA512 6f12efdd2f02adb2414e10daa0604f5351f7731b997d69a9ca2923b6246c7a628bd859c6dca2503e51eeece851421b7739ffbf31a3f3d34dca4dcbadb54411d2
+        HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed
-        SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30
+        REF 2e838f1587d7493f3bb0470b7e21b39c3f7c84ab
+        SHA512 30114e995bfdfa73dc43d016588290ef886e3c24d586f443d7f82d9c577f7274b5fc4b2ca40c9dd39883262cab30bf5b3e3eb560c27191ec4e9bb893e468bb54
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL
index 84359ff0c..9729cd209 100644
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-umqtt-c
-Version: 1.1.11-2
+Version: 1.1.11-4
 Build-Depends: azure-c-shared-utility
 Description: General purpose library for communication over the mqtt protocol
 
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index d03c24527..6833b5eb4 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF 1b3a25f4f7f0edbe068e261e8a808d7bc394a358
-        SHA512 00ff90eccfbb4febded7e819baa6303e97d3e7d6f6f8f1a28ebf353d7ad7ac5ec7f479e66456f395c7ece7fd6d612f3948ac656420bc0bc75566bdbb65fb88c3
-        HEAD_REF public-preview
+        REF f68e8d535d18028e3e6ed4d806ce8994037a49fa
+        SHA512 9bea4c3dbd26f5221c4da782954a4e8b4d372aca75b71a9eb63b818f31f153e4be534a20960c007c3aa184766f2a826c5ba11e780e23098707419ab39f055cc1
+        HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF 3205eb26401e9c6639100934e8fb75b75275760d
-        SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c
+        REF 6bb14b0a731e5c896758fc2f6ffe3d4bd31d2187
+        SHA512 001b04f203327e5096ad3453268939da7738952704a4e0b88ea033b0a2566bec7502b3a674eadf476f9df0da605d25b8a7f6a306e23a42690884188326bd0743
         HEAD_REF master
     )
 endif()
diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL
index dc80b4c41..89af7e7d3 100644
--- a/ports/blaze/CONTROL
+++ b/ports/blaze/CONTROL
@@ -1,4 +1,4 @@
 Source: blaze
-Version: 3.4-1
+Version: 3.5
 Build-Depends: clapack, boost-exception
 Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.
diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake
index a44808249..216a90109 100644
--- a/ports/blaze/portfile.cmake
+++ b/ports/blaze/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO blaze-lib/blaze
-    REF bbe39c81b68eb0d8647da703899e1ee4a82cdfd3
-    SHA512 84eb8226672d9d11d194d165e7aaa333a0d49ca090bb94472f19242e5f2ad0c3e08a30cdafe055cff51b210b603533f879800bd6784f3ffdb0d9eeca65d58b25
+    REF cac64f2b35002f74a8ad2410ce6fb562b2cd2371
+    SHA512 89381d77e518cdea40b0aa5013b8c74cbd737a2ce8d2d6869df1789a8154d2170c692ce04cae907704808fcff4a52fe0860d3fa2ee898780ce650a294b10894f
     HEAD_REF master
     PATCHES
         avoid-src-dir-generation.patch
diff --git a/ports/boost-accumulators/CONTROL b/ports/boost-accumulators/CONTROL
index 4b72307ca..d25e19fc6 100644
--- a/ports/boost-accumulators/CONTROL
+++ b/ports/boost-accumulators/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-accumulators
-Version: 1.68.0
+Version: 1.69.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-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-ublas, boost-utility, boost-vcpkg-helpers
 Description: Boost accumulators module
diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake
index 1dc10c580..7b27e076f 100644
--- a/ports/boost-accumulators/portfile.cmake
+++ b/ports/boost-accumulators/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/accumulators
-    REF boost-1.68.0
-    SHA512 a85e2f307a2f6c08378f595bca14d458da6ffb1b0f078d2be789a4ae8290296b2256ba91ed22ed89542a585efd8f6c1f7041711d8000649bd6141b22f1c77b81
+    REF boost-1.69.0
+    SHA512 82bb844f96ba5bc3ef97171830e2c7acd35eb500af211e2946aa51d1de1350acc2965200906d0656b8fd28eaf7d4781cc4e60b70fcbdad6c272ce8f6b47c608b
     HEAD_REF master
 )
 
diff --git a/ports/boost-algorithm/CONTROL b/ports/boost-algorithm/CONTROL
index 2d392879d..fc11fcd75 100644
--- a/ports/boost-algorithm/CONTROL
+++ b/ports/boost-algorithm/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-algorithm
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost algorithm module
diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake
index 631f93053..ae1ce12a0 100644
--- a/ports/boost-algorithm/portfile.cmake
+++ b/ports/boost-algorithm/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/algorithm
-    REF boost-1.68.0
-    SHA512 e5d6fd1a64d2c153b8135a12ce8fdd830a8e8138ac34dca8c0737eee5ec95238159dcd7422377f1cc50860ab47d918faa3ae802bfcab0d3e86dce689c2933114
+    REF boost-1.69.0
+    SHA512 1f3711ce69db9c8d0e7f2703fe03f2743c0e3d8d8a5342122fa3603cd89733764c23b8758e3cfeb4a92e9ec9f4d33f115e79c84de5b53e816ae467233080bab7
     HEAD_REF master
 )
 
diff --git a/ports/boost-align/CONTROL b/ports/boost-align/CONTROL
index f53211a11..a977e771e 100644
--- a/ports/boost-align/CONTROL
+++ b/ports/boost-align/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-align
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
 Description: Boost align module
diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake
index 74656ba75..5a96db899 100644
--- a/ports/boost-align/portfile.cmake
+++ b/ports/boost-align/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/align
-    REF boost-1.68.0
-    SHA512 70379431769ffbfd3e5a6f1d9580a0d70933925ba7cf6a862fbe0f257b4ccb66b86ece6af7d78c16835d836012811708f179da2956c0851388f4ce38ff056b5c
+    REF boost-1.69.0
+    SHA512 7a2a05bed07c589c72ed87dce4f03b2e803a860e5696c958b6a393297ac95001d3cf521e121710b105a6e742d8160c9e52934d8ace9bdd91b524a69e64fd95bf
     HEAD_REF master
 )
 
diff --git a/ports/boost-any/CONTROL b/ports/boost-any/CONTROL
index f41679d93..6efa9ab4e 100644
--- a/ports/boost-any/CONTROL
+++ b/ports/boost-any/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-any
-Version: 1.68.0
-Build-Depends: boost-config, boost-core, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost any module
diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake
index 3020577ab..9c40ed38a 100644
--- a/ports/boost-any/portfile.cmake
+++ b/ports/boost-any/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/any
-    REF boost-1.68.0
-    SHA512 bf9a7c3c761496a67a25cbb00ea5b7858ea629a6f99627f946a55e60b6c65c9eb0facd2e6aa613247001eebe4da34983083325e198869dc07854f7a41a799478
+    REF boost-1.69.0
+    SHA512 e6ca491c071992e542a480512d2b79add63c57428a527d4cffa5bf85448d9e7b7d2e7356e62d0346704cf881d62b2ca1c9cb3dcb68671b32623660d5cdd2ee96
     HEAD_REF master
 )
 
diff --git a/ports/boost-array/CONTROL b/ports/boost-array/CONTROL
index 04b1dc039..2cb22727c 100644
--- a/ports/boost-array/CONTROL
+++ b/ports/boost-array/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-array
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
 Description: Boost array module
diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake
index 817cdc01a..90a6ec6aa 100644
--- a/ports/boost-array/portfile.cmake
+++ b/ports/boost-array/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/array
-    REF boost-1.68.0
-    SHA512 cf6fa97a21f688888fc2c8c3982681602ddcba04f7821c6af0ad512074983c9a93befdf8e0dcf4336f5dc6d26117f4376fecc508b4ada9bb7f186ce7592a1102
+    REF boost-1.69.0
+    SHA512 7d9eaea992faf31af6c0cf793d543e53dee6a5d827c232e3cc86b639cd4e5dc0d3b6daec46144fc1953083aa7d60e87d6292fa518be1d1b499bc58804c28a443
     HEAD_REF master
 )
 
diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL
index b85abb532..e1a35aeff 100644
--- a/ports/boost-asio/CONTROL
+++ b/ports/boost-asio/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-asio
-Version: 1.68.0-1
-Build-Depends: boost-core, boost-coroutine (!uwp), boost-date-time, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-vcpkg-helpers, openssl
+Version: 1.69.0-1
+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
 Description: Boost asio module
diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake
index ec0ccbee6..9dd127495 100644
--- a/ports/boost-asio/portfile.cmake
+++ b/ports/boost-asio/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/asio
-    REF boost-1.68.0
-    SHA512 287aa7b4e37e97df10d196b1b409d38c19a025c18228df1ba9bb7dc19d53c9f51b69699e71b04ddee030710e08cb9c4b34eb08f8284d3fa88a762ed6fd096dbe
+    REF boost-1.69.0
+    SHA512 46597ccac219ceb484c638be06ba51a812f8b0e9559fe059542a2dbe5ed397f179f3430a3f24a3225e273de2bf351b44354c4f550c48ce491dff62d99618a64b
     HEAD_REF master
 )
 
diff --git a/ports/boost-assert/CONTROL b/ports/boost-assert/CONTROL
index c2fa170a7..7ab47b739 100644
--- a/ports/boost-assert/CONTROL
+++ b/ports/boost-assert/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-assert
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-vcpkg-helpers
 Description: Boost assert module
diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake
index 1b162fd25..2a7ad1e15 100644
--- a/ports/boost-assert/portfile.cmake
+++ b/ports/boost-assert/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/assert
-    REF boost-1.68.0
-    SHA512 fd5ffc755f9f0926adeb1d0f3ceea448094e5dcd94c3c9eaa203676bb790729c8e02e66633535f7eaa1df186d88eeb983ed894c181666489a6a3bf9323a8eac0
+    REF boost-1.69.0
+    SHA512 d96dfd50ab45f71f67f0bb87624b71dff8bb74bfbba8d014896dd1f68ec3163b877394732567ff0fe4e4feb837ff248291b0fcc0743a907df11397b4cd94a275
     HEAD_REF master
 )
 
diff --git a/ports/boost-assign/CONTROL b/ports/boost-assign/CONTROL
index 842661699..9c4e469d5 100644
--- a/ports/boost-assign/CONTROL
+++ b/ports/boost-assign/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-assign
-Version: 1.68.0
-Build-Depends: boost-array, boost-config, boost-detail, boost-mpl, boost-preprocessor, boost-ptr-container, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost assign module
diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake
index e223ea18b..6ac289794 100644
--- a/ports/boost-assign/portfile.cmake
+++ b/ports/boost-assign/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/assign
-    REF boost-1.68.0
-    SHA512 95c2d653e5523d54664e7ed7844d0aa2ccb01c73be2c777b6f8f3c1c738f1bd41c20332d52add7fc6c46621558a09c986a6757b6374a0a54dddfba004a9bb3a0
+    REF boost-1.69.0
+    SHA512 c83961ff2281421001a041a77ab785f81fba1b3538fc96a2b8a5ea6ca950e9088ed820d46758cf4d076c0f31b6b92d948a39384f7e2f796659a76434e7b089b9
     HEAD_REF master
 )
 
diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL
index b207ebc10..384cae7fc 100644
--- a/ports/boost-atomic/CONTROL
+++ b/ports/boost-atomic/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-atomic
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers
 Description: Boost atomic module
diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake
index ae7fd3141..634ad1bb4 100644
--- a/ports/boost-atomic/portfile.cmake
+++ b/ports/boost-atomic/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/atomic
-    REF boost-1.68.0
-    SHA512 651c02ce0b58458114d4e196eecaf614a781c383ae9b42646d040b3e84babf9983efebed08bb60343eb9beeb566a6ae508ad230ffebae1e7731053529c723eab
+    REF boost-1.69.0
+    SHA512 17fe0249f1ceb8d9f6d1f2426a1ea1987bed2a33301cc03debc584f2557e48252a4b1c399f5f71764ef07bdfe48acd9a36a692c59710b64e5656a54a0703427f
     HEAD_REF master
 )
 
diff --git a/ports/boost-beast/CONTROL b/ports/boost-beast/CONTROL
index 71ac84478..1f7e1942f 100644
--- a/ports/boost-beast/CONTROL
+++ b/ports/boost-beast/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-beast
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-align, boost-asio, boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Description: Boost beast module
diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake
index 2a9658e11..c5ce1a1c3 100644
--- a/ports/boost-beast/portfile.cmake
+++ b/ports/boost-beast/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/beast
-    REF boost-1.68.0
-    SHA512 889b5285dd7cca86561bc81c8d152dbc1c281b6b9fedfdb95710de94c8582aaaa150ee1a9d9e11f18f79ef1b336ff44dbd2f7614b06342ea9d7b6ad8f2eb60dc
+    REF boost-1.69.0
+    SHA512 bb6e3763f610abc1fa621f03e8f3e82b4c8e8643bf41eba5353c65d8bf3e84b10161a108148459f1dd8786204d7a3783e0c00caf88233f977b3e3ce93d7f0495
     HEAD_REF master
 )
 
diff --git a/ports/boost-bimap/CONTROL b/ports/boost-bimap/CONTROL
index 64e293c97..7f6bd2f0e 100644
--- a/ports/boost-bimap/CONTROL
+++ b/ports/boost-bimap/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-bimap
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost bimap module
diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake
index 51ee94385..a9dcaa467 100644
--- a/ports/boost-bimap/portfile.cmake
+++ b/ports/boost-bimap/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/bimap
-    REF boost-1.68.0
-    SHA512 f8e994043e41eef2270f78e7d310ac3b86e667be93e7aa04e0fb97a207f75ee1c587fd4cfda741ab19e0e7e8313b24dafe57e93d9d78a6a08cc306fdff3f41d6
+    REF boost-1.69.0
+    SHA512 f6241910a5e94d10f9bc9b5c8dd2bd21c298145ff4eeff30e673e1bd421b962f07fd9c79b99952f896d11fa6874f5ecd64a8d060cf53ab1183735ae361879f40
     HEAD_REF master
 )
 
diff --git a/ports/boost-bind/CONTROL b/ports/boost-bind/CONTROL
index bb6c1825d..a80dc4c38 100644
--- a/ports/boost-bind/CONTROL
+++ b/ports/boost-bind/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-bind
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
 Description: Boost bind module
diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake
index 3f7696f31..4b4a6771a 100644
--- a/ports/boost-bind/portfile.cmake
+++ b/ports/boost-bind/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/bind
-    REF boost-1.68.0
-    SHA512 da8c25851bf1083aceafe2972393544009ddefedbdfc40184c95e6a7fe9403ca73cbdfc4a8d583503952cefb6fe14c2f7068eb8019916100fe00aaf205198470
+    REF boost-1.69.0
+    SHA512 8445e5359d52cf71f0a818c507cfe4746e7966694691e6acaf7284855532245228bbfc3b26fb89d631e1a4d8de72d1a28e50ee60255c8955bef6a28a04b92105
     HEAD_REF master
 )
 
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL
index db12d3b3d..2886f3399 100644
--- a/ports/boost-build/CONTROL
+++ b/ports/boost-build/CONTROL
@@ -1,3 +1,3 @@
 Source: boost-build
-Version: 1.68.0
+Version: 1.69.0
 Description: Boost.Build
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake
index e420fc1a5..6c54d0555 100644
--- a/ports/boost-build/portfile.cmake
+++ b/ports/boost-build/portfile.cmake
@@ -11,21 +11,21 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/build
-    REF boost-1.68.0
-    SHA512 ede4ea6bba966bfdc590ea21b8787f090c690db851fd6eb19644f089de8828b6cec504a7f4be203d57017de2a0288f0e12772e50d9017287221520dca1676a79
+    REF boost-1.69.0
+    SHA512 e8d89e75c83a08bab29f52b5100fccf1d2ddf492a532ae4cb8121a5f49819aebb8157d1a1fd7d514bd8a0fe444e5ebb1103b10c8579d5c234ab81110d9c334a8
     HEAD_REF master
 )
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.68.0/LICENSE_1_0.txt"
+    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.69.0/LICENSE_1_0.txt"
     FILENAME "boost_LICENSE_1_0.txt"
     SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
 )
 
 vcpkg_download_distfile(BOOSTCPP_ARCHIVE
-    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.68.0/boostcpp.jam"
-    FILENAME "boost-1.68.0-boostcpp.jam"
-    SHA512 4d887b05b4873e651fd9bc20f04fc072c7d801fd50445c989517cd39c3a8aa132ed46c407fb0efb35825fc0fc1035393d5ac0da5922be2c120cf2bfff952b3bc
+    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.69.0/boostcpp.jam"
+    FILENAME "boost-1.69.0-boostcpp.jam"
+    SHA512 1d05142f33b86a342674513cd5890b78601b0b3824540588f2c9e4c1fea43fadaa94f4a99495614445d3930861470fbfb8ad8c94b8bddf6a24ee65661a9bddc9
 )
 
 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 637b50d0e..60083adf5 100644
--- a/ports/boost-callable-traits/CONTROL
+++ b/ports/boost-callable-traits/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-callable-traits
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-vcpkg-helpers
 Description: Boost callable_traits module
diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake
index 166fb666a..985c900cf 100644
--- a/ports/boost-callable-traits/portfile.cmake
+++ b/ports/boost-callable-traits/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/callable_traits
-    REF boost-1.68.0
-    SHA512 1c8d7e95d92996a046cc849216e00ee781b1ad8d9f6e4b7d584ea77bedf7a86a17ba0b43863d445f870a1a7991022e9c1a34fa7039de6fbd419a1bbc2e0e94e5
+    REF boost-1.69.0
+    SHA512 0bdff6650b996b640b5853c540dab0a22cb6da13182512bfc34608d9bbb8f99ecd01b018106f91b827e5c9c2a9a7c7373128c85f4b533f472c81efab4eef45eb
     HEAD_REF master
 )
 
diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL
index 2b34389d5..7c154c473 100644
--- a/ports/boost-chrono/CONTROL
+++ b/ports/boost-chrono/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-chrono
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost chrono module
diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake
index c743a1919..562f3ea1e 100644
--- a/ports/boost-chrono/portfile.cmake
+++ b/ports/boost-chrono/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/chrono
-    REF boost-1.68.0
-    SHA512 a124d6588839405163dcf5de1a81bb8bc57cc0e8914b16ba1dc4cd2dd5497617a03c940c7ef53328ed724a3ee518169454af439168b7f257ad0b6ea8219c986c
+    REF boost-1.69.0
+    SHA512 7de2282c65b4c25086f99602fcb4dc21b0470f327d1d8db530387754cd5710588ea196e0382b64df8c2160274d7d229ebf307d37cd7d0052b1beb182ac9dc641
     HEAD_REF master
 )
 
diff --git a/ports/boost-circular-buffer/CONTROL b/ports/boost-circular-buffer/CONTROL
index 01fb2cc36..e56de0eb5 100644
--- a/ports/boost-circular-buffer/CONTROL
+++ b/ports/boost-circular-buffer/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-circular-buffer
-Version: 1.68.0
-Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-iterator, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost circular_buffer module
diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake
index 24c85c55b..f8f815b2b 100644
--- a/ports/boost-circular-buffer/portfile.cmake
+++ b/ports/boost-circular-buffer/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/circular_buffer
-    REF boost-1.68.0
-    SHA512 da2f34f331b3fb24ed6147a67b242f3f4d14eac5fdf524ff57ac6acff0fe73b91bd1d374e61f0314465d5f09d3002bdb442cf2ac5c505b1276d4dbdf75b8cc2a
+    REF boost-1.69.0
+    SHA512 2340ef5d04dff2be8dc6aadd697dd11992c86fcf84da4ea48cac17992b85ebd8f11b26e3772d77110db1ea7b81076c5c29647e8c13a17bbe47063ea1b511f809
     HEAD_REF master
 )
 
diff --git a/ports/boost-compatibility/CONTROL b/ports/boost-compatibility/CONTROL
index d7aab8193..f59e7b652 100644
--- a/ports/boost-compatibility/CONTROL
+++ b/ports/boost-compatibility/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-compatibility
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-vcpkg-helpers
 Description: Boost compatibility module
diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake
index 4f3b3258f..f2c362ed4 100644
--- a/ports/boost-compatibility/portfile.cmake
+++ b/ports/boost-compatibility/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/compatibility
-    REF boost-1.68.0
-    SHA512 73124528957098af9480e776419d3a5ed86ec954695c020075e16730de5bbfd8f104e9463bdbc8996423d89ab5a775dc76b5b9127a44a2f53e4691324776bf17
+    REF boost-1.69.0
+    SHA512 2bac082f818b9138c529089751aea29d3848b90ee213ca58639667b3ffb8fa93235d4d5b3bc248f36dfa8fe79a30fc1f4628adc2637f09df1e0fac7b45e0a893
     HEAD_REF master
 )
 
diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL
index 2bcd3d1e1..858e9b4e3 100644
--- a/ports/boost-compute/CONTROL
+++ b/ports/boost-compute/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-compute
-Version: 1.68.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-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.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 (!arm), boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-uuid, boost-vcpkg-helpers
 Description: Boost compute module
diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake
index 61441381f..43449f136 100644
--- a/ports/boost-compute/portfile.cmake
+++ b/ports/boost-compute/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/compute
-    REF boost-1.68.0
-    SHA512 f80233128e18b68a592c0585c3721254378a45615a79f8d379ad1654548428a86defe7a5147caa8ad955f3f45a568b81e7d97c08cde46f36f7908e670162ed3f
+    REF boost-1.69.0
+    SHA512 885c91598fc5687e6b6054c49777713dc43843b755898700b6de519e115e1431cd9d11a533d30ad782412da0c2912995bea1a86bb6df7f45ee246cfabe86d452
     HEAD_REF master
 )
 
diff --git a/ports/boost-concept-check/CONTROL b/ports/boost-concept-check/CONTROL
index 3d215f848..e50fd5877 100644
--- a/ports/boost-concept-check/CONTROL
+++ b/ports/boost-concept-check/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-concept-check
-Version: 1.68.0
-Build-Depends: boost-config, boost-mpl, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-config, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Description: Boost concept_check module
diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake
index 69ba3a7d2..a656e9806 100644
--- a/ports/boost-concept-check/portfile.cmake
+++ b/ports/boost-concept-check/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/concept_check
-    REF boost-1.68.0
-    SHA512 6f7f819fb8e8d03eb8f2f323e50dda583254e4ead58093c74d84271cb4d2ea5c25cac0c0aeffe97a8e209425d844dd6d7fcd687d0690e09b5e8c6edcd0ea6af2
+    REF boost-1.69.0
+    SHA512 4a3c9833f8269d20486b1fb7e99a9203116f71ed8c6a4339abfe02982fbc3443e2d447e97a7a3915b3fa77db6ba66dc196dc249d3769b741421bb7377b58a061
     HEAD_REF master
 )
 
diff --git a/ports/boost-config/CONTROL b/ports/boost-config/CONTROL
index 49fc221ac..db6e4af38 100644
--- a/ports/boost-config/CONTROL
+++ b/ports/boost-config/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-config
-Version: 1.68.0
-Build-Depends: boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-compatibility, boost-vcpkg-helpers
 Description: Boost config module
diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake
index 899814d49..362560350 100644
--- a/ports/boost-config/portfile.cmake
+++ b/ports/boost-config/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/config
-    REF boost-1.68.0
-    SHA512 2b10be87e3d1a9a64b8b4459ca3427bf6187c53eeaf4551cf3755e4ee6b45e16a28539db0780e6392a3bf862feccffb38042cfb3a8d7f230caa5139ee94b713e
+    REF boost-1.69.0
+    SHA512 c5c6fabbe17f42bbfd0efcb42697eaaf688ceeb6d3a5e16c15e9e60353d99c593eb9b9587c3514642fccab23a869f7235e2531f57ab4e06840e8013f808cf8d8
     HEAD_REF master
 )
 
diff --git a/ports/boost-container-hash/CONTROL b/ports/boost-container-hash/CONTROL
index 2facaaa42..4660d76cb 100644
--- a/ports/boost-container-hash/CONTROL
+++ b/ports/boost-container-hash/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-container-hash
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Description: Boost container_hash module
diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake
index 223bd63eb..caf24b39a 100644
--- a/ports/boost-container-hash/portfile.cmake
+++ b/ports/boost-container-hash/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/container_hash
-    REF boost-1.68.0
-    SHA512 a0d259fbf66444edbebfcbc02215d2c9bda1a7affa841caca49635bf627a434a8bcde6a8f8e8a49ca6a506d2705d5b6d9a62c7da2fa0626a84690f7c4515991b
+    REF boost-1.69.0
+    SHA512 120a1b6d15344507ab3f81454e9c6059fd2fa3a16fc81b6b2a02c93ed5e4b8d1b180343726a38b44d60c25fcfd6427a2c3741c9e9cf18a26c878d4ad2b806b40
     HEAD_REF master
 )
 
diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL
index 7f1ebd197..2e6613b0d 100644
--- a/ports/boost-container/CONTROL
+++ b/ports/boost-container/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-container
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost container module
diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake
index cebcd4034..dcf82dd8b 100644
--- a/ports/boost-container/portfile.cmake
+++ b/ports/boost-container/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/container
-    REF boost-1.68.0
-    SHA512 648fe7ee8442ac56604e515d64a7932f852319a216b345745714db4d37fce80cf46140a8b14d939c25d12372fb6ee3db55ebaf23f0928388735330d8ddeff7c1
+    REF boost-1.69.0
+    SHA512 8acfa595a188870f1cfb30bf1600997300260d81f56b8a28de8ab12065e0206b91c27d1203aa2541261ea734a09084d205d197097dbacd4858a736db56c9280a
     HEAD_REF master
 )
 
diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL
index 72a71a27f..fa0348e55 100644
--- a/ports/boost-context/CONTROL
+++ b/ports/boost-context/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-context
-Version: 1.68.0-1
-Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-vcpkg-helpers
+Version: 1.69.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 (!arm), boost-vcpkg-helpers
 Description: Boost context module
diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake
index fbfdb98f0..78d5efa24 100644
--- a/ports/boost-context/portfile.cmake
+++ b/ports/boost-context/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/context
-    REF boost-1.68.0
-    SHA512 6010cac31d408a9e4a47640b521da810240c697b529e85f97650f022397a55f1b509baf72076fa6e9ebec556c7a38d3da5045e9584c4dbde3d85fa61a5f91043
+    REF boost-1.69.0
+    SHA512 9764013a43d0c5d73b52a6da625c24ffa36b164eddce52157593e75b9d810a1bff5364a73735e848804be82fc356ef13dd5d796f80e6491fb4c9c57797f0a89d
     HEAD_REF master
 )
 
@@ -24,4 +24,4 @@ boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
 if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp)
     file(WRITE ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp
         "#error \"#include <boost/context/all.hpp> is no longer supported by boost_context.\"")
-endif()
-\ No newline at end of file
+endif()
diff --git a/ports/boost-contract/CONTROL b/ports/boost-contract/CONTROL
index 55bd2d2f6..1667b1d72 100644
--- a/ports/boost-contract/CONTROL
+++ b/ports/boost-contract/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-contract
-Version: 1.68.0
+Version: 1.69.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 (!arm), boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost contract module
diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake
index 98dc19d93..7a81ef146 100644
--- a/ports/boost-contract/portfile.cmake
+++ b/ports/boost-contract/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/contract
-    REF boost-1.68.0
-    SHA512 bcf68ae08245449f9bbe5987c7afc3a20b2b77c80d615e2463b6f215331032cefdf217976077e0c9622f1376d0226b53aae64ae4b4e53265179d208a0a0f743f
+    REF boost-1.69.0
+    SHA512 d1d0e8c2bb12a5176933e1848d7abdffee5ce58cb15ff73dbf24723cd436a632629023a28ce25fb4fd2d650b5fffd38cac700d5587f239a654a87b6a0c791755
     HEAD_REF master
 )
 
diff --git a/ports/boost-conversion/CONTROL b/ports/boost-conversion/CONTROL
index 9d59d42ff..b3a43bcba 100644
--- a/ports/boost-conversion/CONTROL
+++ b/ports/boost-conversion/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-conversion
-Version: 1.68.0
-Build-Depends: boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-assert, boost-config, boost-throw-exception, boost-typeof, boost-utility, boost-vcpkg-helpers
 Description: Boost conversion module
diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake
index 4821ee6a0..e89c3a0e9 100644
--- a/ports/boost-conversion/portfile.cmake
+++ b/ports/boost-conversion/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/conversion
-    REF boost-1.68.0
-    SHA512 7b207134766cf68607e575374cb936c3718328a4d0e9ae1cc245bb0ef727a9d6961a11974cffb2b9abe99f82948d0f7b7f1e9404a55091d88fbce9aab1d673f5
+    REF boost-1.69.0
+    SHA512 19e8c50e317166595d0b11927e040994c13bda8cab91b2fbc33de5875ac8270fbc4cef43d11149906f4fdd081a46d5e6635793a825c1e4984ec186a03c5f4121
     HEAD_REF master
 )
 
diff --git a/ports/boost-convert/CONTROL b/ports/boost-convert/CONTROL
index 96f967ed5..5bfa01743 100644
--- a/ports/boost-convert/CONTROL
+++ b/ports/boost-convert/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-convert
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost convert module
diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake
index 5b85d0a77..b42f37b33 100644
--- a/ports/boost-convert/portfile.cmake
+++ b/ports/boost-convert/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/convert
-    REF boost-1.68.0
-    SHA512 8493a2dcba56c6d7fe9cfb1cea1c4225be5112903071c450a2044462adc46e81bc4c98e3a1a5096b146069686250895dae00d0bdb7e1fbc2627325666e9b744d
+    REF boost-1.69.0
+    SHA512 2461fd507ddefbae59f2357cc5627d52826555913660a4c58910f8562815d0d0e41e7ad169075404ed72fe215d93850775c30f4a0335dc282868dd51f7e0b9be
     HEAD_REF master
 )
 
diff --git a/ports/boost-core/CONTROL b/ports/boost-core/CONTROL
index 82b3cf767..200efff69 100644
--- a/ports/boost-core/CONTROL
+++ b/ports/boost-core/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-core
-Version: 1.68.0
-Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-config, boost-vcpkg-helpers
 Description: Boost core module
diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake
index 1273a72c9..be16b6b2a 100644
--- a/ports/boost-core/portfile.cmake
+++ b/ports/boost-core/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/core
-    REF boost-1.68.0
-    SHA512 3870a595e146172a9e126d0894b4809bc776d66490f3f77112ca34f2c5c559576c732e3dd381d9366b25e46ace6a548741875b9992949aafa7cb5d395e3c9c48
+    REF boost-1.69.0
+    SHA512 43851113e0202e8b0d1fc479fb6e87a75152577f4309796335e9d23b26b00631beaf7780fb7404f421e1239a7e1c449c3d1c3634f697c562927c1b623fbd0d76
     HEAD_REF master
 )
 
diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL
index e2fcae43d..7fad1876a 100644
--- a/ports/boost-coroutine/CONTROL
+++ b/ports/boost-coroutine/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-coroutine
-Version: 1.68.0
+Version: 1.69.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 (!arm), boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost coroutine module
diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake
index 6f4f8d92f..4ae5275a9 100644
--- a/ports/boost-coroutine/portfile.cmake
+++ b/ports/boost-coroutine/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/coroutine
-    REF boost-1.68.0
-    SHA512 47edf91ffdcd4ec8acb98b54f7baa19f280b4d865a6810ee26bbb13cc8f9233e8bbeb8771fa796e2b2fef393352981b737c7987da31095ef65f48f62a8a2d092
+    REF boost-1.69.0
+    SHA512 12e8abb698d7b71fc39659e43386a7b33227065cb0ccc1f7c4ff972e0d75dca02e26306214a8aea613f4bd2f3741ca930bf412666312465d0b504cee68b27582
     HEAD_REF master
 )
 
diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL
index c5ba714e0..13eb90846 100644
--- a/ports/boost-coroutine2/CONTROL
+++ b/ports/boost-coroutine2/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-coroutine2
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-config, boost-context (!uwp), boost-detail, boost-vcpkg-helpers
 Description: Boost coroutine2 module
diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake
index 9ede6c004..7fe2063d9 100644
--- a/ports/boost-coroutine2/portfile.cmake
+++ b/ports/boost-coroutine2/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/coroutine2
-    REF boost-1.68.0
-    SHA512 62601d2081a592394ce443b295a9e755513a5e0b10c8791c33dbc4436c37775765a9ac9e49a8a74182759796e1953d1d9fa13e6dcb021b602386eae77d6eda78
+    REF boost-1.69.0
+    SHA512 278fdeedb5624d17a07ee4b9c1ea8864eb695042c19d59cd4cf519d89a9f33774bc2ee38b5e5c2eea18074abd23711d123549c0df414f65ecdb562256be5b3c3
     HEAD_REF master
 )
 
diff --git a/ports/boost-crc/CONTROL b/ports/boost-crc/CONTROL
index bd8f43151..06b2b72c8 100644
--- a/ports/boost-crc/CONTROL
+++ b/ports/boost-crc/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-crc
-Version: 1.68.0
-Build-Depends: boost-compatibility, boost-config, boost-integer, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-array, boost-compatibility, boost-config, boost-integer, boost-type-traits, boost-vcpkg-helpers
 Description: Boost crc module
diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake
index 03f0a43de..3ac1963a4 100644
--- a/ports/boost-crc/portfile.cmake
+++ b/ports/boost-crc/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/crc
-    REF boost-1.68.0
-    SHA512 8d29e20bae0b86bb7592b08a25d0a5c2b8ff83c1ee5aeef1cb9f1b97fe798f743b4ad6c3f1dc59fec54761b2440fc6c8cdfe6f7f4eb7c7352a3ff90c383abf87
+    REF boost-1.69.0
+    SHA512 10cebe78edc8201bed71dd21fe3cab5e1cc7fe1bcb5a52be253f1ec33fabd7f9bb7e7c553785dd1752548c4b8ddd7262de83b84f476cafe8da8a71ac5a0e9e85
     HEAD_REF master
 )
 
diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL
index 348290261..8e8d74c82 100644
--- a/ports/boost-date-time/CONTROL
+++ b/ports/boost-date-time/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-date-time
-Version: 1.68.0
+Version: 1.69.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-mpl, 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
 Description: Boost date_time module
diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake
index 0e664c2de..114d9255e 100644
--- a/ports/boost-date-time/portfile.cmake
+++ b/ports/boost-date-time/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/date_time
-    REF boost-1.68.0
-    SHA512 c48d488cf72bc2a7e10e6068fe1b541718bf1f402ec20bbae56da4b0f712804e21ed7613dbcd5fcc6f90adc59d867bb88c4ddd35d3200e50d291ec9d213660f3
+    REF boost-1.69.0
+    SHA512 5e95ba32467b1431cd0d353f4bebdbf031d6ad6f18c3f462de5931a272b4448b628a68682ced538b11f28c1be0817378800d5e62764feb23736f7b5e96f33d1d
     HEAD_REF master
 )
 
diff --git a/ports/boost-detail/CONTROL b/ports/boost-detail/CONTROL
index 3782d8900..da02cc028 100644
--- a/ports/boost-detail/CONTROL
+++ b/ports/boost-detail/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-detail
-Version: 1.68.0
-Build-Depends: boost-compatibility, boost-config, boost-core, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-compatibility, boost-config, boost-preprocessor, boost-vcpkg-helpers
 Description: Boost detail module
diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake
index 0a4e1b2e1..f4cb94553 100644
--- a/ports/boost-detail/portfile.cmake
+++ b/ports/boost-detail/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/detail
-    REF boost-1.68.0
-    SHA512 0e8188bc2ec189754a078b2b875d996dd485972ac995a999bf5ebbc6379ef299e7ba8d38066efac2d37d6a12e7ed6ee97d120ac334ea022a54609a18bd2447ec
+    REF boost-1.69.0
+    SHA512 f787d14e9d980b5f568320982952bdb122402d3a017d26e90a7552f3dfe4f4a8ffff12f6f7a83ba9434ae1affa6946016a549ae27df829fd323a7543e5f7a7ec
     HEAD_REF master
 )
 
diff --git a/ports/boost-di/CONTROL b/ports/boost-di/CONTROL
index 29105119e..6243b1446 100644
--- a/ports/boost-di/CONTROL
+++ b/ports/boost-di/CONTROL
@@ -1,3 +1,3 @@
 Source: boost-di
-Version: 1.0.2
-Description: C++14 Dependency Injection Library.
-\ No newline at end of file
+Version: 1.1.0
+Description: C++14 Dependency Injection Library.
diff --git a/ports/boost-di/portfile.cmake b/ports/boost-di/portfile.cmake
index 83ab057d1..f6fe59a3f 100644
--- a/ports/boost-di/portfile.cmake
+++ b/ports/boost-di/portfile.cmake
@@ -1,11 +1,11 @@
 #header-only library
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/di-1.0.2)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/di-1.1.0)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/boost-experimental/di/archive/v1.0.2.tar.gz"
-    FILENAME "di-1.0.2.tar.gz"
-    SHA512 1a5fc3738db2c3c18c198ce58e82a60f4f3d39fb66c9dc2b465df89da66a19ffca79eca148e68cd70c76524185ba2145e2857504a25eda4fa70ffd2f05f3be40
+    URLS "https://github.com/boost-experimental/di/archive/v1.1.0.tar.gz"
+    FILENAME "di-1.1.0.tar.gz"
+    SHA512 69f7b0567cffea9bf983aedd7eabd1a07ae20249cd56a13de98eaa0cc835cbe3b76e790da68489536dd07edeb99271a69111f4d0c6b0aa3721ce9f5ead848fe0
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
@@ -19,4 +19,4 @@ vcpkg_download_distfile(LICENSE
 	FILENAME "boost-di-copyright"
 	SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
 )
-file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-di/copyright)
-\ No newline at end of file
+file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-di/copyright)
diff --git a/ports/boost-disjoint-sets/CONTROL b/ports/boost-disjoint-sets/CONTROL
index bce4318a6..800b96123 100644
--- a/ports/boost-disjoint-sets/CONTROL
+++ b/ports/boost-disjoint-sets/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-disjoint-sets
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-graph, boost-vcpkg-helpers
 Description: Boost disjoint_sets module
diff --git a/ports/boost-disjoint-sets/portfile.cmake b/ports/boost-disjoint-sets/portfile.cmake
index 71afb65e0..5821422f1 100644
--- a/ports/boost-disjoint-sets/portfile.cmake
+++ b/ports/boost-disjoint-sets/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/disjoint_sets
-    REF boost-1.68.0
-    SHA512 3ce49942da8b37ad9a094bfbb7eda38efea2d50f70192246e955d4d34970b1069e1c04bdfa1272e6d92a31875b335e2eb2333ed66dbb8231d8206c5faac618a4
+    REF boost-1.69.0
+    SHA512 2d43ec3020249c232b35ce6ab6be541e4dbdddc4dbe9f0e2f92796e3200670df03c40651c0d7fe3f91f89b2524b0f023a4152e80d8b3ee7738ea5fa6880801e3
     HEAD_REF master
 )
 
diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL
index f1787f9e1..6a06ccf7e 100644
--- a/ports/boost-dll/CONTROL
+++ b/ports/boost-dll/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-dll
-Version: 1.68.0
-Build-Depends: boost-config, boost-core, boost-filesystem (!uwp), 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.69.0
+Build-Depends: 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
 Description: Boost dll module
diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake
index 485476cc7..875401da8 100644
--- a/ports/boost-dll/portfile.cmake
+++ b/ports/boost-dll/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/dll
-    REF boost-1.68.0
-    SHA512 5f45561397b8860da4cf9839bb7dbc79127c90f4134d038933414eb44cd1b2af422ee83df08ff6561e7dbab408159e64ef1c34594d1037a978478bd3fb4fa3ca
+    REF boost-1.69.0
+    SHA512 b2948d2e7dc7899533a4ee073d6386166ccaf2fcb40feaa2a98e86f453cd58d74d7e75100cb0e85064ef11fe7caf065e165344463cbe3631333b4c8a3c6a8f50
     HEAD_REF master
 )
 
diff --git a/ports/boost-dynamic-bitset/CONTROL b/ports/boost-dynamic-bitset/CONTROL
index 9f7c179e2..95e899824 100644
--- a/ports/boost-dynamic-bitset/CONTROL
+++ b/ports/boost-dynamic-bitset/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-dynamic-bitset
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-serialization, boost-vcpkg-helpers
 Description: Boost dynamic_bitset module
diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake
index 8ff4350fb..95798b5da 100644
--- a/ports/boost-dynamic-bitset/portfile.cmake
+++ b/ports/boost-dynamic-bitset/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/dynamic_bitset
-    REF boost-1.68.0
-    SHA512 7fa486d3088966fedcc30cced1282b997da39134dc1dcae3382a532c5b64a1965b761f8fd130ca7901aabd77375a84c66597c509c612ba1f99c238c0a754974c
+    REF boost-1.69.0
+    SHA512 80e8b4f8f1fb0d5955e7f9ec92d6d39a214e0443d3a85b633dbc3abdb29d9b401ca1698097e12a25bbc94b6bd722a9cf7698ab4deb61a69ca8a2d84083765290
     HEAD_REF master
 )
 
diff --git a/ports/boost-endian/CONTROL b/ports/boost-endian/CONTROL
index 325a29aa1..bc2baadc4 100644
--- a/ports/boost-endian/CONTROL
+++ b/ports/boost-endian/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-endian
-Version: 1.68.0
-Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost endian module
diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake
index 79adace7e..2fa8f985e 100644
--- a/ports/boost-endian/portfile.cmake
+++ b/ports/boost-endian/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/endian
-    REF boost-1.68.0
-    SHA512 40d7b241198f3146b0dc4ff7ea637f8fdc28b2dca12badaeea6434ba1c56f2bd6ab0027e84da3805ba57daf9e3f99994bb2fbcac491eca39bec4e16b363c7da1
+    REF boost-1.69.0
+    SHA512 13f96af6696b8ba353ab7c11dc2b26db50038b44c44287dd927b78b7ff55fa6fb37002980c878e850cfbe7b1d264722bd632db88404ac2df641b5094229e5e99
     HEAD_REF master
 )
 
diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL
index f1d18a047..737e7876a 100644
--- a/ports/boost-exception/CONTROL
+++ b/ports/boost-exception/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-exception
-Version: 1.68.0
-Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost exception module
diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake
index e84166be9..bc699965c 100644
--- a/ports/boost-exception/portfile.cmake
+++ b/ports/boost-exception/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/exception
-    REF boost-1.68.0
-    SHA512 91eb014c73afe3dcedeacc827e12705530d97f1f3797cadcd17972ce016df630bb22eff27c5f2aec7380047264b90072ba4f17d37e93dbccd5cac7fdd7e32b2e
+    REF boost-1.69.0
+    SHA512 25dd5e1721e6c4668530a90c7bcd4d0adf7312562dbb62dc3a34ac88cb8d4206072dbd365608cd5fb1b3f5eab82686035bd4fba1f4e76b603b95e6d51b090e7d
     HEAD_REF master
 )
 
diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL
index 1dd685de9..b25d07ded 100644
--- a/ports/boost-fiber/CONTROL
+++ b/ports/boost-fiber/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-fiber
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost fiber module
diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake
index 7fddd97ef..bf09a86c9 100644
--- a/ports/boost-fiber/portfile.cmake
+++ b/ports/boost-fiber/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/fiber
-    REF boost-1.68.0
-    SHA512 54325a9b6fcb7d153fd8705a44a802ad34d55af042bee9b74beebda6c66e470cf08bfe49ada6c8d9f2603847d7b695ceba7ebed8eaf1dc3fdf069d07717a47a9
+    REF boost-1.69.0
+    SHA512 c76794d63742ce9b4cc2d0aea2bc806071ea8ce03bda3759ab225edfd2c92c30bb437027e8bb8d6e526406180589f1021f64611a001545a68be41c9a41714a47
     HEAD_REF master
 )
 
diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL
index cf685a086..71630d843 100644
--- a/ports/boost-filesystem/CONTROL
+++ b/ports/boost-filesystem/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-filesystem
-Version: 1.68.0
-Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-range, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost filesystem module
diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake
index d177e7b18..8fe22e891 100644
--- a/ports/boost-filesystem/portfile.cmake
+++ b/ports/boost-filesystem/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/filesystem
-    REF boost-1.68.0
-    SHA512 0861e64016e5c133f811735701814e0d35b99366835fdb9de0238e6c194b1c029d8fae9a1bb32e518729eab33f4e65700f8a5e5f14f06c64085873946dbb9163
+    REF boost-1.69.0
+    SHA512 d278883d80245018a431fe5c169ecbfbf21380b3a1fb491a49aa74ad26a2db6336ef5309143ad19a08aacc9c647a264714823f415ef9fe3d4795f4b2d5cdcde9
     HEAD_REF master
 )
 
diff --git a/ports/boost-flyweight/CONTROL b/ports/boost-flyweight/CONTROL
index 0817a8d62..0f6e0c74a 100644
--- a/ports/boost-flyweight/CONTROL
+++ b/ports/boost-flyweight/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-flyweight
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost flyweight module
diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake
index cf4c0a141..4d30fe96d 100644
--- a/ports/boost-flyweight/portfile.cmake
+++ b/ports/boost-flyweight/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/flyweight
-    REF boost-1.68.0
-    SHA512 0d27d844d3f0899013d70f29c507cbefc67b76a4b9803aada0201946907705b1ac81aefda88855252806284e3ea9e074769f26eb65ae1d82e3ffec4a0ab59951
+    REF boost-1.69.0
+    SHA512 85d2d5045c920bf46d0715805ecf3de13b59974b9a7add7baa66c9d726fdcb20e4e481a24724e52aaff050615d8c52742b764397512676065e654aeba50e81aa
     HEAD_REF master
 )
 
diff --git a/ports/boost-foreach/CONTROL b/ports/boost-foreach/CONTROL
index 914f3b565..4acd878b4 100644
--- a/ports/boost-foreach/CONTROL
+++ b/ports/boost-foreach/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-foreach
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost foreach module
diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake
index 4e84360d8..e5379ea48 100644
--- a/ports/boost-foreach/portfile.cmake
+++ b/ports/boost-foreach/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/foreach
-    REF boost-1.68.0
-    SHA512 501f7caf4f0f4119e110aaacd6530cc7ed6df75b39e9fbd4e3423e4089f7ebdf2ae918a09ae140fdee4ef4eb9f787df21fe1c664aa031cdf1bf4fc447c9c69b0
+    REF boost-1.69.0
+    SHA512 fc7f18b8fbc4bbbe15c32ac8d75b8a783f4a24ae7e90371b57c3ac1571486d0c8ceae88ac943e8192fae5a8ee8e6ec6b59b17c295a4855762f148269a16d087d
     HEAD_REF master
 )
 
diff --git a/ports/boost-format/CONTROL b/ports/boost-format/CONTROL
index c23ee8cf7..0b2637ef5 100644
--- a/ports/boost-format/CONTROL
+++ b/ports/boost-format/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-format
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost format module
diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake
index 7e0537e06..783702c4f 100644
--- a/ports/boost-format/portfile.cmake
+++ b/ports/boost-format/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/format
-    REF boost-1.68.0
-    SHA512 556acda0d0c7f7dc16cb83d0184aaa14dd0b1978f09c52dacc02a3e86d5d39a18e58d46818a18be36f781177538aa927c74cc48cc7bf5647aafc0ff1d4097d56
+    REF boost-1.69.0
+    SHA512 094cdc1dee2020b20c78f10b1478f820948ca31c0edb258c8fc38b21b8fcdee3648eba50d536805ca19536b83e54516160e43895e44ba5403f7e7c4b5dc75d90
     HEAD_REF master
 )
 
diff --git a/ports/boost-function-types/CONTROL b/ports/boost-function-types/CONTROL
index 9a9bcb58c..cdfde4442 100644
--- a/ports/boost-function-types/CONTROL
+++ b/ports/boost-function-types/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-function-types
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
 Description: Boost function_types module
diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake
index 06ea8e7d3..580bb7496 100644
--- a/ports/boost-function-types/portfile.cmake
+++ b/ports/boost-function-types/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/function_types
-    REF boost-1.68.0
-    SHA512 1b3c41f5bb63b2ac6e2c303c66846c0e0041c536630dc0fe8260d72e91997d991fede951dc22809523c56f6bd951bf61e5c26f9fcef5d0b1721a1fcfa678008d
+    REF boost-1.69.0
+    SHA512 642f95aa23254edfc650dc2eb729eb541f507de2ad8d20091e8bde35f4e471b04ab6a8140cd8bf891866e74ce739e3821fddae653a4cd11a2066d1d93061b253
     HEAD_REF master
 )
 
diff --git a/ports/boost-function/CONTROL b/ports/boost-function/CONTROL
index 67885ee6b..a5d118abb 100644
--- a/ports/boost-function/CONTROL
+++ b/ports/boost-function/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-function
-Version: 1.68.0
-Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-integer, boost-mpl, boost-preprocessor, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost function module
diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake
index 277bfb99a..b5c19fc38 100644
--- a/ports/boost-function/portfile.cmake
+++ b/ports/boost-function/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/function
-    REF boost-1.68.0
-    SHA512 71e472987e07a3b60a60231b8e8e18a5ea7883ac9535741fd3ee1e95358e92ac4e00ed94f2428e31483f68632504704b245ad9bc42500a987eb11bbdbce9a7cd
+    REF boost-1.69.0
+    SHA512 58d764e454aacaffb0baf299483be98e3eacdbd8a4e209a6b91727a18c9839e561da5316b8238b397c62a6d9e49631226239d9d3ba20e77b9b1ce648ce3bf940
     HEAD_REF master
 )
 
diff --git a/ports/boost-functional/CONTROL b/ports/boost-functional/CONTROL
index 5abca38fb..912eec3a2 100644
--- a/ports/boost-functional/CONTROL
+++ b/ports/boost-functional/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-functional
-Version: 1.68.0
-Build-Depends: boost-config, boost-core, boost-iterator, boost-mpl, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-config, boost-core, boost-iterator, boost-mpl, boost-preprocessor, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost functional module
diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake
index 0dc76ca80..88956532b 100644
--- a/ports/boost-functional/portfile.cmake
+++ b/ports/boost-functional/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/functional
-    REF boost-1.68.0
-    SHA512 ca784716ed5fe2991cffd60534088e810854fcae1286fc9483d972e2d3c4f5fa6141943d276afcd3064a85f7407ee6db44fd3fb29580501972f6f3ebb8d3bcf2
+    REF boost-1.69.0
+    SHA512 08d4efb9732a1d3fcd91fcbf90cfbac0a4db80b50101c5466a5ade3bee90c7a5dd42375061fd302d9aea1e2f8d9f9b7986f2ed05f3f224c617741bd76776ceec
     HEAD_REF master
 )
 
diff --git a/ports/boost-fusion/CONTROL b/ports/boost-fusion/CONTROL
index 679e8267b..c648924a2 100644
--- a/ports/boost-fusion/CONTROL
+++ b/ports/boost-fusion/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-fusion
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost fusion module
diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake
index 0a3848099..0d6f6a962 100644
--- a/ports/boost-fusion/portfile.cmake
+++ b/ports/boost-fusion/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/fusion
-    REF boost-1.68.0
-    SHA512 335400ecf1e9ce1e2cb40beb449a06e4d620d018c17383ffb6ee26a5fd676e2add905636db777e839d63639724b5745b740a65d92578e213b25ce2041afe14f6
+    REF boost-1.69.0
+    SHA512 fdf2dac6416f46c5d1dae6401bd224a55d693cfb7aee72f189d7cf7bc8103df2b68123f8d17e9a8081eacb83fa334e7a031098bd8626e77ef1cfc15617e821ad
     HEAD_REF master
 )
 
diff --git a/ports/boost-geometry/CONTROL b/ports/boost-geometry/CONTROL
index 1d044e1a2..4d1326f47 100644
--- a/ports/boost-geometry/CONTROL
+++ b/ports/boost-geometry/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-geometry
-Version: 1.68.0
+Version: 1.69.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 (!arm), boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
 Description: Boost geometry module
diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake
index 320e8f6ca..9e4211f34 100644
--- a/ports/boost-geometry/portfile.cmake
+++ b/ports/boost-geometry/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/geometry
-    REF boost-1.68.0
-    SHA512 eecfacd3398238651d3bf02d6d8a8eaac15b262fca8652c6a5a60292ce6ded940176a061a705acdf7176732f48fe20ae388fff65c96b5742275506dd0a587e3c
+    REF boost-1.69.0
+    SHA512 a79a377497bb8270282032e77c62ba3afb25c2201dfdb26de37373141e1a4fa4edb3da4b2de22a1fccb1cbcb52c164ce98c8bb2b30b097509a38e062df85d3d6
     HEAD_REF master
 )
 
diff --git a/ports/boost-gil/CONTROL b/ports/boost-gil/CONTROL
index 0326d1318..f3ad97c66 100644
--- a/ports/boost-gil/CONTROL
+++ b/ports/boost-gil/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-gil
-Version: 1.68.0
-Build-Depends: boost-algorithm, boost-bind, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-iterator, boost-lambda, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-bind, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-iterator, boost-lambda, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost gil module
diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake
index e278c7e99..dcf0da0cd 100644
--- a/ports/boost-gil/portfile.cmake
+++ b/ports/boost-gil/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/gil
-    REF boost-1.68.0
-    SHA512 d3a965aca410f91c214d8f433273e08eefcc20f0e470baa2aba3385ce45a0e18307aae3b81ea619abe39066e4fd924476b7f29c8f45e1aff25a2a7d3eb4062fb
+    REF boost-1.69.0
+    SHA512 2875d2e41ce429c1e2b8175efcda75319383431887c30c07da0051cf7816e16ce0db13093bc4fff89d4d2f2f0224ebb6d3c8a00eb38c130f9234046fd52fe006
     HEAD_REF master
 )
 
diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL
index d63394336..861b1e550 100644
--- a/ports/boost-graph-parallel/CONTROL
+++ b/ports/boost-graph-parallel/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-graph-parallel
-Version: 1.68.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, 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
+Version: 1.69.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
 Description: Boost graph_parallel module
diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake
index 26323675b..195508e2f 100644
--- a/ports/boost-graph-parallel/portfile.cmake
+++ b/ports/boost-graph-parallel/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/graph_parallel
-    REF boost-1.68.0
-    SHA512 668f8d2569cad12e5b5b173b0da012c1c43eb27e4a74d036b7bacdee3417a5148c8b30ecccbbd1b2cd30a8ffc92b6272a268b5595d5965a22a068779f8c2d1c7
+    REF boost-1.69.0
+    SHA512 4a475e105cb6c310c9edc59a43a272635af48c3b7fcc7c1b8f5d9f2f921f64a9a4e50dbc558a7f8d07038fd9f6af39b152a7997c9dc0c9094efdb11ff5ab9114
     HEAD_REF master
 )
 
diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL
index ffc3d629f..b6df893ab 100644
--- a/ports/boost-graph/CONTROL
+++ b/ports/boost-graph/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-graph
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost graph module
diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake
index b8285391c..fcbfc07de 100644
--- a/ports/boost-graph/portfile.cmake
+++ b/ports/boost-graph/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/graph
-    REF boost-1.68.0
-    SHA512 97c05b444d5a4fbf8a881d5f674098b88afc6a331867357ff46c5372bd666847431e49e5f9fdca39a54bb1f56654c8c23a3cbfcf254e56743e7e9b20fe7fcd30
+    REF boost-1.69.0
+    SHA512 9e8a165d87c100e0b10ec0f1a88c29fe35c6056163a9c657b9a02a064199bb511a17b03720204e37b0651468690c5bb704ef28778ef718e8593930375e9e4a2e
     HEAD_REF master
 )
 
diff --git a/ports/boost-hana-msvc/CONTROL b/ports/boost-hana-msvc/CONTROL
deleted file mode 100644
index 0d2f178f8..000000000
--- a/ports/boost-hana-msvc/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: boost-hana-msvc
-Version: 1.67.0-1
-Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers
-Description: Boost hana module
diff --git a/ports/boost-hana-msvc/portfile.cmake b/ports/boost-hana-msvc/portfile.cmake
deleted file mode 100644
index a736e9324..000000000
--- a/ports/boost-hana-msvc/portfile.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO boostorg/hana
-    REF 7f1ae3b1bb52f6eb329300a93dc02309c94dfe01
-    SHA512 5fe1962ae270901b58eec83750edd02cc7192b4fae4add72849efbb9989dd5f9a0e3a85f3e3a7525fce38e6ef5bca210993b89d04a1c39bd0421bd0a6f4c92cb
-    HEAD_REF develop
-)
-
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL
index df3af582a..ef0cff420 100644
--- a/ports/boost-hana/CONTROL
+++ b/ports/boost-hana/CONTROL
@@ -1,5 +1,5 @@
-# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 but has edits
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-hana
-Version: 1.68.0-1
-Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers, boost-hana-msvc (windows), boost-hana-msvc (uwp)
+Version: 1.69.0
+Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers
 Description: Boost hana module
diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake
index ebc34aac3..ac7e385a3 100644
--- a/ports/boost-hana/portfile.cmake
+++ b/ports/boost-hana/portfile.cmake
@@ -1,20 +1,14 @@
-# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 but has edits
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
-    message("The current MSVC releases can't compile boost hana yet.")
-    message("Use a fork from boost 1.67 which has source workarounds instead.")
-    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-else()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/hana
-    REF boost-1.68.0
-    SHA512 93b20dc496ac6fa58ae75d523b8782b7c17398e93286698b48666e59af0c7df7410153dc02a8c4ca940d02ed8b948ea6f47b8f884ae2867e0cc8741e09e643ff
+    REF boost-1.69.0
+    SHA512 d997bad499b654ccab90fa30114fa99c2504e06d61151bf41250f9e606808bc0dfb11b00a563de485e830aed7867b6968541547e0e9c1a0795ae4a09bdba0283
     HEAD_REF master
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
-endif()
diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL
index 9dbacc49b..1f7e4d7a4 100644
--- a/ports/boost-heap/CONTROL
+++ b/ports/boost-heap/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-heap
-Version: 1.68.0
-Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-integer, boost-intrusive, boost-iterator, boost-mpl, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost heap module
diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake
index 4ac883b05..4ba500922 100644
--- a/ports/boost-heap/portfile.cmake
+++ b/ports/boost-heap/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/heap
-    REF boost-1.68.0
-    SHA512 3aac4ee8f4ce4c578f83fefb19532aa859c966fa807a2f156a2428c4e9d44e3e5c09ff4588b43a9dfe46f32dadde03e942f8025551c267e677b3aad20343cbd1
+    REF boost-1.69.0
+    SHA512 331a8ccfb5d41f3881ada825162a6d1ddd33e161edbd5cece4d65844316a5280e9ba1932efa43a60d7c3c0f538cfde5941060183c09382f58955604e7e3b909e
     HEAD_REF master
 )
 
diff --git a/ports/boost-hof/CONTROL b/ports/boost-hof/CONTROL
index 38d3ebc63..f2cf84019 100644
--- a/ports/boost-hof/CONTROL
+++ b/ports/boost-hof/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-hof
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-vcpkg-helpers
 Description: Boost hof module
diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake
index 5b8d97df0..358e67eb4 100644
--- a/ports/boost-hof/portfile.cmake
+++ b/ports/boost-hof/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/hof
-    REF boost-1.68.0
-    SHA512 2400bd9f4329813802e569c608cf997c8fa571e042ab3811e780f7f95e69dc91ae9a31fc591aee75f80e85218147c442ed1b95aad533c5c4843310b5f9ced4ed
+    REF boost-1.69.0
+    SHA512 a49e800a59a3c3733aa647676899bd935c7623d18e6213b949def6ed2aff5cea240a503eb4a1cc2446fd3c7ef01f0d03f546cf4e49b16d9dced3530797670924
     HEAD_REF master
 )
 
diff --git a/ports/boost-icl/CONTROL b/ports/boost-icl/CONTROL
index 1464e6c7c..e723346ac 100644
--- a/ports/boost-icl/CONTROL
+++ b/ports/boost-icl/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-icl
-Version: 1.68.0
-Build-Depends: boost-assert, boost-concept-check, boost-config, 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
+Version: 1.69.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
 Description: Boost icl module
diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake
index 8ab45b5f1..cf33c8ff9 100644
--- a/ports/boost-icl/portfile.cmake
+++ b/ports/boost-icl/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/icl
-    REF boost-1.68.0
-    SHA512 cdeba509b2b41c8dfcd808c5c6d478035cf48b0110e66889a8f9bc2183a8f5635e263f761894a3370d5ca421a08f2ab8c4f03b384ff3fe3eaeb9dce113d3c2e5
+    REF boost-1.69.0
+    SHA512 520780eea6e2c7e0f9b81b899684d44655b95742fc4c3eaf812da527ff0dac607d760ab03bdeaeb2a963162651ed4a93a21c89101f957d0a959d3b88582623a1
     HEAD_REF master
 )
 
diff --git a/ports/boost-integer/CONTROL b/ports/boost-integer/CONTROL
index 795c28fe9..85c1a888b 100644
--- a/ports/boost-integer/CONTROL
+++ b/ports/boost-integer/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-integer
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
 Description: Boost integer module
diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake
index 6c9e8140a..36c15e9f2 100644
--- a/ports/boost-integer/portfile.cmake
+++ b/ports/boost-integer/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/integer
-    REF boost-1.68.0
-    SHA512 3d257bb5b8313c2a884fa9959efe1f6d287c06e1b5746cbc4f9ae5694e61dfb2821d07b355d7e544594c9922a1ec86009dc8f92de9fc4d7b74db3383a817b3ba
+    REF boost-1.69.0
+    SHA512 69bb40592bdf3018facb083e9a9df12093f04e6f024526e39646cb3f4cc1ba5cf8468fd73a424050fc3b93046961fd3c83bb92e38e9f14b17324501ddec63115
     HEAD_REF master
 )
 
diff --git a/ports/boost-interprocess/CONTROL b/ports/boost-interprocess/CONTROL
index eaab7fe54..566a7dbe2 100644
--- a/ports/boost-interprocess/CONTROL
+++ b/ports/boost-interprocess/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-interprocess
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost interprocess module
diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake
index 8a6ab0b60..3dd4adf4d 100644
--- a/ports/boost-interprocess/portfile.cmake
+++ b/ports/boost-interprocess/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/interprocess
-    REF boost-1.68.0
-    SHA512 f3899c4b6aa4619ff93715c2cca13782c7504cbb871adfb2e74e57534bd130b132a109726ecd5c3e9cf63794a90fd39c19f34f4011f702e6c427058bdaf9aad0
+    REF boost-1.69.0
+    SHA512 1bad3bb5e9fa59c48607ea2d668b61fdc15d60ab0e9f6cd04d1fcd972932b2466e94203062a65142b1b810e26b0cb59fd0890aaa4b764ac03d16ab3c95454d73
     HEAD_REF master
 )
 
diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL
index 43d56a644..82c37ae68 100644
--- a/ports/boost-interval/CONTROL
+++ b/ports/boost-interval/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-interval
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-compatibility, boost-config, boost-logic, boost-vcpkg-helpers
 Description: Boost interval module
diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake
index dda65b7bc..7d2d747c7 100644
--- a/ports/boost-interval/portfile.cmake
+++ b/ports/boost-interval/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/interval
-    REF boost-1.68.0
-    SHA512 68596d0516e21132d9ea490ad7cdc66ed17e58f27a4f2a602481ba5e1b38fa51d6d4300108c2eaa1c457493212ee36ecd6f1d2a4b6ca3d1a4fbee23ad0216b38
+    REF boost-1.69.0
+    SHA512 203e19a3c87fa50b22fe0c194f7774fc7dcf7ed7cd21add4bad8cdd1251783a7b173e1100cf33397d69aa3636a4dc4f2341f4a7dd8ac8c7c7f0781e9d48e1001
     HEAD_REF master
 )
 
diff --git a/ports/boost-intrusive/CONTROL b/ports/boost-intrusive/CONTROL
index 7a2fb5c15..0bde2258f 100644
--- a/ports/boost-intrusive/CONTROL
+++ b/ports/boost-intrusive/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-intrusive
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-config, boost-container-hash, boost-core, boost-integer, boost-move, boost-static-assert, boost-vcpkg-helpers
 Description: Boost intrusive module
diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake
index 20e28c310..6d358b98f 100644
--- a/ports/boost-intrusive/portfile.cmake
+++ b/ports/boost-intrusive/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/intrusive
-    REF boost-1.68.0
-    SHA512 f37c6b1198dc811a8b169b9161ad89eb84db2283456b25f7d5eab770f2fe9ff1991da3655dceff23bc3d7bbf3b0d266f0f6f7e6e35fb44a3a6bdf8af651d4208
+    REF boost-1.69.0
+    SHA512 1f89c9d217934db8d5a3aa169a21deed59d0f50b49ac58258bbc1f8c539df7a03d6cac0cd8d1668e73747153599f24cac87c683b12e32d9cc5f7fda438ad1d66
     HEAD_REF master
 )
 
diff --git a/ports/boost-io/CONTROL b/ports/boost-io/CONTROL
index 8167e9047..c5b043db0 100644
--- a/ports/boost-io/CONTROL
+++ b/ports/boost-io/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-io
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-detail, boost-vcpkg-helpers
 Description: Boost io module
diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake
index cfd71f00e..e2b759b91 100644
--- a/ports/boost-io/portfile.cmake
+++ b/ports/boost-io/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/io
-    REF boost-1.68.0
-    SHA512 a1971233e7deccc8354abeb6ab9b4e5955e4ed8b37ab563c0b07e8afaeec6f5c218f06dd60b19df8b836125f431a7032fad4f8b25e14484db5fac1eb9d1cbe01
+    REF boost-1.69.0
+    SHA512 d00c93d23edd21042888bd2abee97eef1a16a25d3621a66273fe10ae56c90381b3b5c94e1739afd2a4b829606f6dd16513bedf450f2d0109bb27108443dfab3f
     HEAD_REF master
 )
 
diff --git a/ports/boost-iostreams/CMakeLists.txt b/ports/boost-iostreams/CMakeLists.txt
index 17e0af6de..454e74845 100644
--- a/ports/boost-iostreams/CMakeLists.txt
+++ b/ports/boost-iostreams/CMakeLists.txt
@@ -16,8 +16,8 @@ if(MSVC)
     set_property(TARGET boost_iostreams PROPERTY OUTPUT_NAME_RELEASE boost_iostreams-vc140-mt)
     set_property(TARGET boost_iostreams PROPERTY OUTPUT_NAME_DEBUG boost_iostreams-vc140-mt-gd)
 
-    set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_RELEASE boost_iostreams-vc141-mt-x32-1_67)
-    set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_DEBUG boost_iostreams-vc141-mt-gd-x32-1_67)
+    set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_RELEASE boost_iostreams)
+    set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_DEBUG boost_iostreamsd)
 endif()
 
 find_package(ZLIB REQUIRED)
@@ -30,6 +30,9 @@ find_package(LibLZMA REQUIRED)
 target_include_directories(boost_iostreams PRIVATE ${LIBLZMA_INCLUDE_DIRS})
 target_link_libraries(boost_iostreams PRIVATE ${LIBLZMA_LIBRARIES})
 
+find_library(ZSTD_LIBRARY NAMES zstdd zstd_staticd zstd zstd_static)
+target_link_libraries(boost_iostreams PRIVATE ${ZSTD_LIBRARY})
+
 install(TARGETS boost_iostreams
     RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL
index f88cc5424..c8763146c 100644
--- a/ports/boost-iostreams/CONTROL
+++ b/ports/boost-iostreams/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-iostreams
-Version: 1.68.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-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
+Version: 1.69.0-3
+Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, 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
 Description: Boost iostreams module
diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake
index 4463749be..d15007e70 100644
--- a/ports/boost-iostreams/portfile.cmake
+++ b/ports/boost-iostreams/portfile.cmake
@@ -5,10 +5,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/iostreams
-    REF boost-1.68.0
-    SHA512 a0c008537c2ceb8ea4f9d1fe7e66fea01f55d753e3b349aa3f664f7a0cd129f11770e520645a18feabde4110f6471194e8bae2479b95ac6d13d8b42be43c5f2e
+    REF boost-1.69.0
+    SHA512 263d06f2533a345eb4fe3926742c6606b486d9f7d024a001f00b09592201ee987854036174b44c39c6d9a47b52262a96f9a8ebf2af215ef217fa11aa1209fe86
     HEAD_REF master
-    PATCHES "${CURRENT_PORT_DIR}/Removeseekpos.patch"
+    PATCHES Removeseekpos.patch
 )
 
 vcpkg_download_distfile(LICENSE
diff --git a/ports/boost-iterator/CONTROL b/ports/boost-iterator/CONTROL
index e428601ec..4d72f30c5 100644
--- a/ports/boost-iterator/CONTROL
+++ b/ports/boost-iterator/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-iterator
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost iterator module
diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake
index 88a664b8f..05cdb6957 100644
--- a/ports/boost-iterator/portfile.cmake
+++ b/ports/boost-iterator/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/iterator
-    REF boost-1.68.0
-    SHA512 e8e223bc5b9334618d676e2aefdeffdde6f31097b634d2ca1fa3d6e73976c42dd123ed76081e13d1f023a7d39f49cc53d63b28e541c2aae858cbf569818bd14e
+    REF boost-1.69.0
+    SHA512 7f5fb06fdc48feb16eab33c6726713bc45fd4ed73598ffc55ba30a2cdd46ebc5d5fe858c0a2d93a348a0d3397891d8c33e6e2a5fce70aeca1d3be6586c269271
     HEAD_REF master
 )
 
diff --git a/ports/boost-lambda/CONTROL b/ports/boost-lambda/CONTROL
index 9355d323f..460510402 100644
--- a/ports/boost-lambda/CONTROL
+++ b/ports/boost-lambda/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-lambda
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost lambda module
diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake
index b8303375c..d21189764 100644
--- a/ports/boost-lambda/portfile.cmake
+++ b/ports/boost-lambda/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lambda
-    REF boost-1.68.0
-    SHA512 7395399071a6d63027685e00f67af1db87e1f89bba54f7f78ee05d1e80d0c7253382f451dcff7c077088f6075f5bdd52d0dfdc745b8a337f575075c5bfd87f6f
+    REF boost-1.69.0
+    SHA512 6de7a65898b08ced82dc6ff0662d1373cedaa53f4aadb7a2c47f611fd67735ed8b88d539829047ce059c27404d33b119dea116661c0124a3445efa426da88f56
     HEAD_REF master
 )
 
diff --git a/ports/boost-lexical-cast/CONTROL b/ports/boost-lexical-cast/CONTROL
index 24004d459..10a4c38de 100644
--- a/ports/boost-lexical-cast/CONTROL
+++ b/ports/boost-lexical-cast/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-lexical-cast
-Version: 1.68.0
-Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-mpl, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost lexical_cast module
diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake
index bd61dffc0..2b975b3df 100644
--- a/ports/boost-lexical-cast/portfile.cmake
+++ b/ports/boost-lexical-cast/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lexical_cast
-    REF boost-1.68.0
-    SHA512 212bc947b64e07e2c3f41663dba157960895539a7662e13d53ccd3327c0cfb506d2294badd1b6c6f102ebc851ba602c384d1eaf85a4875e9d538dc23340cba75
+    REF boost-1.69.0
+    SHA512 3cb8d3a300656b550d22959552e512369239a72336310678c13277f6f94fe29725c1645fdac4a0ff6035a2728e30baa3bd97e2e412d910eda2f882eb263fe3ed
     HEAD_REF master
 )
 
diff --git a/ports/boost-local-function/CONTROL b/ports/boost-local-function/CONTROL
index ae5ba5580..4ee73b1a1 100644
--- a/ports/boost-local-function/CONTROL
+++ b/ports/boost-local-function/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-local-function
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-scope-exit, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost local_function module
diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake
index b28718cb9..b6c2696a9 100644
--- a/ports/boost-local-function/portfile.cmake
+++ b/ports/boost-local-function/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/local_function
-    REF boost-1.68.0
-    SHA512 063158b6a66f82521298b22a597442671219e76a038452cb163de6f095682cfbfaf998a2b69adcd2913f9cf8a633b7e99b1e540a60e3c95092162806b92d23f0
+    REF boost-1.69.0
+    SHA512 9bd3869a6abcaa0366adcb093dc13447b9402d4907b9df1433b74cee69651393a843e88ab16eb38f71c4549adef139796d43a55c28868b89415466f82e013ec3
     HEAD_REF master
 )
 
diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL
index 3bc4af166..bbe8232ba 100644
--- a/ports/boost-locale/CONTROL
+++ b/ports/boost-locale/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-locale
-Version: 1.68.0
+Version: 1.69.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-thread (!arm), boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
 Description: Boost locale module
 
diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake
index a6678b505..794c4e507 100644
--- a/ports/boost-locale/portfile.cmake
+++ b/ports/boost-locale/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/locale
-    REF boost-1.68.0
-    SHA512 6e7c85a307ff8c8f41b1002e02c5c68d9ca5c89e95063adc0f134a5c96be728334f1a0548f92c07f85ed639b73588e49df1b0c2d964fa83cee86c746634d5b94
+    REF boost-1.69.0
+    SHA512 64f738c10f35627a0949e5fa37743374f6d6644c05372d5b019468fc0273e13c024068462961376a663168ee29e7abb2c9c9c07078fc5797bb93e0b15baef2be
     HEAD_REF master
 )
 
diff --git a/ports/boost-lockfree/CONTROL b/ports/boost-lockfree/CONTROL
index bc193d0ec..f389e1ced 100644
--- a/ports/boost-lockfree/CONTROL
+++ b/ports/boost-lockfree/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-lockfree
-Version: 1.68.0-1
-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-iterator, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost lockfree module
diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake
index d3563af0c..e3800b3ad 100644
--- a/ports/boost-lockfree/portfile.cmake
+++ b/ports/boost-lockfree/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lockfree
-    REF boost-1.68.0
-    SHA512 ccdd2e1e1815140c6ef5f7ca7d2b5551038f14b4cebcc5ce95c15ee0799a2e9cc2c1027d166be975d06d9027386992ab5c40f8c1b633b9c82eb087c9ad648d8b
+    REF boost-1.69.0
+    SHA512 e0ea8c20973512d173bb1ef15c5e8b7f946b346ebcc2040283945d0db663a8afd61b854290670cc3d281be516c787af7eb2dbc310b20aaca610ba38888062eef
     HEAD_REF master
 )
 
diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL
index 0d3860587..57dd3bb14 100644
--- a/ports/boost-log/CONTROL
+++ b/ports/boost-log/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-log
-Version: 1.68.0
+Version: 1.69.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 (!arm), boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive
 Description: Boost log module
diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake
index cbc96ef87..1e52fe3cc 100644
--- a/ports/boost-log/portfile.cmake
+++ b/ports/boost-log/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/log
-    REF boost-1.68.0
-    SHA512 d12f9b2d8f782e4df5df16fe6c5267c87266348f6c7c400a9c6ff0b1b7af34ee8baf3d0b4dc4aef20b0a5faf4582d5c90d3429df84d903773bef3e61df93a0d9
+    REF boost-1.69.0
+    SHA512 d6ce7f8cc1ce2aac89adf920131b02197f37ced2d0f059a9353dc21770e34c539bbf771208f6ed293039cddb363b948b6ad4956f2819ed49478537a9305dba54
     HEAD_REF master
 )
 
diff --git a/ports/boost-logic/CONTROL b/ports/boost-logic/CONTROL
index cad7c4d1c..b6797de7b 100644
--- a/ports/boost-logic/CONTROL
+++ b/ports/boost-logic/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-logic
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
 Description: Boost logic module
diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake
index 65810e540..b16b1817c 100644
--- a/ports/boost-logic/portfile.cmake
+++ b/ports/boost-logic/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/logic
-    REF boost-1.68.0
-    SHA512 9d37657394355cad8286bafceefd93112552c2b867e2d4508a16eae8f051922f14f67f3a2cf903f8c371618c4eeed7d70a4bf9067b8404b66b6f224fda5ad85e
+    REF boost-1.69.0
+    SHA512 521144c4095b73fec427b8d424e8632de2795c9b34c5dd928499f2958a72d84f4ddaf20aa1a615ff1537506c7e088a45a1e4a7e17a9db9ea309309657e83b9c4
     HEAD_REF master
 )
 
diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL
index 3667203a4..244fc4e99 100644
--- a/ports/boost-math/CONTROL
+++ b/ports/boost-math/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-math
-Version: 1.68.0
+Version: 1.69.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-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost math module
diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake
index 3ad1251b8..f4adc4d66 100644
--- a/ports/boost-math/portfile.cmake
+++ b/ports/boost-math/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/math
-    REF boost-1.68.0
-    SHA512 3727b6245fe3e6ba3af06f4653251b7d553dc01b83b06b812760e20fb9cd0bbbb2fe0bd7d3cc8b035f503d93e82e51ddb129b1e844944c1284560b212f663748
+    REF boost-1.69.0
+    SHA512 9aedd1d8e875d2c5ddd3e7feaeeeaf0524ee7111a26634559548f33f99d190ba33623951c781271c600880dbe8cf36d4b7f4c2212a6ec2c3804d488dec61c642
     HEAD_REF master
 )
 
diff --git a/ports/boost-metaparse/CONTROL b/ports/boost-metaparse/CONTROL
index 23d84cff6..e5b51a0ff 100644
--- a/ports/boost-metaparse/CONTROL
+++ b/ports/boost-metaparse/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-metaparse
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-mpl, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Description: Boost metaparse module
diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake
index b07eff75f..15e02b1a1 100644
--- a/ports/boost-metaparse/portfile.cmake
+++ b/ports/boost-metaparse/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/metaparse
-    REF boost-1.68.0
-    SHA512 2ab40e9ea0d14d4aa0b98b619a520d5fe974be9f89604d27eed0f1164762e239ce1b2d936faaed0574020dd5162dcc74a89a0ddf9835380abfa5aa10882cbe7a
+    REF boost-1.69.0
+    SHA512 f2720f51ecaa67a61f43eac0112fad40f67ab3c6fef431adb012f644063a10c9870b85f3accf35b09bf163cea59715e25e06cb93d0ba6c9769c44cebc3205b68
     HEAD_REF master
 )
 
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index a598c741d..de02dea1d 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: 2018-10-19
+Version: 2019-01-25
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam
index 997c1234e..d85c8d662 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.68.0 ;
-constant BOOST_VERSION_ABI_TAG : 1_68 ;
+constant BOOST_VERSION : 1.69.0 ;
+constant BOOST_VERSION_ABI_TAG : 1_69 ;
 constant BOOST_JAMROOT_MODULE : $(__name__) ;
 
 import boostcpp ;
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index 2dfb19f6b..8daa3265e 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -228,7 +228,7 @@ function(boost_modular_build)
     file(TO_CMAKE_PATH "${_bm_DIR}/nothing.bat" NOTHING_BAT)
     set(TOOLSET_OPTIONS " <cxxflags>/EHsc <compileflags>-Zm800 <compileflags>-nologo")
     if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-        if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+        if(NOT VCPKG_PLATFORM_TOOLSET MATCHES "v140")
             find_path(PATH_TO_CL cl.exe)
             find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "${PATH_TO_CL}/../../../lib/x86/store/references" NO_DEFAULT_PATH)
             if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND")
@@ -251,7 +251,7 @@ function(boost_modular_build)
     configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY)
     configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)
 
-    if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    if(VCPKG_PLATFORM_TOOLSET MATCHES "v141" OR VCPKG_PLATFORM_TOOLSET MATCHES "v142")
         list(APPEND _bm_OPTIONS toolset=msvc-14.1)
     elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
         list(APPEND _bm_OPTIONS toolset=msvc-14.0)
@@ -342,13 +342,14 @@ function(boost_modular_build)
         string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
         string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
         string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries
+        string(REPLACE "-vc142-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2019 and VS2015 binaries
         string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
         string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
         string(REPLACE "-x32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
         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_68" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
+        string(REPLACE "-1_69" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
         string(REPLACE "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME})
         if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
             # nothing to do
diff --git a/ports/boost-move/CONTROL b/ports/boost-move/CONTROL
index bfefee6c0..8b0181ef4 100644
--- a/ports/boost-move/CONTROL
+++ b/ports/boost-move/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-move
-Version: 1.68.0
-Build-Depends: boost-assert, boost-config, boost-detail, boost-integer, boost-static-assert, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-static-assert, boost-vcpkg-helpers
 Description: Boost move module
diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake
index c7b0a9387..d13e4df9d 100644
--- a/ports/boost-move/portfile.cmake
+++ b/ports/boost-move/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/move
-    REF boost-1.68.0
-    SHA512 7d7032d182a37ba8feb4d60520aac6c31e00c81f2dd7523846f9dddf5def6b78fc74d0f7dc769609d252fdac81a1cbf2e4897b862f35313084b69f6539abb7fa
+    REF boost-1.69.0
+    SHA512 c7cdc3d2452c4399f1e2f128e0d2e85c79ab5e4f45abee79b8fdd2e8df66e92974f6fa29e71e16e609fd69b5b9611a7d51ebbdd12af8af71d3cff6405c301f99
     HEAD_REF master
 )
 
diff --git a/ports/boost-mp11/CONTROL b/ports/boost-mp11/CONTROL
index a251cdc33..248956845 100644
--- a/ports/boost-mp11/CONTROL
+++ b/ports/boost-mp11/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-mp11
-Version: 1.68.0
-Build-Depends: boost-config, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-vcpkg-helpers
 Description: Boost mp11 module
diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake
index b64e20813..e9494bd22 100644
--- a/ports/boost-mp11/portfile.cmake
+++ b/ports/boost-mp11/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/mp11
-    REF boost-1.68.0
-    SHA512 828efcb915b5702c0ff673cbd1543110c60dbd06718fe225e6156d173926b9663bd56c3c7e11c2444245447d776e4135f280f0dfc0424ee1f224a49f95360be0
+    REF boost-1.69.0
+    SHA512 61ea485a6d325cbb7e728a4a3725d88db4d0672c092bc3aef442be6ef1f7535db6c107fe2a582a2c69bb81b927a32fab61e6d400a7b748e5d202cb3c544e99d4
     HEAD_REF master
 )
 
diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL
index 9ec537adc..9f0d77592 100644
--- a/ports/boost-mpi/CONTROL
+++ b/ports/boost-mpi/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-mpi
-Version: 1.68.0-1
+Version: 1.69.0-1
 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-property-map, boost-python (windows), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, msmpi
 Description: Boost mpi module
diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake
index 583ee1c56..ce760fab9 100644
--- a/ports/boost-mpi/portfile.cmake
+++ b/ports/boost-mpi/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/mpi
-    REF boost-1.68.0
-    SHA512 63d6d7d37a96aa5456c90d7c219603d9a36e94de5009af0cfbab7839f1756188ebda8c55f7333124e6d61a7d73e68a9c2dab6eb12f6b4c7ecd06ff5cad0bb231
+    REF boost-1.69.0
+    SHA512 4adda4da59b49f73a4da70fe091027046964191eeb24d29a16f027b3273ba5ac9e0552061cba15ded70db4839f7c8581c26f2b9dde16c2abfabb434fdbbcc106
     HEAD_REF master
 )
 
diff --git a/ports/boost-mpl/CONTROL b/ports/boost-mpl/CONTROL
index c267b3738..a802cb87d 100644
--- a/ports/boost-mpl/CONTROL
+++ b/ports/boost-mpl/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-mpl
-Version: 1.68.0
-Build-Depends: boost-bind, boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Description: Boost mpl module
diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake
index dca0d86d8..095ff4f46 100644
--- a/ports/boost-mpl/portfile.cmake
+++ b/ports/boost-mpl/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/mpl
-    REF boost-1.68.0
-    SHA512 a35139c56fd06c560783844cb5b3ddc4643aa6aa7e3bce76e0b4f24d5b7ace962a0ade60973ab21083a06e824a4701c7b6c534376b2323934a21cda438f1de61
+    REF boost-1.69.0
+    SHA512 eaaaa930246f277bc4194319094356927e0d100048158f3335087dff681e4535bbdddf891df8db8c51ed209137d93c6f0f951a3dbe0e7c846c483c643dd3096a
     HEAD_REF master
 )
 
diff --git a/ports/boost-msm/CONTROL b/ports/boost-msm/CONTROL
index 7fbe896b4..b3a91b3bf 100644
--- a/ports/boost-msm/CONTROL
+++ b/ports/boost-msm/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-msm
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost msm module
diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake
index e376c8e70..1c3fcf1bc 100644
--- a/ports/boost-msm/portfile.cmake
+++ b/ports/boost-msm/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/msm
-    REF boost-1.68.0
-    SHA512 166b5c7b3ced589c196c951b24461ee3cdb46c0d19823a32b5cb0f1577eaaf6738b9cce2a721a2ca5a4c7be009a7a4b890d5353132ba443a97bcff6108a70728
+    REF boost-1.69.0
+    SHA512 0dcdd9dbc76844d2eb5f98081f2612ab4bb0f2480f6912be5daff9fa601fbc065b4e187ae3baa9ee81f1aab31ddc561d645a70a44edfed314775b8e051ba0614
     HEAD_REF master
 )
 
diff --git a/ports/boost-multi-array/CONTROL b/ports/boost-multi-array/CONTROL
index 62dfc32dc..90aa03fbb 100644
--- a/ports/boost-multi-array/CONTROL
+++ b/ports/boost-multi-array/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-multi-array
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-compatibility, boost-config, boost-vcpkg-helpers
 Description: Boost multi_array module
diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake
index c89522d52..7492500b0 100644
--- a/ports/boost-multi-array/portfile.cmake
+++ b/ports/boost-multi-array/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/multi_array
-    REF boost-1.68.0
-    SHA512 ed2bc9d838644e814b83ea771d1952d88a8f997649bfcdeec1b8463946aa842139e8a8a269aada447428346e7d31b6aeb17ffa372fb2ade2e17dbffbaeac67f8
+    REF boost-1.69.0
+    SHA512 f8fc2648333eecbe97c16560182b26e6e8f44299ab75d09fbe34ed45640dbffba7cd0a7b1fce33bdc8a0f49b611d2269bff74936082ef412628e7341c16ee423
     HEAD_REF master
 )
 
diff --git a/ports/boost-multi-index/CONTROL b/ports/boost-multi-index/CONTROL
index 96f917b71..64c284ed0 100644
--- a/ports/boost-multi-index/CONTROL
+++ b/ports/boost-multi-index/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-multi-index
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost multi_index module
diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake
index a23f85ad4..75129391c 100644
--- a/ports/boost-multi-index/portfile.cmake
+++ b/ports/boost-multi-index/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/multi_index
-    REF boost-1.68.0
-    SHA512 6e39d37e79c01ae952e3ba7ab12a2a69f6916d4a846bff3af98c1d5fc2b8ba83b59a782b610817a82c076496e087040a7f44fbb97ce4b6d1b4e87ef2595c4f5b
+    REF boost-1.69.0
+    SHA512 c8cc6a523941c810397165b59f3ec4855319495aecdba05671de3df3b709749a551bafe5277bbf7162f4fabf3a1ce35a3ecef4783e58733ec482435c6cf05433
     HEAD_REF master
 )
 
diff --git a/ports/boost-multiprecision/CONTROL b/ports/boost-multiprecision/CONTROL
index 532079c9a..86644fd6f 100644
--- a/ports/boost-multiprecision/CONTROL
+++ b/ports/boost-multiprecision/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-multiprecision
-Version: 1.68.0
-Build-Depends: boost-array, boost-assert, boost-config, boost-container-hash, boost-detail, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-array, boost-assert, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-predef, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost multiprecision module
diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake
index d51ab1ce1..4d3a34e6a 100644
--- a/ports/boost-multiprecision/portfile.cmake
+++ b/ports/boost-multiprecision/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/multiprecision
-    REF boost-1.68.0
-    SHA512 5a90b41141829f38720b556252f32fae5e31d56deda779af371149c64f74f196cf9c2a5c466b945f1006ec1c44f497767e29f482cba248223bb762da32fd3f3c
+    REF boost-1.69.0
+    SHA512 845a8e5aea10627fb9412ccd4aea4aa8315db00dd07d3b432a6574e6bf0d68574a69e98ae26591ebb47f45d98df9bea3b2392552ec23de8d18f068288a6b24c3
     HEAD_REF master
 )
 
diff --git a/ports/boost-numeric-conversion/CONTROL b/ports/boost-numeric-conversion/CONTROL
index 5e0c9ab27..824d164a6 100644
--- a/ports/boost-numeric-conversion/CONTROL
+++ b/ports/boost-numeric-conversion/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-numeric-conversion
-Version: 1.68.0
-Build-Depends: boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
 Description: Boost numeric_conversion module
diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake
index 722fca482..db73afa20 100644
--- a/ports/boost-numeric-conversion/portfile.cmake
+++ b/ports/boost-numeric-conversion/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/numeric_conversion
-    REF boost-1.68.0
-    SHA512 08fadfb49b2996b118684a90e450d8426ea20270ca2c0a677c61f88b033f3e77139559fa9507a1fa0dbd84621f44502f7bf2949166c8915411da2da543178c01
+    REF boost-1.69.0
+    SHA512 5b39ffc0eb4589483540ea49ea72ab86ae4f12b9c7a1e0902c1bf0a86e2f79d14b4cba107ae18c8390e69e0e4a83b96d4fddfba17ed6372821abd85052003b03
     HEAD_REF master
 )
 
diff --git a/ports/boost-odeint/CONTROL b/ports/boost-odeint/CONTROL
index 41d1cee43..8a96b34d8 100644
--- a/ports/boost-odeint/CONTROL
+++ b/ports/boost-odeint/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-odeint
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost odeint module
diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake
index c95fbf0c7..a8bad4df7 100644
--- a/ports/boost-odeint/portfile.cmake
+++ b/ports/boost-odeint/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/odeint
-    REF boost-1.68.0
-    SHA512 2e7832eb60623f9dabe8a3c2adea0c89fe0c43f9723cdc4a4f30af573186818f462fb66f33b585e0c6e50bbcb1b2e18d598e1d1905e68e54bda7febf09c71350
+    REF boost-1.69.0
+    SHA512 058f4554fe2a573ef489ea4a7262078ff2c9d1682e389089f04d601c67feba6d258028f1be1715711d0302d33614aa8e04ad781ffcfa0c427f418b9096c53b90
     HEAD_REF master
 )
 
diff --git a/ports/boost-optional/CONTROL b/ports/boost-optional/CONTROL
index b7057d42e..1f2ea069d 100644
--- a/ports/boost-optional/CONTROL
+++ b/ports/boost-optional/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-optional
-Version: 1.68.0
-Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-mpl, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost optional module
diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake
index 00ba27665..11c3b5b68 100644
--- a/ports/boost-optional/portfile.cmake
+++ b/ports/boost-optional/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/optional
-    REF boost-1.68.0
-    SHA512 995436e8805a441e13a3fb8040b78dde9363759bd49db789744ba5afe1a90af05b05de882267aef1c76fe68c410172233e2c8b0559e74f6764b3b1a1207a6b9b
+    REF boost-1.69.0
+    SHA512 0bf1520af676a3f1fc34a074f8029018a9353fcf21dc3a3c895d2d3dcf68a2ecb0eae22e2edb9f687cc70e228c24f31a531b91b3d8160fa0559b9411401da64b
     HEAD_REF master
 )
 
diff --git a/ports/boost-parameter-python/CONTROL b/ports/boost-parameter-python/CONTROL
new file mode 100644
index 000000000..c4da4f4cc
--- /dev/null
+++ b/ports/boost-parameter-python/CONTROL
@@ -0,0 +1,5 @@
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+Source: boost-parameter-python
+Version: 1.69.0
+Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python (windows), boost-vcpkg-helpers
+Description: Boost parameter_python module
diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake
new file mode 100644
index 000000000..284476775
--- /dev/null
+++ b/ports/boost-parameter-python/portfile.cmake
@@ -0,0 +1,14 @@
+# 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.69.0
+    SHA512 1a50243b3f527a6bfd95964053e0c0624c5bd859d037770e0c41c4158b4ae4d0da6bcf493759b6cdd66cc08ee9c6c5d82fa4173f67b2a20f9715e2f30f90e6cb
+    HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-parameter/CONTROL b/ports/boost-parameter/CONTROL
index b86aa90d2..01ec570d1 100644
--- a/ports/boost-parameter/CONTROL
+++ b/ports/boost-parameter/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-parameter
-Version: 1.68.0
-Build-Depends: boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-config, boost-detail, boost-mpl, boost-optional, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost parameter module
diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake
index 7a95348a3..1e569ea28 100644
--- a/ports/boost-parameter/portfile.cmake
+++ b/ports/boost-parameter/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/parameter
-    REF boost-1.68.0
-    SHA512 28d4538ccc544884fa9641ffca89c8a7a4f4098330540d1929b798ea69bf571e6073c65b9d4162b9b357b127da798c0fa613410b6b8e24e3af6681d465532d2f
+    REF boost-1.69.0
+    SHA512 08d4397c3edd73a0d1e0485540846cd4d7b537d9046cf08ab841ae323de85d6df9a8a132d5204f514ff0d1d1b41047d63261875fbfd30ca1b1f9b3b0f93c6c81
     HEAD_REF master
 )
 
diff --git a/ports/boost-phoenix/CONTROL b/ports/boost-phoenix/CONTROL
index dd0fb4d48..33cd2bb96 100644
--- a/ports/boost-phoenix/CONTROL
+++ b/ports/boost-phoenix/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-phoenix
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost phoenix module
diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake
index cb12b27d9..3493ab0cb 100644
--- a/ports/boost-phoenix/portfile.cmake
+++ b/ports/boost-phoenix/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/phoenix
-    REF boost-1.68.0
-    SHA512 5ce43db16a9f9e14d151475eb52120c497fbf7082a912af6fa64b4a4e59af9b33938968fb524a4f8f73be039fcfeb4ced19dfc7a3012fe2dc1eb85b621c5eb08
+    REF boost-1.69.0
+    SHA512 e07e678fe7373ec33f331fecefb3951b5b6adbed0e2d9f22148a9d75327c1194c45ba2f0b403ba2978040400cd6fb0f604686ca77c48a2c3878c9e7d15ea33dd
     HEAD_REF master
 )
 
diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL
index aafb24154..a45de2679 100644
--- a/ports/boost-poly-collection/CONTROL
+++ b/ports/boost-poly-collection/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-poly-collection
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost poly_collection module
diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake
index 72eb529e1..b2849bf72 100644
--- a/ports/boost-poly-collection/portfile.cmake
+++ b/ports/boost-poly-collection/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/poly_collection
-    REF boost-1.68.0
-    SHA512 c4b93a5dceaa1e41b3f585f79a34bf05d8bed30f78af86cdf829d910a6ea791420880f087063180a5332eb065b4427cf6c98d9d71a9375d10c0f33defbdb1bd6
+    REF boost-1.69.0
+    SHA512 636f406d1ee0e7f6612ea285d745fc64137fc7b499efb8e852933747a69cc0efbb41b2643514f5d264ea7df087fb950e8f77b433645847b785e376c729c1d098
     HEAD_REF master
 )
 
diff --git a/ports/boost-polygon/CONTROL b/ports/boost-polygon/CONTROL
index 36fb22386..1a588f66d 100644
--- a/ports/boost-polygon/CONTROL
+++ b/ports/boost-polygon/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-polygon
-Version: 1.68.0
-Build-Depends: boost-config, boost-integer, boost-mpl, boost-utility, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-config, boost-integer, boost-vcpkg-helpers
 Description: Boost polygon module
diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake
index 5fe881759..46d0062dd 100644
--- a/ports/boost-polygon/portfile.cmake
+++ b/ports/boost-polygon/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/polygon
-    REF boost-1.68.0
-    SHA512 ebb34e0d693215db2919096600ed9bea6b239a2486135f48a1a3bd683410b0c86c3b455bc2d58f7b6efad50020895d3fd8f4b4b0ee897eacdb7a980d0979e9ad
+    REF boost-1.69.0
+    SHA512 4cd1a3a9856322f475cdf3d4643043143531cf78b9f951d7b533bbfcab38df1dfa55d2326a983dcb7c88635efe72f878215280532dcf47c6cee755bcdfe50f2f
     HEAD_REF master
 )
 
diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL
index b1de76796..888b0cce7 100644
--- a/ports/boost-pool/CONTROL
+++ b/ports/boost-pool/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-pool
-Version: 1.68.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-thread (!arm), boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Description: Boost pool module
diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake
index 5c52588d1..23d73e65b 100644
--- a/ports/boost-pool/portfile.cmake
+++ b/ports/boost-pool/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/pool
-    REF boost-1.68.0
-    SHA512 b1b3d91ac85469c0b06d48bcc159b22974dc446f44d84aee459ba26f1bd114600819efec3b1679be87b91525a0d55ba9a9fbde4828b6436bad4013d9de4652e6
+    REF boost-1.69.0
+    SHA512 b3fad5e548912a485599ee3e1db1989848dee84d5376fd9eda00d63044a6c10deb675a20518ac7626932770350015cdbe4e82cc74ee570edb8abeba85628b832
     HEAD_REF master
 )
 
diff --git a/ports/boost-predef/CONTROL b/ports/boost-predef/CONTROL
index 540b2026d..256939088 100644
--- a/ports/boost-predef/CONTROL
+++ b/ports/boost-predef/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-predef
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-vcpkg-helpers
 Description: Boost predef module
diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake
index b4f21e883..9e5a39d8c 100644
--- a/ports/boost-predef/portfile.cmake
+++ b/ports/boost-predef/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/predef
-    REF boost-1.68.0
-    SHA512 fb353184d4a1cbe7a621d3076bff10061c38912ecfc94d4dab54e43eb40fda62455866b3076c4193d94338cc2fb3fe8bd31f5e20ac56931cd16c2413d6c426f7
+    REF boost-1.69.0
+    SHA512 0fadcf5e36fe83d777843d3a02c730a7f4af06cff52700ef032b196805307d92e4e8665e6387a4d4b1d046d76fffefd980c1208c8f3bc556e6d4d7bdeef2b7ee
     HEAD_REF master
 )
 
diff --git a/ports/boost-preprocessor/CONTROL b/ports/boost-preprocessor/CONTROL
index ac86f7128..276c211ae 100644
--- a/ports/boost-preprocessor/CONTROL
+++ b/ports/boost-preprocessor/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-preprocessor
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-vcpkg-helpers
 Description: Boost preprocessor module
diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake
index d829c5c13..202454897 100644
--- a/ports/boost-preprocessor/portfile.cmake
+++ b/ports/boost-preprocessor/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/preprocessor
-    REF boost-1.68.0
-    SHA512 7c16f996dc9ba6afbc748acc854e3dadc852d76a1a02fc9a61d46fe92edb412c889cfba72c5de5a8f85913711a7f0ad2df3e9d7c4fb20e6422c321847e17399a
+    REF boost-1.69.0
+    SHA512 33366ae1f998644ef9d151037598facbb832cfbacad07c15a5076b61d9d1f7f2d4e0f45af0e87a437af0b43b134f88392aaf697f0144c838b7c6ad274d0f8fd5
     HEAD_REF master
 )
 
diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL
index 4105702ed..e07261e05 100644
--- a/ports/boost-process/CONTROL
+++ b/ports/boost-process/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-process
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost process module
diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake
index c93860190..8c8c53218 100644
--- a/ports/boost-process/portfile.cmake
+++ b/ports/boost-process/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/process
-    REF boost-1.68.0
-    SHA512 6e75874c9eb95e30c8ef098a724e61ce986d14846325b778433467c8940b3cdd5177b5467c36103a8712e8c2234e2a6a00755e440e457d1e03dc16b59a22aad0
+    REF boost-1.69.0
+    SHA512 f01bfad34458fd245785efa12c070f8a21565698a181b55418f19e0ca948f219be6339ad9e43a0bd87a782ecca92e212671081dc18f7c9699e9b984e0e85d4e3
     HEAD_REF master
 )
 
diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL
index ced795473..cd62877f0 100644
--- a/ports/boost-program-options/CONTROL
+++ b/ports/boost-program-options/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-program-options
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost program_options module
diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake
index e33d189a3..2d5308f8c 100644
--- a/ports/boost-program-options/portfile.cmake
+++ b/ports/boost-program-options/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/program_options
-    REF boost-1.68.0
-    SHA512 debbeb71fd8b4b0a4cef0297b3de6f94758948a117eeff4ccb713ea733c2304ce5f0c17673a066c5faa8b87c3aa2e4602908c4d52d76e53d7c4c2120f76ab4f2
+    REF boost-1.69.0
+    SHA512 02a469c0746cef85b2493b46cfa62da87dd2134af33a874d103e6f225577c74264781c567010f2aeaa4a3c8632d1856e107575230c9c370c22e75e2d78c751ef
     HEAD_REF master
 )
 
diff --git a/ports/boost-property-map/CONTROL b/ports/boost-property-map/CONTROL
index 7ac2bc12a..e9bcd373c 100644
--- a/ports/boost-property-map/CONTROL
+++ b/ports/boost-property-map/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-property-map
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost property_map module
diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake
index 33c5c3228..ba2881c75 100644
--- a/ports/boost-property-map/portfile.cmake
+++ b/ports/boost-property-map/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/property_map
-    REF boost-1.68.0
-    SHA512 57d8ad9bd9854702c18c3d0875d6d26386a1dff58cd4b21f9446f33752455715b78027f212a0954e40ea62fc98f5823cfef2e5ea6f6ce7c7e516bb3fa3d26a37
+    REF boost-1.69.0
+    SHA512 6712f57133e12db2e094dae1895fedc995168c54b74052c02355f13164ea71ab393dbac1fe5f8236188a3282a30a91c39ee5dde4328b4e986f06da4bb3d0f033
     HEAD_REF master
 )
 
diff --git a/ports/boost-property-tree/CONTROL b/ports/boost-property-tree/CONTROL
index c4ff3e961..c7398baa5 100644
--- a/ports/boost-property-tree/CONTROL
+++ b/ports/boost-property-tree/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-property-tree
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost property_tree module
diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake
index 245919b9c..856597cef 100644
--- a/ports/boost-property-tree/portfile.cmake
+++ b/ports/boost-property-tree/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/property_tree
-    REF boost-1.68.0
-    SHA512 07410c78fdb9ae1d8a16c6c2ed65caea3136365c04828b78c02074ee523cccbf8f9a7117fcb5524711a0204c8ed77f56adcb47313fa16f63e15801043c3e1763
+    REF boost-1.69.0
+    SHA512 4f0ccacbddc0bc6685a7234dcc80c10134e6e6beb872128d90246d5e9402f5e48ec26da8895bbe2d760e110256db9d16bde3dcccb59d1014afc9bf6970d48bab
     HEAD_REF master
 )
 
diff --git a/ports/boost-proto/CONTROL b/ports/boost-proto/CONTROL
index 42b2d3d4d..7aaaaf15e 100644
--- a/ports/boost-proto/CONTROL
+++ b/ports/boost-proto/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-proto
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost proto module
diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake
index b5e42f617..5dc43fc70 100644
--- a/ports/boost-proto/portfile.cmake
+++ b/ports/boost-proto/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/proto
-    REF boost-1.68.0
-    SHA512 af03f0ad4d67d7d029fc9afec830e78295d34f0dd7af8dea57c3d931d042645f8a8458f1234112826072fb2eb9507ef39375ec412072b2be618621cec2934635
+    REF boost-1.69.0
+    SHA512 54cdc0f1350ac38388ba45bcb33bca3736ebe32214e6cd8c06a3a7471b0ede697ffc4124419ff13d93af667f728bb1713e5dc92c8a8dd1e28e9c526e3ea36ab4
     HEAD_REF master
 )
 
diff --git a/ports/boost-ptr-container/CONTROL b/ports/boost-ptr-container/CONTROL
index e23e8bb67..e86decd35 100644
--- a/ports/boost-ptr-container/CONTROL
+++ b/ports/boost-ptr-container/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-ptr-container
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost ptr_container module
diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake
index 9f36d7041..3cf955911 100644
--- a/ports/boost-ptr-container/portfile.cmake
+++ b/ports/boost-ptr-container/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/ptr_container
-    REF boost-1.68.0
-    SHA512 bf800d67f0692485a04ab46dc9bbb04d542bfe941710796d82bd8d3e6b085d4c75b02d45507f145407317591734ffd83e4b0f9e823a4bee7071485fe94a88302
+    REF boost-1.69.0
+    SHA512 6df58700545067232139b2088e6abe28268a0a158f6827327ad243d616191b11097b9c6bed8705206ae5daa672555f3ed5c11c20352dc95f2c54aacec54d820a
     HEAD_REF master
 )
 
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL
index 31bd01788..236c94c6a 100644
--- a/ports/boost-python/CONTROL
+++ b/ports/boost-python/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-python
-Version: 1.68.0-2
-Build-Depends: boost-bind, boost-config, boost-conversion, boost-core, boost-detail, boost-graph, boost-integer, boost-iterator, boost-mpl, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-utility, boost-vcpkg-helpers, python3
+Version: 1.69.0-1
+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
 Description: Boost python module
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake
index bdbe49f25..bee55c943 100644
--- a/ports/boost-python/portfile.cmake
+++ b/ports/boost-python/portfile.cmake
@@ -5,10 +5,9 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/python
-    REF boost-1.68.0
-    SHA512 17aacec09a653b718e1925f13fbce1a22a09d44011534e451a953600f4fef47b0e8a759d4e1588b74dbfc71ef38f1f13200d77668eca2ad1bc5b1e470e231a2f
+    REF boost-1.69.0
+    SHA512 7ca3210a35ac43eae31c58d7ccd58e6410ec0d62a25ae7a03fb2db9baa4cf863fbaad1686c6ceaf804663c5707f6e60b4806f792f0aceb5c12a85b705d4242d0
     HEAD_REF master
-    PATCHES unwind-type.patch
 )
 
 # Find Python. Can't use find_package here, but we already know where everything is
diff --git a/ports/boost-qvm/CONTROL b/ports/boost-qvm/CONTROL
index 5e6306563..e076506b1 100644
--- a/ports/boost-qvm/CONTROL
+++ b/ports/boost-qvm/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-qvm
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers
 Description: Boost qvm module
diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake
index c9cb0a104..2a9a48d31 100644
--- a/ports/boost-qvm/portfile.cmake
+++ b/ports/boost-qvm/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/qvm
-    REF boost-1.68.0
-    SHA512 1e9babfa993b59cba1cd4c7fa2184576a50ca0f6acd6db91b2e7e1fa3931f1c32de7bae76a8990bdd6cf69551482e74900b66a5bfb1c91c46e2a72d90491a4a3
+    REF boost-1.69.0
+    SHA512 b801ce8f2e96364fbafa31d1a501706a81d57b7d6f2c0ce63c4ca103957f8a4504eb1797fa96e812dac032e4972b18bc973e8a4bc24cfb38ac3a367dad75b4f7
     HEAD_REF master
 )
 
diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL
index df1f75532..c89a37d88 100644
--- a/ports/boost-random/CONTROL
+++ b/ports/boost-random/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-random
-Version: 1.68.0
+Version: 1.69.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-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost random module
diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake
index 1f5c32b86..3024a3317 100644
--- a/ports/boost-random/portfile.cmake
+++ b/ports/boost-random/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/random
-    REF boost-1.68.0
-    SHA512 dc9a4f65610324a021daf834443a49364a71b45d68ab3ec193221c464ffd1e824a48930da10633718ac4652c720db3cbb62d47114b3da98b31f4383c83bfc6b4
+    REF boost-1.69.0
+    SHA512 13875116f5d4fd18eb3ec8b9e09bd1381bc0d5ce533552c555a233380ea91139b7b9e24ff7788c495c2838a3ab9efd400f627d86b09a7b176e2e63ec61d5e6d1
     HEAD_REF master
 )
 
diff --git a/ports/boost-range/CONTROL b/ports/boost-range/CONTROL
index ed079d74c..98735fddd 100644
--- a/ports/boost-range/CONTROL
+++ b/ports/boost-range/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-range
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost range module
diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake
index b3a68e39a..394292b95 100644
--- a/ports/boost-range/portfile.cmake
+++ b/ports/boost-range/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/range
-    REF boost-1.68.0
-    SHA512 a95bb972fa862e210aa77a214d803b5206dba238f1bdedd238bfd0ca3203b0b7c57b6c1738032d696e303049693028237f7eaa12766fa2c667ce6d8d27b6032f
+    REF boost-1.69.0
+    SHA512 948a2ed81fa0d3b92a40f5aa51b564e221c06e0d5111cd346ebb2d11de96045a880f373befccf0ae49317f7c03f1a93813f530d4e1a5b9b016fcb1fa14664085
     HEAD_REF master
 )
 
diff --git a/ports/boost-ratio/CONTROL b/ports/boost-ratio/CONTROL
index 7e5543bd8..7eed485c7 100644
--- a/ports/boost-ratio/CONTROL
+++ b/ports/boost-ratio/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-ratio
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Description: Boost ratio module
diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake
index 1b637a1e8..fc6174fec 100644
--- a/ports/boost-ratio/portfile.cmake
+++ b/ports/boost-ratio/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/ratio
-    REF boost-1.68.0
-    SHA512 0e4e7097ae51c30ae6ccbf112943a54d00421fa1c95f516554543b8f9c4fdde4602ff69e4b5c780a166058dbbe2d073162c0f857be3c07f7b20cc4842f9913f1
+    REF boost-1.69.0
+    SHA512 c52acdde2a8b523f98294a77ad61411fb017dc30cf5232f872581c665fca632dae6955c5869240865f2f0868a96d3d25445506bcd7832a3a5def96ded771b3f8
     HEAD_REF master
 )
 
diff --git a/ports/boost-rational/CONTROL b/ports/boost-rational/CONTROL
index 2078f7f0a..2ecdf706a 100644
--- a/ports/boost-rational/CONTROL
+++ b/ports/boost-rational/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-rational
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost rational module
diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake
index 5db179cc1..299a9cdb2 100644
--- a/ports/boost-rational/portfile.cmake
+++ b/ports/boost-rational/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/rational
-    REF boost-1.68.0
-    SHA512 a259b492d3ed3cc3d4bfae1bc6dfe3abe2678ea6379a1d4a48bd0b176952f5d0d0bd3c1cfbaa5a8e566fc0e59f3d4f267cf039f5f5a9d38e635fd4b999784fa0
+    REF boost-1.69.0
+    SHA512 8115d3f45248918267e1f8630e62d2667302ca11957248a4b6377da58bb6c61b7a0f5e9c11b46133c860e19f90b862c2a466fb38e757f7f7fe88afae3e1ee3c4
     HEAD_REF master
 )
 
diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL
index 14ae738a3..18b331a48 100644
--- a/ports/boost-regex/CONTROL
+++ b/ports/boost-regex/CONTROL
@@ -1,7 +1,7 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-regex
-Version: 1.68.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-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost regex module
 
 Feature: icu
diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake
index 0ab65b58d..1f6fa035b 100644
--- a/ports/boost-regex/portfile.cmake
+++ b/ports/boost-regex/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/regex
-    REF boost-1.68.0
-    SHA512 57ea3b825011172e332f52aead9aae4b7d17dfceef68c5cc017607570c6818adfc73780f4d405a57aa93c3a7a3ca09bb74de2a9cb97e72c78700098ed6d2e63e
+    REF boost-1.69.0
+    SHA512 7ca27b7585ea3627117275711a29c3ed2a5882e0cad7028ccdf63fbd09380807ffa9e344705ea86846b75f45b85f04ad7cc28149c6ba61579684fd6f9febbd48
     HEAD_REF master
 )
 
diff --git a/ports/boost-safe-numerics/CONTROL b/ports/boost-safe-numerics/CONTROL
new file mode 100644
index 000000000..5eb2449ab
--- /dev/null
+++ b/ports/boost-safe-numerics/CONTROL
@@ -0,0 +1,5 @@
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+Source: boost-safe-numerics
+Version: 1.69.0
+Build-Depends: boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-mpl, boost-vcpkg-helpers
+Description: Boost safe_numerics module
diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake
new file mode 100644
index 000000000..f3c41c5e8
--- /dev/null
+++ b/ports/boost-safe-numerics/portfile.cmake
@@ -0,0 +1,14 @@
+# 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.69.0
+    SHA512 708f23d304402671466c24a3c8acb1fd497799eb1c97d314c5ed78712d3906142f3ad5442e159cc304ace46b1e761b920bbe454ebf80df46127be78e98f25f8b
+    HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-scope-exit/CONTROL b/ports/boost-scope-exit/CONTROL
index 229ea3c8b..22ce65238 100644
--- a/ports/boost-scope-exit/CONTROL
+++ b/ports/boost-scope-exit/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-scope-exit
-Version: 1.68.0
-Build-Depends: boost-config, boost-detail, boost-function, boost-mpl, boost-preprocessor, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-config, boost-detail, boost-function, boost-preprocessor, boost-typeof, boost-type-traits, boost-vcpkg-helpers
 Description: Boost scope_exit module
diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake
index 32d208047..e60cd1769 100644
--- a/ports/boost-scope-exit/portfile.cmake
+++ b/ports/boost-scope-exit/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/scope_exit
-    REF boost-1.68.0
-    SHA512 fb1bf400f025836c64604994bd7de0d66227f2bb1bf5f3caf7b7e4db599702dd0ea229ff4c7b3a4efcab9545db8f20ac20d4b4354609047dd1e8b278d2220f43
+    REF boost-1.69.0
+    SHA512 d89d5793f1916218892e3a9c2b4b59d637a613a053be09a9f4b74d73413f98e100868ddccbfbcc7d42af154757836532a16d5301fdd9ac6878d94f8bb9ac7a0d
     HEAD_REF master
 )
 
diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL
index c513a6384..e82a3cbda 100644
--- a/ports/boost-serialization/CONTROL
+++ b/ports/boost-serialization/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-serialization
-Version: 1.68.0
+Version: 1.69.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-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
 Description: Boost serialization module
diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake
index f574fdf28..240762224 100644
--- a/ports/boost-serialization/portfile.cmake
+++ b/ports/boost-serialization/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/serialization
-    REF boost-1.68.0
-    SHA512 13c35139ef8c67e297ca99fa2695b203f45a44788dc0c343075295baba07d0de113132314ddc4438d0d6cd87ad542510160e8cbe773a0f1d7fb24f377809d0b9
+    REF boost-1.69.0
+    SHA512 1db8a9db4a972625b76cbe41b35c4c68940b0b0c3caf8fc3108142df922e359af00533d4a2125a6899a68a9c18b3719c0855da63821b4158c253499d677bd753
     HEAD_REF master
 )
 
diff --git a/ports/boost-signals2/CONTROL b/ports/boost-signals2/CONTROL
index ce1b2ea24..f20771f5a 100644
--- a/ports/boost-signals2/CONTROL
+++ b/ports/boost-signals2/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-signals2
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-mpl, boost-multi-index, 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
 Description: Boost signals2 module
diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake
index f33e55483..74fc65c98 100644
--- a/ports/boost-signals2/portfile.cmake
+++ b/ports/boost-signals2/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/signals2
-    REF boost-1.68.0
-    SHA512 288e818d126fd2f4a6cededf802b74a5e3230483437e2338f179de6d9f22dbdad32c8040c56af2713811e7558326bd7c18a98e327eedcc5990dc9e25d0b35f26
+    REF boost-1.69.0
+    SHA512 96be2cce707e433dadfd23766870d0b01b67e0d156e4178022eedb29928844964c632eefe1da359266180ec7b7bf5f6083f30baa06eb4eb0092078366e9ac4cd
     HEAD_REF master
 )
 
diff --git a/ports/boost-smart-ptr/CONTROL b/ports/boost-smart-ptr/CONTROL
index bdf02ec3a..491dcaa37 100644
--- a/ports/boost-smart-ptr/CONTROL
+++ b/ports/boost-smart-ptr/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-smart-ptr
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost smart_ptr module
diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake
index 942a98163..cf3d86cd7 100644
--- a/ports/boost-smart-ptr/portfile.cmake
+++ b/ports/boost-smart-ptr/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/smart_ptr
-    REF boost-1.68.0
-    SHA512 5c791dd11d0b7d7662bfa936955dfbf9ff7e2e1993051a03997dbfee6b9b28e606ac94bad06a6eb112e8e089cf28721a4140761620a0c268ab8871d913e913d1
+    REF boost-1.69.0
+    SHA512 b11e39bde74287c2c9b24ea2c9509fb2f44714ee75e876e8c2c5754cf8c1c7a8f42570f7084393d031b4347abb1ac9715c779c19ecaf5917abb53e368c1e5868
     HEAD_REF master
 )
 
diff --git a/ports/boost-sort/CONTROL b/ports/boost-sort/CONTROL
index 80cb3c99b..903d8b8db 100644
--- a/ports/boost-sort/CONTROL
+++ b/ports/boost-sort/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-sort
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-integer, boost-range, boost-serialization, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost sort module
diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake
index 67040df74..79a6b239f 100644
--- a/ports/boost-sort/portfile.cmake
+++ b/ports/boost-sort/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/sort
-    REF boost-1.68.0
-    SHA512 011642be7224c2892b63c01a589210dc0562d768a750a13622c181d0e8884cb0c8e2ab68f178bfaee2c895fdf8dd78815f6c8c1d58126e4db5d043068340d676
+    REF boost-1.69.0
+    SHA512 70756aeed4d2b179835ae86a91993d18ee388035b107536e8ab78b32309984ee72151c4359d834722b7e0cfb02262a6f4a708d724e8d154518976589b6f3897b
     HEAD_REF master
 )
 
diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL
index a9d82f0cc..d6fa7c194 100644
--- a/ports/boost-spirit/CONTROL
+++ b/ports/boost-spirit/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-spirit
-Version: 1.68.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-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Version: 1.69.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 (!arm), boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
 Description: Boost spirit module
diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake
index fd31b103c..49e6b4b66 100644
--- a/ports/boost-spirit/portfile.cmake
+++ b/ports/boost-spirit/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/spirit
-    REF boost-1.68.0
-    SHA512 39e1824fcf0fb1358ab5c0df7c524ef0d27c40762e230f68f959e5e7f708c1bd2dffeaeff9ab2b420710bd3a089d48915a05ccfb1117056c96d3ddd66939696b
+    REF boost-1.69.0
+    SHA512 2a27761676401c697de19f847fc000c0dd0fbcfac98f48c18d82bf4a8ff33cc53f05dd7843f596ddbaf3a60497bfb8b08f66a7dd4ec034fa3ea8730e45aef7ec
     HEAD_REF master
 )
 
diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL
index b8c901dff..26932388d 100644
--- a/ports/boost-stacktrace/CONTROL
+++ b/ports/boost-stacktrace/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-stacktrace
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Description: Boost stacktrace module
diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake
index 84818f4ab..66df0a916 100644
--- a/ports/boost-stacktrace/portfile.cmake
+++ b/ports/boost-stacktrace/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/stacktrace
-    REF boost-1.68.0
-    SHA512 2700d80620a5b66e965c00a5e407aec2e075b0e567fe2031bd3671303fb4c4b3a4dc3d3ddb1cfb6058325470a0b51589aedf2a2ea0b46d53cbb754a2d3fb6027
+    REF boost-1.69.0
+    SHA512 ba8de7c238b60104d3d5b7c720121c52f08b430293736a2ad7636fe361827c7bda61d111357436807a77cd5c1a2973abcc2fd5924bf0f74d85a2a258afad366c
     HEAD_REF master
 )
 
diff --git a/ports/boost-statechart/CONTROL b/ports/boost-statechart/CONTROL
index 6425190a9..fa93f1c6c 100644
--- a/ports/boost-statechart/CONTROL
+++ b/ports/boost-statechart/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-statechart
-Version: 1.68.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-type-traits, boost-vcpkg-helpers
+Version: 1.69.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 (!arm), boost-type-traits, boost-vcpkg-helpers
 Description: Boost statechart module
diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake
index 73971e1c2..aac983e0a 100644
--- a/ports/boost-statechart/portfile.cmake
+++ b/ports/boost-statechart/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/statechart
-    REF boost-1.68.0
-    SHA512 f3d2a8d12bd85327928cba9f572e22f438721597675dd9ea22936a06d38a241aa6ef9ca6b5fc183dce20d76c2f306901d2337c12463e917d1ecf1c6d586735bf
+    REF boost-1.69.0
+    SHA512 7f3f17be8efde4017666f7009c55b53036d94aa7db61f0be8634f891486f4ccb1157b2a4f0b7e8a45e8a1bbf6bc5f0f154c9e769344a810e374fc7ea96ae7566
     HEAD_REF master
 )
 
diff --git a/ports/boost-static-assert/CONTROL b/ports/boost-static-assert/CONTROL
index 7a39b5c23..5abb78a89 100644
--- a/ports/boost-static-assert/CONTROL
+++ b/ports/boost-static-assert/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-static-assert
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers
 Description: Boost static_assert module
diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake
index 9d5eb8adf..7e45459d0 100644
--- a/ports/boost-static-assert/portfile.cmake
+++ b/ports/boost-static-assert/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/static_assert
-    REF boost-1.68.0
-    SHA512 af109c668d083a9d7dc63b123b6621b919eab132589bad55a05c0fcdbb0939516a5a787512a87964a04362a4dd73af572293c3a3c2035d41401e78be34ca877e
+    REF boost-1.69.0
+    SHA512 66e7931bab7cf87ad70e463f7154714d88cccf45b32c40adb68ac3af386158220d148df26beb2fc2f111e5cbc443744e32572e8ef26f279c3e81634f0d18ecf6
     HEAD_REF master
 )
 
diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL
index 8b06ccc8e..344927735 100644
--- a/ports/boost-system/CONTROL
+++ b/ports/boost-system/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-system
-Version: 1.68.0
-Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-integer, boost-modular-build-helper, boost-predef, boost-utility, boost-vcpkg-helpers, boost-winapi
+Version: 1.69.0
+Build-Depends: boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-vcpkg-helpers, boost-winapi
 Description: Boost system module
diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake
index fa81b9e0e..fe1699d66 100644
--- a/ports/boost-system/portfile.cmake
+++ b/ports/boost-system/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/system
-    REF boost-1.68.0
-    SHA512 408c0219c9a7d284f7f6053c45c102843b18a52aca9120c9cf88ad752d6480dde21d883e2e4d9a6ecefada0d3bf02364e90d91f5f9cc61a53fd75ebc6e16a0ea
+    REF boost-1.69.0
+    SHA512 64f49a8f2484e3a539a922d66ce05ece9d0ea214c3b1ddf66487ae4201d2a6050ef39da8b1f7dbdb48fbdbc04a1446df0f03cbe8fb85729fcf8b70f066c92053
     HEAD_REF master
 )
 
diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL
index a47306494..fc4602edb 100644
--- a/ports/boost-test/CONTROL
+++ b/ports/boost-test/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-test
-Version: 1.68.0-2
+Version: 1.69.0-2
 Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost test module
diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake
index 7db1284c0..2b165347e 100644
--- a/ports/boost-test/portfile.cmake
+++ b/ports/boost-test/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/test
-    REF boost-1.68.0
-    SHA512 e576311fea904ca64fcbb7d3f9cd435e5b5f68810ee73eaa8d73fe6dfe15663fd4c943308aaa632a7db4e51e3a48ed8e7fcb98b54a70752305cd9a3edbde97e0
+    REF boost-1.69.0
+    SHA512 3a265dc888d749ec1aa5cd13889963b19705d7dbe4092941d8943d3f84a82fc67cee9c3e49cecd9769229b9adea1f09b45a7f4a494cca73cf894a402487ea621
     HEAD_REF master
 )
 
diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL
index 2929ec0b8..0bd043a56 100644
--- a/ports/boost-thread/CONTROL
+++ b/ports/boost-thread/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-thread
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost thread module
diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake
index d260bcae9..712f1e310 100644
--- a/ports/boost-thread/portfile.cmake
+++ b/ports/boost-thread/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/thread
-    REF boost-1.68.0
-    SHA512 ccb1283550347d367390d26c7b64d630cefbdd69ed18d0bdd42a82c726942a76a10a06729630b6e8788d553cf6fee8123feebc3f5b751254cef7a022475b02e8
+    REF boost-1.69.0
+    SHA512 4315662f1592e1f71a1b1a4a502c61df759a4993a376eeb61b5f01a18f4099379ad12989242ccb7d20029b7538b2629e11e707afe10d7fd721e6005c5eb25c56
     HEAD_REF master
     PATCHES avoid-winapi.patch
 )
diff --git a/ports/boost-throw-exception/CONTROL b/ports/boost-throw-exception/CONTROL
index 3f5d2c688..df3e41f63 100644
--- a/ports/boost-throw-exception/CONTROL
+++ b/ports/boost-throw-exception/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-throw-exception
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers
 Description: Boost throw_exception module
diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake
index a376fe37d..36c4fdff7 100644
--- a/ports/boost-throw-exception/portfile.cmake
+++ b/ports/boost-throw-exception/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/throw_exception
-    REF boost-1.68.0
-    SHA512 7ec624763becab452f437eaa6e03c0882f672735a2bc4c1edfa92ccf2acd1c667905ccf15ae0f40091f64b425d83025c7ade4b55bd7418e542b12d575a1c8f60
+    REF boost-1.69.0
+    SHA512 fc9fa9eef9fba2e290598ff0469279f0eaba90918f62d1006837c415a5c49f45ff1b57852b9f03571047f075582498f9c114e7552b7f0d0b8f6edbabb890cc11
     HEAD_REF master
 )
 
diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL
index 69056033b..6979036fb 100644
--- a/ports/boost-timer/CONTROL
+++ b/ports/boost-timer/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-timer
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-system, boost-throw-exception, boost-vcpkg-helpers
 Description: Boost timer module
diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake
index 029bdc2d3..db0933381 100644
--- a/ports/boost-timer/portfile.cmake
+++ b/ports/boost-timer/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/timer
-    REF boost-1.68.0
-    SHA512 5c84057890b0fc57f45f902c59d3f15ba9472d4538d13896b95232591cb2cde123df610b34eb2e3eec13e1cd9b13f652c558170466e0b7e7fe462bd167f84432
+    REF boost-1.69.0
+    SHA512 cfa6a8976b2b91ade5f22c8e8e37cbf687bbfc5bf2904f652287188a903bb1c25f537280a61293141436b71bb1bf0df1e14615948e76571ebf4d3b98fcb9470a
     HEAD_REF master
 )
 
diff --git a/ports/boost-tokenizer/CONTROL b/ports/boost-tokenizer/CONTROL
index 0aab59b91..0ce98025a 100644
--- a/ports/boost-tokenizer/CONTROL
+++ b/ports/boost-tokenizer/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-tokenizer
-Version: 1.68.0
-Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Description: Boost tokenizer module
diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake
index e572b1d40..225fcbe21 100644
--- a/ports/boost-tokenizer/portfile.cmake
+++ b/ports/boost-tokenizer/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/tokenizer
-    REF boost-1.68.0
-    SHA512 f885c49fcafb3cfa4d1028722123d35fc42721cdda1894ccaf918aa25d88429bc8c2a9d73e15154a3982a2122e17bdfb08649578c2bd48f68e82a302e2bbce3b
+    REF boost-1.69.0
+    SHA512 a01120203c4caa6bcfcda803f7811f575b247410e7aa74815646f383a374946263e42987d1cff8a33a65c925cf9d3798854d14995446f637ff8e4e77a3b3b4bc
     HEAD_REF master
 )
 
diff --git a/ports/boost-tti/CONTROL b/ports/boost-tti/CONTROL
index e2b7b093f..6c4c059c7 100644
--- a/ports/boost-tti/CONTROL
+++ b/ports/boost-tti/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-tti
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
 Description: Boost tti module
diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake
index 99e582031..0e3237b42 100644
--- a/ports/boost-tti/portfile.cmake
+++ b/ports/boost-tti/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/tti
-    REF boost-1.68.0
-    SHA512 b14f7abbf2fe5f56b744803a4c803131ebe1b3762d2c85f624ead670619909db30fbd3ee3e5f1787b1f7377c25e5044553cf4df609c31209bbd9c2572b874247
+    REF boost-1.69.0
+    SHA512 1c8c0ea6e47ea4565d280e9ad465851d1f8abf14639676112a45e275889e1cfb9b517c5f12a9e26c32c465c24e93a843f46ea5854060ed7a96ba29bc1f5e687e
     HEAD_REF master
 )
 
diff --git a/ports/boost-tuple/CONTROL b/ports/boost-tuple/CONTROL
index 8cd3cf3f8..bd0d1a7ee 100644
--- a/ports/boost-tuple/CONTROL
+++ b/ports/boost-tuple/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-tuple
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost tuple module
diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake
index 96e2ae757..9a6582a65 100644
--- a/ports/boost-tuple/portfile.cmake
+++ b/ports/boost-tuple/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/tuple
-    REF boost-1.68.0
-    SHA512 b3c31e1b0ccff578f2311cd315118f5d5f37c110ef6537266078cdd23af184806bbaf58fd39e32ebcd4e231117241b16f6c7734717bd3b9344935ce3e2ad2faf
+    REF boost-1.69.0
+    SHA512 b298a179fd103f8da526315cab50bcbc1d2b6f63ad753add05353a943ab6ae1044412eddaafec760809a6ccb881dee6302c5014283eda20bc7563f3eea47c4a8
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL
index 6c92109bb..d937f7c6c 100644
--- a/ports/boost-type-erasure/CONTROL
+++ b/ports/boost-type-erasure/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-type-erasure
-Version: 1.68.0
+Version: 1.69.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 (!arm), boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-vmd
 Description: Boost type_erasure module
diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake
index 20016b7b1..6fce4db2b 100644
--- a/ports/boost-type-erasure/portfile.cmake
+++ b/ports/boost-type-erasure/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_erasure
-    REF boost-1.68.0
-    SHA512 d4f1f2063408e2de67ce660f13017be092b414e7a6fed90f6b460715bdb38ead27763244aa48888646501a6f031c981416d2e5076ab42d619b8a494e99f89ce3
+    REF boost-1.69.0
+    SHA512 40445b1b5f3e3ce61c7d5d2bc0d5018b4ebe2ebbba4d05e941bfbc792a52b04f6dd0025b6502f105686dc55d74ccbc5f7ca61a96a36532ddb6879a9d8d2f6afd
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-index/CONTROL b/ports/boost-type-index/CONTROL
index fbcda2c78..e147947ff 100644
--- a/ports/boost-type-index/CONTROL
+++ b/ports/boost-type-index/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-type-index
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost type_index module
diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake
index e955e244d..a97f2000b 100644
--- a/ports/boost-type-index/portfile.cmake
+++ b/ports/boost-type-index/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_index
-    REF boost-1.68.0
-    SHA512 5d31df2b8f92599d655ff46bdad6342dbce5f4e042054705d61d13b576e4c8d933a4fdb7ec9e5fca14f43dfc1c307911a269041f1742c2894690a94eb5d23b52
+    REF boost-1.69.0
+    SHA512 c323a0f779084272127e1da31efbd166bc1c8ba83083cafba19984c86a91aa87ce84bbfe95a5f439feffb53f286006c215b0b828d8626cc4bbde509ffb05d994
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-traits/CONTROL b/ports/boost-type-traits/CONTROL
index 368cafe9e..24997fa5f 100644
--- a/ports/boost-type-traits/CONTROL
+++ b/ports/boost-type-traits/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-type-traits
-Version: 1.68.0
-Build-Depends: boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Version: 1.69.0-1
+Build-Depends: boost-config, boost-detail, boost-static-assert, boost-vcpkg-helpers
 Description: Boost type_traits module
diff --git a/ports/boost-type-traits/msvc-arm-2.patch b/ports/boost-type-traits/msvc-arm-2.patch
new file mode 100644
index 000000000..f6f192ecb
--- /dev/null
+++ b/ports/boost-type-traits/msvc-arm-2.patch
@@ -0,0 +1,44 @@
+diff --git a/include/boost/type_traits/detail/is_function_cxx_11.hpp b/include/boost/type_traits/detail/is_function_cxx_11.hpp
+index 82303fb..de0ce7e 100644
+--- a/include/boost/type_traits/detail/is_function_cxx_11.hpp
++++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp
+@@ -96,7 +96,7 @@ namespace boost {
+    template <class Ret, class ...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ 
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
+ #ifdef __CLR_VER
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+@@ -328,7 +328,7 @@ namespace boost {
+    template <class Ret, class ...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ 
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
+ #ifdef __CLR_VER
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+diff --git a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
+index d5f1c21..0465ae0 100644
+--- a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
++++ b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
+@@ -108,7 +108,7 @@ namespace boost {
+    template <class Ret, class C, class ...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(C::*)(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ 
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
+ #ifdef __CLR_VER
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+@@ -362,7 +362,7 @@ namespace boost {
+    template <class Ret, class C, class ...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(C::*)(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ 
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
+ #ifdef __CLR_VER
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
diff --git a/ports/boost-type-traits/msvc-arm.patch b/ports/boost-type-traits/msvc-arm.patch
new file mode 100644
index 000000000..cf3d9005a
--- /dev/null
+++ b/ports/boost-type-traits/msvc-arm.patch
@@ -0,0 +1,440 @@
+diff --git a/include/boost/type_traits/detail/is_function_cxx_11.hpp b/include/boost/type_traits/detail/is_function_cxx_11.hpp
+index 3031130..82303fb 100644
+--- a/include/boost/type_traits/detail/is_function_cxx_11.hpp
++++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp
+@@ -101,7 +101,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -114,7 +114,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -127,7 +127,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -140,7 +140,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -154,7 +154,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -167,7 +167,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -180,7 +180,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -193,7 +193,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -207,7 +207,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)&&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)&&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -220,7 +220,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -233,7 +233,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -246,7 +246,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -333,7 +333,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -346,7 +346,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -359,7 +359,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -372,7 +372,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -386,7 +386,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -399,7 +399,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -412,7 +412,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -425,7 +425,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -439,7 +439,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -452,7 +452,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -465,7 +465,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -478,7 +478,7 @@ namespace boost {
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_function<Ret __stdcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
+diff --git a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
+index b77a4a5..d5f1c21 100644
+--- a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
++++ b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
+@@ -113,7 +113,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -128,7 +128,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -143,7 +143,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -158,7 +158,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -174,7 +174,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -189,7 +189,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -204,7 +204,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -219,7 +219,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -235,7 +235,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -250,7 +250,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -265,7 +265,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -280,7 +280,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -367,7 +367,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -382,7 +382,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -397,7 +397,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -412,7 +412,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -428,7 +428,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -443,7 +443,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -458,7 +458,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -473,7 +473,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -489,7 +489,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -504,7 +504,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -519,7 +519,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+@@ -534,7 +534,7 @@ namespace boost {
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #endif
+-#ifndef _M_AMD64
++#ifdef _M_IX86
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+    struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake
index 427b9c699..f2661a4ba 100644
--- a/ports/boost-type-traits/portfile.cmake
+++ b/ports/boost-type-traits/portfile.cmake
@@ -5,9 +5,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_traits
-    REF boost-1.68.0
-    SHA512 d9bdb5eb2e602085bf1f6d4339a7895c2f1a7227889e7c20088cc9fe35da5f1c44ff297c043f1713a8831b0785ef871b5ac02c8ad2b7ee305c1a6310678b5985
+    REF boost-1.69.0
+    SHA512 83d585933374420808aaf3743cda48d914bb7d536bf3f19e59bba1b24403a1482ff509e1f804a0b55d3bc434aceedcb0b75f873b9feaa9ba1c1a762a11d4fc94
     HEAD_REF master
+    PATCHES
+        msvc-arm.patch
+        msvc-arm-2.patch
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/boost-typeof/CONTROL b/ports/boost-typeof/CONTROL
index a7ea199cf..8ee36b04c 100644
--- a/ports/boost-typeof/CONTROL
+++ b/ports/boost-typeof/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-typeof
-Version: 1.68.0
-Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.0
+Build-Depends: boost-config, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
 Description: Boost typeof module
diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake
index 54693f1cb..66486e83c 100644
--- a/ports/boost-typeof/portfile.cmake
+++ b/ports/boost-typeof/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/typeof
-    REF boost-1.68.0
-    SHA512 c01723f5e50b7bd7d190df73e4b5b7ffe6512c89d76080061dcd1d4a7dac45b450dda4e3edc7452613a7aad230414ad8ad728d56ed392f9d5571a99281315ada
+    REF boost-1.69.0
+    SHA512 66932eaef89b406c1570bd469370cc62ad298ee7c1864d01a0380a32c90511711cb8b00776c203c8ed6eb2ecec8fb5c005bb932c2277e4fe29b182e485927b18
     HEAD_REF master
 )
 
diff --git a/ports/boost-ublas/CONTROL b/ports/boost-ublas/CONTROL
index 68e20cac5..eca065013 100644
--- a/ports/boost-ublas/CONTROL
+++ b/ports/boost-ublas/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-ublas
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: 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
 Description: Boost ublas module
diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake
index 2829e600b..b46d7a830 100644
--- a/ports/boost-ublas/portfile.cmake
+++ b/ports/boost-ublas/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/ublas
-    REF boost-1.68.0
-    SHA512 26bf61e43551a199e9a62d2d7f21fcb9407e9dc97b20317b17561d5c95256eced961eb30b1d8937533c1d9b77d56a148dfb82471b2228a92a3c53b63982cb02f
+    REF boost-1.69.0
+    SHA512 ef39748840ebdb19dfab07f51120c771e08d82edcd526952d15db105b3779c17a8c6742c73a55b0427ad84b7dfa30d08337f331d915fed09b0de30b3606c2385
     HEAD_REF master
 )
 
diff --git a/ports/boost-units/CONTROL b/ports/boost-units/CONTROL
index e6645b1a3..1d1fa035c 100644
--- a/ports/boost-units/CONTROL
+++ b/ports/boost-units/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-units
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost units module
diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake
index 50041db80..f823754e6 100644
--- a/ports/boost-units/portfile.cmake
+++ b/ports/boost-units/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/units
-    REF boost-1.68.0
-    SHA512 8ec422fb52cf1761bd0e4f822807e8c9ed7a3c1642dc96e7447ffd903c9c38c045699b897a69714516e5654252b670fc5b7c795f6e6e54aeb7aed3adebdbccb8
+    REF boost-1.69.0
+    SHA512 6a4a18e6dc8b2d8ddcd027bab0b30a6892639de6e85f25dd456b23fb36f162fd6ec142f49e7ab416bbd1e9d6f5eac541faaa46450896dbfa9691c31c855e217f
     HEAD_REF master
 )
 
diff --git a/ports/boost-unordered/CONTROL b/ports/boost-unordered/CONTROL
index 62bcadd48..796d8bf7d 100644
--- a/ports/boost-unordered/CONTROL
+++ b/ports/boost-unordered/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-unordered
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost unordered module
diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake
index 3c89877e9..aaf69b4fe 100644
--- a/ports/boost-unordered/portfile.cmake
+++ b/ports/boost-unordered/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/unordered
-    REF boost-1.68.0
-    SHA512 71b34649d70a610efa6d2e98019ee5db57aa5f09a4a388c8bf54e4a1ff02de8b581a249f7b917be58663e260599732eaaedeb297e7c20046013a811997991c16
+    REF boost-1.69.0
+    SHA512 51bbbdcc0661b502445e53091bb5ab859ece03ce549365ac58964459e0b7c162e10b166324b8b9c28a9a8aef5532fa31fed68bbb878e3d36f115a6279109e4b7
     HEAD_REF master
 )
 
diff --git a/ports/boost-utility/CONTROL b/ports/boost-utility/CONTROL
index 271c5a718..7850447a2 100644
--- a/ports/boost-utility/CONTROL
+++ b/ports/boost-utility/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-utility
-Version: 1.68.0
-Build-Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost utility module
diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake
index 6d1af49f7..521de5622 100644
--- a/ports/boost-utility/portfile.cmake
+++ b/ports/boost-utility/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/utility
-    REF boost-1.68.0
-    SHA512 ee6ef15cd7291b5001f4a3a96e95790cfab2017b76f6eac3b9672983e56440d6184cb896257a9c4e365fe1e71b3c721b3b98a4d36d793a8bdf8d1c78585408e3
+    REF boost-1.69.0
+    SHA512 92c97875eff9aee2724b4ae1ed04a6885b06c77fa14ce646423c6b7024bb1d86ef358ecc5d3fa3835b3d70adb968a49f647828fe181ae469aa6fd1fe0a1bc8cf
     HEAD_REF master
 )
 
diff --git a/ports/boost-uuid/CONTROL b/ports/boost-uuid/CONTROL
index dce434277..b17b48ef8 100644
--- a/ports/boost-uuid/CONTROL
+++ b/ports/boost-uuid/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-uuid
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost uuid module
diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake
index 41f903735..b8c43c34a 100644
--- a/ports/boost-uuid/portfile.cmake
+++ b/ports/boost-uuid/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/uuid
-    REF boost-1.68.0
-    SHA512 cb03182301283785e123a77060426dfcc054c21663ce76d05c1d8dc57c529a8bceadb0c26deadff1ee5070d3bc687050819f272b8afe51ecfafe679631162fc1
+    REF boost-1.69.0
+    SHA512 b6f1dbceb1ca2665df63b7d4745c185aca0812ede640e569d086d5f428b9babdfb15096ba5b2475bd59b87bc27b3f961388fe251a25fe0422f036058ab9c5856
     HEAD_REF master
 )
 
diff --git a/ports/boost-variant/CONTROL b/ports/boost-variant/CONTROL
index b2f106c54..45e40a9b8 100644
--- a/ports/boost-variant/CONTROL
+++ b/ports/boost-variant/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-variant
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost variant module
diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake
index 9a0f5a8da..95352b3f0 100644
--- a/ports/boost-variant/portfile.cmake
+++ b/ports/boost-variant/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/variant
-    REF boost-1.68.0
-    SHA512 532999093f3dbc2f6a96ce7230cf0f1248f079e185f07f99a7162e0a8e75b75fbfda89d21f13fd01d4f5740853e932d46b0e7f9301a9cef0ff15017f1c8cae98
+    REF boost-1.69.0
+    SHA512 281f2a89317603e4875d35388d941c3a174024618f2f9c255344e69d43d43509de2947e35374d8498e337326c7637805160a84f3b2b4da8811660c8429e11be0
     HEAD_REF master
 )
 
diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1
index 07b2e7a25..e49ee32e8 100644
--- a/ports/boost-vcpkg-helpers/generate-ports.ps1
+++ b/ports/boost-vcpkg-helpers/generate-ports.ps1
@@ -1,7 +1,7 @@
 [CmdletBinding()]
 param (
     $libraries = @(),
-    $version = "1.68.0"
+    $version = "1.69.0"
 )
 
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
@@ -95,6 +95,12 @@ function Generate()
         "    REF boost-$version"
         "    SHA512 $Hash"
         "    HEAD_REF master"
+    )
+    if ($Name -eq "thread")
+    {
+        $portfileLines += @("    PATCHES avoid-winapi.patch")
+    }
+    $portfileLines += @(
         ")"
         ""
     )
@@ -144,7 +150,12 @@ function Generate()
         {
             $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_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"
+                ")"
             )
         }
         else
@@ -160,51 +171,9 @@ function Generate()
         "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})"
     )
 
-    if ($Name -eq "exception")
+    if (Test-Path "$scriptsDir/post-build-stubs/$Name.cmake")
     {
-        $portfileLines += @(
-            ""
-            "set(VCPKG_LIBRARY_LINKAGE static)"
-            "file(REMOVE_RECURSE `${CURRENT_PACKAGES_DIR}/bin `${CURRENT_PACKAGES_DIR}/debug/bin)"
-         )
-    }
-    if ($Name -eq "config")
-    {
-        $portfileLines += @(
-            "file(APPEND `${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp `"\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n`")"
-            "file(APPEND `${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp `"\n#undef BOOST_ALL_DYN_LINK\n`")"
-            ""
-            "if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)"
-            "    file(APPEND `${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp `"\n#define BOOST_ALL_DYN_LINK\n`")"
-            "endif()"
-            "file(COPY `${SOURCE_PATH}/checks DESTINATION `${CURRENT_PACKAGES_DIR}/share/boost-config)"
-        )
-    }
-    if ($Name -eq "predef")
-    {
-        $portfileLines += @(
-            ""
-            "file(COPY `${SOURCE_PATH}/tools/check DESTINATION `${CURRENT_PACKAGES_DIR}/share/boost-predef)"
-        )
-    }
-    if ($Name -eq "test")
-    {
-        $portfileLines += @(
-            "if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL `"release`")"
-            "    file(MAKE_DIRECTORY `${CURRENT_PACKAGES_DIR}/lib/manual-link)"
-            "    file(GLOB MONITOR_LIBS `${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*)"
-            "    file(COPY `${MONITOR_LIBS} DESTINATION `${CURRENT_PACKAGES_DIR}/lib/manual-link)"
-            "    file(REMOVE `${MONITOR_LIBS})"
-            "endif()"
-            ""
-            "if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL `"debug`")"
-            "    file(MAKE_DIRECTORY `${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)"
-            "    file(GLOB DEBUG_MONITOR_LIBS `${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*)"
-            "    file(COPY `${DEBUG_MONITOR_LIBS} DESTINATION `${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)"
-            "    file(REMOVE `${DEBUG_MONITOR_LIBS})"
-            "endif()"
-            ""
-        )
+        $portfileLines += @(get-content "$scriptsDir/post-build-stubs/$Name.cmake")
     }
 
     $portfileLines | out-file -enc ascii "$scriptsDir/../boost-$sanitizedName/portfile.cmake"
@@ -244,6 +213,7 @@ $libraries_found = ls $scriptsDir/boost/libs -directory | % name | % {
         "interval"
         "odeint"
         "ublas"
+        "safe_numerics"
     }
     else
     {
@@ -297,7 +267,7 @@ foreach ($library in $libraries)
                 -replace "boost/numeric/conversion/","boost/numeric_conversion/" `
                 -replace "boost/functional/hash.hpp","boost/container_hash/hash.hpp" `
                 -replace "boost/detail/([^/]+)/","boost/`$1/" `
-                -replace "#include ?<boost/([a-zA-Z0-9\._]*)(/|>).*", "`$1" `
+                -replace " *# *include *<boost/([a-zA-Z0-9\._]*)(/|>).*", "`$1" `
                 -replace "/|\.hp?p?| ","" } | group | % name | % {
             # mappings
             Write-Verbose "${library}: $_"
@@ -306,9 +276,9 @@ foreach ($library in $libraries)
             elseif ($_ -eq "type") { "core" }
             elseif ($_ -match "unordered_") { "unordered" }
             elseif ($_ -match "cstdint") { "integer" }
-            elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior") { "utility" }
-            elseif ($_ -eq "version") { "config" }
-            elseif ($_ -match "shared_ptr|make_shared|intrusive_ptr|scoped_ptr|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" }
+            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 "iterator_adaptors|generator_iterator|pointee") { "iterator" }
             elseif ($_ -eq "regex_fwd") { "regex" }
             elseif ($_ -eq "make_default") { "convert" }
@@ -327,6 +297,7 @@ foreach ($library in $libraries)
             elseif ($_ -eq "exception_ptr") { "exception" }
             elseif ($_ -eq "multi_index_container") { "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" }
             else { $_ }
         } | group | % name | ? { $_ -ne $library }
@@ -339,7 +310,7 @@ foreach ($library in $libraries)
 
         $deps = @($deps | ? {
             # Boost contains cycles, so remove a few dependencies to break the loop.
-            (($library -notmatch "core|assert|mpl|detail|throw_exception|type_traits") -or ($_ -notmatch "utility")) `
+            (($library -notmatch "core|assert|mpl|detail|throw_exception|type_traits|^exception") -or ($_ -notmatch "utility")) `
             -and `
             (($library -notmatch "range") -or ($_ -notmatch "algorithm"))`
             -and `
@@ -357,6 +328,10 @@ foreach ($library in $libraries)
             -and `
             (($library -notmatch "spirit") -or ($_ -notmatch "serialization"))`
             -and `
+            (($library -notmatch "throw_exception") -or ($_ -notmatch "^exception"))`
+            -and `
+            (($library -notmatch "iostreams") -or ($_ -notmatch "random"))`
+            -and `
             (($library -notmatch "utility|concept_check") -or ($_ -notmatch "iterator"))
         } | % { "boost-$_" -replace "_","-" } | % {
             TransformReference $_
@@ -407,22 +382,24 @@ foreach ($library in $libraries)
     }
 }
 
-# Generate master boost control file which depends on each individual library
-# mpi is excluded due to it having a dependency on msmpi
-$boostDependsList = @($libraries_in_boost_port | % { "boost-$_" -replace "_","-" } | ? { $_ -notmatch "boost-mpi" }) -join ", "
-
-@(
-    "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1"
-    "Source: boost"
-    "Version: $version"
-    "Description: Peer-reviewed portable C++ source libraries"
-    "Build-Depends: $boostDependsList"
-    ""
-    "Feature: mpi"
-    "Description: Build with MPI support"
-    "Build-Depends: boost-mpi"
-) | out-file -enc ascii $scriptsDir/../boost/CONTROL
-
-"set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" | out-file -enc ascii $scriptsDir/../boost/portfile.cmake
+if ($libraries_in_boost_port.length -gt 1) {
+    # Generate master boost control file which depends on each individual library
+    # mpi is excluded due to it having a dependency on msmpi
+    $boostDependsList = @($libraries_in_boost_port | % { "boost-$_" -replace "_","-" } | ? { $_ -notmatch "boost-mpi" }) -join ", "
+
+    @(
+        "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1"
+        "Source: boost"
+        "Version: $version"
+        "Description: Peer-reviewed portable C++ source libraries"
+        "Build-Depends: $boostDependsList"
+        ""
+        "Feature: mpi"
+        "Description: Build with MPI support"
+        "Build-Depends: boost-mpi"
+    ) | out-file -enc ascii $scriptsDir/../boost/CONTROL
+
+    "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" | out-file -enc ascii $scriptsDir/../boost/portfile.cmake
+}
 
 return
diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/config.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/config.cmake
new file mode 100644
index 000000000..b09ea209b
--- /dev/null
+++ b/ports/boost-vcpkg-helpers/post-build-stubs/config.cmake
@@ -0,0 +1,7 @@
+file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n")
+file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#undef BOOST_ALL_DYN_LINK\n")
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOOST_ALL_DYN_LINK\n")
+endif()
+file(COPY ${SOURCE_PATH}/checks DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-config)
diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/context.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/context.cmake
new file mode 100644
index 000000000..a88f8441d
--- /dev/null
+++ b/ports/boost-vcpkg-helpers/post-build-stubs/context.cmake
@@ -0,0 +1,6 @@
+
+# boost-context removed all.hpp, which is used by FindBoost to determine that context is installed
+if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp)
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp
+        "#error \"#include <boost/context/all.hpp> is no longer supported by boost_context.\"")
+endif()
diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/exception.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/exception.cmake
new file mode 100644
index 000000000..43594a044
--- /dev/null
+++ b/ports/boost-vcpkg-helpers/post-build-stubs/exception.cmake
@@ -0,0 +1,3 @@
+
+set(VCPKG_LIBRARY_LINKAGE static)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/predef.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/predef.cmake
new file mode 100644
index 000000000..b960fcd6e
--- /dev/null
+++ b/ports/boost-vcpkg-helpers/post-build-stubs/predef.cmake
@@ -0,0 +1,2 @@
+
+file(COPY ${SOURCE_PATH}/tools/check DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-predef)
diff --git a/ports/boost-vcpkg-helpers/post-build-stubs/test.cmake b/ports/boost-vcpkg-helpers/post-build-stubs/test.cmake
new file mode 100644
index 000000000..c6d07dbc4
--- /dev/null
+++ b/ports/boost-vcpkg-helpers/post-build-stubs/test.cmake
@@ -0,0 +1,14 @@
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+    file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*)
+    file(COPY ${MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+    file(REMOVE ${MONITOR_LIBS})
+endif()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+    file(GLOB DEBUG_MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*)
+    file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+    file(REMOVE ${DEBUG_MONITOR_LIBS})
+endif()
+
diff --git a/ports/boost-vmd/CONTROL b/ports/boost-vmd/CONTROL
index a126cf997..928a66dc2 100644
--- a/ports/boost-vmd/CONTROL
+++ b/ports/boost-vmd/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-vmd
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-preprocessor, boost-vcpkg-helpers
 Description: Boost vmd module
diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake
index 460e5ff1d..176d487f0 100644
--- a/ports/boost-vmd/portfile.cmake
+++ b/ports/boost-vmd/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/vmd
-    REF boost-1.68.0
-    SHA512 5d12edebb0beabb8b82d2aab15b50b35555e171eb5e289d67872c67d30fadcbd890f7c61db9a1b599572b5eebbb6978accf8673e86c6373181ff66c5c56b3cc8
+    REF boost-1.69.0
+    SHA512 d6b6a88a92849eb6c21aad27ee59e5a6d488524ea813cfa0fd9dc015b5c25e98da6ad97bd62d80d24d973b07b01ccf437f8b1d1f10b4e6aa7402ee8e594953c3
     HEAD_REF master
 )
 
diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL
index 7df45759c..d9cc98840 100644
--- a/ports/boost-wave/CONTROL
+++ b/ports/boost-wave/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-wave
-Version: 1.68.0
+Version: 1.69.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
 Description: Boost wave module
diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake
index b58a6f643..294109a06 100644
--- a/ports/boost-wave/portfile.cmake
+++ b/ports/boost-wave/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/wave
-    REF boost-1.68.0
-    SHA512 988caa39d1958defdca1a89790bb1028d51060b1c8bf33047d175fe990c9565c4f60ba4d32215f9af6a433f286fe0201e1a9d45b365b3eac6148d0902d997080
+    REF boost-1.69.0
+    SHA512 aeb8ba65a0fcc85aae27aa5bba45b2a7421c2e04b64bb03ece77b6c7fa0f2d9282a5e19c64506bcd906357375deb7a1e5711334c74859995b1d0e70014248609
     HEAD_REF master
 )
 
diff --git a/ports/boost-winapi/CONTROL b/ports/boost-winapi/CONTROL
index aae04fe68..927d9e06f 100644
--- a/ports/boost-winapi/CONTROL
+++ b/ports/boost-winapi/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-winapi
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-config, boost-predef, boost-vcpkg-helpers
 Description: Boost winapi module
diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake
index 0080662c9..78144f25d 100644
--- a/ports/boost-winapi/portfile.cmake
+++ b/ports/boost-winapi/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/winapi
-    REF boost-1.68.0
-    SHA512 640b144502bfc3ed06267d90a01d7eb7812898596c61e16048baaf98f49a27bffe5ccfddd6070d835c12d154c4669d1e2b862521f095a23868b192e62e439af1
+    REF boost-1.69.0
+    SHA512 e1ed458c0ce6d5daa6e9fe577a0010e05e5bc290e485b4f2183e5f61b5ebb07983eab9f5477b3195049f232a699074a1a58f719b5d5b8c0f550ab9e3abae6764
     HEAD_REF master
 )
 
diff --git a/ports/boost-xpressive/CONTROL b/ports/boost-xpressive/CONTROL
index f7202426d..1be7e5128 100644
--- a/ports/boost-xpressive/CONTROL
+++ b/ports/boost-xpressive/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-xpressive
-Version: 1.68.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, 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-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.69.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
 Description: Boost xpressive module
diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake
index 5eae33972..dad20d014 100644
--- a/ports/boost-xpressive/portfile.cmake
+++ b/ports/boost-xpressive/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/xpressive
-    REF boost-1.68.0
-    SHA512 3038a336a13232e567e1017b005bb6b95ffbc7ad0bcb55385afb33ba545d0d860edd79e1902263cd4e99703c75ca6d57d06be95ddec430f3b54b1f31fb05b84d
+    REF boost-1.69.0
+    SHA512 ac6ab9955ab4cb6e8a1905304595a9b33c71b4041673b6e942adc023bd67c7b64bf786976f40cb2daea6ce164f72fff50fc6fa583dd12d5978a4e3ba6524b523
     HEAD_REF master
 )
 
diff --git a/ports/boost-yap/CONTROL b/ports/boost-yap/CONTROL
index 70b4727e6..97a727fd5 100644
--- a/ports/boost-yap/CONTROL
+++ b/ports/boost-yap/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-yap
-Version: 1.68.0
+Version: 1.69.0
 Build-Depends: boost-hana, boost-preprocessor, boost-type-index, boost-vcpkg-helpers
 Description: Boost yap module
diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake
index 3d99e46fa..edbed9475 100644
--- a/ports/boost-yap/portfile.cmake
+++ b/ports/boost-yap/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/yap
-    REF boost-1.68.0
-    SHA512 a8d920b8a0f60b26db2a0eff7718184dcd6f0405f9ebb5ca7a7c0bcb7b824e52a17a63f786c09a4de566a24c3a5178e9916e5d1b05dd13fd82083c2d4749d523
+    REF boost-1.69.0
+    SHA512 12a6d5ed8491a9ebd258fa83ef752af88db38a9517a4da43fd20dd63a244271c7b889f92a32fc67f098230c7cbf530578c8ef163d6427144173183dc2fdc1156
     HEAD_REF master
 )
 
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 13c43fb8b..fc51d7cec 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,8 +1,8 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost
-Version: 1.68.0
+Version: 1.69.0
 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-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-optional, boost-parameter, 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 (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-scope-exit, boost-serialization, boost-signals, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-system, boost-test (!uwp), boost-thread (!arm), 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-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-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-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-parameter, boost-parameter-python (windows), 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 (windows), 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 (!arm), 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-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap
 
 Feature: mpi
 Description: Build with MPI support
diff --git a/ports/bzip2/CMakeLists.txt b/ports/bzip2/CMakeLists.txt
index 2f70c5404..e2da221d7 100644
--- a/ports/bzip2/CMakeLists.txt
+++ b/ports/bzip2/CMakeLists.txt
@@ -5,7 +5,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
     add_definitions(-DBZ_DEBUG) # enable extra assertions
 endif()
 
-set(LIBBZ2_SOURCES
+set(BZ2_SOURCES
     blocksort.c
     huffman.c
     crctable.c
@@ -14,12 +14,13 @@ set(LIBBZ2_SOURCES
     decompress.c
     bzlib.c)
 
-add_library(libbz2 ${LIBBZ2_SOURCES})
-set_target_properties(libbz2 PROPERTIES
-    ARCHIVE_OUTPUT_NAME bz2 # required for FindBzip2 to work
-    DEBUG_POSTFIX d)
+add_library(bz2 ${BZ2_SOURCES})
+set_target_properties(bz2 PROPERTIES
+    DEBUG_POSTFIX d
+    VERSION 1.0.6
+    SOVERSION 1.0)
 if(BUILD_SHARED_LIBS)
-    target_compile_definitions(libbz2 PRIVATE -DBZ_BUILD_DLL)
+    target_compile_definitions(bz2 PRIVATE -DBZ_BUILD_DLL)
 endif()
 
 if(MSVC)
@@ -28,14 +29,14 @@ if(MSVC)
     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
 endif()
 
-install(TARGETS libbz2
+install(TARGETS bz2
     RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib)
 
 if(NOT BZIP2_SKIP_TOOLS)
-    add_executable(bzip2 bzip2.c ${LIBBZ2_SOURCES})
-    add_executable(bzip2recover bzip2recover.c ${LIBBZ2_SOURCES})
+    add_executable(bzip2 bzip2.c ${BZ2_SOURCES})
+    add_executable(bzip2recover bzip2recover.c ${BZ2_SOURCES})
     install(TARGETS bzip2 bzip2recover DESTINATION tools/bzip2)
 endif()
 
diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL
index fad303399..00995aed9 100644
--- a/ports/bzip2/CONTROL
+++ b/ports/bzip2/CONTROL
@@ -1,3 +1,3 @@
 Source: bzip2
-Version: 1.0.6-3
+Version: 1.0.6-4
 Description: High-quality data compressor.
diff --git a/ports/caffe2/CONTROL b/ports/caffe2/CONTROL
index d09de8e6d..2f40d9825 100644
--- a/ports/caffe2/CONTROL
+++ b/ports/caffe2/CONTROL
@@ -1,4 +1,4 @@
 Source: caffe2
-Version: 0.8.1
+Version: 0.8.1-1
 Build-Depends: lmdb, gflags, glog, eigen3, protobuf
 Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.
diff --git a/ports/caffe2/portfile.cmake b/ports/caffe2/portfile.cmake
index fa87542ed..41abd403e 100644
--- a/ports/caffe2/portfile.cmake
+++ b/ports/caffe2/portfile.cmake
@@ -15,12 +15,8 @@ vcpkg_from_github(
     REF eab13a2d5c807bf5d49efd4584787b639a981b79
     SHA512 505a8540b0c28329c4e2ce443ac8e198c1ee613eb6b932927ee9d04c8afdc95081f3c4581408b7097d567840427b31f6d7626ea80f27e56532f2f2e6acd87023
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-    ${CMAKE_CURRENT_LIST_DIR}/msvc-fixes.patch
+        ${CMAKE_CURRENT_LIST_DIR}/msvc-fixes.patch
 )
 
 if(VCPKG_CRT_LINKAGE STREQUAL static)
@@ -29,6 +25,12 @@ else()
     set(USE_STATIC_RUNTIME OFF)
 endif()
 
+if(CMAKE_HOST_WIN32)
+    set(EXECUTABLE_SUFFIX ".exe")
+else()
+    set(EXECUTABLE_SUFFIX "")
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -62,7 +64,7 @@ vcpkg_configure_cmake(
     -DUSE_SNPE=OFF
     -DUSE_ZMQ=OFF
     -DBUILD_TEST=OFF
-    -DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc.exe
+    -DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}
 )
 
 vcpkg_install_cmake()
@@ -86,7 +88,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/binaries)
 
 # Move bin to tools
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
-file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX})
 foreach(binary ${BINARIES})
     get_filename_component(binary_name ${binary} NAME)
     file(RENAME ${binary} ${CURRENT_PACKAGES_DIR}/tools/${binary_name})
@@ -95,22 +97,12 @@ endforeach()
 # Remove bin directory
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
 # Remove headers and tools from debug build
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
-foreach(binary ${BINARIES})
-    get_filename_component(binary_name ${binary} NAME)
-    file(REMOVE ${binary})
-endforeach()
-
-# Remove bin directory
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
 # install license
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/caffe2)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/caffe2 RENAME copyright)
diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt
index 9fc476539..a23d776ed 100644
--- a/ports/cairo/CMakeLists.txt
+++ b/ports/cairo/CMakeLists.txt
@@ -167,6 +167,9 @@ find_package(Freetype REQUIRED)
 find_package(unofficial-glib CONFIG REQUIRED)
 find_package(unofficial-fontconfig CONFIG REQUIRED)
 find_package(unofficial-pixman CONFIG REQUIRED)
+if(APPLE)
+  find_package(Threads REQUIRED)
+endif()
 
 # Cairo needs to be told which features of FreeType are availible
 add_definitions(
diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL
index 365fe38e7..d33147b18 100644
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@@ -1,4 +1,4 @@
 Source: cairo
-Version: 1.15.8-4
+Version: 1.15.8-5
 Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
 Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
index 15a9da60a..8a6b57c53 100644
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
 Source: catch2
-Version: 2.5.0
+Version: 2.6.0
 Description: A modern, header-only test framework for unit testing.
   Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index f6ed65251..63bcc3832 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
-    REF v2.5.0
-    SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
+    REF v2.6.0
+    SHA512 8d693cce413421ca747a0a3864d72c20f30fb8e432eb1f13e69605a71cc4e536d6710561f989cce6783d28f8b667b8da42c624056c4d412852885a8cf0df1e5d
     HEAD_REF master
 )
 
diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL
index 5bd3ed7d7..6efe6545e 100644
--- a/ports/cimg/CONTROL
+++ b/ports/cimg/CONTROL
@@ -1,3 +1,3 @@
 Source: cimg
-Version: 2.4.4
+Version: 2.4.5
 Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing
diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake
index 752f36b9f..e19efd450 100644
--- a/ports/cimg/portfile.cmake
+++ b/ports/cimg/portfile.cmake
@@ -2,9 +2,9 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "dtschump/CImg"
-    REF v.2.4.4
+    REF v.2.4.5
     HEAD_REF master
-    SHA512 16106e6b225fa53f4d825a1c91a05fca27b7b9219126b4328aa74fc2bdead9f145445524f456d230cef18ea2e2fe39f9f725cdf78ed4556270af728be3aa80e8)
+    SHA512 0a306ba4265a0e68d358e1ca54c597e80b43e72205de161d0971cd5837ca7d48322725d6ec129381e708a1d11fb5697884a5901ac753080fd8d8c08b80b28138)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL
index 1e75d2a70..d15d64155 100644
--- a/ports/cli11/CONTROL
+++ b/ports/cli11/CONTROL
@@ -1,3 +1,3 @@
 Source: cli11
-Version: 1.6.2
+Version: 1.7.1
 Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. <https://github.com/CLIUtils/CLI11>
diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake
index 08fb83dc9..e00158d70 100644
--- a/ports/cli11/portfile.cmake
+++ b/ports/cli11/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CLIUtils/CLI11
-    REF v1.6.2
-    SHA512 0160323a7a87ecdf5cff081a4270a30977b87f0592041d8fde84ec655b28cdbc40813567f95df375a4f6f953b60a638deacfb3cc5dec562c4d348dcc532f0ab7
+    REF v1.7.1
+    SHA512 774ba3828c89ca8f0857a14d9823c11f116667f2fc305e6b2c73ccf3b194b50947821ec14073c618fc644bf6b597f6802cc2337d8a7425de4f42ba5b46e8370f
     HEAD_REF master
 )
 
diff --git a/ports/collada-dom/CONTROL b/ports/collada-dom/CONTROL
new file mode 100644
index 000000000..6625c5a4a
--- /dev/null
+++ b/ports/collada-dom/CONTROL
@@ -0,0 +1,4 @@
+Source: collada-dom
+Version: 2.5.0
+Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.
+Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system
+\ No newline at end of file
diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake
new file mode 100644
index 000000000..2612eca68
--- /dev/null
+++ b/ports/collada-dom/portfile.cmake
@@ -0,0 +1,27 @@
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/collada-dom-2.5.0)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO rdiankov/collada-dom
+    REF d37ae7532e350b87c88712e9f6ab4b1f440d20cd
+    SHA512 cb923d296219765096f5246cc7a2b69712931f58171ae885dbdbd215fca86d911c34d12748d3304d6a5a350dc737ff0caead2495acac488af5431b437cbacc7d
+    HEAD_REF v2.5.0
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/vs-version-detection.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/use-uriparser.patch"
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/collada_dom-2.5")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION
+             ${CURRENT_PACKAGES_DIR}/share/collada-dom
+             RENAME copyright)
+\ No newline at end of file
diff --git a/ports/collada-dom/use-uriparser.patch b/ports/collada-dom/use-uriparser.patch
new file mode 100644
index 000000000..6de0662ef
--- /dev/null
+++ b/ports/collada-dom/use-uriparser.patch
@@ -0,0 +1,127 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ec1527..3f044d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -237,23 +237,29 @@ else()
+   set(MINIZIP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dom/external-libs/minizip-1.1 ${ZLIB_INCLUDE_DIR})
+ endif()
+ 
+-pkg_check_modules(liburiparser liburiparser)
+-
+-if(liburiparser_FOUND)
+-  set(liburiparser_CFLAGS_OTHERS "-DUSE_URIPARSER")
++find_package(UriParser)
++if(URIPARSER_FOUND)
++  set(URIPARSER_CFLAGS_OTHERS "-DUSE_URIPARSER")
++  set(URIPARSER_LIBRARIES ${URIPARSER_LIBRARY})
++  message(STATUS "liburiparser found")
+ else()
+-  # try using pcrecpp
+-  pkg_check_modules(libpcrecpp libpcrecpp)
+-  if( libpcrecpp_FOUND )
++  pkg_check_modules(liburiparser liburiparser)
++  if(liburiparser_FOUND)
++    set(URIPARSER_CFLAGS_OTHERS "-DUSE_URIPARSER")
++    message(STATUS "liburiparser found")
++  else()
++    # try using pcrecpp
++    pkg_check_modules(libpcrecpp libpcrecpp)
++    if( libpcrecpp_FOUND )
+     set(CMAKE_REQUIRED_INCLUDES ${libpcrecpp_INCLUDE_DIRS})
+     check_include_file_cxx(pcrecpp.h HAVE_PCRECPP_H)
+     set(CMAKE_REQUIRED_INCLUDES)
+     if( NOT HAVE_PCRECPP_H )
+-      set(libpcrecpp_FOUND 0)
++        set(libpcrecpp_FOUND 0)
++    endif()
+     endif()
+-  endif()
+ 
+-  if( NOT libpcrecpp_FOUND )
++    if( NOT libpcrecpp_FOUND )
+     message(STATUS "System pcre not found, using local from sources")
+     # include the local pcre
+     add_subdirectory(dom/external-libs/pcre-8.02)
+@@ -262,6 +268,7 @@ else()
+     set(libpcrecpp_LIBRARIES pcrecpp_local)
+     set(libpcrecpp_CFLAGS_OTHERS "-DPCRE_STATIC")
+     set(libpcrecpp_LDFLAGS_OTHERS)
++    endif()
+   endif()
+ endif()
+ 
+diff --git a/cmake-modules/FindUriParser.cmake b/cmake-modules/FindUriParser.cmake
+new file mode 100644
+index 0000000..91f466b
+--- /dev/null
++++ b/cmake-modules/FindUriParser.cmake
+@@ -0,0 +1,35 @@
++# Find the UriParser library
++# Defines:
++
++#  URIPARSER_INCLUDE_DIR - uriparser include directory
++#  URIPARSER_LIBRARY     - uriparser library file
++#  URIPARSER_FOUND       - TRUE if uriparser is found
++
++if (URIPARSER_INCLUDE_DIR)
++ #check cache 
++  set(URIPARSER_FIND_QUIETLY TRUE)
++endif ()
++
++if (NOT URIPARSER_INCLUDE_DIR)
++    find_path(URIPARSER_INCLUDE_DIR NAMES Uri.h PATH_SUFFIXES uriparser)
++    set(URIPARSER_INCLUDE_DIR ${URIPARSER_INCLUDE_DIR}/uriparser CACHE PATH "uriparser includes")
++endif ()
++
++find_library(URIPARSER_LIBRARY NAMES uriparser)
++
++if (URIPARSER_INCLUDE_DIR AND URIPARSER_LIBRARY)
++  set(URIPARSER_FOUND TRUE)
++  set(UriParser_FOUND TRUE)
++endif ()
++
++if (URIPARSER_FOUND)
++   if (NOT URIPARSER_FIND_QUIETLY)
++      message(STATUS "Found UriParser library: ${URIPARSER_LIBRARY}")
++   endif ()
++else ()
++   if (NOT URIPARSER_FIND_QUIETLY)
++      message(FATAL_ERROR "Could NOT find UriParser library")
++    else ()
++      message(STATUS "Could NOT find UriParser library")
++    endif ()
++endif ()
+diff --git a/dom/CMakeLists.txt b/dom/CMakeLists.txt
+index f7ffb27..62e1b8a 100644
+--- a/dom/CMakeLists.txt
++++ b/dom/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ set(COLLADA_INTERNAL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+ include_directories(${COLLADA_INTERNAL_INCLUDE})
+-set(COLLADA_LIBS minizip ${liburiparser_LIBRARIES} ${libpcrecpp_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
++set(COLLADA_LIBS minizip ${URIPARSER_LIBRARIES} ${libpcrecpp_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+ 
+ file(GLOB dae_files ${CMAKE_CURRENT_SOURCE_DIR}/src/dae/*.cpp)
+ if( LIBXML2_FOUND )
+@@ -13,7 +13,7 @@ file(GLOB stddatabase_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/STLDatabase/
+ file(GLOB stderrplugin_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/stdErrPlugin/*.cpp)
+ 
+ set(COLLADA_BASE_SOURCES ${dae_files} ${libxmlplugin_files} ${stddatabase_files} ${stderrplugin_files})
+-set(COLLADA_COMPILE_FLAGS "${liburiparser_CFLAGS_OTHERS} ${libpcrecpp_CFLAGS_OTHERS} ${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS}")
++set(COLLADA_COMPILE_FLAGS "${URIPARSER_CFLAGS_OTHERS} ${libpcrecpp_CFLAGS_OTHERS} ${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS}")
+ # create dynamic libraries
+ set(COLLADA_COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS} -DDOM_DYNAMIC -DDOM_EXPORT")
+ 
+diff --git a/dom/src/dae/daeURI.cpp b/dom/src/dae/daeURI.cpp
+index 3a8f815..1623753 100644
+--- a/dom/src/dae/daeURI.cpp
++++ b/dom/src/dae/daeURI.cpp
+@@ -790,7 +790,7 @@ bool cdom::parseUriRef(const string& uriRef,
+         scheme = fromRange(uri.scheme);
+         authority = fromRange(uri.hostText);
+         path = fromList(uri.pathHead, "/");
+-        if (uri.absolutePath != URI_TRUE and uri.hostText.first == NULL)
++        if (uri.absolutePath != URI_TRUE && uri.hostText.first == NULL)
+             path = path.erase(0, 1);
+         query = fromRange(uri.query);
+         fragment = fromRange(uri.fragment);
diff --git a/ports/collada-dom/vs-version-detection.patch b/ports/collada-dom/vs-version-detection.patch
new file mode 100644
index 000000000..7379f33be
--- /dev/null
+++ b/ports/collada-dom/vs-version-detection.patch
@@ -0,0 +1,39 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2596a23..3ec1527 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 2.6.0)
++cmake_minimum_required (VERSION 3.7.0)
+ project (collada-dom)
+ set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
+ 
+@@ -89,14 +89,22 @@ string(TOUPPER ${COMPONENT_PREFIX} COMPONENT_PREFIX_UPPER)
+ set(CPACK_COMPONENTS_ALL ${COMPONENT_PREFIX}-base ${COMPONENT_PREFIX}-dev)
+ 
+ if( MSVC )
+-  if( MSVC70 OR MSVC71 )
+-    set(MSVC_PREFIX "vc70")
+-  elseif( MSVC80 )
+-    set(MSVC_PREFIX "vc80")
+-  elseif( MSVC90 )
++  if( MSVC_VERSION GREATER_EQUAL 1910 )
++    set(MSVC_PREFIX "vc140")
++  elseif( MSVC_VERSION GREATER_EQUAL 1900 )
++    set(MSVC_PREFIX "vc130")
++  elseif( MSVC_VERSION GREATER_EQUAL 1800 )
++    set(MSVC_PREFIX "vc120")
++  elseif( MSVC_VERSION GREATER_EQUAL 1700 )
++    set(MSVC_PREFIX "vc110")
++  elseif( MSVC_VERSION GREATER_EQUAL 1600 )
++    set(MSVC_PREFIX "vc100")
++  elseif( MSVC_VERSION GREATER_EQUAL 1500 )
+     set(MSVC_PREFIX "vc90")
++  elseif( MSVC_VERSION GREATER_EQUAL 1400 )
++    set(MSVC_PREFIX "vc80")
+   else()
+-    set(MSVC_PREFIX "vc100")
++    set(MSVC_PREFIX "vc70")
+   endif()
+   set(COLLADA_DOM_LIBRARY_SUFFIX "${COLLADA_DOM_SOVERSION}-${COLLADA_PRECISION}-${MSVC_PREFIX}-mt")
+ else()
diff --git a/ports/coroutine/CONTROL b/ports/coroutine/CONTROL
new file mode 100644
index 000000000..4b193d5bd
--- /dev/null
+++ b/ports/coroutine/CONTROL
@@ -0,0 +1,4 @@
+Source: coroutine
+Version: 1.4.0
+Build-Depends: ms-gsl
+Description: C++ coroutine helper/example library
diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake
new file mode 100644
index 000000000..17e7596af
--- /dev/null
+++ b/ports/coroutine/portfile.cmake
@@ -0,0 +1,58 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO            luncliff/coroutine
+    REF             1.4
+    SHA512          981c9c728c7888995880a97e8533fa31f41085ef57e1c61e53e555f329d20d4a882d9de724d9e93e3d009dc3fe0669fe4d1af403654a9373e4aab44c933628a3
+    HEAD_REF        master
+)
+
+if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86)
+    message(FATAL_ERROR "This library doesn't support x86 arch. Please use x64 instead or contact maintainer")
+endif()
+
+# package: 'ms-gsl'
+message(STATUS "Using Guideline Support Library at ${CURRENT_INSTALLED_DIR}/include")
+
+set(DLL_LINKAGE false)
+if(${VCPKG_LIBRARY_LINKAGE} MATCHES dynamic)
+    message(STATUS "Using DLL linkage")
+    set(DLL_LINKAGE true)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        # package: 'ms-gsl'
+        -DGSL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
+        -DTEST_DISABLED=True
+        -DBUILD_SHARED_LIBS=${DLL_LINKAGE}
+)
+
+vcpkg_install_cmake()
+
+file(
+    INSTALL     ${SOURCE_PATH}/LICENSE
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/coroutine
+    RENAME      copyright
+)
+
+if(WIN32 AND DLL_LINKAGE)
+    file(INSTALL        ${CURRENT_PACKAGES_DIR}/debug/lib/coroutine.dll
+         DESTINATION    ${CURRENT_PACKAGES_DIR}/debug/bin
+    )
+    file(REMOVE         ${CURRENT_PACKAGES_DIR}/debug/lib/coroutine.dll)
+
+    file(INSTALL        ${CURRENT_PACKAGES_DIR}/lib/coroutine.dll
+         DESTINATION    ${CURRENT_PACKAGES_DIR}/bin
+    )
+    file(REMOVE         ${CURRENT_PACKAGES_DIR}/lib/coroutine.dll)
+endif()
+# removed duplicates in debug
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# unset used variables
+unset(DLL_LINKAGE)
diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL
index 116a9f7e7..db1dd82f9 100644
--- a/ports/corrade/CONTROL
+++ b/ports/corrade/CONTROL
@@ -1,5 +1,5 @@
 Source: corrade
-Version: 2018.10-1
+Version: 2019.01-1
 Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/
 Default-Features: interconnect, pluginmanager, testsuite, utility
 
diff --git a/ports/corrade/fixC2666.patch b/ports/corrade/fixC2666.patch
new file mode 100644
index 000000000..e6e2ffccc
--- /dev/null
+++ b/ports/corrade/fixC2666.patch
@@ -0,0 +1,16 @@
+diff --git a/modules/UseCorrade.cmake b/modules/UseCorrade.cmake
+index 744d5a1..129e75f 100644
+--- a/modules/UseCorrade.cmake
++++ b/modules/UseCorrade.cmake
+@@ -164,7 +164,10 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "
+         # "dllexport and extern are incompatible on an explicit instantiation".
+         # Why the error is emitted only on classes? Functions are okay with
+         # dllexport extern?!
+-        "/wd4910")
++        "/wd4910"
++
++        #Add the /permissive- option
++        "/permissive-")
+     set(CORRADE_PEDANTIC_COMPILER_DEFINITIONS
+         # Disabling warning for not using "secure-but-not-standard" STL algos
+         "_CRT_SECURE_NO_WARNINGS" "_SCL_SECURE_NO_WARNINGS"
diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake
index 0a6f1babb..c9e0321dd 100644
--- a/ports/corrade/portfile.cmake
+++ b/ports/corrade/portfile.cmake
@@ -2,9 +2,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/corrade
-    REF v2018.10
-    SHA512 594c15d9622fa0abdf893c15054f27bdcc40b5de1543d722b7173138ec5d299c45b7a85376ed617cdf9b4f52a05bf7a3d1ea1983e112b62690211116c255d201
+    REF v2019.01
+    SHA512 63468ee0a9362d92d61e2bc77fb8c3e455761894998393910f6bce4111b0ec74db8fe2a8658cec1292c5ceb26e57e005324b34f1ec343d4216abf3a955eaa97e
     HEAD_REF master
+    PATCHES fixC2666.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
@@ -29,6 +30,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
+        -DDUTILITY_USE_ANSI_COLORS=ON
         -DBUILD_STATIC=${BUILD_STATIC}
         ${_COMPONENT_FLAGS}
 )
diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL
index fcdc0fcaa..9626f1a62 100644
--- a/ports/cppgraphqlgen/CONTROL
+++ b/ports/cppgraphqlgen/CONTROL
@@ -1,4 +1,4 @@
 Source: cppgraphqlgen
-Version: 1.0.3
+Version: 2.0.2
 Build-Depends: pegtl, rapidjson
 Description: C++ GraphQL schema service generator
diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake
index c6cad7d99..8371cde46 100644
--- a/ports/cppgraphqlgen/portfile.cmake
+++ b/ports/cppgraphqlgen/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cppgraphqlgen
-    REF v1.0.3
-    SHA512 136f17460d6a7ed3bd20e2be5f9326d2a4a039bc1a7a212155a31a5e165e0f1fd061638c3f77f22d6c3d4230e9a57563585ad29ef59eea355e1521b374ce1ce4
+    REF v2.0.2
+    SHA512 259c8bc844b70e99332cd52caf48de3e5f0dfdf5bba6d986209a0e5a9f4491953901b365f43e8612f171bdcaef80b524d6b261b62fb8a429e529a5701a839ca1
     HEAD_REF master
 )
 
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index e5da66ef7..aaa41316e 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.10.7
+Version: 2.10.10
 Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows)
 Description: C++11 JSON, REST, and OAuth library
   The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index bf8478be0..9f34226ef 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cpprestsdk
-    REF v2.10.9
-    SHA512 bae55232bdee6dd4cb9e3da81b41c4d9b2c4b7bd514d7a15bbeadf90e13e96a6c3055d40e277f00b8e85f39b7eddd1bf7d4839f0a98a6040a55576e2d6ac2b57
+    REF v2.10.10
+    SHA512 6169d0907aead80a4e0a3f6a25fb71ab13a46a10a9700974c629b91948a83ee3c841a4ac7dfac8155ea3731c0eedee594c07ec37050d57770faf4eee608660e5
     HEAD_REF master
 )
 
diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL
index 89db4de57..7723d0fbf 100644
--- a/ports/cryptopp/CONTROL
+++ b/ports/cryptopp/CONTROL
@@ -1,3 +1,3 @@
 Source: cryptopp
-Version: 7.0.0
+Version: 8.0.0
 Description: Crypto++ is a free C++ class library of cryptographic schemes.
diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake
index 82893be41..37e89a39d 100644
--- a/ports/cryptopp/portfile.cmake
+++ b/ports/cryptopp/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH CMAKE_SOURCE_PATH
   REPO noloader/cryptopp-cmake
-  REF 2729870f277bd568a8e8183b5ba7799e0c2dbf96
-  SHA512 fff9468774f66a895ab44ce76d37b320aeaa9398514b66d5116ffe84705ef7a202586622d598ea03f7c1636587893d46c6eee5e0da965c58fb74131c4b76223c
+  REF b97d72f083fefa249e46ae3c15a2c294e615fca2
+  SHA512 e6c65bb81a47009fa568c957beea65c37f2283bdc5afad6a45983f685c0b9c9c01ac4bb334d45dacbdc74f9d834b316c09cbb16d3ead7fb48737fbad76ff3f8d
   HEAD_REF master
   PATCHES
     cmake.patch
@@ -16,8 +16,8 @@ vcpkg_from_github(
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO weidai11/cryptopp
-  REF CRYPTOPP_7_0_0
-  SHA512 bc83f6adf0ae627c57ff9172d8cee69e7000d9b414ec903a50f11f9a68da08d1dd4985ddaffada86bf58e8168a2df065185efd932201d2df9db3f73025825e54
+  REF CRYPTOPP_8_0_0
+  SHA512 e3240882748f5306442a3feca5b0718c6ee20a44596f522c6c3ae35e0c81d56412b5b223b2bcf2eb74a8ce4c08a73b4c25f4d005417bdc68f9309708cc5c5ddb
   HEAD_REF master
   PATCHES patch.patch
 )
diff --git a/ports/curlpp/CONTROL b/ports/curlpp/CONTROL
new file mode 100644
index 000000000..1c6c07f32
--- /dev/null
+++ b/ports/curlpp/CONTROL
@@ -0,0 +1,4 @@
+Source: curlpp
+Version: 2018-06-15
+Description: C++ wrapper around libcURL
+Build-Depends: curl
diff --git a/ports/curlpp/fix-cmake.patch b/ports/curlpp/fix-cmake.patch
new file mode 100644
index 000000000..3930b65c2
--- /dev/null
+++ b/ports/curlpp/fix-cmake.patch
@@ -0,0 +1,52 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b183a0..a801ae8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -85,11 +85,12 @@ endif()
+ 
+ file(GLOB_RECURSE HeaderFileList "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
+ file(GLOB_RECURSE SourceFileList "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
++if(BUILD_SHARED_LIBS)
+ add_library(${PROJECT_NAME} SHARED ${HeaderFileList} ${SourceFileList})
+ target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS})
+ set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1 VERSION 1.0.0)
+-
+-add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList})
++else()
++add_library(${PROJECT_NAME} STATIC ${HeaderFileList} ${SourceFileList})
+ 
+ # Make sure that on unix-platforms shared and static libraries have
+ # the same root name, but different suffixes.
+@@ -97,19 +98,28 @@ add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList})
+ #  (solution taken from https://cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F)
+ # 
+ # Making shared and static libraries have the same root name, but different suffixes
+-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
++SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
+ # Now the library target "curlpp_static" will be named "curlpp.lib" with MS tools.
+ # This conflicts with the "curlpp.lib" import library corresponding to "curlpp.dll",
+ # so we add a "lib" prefix (which is default on other platforms anyway):
+-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES PREFIX "lib")
+-target_link_libraries(${PROJECT_NAME}_static ${CURL_LIBRARIES} ${CONAN_LIBS})
++SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "lib")
++target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS})
++endif()
++
++target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
+ 
+ # install headers
+ install(DIRECTORY include/utilspp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/utilspp")
+ install(DIRECTORY include/curlpp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/curlpp")
+ 
+-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static
++install(TARGETS ${PROJECT_NAME}
++        EXPORT ${PROJECT_NAME}-config
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
++install(EXPORT ${PROJECT_NAME}-config
++    FILE unofficial-${PROJECT_NAME}-config.cmake
++    NAMESPACE unofficial::${PROJECT_NAME}::
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++)
diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake
new file mode 100644
index 000000000..aaa9c51ab
--- /dev/null
+++ b/ports/curlpp/portfile.cmake
@@ -0,0 +1,47 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jpbarrette/curlpp
+    REF 8810334c830faa3b38bcd94f5b1ab695a4f05eb9
+    SHA512 47eb0738d7cd2d4262c455f9472a21535343bcf08bda6de19771dab9204e068272b41782c87057d50e3781683a29e79d6387577be68d175a7fa890367f15d0d2
+    HEAD_REF master
+    PATCHES
+        fix-cmake.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/${PORT}
+    TARGET_PATH share/unofficial-${PORT}
+)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE
+        ${CURRENT_PACKAGES_DIR}/bin
+        ${CURRENT_PACKAGES_DIR}/debug/bin
+    )
+
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
+        ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}
+        @ONLY
+    )
+endif()
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/doc/LICENSE
+    ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
+
+# CMake integration test
+#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/curlpp/vcpkg-cmake-wrapper.cmake b/ports/curlpp/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..0bffdc6b4
--- /dev/null
+++ b/ports/curlpp/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,35 @@
+_find_package(${ARGS})
+
+if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    if(TARGET unofficial::curlpp::curlpp)
+        # Fix CURL dependencies. See:
+        # https://github.com/Microsoft/vcpkg/issues/4312
+
+        set(_libs "")
+
+        find_package(CURL REQUIRED)
+
+        set(ZLIB_ROOT ${CMAKE_PREFIX_PATH}) # Prefer Zlib installed via `vcpkg`
+        find_package(ZLIB)
+        unset(ZLIB_ROOT)
+
+        list(APPEND _libs ${CURL_LIBRARIES} ZLIB::ZLIB)
+
+        find_package(OpenSSL QUIET)
+        if(OPENSSL_FOUND)
+            list(APPEND _libs OpenSSL::SSL OpenSSL::Crypto)
+        endif()
+
+        find_package(Threads REQUIRED)
+        list(APPEND _libs Threads::Threads)
+
+        if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+            list(APPEND _libs Ws2_32 Crypt32)
+        endif()
+
+        set_target_properties(
+            unofficial::curlpp::curlpp
+            PROPERTIES INTERFACE_LINK_LIBRARIES "${_libs}"
+        )
+    endif()
+endif()
diff --git a/ports/detours/CONTROL b/ports/detours/CONTROL
new file mode 100644
index 000000000..4998741bd
--- /dev/null
+++ b/ports/detours/CONTROL
@@ -0,0 +1,3 @@
+Source: detours
+Version: 4.0.1
+Description: Detours is a software package for monitoring and instrumenting API calls on Windows.
+\ No newline at end of file
diff --git a/ports/detours/find-jmp-bounds-arm64.patch b/ports/detours/find-jmp-bounds-arm64.patch
new file mode 100644
index 000000000..21390cec0
--- /dev/null
+++ b/ports/detours/find-jmp-bounds-arm64.patch
@@ -0,0 +1,24 @@
+diff --git a/src/detours.cpp b/src/detours.cpp
+index 8345c4d..3cd0e9d 100644
+--- a/src/detours.cpp
++++ b/src/detours.cpp
+@@ -974,6 +974,19 @@ inline PBYTE detour_skip_jmp(PBYTE pbCode, PVOID *ppGlobals)
+     return pbCode;
+ }
+ 
++inline void detour_find_jmp_bounds(PBYTE pbCode,
++                                   PDETOUR_TRAMPOLINE *ppLower,
++                                   PDETOUR_TRAMPOLINE *ppUpper)
++{
++    // We have to place trampolines within +/- 2GB of code.
++    ULONG_PTR lo = detour_2gb_below((ULONG_PTR)pbCode);
++    ULONG_PTR hi = detour_2gb_above((ULONG_PTR)pbCode);
++    DETOUR_TRACE(("[%p..%p..%p]\n", lo, pbCode, hi));
++
++    *ppLower = (PDETOUR_TRAMPOLINE)lo;
++    *ppUpper = (PDETOUR_TRAMPOLINE)hi;
++}
++
+ inline BOOL detour_does_code_end_function(PBYTE pbCode)
+ {
+     ULONG Opcode = fetch_opcode(pbCode);
diff --git a/ports/detours/portfile.cmake b/ports/detours/portfile.cmake
new file mode 100644
index 000000000..038f8637c
--- /dev/null
+++ b/ports/detours/portfile.cmake
@@ -0,0 +1,28 @@
+include(vcpkg_common_functions)
+find_program(NMAKE nmake)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/Detours
+    REF v4.0.1
+    SHA512 0a9c21b8222329add2de190d2e94d99195dfa55de5a914b75d380ffe0fb787b12e016d0723ca821001af0168fd1643ffd2455298bf3de5fdc155b3393a3ccc87
+    HEAD_REF master
+    PATCHES 
+        find-jmp-bounds-arm64.patch
+)
+
+set(ENV{DETOURS_TARGET_PROCESSOR} "${VCPKG_TARGET_ARCHITECTURE}")
+
+vcpkg_execute_required_process(
+    COMMAND ${NMAKE}
+    WORKING_DIRECTORY ${SOURCE_PATH}/src
+    LOGNAME build-${TARGET_TRIPLET}
+)
+
+# Detours does not differentiate between Release and Debug builds, use the same binaries for both.
+file(INSTALL ${SOURCE_PATH}/lib.${VCPKG_TARGET_ARCHITECTURE}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${SOURCE_PATH}/lib.${VCPKG_TARGET_ARCHITECTURE}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+\ No newline at end of file
diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL
index 65ac705dd..c4afd763a 100644
--- a/ports/doctest/CONTROL
+++ b/ports/doctest/CONTROL
@@ -1,3 +1,3 @@
 Source: doctest
-Version: 2.2.0
+Version: 2.2.3
 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD
diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake
index fffe1bb30..53defc430 100644
--- a/ports/doctest/portfile.cmake
+++ b/ports/doctest/portfile.cmake
@@ -1,15 +1,23 @@
-#header-only library
 include(vcpkg_common_functions)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onqtam/doctest
-    REF 2.2.0
-    SHA512 edf35be338194c7abfb991e6bcc766fe9badc1cc0f21dd7147a6a42ecf451ef6a4eaa1e63b46337fb14a8ed9b107fd381e1b3b502039d7d23476b3f52b12d89c
+    REF 2.2.3
+    SHA512 764463178ea109d46714751a0e5a74d9896c3cf3f8b8c3424a9252c58d9f2c1a2c7fa7eec68e516fb96f4634ae0078ea00d49d28d45a6331c3ebcbe1ed6b1175
     HEAD_REF master
 )
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/doctest RENAME copyright)
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DDOCTEST_WITH_TESTS=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/doctest)
 
-# Copy header file
-file(INSTALL ${SOURCE_PATH}/doctest/doctest.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/doctest)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/doctest/copyright COPYONLY)
diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL
index 5159f18fc..a597fe506 100644
--- a/ports/eastl/CONTROL
+++ b/ports/eastl/CONTROL
@@ -1,4 +1,4 @@
 Source: eastl
-Version: 3.12.08
+Version: 3.13.00
 Description: Electronic Arts Standard Template Library.
     It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.
diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake
index b447f1d94..63e6ab6fa 100644
--- a/ports/eastl/portfile.cmake
+++ b/ports/eastl/portfile.cmake
@@ -8,8 +8,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO electronicarts/EASTL
-    REF 3.12.08
-    SHA512 8135831a16dcc662de04d8053560a40d2ca8e6b44c5b5b6ccabd7b30241ce299b90fc22ad001cefb8e2c81a6b59847157c6e488ce797ee96314a931df468f16a
+    REF 3.13.00
+    SHA512 5a0a0491e98c1ef18d979865c02f46b3252ecf2757d2f9c5bb07181dfb7b45ff1bba900640fce3771aa4ac06a3e432ce514d1d358ff2066261d0197385419ddb
     HEAD_REF master
 )
 
diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL
new file mode 100644
index 000000000..9676b708b
--- /dev/null
+++ b/ports/ensmallen/CONTROL
@@ -0,0 +1,5 @@
+Source: ensmallen
+Version: 1.14.0
+Description: A header-only C++ library for mathematical optimization.
+Build-Depends: openblas, clapack, armadillo
+
diff --git a/ports/ensmallen/disable_tests.patch b/ports/ensmallen/disable_tests.patch
new file mode 100644
index 000000000..80dd7e869
--- /dev/null
+++ b/ports/ensmallen/disable_tests.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1577be5..b0171b2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,6 +57,7 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/include/ensmallen_bits"
+ install(FILES ${CMAKE_SOURCE_DIR}/include/ensmallen.hpp
+         DESTINATION "${CMAKE_INSTALL_PREFIX}/include")
+ 
+-enable_testing()
+-
+-add_subdirectory(tests)
++# Disable tests
++#enable_testing()
++#
++#add_subdirectory(tests)
diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake
new file mode 100644
index 000000000..dd03620f5
--- /dev/null
+++ b/ports/ensmallen/portfile.cmake
@@ -0,0 +1,21 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mlpack/ensmallen
+    REF ensmallen-1.14.0
+    SHA512 a0b3660a0d01f5bc79fe302f08161a0b4d16fa006cc1d95cf24e046d2a4ab48de49b7644023837ed93426b982fbd0861d6c2774c0a80f4d2392ce494291ff70a
+    HEAD_REF master
+	PATCHES
+		disable_tests.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+vcpkg_install_cmake()
+
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ensmallen RENAME copyright)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
diff --git a/ports/fann/CONTROL b/ports/fann/CONTROL
new file mode 100644
index 000000000..84b062a30
--- /dev/null
+++ b/ports/fann/CONTROL
@@ -0,0 +1,3 @@
+Source: fann
+Version: 2.2.0
+Description: Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.
+\ No newline at end of file
diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake
new file mode 100644
index 000000000..d18d040e2
--- /dev/null
+++ b/ports/fann/portfile.cmake
@@ -0,0 +1,53 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libfann/fann
+    REF 2.2.0
+    SHA512 b307539a39d93078a489710ac77aa8c6e324f3cf5ef80299ce257d10c043913764abef83aceac5278a5bd243b1ee245b4e8331a9e13c774aa63c9cb604f86bdd
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+vcpkg_install_cmake()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    message(STATUS "FANN does not support static linkage. Building dynamically.")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    # Finish Directories
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/fann.dll ${CURRENT_PACKAGES_DIR}/bin/fann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/doublefann.dll ${CURRENT_PACKAGES_DIR}/bin/doublefann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/fixedfann.dll ${CURRENT_PACKAGES_DIR}/bin/fixedfann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/floatfann.dll ${CURRENT_PACKAGES_DIR}/bin/floatfann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/fann.lib ${CURRENT_PACKAGES_DIR}/lib/fann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/doublefann.lib ${CURRENT_PACKAGES_DIR}/lib/doublefann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/fixedfann.lib ${CURRENT_PACKAGES_DIR}/lib/fixedfann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/floatfann.lib ${CURRENT_PACKAGES_DIR}/lib/floatfann.lib)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/doublefann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/doublefann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fixedfann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fixedfann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/floatfann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/floatfann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/doublefann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/doublefann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fixedfann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fixedfann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/floatfann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/floatfann.lib)
+
+    # Remove useless config file and include path
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+endif()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+
+vcpkg_copy_pdbs()
+\ No newline at end of file
diff --git a/ports/fftw3/CONTROL b/ports/fftw3/CONTROL
index a0ed88124..55cd702d2 100644
--- a/ports/fftw3/CONTROL
+++ b/ports/fftw3/CONTROL
@@ -1,3 +1,6 @@
 Source: fftw3
 Version: 3.3.8
 Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).
+
+Feature: openmp
+Description: Builds openmp enabled lib
+\ No newline at end of file
diff --git a/ports/fftw3/omp_test.patch b/ports/fftw3/omp_test.patch
new file mode 100644
index 000000000..6123798a2
--- /dev/null
+++ b/ports/fftw3/omp_test.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f3cfc20..9826bff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -385,6 +385,12 @@ if (BUILD_TESTS)
+     target_link_libraries (bench ${fftw3_lib})
+   endif ()
+ 
++  if (ENABLE_OPENMP)
++    target_link_libraries (bench ${fftw3_lib}_omp)
++  else ()
++    target_link_libraries (bench ${fftw3_lib})
++  endif ()
++
+ 
+   enable_testing ()
+ 
diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake
index ca3201ec3..4efb47075 100644
--- a/ports/fftw3/portfile.cmake
+++ b/ports/fftw3/portfile.cmake
@@ -17,12 +17,25 @@ vcpkg_download_distfile(ARCHIVE
 
 vcpkg_extract_source_archive(${ARCHIVE})
 
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/omp_test.patch
+)
+
+if ("openmp" IN_LIST FEATURES)
+    set(ENABLE_OPENMP ON)
+else()
+    set(ENABLE_OPENMP OFF)
+endif()
+
 foreach(PRECISION ENABLE_DEFAULT_PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE)
 	vcpkg_configure_cmake(
 		SOURCE_PATH ${SOURCE_PATH}
 		PREFER_NINJA
 		OPTIONS 
 			-D${PRECISION}=ON
+			-DENABLE_OPENMP=${ENABLE_OPENMP}
 	)
 
 	vcpkg_install_cmake()
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index eeffbb2a1..d5dd6754a 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2019.01.07.00
+Version: 2019.01.28.00
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread
 Default-Features: zlib
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 1303eca30..72b3485ff 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF v2019.01.07.00
-    SHA512 9f5d39947818315b9a951ec261fef3a69f52a380a29f74555b16a11a276cda168effb4026fc38a2dde31117485074e3aa496a7abb8d317ca7f3c667a54d4851e
+    REF v2019.01.28.00
+    SHA512 cdd32d863bd98b31332fbcb25a548407857ffd8e611fb5d243821f43fcf240cb796fb4520dddec5537f398c10492e1ecb03de22f7ec0384b98411e9906f40d09
     HEAD_REF master
     PATCHES
         find-gflags.patch
diff --git a/ports/forge/CONTROL b/ports/forge/CONTROL
new file mode 100644
index 000000000..391d6c8fe
--- /dev/null
+++ b/ports/forge/CONTROL
@@ -0,0 +1,4 @@
+Source: forge
+Version: 1.0.3-1
+Description: Helps with high performance visulizations involving OpenGL-CUDA/OpenCL interop.
+Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows)
diff --git a/ports/forge/forge_targets_fix.patch b/ports/forge/forge_targets_fix.patch
new file mode 100644
index 000000000..f2d8371d2
--- /dev/null
+++ b/ports/forge/forge_targets_fix.patch
@@ -0,0 +1,115 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c7236a6..b4b910a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,64 +110,63 @@ install(DIRECTORY include/
+     PATTERN "*.h"
+     PATTERN "*.hpp"
+     PATTERN ".gitignore" EXCLUDE)
+-# The Forge version header is generated and thus need to be
+-# included explicitly
++
+ install(FILES ${Forge_BINARY_DIR}/include/fg/version.h
+     DESTINATION "${FG_INSTALL_INC_DIR}/fg/"
+     COMPONENT headers)
+ 
+-install(EXPORT ForgeTargets
+-    NAMESPACE Forge::
+-    DESTINATION ${FG_INSTALL_CMAKE_DIR}
+-    COMPONENT forge)
+-
+-export(EXPORT ForgeTargets
+-    NAMESPACE Forge::
+-    FILE cmake/ForgeTargets.cmake)
++# install the examples irrespective of the FG_BUILD_EXAMPLES value
++# only the examples source files are installed, so the installation of these
++# source files does not depend on FG_BUILD_EXAMPLES
++# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without
++# building the example executables
++install(DIRECTORY examples/ #NOTE The slash at the end is important
++    DESTINATION ${FG_INSTALL_EXAMPLE_DIR}
++    COMPONENT examples)
+ 
+ include(CMakePackageConfigHelpers)
+ write_basic_package_version_file(
+-    "${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake"
++    "${Forge_BINARY_DIR}/ForgeConfigVersion.cmake"
+     COMPATIBILITY SameMajorVersion)
+ 
+-# This config file will be installed so we need to set the install_destination
+-# path relative to the install path
++
++# export install config file
+ set(INCLUDE_DIRS include)
+ set(CMAKE_DIR ${FG_INSTALL_CMAKE_DIR})
+ configure_package_config_file(
+-  "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
+-  "cmake/install/ForgeConfig.cmake"
+-  INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}"
+-  PATH_VARS INCLUDE_DIRS CMAKE_DIR)
+-
+-install(FILES ${Forge_BINARY_DIR}/cmake/install/ForgeConfig.cmake
+-    ${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake
++    "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
++    "cmake_install/ForgeConfig.cmake"
++    INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}"
++    PATH_VARS INCLUDE_DIRS CMAKE_DIR
++)
++install(FILES ${Forge_BINARY_DIR}/cmake_install/ForgeConfig.cmake
++    ${Forge_BINARY_DIR}/ForgeConfigVersion.cmake
+     DESTINATION ${FG_INSTALL_CMAKE_DIR}
+-    COMPONENT cmake)
++    COMPONENT cmake
++)
++install(EXPORT ForgeTargets
++    NAMESPACE Forge::
++    DESTINATION ${FG_INSTALL_CMAKE_DIR}
++    COMPONENT forge
++)
+ 
+-# Following file will be used to create the config file for the build directory.
+-# These config files will be used by the examples to find the Forge
+-# libraries
++
++# export build tree targets config file
+ set(INCLUDE_DIRS "${Forge_SOURCE_DIR}/include" "${Forge_BINARY_DIR}/include")
+-set(CMAKE_DIR "${Forge_BINARY_DIR}/cmake")
++set(CMAKE_DIR "${Forge_BINARY_DIR}")
+ configure_package_config_file(
+-  "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
+-  "cmake/ForgeConfig.cmake"
+-  INSTALL_DESTINATION "${Forge_BINARY_DIR}/cmake"
+-  PATH_VARS INCLUDE_DIRS CMAKE_DIR
+-  INSTALL_PREFIX "${Forge_BINARY_DIR}")
++    "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
++    "ForgeConfig.cmake"
++    INSTALL_DESTINATION "${Forge_BINARY_DIR}"
++    PATH_VARS INCLUDE_DIRS CMAKE_DIR
++    INSTALL_PREFIX "${Forge_BINARY_DIR}"
++)
++export(EXPORT ForgeTargets
++    NAMESPACE Forge::
++    FILE ForgeTargets.cmake
++)
++#export(PACKAGE Forge)
+ 
+-#--------------------------------------------------------------------
+-# Install examples
+-#--------------------------------------------------------------------
+-# install the examples irrespective of the FG_BUILD_EXAMPLES value
+-# only the examples source files are installed, so the installation of these
+-# source files does not depend on FG_BUILD_EXAMPLES
+-# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without
+-# building the example executables
+-install(DIRECTORY examples/ #NOTE The slash at the end is important
+-    DESTINATION ${FG_INSTALL_EXAMPLE_DIR}
+-    COMPONENT examples)
+ 
+ include(CPackConfig)
+ 
+@@ -177,4 +176,4 @@ conditional_directory(FG_BUILD_EXAMPLES examples)
+ mark_as_advanced(
+     pkgcfg_lib_FontConfigPkg_freetype
+     pkgcfg_lib_FontConfigPkg_fontconfig
+-    )
++)
diff --git a/ports/forge/portfile.cmake b/ports/forge/portfile.cmake
new file mode 100644
index 000000000..cd7c2ca54
--- /dev/null
+++ b/ports/forge/portfile.cmake
@@ -0,0 +1,44 @@
+include(vcpkg_common_functions)
+
+if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    message(FATAL_ERROR "This port currently only supports x64 architecture")
+endif()
+
+set(PATCHES forge_targets_fix.patch)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    list(APPEND PATCHES static_build.patch)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO arrayfire/forge
+    REF v1.0.3
+    SHA512 e1a7688c1c3ab4659401463c5d025917b6e5766129446aefbebe0d580756cd2cc07256ddda9b20899690765220e5467b9209e00476c80ea6a51a1a0c0e9da616
+    HEAD_REF master
+    PATCHES ${PATCHES}
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DFG_BUILD_DOCS=OFF
+        -DFG_BUILD_EXAMPLES=OFF
+        -DFG_INSTALL_BIN_DIR=bin
+        -DFG_WITH_FREEIMAGE=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/bin/* ${CURRENT_PACKAGES_DIR}/debug/bin/*)
+list(FILTER DLLS EXCLUDE REGEX "forge\\.dll\$")
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/examples
+    ${CURRENT_PACKAGES_DIR}/examples
+    ${DLLS}
+)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forge RENAME copyright)
diff --git a/ports/forge/static_build.patch b/ports/forge/static_build.patch
new file mode 100644
index 000000000..387811ce1
--- /dev/null
+++ b/ports/forge/static_build.patch
@@ -0,0 +1,39 @@
+diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt
+index 1aeec1e..52eff05 100755
+--- a/src/backend/opengl/CMakeLists.txt
++++ b/src/backend/opengl/CMakeLists.txt
+@@ -142,7 +142,7 @@ install(TARGETS forge
+     INCLUDES DESTINATION ${FG_INSTALL_INC_DIR})
+ 
+ # install dependencies
+-if (WIN32)
++if (WIN32 AND BUILD_SHARED_LIBS)
+     if (FG_WITH_FREEIMAGE AND NOT FG_USE_STATIC_FREEIMAGE)
+         install(FILES $<TARGET_FILE:FreeImage::FreeImage>
+             DESTINATION ${FG_INSTALL_BIN_DIR}
+diff --git a/src/backend/opengl/glfw/CMakeLists.txt b/src/backend/opengl/glfw/CMakeLists.txt
+index caf4913..3c8d71c 100644
+--- a/src/backend/opengl/glfw/CMakeLists.txt
++++ b/src/backend/opengl/glfw/CMakeLists.txt
+@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS)
+     install(TARGETS forge_wtk_interface EXPORT ForgeTargets)
+ endif ()
+ 
+-if (WIN32)
++if (WIN32 AND BUILD_SHARED_LIBS)
+     install(FILES $<TARGET_FILE:glfw>
+     DESTINATION ${FG_INSTALL_BIN_DIR}
+     COMPONENT dependencies)
+diff --git a/src/backend/opengl/sdl/CMakeLists.txt b/src/backend/opengl/sdl/CMakeLists.txt
+index d8cd312..d55f27d 100644
+--- a/src/backend/opengl/sdl/CMakeLists.txt
++++ b/src/backend/opengl/sdl/CMakeLists.txt
+@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS)
+     install(TARGETS forge_wtk_interface EXPORT ForgeTargets)
+ endif ()
+ 
+-if (WIN32)
++if (WIN32 AND BUILD_SHARED_LIBS)
+     install(FILES $<TARGET_FILE:SDL2::SDL2>
+     DESTINATION ${FG_INSTALL_BIN_DIR}
+     COMPONENT dependencies)
diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt
index 997fba37a..60c7f9bd8 100644
--- a/ports/freeimage/CMakeLists.txt
+++ b/ports/freeimage/CMakeLists.txt
@@ -4,22 +4,27 @@ include(GNUInstallDirs)
 
 project(FreeImage C CXX)
 
-find_package(zlib REQUIRED)
-find_package(PNG REQUIRED)
-find_package(JPEG REQUIRED)
-if(NOT JPEG_LIBRARY_DEBUG)
-    set(JPEG_LIBRARY_DEBUG ${JPEG_LIBRARY_RELEASE})
+set(CMAKE_MODULE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/share/JXR" ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/share/OpenEXR" ${CMAKE_MODULE_PATH})
+
+if(MSVC)
+  add_definitions("-D_CRT_SECURE_NO_WARNINGS")
+  set(CMAKE_CXX_FLAGS "/wd4828 ${CMAKE_CXX_FLAGS}")
 endif()
-find_package(TIFF REQUIRED)
-find_package(OPENJPEG REQUIRED)
 
-# Include some custom Find***.cmake modules 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+if(BUILD_SHARED_LIBS)
+  add_definitions("-DOPENEXR_DLL")
+endif()
 
-find_package(WEBP REQUIRED)
-find_package(JXR  REQUIRED)
-find_package(LibRaw REQUIRED)
-find_package(OpenEXR REQUIRED)
+find_package(zlib     REQUIRED)
+find_package(PNG      REQUIRED)
+find_package(JPEG     REQUIRED)
+find_package(TIFF     REQUIRED)
+find_package(OpenJPEG REQUIRED)
+find_package(WebP     REQUIRED)
+find_package(JXR      REQUIRED)
+find_package(LibRaw   REQUIRED)
+find_package(OpenEXR  REQUIRED)
 
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 option(INSTALL_HEADERS "Install the development headers" ON)
@@ -33,12 +38,12 @@ set(CMAKE_DEBUG_POSTFIX "d")
 set(PUBLIC_HEADERS ${REAL_SOURCE_DIR}/FreeImage.h)
 
 # List the private header files
-set(ROOT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/CacheFile.h 
-                         ${REAL_SOURCE_DIR}/FreeImageIO.h 
+set(ROOT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/CacheFile.h
+                         ${REAL_SOURCE_DIR}/FreeImageIO.h
                          ${REAL_SOURCE_DIR}/MapIntrospector.h
-                         ${REAL_SOURCE_DIR}/Plugin.h 
-                         ${REAL_SOURCE_DIR}/Quantizers.h 
-                         ${REAL_SOURCE_DIR}/ToneMapping.h 
+                         ${REAL_SOURCE_DIR}/Plugin.h
+                         ${REAL_SOURCE_DIR}/Quantizers.h
+                         ${REAL_SOURCE_DIR}/ToneMapping.h
                          ${REAL_SOURCE_DIR}/Utilities.h)
 
 file(GLOB FREEIMAGE_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/FreeImage/*.h)
@@ -59,7 +64,7 @@ file(GLOB METADATA_SRCS ${REAL_SOURCE_DIR}/Metadata/*.cpp)
 # The G3 plugin is disabled because it require the private copy of tiff
 list(REMOVE_ITEM FREEIMAGE_SRCS ${REAL_SOURCE_DIR}/FreeImage/PluginG3.cpp)
 
-# The JPEGTransform plugin is disable because it requires a private copy of jpeg 
+# The JPEGTransform plugin is disable because it requires a private copy of jpeg
 list(REMOVE_ITEM FREEIMAGE_TOOLKIT_SRCS ${REAL_SOURCE_DIR}/FreeImageToolkit/JPEGTransform.cpp)
 
 
@@ -69,8 +74,8 @@ set(SRCS ${DEPRECATION_SRCS}
          ${METADATA_SRCS}
 )
 
-# If FreeImage is used as a static library, FREEIMAGE_LIB 
-# needs to be defined (at the C preprocessor level) to correctly 
+# If FreeImage is used as a static library, FREEIMAGE_LIB
+# needs to be defined (at the C preprocessor level) to correctly
 # define (to nothing instead of _declspec(dllimport) ) the DLL_API macro.
 # For this purpouse we include (depending on the BUILD_SHARED_LIBS )
 # the appropriate FreeImageConfig.h .
@@ -90,7 +95,7 @@ else()
 endif()
 
 target_include_directories(FreeImage PRIVATE ${REAL_SOURCE_DIR}
-                                             ${ZLIB_INCLUDE_DIRS} 
+                                             ${ZLIB_INCLUDE_DIRS}
                                              ${JPEG_INCLUDE_DIRS}
                                              ${TIFF_INCLUDE_DIRS}
                                              ${PNG_INCLUDE_DIRS}
@@ -149,4 +154,4 @@ install(TARGETS FreeImagePlus
 
 if(INSTALL_HEADERS)
     install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-endif()
-\ No newline at end of file
+endif()
diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL
index d8bd820e6..5497b0fa3 100644
--- a/ports/freeimage/CONTROL
+++ b/ports/freeimage/CONTROL
@@ -1,4 +1,4 @@
 Source: freeimage
-Version: 3.18.0-2
+Version: 3.18.0-3
 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr
 Description: Support library for graphics image formats
diff --git a/ports/freeimage/cmake/FindOpenEXR.cmake b/ports/freeimage/cmake/FindOpenEXR.cmake
deleted file mode 100644
index beca25145..000000000
--- a/ports/freeimage/cmake/FindOpenEXR.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-find_path(OpenEXR_INCLUDE_DIRS OpenEXR/OpenEXRConfig.h)
-
-file(STRINGS "${OpenEXR_INCLUDE_DIRS}/OpenEXR/OpenEXRConfig.h" OPENEXR_CONFIG_H)
-
-string(REGEX REPLACE "^.*define OPENEXR_VERSION_MAJOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MAJOR "${OPENEXR_CONFIG_H}")
-string(REGEX REPLACE "^.*define OPENEXR_VERSION_MINOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MINOR "${OPENEXR_CONFIG_H}")
-set(OpenEXR_LIB_SUFFIX "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}")
-
-find_library(OpenEXR_LIBRARY IlmImf-${OpenEXR_LIB_SUFFIX})
-find_library(OpenEXR_UTIL_LIBRARY IlmImfUtil-${OpenEXR_LIB_SUFFIX})
-
-find_library(OpenEXR_HALF_LIBRARY Half)
-find_library(OpenEXR_IEX_LIBRARY Iex-${OpenEXR_LIB_SUFFIX})
-find_library(OpenEXR_THREAD_LIBRARY IlmThread-${OpenEXR_LIB_SUFFIX})
-find_library(OpenEXR_IEXMATH_LIBRARY IexMath-${OpenEXR_LIB_SUFFIX})
-find_library(OpenEXR_MATH_LIBRARY Imath-${OpenEXR_LIB_SUFFIX})
-
-set(OpenEXR_LIBRARIES 
-    ${OpenEXR_LIBRARY}
-    ${OpenEXR_MATH_LIBRARY}
-    ${OpenEXR_IEXMATH_LIBRARY}
-    ${OpenEXR_UTIL_LIBRARY} 
-    ${OpenEXR_HALF_LIBRARY} 
-    ${OpenEXR_IEX_LIBRARY} 
-    ${OpenEXR_THREAD_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS)
diff --git a/ports/freeimage/cmake/FindWEBP.cmake b/ports/freeimage/cmake/FindWEBP.cmake
deleted file mode 100644
index b4fefeadc..000000000
--- a/ports/freeimage/cmake/FindWEBP.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# - Find WEBP
-# Find the WEBP library 
-# This module defines
-#  WEBP_INCLUDE_DIRS, where to find webp/decode.h
-#  WEBP_LIBRARIES, the libraries needed to use WEBP
-#
-
-find_path(WEBP_INCLUDE_DIRS
-    NAMES webp/decode.h
-)
-mark_as_advanced(WEBP_INCLUDE_DIRS)
-
-find_library(WEBP_LIBRARY_RELEASE NAMES webp PATH_SUFFIXES lib)
-find_library(WEBP_LIBRARY_DEBUG NAMES webpd PATH_SUFFIXES lib)
-
-find_library(WEBPMUX_LIBRARY_RELEASE NAMES webpmux PATH_SUFFIXES lib)
-find_library(WEBPMUX_LIBRARY_DEBUG NAMES webpmuxd PATH_SUFFIXES lib)
-
-include(SelectLibraryConfigurations)
-select_library_configurations(WEBP)
-select_library_configurations(WEBPMUX)
-
-set(WEBP_LIBRARIES ${WEBPMUX_LIBRARY} ${WEBP_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(WEBP DEFAULT_MSG WEBP_INCLUDE_DIRS WEBP_LIBRARIES)
diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake
index 6f3cfaebe..3fea39a0e 100644
--- a/ports/freeimage/portfile.cmake
+++ b/ports/freeimage/portfile.cmake
@@ -13,11 +13,8 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/FreeImageConfig-static.h DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/FreeImageConfig-dynamic.h DESTINATION ${SOURCE_PATH})
 
-# Copy some useful Find***.cmake modules 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake DESTINATION ${SOURCE_PATH})
-
-# This is not strictly necessary, but to make sure 
-# that no "internal" libraries are used by removing them
+# This is not strictly necessary, but to make sure
+# that no "internal" libraries are used we remove them
 file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibJPEG)
 file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibPNG)
 file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibTIFF4)
@@ -46,7 +43,11 @@ vcpkg_apply_patches(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
+    OPTIONS
+      -DVCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}
+      -DTARGET_TRIPLET=${TARGET_TRIPLET}
+    OPTIONS_DEBUG
+      -DINSTALL_HEADERS=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/freetype/0001-Fix-install-command.patch b/ports/freetype/0001-Fix-install-command.patch
new file mode 100644
index 000000000..feee3aefa
--- /dev/null
+++ b/ports/freetype/0001-Fix-install-command.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad8ded0..32324d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -407,6 +407,7 @@ endif ()
+ include(GNUInstallDirs)
+ 
+ if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
++  if(UNIX)
+   install(
+     # Note the trailing slash in the argument to `DIRECTORY'!
+     DIRECTORY ${PROJECT_SOURCE_DIR}/include/
+@@ -420,6 +421,19 @@ if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
+           ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h
+       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config
+       COMPONENT headers)
++  else()
++  install(
++    # Note the trailing slash in the argument to `DIRECTORY'!
++    DIRECTORY ${PROJECT_SOURCE_DIR}/include/
++      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2
++      COMPONENT headers
++      PATTERN "internal" EXCLUDE
++      PATTERN "ftoption.h" EXCLUDE)
++  install(
++    FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h
++      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config
++      COMPONENT headers)
++  endif()
+ endif ()
+ 
+ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
diff --git a/ports/freetype/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch b/ports/freetype/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch
deleted file mode 100644
index 34318ad61..000000000
--- a/ports/freetype/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7286c233834117404f400e3cfd5500610ca56d9a Mon Sep 17 00:00:00 2001
-From: Robert Schumacher <roschuma@microsoft.com>
-Date: Sat, 7 May 2016 02:10:45 -0700
-Subject: [PATCH] Support Windows DLLs via CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f02ee51..774737d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -115,7 +115,7 @@ project(freetype)
- 
- 
- if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS)
--  message(FATAL_ERROR "Building shared libraries on Windows needs MinGW")
-+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
- endif ()
- 
- # Disallow in-source builds
--- 
-2.8.1.windows.1
-
diff --git a/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch b/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch
index eeecbc1f7..993576160 100644
--- a/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch
+++ b/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch
@@ -1,17 +1,23 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6bb2558..a894ada 100644
+index 32324d6..89a73a4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -419,8 +419,11 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-     ARCHIVE DESTINATION lib
-     FRAMEWORK DESTINATION Library/Frameworks
-     )
+@@ -151,6 +151,9 @@ option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF)
+ option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF)
+ option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF)
+ 
++# vcpkg config install path
++option(CONFIG_INSTALL_PATH "location to install cmake config files" lib/cmake/freetype)
 +
-+  set(CONFIG_INSTALL_PATH "lib/cmake/freetype" CACHE STRING "location to install cmake config files")
-+
-   install(EXPORT freetype-targets
--    DESTINATION lib/cmake/freetype
-+    DESTINATION ${CONFIG_INSTALL_PATH}
-     FILE freetype-config.cmake
-     )
+ 
+ # Disallow in-source builds
+ if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}")
+@@ -475,7 +478,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+       COMPONENT libraries)
+   install(
+     EXPORT freetype-targets
+-      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
++      DESTINATION ${CONFIG_INSTALL_PATH}
+       FILE freetype-config.cmake
+       COMPONENT headers)
  endif ()
diff --git a/ports/freetype/0003-Fix-UWP.patch b/ports/freetype/0003-Fix-UWP.patch
index 253f91e6a..937942189 100644
--- a/ports/freetype/0003-Fix-UWP.patch
+++ b/ports/freetype/0003-Fix-UWP.patch
@@ -1,63 +1,67 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 744b2d5..d114b9b 100644
+index 89a73a4..fe9bc65 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -312,6 +312,9 @@ else ()
-   set(BASE_SRCS ${BASE_SRCS} src/base/ftdebug.c)
+@@ -321,6 +321,10 @@ else ()
+   list(APPEND BASE_SRCS src/base/ftdebug.c)
  endif ()
  
 +if(MSVC)
 +  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
 +endif()
- 
++
  if (BUILD_FRAMEWORK)
-   set(BASE_SRCS
+   list(APPEND BASE_SRCS builds/mac/freetype-Info.plist)
+ endif ()
 diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
-index 4666d48..382a915 100644
+index 9664404..f56335a 100644
 --- a/include/freetype/freetype.h
 +++ b/include/freetype/freetype.h
-@@ -845,6 +845,9 @@ FT_BEGIN_HEADER
-   /*************************************************************************/
-   /*************************************************************************/
- 
+@@ -1066,6 +1066,11 @@ FT_BEGIN_HEADER
+   /*    Especially for TrueType fonts see also the documentation for       */
+   /*    @FT_Size_Metrics.                                                  */
+   /*                                                                       */
++
 +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
 +#define generic GenericFromFreeTypeLibrary
 +#endif
- 
-   /*************************************************************************/
-   /*                                                                       */
-@@ -1777,6 +1780,10 @@ FT_BEGIN_HEADER
++
+   typedef struct  FT_FaceRec_
+   {
+     FT_Long           num_faces;
+@@ -1942,6 +1947,9 @@ FT_BEGIN_HEADER
  
    } FT_GlyphSlotRec;
  
 +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
 +#undef generic
 +#endif
-+
  
    /*************************************************************************/
    /*************************************************************************/
 diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
-index fa05347..ae2754b 100644
+index 8d07e35..ce6fffd 100644
 --- a/src/base/ftobjs.c
 +++ b/src/base/ftobjs.c
-@@ -457,6 +457,9 @@
+@@ -491,6 +491,10 @@
      return error;
    }
  
 +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
 +#define generic GenericFromFreeTypeLibrary
 +#endif
++
  
-   /* documentation is in ftobjs.h */
- 
-@@ -971,6 +974,9 @@
+   static void
+   ft_glyphslot_clear( FT_GlyphSlot  slot )
+@@ -1151,6 +1155,10 @@
      FT_FREE( face );
    }
  
 +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
 +#undef generic
 +#endif
++
  
    static void
    Destroy_Driver( FT_Driver  driver )
diff --git a/ports/freetype/0004-Fix-DLL-install.patch b/ports/freetype/0004-Fix-DLL-install.patch
new file mode 100644
index 000000000..8d70b993f
--- /dev/null
+++ b/ports/freetype/0004-Fix-DLL-install.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fe9bc65..dd8a878 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -478,6 +478,8 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+       EXPORT freetype-targets
+       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++# DLL is RUNTIME
++      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+       FRAMEWORK DESTINATION Library/Frameworks
+       COMPONENT libraries)
+   install(
diff --git a/ports/freetype/0004-Fix-macOS-defines.patch b/ports/freetype/0004-Fix-macOS-defines.patch
deleted file mode 100644
index 92e676b52..000000000
--- a/ports/freetype/0004-Fix-macOS-defines.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt	2018-11-16 10:49:22.000000000 +0100
-+++ b/CMakeLists.txt	2018-11-16 10:50:26.000000000 +0100
-@@ -200,17 +200,17 @@
-     FTCONFIG_H)
-   if (HAVE_UNISTD_H)
-     string(REGEX REPLACE
--      "#undef +(HAVE_UNISTD_H)" "#define \\1"
-+      "#undef +(HAVE_UNISTD_H)" "#define \\1 1"
-       FTCONFIG_H "${FTCONFIG_H}")
-   endif ()
-   if (HAVE_FCNTL_H)
-     string(REGEX REPLACE
--      "#undef +(HAVE_FCNTL_H)" "#define \\1"
-+      "#undef +(HAVE_FCNTL_H)" "#define \\1 1"
-       FTCONFIG_H "${FTCONFIG_H}")
-   endif ()
-   if (HAVE_STDINT_H)
-     string(REGEX REPLACE
--      "#undef +(HAVE_STDINT_H)" "#define \\1"
-+      "#undef +(HAVE_STDINT_H)" "#define \\1 1"
-       FTCONFIG_H "${FTCONFIG_H}")
-   endif ()
-   string(REPLACE "/undef " "#undef "
diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL
index 1052412b4..7e18d1a7c 100644
--- a/ports/freetype/CONTROL
+++ b/ports/freetype/CONTROL
@@ -1,4 +1,4 @@
 Source: freetype
-Version: 2.8.1-4
+Version: 2.9.1-1
 Build-Depends: zlib, bzip2, libpng
 Description: A library to render fonts.
diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake
index 13926dd19..ace5a062d 100644
--- a/ports/freetype/portfile.cmake
+++ b/ports/freetype/portfile.cmake
@@ -1,20 +1,20 @@
 include(vcpkg_common_functions)
 
-set(FT_VERSION 2.8.1)
+set(FT_VERSION 2.9.1)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.bz2" "https://downloads.sourceforge.net/project/freetype/freetype2/${FT_VERSION}/freetype-${FT_VERSION}.tar.bz2"
     FILENAME "freetype-${FT_VERSION}.tar.bz2"
-    SHA512 ca59e47f0fceeeb9b8032be2671072604d0c79094675df24187829c05e99757d0a48a0f8062d4d688e056f783aa8f6090d732ad116562e94784fccf1339eb823
+    SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
 )
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${FT_VERSION}
     PATCHES
-        0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch
+        0001-Fix-install-command.patch
         0002-Add-CONFIG_INSTALL_PATH-option.patch
         0003-Fix-UWP.patch
-        0004-Fix-macOS-defines.patch
+        0004-Fix-DLL-install.patch
 )
 
 vcpkg_configure_cmake(
@@ -22,10 +22,10 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DCONFIG_INSTALL_PATH=share/freetype
-        -DWITH_ZLIB=ON
-        -DWITH_BZip2=ON
-        -DWITH_PNG=ON
-        -DWITH_HarfBuzz=OFF
+        -DFT_WITH_ZLIB=ON
+        -DFT_WITH_BZIP2=ON
+        -DFT_WITH_PNG=ON
+        -DFT_WITH_HARFBUZZ=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/gcem/CONTROL b/ports/gcem/CONTROL
new file mode 100644
index 000000000..b3c280cd7
--- /dev/null
+++ b/ports/gcem/CONTROL
@@ -0,0 +1,3 @@
+Source: gcem
+Version: 1.8.1
+Description: A C++ compile-time math library using generalized constant expressions
diff --git a/ports/gcem/portfile.cmake b/ports/gcem/portfile.cmake
new file mode 100644
index 000000000..4a13af1c2
--- /dev/null
+++ b/ports/gcem/portfile.cmake
@@ -0,0 +1,24 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO kthohr/gcem
+    REF v1.8.1
+    SHA512 dd82a917822ffdfb3f224599340d2a0499e47db8d469d9febf3d37cd796fae3c8186a4fc05cc727d3ef82655359166caafbb5ddee3b79ba7becf1a53cce20e4a
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gcem)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gcem)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/gcem/LICENSE ${CURRENT_PACKAGES_DIR}/share/gcem/copyright)
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
index 810c12e41..0814046f5 100644
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@@ -1,12 +1,7 @@
 Source: gdal
 Version: 2.4.0
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
-Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma
-Default-Features: mysql-libmysql
-
-Feature: mysql-libmysql
-Build-Depends: libmysql
-Description: Add mysql support using libmysql
+Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5
 
 Feature: mysql-libmariadb
 Build-Depends: libmariadb
diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt
index c94ab4c13..cfd460e20 100644
--- a/ports/gettext/CMakeLists.txt
+++ b/ports/gettext/CMakeLists.txt
@@ -3,8 +3,6 @@ project(libintl C)
 
 find_package(unofficial-iconv REQUIRED)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/config .)
-
 set(CMAKE_STATIC_LIBRARY_PREFIX)
 set(CMAKE_SHARED_LIBRARY_PREFIX)
 
@@ -23,27 +21,28 @@ else()
     set(HAVE_ASPRINTF 1)
     set(HAVE_WPRINTF 1)
     set(HAVE_NEWLOCALE 1)
-    add_definitions(-DHAVE_NEWLOCALE=1)
-
-    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-    set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-    find_package(Threads REQUIRED)
-    if(NOT CMAKE_USE_PTHREADS_INIT)
-        message(FATAL_ERROR "Error: Only pthreads is currently supported.")
-    endif()
-
-    include(CheckFunctionExists)
-    include(CheckIncludeFiles)
-
-    if(APPLE)
-        set(HAVE_CFLOCALECOPYCURRENT 1)
-        set(HAVE_CFPREFERENCESCOPYAPPVALUE 1)
-    endif()
-    check_function_exists(dcgettext HAVE_DCGETTEXT)
-    check_include_files(features.h HAVE_FEATURES_H)
-    check_function_exists(gettext HAVE_GETTEXT)
-    check_include_files(mach-o/dyld.h HAVE_MACH_O_DYLD_H)
-    check_function_exists(mempcpy HAVE_MEMPCPY)
+    add_definitions(-DHAVE_NEWLOCALE=1)
+    add_definitions(-DHAVE_NEWLOCALE=1)
+
+    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+    set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+    find_package(Threads REQUIRED)
+    if(NOT CMAKE_USE_PTHREADS_INIT)
+        message(FATAL_ERROR "Error: Only pthreads is currently supported.")
+    endif()
+
+    include(CheckFunctionExists)
+    include(CheckIncludeFiles)
+
+    if(APPLE)
+        set(HAVE_CFLOCALECOPYCURRENT 1)
+        set(HAVE_CFPREFERENCESCOPYAPPVALUE 1)
+    endif()
+    check_function_exists(dcgettext HAVE_DCGETTEXT)
+    check_include_files(features.h HAVE_FEATURES_H)
+    check_function_exists(gettext HAVE_GETTEXT)
+    check_include_files(mach-o/dyld.h HAVE_MACH_O_DYLD_H)
+    check_function_exists(mempcpy HAVE_MEMPCPY)
     check_include_files(xlocale.h HAVE_XLOCALE_H)
 
     configure_file(intl/libgnuintl.in.h config/libgnuintl.h @ONLY)
@@ -106,18 +105,43 @@ add_definitions("-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIB
 add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -D_CRT_SECURE_NO_WARNINGS")
 
 add_library(libintl ${SOURCES})
-target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv)
-if(APPLE)
-    find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)
-    target_link_libraries(libintl PRIVATE ${COREFOUNDATION_LIBRARY})
-endif()
-if(NOT WIN32)
-    target_link_libraries(libintl PRIVATE Threads::Threads)
+target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv)
+
+target_include_directories(libintl PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/config>
+    $<INSTALL_INTERFACE:include>
+)
+
+if(APPLE)
+    find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)
+    target_link_libraries(libintl PRIVATE ${COREFOUNDATION_LIBRARY})
+endif()
+if(NOT WIN32)
+    target_link_libraries(libintl PRIVATE Threads::Threads)
 endif()
 
 install(TARGETS libintl
+  EXPORT unofficial-gettext-targets
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION bin
   ARCHIVE DESTINATION lib
 )
 
+install(
+    EXPORT unofficial-gettext-targets
+    FILE unofficial-gettext-targets.cmake
+    NAMESPACE unofficial::gettext::
+    DESTINATION share/unofficial-gettext
+)
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-gettext-config.cmake" "
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-iconv)
+find_dependency(Threads)
+include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-targets.cmake)
+")
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-gettext-config.cmake
+    DESTINATION share/unofficial-gettext
+)
+\ No newline at end of file
diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL
index 76e1d22d4..386fbd09c 100644
--- a/ports/gettext/CONTROL
+++ b/ports/gettext/CONTROL
@@ -1,4 +1,4 @@
 Source: gettext
-Version: 0.19-5
-Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages
+Version: 0.19-8
+Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl.
 Build-Depends: libiconv
diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake
index 2a26817d7..d7283cc90 100644
--- a/ports/gettext/portfile.cmake
+++ b/ports/gettext/portfile.cmake
@@ -1,18 +1,28 @@
 if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-gettext)
     return()
 endif()
 
 #Based on https://github.com/winlibs/gettext
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gettext-0.19)
+
+set(GETTEXT_VERSION 0.19)
+
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-0.19.tar.gz"
-    FILENAME "gettext-0.19.tar.gz"
+    URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz"
+    FILENAME "gettext-${GETTEXT_VERSION}.tar.gz"
     SHA512 a5db035c582ff49d45ee6eab9466b2bef918e413a882019c204a9d8903cb3770ddfecd32c971ea7c7b037c7b69476cf7c56dcabc8b498b94ab99f132516c9922
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${GETTEXT_VERSION}
+    PATCHES
+        0001-Fix-macro-definitions.patch
+        0002-Fix-uwp-build.patch
+)
 
 file(COPY
     ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
@@ -24,12 +34,6 @@ file(REMOVE ${SOURCE_PATH}/gettext-runtime/intl/libgnuintl.h ${SOURCE_PATH}/gett
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/libgnuintl.win32.h DESTINATION ${SOURCE_PATH}/gettext-runtime/intl)
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-macro-definitions.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/0002-Fix-uwp-build.patch"
-)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/gettext-runtime
     PREFER_NINJA
@@ -38,6 +42,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-gettext TARGET_PATH share/unofficial-gettext)
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gettext)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/gettext/COPYING ${CURRENT_PACKAGES_DIR}/share/gettext/copyright)
diff --git a/ports/gettext/unofficial-gettext-config.cmake b/ports/gettext/unofficial-gettext-config.cmake
new file mode 100644
index 000000000..3b872142a
--- /dev/null
+++ b/ports/gettext/unofficial-gettext-config.cmake
@@ -0,0 +1 @@
+add_library(unofficial::gettext::libintl INTERFACE IMPORTED)
diff --git a/ports/gl3w/CONTROL b/ports/gl3w/CONTROL
index e8f6fdae1..d2ce04972 100644
--- a/ports/gl3w/CONTROL
+++ b/ports/gl3w/CONTROL
@@ -1,4 +1,4 @@
 Source: gl3w
-Version: 8f7f459d
+Version: 99ed3211
 Description: Simple OpenGL core profile loading
 Build-Depends: opengl-registry
diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake
index a5a7825b7..c5010491a 100644
--- a/ports/gl3w/portfile.cmake
+++ b/ports/gl3w/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO skaslev/gl3w
-  REF 8f7f459df8725c9614136b49a96023de276219f2
-  SHA512 7674008716accb25347c81f755f2db7a885ecb5c51b481e0e8f337bc8ee0949a5a58f5816b27a66535ed4da0b9438ba6a6a84712560c7b1a0f1b2908b4eb81e5
+  REF 99ed321100d37032cb6bfa7dd8dea85f10c86132
+  SHA512 217f65644c73c33383b09893fa5ede066cc4b1cddab051feac11d7e939dba14ed637b297ea42a0426bc0a1a3bc665998a91c27ca10d28704ce9e2d3d90e73595
   HEAD_REF master
 )
 
diff --git a/ports/glad/CONTROL b/ports/glad/CONTROL
index d74a35089..5d041c0a0 100644
--- a/ports/glad/CONTROL
+++ b/ports/glad/CONTROL
@@ -1,4 +1,4 @@
 Source: glad
-Version: 0.1.28-3
+Version: 0.1.29
 Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.
 Build-Depends: egl-registry, opengl-registry
diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake
index cc73b1e39..252109b8f 100644
--- a/ports/glad/portfile.cmake
+++ b/ports/glad/portfile.cmake
@@ -5,14 +5,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Dav1dde/glad
-    REF v0.1.28
-    SHA512 5895e25bffab4ead346f65011cbb52a434779fed1dad619ffde27f68b52994cd0b048a45b4533b22b54971dfdba935d93fcf6bee5789061d0057af869b95998c
+    REF v0.1.29
+    SHA512 056c0439b673d86bd10fe733873d4b82cf70861818980f08b3ec23f7b478750064a6d53925cc2cf9445e570cece5f21e12d7af6f1927b64af05d8d1f2afdedcb
     HEAD_REF master
 )
 
-vcpkg_find_acquire_program(PYTHON2)
-get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
-vcpkg_add_to_path("${PYTHON2_DIR}")
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
 
 file(COPY
     ${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h
diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL
index 8be4a8c33..195d3d6f5 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: google-cloud-cpp
-Version: 0.5.0
+Version: 0.6.0
 Build-Depends: grpc, gtest, curl, crc32c
 Description: C++ Client Libraries for Google Cloud Platform APIs.
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 94e227c4f..0f8b14d84 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -27,6 +27,7 @@ vcpkg_configure_cmake(
     OPTIONS
         -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
         -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF
+	-DBUILD_TESTING=OFF
 )
 
 vcpkg_install_cmake(ADD_BIN_TO_PATH)
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index f7a46c9f6..274faed53 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,4 +1,4 @@
 Source: grpc
-Version: 1.17.1
+Version: 1.18.0
 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp)
 Description: An RPC library and framework
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 77db34226..492025ff3 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -11,8 +11,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
-    REF v1.17.1
-    SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
+    REF v1.18.0
+    SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
     HEAD_REF master
     PATCHES fix-uwp.patch
 )
diff --git a/ports/gsoap/CONTROL b/ports/gsoap/CONTROL
new file mode 100644
index 000000000..2da6f0409
--- /dev/null
+++ b/ports/gsoap/CONTROL
@@ -0,0 +1,4 @@
+Source: gsoap
+Version: 2.8.78-1
+Build-Depends: curl
+Description: The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings.
+\ No newline at end of file
diff --git a/ports/gsoap/fix-build-in-windows.patch b/ports/gsoap/fix-build-in-windows.patch
new file mode 100644
index 000000000..e661fb7c7
--- /dev/null
+++ b/ports/gsoap/fix-build-in-windows.patch
@@ -0,0 +1,307 @@
+ gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln       |   8 +-
+ .../soapcpp2/soapcpp2/soapcpp2.vcxproj             | 114 +++++++++++++++++
+ gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln           |   8 +-
+ .../VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj  | 139 +++++++++++++++++++++
+ 4 files changed, 263 insertions(+), 6 deletions(-)
+
+diff --git a/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln b/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln
+index 68bacf1..5d74e6b 100644
+--- a/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln
++++ b/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln
+@@ -1,7 +1,9 @@
+ 
+-Microsoft Visual Studio Solution File, Format Version 9.00
+-# Visual C++ Express 2005
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soapcpp2", "soapcpp2\soapcpp2.vcproj", "{BDD1B293-CE39-4BEC-8E63-8B1621F3EB56}"
++Microsoft Visual Studio Solution File, Format Version 12.00
++# Visual Studio 14
++VisualStudioVersion = 14.0.25420.1
++MinimumVisualStudioVersion = 10.0.40219.1
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soapcpp2", "soapcpp2\soapcpp2.vcxproj", "{BDD1B293-CE39-4BEC-8E63-8B1621F3EB56}"
+ EndProject
+ Global
+ 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+diff --git a/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj b/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj
+new file mode 100644
+index 0000000..17f1d75
+--- /dev/null
++++ b/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj
+@@ -0,0 +1,114 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++  <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|Win32">
++      <Configuration>Debug</Configuration>
++      <Platform>Win32</Platform>
++    </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|Win32">
++      <Configuration>Release</Configuration>
++      <Platform>Win32</Platform>
++    </ProjectConfiguration>
++  </ItemGroup>
++  <PropertyGroup Label="Globals">
++    <ProjectGuid>{BDD1B293-CE39-4BEC-8E63-8B1621F3EB56}</ProjectGuid>
++    <RootNamespace>soapcpp2</RootNamespace>
++    <Keyword>Win32Proj</Keyword>
++    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++  </PropertyGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <PlatformToolset>v140</PlatformToolset>
++    <CharacterSet>Unicode</CharacterSet>
++    <WholeProgramOptimization>true</WholeProgramOptimization>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <PlatformToolset>v140</PlatformToolset>
++    <CharacterSet>Unicode</CharacterSet>
++  </PropertyGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
++  <ImportGroup Label="ExtensionSettings">
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++  </ImportGroup>
++  <PropertyGroup Label="UserMacros" />
++  <PropertyGroup>
++    <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
++    <IntDir>$(Configuration)\</IntDir>
++    <LinkIncremental>true</LinkIncremental>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
++    <IntDir>$(Configuration)\</IntDir>
++    <LinkIncremental>false</LinkIncremental>
++  </PropertyGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <MinimalRebuild>true</MinimalRebuild>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <PrecompiledHeader />
++      <WarningLevel>Level3</WarningLevel>
++      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
++    </ClCompile>
++    <Link>
++      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <TargetMachine>MachineX86</TargetMachine>
++    </Link>
++  </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++    <ClCompile>
++      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++      <PrecompiledHeader />
++      <WarningLevel>Level3</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++    </ClCompile>
++    <Link>
++      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OptimizeReferences>true</OptimizeReferences>
++      <EnableCOMDATFolding>true</EnableCOMDATFolding>
++      <TargetMachine>MachineX86</TargetMachine>
++    </Link>
++  </ItemDefinitionGroup>
++  <ItemGroup>
++    <ClCompile Include="error2.c" />
++    <ClCompile Include="init2.c" />
++    <ClCompile Include="lex.soapcpp2_lex.c" />
++    <ClCompile Include="soapcpp2.c">
++      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
++      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
++      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
++      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
++    </ClCompile>
++    <ClCompile Include="soapcpp2_yacc.tab.c" />
++    <ClCompile Include="symbol2.c" />
++  </ItemGroup>
++  <ItemGroup>
++    <ClInclude Include="error2.h" />
++    <ClInclude Include="soapcpp2.h" />
++    <ClInclude Include="soapcpp2_yacc.tab.h" />
++  </ItemGroup>
++  <ItemGroup>
++    <None Include="soapcpp2_lex.l" />
++    <None Include="soapcpp2_yacc.y" />
++  </ItemGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
++  <ImportGroup Label="ExtensionTargets">
++  </ImportGroup>
++</Project>
+\ No newline at end of file
+diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln b/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln
+index ffa3fa4..3f23607 100644
+--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln
++++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln
+@@ -1,7 +1,9 @@
+ 
+-Microsoft Visual Studio Solution File, Format Version 9.00
+-# Visual C++ Express 2005
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsdl2h", "wsdl2h\wsdl2h.vcproj", "{6CBC554A-4FFB-461F-91D4-11B358802815}"
++Microsoft Visual Studio Solution File, Format Version 12.00
++# Visual Studio 14
++VisualStudioVersion = 14.0.25420.1
++MinimumVisualStudioVersion = 10.0.40219.1
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsdl2h", "wsdl2h\wsdl2h.vcxproj", "{6CBC554A-4FFB-461F-91D4-11B358802815}"
+ EndProject
+ Global
+ 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj
+new file mode 100644
+index 0000000..abf3ea6
+--- /dev/null
++++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj
+@@ -0,0 +1,139 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++  <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|Win32">
++      <Configuration>Debug</Configuration>
++      <Platform>Win32</Platform>
++    </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|Win32">
++      <Configuration>Release</Configuration>
++      <Platform>Win32</Platform>
++    </ProjectConfiguration>
++  </ItemGroup>
++  <PropertyGroup Label="Globals">
++    <ProjectGuid>{6CBC554A-4FFB-461F-91D4-11B358802815}</ProjectGuid>
++    <RootNamespace>wsdl2h</RootNamespace>
++    <Keyword>Win32Proj</Keyword>
++    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++  </PropertyGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <PlatformToolset>v140</PlatformToolset>
++    <CharacterSet>Unicode</CharacterSet>
++    <WholeProgramOptimization>true</WholeProgramOptimization>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <PlatformToolset>v140</PlatformToolset>
++    <CharacterSet>Unicode</CharacterSet>
++  </PropertyGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
++  <ImportGroup Label="ExtensionSettings">
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++  </ImportGroup>
++  <PropertyGroup Label="UserMacros" />
++  <PropertyGroup>
++    <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
++    <IntDir>$(Configuration)\</IntDir>
++    <LinkIncremental>true</LinkIncremental>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
++    <IntDir>$(Configuration)\</IntDir>
++    <LinkIncremental>false</LinkIncremental>
++  </PropertyGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <MinimalRebuild>true</MinimalRebuild>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <PrecompiledHeader />
++      <WarningLevel>Level3</WarningLevel>
++      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
++    </ClCompile>
++    <Link>
++      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <TargetMachine>MachineX86</TargetMachine>
++    </Link>
++  </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++    <ClCompile>
++      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++      <PrecompiledHeader />
++      <WarningLevel>Level3</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++    </ClCompile>
++    <Link>
++      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OptimizeReferences>true</OptimizeReferences>
++      <EnableCOMDATFolding>true</EnableCOMDATFolding>
++      <TargetMachine>MachineX86</TargetMachine>
++    </Link>
++  </ItemDefinitionGroup>
++  <ItemGroup>
++    <ClCompile Include="bpel.cpp" />
++    <ClCompile Include="mime.cpp" />
++    <ClCompile Include="schema.cpp" />
++    <ClCompile Include="service.cpp" />
++    <ClCompile Include="soap.cpp" />
++    <ClCompile Include="stdsoap2.cpp" />
++    <ClCompile Include="types.cpp" />
++    <ClCompile Include="wadl.cpp" />
++    <ClCompile Include="wsdl.cpp" />
++    <ClCompile Include="wsdl2h.cpp" />
++    <ClCompile Include="wsdlC.cpp" />
++    <ClCompile Include="wsp.cpp" />
++  </ItemGroup>
++  <ItemGroup>
++    <ClInclude Include="bpel.h" />
++    <ClInclude Include="dime.h" />
++    <ClInclude Include="gwsdl.h" />
++    <ClInclude Include="http.h" />
++    <ClInclude Include="imports.h" />
++    <ClInclude Include="includes.h" />
++    <ClInclude Include="mime.h" />
++    <ClInclude Include="schema.h" />
++    <ClInclude Include="service.h" />
++    <ClInclude Include="soap.h" />
++    <ClInclude Include="sp.h" />
++    <ClInclude Include="stdsoap2.h" />
++    <ClInclude Include="types.h" />
++    <ClInclude Include="wadl.h" />
++    <ClInclude Include="wsam.h" />
++    <CustomBuild Include="wsdl.h">
++      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Parsing WSDL and Schema definitions</Message>
++      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">soapcpp2.exe -SC -pwsdl %(Filename)%(Extension)
++</Command>
++      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wsdlStub.h wsdlH.h wsdlC.cpp;%(Outputs)</Outputs>
++      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Parsing WSDL and Schema definitions</Message>
++      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">soapcpp2.exe -SC -pwsdl %(Filename)%(Extension)
++</Command>
++      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wsdlStub.h wsdlH.h wsdlC.cpp;%(Outputs)</Outputs>
++    </CustomBuild>
++    <ClInclude Include="wsdlH.h" />
++    <ClInclude Include="wsdlStub.h" />
++    <ClInclude Include="wsp.h" />
++    <ClInclude Include="wsrmp.h" />
++    <ClInclude Include="wst.h" />
++    <ClInclude Include="wsu.h" />
++  </ItemGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
++  <ImportGroup Label="ExtensionTargets">
++  </ImportGroup>
++</Project>
+\ No newline at end of file
diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake
new file mode 100644
index 000000000..8162d6780
--- /dev/null
+++ b/ports/gsoap/portfile.cmake
@@ -0,0 +1,61 @@
+include(vcpkg_common_functions)
+set(GSOAP_VERSION 2.8)
+set(GSOAP_SUB_VERSION .78)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gsoap-${GSOAP_VERSION})
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://ayera.dl.sourceforge.net/project/gsoap2/gsoap-${GSOAP_VERSION}/gsoap_${GSOAP_VERSION}${GSOAP_SUB_VERSION}.zip"
+    FILENAME "gsoap_${GSOAP_VERSION}${GSOAP_SUB_VERSION}.zip"
+    SHA512 c115044d2662c2dd355c4756a974a0013b7213dd28c536aba179e53c19466279bfa34ce16b4426db5aa7a24d94c18e0ed7e7cdf05e799bf89f7b54031aa0874e
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES
+       "${CMAKE_CURRENT_LIST_DIR}/fix-build-in-windows.patch"
+)
+
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(BUILD_ARCH "Win32")
+else()
+    message("gsoap only supported Win32")
+    set(BUILD_ARCH "Win32")
+endif()
+
+# Handle binary files and includes
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/gsoap ${CURRENT_PACKAGES_DIR}/debug/tools)
+
+if (WIN32)
+    vcpkg_build_msbuild(
+        USE_VCPKG_INTEGRATION
+        PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln
+        PLATFORM ${BUILD_ARCH}
+        TARGET Build
+    )
+    vcpkg_build_msbuild(
+        USE_VCPKG_INTEGRATION
+        PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln
+        PLATFORM ${BUILD_ARCH}
+        TARGET Build
+    )
+    
+    file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/release/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/)
+    file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/release/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/)
+    file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/debug/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/)
+    file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/debug/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/)
+else()
+    message(FATAL_ERROR "Sorry but gsoap only can be build in Windows temporary")
+endif()
+
+    
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${SOURCE_PATH}/gsoap/stdsoap2.h ${SOURCE_PATH}/gsoap/stdsoap2.c ${SOURCE_PATH}/gsoap/stdsoap2.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE.txt ${SOURCE_PATH}/INSTALL.txt ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/copyright)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/INSTALL.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/install)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/README.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/readme) 
+
+vcpkg_copy_pdbs()
+\ No newline at end of file
diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL
index 5b3a7c465..97e7f3f8c 100644
--- a/ports/gtest/CONTROL
+++ b/ports/gtest/CONTROL
@@ -1,3 +1,3 @@
 Source: gtest
-Version: 1.8.1-1
+Version: 2019-01-04
 Description: GoogleTest and GoogleMock testing frameworks.
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
index 4b0857de4..62d307aa2 100644
--- a/ports/gtest/portfile.cmake
+++ b/ports/gtest/portfile.cmake
@@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/googletest
-    REF release-1.8.1
-    SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
+    REF b6cd405286ed8635ece71c72f118e659f4ade3fb
+    SHA512 1642a9cf1923d00c52c346399941517787431dad3e6d3a5da07bc02243a231a95e30e0a9568ffd29bb9b9757f15c1c47d2d811c2bedb301f2d27cf912be0a534
     HEAD_REF master
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-z7-override.patch
diff --git a/ports/harfbuzz/0002-fix-macos-build.patch b/ports/harfbuzz/0002-fix-macos-build.patch
new file mode 100644
index 000000000..3b32092c1
--- /dev/null
+++ b/ports/harfbuzz/0002-fix-macos-build.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c613e0..32d3a29 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.0)
++cmake_minimum_required(VERSION 3.5.0)
+ project(harfbuzz)
+ 
+ enable_testing()
+@@ -316,6 +316,10 @@ if (HB_HAVE_GLIB)
+ 
+   find_package(Threads REQUIRED)
+   find_package(unofficial-iconv REQUIRED)
++  if(APPLE)
++    find_package(unofficial-gettext CONFIG REQUIRED)
++    list(APPEND THIRD_PARTY_LIBS unofficial::gettext::libintl)
++  endif()
+   find_package(unofficial-glib CONFIG REQUIRED)
+ 
+   list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc)
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 32d70f5ec..fccb549ff 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,7 +1,7 @@
 Source: harfbuzz
-Version: 1.8.4-3
+Version: 1.8.4-4
 Description: HarfBuzz OpenType text shaping engine
-Build-Depends: freetype, ragel
+Build-Depends: freetype, ragel, gettext (osx)
 Default-Features: ucdn
 
 Feature: graphite2
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index 382b045e1..d1455e5dc 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
         find-package-freetype-2.patch
         glib-cmake.patch
         0001-fix-cmake-export.patch
+        0002-fix-macos-build.patch
 )
 
 SET(HB_HAVE_ICU "OFF")
diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL
index 253b3aaae..e99f115ae 100644
--- a/ports/hpx/CONTROL
+++ b/ports/hpx/CONTROL
@@ -1,5 +1,5 @@
 Source: hpx
-Version: 1.2.0
+Version: 1.2.1-0
 Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
 Description: The C++ Standards Library for Concurrency and Parallelism 
   HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case.
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake
index 704d944fc..2955905ce 100644
--- a/ports/hpx/portfile.cmake
+++ b/ports/hpx/portfile.cmake
@@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO STEllAR-GROUP/hpx
-    REF 1.2.0
-    SHA512 caf2650381856db6a96fd4b120975d94d68d9bb19ada1d6cd076abe2d4aa1418e410167f774a881d95eacd0d46bbd5f90f16a4c77b4a2cf00e5b24ea17bfe670
+    REF 1.2.1
+    SHA512 46e9e36cbd9bec935b2a1efce8167c641de88aca8e4dd9c2e3269a1d82ab2965812b5483b6dff4465634f454757b19ad4f73ddcc5ddd73d6efbf28d0819f7dc7
     HEAD_REF master
 )
 
diff --git a/ports/hyperscan/CONTROL b/ports/hyperscan/CONTROL
new file mode 100644
index 000000000..bf45c2238
--- /dev/null
+++ b/ports/hyperscan/CONTROL
@@ -0,0 +1,4 @@
+Source: hyperscan
+Version: 5.0.1-1
+Description: A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.
+Build-Depends: boost-array, boost-chrono, boost-config, boost-core, boost-detail, boost-functional, boost-regex, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-utility, boost-dynamic-bitset, boost-random, boost-graph, boost-multi-array, boost-icl, boost-ptr-container, python3, ragel
+\ No newline at end of file
diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake
new file mode 100644
index 000000000..be8410b38
--- /dev/null
+++ b/ports/hyperscan/portfile.cmake
@@ -0,0 +1,41 @@
+# Build with 'vcpkg.exe install hyperscan:x86-windows-static-release'; Hyperscan doesn't support dynamic libraries on Windows.
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+
+set(HYPERSCAN_VERSION 5.1.0)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/intel/hyperscan/archive/v${HYPERSCAN_VERSION}.zip"
+    FILENAME "v${HYPERSCAN_VERSION}.zip"
+    SHA512 89a826c1e66175f1781f57d0d430f2d5d245ab590acc4b5df6638c5f6fe43914db028f8bc86e566ea27b55883c91be0d8da079b3d7547899f7cf540b52a3cf0a
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${HYPERSCAN_VERSION})
+
+vcpkg_find_acquire_program(PYTHON3)
+
+# Add python3 to path
+get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY)
+vcpkg_add_to_path(PREPEND ${PYTHON_PATH})
+vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin)
+vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin)
+vcpkg_find_acquire_program(PYTHON3)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/hyperscan RENAME copyright)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Post-build test for cmake libraries
+# vcpkg_test_cmake(PACKAGE_NAME hs)
diff --git a/ports/ilmbase/CONTROL b/ports/ilmbase/CONTROL
index 9e405df31..51ea5dffc 100644
--- a/ports/ilmbase/CONTROL
+++ b/ports/ilmbase/CONTROL
@@ -1,3 +1,4 @@
-Source: ilmbase
-Version: 2.2.1-1
-Description: Base libraries from ILM for OpenEXR
+Source: ilmbase
+Version: 2.3.0
+Build-Depends: openexr
+Description: empty package, linking to newer one
diff --git a/ports/ilmbase/fix-parallel-build.patch b/ports/ilmbase/fix-parallel-build.patch
deleted file mode 100644
index 85c773f31..000000000
--- a/ports/ilmbase/fix-parallel-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Half/CMakeLists.txt b/Half/CMakeLists.txt
-index 6f9714d..0c43904 100644
---- a/Half/CMakeLists.txt
-+++ b/Half/CMakeLists.txt
-@@ -2,10 +2,10 @@
- 
- ADD_EXECUTABLE ( eLut eLut.cpp )
- 
--ADD_CUSTOM_COMMAND (
--  TARGET eLut POST_BUILD
-+ADD_CUSTOM_TARGET ( make_eLut
-   COMMAND eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
-   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+  DEPENDS eLut
- )
- SET_SOURCE_FILES_PROPERTIES(
-   ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
-@@ -13,25 +13,16 @@ SET_SOURCE_FILES_PROPERTIES(
-   )
- 
- ADD_EXECUTABLE ( toFloat toFloat.cpp )
--ADD_CUSTOM_COMMAND (
--  TARGET toFloat POST_BUILD
-+ADD_CUSTOM_TARGET ( make_toFloat
-   COMMAND toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
-   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+  DEPENDS toFloat
- )
- SET_SOURCE_FILES_PROPERTIES(
-   ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
-   PROPERTIES HEADER_FILE_ONLY TRUE
-   )
- 
--SET_SOURCE_FILES_PROPERTIES(
--  half.cpp
--  PROPERTIES
--  OBJECT_DEPENDS
--  ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
--  OBJECT_DEPENDS
--  ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
--  )
--
- IF(BUILD_SHARED_LIBS)
-     ADD_DEFINITIONS(-DHALF_EXPORTS)
- ENDIF()
-@@ -41,7 +32,7 @@ ADD_LIBRARY ( Half ${LIB_TYPE}
-   )
- 
- 
--ADD_DEPENDENCIES ( Half toFloat eLut )
-+ADD_DEPENDENCIES ( Half make_toFloat make_eLut )
- 
- INSTALL ( TARGETS
-   Half
diff --git a/ports/ilmbase/portfile.cmake b/ports/ilmbase/portfile.cmake
index 1752beb2c..9aefc8241 100644
--- a/ports/ilmbase/portfile.cmake
+++ b/ports/ilmbase/portfile.cmake
@@ -1,49 +1 @@
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "UWP build not supported")
-endif()
-
-set(ILM_VERSION 2.2.1)
-set(ILM_HASH a08ddd9069b34a93612445a445a2ddf80c0e22349bcf221a3cc6e9f5575180b08a8b597009dacabf072360e7162e15964988bc79e8ec82cf3da6507148a75320)
-
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ilmbase-${ILM_VERSION})
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILM_VERSION}.tar.gz"
-    FILENAME "ilmbase-${ILM_VERSION}.tar.gz"
-    SHA512 ${ILM_HASH})
-
-vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-parallel-build.patch)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA)
-vcpkg_install_cmake()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    foreach(SUBDIR "" "/debug")
-        file(GLOB DLLS ${CURRENT_PACKAGES_DIR}${SUBDIR}/lib/*.dll)
-        file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}${SUBDIR}/bin)
-        file(REMOVE ${DLLS})
-    endforeach()
-endif()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-vcpkg_copy_pdbs()
-
-foreach(HEADER halfExport.h IexExport.h IexMathFloatExc.h IlmThreadExport.h ImathExport.h)
-    file(READ ${CURRENT_PACKAGES_DIR}/include/OpenEXR/${HEADER} HEADER_FILE)
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        string(REPLACE "defined(OPENEXR_DLL)" "1" HEADER_FILE "${HEADER_FILE}")
-    else()
-        string(REPLACE "defined(OPENEXR_DLL)" "0" HEADER_FILE "${HEADER_FILE}")
-    endif()
-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/OpenEXR/${HEADER} "${HEADER_FILE}")
-endforeach()
-
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ilmbase)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/ilmbase/LICENSE ${CURRENT_PACKAGES_DIR}/share/ilmbase/copyright)
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL
index 376a3a103..41c394eac 100644
--- a/ports/imgui/CONTROL
+++ b/ports/imgui/CONTROL
@@ -1,3 +1,3 @@
 Source: imgui
-Version: 1.67-1
+Version: 1.68
 Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.
diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake
index e5aaa471c..2c731a11c 100644
--- a/ports/imgui/portfile.cmake
+++ b/ports/imgui/portfile.cmake
@@ -1,10 +1,18 @@
 include(vcpkg_common_functions)
 
+if (TARGET_TRIPLET MATCHES "^x(86|64)-windows$" AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(WARNING "\
+The author of imgui strongly advises users of this lib against using a DLL. \
+For more details, please visit: \
+https://github.com/Microsoft/vcpkg/issues/5110"
+    )
+endif ()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ocornut/imgui
-    REF v1.67
-    SHA512 14cca66a55597517d6e1cafa59897b8e8f482db0a31a73d87a3ca634a12afe9ece2f423c17ece802e23bb2c09322502b2b2c4318054fad03bd1c537031fd6f71
+    REF v1.68
+    SHA512 4a7996f188816eb1caa3130546fbfbe2069a8a338daf0540ae09e7c7d6a40082e25144e91c94f53d7ff6023925c92ce591e4d59614e08b1ca7b91097519bf4a4
     HEAD_REF master
 )
 
diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt
new file mode 100644
index 000000000..b58739836
--- /dev/null
+++ b/ports/irrlicht/CMakeLists.txt
@@ -0,0 +1,208 @@
+#
+# Irrlicht 3D engine
+#
+cmake_minimum_required(VERSION 3.8)
+project(Irrlicht)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+    
+# Irrlicht directories
+# -------------------------------------------------------------------------------------------------
+set(IRR_ROOT_DIR "")
+set(IRR_SRC_DIR "source/Irrlicht")
+set(IRR_INC_DIR "include")
+
+# Options
+# -------------------------------------------------------------------------------------------------
+set(DXSDK "")
+if(DEFINED ENV{DXSDK_DIR})
+    set(DXSDK "ENV{DXSDK_DIR}")
+endif()
+
+set(IRR_FAST_MATH 0 CACHE BOOL "Whether to enable fast maths (at the expense of precision)")
+set(IRR_SHARED_LIB 1 CACHE BOOL "Whether to generate shared libraries instead of static libraries")
+set(IRR_DIRECTX_SDK ${DXSDK} CACHE PATH "Path to the DirectX SDK (for DirectX 9, this folder should contain /Include, /Lib)")
+set(IRR_BUILD_TOOLS 0 CACHE BOOL "Whether to generate the tools")
+
+# Some helper functions
+# -------------------------------------------------------------------------------------------------
+function(glob_c_cpp_sources result folder)
+    file(GLOB res
+        "${folder}/*.c"
+        "${folder}/*.cpp"
+        "${folder}/*.h"
+        "${folder}/*.hpp"
+        "${folder}/*.rc")
+    set(${result} ${res} PARENT_SCOPE)
+endfunction()
+
+# Source files
+# -------------------------------------------------------------------------------------------------
+glob_c_cpp_sources(IRR_SRC_FILES                    ${IRR_SRC_DIR})
+glob_c_cpp_sources(IRR_SRC_FILES_INTERFACE          ${IRR_INC_DIR})
+glob_c_cpp_sources(IRR_SRC_FILES_AESGLADMAN         ${IRR_SRC_DIR}/aesGladman)
+glob_c_cpp_sources(IRR_SRC_FILES_LZMA               ${IRR_SRC_DIR}/lzma)
+
+glob_c_cpp_sources(IRR_TOOL_FILES_FILE_TO_HEADER    ${IRR_ROOT_DIR}/tools/FileToHeader/)
+glob_c_cpp_sources(IRR_TOOL_FILES_GUI_EDITOR        ${IRR_ROOT_DIR}/tools/GUIEditor/)
+glob_c_cpp_sources(IRR_TOOL_FILES_FONT_TOOL         ${IRR_ROOT_DIR}/tools/IrrFontTool/newFontTool/)
+glob_c_cpp_sources(IRR_TOOL_FILES_MESH_CONVERTER    ${IRR_ROOT_DIR}/tools/MeshConverter/)
+    
+# Group files
+# -------------------------------------------------------------------------------------------------
+source_group(Irrlicht\\engine           FILES ${IRR_SRC_FILES})
+source_group(Irrlicht\\interface        FILES ${IRR_SRC_FILES_INTERFACE})
+source_group(Irrlicht\\libs\\aesGladman FILES ${IRR_SRC_FILES_AESGLADMAN})
+source_group(Irrlicht\\libs\\lzma       FILES ${IRR_SRC_FILES_LZMA})
+
+# Library files
+# -------------------------------------------------------------------------------------------------
+find_package(ZLIB REQUIRED)
+find_package(PNG REQUIRED)
+find_package(JPEG REQUIRED)
+find_package(BZip2 REQUIRED)
+#find_package(LIBLZMA REQUIRED) # LIBLZMA does not export _LzmaDecode
+
+# Irrlicht target
+# -------------------------------------------------------------------------------------------------
+set(IRR_ALL_SRC_FILES
+    ${IRR_SRC_FILES}
+    ${IRR_SRC_FILES_INTERFACE}
+    ${IRR_SRC_FILES_AESGLADMAN}
+    ${IRR_SRC_FILES_LZMA}
+    )
+
+if(${IRR_SHARED_LIB})
+    add_library(Irrlicht SHARED ${IRR_ALL_SRC_FILES})
+else()
+    add_library(Irrlicht STATIC ${IRR_ALL_SRC_FILES})
+endif()
+
+target_link_libraries(Irrlicht PRIVATE 
+    ${ZLIB_LIBRARY} 
+    ${PNG_LIBRARY} 
+    ${JPEG_LIBRARY} 
+    ${BZIP2_LIBRARY}
+    )
+
+if(IRR_BUILD_TOOLS)
+    add_executable(FileToHeader         ${IRR_TOOL_FILES_FILE_TO_HEADER})
+
+    add_executable(GUIEditor            ${IRR_TOOL_FILES_GUI_EDITOR})
+    target_link_libraries(GUIEditor     Irrlicht)
+
+    add_executable(FontTool             ${IRR_TOOL_FILES_FONT_TOOL})
+    target_link_libraries(FontTool      Irrlicht)
+
+    add_executable(MeshConverter        ${IRR_TOOL_FILES_MESH_CONVERTER})
+    target_link_libraries(MeshConverter Irrlicht)
+endif()
+
+# Target properties (for compilation & export)
+# -------------------------------------------------------------------------------------------------
+target_include_directories(Irrlicht
+    PRIVATE ${IRR_SRC_DIR}
+    PRIVATE ${IRR_SRC_DIR}/aesGladman
+    PRIVATE ${BZIP2_INCLUDE_DIR}
+    PRIVATE ${JPEG_INCLUDE_DIR}
+    PRIVATE ${LIBPNG_INCLUDE_DIR}
+    PRIVATE ${IRR_SRC_DIR}/lzma
+    PRIVATE ${ZLIB_INCLUDE_DIR}
+    )
+
+# I dont realy understand why this is necesary or what it is doing,
+# but it is necesarry to build and export a package. 
+# See: https://cmake.org/cmake/help/v3.8/command/target_include_directories.html
+target_include_directories(Irrlicht PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include/irrlicht>  # <prefix>/include/irrlicht
+)
+
+if(NOT ${IRR_DIRECTX_SDK} STREQUAL "")
+    target_include_directories(Irrlicht PRIVATE ${IRR_DIRECTX_SDK}/Include)
+    if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
+        set(DX_LIBS ${IRR_DIRECTX_SDK}/Lib/x86)
+    else()
+        set(DX_LIBS ${IRR_DIRECTX_SDK}/Lib/x64)
+    endif()
+    target_link_libraries(Irrlicht
+        PRIVATE ${DX_LIBS}/d3dx9.lib
+        PRIVATE ${DX_LIBS}/dinput8.lib
+        PRIVATE ${DX_LIBS}/dxguid.lib)
+else()
+    target_compile_definitions(Irrlicht PRIVATE NO_IRR_COMPILE_WITH_DIRECT3D_9_)
+endif()
+
+if(NOT ${IRR_SHARED_LIB})
+    target_compile_definitions(Irrlicht PUBLIC _IRR_STATIC_LIB_)
+endif()
+
+# Per platform config
+# -------------------------------------------------------------------------------------------------
+
+# Export symbols
+target_compile_definitions(Irrlicht PRIVATE IRRLICHT_EXPORTS)
+
+if(WIN32)
+    # Import the symbols of bzip2
+    target_compile_definitions(Irrlicht PRIVATE BZ_IMPORT)
+
+    # Disable the ton of warnings from standard library
+    target_compile_definitions(Irrlicht PRIVATE _CRT_SECURE_NO_WARNINGS)
+
+    # Multi processor compilation
+    target_compile_options(Irrlicht PRIVATE /MP)
+
+    # Fast math options
+    if(${IRR_FAST_MATH})
+        target_compile_options(Irrlicht PRIVATE /fp:fast)
+        message("Fast Math Enabled")
+        # SSE2 is automatically activated on x64
+        if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
+            target_compile_options(Irrlicht PRIVATE /arch:SSE2)
+        endif()
+    endif()
+
+elseif(UNIX)
+    # Standard mode
+    target_compile_options(Irrlicht
+        PRIVATE -Wall
+        PRIVATE -pipe
+        PRIVATE -fno-exceptions
+        PRIVATE -fno-strict-aliasing)
+    
+    # Disable RTTI on C++ files only (no sense for C files)
+    set_source_files_properties(${IRR_SRC_FILES} ${IRR_SRC_FILES_AESGLADMAN}
+        PROPERTIES COMPILE_FLAGS -fno-rtti)
+
+    # Debug macro
+    target_compile_options(Irrlicht PRIVATE $<$<CONFIG:Debug>:-D_DEBUG>)
+
+    # X11 and OpenGL
+    target_link_libraries(Irrlicht
+        PRIVATE X11
+        PRIVATE GL
+        PRIVATE Xxf86vm)
+endif()
+
+# Installation
+# -------------------------------------------------------------------------------------------------
+install(
+    TARGETS Irrlicht
+    EXPORT Irrlicht
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
+
+install(FILES ${IRR_SRC_FILES_INTERFACE} DESTINATION "include/irrlicht" CONFIGURATIONS Release)
+
+if(IRR_BUILD_TOOLS)
+    install(
+        TARGETS FileToHeader GUIEditor FontTool MeshConverter 
+        RUNTIME DESTINATION tools/irrlicht/
+        CONFIGURATIONS Release
+    )
+endif()
+
+install(EXPORT Irrlicht FILE irrlicht-targets.cmake DESTINATION share/irrlicht)
diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL
new file mode 100644
index 000000000..59071e8dc
--- /dev/null
+++ b/ports/irrlicht/CONTROL
@@ -0,0 +1,10 @@
+Source: irrlicht
+Version: 1.8.4
+Description: Irrlicht lightning fast 3d engine
+Build-Depends: zlib, libpng, bzip2, libjpeg-turbo
+
+Feature: fast-fpu
+Description: Enable fast maths (at the expense of precision)
+
+Feature: tools
+Description: Build the Tools FileToHeader, FontTool, GUIEditor and MeshConverter
diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake
new file mode 100644
index 000000000..0f9f4691e
--- /dev/null
+++ b/ports/irrlicht/portfile.cmake
@@ -0,0 +1,94 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+
+include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://downloads.sourceforge.net/project/irrlicht/Irrlicht%20SDK/1.8/1.8.4/irrlicht-1.8.4.zip"
+    FILENAME "irrlicht-1.8.4.zip"
+    SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF "1.8.4"
+    # [NO_REMOVE_ONE_LEVEL]
+    # [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>]
+    # [PATCHES <a.patch>...]
+)
+
+# Copy CMakeLists.txt to the source, because Irrlicht does not have one.
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+set(FAST_MATH FALSE)
+if("fast-fpu" IN_LIST FEATURES)
+    set(FAST_MATH TRUE)
+endif()
+
+set(BUILD_TOOLS FALSE)
+if("tools" IN_LIST FEATURES)
+    set(BUILD_TOOLS TRUE)
+endif()
+
+set(SHARED_LIB TRUE)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(SHARED_LIB FALSE)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS 
+        -DIRR_SHARED_LIB=${SHARED_LIB} 
+        -DIRR_FAST_MATH=${FAST_MATH}
+        -DIRR_BUILD_TOOLS=${BUILD_TOOLS}
+    # OPTIONS_RELEASE -DOPTIMIZE=1
+    # OPTIONS_DEBUG -DDEBUGGABLE=1
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets()
+
+if(BUILD_TOOLS)
+    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/)
+endif()
+
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)")
+# Handle copyright
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/irrlicht/copyright "
+The Irrlicht Engine License
+===========================
+
+Copyright (C) 2002-2015 Nikolaus Gebhardt
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgement in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be clearly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.")
+
+vcpkg_copy_pdbs()
+
+# Post-build test for cmake libraries
+vcpkg_test_cmake(PACKAGE_NAME irrlicht)
diff --git a/ports/json-spirit/CONTROL b/ports/json-spirit/CONTROL
index dcfc407d7..e2b1d8079 100644
--- a/ports/json-spirit/CONTROL
+++ b/ports/json-spirit/CONTROL
@@ -1,4 +1,4 @@
 Source: json-spirit
-Version: 4.1.0
+Version: 4.1.0-1
 Description: json parser using boost library
 Build-Depends: boost-config, boost-integer, boost-smart-ptr, boost-variant, boost-spirit
diff --git a/ports/json-spirit/Fix-link-error-C1128.patch b/ports/json-spirit/Fix-link-error-C1128.patch
new file mode 100644
index 000000000..e676931cc
--- /dev/null
+++ b/ports/json-spirit/Fix-link-error-C1128.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 24b1caf..2aac0b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,7 +60,9 @@ endif()
+ 
+ message(${CMAKE_INSTALL_INCLUDEDIR})
+ 
+-
++if(MSVC)
++add_definitions(/bigobj)
++endif()
+ set(CPACK_PACKAGE_VERSION_MAJOR 4)
+ set(CPACK_PACKAGE_VERSION_MINOR 0)
+ set(CPACK_PACKAGE_VERSION_PATCH 8)
diff --git a/ports/json-spirit/dll-wins.patch b/ports/json-spirit/dll-wins.patch
new file mode 100644
index 000000000..18c60e580
--- /dev/null
+++ b/ports/json-spirit/dll-wins.patch
@@ -0,0 +1,281 @@
+diff --git a/.travis.yml b/.travis.yml
+index e5b56eb..87f2926 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -14,4 +14,4 @@ script:
+   - cmake --build . --target all --
+ 
+ after_script:
+-  - ctest
++  - ctest 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fb24877..a10a49f 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,15 +60,17 @@ endif()
+ 
+ message(${CMAKE_INSTALL_INCLUDEDIR})
+ 
+-
++
+ set(CPACK_PACKAGE_VERSION_MAJOR 4)
+ set(CPACK_PACKAGE_VERSION_MINOR 0)
+ set(CPACK_PACKAGE_VERSION_PATCH 8)
+ set(CPACK_PACKAGE_DESCRIPTION "A C++ JSON Parser/Generator Implemented with Boost Spirit")
+ include(CPack)
+-
++
++set(EXPORT_HEADERS )
+ INSTALL(
+   FILES
++  json_spirit/json_spirit_global.h
+   json_spirit/json_spirit.h
+   json_spirit/json_spirit_error_position.h
+   json_spirit/json_spirit_reader.h
+@@ -80,4 +82,4 @@ INSTALL(
+   json_spirit/json_spirit_writer_template.h
+   json_spirit/json_spirit_writer_options.h
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json_spirit)
+-
++
+diff --git a/json_spirit/CMakeLists.txt b/json_spirit/CMakeLists.txt
+index 23da64c..10d4e2b 100755
+--- a/json_spirit/CMakeLists.txt
++++ b/json_spirit/CMakeLists.txt
+@@ -15,13 +15,19 @@ SET(JSON_SPIRIT_SRCS
+ FIND_PACKAGE(Boost 1.34 REQUIRED)
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
+ 
+-
++
+ OPTION(BUILD_STATIC_LIBS "Build static libraries" OFF)
+ 
+ if(BUILD_STATIC_LIBS)
+   ADD_LIBRARY(json_spirit STATIC ${JSON_SPIRIT_SRCS})
+-  install(TARGETS json_spirit ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  install(TARGETS json_spirit ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})  
+ else(BUILD_STATIC_LIBS)
+   ADD_LIBRARY(json_spirit SHARED ${JSON_SPIRIT_SRCS})
+-  install(TARGETS json_spirit LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  if(WIN32)
++    install(TARGETS json_spirit RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++    install(TARGETS json_spirit ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})  
++  else()
++    install(TARGETS json_spirit LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  endif()
++  
+ endif(BUILD_STATIC_LIBS)
+diff --git a/json_spirit/json_spirit_global.h b/json_spirit/json_spirit_global.h
+new file mode 100644
+index 0000000..07a7d2c
+--- /dev/null
++++ b/json_spirit/json_spirit_global.h
+@@ -0,0 +1,18 @@
++#ifndef JSON_SPIRIT_GLOBAL_H
++#define JSON_SPIRIT_GLOBAL_H
++
++#if (defined _WIN32) || (defined _WIN64)
++    #define DECL_EXPORT __declspec(dllexport)
++    #define DECL_IMPORT __declspec(dllimport)
++#else
++    #define DECL_EXPORT
++    #define DECL_IMPORT
++#endif
++
++#if defined(json_spirit_EXPORTS)
++#  define json_spirit_EXPORT DECL_EXPORT
++#else
++#  define json_spirit_EXPORT DECL_IMPORT
++#endif
++
++#endif
+\ No newline at end of file
+diff --git a/json_spirit/json_spirit_reader.h b/json_spirit/json_spirit_reader.h
+index a6cfac7..50cc6f5 100755
+--- a/json_spirit/json_spirit_reader.h
++++ b/json_spirit/json_spirit_reader.h
+@@ -11,6 +11,7 @@
+ # pragma once
+ #endif
+ 
++#include "json_spirit_global.h"
+ #include "json_spirit_value.h"
+ #include "json_spirit_error_position.h"
+ #include <iostream>
+@@ -20,43 +21,43 @@ namespace json_spirit
+     // functions to reads a JSON values
+ 
+ #ifdef JSON_SPIRIT_VALUE_ENABLED
+-    bool read( const std::string& s, Value& value );
+-    bool read( std::istream& is,     Value& value );
+-    bool read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value );
++    json_spirit_EXPORT bool read( const std::string& s, Value& value );
++    json_spirit_EXPORT bool read( std::istream& is,     Value& value );
++    json_spirit_EXPORT bool read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value );
+ 
+-    void read_or_throw( const std::string& s, Value& value );  
+-    void read_or_throw( std::istream& is,     Value& value );
+-    void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value );
++    json_spirit_EXPORT void read_or_throw( const std::string& s, Value& value );  
++    json_spirit_EXPORT void read_or_throw( std::istream& is,     Value& value );
++    json_spirit_EXPORT void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value );
+ #endif
+ 
+ #if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING )
+-    bool read( const std::wstring& s, wValue& value );
+-    bool read( std::wistream&  is,    wValue& value );
+-    bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value );    
++    json_spirit_EXPORT bool read( const std::wstring& s, wValue& value );
++    json_spirit_EXPORT bool read( std::wistream&  is,    wValue& value );
++    json_spirit_EXPORT bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value );    
+ 
+-    void read_or_throw( const std::wstring& s, wValue& value );
+-    void read_or_throw( std::wistream& is,     wValue& value );
+-    void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value );
++    json_spirit_EXPORT void read_or_throw( const std::wstring& s, wValue& value );
++    json_spirit_EXPORT void read_or_throw( std::wistream& is,     wValue& value );
++    json_spirit_EXPORT void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value );
+ #endif
+ 
+ #ifdef JSON_SPIRIT_MVALUE_ENABLED
+-    bool read( const std::string& s, mValue& value );
+-    bool read( std::istream& is,     mValue& value );
+-    bool read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value );
++    json_spirit_EXPORT bool read( const std::string& s, mValue& value );
++    json_spirit_EXPORT bool read( std::istream& is,     mValue& value );
++    json_spirit_EXPORT bool read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value );
+ 
+-    void read_or_throw( const std::string& s, mValue& value );  
+-    void read_or_throw( std::istream& is,     mValue& value );
+-    void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value );
++    json_spirit_EXPORT void read_or_throw( const std::string& s, mValue& value );  
++    json_spirit_EXPORT void read_or_throw( std::istream& is,     mValue& value );
++    json_spirit_EXPORT void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value );
+ #endif
+ 
+ #if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING )
+-    bool read( const std::wstring& s, wmValue& value );
+-    bool read( std::wistream& is,     wmValue& value );
+-    bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value );    
++    json_spirit_EXPORT bool read( const std::wstring& s, wmValue& value );
++    json_spirit_EXPORT bool read( std::wistream& is,     wmValue& value );
++    json_spirit_EXPORT bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value );    
+ 
+-    void read_or_throw( const std::wstring& s, wmValue& value );
+-    void read_or_throw( std::wistream& is,     wmValue& value );
+-    void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value );
++    json_spirit_EXPORT void read_or_throw( const std::wstring& s, wmValue& value );
++    json_spirit_EXPORT void read_or_throw( std::wistream& is,     wmValue& value );
++    json_spirit_EXPORT void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value );
+ #endif
+ }
+ 
+diff --git a/json_spirit/json_spirit_writer.h b/json_spirit/json_spirit_writer.h
+index 2722780..f60dc07 100755
+--- a/json_spirit/json_spirit_writer.h
++++ b/json_spirit/json_spirit_writer.h
+@@ -11,6 +11,7 @@
+ # pragma once
+ #endif
+ 
++#include "json_spirit_global.h"
+ #include "json_spirit_value.h"
+ #include "json_spirit_writer_options.h"
+ #include <iostream>
+@@ -20,44 +21,44 @@ namespace json_spirit
+     // these functions to convert JSON Values to text
+ 
+ #ifdef JSON_SPIRIT_VALUE_ENABLED
+-    void         write( const Value&  value, std::ostream&  os, unsigned int options = 0 );
+-    std::string  write( const Value&  value, unsigned int options = 0 );
++    json_spirit_EXPORT void         write( const Value&  value, std::ostream&  os, unsigned int options = 0 );
++    json_spirit_EXPORT std::string  write( const Value&  value, unsigned int options = 0 );
+ #endif
+ 
+ #ifdef JSON_SPIRIT_MVALUE_ENABLED
+-    void         write( const mValue& value, std::ostream&  os, unsigned int options = 0 );
+-    std::string  write( const mValue& value, unsigned int options = 0 );
++    json_spirit_EXPORT void         write( const mValue& value, std::ostream&  os, unsigned int options = 0 );
++    json_spirit_EXPORT std::string  write( const mValue& value, unsigned int options = 0 );
+ #endif
+ 
+ #if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING )
+-    void         write( const wValue&  value, std::wostream& os, unsigned int options = 0 );
+-    std::wstring write( const wValue&  value, unsigned int options = 0 );
++    json_spirit_EXPORT void         write( const wValue&  value, std::wostream& os, unsigned int options = 0 );
++    json_spirit_EXPORT std::wstring write( const wValue&  value, unsigned int options = 0 );
+ #endif
+ 
+ #if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING )
+-    void         write( const wmValue& value, std::wostream& os, unsigned int options = 0 );
+-    std::wstring write( const wmValue& value, unsigned int options = 0 );
++    json_spirit_EXPORT void         write( const wmValue& value, std::wostream& os, unsigned int options = 0 );
++    json_spirit_EXPORT std::wstring write( const wmValue& value, unsigned int options = 0 );
+ #endif
+ 
+     // these "formatted" versions of the "write" functions are the equivalent of the above functions
+     // with option "pretty_print"
+     
+ #ifdef JSON_SPIRIT_VALUE_ENABLED
+-    void         write_formatted( const Value& value, std::ostream&  os );
+-    std::string  write_formatted( const Value& value );
++    json_spirit_EXPORT void         write_formatted( const Value& value, std::ostream&  os );
++    json_spirit_EXPORT std::string  write_formatted( const Value& value );
+ #endif
+ #ifdef JSON_SPIRIT_MVALUE_ENABLED
+-    void         write_formatted( const mValue& value, std::ostream&  os );
+-    std::string  write_formatted( const mValue& value );
++    json_spirit_EXPORT void         write_formatted( const mValue& value, std::ostream&  os );
++    json_spirit_EXPORT std::string  write_formatted( const mValue& value );
+ #endif
+ 
+ #if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING )
+-    void         write_formatted( const wValue& value, std::wostream& os );
+-    std::wstring write_formatted( const wValue& value );
++    json_spirit_EXPORT void         write_formatted( const wValue& value, std::wostream& os );
++    json_spirit_EXPORT std::wstring write_formatted( const wValue& value );
+ #endif
+ #if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING )
+-    void         write_formatted( const wmValue& value, std::wostream& os );
+-    std::wstring write_formatted( const wmValue& value );
++    json_spirit_EXPORT void         write_formatted( const wmValue& value, std::wostream& os );
++    json_spirit_EXPORT std::wstring write_formatted( const wmValue& value );
+ #endif
+ }
+ 
+diff --git a/json_test/json_spirit_value_test.cpp b/json_test/json_spirit_value_test.cpp
+index e055dae..faab022 100755
+--- a/json_test/json_spirit_value_test.cpp
++++ b/json_test/json_spirit_value_test.cpp
+@@ -381,9 +381,15 @@ namespace
+         Container_constructor_runner()
+         {
+             vector< double > vd = list_of( 1.2 )( 1.3 );  test_container_constructor( vd );
++            #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
++            vector< int >    vi = { 1 };                  test_container_constructor( vi );
++                             vi = { 1, 2 };               test_container_constructor( vi );
++                             vi = { 1, 2, 3 };            test_container_constructor( vi );
++            #else
+             vector< int >    vi = list_of( 1 );           test_container_constructor( vi );
+                              vi = list_of( 1 )( 2 );      test_container_constructor( vi );
+                              vi = list_of( 1 )( 2 )( 3 ); test_container_constructor( vi );
++            #endif                             
+             list< double >   ld = list_of( 1.2 )( 1.3 );  test_container_constructor( ld );
+             list< int >      li = list_of( 1 );           test_container_constructor( li );
+                              li = list_of( 1 )( 2 );      test_container_constructor( li );
+@@ -447,9 +453,15 @@ namespace
+             }
+             
+             vector< double > vd = list_of( 1.2 )( 1.3 );   test_variant_array_constructor< double > ( vd );
++            #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
++            vector< int >    vi = { 1 };                   test_variant_array_constructor< int >( vi );
++                             vi = { 1, 2 };                test_variant_array_constructor< int >( vi );
++                             vi = { 1, 2, 3 };             test_variant_array_constructor< int >( vi );
++            #else
+             vector< int >    vi = list_of( 1 );            test_variant_array_constructor< int >( vi );
+                              vi = list_of( 1 )( 2 );       test_variant_array_constructor< int >( vi );
+                              vi = list_of( 1 )( 2 )( 3 );  test_variant_array_constructor< int >( vi );
++            #endif
+             list< double >   ld = list_of( 1.2 )( 1.3 );   test_variant_array_constructor< double >( ld );
+             list< int >      li = list_of( 1 );            test_variant_array_constructor< int >( li );
+                              li = list_of( 1 )( 2 );       test_variant_array_constructor< int >( li );
diff --git a/ports/json-spirit/portfile.cmake b/ports/json-spirit/portfile.cmake
index d33737d79..3b5e1d316 100644
--- a/ports/json-spirit/portfile.cmake
+++ b/ports/json-spirit/portfile.cmake
@@ -1,19 +1,20 @@
 include(vcpkg_common_functions)
 
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO png85/json_spirit
     REF 5e16cca59b31d8beda0f07e3917ce11dcd43b3db
     SHA512 6ac0f15726391c9003e516213535c8d30e98b6c33bca0b03e9bf38e7085824bfc6cfaab267b1dfccbfcc567638d26f722d7e331f4e3b60d3acd5c717cb1fafcc
     HEAD_REF master
+    PATCHES
+        dll-wins.patch
+        Fix-link-error-C1128.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DBUILD_STATIC_LIBS=on -DJSON_SPIRIT_DEMOS=off -DJSON_SPIRIT_TESTS=off)
+    OPTIONS -DBUILD_STATIC_LIBS=off -DJSON_SPIRIT_DEMOS=off -DJSON_SPIRIT_TESTS=off)
 
 vcpkg_install_cmake()
 
diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake
index c29c869ed..f1badbd1e 100644
--- a/ports/jsoncpp/portfile.cmake
+++ b/ports/jsoncpp/portfile.cmake
@@ -18,6 +18,7 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON
             -DBUILD_STATIC_LIBS:BOOL=${JSONCPP_STATIC}
             -DBUILD_SHARED_LIBS:BOOL=${JSONCPP_DYNAMIC}
diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL
index 9fcc36254..2d3fa4ac4 100644
--- a/ports/jxrlib/CONTROL
+++ b/ports/jxrlib/CONTROL
@@ -1,3 +1,3 @@
 Source: jxrlib
-Version: 1.1-4
+Version: 1.1-5
 Description: Open source implementation of the jpegxr image format standard.
diff --git a/ports/freeimage/cmake/FindJXR.cmake b/ports/jxrlib/FindJXR.cmake
index 7e4a5d45e..7e4a5d45e 100644
--- a/ports/freeimage/cmake/FindJXR.cmake
+++ b/ports/jxrlib/FindJXR.cmake
diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake
index ca29a6aca..9b7cca5fb 100644
--- a/ports/jxrlib/portfile.cmake
+++ b/ports/jxrlib/portfile.cmake
@@ -28,4 +28,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxrlib)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/jxrlib/LICENSE ${CURRENT_PACKAGES_DIR}/share/jxrlib/copyright)
 
+#install FindJXR.cmake file
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/JXR)
+
 vcpkg_copy_pdbs()
diff --git a/ports/lest/CONTROL b/ports/lest/CONTROL
new file mode 100644
index 000000000..20913e218
--- /dev/null
+++ b/ports/lest/CONTROL
@@ -0,0 +1,3 @@
+Source: lest
+Version: 1.34.1
+Description: A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant)
diff --git a/ports/lest/portfile.cmake b/ports/lest/portfile.cmake
new file mode 100644
index 000000000..cb2d9a080
--- /dev/null
+++ b/ports/lest/portfile.cmake
@@ -0,0 +1,11 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinmoene/lest
+    REF v1.34.1
+    SHA512 7f4b0e49c1cf4c55d21752259ee45f9265aba254b9c15f84e77f9ae3e5ef3443abcb43fafe8e16d84bbdffee72dae842de0ed661c2caeb9607fcb188eb3ec7d1
+)
+
+file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/lest RENAME copyright)
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index af3d528b8..7cb34cd94 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,5 +1,5 @@
 Source: libarchive
-Version: 3.3.3-2
+Version: 3.3.3-3
 Description: Library for reading and writing streaming archives
 Build-Depends: zlib
 Default-Features: bzip2, libxml2, lz4, lzma, lzo, openssl
diff --git a/ports/libarchive/fix-lz4.patch b/ports/libarchive/fix-lz4.patch
index 6a3d974fc..163e55ed0 100644
--- a/ports/libarchive/fix-lz4.patch
+++ b/ports/libarchive/fix-lz4.patch
@@ -1,18 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 73bf07b3..76a1d61d 100644
+index 80871bc9..2a16dc70 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -515,7 +515,10 @@ IF (LZ4_INCLUDE_DIR)
- ENDIF (LZ4_INCLUDE_DIR)
-
- FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
--FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
-+FIND_LIBRARY(LZ4_LIBRARY_DEBUG NAMES lz4d liblz4d)
-+FIND_LIBRARY(LZ4_LIBRARY_RELEASE NAMES lz4 liblz4)
-+INCLUDE(SelectLibraryConfigurations)
-+SELECT_LIBRARY_CONFIGURATIONS(LZ4)
- INCLUDE(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
- IF(LZ4_FOUND)
-
- 
-\ No newline at end of file
+@@ -517,7 +517,10 @@ IF(ENABLE_LZ4)
+   ENDIF (LZ4_INCLUDE_DIR)
+ 
+   FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
+-  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
++  FIND_LIBRARY(LZ4_LIBRARY_DEBUG NAMES lz4d liblz4d)
++  FIND_LIBRARY(LZ4_LIBRARY_RELEASE NAMES lz4 liblz4)
++  INCLUDE(SelectLibraryConfigurations)
++  SELECT_LIBRARY_CONFIGURATIONS(LZ4)
+   INCLUDE(FindPackageHandleStandardArgs)
+   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
+ ELSE(ENABLE_LZ4)
diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake
index a2a35ad65..5d6755bc0 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -26,7 +26,6 @@ set(BUILD_libarchive_libxml2 OFF)
 if("libxml2" IN_LIST FEATURES)
   set(BUILD_libarchive_libxml2 ON)
 endif()
-set(BUILD_libarchive_libxml2 OFF)
 
 set(BUILD_libarchive_lz4 OFF)
 if("lz4" IN_LIST FEATURES)
diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt
index 12e32f902..32d7ef097 100644
--- a/ports/libass/CMakeLists.txt
+++ b/ports/libass/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.9)
 project(libass C CXX)
 
+set(LIBASS_VERSION 0.14.0)
+
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
@@ -9,6 +11,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 #    macOS - CONFIG_CORETEXT
 #    linux - CONFIG_FONTCONFIG
 add_compile_definitions(CONFIG_DIRECTWRITE)
+add_compile_definitions(CONFIG_FREETYPE)
+add_compile_definitions(CONFIG_FRIBIDI)
+add_compile_definitions(CONFIG_HARFBUZZ)
 
 file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c)
 
@@ -21,16 +26,38 @@ find_path(FRIBIDI_INCLUDE_DIR
           NAMES fribidi.h
           PATH_SUFFIXES fribidi)
 
+find_path(HARFBUZZ_INCLUDE_DIR
+          NAMES hb.h
+          PATH_SUFFIXES harfbuzz)
+
 find_library(FRIBIDI_LIBRARY NAMES fribidi)
+find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
 
-add_library(ass STATIC ${SOURCES})
+add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def)
 
-target_include_directories(ass PRIVATE ${FRIBIDI_INCLUDE_DIR})
+target_include_directories(ass PRIVATE 
+  ${FRIBIDI_INCLUDE_DIR} 
+  ${HARFBUZZ_INCLUDE_DIR})
 
-target_link_libraries(ass PRIVATE Freetype::Freetype)
+target_link_libraries(ass PRIVATE 
+  Freetype::Freetype 
+  ${FRIBIDI_LIBRARY} 
+  ${HARFBUZZ_LIBRARY})
 
 install(TARGETS ass
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib)
 
+# pkgconfig file
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+set(PACKAGE_VERSION ${LIBASS_VERSION})
+set(PKG_REQUIRES_PRIVATE "harfbuzz >= 0.9.5, fribidi >= 0.19.0, freetype2 >= 9.10.3")
+set(PKG_LIBS_PRIVATE -lm)
+configure_file(libass.pc.in libass.pc @ONLY)
+install(FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/libass.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/ports/libass/libass.def b/ports/libass/libass.def
new file mode 100644
index 000000000..58bfad3d6
--- /dev/null
+++ b/ports/libass/libass.def
@@ -0,0 +1,46 @@
+EXPORTS
+ass_library_init
+ass_library_done
+ass_library_version
+ass_set_fonts_dir
+ass_set_extract_fonts
+ass_set_style_overrides
+ass_renderer_init
+ass_renderer_done
+ass_set_frame_size
+ass_set_storage_size
+ass_set_margins
+ass_set_use_margins
+ass_set_aspect_ratio
+ass_set_font_scale
+ass_set_hinting
+ass_set_line_spacing
+ass_get_available_font_providers
+ass_set_fonts
+ass_render_frame
+ass_new_track
+ass_free_track
+ass_alloc_style
+ass_alloc_event
+ass_free_style
+ass_free_event
+ass_process_data
+ass_process_codec_private
+ass_process_chunk
+ass_read_file
+ass_read_memory
+ass_read_styles
+ass_add_font
+ass_clear_fonts
+ass_step_sub
+ass_process_force_style
+ass_set_message_cb
+ass_fonts_update
+ass_set_cache_limits
+ass_flush_events
+ass_set_shaper
+ass_set_line_position
+ass_set_pixel_aspect
+ass_set_selective_style_override_enabled
+ass_set_selective_style_override
+ass_set_check_readorder
diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake
index 64d49c985..040cadc66 100644
--- a/ports/libass/portfile.cmake
+++ b/ports/libass/portfile.cmake
@@ -1,8 +1,6 @@
 
 include(vcpkg_common_functions)
 
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libass/libass
@@ -14,6 +12,8 @@ vcpkg_from_github(
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH})
 
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/libass.def DESTINATION ${SOURCE_PATH})
+
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libass RENAME copyright)
 
diff --git a/ports/libcuckoo/CONTROL b/ports/libcuckoo/CONTROL
new file mode 100644
index 000000000..b9c1440b3
--- /dev/null
+++ b/ports/libcuckoo/CONTROL
@@ -0,0 +1,3 @@
+Source: libcuckoo
+Version: 2018-12-24-1
+Description: A high-performance, concurrent hash table
diff --git a/ports/libcuckoo/portfile.cmake b/ports/libcuckoo/portfile.cmake
new file mode 100644
index 000000000..15d6df316
--- /dev/null
+++ b/ports/libcuckoo/portfile.cmake
@@ -0,0 +1,34 @@
+# Header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO efficient/libcuckoo
+    REF f3138045810b2c2e9b59dbede296b4a5194af4f9
+    SHA512 b1682b7175b2a7fd22c34cbaf9770f2f1bfb3f0d1be046338a8a489c302f0434ca1cbf2ffe5845e09aba132b0be6a1d6472b66b4518bb172b82af93a9d27cd21
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTS=OFF
+        -DBUILD_STRESS_TESTS=OFF
+        -DBUILD_UNIT_TESTS=OFF
+        -DBUILD_UNIVERSAL_BENCHMARK=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/libgta/CONTROL b/ports/libgta/CONTROL
index 2f5e817f6..344c44c4d 100644
--- a/ports/libgta/CONTROL
+++ b/ports/libgta/CONTROL
@@ -1,4 +1,4 @@
 Source: libgta
-Version: 1.0.8
+Version: 1.0.8-1
 Description: Libgta is a portable library that implements the Generic Tagged Array (GTA) file format.
 Build-Depends: bzip2, zlib, liblzma
diff --git a/ports/libgta/portfile.cmake b/ports/libgta/portfile.cmake
index 31fc64fd0..1bbe6325c 100644
--- a/ports/libgta/portfile.cmake
+++ b/ports/libgta/portfile.cmake
@@ -1,16 +1,18 @@
-
 include(vcpkg_common_functions)
 
 set(LIBGTA_VERSION 1.0.8)
 set(LIBGTA_HASH 99ec3d6317c9a12cf440a60bb989cc7a3fe35e0a1da3e65206e5cd52b69fb860850e61ea0f819511ef48ddc87c468c0ded710409990627096738886e1b358423)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libgta-${LIBGTA_VERSION})
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.savannah.nongnu.org/releases/gta/libgta-1.0.8.tar.xz"
     FILENAME "libgta-${LIBGTA_VERSION}.tar.xz"
     SHA512 ${LIBGTA_HASH})
 
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${LIBGTA_VERSION}
+)
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIBS)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"  ENABLE_STATIC_LIBS)
@@ -18,12 +20,11 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"  ENABLE_STATIC_LIBS)
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DGTA_BUILD_SHARED_LIBS=${ENABLE_SHARED_LIBS}
-            -DGTA_BUILD_STATIC_LIBS=${ENABLE_STATIC_LIBS}
+    OPTIONS -DGTA_BUILD_SHARED_LIB=${ENABLE_SHARED_LIBS}
+            -DGTA_BUILD_STATIC_LIB=${ENABLE_STATIC_LIBS}
             -DGTA_BUILD_DOCUMENTATION=OFF
 )
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
diff --git a/ports/libics/CONTROL b/ports/libics/CONTROL
new file mode 100644
index 000000000..5f98c9614
--- /dev/null
+++ b/ports/libics/CONTROL
@@ -0,0 +1,3 @@
+Source: libics
+Version: 1.6.2
+Description: Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject.
+\ No newline at end of file
diff --git a/ports/libics/cmakelists.patch b/ports/libics/cmakelists.patch
new file mode 100644
index 000000000..9e7fa498f
--- /dev/null
+++ b/ports/libics/cmakelists.patch
@@ -0,0 +1,12 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -86,7 +86,8 @@
+ endif()
+ 
+ # Install
+-install(TARGETS libics libics_static DESTINATION lib)
++install(TARGETS libics DESTINATION bin)
++install(TARGETS libics_static DESTINATION lib)
+ install(FILES ${HEADERS} DESTINATION include)
+ 
+ # Unit tests
diff --git a/ports/libics/portfile.cmake b/ports/libics/portfile.cmake
new file mode 100644
index 000000000..9bcf997ed
--- /dev/null
+++ b/ports/libics/portfile.cmake
@@ -0,0 +1,23 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO svi-opensource/libics
+    REF 8d8d2dbe72450cbaf88080b6c0e24a7a4a58009e 
+    SHA512 739668b4d51ddb67d50ed1d41bd6965b90b5e4eafc7ec19e2f1d668f48af6e237f6a1872673e3fec5888efe94c2b321295c4de9502aba1f677fc6d0e0399c141
+    HEAD_REF master
+    PATCHES
+        cmakelists.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(COPY ${SOURCE_PATH}/GNU_LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libics)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libics/GNU_LICENSE ${CURRENT_PACKAGES_DIR}/share/libics/copyright)
+\ No newline at end of file
diff --git a/ports/liblsl/CONTROL b/ports/liblsl/CONTROL
new file mode 100644
index 000000000..0d2d95b1d
--- /dev/null
+++ b/ports/liblsl/CONTROL
@@ -0,0 +1,3 @@
+Source: liblsl
+Version: 1.13.0-b4
+Description: C++ lsl library for multi-modal time-synched data transmission over the local network
diff --git a/ports/liblsl/fix-runtime-destination.patch b/ports/liblsl/fix-runtime-destination.patch
new file mode 100644
index 000000000..a2bdbfbbe
--- /dev/null
+++ b/ports/liblsl/fix-runtime-destination.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5832a0e6..497dacd1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -170,7 +170,7 @@ endif()
+ install(TARGETS lsl
+ 	COMPONENT liblsl
+ 	EXPORT "${PROJECT_NAME}Config"
+-	RUNTIME DESTINATION ${LSLPREFIX}lib
++	RUNTIME DESTINATION ${LSLPREFIX}bin
+ 	LIBRARY DESTINATION ${LSLPREFIX}lib
+ 	INCLUDES DESTINATION ${LSLPREFIX}include
+ 	ARCHIVE DESTINATION ${LSLPREFIX}lib
diff --git a/ports/liblsl/hardcode-version.patch b/ports/liblsl/hardcode-version.patch
new file mode 100644
index 000000000..e7343271e
--- /dev/null
+++ b/ports/liblsl/hardcode-version.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73e4a7a0..0f8e19f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,26 +106,6 @@ if(LSL_NO_FANCY_LIBNAME)
+ 	set(CMAKE_DEBUG_POSTFIX "")
+ endif()
+ 
+-# try to find out which revision is currently checked out
+-find_package(Git)
+-if(GIT_FOUND)
+-	execute_process(
+-		COMMAND ${GIT_EXECUTABLE} describe --tags HEAD
+-		WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
+-		OUTPUT_VARIABLE lslgitrevision
+-		OUTPUT_STRIP_TRAILING_WHITESPACE
+-	)
+-	execute_process(
+-		COMMAND ${GIT_EXECUTABLE} rev-parse --symbolic-full-name --abbrev-ref @
+-		WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
+-		OUTPUT_VARIABLE lslgitbranch
+-		OUTPUT_STRIP_TRAILING_WHITESPACE
+-	)
+-	message(STATUS "Git version information: ${lslgitbranch}/${lslgitrevision}")
+-else()
+-	set(lslgitrevision "unknown")
+-	set(lslgitbranch "unknown")
+-endif()
+ set(LSL_VERSION_INFO "\"git:${lslgitrevision}/branch:${lslgitbranch}/build:${CMAKE_BUILD_TYPE}/compiler:${CMAKE_CXX_COMPILER_ID}-${CMAKE_CXX_COMPILER_VERSION}/boost:\" BOOST_LIB_VERSION")
+ set_source_files_properties("src/lsl_freefuncs_c.cpp" PROPERTIES COMPILE_DEFINITIONS LSL_LIBRARY_INFO_STR=${LSL_VERSION_INFO})
+ 
diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake
new file mode 100644
index 000000000..d8670d7e3
--- /dev/null
+++ b/ports/liblsl/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO sccn/liblsl
+    REF v1.13.0-b4 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake
+    SHA512 19bc587afcff315385e7bab1f88cf4edd315acfda61a630b23ffe4c59bc0f5aa570f0a979071f2b60009bb4d4b8ce08c98c414dc5b88042556b2501f4b8dcb79
+    HEAD_REF master
+    PATCHES hardcode-version.patch fix-runtime-destination.patch
+)
+
+vcpkg_configure_cmake(
+	SOURCE_PATH ${SOURCE_PATH}
+	PREFER_NINJA
+	OPTIONS
+		-DLSL_BUILD_STATIC=OFF
+		-DLSL_UNIXFOLDERS=ON
+		-DLSL_NO_FANCY_LIBNAME=ON
+		-Dlslgitrevision="v1.13.0-b4"
+		-Dlslgitbranch="master"
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl)
diff --git a/ports/libodb-boost/CMakeLists.txt b/ports/libodb-boost/CMakeLists.txt
new file mode 100644
index 000000000..5dd0eb9b8
--- /dev/null
+++ b/ports/libodb-boost/CMakeLists.txt
@@ -0,0 +1,47 @@
+cmake_minimum_required(VERSION 3.0)
+project(libodb-boost VERSION 2.4.0 LANGUAGES CXX)
+find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
+configure_file(config.unix.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/odb/boost/details/config.h COPYONLY)
+
+# FIXME: should we require boost? which packages?
+# find_package(PostgreSQL REQUIRED)
+set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)")
+file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    *.cxx)
+add_library(libodb-boost ${libodb_src})
+target_include_directories(libodb-boost
+    PUBLIC
+        $<INSTALL_INTERFACE:include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+
+)
+
+target_link_libraries(libodb-boost PRIVATE odb::libodb)
+if(BUILD_SHARED_LIBS)
+    target_compile_definitions(libodb-boost PRIVATE
+        -DLIBODB_BOOST_DYNAMIC_LIB)
+else()
+    target_compile_definitions(libodb-boost PRIVATE
+        -DLIBODB_BOOST_STATIC_LIB)
+endif()
+install(TARGETS libodb-boost EXPORT odb_boostConfig
+    COMPONENT boost
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION bin
+)
+if(LIBODB_INSTALL_HEADERS)
+install(DIRECTORY odb DESTINATION include/
+        COMPONENT sqlite
+        FILES_MATCHING
+        PATTERN "*.h"
+        PATTERN "*.hxx"
+        PATTERN "*.ixx"
+        PATTERN "*.txx"
+        PATTERN "*.options"
+)
+endif()
+install(EXPORT odb_boostConfig NAMESPACE odb:: COMPONENT boost DESTINATION share/odb)
+export(TARGETS libodb-boost NAMESPACE odb:: FILE odb_boostConfig.cmake)
diff --git a/ports/libodb-boost/CONTROL b/ports/libodb-boost/CONTROL
new file mode 100644
index 000000000..5913d752b
--- /dev/null
+++ b/ports/libodb-boost/CONTROL
@@ -0,0 +1,4 @@
+Source: libodb-boost
+Version: 2.4.0-1
+Description: Description: Boost support for the ODB ORM library
+Build-Depends: libodb
diff --git a/ports/libodb-boost/config.unix.h.in b/ports/libodb-boost/config.unix.h.in
new file mode 100644
index 000000000..b049efd09
--- /dev/null
+++ b/ports/libodb-boost/config.unix.h.in
@@ -0,0 +1,14 @@
+/* odb/boost/details/config.h.  Generated from config.h.in by configure.  */
+/* file      : odb/boost/details/config.h.in
+ * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+ * license   : GNU GPL v2; see accompanying LICENSE file
+ */
+
+/* This file is automatically processed by configure. */
+
+#ifndef ODB_BOOST_DETAILS_CONFIG_H
+#define ODB_BOOST_DETAILS_CONFIG_H
+
+/* #undef LIBODB_BOOST_STATIC_LIB */
+
+#endif /* ODB_BOOST_DETAILS_CONFIG_H */
diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake
new file mode 100644
index 000000000..3f8dfc061
--- /dev/null
+++ b/ports/libodb-boost/portfile.cmake
@@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libodb-boost-2.4.0)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-boost-2.4.0.tar.gz"
+    FILENAME "libodb-boost-2.4.0.tar.gz"
+    SHA512 af716b0385cf4ea18b20dcd5880c69c43cfc195eec4ff196a8e438833306489c39ab06a494e5d60cd08ba0d94caa05bd07e5f3fa836d835bad15c8a2ad7de306
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+file(COPY
+  ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in
+  DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS_DEBUG
+        -DLIBODB_INSTALL_HEADERS=OFF
+)
+vcpkg_build_cmake()
+vcpkg_install_cmake()
+
+file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake LIBODB_DEBUG_TARGETS)
+string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_boostConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}")
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb-boost)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb-boost/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb-boost/copyright)
+vcpkg_copy_pdbs()
diff --git a/ports/libodb-mysql/CMakeLists.txt b/ports/libodb-mysql/CMakeLists.txt
index b578964b6..fe02585b1 100644
--- a/ports/libodb-mysql/CMakeLists.txt
+++ b/ports/libodb-mysql/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.0)
 project(libodb-mysql VERSION 2.4.0 LANGUAGES CXX)
 find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
+configure_file(config.unix.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/odb/mysql/details/config.h COPYONLY)
+
 INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR})
 set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)")
 file(GLOB_RECURSE libodb_src
diff --git a/ports/libodb-mysql/config.unix.h.in b/ports/libodb-mysql/config.unix.h.in
new file mode 100644
index 000000000..b1270e20e
--- /dev/null
+++ b/ports/libodb-mysql/config.unix.h.in
@@ -0,0 +1,19 @@
+/* odb/mysql/details/config.h.  Generated from config.h.in by configure.  */
+/* file      : odb/mysql/details/config.h.in
+ * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+ * license   : GNU GPL v2; see accompanying LICENSE file
+ */
+
+/* This file is automatically processed by configure. */
+
+#ifndef ODB_MYSQL_DETAILS_CONFIG_H
+#define ODB_MYSQL_DETAILS_CONFIG_H
+
+/* #undef LIBODB_MYSQL_STATIC_LIB */
+
+/* #undef LIBODB_MYSQL_INCLUDE_SHORT */
+#define LIBODB_MYSQL_INCLUDE_LONG 1
+
+/* #undef LIBODB_MYSQL_THR_KEY_VISIBLE */
+
+#endif /* ODB_MYSQL_DETAILS_CONFIG_H */
diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake
index e6f1e2441..88684bd35 100644
--- a/ports/libodb-mysql/portfile.cmake
+++ b/ports/libodb-mysql/portfile.cmake
@@ -25,7 +25,11 @@ vcpkg_apply_patches(
         ${CMAKE_CURRENT_LIST_DIR}/adapter_mysql_8.0.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY
+  ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in
+  DESTINATION ${SOURCE_PATH})
+
 set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql")
 set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib")
 set(MYSQL_LIB_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib")
@@ -48,4 +52,4 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_mysqlConfig-debug.cmake "${LIBO
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb-mysql)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb-mysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb-mysql/copyright)
-vcpkg_copy_pdbs()
-\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/libodb-pgsql/CMakeLists.txt b/ports/libodb-pgsql/CMakeLists.txt
index cb510e805..46137ab57 100644
--- a/ports/libodb-pgsql/CMakeLists.txt
+++ b/ports/libodb-pgsql/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.0)
 project(libodb-pgsql VERSION 2.4.0 LANGUAGES CXX)
 find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
 find_package(PostgreSQL REQUIRED)
+configure_file(config.unix.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/odb/pgsql/details/config.h COPYONLY)
+
 set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)")
 file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/ports/libodb-pgsql/config.unix.h.in b/ports/libodb-pgsql/config.unix.h.in
new file mode 100644
index 000000000..cdced9eb0
--- /dev/null
+++ b/ports/libodb-pgsql/config.unix.h.in
@@ -0,0 +1,14 @@
+/* odb/pgsql/details/config.h.  Generated from config.h.in by configure.  */
+/* file      : odb/pgsql/details/config.h.in
+ * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+ * license   : GNU GPL v2; see accompanying LICENSE file
+ */
+
+/* This file is automatically processed by configure. */
+
+#ifndef ODB_PGSQL_DETAILS_CONFIG_H
+#define ODB_PGSQL_DETAILS_CONFIG_H
+
+/* #undef LIBODB_PGSQL_STATIC_LIB */
+
+#endif /* ODB_PGSQL_DETAILS_CONFIG_H */
diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake
index 752f98b70..cef945c73 100644
--- a/ports/libodb-pgsql/portfile.cmake
+++ b/ports/libodb-pgsql/portfile.cmake
@@ -7,7 +7,11 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY
+  ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in
+  DESTINATION ${SOURCE_PATH})
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS_DEBUG
diff --git a/ports/libodb-sqlite/CMakeLists.txt b/ports/libodb-sqlite/CMakeLists.txt
index bd1717899..99fb0c236 100644
--- a/ports/libodb-sqlite/CMakeLists.txt
+++ b/ports/libodb-sqlite/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.0)
 project(libodb-sqlite VERSION 2.4.0 LANGUAGES CXX)
 find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
 find_package(sqlite3 REQUIRED)
+configure_file(config.unix.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/odb/sqlite/details/config.h COPYONLY)
+
 set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)")
 file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/ports/libodb-sqlite/config.unix.h.in b/ports/libodb-sqlite/config.unix.h.in
new file mode 100644
index 000000000..f5af346a1
--- /dev/null
+++ b/ports/libodb-sqlite/config.unix.h.in
@@ -0,0 +1,15 @@
+/* odb/sqlite/details/config.h.  Generated from config.h.in by configure.  */
+/* file      : odb/sqlite/details/config.h.in
+ * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+ * license   : GNU GPL v2; see accompanying LICENSE file
+ */
+
+/* This file is automatically processed by configure. */
+
+#ifndef ODB_SQLITE_DETAILS_CONFIG_H
+#define ODB_SQLITE_DETAILS_CONFIG_H
+
+/* #undef LIBODB_SQLITE_STATIC_LIB */
+#define LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY 1
+
+#endif /* ODB_SQLITE_DETAILS_CONFIG_H */
diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake
index a1228f4ed..143d32efb 100644
--- a/ports/libodb-sqlite/portfile.cmake
+++ b/ports/libodb-sqlite/portfile.cmake
@@ -15,7 +15,11 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY
+  ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in
+  DESTINATION ${SOURCE_PATH})
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS_DEBUG
@@ -30,4 +34,4 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake "${LIB
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb-sqlite)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb-sqlite/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb-sqlite/copyright)
-vcpkg_copy_pdbs()
-\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/libodb/CMakeLists.txt b/ports/libodb/CMakeLists.txt
index b4aef5817..a49175a8a 100644
--- a/ports/libodb/CMakeLists.txt
+++ b/ports/libodb/CMakeLists.txt
@@ -1,13 +1,21 @@
 cmake_minimum_required(VERSION 3.0)
 project(libodb VERSION 2.4.0 LANGUAGES CXX)
 set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)")
+configure_file(config.unix.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/odb/details/config.h COPYONLY)
+
 file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     *.cxx)
-list(FILTER libodb_src EXCLUDE REGEX /posix/.*)
+if (WIN32)
+  list(FILTER libodb_src EXCLUDE REGEX /posix/.*)
+elseif (UNIX)
+  list(FILTER libodb_src EXCLUDE REGEX /win32/.*)
+endif()
+
 add_library(libodb ${libodb_src})
 target_include_directories(libodb
-    PUBLIC 
+    PUBLIC
         $<INSTALL_INTERFACE:include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 
diff --git a/ports/libodb/config.unix.h.in b/ports/libodb/config.unix.h.in
new file mode 100644
index 000000000..4df77c5c7
--- /dev/null
+++ b/ports/libodb/config.unix.h.in
@@ -0,0 +1,20 @@
+/* odb/details/config.h.  Generated from config.h.in by configure.  */
+/* file      : odb/details/config.h.in
+ * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+ * license   : GNU GPL v2; see accompanying LICENSE file
+ */
+
+/* This file is automatically processed by configure. */
+
+#ifndef ODB_DETAILS_CONFIG_H
+#define ODB_DETAILS_CONFIG_H
+
+/* #undef ODB_THREADS_NONE */
+#define ODB_THREADS_POSIX 1
+/* #undef ODB_THREADS_WIN32 */
+#define ODB_THREADS_TLS_KEYWORD 1
+/* #undef ODB_THREADS_TLS_DECLSPEC */
+
+/* #undef LIBODB_STATIC_LIB */
+
+#endif /* ODB_DETAILS_CONFIG_H */
diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake
index 01f326548..017979dc4 100644
--- a/ports/libodb/portfile.cmake
+++ b/ports/libodb/portfile.cmake
@@ -15,7 +15,11 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 f1311458634695eb6ba307ebfd492e3b260e7beb06db1c5c46df58c339756be4006322cdc4e42d055bf5b2ad14ce4656ddcafcc4e16c282034db8a77d255c3eb
 )
 vcpkg_extract_source_archive(${ARCHIVE})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY
+  ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in
+  DESTINATION ${SOURCE_PATH})
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS_DEBUG
diff --git a/ports/libogg/0001-Install-CMake-package-config-module.patch b/ports/libogg/0001-Install-CMake-package-config-module.patch
new file mode 100644
index 000000000..2a33a641e
--- /dev/null
+++ b/ports/libogg/0001-Install-CMake-package-config-module.patch
@@ -0,0 +1,97 @@
+From 0d3c307cee6e8135c84f3f7755bbc10dfd26e02b Mon Sep 17 00:00:00 2001
+From: evpobr <evpobr@gmail.com>
+Date: Sat, 16 Feb 2019 11:50:16 +0500
+Subject: [PATCH] Install CMake package config module
+
+---
+ CMakeLists.txt | 40 ++++++++++++++++++++++++++++++++++------
+ 1 file changed, 34 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ab14a2..9f5ee5a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,9 +1,10 @@
+-cmake_minimum_required(VERSION 2.8.7)
++cmake_minimum_required(VERSION 2.8.12)
+ project(libogg)
+ 
+ # Required modules
+ include(GNUInstallDirs)
+ include(CheckIncludeFiles)
++include(CMakePackageConfigHelpers)
+ 
+ # Build options
+ option(BUILD_SHARED_LIBS "Build shared library" OFF)
+@@ -80,18 +81,24 @@ if(BUILD_FRAMEWORK)
+     set(BUILD_SHARED_LIBS TRUE)
+ endif()
+ 
+-include_directories(include ${CMAKE_CURRENT_BINARY_DIR}/include)
+-add_library(ogg ${OGG_HEADERS} ${OGG_SOURCES})
++add_library(Ogg ${OGG_HEADERS} ${OGG_SOURCES})
++
++target_include_directories(Ogg
++    PUBLIC
++        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
++        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
++        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++)
+ 
+ get_version_info(OGG_VERSION_INFO "LIB_CURRENT" "LIB_AGE" "LIB_REVISION")
+ set_target_properties(
+-    ogg PROPERTIES
++    Ogg PROPERTIES
+     SOVERSION ${OGG_VERSION_INFO}
+     PUBLIC_HEADER "${OGG_HEADERS}"
+ )
+ 
+ if(BUILD_FRAMEWORK)
+-    set_target_properties(ogg PROPERTIES
++    set_target_properties(Ogg PROPERTIES
+         FRAMEWORK TRUE
+         FRAMEWORK_VERSION ${PROJECT_VERSION}
+         MACOSX_FRAMEWORK_IDENTIFIER org.xiph.ogg
+@@ -100,17 +107,38 @@ if(BUILD_FRAMEWORK)
+         XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
+         OUTPUT_NAME Ogg
+     )
++else()
++    set_target_properties(Ogg PROPERTIES OUTPUT_NAME ogg)
+ endif()
+ 
+ configure_pkg_config_file(ogg.pc.in)
+ 
+-install(TARGETS ogg
++set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Ogg)
++
++install(TARGETS Ogg
++    EXPORT OggConfig
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
+     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ogg
+ )
++install(EXPORT OggConfig
++    NAMESPACE Ogg::
++    DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}
++)
++
++if(CMAKE_VERSION VERSION_LESS 3.11)
++    write_basic_package_version_file(OggConfigVersion.cmake COMPATIBILITY SameMajorVersion)
++else()
++    write_basic_package_version_file(OggConfigVersion.cmake COMPATIBILITY SameMinorVersion)
++endif()
++
++install(
++    FILES ${CMAKE_CURRENT_BINARY_DIR}/OggConfigVersion.cmake
++    DESTINATION	${CMAKE_INSTALL_PACKAGEDIR}
++)
++
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ogg.pc
+     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ )
+-- 
+2.20.1.windows.1
+
diff --git a/ports/libogg/CONTROL b/ports/libogg/CONTROL
index 459cdaf95..87169b6ef 100644
--- a/ports/libogg/CONTROL
+++ b/ports/libogg/CONTROL
@@ -1,3 +1,3 @@
 Source: libogg
-Version: 1.3.3
+Version: 1.3.3-1
 Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.
diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake
index d0efac69a..ad8955fa8 100644
--- a/ports/libogg/portfile.cmake
+++ b/ports/libogg/portfile.cmake
@@ -5,6 +5,7 @@ vcpkg_from_github(
     REF v1.3.3
     SHA512 0bd6095d647530d4cb1f509eb5e99965a25cc3dd9b8125b93abd6b248255c890cf20710154bdec40568478eb5c4cde724abfb2eff1f3a04e63acef0fbbc9799b
     HEAD_REF master
+    PATCHES 0001-Install-CMake-package-config-module.patch
 )
 
 vcpkg_configure_cmake(
@@ -16,6 +17,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Ogg TARGET_PATH share/Ogg)
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 vcpkg_copy_pdbs()
diff --git a/ports/libstk/CMakeLists.txt b/ports/libstk/CMakeLists.txt
new file mode 100644
index 000000000..7d92632dc
--- /dev/null
+++ b/ports/libstk/CMakeLists.txt
@@ -0,0 +1,215 @@
+cmake_minimum_required(VERSION 3.0)
+project(libstk)
+
+set(LIBSTK_SOURCES
+	src/ADSR.cpp
+	src/Asymp.cpp
+	src/BandedWG.cpp
+	src/BeeThree.cpp
+	src/BiQuad.cpp
+	src/Blit.cpp
+	src/BlitSaw.cpp
+	src/BlitSquare.cpp
+	src/BlowBotl.cpp
+	src/BlowHole.cpp
+	src/Bowed.cpp
+	src/Brass.cpp
+	src/Chorus.cpp
+	src/Clarinet.cpp
+	src/Delay.cpp
+	src/DelayA.cpp
+	src/DelayL.cpp
+	src/Drummer.cpp
+	src/Echo.cpp
+	src/Envelope.cpp
+	src/FileLoop.cpp
+	src/FileRead.cpp
+	src/FileWrite.cpp
+	src/FileWvIn.cpp
+	src/FileWvOut.cpp
+	src/Fir.cpp
+	src/Flute.cpp
+	src/FM.cpp
+	src/FMVoices.cpp
+	src/FormSwep.cpp
+	src/FreeVerb.cpp
+	src/Granulate.cpp
+	src/Guitar.cpp
+	src/HevyMetl.cpp
+	src/Iir.cpp
+	src/JCRev.cpp
+	src/LentPitShift.cpp
+	src/Makefile.in
+	src/Mandolin.cpp
+	src/Mesh2D.cpp
+	src/Messager.cpp
+	src/MidiFileIn.cpp
+	src/Modal.cpp
+	src/ModalBar.cpp
+	src/Modulate.cpp
+	src/Moog.cpp
+	src/Noise.cpp
+	src/NRev.cpp
+	src/OnePole.cpp
+	src/OneZero.cpp
+	src/PercFlut.cpp
+	src/Phonemes.cpp
+	src/PitShift.cpp
+	src/Plucked.cpp
+	src/PoleZero.cpp
+	src/PRCRev.cpp
+	src/Resonate.cpp
+	src/Rhodey.cpp
+	src/Sampler.cpp
+	src/Saxofony.cpp
+	src/Shakers.cpp
+	src/Simple.cpp
+	src/SineWave.cpp
+	src/SingWave.cpp
+	src/Sitar.cpp
+	src/Skini.cpp
+	src/Sphere.cpp
+	src/StifKarp.cpp
+	src/Stk.cpp
+	src/TapDelay.cpp
+	src/TubeBell.cpp
+	src/Twang.cpp
+	src/TwoPole.cpp
+	src/TwoZero.cpp
+	src/Voicer.cpp
+	src/VoicForm.cpp
+	src/Whistle.cpp
+	src/Wurley.cpp)
+
+set(LIBSTK_REALTIME_SOURCES
+	src/InetWvIn.cpp
+	src/InetWvOut.cpp
+	src/Mutex.cpp
+	src/RtAudio.cpp
+	src/RtMidi.cpp
+	src/RtWvIn.cpp
+	src/RtWvOut.cpp
+	src/Socket.cpp
+	src/TcpClient.cpp
+	src/TcpServer.cpp
+	src/Thread.cpp
+	src/UdpSocket.cpp
+)
+
+set(LIBSTK_HEADERS
+	include/ADSR.h
+	include/Asymp.h
+	include/BandedWG.h
+	include/BeeThree.h
+	include/BiQuad.h
+	include/Blit.h
+	include/BlitSaw.h
+	include/BlitSquare.h
+	include/BlowBotl.h
+	include/BlowHole.h
+	include/Bowed.h
+	include/BowTable.h
+	include/Brass.h
+	include/Chorus.h
+	include/Clarinet.h
+	include/Cubic.h
+	include/Delay.h
+	include/DelayA.h
+	include/DelayL.h
+	include/Drummer.h
+	include/Echo.h
+	include/Effect.h
+	include/Envelope.h
+	include/FileLoop.h
+	include/FileRead.h
+	include/FileWrite.h
+	include/FileWvIn.h
+	include/FileWvOut.h
+	include/Filter.h
+	include/Fir.h
+	include/Flute.h
+	include/FM.h
+	include/FMVoices.h
+	include/FormSwep.h
+	include/FreeVerb.h
+	include/Function.h
+	include/Generator.h
+	include/Granulate.h
+	include/Guitar.h
+	include/HevyMetl.h
+	include/Iir.h
+	include/InetWvIn.h
+	include/InetWvOut.h
+	include/Instrmnt.h
+	include/JCRev.h
+	include/JetTable.h
+	include/LentPitShift.h
+	include/Mandolin.h
+	include/Mesh2D.h
+	include/Messager.h
+	include/MidiFileIn.h
+	include/Modal.h
+	include/ModalBar.h
+	include/Modulate.h
+	include/Moog.h
+	include/Mutex.h
+	include/Noise.h
+	include/NRev.h
+	include/OnePole.h
+	include/OneZero.h
+	include/PercFlut.h
+	include/Phonemes.h
+	include/PitShift.h
+	include/Plucked.h
+	include/PoleZero.h
+	include/PRCRev.h
+	include/ReedTable.h
+	include/Resonate.h
+	include/Rhodey.h
+	include/RtAudio.h
+	include/RtMidi.h
+	include/RtWvIn.h
+	include/RtWvOut.h
+	include/Sampler.h
+	include/Saxofony.h
+	include/Shakers.h
+	include/Simple.h
+	include/SineWave.h
+	include/SingWave.h
+	include/Sitar.h
+	include/Skini.h
+	include/SKINImsg.h
+	include/SKINItbl.h
+	include/Socket.h
+	include/Sphere.h
+	include/StifKarp.h
+	include/Stk.h
+	include/TapDelay.h
+	include/TcpClient.h
+	include/TcpServer.h
+	include/Thread.h
+	include/TubeBell.h
+	include/Twang.h
+	include/TwoPole.h
+	include/TwoZero.h
+	include/UdpSocket.h
+	include/Vector3D.h
+	include/Voicer.h
+	include/VoicForm.h
+	include/Whistle.h
+	include/Wurley.h
+	include/WvIn.h
+	include/WvOut.h
+)
+
+add_library(libstk ${LIBSTK_SOURCES})
+target_include_directories(libstk PRIVATE include PUBLIC $<INSTALL_INTERFACE:include>)
+set_target_properties(libstk PROPERTIES PUBLIC_HEADER "${LIBSTK_HEADERS}")
+target_compile_definitions(libstk PRIVATE __LITTLE_ENDIAN__)
+
+install(TARGETS libstk EXPORT unofficial-libstk-config
+	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib
+	RUNTIME DESTINATION bin
+	PUBLIC_HEADER DESTINATION include/stk)
+install(EXPORT unofficial-libstk-config NAMESPACE unofficial::libstk:: DESTINATION share/unofficial-libstk)
diff --git a/ports/libstk/CONTROL b/ports/libstk/CONTROL
new file mode 100644
index 000000000..e8f1382b5
--- /dev/null
+++ b/ports/libstk/CONTROL
@@ -0,0 +1,3 @@
+Source: libstk
+Version: 4.6.0-2
+Description: The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language. 
diff --git a/ports/libstk/portfile.cmake b/ports/libstk/portfile.cmake
new file mode 100644
index 000000000..1d8ec73f1
--- /dev/null
+++ b/ports/libstk/portfile.cmake
@@ -0,0 +1,36 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO thestk/stk
+    REF v4.6.0
+    SHA512 8e40dbd9e2b315df769262889fdf15b4a67843984d27a1f939d8bc6e820abb662eeae3b934fa81097222c67f7922681fe170006bebe5597cbd51b0a8624a6733
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libstk TARGET_PATH share/unofficial-libstk)
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstk RENAME copyright)
+
+file(GLOB RAWFILES ${SOURCE_PATH}/rawwaves/*.raw)
+file(COPY ${RAWFILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstk/rawwaves)
+
+# Post-build test for cmake libraries
+# vcpkg_test_cmake(PACKAGE_NAME libstk)
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL
index 815a53497..519d08553 100644
--- a/ports/libtorrent/CONTROL
+++ b/ports/libtorrent/CONTROL
@@ -1,4 +1,4 @@
 Source: libtorrent
-Version: 1.1.6-1
+Version: 1.2.0-1
 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
+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
diff --git a/ports/libtorrent/add-datetime-to-boost-libs.patch b/ports/libtorrent/add-datetime-to-boost-libs.patch
index 35d8de1cf..1ec65a8f5 100644
--- a/ports/libtorrent/add-datetime-to-boost-libs.patch
+++ b/ports/libtorrent/add-datetime-to-boost-libs.patch
@@ -1,13 +1,16 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 340e38f..1963d90 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -258,7 +258,7 @@ endif()
- 
- # Boost
- if(NOT DEFINED Boost_INCLUDE_DIR OR NOT DEFINED Boost_LIBRARIES)
--	FIND_PACKAGE(Boost REQUIRED COMPONENTS system chrono random)
-+	FIND_PACKAGE(Boost REQUIRED COMPONENTS system date_time chrono random)
- endif()
- include_directories(${Boost_INCLUDE_DIRS})
- target_link_libraries(torrent-rasterbar ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 944602b..9d95446 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -678,9 +678,9 @@ else()
+ endif()
+ 
+ # Boost
+-find_public_dependency(Boost REQUIRED COMPONENTS system)
++find_public_dependency(Boost REQUIRED COMPONENTS system date_time)
+ target_include_directories(torrent-rasterbar PUBLIC ${Boost_INCLUDE_DIRS})
+-target_link_libraries(torrent-rasterbar PUBLIC ${Boost_SYSTEM_LIBRARY})
++target_link_libraries(torrent-rasterbar PUBLIC ${Boost_LIBRARIES})
+ 
+ if (exceptions)
+ 	if (MSVC)
diff --git a/ports/libtorrent/boost-167.patch b/ports/libtorrent/boost-167.patch
deleted file mode 100644
index 279d517d5..000000000
--- a/ports/libtorrent/boost-167.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/include/libtorrent/ip_filter.hpp b/include/libtorrent/ip_filter.hpp
-index dac1cab..0b29c64 100644
---- a/include/libtorrent/ip_filter.hpp
-+++ b/include/libtorrent/ip_filter.hpp
-@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
- 
- #include <boost/limits.hpp>
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- #include <boost/cstdint.hpp>
- #include <boost/tuple/tuple.hpp>
- 
-diff --git a/src/kademlia/routing_table.cpp b/src/kademlia/routing_table.cpp
-index 1ac00de..1d11617 100644
---- a/src/kademlia/routing_table.cpp
-+++ b/src/kademlia/routing_table.cpp
-@@ -53,6 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.
- 
- #include <boost/cstdint.hpp>
- #include <boost/bind.hpp>
-+#include <boost/next_prior.hpp>
- 
- #include "libtorrent/aux_/disable_warnings_pop.hpp"
- 
-diff --git a/src/torrent.cpp b/src/torrent.cpp
-index feacfa4..7b2b920 100644
---- a/src/torrent.cpp
-+++ b/src/torrent.cpp
-@@ -46,6 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
- 
- #include <boost/bind.hpp>
- #include <boost/make_shared.hpp>
-+#include <boost/next_prior.hpp>
- #if TORRENT_USE_I2P
- #  include <boost/algorithm/string/predicate.hpp>
- #endif
-diff --git a/test/test_ip_filter.cpp b/test/test_ip_filter.cpp
-index 21ac404..40e3cd5 100644
---- a/test/test_ip_filter.cpp
-+++ b/test/test_ip_filter.cpp
-@@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
- 
- #include "libtorrent/ip_filter.hpp"
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- 
- #include "test.hpp"
- #include "settings.hpp"
diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
index 792fe1dee..fb84c9794 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -3,25 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arvidn/libtorrent
-    REF libtorrent-1_1_6
-    SHA512 528034e63330d3c6910ab9db34a2a543618961c0095ecb8f865065516c341d063cba92aed2904b80aa0d0ef65df1b91c400f69d16defad787ff1ffb5edd09e37
+    REF libtorrent_1_2_0
+    SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/add-datetime-to-boost-libs.patch
-        ${CMAKE_CURRENT_LIST_DIR}/boost-167.patch
+    PATCHES add-datetime-to-boost-libs.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTORRENT_SHARED)
 
-file(READ "${SOURCE_PATH}/include/libtorrent/export.hpp" _contents)
-string(REPLACE "<boost/config/select_compiler_config.hpp>" "<boost/config/detail/select_compiler_config.hpp>" _contents "${_contents}")
-string(REPLACE "<boost/config/select_platform_config.hpp>" "<boost/config/detail/select_platform_config.hpp>" _contents "${_contents}")
-file(WRITE "${SOURCE_PATH}/include/libtorrent/export.hpp" "${_contents}")
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
@@ -33,22 +22,17 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    # Put shared libraries into the proper directory
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/torrent-rasterbar.dll ${CURRENT_PACKAGES_DIR}/bin/torrent-rasterbar.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/torrent-rasterbar.dll ${CURRENT_PACKAGES_DIR}/debug/bin/torrent-rasterbar.dll)
-
     # Defines for shared lib
-    file(READ ${CURRENT_PACKAGES_DIR}/include/libtorrent/export.hpp EXPORT_H)
+    file(READ ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp EXPORT_H)
     string(REPLACE "defined TORRENT_BUILDING_SHARED" "1" EXPORT_H "${EXPORT_H}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/libtorrent/export.hpp "${EXPORT_H}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp "${EXPORT_H}")
 endif()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibtorrentRasterbar TARGET_PATH share/libtorrentrasterbar)
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtorrent)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libtorrent/LICENSE ${CURRENT_PACKAGES_DIR}/share/libtorrent/copyright)
 
 # Do not duplicate include files
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/cmake)
diff --git a/ports/libunibreak/CMakeLists.txt b/ports/libunibreak/CMakeLists.txt
index 9ee5437d3..7bbff8f3a 100644
--- a/ports/libunibreak/CMakeLists.txt
+++ b/ports/libunibreak/CMakeLists.txt
@@ -5,6 +5,7 @@ project(libunibreak)
 set(libunibreak_srcs
   src/linebreakdata.c
   src/linebreakdef.c
+  src/linebreak.c
   src/wordbreak.c
   src/graphemebreak.c
   src/unibreakbase.c
@@ -30,6 +31,8 @@ if(NOT DISABLE_INSTALL_HEADERS)
     src/linebreakdef.h
     src/wordbreak.h
     src/wordbreakdef.h
+    src/unibreakbase.h
+    src/unibreakdef.h
     DESTINATION include
   )
 endif()
diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL
index 1106a3285..611be7070 100644
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@@ -1,3 +1,3 @@
 Source: libuv
-Version: 1.24.1
+Version: 1.25.0
 Description: libuv is a multi-platform support library with a focus on asynchronous I/O.
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 6b15dba59..8179c28bb 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuv/libuv
-    REF v1.24.1
-    SHA512 19cb03a7a62ad2a1f392e1de3e4fdb622e3ac5afe890bfb819c30118f4745f81ecc343d5b633eebb8471fdfb4025652bbface245fd616c55346aae82376f6836
+    REF v1.25.0
+    SHA512 d1024f9193e2ad69cc670441b74ff7c63ca7d295e9a7a43c90da6781a39352687465bfe7e852d6e9085c21821bf8d11c10139c7229759fdce567d809c605acfd
     HEAD_REF v1.x
 )
 
diff --git a/ports/libwebp/0001-build-fixes.patch b/ports/libwebp/0001-build-fixes.patch
new file mode 100644
index 000000000..c25ecbfee
--- /dev/null
+++ b/ports/libwebp/0001-build-fixes.patch
@@ -0,0 +1,163 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 499ddce..895fda9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -159,6 +159,10 @@ add_definitions(-DHAVE_CONFIG_H)
+ if(MSVC)
+   # avoid security warnings for e.g., fopen() used in the examples.
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
++  add_definitions(-DWEBP_HAVE_JUST_SDL_H)
++  if(BUILD_SHARED_LIBS)
++    add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\))
++  endif()
+ else()
+   add_definitions(-Wall)
+ endif()
+@@ -342,19 +346,23 @@ if(WEBP_BUILD_ANIM_UTILS
+                     "example_util_[^ ]*")
+   list(APPEND EXAMPLEUTIL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/stopwatch.h)
+   add_library(exampleutil ${EXAMPLEUTIL_SRCS})
++  set_target_properties(exampleutil PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+   target_include_directories(
+     exampleutil
+     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
++  target_link_libraries(exampleutil imageioutil)
+ 
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEIOUTILS_SRCS"
+                     "imageio_util_[^ ]*")
+   add_library(imageioutil ${IMAGEIOUTILS_SRCS})
++  set_target_properties(imageioutil PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+   target_link_libraries(imageioutil webp)
+ 
+   # Image-decoding utility library.
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEDEC_SRCS"
+                     "imagedec_[^ ]*")
+   add_library(imagedec ${IMAGEDEC_SRCS})
++  set_target_properties(imagedec PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+   target_link_libraries(imagedec
+                         imageioutil
+                         webpdemux
+@@ -365,7 +373,8 @@ if(WEBP_BUILD_ANIM_UTILS
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEENC_SRCS"
+                     "imageenc_[^ ]*")
+   add_library(imageenc ${IMAGEENC_SRCS})
+-  target_link_libraries(imageenc webp)
++  set_target_properties(imageenc PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
++  target_link_libraries(imageenc imageioutil webp)
+ 
+   set_property(TARGET exampleutil
+                       imageioutil
+@@ -380,7 +389,7 @@ if(WEBP_BUILD_DWEBP)
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "DWEBP_SRCS" "dwebp")
+   add_executable(dwebp ${DWEBP_SRCS})
+   target_link_libraries(dwebp exampleutil imagedec imageenc)
+-  target_include_directories(dwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(dwebp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS dwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -389,13 +398,14 @@ if(WEBP_BUILD_CWEBP)
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "CWEBP_SRCS" "cwebp")
+   add_executable(cwebp ${CWEBP_SRCS})
+   target_link_libraries(cwebp exampleutil imagedec webp)
+-  target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "")
+   add_library(libwebpmux ${WEBP_MUX_SRCS})
++  set_target_properties(libwebpmux PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+   target_link_libraries(libwebpmux webp)
+   target_include_directories(libwebpmux
+                              PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+@@ -411,7 +421,7 @@ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
+                                    "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;")
+-  set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
++  #set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
+   list(APPEND INSTALLED_LIBRARIES libwebpmux)
+   configure_pkg_config("src/mux/libwebpmux.pc")
+ endif()
+@@ -428,7 +438,7 @@ if(WEBP_BUILD_GIF2WEBP)
+                         webp
+                         libwebpmux
+                         ${WEBP_DEP_GIF_LIBRARIES})
+-  target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -444,7 +454,7 @@ if(WEBP_BUILD_IMG2WEBP)
+                         imageioutil
+                         webp
+                         libwebpmux)
+-  target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -464,6 +474,7 @@ if(WEBP_BUILD_VWEBP)
+                           webpdemux)
+     target_include_directories(vwebp
+                                PRIVATE GLUT::GLUT
++                                       ${CMAKE_CURRENT_SOURCE_DIR}/src
+                                        ${CMAKE_CURRENT_BINARY_DIR}/src
+                                        ${OPENGL_INCLUDE_DIR})
+     install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+@@ -483,7 +494,7 @@ if(WEBP_BUILD_WEBPINFO)
+                     "webpinfo")
+   add_executable(webpinfo ${WEBPINFO_SRCS})
+   target_link_libraries(webpinfo exampleutil imageioutil)
+-  target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS webpinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -493,7 +504,7 @@ if(WEBP_BUILD_WEBPMUX)
+                     "webpmux")
+   add_executable(webpmux ${WEBPMUX_SRCS})
+   target_link_libraries(webpmux exampleutil imageioutil libwebpmux webp)
+-  target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS webpmux RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -540,7 +551,7 @@ if(WEBP_BUILD_WEBP_JS)
+   # JavaScript version
+   add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
+   target_link_libraries(webp_js webpdecoder SDL)
+-  target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
++  target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+   set(WEBP_HAVE_SDL 1)
+   set_target_properties(
+     webp_js
+@@ -553,7 +564,7 @@ if(WEBP_BUILD_WEBP_JS)
+   # WASM version
+   add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
+   target_link_libraries(webp_wasm webpdecoder SDL)
+-  target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
++  target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+   set_target_properties(
+     webp_wasm
+     PROPERTIES LINK_FLAGS "-s WASM=1 -s 'BINARYEN_METHOD=\"native-wasm\"' \
+@@ -579,7 +590,7 @@ if(WEBP_BUILD_ANIM_UTILS)
+                         libwebpmux
+                         webpdemux
+                         ${WEBP_DEP_GIF_LIBRARIES})
+-  target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+ 
+   # anim_dump
+   include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS} ${WEBP_DEP_GIF_INCLUDE_DIRS})
+@@ -595,7 +606,7 @@ if(WEBP_BUILD_ANIM_UTILS)
+                         libwebpmux
+                         webpdemux
+                         ${WEBP_DEP_GIF_LIBRARIES})
+-  target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+ endif()
+ 
+ # Install the different headers and libraries.
diff --git a/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch
new file mode 100644
index 000000000..2ed199ec8
--- /dev/null
+++ b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch
@@ -0,0 +1,69 @@
+diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in
+index bb22164..3ad256f 100644
+--- a/cmake/WebPConfig.cmake.in
++++ b/cmake/WebPConfig.cmake.in
+@@ -4,8 +4,60 @@ set(WEBP_VERSION ${WebP_VERSION})
+ @PACKAGE_INIT@
+ 
+ include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
++include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
+ 
+-set(WebP_INCLUDE_DIRS "webp")
+-set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS})
+-set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@")
+-set(WEBP_LIBRARIES "${WebP_LIBRARIES}")
++find_path(WEBP_INCLUDE_DIR NAMES webp/types.h)
++set(WebP_INCLUDE_DIR ${WEBP_INCLUDE_DIR})
++set(WebP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
++set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
++
++if(NOT WEBP_BASE_LIBRARY AND NOT WebP_BASE_LIBRARY)
++  find_library(WEBP_BASE_LIBRARY_RELEASE NAMES webp)
++  find_library(WEBP_BASE_LIBRARY_DEBUG NAMES webpd)
++  select_library_configurations(WEBP_BASE)
++  set(WebP_BASE_LIBRARY ${WEBP_BASE_LIBRARY})
++  if(WEBP_BASE_LIBRARY)
++    list(APPEND WEBP_LIBRARIES "${WEBP_BASE_LIBRARY}")
++    list(APPEND WebP_LIBRARIES "${WebP_BASE_LIBRARY}")
++  endif()
++endif()
++
++if(NOT WEBP_DECODER_LIBRARY AND NOT WebP_DECODER_LIBRARY)
++  find_library(WEBP_DECODER_LIBRARY_RELEASE NAMES webpdecoder)
++  find_library(WEBP_DECODER_LIBRARY_DEBUG NAMES webpdecoderd)
++  select_library_configurations(WEBP_DECODER)
++  set(WebP_DECODER_LIBRARY ${WEBP_DECODER_LIBRARY})
++  if(WEBP_DECODER_LIBRARY)
++    list(APPEND WEBP_LIBRARIES "${WEBP_DECODER_LIBRARY}")
++    list(APPEND WebP_LIBRARIES "${WebP_DECODER_LIBRARY}")
++  endif()
++endif()
++
++if(NOT WEBP_DEMUX_LIBRARY AND NOT WebP_DEMUX_LIBRARY)
++  find_library(WEBP_DEMUX_LIBRARY_RELEASE NAMES webpdemux)
++  find_library(WEBP_DEMUX_LIBRARY_DEBUG NAMES webpdemuxd)
++  select_library_configurations(WEBP_DEMUX)
++  set(WebP_DEMUX_LIBRARY ${WEBP_DEMUX_LIBRARY})
++  if(WEBP_DEMUX_LIBRARY)
++    list(APPEND WEBP_LIBRARIES "${WEBP_DEMUX_LIBRARY}")
++    list(APPEND WebP_LIBRARIES "${WebP_DEMUX_LIBRARY}")
++  endif()
++endif()
++
++if(NOT WEBP_MUX_LIBRARY AND NOT WebP_MUX_LIBRARY)
++  find_library(WEBP_MUX_LIBRARY_RELEASE NAMES libwebpmux)
++  find_library(WEBP_MUX_LIBRARY_DEBUG NAMES libwebpmuxd)
++  select_library_configurations(WEBP_MUX)
++  set(WebP_MUX_LIBRARY ${WEBP_MUX_LIBRARY})
++  if(WEBP_MUX_LIBRARY)
++    list(APPEND WEBP_LIBRARIES "${WEBP_MUX_LIBRARY}")
++    list(APPEND WebP_LIBRARIES "${WebP_MUX_LIBRARY}")
++  endif()
++endif()
++
++set(WEBP_LIBRARY ${WEBP_BASE_LIBRARY})
++set(WebP_LIBRARY ${WebP_BASE_LIBRARY})
++if(WEBP_BASE_LIBRARY AND WEBP_INCLUDE_DIR)
++  set(WEBP_FOUND 1)
++  set(WebP_FOUND 1)
++endif()
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL
index 3e3ae16d8..9ffa6426d 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,3 +1,9 @@
 Source: libwebp
-Version: 0.6.1-2
+Version: 1.0.2-1
 Description: Lossy compression of digital photographic images.
+Build-Depends: opengl
+Default-Features: all
+
+Feature: all
+Description: enable all webp features
+Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut, sdl1
diff --git a/ports/libwebp/FindWebP.cmake b/ports/libwebp/FindWebP.cmake
deleted file mode 100644
index c39a0eb05..000000000
--- a/ports/libwebp/FindWebP.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-include(SelectLibraryConfigurations)
-include(FindPackageHandleStandardArgs)
-
-# If the user has provided ``WEBP_ROOT``, use it!  Choose items found
-# at this location over system locations.
-if( EXISTS "$ENV{WEBP_ROOT}" )
-  file( TO_CMAKE_PATH "$ENV{WEBP_ROOT}" WEBP_ROOT )
-  set( WEBP_ROOT "${WEBP_ROOT}" CACHE PATH "Prefix for WebP installation." )
-elseif(EXISTS "$ENV{WEBP_DIR}" )
-  file( TO_CMAKE_PATH "$ENV{WEBP_DIR}" WEBP_ROOT )
-  set( WEBP_ROOT "${WEBP_ROOT}" CACHE PATH "Prefix for WebP installation." )
-endif()
-
-if(NOT WEBP_INCLUDE_DIR)
-  FIND_PATH(WEBP_INCLUDE_DIR NAMES webp/decode.h)
-endif()
-
-if(NOT WEBP_LIBRARY)
-  find_library(WEBP_LIBRARY_RELEASE NAMES webp PATHS ${WEBP_ROOT} PATH_SUFFIXES webp )
-  find_library(WEBP_LIBRARY_DEBUG NAMES webpd PATHS ${WEBP_ROOT} PATH_SUFFIXES debug webp webp/debug debug/webp)
-  select_library_configurations(WEBP)
-endif()
-
-SET(WEBP_LIBRARIES ${WEBP_LIBRARY})
-SET(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
-
-find_package_handle_standard_args(WEBP REQUIRED_VARS WEBP_LIBRARY WEBP_INCLUDE_DIR)
diff --git a/ports/libwebp/build_fixes.patch b/ports/libwebp/build_fixes.patch
deleted file mode 100644
index 72cb304a9..000000000
--- a/ports/libwebp/build_fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3b105e37..f9b806c4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,6 +106,9 @@ endforeach()
- if(MSVC)
-   # avoid security warnings for e.g., fopen() used in the examples.
-   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+  if(BUILD_SHARED_LIBS)
-+    add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\))
-+  endif()
- else()
-   add_definitions(-Wall)
- endif()
-@@ -235,6 +238,10 @@ if(WEBP_BUILD_GIF2WEBP AND NOT GIF_FOUND)
- endif()
- 
- if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
-+  set(WEBP_BUILD_MUX ON)
-+endif()
-+
-+if(WEBP_BUILD_MUX)
-   parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS"
-     "")
-   add_library(webpmux ${WEBP_MUX_SRCS})
-@@ -322,6 +329,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h
-         DESTINATION include/webp)
- install(TARGETS ${INSTALLED_LIBRARIES}
-+        RUNTIME DESTINATION bin
-         LIBRARY DESTINATION lib
-         ARCHIVE DESTINATION lib)
- 
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index e4f5dbbc8..bae24ddff 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -1,37 +1,84 @@
 include(vcpkg_common_functions)
 
 vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO webmproject/libwebp
-    REF v0.6.1
-    SHA512 313b345a01c91eb07c2e4d46b93fcda9c50dca9e05e39f757238a679355514a2e9bc9bc220f3d3eb6d6a55148957cb2be14dac330203953337759841af1a32bf
-    HEAD_REF master
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO webmproject/libwebp
+  REF v1.0.2
+  SHA512 27ca4e7c87d3114a5d3dba6801b5608207a9adc44d0fa62f7523d39be789d389d342d9db5e28c9301eff8fcb1471809c76680a68abd4ff97217b17dd13c4e22b
+  HEAD_REF master
+  PATCHES
+    0001-build-fixes.patch
+    0002-cmake-config-add-backwards-compatibility.patch
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/build_fixes.patch
-)
+set(WEBP_BUILD_ANIM_UTILS OFF)
+set(WEBP_BUILD_GIF2WEBP OFF)
+set(WEBP_BUILD_IMG2WEBP OFF)
+set(WEBP_BUILD_VWEBP OFF)
+set(WEBP_BUILD_WEBPINFO OFF)
+set(WEBP_BUILD_WEBPMUX OFF)
+set(WEBP_BUILD_EXTRAS OFF)
+set(WEBP_NEAR_LOSSLESS OFF)
+if("all" IN_LIST FEATURES)
+  set(WEBP_BUILD_ANIM_UTILS ON)
+  set(WEBP_NEAR_LOSSLESS ON)
+  set(WEBP_BUILD_GIF2WEBP ON)
+  set(WEBP_BUILD_IMG2WEBP ON)
+  set(WEBP_BUILD_VWEBP ON)
+  set(WEBP_BUILD_WEBPINFO ON)
+  set(WEBP_BUILD_WEBPMUX ON)
+  set(WEBP_BUILD_EXTRAS ON)
+endif()
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DCMAKE_DEBUG_POSTFIX=d
-        -DWEBP_BUILD_MUX=ON
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+    -DWEBP_ENABLE_SIMD:BOOL=ON
+    -DWEBP_BUILD_ANIM_UTILS:BOOL=${WEBP_BUILD_ANIM_UTILS}
+    -DWEBP_BUILD_CWEBP:BOOL=OFF
+    -DWEBP_BUILD_DWEBP:BOOL=OFF
+    -DWEBP_BUILD_GIF2WEBP:BOOL=${WEBP_BUILD_GIF2WEBP}
+    -DWEBP_BUILD_IMG2WEBP:BOOL=${WEBP_BUILD_IMG2WEBP}
+    -DWEBP_BUILD_VWEBP:BOOL=${WEBP_BUILD_VWEBP}
+    -DWEBP_BUILD_WEBPINFO:BOOL=${WEBP_BUILD_WEBPINFO}
+    -DWEBP_BUILD_WEBPMUX:BOOL=${WEBP_BUILD_WEBPMUX}
+    -DWEBP_BUILD_EXTRAS:BOOL=${WEBP_BUILD_EXTRAS}
+    -DWEBP_BUILD_WEBP_JS:BOOL=OFF
+    -DWEBP_NEAR_LOSSLESS:BOOL=${WEBP_NEAR_LOSSLESS}
+    -DWEBP_ENABLE_SWAP_16BIT_CSP:BOOL=OFF
+  OPTIONS_DEBUG
+    -DCMAKE_DEBUG_POSTFIX=d
 )
 
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH "share/WebP/cmake/" TARGET_PATH "share/WebP/")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share)
 
-# Handle copyright
+if("all" IN_LIST FEATURES)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2webp.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/img2webp.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp_sdl.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpinfo.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpmux.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webp_quality.exe)
+  file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libwebp/)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/get_disto.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/get_disto.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gif2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/gif2webp.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/img2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/img2webp.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp_sdl.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpinfo.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpinfo.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpmux.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpmux.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webp_quality.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webp_quality.exe)
+  vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libwebp)
+endif()
+
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebp/COPYING ${CURRENT_PACKAGES_DIR}/share/libwebp/copyright)
-
-vcpkg_copy_pdbs()
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindWebP.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp)
diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL
index 52681ed04..c318303dc 100644
--- a/ports/libzip/CONTROL
+++ b/ports/libzip/CONTROL
@@ -1,4 +1,9 @@
 Source: libzip
-Version: rel-1-5-1-vcpkg1
+Version: rel-1-5-1-vcpkg2
 Build-Depends: zlib
+Default-Features: openssl
 Description: A library for reading, creating, and modifying zip archives.
+
+Feature: openssl
+Build-Depends: openssl
+Description: AES (encryption) support using OpenSSL
diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake
index de7940b3a..c4dee7221 100644
--- a/ports/libzip/portfile.cmake
+++ b/ports/libzip/portfile.cmake
@@ -8,9 +8,18 @@ vcpkg_from_github(
     PATCHES cmake_dont_build_more_than_needed.patch
 )
 
+# AES encryption
+set(USE_OPENSSL OFF)
+if("openssl" IN_LIST FEATURES)
+    set(USE_OPENSSL ON)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+        OPTIONS
+            # see https://github.com/nih-at/libzip/blob/rel-1-5-1/INSTALL.md
+            -DENABLE_OPENSSL=${USE_OPENSSL}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/magnum-extras/CONTROL b/ports/magnum-extras/CONTROL
index 2f782f048..9942c9463 100644
--- a/ports/magnum-extras/CONTROL
+++ b/ports/magnum-extras/CONTROL
@@ -1,6 +1,6 @@
 Source: magnum-extras
-Version: 2018.10-1
-Build-Depends: magnum
+Version: 2019.01-1
+Build-Depends: magnum[core]
 Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
 Default-Features:
 
diff --git a/ports/magnum-extras/portfile.cmake b/ports/magnum-extras/portfile.cmake
index 1a080b566..7941aeee9 100644
--- a/ports/magnum-extras/portfile.cmake
+++ b/ports/magnum-extras/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/magnum-extras
-    REF v2018.10
-    SHA512 2f1164e321ceff9ae526cb2bae961147f52f56b35ea837c29ba0153f418a269056f469415ca0393dfb8fa5d916e92130aaccc61105d18e3f242820d13478eb33
+    REF v2019.01
+    SHA512 b7116e53a6132c937ad1dc10d251d0b98884375a14e947c5ddfa046cd7a8e7e60eddf2802e1c945168fcb42d78fb13639fe65ea259c6a44f064e6065ee5ae3af
     HEAD_REF master
 )
 
diff --git a/ports/magnum-integration/CONTROL b/ports/magnum-integration/CONTROL
index 6fdb5c5cd..da379258c 100644
--- a/ports/magnum-integration/CONTROL
+++ b/ports/magnum-integration/CONTROL
@@ -1,6 +1,6 @@
 Source: magnum-integration
-Version: 2018.10-1
-Build-Depends: magnum
+Version: 2019.01-1
+Build-Depends: magnum[core]
 Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
 Default-Features:
 
@@ -11,6 +11,10 @@ Build-Depends: bullet3
 Feature: glm
 Description: GlmIntegration library
 Build-Depends: glm
+
+Feature: imgui
+Description: ImGuiIntegration library
+Build-Depends: imgui
 #Feature: ovr
 #Description: OvrIntegration library
 #Build-Depends: ovrsdk
diff --git a/ports/magnum-integration/portfile.cmake b/ports/magnum-integration/portfile.cmake
index 1e1ba801a..60231be97 100644
--- a/ports/magnum-integration/portfile.cmake
+++ b/ports/magnum-integration/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/magnum-integration
-    REF v2018.10
-    SHA512 2743eb7ee377350e85c1112f5c81850922748f50dc2d5409ccb05bec2b3246c91b8e149891a72a8319125a9843b408fd8254efaffaed2100a425e3e7ef426bbe
+    REF v2019.01
+    SHA512 4f892c30c3824aea5d51b9178ca5001b97eb89659b45ac6f5f2182ea2a3a8ff54d80e6b143679ea7f5a07c408afb480d11895c6e7afdc9003951f68e14000f9f
     HEAD_REF master
 )
 
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
index 0aa1b075c..c109f7edf 100644
--- a/ports/magnum-plugins/CONTROL
+++ b/ports/magnum-plugins/CONTROL
@@ -1,6 +1,6 @@
 Source: magnum-plugins
-Version: 2018.10-1
-Build-Depends: magnum
+Version: 2019.01-1
+Build-Depends: magnum[core]
 Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
 Default-Features: ddsimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stbimageconverter, stbimageimporter
 
@@ -26,6 +26,10 @@ Build-Depends: magnum[audio]
 Feature: drwavaudioimporter
 Description: DrWavAudioImporter plugin
 Build-Depends: magnum[audio]
+#
+#Feature: faad2audioimporter
+#Description: Faad2AudioImporter plugin
+#Build-Depends: magnum[audio], faad2
 
 Feature: freetypefont
 Description: FreeTypeFont plugin
diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
index aa7f120fe..c013a0841 100644
--- a/ports/magnum-plugins/portfile.cmake
+++ b/ports/magnum-plugins/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/magnum-plugins
-    REF v2018.10
-    SHA512 0ff79d2451957dd38f6bf9b1ee5b99f5ea9ac2cd993124f0bc4ae3e571d1a9f407876ecf59a34fd1bd86cda991e81e6632925b7a289e30b113b457bd1c7a0ae1
+    REF v2019.01
+    SHA512 482131372671ce0b86b6643f8c584f000db4324fe0f7e32bf9a31febded7b97ab7e947028fe21ce649554d2cff2bc11dfd94fad0006c465911c9f44b28c2d2a5
     HEAD_REF master
 )
 
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index 8cb02ccc2..29db869a3 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,8 +1,8 @@
 Source: magnum
-Version: 2018.10-1
-Build-Depends: corrade[pluginmanager], corrade[utility]
+Version: 2019.01-1
+Build-Depends: corrade[utility]
 Description: C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
-Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, shapes, text, texturetools, trade, sdl2application
+Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application
 
 Feature: al-info
 Description: magnum-al-info utility
@@ -14,7 +14,7 @@ Build-Depends: magnum[trade]
 
 Feature: anyaudioimporter
 Description: AnyAudioImporter plugin
-Build-Depends: magnum[audio]
+Build-Depends: magnum[audio], corrade[pluginmanager]
 
 Feature: anyimageconverter
 Description: AnyImageConverter plugin
@@ -50,10 +50,6 @@ Feature: glfwapplication
 Description: GlfwApplication library
 Build-Depends: glfw3
 
-Feature: glutapplication
-Description: GlutApplication library
-Build-Depends: freeglut, magnum[gl]
-
 Feature: imageconverter
 Description: magnum-imageconverter utility
 Build-Depends: magnum[trade]
@@ -90,9 +86,6 @@ Feature: sdl2application
 Description: Sdl2Application library
 Build-Depends: sdl2
 
-Feature: shapes
-Description: Shapes library
-
 Feature: scenegraph
 Description: SceneGraph library
 
@@ -102,7 +95,7 @@ Build-Depends: magnum[gl]
 
 Feature: text
 Description: Text library
-Build-Depends: magnum[texturetools], magnum[gl]
+Build-Depends: magnum[texturetools], magnum[gl], corrade[pluginmanager]
 
 Feature: texturetools
 Description: TextureTools library
@@ -113,6 +106,7 @@ Build-Depends: magnum[trade]
 
 Feature: trade
 Description: Trade library
+Build-Depends: corrade[pluginmanager]
 
 Feature: wavaudioimporter
 Description: WavAudioImporter plugin
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index e7f2833e7..9b8d3b424 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/magnum
-    REF v2018.10
-    SHA512 3c0998fc3600cb3799e89b4b97f6640e9b7ea9eb0ba937a2ccc0a9e5411f7dc466524a56a49ec04993530703e6688292af042a9aa6452af37f20d4449351cd96
+    REF v2019.01
+    SHA512 1edce0a38af90bd456a827b073d30d470a13b47797d62ba22001643be7519722c6886498a63be5e2ee65b8649a7eb2c217bbe2cd36ab4f4523d91aaee573ffd5
     HEAD_REF master
 )
 
diff --git a/ports/miniz/CMakeLists-targets.patch b/ports/miniz/CMakeLists-targets.patch
new file mode 100644
index 000000000..3b4c70468
--- /dev/null
+++ b/ports/miniz/CMakeLists-targets.patch
@@ -0,0 +1,54 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7dd6309..eaf160f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,12 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "")
+ CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif ()
+ 
+-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+-
+ set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
+ 
+-add_library(miniz ${miniz_SOURCE})
++add_library(miniz STATIC ${miniz_SOURCE})
++target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS)
+ 
++if(FALSE)
+ set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
+ set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
+ set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
+@@ -41,12 +41,28 @@ if(${UNIX})
+     target_link_libraries(example6 m)
+ endif()
+ 
++target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS)
++
+ # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
+ # target_link_libraries(miniz_tester miniz)
++endif()
+ 
+-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
+-    ARCHIVE  DESTINATION lib
+-    LIBRARY DESTINATION lib
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
++    ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     )
++export(TARGETS ${PROJECT_NAME}
++    NAMESPACE miniz::
++    FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
++)
++install(EXPORT ${PROJECT_NAME}Config
++    DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz"
++    NAMESPACE miniz::
++)
+ file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+-install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+\ No newline at end of file
++install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
diff --git a/ports/miniz/CONTROL b/ports/miniz/CONTROL
new file mode 100644
index 000000000..51a370a80
--- /dev/null
+++ b/ports/miniz/CONTROL
@@ -0,0 +1,3 @@
+Source: miniz
+Version: 2.0.8
+Description: Single C source file zlib-replacement library
diff --git a/ports/miniz/portfile.cmake b/ports/miniz/portfile.cmake
new file mode 100644
index 000000000..9c67ea8c9
--- /dev/null
+++ b/ports/miniz/portfile.cmake
@@ -0,0 +1,25 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO richgel999/miniz
+    REF 2.0.8
+    SHA512 84b480df8bff63422d8c36cef3741f9b9f3dce13babf4de6cb4d575209978ad849357cc72bcf31ee8b6c5da6853ed2e5eddbbe16fecd689afd7028e834abf7e9
+    HEAD_REF master
+    PATCHES
+    	CMakeLists-targets.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/miniz RENAME copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME miniz)
diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt
index 0b572b39c..4ccf6972a 100644
--- a/ports/minizip/CMakeLists.txt
+++ b/ports/minizip/CMakeLists.txt
@@ -7,7 +7,7 @@ endif()
 
 find_package(ZLIB REQUIRED)
 
-find_package(Bzip2 REQUIRED)
+find_package(BZip2 REQUIRED)
 
 set(MIN_SRC contrib/minizip)
 
diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL
new file mode 100644
index 000000000..457cb769f
--- /dev/null
+++ b/ports/mlpack/CONTROL
@@ -0,0 +1,7 @@
+Source: mlpack
+Version: 3.0.4
+Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.
+Build-Depends: openblas, clapack, boost, armadillo
+
+Feature: tools
+Description: Build command-line executables and tests.
diff --git a/ports/mlpack/cmakelists.patch b/ports/mlpack/cmakelists.patch
new file mode 100644
index 000000000..bc251980a
--- /dev/null
+++ b/ports/mlpack/cmakelists.patch
@@ -0,0 +1,52 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -252,7 +252,7 @@
+ # script Armadillo uses to find these.
+ if (WIN32)
+   find_library(LAPACK_LIBRARY
+-      NAMES lapack liblapack lapack_win32_MT lapack_win32
++      NAMES clapack lapack liblapack lapack_win32_MT lapack_win32
+       PATHS "C:/Program Files/Armadillo"
+       PATH_SUFFIXES "examples/lib_win32/")
+ 
+@@ -261,7 +261,7 @@
+   endif ()
+ 
+   find_library(BLAS_LIBRARY
+-      NAMES blas libblas blas_win32_MT blas_win32
++      NAMES openblas blas libblas blas_win32_MT blas_win32
+       PATHS "C:/Program Files/Armadillo"
+       PATH_SUFFIXES "examples/lib_win32/")
+ 
+@@ -281,6 +281,9 @@
+ # Unfortunately this configuration variable is necessary and will need to be
+ # updated as time goes on and new versions are released.
+ set(Boost_ADDITIONAL_VERSIONS
++  "1.69.0" "1.69"
++  "1.68.0" "1.68"
++  "1.67.0" "1.67"
+   "1.66.0" "1.66"
+   "1.65.1" "1.65.0" "1.65"
+   "1.64.1" "1.64.0" "1.64"
+@@ -307,19 +310,11 @@
+     REQUIRED
+ )
+ 
+-link_directories(${Boost_LIBRARY_DIRS})
+-
+-# In Visual Studio, automatic linking is performed, so we don't need to worry
+-# about it.  Clear the list of libraries to link against and let Visual Studio
+-# handle it.
+-if (MSVC)
+-  link_directories(${Boost_LIBRARY_DIRS})
+-  set(Boost_LIBRARIES "")
+-endif ()
++link_directories(${Boost_LIBRARIES})
+ 
+ set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+ set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${Boost_LIBRARIES})
+-set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
++set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARIES})
+ 
+ # For Boost testing framework (will have no effect on non-testing executables).
+ # This specifies to Boost that we are dynamically linking to the Boost test
diff --git a/ports/mlpack/meta_info_extractor.patch b/ports/mlpack/meta_info_extractor.patch
new file mode 100644
index 000000000..3a9fa00dd
--- /dev/null
+++ b/ports/mlpack/meta_info_extractor.patch
@@ -0,0 +1,189 @@
+--- a/src/mlpack/core/cv/meta_info_extractor.hpp
++++ b/src/mlpack/core/cv/meta_info_extractor.hpp
+@@ -38,50 +38,142 @@
+          bool NumClasses>
+ struct TrainForm;
+ 
+-template<typename PT, typename WT, typename... SignatureParams>
+-struct TrainFormBase
+-{
+-  using PredictionsType = PT;
+-  using WeightsType = WT;
+-
+-  /* A minimum number of parameters that should be inferred */
+-  static const size_t MinNumberOfAdditionalArgs = 1;
+-
+-  template<typename Class, typename RT, typename... Ts>
+-  using Type = RT(Class::*)(SignatureParams..., Ts...);
+-};
+-
+-template<typename MT, typename PT>
+-struct TrainForm<MT, PT, void, false, false> : public TrainFormBase<PT, void,
+-    const MT&, const PT&> {};
+-
+-template<typename MT, typename PT>
+-struct TrainForm<MT, PT, void, true, false> : public TrainFormBase<PT, void,
+-    const MT&, const data::DatasetInfo&, const PT&> {};
+-
+-template<typename MT, typename PT, typename WT>
+-struct TrainForm<MT, PT, WT, false, false> : public TrainFormBase<PT, WT,
+-    const MT&, const PT&, const WT&> {};
+-
+-template<typename MT, typename PT, typename WT>
+-struct TrainForm<MT, PT, WT, true, false> : public TrainFormBase<PT, WT,
+-    const MT&, const data::DatasetInfo&, const PT&, const WT&> {};
+-
+-template<typename MT, typename PT>
+-struct TrainForm<MT, PT, void, false, true> : public TrainFormBase<PT, void,
+-    const MT&, const PT&, const size_t> {};
+-
+-template<typename MT, typename PT>
+-struct TrainForm<MT, PT, void, true, true> : public TrainFormBase<PT, void,
+-    const MT&, const data::DatasetInfo&, const PT&, const size_t> {};
+-
+-template<typename MT, typename PT, typename WT>
+-struct TrainForm<MT, PT, WT, false, true> : public TrainFormBase<PT, WT,
+-    const MT&, const PT&, const size_t, const WT&> {};
+-
+-template<typename MT, typename PT, typename WT>
+-struct TrainForm<MT, PT, WT, true, true> : public TrainFormBase<PT, WT,
+-    const MT&, const data::DatasetInfo&, const PT&, const size_t, const WT&> {};
++#if _MSC_VER <= 1916 // Visual Studio 2017 version 15.9 or older.
++  // Due to an internal MSVC compiler bug (MSVC ) we can't use two parameter
++  // packs. So we have to write multiple TrainFormBase forms.
++  template<typename PT, typename WT, typename T1, typename T2>
++  struct TrainFormBase4
++  {
++    using PredictionsType = PT;
++    using WeightsType = WT;
++
++    /* A minimum number of parameters that should be inferred */
++    static const size_t MinNumberOfAdditionalArgs = 1;
++
++    template<typename Class, typename RT, typename... Ts>
++    using Type = RT(Class::*)(T1, T2, Ts...);
++  };
++
++  template<typename PT, typename WT, typename T1, typename T2, typename T3>
++  struct TrainFormBase5
++  {
++    using PredictionsType = PT;
++    using WeightsType = WT;
++
++    /* A minimum number of parameters that should be inferred */
++    static const size_t MinNumberOfAdditionalArgs = 1;
++
++    template<typename Class, typename RT, typename... Ts>
++    using Type = RT(Class::*)(T1, T2, T3, Ts...);
++  };
++
++  template<typename PT, typename WT, typename T1, typename T2, typename T3,
++      typename T4>
++  struct TrainFormBase6
++  {
++    using PredictionsType = PT;
++    using WeightsType = WT;
++
++    /* A minimum number of parameters that should be inferred */
++    static const size_t MinNumberOfAdditionalArgs = 1;
++
++    template<typename Class, typename RT, typename... Ts>
++    using Type = RT(Class::*)(T1, T2, T3, T4, Ts...);
++  };
++
++  template<typename PT, typename WT, typename T1, typename T2, typename T3,
++      typename T4, typename T5>
++  struct TrainFormBase7
++  {
++    using PredictionsType = PT;
++    using WeightsType = WT;
++
++    /* A minimum number of parameters that should be inferred */
++    static const size_t MinNumberOfAdditionalArgs = 1;
++
++    template<typename Class, typename RT, typename... Ts>
++    using Type = RT(Class::*)(T1, T2, T3, T4, T5, Ts...);
++  };
++
++  template<typename MT, typename PT>
++  struct TrainForm<MT, PT, void, false, false> : public TrainFormBase4<PT, void,
++      const MT&, const PT&> {};
++
++  template<typename MT, typename PT>
++  struct TrainForm<MT, PT, void, true, false> : public TrainFormBase5<PT, void,
++      const MT&, const data::DatasetInfo&, const PT&> {};
++
++  template<typename MT, typename PT, typename WT>
++  struct TrainForm<MT, PT, WT, false, false> : public TrainFormBase5<PT, WT,
++      const MT&, const PT&, const WT&> {};
++
++  template<typename MT, typename PT, typename WT>
++  struct TrainForm<MT, PT, WT, true, false> : public TrainFormBase6<PT, WT,
++      const MT&, const data::DatasetInfo&, const PT&, const WT&> {};
++
++  template<typename MT, typename PT>
++  struct TrainForm<MT, PT, void, false, true> : public TrainFormBase5<PT, void,
++      const MT&, const PT&, const size_t> {};
++
++  template<typename MT, typename PT>
++  struct TrainForm<MT, PT, void, true, true> : public TrainFormBase6<PT, void,
++      const MT&, const data::DatasetInfo&, const PT&, const size_t> {};
++
++  template<typename MT, typename PT, typename WT>
++  struct TrainForm<MT, PT, WT, false, true> : public TrainFormBase6<PT, WT,
++      const MT&, const PT&, const size_t, const WT&> {};
++
++  template<typename MT, typename PT, typename WT>
++  struct TrainForm<MT, PT, WT, true, true> : public TrainFormBase7<PT, WT,
++      const MT&, const data::DatasetInfo&, const PT&,
++      const size_t, const WT&> {};
++#else
++  template<typename PT, typename WT, typename... SignatureParams>
++  struct TrainFormBase
++  {
++    using PredictionsType = PT;
++    using WeightsType = WT;
++
++    /* A minimum number of parameters that should be inferred */
++    static const size_t MinNumberOfAdditionalArgs = 1;
++
++    template<typename Class, typename RT, typename... Ts>
++    using Type = RT(Class::*)(SignatureParams..., Ts...);
++  };
++
++  template<typename MT, typename PT>
++  struct TrainForm<MT, PT, void, false, false> : public TrainFormBase<PT, void,
++      const MT&, const PT&> {};
++
++  template<typename MT, typename PT>
++  struct TrainForm<MT, PT, void, true, false> : public TrainFormBase<PT, void,
++      const MT&, const data::DatasetInfo&, const PT&> {};
++
++  template<typename MT, typename PT, typename WT>
++  struct TrainForm<MT, PT, WT, false, false> : public TrainFormBase<PT, WT,
++      const MT&, const PT&, const WT&> {};
++
++  template<typename MT, typename PT, typename WT>
++  struct TrainForm<MT, PT, WT, true, false> : public TrainFormBase<PT, WT,
++      const MT&, const data::DatasetInfo&, const PT&, const WT&> {};
++
++  template<typename MT, typename PT>
++  struct TrainForm<MT, PT, void, false, true> : public TrainFormBase<PT, void,
++      const MT&, const PT&, const size_t> {};
++
++  template<typename MT, typename PT>
++  struct TrainForm<MT, PT, void, true, true> : public TrainFormBase<PT, void,
++      const MT&, const data::DatasetInfo&, const PT&, const size_t> {};
++
++  template<typename MT, typename PT, typename WT>
++  struct TrainForm<MT, PT, WT, false, true> : public TrainFormBase<PT, WT,
++      const MT&, const PT&, const size_t, const WT&> {};
++
++  template<typename MT, typename PT, typename WT>
++  struct TrainForm<MT, PT, WT, true, true> : public TrainFormBase<PT, WT,
++      const MT&, const data::DatasetInfo&, const PT&,
++      const size_t, const WT&> {};
++#endif
+ 
+ /* A struct for indication that a right method form can't be found */
+ struct NotFoundMethodForm
diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake
new file mode 100644
index 000000000..9bd69ed8b
--- /dev/null
+++ b/ports/mlpack/portfile.cmake
@@ -0,0 +1,43 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mlpack/mlpack
+    REF mlpack-3.0.4
+    SHA512 07730a826efb55a41fce2286de8df15421e7a7189b9cdc4699c6a32e3d4b1964a98e3829a60513994ef747640952229e7a3b744ac0ae324f5e5e57f982a86f66
+    HEAD_REF master
+	PATCHES 
+		meta_info_extractor.patch
+		cmakelists.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MLPACK_SHARED_LIBS)
+
+set(BUILD_TOOLS OFF)
+if("tools" IN_LIST FEATURES)
+    set(BUILD_TOOLS ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+	OPTIONS
+		-DBUILD_TESTS=${BUILD_TOOLS}
+		-DBUILD_CLI_EXECUTABLES=${BUILD_TOOLS}
+		-DBUILD_SHARED_LIBS=${MLPACK_SHARED_LIBS}
+)
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mlpack RENAME copyright)
+
+if(BUILD_TOOLS)
+	file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+	file(GLOB MLPACK_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+	file(COPY ${MLPACK_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+	file(REMOVE ${MLPACK_TOOLS})
+	file(GLOB MLPACK_TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+	file(REMOVE ${MLPACK_TOOLS_DEBUG})
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL
index 700f65d1a..d19dec51c 100644
--- a/ports/mongo-c-driver/CONTROL
+++ b/ports/mongo-c-driver/CONTROL
@@ -1,4 +1,4 @@
 Source: mongo-c-driver
-Version: 1.9.5-1
+Version: 1.9.5-2
 Build-Depends: libbson, openssl (uwp)
 Description: Client library written in C for MongoDB.
diff --git a/ports/mongo-c-driver/fix-uwp.patch b/ports/mongo-c-driver/fix-uwp.patch
index 59d67c6be..b2ec77ab8 100644
--- a/ports/mongo-c-driver/fix-uwp.patch
+++ b/ports/mongo-c-driver/fix-uwp.patch
@@ -90,19 +90,26 @@ index 4e181bd..b274fc1 100644
     ZeroMemory (&osvi, sizeof (OSVERSIONINFO));
     osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
 diff --git a/src/mongoc/mongoc-util.c b/src/mongoc/mongoc-util.c
-index 6dbb26d..7f33780 100644
+index a4e50ea..4f631e7 100644
 --- a/src/mongoc/mongoc-util.c
 +++ b/src/mongoc/mongoc-util.c
-@@ -69,7 +69,11 @@ _mongoc_hex_md5 (const char *input)
- void
+@@ -70,6 +70,11 @@ void
  _mongoc_usleep (int64_t usec)
  {
--#ifdef _WIN32
+ #ifdef _WIN32
 +#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
 +   if (usec / 1000 > MAXDWORD || usec < 0)
 +      __fastfail(-1);
 +   Sleep((DWORD)(usec / 1000));
-+#elif defined(_WIN32)
++#else
     LARGE_INTEGER ft;
     HANDLE timer;
- 
+
+@@ -80,6 +85,7 @@ _mongoc_usleep (int64_t usec)
+    SetWaitableTimer (timer, &ft, 0, NULL, NULL, 0);
+    WaitForSingleObject (timer, INFINITE);
+    CloseHandle (timer);
++#endif
+ #else
+    BSON_ASSERT (usec >= 0);
+    usleep ((useconds_t) usec);
diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
index 54d70aaf8..a3c5f2d31 100644
--- a/ports/mongo-c-driver/portfile.cmake
+++ b/ports/mongo-c-driver/portfile.cmake
@@ -14,8 +14,9 @@ else()
     set(ENABLE_STATIC OFF)
 endif()
 
-set(ENABLE_SSL "WINDOWS")
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    set(ENABLE_SSL "WINDOWS")
+else()
     set(ENABLE_SSL "OPENSSL")
 endif()
 
@@ -48,12 +49,21 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib
-        ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib
-        ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib)
+    if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+	    file(RENAME
+            ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a
+            ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a)
+        file(RENAME
+            ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a
+            ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a)
+    else()
+        file(RENAME
+            ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib
+            ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib)
+        file(RENAME
+            ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib
+            ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib)
+    endif()
 
     # drop the __declspec(dllimport) when building static
     vcpkg_apply_patches(
diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL
index 08de8ddec..3a8e6108f 100644
--- a/ports/mongo-cxx-driver/CONTROL
+++ b/ports/mongo-cxx-driver/CONTROL
@@ -1,4 +1,4 @@
 Source: mongo-cxx-driver
-Version: 3.1.1-3
+Version: 3.2.0-1
 Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility
 Description: MongoDB C++ Driver.
diff --git a/ports/mongo-cxx-driver/disable_shared.patch b/ports/mongo-cxx-driver/disable_shared.patch
deleted file mode 100644
index 5f2f9a04e..000000000
--- a/ports/mongo-cxx-driver/disable_shared.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
-index a9a7ada..6b87a6d 100644
---- a/src/bsoncxx/CMakeLists.txt
-+++ b/src/bsoncxx/CMakeLists.txt
-@@ -117,9 +117,15 @@ if (WIN32)
-     )
- endif()
- 
--add_library(bsoncxx SHARED
--    ${bsoncxx_sources}
--)
-+if(BUILD_SHARED_LIBS)
-+	add_library(bsoncxx SHARED
-+		${bsoncxx_sources}
-+	)
-+else()
-+	add_library(bsoncxx SHARED
-+		exception/error_code.cpp
-+	)
-+endif()
- 
- set(bsoncxx_libs ${LIBBSON_LIBRARIES})
- 
-diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
-index 2ef54e4..53a13f7 100644
---- a/src/mongocxx/CMakeLists.txt
-+++ b/src/mongocxx/CMakeLists.txt
-@@ -134,9 +134,15 @@ set_target_properties(mongocxx_mocked PROPERTIES
-     VERSION ${MONGOCXX_VERSION}
- )
- 
--add_library(mongocxx SHARED
--    ${mongocxx_sources}
--)
-+if(BUILD_SHARED_LIBS)
-+	add_library(mongocxx SHARED
-+		${mongocxx_sources}
-+	)
-+else()
-+	add_library(mongocxx SHARED
-+		exception/error_code.cpp
-+	)
-+endif()
- 
- set_target_properties (mongocxx PROPERTIES
-     OUTPUT_NAME mongocxx
diff --git a/ports/mongo-cxx-driver/disable_test_and_example.patch b/ports/mongo-cxx-driver/disable_test_and_example.patch
index d542628f7..734f52f26 100644
--- a/ports/mongo-cxx-driver/disable_test_and_example.patch
+++ b/ports/mongo-cxx-driver/disable_test_and_example.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4538920..e783ff5 100644
+index 27cf3b6b8..896eee19a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -74,66 +74,66 @@ endif()
+@@ -87,68 +87,68 @@ endif()
  
  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
  
@@ -63,63 +63,63 @@ index 4538920..e783ff5 100644
 -)
 -
 -set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party)
-+#add_custom_target(hugo_dir
-+#    COMMAND ${CMAKE_COMMAND} -E make_directory hugo
-+#)
-+#
-+#add_custom_target(hugo
-+#    DEPENDS hugo_dir
-+#    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs
-+#    COMMAND hugo
-+#    VERBATIM
-+#)
-+#
-+#add_custom_target(hugo-deploy
-+#    DEPENDS hugo
-+#    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+#    COMMAND etc/deploy-to-ghpages.pl --hugo git@github.com:mongodb/mongo-cxx-driver
-+#    VERBATIM
-+#)
-+#
-+#add_custom_target(docs_dir_current
-+#    COMMAND ${CMAKE_COMMAND} -E make_directory docs/api/current
-+#)
-+#
-+#add_custom_target(doxygen-current
-+#    DEPENDS docs_dir_current
-+#    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+#    COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
-+#    VERBATIM
-+#)
-+#
-+#add_custom_target(doxygen-all
-+#    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+#    COMMAND etc/generate-all-apidocs.pl
-+#    VERBATIM
-+#)
-+#
-+#add_custom_target(doxygen-deploy
-+#    DEPENDS doxygen-all
-+#    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+#    COMMAND etc/deploy-to-ghpages.pl --doxygen git@github.com:mongodb/mongo-cxx-driver
-+#    VERBATIM
-+#)
-+#
-+#add_custom_target(format
-+#    python ${CMAKE_SOURCE_DIR}/etc/clang_format.py format
-+#    VERBATIM
-+#)
-+#
-+#add_custom_target(format-lint
-+#    python ${CMAKE_SOURCE_DIR}/etc/clang_format.py lint
-+#    VERBATIM
-+#)
-+#
-+#add_custom_target(docs
-+#    DEPENDS hugo doxygen-current
-+#)
-+#
-+#set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party)
++# add_custom_target(hugo_dir
++#     COMMAND ${CMAKE_COMMAND} -E make_directory hugo
++# )
++
++# add_custom_target(hugo
++#     DEPENDS hugo_dir
++#     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs
++#     COMMAND hugo
++#     VERBATIM
++# )
++
++# add_custom_target(hugo-deploy
++#     DEPENDS hugo
++#     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++#     COMMAND etc/deploy-to-ghpages.pl --hugo git@github.com:mongodb/mongo-cxx-driver
++#     VERBATIM
++# )
++
++# add_custom_target(docs_dir_current
++#     COMMAND ${CMAKE_COMMAND} -E make_directory docs/api/current
++# )
++
++# add_custom_target(doxygen-current
++#     DEPENDS docs_dir_current
++#     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++#     COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
++#     VERBATIM
++# )
++
++# add_custom_target(doxygen-all
++#     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++#     COMMAND etc/generate-all-apidocs.pl
++#     VERBATIM
++# )
++
++# add_custom_target(doxygen-deploy
++#     DEPENDS doxygen-all
++#     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++#     COMMAND etc/deploy-to-ghpages.pl --doxygen git@github.com:mongodb/mongo-cxx-driver
++#     VERBATIM
++# )
++
++# add_custom_target(format
++#     python ${CMAKE_SOURCE_DIR}/etc/clang_format.py format
++#     VERBATIM
++# )
++
++# add_custom_target(format-lint
++#     python ${CMAKE_SOURCE_DIR}/etc/clang_format.py lint
++#     VERBATIM
++# )
++
++# add_custom_target(docs
++#     DEPENDS hugo doxygen-current
++# )
++
++# set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party)
  
  enable_testing()
  
@@ -127,22 +127,24 @@ index 4538920..e783ff5 100644
  
 -add_subdirectory(examples EXCLUDE_FROM_ALL)
 +#add_subdirectory(examples EXCLUDE_FROM_ALL)
+ 
+ add_subdirectory(benchmark EXCLUDE_FROM_ALL)
 diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
-index 010f5e4..a9a7ada 100644
+index bd6e40662..d6054b022 100644
 --- a/src/bsoncxx/CMakeLists.txt
 +++ b/src/bsoncxx/CMakeLists.txt
-@@ -202,4 +202,4 @@ install(
-   DESTINATION lib/cmake/libbsoncxx-${BSONCXX_VERSION}
+@@ -249,4 +249,4 @@ install(
+   DESTINATION lib/cmake/${PKG}-${BSONCXX_VERSION}
  )
  
 -add_subdirectory(test)
 +#add_subdirectory(test)
 diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
-index 12d188b..2ef54e4 100644
+index a05021228..3dd7c1224 100644
 --- a/src/mongocxx/CMakeLists.txt
 +++ b/src/mongocxx/CMakeLists.txt
-@@ -209,4 +209,4 @@ install(
-   DESTINATION lib/cmake/libmongocxx-${MONGOCXX_VERSION}
+@@ -238,4 +238,4 @@ install(
+   DESTINATION lib/cmake/${PKG}-${MONGOCXX_VERSION}
  )
  
 -add_subdirectory(test)
diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake
index b80c8a5bf..69ac66b04 100644
--- a/ports/mongo-cxx-driver/portfile.cmake
+++ b/ports/mongo-cxx-driver/portfile.cmake
@@ -1,88 +1,92 @@
 include(vcpkg_common_functions)
+
+set(VERSION_MAJOR 3)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 0)
+set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+
 vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
+    OUT_SOURCE_PATH SOURCE_PATH
     REPO mongodb/mongo-cxx-driver
-	REF r3.1.1
-    SHA512 ba8a735e5645cbce4497df71a4577e891d507f577dbd5270ec8a82e54c39c2806bf2ff4848b621f18b36d31fb6031e5b4211972b661c43009bff0ed7ab6cf338
-	HEAD_REF master
-	PATCHES
-	 "${CURRENT_PORT_DIR}/disable_test_and_example.patch"
-	 "${CURRENT_PORT_DIR}/disable_shared.patch"
-	 "${CURRENT_PORT_DIR}/fix-uwp.patch"
-	 "${CURRENT_PORT_DIR}/disable-c2338-mongo-cxx-driver.patch"
+    REF r${VERSION_FULL}
+    SHA512 cad8dd6e9fd75aa3aee15321c9b3df21d43c346f5b0b3dd75c86f9117d3376ad83fcda0c4a333c0a23d555e76d79432016623dd5f860ffef9964a6e8046e84b5
+    HEAD_REF master
+    PATCHES
+        disable_test_and_example.patch
+        fix-uwp.patch
+        disable-c2338-mongo-cxx-driver.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS
         -DLIBBSON_DIR=${CURRENT_INSTALLED_DIR}
         -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR}
+        -DMONGOCXX_HEADER_INSTALL_DIR=include
+        -DBSONCXX_HEADER_INSTALL_DIR=include
 )
 
 vcpkg_install_cmake()
 
-file(RENAME
-    ${CURRENT_PACKAGES_DIR}/include/bsoncxx/v_noabi/bsoncxx
-    ${CURRENT_PACKAGES_DIR}/temp)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bsoncxx)
-file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include/bsoncxx)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/libbsoncxx/libbsoncxx-config.cmake
+"
+set(LIBBSONCXX_VERSION_MAJOR ${VERSION_MAJOR})
+set(LIBBSONCXX_VERSION_MINOR ${VERSION_MINOR})
+set(LIBBSONCXX_VERSION_PATCH ${VERSION_PATCH})
+set(LIBBSONCXX_PACKAGE_VERSION ${VERSION_FULL})
 
-file(RENAME
-    ${CURRENT_PACKAGES_DIR}/include/mongocxx/v_noabi/mongocxx
-    ${CURRENT_PACKAGES_DIR}/temp)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/mongocxx)
-file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include/mongocxx)
+get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)
 
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/lib/cmake
-    ${CURRENT_PACKAGES_DIR}/debug/lib/cmake
+set(LIBBSONCXX_INCLUDE_DIRS \"\${PACKAGE_PREFIX_DIR}/include\")
+find_library(LIBBSONCXX_LIBRARY_PATH_RELEASE bsoncxx bsoncxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/lib\" NO_DEFAULT_PATH)
+find_library(LIBBSONCXX_LIBRARY_PATH_DEBUG bsoncxx bsoncxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/debug/lib\" NO_DEFAULT_PATH)
+set(LIBBSONCXX_LIBRARIES optimized \${LIBBSONCXX_LIBRARY_PATH_RELEASE} debug \${LIBBSONCXX_LIBRARY_PATH_DEBUG})
+"
+)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongocxx/libmongocxx-config.cmake
+"
+set(LIBMONGOCXX_VERSION_MAJOR ${VERSION_MAJOR})
+set(LIBMONGOCXX_VERSION_MINOR ${VERSION_MINOR})
+set(LIBMONGOCXX_VERSION_PATCH ${VERSION_PATCH})
+set(LIBMONGOCXX_PACKAGE_VERSION ${VERSION_FULL})
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(libbsoncxx)
+
+get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)
+
+set(LIBMONGOCXX_INCLUDE_DIRS \"\${PACKAGE_PREFIX_DIR}/include\" \${LIBBSONCXX_INCLUDE_DIRS})
+find_library(LIBMONGOCXX_LIBRARY_PATH_RELEASE NAMES mongocxx mongocxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/lib\" NO_DEFAULT_PATH)
+find_library(LIBMONGOCXX_LIBRARY_PATH_DEBUG NAMES mongocxx mongocxx-static PATHS \"\${PACKAGE_PREFIX_DIR}/debug/lib\" NO_DEFAULT_PATH)
+set(LIBMONGOCXX_LIBRARIES optimized \${LIBMONGOCXX_LIBRARY_PATH_RELEASE} debug \${LIBMONGOCXX_LIBRARY_PATH_DEBUG} \${LIBBSONCXX_LIBRARIES})
+"
+)
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+
+file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/include/bsoncxx/cmake
     ${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/private
     ${CURRENT_PACKAGES_DIR}/include/bsoncxx/private
     ${CURRENT_PACKAGES_DIR}/include/bsoncxx/test
+    ${CURRENT_PACKAGES_DIR}/include/bsoncxx/test_util
     ${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party
 
     ${CURRENT_PACKAGES_DIR}/include/mongocxx/cmake
     ${CURRENT_PACKAGES_DIR}/include/mongocxx/config/private
-    ${CURRENT_PACKAGES_DIR}/include/mongocxx/test
-    ${CURRENT_PACKAGES_DIR}/include/mongocxx/test_util
-    ${CURRENT_PACKAGES_DIR}/include/mongocxx/private
     ${CURRENT_PACKAGES_DIR}/include/mongocxx/exception/private
     ${CURRENT_PACKAGES_DIR}/include/mongocxx/options/private
+    ${CURRENT_PACKAGES_DIR}/include/mongocxx/gridfs/private
+    ${CURRENT_PACKAGES_DIR}/include/mongocxx/private
+    ${CURRENT_PACKAGES_DIR}/include/mongocxx/test
+    ${CURRENT_PACKAGES_DIR}/include/mongocxx/test_util
 
-    ${CURRENT_PACKAGES_DIR}/debug/include)
-
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/lib/bsoncxx.lib)
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/debug/lib/bsoncxx.lib)
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/lib/mongocxx.lib)
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/debug/lib/mongocxx.lib)
-
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/lib/libbsoncxx.lib
-        ${CURRENT_PACKAGES_DIR}/lib/bsoncxx.lib)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/debug/lib/libmongocxx.lib
-        ${CURRENT_PACKAGES_DIR}/debug/lib/mongocxx.lib)
-
-    # define MONGOCXX_STATIC in config/export.hpp
-    vcpkg_apply_patches(
-        SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
-        PATCHES
-            ${CMAKE_CURRENT_LIST_DIR}/static.patch
-    )
-else()
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/lib/libbsoncxx.lib)
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/debug/lib/libbsoncxx.lib)
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/lib/libmongocxx.lib)
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/debug/lib/libmongocxx.lib)
-endif()
+    ${CURRENT_PACKAGES_DIR}/debug/include
+)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-cxx-driver RENAME copyright)
 file(COPY ${SOURCE_PATH}/THIRD-PARTY-NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-cxx-driver)
 
-vcpkg_copy_pdbs()
-\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/mpark-variant/CONTROL b/ports/mpark-variant/CONTROL
index d6cbf380e..45cd9e237 100644
--- a/ports/mpark-variant/CONTROL
+++ b/ports/mpark-variant/CONTROL
@@ -1,3 +1,3 @@
 Source: mpark-variant
-Version: 1.3.0
+Version: 1.4.0
 Description: an implementation of C++17 std::variant for C++11/14/17.
diff --git a/ports/mpark-variant/portfile.cmake b/ports/mpark-variant/portfile.cmake
index b400507ee..c6010356e 100644
--- a/ports/mpark-variant/portfile.cmake
+++ b/ports/mpark-variant/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mpark/variant
-    REF v1.3.0
-    SHA512 53735d14a9b241d93191fa3b7ac8ed8fb17a8f8766318b2817c4dd1948088377190ca168027a297bae41bb2cc1f6043fe51752d43b8c33badcc9f2df9fa08ece
+    REF v1.4.0
+    SHA512 598ef21824f9cd7586f88de5a51bfe24dde4c492e8e6b8288d2912920812c48fd01c54d9683e1620cb034563c4eac737a382620e6b4af473808a2e77017a89e3
     HEAD_REF master
 )
 
diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL
index b17888fd3..913ed8375 100644
--- a/ports/ms-gsl/CONTROL
+++ b/ports/ms-gsl/CONTROL
@@ -1,3 +1,3 @@
 Source: ms-gsl
-Version: 2019-01-15
+Version: 2019-01-18
 Description: Microsoft implementation of the Guidelines Support Library
diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake
index a1359d206..b424ec3a7 100644
--- a/ports/ms-gsl/portfile.cmake
+++ b/ports/ms-gsl/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/GSL
-    REF 6418b5f4de2204cd5a335b00d2f8754301b8b382
-    SHA512 d585ce18ff190e681f55c53978bd8d84dd0f8ebf0f572a49a38be07c44bd97b6d99c46b9f5fff2455dbd934e242be4a2d6d3ca2ba193358cafa14272d7a6fba8
+    REF 7d78b743e43ecba06ca47426d03d9d16076dec16
+    SHA512 2174ad6a1eaced41e00f0781d13e68ca981644c20ba66e8e6e10b75d910203d860a93d3e9875a0560a9b7aee88e5703880014af67ab32028bffebb06f79811b7
     HEAD_REF master
 )
 
diff --git a/ports/nano-signal-slot/CONTROL b/ports/nano-signal-slot/CONTROL
new file mode 100644
index 000000000..dbccb32b7
--- /dev/null
+++ b/ports/nano-signal-slot/CONTROL
@@ -0,0 +1,3 @@
+Source: nano-signal-slot
+Version: commit-25aa2aa90d450d3c7550c535c7993a9e2ed0764a
+Description: Pure C++17 Signals and Slots
diff --git a/ports/nano-signal-slot/portfile.cmake b/ports/nano-signal-slot/portfile.cmake
new file mode 100644
index 000000000..55a879d1d
--- /dev/null
+++ b/ports/nano-signal-slot/portfile.cmake
@@ -0,0 +1,22 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(
+	ONLY_STATIC_LIBRARY
+)
+
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+    message(FATAL_ERROR "Error: UWP builds not supported yet.")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO NoAvailableAlias/nano-signal-slot
+    REF 25aa2aa90d450d3c7550c535c7993a9e2ed0764a
+    SHA512 35dc9d0d9cce116a5bcea59ab9562c87dba9f6db999807ccbef7df1fb05513eaa71132ba2996eb43f0f241288096419892ac31a400ec6cb5013438e6b670194d
+    HEAD_REF master
+)
+
+file(GLOB INCLUDES ${SOURCE_PATH}/*.hpp)
+file(INSTALL ${INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/nano-signal-slot RENAME copyright)
+\ No newline at end of file
diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake
index f2630711e..4abe0f9dc 100644
--- a/ports/netcdf-c/portfile.cmake
+++ b/ports/netcdf-c/portfile.cmake
@@ -52,3 +52,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/netcdf-c)
+file(
+    RENAME
+        ${CURRENT_PACKAGES_DIR}/share/netcdf-c/COPYRIGHT
+        ${CURRENT_PACKAGES_DIR}/share/netcdf-c/copyright
+)
diff --git a/ports/netcdf-cxx4/portfile.cmake b/ports/netcdf-cxx4/portfile.cmake
index 92ae59675..22e4e1653 100644
--- a/ports/netcdf-cxx4/portfile.cmake
+++ b/ports/netcdf-cxx4/portfile.cmake
@@ -42,3 +42,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/netcdf-cxx4)
+file(
+    RENAME
+        ${CURRENT_PACKAGES_DIR}/share/netcdf-cxx4/COPYRIGHT
+        ${CURRENT_PACKAGES_DIR}/share/netcdf-cxx4/copyright
+)
diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL
index 6d8f59edc..d1d9b689b 100644
--- a/ports/nlohmann-json/CONTROL
+++ b/ports/nlohmann-json/CONTROL
@@ -1,3 +1,3 @@
 Source: nlohmann-json
-Version: 3.5.0
+Version: 3.5.0-5
 Description: JSON for Modern C++
diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake
index 66096ce89..ea95cad97 100644
--- a/ports/nlohmann-json/portfile.cmake
+++ b/ports/nlohmann-json/portfile.cmake
@@ -1,18 +1,53 @@
 include(vcpkg_common_functions)
 
 set(SOURCE_VERSION 3.5.0)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/nlohmann-json-v${SOURCE_VERSION})
 
-vcpkg_download_distfile(HEADER
-    URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/json.hpp"
-    FILENAME "nlohmann-json-${SOURCE_VERSION}.hpp"
-    SHA512 6e8df9c0a8b5e74cc03f1c7620820215d43b642e213d30481830e5608c8196455dab5a5b604758c25dc6f45bd394fc0be6c8f8712a6498e96b3fd2e7d388d3c0
+file(MAKE_DIRECTORY ${SOURCE_PATH})
+
+function(download_src SUBPATH SHA512)
+    vcpkg_download_distfile(FILE
+        URLS "https://github.com/nlohmann/json/raw/v${SOURCE_VERSION}/${SUBPATH}"
+        FILENAME "nlohmann-json-v${SOURCE_VERSION}/${SUBPATH}"
+        SHA512 ${SHA512}
+    )
+    get_filename_component(SUBPATH_DIR "${SOURCE_PATH}/${SUBPATH}" DIRECTORY)
+    file(COPY ${FILE} DESTINATION ${SUBPATH_DIR})
+endfunction()
+
+download_src(CMakeLists.txt c763a16ff8026f049041e4461040416278d51751a6ac37ed1f4bfb565c748f2307e121fa6f71c2420d30ceb231cfb68b3f502cb8c3750371c1bf90e1f651578f)
+download_src(LICENSE.MIT 0fdb404547467f4523579acde53066badf458504d33edbb6e39df0ae145ed27d48a720189a60c225c0aab05f2aa4ce4050dcb241b56dc693f7ee9f54c8728a75)
+download_src(nlohmann_json.natvis 9bce6758db0e54777394a4e718e60a281952b15f0c6dc6a6ad4a6d023c958b5515b2d39b7d4c66c03f0d3fdfdc1d6c23afb8b8419f1345c9d44d7b9a9ee2582b)
+download_src(cmake/config.cmake.in 7caab6166baa891f77f5b632ac4a920e548610ec41777b885ec51fe68d3665ffe91984dd2881caf22298b5392dfbd84b526fda252467bb66de9eb90e6e6ade5a)
+download_src(single_include/nlohmann/json.hpp 6e8df9c0a8b5e74cc03f1c7620820215d43b642e213d30481830e5608c8196455dab5a5b604758c25dc6f45bd394fc0be6c8f8712a6498e96b3fd2e7d388d3c0)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DJSON_BuildTests=0
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nlohmann_json TARGET_PATH share/nlohmann_json)
+
+vcpkg_replace_string(
+    ${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_jsonTargets.cmake
+    "{_IMPORT_PREFIX}/nlohmann_json.natvis"
+    "{_IMPORT_PREFIX}/share/nlohmann_json/nlohmann_json.natvis"
 )
 
-vcpkg_download_distfile(LICENSE
-    URLS "https://github.com/nlohmann/json/raw/v${SOURCE_VERSION}/LICENSE.MIT"
-    FILENAME "nlohmann-json-LICENSE-${SOURCE_VERSION}.txt"
-    SHA512 0fdb404547467f4523579acde53066badf458504d33edbb6e39df0ae145ed27d48a720189a60c225c0aab05f2aa4ce4050dcb241b56dc693f7ee9f54c8728a75
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
 )
 
-file(INSTALL ${HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include/nlohmann RENAME json.hpp)
-file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/nlohmann-json RENAME copyright)
+if(EXISTS ${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis)
+    file(RENAME
+        ${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis
+        ${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_json.natvis
+    )
+endif()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/nlohmann-json RENAME copyright)
diff --git a/ports/ompl/001-disable-extra-components.patch b/ports/ompl/001-disable-extra-components.patch
new file mode 100644
index 000000000..b1bb8bc39
--- /dev/null
+++ b/ports/ompl/001-disable-extra-components.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fbde81b..da11bfe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -173,12 +173,13 @@ endif()
+ # R is needed for running Planner Arena locally
+ find_program(R_EXEC R)
+ 
+-add_subdirectory(py-bindings)
++# VCPKG PATCH: Disable extra components from library.
++# add_subdirectory(py-bindings)
+ add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(demos)
+-add_subdirectory(scripts)
+-add_subdirectory(doc)
++# add_subdirectory(tests)
++# add_subdirectory(demos)
++# add_subdirectory(scripts)
++# add_subdirectory(doc)
+ 
+ target_link_flags(ompl)
+ set(PKG_NAME "ompl")
diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL
new file mode 100644
index 000000000..082853664
--- /dev/null
+++ b/ports/ompl/CONTROL
@@ -0,0 +1,4 @@
+Source: ompl
+Version: 1.4.1-2
+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, eigen3
+\ No newline at end of file
diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake
new file mode 100644
index 000000000..b0814e3b1
--- /dev/null
+++ b/ports/ompl/portfile.cmake
@@ -0,0 +1,56 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+
+include(vcpkg_common_functions)
+
+set(OMPL_VERSION 1.4.1)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/ompl/ompl/archive/${OMPL_VERSION}.zip"
+    FILENAME "ompl-${OMPL_VERSION}.zip"
+    SHA512 2552476e86fdd4d61a5663d401c18f873424127d04d2342f1e0e5d4a15212b952c9de59f1a2483c2c71ee3cc3aadbe1b5912ae7fa262c218dd0b22daadfcd95c
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${OMPL_VERSION}
+    PATCHES 
+        "001-disable-extra-components.patch"
+)
+# For some reason, demos and tests are being installed 
+# even when disabling the correct OMPL options.
+# The "001-disable-extra-components.patch" avoids that issue.
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS 
+        -DOMPL_VERSIONED_INSTALL=OFF
+        -DOMPL_REGISTRATION=OFF
+        -DOMPL_BUILD_DEMOS=OFF
+        -DOMPL_BUILD_TESTS=OFF
+        -DOMPL_BUILD_PYBINDINGS=OFF
+        -DOMPL_BUILD_PYTESTS=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/ompl/cmake)
+
+# Remove debug distribution
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ompl RENAME copyright)
+
+# Post-build test for cmake libraries
+# vcpkg_test_cmake(PACKAGE_NAME ompl)
diff --git a/ports/oniguruma/CONTROL b/ports/oniguruma/CONTROL
new file mode 100644
index 000000000..bf7a481ab
--- /dev/null
+++ b/ports/oniguruma/CONTROL
@@ -0,0 +1,6 @@
+Source: oniguruma
+Version: 2019-02-26
+Description: Modern and flexible regular expressions library
+
+Feature: non-posix
+Description: Disable POSIX API
diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake
new file mode 100644
index 000000000..40652b590
--- /dev/null
+++ b/ports/oniguruma/portfile.cmake
@@ -0,0 +1,50 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO kkos/oniguruma
+    REF 502b1f416746ed8700498229bbfceb180e400fbc
+    SHA512 0faf12f415de59716d8faa4d3dc026874c3bd6a3624f75f2a184843025294eb885d57164ae6dcb916cba5c7d1a4da4bcb0dc23fce3ceae5b34b7320e8f0e2c02
+    HEAD_REF master
+)
+
+if("non-posix" IN_LIST FEATURES)
+    set(ENABLE_POSIX_API OFF)
+else()
+    set(ENABLE_POSIX_API ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DENABLE_POSIX_API=${ENABLE_POSIX_API}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h
+        "#if defined(ONIGURUMA_EXPORT)"
+        "#if 0 // defined(ONIGURUMA_EXPORT)"
+    )
+else()
+    # oniguruma.h uses `\n` as line break.
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h
+        "#ifndef ONIG_EXTERN\n#if defined(_WIN32) && !defined(__GNUC__)"
+        "#if 0\n#if defined(_WIN32) && !defined(__GNUC__)"
+    )
+endif()
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL
index 78617d700..ed1206a0a 100644
--- a/ports/openblas/CONTROL
+++ b/ports/openblas/CONTROL
@@ -1,3 +1,3 @@
 Source: openblas
-Version: 0.2.20-2
+Version: 0.3.5
 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
diff --git a/ports/openblas/install-openblas.patch b/ports/openblas/install-openblas.patch
deleted file mode 100644
index ef9574cdd..000000000
--- a/ports/openblas/install-openblas.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a379f549..f95a872b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,7 +16,7 @@ enable_language(C)
- include(GNUInstallDirs)
- 
- if(MSVC)
--set(OpenBLAS_LIBNAME libopenblas)
-+set(OpenBLAS_LIBNAME openblas)
- else()
- set(OpenBLAS_LIBNAME openblas)
- endif()
-@@ -197,6 +197,10 @@ set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES
-   SOVERSION ${OpenBLAS_MAJOR_VERSION}
- )
- 
-+install(TARGETS ${OpenBLAS_LIBNAME}
-+        RUNTIME DESTINATION bin
-+        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION lib)
- 
- # TODO: Why is the config saved here? Is this necessary with CMake?
- #Save the config files for installation
diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake
index 463db0f25..ef4e5e177 100644
--- a/ports/openblas/portfile.cmake
+++ b/ports/openblas/portfile.cmake
@@ -24,14 +24,14 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xianyi/OpenBLAS
-    REF v0.2.20
-    SHA512 8dfc8e8c8d456b834d2e9544c8eadd9f4770e30db8b8dd76af601ec0735fd86c9cf63dd6a03ccd23fc02ec2e05069a09875b9073dfe29f99aadab3a958ae2634
+    REF v0.3.5
+    SHA512 91b3074eb922453bf843158b4281cde65db9e8bbdd7590e75e9e6cdcb486157f7973f2936f327bb3eb4f1702ce0ba51ae6729d8d4baf2d986c50771e8f696df0
     HEAD_REF develop
 )
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/install-openblas.patch" "${CMAKE_CURRENT_LIST_DIR}/whitespace.patch"
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/uwp.patch"
 )
 
 find_program(GIT NAMES git git.cmd)
@@ -77,16 +77,14 @@ if(VCPKG_CMAKE_SYSTEM_NAME  STREQUAL "WindowsStore")
         OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DVS_WINRT_COMPONENT=TRUE -DBUILD_WITHOUT_LAPACK=ON 
         "-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel")
 
+elseif(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    vcpkg_configure_cmake(
+        SOURCE_PATH ${SOURCE_PATH}
+        OPTIONS -DBUILD_WITHOUT_LAPACK=ON)
 else()
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
-        OPTIONS -DTARGET=NEHALEM -DBUILD_WITHOUT_LAPACK=ON
-        # PREFER_NINJA # Disable this option if project cannot be built with Ninja
-        # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
-        # OPTIONS_RELEASE -DOPTIMIZE=1
-        # OPTIONS_DEBUG -DDEBUGGABLE=1
-)
-
+        OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DNOFORTRAN=ON)
 endif()
 
 
@@ -97,9 +95,6 @@ vcpkg_install_cmake()
 # this is only to quite vcpkg
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/openblas_common.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
-file(COPY ${SOURCE_PATH}/config.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(RENAME ${CURRENT_PACKAGES_DIR}/include/config.h ${CURRENT_PACKAGES_DIR}/include/openblas_config.h)
-
 file(READ ${SOURCE_PATH}/cblas.h CBLAS_H)
 string(REPLACE "#include \"common.h\"" "#include \"openblas_common.h\"" CBLAS_H "${CBLAS_H}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/cblas.h "${CBLAS_H}")
@@ -110,4 +105,4 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/openblas/LICENSE ${CURRENT_PACKAGES_DI
 
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
diff --git a/ports/openblas/uwp.patch b/ports/openblas/uwp.patch
new file mode 100644
index 000000000..93d0795a6
--- /dev/null
+++ b/ports/openblas/uwp.patch
@@ -0,0 +1,34 @@
+--- a/cmake/prebuild.cmake	2019-01-28 03:05:58.422245700 -0600
++++ b/cmake/prebuild.cmake	2019-01-28 03:07:02.885495800 -0600
+@@ -37,6 +37,9 @@
+ 
+ # CPUIDEMU = ../../cpuid/table.o
+ 
++if (NOT DEFINED BLASHELPER_BINARY_DIR)
++  set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}")
++endif ()
+ 
+ if (DEFINED CPUIDEMU)
+   set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
+@@ -310,8 +313,8 @@ else(NOT CMAKE_CROSSCOMPILING)
+   message(STATUS "Running getarch")
+ 
+   # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
+-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
+-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
+ 
+   message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}")
+ 
+@@ -337,8 +340,8 @@ execute_process(COMMAND "${PROJECT_BINAR
+   endif ()
+ 
+   # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
+-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
+-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
+ 
+   # append config data from getarch_2nd to the TARGET file and read in CMake vars
+   file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT})
diff --git a/ports/openblas/whitespace.patch b/ports/openblas/whitespace.patch
deleted file mode 100644
index 410e81655..000000000
--- a/ports/openblas/whitespace.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
-index 02ab708..b51bd0b 100644
---- a/cmake/prebuild.cmake
-+++ b/cmake/prebuild.cmake
-@@ -37,6 +37,10 @@
- 
- # CPUIDEMU = ../../cpuid/table.o
- 
-+if (NOT DEFINED BLASHELPER_BINARY_DIR)
-+  set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}")
-+endif ()
-+
- if (DEFINED CPUIDEMU)
-   set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
- endif ()
-@@ -87,7 +87,7 @@ file(MAKE_DIRECTORY ${GETARCH_DIR})
- if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
-   try_compile(GETARCH_RESULT ${GETARCH_DIR}
-     SOURCES ${GETARCH_SRC}
--    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I${PROJECT_SOURCE_DIR}
-+    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${PROJECT_SOURCE_DIR}"
-     OUTPUT_VARIABLE GETARCH_LOG
-     COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN}
-   )
-@@ -95,8 +99,8 @@ endif ()
- message(STATUS "Running getarch")
- 
- # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
--execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
--execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
-+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
-+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
- 
- message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}") 
-
-@@ -114,7 +114,7 @@ file(MAKE_DIRECTORY ${GETARCH2_DIR})
- if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
-   try_compile(GETARCH2_RESULT ${GETARCH2_DIR}
-     SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c
--    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I${PROJECT_SOURCE_DIR}
-+    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${PROJECT_SOURCE_DIR}"
-     OUTPUT_VARIABLE GETARCH2_LOG
-     COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN}
-   )
-@@ -121,8 +125,8 @@ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
- endif ()
- 
- # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
--execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
--execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
-+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
-+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
- 
- # append config data from getarch_2nd to the TARGET file and read in CMake vars
- file(APPEND ${TARGET_CONF} ${GETARCH2_CONF_OUT})
-@@ -141,7 +141,7 @@ file(MAKE_DIRECTORY ${GEN_CONFIG_H_DIR})
- if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
-   try_compile(GEN_CONFIG_H_RESULT ${GEN_CONFIG_H_DIR}
-     SOURCES ${PROJECT_SOURCE_DIR}/gen_config_h.c
--    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GEN_CONFIG_H_FLAGS} -I${PROJECT_SOURCE_DIR}
-+    COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GEN_CONFIG_H_FLAGS} -I"${PROJECT_SOURCE_DIR}"
-     OUTPUT_VARIABLE GEN_CONFIG_H_LOG
-     COPY_FILE ${PROJECT_BINARY_DIR}/${GEN_CONFIG_H_BIN}
-   )
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 41e73b195..03328915d 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,5 +1,5 @@
 Source: opencv
-Version: 3.4.3-5
+Version: 3.4.3-6
 Build-Depends: zlib
 Description: computer vision library
 Default-Features: opengl, jpeg, png, tiff, eigen, flann
@@ -37,6 +37,10 @@ Description: prebuilt ffmpeg support for opencv
 Feature: ipp
 Description: Enable Intel Integrated Performance Primitives
 
+Feature: tbb
+Build-Depends: tbb
+Description: Enable Intel Threading Building Blocks
+
 Feature: qt
 Build-Depends: qt5
 Description: Qt GUI support for opencv
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index 6fbb535cf..49e42466a 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -145,6 +145,11 @@ if("ipp" IN_LIST FEATURES)
   endif()
 endif()
 
+set(WITH_TBB OFF)
+if("tbb" IN_LIST FEATURES)
+  set(WITH_TBB ON)
+endif()
+
 set(WITH_QT OFF)
 if("qt" IN_LIST FEATURES)
   set(WITH_QT ON)
@@ -282,7 +287,7 @@ vcpkg_configure_cmake(
         ${BUILD_WITH_CONTRIB_FLAG}
         -DOPENCV_OTHER_INSTALL_PATH=share/opencv
         # WITH
-        -DWITH_CUBLAS=OFF
+        -DWITH_CUBLAS=${WITH_CUDA}
         -DWITH_CUDA=${WITH_CUDA}
         -DWITH_EIGEN=${WITH_EIGEN}
         -DWITH_FFMPEG=${WITH_FFMPEG}
@@ -299,6 +304,7 @@ vcpkg_configure_cmake(
         -DWITH_PNG=${WITH_PNG}
         -DWITH_PROTOBUF=${WITH_PROTOBUF}
         -DWITH_QT=${WITH_QT}
+        -DWITH_TBB=${WITH_TBB}
         -DWITH_TIFF=${WITH_TIFF}
         -DWITH_VTK=${WITH_VTK}
         -DWITH_WEBP=${WITH_WEBP}
diff --git a/ports/openexr/CMakeLists.txt.patch b/ports/openexr/CMakeLists.txt.patch
deleted file mode 100644
index 0ee0110d5..000000000
--- a/ports/openexr/CMakeLists.txt.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8c0a385..887ddf5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -157,8 +157,8 @@ IF (HAVE_SYSCONF_NPROCESSORS_ONLN)
-   FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1\n" )
- ENDIF()
-   
--SET (OPENEXR_LIBSUFFIX "")
--SET (ILMBASE_LIBSUFFIX "")
-+SET (OPENEXR_LIBSUFFIX "" CACHE STRING "Default suffix for OpenEXR")
-+SET (ILMBASE_LIBSUFFIX "" CACHE STRING "Default suffix for ILMBase")
- IF (NAMESPACE_VERSIONING)
-   SET ( OPENEXR_LIBSUFFIX "-${OPENEXR_VERSION_API}" )
-   # assume same NAMESPACE_VERSION setting for IlmBase for now
-@@ -188,32 +188,6 @@ SET_TARGET_PROPERTIES ( IlmImfUtil
-   SOVERSION 23
-   OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}"
-   )
--  
--##########################
--# Example Code
--##########################
--ADD_SUBDIRECTORY ( IlmImfExamples )
--
--  
--##########################
--# Tests
--##########################
--ADD_SUBDIRECTORY ( IlmImfTest )
--ADD_SUBDIRECTORY ( IlmImfUtilTest )
--ADD_SUBDIRECTORY ( IlmImfFuzzTest )
--
--
--##########################
--# Binaries / Utilities
--##########################
--ADD_SUBDIRECTORY ( exrheader )
--ADD_SUBDIRECTORY ( exrmaketiled )
--ADD_SUBDIRECTORY ( exrstdattr )
--ADD_SUBDIRECTORY ( exrmakepreview )
--ADD_SUBDIRECTORY ( exrenvmap )
--ADD_SUBDIRECTORY ( exrmultiview )
--ADD_SUBDIRECTORY ( exrmultipart )
--
- 
- ##########################
- # Installation
-@@ -224,37 +198,3 @@ INSTALL ( FILES
-   DESTINATION
-   ${CMAKE_INSTALL_PREFIX}/include/OpenEXR
-   )
--
--# Documentation
--INSTALL ( FILES
--  doc/TechnicalIntroduction.pdf
--  doc/ReadingAndWritingImageFiles.pdf
--  doc/OpenEXRFileLayout.pdf
--  doc/MultiViewOpenEXR.pdf
--  doc/InterpretingDeepPixels.pdf
--  doc/TheoryDeepPixels.pdf
--  DESTINATION
--  ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${OPENEXR_VERSION}
--  )
--
--# Examples
--INSTALL ( FILES
--  IlmImfExamples/main.cpp
--  IlmImfExamples/drawImage.cpp
--  IlmImfExamples/rgbaInterfaceExamples.cpp
--  IlmImfExamples/rgbaInterfaceTiledExamples.cpp
--  IlmImfExamples/generalInterfaceExamples.cpp
--  IlmImfExamples/lowLevelIoExamples.cpp
--  IlmImfExamples/previewImageExamples.cpp
--  IlmImfExamples/generalInterfaceTiledExamples.cpp
--  IlmImfExamples/generalInterfaceTiledExamples.h
--  IlmImfExamples/drawImage.h
--  IlmImfExamples/rgbaInterfaceExamples.h
--  IlmImfExamples/generalInterfaceExamples.h
--  IlmImfExamples/rgbaInterfaceTiledExamples.h
--  IlmImfExamples/lowLevelIoExamples.h
--  IlmImfExamples/previewImageExamples.h
--  IlmImfExamples/namespaceAlias.h
--  DESTINATION
--  ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${OPENEXR_VERSION}/examples
--  )
diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL
index 752dafc6d..ea85a082f 100644
--- a/ports/openexr/CONTROL
+++ b/ports/openexr/CONTROL
@@ -1,4 +1,4 @@
 Source: openexr
-Version: 2.2.1-1
+Version: 2.3.0-2
 Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications
-Build-Depends: zlib, ilmbase
+Build-Depends: zlib
diff --git a/ports/openexr/FindOpenEXR.cmake b/ports/openexr/FindOpenEXR.cmake
index cfff7824c..a381c6db9 100644
--- a/ports/openexr/FindOpenEXR.cmake
+++ b/ports/openexr/FindOpenEXR.cmake
@@ -1,13 +1,87 @@
 include(FindPackageHandleStandardArgs)
 
+find_path(OpenEXR_INCLUDE_DIRS OpenEXR/OpenEXRConfig.h)
 find_path(OPENEXR_INCLUDE_PATHS NAMES ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
 
-find_library(OPENEXR_HALF_LIBRARY NAMES Half)
-find_library(OPENEXR_IEX_LIBRARY NAMES Iex-2_2)
-find_library(OPENEXR_IMATH_LIBRARY NAMES Imath-2_2)
-find_library(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf-2_2)
-find_library(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread-2_2)
+file(STRINGS "${OpenEXR_INCLUDE_DIRS}/OpenEXR/OpenEXRConfig.h" OPENEXR_CONFIG_H)
 
-set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY})
+string(REGEX REPLACE "^.*define OPENEXR_VERSION_MAJOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MAJOR "${OPENEXR_CONFIG_H}")
+string(REGEX REPLACE "^.*define OPENEXR_VERSION_MINOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MINOR "${OPENEXR_CONFIG_H}")
+set(OpenEXR_LIB_SUFFIX "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}")
 
-find_package_handle_standard_args(OPENEXR REQUIRED_VARS OPENEXR_LIBRARIES OPENEXR_INCLUDE_PATHS)
+include(SelectLibraryConfigurations)
+
+if(NOT OpenEXR_BASE_LIBRARY)
+  find_library(OpenEXR_BASE_LIBRARY_RELEASE NAMES IlmImf-${OpenEXR_LIB_SUFFIX})
+  find_library(OpenEXR_BASE_LIBRARY_DEBUG NAMES IlmImf-${OpenEXR_LIB_SUFFIX}_d)
+  select_library_configurations(OpenEXR_BASE)
+endif()
+
+if(NOT OpenEXR_UTIL_LIBRARY)
+  find_library(OpenEXR_UTIL_LIBRARY_RELEASE NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX})
+  find_library(OpenEXR_UTIL_LIBRARY_DEBUG NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX}_d)
+  select_library_configurations(OpenEXR_UTIL)
+endif()
+
+if(NOT OpenEXR_HALF_LIBRARY)
+  find_library(OpenEXR_HALF_LIBRARY_RELEASE NAMES Half-${OpenEXR_LIB_SUFFIX})
+  find_library(OpenEXR_HALF_LIBRARY_DEBUG NAMES Half-${OpenEXR_LIB_SUFFIX}_d)
+  select_library_configurations(OpenEXR_HALF)
+endif()
+
+if(NOT OpenEXR_IEX_LIBRARY)
+  find_library(OpenEXR_IEX_LIBRARY_RELEASE NAMES Iex-${OpenEXR_LIB_SUFFIX})
+  find_library(OpenEXR_IEX_LIBRARY_DEBUG NAMES Iex-${OpenEXR_LIB_SUFFIX}_d)
+  select_library_configurations(OpenEXR_IEX)
+endif()
+
+if(NOT OpenEXR_MATH_LIBRARY)
+  find_library(OpenEXR_MATH_LIBRARY_RELEASE NAMES Imath-${OpenEXR_LIB_SUFFIX})
+  find_library(OpenEXR_MATH_LIBRARY_DEBUG NAMES Imath-${OpenEXR_LIB_SUFFIX}_d)
+  select_library_configurations(OpenEXR_MATH)
+endif()
+
+if(NOT OpenEXR_THREAD_LIBRARY)
+  find_library(OpenEXR_THREAD_LIBRARY_RELEASE NAMES IlmThread-${OpenEXR_LIB_SUFFIX})
+  find_library(OpenEXR_THREAD_LIBRARY_DEBUG NAMES IlmThread-${OpenEXR_LIB_SUFFIX}_d)
+  select_library_configurations(OpenEXR_THREAD)
+endif()
+
+if(NOT OpenEXR_IEXMATH_LIBRARY)
+  find_library(OpenEXR_IEXMATH_LIBRARY_RELEASE NAMES IexMath-${OpenEXR_LIB_SUFFIX})
+  find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}d)
+  select_library_configurations(OpenEXR_IEXMATH)
+endif()
+
+set(OPENEXR_HALF_LIBRARY "${OpenEXR_HALF_LIBRARY}")
+set(OPENEXR_IEX_LIBRARY "${OpenEXR_IEX_LIBRARY}")
+set(OPENEXR_IMATH_LIBRARY "${OpenEXR_MATH_LIBRARY}")
+set(OPENEXR_ILMIMF_LIBRARY "${OpenEXR_BASE_LIBRARY}")
+set(OPENEXR_ILMIMFUTIL_LIBRARY "${OpenEXR_UTIL_LIBRARY}")
+set(OPENEXR_ILMTHREAD_LIBRARY "${OpenEXR_THREAD_LIBRARY}")
+
+set(OpenEXR_LIBRARY "${OpenEXR_BASE_LIBRARY}")
+
+set(OpenEXR_LIBRARIES
+    ${OpenEXR_LIBRARY}
+    ${OpenEXR_MATH_LIBRARY}
+    ${OpenEXR_IEXMATH_LIBRARY}
+    ${OpenEXR_UTIL_LIBRARY}
+    ${OpenEXR_HALF_LIBRARY}
+    ${OpenEXR_IEX_LIBRARY}
+    ${OpenEXR_THREAD_LIBRARY}
+)
+
+set(OPENEXR_LIBRARIES
+    ${OPENEXR_HALF_LIBRARY}
+    ${OPENEXR_IEX_LIBRARY}
+    ${OPENEXR_IMATH_LIBRARY}
+    ${OPENEXR_ILMIMF_LIBRARY}
+    ${OPENEXR_ILMTHREAD_LIBRARY}
+)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS)
+
+if(OpenEXR_FOUND)
+    set(OPENEXR_FOUND 1)
+endif()
diff --git a/ports/openexr/add-missing-export.patch b/ports/openexr/add-missing-export.patch
deleted file mode 100644
index c78842d18..000000000
--- a/ports/openexr/add-missing-export.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/IlmImf/ImfHeader.h b/IlmImf/ImfHeader.h
-index 756a62e..dd71e0e 100644
---- a/IlmImf/ImfHeader.h
-+++ b/IlmImf/ImfHeader.h
-@@ -493,7 +493,7 @@ class Header::ConstIterator
- //
- //------------------------------------------------------------------------
- 
--void staticInitialize ();
-+IMF_EXPORT void staticInitialize ();
- 
- 
- //-----------------
diff --git a/ports/openexr/fix-static-linking.patch b/ports/openexr/fix-static-linking.patch
deleted file mode 100644
index af2f067f1..000000000
--- a/ports/openexr/fix-static-linking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/IlmImf/CMakeLists.txt b/IlmImf/CMakeLists.txt
-index 18d90edc..21bbaa27 100644
---- a/IlmImf/CMakeLists.txt
-+++ b/IlmImf/CMakeLists.txt
-@@ -25,8 +25,8 @@ ADD_EXECUTABLE ( dwaLookups
- 
- TARGET_LINK_LIBRARIES ( dwaLookups
-   Half
--  Iex${ILMBASE_LIBSUFFIX}
-   IlmThread${ILMBASE_LIBSUFFIX}
-+  Iex${ILMBASE_LIBSUFFIX}
-   ${PTHREAD_LIB}
- )
- 
diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake
index b02a487a9..c32d07123 100644
--- a/ports/openexr/portfile.cmake
+++ b/ports/openexr/portfile.cmake
@@ -1,63 +1,71 @@
-set(OPENEXR_VERSION 2.2.1)
-set(OPENEXR_HASH 192100c6ac47534f3a93c55327d2ab90b07a8265156855086b326184328c257dcde12991b3f3f1831e2df4226fe884adcfe481c2f02a157c715aee665e89a480)
-
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openexr-${OPENEXR_VERSION})
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.savannah.nongnu.org/releases/openexr/openexr-${OPENEXR_VERSION}.tar.gz"
-    FILENAME "openexr-${OPENEXR_VERSION}.tar.gz"
-    SHA512 ${OPENEXR_HASH})
-
-vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-    "${CMAKE_CURRENT_LIST_DIR}/add-missing-export.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/fix-static-linking.patch"
-)
 
-# Ensure helper executables can run during build
-set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin")
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  message(FATAL_ERROR "UWP build not supported")
+endif()
+
+set(OPENEXR_VERSION 2.3.0)
+set(OPENEXR_HASH 268ae64b40d21d662f405fba97c307dad1456b7d996a447aadafd41b640ca736d4851d9544b4741a94e7b7c335fe6e9d3b16180e710671abfc0c8b2740b147b2)
 
-# In debug build buildsystem cannot locate IlmBase headers
-set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG}")
-set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -I\"${CURRENT_INSTALLED_DIR}/include/OpenEXR\"")
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO openexr/openexr
+  REF v${OPENEXR_VERSION}
+  SHA512 ${OPENEXR_HASH}
+  HEAD_REF master
+)
 
 vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS_DEBUG
-        -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR}/debug
-    OPTIONS_RELEASE
-        -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR})
+  PREFER_NINJA
+  OPTIONS
+    -DOPENEXR_BUILD_PYTHON_LIBS:BOOL=FALSE
+  OPTIONS_DEBUG
+    -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR}/debug
+  OPTIONS_RELEASE
+    -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR})
 
 vcpkg_install_cmake()
 
-# if you need to have OpenEXR tools, edit CMakeLists.txt.patch and remove the part that disables building executables,
-# then remove the following line which deletes them and finally use vcpkg_copy_tool_dependencies() to save them
-# (may require additional patching to the OpenEXR toolchain which is really broken)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    foreach(SUBDIR "" "/debug")
-        file(GLOB DLLS ${CURRENT_PACKAGES_DIR}${SUBDIR}/lib/*.dll)
-        file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}${SUBDIR}/bin)
-        file(REMOVE ${DLLS})
-    endforeach()
+# NOTE: Only use ".exe" extension on Windows executables.
+# Is there a cleaner way to do this?
+if(WIN32)
+    set(EXECUTABLE_SUFFIX ".exe")
+else()
+    set(EXECUTABLE_SUFFIX "")
 endif()
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmakepreview${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmaketiled${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultipart${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultiview${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrstdattr${EXECUTABLE_SUFFIX})
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openexr/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrenvmap${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrenvmap${EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrheader${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrheader${EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmakepreview${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmakepreview${EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmaketiled${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmaketiled${EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultipart${EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${EXECUTABLE_SUFFIX})
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openexr)
 
 vcpkg_copy_pdbs()
 
-file(READ ${CURRENT_PACKAGES_DIR}/include/OpenEXR/ImfExport.h HEADER_FILE)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    string(REPLACE "defined(OPENEXR_DLL)" "1" HEADER_FILE "${HEADER_FILE}")
+if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  set(OPENEXR_PORT_DIR "openexr")
 else()
-    string(REPLACE "defined(OPENEXR_DLL)" "0" HEADER_FILE "${HEADER_FILE}")
+  set(OPENEXR_PORT_DIR "OpenEXR")
 endif()
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/OpenEXR/ImfExport.h "${HEADER_FILE}")
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openexr)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/openexr/LICENSE ${CURRENT_PACKAGES_DIR}/share/openexr/copyright)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/copyright)
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindOpenEXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openexr)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindOpenEXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR})
diff --git a/ports/openvdb/0001-fix-cmake-modules.patch b/ports/openvdb/0001-fix-cmake-modules.patch
new file mode 100644
index 000000000..1e613e602
--- /dev/null
+++ b/ports/openvdb/0001-fix-cmake-modules.patch
@@ -0,0 +1,198 @@
+diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
+index 2d9d9d3..e9b4abc 100644
+--- a/cmake/FindBlosc.cmake
++++ b/cmake/FindBlosc.cmake
+@@ -37,11 +37,7 @@
+ 
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+ 
+-FIND_PATH( BLOSC_LOCATION include/blosc.h
+-  "$ENV{BLOSC_ROOT}"
+-  NO_DEFAULT_PATH
+-  NO_SYSTEM_ENVIRONMENT_PATH
+-  )
++FIND_PATH( BLOSC_LOCATION include/blosc.h)
+ 
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( Blosc
+   REQUIRED_VARS BLOSC_LOCATION
+@@ -53,7 +49,7 @@ IF ( BLOSC_FOUND )
+     CACHE STRING "Blosc library directories")
+ 
+   SET ( _blosc_library_name "blosc" )
+-  
++
+   # Static library setup
+   IF (Blosc_USE_STATIC_LIBS)
+     SET(CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP ${CMAKE_FIND_LIBRARY_SUFFIXES})
+@@ -69,7 +65,7 @@ IF ( BLOSC_FOUND )
+     NO_DEFAULT_PATH
+     NO_SYSTEM_ENVIRONMENT_PATH
+     )
+-  
++
+   # Static library tear down
+   IF (Blosc_USE_STATIC_LIBS)
+     SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
+diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
+index 0b72457..75951a6 100644
+--- a/cmake/FindGLEW.cmake
++++ b/cmake/FindGLEW.cmake
+@@ -39,11 +39,7 @@
+ 
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+ 
+-FIND_PATH( GLEW_LOCATION include/GL/glew.h
+-  "$ENV{GLEW_ROOT}"
+-  NO_DEFAULT_PATH
+-  NO_SYSTEM_ENVIRONMENT_PATH
+-  )
++FIND_PATH( GLEW_LOCATION include/GL/glew.h)
+ 
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( GLEW
+   REQUIRED_VARS GLEW_LOCATION
+diff --git a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
+index cea0b86..07ea09e 100644
+--- a/cmake/FindGLFW3.cmake
++++ b/cmake/FindGLFW3.cmake
+@@ -39,11 +39,7 @@
+ 
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+ 
+-FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
+-  "$ENV{GLFW3_ROOT}"
+-  NO_DEFAULT_PATH
+-  NO_SYSTEM_ENVIRONMENT_PATH
+-)
++FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h)
+ 
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( GLFW3
+   REQUIRED_VARS GLFW3_LOCATION
+diff --git a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake
+index 664affd..5197110 100644
+--- a/cmake/FindILMBase.cmake
++++ b/cmake/FindILMBase.cmake
+@@ -43,11 +43,7 @@
+ 
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+ 
+-FIND_PATH ( ILMBASE_LOCATION include/OpenEXR/IlmBaseConfig.h
+-  "$ENV{ILMBASE_ROOT}"
+-  NO_DEFAULT_PATH
+-  NO_SYSTEM_ENVIRONMENT_PATH
+-  )
++FIND_PATH ( ILMBASE_LOCATION include/OpenEXR/IlmBaseConfig.h)
+ 
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( ILMBase
+   REQUIRED_VARS ILMBASE_LOCATION
+@@ -70,11 +66,13 @@ IF ( ILMBASE_FOUND )
+ 	SET ( IEXMATH_LIBRARY_NAME   IexMath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}   )
+ 	SET ( ILMTHREAD_LIBRARY_NAME IlmThread-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
+ 	SET ( IMATH_LIBRARY_NAME     Imath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}     )
++	SET ( HALF_LIBRARY_NAME      Half-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}      )
+   ELSE ( ILMBASE_NAMESPACE_VERSIONING )
+ 	SET ( IEX_LIBRARY_NAME       Iex       )
+ 	SET ( IEXMATH_LIBRARY_NAME   IexMath   )
+ 	SET ( ILMTHREAD_LIBRARY_NAME IlmThread )
+ 	SET ( IMATH_LIBRARY_NAME     Imath     )
++	SET ( HALF_LIBRARY_NAME      Half      )
+   ENDIF ( ILMBASE_NAMESPACE_VERSIONING )
+ 
+   SET ( ILMBASE_INCLUDE_DIRS
+@@ -84,7 +82,7 @@ IF ( ILMBASE_FOUND )
+   SET ( ILMBASE_LIBRARYDIR ${ILMBASE_LOCATION}/lib
+     CACHE STRING "ILMBase library directories")
+   SET ( ILMBASE_FOUND TRUE )
+-  
++
+   SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+   IF (Ilmbase_USE_STATIC_LIBS)
+     IF (APPLE)
+@@ -129,14 +127,14 @@ IF ( ILMBASE_FOUND )
+     ELSEIF (WIN32)
+       # Link library
+       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+-      FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR} )
++      FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
+       FIND_LIBRARY ( Ilmbase_IEX_LIBRARY ${IEX_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
+       FIND_LIBRARY ( Ilmbase_IEXMATH_LIBRARY ${IEXMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
+       FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY ${ILMTHREAD_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
+       FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY ${IMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
+       # Load library
+       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+-      FIND_LIBRARY ( Ilmbase_HALF_DLL Half PATHS ${ILMBASE_LOCATION}/bin
++      FIND_LIBRARY ( Ilmbase_HALF_DLL ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LOCATION}/bin
+ 		NO_DEFAULT_PATH
+ 		NO_SYSTEM_ENVIRONMENT_PATH
+         )
+@@ -157,7 +155,7 @@ IF ( ILMBASE_FOUND )
+ 		NO_SYSTEM_ENVIRONMENT_PATH
+         )
+     ELSE (APPLE)
+-      FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR}
++      FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
+ 		NO_DEFAULT_PATH
+ 		NO_SYSTEM_ENVIRONMENT_PATH
+         )
+diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
+index 6d69c03..5ecf8fa 100644
+--- a/cmake/FindOpenEXR.cmake
++++ b/cmake/FindOpenEXR.cmake
+@@ -38,11 +38,7 @@
+ 
+ FIND_PACKAGE ( PackageHandleStandardArgs )
+ 
+-FIND_PATH ( OPENEXR_LOCATION include/OpenEXR/OpenEXRConfig.h
+-  ENV OPENEXR_ROOT
+-  NO_DEFAULT_PATH
+-  NO_SYSTEM_ENVIRONMENT_PATH
+-  )
++FIND_PATH ( OPENEXR_LOCATION include/OpenEXR/OpenEXRConfig.h)
+ 
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( OpenEXR
+   REQUIRED_VARS OPENEXR_LOCATION
+@@ -59,7 +55,7 @@ IF ( OPENEXR_FOUND )
+   FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR ")
+   STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" _openexr_version_minor_unstrip "${_openexr_version_minor_string}")
+   STRING ( STRIP "${_openexr_version_minor_unstrip}" OPENEXR_VERSION_MINOR )
+-  
++
+   MESSAGE ( STATUS "Found OpenEXR v${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR} at ${OPENEXR_LOCATION}" )
+ 
+   IF ( OPENEXR_NAMESPACE_VERSIONING )
+@@ -67,7 +63,7 @@ IF ( OPENEXR_FOUND )
+   ELSE ( OPENEXR_NAMESPACE_VERSIONING )
+ 	SET ( ILMIMF_LIBRARY_NAME IlmImf )
+   ENDIF ( OPENEXR_NAMESPACE_VERSIONING )
+-	
++
+   SET ( OPENEXR_INCLUDE_DIRS
+     ${OPENEXR_LOCATION}/include
+     ${OPENEXR_LOCATION}/include/OpenEXR
+@@ -120,6 +116,5 @@ IF ( OPENEXR_FOUND )
+   ENDIF ()
+ 
+   # SET( Openexr_ILMIMF_LIBRARY ${OPENEXR_ILMIMF_LIBRARY_PATH} CACHE STRING "Openexr's IlmImf library")
+-  
+-ENDIF ( OPENEXR_FOUND )
+ 
++ENDIF ( OPENEXR_FOUND )
+diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
+index 8a56ec0..9f5a7b4 100644
+--- a/cmake/FindTBB.cmake
++++ b/cmake/FindTBB.cmake
+@@ -42,14 +42,7 @@ FIND_PACKAGE ( PackageHandleStandardArgs )
+ 
+ # SET ( TBB_FOUND FALSE )
+ 
+-FIND_PATH( TBB_LOCATION include/tbb/tbb.h
+-  "$ENV{TBB_ROOT}"
+-  NO_DEFAULT_PATH
+-  NO_CMAKE_ENVIRONMENT_PATH
+-  NO_CMAKE_PATH
+-  NO_SYSTEM_ENVIRONMENT_PATH
+-  NO_CMAKE_SYSTEM_PATH
+-  )
++FIND_PATH( TBB_LOCATION include/tbb/tbb.h)
+ 
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( TBB
+   REQUIRED_VARS TBB_LOCATION
diff --git a/ports/openvdb/0002-add-custom-options.patch b/ports/openvdb/0002-add-custom-options.patch
new file mode 100644
index 000000000..5e8d49091
--- /dev/null
+++ b/ports/openvdb/0002-add-custom-options.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b35ec70..801e7df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,6 +38,9 @@ if(CCACHE_FOUND)
+     set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+ endif(CCACHE_FOUND)
+ 
++OPTION ( OPENVDB_BUILD_TOOLS "Build OpenVDB utilities" OFF )
++OPTION ( OPENVDB_STATIC "Build statically linked library" OFF )
++OPTION ( OPENVDB_SHARED "Build dynamically linked library" ON )
+ OPTION ( OPENVDB_BUILD_UNITTESTS "Build the OpenVDB unit tests" ON )
+ OPTION ( OPENVDB_BUILD_DOCS "Build the OpenVDB documentation" OFF )
+ OPTION ( OPENVDB_BUILD_PYTHON_MODULE "Build the pyopenvdb Python module" ON )
diff --git a/ports/openvdb/AddLinkageAndToolsChoice.patch b/ports/openvdb/0003-build-only-necessary-targets.patch
index 57078be15..55b480ce4 100644
--- a/ports/openvdb/AddLinkageAndToolsChoice.patch
+++ b/ports/openvdb/0003-build-only-necessary-targets.patch
@@ -1,81 +1,63 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 712fb1d..440a63a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,6 +32,9 @@ PROJECT ( OpenVDB )
- 
- ENABLE_TESTING()
- 
-+OPTION ( OPENVDB_BUILD_TOOLS "Build OpenVDB utilities" ON )
-+OPTION ( OPENVDB_STATIC "Build statically linked library" ON )
-+OPTION ( OPENVDB_SHARED "Build dynamically linked library" ON )
- OPTION ( OPENVDB_BUILD_UNITTESTS "Build the OpenVDB unit tests" ON )
- OPTION ( OPENVDB_BUILD_DOCS "Build the OpenVDB documentation" OFF )
- OPTION ( OPENVDB_BUILD_PYTHON_MODULE "Build the pyopenvdb Python module" ON )
 diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
-index 5703eb9..6ff3c6a 100644
+index 9404dbc..b4129e3 100644
 --- a/openvdb/CMakeLists.txt
 +++ b/openvdb/CMakeLists.txt
-@@ -26,6 +26,7 @@
- #
- PROJECT ( OpenVDBCore )
+@@ -29,12 +29,13 @@ PROJECT ( OpenVDBCore )
+ 
+ set(CMAKE_CXX_STANDARD 11)
  
 +IF ( OPENVDB_BUILD_TOOLS )
  IF ( USE_GLFW3 )
    FIND_PACKAGE ( GLFW3 REQUIRED )
    SET ( OPENVDB_USE_GLFW_FLAG "-DOPENVDB_USE_GLFW_3" )
-@@ -42,9 +43,12 @@ ELSE ()
+   IF ( UNIX AND NOT APPLE )
+     SET ( GLFW_DEPENDENT_LIBRARIES "X11;Xi;Xrandr;Xinerama;Xcursor;Xxf86vm" )
+-  ENDIF ( UNIX AND NOT APPLE )
++  ENDIF ()
+   SET ( GLFW_LINK_LIBRARY ${GLFW3_glfw_LIBRARY} )
+   SET ( GLFW_INCLUDE_DIRECTORY  ${GLFW3_INCLUDE_DIR} CACHE STRING "GLFW3 include directory")
+ ELSE ()
+@@ -45,12 +46,14 @@ ELSE ()
    SET ( GLFW_LINK_LIBRARY ${GLFW_glfw_LIBRARY} )
    SET ( GLFW_INCLUDE_DIRECTORY  ${GLFW_INCLUDE_DIR} CACHE STRING "GLFW include directory")
  ENDIF ()
-+ENDIF ( OPENVDB_BUILD_TOOLS )
++ENDIF ()
  
- IF (WIN32)
-+  IF ( OPENVDB_BUILD_TOOLS )
-   FIND_PACKAGE ( GLEW REQUIRED )
-+  ENDIF ( OPENVDB_BUILD_TOOLS )
- ELSE ()
-   FIND_PACKAGE ( Threads REQUIRED )
- ENDIF()
-@@ -75,7 +79,7 @@ SET ( OPENVDB_PATCH_VERSION_NUMBER ${_openvdb_patch_version_number} CACHE STRING
- # MESSAGE ( "OPENVDB_MINOR_VERSION_NUMBER = ${OPENVDB_MINOR_VERSION_NUMBER}" )
- # MESSAGE ( "OPENVDB_PATCH_VERSION_NUMBER = ${OPENVDB_PATCH_VERSION_NUMBER}" )
- 
--FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system thread ${OPENVDB_BOOST_PYTHON_LIBRARY_COMPONENT_NAME} )
-+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system thread date_time ${OPENVDB_BOOST_PYTHON_LIBRARY_COMPONENT_NAME} )
- IF (WIN32 AND OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING)
-   ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
- ENDIF ()
-@@ -85,7 +89,9 @@ FIND_PACKAGE ( TBB REQUIRED )
- FIND_PACKAGE ( ZLIB REQUIRED )
- FIND_PACKAGE ( ILMBase REQUIRED )
- FIND_PACKAGE ( OpenEXR REQUIRED )
+-IF (WIN32)
 +IF ( OPENVDB_BUILD_TOOLS )
- FIND_PACKAGE ( OpenGL REQUIRED )
++IF ( WIN32 )
+   FIND_PACKAGE ( GLEW REQUIRED )
+-ELSE ()
+-  FIND_PACKAGE ( Threads REQUIRED )
+-ENDIF()
 +ENDIF ()
- IF (OPENVDB_BUILD_DOCS)
-   FIND_PACKAGE ( Doxygen REQUIRED )
- ENDIF ()
-@@ -127,7 +133,10 @@ INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
++ENDIF ()
++FIND_PACKAGE ( Threads REQUIRED )
+ 
+ # Determine OpenVDB version
+ #define OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER 4
+@@ -130,7 +133,12 @@ INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
  INCLUDE_DIRECTORIES ( SYSTEM ${CPPUNIT_INCLUDE_DIR} )
  
  IF (WIN32)
 -  ADD_DEFINITIONS ( -D_WIN32 -DNOMINMAX -DHALF_EXPORTS -DOPENVDB_DLL )
++  ADD_DEFINITIONS ( -D__TBB_NO_IMPLICIT_LINKAGE )
++  ADD_DEFINITIONS ( -D__TBBMALLOC_NO_IMPLICIT_LINKAGE )
 +  ADD_DEFINITIONS ( -D_WIN32 -DNOMINMAX )
 +  IF ( OPENVDB_SHARED )
-+    ADD_DEFINITIONS ( -DOPENVDB_DLL )
++    ADD_DEFINITIONS ( -DOPENEXR_DLL -DOPENVDB_DLL )
 +  ENDIF ()
  ELSE ()
    ADD_DEFINITIONS ( -pthread -fPIC )
  ENDIF ()
-@@ -167,16 +176,20 @@ SET ( OPENVDB_LIBRARY_SOURCE_FILES
+@@ -170,16 +178,21 @@ SET ( OPENVDB_LIBRARY_SOURCE_FILES
  
  SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_LIBRARY_SOURCE_FILES}
    PROPERTIES
 -  COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}"
 +  COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>"
    )
--
+ 
 +IF ( OPENVDB_STATIC )
  ADD_LIBRARY ( openvdb_static STATIC
    ${OPENVDB_LIBRARY_SOURCE_FILES}
@@ -91,7 +73,7 @@ index 5703eb9..6ff3c6a 100644
  TARGET_LINK_LIBRARIES ( openvdb_static
    ${Boost_IOSTREAMS_LIBRARY}
    ${Boost_SYSTEM_LIBRARY}
-@@ -185,6 +198,8 @@ TARGET_LINK_LIBRARIES ( openvdb_static
+@@ -188,6 +201,8 @@ TARGET_LINK_LIBRARIES ( openvdb_static
    ${ZLIB_LIBRARY}
    ${BLOSC_blosc_LIBRARY}
    )
@@ -100,7 +82,7 @@ index 5703eb9..6ff3c6a 100644
  TARGET_LINK_LIBRARIES ( openvdb_shared
    ${Boost_IOSTREAMS_LIBRARY}
    ${Boost_SYSTEM_LIBRARY}
-@@ -193,7 +208,9 @@ TARGET_LINK_LIBRARIES ( openvdb_shared
+@@ -196,7 +211,9 @@ TARGET_LINK_LIBRARIES ( openvdb_shared
    ${ZLIB_LIBRARY}
    ${BLOSC_blosc_LIBRARY}
    )
@@ -110,17 +92,19 @@ index 5703eb9..6ff3c6a 100644
  IF (WIN32)
    SET_TARGET_PROPERTIES ( openvdb_static
  	PROPERTIES OUTPUT_NAME libopenvdb
-@@ -203,7 +220,9 @@ ELSE()
+@@ -205,8 +222,10 @@ ELSE()
+   SET_TARGET_PROPERTIES ( openvdb_static
  	PROPERTIES OUTPUT_NAME openvdb
  	)
- ENDIF()
+-ENDIF()
++ENDIF ()
 +ENDIF ()
  
 +IF ( OPENVDB_SHARED )
  SET_TARGET_PROPERTIES(
    openvdb_shared
    PROPERTIES
-@@ -211,13 +230,15 @@ SET_TARGET_PROPERTIES(
+@@ -214,13 +233,15 @@ SET_TARGET_PROPERTIES(
    SOVERSION ${OPENVDB_MAJOR_VERSION_NUMBER}.${OPENVDB_MINOR_VERSION_NUMBER}
    VERSION ${OPENVDB_MAJOR_VERSION_NUMBER}.${OPENVDB_MINOR_VERSION_NUMBER}.${OPENVDB_PATCH_VERSION_NUMBER}
    )
@@ -137,7 +121,7 @@ index 5703eb9..6ff3c6a 100644
  ADD_EXECUTABLE ( vdb_print
    ${VDB_PRINT_SOURCE_FILES}
    )
-@@ -231,7 +252,7 @@ TARGET_LINK_LIBRARIES ( vdb_print
+@@ -236,7 +257,7 @@ TARGET_LINK_LIBRARIES ( vdb_print
  SET ( VDB_RENDER_SOURCE_FILES cmd/openvdb_render/main.cc )
  SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES}
    PROPERTIES
@@ -146,7 +130,7 @@ index 5703eb9..6ff3c6a 100644
    )
  ADD_EXECUTABLE ( vdb_render
    ${VDB_RENDER_SOURCE_FILES}
-@@ -256,26 +277,26 @@ SET ( VDB_VIEW_SOURCE_FILES
+@@ -263,31 +284,40 @@ SET ( VDB_VIEW_SOURCE_FILES
    )
  SET_SOURCE_FILES_PROPERTIES ( ${VDB_VIEW_SOURCE_FILES}
    PROPERTIES
@@ -154,9 +138,13 @@ index 5703eb9..6ff3c6a 100644
 +  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 $<$<CXX_COMPILER_ID:MSVC>:/bigobj>"
    )
 -IF (NOT WIN32)
++
    ADD_EXECUTABLE ( vdb_view
      ${VDB_VIEW_SOURCE_FILES}
      )
+-  
++
+   target_include_directories ( vdb_view SYSTEM PRIVATE ${Boost_INCLUDE_DIR} )
  
    TARGET_LINK_LIBRARIES ( vdb_view
      openvdb_shared
@@ -167,41 +155,58 @@ index 5703eb9..6ff3c6a 100644
 -    ${COCOA_LIBRARY}
 -    ${IOKIT_LIBRARY}
 -    ${COREVIDEO_LIBRARY}
-+    #${COCOA_LIBRARY}
-+    #${IOKIT_LIBRARY}
-+    #${COREVIDEO_LIBRARY}
      ${GLFW_LINK_LIBRARY}
      ${GLFW_DEPENDENT_LIBRARIES}
      ${GLEW_GLEW_LIBRARY}
-     )
--ENDIF ()
-+
-+ENDIF ( OPENVDB_BUILD_TOOLS )
++    )
++  IF (APPLE)
++  TARGET_LINK_LIBRARIES ( vdb_view
++    ${COCOA_LIBRARY}
++    ${IOKIT_LIBRARY}
++    ${COREVIDEO_LIBRARY}
++  )
++  ENDIF ()
++  IF (NOT WIN32)
++  TARGET_LINK_LIBRARIES ( vdb_view
+     m
+     stdc++
+-    )
++  )
++  ENDIF ()
+ ENDIF ()
  
++
  SET ( UNITTEST_SOURCE_FILES
    unittest/main.cc
-@@ -405,27 +426,32 @@ IF (OPENVDB_BUILD_DOCS)
+   unittest/TestAttributeArray.cc
+@@ -398,7 +428,7 @@ IF ( OPENVDB_BUILD_UNITTESTS )
  
+   ADD_TEST ( vdb_unit_test vdb_test )
+ 
+-ENDIF (OPENVDB_BUILD_UNITTESTS)
++ENDIF ()
+ 
+ # Doxygen docmentation
+ IF (OPENVDB_BUILD_DOCS)
+@@ -419,26 +449,29 @@ IF (OPENVDB_BUILD_DOCS)
  ENDIF ()
  
-+IF ( OPENVDB_BUILD_TOOLS )
  # Installation
 -IF ( NOT WIN32 )
-+#IF ( NOT WIN32 )
++IF ( OPENVDB_BUILD_TOOLS )
    INSTALL ( TARGETS
      vdb_view
      DESTINATION
      bin
      )
 -ENDIF ()
-+#ENDIF ()
  INSTALL ( TARGETS
    vdb_print
    vdb_render
    DESTINATION
    bin
    )
-+ENDIF ( OPENVDB_BUILD_TOOLS )
++ENDIF ()
  
 +IF ( OPENVDB_STATIC)
  INSTALL ( TARGETS
@@ -215,11 +220,11 @@ index 5703eb9..6ff3c6a 100644
  IF (WIN32)
    INSTALL ( TARGETS
  	openvdb_shared
-@@ -439,6 +465,7 @@ ELSE()
+@@ -452,6 +485,7 @@ ELSE()
  	lib
  	)
  ENDIF ()
-+ENDIF ( OPENVDB_SHARED )
++ENDIF ()
  
  INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
    FILES_MATCHING PATTERN "*.h"
diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL
index e822bf04c..acf11cd00 100644
--- a/ports/openvdb/CONTROL
+++ b/ports/openvdb/CONTROL
@@ -1,8 +1,8 @@
 Source: openvdb
-Version: 5.0.0-2
-Build-Depends: ilmbase, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess
+Version: 6.0.0
+Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess
 Description: Sparse volume data structure and tools
 
 Feature: tools
 Description: OpenVDB utilities: view, print and render
-Build-Depends: glew, glfw3, boost-ptr-container
+Build-Depends: glew, glfw3
diff --git a/ports/openvdb/UseGLEWOnWindowsForViewer.patch b/ports/openvdb/UseGLEWOnWindowsForViewer.patch
deleted file mode 100644
index bfa29c46c..000000000
--- a/ports/openvdb/UseGLEWOnWindowsForViewer.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/openvdb/viewer/ClipBox.h b/openvdb/viewer/ClipBox.h
-index b792491..d2f50cc 100644
---- a/openvdb/viewer/ClipBox.h
-+++ b/openvdb/viewer/ClipBox.h
-@@ -36,6 +36,8 @@
- #if defined(__APPLE__) || defined(MACOSX)
- #include <OpenGL/gl.h>
- #include <OpenGL/glu.h>
-+#elif defined(WIN32)
-+#include <GL/glew.h>
- #else
- #include <GL/gl.h>
- #include <GL/glu.h>
-diff --git a/openvdb/viewer/Font.h b/openvdb/viewer/Font.h
-index 6e79704..566cfbd 100644
---- a/openvdb/viewer/Font.h
-+++ b/openvdb/viewer/Font.h
-@@ -36,6 +36,8 @@
- #if defined(__APPLE__) || defined(MACOSX)
- #include <OpenGL/gl.h>
- #include <OpenGL/glu.h>
-+#elif defined(WIN32)
-+#include <GL/glew.h>
- #else
- #include <GL/gl.h>
- #include <GL/glu.h>
-diff --git a/openvdb/viewer/RenderModules.h b/openvdb/viewer/RenderModules.h
-index f4745d9..339dfc3 100644
---- a/openvdb/viewer/RenderModules.h
-+++ b/openvdb/viewer/RenderModules.h
-@@ -43,6 +43,8 @@
- #if defined(__APPLE__) || defined(MACOSX)
- #include <OpenGL/gl.h>
- #include <OpenGL/glu.h>
-+#elif defined(WIN32)
-+#include <GL/glew.h>
- #else
- #include <GL/gl.h>
- #include <GL/glu.h>
-diff --git a/openvdb/viewer/Viewer.cc b/openvdb/viewer/Viewer.cc
-index 307aa2b..8b79358 100644
---- a/openvdb/viewer/Viewer.cc
-+++ b/openvdb/viewer/Viewer.cc
-@@ -540,7 +540,15 @@ ViewerImpl::open(int width, int height)
-             std::shared_ptr<GLFWwindow> curWindow(
-                 glfwGetCurrentContext(), glfwMakeContextCurrent);
-             glfwMakeContextCurrent(mWindow);
--            BitmapFont13::initialize();
-+            BitmapFont13::initialize();            
-+#ifdef WIN32
-+            if (glewInit() == GLEW_OK) {
-+                OPENVDB_LOG_DEBUG_RUNTIME("initialized GLEW from thread "
-+                    << boost::this_thread::get_id());
-+            } else {
-+                OPENVDB_LOG_ERROR("GLEW initialization failed");
-+            }
-+#endif
-         }
-     }
-     mCamera->setWindow(mWindow);
diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake
index a21e82240..7f2fa6c29 100644
--- a/ports/openvdb/portfile.cmake
+++ b/ports/openvdb/portfile.cmake
@@ -2,17 +2,14 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO dreamworksanimation/openvdb
-    REF v5.0.0
-    SHA512 8916d54683d81144114e57f8332be43b7547e6da5d194f6147bcefd4ee9e8e7ec817f27b65adb129dfd149e6b308f4bab30591ee953ee2c319636491bf051a2b
+    REPO AcademySoftwareFoundation/openvdb
+    REF v6.0.0
+    SHA512 6b9e267fff46647b39e1e6faa12059442196c1858df1fda1515cfc375e25bc3033e2828c80e63a652509cfba386376e022cebf81ec85aaccece421b0c721529b
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-    ${CMAKE_CURRENT_LIST_DIR}/UseGLEWOnWindowsForViewer.patch
-    ${CMAKE_CURRENT_LIST_DIR}/AddLinkageAndToolsChoice.patch
+      ${CMAKE_CURRENT_LIST_DIR}/0001-fix-cmake-modules.patch
+      ${CMAKE_CURRENT_LIST_DIR}/0002-add-custom-options.patch
+      ${CMAKE_CURRENT_LIST_DIR}/0003-build-only-necessary-targets.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -24,74 +21,24 @@ else()
 endif()
 
 if ("tools" IN_LIST FEATURES)
+  if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(OPENVDB_BUILD_TOOLS ON)
-    set(OPENVDB_SHARED ON) # tools require shared version of the library
-else()
-    set(OPENVDB_BUILD_TOOLS OFF)
-endif()
-
-file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}" INSTALL_LOCATION)
-
-file(TO_NATIVE_PATH "${INSTALL_LOCATION}/include" INCLUDE_LOCATION)
-file(TO_NATIVE_PATH "${INSTALL_LOCATION}/lib/" LIB_LOCATION)
-file(TO_NATIVE_PATH "${INSTALL_LOCATION}/debug/lib/" LIB_LOCATION_DEBUG)
-
-file(TO_NATIVE_PATH "${LIB_LOCATION}/zlib.lib" ZLIB_LIBRARY)
-file(TO_NATIVE_PATH "${LIB_LOCATION}/tbb.lib" Tbb_TBB_LIBRARY)
-file(TO_NATIVE_PATH "${LIB_LOCATION}/tbbmalloc.lib" Tbb_TBBMALLOC_LIBRARY)
-file(TO_NATIVE_PATH "${LIB_LOCATION_DEBUG}/tbb_debug.lib" Tbb_TBB_LIBRARY_DEBUG)
-file(TO_NATIVE_PATH "${LIB_LOCATION_DEBUG}/tbbmalloc_debug.lib" Tbb_TBBMALLOC_LIBRARY_DEBUG)
-
-file(TO_NATIVE_PATH "${LIB_LOCATION}/Half.lib" Ilmbase_HALF_LIBRARY)
-file(TO_NATIVE_PATH "${LIB_LOCATION}/Iex-2_2.lib" Ilmbase_IEX_LIBRARY)
-file(TO_NATIVE_PATH "${LIB_LOCATION}/IlmThread-2_2.lib" Ilmbase_ILMTHREAD_LIBRARY)
-
-if (OPENVDB_STATIC)
-    file(TO_NATIVE_PATH "${LIB_LOCATION}/glfw3.lib" GLFW3_LIBRARY)
-else()
-    file(TO_NATIVE_PATH "${LIB_LOCATION}/glfw3dll.lib" GLFW3_LIBRARY)
+  else()
+    message(ERROR "Unable to build tools if static libraries are required")
+  endif()
 endif()
 
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DOPENVDB_BUILD_UNITTESTS=OFF
-            -DOPENVDB_BUILD_PYTHON_MODULE=OFF
-            -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
-            -DUSE_GLFW3=ON
-            -DGLFW3_USE_STATIC_LIBS=${OPENVDB_STATIC}
-            -DBlosc_USE_STATIC_LIBS=${OPENVDB_STATIC}
-            -DOpenexr_USE_STATIC_LIBS=${OPENVDB_STATIC}
-            -DIlmbase_USE_STATIC_LIBS=${OPENVDB_STATIC}
-            -DGLFW3_glfw_LIBRARY=${GLFW3_LIBRARY}
-
-            -DIlmbase_HALF_LIBRARY=${Ilmbase_HALF_LIBRARY}
-            -DIlmbase_IEX_LIBRARY=${Ilmbase_IEX_LIBRARY}
-            -DIlmbase_ILMTHREAD_LIBRARY=${Ilmbase_ILMTHREAD_LIBRARY}
-
-            -DOPENVDB_STATIC=${OPENVDB_STATIC}
-            -DOPENVDB_SHARED=${OPENVDB_SHARED}
-            -DOPENVDB_BUILD_TOOLS=${OPENVDB_BUILD_TOOLS}
-
-            -DZLIB_INCLUDE_DIR=${INCLUDE_LOCATION}
-            -DTBB_INCLUDE_DIR=${INCLUDE_LOCATION}
-            -DZLIB_LIBRARY=${ZLIB_LIBRARY}
-
-            -DGLFW3_LOCATION=${INSTALL_LOCATION}
-            -DGLEW_LOCATION=${INSTALL_LOCATION}
-            -DILMBASE_LOCATION=${INSTALL_LOCATION}
-            -DOPENEXR_LOCATION=${INSTALL_LOCATION}
-            -DTBB_LOCATION=${INSTALL_LOCATION}
-            -DBLOSC_LOCATION=${INSTALL_LOCATION}
-    OPTIONS_RELEASE
-        -DTBB_LIBRARY_PATH=${LIB_LOCATION}
-        -DTbb_TBB_LIBRARY=${Tbb_TBB_LIBRARY}
-        -DTbb_TBBMALLOC_LIBRARY=${Tbb_TBBMALLOC_LIBRARY}
-    OPTIONS_DEBUG
-        -DTBB_LIBRARY_PATH=${LIB_LOCATION_DEBUG}
-        -DTbb_TBB_LIBRARY=${Tbb_TBB_LIBRARY_DEBUG}
-        -DTbb_TBBMALLOC_LIBRARY=${Tbb_TBBMALLOC_LIBRARY_DEBUG}
+    OPTIONS
+        -DOPENVDB_BUILD_UNITTESTS=OFF
+        -DOPENVDB_BUILD_PYTHON_MODULE=OFF
+        -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
+        -DUSE_GLFW3=ON
+        -DOPENVDB_STATIC=${OPENVDB_STATIC}
+        -DOPENVDB_SHARED=${OPENVDB_SHARED}
+        -DOPENVDB_BUILD_TOOLS=${OPENVDB_BUILD_TOOLS}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL
index dc9396dd4..2cca0cdaa 100644
--- a/ports/osg/CONTROL
+++ b/ports/osg/CONTROL
@@ -2,3 +2,7 @@ Source: osg
 Version: 3.6.2
 Description:  The OpenSceneGraph is an open source high performance 3D graphics toolkit.
 Build-Depends: freetype, jasper, openexr, zlib, gdal, giflib, libjpeg-turbo, libpng, tiff
+
+Feature: collada
+Description: Support for Collada (.dae) files
+Build-Depends: collada-dom
diff --git a/ports/osg/collada.patch b/ports/osg/collada.patch
new file mode 100644
index 000000000..7c856c86d
--- /dev/null
+++ b/ports/osg/collada.patch
@@ -0,0 +1,76 @@
+diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake
+index 8c9c2fc33..6a8ab04ca 100644
+--- a/CMakeModules/FindCOLLADA.cmake
++++ b/CMakeModules/FindCOLLADA.cmake
+@@ -25,11 +25,11 @@ ENDIF()
+ 
+ IF(APPLE)
+     SET(COLLADA_BUILDNAME "mac")
+-  SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
++    SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
+ ELSEIF(MINGW)
+     SET(COLLADA_BUILDNAME "mingw")
+-  SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
+-ELSEIF(MSVC_VERSION EQUAL 1900 OR MSVC_VERSION EQUAL 1910 )
++    SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
++ELSEIF(MSVC_VERSION GREATER_EQUAL 1900 )
+     SET(COLLADA_BUILDNAME "vc14")
+     SET(COLLADA_BOOST_BUILDNAME "vc140")
+ ELSEIF(MSVC_VERSION EQUAL 1800)
+@@ -58,6 +58,7 @@ ENDIF()
+ 
+ 
+ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
++    PATHS
+     ${COLLADA_DOM_ROOT}/include
+     $ENV{COLLADA_DIR}/include
+     $ENV{COLLADA_DIR}
+@@ -65,27 +66,19 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
+     /Library/Frameworks
+     /opt/local/Library/Frameworks #macports
+     /usr/local/include
+-    /usr/local/include/colladadom
+-    /usr/local/include/collada-dom
+-    /usr/local/include/collada-dom2.5
+-    /usr/local/include/collada-dom2.4
+-    /usr/local/include/collada-dom2.2
+-    /opt/local/include/collada-dom
+-    /opt/local/include/collada-dom2.5
+-    /opt/local/include/collada-dom2.4
+-    /opt/local/include/collada-dom2.2
+     /usr/include/
+-    /usr/include/colladadom
+-    /usr/include/collada-dom
+-    /usr/include/collada-dom2.5
+-    /usr/include/collada-dom2.4
+-    /usr/include/collada-dom2.2
+     /sw/include # Fink
+     /opt/local/include # DarwinPorts
+     /opt/csw/include # Blastwave
+     /opt/include
+     /usr/freeware/include
+     ${ACTUAL_3DPARTY_DIR}/include
++    PATH_SUFFIXES
++    colladadom
++    collada-dom
++    collada-dom2.5
++    collada-dom2.4
++    collada-dom2.2
+ )
+ 
+ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
+diff --git a/src/osgPlugins/dae/CMakeLists.txt b/src/osgPlugins/dae/CMakeLists.txt
+index af03fb866..7eadfc2f3 100644
+--- a/src/osgPlugins/dae/CMakeLists.txt
++++ b/src/osgPlugins/dae/CMakeLists.txt
+@@ -49,7 +49,9 @@ ELSE()
+ ENDIF()
+ 
+ ADD_DEFINITIONS(-DNO_BOOST)
+-ADD_DEFINITIONS(-DCOLLADA_DOM_SUPPORT141)
++ADD_DEFINITIONS(-DCOLLADA_DOM_USING_141
++                -DCOLLADA_DOM_SUPPORT141
++                -DCOLLADA_DOM_SUPPORT150)
+ 
+ IF (COLLADA_DOM_2_4_OR_LATER)
+     ADD_DEFINITIONS(-DCOLLADA_DOM_2_4_OR_LATER)
diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake
index ca5c18f59..e72b5807b 100644
--- a/ports/osg/portfile.cmake
+++ b/ports/osg/portfile.cmake
@@ -22,6 +22,8 @@ vcpkg_from_github(
 	REF OpenSceneGraph-3.6.2
 	SHA512 6949dd4dea9dcffe4228086b72eafdb253bf1403b3b7a70a4727848c3cde23ad0270f41b1c3e2bdbfd410ec067ecce2052a5d26c61b032b6d46ce84b8c931bfb
 	HEAD_REF master
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/collada.patch"
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/platform-folders/CONTROL b/ports/platform-folders/CONTROL
new file mode 100644
index 000000000..d964e1d08
--- /dev/null
+++ b/ports/platform-folders/CONTROL
@@ -0,0 +1,3 @@
+Source: platform-folders
+Version: 4.0.0-4
+Description: A C++ library to look for special directories like "My Documents" and "%APPDATA%"
diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake
new file mode 100644
index 000000000..a08610e18
--- /dev/null
+++ b/ports/platform-folders/portfile.cmake
@@ -0,0 +1,36 @@
+include(vcpkg_common_functions)
+set(TARGET_BUILD_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO sago007/PlatformFolders
+    REF 4.0.0
+    SHA512 89bd9b971cff55ddb051ffcf2e1bbf1678ec14c601916d65ebd4d8e46a79cf93f12cbe9c13ebd0417808f35d7031d13274cda78f009a26fbd19d71e13a5e5ac6
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+		-DBUILD_TESTING=OFF
+		-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
+)
+
+vcpkg_install_cmake()
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(INSTALL ${TARGET_BUILD_PATH}-rel/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/)	
+    file(INSTALL ${TARGET_BUILD_PATH}-dbg/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/)
+endif()
+
+if (WIN32)
+	vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/platform_folders)
+else()
+	vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ TARGET_PATH /share/)
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/platform-folders RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake
index b85378ce3..8543643b5 100644
--- a/ports/ponder/portfile.cmake
+++ b/ports/ponder/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DUSES_RAPIDJSON=OFF
         -DUSES_RAPIDXML=OFF
diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL
index 26a0bce93..f37197e83 100644
--- a/ports/python3/CONTROL
+++ b/ports/python3/CONTROL
@@ -1,3 +1,3 @@
 Source: python3
-Version: 3.6.4-2
+Version: 3.6.4-5
 Description: The Python programming language as an embeddable library
 \ No newline at end of file
diff --git a/ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch b/ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch
new file mode 100644
index 000000000..50b728340
--- /dev/null
+++ b/ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch
@@ -0,0 +1,13 @@
+diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
+index 0f01852..6e63711 100644
+--- a/PCbuild/pythoncore.vcxproj
++++ b/PCbuild/pythoncore.vcxproj
+@@ -71,7 +71,7 @@
+     </ClCompile>
+     <Link>
+       <AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\v140\$(ArchName)</AdditionalLibraryDirectories>
+       <BaseAddress>0x1e000000</BaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
diff --git a/ports/python3/dev16.patch b/ports/python3/dev16.patch
new file mode 100644
index 000000000..38a968729
--- /dev/null
+++ b/ports/python3/dev16.patch
@@ -0,0 +1,17 @@
+diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
+index 9a096bc..0647cf8 100644
+--- a/PCbuild/pyproject.props
++++ b/PCbuild/pyproject.props
+@@ -94,9 +94,9 @@
+           Inputs="$(PySourcePath)Include\patchlevel.h"
+           Outputs="$(IntDir)pythonnt_rc.h">
+     <WriteLinesToFile File="$(IntDir)pythonnt_rc.h" Overwrite="true" Encoding="ascii"
+-                      Lines='/* This file created by pyproject.props /t:GeneratePythonNtRcH */
+-#define FIELD3 $(Field3Value)
+-#define MS_DLL_ID "$(SysWinVer)"
++                      Lines='/* This file created by pyproject.props /t:GeneratePythonNtRcH */;
++#define FIELD3 $(Field3Value);
++#define MS_DLL_ID "$(SysWinVer)";
+ #define PYTHON_DLL_NAME "$(TargetName)$(TargetExt)"
+ ' />
+     <ItemGroup>
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
index 576a35e8a..308f0aa37 100644
--- a/ports/python3/portfile.cmake
+++ b/ports/python3/portfile.cmake
@@ -19,6 +19,8 @@ vcpkg_from_github(
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/0004-Fix-iomodule-for-RS4-SDK.patch
         ${CMAKE_CURRENT_LIST_DIR}/0005-Fix-DefaultWindowsSDKVersion.patch
+        dev16.patch
+        Microsoft.VisualStudio.Setup.Configuration.Native.patch
 )
 
 # We need per-triplet directories because we need to patch the project files differently based on the linkage
@@ -71,6 +73,7 @@ file(COPY ${SOURCE_PATH}/Lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${P
 
 file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
     file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL
index 2013fc194..fedcd7bd8 100644
--- a/ports/qt5-3d/CONTROL
+++ b/ports/qt5-3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-3d
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake
index ef9c6a44e..96df50dd7 100644
--- a/ports/qt5-3d/portfile.cmake
+++ b/ports/qt5-3d/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qt3d 4df1c07d5fce5771779bf8c43f41f97c8135702f606e7d0766bb17f8819057038b0b83366469ffbcef39e36a527a771d6905ae000f37ce67e6cad3a769e28eba)
+qt_modular_library(qt3d 4c054b1075e976043fca5033a27be8a3f0d2df5dde5da4a536a9e7d61cdfd91007a2bf687bc19ad59724a2d53a9730b5d2446238bb7c6289d6a5dd3bf220a409)
diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
index 491702603..486dbf518 100644
--- a/ports/qt5-activeqt/CONTROL
+++ b/ports/qt5-activeqt/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-activeqt
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 ActiveQt Module - ActiveX components
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake
index 9af6e19c9..6040fc1aa 100644
--- a/ports/qt5-activeqt/portfile.cmake
+++ b/ports/qt5-activeqt/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtactiveqt 439ba83a10763b29419d34bac42d11c59964e9d279cbee0faa51198cfbc91ef0fe60b4b96ea516dcdcc9bc6696599d266b406a0d5e9a6e182ca61df67349a11c)
+qt_modular_library(qtactiveqt ff2871a7c0fa2674354f8bbd32196d8b2af34212e09e0f8c1df23182353959464dfb8c96800e45dae380f239082f62ed6f1904e72dc93e43141edb4f2606edd9)
 
 #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts)
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index fdf74b20c..c17ac83c2 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,4 +1,4 @@
-Source: qt5-base
-Version: 5.12.0
-Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
-Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
+Source: qt5-base
+Version: 5.12.1-1
+Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
+Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
diff --git a/ports/qt5-base/configure_qt.cmake b/ports/qt5-base/configure_qt.cmake
index aa3fe4aff..b66f6d22e 100644
--- a/ports/qt5-base/configure_qt.cmake
+++ b/ports/qt5-base/configure_qt.cmake
@@ -32,11 +32,11 @@ function(configure_qt)
             -debug
             -prefix ${CURRENT_INSTALLED_DIR}/debug
             -extprefix ${CURRENT_PACKAGES_DIR}/debug
-            -hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5
-            -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
-            -datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
-            -plugindir ${CURRENT_PACKAGES_DIR}/debug/plugins
-            -qmldir ${CURRENT_PACKAGES_DIR}/debug/qml
+            -hostbindir ${CURRENT_INSTALLED_DIR}/debug/tools/qt5
+            -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug
+            -datadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug
+            -plugindir ${CURRENT_INSTALLED_DIR}/debug/plugins
+            -qmldir ${CURRENT_INSTALLED_DIR}/debug/qml
             -headerdir ${CURRENT_PACKAGES_DIR}/include
             -I ${CURRENT_INSTALLED_DIR}/include
             -L ${CURRENT_INSTALLED_DIR}/debug/lib
@@ -53,11 +53,11 @@ function(configure_qt)
             -release
             -prefix ${CURRENT_INSTALLED_DIR}
             -extprefix ${CURRENT_PACKAGES_DIR}
-            -hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5
-            -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5
-            -datadir ${CURRENT_PACKAGES_DIR}/share/qt5
-            -plugindir ${CURRENT_PACKAGES_DIR}/plugins
-            -qmldir ${CURRENT_PACKAGES_DIR}/qml
+            -hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5
+            -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5
+            -datadir ${CURRENT_INSTALLED_DIR}/share/qt5
+            -plugindir ${CURRENT_INSTALLED_DIR}/plugins
+            -qmldir ${CURRENT_INSTALLED_DIR}/qml
             -I ${CURRENT_INSTALLED_DIR}/include
             -L ${CURRENT_INSTALLED_DIR}/lib
             -platform ${_csc_PLATFORM}
diff --git a/ports/qt5-base/fix-gui-configure-json.patch b/ports/qt5-base/fix-gui-configure-json.patch
new file mode 100644
index 000000000..060fd0b3c
--- /dev/null
+++ b/ports/qt5-base/fix-gui-configure-json.patch
@@ -0,0 +1,40 @@
+diff --git a/src/gui/configure.json b/src/gui/configure.json
+index 89934c8f..70d08177 100644
+--- a/src/gui/configure.json
++++ b/src/gui/configure.json
+@@ -239,7 +239,8 @@
+             "sources": [
+                 { "type": "pkgConfig", "args": "freetype2" },
+                 { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
+-                { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
++                { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
++                { "libs": "-lfreetype" }
+             ],
+             "use": [
+                 { "lib": "zlib", "condition": "features.system-zlib" }
+@@ -250,7 +251,7 @@
+             "test": {
+                 "tail": [
+                     "#ifndef FC_RGBA_UNKNOWN",
+-                    "#  error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define",
++                    "#  error This version of fontconfig is too old, it is missing the FC_RGBA_UNKNOWN define",
+                     "#endif"
+                 ],
+                 "main": [
+@@ -1436,7 +1437,7 @@
+         },
+         "eglfs_x11": {
+             "label": "EGLFS X11",
+-            "condition": "features.eglfs && features.xcb && features.xcb-xlib && features.egl_x11",
++            "condition": "features.eglfs && features.xcb-xlib && features.egl_x11",
+             "output": [ "privateFeature" ]
+         },
+         "gif": {
+@@ -1569,7 +1570,6 @@
+         },
+         "xcb-xlib": {
+             "label": "XCB Xlib",
+-            "emitIf": "features.xcb",
+             "condition": "features.xlib && libs.xcb_xlib",
+             "output": [ "privateFeature" ]
+         },
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 79b7f763d..e5b59aeb9 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -1,195 +1,190 @@
-include(vcpkg_common_functions)
-
-string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
-if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
-    message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n"
-        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
-    )
-endif()
-
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-include(configure_qt)
-include(install_qt)
-
-set(MAJOR_MINOR 5.12)
-set(FULL_VERSION ${MAJOR_MINOR}.0)
-set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz")
-
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
-    FILENAME ${ARCHIVE_NAME}
-    SHA512 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570
-)
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE "${ARCHIVE_FILE}"
-    REF ${FULL_VERSION}
-    PATCHES
-        fix-system-freetype.patch
-        fix-system-pcre2.patch
-        fix-system-pcre2-linux.patch
-)
-
-# Remove vendored dependencies to ensure they are not picked up by the build
-foreach(DEPENDENCY freetype zlib harfbuzzng libjpeg libpng double-conversion sqlite)
-    if(EXISTS ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
-        file(REMOVE_RECURSE ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
-    endif()
-endforeach()
-
-file(REMOVE_RECURSE ${SOURCE_PATH}/include/QtZlib)
-
-# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
-set(ENV{_CL_} "/utf-8")
-
-set(CORE_OPTIONS
-    -confirm-license
-    -opensource
-    -system-zlib
-    -system-libjpeg
-    -system-libpng
-    -system-freetype
-    -system-pcre
-    -system-harfbuzz
-    -system-doubleconversion
-    -system-sqlite
-    -no-fontconfig
-    -nomake examples
-    -nomake tests
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    list(APPEND CORE_OPTIONS
-        -static
-    )
-else()
-    list(APPEND CORE_OPTIONS
-        -sql-sqlite
-        -sql-psql
-    )
-endif()
-
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    set(PLATFORM "win32-msvc")
-
-    configure_qt(
-        SOURCE_PATH ${SOURCE_PATH}
-        PLATFORM ${PLATFORM}
-        OPTIONS
-            ${CORE_OPTIONS}
-            -mp
-            -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop"
-        OPTIONS_RELEASE
-            LIBJPEG_LIBS="-ljpeg"
-            ZLIB_LIBS="-lzlib"
-            LIBPNG_LIBS="-llibpng16"
-            FREETYPE_LIBS="-lfreetype"
-            PSQL_LIBS="-llibpq"
-        OPTIONS_DEBUG
-            LIBJPEG_LIBS="-ljpegd"
-            ZLIB_LIBS="-lzlibd"
-            LIBPNG_LIBS="-llibpng16d"
-            PSQL_LIBS="-llibpqd"
-            FREETYPE_LIBS="-lfreetyped"
-    )
-
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    configure_qt(
-        SOURCE_PATH ${SOURCE_PATH}
-        PLATFORM "linux-g++"
-        OPTIONS
-            ${CORE_OPTIONS}
-            -no-sqlite
-            -no-opengl # other options are "-no-opengl", "-opengl angle", and "-opengl desktop"
-        OPTIONS_RELEASE
-            "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a"
-            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
-            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a"
-            "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a"
-            "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
-            "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a"
-            "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a"
-        OPTIONS_DEBUG
-            "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a"
-            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
-            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
-            "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
-            "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
-            "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libfreetyped.a"
-            "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.a ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a ${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a"
-    )
-endif()
-
-install_qt()
-
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
-
-file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
-list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
-file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
-file(REMOVE ${BINARY_TOOLS})
-file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*")
-list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
-file(REMOVE ${BINARY_TOOLS})
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
-
-vcpkg_execute_required_process(
-    COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py
-    WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake
-    LOGNAME fix-cmake
-)
-
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5)
-
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
-    #---------------------------------------------------------------------------
-    # qtmain(d) vs. Qt5AxServer(d)
-    #---------------------------------------------------------------------------
-    # Qt applications have to either link to qtmain(d) or to Qt5AxServer(d),
-    # never both. See http://doc.qt.io/qt-5/activeqt-server.html for more info.
-    #
-    # Create manual-link folders:
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-    #
-    # Either have users explicitly link against qtmain.lib, qtmaind.lib:
-    file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-    file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl)
-    file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-    file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl)
-
-    #---------------------------------------------------------------------------
-    # Qt5Bootstrap: only used to bootstrap qmake dependencies
-    #---------------------------------------------------------------------------
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.lib)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.prl)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.lib ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.prl ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.prl)
-    #---------------------------------------------------------------------------
-endif()
-
-file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")
-file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
-file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
-foreach(PRL_FILE IN LISTS PRL_FILES)
-    file(READ "${PRL_FILE}" _contents)
-    string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
-    string(REPLACE "${CMAKE_DEBUG_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
-    file(WRITE "${PRL_FILE}" "${_contents}")
-endforeach()
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins)
-
-file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION  ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+include(vcpkg_common_functions)
+
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
+    message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+include(configure_qt)
+include(install_qt)
+
+set(MAJOR_MINOR 5.12)
+set(FULL_VERSION ${MAJOR_MINOR}.1)
+set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz")
+
+vcpkg_download_distfile(ARCHIVE_FILE
+    URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
+    FILENAME ${ARCHIVE_NAME}
+    SHA512 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25
+)
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE "${ARCHIVE_FILE}"
+    REF ${FULL_VERSION}
+    PATCHES
+        fix-gui-configure-json.patch
+)
+
+# Remove vendored dependencies to ensure they are not picked up by the build
+foreach(DEPENDENCY freetype zlib harfbuzzng libjpeg libpng double-conversion sqlite)
+    if(EXISTS ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
+        file(REMOVE_RECURSE ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
+    endif()
+endforeach()
+
+file(REMOVE_RECURSE ${SOURCE_PATH}/include/QtZlib)
+
+# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
+set(ENV{_CL_} "/utf-8")
+
+set(CORE_OPTIONS
+    -confirm-license
+    -opensource
+    -system-zlib
+    -system-libjpeg
+    -system-libpng
+    -system-freetype
+    -system-pcre
+    -system-harfbuzz
+    -system-doubleconversion
+    -system-sqlite
+    -no-fontconfig
+    -nomake examples
+    -nomake tests
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    list(APPEND CORE_OPTIONS
+        -static
+    )
+endif()
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(PLATFORM "win32-msvc")
+
+    configure_qt(
+        SOURCE_PATH ${SOURCE_PATH}
+        PLATFORM ${PLATFORM}
+        OPTIONS
+            ${CORE_OPTIONS}
+            -mp
+            -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop"
+        OPTIONS_RELEASE
+            LIBJPEG_LIBS="-ljpeg"
+            ZLIB_LIBS="-lzlib"
+            LIBPNG_LIBS="-llibpng16"
+            PSQL_LIBS="-llibpq"
+            PCRE2_LIBS="-lpcre2-16"
+            FREETYPE_LIBS="-lfreetype"
+        OPTIONS_DEBUG
+            LIBJPEG_LIBS="-ljpegd"
+            ZLIB_LIBS="-lzlibd"
+            LIBPNG_LIBS="-llibpng16d"
+            PSQL_LIBS="-llibpqd"
+            PCRE2_LIBS="-lpcre2-16d"
+            FREETYPE_LIBS="-lfreetyped"
+    )
+
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    configure_qt(
+        SOURCE_PATH ${SOURCE_PATH}
+        PLATFORM "linux-g++"
+        OPTIONS
+            ${CORE_OPTIONS}
+        OPTIONS_RELEASE
+            "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a"
+            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
+            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a"
+            "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a"
+            "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
+            "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a"
+            "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a -ldl -lpthread"
+            "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libsqlite3.a -ldl -lpthread"
+        OPTIONS_DEBUG
+            "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a"
+            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
+            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
+            "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
+            "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
+            "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libfreetyped.a"
+            "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.a ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a ${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a -ldl -lpthread"
+            "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libsqlite3.a -ldl -lpthread"
+    )
+endif()
+
+install_qt()
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+
+file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
+list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
+file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
+file(REMOVE ${BINARY_TOOLS})
+file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*")
+list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
+file(REMOVE ${BINARY_TOOLS})
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
+
+vcpkg_execute_required_process(
+    COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py
+    WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake
+    LOGNAME fix-cmake
+)
+
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5)
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
+    #---------------------------------------------------------------------------
+    # qtmain(d) vs. Qt5AxServer(d)
+    #---------------------------------------------------------------------------
+    # Qt applications have to either link to qtmain(d) or to Qt5AxServer(d),
+    # never both. See http://doc.qt.io/qt-5/activeqt-server.html for more info.
+    #
+    # Create manual-link folders:
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+    #
+    # Either have users explicitly link against qtmain.lib, qtmaind.lib:
+    file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+    file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl)
+    file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+    file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl)
+
+    #---------------------------------------------------------------------------
+    # Qt5Bootstrap: only used to bootstrap qmake dependencies
+    #---------------------------------------------------------------------------
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.lib)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.prl)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.lib ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.prl ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.prl)
+    #---------------------------------------------------------------------------
+endif()
+
+file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")
+file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
+file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
+foreach(PRL_FILE IN LISTS PRL_FILES)
+    file(READ "${PRL_FILE}" _contents)
+    string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
+    string(REPLACE "${CMAKE_DEBUG_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
+    file(WRITE "${PRL_FILE}" "${_contents}")
+endforeach()
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION  ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/qt5-base/qtdeploy.ps1 b/ports/qt5-base/qtdeploy.ps1
index 2161f69c8..c751e891e 100644
--- a/ports/qt5-base/qtdeploy.ps1
+++ b/ports/qt5-base/qtdeploy.ps1
@@ -41,6 +41,7 @@ function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [str
         deployPlugins "imageformats"
         deployPlugins "iconengines"
         deployPlugins "platforminputcontexts"
+        deployPlugins "styles"
     } elseif ($targetBinaryName -match "Qt5Networkd?.dll") {
         deployPlugins "bearer"
         if (Test-Path "$binDir\libeay32.dll")
diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL
index a682fb982..0b5964bb3 100644
--- a/ports/qt5-charts/CONTROL
+++ b/ports/qt5-charts/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-charts
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-charts/portfile.cmake b/ports/qt5-charts/portfile.cmake
index 6ce32435e..cb3c99d2a 100644
--- a/ports/qt5-charts/portfile.cmake
+++ b/ports/qt5-charts/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtcharts f8767dc019cf0b9a983e4fd61ac983184d7f4d3ad3cb748fc26a877892d537808eafc3f18815ba06761818e0fe5a74f0a048772fdac9ce86d7290a078f5e21aa)
+qt_modular_library(qtcharts 1915581f9cd644e0c6d9d38f5881ce388437ab1fa45554c01625ffd5c51067188450ff9329ccfcab17222389876658bd1e4595a426e75ef637311888451cfcd2)
diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL
new file mode 100644
index 000000000..45319857c
--- /dev/null
+++ b/ports/qt5-connectivity/CONTROL
@@ -0,0 +1,4 @@
+Source: qt5-connectivity
+Version: 5.12.0
+Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware
+Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-connectivity/portfile.cmake b/ports/qt5-connectivity/portfile.cmake
new file mode 100644
index 000000000..91e15366a
--- /dev/null
+++ b/ports/qt5-connectivity/portfile.cmake
@@ -0,0 +1,5 @@
+include(vcpkg_common_functions)
+
+include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
+
+qt_modular_library(qtconnectivity 89a16da0bb958da3123a2cebec45b954b034b2a586490c8217769e2e0f22080676e57f847c9a6622ea2129f539ac8732e0968f38517236c9880ff9b715492ede)
diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL
index 54d6eb7f6..2b6627465 100644
--- a/ports/qt5-datavis3d/CONTROL
+++ b/ports/qt5-datavis3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-datavis3d
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-datavis3d/portfile.cmake b/ports/qt5-datavis3d/portfile.cmake
index 0b5430177..4927f7007 100644
--- a/ports/qt5-datavis3d/portfile.cmake
+++ b/ports/qt5-datavis3d/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtdatavis3d 6b88551e5ada11333a2202598d2c3732dccafafbf0dd7f245dee103137ca0bd3b547b47d3e6dd6929610764f520baa75cd92bf986493fcd57c7ce61e7d419204)
+qt_modular_library(qtdatavis3d a0eff0f58515720d9c8e37bce16a3f6f719ca748c6228f183eb7e2fe2cc024195e5122cc29b9d0dba3319a9d6147105c0b253fb5e633e16db1fb20cca563d956)
diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL
index e16026069..87b5a8da0 100644
--- a/ports/qt5-declarative/CONTROL
+++ b/ports/qt5-declarative/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-declarative
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake
index 8999aebb6..afa19aa53 100644
--- a/ports/qt5-declarative/portfile.cmake
+++ b/ports/qt5-declarative/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtdeclarative 858d33bfcd5b87904bb08e0fec04665d3f43ed84de4f4336f4ef4ad2f2bd6d4ea79c048c8f8f8adfd4c30d6a9e01cd46175dc0e5a1335a000c57c0d0058999bd)
+qt_modular_library(qtdeclarative e06032da5c1c151200215f55728b9ce0fac299076f0ca3150143525a56bcce15eb72f6aa982b439e3920d1cd7a30468b3f0913f135d644ecda277d763fb5e1b5)
 
 #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts)
diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL
index bf323df72..323bf6747 100644
--- a/ports/qt5-gamepad/CONTROL
+++ b/ports/qt5-gamepad/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-gamepad
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-gamepad/portfile.cmake b/ports/qt5-gamepad/portfile.cmake
index fe7f260c1..7967f7f41 100644
--- a/ports/qt5-gamepad/portfile.cmake
+++ b/ports/qt5-gamepad/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtgamepad bf412012b270b1fc594a8f139e5343f45d8b989cbc2d5eb02eb1c06817dd7ffd36706b14e3fa7691e4b4554b56c05e42899d28e278b1f1e0ca278842f46b8cfa)
+qt_modular_library(qtgamepad 5e5f2c06103493880793f94aa062b1eccccbe0f53ded457969a0d77e864cee31759267a19edc68f3a015e261b84727f34b991b4a6b3c838600a68b030e77fa1e)
diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL
index 73f051121..3e4fadbe8 100644
--- a/ports/qt5-graphicaleffects/CONTROL
+++ b/ports/qt5-graphicaleffects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-graphicaleffects
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 GraphicalEffects Module.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-graphicaleffects/portfile.cmake b/ports/qt5-graphicaleffects/portfile.cmake
index 6c3ff45e3..2ea131939 100644
--- a/ports/qt5-graphicaleffects/portfile.cmake
+++ b/ports/qt5-graphicaleffects/portfile.cmake
@@ -4,4 +4,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtgraphicaleffects 88545f9f11d5f97aa70b293539aa10b4e87bbf1f585ba57cbf337c0300b2cdad52ab9d25867a663714ae345c21006d10f567fdbb839df235a9faf7f7674a5835)
+qt_modular_library(qtgraphicaleffects f7c93fa9b33a4096d5a150a6db984400daecc0ee16203402f1d465fddd288a9ea55625fcbd4ccd4c0b8addaa458d7955244b076a9c6c13a83d7c61c6029ddd81)
diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL
index 9681cf060..bfb362834 100644
--- a/ports/qt5-imageformats/CONTROL
+++ b/ports/qt5-imageformats/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-imageformats
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake
index 7a3e37749..001661111 100644
--- a/ports/qt5-imageformats/portfile.cmake
+++ b/ports/qt5-imageformats/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtimageformats c83cfdb7e2c73c796d57e14c26bcf2b7d7d1b72413d0d0d632747f42748368d3538e2b1b2b896fe9ca2f58dda285b3452db42738911f26bad5413adea36a3f45)
+qt_modular_library(qtimageformats 1514c5d7a285d718fdf1f3ba11f00029551af70e8b7bd927e061c55a35fca6978164da2846f26b6d57a4c81af2a75eb3f8358f46fa74bd70ba3407aa3bbcb0e5)
 
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL
new file mode 100644
index 000000000..fd647d83b
--- /dev/null
+++ b/ports/qt5-location/CONTROL
@@ -0,0 +1,4 @@
+Source: qt5-location
+Version: 5.12.1
+Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
+Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake
new file mode 100644
index 000000000..1fde2fa48
--- /dev/null
+++ b/ports/qt5-location/portfile.cmake
@@ -0,0 +1,5 @@
+include(vcpkg_common_functions)
+
+include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
+
+qt_modular_library(qtlocation 08dceeef8681b1266763197d8d4cab1d2ae8e8d0b62ae50ab44c64698588652d6ecf976b8f0095fa33b3a93b66b43fd4acbde4ebc47af8bdd79ce708c4237ed2)
diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL
index f738101d7..eedb58432 100644
--- a/ports/qt5-modularscripts/CONTROL
+++ b/ports/qt5-modularscripts/CONTROL
@@ -1,3 +1,3 @@
 Source: qt5-modularscripts
-Version: 2018-12-17
+Version: 2019-02-02
 Description: Vcpkg helpers to package qt5 modules
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake
index 34efa6eb9..a99d18478 100644
--- a/ports/qt5-modularscripts/qt_modular_library.cmake
+++ b/ports/qt5-modularscripts/qt_modular_library.cmake
@@ -9,7 +9,7 @@ function(qt_modular_library NAME HASH)
     endif()
 
     set(MAJOR_MINOR 5.12)
-    set(FULL_VERSION ${MAJOR_MINOR}.0)
+    set(FULL_VERSION ${MAJOR_MINOR}.1)
     set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz")
 
     vcpkg_download_distfile(ARCHIVE_FILE
diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL
index c2dacdb53..25f96138b 100644
--- a/ports/qt5-multimedia/CONTROL
+++ b/ports/qt5-multimedia/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-multimedia
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake
index 735b53eea..77aee6d10 100644
--- a/ports/qt5-multimedia/portfile.cmake
+++ b/ports/qt5-multimedia/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtmultimedia b16e657c73e57a8e5588697fda0e902834df10edd52704edcb7deb74fc45054ff9840344309ba720998d8afa6a5f315ce2bd46393ff8db6492694cfce0543692)
+qt_modular_library(qtmultimedia cdf9161648abd9f6c6d20171a75e9edefd77a46e946263f7e22e9f2ae69a55132688c31e46378cdc74c3bdf528fd94383b7e3b20bd8befa485a02cabb398dea0)
diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL
index 82809ca9c..b4653798f 100644
--- a/ports/qt5-networkauth/CONTROL
+++ b/ports/qt5-networkauth/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-networkauth
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Network Authorization Module
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake
index e144088d6..40fda857c 100644
--- a/ports/qt5-networkauth/portfile.cmake
+++ b/ports/qt5-networkauth/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtnetworkauth ae00e338ff4b9b3233c821a28d59e601489554ce882e8a1dc22c0d7903fadbee182e1f9a43c3667b707581d196f5615042b230823e48c71a4f2b5d793183f1de)
+qt_modular_library(qtnetworkauth 219117019cb98b87a84d351aa6b5479f3fa220c82fd4ff7409d2003c79402ead21454dcd1280be4db78b77045707dfa0fbbdefc738b9ac1142bf338a67447c60)
diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL
new file mode 100644
index 000000000..35d617b68
--- /dev/null
+++ b/ports/qt5-purchasing/CONTROL
@@ -0,0 +1,4 @@
+Source: qt5-purchasing
+Version: 5.12.1
+Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.
+Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-purchasing/portfile.cmake b/ports/qt5-purchasing/portfile.cmake
new file mode 100644
index 000000000..3ea4b192c
--- /dev/null
+++ b/ports/qt5-purchasing/portfile.cmake
@@ -0,0 +1,5 @@
+include(vcpkg_common_functions)
+
+include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
+
+qt_modular_library(qtpurchasing 655283a32f02a4a5bb8b890081fa1276e1a0c1396f50bb5c8ea849b55a60d8dde368f05072ab786fb8bb14cc41be8394d635bf4af791f2ef289796e04395dbb6)
diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL
index e76b8f15b..8b0552337 100644
--- a/ports/qt5-quickcontrols/CONTROL
+++ b/ports/qt5-quickcontrols/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 QuickControls Module.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-quickcontrols/portfile.cmake b/ports/qt5-quickcontrols/portfile.cmake
index 8a93e8947..ac74db9d5 100644
--- a/ports/qt5-quickcontrols/portfile.cmake
+++ b/ports/qt5-quickcontrols/portfile.cmake
@@ -4,4 +4,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtquickcontrols a2052398c281e81f8a61afe49f262d4feeb4da2593dbec0cc9971e7de6b169b17c1cf2ee7c213b3d5939cc322d4d715a1ce318b031fd4b8a783fac7bae3e37f9)
+qt_modular_library(qtquickcontrols 2275a9f0e3ddf7a4f42de5608b01686bf7faabe52c70dfae66ccdc7ab1283962aecb58481b42afbc5244d3abef56846bfabd9ed5229debe55d9f96cd88d16623)
diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL
index f85acbb14..027cb6e71 100644
--- a/ports/qt5-quickcontrols2/CONTROL
+++ b/ports/qt5-quickcontrols2/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols2
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 QuickControls2 Module.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-quickcontrols2/portfile.cmake b/ports/qt5-quickcontrols2/portfile.cmake
index 5b9dfed4b..845a4c852 100644
--- a/ports/qt5-quickcontrols2/portfile.cmake
+++ b/ports/qt5-quickcontrols2/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtquickcontrols2 e954832787fcb36cc3bab529b5ddf88ffa96d90924b9193a99e524831aff24026c9b278b4f3bb41afb2cc52a89888621637863ad0cda928901d9eb81e49017a5)
+qt_modular_library(qtquickcontrols2 fecbde2d38e7b9d18c0cfba8a724bba43d92702b8fb7c15b589a47e584f6023e498b1fb81a864835dbfdf38af6ee20ce9965f233df497a0639aceb87e8c1b123)
diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL
new file mode 100644
index 000000000..bea95b4ae
--- /dev/null
+++ b/ports/qt5-remoteobjects/CONTROL
@@ -0,0 +1,4 @@
+Source: qt5-remoteobjects
+Version: 5.12.1
+Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.
+Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-remoteobjects/portfile.cmake b/ports/qt5-remoteobjects/portfile.cmake
new file mode 100644
index 000000000..7a238ebcf
--- /dev/null
+++ b/ports/qt5-remoteobjects/portfile.cmake
@@ -0,0 +1,5 @@
+include(vcpkg_common_functions)
+
+include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
+
+qt_modular_library(qtremoteobjects 9b4222c6336374387aa5c5021833b4b12d4ab76f4af3a5f843ce2abca090a6af299b37d34b86bfc46e5ed8e54e50d8abc6804f88c8843327f90795c06a37ca0d)
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL
index 02a9b88fb..b47aa9798 100755
--- a/ports/qt5-script/CONTROL
+++ b/ports/qt5-script/CONTROL
@@ -1,3 +1,4 @@
 Source: qt5-script
-Version: 5.12.0
+Version: 5.12.1
+Build-Depends: qt5-base, qt5-modularscripts
 Description:Qt5 Script Module.
diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake
index e6465127d..b4e40355b 100755
--- a/ports/qt5-script/portfile.cmake
+++ b/ports/qt5-script/portfile.cmake
@@ -2,4 +2,4 @@
 include(vcpkg_common_functions)
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtscript f8870208fb0eb35551294739eabe9736a458e79fef1160b836031411b8055df7284339d301f2983c94b3bafeb15919fc575e12541c471655c0db9c0c5d85a087)
+qt_modular_library(qtscript 1fe7d0582e6c61fd146d66080bc91b40a6a2bda9b6bdb983339276b1aebb6f3c24070fc5acb2fd90556c11d51708c7bc75542532097b7f4f381b13dadaec5c9e)
diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL
index c3163b420..216fd3fd1 100644
--- a/ports/qt5-scxml/CONTROL
+++ b/ports/qt5-scxml/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-scxml
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-scxml/portfile.cmake b/ports/qt5-scxml/portfile.cmake
index eb912f98b..51c855271 100644
--- a/ports/qt5-scxml/portfile.cmake
+++ b/ports/qt5-scxml/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtscxml 4a50e6586a452bf0a0e9b40e969d00082c1bc88b50128d8ff211be4f03705e5a5aa3dcee062e9a635f6f520c6b1cbf52b4a68742d0b41409e1d9f650e76dbf49)
+qt_modular_library(qtscxml 3bfb08eb8506ca1076a594fb48b09360d258ecf26596045d2bff8702ad1ac0d0cc16dbc5e4528bf2a0fc1fad93c44f5cf34dc86e4d1243764a49a56f99985501)
diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL
new file mode 100644
index 000000000..55d620ee1
--- /dev/null
+++ b/ports/qt5-sensors/CONTROL
@@ -0,0 +1,4 @@
+Source: qt5-sensors
+Version: 5.12.1
+Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.
+Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-sensors/portfile.cmake b/ports/qt5-sensors/portfile.cmake
new file mode 100644
index 000000000..1a90f5486
--- /dev/null
+++ b/ports/qt5-sensors/portfile.cmake
@@ -0,0 +1,5 @@
+include(vcpkg_common_functions)
+
+include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
+
+qt_modular_library(qtsensors 437c8fce62b4fde138a7927ae494526852a63c2c9a392aaa5f79da6b9ec134e54b17dcd908e5cd7d12474dd112672e0a6a478a307cf716cce9fed67937da3fdc)
diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL
index 19c7687b5..7f725ffab 100644
--- a/ports/qt5-serialport/CONTROL
+++ b/ports/qt5-serialport/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-serialport
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-serialport/portfile.cmake b/ports/qt5-serialport/portfile.cmake
index 515535458..019ed1b17 100644
--- a/ports/qt5-serialport/portfile.cmake
+++ b/ports/qt5-serialport/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtserialport b8004e844cab66a50f5c899af74f22e62dbac23493210d579344d4a9337990da9781c3647662e7f31b132b4c60d7e3de640a9a636ae7c63de253858324e11428)
+qt_modular_library(qtserialport c917e08f417677fb16058c4be95c20dcd5881f41daf6033b864f725b259bfa38ab07a993a6a19f26574f1b662116aaceea26965cd1d2a5df7465e2bda495e7ff)
diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL
index f3c6068d4..336601da2 100644
--- a/ports/qt5-speech/CONTROL
+++ b/ports/qt5-speech/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-speech
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Speech Module
 Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows)
diff --git a/ports/qt5-speech/portfile.cmake b/ports/qt5-speech/portfile.cmake
index 2cbd8064a..61dfc802a 100644
--- a/ports/qt5-speech/portfile.cmake
+++ b/ports/qt5-speech/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtspeech cbc34d2d51ef2cf333dccd0a142198a477187786e743f6322370a197b4bbcba11ef7ce92aa9ea0917cc092f51609e71764ee3e5d356dadd54eaae5783c756887)
+qt_modular_library(qtspeech 321f6dafe0751af1e9cb5bd32f340ae445d2d148a8d2060bd5bd65d034f242547a79667253a4d1e220ccd4f59ea36a7fbe1b50093f36e2017b872f2b858050d2)
diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL
index 320a03df8..8a199f1c7 100644
--- a/ports/qt5-svg/CONTROL
+++ b/ports/qt5-svg/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-svg
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake
index b528c806f..091afa59b 100644
--- a/ports/qt5-svg/portfile.cmake
+++ b/ports/qt5-svg/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtsvg 571e457dce3b62de5f316ab69fa0a9a9fd6a3ace8b05ae525ad5c82e6784b60f3c06f1ce94c3639c861639740b29d996fda6907ce77b60aeae916788313e0a65)
+qt_modular_library(qtsvg c09da58bb901546fa8f408528ed25c9cc57d2bda35e56112eab08a08bf8fdb06cdaed1995d46d6baa08cab8660a3661be3dfa51754cc55e4fab96f7c90533ea3)
diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL
index 86d880315..492bf89fc 100644
--- a/ports/qt5-tools/CONTROL
+++ b/ports/qt5-tools/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-tools
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake
index 1502646d9..1cc0a7f9b 100644
--- a/ports/qt5-tools/portfile.cmake
+++ b/ports/qt5-tools/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qttools 90ce900dc64856e994b05dba8a1f2735357d7cc489b0565beb2553c6007e0a53cedf363cbec96d9af325182f5a164eafe10d2d4d180ee72f544bf0fa9dbc671d)
+qt_modular_library(qttools e3ae1974f0b20bad1b86d038c3585753183b8c24c133393e3ecf65a0487402ad8dcf8147bf263e9a4c2d3abef1b706981943fcf5268726e424f1b61f69ce4f2e)
 
 #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts)
diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL
index 2b2e7d291..3b21a1c6d 100644
--- a/ports/qt5-virtualkeyboard/CONTROL
+++ b/ports/qt5-virtualkeyboard/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-virtualkeyboard
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-virtualkeyboard/portfile.cmake b/ports/qt5-virtualkeyboard/portfile.cmake
index 4b30772a8..342fd6a5a 100644
--- a/ports/qt5-virtualkeyboard/portfile.cmake
+++ b/ports/qt5-virtualkeyboard/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtvirtualkeyboard 984a4d8eb7fd4aaaee956c65e818467be93540769867023f6a9bb8a6d53bab7fe30d372aaa21cc3fb3642b9e6fa672669d4caacfaa0ed7500dcb126ee4be40f8)
+qt_modular_library(qtvirtualkeyboard 17f85982bb7d39784b5a85fba7758d3c032c158ca453c30255ec03e5e61dc8bbcbcbc58afe8f43bcf0297bb00d4e8606f553501bde68252d097d7bb32af9d24f)
 
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL
new file mode 100644
index 000000000..85edc4b81
--- /dev/null
+++ b/ports/qt5-webchannel/CONTROL
@@ -0,0 +1,4 @@
+Source: qt5-webchannel
+Version: 5.12.1
+Description: Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.
+Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-webchannel/portfile.cmake b/ports/qt5-webchannel/portfile.cmake
new file mode 100644
index 000000000..f1b5ccd16
--- /dev/null
+++ b/ports/qt5-webchannel/portfile.cmake
@@ -0,0 +1,5 @@
+include(vcpkg_common_functions)
+
+include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
+
+qt_modular_library(qtwebchannel 71f2eb4b808e5892d246bafa289f7a4464e9705d568ceb01443b787d2eade8ee9bd20eef46900ba6fa2b251e7e15aebb7564e854360a3ad70992ad17cc1f9751)
diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL
index 5feba2a6b..f3ed649a9 100644
--- a/ports/qt5-websockets/CONTROL
+++ b/ports/qt5-websockets/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-websockets
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-websockets/portfile.cmake b/ports/qt5-websockets/portfile.cmake
index 7b949223e..8aa9cc9ed 100644
--- a/ports/qt5-websockets/portfile.cmake
+++ b/ports/qt5-websockets/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwebsockets 2c176fce2ad92d7c6c23047ea35a7e868d222abaea077f3d1d9e84ff5fccbaa198d1d0583f5686fdc99c71bea9c4a733cf0b718c65262e761e5f07a93452d186)
+qt_modular_library(qtwebsockets 4239563f05d65e85d2c46f24b3757e7fcfb119a2c9af0b221b321702f7849a4af05da1fdc1e77c0098df40af231ed781be5ead9361bae3dbf2c7808043601577)
diff --git a/ports/qt5-webview/CONTROL b/ports/qt5-webview/CONTROL
new file mode 100644
index 000000000..fda869331
--- /dev/null
+++ b/ports/qt5-webview/CONTROL
@@ -0,0 +1,4 @@
+Source: qt5-webview
+Version: 5.12.1
+Description: Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.
+Build-Depends: qt5-base, qt5-modularscripts, qt5-declarative
diff --git a/ports/qt5-webview/portfile.cmake b/ports/qt5-webview/portfile.cmake
new file mode 100644
index 000000000..df9f90c0a
--- /dev/null
+++ b/ports/qt5-webview/portfile.cmake
@@ -0,0 +1,5 @@
+include(vcpkg_common_functions)
+
+include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
+
+qt_modular_library(qtwebview 27e1904570678691e26831e87953e47d6b707bfe0504cde112ad6c8c18ea163eb83d90f8d4dbbf73873caee827e486691bb73e16a4c8b9e522bbeffbb68e9973)
diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL
index 00350de99..0ed5317d2 100644
--- a/ports/qt5-winextras/CONTROL
+++ b/ports/qt5-winextras/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-winextras
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.
 Build-Depends: qt5-modularscripts, qt5-base, atlmfc
diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake
index 18e3e40be..64f112bbd 100644
--- a/ports/qt5-winextras/portfile.cmake
+++ b/ports/qt5-winextras/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwinextras 37279e56c8317c2303d077d46ccb3780822e0853f9a2b92d3c9566077a977c2322ee46e9eca5f0f417624fe8ea4da03480fb905895dfb6b149a1c98b1caa3707)
+qt_modular_library(qtwinextras 2adf2849359ed97724256ba2ce7492f6820c92e898142683b696be0af5393d8af26b5af3d827c25e9027e77f95eb7f12ebb2be22a5d4c99e645c65a7fd7fe0e6)
diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL
index 7cc2504d6..04b00a415 100644
--- a/ports/qt5-xmlpatterns/CONTROL
+++ b/ports/qt5-xmlpatterns/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-xmlpatterns
-Version: 5.12.0
+Version: 5.12.1
 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake
index 64832816c..bd39b03f8 100644
--- a/ports/qt5-xmlpatterns/portfile.cmake
+++ b/ports/qt5-xmlpatterns/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtxmlpatterns 9e9fe5d99957a0079eada985d8b9837cee27c0025851d00024951bb12cf23d0fb2483cbf3a39cb4c5a23b9d453e42d667b0434e73d87447d9b4e84a9dca37ece)
+qt_modular_library(qtxmlpatterns 2a75b6fdbe07317ce91b69e0fc9abe39899b5c48885033f734c0d018115762e7558723ae0fcb5ad5a2266a52471f139236778be8191c61abec9bf0b07a0f01f7)
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index d4093b323..6b4b9129b 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5
-Version: 5.12.0
+Version: 5.12.1-1
 Description: Qt5 Application Framework
-Build-Depends: qt5-3d, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-winextras, qt5-xmlpatterns
+Build-Depends: qt5-3d, qt5-activeqt, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-location, qt5-multimedia, qt5-networkauth, qt5-purchasing, qt5-quickcontrols, qt5-quickcontrols2, qt5-script, qt5-scxml, qt5-sensors, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-webchannel, qt5-websockets, qt5-winextras, qt5-xmlpatterns
diff --git a/ports/rang/CMakeLists.txt b/ports/rang/CMakeLists.txt
new file mode 100644
index 000000000..6cf64a05f
--- /dev/null
+++ b/ports/rang/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required (VERSION 2.8)
+project (rang)
+
+include_directories(include)
+install(FILES ${PROJECT_SOURCE_DIR}/include/rang.hpp DESTINATION include)
+\ No newline at end of file
diff --git a/ports/rang/CONTROL b/ports/rang/CONTROL
new file mode 100644
index 000000000..629bee475
--- /dev/null
+++ b/ports/rang/CONTROL
@@ -0,0 +1,3 @@
+Source: rang
+Version: 3.1.0
+Description: Colors for your Terminal.
+\ No newline at end of file
diff --git a/ports/rang/portfile.cmake b/ports/rang/portfile.cmake
new file mode 100644
index 000000000..4c332a82e
--- /dev/null
+++ b/ports/rang/portfile.cmake
@@ -0,0 +1,21 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO agauniyal/rang
+    REF v3.1.0
+    SHA512 3419c9d8b8177320d4254a3e317790b0ca17bb08940025a16cb6a468a5f4c6e6a8bae391441fbb61b46e94cbe760aef1cb7f31fb8a1e958312e9dcb568b04470
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+\ No newline at end of file
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL
index 076c71211..7dce06170 100644
--- a/ports/range-v3/CONTROL
+++ b/ports/range-v3/CONTROL
@@ -1,3 +1,3 @@
 Source: range-v3
-Version: 0.4.0-20181129
+Version: 0.4.0-20190212
 Description: Range library for C++11/14/17.
diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake
index f7577c9bb..ed54a04cf 100644
--- a/ports/range-v3/portfile.cmake
+++ b/ports/range-v3/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ericniebler/range-v3
-    REF cf8add9f467aac695b9fa38e168b90df36b1a806
-    SHA512 92b1c09a423f6672b710abfde886b28d789a030f0f5db1c340ab75eead4abcf1a8b213adeb197af92747678873b1cae62362ee878c2a6bb38e532b0e83ac7bb2
+    REF c0a1924a3f30bff8c86086849245b6e7ba79b4dd
+    SHA512 ce7ee4b268db98a21fc1210deb2bb79c6b18b1fc5ce7300d64c8b72b97979c9fb8137af910fe42711e3dc9c1405bbc1bc8a15f3223f9ef5ad8416950f4f1576e
     HEAD_REF master
 )
 
diff --git a/ports/rapidjson/CONTROL b/ports/rapidjson/CONTROL
index 5e7d4e5cf..b5fe3d4c9 100644
--- a/ports/rapidjson/CONTROL
+++ b/ports/rapidjson/CONTROL
@@ -1,3 +1,3 @@
 Source: rapidjson
-Version: 1.1.0-2
+Version: 1.1.0-3
 Description: A fast JSON parser/generator for C++ with both SAX/DOM style API <http://rapidjson.org/>
diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake
index 45686aab0..8c1c0b938 100644
--- a/ports/rapidjson/portfile.cmake
+++ b/ports/rapidjson/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
 # Use RapidJSON's own build process, skipping examples and tests
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS
         -DRAPIDJSON_BUILD_DOC:BOOL=OFF
         -DRAPIDJSON_BUILD_EXAMPLES:BOOL=OFF
diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL
index 46bab0028..b83dc9cba 100644
--- a/ports/re2/CONTROL
+++ b/ports/re2/CONTROL
@@ -1,3 +1,3 @@
 Source: re2
-Version: 2019-01-09
+Version: 2019-01-30
 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.
 \ No newline at end of file
diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake
index 95816db3d..e2c284be9 100644
--- a/ports/re2/portfile.cmake
+++ b/ports/re2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/re2
-    REF 90970542fe952602f42150c6e71d086f5afebcb3
-    SHA512 910e8ec958d559e2d71bcc701bdb2ac52e319025470a6690cdf86c10ec385789b81392f61f3d5586f4bc4b686714c05ebe67e5596978c0c6c2e5b4b3694cf8d9
+    REF 98ad734aae9996a6dd1aa1fec72e800d621acd51
+    SHA512 e28a6b3428ca2714a48194f82f9d6ea4c56b3d4bc776bf3b9402bc081ca8d667f37f4ce98cd89ed1077998f945f1eebee1f501a1acdcb1fb16e741643bc8d8ab
     HEAD_REF master
 )
 
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL
index 94bcc35fd..8ec367068 100644
--- a/ports/rocksdb/CONTROL
+++ b/ports/rocksdb/CONTROL
@@ -14,3 +14,7 @@ Description: snappy support in rocksdb
 Feature: zlib
 Build-Depends: zlib
 Description: zlib support in rocksdb
+
+Feature: tbb
+Build-Depends: tbb
+Description: tbb support in rocksdb
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake
index 2b2013190..202ef61a8 100644
--- a/ports/rocksdb/portfile.cmake
+++ b/ports/rocksdb/portfile.cmake
@@ -39,6 +39,14 @@ if("zlib" IN_LIST FEATURES)
   set(WITH_ZLIB ON)
 endif()
 
+set(WITH_TBB OFF)
+set(ROCKSDB_IGNORE_PACKAGE_TBB TRUE)
+if("tbb" IN_LIST FEATURES)
+  set(WITH_TBB ON)
+  set(ROCKSDB_IGNORE_PACKAGE_TBB FALSE)
+endif()
+
+
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
@@ -47,7 +55,9 @@ vcpkg_configure_cmake(
   -DWITH_SNAPPY=${WITH_SNAPPY}
   -DWITH_LZ4=${WITH_LZ4}
   -DWITH_ZLIB=${WITH_ZLIB}
+  -DWITH_TBB=${WITH_TBB}
   -DWITH_TESTS=OFF
+  -DUSE_RTTI=1
   -DROCKSDB_INSTALL_ON_WINDOWS=ON
   -DFAIL_ON_WARNINGS=OFF
   -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY}
@@ -55,7 +65,7 @@ vcpkg_configure_cmake(
   -DCMAKE_DEBUG_POSTFIX=d
   -DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB}
   -DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB}
-  -DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE
+  -DCMAKE_DISABLE_FIND_PACKAGE_TBB=${ROCKSDB_IGNORE_PACKAGE_TBB}
   -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE
   -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE
   -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL
index 0dbf976ce..ca587479a 100644
--- a/ports/rs-core-lib/CONTROL
+++ b/ports/rs-core-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: rs-core-lib
-Version: 2019-01-09
+Version: 2019-01-30
 Description: Minimal common utilities by Ross Smith
 
diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake
index a7eb6a76d..eb7e36a9c 100644
--- a/ports/rs-core-lib/portfile.cmake
+++ b/ports/rs-core-lib/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CaptainCrowbar/rs-core-lib
-    REF fa2144ec238def8d5e08d8489fda6ccfe19a8db1
-    SHA512 c6c6405a15e197cc7f335e26193b46f00d3293606c042d7d6a2c50e79aa93c9c2ed14537a71b6dad30c271f80138cb7d294bf85bf0e67cbec6c0709e9f0f624f
+    REF 0d70c5fcce34b05aa871bd77241315ff3cbed19f
+    SHA512 58753805178ea92c8863636df88c2b25f1eaadcd5f5a626a589141ac1a429208322c9d965577c6d1035ebd881b0c105c9f75e74636a509e60f9e833cc518b5ca
     HEAD_REF master
 )
 
diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt
index 6992521b1..5edb15906 100644
--- a/ports/sdl2-mixer/CMakeLists.txt
+++ b/ports/sdl2-mixer/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.1)
 project(SDL2_MIXER C)
 
 find_path(SDL_INCLUDE_DIR SDL.h PATH_SUFFIXES SDL2)
@@ -7,9 +7,7 @@ set(SDL_MIXER_INCLUDES ${SDL_INCLUDE_DIR})
 set(SDL_MIXER_LIBRARIES ${SDL_LIBRARY})
 
 # builtin formats
-set(SDL_MIXER_DEFINES
-    MUSIC_WAV
-    MUSIC_MID_NATIVE)
+set(SDL_MIXER_DEFINES MUSIC_WAV)
 
 # MP3 support
 if(SDL_MIXER_ENABLE_MP3)
@@ -22,8 +20,8 @@ endif()
 
 # FLAC support
 if(SDL_MIXER_ENABLE_FLAC)
-    find_path(FLAC_INCLUDE_DIR flac/all.h)
-    find_library(FLAC_LIBRARY flac)
+    find_path(FLAC_INCLUDE_DIR FLAC/all.h)
+    find_library(FLAC_LIBRARY FLAC)
     list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR})
     list(APPEND SDL_MIXER_LIBRARIES ${FLAC_LIBRARY})
     list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC)
@@ -62,15 +60,17 @@ add_library(SDL2_mixer
     music_mikmod.c
     music_modplug.c
     music_mpg123.c
-    music_nativemidi.c
     music_ogg.c
     music_smpeg.c
     music_timidity.c
     music_wav.c
-    native_midi/native_midi_common.c
-    native_midi/native_midi_win32.c
     version.rc)
 
+if(WIN32)
+    list(APPEND SDL_MIXER_DEFINES MUSIC_MID_NATIVE)
+    target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c native_midi/native_midi_win32.c)
+endif()
+
 set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS)
 target_compile_definitions(SDL2_mixer PRIVATE ${SDL_MIXER_DEFINES})
 target_include_directories(SDL2_mixer PRIVATE ${SDL_MIXER_INCLUDES} ./native_midi)
diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL
index 7f953a2f9..4f0c86ff1 100644
--- a/ports/sdl2-mixer/CONTROL
+++ b/ports/sdl2-mixer/CONTROL
@@ -1,4 +1,4 @@
 Source: sdl2-mixer
-Version: 2.0.2-4
+Version: 2.0.2-5
 Description: Multi-channel audio mixer library for SDL.
 Build-Depends: sdl2, libflac, mpg123, libmodplug, libvorbis
diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake
index 9f6240bcf..c04d63654 100644
--- a/ports/sdl2-mixer/portfile.cmake
+++ b/ports/sdl2-mixer/portfile.cmake
@@ -1,11 +1,16 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_mixer-2.0.2)
+set(SDL2_MIXER_VERSION 2.0.2)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.2.zip"
-    FILENAME "SDL2_mixer-2.0.2.zip"
-    SHA512 da0c27c560a153d57d69a1b6c58a288f017762afc654749957072900a904d3dac19a0efcb68516cb166546d29ff570462385016e0041dae6f393ccb4bbd2ffbc)
+    URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${SDL2_MIXER_VERSION}.zip"
+    FILENAME "SDL2_mixer-${SDL2_MIXER_VERSION}.zip"
+    SHA512 da0c27c560a153d57d69a1b6c58a288f017762afc654749957072900a904d3dac19a0efcb68516cb166546d29ff570462385016e0041dae6f393ccb4bbd2ffbc
+)
 
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${SDL2_MIXER_VERSION}
+)
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
@@ -17,7 +22,8 @@ vcpkg_configure_cmake(
         -DSDL_MIXER_ENABLE_MOD=ON       # libmodplug
         -DSDL_MIXER_ENABLE_OGGVORBIS=ON # libvorbis 
     OPTIONS_DEBUG
-        -DSDL_MIXER_SKIP_HEADERS=ON)
+        -DSDL_MIXER_SKIP_HEADERS=ON
+)
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
diff --git a/ports/sdl2/CONTROL b/ports/sdl2/CONTROL
index 18e867b7c..05e9d6363 100644
--- a/ports/sdl2/CONTROL
+++ b/ports/sdl2/CONTROL
@@ -1,3 +1,7 @@
 Source: sdl2
 Version: 2.0.9-1
 Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.
+
+Feature: vulkan
+Description: Vulkan functionality for SDL
+Build-Depends: vulkan
diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake
index 4bcfa5a9a..294d37449 100644
--- a/ports/sdl2/portfile.cmake
+++ b/ports/sdl2/portfile.cmake
@@ -16,13 +16,18 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SDL_SHARED)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT)
 
+set(VULKAN_VIDEO OFF)
+if("vulkan" IN_LIST FEATURES)
+    set(VULKAN_VIDEO ON)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         -DSDL_STATIC=${SDL_STATIC}
         -DSDL_SHARED=${SDL_SHARED}
-        -DVIDEO_VULKAN=OFF
+        -DVIDEO_VULKAN=${VULKAN_VIDEO}
         -DFORCE_STATIC_VCRT=${FORCE_STATIC_VCRT}
         -DLIBC=ON
 )
diff --git a/ports/seqan/CONTROL b/ports/seqan/CONTROL
new file mode 100644
index 000000000..09185ccf4
--- /dev/null
+++ b/ports/seqan/CONTROL
@@ -0,0 +1,3 @@
+Source: seqan
+Version: 2.4.0
+Description: SeqAn is an open source C++ library of efficient algorithms and data structures for the analysis of sequences with the focus on biological data.
diff --git a/ports/seqan/portfile.cmake b/ports/seqan/portfile.cmake
new file mode 100644
index 000000000..8741a7090
--- /dev/null
+++ b/ports/seqan/portfile.cmake
@@ -0,0 +1,14 @@
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/seqan-library-2.4.0)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://packages.seqan.de/seqan-library/seqan-library-2.4.0.zip"
+    FILENAME "seqan-library-2.4.0.zip"
+    SHA512 9a1b4fe9dff9ad49a8761798a6a6eaeebce683ccb5e2dd78ea4b8829093918606830a16ea458d67bf3f652531ddc55b550c12cb257be913bb187c8940d96a575
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/share/doc/seqan/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/seqan RENAME copyright)
+
+# Copy the seqan header files
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h")
diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake
index d3ed5d023..c77110dbe 100644
--- a/ports/shaderc/portfile.cmake
+++ b/ports/shaderc/portfile.cmake
@@ -36,7 +36,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe")
+file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*${CMAKE_EXECUTABLE_SUFFIX}")
 file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
 
 #Safe to remove as libs are static
diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL
index a0e398e31..8e05a6da9 100644
--- a/ports/sobjectizer/CONTROL
+++ b/ports/sobjectizer/CONTROL
@@ -1,3 +1,3 @@
 Source: sobjectizer
-Version: 5.5.24.1
+Version: 5.5.24.2
 Description: SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.
diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake
index bf8174bf5..df10f6792 100644
--- a/ports/sobjectizer/portfile.cmake
+++ b/ports/sobjectizer/portfile.cmake
@@ -1,12 +1,12 @@
 include(vcpkg_common_functions)
 
-set(VERSION 5.5.24.1)
+set(VERSION 5.5.24.2)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip"
     FILENAME "so-${VERSION}.zip"
-    SHA512 a7b8b57626e99588f79e14594dea1cdfe7fea455f01fe4fde9c397b3086c0a9f0c3cb75b531cc8c40a3f38729729ec6764d450ed7fc626ae79e2f2de7cd2a98e
+    SHA512 50c80efc780850c394f3966f202ce45cde2cbef470ee6ead9c62239a1e9b60b28a970d8b217eca713b09118fbe4a8fc974a35f754d2f3ed395e2752bccd3e330
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/spirv-cross/portfile.cmake b/ports/spirv-cross/portfile.cmake
index 8ed881d41..6495e82bc 100644
--- a/ports/spirv-cross/portfile.cmake
+++ b/ports/spirv-cross/portfile.cmake
@@ -23,6 +23,9 @@ foreach(COMPONENT core cpp glsl hlsl msl reflect util)
     vcpkg_fixup_cmake_targets(CONFIG_PATH share/spirv_cross_${COMPONENT}/cmake TARGET_PATH share/spirv_cross_${COMPONENT})
 endforeach()
 
+file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*")
+file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+
 # cleanup
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/spirv-cross/copyright COPYONLY)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake
index 11d332a39..bbfdbf242 100644
--- a/ports/spirv-tools/portfile.cmake
+++ b/ports/spirv-tools/portfile.cmake
@@ -33,7 +33,7 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe")
+file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*${CMAKE_EXECUTABLE_SUFFIX}")
 file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
 file(REMOVE ${EXES})
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
diff --git a/ports/strict-variant/CONTROL b/ports/strict-variant/CONTROL
new file mode 100644
index 000000000..cc8af9ef0
--- /dev/null
+++ b/ports/strict-variant/CONTROL
@@ -0,0 +1,3 @@
+Source: strict-variant
+Version: v0.5
+Description: Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves.
diff --git a/ports/strict-variant/portfile.cmake b/ports/strict-variant/portfile.cmake
new file mode 100644
index 000000000..ef0b34361
--- /dev/null
+++ b/ports/strict-variant/portfile.cmake
@@ -0,0 +1,17 @@
+# header-only
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cbeck88/strict-variant
+    REF 5ab330edcb5e3eea67fbedf8ac89648e5bc1e9a1
+    SHA512 c80e5cd7cff389174447f5825af57ddea079956b2a4cb89337479e02289e89df19713ff031e914bdff2c823e8d2518311a1118701ae4e173f6557c770e553cd0
+    HEAD_REF master
+)
+
+# Copy header files
+file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp")
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/strict-variant)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/strict-variant/LICENSE ${CURRENT_PACKAGES_DIR}/share/strict-variant/copyright)
diff --git a/ports/systemc/CONTROL b/ports/systemc/CONTROL
new file mode 100644
index 000000000..488a06338
--- /dev/null
+++ b/ports/systemc/CONTROL
@@ -0,0 +1,3 @@
+Source: systemc
+Version: 2.3.3-2
+Description: A set of C++ classes and macros which provide an event-driven simulation kernel in C++
diff --git a/ports/systemc/install.patch b/ports/systemc/install.patch
new file mode 100644
index 000000000..d335a8b18
--- /dev/null
+++ b/ports/systemc/install.patch
@@ -0,0 +1,23 @@
+--- CMakeLists.txt	Sat Oct 13 00:19:07 2018
++++ CMakeLists.txt.fixed	Mon Jan 28 15:51:38 2019
+@@ -555,7 +555,7 @@
+ endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ 
+ # Set the installation paths for headers, libraries, and documentation.
+-set (CMAKE_INSTALL_DOCDIR "share/doc/systemc" CACHE PATH
++set (CMAKE_INSTALL_DOCDIR "share/systemc" CACHE PATH
+      "Documentation installation directory") # otherwise mixed-case
+ if (INSTALL_TO_LIB_BUILD_TYPE_DIR)
+   # Install libraries to lib-${CMAKE_BUILD_TYPE} so that different build variants
+@@ -589,9 +589,9 @@
+   set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH
+        "CMake package configuration installation directory" FORCE)
+ else (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR)
+-  set (SystemCLanguage_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCLanguage CACHE PATH
++  set (SystemCLanguage_INSTALL_CMAKEDIR share/SystemCLanguage CACHE PATH
+        "CMake package configuration installation directory for the SystemCLanguage package.")
+-  set (SystemCTLM_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCTLM CACHE PATH
++  set (SystemCTLM_INSTALL_CMAKEDIR share/SystemCTLM CACHE PATH
+        "CMake package configuration installation directory for the SystemCTLM package.")
+ endif (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR)
+ mark_as_advanced(SystemCLanguage_INSTALL_CMAKEDIR SystemCTLM_INSTALL_CMAKEDIR)
diff --git a/ports/systemc/portfile.cmake b/ports/systemc/portfile.cmake
new file mode 100644
index 000000000..0165b8270
--- /dev/null
+++ b/ports/systemc/portfile.cmake
@@ -0,0 +1,41 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+set(SYSTEMC_VERSION 2.3.3)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.accellera.org/images/downloads/standards/systemc/systemc-${SYSTEMC_VERSION}.zip"
+    FILENAME "systemc-${SYSTEMC_VERSION}.zip"
+    SHA512 f4df172addf816a1928d411dcab42c1679dc4c9d772f406c10d798a2c174d89cdac7a83947fa8beea1e3aff93da522d2d2daf61a4841ec456af7b7446c5c4a14
+)
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${SYSTEMC_VERSION}
+    PATCHES
+        install.patch
+        tlm_correct_dependency.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DCMAKE_CXX_STANDARD=17
+        -DDISABLE_COPYRIGHT_MESSAGE=ON
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/SystemCLanguage TARGET_PATH share/SystemCLanguage)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/SystemCTLM TARGET_PATH share/SystemCTLM)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/systemc RENAME copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/sysc/packages/qt/time)
+
+# Post-build test for cmake libraries (disabled for now due to issues with vcpkg_test_cmake)
+#vcpkg_test_cmake(PACKAGE_NAME SystemCLanguage)
+#vcpkg_test_cmake(PACKAGE_NAME SystemCTLM)
diff --git a/ports/systemc/tlm_correct_dependency.patch b/ports/systemc/tlm_correct_dependency.patch
new file mode 100644
index 000000000..56a4a466f
--- /dev/null
+++ b/ports/systemc/tlm_correct_dependency.patch
@@ -0,0 +1,8 @@
+--- cmake\SystemCTLMConfig.cmake.in	Sat Oct 13 00:19:07 2018
++++ cmake\SystemCTLMConfig.cmake.in.fixed	Mon Jan 28 15:23:44 2019
+@@ -2,4 +2,4 @@
+ 
+ # TLM is part of the SystemC language library.
+ include(CMakeFindDependencyMacro)
+-find_dependency (SystemC @SystemCLanguage_VERSION_MAJOR@.@SystemCLanguage_VERSION_MINOR@.@SystemCLanguage_VERSION_PATCH@.@SystemCLanguage_VERSION_RELEASE_DATE@ EXACT)
++find_dependency (SystemCLanguage @SystemCLanguage_VERSION_MAJOR@.@SystemCLanguage_VERSION_MINOR@.@SystemCLanguage_VERSION_PATCH@.@SystemCLanguage_VERSION_RELEASE_DATE@ EXACT)
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index 94126c5e7..22956077e 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
 Source: tbb
-Version: 2019_U3
+Version: 2019_U3-1
 Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index 09398ae92..14d70deb5 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -1,7 +1,10 @@
 include(vcpkg_common_functions)
 
 if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-  vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        message("tbb only supports dynamic library linkage")
+        set(VCPKG_LIBRARY_LINKAGE "dynamic")
+    endif()
 endif()
 
 vcpkg_from_github(
diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL
index f00c0c0e2..2180e3932 100644
--- a/ports/thrift/CONTROL
+++ b/ports/thrift/CONTROL
@@ -1,4 +1,4 @@
 Source: thrift
-Version: 2019-01-09
+Version: 2019-01-30
 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit
 Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010.
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
index 41b2189d7..cd0faf0f1 100644
--- a/ports/thrift/portfile.cmake
+++ b/ports/thrift/portfile.cmake
@@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/thrift
-    REF a5df39032ca206e2e6a9ec975147e81746d9a255
-    SHA512 765227283477dc0c0d0e94da34f1d11e90ccdfc61752662e9da7c9e4793d655de2a6c42e8e44c488e264b8b1f071c5a1324bb63111d471718c6e85b39b812ddd
+    REF 2ec93c8a2da2531755078ab6d5a65a96e26cf4c2
+    SHA512 6e6787e04ec963516be669511a18e128e5aff19bf33c70b37d9488b4abf42c20de75c8e72d60a81e679dea2faa8abe526deb71a6fc8ef7ba27216990be07c22c
     HEAD_REF master
 )
 
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL
index 45499f1fd..9723ea8b8 100644
--- a/ports/tiff/CONTROL
+++ b/ports/tiff/CONTROL
@@ -1,4 +1,4 @@
 Source: tiff
-Version: 4.0.10-1
+Version: 4.0.10-2
 Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp)
 Description: A library that supports the manipulation of TIFF image files
diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake
index 6e46ee6d2..d51d772ca 100644
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@@ -32,6 +32,7 @@ vcpkg_configure_cmake(
         -DBUILD_TESTS=OFF
         -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing.
         -Djpeg12=OFF
+        -Dwebp=OFF
         -Dzstd=OFF
         ${TIFF_CXX_TARGET}
 )
diff --git a/ports/tinyfiledialogs/CMakeLists.txt b/ports/tinyfiledialogs/CMakeLists.txt
index 4adabaf9a..34940b79d 100644
--- a/ports/tinyfiledialogs/CMakeLists.txt
+++ b/ports/tinyfiledialogs/CMakeLists.txt
@@ -5,7 +5,23 @@ add_library(tinyfiledialogs tinyfiledialogs.c)
 
 install(
     TARGETS tinyfiledialogs
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    RUNTIME DESTINATION bin
+    EXPORT tinyfiledialogsConfig
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+)
+install(
+    FILES tinyfiledialogs.h
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/include/tinyfiledialogs"
+)
+
+export(
+    TARGETS tinyfiledialogs
+    NAMESPACE tinyfiledialogs::
+    FILE "${CMAKE_CURRENT_BINARY_DIR}/tinyfiledialogsConfig.cmake"
+)
+install(
+    EXPORT tinyfiledialogsConfig
+    NAMESPACE tinyfiledialogs::
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/share/tinyfiledialogs"
 )
diff --git a/ports/tinyfiledialogs/CONTROL b/ports/tinyfiledialogs/CONTROL
index bb3a2ff33..485cc4351 100644
--- a/ports/tinyfiledialogs/CONTROL
+++ b/ports/tinyfiledialogs/CONTROL
@@ -1,3 +1,3 @@
 Source: tinyfiledialogs
-Version: 3.3.7-1
+Version: 3.3.8
 Description: Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more
diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake
index 66f1735a8..73fd52d91 100644
--- a/ports/tinyfiledialogs/portfile.cmake
+++ b/ports/tinyfiledialogs/portfile.cmake
@@ -2,21 +2,20 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(SHA 03d35a86696859128d41f8b967c1ef3e39c980ce)
+set(SHA 21998464c84ddaa9f911d8d05378d6f23a3a3671)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SHA})
 
 vcpkg_download_distfile(HEADERFILE
     URLS "https://sourceforge.net/p/tinyfiledialogs/code/ci/${SHA}/tree/tinyfiledialogs.h?format=raw"
     FILENAME "tinyfiledialogs-h-${SHA}"
-    SHA512 e3503165bcbb665c2f09c19591f28eba63e50b8d20fd4e65f31ec6a33742879c007aa7402cfd429ff92a2847534f0f0cc1b979954372be0c6578d49ed5f3e18d
+    SHA512 3f15192e2e2ba674308330eca88f5f2430980b93a53389125fab4de0fce775b9a0e2a0464a3a69bd86e362715c866504e752bfea402f1072005f6da3c97316d8
 )
 vcpkg_download_distfile(SOURCEFILE
     URLS "https://sourceforge.net/p/tinyfiledialogs/code/ci/${SHA}/tree/tinyfiledialogs.c?format=raw"
     FILENAME "tinyfiledialogs-c-${SHA}"
-    SHA512 263a9fcd11af3dcfd3cd7b6cfaad216cfdd94925639e613d43e7a2dbae2b4387fe8182cd72401e19b2891a08809bc68caece341df28e91b5894cc4b9ecd157f4
+    SHA512 b03260ba84872b3cf4eae2fed3a1770480021e3d4109f5ef243a433da48e443b7f244b105a16ce9d5655e086774d9098628e56b1559a6862fb5add547210ca58
 )
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SHA})
-
 configure_file(${HEADERFILE} ${SOURCE_PATH}/tinyfiledialogs.h COPYONLY)
 configure_file(${SOURCEFILE} ${SOURCE_PATH}/tinyfiledialogs.c COPYONLY)
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -25,13 +24,11 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
 )
-
 vcpkg_install_cmake()
-vcpkg_copy_pdbs()
 
-configure_file(${HEADERFILE} ${CURRENT_PACKAGES_DIR}/include/tinyfiledialogs.h COPYONLY)
+vcpkg_fixup_cmake_targets()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/tinyfiledialogs)
 file(READ ${HEADERFILE} _contents)
 string(SUBSTRING "${_contents}" 0 1024 _contents)
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/tinyfiledialogs/copyright "${_contents}")
diff --git a/ports/tinyspline/cmake.patch b/ports/tinyspline/cmake.patch
index 2cb6a2602..593ed9012 100644
--- a/ports/tinyspline/cmake.patch
+++ b/ports/tinyspline/cmake.patch
@@ -1,29 +1,16 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 02dfb83..35e01f8 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -387,6 +387,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
- 	# TINYSPLINE_LIBRARY_C_FLAGS
- 	set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /Wall")
- 	set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX")
-+	set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /wd4820")
-+	set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /wd5045")		
-+	set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /wd4711")
- 
- 	# TINYSPLINE_LIBRARY_CXX_FLAGS
- 	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /Wall")
-@@ -395,6 +398,14 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
- 	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4710")
- 	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4350")
- 	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4820")
-+	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd5045")
-+	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4571")
-+	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4625")
-+	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4626")
-+	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd5026")
-+	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd5027")
-+	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4774")
-+	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4711")
- 
- 	# TINYSPLINE_BINDING_CXX_FLAGS
- 	set(TINYSPLINE_BINDING_CXX_FLAGS "${TINYSPLINE_BINDING_CXX_FLAGS} /w")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 02dfb83..030a0b5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -386,11 +386,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+ 
+ 	# TINYSPLINE_LIBRARY_C_FLAGS
+ 	set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /Wall")
+-	set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX")
+ 
+ 	# TINYSPLINE_LIBRARY_CXX_FLAGS
+ 	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /Wall")
+-	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /WX")
+ 	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4514")
+ 	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4710")
+ 	set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4350")
diff --git a/ports/trompeloeil/CONTROL b/ports/trompeloeil/CONTROL
index 4c7b96ec1..d719459fa 100644
--- a/ports/trompeloeil/CONTROL
+++ b/ports/trompeloeil/CONTROL
@@ -1,4 +1,4 @@
 Source: trompeloeil
-Version: 32-1
+Version: 33
 Description: A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0
     For issues/pull requests/questions visit https://github.com/rollbear/trompeloeil
diff --git a/ports/trompeloeil/portfile.cmake b/ports/trompeloeil/portfile.cmake
index a499ad4de..ded47bf85 100644
--- a/ports/trompeloeil/portfile.cmake
+++ b/ports/trompeloeil/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rollbear/trompeloeil
-    REF v32
-    SHA512 001660b540880d9b1777d41ceb564b603a8d442649da86f9272e34cc642e10b43217ffadbc7d7fa7d32cb60dcc3daa0be17f86d5de48e8fce25f8681c645025d
+    REF v33
+    SHA512 944f8ee3d2c11877e56cfef7cbcf217ce88dbf8e426a39bba4c74c00057647503394ee9736ce19b0653cd8bba83ac717ea251155e665d3810bd5aba5133ac1b3
     HEAD_REF master
     PATCHES disable_master_project.patch
 )
diff --git a/ports/tsl-hopscotch-map/CONTROL b/ports/tsl-hopscotch-map/CONTROL
new file mode 100644
index 000000000..91f048054
--- /dev/null
+++ b/ports/tsl-hopscotch-map/CONTROL
@@ -0,0 +1,3 @@
+Source: tsl-hopscotch-map
+Version: 2.2.0
+Description: C++ implementation of a fast hash map and hash set using hopscotch hashing 
diff --git a/ports/tsl-hopscotch-map/portfile.cmake b/ports/tsl-hopscotch-map/portfile.cmake
new file mode 100644
index 000000000..2542360a3
--- /dev/null
+++ b/ports/tsl-hopscotch-map/portfile.cmake
@@ -0,0 +1,21 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Tessil/hopscotch-map
+    REF v2.2.0
+    SHA512 a3cd0fe47ff16de6d556c24e0bd96e420c1f06f2e44388e4f223fd8cf30a6cf0af20ade46af46f8cb5bbfd86a0fce2ca65658999cc2c14f4998d949f12afff2f
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE 
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} 
+     RENAME copyright
+)
diff --git a/ports/tsl-ordered-map/CONTROL b/ports/tsl-ordered-map/CONTROL
new file mode 100644
index 000000000..7595c53fc
--- /dev/null
+++ b/ports/tsl-ordered-map/CONTROL
@@ -0,0 +1,3 @@
+Source: tsl-ordered-map
+Version: 0.8.0
+Description: C++ hash map and hash set which preserve the order of insertion
diff --git a/ports/tsl-ordered-map/portfile.cmake b/ports/tsl-ordered-map/portfile.cmake
new file mode 100644
index 000000000..bfa4f0625
--- /dev/null
+++ b/ports/tsl-ordered-map/portfile.cmake
@@ -0,0 +1,21 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Tessil/ordered-map
+    REF v0.8.0
+    SHA512 9e0cc8ea4d5731e89cb6d58a54394b4ab0378cb2488d9e462ad80facd8aa06e21aaa0f9b969fbd7ac22c99bae09ab7c6e7980857784aa0b1a3a2b0c216ffa79a
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE 
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} 
+     RENAME copyright
+)
diff --git a/ports/tsl-sparse-map/CONTROL b/ports/tsl-sparse-map/CONTROL
new file mode 100644
index 000000000..31e08231c
--- /dev/null
+++ b/ports/tsl-sparse-map/CONTROL
@@ -0,0 +1,3 @@
+Source: tsl-sparse-map
+Version: 0.6.0
+Description: C++ implementation of a memory efficient hash map and hash set
diff --git a/ports/tsl-sparse-map/portfile.cmake b/ports/tsl-sparse-map/portfile.cmake
new file mode 100644
index 000000000..6895d7c67
--- /dev/null
+++ b/ports/tsl-sparse-map/portfile.cmake
@@ -0,0 +1,21 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Tessil/sparse-map
+    REF v0.6.0
+    SHA512 6a21ebbd3505a0b4bf199f24ae9262395392964457eb26edb39fd7aa82aec7fc74468f7615977c74a2f36332850a68e1d6a6e86d487c3dff7efa2b081fa2c8c5
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE 
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} 
+     RENAME copyright
+)
diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL
index 11845151a..6deb2ea41 100644
--- a/ports/unicorn-lib/CONTROL
+++ b/ports/unicorn-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: unicorn-lib
-Version: 2019-01-09
+Version: 2019-01-30
 Description: Unicode library for C++ by Ross Smith
 Build-Depends: rs-core-lib, pcre2, zlib, libiconv
diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake
index a982e1a24..68f14fef2 100644
--- a/ports/unicorn-lib/portfile.cmake
+++ b/ports/unicorn-lib/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CaptainCrowbar/unicorn-lib
-    REF a1e3df0dd62004c244d00825867aea30c83d678e
-    SHA512 febc79ba30ba023f24a8b5ae01465bf353457d37cfccbdaebeabde16f7a4758a8acd8f9c6ddd9f453fc0918b6c02631a45107f322297ea0e32ac46c548d9e7b3
+    REF e5e6615ce4297a8b385884c21c1b78a6515cb766
+    SHA512 bdffd177d106882f1dcb59ac9dcecb985a8b6f9cec8dc44ff1eea3201bed1258e760a964163fed3514aa661a4be4bd92a0c437d769dbdffa04693a870ecf355c
     HEAD_REF master
 )
 
diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL
index f01523040..ea9008367 100644
--- a/ports/unicorn/CONTROL
+++ b/ports/unicorn/CONTROL
@@ -1,3 +1,3 @@
 Source: unicorn
-Version: 2019-01-09
+Version: 2019-01-30
 Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework
diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake
index 93c4d8f34..4eabb25be 100644
--- a/ports/unicorn/portfile.cmake
+++ b/ports/unicorn/portfile.cmake
@@ -14,8 +14,8 @@ set(VCPKG_CRT_LINKAGE "static")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO unicorn-engine/unicorn
-    REF ac0cd2144df92a487acd98a43b1d7880a3044835
-    SHA512 68bd31beabdad80e80e049159a9345cd7a6830a01f63f813612a14802fe1d8bcf2f7089e120b2cd0ebd432fe0b17adc2cd9177485c694c7d963beae10580446b
+    REF 3df5ef8ab1cffc43fab461bfd24e42ae6c5919cf
+    SHA512 0b3037138075ad1bdc3be38295308dc15b5930b3c5de10cd0ac203e159b2dd0423ab74fe1a53e1922a5c809b2862e17b8a8d8d921335687755c1d210e21e4d0e
     HEAD_REF master
 )
 
diff --git a/ports/uvw/CONTROL b/ports/uvw/CONTROL
index 1fc066ee2..0a055ad8b 100644
--- a/ports/uvw/CONTROL
+++ b/ports/uvw/CONTROL
@@ -1,3 +1,3 @@
 Source: uvw
-Version: 1.11.2
+Version: 1.11.3
 Description: Header-only, event based, tiny and easy to use libuv wrapper in modern C++. <https://github.com/skypjack/uvw>
diff --git a/ports/uvw/portfile.cmake b/ports/uvw/portfile.cmake
index 0cbacec21..e7d2c9b00 100644
--- a/ports/uvw/portfile.cmake
+++ b/ports/uvw/portfile.cmake
@@ -13,6 +13,11 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/include
 )
 
+file(INSTALL
+    ${SOURCE_PATH}/src/uvw.hpp
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+
 # Handle copyright/readme/package files
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw RENAME copyright)
 file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw)
diff --git a/ports/vcglib/CONTROL b/ports/vcglib/CONTROL
new file mode 100644
index 000000000..7f52548f4
--- /dev/null
+++ b/ports/vcglib/CONTROL
@@ -0,0 +1,4 @@
+Source: vcglib
+Version: 1.0.1
+Description: library for manipulation, processing, cleaning, simplifying triangle meshes.
+Build-Depends: eigen3
+\ No newline at end of file
diff --git a/ports/vcglib/consume-vcpkg-eigen3.patch b/ports/vcglib/consume-vcpkg-eigen3.patch
new file mode 100644
index 000000000..35e9f5537
--- /dev/null
+++ b/ports/vcglib/consume-vcpkg-eigen3.patch
@@ -0,0 +1,225 @@
+diff --git a/vcg/complex/algorithms/curve_on_manifold.h b/vcg/complex/algorithms/curve_on_manifold.h
+index 5b9d858..f091b4b 100644
+--- a/vcg/complex/algorithms/curve_on_manifold.h
++++ b/vcg/complex/algorithms/curve_on_manifold.h
+@@ -36,7 +36,7 @@
+ #include <vcg/space/index/kdtree/kdtree.h>
+ #include <vcg/math/histogram.h>
+ #include<vcg/space/distance3.h>
+-#include<eigenlib/Eigen/Core>
++#include<eigen3/Eigen/Core>
+ #include <vcg/complex/algorithms/attribute_seam.h>
+ #include <wrap/io_trimesh/export_ply.h>
+ 
+diff --git a/vcg/complex/algorithms/harmonic.h b/vcg/complex/algorithms/harmonic.h
+index d004d7b..13d5167 100644
+--- a/vcg/complex/algorithms/harmonic.h
++++ b/vcg/complex/algorithms/harmonic.h
+@@ -24,7 +24,7 @@
+ #define __VCGLIB_HARMONIC_FIELD
+ 
+ #include <vcg/complex/complex.h>
+-#include <eigenlib/Eigen/Sparse>
++#include <eigen3/Eigen/Sparse>
+ 
+ namespace vcg {
+ namespace tri {
+diff --git a/vcg/complex/algorithms/implicit_smooth.h b/vcg/complex/algorithms/implicit_smooth.h
+index 2e1e24f..76311e2 100644
+--- a/vcg/complex/algorithms/implicit_smooth.h
++++ b/vcg/complex/algorithms/implicit_smooth.h
+@@ -23,7 +23,7 @@
+ #ifndef __VCG_IMPLICIT_SMOOTHER
+ #define __VCG_IMPLICIT_SMOOTHER
+ 
+-#include <eigenlib/Eigen/Sparse>
++#include <eigen3/Eigen/Sparse>
+ #include <vcg/complex/algorithms/mesh_to_matrix.h>
+ #include <vcg/complex/algorithms/update/quality.h>
+ #include <vcg/complex/algorithms/smooth.h>
+diff --git a/vcg/complex/algorithms/inertia.h b/vcg/complex/algorithms/inertia.h
+index 41b5a29..f25d6f9 100644
+--- a/vcg/complex/algorithms/inertia.h
++++ b/vcg/complex/algorithms/inertia.h
+@@ -24,8 +24,8 @@
+ #define _VCG_INERTIA_
+ 
+ 
+-#include <eigenlib/Eigen/Core>
+-#include <eigenlib/Eigen/Eigenvalues>
++#include <eigen3/Eigen/Core>
++#include <eigen3/Eigen/Eigenvalues>
+ #include <vcg/complex/algorithms/update/normal.h>
+ 
+ namespace vcg
+diff --git a/vcg/complex/algorithms/parametrization/poisson_solver.h b/vcg/complex/algorithms/parametrization/poisson_solver.h
+index cf5c36d..3b8f1a5 100644
+--- a/vcg/complex/algorithms/parametrization/poisson_solver.h
++++ b/vcg/complex/algorithms/parametrization/poisson_solver.h
+@@ -24,7 +24,7 @@
+ #ifndef VCG_POISSON_SOLVER
+ #define VCG_POISSON_SOLVER
+ 
+-#include <eigenlib/Eigen/Sparse>
++#include <eigen3/Eigen/Sparse>
+ 
+ #include <vcg/complex/algorithms/clean.h>
+ #include <vcg/complex/algorithms/update/bounding.h>
+diff --git a/vcg/complex/algorithms/update/curvature.h b/vcg/complex/algorithms/update/curvature.h
+index 441121b..0a96146 100644
+--- a/vcg/complex/algorithms/update/curvature.h
++++ b/vcg/complex/algorithms/update/curvature.h
+@@ -32,7 +32,7 @@
+ #include <vcg/complex/algorithms/point_sampling.h>
+ #include <vcg/complex/algorithms/intersection.h>
+ #include <vcg/complex/algorithms/inertia.h>
+-#include <eigenlib/Eigen/Core>
++#include <eigen3/Eigen/Core>
+ 
+ namespace vcg {
+ namespace tri {
+diff --git a/vcg/complex/algorithms/update/curvature_fitting.h b/vcg/complex/algorithms/update/curvature_fitting.h
+index b2b8c63..ab04b6b 100644
+--- a/vcg/complex/algorithms/update/curvature_fitting.h
++++ b/vcg/complex/algorithms/update/curvature_fitting.h
+@@ -38,11 +38,11 @@
+ #include <vcg/complex/algorithms/inertia.h>
+ #include <vcg/complex/algorithms/nring.h>
+ 
+-#include <eigenlib/Eigen/Core>
+-#include <eigenlib/Eigen/QR>
+-#include <eigenlib/Eigen/LU>
+-#include <eigenlib/Eigen/SVD>
+-#include <eigenlib/Eigen/Eigenvalues>
++#include <eigen3/Eigen/Core>
++#include <eigen3/Eigen/QR>
++#include <eigen3/Eigen/LU>
++#include <eigen3/Eigen/SVD>
++#include <eigen3/Eigen/Eigenvalues>
+ 
+ 
+ namespace vcg {
+diff --git a/vcg/complex/algorithms/update/fitmaps.h b/vcg/complex/algorithms/update/fitmaps.h
+index bd2c94f..fd837d7 100644
+--- a/vcg/complex/algorithms/update/fitmaps.h
++++ b/vcg/complex/algorithms/update/fitmaps.h
+@@ -34,10 +34,10 @@
+ #include <vcg/complex/algorithms/update/bounding.h>
+ #include "vcg/complex/algorithms/update/curvature_fitting.h"
+ 
+-#include <eigenlib/Eigen/Core>
+-#include <eigenlib/Eigen/QR>
+-#include <eigenlib/Eigen/LU>
+-#include <eigenlib/Eigen/SVD>
++#include <eigen3/Eigen/Core>
++#include <eigen3/Eigen/QR>
++#include <eigen3/Eigen/LU>
++#include <eigen3/Eigen/SVD>
+ 
+ #include <vcg/complex/algorithms/nring.h>
+ 
+diff --git a/vcg/math/eigen.h b/vcg/math/eigen.h
+index 5cae402..81f32ff 100644
+--- a/vcg/math/eigen.h
++++ b/vcg/math/eigen.h
+@@ -53,10 +53,10 @@ struct ei_to_vcgtype;
+ }
+ 
+ #include "base.h"
+-#include "../../eigenlib/Eigen/LU"
+-#include "../../eigenlib/Eigen/Geometry"
+-#include "../../eigenlib/Eigen/Array"
+-#include "../../eigenlib/Eigen/Core"
++#include "../../eigen3/Eigen/LU"
++#include "../../eigen3/Eigen/Geometry"
++#include "../../eigen3/Eigen/Array"
++#include "../../eigen3/Eigen/Core"
+ 
+ // add support for unsigned char and short int
+ namespace Eigen {
+diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h
+index a138e57..5291e0e 100644
+--- a/vcg/math/matrix44.h
++++ b/vcg/math/matrix44.h
+@@ -30,8 +30,8 @@
+ #include <vcg/space/point4.h>
+ #include <vector>
+ #include <iostream>
+-#include <eigenlib/Eigen/Core>
+-#include <eigenlib/Eigen/LU>
++#include <eigen3/Eigen/Core>
++#include <eigen3/Eigen/LU>
+ 
+ namespace vcg {
+ 
+diff --git a/vcg/math/polar_decomposition.h b/vcg/math/polar_decomposition.h
+index deabf86..bd725d1 100644
+--- a/vcg/math/polar_decomposition.h
++++ b/vcg/math/polar_decomposition.h
+@@ -26,8 +26,8 @@
+ 
+ #include <vcg/math/matrix33.h>
+ #include <vcg/math/matrix44.h>
+-#include <eigenlib/Eigen/Dense>
+-#include <eigenlib/Eigen/SVD>
++#include <eigen3/Eigen/Dense>
++#include <eigen3/Eigen/SVD>
+ 
+ namespace vcg{
+ 
+diff --git a/vcg/math/quadric.h b/vcg/math/quadric.h
+index 8522056..99a9de1 100644
+--- a/vcg/math/quadric.h
++++ b/vcg/math/quadric.h
+@@ -26,7 +26,7 @@
+ #include <vcg/space/point3.h>
+ #include <vcg/space/plane3.h>
+ #include <vcg/math/matrix33.h>
+-#include <eigenlib/Eigen/Core>
++#include <eigen3/Eigen/Core>
+ 
+ namespace vcg {
+ namespace math {
+diff --git a/vcg/space/fitting3.h b/vcg/space/fitting3.h
+index e9e238a..6861969 100644
+--- a/vcg/space/fitting3.h
++++ b/vcg/space/fitting3.h
+@@ -29,8 +29,8 @@
+ #include <vcg/math/matrix44.h>
+ #include <vcg/math/matrix33.h>
+ 
+-#include <eigenlib/Eigen/Core>
+-#include <eigenlib/Eigen/Eigenvalues>
++#include <eigen3/Eigen/Core>
++#include <eigen3/Eigen/Eigenvalues>
+ 
+ namespace vcg {
+ 
+diff --git a/vcg/space/point_matching.h b/vcg/space/point_matching.h
+index e9ac0ff..c6ff376 100644
+--- a/vcg/space/point_matching.h
++++ b/vcg/space/point_matching.h
+@@ -27,8 +27,8 @@
+ #include <vcg/math/quaternion.h>
+ #include <vcg/math/matrix44.h>
+ 
+-#include <eigenlib/Eigen/Dense>
+-#include <eigenlib/Eigen/Eigenvalues>
++#include <eigen3/Eigen/Dense>
++#include <eigen3/Eigen/Eigenvalues>
+ #include  <iostream>
+ 
+ namespace vcg
+diff --git a/wrap/igl/smooth_field.h b/wrap/igl/smooth_field.h
+index e1208cf..a403d54 100644
+--- a/wrap/igl/smooth_field.h
++++ b/wrap/igl/smooth_field.h
+@@ -25,7 +25,7 @@
+ #define SMOOTHER_FIELD_H
+ 
+ //eigen stuff
+-#include <eigenlib/Eigen/Sparse>
++#include <eigen3/Eigen/Sparse>
+ 
+ //vcg stuff
+ #include <vcg/complex/algorithms/update/color.h>
diff --git a/ports/vcglib/portfile.cmake b/ports/vcglib/portfile.cmake
new file mode 100644
index 000000000..5389a69fb
--- /dev/null
+++ b/ports/vcglib/portfile.cmake
@@ -0,0 +1,15 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cnr-isti-vclab/vcglib
+    REF v1.0.1
+    SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
+    PATCHES consume-vcpkg-eigen3.patch
+    )
+
+configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vcglib/copyright COPYONLY)
+
+file(COPY ${SOURCE_PATH}/vcg/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/vcg)
+file(COPY ${SOURCE_PATH}/wrap/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/wrap)
+file(COPY ${SOURCE_PATH}/img/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/img)
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index 0eb485dcd..2521ed58c 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,5 +1,5 @@
 Source: vtk
-Version: 8.1.0-6
+Version: 8.1.0-7
 Description: Software system for 3D computer graphics, image processing, and visualization
 Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora
 
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index 7a5536163..8b6123eb7 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -166,7 +166,7 @@ vcpkg_configure_cmake(
         -DVTK_INSTALL_DATA_DIR=share/vtk/data
         -DVTK_INSTALL_DOC_DIR=share/vtk/doc
         -DVTK_INSTALL_PACKAGE_DIR=share/vtk
-        -DVTK_INSTALL_RUNTIME_DIR=tools
+        -DVTK_INSTALL_RUNTIME_DIR=bin
         -DVTK_FORBID_DOWNLOADS=ON
         ${ADDITIONAL_OPTIONS}
 )
@@ -306,12 +306,44 @@ endforeach()
 # =============================================================================
 # Clean-up other directories
 
+# Delete the debug binary TOOL_NAME that is not required
+function(_vtk_remove_debug_tool TOOL_NAME)
+    # on windows, the tools end with .exe
+    set(filename_win ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe)
+    if(EXISTS ${filename_win})
+        file(REMOVE ${filename_win})
+    endif()
+    # on other OS, it doesn't
+    set(filename_unix ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME})
+    if(EXISTS ${filename_unix})
+        file(REMOVE ${filename_unix})
+    endif()
+    # we also have to bend the lines referencing the tools in VTKTargets-debug.cmake
+    # to make them point to the release version of the tools
+    file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake" VTK_TARGETS_CONTENT_DEBUG)
+    string(REPLACE "debug/bin/${TOOL_NAME}" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_DEBUG "${VTK_TARGETS_CONTENT_DEBUG}")
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake" "${VTK_TARGETS_CONTENT_DEBUG}")
+endfunction()
 
-function(_vtk_remove_tool TOOL_NAME)
-    set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe)
-    if(EXISTS ${filename})
-        file(REMOVE ${filename})
+# Move the release binary TOOL_NAME from bin to tools
+function(_vtk_move_release_tool TOOL_NAME)
+    # on windows, the tools end with .exe
+    set(old_filename_win "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe")
+    if(EXISTS ${old_filename_win})
+        file(INSTALL ${old_filename_win} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk")
+        file(REMOVE ${old_filename_win})
     endif()
+    # on other OS, it doesn't
+    set(old_filename_unix "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}")
+    if(EXISTS ${old_filename_unix})
+        file(INSTALL ${old_filename_unix} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk")
+        file(REMOVE ${old_filename_unix})
+    endif()
+    # we also have to bend the lines referencing the tools in VTKTargets-release.cmake
+    # to make them point to the tool folder
+    file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake" VTK_TARGETS_CONTENT_RELEASE)
+    string(REPLACE "bin/${TOOL_NAME}" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_RELEASE "${VTK_TARGETS_CONTENT_RELEASE}")
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake" "${VTK_TARGETS_CONTENT_RELEASE}")
 endfunction()
 
 set(VTK_TOOLS
@@ -329,15 +361,16 @@ set(VTK_TOOLS
     pvtkpython
 )
 
+foreach(TOOL_NAME IN LISTS VTK_TOOLS)
+    _vtk_remove_debug_tool("${TOOL_NAME}")
+    _vtk_move_release_tool("${TOOL_NAME}")
+endforeach()
+
 file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" _contents)
 string(REPLACE "vtk::hdf5::hdf5_hl" "" _contents "${_contents}")
 string(REPLACE "vtk::hdf5::hdf5" "" _contents "${_contents}")
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" "${_contents}")
 
-foreach(TOOL_NAME IN LISTS VTK_TOOLS)
-    _vtk_remove_tool("${TOOL_NAME}")
-endforeach()
-
 # =============================================================================
 # Remove other files and directories that are not valid for vcpkg
 if(VTK_WITH_ALL_MODULES)
@@ -357,3 +390,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 # Handle copyright
 file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/vtk/copyright)
+
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk)
diff --git a/ports/vulkan/CONTROL b/ports/vulkan/CONTROL
index 77f99641d..2d4947d31 100644
--- a/ports/vulkan/CONTROL
+++ b/ports/vulkan/CONTROL
@@ -1,3 +1,3 @@
 Source: vulkan
-Version: 1.1.82.1
+Version: 1.1.82.1-1
 Description: A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices.
 \ No newline at end of file
diff --git a/ports/vulkan/portfile.cmake b/ports/vulkan/portfile.cmake
index 31eb802b4..bf6c2d65e 100644
--- a/ports/vulkan/portfile.cmake
+++ b/ports/vulkan/portfile.cmake
@@ -33,5 +33,12 @@ if(VULKAN_DIR MATCHES "(([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+))")
     endif()
 endif()
 
-configure_file(${VULKAN_DIR}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY)
+if (EXISTS ${VULKAN_DIR}/../LICENSE.TXT)
+    configure_file(${VULKAN_DIR}/../LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY)
+elseif(EXISTS ${VULKAN_DIR}/LICENSE.TXT)
+    configure_file(${VULKAN_DIR}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY)
+else()
+    message(FATAL_ERROR "Could not find LICENSE.TXT")
+endif()
+
 SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 \ No newline at end of file
diff --git a/ports/wavpack/CONTROL b/ports/wavpack/CONTROL
new file mode 100644
index 000000000..80fb66b96
--- /dev/null
+++ b/ports/wavpack/CONTROL
@@ -0,0 +1,3 @@
+Source: wavpack
+Version: 5.1.0-00d9a4a
+Description: WavPack encode/decode library, command-line programs, and several plugins
diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake
new file mode 100644
index 000000000..1594f7249
--- /dev/null
+++ b/ports/wavpack/portfile.cmake
@@ -0,0 +1,48 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/00d9a4ac58a52b52495736be614cb06ba102663c)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO dbry/WavPack
+    REF 00d9a4ac58a52b52495736be614cb06ba102663c
+    SHA512 a0d08ac2ff46bd4cc606626c8e0da18a83392722a2e40df18f9e40710e5e147c0a24800174bfdf42ed7a12be4d9679f6302c51d8409724d31ca2a29ab4972481
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS
+        -DWAVPACK_INSTALL_DOCS=OFF
+        -DWAVPACK_BUILD_PROGRAMS=OFF
+        -DWAVPACK_BUILD_COOLEDIT_PLUGIN=OFF
+        -DWAVPACK_BUILD_WINAMP_PLUGIN=OFF
+        -DBUILD_TESTING=OFF
+        -DWAVPACK_BUILD_DOCS=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wavpack RENAME copyright)
+
+# Post-build test for cmake libraries
+# vcpkg_test_cmake(PACKAGE_NAME wavpack)
diff --git a/ports/wt/0001-boost-1.66.patch b/ports/wt/0001-boost-1.66.patch
deleted file mode 100644
index b11ffdb05..000000000
--- a/ports/wt/0001-boost-1.66.patch
+++ /dev/null
@@ -1,370 +0,0 @@
-From a0fd67d85947c835cd55078edacf3c2ac84ca53f Mon Sep 17 00:00:00 2001
-From: Robert Schumacher <roschuma@microsoft.com>
-Date: Fri, 23 Feb 2018 03:12:00 -0800
-Subject: [PATCH 1/3] boost 1.66
-
-
-diff --git a/src/Wt/Http/Client.C b/src/Wt/Http/Client.C
-index 85230d1..a2c893e 100644
---- a/src/Wt/Http/Client.C
-+++ b/src/Wt/Http/Client.C
-@@ -642,7 +642,7 @@ private:
- 
- protected:
-   asio::io_service& ioService_;
--  asio::strand strand_;
-+  asio::io_context::strand strand_;
-   tcp::resolver resolver_;
-   asio::streambuf requestBuf_;
-   asio::streambuf responseBuf_;
-diff --git a/src/Wt/Http/Client.h b/src/Wt/Http/Client.h
-index f3c7169..0f638e8 100644
---- a/src/Wt/Http/Client.h
-+++ b/src/Wt/Http/Client.h
-@@ -21,11 +21,7 @@
- #include <string>
- 
- #ifdef WT_ASIO_IS_BOOST_ASIO
--namespace boost {
--  namespace asio {
--    class io_service;
--  }
--}
-+#include <boost/asio/io_service.hpp>
- #else // WT_ASIO_IS_STANDALONE_ASIO
- namespace asio {
-   class io_service;
-diff --git a/src/http/Connection.C b/src/http/Connection.C
-index cab7708..cca4e0a 100644
---- a/src/http/Connection.C
-+++ b/src/http/Connection.C
-@@ -78,7 +78,7 @@ void Connection::scheduleStop()
- 
- void Connection::start()
- {
--  LOG_DEBUG(socket().native() << ": start()");
-+  LOG_DEBUG(socket().native_handle() << ": start()");
- 
-   request_parser_.reset();
-   request_.reset();
-@@ -106,7 +106,7 @@ void Connection::stop()
- void Connection::setReadTimeout(int seconds)
- {
-   if (seconds != 0) {
--    LOG_DEBUG(socket().native() << " setting read timeout (ws: "
-+    LOG_DEBUG(socket().native_handle() << " setting read timeout (ws: "
- 	      << request_.webSocketVersion << ")");
-     state_ |= Reading;
- 
-@@ -118,7 +118,7 @@ void Connection::setReadTimeout(int seconds)
- 
- void Connection::setWriteTimeout(int seconds)
- {
--  LOG_DEBUG(socket().native() << " setting write timeout (ws: "
-+  LOG_DEBUG(socket().native_handle() << " setting write timeout (ws: "
- 	    << request_.webSocketVersion << ")");
-   state_ |= Writing;
- 
-@@ -129,7 +129,7 @@ void Connection::setWriteTimeout(int seconds)
- 
- void Connection::cancelReadTimer()
- {
--  LOG_DEBUG(socket().native() << " cancel read timeout");
-+  LOG_DEBUG(socket().native_handle() << " cancel read timeout");
-   state_.clear(Reading);
- 
-   readTimer_.cancel();
-@@ -137,7 +137,7 @@ void Connection::cancelReadTimer()
- 
- void Connection::cancelWriteTimer()
- {
--  LOG_DEBUG(socket().native() << " cancel write timeout");
-+  LOG_DEBUG(socket().native_handle() << " cancel write timeout");
-   state_.clear(Writing);
- 
-   writeTimer_.cancel();
-@@ -163,7 +163,7 @@ void Connection::handleReadRequest0()
- 
- #ifdef DEBUG
-   try {
--    LOG_DEBUG(socket().native() << "incoming request: "
-+    LOG_DEBUG(socket().native_handle() << "incoming request: "
- 	      << socket().remote_endpoint().port() << " (avail= "
- 	      << (rcv_buffer_size_ - (rcv_remaining_ - buffer.data())) << "): "
- 	      << std::string(rcv_remaining_,
-@@ -189,7 +189,7 @@ void Connection::handleReadRequest0()
-     if (doWebSockets)
-       request_.enableWebSocket();
- 
--    LOG_DEBUG(socket().native() << "request: " << status);
-+    LOG_DEBUG(socket().native_handle() << "request: " << status);
- 
-     if (status >= 300)
-       sendStockReply(status);
-@@ -242,7 +242,7 @@ void Connection::sendStockReply(StockReply::status_type status)
- void Connection::handleReadRequest(const Wt::AsioWrapper::error_code& e,
- 				   std::size_t bytes_transferred)
- {
--  LOG_DEBUG(socket().native() << ": handleReadRequest(): " << e.message());
-+  LOG_DEBUG(socket().native_handle() << ": handleReadRequest(): " << e.message());
- 
-   cancelReadTimer();
- 
-@@ -261,7 +261,7 @@ void Connection::close()
-   cancelReadTimer();
-   cancelWriteTimer();
- 
--  LOG_DEBUG(socket().native() << ": close()");
-+  LOG_DEBUG(socket().native_handle() << ": close()");
- 
-   ConnectionManager_.stop(shared_from_this());
- }
-@@ -274,7 +274,7 @@ bool Connection::closed() const
- 
- void Connection::handleError(const Wt::AsioWrapper::error_code& e)
- {
--  LOG_DEBUG(socket().native() << ": error: " << e.message());
-+  LOG_DEBUG(socket().native_handle() << ": error: " << e.message());
- 
-   close();
- }
-@@ -349,7 +349,7 @@ void Connection::handleReadBody0(ReplyPtr reply,
-                                  const Wt::AsioWrapper::error_code& e,
- 				 std::size_t bytes_transferred)
- {
--  LOG_DEBUG(socket().native() << ": handleReadBody0(): " << e.message());
-+  LOG_DEBUG(socket().native_handle() << ": handleReadBody0(): " << e.message());
- 
-   if (disconnectCallback_) {
-     if (e && e != asio::error::operation_aborted) {
-@@ -357,7 +357,7 @@ void Connection::handleReadBody0(ReplyPtr reply,
-       disconnectCallback_ = boost::function<void()>();
-       f();
-     } else if (!e) {
--      LOG_ERROR(socket().native()
-+      LOG_ERROR(socket().native_handle()
- 		<< ": handleReadBody(): while waiting for disconnect, "
- 		"received unexpected data, closing");
-       close();
-@@ -403,14 +403,14 @@ void Connection::startWriteResponse(ReplyPtr reply)
-     int size = asio::buffer_size(buffers[i]);
-     s += size;
- #ifdef DEBUG_DUMP
--    char *data = (char *)asio::detail::buffer_cast_helper(buffers[i]);
-+    char *data = asio::buffer_cast<char*>(buffers[i]);
-     for (int j = 0; j < size; ++j)
-       std::cerr << data[j];
- #endif
-   }
- #endif
- 
--  LOG_DEBUG(socket().native() << " sending: " << s << "(buffers: "
-+  LOG_DEBUG(socket().native_handle() << " sending: " << s << "(buffers: "
- 	    << buffers.size() << ")");
- 
-   if (!buffers.empty()) {
-@@ -423,7 +423,7 @@ void Connection::startWriteResponse(ReplyPtr reply)
- 
- void Connection::handleWriteResponse(ReplyPtr reply)
- {
--  LOG_DEBUG(socket().native() << ": handleWriteResponse() " <<
-+  LOG_DEBUG(socket().native_handle() << ": handleWriteResponse() " <<
- 	    haveResponse_ << " " << responseDone_);
-   if (haveResponse_)
-     startWriteResponse(reply);
-@@ -458,7 +458,7 @@ void Connection::handleWriteResponse0(ReplyPtr reply,
-                                       const Wt::AsioWrapper::error_code& e,
- 				      std::size_t bytes_transferred)
- {
--  LOG_DEBUG(socket().native() << ": handleWriteResponse0(): "
-+  LOG_DEBUG(socket().native_handle() << ": handleWriteResponse0(): "
- 	    << bytes_transferred << " ; " << e.message());
- 
-   cancelWriteTimer();
-diff --git a/src/http/Connection.h b/src/http/Connection.h
-index b0b71a3..bc0b6ed 100644
---- a/src/http/Connection.h
-+++ b/src/http/Connection.h
-@@ -61,7 +61,7 @@ public:
-   virtual ~Connection();
- 
-   Server *server() const { return server_; }
--  asio::strand& strand() { return strand_; }
-+  asio::io_context::strand& strand() { return strand_; }
- 
-   /// Stop all asynchronous operations associated with the connection.
-   void scheduleStop();
-@@ -104,7 +104,7 @@ protected:
-   /// The manager for this connection.
-   ConnectionManager& ConnectionManager_;
- 
--  asio::strand strand_;
-+  asio::io_context::strand strand_;
- 
-   void finishReply();
- 
-diff --git a/src/http/Reply.C b/src/http/Reply.C
-index 0d79e39..5e6c615 100644
---- a/src/http/Reply.C
-+++ b/src/http/Reply.C
-@@ -596,7 +596,7 @@ bool Reply::encodeNextContentBuffer(
-       originalSize += bs;
- 
-       gzipStrm_.avail_in = bs;
--      gzipStrm_.next_in = (unsigned char *)asio::detail::buffer_cast_helper(b);
-+      gzipStrm_.next_in = (unsigned char *)b.data();
- 
-       unsigned char out[16*1024];
-       do {
-diff --git a/src/http/Server.h b/src/http/Server.h
-index 3d3229a..373073f 100644
---- a/src/http/Server.h
-+++ b/src/http/Server.h
-@@ -129,7 +129,7 @@ private:
-   Wt::WLogger accessLogger_;
- 
-   /// The strand for handleTcpAccept(), handleSslAccept() and handleStop()
--  asio::strand accept_strand_;
-+  asio::io_context::strand accept_strand_;
- 
-   /// Acceptors used to listen for incoming http connections.
-   std::vector<TcpListener> tcp_listeners_;
-diff --git a/src/http/SessionProcess.C b/src/http/SessionProcess.C
-index 72d9a88..92320b0 100644
---- a/src/http/SessionProcess.C
-+++ b/src/http/SessionProcess.C
-@@ -80,7 +80,7 @@ void SessionProcess::asyncExec(const Configuration &config,
-   if (!ec)
-     acceptor_->listen(0, ec);
- #ifndef WT_WIN32
--  fcntl(acceptor_->native(), F_SETFD, FD_CLOEXEC);
-+  fcntl(acceptor_->native_handle(), F_SETFD, FD_CLOEXEC);
- #endif // !WT_WIN32
-   if (ec) {
-     LOG_ERROR("Couldn't create listening socket: " << ec.message());
-diff --git a/src/http/SslConnection.C b/src/http/SslConnection.C
-index 74c8642..2c34b53 100644
---- a/src/http/SslConnection.C
-+++ b/src/http/SslConnection.C
-@@ -81,9 +81,9 @@ void SslConnection::handleHandshake(const Wt::AsioWrapper::error_code& error)
- 
- void SslConnection::stop()
- {
--  LOG_DEBUG(socket().native() << ": stop()");
-+  LOG_DEBUG(socket().native_handle() << ": stop()");
-   finishReply();
--  LOG_DEBUG(socket().native() << ": SSL shutdown");
-+  LOG_DEBUG(socket().native_handle() << ": SSL shutdown");
- 
-   Connection::stop();
-   
-@@ -108,20 +108,20 @@ void SslConnection::stopNextLayer(const Wt::AsioWrapper::error_code& ec)
-   // In case of timeout, we will get here twice.
-   sslShutdownTimer_.cancel();
-   if (ec) {
--    LOG_DEBUG(socket().native() << ": ssl_shutdown failed:"
-+    LOG_DEBUG(socket().native_handle() << ": ssl_shutdown failed:"
-       << ec.message());
-   }
-   try {
-     if (socket().is_open()) {
-       Wt::AsioWrapper::error_code ignored_ec;
--      LOG_DEBUG(socket().native() << ": socket shutdown");
-+      LOG_DEBUG(socket().native_handle() << ": socket shutdown");
-       socket().shutdown(asio::ip::tcp::socket::shutdown_both, 
- 			ignored_ec);
--      LOG_DEBUG(socket().native() << "closing socket");
-+      LOG_DEBUG(socket().native_handle() << "closing socket");
-       socket().close();
-     }
-   } catch (Wt::AsioWrapper::system_error& e) {
--    LOG_DEBUG(socket().native() << ": error " << e.what());
-+    LOG_DEBUG(socket().native_handle() << ": error " << e.what());
-   }
- }
- 
-@@ -161,7 +161,7 @@ void SslConnection::startAsyncReadBody(ReplyPtr reply,
- 				       Buffer& buffer, int timeout)
- {
-   if (state_ & Reading) {
--    LOG_DEBUG(socket().native() << ": state_ = "
-+    LOG_DEBUG(socket().native_handle() << ": state_ = "
- 	      << (state_ & Reading ? "reading " : "")
- 	      << (state_ & Writing ? "writing " : ""));
-     stop();
-@@ -198,7 +198,7 @@ void SslConnection
- 			  int timeout)
- {
-   if (state_ & Writing) {
--    LOG_DEBUG(socket().native() << ": state_ = "
-+    LOG_DEBUG(socket().native_handle() << ": state_ = "
- 	      << (state_ & Reading ? "reading " : "")
- 	      << (state_ & Writing ? "writing " : ""));
-     stop();
-diff --git a/src/http/TcpConnection.C b/src/http/TcpConnection.C
-index ad73164..4eaf83b 100644
---- a/src/http/TcpConnection.C
-+++ b/src/http/TcpConnection.C
-@@ -38,17 +38,17 @@ asio::ip::tcp::socket& TcpConnection::socket()
- 
- void TcpConnection::stop()
- {
--  LOG_DEBUG(socket().native() << ": stop()");
-+  LOG_DEBUG(socket().native_handle() << ": stop()");
- 
-   finishReply();
- 
-   try {
-     Wt::AsioWrapper::error_code ignored_ec;
-     socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec);
--    LOG_DEBUG(socket().native() << ": closing socket");
-+    LOG_DEBUG(socket().native_handle() << ": closing socket");
-     socket_.close();
-   } catch (Wt::AsioWrapper::system_error& e) {
--    LOG_DEBUG(socket().native() << ": error " << e.what());
-+    LOG_DEBUG(socket().native_handle() << ": error " << e.what());
-   }
- 
-   Connection::stop();
-@@ -56,10 +56,10 @@ void TcpConnection::stop()
- 
- void TcpConnection::startAsyncReadRequest(Buffer& buffer, int timeout)
- {
--  LOG_DEBUG(socket().native() << ": startAsyncReadRequest");
-+  LOG_DEBUG(socket().native_handle() << ": startAsyncReadRequest");
- 
-   if (state_ & Reading) {
--    LOG_DEBUG(socket().native() << ": state_ = "
-+    LOG_DEBUG(socket().native_handle() << ": state_ = "
- 	      << (state_ & Reading ? "reading " : "")
- 	      << (state_ & Writing ? "writing " : ""));
-     stop();
-@@ -81,10 +81,10 @@ void TcpConnection::startAsyncReadRequest(Buffer& buffer, int timeout)
- void TcpConnection::startAsyncReadBody(ReplyPtr reply,
- 				       Buffer& buffer, int timeout)
- {
--  LOG_DEBUG(socket().native() << ": startAsyncReadBody");
-+  LOG_DEBUG(socket().native_handle() << ": startAsyncReadBody");
- 
-   if (state_ & Reading) {
--    LOG_DEBUG(socket().native() << ": state_ = "
-+    LOG_DEBUG(socket().native_handle() << ": state_ = "
- 	      << (state_ & Reading ? "reading " : "")
- 	      << (state_ & Writing ? "writing " : ""));
-     stop();
-@@ -109,10 +109,10 @@ void TcpConnection::startAsyncWriteResponse
-       const std::vector<asio::const_buffer>& buffers,
-       int timeout)
- {
--  LOG_DEBUG(socket().native() << ": startAsyncWriteResponse");
-+  LOG_DEBUG(socket().native_handle() << ": startAsyncWriteResponse");
- 
-   if (state_ & Writing) {
--    LOG_DEBUG(socket().native() << ": state_ = "
-+    LOG_DEBUG(socket().native_handle() << ": state_ = "
- 	      << (state_ & Reading ? "reading " : "")
- 	      << (state_ & Writing ? "writing " : ""));
-     stop();
--- 
-2.16.2.windows.1
-
diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake
index 3c2e70962..c9fb520f6 100644
--- a/ports/wt/portfile.cmake
+++ b/ports/wt/portfile.cmake
@@ -7,7 +7,6 @@ vcpkg_from_github(
     SHA512 5513b428bfd3e778726c947606677f3e0774b38e640e61cd94906a2e0c75d204a68072b54ddeb3614a7ba08f5668e6eb3a96d9c8df3744b09dc36ad9be12d924
     HEAD_REF master
     PATCHES
-        0001-boost-1.66.patch
         0002-link-glew.patch
         0003-disable-boost-autolink.patch
         0004-link-ssl.patch
diff --git a/ports/wtl/CONTROL b/ports/wtl/CONTROL
index 5fbab5c61..0eb3cf372 100644
--- a/ports/wtl/CONTROL
+++ b/ports/wtl/CONTROL
@@ -1,5 +1,5 @@
 Source: wtl
 Maintainer: jfrederich@gmail.com
-Version: 10.0-1
+Version: 10.0-2
 Description: Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.
 Build-Depends:
diff --git a/ports/wtl/portfile.cmake b/ports/wtl/portfile.cmake
index 6ee21e895..85cbca6e6 100644
--- a/ports/wtl/portfile.cmake
+++ b/ports/wtl/portfile.cmake
@@ -1,9 +1,9 @@
 #header-only library
 include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://downloads.sourceforge.net/project/wtl/WTL%2010/WTL%2010.0.7336/WTL10_7336.zip"
-    FILENAME "WTL10_7336.zip"
-    SHA512 68368be0b35fba97ed63fd684e98c077ab94ea2ce928693da7f1f48e2547486109e045e026218a7c8652aec46930b79572679c0b79afaa75a3dbf98572e4d9b5
+    URLS "https://downloads.sourceforge.net/project/wtl/WTL%2010/WTL%2010.0.8356/WTL10_8356.zip"
+    FILENAME "WTL10_8356.zip"
+    SHA512 4eb24151f4009cdfebc17f08312cae65d46c8ea205ccc7b56f14c46b54d28d8d4e6290de3150e558dc076d7815a9dde2a8952695f46f4402c83b0da2bf65f241
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/x-plane/CONTROL b/ports/x-plane/CONTROL
new file mode 100644
index 000000000..a2b267ed0
--- /dev/null
+++ b/ports/x-plane/CONTROL
@@ -0,0 +1,3 @@
+Source: x-plane
+Version: 3.0.1
+Description: The X-Plane Plugin SDK.
+\ No newline at end of file
diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake
new file mode 100644
index 000000000..cfc5fedd3
--- /dev/null
+++ b/ports/x-plane/portfile.cmake
@@ -0,0 +1,43 @@
+include(vcpkg_common_functions)
+
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+    message(FATAL_ERROR "the x-plane SDK cannot be built for the x86 architecture")
+endif()
+
+vcpkg_download_distfile(
+    OUT_SOURCE_PATH
+    URLS http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK301.zip
+    FILENAME XPSDK301.zip
+    SHA512 3044d606039be8230f35a5992d322d4c009b4056f8fb17e929a9f5c2204c084e2c83ddad10801b21727645ec957c8942b83938f81256ec3778dbe75df525e62a
+)
+
+vcpkg_extract_source_archive(
+    ${OUT_SOURCE_PATH} ${CURRENT_PACKAGES_DIR}/temp/
+)
+
+file(MAKE_DIRECTORY
+    ${CURRENT_PACKAGES_DIR}/lib
+    ${CURRENT_PACKAGES_DIR}/debug/lib
+)
+
+file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/CHeaders/Widgets/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/CHeaders/Wrappers/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/CHeaders/XPLM/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+    file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+    file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+    file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+    file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+    file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Mac/XPLM.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+    file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/Libraries/Mac/XPWidgets.framework/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+endif()
+
+# Handle copyright
+file(COPY ${CURRENT_PACKAGES_DIR}/temp/SDK/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/x-plane/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/x-plane/license.txt ${CURRENT_PACKAGES_DIR}/share/x-plane/copyright)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/temp/)
+\ No newline at end of file
diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL
index f2185d2f0..ae598d613 100644
--- a/ports/x265/CONTROL
+++ b/ports/x265/CONTROL
@@ -1,3 +1,3 @@
 Source: x265
-Version: 2.9-2
+Version: 3.0-1
 Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.
diff --git a/ports/x265/disable-install-pdb.patch b/ports/x265/disable-install-pdb.patch
index 1b58d287c..4d57d764b 100644
--- a/ports/x265/disable-install-pdb.patch
+++ b/ports/x265/disable-install-pdb.patch
@@ -2,7 +2,7 @@ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
 index 33b6523..06e3193 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -556,13 +556,13 @@ endif()
+@@ -559,13 +559,13 @@ endif()
  install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
  if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
      if(MSVC_IDE)
diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake
index 87f11c4f4..6b207baf3 100644
--- a/ports/x265/portfile.cmake
+++ b/ports/x265/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO multicoreware/x265
-    REF 2.9
-    SHA512 5bd9732b6af67e7f7c5b1e71d26acbd98fb98e9e81c6052cda2e1e9254e3eaaa28914805d3f8cd2535dd042022047e54f8ae49ea02269160b609d191a7d99e94
+    REF 3.0
+    SHA512 698fd31bf30c65896717225de69714523bcbd3d835474f777bf32c3a6d6dbbf941a09db076e13e76917a5ca014c89fca924fcb0ea3d15bc09748b6fc834a4ba2
     HEAD_REF master
 )
 
@@ -13,13 +13,24 @@ vcpkg_apply_patches(
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-install-pdb.patch
 )
 
+set(ENABLE_ASSEMBLY OFF)
+if (WIN32)
+    vcpkg_find_acquire_program(NASM)
+    get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
+    set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}")
+    set(ENABLE_ASSEMBLY ON)
+endif ()
+
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/source
     PREFER_NINJA
-    OPTIONS -DENABLE_SHARED=${ENABLE_SHARED}
-    OPTIONS_DEBUG -DENABLE_CLI=OFF
+    OPTIONS
+        -DENABLE_ASSEMBLY=${ENABLE_ASSEMBLY}
+        -DENABLE_SHARED=${ENABLE_SHARED}
+    OPTIONS_DEBUG
+        -DENABLE_CLI=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL
new file mode 100644
index 000000000..f0581395c
--- /dev/null
+++ b/ports/xeus/CONTROL
@@ -0,0 +1,4 @@
+Source: xeus
+Version: 2019-02-13-1
+Description: C++ implementation of the Jupyter kernel protocol
+Build-Depends: cppzmq, cryptopp, libuuid (linux), nlohmann-json, xtl, zeromq
diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake
new file mode 100644
index 000000000..1ba0df8f7
--- /dev/null
+++ b/ports/xeus/portfile.cmake
@@ -0,0 +1,47 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO QuantStack/xeus
+    REF f78c60c7ce28baecb2479f2b82e4e8d1a6c35188
+    SHA512 9d83f32f641bcad4ac96e263c465d46bdfa7d18d41f1e201309244c95587ce08ff2426f7cdd3a4399563d46064ed9bedd4d0babf4840f65e95c6a2c6f23ac9bb
+    HEAD_REF master
+    PATCHES
+        static-lib.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTS=OFF
+        -DDOWNLOAD_GTEST=OFF
+        -DXEUS_USE_SHARED_CRYPTOPP=OFF # `cryptopp` port currently only supports static linkage.
+        -DDISABLE_ARCH_NATIVE=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/xeus/xeus.hpp
+        "#ifdef XEUS_STATIC_LIB"
+        "#if 1 // #ifdef XEUS_STATIC_LIB"
+    )
+endif()
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# Install usage
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+# CMake integration test
+#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/xeus/static-lib.patch b/ports/xeus/static-lib.patch
new file mode 100644
index 000000000..e9ab41f01
--- /dev/null
+++ b/ports/xeus/static-lib.patch
@@ -0,0 +1,63 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 26118eb..ccda00b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,7 +141,12 @@ set(XEUS_SOURCES
+ # Output
+ # ======
+ 
+-add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS})
++option(BUILD_SHARED_LIBS "Build shared instead of static libraries." ON)
++if (BUILD_SHARED_LIBS)
++    add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS})
++else ()
++    add_library(xeus STATIC ${XEUS_SOURCES} ${XEUS_HEADERS})
++endif ()
+ 
+ if (APPLE)
+     set_target_properties(xeus PROPERTIES
+@@ -166,9 +171,9 @@ target_link_libraries(xeus
+ 
+ OPTION(XEUS_USE_SHARED_CRYPTOPP "Used shared library for cryptopp" OFF)
+ if (XEUS_USE_SHARED_CRYPTOPP)
+-    target_link_libraries(xeus PRIVATE cryptopp-shared)
++    target_link_libraries(xeus PUBLIC cryptopp-shared)
+ else ()
+-    target_link_libraries(xeus PRIVATE cryptopp-static)
++    target_link_libraries(xeus PUBLIC cryptopp-static)
+ endif ()
+ 
+ if(NOT MSVC)
+@@ -226,6 +231,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
+     message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+ endif()
+ 
++if (NOT BUILD_SHARED_LIBS)
++    target_compile_definitions(xeus PUBLIC XEUS_STATIC_LIB)
++endif ()
++
+ if(MSVC)
+     target_compile_definitions(xeus PUBLIC -DNOMINMAX)
+     target_compile_options(xeus PUBLIC /DGUID_WINDOWS /MP /bigobj)
+diff --git a/include/xeus/xeus.hpp b/include/xeus/xeus.hpp
+index 99e1d79..522bb78 100644
+--- a/include/xeus/xeus.hpp
++++ b/include/xeus/xeus.hpp
+@@ -10,10 +10,14 @@
+ #define XEUS_EXPORT_HPP
+ 
+ #ifdef _WIN32
+-    #ifdef XEUS_EXPORTS
+-        #define XEUS_API __declspec(dllexport)
++    #ifdef XEUS_STATIC_LIB
++        #define XEUS_API
+     #else
+-        #define XEUS_API __declspec(dllimport)
++        #ifdef XEUS_EXPORTS
++            #define XEUS_API __declspec(dllexport)
++        #else
++            #define XEUS_API __declspec(dllimport)
++        #endif
+     #endif
+ #else
+     #define XEUS_API
diff --git a/ports/xeus/usage b/ports/xeus/usage
new file mode 100644
index 000000000..bac932eb9
--- /dev/null
+++ b/ports/xeus/usage
@@ -0,0 +1,4 @@
+The package xeus provides CMake targets:
+
+    find_package(xeus CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE xeus)
diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL
index f75d920ab..e5f8d0f14 100644
--- a/ports/xsimd/CONTROL
+++ b/ports/xsimd/CONTROL
@@ -1,5 +1,5 @@
 Source: xsimd
-Version: 7.1.2
+Version: 7.1.3
 Description: Modern, portable C++ wrappers for SIMD intrinsics
 
 Feature: xcomplex
diff --git a/ports/xsimd/PatchHeaderIncludeGuard.patch b/ports/xsimd/PatchHeaderIncludeGuard.patch
deleted file mode 100644
index 73ba4a9bf..000000000
--- a/ports/xsimd/PatchHeaderIncludeGuard.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/include/xsimd/stl/algorithms.hpp b/include/xsimd/stl/algorithms.hpp
-index 4cb2b79..1590b89 100644
---- a/include/xsimd/stl/algorithms.hpp
-+++ b/include/xsimd/stl/algorithms.hpp
-@@ -6,6 +6,9 @@
- * The full license is in the file LICENSE, distributed with this software. *
- ****************************************************************************/
- 
-+#ifndef XSIMD_ALGORITHMS_HPP
-+#define XSIMD_ALGORITHMS_HPP
-+
- #include "xsimd/memory/xsimd_load_store.hpp"
- 
- namespace xsimd
-@@ -126,4 +129,6 @@ namespace xsimd
- 
-         #undef XSIMD_LOOP_MACRO
-     }
--}
-\ No newline at end of file
-+}
-+
-+#endif
-\ No newline at end of file
diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake
index 7e128cd8f..3b51bd9a8 100644
--- a/ports/xsimd/portfile.cmake
+++ b/ports/xsimd/portfile.cmake
@@ -5,10 +5,9 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xsimd
-    REF 7.1.2
-    SHA512 9479eb6188a68388d470e38ec7b08aaeeb03a1028a574258b52e1c39ce0b1b1aaf97a5cb898447f68c989badd23903ba7a059f5daf59160c660ba751d668c0eb
+    REF 7.1.3
+    SHA512 9f0e2babee9a3a80e16440466277bd635a26197f80cdf806312f7e1cc616db59062887566d50b4cdebe3c3ba4d60155b477684177607428aee53e1d5a95de926
     HEAD_REF master
-    PATCHES PatchHeaderIncludeGuard.patch
 )
 
 if("xcomplex" IN_LIST FEATURES)
diff --git a/ports/xtensor-blas/CONTROL b/ports/xtensor-blas/CONTROL
new file mode 100644
index 000000000..578687b8e
--- /dev/null
+++ b/ports/xtensor-blas/CONTROL
@@ -0,0 +1,4 @@
+Source: xtensor-blas
+Version: 0.15.1
+Description: BLAS extension to xtensor
+Build-Depends: xtensor
diff --git a/ports/xtensor-blas/portfile.cmake b/ports/xtensor-blas/portfile.cmake
new file mode 100644
index 000000000..e9023ea15
--- /dev/null
+++ b/ports/xtensor-blas/portfile.cmake
@@ -0,0 +1,38 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO QuantStack/xtensor-blas
+    REF 0.15.1
+    SHA512 c80def1cc106efec1ee4c33f3724b6b63af4c826e45e2a5a8dc066d368867b3a1d909ae490e09c615c2119b3aad3ef5b739fe86925d0229a69329ddee09c3d66
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS_RELEASE -DCXXBLAS_DEBUG=OFF
+    OPTIONS_DEBUG -DCXXBLAS_DEBUG=ON
+    OPTIONS
+        -DXTENSOR_USE_FLENS_BLAS=OFF
+        -DBUILD_TESTS=OFF
+        -DBUILD_BENCHMARK=OFF
+        -DDOWNLOAD_GTEST=OFF
+        -DDOWNLOAD_GBENCHMARK=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xflens/cxxblas/netlib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL
index 01614cba0..9b84a6ff3 100644
--- a/ports/xtensor/CONTROL
+++ b/ports/xtensor/CONTROL
@@ -1,5 +1,5 @@
 Source: xtensor
-Version: 2019-01-20
+Version: 0.19.3
 Description: C++ tensors with broadcasting and lazy computing
 Build-Depends: nlohmann-json, xtl
 
diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake
index 795bb3ce8..99f52d195 100644
--- a/ports/xtensor/portfile.cmake
+++ b/ports/xtensor/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtensor
-    REF ca0cfdbde852ee61a3ef20076e2733030f3d6479
-    SHA512 d960a3c1c3e6c9250c6bc5ed4e641486980a3ffa4179696eabb92fee50673901324cd2174b76cbd74ab07e6f3c175a26cb564b3087863602c3dce0a83a263da6
+    REF 0.19.3
+    SHA512 e3b0085115252441ef4ddf21ef48ca18c3872c24d7f94d2f7533fa8f4b00dff0b5613946296f9dd4d7db3381ff43b41dd2f1ae3857a409fabd439eade431aba2
     HEAD_REF master
 )
 
diff --git a/ports/xtl/CONTROL b/ports/xtl/CONTROL
index f5158ebe5..1ee82f60a 100644
--- a/ports/xtl/CONTROL
+++ b/ports/xtl/CONTROL
@@ -1,4 +1,4 @@
 Source: xtl
-Version: 0.5.3
+Version: 0.5.4
 Build-Depends: nlohmann-json
 Description: The x template library.
diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake
index 23a6f9f44..66e504b73 100644
--- a/ports/xtl/portfile.cmake
+++ b/ports/xtl/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtl
-    REF 0.5.3
-    SHA512 340e10a113d88be81833e8c123835de0fd30bc9b80387cd260edbff5e54ff2d78a72f77ec8803e3031f54f32c7f189a7afc9e0c1b7446fc6340a4482f308ccbf
+    REF 0.5.4
+    SHA512 6181334dda9a2afce4ce2809572605c2f911770f7805a8328e14fa94d4572475c7725f2ead54daec00e62933df6a4c22616a247798c5b7f1f3bd4290945776c8
     HEAD_REF master
 )
 
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL
index 2fe693a12..85bee72f7 100644
--- a/ports/zeromq/CONTROL
+++ b/ports/zeromq/CONTROL
@@ -1,3 +1,3 @@
 Source: zeromq
-Version: 2019-01-09
+Version: 2019-01-30
 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products
diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake
index 929df2718..2ceba5e3a 100644
--- a/ports/zeromq/portfile.cmake
+++ b/ports/zeromq/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeromq/libzmq
-    REF 3154f3eab7fee360991e244c2d710f274e0ad4d9
-    SHA512 c964add0fb93965bc26f6e981908dd2c8c321ed9857621a4f8a35145a4cd0f087298db0eddf659f4e91e0c4c1641edbba00a3771e520771bfdcbe8fb925cfb05
+    REF 19b64709bbf9f119d66cdacb9c0e89e4becd9775
+    SHA512 7743097d6251764b911e586a9f857331b834b7223d6c3f2630fec71c310ba2927118410ab6c270c07d87329c15dd00fd89c843f20eb22d6c042d83b740c5e34e
     HEAD_REF master
 )
 
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 42eabd01b..07a9fcbaa 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -25,7 +25,7 @@ $withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash
 
 function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName)
 {
-    if ($object -eq $null)
+    if ($null -eq $object)
     {
         return $false
     }
@@ -36,12 +36,12 @@ function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Par
 function getProgramFiles32bit()
 {
     $out = ${env:PROGRAMFILES(X86)}
-    if ($out -eq $null)
+    if ($null -eq $out)
     {
         $out = ${env:PROGRAMFILES}
     }
 
-    if ($out -eq $null)
+    if ($null -eq $out)
     {
         throw "Could not find [Program Files 32-bit]"
     }
@@ -138,7 +138,7 @@ function getVisualStudioInstances()
 function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
 {
     $VisualStudioInstances = getVisualStudioInstances
-    if ($VisualStudioInstances -eq $null)
+    if ($null -eq $VisualStudioInstances)
     {
         throw "Could not find Visual Studio. VS2015 or VS2017 (with C++) needs to be installed."
     }
@@ -166,7 +166,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
             if (Test-Path $VCFolder)
             {
                 Write-Verbose "Picking: $instanceCandidate"
-                return "$path\MSBuild\Current\Bin\MSBuild.exe", "v141"
+                return "$path\MSBuild\Current\Bin\MSBuild.exe", "v142"
             }
         }
 
@@ -192,7 +192,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
         }
     }
 
-    throw "Could not find MSBuild version with C++ support. VS2015 or VS2017 (with C++) needs to be installed."
+    throw "Could not find MSBuild version with C++ support. VS2015, VS2017, or VS2019 (with C++) needs to be installed."
 }
 function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = $False,
                         [Parameter(Mandatory=$False)][switch]$DisableWin81SDK = $False,
@@ -210,7 +210,7 @@ function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK =
     # Windows 10 SDK
     function CheckWindows10SDK($path)
     {
-        if ($path -eq $null)
+        if ($null -eq $path)
         {
             return
         }
@@ -262,7 +262,7 @@ function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK =
     # Windows 8.1 SDK
     function CheckWindows81SDK($path)
     {
-        if ($path -eq $null)
+        if ($null -eq $path)
         {
             return
         }
@@ -396,7 +396,7 @@ if ($ec -ne 0)
 }
 Write-Host "`nBuilding vcpkg.exe... done.`n"
 
-Write-Verbose("Placing vcpkg.exe in the correct location")
+Write-Verbose "Placing vcpkg.exe in the correct location"
 
 Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
 Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe"
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 91c196fb9..4ffb123d4 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -50,7 +50,13 @@ else()
         elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
             set(_VCPKG_TARGET_TRIPLET_ARCH x64)
         else()
-            message(FATAL_ERROR "Unable to determine target architecture.")
+            if( _CMAKE_IN_TRY_COMPILE )
+                message(STATUS "Unable to determine target architecture, continuing without vcpkg.")
+            else()
+                message(WARNING "Unable to determine target architecture, continuing without vcpkg.")
+            endif()
+            set(VCPKG_TOOLCHAIN ON)
+            return()
         endif()
     endif()
 endif()
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index cf3fc7861..f7b81de93 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -77,9 +77,6 @@ function(vcpkg_configure_cmake)
     elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
         # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility
         set(NINJA_CAN_BE_USED OFF)
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-        # Arm64 usage should be allowed once github issue #2375 is resolved
-        set(NINJA_CAN_BE_USED OFF)
     endif()
 
     if(_csc_GENERATOR)
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 0c3a9bca2..1f856b69e 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -58,15 +58,12 @@ function(vcpkg_find_acquire_program VAR)
     set(HASH a6e685ea24376f50db5f06c5b46075f1d3be25168fa1f27fa9b02e2ac017826cee62a2b43562f9b6c989337a231ba914416c110075457764de2d11f99d5e0f26)
   elseif(VAR MATCHES "NASM")
     set(PROGNAME nasm)
-    set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.12.02)
+    set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.14)
     set(BREW_PACKAGE_NAME "nasm")
     set(APT_PACKAGE_NAME "nasm")
-    set(URL
-      "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip"
-      "http://mirrors.kodi.tv/build-deps/win32/nasm-2.12.02-win32.zip"
-    )
-    set(ARCHIVE "nasm-2.12.02-win32.zip")
-    set(HASH df7aaba094e17832688c88993997612a2e2c96cc3dc14ca3e8347b44c7762115f5a7fc6d7f20be402553aaa4c9e43ddfcf6228f581cfe89289bae550de151b36)
+    set(URL "http://www.nasm.us/pub/nasm/releasebuilds/2.14/win32/nasm-2.14-win32.zip")
+    set(ARCHIVE "nasm-2.14-win32.zip")
+    set(HASH 64481b0346b83de8c9568f04a54f68e0f4c71724afa0b414f12e4080951d8c49e489bfc32117f9a489e3e49477b1cadc583c672311316d27c543af304c4b7f2a)
   elseif(VAR MATCHES "YASM")
     set(PROGNAME yasm)
     set(SUBDIR 1.3.0.6)
@@ -155,7 +152,7 @@ function(vcpkg_find_acquire_program VAR)
       set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download")
       set(ARCHIVE "win_flex_bison-2.5.16.zip")
       set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123)
-      if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4" AND SUBDIR STREQUAL "win_flex-2.5.16")
+      if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4")
         file(REMOVE_RECURSE "${PATHS}")
       endif()
     else()
@@ -171,6 +168,9 @@ function(vcpkg_find_acquire_program VAR)
       set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download")
       set(ARCHIVE "win_flex_bison-2.5.16.zip")
       set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123)
+      if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4")
+        file(REMOVE_RECURSE "${PATHS}")
+      endif()
     else()
       set(PROGNAME bison)
       set(APT_PACKAGE_NAME bison)
diff --git a/scripts/cmake/vcpkg_test_cmake.cmake b/scripts/cmake/vcpkg_test_cmake.cmake
index 718b2f69c..29654346a 100644
--- a/scripts/cmake/vcpkg_test_cmake.cmake
+++ b/scripts/cmake/vcpkg_test_cmake.cmake
@@ -27,6 +27,11 @@ function(vcpkg_test_cmake)
       set(PACKAGE_TYPE CONFIG)
     endif()
 
+    if(VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
+      message(STATUS "Skipping CMake integration test due to v142 / CMake interaction issues")
+      return()
+    endif()
+
     message(STATUS "Performing CMake integration test")
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test)
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test)
diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake
index e44f53aa8..33f8a4853 100644
--- a/scripts/templates/portfile.in.cmake
+++ b/scripts/templates/portfile.in.cmake
@@ -11,13 +11,24 @@
 #
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/@ROOT_NAME@)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "@URL@"
     FILENAME "@FILENAME@"
     SHA512 @SHA512@
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE} 
+    # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag).
+    # REF 1.0.0
+    # (Optional) Read the docs for how to generate patches at: 
+    # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md
+    # PATCHES
+    #   001_port_fixes.patch
+    #   002_more_port_fixes.patch
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
diff --git a/toolsrc/include/vcpkg/install.h b/toolsrc/include/vcpkg/install.h
index b7acbf15f..2e92764dc 100644
--- a/toolsrc/include/vcpkg/install.h
+++ b/toolsrc/include/vcpkg/install.h
@@ -37,7 +37,6 @@ namespace vcpkg::Install
         std::string total_elapsed_time;
 
         void print() const;
-        static std::string xunit_result(const PackageSpec& spec, Chrono::ElapsedTime time, Build::BuildResult code);
         std::string xunit_results() const;
     };
 
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index fc7283599..97565bf41 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -102,7 +102,7 @@ static void inner(const VcpkgCmdArguments& args)
 
     Debug::println("Using vcpkg-root: %s", vcpkg_root_dir.u8string());
 
-    auto default_vs_path = System::get_environment_variable("VCPKG_DEFAULT_VS_PATH").value_or("");
+    auto default_vs_path = System::get_environment_variable("VCPKG_VISUAL_STUDIO_PATH").value_or("");
 
     const Expected<VcpkgPaths> expected_paths = VcpkgPaths::create(vcpkg_root_dir, default_vs_path);
     Checks::check_exit(VCPKG_LINE_INFO,
diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp
index 8aa1db53c..90b9c34b3 100644
--- a/toolsrc/src/vcpkg/base/system.cpp
+++ b/toolsrc/src/vcpkg/base/system.cpp
@@ -30,7 +30,7 @@ namespace vcpkg::System
         static constexpr const uint32_t buff_size = 1024 * 32;
         uint32_t size = buff_size;
         char buf[buff_size] = {};
-        bool result = _NSGetExecutablePath(buf, &size);
+        int result = _NSGetExecutablePath(buf, &size);
         Checks::check_exit(VCPKG_LINE_INFO, result != -1, "Could not determine current executable path.");
         std::unique_ptr<char> canonicalPath(realpath(buf, NULL));
         Checks::check_exit(VCPKG_LINE_INFO, result != -1, "Could not determine current executable path.");
@@ -74,6 +74,10 @@ namespace vcpkg::System
         return CPUArchitecture::X64;
 #elif defined(__x86__) || defined(_M_X86)
         return CPUArchitecture::X86;
+#elif defined(__arm__) || defined(_M_ARM)
+        return CPUArchitecture::ARM;
+#elif defined(__aarch64__) || defined(_M_ARM64)
+        return CPUArchitecture::ARM64;
 #else
 #error "Unknown host architecture"
 #endif
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index 67d9b63ed..c0afd7772 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -1,941 +1,1002 @@
-#include "pch.h"
-
-#include <vcpkg/base/checks.h>
-#include <vcpkg/base/chrono.h>
-#include <vcpkg/base/enums.h>
-#include <vcpkg/base/hash.h>
-#include <vcpkg/base/optional.h>
-#include <vcpkg/base/stringliteral.h>
-#include <vcpkg/base/system.h>
-
-#include <vcpkg/build.h>
-#include <vcpkg/commands.h>
-#include <vcpkg/dependencies.h>
-#include <vcpkg/globalstate.h>
-#include <vcpkg/help.h>
-#include <vcpkg/input.h>
-#include <vcpkg/metrics.h>
-#include <vcpkg/paragraphs.h>
-#include <vcpkg/postbuildlint.h>
-#include <vcpkg/statusparagraphs.h>
-#include <vcpkg/vcpkglib.h>
-
-using vcpkg::Build::BuildResult;
-using vcpkg::Parse::ParseControlErrorInfo;
-using vcpkg::Parse::ParseExpected;
-
-namespace vcpkg::Build::Command
-{
-    using Dependencies::InstallPlanAction;
-    using Dependencies::InstallPlanType;
-
-    static constexpr StringLiteral OPTION_CHECKS_ONLY = "--checks-only";
-
-    void perform_and_exit_ex(const FullPackageSpec& full_spec,
-                             const fs::path& port_dir,
-                             const ParsedArguments& options,
-                             const VcpkgPaths& paths)
-    {
-        const PackageSpec& spec = full_spec.package_spec;
-        if (Util::Sets::contains(options.switches, OPTION_CHECKS_ONLY))
-        {
-            const auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, spec.triplet());
-            const auto build_info = Build::read_build_info(paths.get_filesystem(), paths.build_info_file_path(spec));
-            const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info);
-            Checks::check_exit(VCPKG_LINE_INFO, error_count == 0);
-            Checks::exit_success(VCPKG_LINE_INFO);
-        }
-
-        const ParseExpected<SourceControlFile> source_control_file =
-            Paragraphs::try_load_port(paths.get_filesystem(), port_dir);
-
-        if (!source_control_file.has_value())
-        {
-            print_error_message(source_control_file.error());
-            Checks::exit_fail(VCPKG_LINE_INFO);
-        }
-
-        const auto& scf = source_control_file.value_or_exit(VCPKG_LINE_INFO);
-        Checks::check_exit(VCPKG_LINE_INFO,
-                           spec.name() == scf->core_paragraph->name,
-                           "The Source field inside the CONTROL file does not match the port directory: '%s' != '%s'",
-                           scf->core_paragraph->name,
-                           spec.name());
-
-        const StatusParagraphs status_db = database_load_check(paths);
-        const Build::BuildPackageOptions build_package_options{
-            Build::UseHeadVersion::NO,
-            Build::AllowDownloads::YES,
-            Build::CleanBuildtrees::NO,
-            Build::CleanPackages::NO,
-            Build::DownloadTool::BUILT_IN,
-            GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO,
-            Build::FailOnTombstone::NO,
-        };
-
-        std::set<std::string> features_as_set(full_spec.features.begin(), full_spec.features.end());
-        features_as_set.emplace("core");
-
-        const Build::BuildPackageConfig build_config{
-            *scf, spec.triplet(), fs::path{port_dir}, build_package_options, features_as_set};
-
-        const auto build_timer = Chrono::ElapsedTimer::create_started();
-        const auto result = Build::build_package(paths, build_config, status_db);
-        System::println("Elapsed time for package %s: %s", spec.to_string(), build_timer.to_string());
-
-        if (result.code == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES)
-        {
-            System::println(System::Color::error,
-                            "The build command requires all dependencies to be already installed.");
-            System::println("The following dependencies are missing:");
-            System::println();
-            for (const auto& p : result.unmet_dependencies)
-            {
-                System::println("    %s", p);
-            }
-            System::println();
-            Checks::exit_fail(VCPKG_LINE_INFO);
-        }
-
-        Checks::check_exit(VCPKG_LINE_INFO, result.code != BuildResult::EXCLUDED);
-
-        if (result.code != BuildResult::SUCCEEDED)
-        {
-            System::println(System::Color::error, Build::create_error_message(result.code, spec));
-            System::println(Build::create_user_troubleshooting_message(spec));
-            Checks::exit_fail(VCPKG_LINE_INFO);
-        }
-
-        Checks::exit_success(VCPKG_LINE_INFO);
-    }
-
-    static constexpr std::array<CommandSwitch, 1> BUILD_SWITCHES = {{
-        {OPTION_CHECKS_ONLY, "Only run checks, do not rebuild package"},
-    }};
-
-    const CommandStructure COMMAND_STRUCTURE = {
-        Help::create_example_string("build zlib:x64-windows"),
-        1,
-        1,
-        {BUILD_SWITCHES, {}},
-        nullptr,
-    };
-
-    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
-    {
-        // Build only takes a single package and all dependencies must already be installed
-        const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE);
-        const std::string command_argument = args.command_arguments.at(0);
-        const FullPackageSpec spec =
-            Input::check_and_get_full_package_spec(command_argument, default_triplet, COMMAND_STRUCTURE.example_text);
-        Input::check_triplet(spec.package_spec.triplet(), paths);
-        if (!spec.features.empty() && !GlobalState::feature_packages)
-        {
-            Checks::exit_with_message(
-                VCPKG_LINE_INFO, "Feature packages are experimentally available under the --featurepackages flag.");
-        }
-        perform_and_exit_ex(spec, paths.port_dir(spec.package_spec), options, paths);
-    }
-}
-
-namespace vcpkg::Build
-{
-    static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage";
-    static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs";
-    static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT";
-    static const std::string NAME_EMPTY_INCLUDE_FOLDER = "PolicyEmptyIncludeFolder";
-    static const std::string NAME_ALLOW_OBSOLETE_MSVCRT = "PolicyAllowObsoleteMsvcrt";
-
-    const std::string& to_string(BuildPolicy policy)
-    {
-        switch (policy)
-        {
-            case BuildPolicy::EMPTY_PACKAGE: return NAME_EMPTY_PACKAGE;
-            case BuildPolicy::DLLS_WITHOUT_LIBS: return NAME_DLLS_WITHOUT_LIBS;
-            case BuildPolicy::ONLY_RELEASE_CRT: return NAME_ONLY_RELEASE_CRT;
-            case BuildPolicy::EMPTY_INCLUDE_FOLDER: return NAME_EMPTY_INCLUDE_FOLDER;
-            case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return NAME_ALLOW_OBSOLETE_MSVCRT;
-            default: Checks::unreachable(VCPKG_LINE_INFO);
-        }
-    }
-
-    CStringView to_cmake_variable(BuildPolicy policy)
-    {
-        switch (policy)
-        {
-            case BuildPolicy::EMPTY_PACKAGE: return "VCPKG_POLICY_EMPTY_PACKAGE";
-            case BuildPolicy::DLLS_WITHOUT_LIBS: return "VCPKG_POLICY_DLLS_WITHOUT_LIBS";
-            case BuildPolicy::ONLY_RELEASE_CRT: return "VCPKG_POLICY_ONLY_RELEASE_CRT";
-            case BuildPolicy::EMPTY_INCLUDE_FOLDER: return "VCPKG_POLICY_EMPTY_INCLUDE_FOLDER";
-            case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return "VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT";
-            default: Checks::unreachable(VCPKG_LINE_INFO);
-        }
-    }
-
-    static const std::string NAME_BUILD_IN_DOWNLOAD = "BUILT_IN";
-    static const std::string NAME_ARIA2_DOWNLOAD = "ARIA2";
-
-    const std::string& to_string(DownloadTool tool)
-    {
-        switch (tool)
-        {
-            case DownloadTool::BUILT_IN: return NAME_BUILD_IN_DOWNLOAD;
-            case DownloadTool::ARIA2: return NAME_ARIA2_DOWNLOAD;
-            default: Checks::unreachable(VCPKG_LINE_INFO);
-        }
-    }
-
-    Optional<LinkageType> to_linkage_type(const std::string& str)
-    {
-        if (str == "dynamic") return LinkageType::DYNAMIC;
-        if (str == "static") return LinkageType::STATIC;
-        return nullopt;
-    }
-
-    namespace BuildInfoRequiredField
-    {
-        static const std::string CRT_LINKAGE = "CRTLinkage";
-        static const std::string LIBRARY_LINKAGE = "LibraryLinkage";
-    }
-
-    CStringView to_vcvarsall_target(const std::string& cmake_system_name)
-    {
-        if (cmake_system_name.empty()) return "";
-        if (cmake_system_name == "Windows") return "";
-        if (cmake_system_name == "WindowsStore") return "store";
-
-        Checks::exit_with_message(VCPKG_LINE_INFO, "Unsupported vcvarsall target %s", cmake_system_name);
-    }
-
-    CStringView to_vcvarsall_toolchain(const std::string& target_architecture, const Toolset& toolset)
-    {
-        auto maybe_target_arch = System::to_cpu_architecture(target_architecture);
-        Checks::check_exit(
-            VCPKG_LINE_INFO, maybe_target_arch.has_value(), "Invalid architecture string: %s", target_architecture);
-        auto target_arch = maybe_target_arch.value_or_exit(VCPKG_LINE_INFO);
-        auto host_architectures = System::get_supported_host_architectures();
-
-        for (auto&& host : host_architectures)
-        {
-            const auto it = Util::find_if(toolset.supported_architectures, [&](const ToolsetArchOption& opt) {
-                return host == opt.host_arch && target_arch == opt.target_arch;
-            });
-            if (it != toolset.supported_architectures.end()) return it->name;
-        }
-
-        Checks::exit_with_message(VCPKG_LINE_INFO,
-                                  "Unsupported toolchain combination. Target was: %s but supported ones were:\n%s",
-                                  target_architecture,
-                                  Strings::join(",", toolset.supported_architectures, [](const ToolsetArchOption& t) {
-                                      return t.name.c_str();
-                                  }));
-    }
-
-    std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset)
-    {
-        if (pre_build_info.external_toolchain_file.has_value()) return "";
-        if (!pre_build_info.cmake_system_name.empty() && pre_build_info.cmake_system_name != "WindowsStore") return "";
-
-        const char* tonull = " >nul";
-        if (GlobalState::debugging)
-        {
-            tonull = "";
-        }
-
-        const auto arch = to_vcvarsall_toolchain(pre_build_info.target_architecture, toolset);
-        const auto target = to_vcvarsall_target(pre_build_info.cmake_system_name);
-
-        return Strings::format(R"("%s" %s %s %s %s 2>&1 <NUL)",
-                               toolset.vcvarsall.u8string(),
-                               Strings::join(" ", toolset.vcvarsall_options),
-                               arch,
-                               target,
-                               tonull);
-    }
-
-    static BinaryParagraph create_binary_feature_control_file(const SourceParagraph& source_paragraph,
-                                                              const FeatureParagraph& feature_paragraph,
-                                                              const Triplet& triplet)
-    {
-        return BinaryParagraph(source_paragraph, feature_paragraph, triplet);
-    }
-
-    static std::unique_ptr<BinaryControlFile> create_binary_control_file(const SourceParagraph& source_paragraph,
-                                                                         const Triplet& triplet,
-                                                                         const BuildInfo& build_info,
-                                                                         const std::string& abi_tag)
-    {
-        auto bcf = std::make_unique<BinaryControlFile>();
-        BinaryParagraph bpgh(source_paragraph, triplet, abi_tag);
-        if (const auto p_ver = build_info.version.get())
-        {
-            bpgh.version = *p_ver;
-        }
-        bcf->core_paragraph = std::move(bpgh);
-        return bcf;
-    }
-
-    static void write_binary_control_file(const VcpkgPaths& paths, BinaryControlFile bcf)
-    {
-        std::string start = Strings::serialize(bcf.core_paragraph);
-        for (auto&& feature : bcf.features)
-        {
-            start += "\n" + Strings::serialize(feature);
-        }
-        const fs::path binary_control_file = paths.packages / bcf.core_paragraph.dir() / "CONTROL";
-        paths.get_filesystem().write_contents(binary_control_file, start);
-    }
-
-    static std::vector<FeatureSpec> compute_required_feature_specs(const BuildPackageConfig& config,
-                                                                   const StatusParagraphs& status_db)
-    {
-        const Triplet& triplet = config.triplet;
-
-        const std::vector<std::string> dep_strings =
-            Util::fmap_flatten(config.feature_list, [&](std::string const& feature) -> std::vector<std::string> {
-                if (feature == "core")
-                {
-                    return filter_dependencies(config.scf.core_paragraph->depends, triplet);
-                }
-
-                auto maybe_feature = config.scf.find_feature(feature);
-                Checks::check_exit(VCPKG_LINE_INFO, maybe_feature.has_value());
-
-                return filter_dependencies(maybe_feature.get()->depends, triplet);
-            });
-
-        auto dep_fspecs = FeatureSpec::from_strings_and_triplet(dep_strings, triplet);
-        Util::sort_unique_erase(dep_fspecs);
-
-        // expand defaults
-        std::vector<FeatureSpec> ret;
-        for (auto&& fspec : dep_fspecs)
-        {
-            if (fspec.feature().empty())
-            {
-                // reference to default features
-                const auto it = status_db.find_installed(fspec.spec());
-                if (it == status_db.end())
-                {
-                    // not currently installed, so just leave the default reference so it will fail later
-                    ret.push_back(fspec);
-                }
-                else
-                {
-                    ret.emplace_back(fspec.spec(), "core");
-                    for (auto&& default_feature : it->get()->package.default_features)
-                        ret.emplace_back(fspec.spec(), default_feature);
-                }
-            }
-            else
-            {
-                ret.push_back(fspec);
-            }
-        }
-        Util::sort_unique_erase(ret);
-
-        return ret;
-    }
-
-    static ExtendedBuildResult do_build_package(const VcpkgPaths& paths,
-                                                const PreBuildInfo& pre_build_info,
-                                                const PackageSpec& spec,
-                                                const std::string& abi_tag,
-                                                const BuildPackageConfig& config)
-    {
-        auto& fs = paths.get_filesystem();
-        const Triplet& triplet = spec.triplet();
-
-#if !defined(_WIN32)
-        // TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107.
-        // bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted.
-        vcpkg::Util::unused(paths.get_tool_exe(Tools::NINJA));
-#endif
-
-        const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE);
-        const fs::path& git_exe_path = paths.get_tool_exe(Tools::GIT);
-
-        std::string all_features;
-        for (auto& feature : config.scf.feature_paragraphs)
-        {
-            all_features.append(feature->name + ";");
-        }
-
-        const Toolset& toolset = paths.get_toolset(pre_build_info);
-        const std::string cmd_launch_cmake = System::make_cmake_cmd(
-            cmake_exe_path,
-            paths.ports_cmake,
-            {
-                {"CMD", "BUILD"},
-                {"PORT", config.scf.core_paragraph->name},
-                {"CURRENT_PORT_DIR", config.port_dir},
-                {"TARGET_TRIPLET", spec.triplet().canonical_name()},
-                {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},
-                {"VCPKG_USE_HEAD_VERSION",
-                Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},
-                {"DOWNLOADS", paths.downloads},
-                {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"},
-                {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)},
-                {"GIT", git_exe_path},
-                {"FEATURES", Strings::join(";", config.feature_list)},
-                {"ALL_FEATURES", all_features},
-            });
-
-        auto command = make_build_env_cmd(pre_build_info, toolset);
-        if (!command.empty())
-        {
-#ifdef _WIN32
-            command.append(" & ");
-#else
-            command.append(" && ");
-#endif
-        }
-        command.append(cmd_launch_cmake);
-        const auto timer = Chrono::ElapsedTimer::create_started();
-
-        const int return_code = System::cmd_execute_clean(command);
-        const auto buildtimeus = timer.microseconds();
-        const auto spec_string = spec.to_string();
-
-        {
-            auto locked_metrics = Metrics::g_metrics.lock();
-            locked_metrics->track_buildtime(spec.to_string() + ":[" + Strings::join(",", config.feature_list) + "]",
-                                            buildtimeus);
-            if (return_code != 0)
-            {
-                locked_metrics->track_property("error", "build failed");
-                locked_metrics->track_property("build_error", spec_string);
-                return BuildResult::BUILD_FAILED;
-            }
-        }
-
-        const BuildInfo build_info = read_build_info(fs, paths.build_info_file_path(spec));
-        const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info);
-
-        auto bcf = create_binary_control_file(*config.scf.core_paragraph, triplet, build_info, abi_tag);
-
-        if (error_count != 0)
-        {
-            return BuildResult::POST_BUILD_CHECKS_FAILED;
-        }
-        for (auto&& feature : config.feature_list)
-        {
-            for (auto&& f_pgh : config.scf.feature_paragraphs)
-            {
-                if (f_pgh->name == feature)
-                    bcf->features.push_back(
-                        create_binary_feature_control_file(*config.scf.core_paragraph, *f_pgh, triplet));
-            }
-        }
-
-        write_binary_control_file(paths, *bcf);
-        return {BuildResult::SUCCEEDED, std::move(bcf)};
-    }
-
-    static ExtendedBuildResult do_build_package_and_clean_buildtrees(const VcpkgPaths& paths,
-                                                                     const PreBuildInfo& pre_build_info,
-                                                                     const PackageSpec& spec,
-                                                                     const std::string& abi_tag,
-                                                                     const BuildPackageConfig& config)
-    {
-        auto result = do_build_package(paths, pre_build_info, spec, abi_tag, config);
-
-        if (config.build_package_options.clean_buildtrees == CleanBuildtrees::YES)
-        {
-            auto& fs = paths.get_filesystem();
-            const fs::path buildtrees_dir = paths.buildtrees / config.scf.core_paragraph->name;
-            auto buildtree_files = fs.get_files_non_recursive(buildtrees_dir);
-            for (auto&& file : buildtree_files)
-            {
-                if (fs.is_directory(file)) // Will only keep the logs
-                {
-                    std::error_code ec;
-                    fs.remove_all(file, ec);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    Optional<AbiTagAndFile> compute_abi_tag(const VcpkgPaths& paths,
-                                            const BuildPackageConfig& config,
-                                            const PreBuildInfo& pre_build_info,
-                                            Span<const AbiEntry> dependency_abis)
-    {
-        if (config.build_package_options.binary_caching == BinaryCaching::NO) return nullopt;
-
-        auto& fs = paths.get_filesystem();
-        const Triplet& triplet = config.triplet;
-        const std::string& name = config.scf.core_paragraph->name;
-
-        std::vector<AbiEntry> abi_tag_entries(dependency_abis.begin(), dependency_abis.end());
-
-        abi_tag_entries.emplace_back(AbiEntry{"cmake", paths.get_tool_version(Tools::CMAKE)});
-
-        abi_tag_entries.emplace_back(
-            AbiEntry{"portfile", vcpkg::Hash::get_file_hash(fs, config.port_dir / "portfile.cmake", "SHA1")});
-        abi_tag_entries.emplace_back(
-            AbiEntry{"control", vcpkg::Hash::get_file_hash(fs, config.port_dir / "CONTROL", "SHA1")});
-
-        abi_tag_entries.emplace_back(AbiEntry{"vcpkg_fixup_cmake_targets", "1"});
-
-        abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag});
-
-        const std::string features = Strings::join(";", config.feature_list);
-        abi_tag_entries.emplace_back(AbiEntry{"features", features});
-
-        if (config.build_package_options.use_head_version == UseHeadVersion::YES)
-            abi_tag_entries.emplace_back(AbiEntry{"head", ""});
-
-        Util::sort(abi_tag_entries);
-
-        const std::string full_abi_info =
-            Strings::join("", abi_tag_entries, [](const AbiEntry& p) { return p.key + " " + p.value + "\n"; });
-
-        if (GlobalState::debugging)
-        {
-            System::println("[DEBUG] <abientries>");
-            for (auto&& entry : abi_tag_entries)
-            {
-                System::println("[DEBUG] %s|%s", entry.key, entry.value);
-            }
-            System::println("[DEBUG] </abientries>");
-        }
-
-        auto abi_tag_entries_missing = abi_tag_entries;
-        Util::erase_remove_if(abi_tag_entries_missing, [](const AbiEntry& p) { return !p.value.empty(); });
-
-        if (abi_tag_entries_missing.empty())
-        {
-            std::error_code ec;
-            fs.create_directories(paths.buildtrees / name, ec);
-            const auto abi_file_path = paths.buildtrees / name / (triplet.canonical_name() + ".vcpkg_abi_info.txt");
-            fs.write_contents(abi_file_path, full_abi_info);
-
-            return AbiTagAndFile{Hash::get_file_hash(fs, abi_file_path, "SHA1"), abi_file_path};
-        }
-
-        System::println(
-            "Warning: binary caching disabled because abi keys are missing values:\n%s",
-            Strings::join("", abi_tag_entries_missing, [](const AbiEntry& e) { return "    " + e.key + "\n"; }));
-
-        return nullopt;
-    }
-
-    static void decompress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& archive_path)
-    {
-        auto& fs = paths.get_filesystem();
-
-        auto pkg_path = paths.package_dir(spec);
-        std::error_code ec;
-        fs.remove_all(pkg_path, ec);
-        fs.create_directories(pkg_path, ec);
-        auto files = fs.get_files_non_recursive(pkg_path);
-        Checks::check_exit(VCPKG_LINE_INFO, files.empty(), "unable to clear path: %s", pkg_path.u8string());
-
-#if defined(_WIN32)
-        auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP);
-
-        System::cmd_execute_clean(Strings::format(
-            R"("%s" x "%s" -o"%s" -y >nul)", seven_zip_exe.u8string(), archive_path.u8string(), pkg_path.u8string()));
-#else
-        System::cmd_execute_clean(
-            Strings::format(R"(unzip -qq "%s" "-d%s")", archive_path.u8string(), pkg_path.u8string()));
-#endif
-    }
-
-    static void compress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& tmp_archive_path)
-    {
-        auto& fs = paths.get_filesystem();
-
-        std::error_code ec;
-
-        fs.remove(tmp_archive_path, ec);
-        Checks::check_exit(
-            VCPKG_LINE_INFO, !fs.exists(tmp_archive_path), "Could not remove file: %s", tmp_archive_path.u8string());
-#if defined(_WIN32)
-        auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP);
-
-        System::cmd_execute_clean(Strings::format(R"("%s" a "%s" "%s\*" >nul)",
-                                                  seven_zip_exe.u8string(),
-                                                  tmp_archive_path.u8string(),
-                                                  paths.package_dir(spec).u8string()));
-#else
-        System::cmd_execute_clean(Strings::format(
-            R"(cd '%s' && zip --quiet -r '%s' *)", paths.package_dir(spec).u8string(), tmp_archive_path.u8string()));
-#endif
-    }
-
-    ExtendedBuildResult build_package(const VcpkgPaths& paths,
-                                      const BuildPackageConfig& config,
-                                      const StatusParagraphs& status_db)
-    {
-        auto& fs = paths.get_filesystem();
-        const Triplet& triplet = config.triplet;
-        const std::string& name = config.scf.core_paragraph->name;
-
-        std::vector<FeatureSpec> required_fspecs = compute_required_feature_specs(config, status_db);
-
-        // extract out the actual package ids
-        auto dep_pspecs = Util::fmap(required_fspecs, [](FeatureSpec const& fspec) { return fspec.spec(); });
-        Util::sort_unique_erase(dep_pspecs);
-
-        // Find all features that aren't installed. This mutates required_fspecs.
-        Util::erase_remove_if(required_fspecs, [&](FeatureSpec const& fspec) {
-            return status_db.is_installed(fspec) || fspec.name() == name;
-        });
-
-        if (!required_fspecs.empty())
-        {
-            return {BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES, std::move(required_fspecs)};
-        }
-
-        const PackageSpec spec =
-            PackageSpec::from_name_and_triplet(config.scf.core_paragraph->name, triplet).value_or_exit(VCPKG_LINE_INFO);
-
-        std::vector<AbiEntry> dependency_abis;
-
-        // dep_pspecs was not destroyed
-        for (auto&& pspec : dep_pspecs)
-        {
-            if (pspec == spec) continue;
-            const auto status_it = status_db.find_installed(pspec);
-            Checks::check_exit(VCPKG_LINE_INFO, status_it != status_db.end());
-            dependency_abis.emplace_back(
-                AbiEntry{status_it->get()->package.spec.name(), status_it->get()->package.abi});
-        }
-
-        const auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet);
-
-        auto maybe_abi_tag_and_file = compute_abi_tag(paths, config, pre_build_info, dependency_abis);
-
-        const auto abi_tag_and_file = maybe_abi_tag_and_file.get();
-
-        if (config.build_package_options.binary_caching == BinaryCaching::YES && abi_tag_and_file)
-        {
-            const fs::path archives_root_dir = paths.root / "archives";
-            const std::string archive_name = abi_tag_and_file->tag + ".zip";
-            const fs::path archive_subpath = fs::u8path(abi_tag_and_file->tag.substr(0, 2)) / archive_name;
-            const fs::path archive_path = archives_root_dir / archive_subpath;
-            const fs::path archive_tombstone_path = archives_root_dir / "fail" / archive_subpath;
-
-            if (fs.exists(archive_path))
-            {
-                System::println("Using cached binary package: %s", archive_path.u8string());
-
-                decompress_archive(paths, spec, archive_path);
-
-                auto maybe_bcf = Paragraphs::try_load_cached_package(paths, spec);
-                std::unique_ptr<BinaryControlFile> bcf =
-                    std::make_unique<BinaryControlFile>(std::move(maybe_bcf).value_or_exit(VCPKG_LINE_INFO));
-                return {BuildResult::SUCCEEDED, std::move(bcf)};
-            }
-
-            if (fs.exists(archive_tombstone_path))
-            {
-                if (config.build_package_options.fail_on_tombstone == FailOnTombstone::YES)
-                {
-                    System::println("Found failure tombstone: %s", archive_tombstone_path.u8string());
-                    return BuildResult::BUILD_FAILED;
-                }
-                else
-                {
-                    System::println(
-                        System::Color::warning, "Found failure tombstone: %s", archive_tombstone_path.u8string());
-                }
-            }
-
-            System::println("Could not locate cached archive: %s", archive_path.u8string());
-
-            ExtendedBuildResult result = do_build_package_and_clean_buildtrees(
-                paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config);
-
-            std::error_code ec;
-            fs.create_directories(paths.package_dir(spec) / "share" / spec.name(), ec);
-            auto abi_file_in_package = paths.package_dir(spec) / "share" / spec.name() / "vcpkg_abi_info.txt";
-            fs.copy_file(abi_tag_and_file->tag_file, abi_file_in_package, fs::stdfs::copy_options::none, ec);
-            Checks::check_exit(VCPKG_LINE_INFO, !ec, "Could not copy into file: %s", abi_file_in_package.u8string());
-
-            if (result.code == BuildResult::SUCCEEDED)
-            {
-                const auto tmp_archive_path = paths.buildtrees / spec.name() / (spec.triplet().to_string() + ".zip");
-
-                compress_archive(paths, spec, tmp_archive_path);
-
-                fs.create_directories(archive_path.parent_path(), ec);
-                fs.rename_or_copy(tmp_archive_path, archive_path, ".tmp", ec);
-                if (ec)
-                {
-                    System::println(System::Color::warning,
-                                    "Failed to store binary cache %s: %s",
-                                    archive_path.u8string(),
-                                    ec.message());
-                }
-                else
-                    System::println("Stored binary cache: %s", archive_path.u8string());
-            }
-            else if (result.code == BuildResult::BUILD_FAILED || result.code == BuildResult::POST_BUILD_CHECKS_FAILED)
-            {
-                // Build failed, so store tombstone archive
-                fs.create_directories(archive_tombstone_path.parent_path(), ec);
-                fs.write_contents(archive_tombstone_path, "", ec);
-            }
-
-            return result;
-        }
-
-        return do_build_package_and_clean_buildtrees(
-            paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config);
-    }
-
-    const std::string& to_string(const BuildResult build_result)
-    {
-        static const std::string NULLVALUE_STRING = Enums::nullvalue_to_string("vcpkg::Commands::Build::BuildResult");
-        static const std::string SUCCEEDED_STRING = "SUCCEEDED";
-        static const std::string BUILD_FAILED_STRING = "BUILD_FAILED";
-        static const std::string FILE_CONFLICTS_STRING = "FILE_CONFLICTS";
-        static const std::string POST_BUILD_CHECKS_FAILED_STRING = "POST_BUILD_CHECKS_FAILED";
-        static const std::string CASCADED_DUE_TO_MISSING_DEPENDENCIES_STRING = "CASCADED_DUE_TO_MISSING_DEPENDENCIES";
-        static const std::string EXCLUDED_STRING = "EXCLUDED";
-
-        switch (build_result)
-        {
-            case BuildResult::NULLVALUE: return NULLVALUE_STRING;
-            case BuildResult::SUCCEEDED: return SUCCEEDED_STRING;
-            case BuildResult::BUILD_FAILED: return BUILD_FAILED_STRING;
-            case BuildResult::POST_BUILD_CHECKS_FAILED: return POST_BUILD_CHECKS_FAILED_STRING;
-            case BuildResult::FILE_CONFLICTS: return FILE_CONFLICTS_STRING;
-            case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: return CASCADED_DUE_TO_MISSING_DEPENDENCIES_STRING;
-            case BuildResult::EXCLUDED: return EXCLUDED_STRING;
-            default: Checks::unreachable(VCPKG_LINE_INFO);
-        }
-    }
-
-    std::string create_error_message(const BuildResult build_result, const PackageSpec& spec)
-    {
-        return Strings::format("Error: Building package %s failed with: %s", spec, Build::to_string(build_result));
-    }
-
-    std::string create_user_troubleshooting_message(const PackageSpec& spec)
-    {
-        return Strings::format("Please ensure you're using the latest portfiles with `.\\vcpkg update`, then\n"
-                               "submit an issue at https://github.com/Microsoft/vcpkg/issues including:\n"
-                               "  Package: %s\n"
-                               "  Vcpkg version: %s\n"
-                               "\n"
-                               "Additionally, attach any relevant sections from the log files above.",
-                               spec,
-                               Commands::Version::version());
-    }
-
-    static BuildInfo inner_create_buildinfo(std::unordered_map<std::string, std::string> pgh)
-    {
-        Parse::ParagraphParser parser(std::move(pgh));
-
-        BuildInfo build_info;
-
-        {
-            std::string crt_linkage_as_string;
-            parser.required_field(BuildInfoRequiredField::CRT_LINKAGE, crt_linkage_as_string);
-
-            auto crtlinkage = to_linkage_type(crt_linkage_as_string);
-            if (const auto p = crtlinkage.get())
-                build_info.crt_linkage = *p;
-            else
-                Checks::exit_with_message(VCPKG_LINE_INFO, "Invalid crt linkage type: [%s]", crt_linkage_as_string);
-        }
-
-        {
-            std::string library_linkage_as_string;
-            parser.required_field(BuildInfoRequiredField::LIBRARY_LINKAGE, library_linkage_as_string);
-            auto liblinkage = to_linkage_type(library_linkage_as_string);
-            if (const auto p = liblinkage.get())
-                build_info.library_linkage = *p;
-            else
-                Checks::exit_with_message(
-                    VCPKG_LINE_INFO, "Invalid library linkage type: [%s]", library_linkage_as_string);
-        }
-        std::string version = parser.optional_field("Version");
-        if (!version.empty()) build_info.version = std::move(version);
-
-        std::map<BuildPolicy, bool> policies;
-        for (auto policy : G_ALL_POLICIES)
-        {
-            const auto setting = parser.optional_field(to_string(policy));
-            if (setting.empty()) continue;
-            if (setting == "enabled")
-                policies.emplace(policy, true);
-            else if (setting == "disabled")
-                policies.emplace(policy, false);
-            else
-                Checks::exit_with_message(
-                    VCPKG_LINE_INFO, "Unknown setting for policy '%s': %s", to_string(policy), setting);
-        }
-
-        if (const auto err = parser.error_info("PostBuildInformation"))
-        {
-            print_error_message(err);
-            Checks::exit_fail(VCPKG_LINE_INFO);
-        }
-
-        build_info.policies = BuildPolicies(std::move(policies));
-
-        return build_info;
-    }
-
-    BuildInfo read_build_info(const Files::Filesystem& fs, const fs::path& filepath)
-    {
-        const Expected<std::unordered_map<std::string, std::string>> pghs =
-            Paragraphs::get_single_paragraph(fs, filepath);
-        Checks::check_exit(VCPKG_LINE_INFO, pghs.get() != nullptr, "Invalid BUILD_INFO file for package");
-        return inner_create_buildinfo(*pghs.get());
-    }
-
-    PreBuildInfo PreBuildInfo::from_triplet_file(const VcpkgPaths& paths, const Triplet& triplet)
-    {
-        static constexpr CStringView FLAG_GUID = "c35112b6-d1ba-415b-aa5d-81de856ef8eb";
-
-        const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE);
-        const fs::path ports_cmake_script_path = paths.scripts / "get_triplet_environment.cmake";
-        const fs::path triplet_file_path = paths.triplets / (triplet.canonical_name() + ".cmake");
-
-        const auto cmd_launch_cmake = System::make_cmake_cmd(cmake_exe_path,
-                                                             ports_cmake_script_path,
-                                                             {
-                                                                 {"CMAKE_TRIPLET_FILE", triplet_file_path},
-                                                             });
-        const auto ec_data = System::cmd_execute_and_capture_output(cmd_launch_cmake);
-        Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, ec_data.output);
-
-        const std::vector<std::string> lines = Strings::split(ec_data.output, "\n");
-
-        PreBuildInfo pre_build_info;
-
-        const auto e = lines.cend();
-        auto cur = std::find(lines.cbegin(), e, FLAG_GUID);
-        if (cur != e) ++cur;
-
-        for (; cur != e; ++cur)
-        {
-            auto&& line = *cur;
-
-            const std::vector<std::string> s = Strings::split(line, "=");
-            Checks::check_exit(VCPKG_LINE_INFO,
-                               s.size() == 1 || s.size() == 2,
-                               "Expected format is [VARIABLE_NAME=VARIABLE_VALUE], but was [%s]",
-                               line);
-
-            const bool variable_with_no_value = s.size() == 1;
-            const std::string variable_name = s.at(0);
-            const std::string variable_value = variable_with_no_value ? "" : s.at(1);
-
-            if (variable_name == "VCPKG_TARGET_ARCHITECTURE")
-            {
-                pre_build_info.target_architecture = variable_value;
-                continue;
-            }
-
-            if (variable_name == "VCPKG_CMAKE_SYSTEM_NAME")
-            {
-                pre_build_info.cmake_system_name = variable_value;
-                continue;
-            }
-
-            if (variable_name == "VCPKG_CMAKE_SYSTEM_VERSION")
-            {
-                pre_build_info.cmake_system_version = variable_value;
-                continue;
-            }
-
-            if (variable_name == "VCPKG_PLATFORM_TOOLSET")
-            {
-                pre_build_info.platform_toolset =
-                    variable_value.empty() ? nullopt : Optional<std::string>{variable_value};
-                continue;
-            }
-
-            if (variable_name == "VCPKG_VISUAL_STUDIO_PATH")
-            {
-                pre_build_info.visual_studio_path =
-                    variable_value.empty() ? nullopt : Optional<fs::path>{variable_value};
-                continue;
-            }
-
-            if (variable_name == "VCPKG_CHAINLOAD_TOOLCHAIN_FILE")
-            {
-                pre_build_info.external_toolchain_file =
-                    variable_value.empty() ? nullopt : Optional<std::string>{variable_value};
-                continue;
-            }
-
-            if (variable_name == "VCPKG_BUILD_TYPE")
-            {
-                if (variable_value.empty())
-                    pre_build_info.build_type = nullopt;
-                else if (Strings::case_insensitive_ascii_equals(variable_value, "debug"))
-                    pre_build_info.build_type = ConfigurationType::DEBUG;
-                else if (Strings::case_insensitive_ascii_equals(variable_value, "release"))
-                    pre_build_info.build_type = ConfigurationType::RELEASE;
-                else
-                    Checks::exit_with_message(
-                        VCPKG_LINE_INFO, "Unknown setting for VCPKG_BUILD_TYPE: %s", variable_value);
-                continue;
-            }
-
-            Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown variable name %s", line);
-        }
-
-        pre_build_info.triplet_abi_tag = [&]() {
-            const auto& fs = paths.get_filesystem();
-            static std::map<fs::path, std::string> s_hash_cache;
-
-            auto it_hash = s_hash_cache.find(triplet_file_path);
-            if (it_hash != s_hash_cache.end())
-            {
-                return it_hash->second;
-            }
-            auto hash = Hash::get_file_hash(fs, triplet_file_path, "SHA1");
-
-            if (auto p = pre_build_info.external_toolchain_file.get())
-            {
-                hash += "-";
-                hash += Hash::get_file_hash(fs, *p, "SHA1");
-            }
-            else if (pre_build_info.cmake_system_name == "Linux")
-            {
-                hash += "-";
-                hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "linux.cmake", "SHA1");
-            }
-            else if (pre_build_info.cmake_system_name == "Darwin")
-            {
-                hash += "-";
-                hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "osx.cmake", "SHA1");
-            }
-            else if (pre_build_info.cmake_system_name == "FreeBSD")
-            {
-                hash += "-";
-                hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "freebsd.cmake", "SHA1");
-            }
-            else if (pre_build_info.cmake_system_name == "Android")
-            {
-                hash += "-";
-                hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "android.cmake", "SHA1");
-            }
-
-            s_hash_cache.emplace(triplet_file_path, hash);
-            return hash;
-        }();
-
-        return pre_build_info;
-    }
-    ExtendedBuildResult::ExtendedBuildResult(BuildResult code) : code(code) {}
-    ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::unique_ptr<BinaryControlFile>&& bcf)
-        : code(code), binary_control_file(std::move(bcf))
-    {
-    }
-    ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::vector<FeatureSpec>&& unmet_deps)
-        : code(code), unmet_dependencies(std::move(unmet_deps))
-    {
-    }
-}
+#include "pch.h"
+
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/chrono.h>
+#include <vcpkg/base/enums.h>
+#include <vcpkg/base/hash.h>
+#include <vcpkg/base/optional.h>
+#include <vcpkg/base/stringliteral.h>
+#include <vcpkg/base/system.h>
+
+#include <vcpkg/build.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/dependencies.h>
+#include <vcpkg/globalstate.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
+#include <vcpkg/metrics.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/postbuildlint.h>
+#include <vcpkg/statusparagraphs.h>
+#include <vcpkg/vcpkglib.h>
+
+using vcpkg::Build::BuildResult;
+using vcpkg::Parse::ParseControlErrorInfo;
+using vcpkg::Parse::ParseExpected;
+
+namespace vcpkg::Build::Command
+{
+    using Dependencies::InstallPlanAction;
+    using Dependencies::InstallPlanType;
+
+    static constexpr StringLiteral OPTION_CHECKS_ONLY = "--checks-only";
+
+    void perform_and_exit_ex(const FullPackageSpec& full_spec,
+                             const fs::path& port_dir,
+                             const ParsedArguments& options,
+                             const VcpkgPaths& paths)
+    {
+        const PackageSpec& spec = full_spec.package_spec;
+        if (Util::Sets::contains(options.switches, OPTION_CHECKS_ONLY))
+        {
+            const auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, spec.triplet());
+            const auto build_info = Build::read_build_info(paths.get_filesystem(), paths.build_info_file_path(spec));
+            const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info);
+            Checks::check_exit(VCPKG_LINE_INFO, error_count == 0);
+            Checks::exit_success(VCPKG_LINE_INFO);
+        }
+
+        const ParseExpected<SourceControlFile> source_control_file =
+            Paragraphs::try_load_port(paths.get_filesystem(), port_dir);
+
+        if (!source_control_file.has_value())
+        {
+            print_error_message(source_control_file.error());
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+
+        const auto& scf = source_control_file.value_or_exit(VCPKG_LINE_INFO);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           spec.name() == scf->core_paragraph->name,
+                           "The Source field inside the CONTROL file does not match the port directory: '%s' != '%s'",
+                           scf->core_paragraph->name,
+                           spec.name());
+
+        const StatusParagraphs status_db = database_load_check(paths);
+        const Build::BuildPackageOptions build_package_options{
+            Build::UseHeadVersion::NO,
+            Build::AllowDownloads::YES,
+            Build::CleanBuildtrees::NO,
+            Build::CleanPackages::NO,
+            Build::DownloadTool::BUILT_IN,
+            GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO,
+            Build::FailOnTombstone::NO,
+        };
+
+        std::set<std::string> features_as_set(full_spec.features.begin(), full_spec.features.end());
+        features_as_set.emplace("core");
+
+        const Build::BuildPackageConfig build_config{
+            *scf, spec.triplet(), fs::path{port_dir}, build_package_options, features_as_set};
+
+        const auto build_timer = Chrono::ElapsedTimer::create_started();
+        const auto result = Build::build_package(paths, build_config, status_db);
+        System::println("Elapsed time for package %s: %s", spec.to_string(), build_timer.to_string());
+
+        if (result.code == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES)
+        {
+            System::println(System::Color::error,
+                            "The build command requires all dependencies to be already installed.");
+            System::println("The following dependencies are missing:");
+            System::println();
+            for (const auto& p : result.unmet_dependencies)
+            {
+                System::println("    %s", p);
+            }
+            System::println();
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+
+        Checks::check_exit(VCPKG_LINE_INFO, result.code != BuildResult::EXCLUDED);
+
+        if (result.code != BuildResult::SUCCEEDED)
+        {
+            System::println(System::Color::error, Build::create_error_message(result.code, spec));
+            System::println(Build::create_user_troubleshooting_message(spec));
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+
+        Checks::exit_success(VCPKG_LINE_INFO);
+    }
+
+    static constexpr std::array<CommandSwitch, 1> BUILD_SWITCHES = {{
+        {OPTION_CHECKS_ONLY, "Only run checks, do not rebuild package"},
+    }};
+
+    const CommandStructure COMMAND_STRUCTURE = {
+        Help::create_example_string("build zlib:x64-windows"),
+        1,
+        1,
+        {BUILD_SWITCHES, {}},
+        nullptr,
+    };
+
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
+    {
+        // Build only takes a single package and all dependencies must already be installed
+        const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE);
+        const std::string command_argument = args.command_arguments.at(0);
+        const FullPackageSpec spec =
+            Input::check_and_get_full_package_spec(command_argument, default_triplet, COMMAND_STRUCTURE.example_text);
+        Input::check_triplet(spec.package_spec.triplet(), paths);
+        if (!spec.features.empty() && !GlobalState::feature_packages)
+        {
+            Checks::exit_with_message(
+                VCPKG_LINE_INFO, "Feature packages are experimentally available under the --featurepackages flag.");
+        }
+        perform_and_exit_ex(spec, paths.port_dir(spec.package_spec), options, paths);
+    }
+}
+
+namespace vcpkg::Build
+{
+    static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage";
+    static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs";
+    static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT";
+    static const std::string NAME_EMPTY_INCLUDE_FOLDER = "PolicyEmptyIncludeFolder";
+    static const std::string NAME_ALLOW_OBSOLETE_MSVCRT = "PolicyAllowObsoleteMsvcrt";
+
+    const std::string& to_string(BuildPolicy policy)
+    {
+        switch (policy)
+        {
+            case BuildPolicy::EMPTY_PACKAGE: return NAME_EMPTY_PACKAGE;
+            case BuildPolicy::DLLS_WITHOUT_LIBS: return NAME_DLLS_WITHOUT_LIBS;
+            case BuildPolicy::ONLY_RELEASE_CRT: return NAME_ONLY_RELEASE_CRT;
+            case BuildPolicy::EMPTY_INCLUDE_FOLDER: return NAME_EMPTY_INCLUDE_FOLDER;
+            case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return NAME_ALLOW_OBSOLETE_MSVCRT;
+            default: Checks::unreachable(VCPKG_LINE_INFO);
+        }
+    }
+
+    CStringView to_cmake_variable(BuildPolicy policy)
+    {
+        switch (policy)
+        {
+            case BuildPolicy::EMPTY_PACKAGE: return "VCPKG_POLICY_EMPTY_PACKAGE";
+            case BuildPolicy::DLLS_WITHOUT_LIBS: return "VCPKG_POLICY_DLLS_WITHOUT_LIBS";
+            case BuildPolicy::ONLY_RELEASE_CRT: return "VCPKG_POLICY_ONLY_RELEASE_CRT";
+            case BuildPolicy::EMPTY_INCLUDE_FOLDER: return "VCPKG_POLICY_EMPTY_INCLUDE_FOLDER";
+            case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return "VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT";
+            default: Checks::unreachable(VCPKG_LINE_INFO);
+        }
+    }
+
+    static const std::string NAME_BUILD_IN_DOWNLOAD = "BUILT_IN";
+    static const std::string NAME_ARIA2_DOWNLOAD = "ARIA2";
+
+    const std::string& to_string(DownloadTool tool)
+    {
+        switch (tool)
+        {
+            case DownloadTool::BUILT_IN: return NAME_BUILD_IN_DOWNLOAD;
+            case DownloadTool::ARIA2: return NAME_ARIA2_DOWNLOAD;
+            default: Checks::unreachable(VCPKG_LINE_INFO);
+        }
+    }
+
+    Optional<LinkageType> to_linkage_type(const std::string& str)
+    {
+        if (str == "dynamic") return LinkageType::DYNAMIC;
+        if (str == "static") return LinkageType::STATIC;
+        return nullopt;
+    }
+
+    namespace BuildInfoRequiredField
+    {
+        static const std::string CRT_LINKAGE = "CRTLinkage";
+        static const std::string LIBRARY_LINKAGE = "LibraryLinkage";
+    }
+
+    CStringView to_vcvarsall_target(const std::string& cmake_system_name)
+    {
+        if (cmake_system_name.empty()) return "";
+        if (cmake_system_name == "Windows") return "";
+        if (cmake_system_name == "WindowsStore") return "store";
+
+        Checks::exit_with_message(VCPKG_LINE_INFO, "Unsupported vcvarsall target %s", cmake_system_name);
+    }
+
+    CStringView to_vcvarsall_toolchain(const std::string& target_architecture, const Toolset& toolset)
+    {
+        auto maybe_target_arch = System::to_cpu_architecture(target_architecture);
+        Checks::check_exit(
+            VCPKG_LINE_INFO, maybe_target_arch.has_value(), "Invalid architecture string: %s", target_architecture);
+        auto target_arch = maybe_target_arch.value_or_exit(VCPKG_LINE_INFO);
+        auto host_architectures = System::get_supported_host_architectures();
+
+        for (auto&& host : host_architectures)
+        {
+            const auto it = Util::find_if(toolset.supported_architectures, [&](const ToolsetArchOption& opt) {
+                return host == opt.host_arch && target_arch == opt.target_arch;
+            });
+            if (it != toolset.supported_architectures.end()) return it->name;
+        }
+
+        Checks::exit_with_message(VCPKG_LINE_INFO,
+                                  "Unsupported toolchain combination. Target was: %s but supported ones were:\n%s",
+                                  target_architecture,
+                                  Strings::join(",", toolset.supported_architectures, [](const ToolsetArchOption& t) {
+                                      return t.name.c_str();
+                                  }));
+    }
+
+    std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset)
+    {
+        if (pre_build_info.external_toolchain_file.has_value()) return "";
+        if (!pre_build_info.cmake_system_name.empty() && pre_build_info.cmake_system_name != "WindowsStore") return "";
+
+        const char* tonull = " >nul";
+        if (GlobalState::debugging)
+        {
+            tonull = "";
+        }
+
+        const auto arch = to_vcvarsall_toolchain(pre_build_info.target_architecture, toolset);
+        const auto target = to_vcvarsall_target(pre_build_info.cmake_system_name);
+
+        return Strings::format(R"("%s" %s %s %s %s 2>&1 <NUL)",
+                               toolset.vcvarsall.u8string(),
+                               Strings::join(" ", toolset.vcvarsall_options),
+                               arch,
+                               target,
+                               tonull);
+    }
+
+    static BinaryParagraph create_binary_feature_control_file(const SourceParagraph& source_paragraph,
+                                                              const FeatureParagraph& feature_paragraph,
+                                                              const Triplet& triplet)
+    {
+        return BinaryParagraph(source_paragraph, feature_paragraph, triplet);
+    }
+
+    static std::unique_ptr<BinaryControlFile> create_binary_control_file(const SourceParagraph& source_paragraph,
+                                                                         const Triplet& triplet,
+                                                                         const BuildInfo& build_info,
+                                                                         const std::string& abi_tag)
+    {
+        auto bcf = std::make_unique<BinaryControlFile>();
+        BinaryParagraph bpgh(source_paragraph, triplet, abi_tag);
+        if (const auto p_ver = build_info.version.get())
+        {
+            bpgh.version = *p_ver;
+        }
+        bcf->core_paragraph = std::move(bpgh);
+        return bcf;
+    }
+
+    static void write_binary_control_file(const VcpkgPaths& paths, BinaryControlFile bcf)
+    {
+        std::string start = Strings::serialize(bcf.core_paragraph);
+        for (auto&& feature : bcf.features)
+        {
+            start += "\n" + Strings::serialize(feature);
+        }
+        const fs::path binary_control_file = paths.packages / bcf.core_paragraph.dir() / "CONTROL";
+        paths.get_filesystem().write_contents(binary_control_file, start);
+    }
+
+    static std::vector<FeatureSpec> compute_required_feature_specs(const BuildPackageConfig& config,
+                                                                   const StatusParagraphs& status_db)
+    {
+        const Triplet& triplet = config.triplet;
+
+        const std::vector<std::string> dep_strings =
+            Util::fmap_flatten(config.feature_list, [&](std::string const& feature) -> std::vector<std::string> {
+                if (feature == "core")
+                {
+                    return filter_dependencies(config.scf.core_paragraph->depends, triplet);
+                }
+
+                auto maybe_feature = config.scf.find_feature(feature);
+                Checks::check_exit(VCPKG_LINE_INFO, maybe_feature.has_value());
+
+                return filter_dependencies(maybe_feature.get()->depends, triplet);
+            });
+
+        auto dep_fspecs = FeatureSpec::from_strings_and_triplet(dep_strings, triplet);
+        Util::sort_unique_erase(dep_fspecs);
+
+        // expand defaults
+        std::vector<FeatureSpec> ret;
+        for (auto&& fspec : dep_fspecs)
+        {
+            if (fspec.feature().empty())
+            {
+                // reference to default features
+                const auto it = status_db.find_installed(fspec.spec());
+                if (it == status_db.end())
+                {
+                    // not currently installed, so just leave the default reference so it will fail later
+                    ret.push_back(fspec);
+                }
+                else
+                {
+                    ret.emplace_back(fspec.spec(), "core");
+                    for (auto&& default_feature : it->get()->package.default_features)
+                        ret.emplace_back(fspec.spec(), default_feature);
+                }
+            }
+            else
+            {
+                ret.push_back(fspec);
+            }
+        }
+        Util::sort_unique_erase(ret);
+
+        return ret;
+    }
+
+    static ExtendedBuildResult do_build_package(const VcpkgPaths& paths,
+                                                const PreBuildInfo& pre_build_info,
+                                                const PackageSpec& spec,
+                                                const std::string& abi_tag,
+                                                const BuildPackageConfig& config)
+    {
+        auto& fs = paths.get_filesystem();
+        const Triplet& triplet = spec.triplet();
+
+#if !defined(_WIN32)
+        // TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107.
+        // bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted.
+        vcpkg::Util::unused(paths.get_tool_exe(Tools::NINJA));
+#endif
+
+        const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE);
+        const fs::path& git_exe_path = paths.get_tool_exe(Tools::GIT);
+
+        std::string all_features;
+        for (auto& feature : config.scf.feature_paragraphs)
+        {
+            all_features.append(feature->name + ";");
+        }
+
+        const Toolset& toolset = paths.get_toolset(pre_build_info);
+        const std::string cmd_launch_cmake = System::make_cmake_cmd(
+            cmake_exe_path,
+            paths.ports_cmake,
+            {
+                {"CMD", "BUILD"},
+                {"PORT", config.scf.core_paragraph->name},
+                {"CURRENT_PORT_DIR", config.port_dir},
+                {"TARGET_TRIPLET", spec.triplet().canonical_name()},
+                {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},
+                {"VCPKG_USE_HEAD_VERSION",
+                Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},
+                {"DOWNLOADS", paths.downloads},
+                {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"},
+                {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)},
+                {"GIT", git_exe_path},
+                {"FEATURES", Strings::join(";", config.feature_list)},
+                {"ALL_FEATURES", all_features},
+            });
+
+        auto command = make_build_env_cmd(pre_build_info, toolset);
+        if (!command.empty())
+        {
+#ifdef _WIN32
+            command.append(" & ");
+#else
+            command.append(" && ");
+#endif
+        }
+        command.append(cmd_launch_cmake);
+        const auto timer = Chrono::ElapsedTimer::create_started();
+
+        const int return_code = System::cmd_execute_clean(command);
+        const auto buildtimeus = timer.microseconds();
+        const auto spec_string = spec.to_string();
+
+        {
+            auto locked_metrics = Metrics::g_metrics.lock();
+            locked_metrics->track_buildtime(spec.to_string() + ":[" + Strings::join(",", config.feature_list) + "]",
+                                            buildtimeus);
+            if (return_code != 0)
+            {
+                locked_metrics->track_property("error", "build failed");
+                locked_metrics->track_property("build_error", spec_string);
+                return BuildResult::BUILD_FAILED;
+            }
+        }
+
+        const BuildInfo build_info = read_build_info(fs, paths.build_info_file_path(spec));
+        const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info);
+
+        auto bcf = create_binary_control_file(*config.scf.core_paragraph, triplet, build_info, abi_tag);
+
+        if (error_count != 0)
+        {
+            return BuildResult::POST_BUILD_CHECKS_FAILED;
+        }
+        for (auto&& feature : config.feature_list)
+        {
+            for (auto&& f_pgh : config.scf.feature_paragraphs)
+            {
+                if (f_pgh->name == feature)
+                    bcf->features.push_back(
+                        create_binary_feature_control_file(*config.scf.core_paragraph, *f_pgh, triplet));
+            }
+        }
+
+        write_binary_control_file(paths, *bcf);
+        return {BuildResult::SUCCEEDED, std::move(bcf)};
+    }
+
+    static ExtendedBuildResult do_build_package_and_clean_buildtrees(const VcpkgPaths& paths,
+                                                                     const PreBuildInfo& pre_build_info,
+                                                                     const PackageSpec& spec,
+                                                                     const std::string& abi_tag,
+                                                                     const BuildPackageConfig& config)
+    {
+        auto result = do_build_package(paths, pre_build_info, spec, abi_tag, config);
+
+        if (config.build_package_options.clean_buildtrees == CleanBuildtrees::YES)
+        {
+            auto& fs = paths.get_filesystem();
+            const fs::path buildtrees_dir = paths.buildtrees / config.scf.core_paragraph->name;
+            auto buildtree_files = fs.get_files_non_recursive(buildtrees_dir);
+            for (auto&& file : buildtree_files)
+            {
+                if (fs.is_directory(file)) // Will only keep the logs
+                {
+                    std::error_code ec;
+                    fs.remove_all(file, ec);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    Optional<AbiTagAndFile> compute_abi_tag(const VcpkgPaths& paths,
+                                            const BuildPackageConfig& config,
+                                            const PreBuildInfo& pre_build_info,
+                                            Span<const AbiEntry> dependency_abis)
+    {
+        if (config.build_package_options.binary_caching == BinaryCaching::NO) return nullopt;
+
+        auto& fs = paths.get_filesystem();
+        const Triplet& triplet = config.triplet;
+        const std::string& name = config.scf.core_paragraph->name;
+
+        std::vector<AbiEntry> abi_tag_entries(dependency_abis.begin(), dependency_abis.end());
+
+        abi_tag_entries.emplace_back(AbiEntry{"cmake", paths.get_tool_version(Tools::CMAKE)});
+
+        // If there is an unusually large number of files in the port then
+        // something suspicious is going on.  Rather than hash all of them
+        // just mark the port as no-hash
+        const int max_port_file_count = 100;
+
+        // the order of recursive_directory_iterator is undefined so save the names to sort
+        std::vector<fs::path> port_files;
+        for (auto &port_file : fs::stdfs::recursive_directory_iterator(config.port_dir))
+        {
+            if (fs::is_regular_file(status(port_file)))
+            {
+                port_files.push_back(port_file);
+                if (port_files.size() > max_port_file_count)
+                {
+                    abi_tag_entries.emplace_back(AbiEntry{ "no_hash_max_portfile", "" });
+                    break;
+                }
+            }
+        }
+
+        if (port_files.size() <= max_port_file_count)
+        {
+            std::sort(port_files.begin(), port_files.end());
+
+            int counter = 0;
+            for (auto & port_file : port_files)
+            {
+                // When vcpkg takes a dependency on C++17 it can use fs::relative,
+                // which will give a stable ordering and better names in the key entry.
+                // this is not available in the filesystem TS so instead number the files for the key.
+                std::string key = Strings::format("file_%03d", counter++);
+                if (GlobalState::debugging)
+                {
+                    System::println("[DEBUG] mapping %s from %s", key, port_file.string());
+                }
+                abi_tag_entries.emplace_back(AbiEntry{ key, vcpkg::Hash::get_file_hash(fs, port_file, "SHA1") });
+            }
+        }
+
+        abi_tag_entries.emplace_back(AbiEntry{"vcpkg_fixup_cmake_targets", "1"});
+
+        abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag});
+
+        const std::string features = Strings::join(";", config.feature_list);
+        abi_tag_entries.emplace_back(AbiEntry{"features", features});
+
+        if (config.build_package_options.use_head_version == UseHeadVersion::YES)
+            abi_tag_entries.emplace_back(AbiEntry{"head", ""});
+
+        Util::sort(abi_tag_entries);
+
+        const std::string full_abi_info =
+            Strings::join("", abi_tag_entries, [](const AbiEntry& p) { return p.key + " " + p.value + "\n"; });
+
+        if (GlobalState::debugging)
+        {
+            System::println("[DEBUG] <abientries>");
+            for (auto&& entry : abi_tag_entries)
+            {
+                System::println("[DEBUG] %s|%s", entry.key, entry.value);
+            }
+            System::println("[DEBUG] </abientries>");
+        }
+
+        auto abi_tag_entries_missing = abi_tag_entries;
+        Util::erase_remove_if(abi_tag_entries_missing, [](const AbiEntry& p) { return !p.value.empty(); });
+
+        if (abi_tag_entries_missing.empty())
+        {
+            std::error_code ec;
+            fs.create_directories(paths.buildtrees / name, ec);
+            const auto abi_file_path = paths.buildtrees / name / (triplet.canonical_name() + ".vcpkg_abi_info.txt");
+            fs.write_contents(abi_file_path, full_abi_info);
+
+            return AbiTagAndFile{Hash::get_file_hash(fs, abi_file_path, "SHA1"), abi_file_path};
+        }
+
+        System::println(
+            "Warning: binary caching disabled because abi keys are missing values:\n%s",
+            Strings::join("", abi_tag_entries_missing, [](const AbiEntry& e) { return "    " + e.key + "\n"; }));
+
+        return nullopt;
+    }
+
+    static void decompress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& archive_path)
+    {
+        auto& fs = paths.get_filesystem();
+
+        auto pkg_path = paths.package_dir(spec);
+        std::error_code ec;
+        fs.remove_all(pkg_path, ec);
+        fs.create_directories(pkg_path, ec);
+        auto files = fs.get_files_non_recursive(pkg_path);
+        Checks::check_exit(VCPKG_LINE_INFO, files.empty(), "unable to clear path: %s", pkg_path.u8string());
+
+#if defined(_WIN32)
+        auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP);
+
+        System::cmd_execute_clean(Strings::format(
+            R"("%s" x "%s" -o"%s" -y >nul)", seven_zip_exe.u8string(), archive_path.u8string(), pkg_path.u8string()));
+#else
+        System::cmd_execute_clean(
+            Strings::format(R"(unzip -qq "%s" "-d%s")", archive_path.u8string(), pkg_path.u8string()));
+#endif
+    }
+
+    // Compress the source directory into the destination file.
+    static void compress_directory(const VcpkgPaths& paths, const fs::path& source, const fs::path& destination)
+    {
+        auto& fs = paths.get_filesystem();
+
+        std::error_code ec;
+
+        fs.remove(destination, ec);
+        Checks::check_exit(
+            VCPKG_LINE_INFO, !fs.exists(destination), "Could not remove file: %s", destination.u8string());
+#if defined(_WIN32)
+        auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP);
+
+        System::cmd_execute_clean(Strings::format(R"("%s" a "%s" "%s\*" >nul)",
+                                                  seven_zip_exe.u8string(),
+                                                  destination.u8string(),
+                                                  source.u8string()));
+#else
+        System::cmd_execute_clean(Strings::format(
+            R"(cd '%s' && zip --quiet -r '%s' *)", source.u8string(), destination.u8string()));
+#endif
+    }
+
+    static void compress_archive(const VcpkgPaths& paths, const PackageSpec& spec, const fs::path& destination)
+    {
+        compress_directory(paths, paths.package_dir(spec), destination);
+    }
+
+    ExtendedBuildResult build_package(const VcpkgPaths& paths,
+                                      const BuildPackageConfig& config,
+                                      const StatusParagraphs& status_db)
+    {
+        auto& fs = paths.get_filesystem();
+        const Triplet& triplet = config.triplet;
+        const std::string& name = config.scf.core_paragraph->name;
+
+        std::vector<FeatureSpec> required_fspecs = compute_required_feature_specs(config, status_db);
+
+        // extract out the actual package ids
+        auto dep_pspecs = Util::fmap(required_fspecs, [](FeatureSpec const& fspec) { return fspec.spec(); });
+        Util::sort_unique_erase(dep_pspecs);
+
+        // Find all features that aren't installed. This mutates required_fspecs.
+        Util::erase_remove_if(required_fspecs, [&](FeatureSpec const& fspec) {
+            return status_db.is_installed(fspec) || fspec.name() == name;
+        });
+
+        if (!required_fspecs.empty())
+        {
+            return {BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES, std::move(required_fspecs)};
+        }
+
+        const PackageSpec spec =
+            PackageSpec::from_name_and_triplet(config.scf.core_paragraph->name, triplet).value_or_exit(VCPKG_LINE_INFO);
+
+        std::vector<AbiEntry> dependency_abis;
+
+        // dep_pspecs was not destroyed
+        for (auto&& pspec : dep_pspecs)
+        {
+            if (pspec == spec) continue;
+            const auto status_it = status_db.find_installed(pspec);
+            Checks::check_exit(VCPKG_LINE_INFO, status_it != status_db.end());
+            dependency_abis.emplace_back(
+                AbiEntry{status_it->get()->package.spec.name(), status_it->get()->package.abi});
+        }
+
+        const auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet);
+
+        auto maybe_abi_tag_and_file = compute_abi_tag(paths, config, pre_build_info, dependency_abis);
+
+        const auto abi_tag_and_file = maybe_abi_tag_and_file.get();
+
+        if (config.build_package_options.binary_caching == BinaryCaching::YES && abi_tag_and_file)
+        {
+            const fs::path archives_root_dir = paths.root / "archives";
+            const std::string archive_name = abi_tag_and_file->tag + ".zip";
+            const fs::path archive_subpath = fs::u8path(abi_tag_and_file->tag.substr(0, 2)) / archive_name;
+            const fs::path archive_path = archives_root_dir / archive_subpath;
+            const fs::path archive_tombstone_path = archives_root_dir / "fail" / archive_subpath;
+
+            if (fs.exists(archive_path))
+            {
+                System::println("Using cached binary package: %s", archive_path.u8string());
+
+                decompress_archive(paths, spec, archive_path);
+
+                auto maybe_bcf = Paragraphs::try_load_cached_package(paths, spec);
+                std::unique_ptr<BinaryControlFile> bcf =
+                    std::make_unique<BinaryControlFile>(std::move(maybe_bcf).value_or_exit(VCPKG_LINE_INFO));
+                return {BuildResult::SUCCEEDED, std::move(bcf)};
+            }
+
+            if (fs.exists(archive_tombstone_path))
+            {
+                if (config.build_package_options.fail_on_tombstone == FailOnTombstone::YES)
+                {
+                    System::println("Found failure tombstone: %s", archive_tombstone_path.u8string());
+                    return BuildResult::BUILD_FAILED;
+                }
+                else
+                {
+                    System::println(
+                        System::Color::warning, "Found failure tombstone: %s", archive_tombstone_path.u8string());
+                }
+            }
+
+            System::println("Could not locate cached archive: %s", archive_path.u8string());
+
+            ExtendedBuildResult result = do_build_package_and_clean_buildtrees(
+                paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config);
+
+            std::error_code ec;
+            fs.create_directories(paths.package_dir(spec) / "share" / spec.name(), ec);
+            auto abi_file_in_package = paths.package_dir(spec) / "share" / spec.name() / "vcpkg_abi_info.txt";
+            fs.copy_file(abi_tag_and_file->tag_file, abi_file_in_package, fs::stdfs::copy_options::none, ec);
+            Checks::check_exit(VCPKG_LINE_INFO, !ec, "Could not copy into file: %s", abi_file_in_package.u8string());
+
+            if (result.code == BuildResult::SUCCEEDED)
+            {
+                const auto tmp_archive_path = paths.buildtrees / spec.name() / (spec.triplet().to_string() + ".zip");
+
+                compress_archive(paths, spec, tmp_archive_path);
+
+                fs.create_directories(archive_path.parent_path(), ec);
+                fs.rename_or_copy(tmp_archive_path, archive_path, ".tmp", ec);
+                if (ec)
+                {
+                    System::println(System::Color::warning,
+                                    "Failed to store binary cache %s: %s",
+                                    archive_path.u8string(),
+                                    ec.message());
+                }
+                else
+                    System::println("Stored binary cache: %s", archive_path.u8string());
+            }
+            else if (result.code == BuildResult::BUILD_FAILED || result.code == BuildResult::POST_BUILD_CHECKS_FAILED)
+            {
+                if (!fs.exists(archive_tombstone_path))
+                {
+                    // Build failed, store all failure logs in the tombstone.
+                    const auto tmp_log_path = paths.buildtrees / spec.name() / "tmp_failure_logs";
+                    const auto tmp_log_path_destination = tmp_log_path / spec.name();
+                    const auto tmp_failure_zip = paths.buildtrees / spec.name() / "failure_logs.zip";
+                    fs.create_directories(tmp_log_path_destination, ec);
+
+                    for (auto &log_file : fs::stdfs::directory_iterator(paths.buildtrees / spec.name()))
+                    {
+                        if (log_file.path().extension() == ".log")
+                        {
+                            fs.copy_file(log_file.path(), tmp_log_path_destination / log_file.path().filename(), fs::stdfs::copy_options::none, ec);
+                        }
+                    }
+
+                    compress_directory(paths, tmp_log_path, paths.buildtrees / spec.name() / "failure_logs.zip");
+
+                    fs.create_directories(archive_tombstone_path.parent_path(), ec);
+                    fs.rename_or_copy(tmp_failure_zip, archive_tombstone_path, ".tmp", ec);
+
+                    // clean up temporary directory
+                    fs.remove_all(tmp_log_path, ec);
+                }
+            }
+
+            return result;
+        }
+
+        return do_build_package_and_clean_buildtrees(
+            paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config);
+    }
+
+    const std::string& to_string(const BuildResult build_result)
+    {
+        static const std::string NULLVALUE_STRING = Enums::nullvalue_to_string("vcpkg::Commands::Build::BuildResult");
+        static const std::string SUCCEEDED_STRING = "SUCCEEDED";
+        static const std::string BUILD_FAILED_STRING = "BUILD_FAILED";
+        static const std::string FILE_CONFLICTS_STRING = "FILE_CONFLICTS";
+        static const std::string POST_BUILD_CHECKS_FAILED_STRING = "POST_BUILD_CHECKS_FAILED";
+        static const std::string CASCADED_DUE_TO_MISSING_DEPENDENCIES_STRING = "CASCADED_DUE_TO_MISSING_DEPENDENCIES";
+        static const std::string EXCLUDED_STRING = "EXCLUDED";
+
+        switch (build_result)
+        {
+            case BuildResult::NULLVALUE: return NULLVALUE_STRING;
+            case BuildResult::SUCCEEDED: return SUCCEEDED_STRING;
+            case BuildResult::BUILD_FAILED: return BUILD_FAILED_STRING;
+            case BuildResult::POST_BUILD_CHECKS_FAILED: return POST_BUILD_CHECKS_FAILED_STRING;
+            case BuildResult::FILE_CONFLICTS: return FILE_CONFLICTS_STRING;
+            case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: return CASCADED_DUE_TO_MISSING_DEPENDENCIES_STRING;
+            case BuildResult::EXCLUDED: return EXCLUDED_STRING;
+            default: Checks::unreachable(VCPKG_LINE_INFO);
+        }
+    }
+
+    std::string create_error_message(const BuildResult build_result, const PackageSpec& spec)
+    {
+        return Strings::format("Error: Building package %s failed with: %s", spec, Build::to_string(build_result));
+    }
+
+    std::string create_user_troubleshooting_message(const PackageSpec& spec)
+    {
+        return Strings::format("Please ensure you're using the latest portfiles with `.\\vcpkg update`, then\n"
+                               "submit an issue at https://github.com/Microsoft/vcpkg/issues including:\n"
+                               "  Package: %s\n"
+                               "  Vcpkg version: %s\n"
+                               "\n"
+                               "Additionally, attach any relevant sections from the log files above.",
+                               spec,
+                               Commands::Version::version());
+    }
+
+    static BuildInfo inner_create_buildinfo(std::unordered_map<std::string, std::string> pgh)
+    {
+        Parse::ParagraphParser parser(std::move(pgh));
+
+        BuildInfo build_info;
+
+        {
+            std::string crt_linkage_as_string;
+            parser.required_field(BuildInfoRequiredField::CRT_LINKAGE, crt_linkage_as_string);
+
+            auto crtlinkage = to_linkage_type(crt_linkage_as_string);
+            if (const auto p = crtlinkage.get())
+                build_info.crt_linkage = *p;
+            else
+                Checks::exit_with_message(VCPKG_LINE_INFO, "Invalid crt linkage type: [%s]", crt_linkage_as_string);
+        }
+
+        {
+            std::string library_linkage_as_string;
+            parser.required_field(BuildInfoRequiredField::LIBRARY_LINKAGE, library_linkage_as_string);
+            auto liblinkage = to_linkage_type(library_linkage_as_string);
+            if (const auto p = liblinkage.get())
+                build_info.library_linkage = *p;
+            else
+                Checks::exit_with_message(
+                    VCPKG_LINE_INFO, "Invalid library linkage type: [%s]", library_linkage_as_string);
+        }
+        std::string version = parser.optional_field("Version");
+        if (!version.empty()) build_info.version = std::move(version);
+
+        std::map<BuildPolicy, bool> policies;
+        for (auto policy : G_ALL_POLICIES)
+        {
+            const auto setting = parser.optional_field(to_string(policy));
+            if (setting.empty()) continue;
+            if (setting == "enabled")
+                policies.emplace(policy, true);
+            else if (setting == "disabled")
+                policies.emplace(policy, false);
+            else
+                Checks::exit_with_message(
+                    VCPKG_LINE_INFO, "Unknown setting for policy '%s': %s", to_string(policy), setting);
+        }
+
+        if (const auto err = parser.error_info("PostBuildInformation"))
+        {
+            print_error_message(err);
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+
+        build_info.policies = BuildPolicies(std::move(policies));
+
+        return build_info;
+    }
+
+    BuildInfo read_build_info(const Files::Filesystem& fs, const fs::path& filepath)
+    {
+        const Expected<std::unordered_map<std::string, std::string>> pghs =
+            Paragraphs::get_single_paragraph(fs, filepath);
+        Checks::check_exit(VCPKG_LINE_INFO, pghs.get() != nullptr, "Invalid BUILD_INFO file for package");
+        return inner_create_buildinfo(*pghs.get());
+    }
+
+    PreBuildInfo PreBuildInfo::from_triplet_file(const VcpkgPaths& paths, const Triplet& triplet)
+    {
+        static constexpr CStringView FLAG_GUID = "c35112b6-d1ba-415b-aa5d-81de856ef8eb";
+
+        const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE);
+        const fs::path ports_cmake_script_path = paths.scripts / "get_triplet_environment.cmake";
+        const fs::path triplet_file_path = paths.triplets / (triplet.canonical_name() + ".cmake");
+
+        const auto cmd_launch_cmake = System::make_cmake_cmd(cmake_exe_path,
+                                                             ports_cmake_script_path,
+                                                             {
+                                                                 {"CMAKE_TRIPLET_FILE", triplet_file_path},
+                                                             });
+        const auto ec_data = System::cmd_execute_and_capture_output(cmd_launch_cmake);
+        Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, ec_data.output);
+
+        const std::vector<std::string> lines = Strings::split(ec_data.output, "\n");
+
+        PreBuildInfo pre_build_info;
+
+        const auto e = lines.cend();
+        auto cur = std::find(lines.cbegin(), e, FLAG_GUID);
+        if (cur != e) ++cur;
+
+        for (; cur != e; ++cur)
+        {
+            auto&& line = *cur;
+
+            const std::vector<std::string> s = Strings::split(line, "=");
+            Checks::check_exit(VCPKG_LINE_INFO,
+                               s.size() == 1 || s.size() == 2,
+                               "Expected format is [VARIABLE_NAME=VARIABLE_VALUE], but was [%s]",
+                               line);
+
+            const bool variable_with_no_value = s.size() == 1;
+            const std::string variable_name = s.at(0);
+            const std::string variable_value = variable_with_no_value ? "" : s.at(1);
+
+            if (variable_name == "VCPKG_TARGET_ARCHITECTURE")
+            {
+                pre_build_info.target_architecture = variable_value;
+                continue;
+            }
+
+            if (variable_name == "VCPKG_CMAKE_SYSTEM_NAME")
+            {
+                pre_build_info.cmake_system_name = variable_value;
+                continue;
+            }
+
+            if (variable_name == "VCPKG_CMAKE_SYSTEM_VERSION")
+            {
+                pre_build_info.cmake_system_version = variable_value;
+                continue;
+            }
+
+            if (variable_name == "VCPKG_PLATFORM_TOOLSET")
+            {
+                pre_build_info.platform_toolset =
+                    variable_value.empty() ? nullopt : Optional<std::string>{variable_value};
+                continue;
+            }
+
+            if (variable_name == "VCPKG_VISUAL_STUDIO_PATH")
+            {
+                pre_build_info.visual_studio_path =
+                    variable_value.empty() ? nullopt : Optional<fs::path>{variable_value};
+                continue;
+            }
+
+            if (variable_name == "VCPKG_CHAINLOAD_TOOLCHAIN_FILE")
+            {
+                pre_build_info.external_toolchain_file =
+                    variable_value.empty() ? nullopt : Optional<std::string>{variable_value};
+                continue;
+            }
+
+            if (variable_name == "VCPKG_BUILD_TYPE")
+            {
+                if (variable_value.empty())
+                    pre_build_info.build_type = nullopt;
+                else if (Strings::case_insensitive_ascii_equals(variable_value, "debug"))
+                    pre_build_info.build_type = ConfigurationType::DEBUG;
+                else if (Strings::case_insensitive_ascii_equals(variable_value, "release"))
+                    pre_build_info.build_type = ConfigurationType::RELEASE;
+                else
+                    Checks::exit_with_message(
+                        VCPKG_LINE_INFO, "Unknown setting for VCPKG_BUILD_TYPE: %s", variable_value);
+                continue;
+            }
+
+            Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown variable name %s", line);
+        }
+
+        pre_build_info.triplet_abi_tag = [&]() {
+            const auto& fs = paths.get_filesystem();
+            static std::map<fs::path, std::string> s_hash_cache;
+
+            auto it_hash = s_hash_cache.find(triplet_file_path);
+            if (it_hash != s_hash_cache.end())
+            {
+                return it_hash->second;
+            }
+            auto hash = Hash::get_file_hash(fs, triplet_file_path, "SHA1");
+
+            if (auto p = pre_build_info.external_toolchain_file.get())
+            {
+                hash += "-";
+                hash += Hash::get_file_hash(fs, *p, "SHA1");
+            }
+            else if (pre_build_info.cmake_system_name == "Linux")
+            {
+                hash += "-";
+                hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "linux.cmake", "SHA1");
+            }
+            else if (pre_build_info.cmake_system_name == "Darwin")
+            {
+                hash += "-";
+                hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "osx.cmake", "SHA1");
+            }
+            else if (pre_build_info.cmake_system_name == "FreeBSD")
+            {
+                hash += "-";
+                hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "freebsd.cmake", "SHA1");
+            }
+            else if (pre_build_info.cmake_system_name == "Android")
+            {
+                hash += "-";
+                hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "android.cmake", "SHA1");
+            }
+
+            s_hash_cache.emplace(triplet_file_path, hash);
+            return hash;
+        }();
+
+        return pre_build_info;
+    }
+    ExtendedBuildResult::ExtendedBuildResult(BuildResult code) : code(code) {}
+    ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::unique_ptr<BinaryControlFile>&& bcf)
+        : code(code), binary_control_file(std::move(bcf))
+    {
+    }
+    ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::vector<FeatureSpec>&& unmet_deps)
+        : code(code), unmet_dependencies(std::move(unmet_deps))
+    {
+    }
+}
diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp
index 5ca962744..4ff503e1c 100644
--- a/toolsrc/src/vcpkg/commands.ci.cpp
+++ b/toolsrc/src/vcpkg/commands.ci.cpp
@@ -52,24 +52,176 @@ namespace vcpkg::Commands::CI
         nullptr,
     };
 
+    struct XunitTestResults
+    {
+    public:
+
+        XunitTestResults()
+        {
+            m_assembly_run_datetime = Chrono::CTime::get_current_date_time();
+        }
+
+        void add_test_results(const std::string& spec, const Build::BuildResult& build_result, const Chrono::ElapsedTime& elapsed_time, const std::string& abi_tag)
+        {
+            m_collections.back().tests.push_back({ spec, build_result, elapsed_time, abi_tag });
+        }
+
+        // Starting a new test collection
+        void push_collection( const std::string& name)
+        {
+            m_collections.push_back({name});
+        }
+
+        void collection_time(const vcpkg::Chrono::ElapsedTime& time)
+        {
+            m_collections.back().time = time;
+        }
+
+        const std::string& build_xml()
+        {
+            m_xml.clear();
+            xml_start_assembly();
+
+            for (const auto& collection : m_collections)
+            {
+                xml_start_collection(collection);
+                for (const auto& test : collection.tests)
+                {
+                    xml_test(test);
+                }
+                xml_finish_collection();
+            }
+
+            xml_finish_assembly();
+            return m_xml;
+        }
+
+        void assembly_time(const vcpkg::Chrono::ElapsedTime& assembly_time)
+        {
+            m_assembly_time = assembly_time;
+        }
+
+    private:
+
+        struct XunitTest
+        {
+            std::string name;
+            vcpkg::Build::BuildResult result;
+            vcpkg::Chrono::ElapsedTime time;
+            std::string abi_tag;
+        };
+
+        struct XunitCollection
+        {
+            std::string name;
+            vcpkg::Chrono::ElapsedTime time;
+            std::vector<XunitTest> tests;
+        };
+
+        void xml_start_assembly()
+        {
+            std::string datetime;
+            if (m_assembly_run_datetime)
+            {
+                auto rawDateTime = m_assembly_run_datetime.get()->to_string();
+                // The expected format is "yyyy-mm-ddThh:mm:ss.0Z"
+                //                         0123456789012345678901
+                datetime = Strings::format(R"(run-date="%s" run-time="%s")",
+                    rawDateTime.substr(0, 10), rawDateTime.substr(11, 8));
+            }
+
+            std::string time = Strings::format(R"(time="%lld")", m_assembly_time.as<std::chrono::seconds>().count());
+
+            m_xml += Strings::format(
+                R"(<assemblies>)" "\n"
+                R"(  <assembly name="vcpkg" %s %s>)"  "\n"
+                , datetime, time);
+        }
+        void xml_finish_assembly()
+        {
+            m_xml += "  </assembly>\n"
+                "</assemblies>\n";
+        }
+
+        void xml_start_collection(const XunitCollection& collection)
+        {
+            m_xml += Strings::format(R"(    <collection name="%s" time="%lld">)"
+                "\n",
+                collection.name,
+                collection.time.as<std::chrono::seconds>().count());
+        }
+        void xml_finish_collection()
+        {
+            m_xml += "    </collection>\n";
+        }
+
+        void xml_test(const XunitTest& test)
+        {
+            std::string message_block;
+            const char* result_string = "";
+            switch (test.result)
+            {
+            case BuildResult::POST_BUILD_CHECKS_FAILED:
+            case BuildResult::FILE_CONFLICTS:
+            case BuildResult::BUILD_FAILED:
+                result_string = "Fail";
+                message_block = Strings::format("<failure><message><![CDATA[%s]]></message></failure>", to_string(test.result));
+                break;
+            case BuildResult::EXCLUDED:
+            case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES:
+                result_string = "Skip";
+                message_block = Strings::format("<reason><![CDATA[%s]]></reason>", to_string(test.result));
+                break;
+            case BuildResult::SUCCEEDED:
+                result_string = "Pass";
+                break;
+            default:
+                Checks::exit_fail(VCPKG_LINE_INFO);
+                break;
+            }
+
+            std::string traits_block;
+            if (test.abi_tag != "") // only adding if there is a known abi tag
+            {
+                traits_block = Strings::format(R"(<traits><trait name="abi_tag" value="%s" /></traits>)", test.abi_tag);
+            }
+
+            m_xml += Strings::format(R"(      <test name="%s" method="%s" time="%lld" result="%s">%s%s</test>)"
+                "\n",
+                test.name,
+                test.name,
+                test.time.as<std::chrono::seconds>().count(),
+                result_string,
+                traits_block,
+                message_block);
+        }
+
+        Optional<vcpkg::Chrono::CTime> m_assembly_run_datetime;
+        vcpkg::Chrono::ElapsedTime m_assembly_time;
+        std::vector<XunitCollection> m_collections;
+
+        std::string m_xml;
+    };
+
+
     struct UnknownCIPortsResults
     {
         std::vector<FullPackageSpec> unknown;
         std::map<PackageSpec, Build::BuildResult> known;
         std::map<PackageSpec, std::vector<std::string>> features;
+        std::map<PackageSpec, std::string> abi_tag_map;
     };
 
-    static UnknownCIPortsResults find_unknown_ports_for_ci(const VcpkgPaths& paths,
+    static std::unique_ptr<UnknownCIPortsResults> find_unknown_ports_for_ci(const VcpkgPaths& paths,
                                                            const std::set<std::string>& exclusions,
                                                            const Dependencies::PortFileProvider& provider,
                                                            const std::vector<FeatureSpec>& fspecs,
                                                            const bool purge_tombstones)
     {
-        UnknownCIPortsResults ret;
+        auto ret = std::make_unique<UnknownCIPortsResults>();
 
         auto& fs = paths.get_filesystem();
 
-        std::map<PackageSpec, std::string> abi_tag_map;
         std::set<PackageSpec> will_fail;
 
         const Build::BuildPackageOptions build_options = {
@@ -103,9 +255,9 @@ namespace vcpkg::Commands::CI
 
                     auto dependency_abis =
                         Util::fmap(p->computed_dependencies, [&](const PackageSpec& spec) -> Build::AbiEntry {
-                            auto it = abi_tag_map.find(spec);
+                            auto it = ret->abi_tag_map.find(spec);
 
-                            if (it == abi_tag_map.end())
+                            if (it == ret->abi_tag_map.end())
                                 return {spec.name(), ""};
                             else
                                 return {spec.name(), it->second};
@@ -118,13 +270,13 @@ namespace vcpkg::Commands::CI
                     if (auto tag_and_file = maybe_tag_and_file.get())
                     {
                         abi = tag_and_file->tag;
-                        abi_tag_map.emplace(p->spec, abi);
+                        ret->abi_tag_map.emplace(p->spec, abi);
                     }
                 }
                 else if (auto ipv = p->installed_package.get())
                 {
                     abi = ipv->core->package.abi;
-                    if (!abi.empty()) abi_tag_map.emplace(p->spec, abi);
+                    if (!abi.empty()) ret->abi_tag_map.emplace(p->spec, abi);
                 }
 
                 std::string state;
@@ -143,35 +295,35 @@ namespace vcpkg::Commands::CI
 
                 bool b_will_build = false;
 
-                ret.features.emplace(p->spec,
+                ret->features.emplace(p->spec,
                                      std::vector<std::string> {p->feature_list.begin(), p->feature_list.end()});
 
                 if (Util::Sets::contains(exclusions, p->spec.name()))
                 {
-                    ret.known.emplace(p->spec, BuildResult::EXCLUDED);
+                    ret->known.emplace(p->spec, BuildResult::EXCLUDED);
                     will_fail.emplace(p->spec);
                 }
                 else if (std::any_of(p->computed_dependencies.begin(),
                                      p->computed_dependencies.end(),
                                      [&](const PackageSpec& spec) { return Util::Sets::contains(will_fail, spec); }))
                 {
-                    ret.known.emplace(p->spec, BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES);
+                    ret->known.emplace(p->spec, BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES);
                     will_fail.emplace(p->spec);
                 }
                 else if (fs.exists(archive_path))
                 {
                     state += "pass";
-                    ret.known.emplace(p->spec, BuildResult::SUCCEEDED);
+                    ret->known.emplace(p->spec, BuildResult::SUCCEEDED);
                 }
                 else if (fs.exists(archive_tombstone_path))
                 {
                     state += "fail";
-                    ret.known.emplace(p->spec, BuildResult::BUILD_FAILED);
+                    ret->known.emplace(p->spec, BuildResult::BUILD_FAILED);
                     will_fail.emplace(p->spec);
                 }
                 else
                 {
-                    ret.unknown.push_back({p->spec, {p->feature_list.begin(), p->feature_list.end()}});
+                    ret->unknown.push_back({p->spec, {p->feature_list.begin(), p->feature_list.end()}});
                     b_will_build = true;
                 }
 
@@ -229,23 +381,29 @@ namespace vcpkg::Commands::CI
         };
 
         std::vector<std::map<PackageSpec, BuildResult>> all_known_results;
+        std::map<PackageSpec, std::string> abi_tag_map;
+
+        XunitTestResults xunitTestResults;
 
         std::vector<std::string> all_ports = Install::get_all_port_names(paths);
         std::vector<TripletAndSummary> results;
+        auto timer = Chrono::ElapsedTimer::create_started();
         for (const Triplet& triplet : triplets)
         {
             Input::check_triplet(triplet, paths);
 
+            xunitTestResults.push_collection(triplet.canonical_name());
+
             Dependencies::PackageGraph pgraph(paths_port_file, status_db);
 
             std::vector<PackageSpec> specs = PackageSpec::to_package_specs(all_ports, triplet);
             // Install the default features for every package
-            auto all_fspecs = Util::fmap(specs, [](auto& spec) { return FeatureSpec(spec, ""); });
+            auto all_feature_specs = Util::fmap(specs, [](auto& spec) { return FeatureSpec(spec, ""); });
             auto split_specs =
-                find_unknown_ports_for_ci(paths, exclusions_set, paths_port_file, all_fspecs, purge_tombstones);
-            auto fspecs = FullPackageSpec::to_feature_specs(split_specs.unknown);
+                find_unknown_ports_for_ci(paths, exclusions_set, paths_port_file, all_feature_specs, purge_tombstones);
+            auto feature_specs = FullPackageSpec::to_feature_specs(split_specs->unknown);
 
-            for (auto&& fspec : fspecs)
+            for (auto&& fspec : feature_specs)
                 pgraph.install(fspec);
 
             Dependencies::CreateInstallPlanOptions serialize_options;
@@ -284,7 +442,7 @@ namespace vcpkg::Commands::CI
                                 p->plan_type = InstallPlanType::EXCLUDED;
                             }
 
-                            for (auto&& feature : split_specs.features[p->spec])
+                            for (auto&& feature : split_specs->features[p->spec])
                                 if (p->feature_list.find(feature) == p->feature_list.end())
                                 {
                                     pgraph.install({p->spec, feature});
@@ -304,13 +462,32 @@ namespace vcpkg::Commands::CI
             }
             else
             {
+                auto collection_timer = Chrono::ElapsedTimer::create_started();
                 auto summary = Install::perform(action_plan, Install::KeepGoing::YES, paths, status_db);
+                auto collection_time_elapsed = collection_timer.elapsed();
+
+                // Adding results for ports that were built or pulled from an archive
                 for (auto&& result : summary.results)
-                    split_specs.known.erase(result.spec);
-                results.push_back({triplet, std::move(summary)});
-                all_known_results.emplace_back(std::move(split_specs.known));
+                {
+                    split_specs->known.erase(result.spec);
+                    xunitTestResults.add_test_results(result.spec.to_string(), result.build_result.code, result.timing, split_specs->abi_tag_map.at(result.spec));
+                }
+
+                // Adding results for ports that were not built because they have known states
+                for (auto&& port : split_specs->known)
+                {
+                    xunitTestResults.add_test_results(port.first.to_string(), port.second, Chrono::ElapsedTime{}, split_specs->abi_tag_map.at(port.first));
+                }
+
+                all_known_results.emplace_back(std::move(split_specs->known));
+                abi_tag_map.insert(split_specs->abi_tag_map.begin(), split_specs->abi_tag_map.end());
+
+                results.push_back({ triplet, std::move(summary)});
+
+                xunitTestResults.collection_time( collection_time_elapsed );
             }
         }
+        xunitTestResults.assembly_time(timer.elapsed());
 
         for (auto&& result : results)
         {
@@ -322,21 +499,7 @@ namespace vcpkg::Commands::CI
         auto it_xunit = options.settings.find(OPTION_XUNIT);
         if (it_xunit != options.settings.end())
         {
-            std::string xunit_doc = "<assemblies><assembly><collection>\n";
-
-            for (auto&& result : results)
-                xunit_doc += result.summary.xunit_results();
-            for (auto&& known_result : all_known_results)
-            {
-                for (auto&& result : known_result)
-                {
-                    xunit_doc +=
-                        Install::InstallSummary::xunit_result(result.first, Chrono::ElapsedTime {}, result.second);
-                }
-            }
-
-            xunit_doc += "</collection></assembly></assemblies>\n";
-            paths.get_filesystem().write_contents(fs::u8path(it_xunit->second), xunit_doc);
+            paths.get_filesystem().write_contents(fs::u8path(it_xunit->second), xunitTestResults.build_xml());
         }
 
         Checks::exit_success(VCPKG_LINE_INFO);
diff --git a/toolsrc/src/vcpkg/commands.dependinfo.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp
index 5f72e965b..455f3b7c5 100644
--- a/toolsrc/src/vcpkg/commands.dependinfo.cpp
+++ b/toolsrc/src/vcpkg/commands.dependinfo.cpp
@@ -12,16 +12,16 @@ namespace vcpkg::Commands::DependInfo
     constexpr StringLiteral OPTION_DOT = "--dot";
     constexpr StringLiteral OPTION_DGML = "--dgml";
 
-    constexpr std::array<CommandSwitch, 2> DEPEND_SWITCHES = { {
-        { OPTION_DOT, "Creates graph on basis of dot" },
-        { OPTION_DGML, "Creates graph on basis of dgml" },
-        } };
+    constexpr std::array<CommandSwitch, 2> DEPEND_SWITCHES = {{
+        {OPTION_DOT, "Creates graph on basis of dot"},
+        {OPTION_DGML, "Creates graph on basis of dgml"},
+    }};
 
     const CommandStructure COMMAND_STRUCTURE = {
         Help::create_example_string(R"###(depend-info [pat])###"),
         0,
-        1,
-        { DEPEND_SWITCHES,{} },
+        SIZE_MAX,
+        {DEPEND_SWITCHES, {}},
         nullptr,
     };
 
@@ -32,8 +32,7 @@ namespace vcpkg::Commands::DependInfo
         return output;
     }
 
-    std::string create_dot_as_string(
-        const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
+    std::string create_dot_as_string(const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
     {
         int empty_node_count = 0;
 
@@ -53,7 +52,7 @@ namespace vcpkg::Commands::DependInfo
             s.append(Strings::format("%s;", name));
             for (const Dependency& d : source_paragraph.depends)
             {
-                const std::string dependency_name = replace_dashes_with_underscore(d.name());
+                const std::string dependency_name = replace_dashes_with_underscore(d.depend.name);
                 s.append(Strings::format("%s -> %s;", name, dependency_name));
             }
         }
@@ -62,8 +61,7 @@ namespace vcpkg::Commands::DependInfo
         return s;
     }
 
-    std::string create_dgml_as_string(
-        const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
+    std::string create_dgml_as_string(const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
     {
         std::string s;
         s.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
@@ -79,16 +77,22 @@ namespace vcpkg::Commands::DependInfo
             // Iterate over dependencies.
             for (const Dependency& d : source_paragraph.depends)
             {
-                links.append(Strings::format("<Link Source=\"%s\" Target=\"%s\" />", name, d.name()));
+                if (d.qualifier.empty())
+                    links.append(Strings::format("<Link Source=\"%s\" Target=\"%s\" />", name, d.depend.name));
+                else
+                    links.append(Strings::format(
+                        "<Link Source=\"%s\" Target=\"%s\" StrokeDashArray=\"4\" />", name, d.depend.name));
             }
 
             // Iterate over feature dependencies.
-            const std::vector<std::unique_ptr<FeatureParagraph>>& feature_paragraphs = source_control_file->feature_paragraphs;
+            const std::vector<std::unique_ptr<FeatureParagraph>>& feature_paragraphs =
+                source_control_file->feature_paragraphs;
             for (const auto& feature_paragraph : feature_paragraphs)
             {
                 for (const Dependency& d : feature_paragraph->depends)
                 {
-                    links.append(Strings::format("<Link Source=\"%s\" Target=\"%s\" />", name, d.name()));
+                    links.append(Strings::format(
+                        "<Link Source=\"%s\" Target=\"%s\" StrokeDashArray=\"4\" />", name, d.depend.name));
                 }
             }
         }
@@ -101,9 +105,8 @@ namespace vcpkg::Commands::DependInfo
         return s;
     }
 
-    std::string create_graph_as_string(
-        const std::unordered_set<std::string>& switches,
-        const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
+    std::string create_graph_as_string(const std::unordered_set<std::string>& switches,
+                                       const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
     {
         if (Util::Sets::contains(switches, OPTION_DOT))
         {
@@ -116,35 +119,50 @@ namespace vcpkg::Commands::DependInfo
         return "";
     }
 
+    void build_dependencies_list(std::set<std::string>& packages_to_keep,
+                                 const std::string& requested_package,
+                                 const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
+    {
+        const auto source_control_file =
+            Util::find_if(source_control_files, [&requested_package](const auto& source_control_file) {
+                return source_control_file->core_paragraph->name == requested_package;
+            });
+
+        if (source_control_file != source_control_files.end())
+        {
+            const auto new_package = packages_to_keep.insert(requested_package).second;
+
+            if (new_package)
+            {
+                for (const auto& dependency : (*source_control_file)->core_paragraph->depends)
+                {
+                    build_dependencies_list(packages_to_keep, dependency.depend.name, source_control_files);
+                }
+            }
+        }
+        else
+        {
+            System::println(System::Color::warning, "package '%s' does not exist", requested_package);
+        }
+    }
+
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
     {
         const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE);
 
         auto source_control_files = Paragraphs::load_all_ports(paths.get_filesystem(), paths.ports);
 
-        if (args.command_arguments.size() == 1)
+        if (args.command_arguments.size() >= 1)
         {
-            const std::string filter = args.command_arguments.at(0);
-
-            Util::erase_remove_if(source_control_files,
-                                  [&](const std::unique_ptr<SourceControlFile>& source_control_file) {
-                                      const SourceParagraph& source_paragraph = *source_control_file->core_paragraph;
-
-                                      if (Strings::case_insensitive_ascii_contains(source_paragraph.name, filter))
-                                      {
-                                          return false;
-                                      }
-
-                                      for (const Dependency& dependency : source_paragraph.depends)
-                                      {
-                                          if (Strings::case_insensitive_ascii_contains(dependency.name(), filter))
-                                          {
-                                              return false;
-                                          }
-                                      }
-
-                                      return true;
-                                  });
+            std::set<std::string> packages_to_keep;
+            for (const auto& requested_package : args.command_arguments)
+            {
+                build_dependencies_list(packages_to_keep, requested_package, source_control_files);
+            }
+
+            Util::erase_remove_if(source_control_files, [&packages_to_keep](const auto& source_control_file) {
+                return !Util::Sets::contains(packages_to_keep, source_control_file->core_paragraph->name);
+            });
         }
 
         if (!options.switches.empty())
diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp
index 044ae1c47..c9d52c572 100644
--- a/toolsrc/src/vcpkg/commands.edit.cpp
+++ b/toolsrc/src/vcpkg/commands.edit.cpp
@@ -157,6 +157,9 @@ namespace vcpkg::Commands::Edit
 #elif defined(__APPLE__)
         candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code"});
         candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"});
+#elif defined(__linux__)
+        candidate_paths.push_back(fs::path{"/usr/share/code/bin/code"});
+        candidate_paths.push_back(fs::path{"/usr/bin/code"});
 #endif
 
         const auto it = Util::find_if(candidate_paths, [&](const fs::path& p) { return fs.exists(p); });
diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp
index 1cfa2bf71..434876871 100644
--- a/toolsrc/src/vcpkg/install.cpp
+++ b/toolsrc/src/vcpkg/install.cpp
@@ -719,9 +719,9 @@ namespace vcpkg::Install
         return nullptr;
     }
 
-    std::string InstallSummary::xunit_result(const PackageSpec& spec, Chrono::ElapsedTime time, BuildResult code)
+    static std::string xunit_result(const PackageSpec& spec, Chrono::ElapsedTime time, BuildResult code)
     {
-        std::string inner_block;
+        std::string message_block;
         const char* result_string = "";
         switch (code)
         {
@@ -729,12 +729,12 @@ namespace vcpkg::Install
             case BuildResult::FILE_CONFLICTS:
             case BuildResult::BUILD_FAILED:
                 result_string = "Fail";
-                inner_block = Strings::format("<failure><message><![CDATA[%s]]></message></failure>", to_string(code));
+                message_block = Strings::format("<failure><message><![CDATA[%s]]></message></failure>", to_string(code));
                 break;
             case BuildResult::EXCLUDED:
             case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES:
                 result_string = "Skip";
-                inner_block = Strings::format("<reason><![CDATA[%s]]></reason>", to_string(code));
+                message_block = Strings::format("<reason><![CDATA[%s]]></reason>", to_string(code));
                 break;
             case BuildResult::SUCCEEDED: result_string = "Pass"; break;
             default: Checks::exit_fail(VCPKG_LINE_INFO);
@@ -746,7 +746,7 @@ namespace vcpkg::Install
                                spec,
                                time.as<std::chrono::seconds>().count(),
                                result_string,
-                               inner_block);
+                               message_block);
     }
 
     std::string InstallSummary::xunit_results() const
diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp
index ed61cb42a..baa8b070b 100644
--- a/toolsrc/src/vcpkg/sourceparagraph.cpp
+++ b/toolsrc/src/vcpkg/sourceparagraph.cpp
@@ -194,16 +194,13 @@ namespace vcpkg
             auto pos = depend_string.find(' ');
             if (pos == std::string::npos) return Dependency::parse_dependency(depend_string, "");
             // expect of the form "\w+ \[\w+\]"
-            Dependency dep;
-
-            dep.depend.name = depend_string.substr(0, pos);
             if (depend_string.c_str()[pos + 1] != '(' || depend_string[depend_string.size() - 1] != ')')
             {
                 // Error, but for now just slurp the entire string.
                 return Dependency::parse_dependency(depend_string, "");
             }
-            dep.qualifier = depend_string.substr(pos + 2, depend_string.size() - pos - 3);
-            return dep;
+            return Dependency::parse_dependency(depend_string.substr(0, pos),
+                                                depend_string.substr(pos + 2, depend_string.size() - pos - 3));
         });
     }
 
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp
index a92a5673e..47994660c 100644
--- a/toolsrc/src/vcpkg/vcpkgpaths.cpp
+++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp
@@ -192,6 +192,26 @@ namespace vcpkg
                                vs_root_path.generic_string());
         }
 
+        if (prebuildinfo.cmake_system_name == "WindowsStore")
+        {
+            // For now, cmake does not support VS 2019 when using the MSBuild generator.
+            Util::erase_remove_if(candidates, [&](const Toolset* t) { return t->version == "v142"; });
+            Checks::check_exit(VCPKG_LINE_INFO,
+                               !candidates.empty(),
+                               "With the current CMake version, UWP binaries can only be built with toolset version "
+                               "v141 or below. Please install the v141 toolset in VS 2019.");
+        }
+
+        if (System::get_host_processor() == System::CPUArchitecture::X86)
+        {
+            // For now, cmake does not support VS 2019 when using the MSBuild generator.
+            Util::erase_remove_if(candidates, [&](const Toolset* t) { return t->version == "v142"; });
+            Checks::check_exit(VCPKG_LINE_INFO,
+                               !candidates.empty(),
+                               "With the current CMake version, 32-bit machines can build with toolset version "
+                               "v141 or below. Please install the v141 toolset in VS 2019.");
+        }
+
         Checks::check_exit(VCPKG_LINE_INFO, !candidates.empty(), "No suitable Visual Studio instances were found");
         return *candidates.front();
 
diff --git a/toolsrc/src/vcpkg/visualstudio.cpp b/toolsrc/src/vcpkg/visualstudio.cpp
index 83a530a10..d2fccc716 100644
--- a/toolsrc/src/vcpkg/visualstudio.cpp
+++ b/toolsrc/src/vcpkg/visualstudio.cpp
@@ -12,6 +12,7 @@ namespace vcpkg::VisualStudio
     static constexpr CStringView V_120 = "v120";
     static constexpr CStringView V_140 = "v140";
     static constexpr CStringView V_141 = "v141";
+    static constexpr CStringView V_142 = "v142";
 
     struct VisualStudioInstance
     {
@@ -213,35 +214,62 @@ namespace vcpkg::VisualStudio
 
                 for (const fs::path& subdir : msvc_subdirectories)
                 {
+                    auto toolset_version_full = subdir.filename().u8string();
+                    auto toolset_version_prefix = toolset_version_full.substr(0, 4);
+                    CStringView toolset_version;
+                    std::string vcvars_option;
+                    if (toolset_version_prefix.size() != 4)
+                    {
+                        // unknown toolset
+                        continue;
+                    }
+                    else if (toolset_version_prefix[3] == '1')
+                    {
+                        toolset_version = V_141;
+                        vcvars_option = "-vcvars_ver=14.1";
+                    }
+                    else if (toolset_version_prefix[3] == '2')
+                    {
+                        toolset_version = V_142;
+                        vcvars_option = "-vcvars_ver=14.2";
+                    }
+                    else
+                    {
+                        // unknown toolset minor version
+                        continue;
+                    }
                     const fs::path dumpbin_path = subdir / "bin" / "HostX86" / "x86" / "dumpbin.exe";
                     paths_examined.push_back(dumpbin_path);
                     if (fs.exists(dumpbin_path))
                     {
-                        const Toolset v141_toolset{
-                            vs_instance.root_path, dumpbin_path, vcvarsall_bat, {}, V_141, supported_architectures};
+                        Toolset toolset{vs_instance.root_path,
+                                        dumpbin_path,
+                                        vcvarsall_bat,
+                                        {vcvars_option},
+                                        toolset_version,
+                                        supported_architectures};
 
                         const auto english_language_pack = dumpbin_path.parent_path() / "1033";
 
                         if (!fs.exists(english_language_pack))
                         {
-                            excluded_toolsets.push_back(v141_toolset);
-                            break;
+                            excluded_toolsets.push_back(std::move(toolset));
+                            continue;
                         }
 
-                        found_toolsets.push_back(v141_toolset);
+                        found_toolsets.push_back(std::move(toolset));
 
                         if (v140_is_available)
                         {
-                            const Toolset v140_toolset{vs_instance.root_path,
-                                                       dumpbin_path,
-                                                       vcvarsall_bat,
-                                                       {"-vcvars_ver=14.0"},
-                                                       V_140,
-                                                       supported_architectures};
-                            found_toolsets.push_back(v140_toolset);
+                            found_toolsets.push_back({vs_instance.root_path,
+                                                      dumpbin_path,
+                                                      vcvarsall_bat,
+                                                      {"-vcvars_ver=14.0"},
+                                                      V_140,
+                                                      supported_architectures});
                         }
 
-                        break;
+                        continue;
                     }
                 }