Merge branch 'master' of https://github.com/EMCECS/vcpkg

# Conflicts: # ports/ecsutil/CONTROL # ports/ecsutil/portfile.cmake
author: Bob Kast <bob.kast@emc.com> 2018-10-23 09:06:58 -0400
committer: Bob Kast <bob.kast@emc.com> 2018-10-23 09:06:58 -0400
commit: 230d795ae3c3f2e45821b887c6065a81a8c04326 (patch)
tree: 7b014a1547ff1cc9ef80add56eb03b17774a1ff6
parent: 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff)
parent: 9b21ff9612916e24f89c6839599d3d50446597d8 (diff)
download: vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz
vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip
718 files changed, 5885 insertions, 2545 deletions
diff --git a/.gitignore b/.gitignore
index c223e6fcf..bc83e2959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -283,6 +283,7 @@ __pycache__/
 /installed*/
 /packages/
 /scripts/buildsystems/tmp/
+/toolsrc/build.rel/
 #ignore custom triplets
 /triplets/*
 #add vcpkg-designed triplets back in
diff --git a/README.md b/README.md
index c2f3fc1da..23cb4e5f4 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Prerequisites:
 - Windows 10, 8.1, 7, Linux, or MacOS
 - Visual Studio 2017 or Visual Studio 2015 Update 3 (on Windows)
 - Git
-- *Optional: CMake 3.10.2*
+- *Optional:* CMake 3.10.2
 
 To get started:
 ```
@@ -18,19 +18,19 @@ To get started:
 > cd vcpkg
 
 PS> .\bootstrap-vcpkg.bat
-Ubuntu:~/$ ./bootstrap-vcpkg.sh
+Linux:~/$ ./bootstrap-vcpkg.sh
 ```
 
 Then, to hook up user-wide [integration](docs/users/integration.md), run (note: requires admin on first use)
 ```
 PS> .\vcpkg integrate install
-Ubuntu:~/$ ./vcpkg integrate install
+Linux:~/$ ./vcpkg integrate install
 ```
 
 Install any packages with
 ```
 PS> .\vcpkg install sdl2 curl
-Ubuntu:~/$ ./vcpkg install sdl2 curl
+Linux:~/$ ./vcpkg install sdl2 curl
 ```
 
 The best way to use installed libraries with CMake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as `-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake`.
diff --git a/docs/about/faq.md b/docs/about/faq.md
index ff7ecdba5..0178e051a 100644
--- a/docs/about/faq.md
+++ b/docs/about/faq.md
@@ -35,7 +35,7 @@ To use different versions of a library for different projects, we recommend maki
 
 If your application is very sensitive to the versions of libraries, we recommend checking in the specific set of portfiles you need into your source control along with your project sources and using the `--vcpkg-root` option to redirect the working directory of `vcpkg.exe`.
 
-## How does Vcpkg protect my Privacy?
+## How does Vcpkg protect my privacy?
 See the [Privacy document](privacy.md) for all information regarding privacy.
 
 ## Can I use my own CMake toolchain file with Vcpkg's toolchain file?
@@ -93,7 +93,7 @@ Enabling user-wide integration (`vcpkg integrate install`) changes the default f
 ## Why not NuGet?
 NuGet is a package manager for .NET libraries with a strong dependency on MSBuild. It does not meet the specific needs of Native C++ customers in at least three ways.
 
-- **Compilation Flavors**. With so many possible combinations of compilation options, the task of providing a truly complete set of options is intrinsicly impossible. Furthermore, the download size for reasonably complete binary packages becomes enormous. This makes it a requirement to split the results into multiple packages, but then searching becomes very difficult.
+- **Compilation Flavors**. With so many possible combinations of compilation options, the task of providing a truly complete set of options is intrinsically impossible. Furthermore, the download size for reasonably complete binary packages becomes enormous. This makes it a requirement to split the results into multiple packages, but then searching becomes very difficult.
 
 - **Binary vs Source**. Very closely tied to the first point, NuGet is designed from the ground up to provide relatively small, prebuilt binaries. Due to the nature of native code, developers need to have access to the source code to ensure ABI compatibility, performance, integrity, and debuggability.
 
@@ -108,7 +108,7 @@ Conan.io is a publicly-federated, project-centric, cross-platform, C++ package m
 
 - **Cross-platform vs single-platform**. While being hosted on many platforms is an excellent north star, we believe the level of system integration and stability provided by apt-get, yum, and homebrew is well worth needing to exchange `apt-get install libboost-all-dev` with `brew install boost` in automated scripts. We chose to make our system as easy as possible to integrate into a world with these very successful system managers -- one more line for `vcpkg install boost` -- instead of attempting to replace them where they are already so successful and well-loved.
 
-- **C++/CMake vs python**. While Python is an excellent language loved by many, we believe that transparency and familiarity are the most important factors when choosing a tool as important to your workflow as a package manager. Consequently, we chose to make the implementation languages be as universally accepted as possible: C++ should be used in a C++ package manager for C++ programmers. You should not be required to learn another language just to understand your package manager.
+- **C++/CMake vs python**. While Python is an excellent language loved by many, we believe that transparency and familiarity are the most important factors when choosing a tool as important to your workflow as a package manager. Consequently, we chose to make the implementation languages be as universally accepted as possible: C++ should be used in a C++ package manager for C++ programmers. You should not be required to learn another programming language just to understand your package manager.
 
 ## Why not Chocolatey?
 Chocolatey is an excellent system for managing applications. However, it is not currently designed to acquire redistributable developer assets and help you with debugging. Vcpkg, in comparison, is designed to get you the libraries you need to build your application and help you deliver through any platform you'd like (including Chocolatey!).
diff --git a/docs/examples/packaging-zlib.md b/docs/examples/packaging-zlib.md
index 508947f1a..1d61cfee1 100644
--- a/docs/examples/packaging-zlib.md
+++ b/docs/examples/packaging-zlib.md
@@ -3,7 +3,7 @@
 ### Bootstrap with `create`
 First, locate a globally accessible archive of the library's sources. Zip, gzip, and bzip are all supported. Strongly prefer official sources or mirrors over unofficial mirrors.
 
-*Looking at zlib's website, the URL http://zlib.net/zlib128.zip looks appropriate.*
+*Looking at zlib's website, the URL http://zlib.net/zlib1211.zip looks appropriate.*
 
 Second, determine a suitable package name. This should be ASCII, lowercase, and recognizable to someone who knows the library's "human name". If the library is already packaged in another package manager, prefer that name.
 
@@ -11,7 +11,7 @@ Second, determine a suitable package name. This should be ASCII, lowercase, and
 
 Finally, if the server's name for the archive is not very descriptive (such as downloading a zipped commit or branch from GitHub), choose a nice archive name of the form `<packagename>-<version>.zip`.
 
-*`zlib128.zip` is a fine name, so no change needed.*
+*`zlib1211.zip` is a fine name, so no change needed.*
 
 All this information can then be passed into the `create` command, which will download the sources and bootstrap the packaging process inside `ports\<packagename>`.
 
@@ -26,7 +26,7 @@ In addition to the generated `ports\<package>\portfile.cmake`, we also need a `p
 *For zlib2, we'll create the file `ports\zlib2\CONTROL` with the following contents:*
 ```no-highlight
 Source: zlib2
-Version: 1.2.8
+Version: 1.2.11
 Description: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
 ```
 
diff --git a/docs/users/triplets.md b/docs/users/triplets.md
index 70580df46..2bb9c74b3 100644
--- a/docs/users/triplets.md
+++ b/docs/users/triplets.md
@@ -41,6 +41,16 @@ This can be set to `v141`, `v140`, or left blank. If left blank, we select the l
 Visual Studio 2015 platform toolset is `v140`  
 Visual Studio 2017 platform toolset is `v141`
 
+### 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.
+
+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_CHAINLOAD_TOOLCHAIN_FILE
 Specifies an alternate CMake Toolchain file to use.
 
@@ -52,6 +62,7 @@ See also the CMake documentation for toolchain files: https://cmake.org/cmake/he
 Sets additional compiler flags to be used when not using `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`.
 
 This option also has forms for configuration-specific and C flags:
+- `VCPKG_CXX_FLAGS`
 - `VCPKG_CXX_FLAGS_DEBUG`
 - `VCPKG_CXX_FLAGS_RELEASE`
 - `VCPKG_C_FLAGS`
diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt
index 88a20935a..b4b8a646d 100644
--- a/ports/abseil/CMakeLists.txt
+++ b/ports/abseil/CMakeLists.txt
@@ -17,8 +17,7 @@ endif()
 function(add_sublibrary LIB)
     file(GLOB_RECURSE SOURCES "absl/${LIB}/*.cc")
     list(FILTER SOURCES EXCLUDE REGEX "_test(ing)?(_.+)?.cc$|_nonprod.cc$|test_util.cc$|_benchmark.cc$")
-    file(GLOB HEADERS "absl/${LIB}/*.h" "absl/${LIB}/*.inc")
-    file(GLOB INTERNAL_HEADERS "absl/${LIB}/internal/*.h")
+    file(GLOB_RECURSE HEADERS "absl/${LIB}/*.h" "absl/${LIB}/*.inc")
 
     if(SOURCES)
         if("STATIC" IN_LIST ARGN)
@@ -33,7 +32,6 @@ function(add_sublibrary LIB)
         target_include_directories(${LIB} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
     endif()
 
-
     install(TARGETS ${LIB} EXPORT unofficial-abseil-targets
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
@@ -42,10 +40,11 @@ function(add_sublibrary LIB)
 
     if(INSTALL_HEADERS)
         if(HEADERS)
-            install(FILES ${HEADERS} DESTINATION "include/absl/${LIB}")
-        endif()
-        if(INTERNAL_HEADERS)
-            install(FILES ${INTERNAL_HEADERS} DESTINATION "include/absl/${LIB}/internal")
+            foreach(file IN LISTS HEADERS)
+                get_filename_component(dir ${file} DIRECTORY)
+                file(RELATIVE_PATH rel_dir ${CMAKE_SOURCE_DIR}/absl/${LIB} ${dir})
+                install(FILES ${file} DESTINATION "include/absl/${LIB}/${rel_dir}")
+            endforeach()
         endif()
     endif()
 endfunction()
@@ -85,9 +84,6 @@ target_link_public_libraries(utility base meta)
 target_link_public_libraries(time base numeric)
 target_link_public_libraries(synchronization base time)
 
-find_package(unofficial-cctz REQUIRED)
-target_link_libraries(time PUBLIC unofficial::cctz)
-
 install(
     EXPORT unofficial-abseil-targets
     FILE unofficial-abseil-config.cmake
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
index 4f8b132a9..61eb0e906 100644
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@@ -1,7 +1,6 @@
 Source: abseil
-Version: 2018-07-30
+Version: 2018-09-18-3
 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.
   Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.
-Build-Depends: cctz
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index a45b31b06..7894b5654 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 c2e00d341913bf03b4597ade5b056042e23e8c58
-    SHA512 60e9f0abc4ebbc356314c144b769a6918d4c5215df9f01aafb234f94756b08b670bdaf4cf88363ea4daf3bd19cb193ba6817aba70b208275d3d5d1ed2926ce9a
+    REF 8ff1374008259719b54a8cb128ef951c02da164c
+    SHA512 c8eaef8d3a829152bbe1a9adf60fad74858d10e78d2fd1ad8409a027add2f9e24df9994e4981960550b04845838ec6f5ac83b09d6a8850d129fb078d15c4b94f
     HEAD_REF master
 )
 
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 80279d6ed..8323188d9 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -1,3 +1,3 @@
 Source: ace
-Version: 6.5.1
+Version: 6.5.2
 Description: The ADAPTIVE Communication Environment
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 116459c8b..98b000122 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -9,9 +9,9 @@ endif()
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.1.zip"
-    FILENAME "ACE-6.5.1.zip"
-    SHA512 b6444b183a356f4a9fc4af57ccc239a400121fbb00547ff9d13c51f0fc20f38b0aa87b9568531472e5f7fde82deea3d4c3d91d7504aca89799a2505ba492c73a
+    URLS "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.2.zip"
+    FILENAME "ACE-6.5.2.zip"
+    SHA512 ca8a55942b50628e851cad7074a249c480d82f916979a50bb24174432248037fb7a79ca055c7e6553d96aa58f14b97e8e8bf5dbc8671b72b8712e8a65f63ac98
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL
index 9a43a7b00..a2aefabec 100644
--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@@ -1,4 +1,4 @@
 Source: alembic
-Version: 1.7.8
+Version: 1.7.9
 Build-Depends: ilmbase, hdf5
 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. http://alembic.io/
diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake
index d9720a178..295afa34a 100644
--- a/ports/alembic/portfile.cmake
+++ b/ports/alembic/portfile.cmake
@@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alembic/alembic
-    REF 1.7.8
-    SHA512 bc36e30d1aecd67da16247365a973c462e9716309d090fefe36f625c8d2ab2d517fe8ac694a9188cd6eeb623a3217f59f461c82fcfec43d0a60a07381526983a
+    REF 1.7.9
+    SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
     HEAD_REF master
 )
 
diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL
index 1f771a0ed..b4ea1f213 100644
--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@@ -1,3 +1,3 @@
 Source: apr
-Version: 1.6.3
+Version: 1.6.5
 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index 22bd260c8..40ced3049 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -4,13 +4,13 @@ endif()
 
 include(vcpkg_common_functions)
 
-set(VERSION 1.6.3)
+set(VERSION 1.6.5)
 
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-${VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
     FILENAME "apr-${VERSION}.tar.bz2"
-    SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
+    SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/asyncplusplus/CONTROL b/ports/asyncplusplus/CONTROL
new file mode 100644
index 000000000..eb82afe70
--- /dev/null
+++ b/ports/asyncplusplus/CONTROL
@@ -0,0 +1,3 @@
+Source: asyncplusplus
+Version: 1.0-1
+Description: Async++ is a lightweight concurrency framework for C++11
diff --git a/ports/asyncplusplus/portfile.cmake b/ports/asyncplusplus/portfile.cmake
new file mode 100644
index 000000000..d348dc83e
--- /dev/null
+++ b/ports/asyncplusplus/portfile.cmake
@@ -0,0 +1,34 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Amanieu/asyncplusplus
+    REF v1.0
+    SHA512 bb1fc032d2d8de49b4505e0629d48e5cfa99edfcafbf17848f160ceb320bcd993f1549095248d1a0ef8fc1ec07ecbaad6b634a770ddc1974092d373a508a5fe3
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/Async++.cmake ${CURRENT_PACKAGES_DIR}/cmake/Async++Targets.cmake)
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/async++)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/async++/Async++Targets.cmake ${CURRENT_PACKAGES_DIR}/share/async++/Async++.cmake)
+
+file(READ ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake _contents)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake "include(CMakeFindDependencyMacro)\n${_contents}")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/asyncplusplus)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/LICENSE ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME Async++)
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index 611b1989b..7402c2e35 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,8 +1,8 @@
 Source: aws-sdk-cpp
-Version: 1.5.2
+Version: 1.6.12-1
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
-Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
+Default-Features: dynamodb, s3, kinesis
 # Automatically generated by generateFeatures.ps1
 
 Feature: access-management
diff --git a/ports/aws-sdk-cpp/CONTROL.in b/ports/aws-sdk-cpp/CONTROL.in
index 184374de6..13b206bfa 100644
--- a/ports/aws-sdk-cpp/CONTROL.in
+++ b/ports/aws-sdk-cpp/CONTROL.in
@@ -2,4 +2,4 @@ Source: aws-sdk-cpp
 Version: 1.4.30-1
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
-Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
+Default-Features: dynamodb, s3, kinesis
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index a6d2ac514..854e24fcb 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.5.2
-    SHA512 d157e12ff836ee1ee875755ffd96312bdad7d8ad17d3cf7b5919f01f755ba62e53366eee0d32c1f41e9da7aa678fe3349cc19dd14bbaf5f2908474d6e66d6146
+    REF 1.6.12
+    SHA512 37cd573ea354394c170a081572f63dfe604bf631d0129a53f066f121680b92c8f64b343a4d841de9a178679a322755a858a1148fbfc99c3f525a1f025fdfbd84
     HEAD_REF master
 )
 
diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL
index e3f158a95..cde95570e 100644
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 5.0.0
+Version: 5.1.1
 Build-Depends: cpprestsdk, 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 be9f8074c..07affc756 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.0.0
-    SHA512 730d082b4bf4ef73ee8aa5f8c87927149e4c2b65fc58dc9609f992ab8fcdd7e9fdbc4b77fbc46378ebd575196477dee7943db5d43724591d505aba511fe3052a
+    REF v5.1.1
+    SHA512 e5983d767681cf82a68af3c983a83515a2a7a3b5bf2ffbadcd2992dbcdf213bb322f8d0c4369a4c729ac7536e3e0f52e44cde012cbe1f9464df3ad901f635b6a
     HEAD_REF master
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/pplx-do-while.patch
diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL
index c72f70865..dc80b4c41 100644
--- a/ports/blaze/CONTROL
+++ b/ports/blaze/CONTROL
@@ -1,4 +1,4 @@
 Source: blaze
-Version: 3.3
+Version: 3.4-1
 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/no-generate-to-source-dir.patch b/ports/blaze/avoid-src-dir-generation.patch
index 2ef7cc76f..c57d6a429 100644
--- a/ports/blaze/no-generate-to-source-dir.patch
+++ b/ports/blaze/avoid-src-dir-generation.patch
@@ -1,8 +1,28 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcb79e6..c04a3f0 100644
+index 7ecc993..793ec34 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -151,7 +151,7 @@ endif ()
+@@ -63,8 +63,8 @@ endif()
+ #==================================================================================================
+ 
+ find_package(LAPACK REQUIRED)
+-target_link_libraries(blaze INTERFACE ${LAPACK_LIBRARIES})
+-target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
++target_link_libraries(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LIBRARIES}>)
++target_compile_options(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LINKER_FLAGS}>)
+ 
+ 
+ #==================================================================================================
+@@ -72,7 +72,7 @@ target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
+ #==================================================================================================
+ 
+ find_package(Boost 1.54.0 REQUIRED)
+-target_include_directories(blaze INTERFACE ${Boost_INCLUDE_DIRS})
++target_include_directories(blaze INTERFACE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>)
+ 
+ 
+ #==================================================================================================
+@@ -163,7 +163,7 @@ endif ()
  set(BLAZE_CACHE_SIZE ${BLAZE_CACHE_SIZE} CACHE STRING "Cache size of the CPU in bytes." FORCE)
  
  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/CacheSize.h.in"
@@ -11,7 +31,7 @@ index fcb79e6..c04a3f0 100644
  
  
  #==================================================================================================
-@@ -204,7 +204,7 @@ else ()
+@@ -216,7 +216,7 @@ else ()
  endif ()
  
  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/BLAS.h.in"
@@ -20,7 +40,7 @@ index fcb79e6..c04a3f0 100644
  
  
  #==================================================================================================
-@@ -215,7 +215,7 @@ set(BLAZE_TRANSPOSE_FLAG "columnVector" CACHE STRING "Specify the default transp
+@@ -227,7 +227,7 @@ set(BLAZE_TRANSPOSE_FLAG "columnVector" CACHE STRING "Specify the default transp
  set_property(CACHE BLAZE_TRANSPOSE_FLAG PROPERTY STRINGS "columnVector;rowVector")
  
  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/TransposeFlag.h.in"
@@ -29,7 +49,7 @@ index fcb79e6..c04a3f0 100644
  
  
  #==================================================================================================
-@@ -226,7 +226,7 @@ set(BLAZE_STORAGE_ORDER "rowMajor" CACHE STRING "Specify the default storage ord
+@@ -238,7 +238,7 @@ set(BLAZE_STORAGE_ORDER "rowMajor" CACHE STRING "Specify the default storage ord
  set_property(CACHE BLAZE_STORAGE_ORDER PROPERTY STRINGS "rowMajor;columnMajor")
  
  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/StorageOrder.h.in"
@@ -38,7 +58,7 @@ index fcb79e6..c04a3f0 100644
  
  
  #==================================================================================================
-@@ -242,7 +242,7 @@ else ()
+@@ -254,7 +254,7 @@ else ()
  endif ()
  
  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Vectorization.h.in"
@@ -47,7 +67,7 @@ index fcb79e6..c04a3f0 100644
  
  
  #==================================================================================================
-@@ -288,7 +288,7 @@ elseif (BLAZE_SMP_THREADS STREQUAL "HPX")
+@@ -300,7 +300,7 @@ elseif (BLAZE_SMP_THREADS STREQUAL "HPX")
  endif ()
  
  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/SMP.h.in"
@@ -56,7 +76,7 @@ index fcb79e6..c04a3f0 100644
  
  
  #==================================================================================================
-@@ -304,7 +304,7 @@ else ()
+@@ -316,7 +316,7 @@ else ()
  endif ()
  
  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Restrict.h.in"
@@ -65,7 +85,7 @@ index fcb79e6..c04a3f0 100644
  
  
  #==================================================================================================
-@@ -334,7 +334,7 @@ else ()
+@@ -346,7 +346,7 @@ else ()
  endif ()
  
  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Optimizations.h.in"
@@ -74,7 +94,7 @@ index fcb79e6..c04a3f0 100644
  
  
  #==================================================================================================
-@@ -352,7 +352,7 @@ else ()
+@@ -364,7 +364,7 @@ else ()
  endif ()
  
  configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"
@@ -83,23 +103,11 @@ index fcb79e6..c04a3f0 100644
  
  
  #==================================================================================================
-@@ -360,6 +360,19 @@ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"
- #==================================================================================================
+@@ -379,6 +379,7 @@ write_basic_package_version_file(
+    COMPATIBILITY SameMajorVersion
+    )
  
++install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/blaze DESTINATION include)
  install(DIRECTORY blaze DESTINATION include)
-+install(
-+    FILES
-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/BLAS.h"
-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/CacheSize.h"
-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Inline.h"
-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Optimizations.h"
-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Restrict.h"
-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/SMP.h"
-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/StorageOrder.h"
-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/TransposeFlag.h"
-+        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Vectorization.h"
-+    DESTINATION include/blaze/config
-+)
  install(TARGETS blaze EXPORT blazeTargets)
  
- configure_file(
diff --git a/ports/blaze/no-absolute-paths-in-install.patch b/ports/blaze/no-absolute-paths-in-install.patch
deleted file mode 100644
index a601a37e7..000000000
--- a/ports/blaze/no-absolute-paths-in-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0d102ab..5d918b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,7 +36,7 @@ cmake_minimum_required(VERSION 3.5)
- add_library(blaze INTERFACE)
- target_include_directories(blaze INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
--   $<INSTALL_INTERFACE:install>
-+   $<INSTALL_INTERFACE:include>
-    )
- 
- target_compile_options(blaze INTERFACE
-@@ -48,8 +48,8 @@ target_compile_options(blaze INTERFACE
- #==================================================================================================
- 
- find_package(LAPACK REQUIRED)
--target_link_libraries(blaze INTERFACE ${LAPACK_LIBRARIES})
--target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
-+target_link_libraries(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LIBRARIES}>)
-+target_compile_options(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LINKER_FLAGS}>)
- 
- 
- #==================================================================================================
-@@ -57,7 +57,7 @@ target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
- #==================================================================================================
- 
- find_package(Boost 1.54.0 REQUIRED)
--target_include_directories(blaze INTERFACE ${Boost_INCLUDE_DIRS})
-+target_include_directories(blaze INTERFACE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>)
- 
- 
- #==================================================================================================
diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake
index f82179a0c..a44808249 100644
--- a/ports/blaze/portfile.cmake
+++ b/ports/blaze/portfile.cmake
@@ -3,16 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO blaze-lib/blaze
-    REF v3.3
-    SHA512 1210db57fca04832ff9382cbb904f22f70eab3acbc355a1d22435bfe042d6acac7f86a908d8654cf49517c2ad825cd8be19f85b20b1ebd46a79d474a424653c8
+    REF bbe39c81b68eb0d8647da703899e1ee4a82cdfd3
+    SHA512 84eb8226672d9d11d194d165e7aaa333a0d49ca090bb94472f19242e5f2ad0c3e08a30cdafe055cff51b210b603533f879800bd6784f3ffdb0d9eeca65d58b25
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/no-absolute-paths-in-install.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/no-generate-to-source-dir.patch"
+        avoid-src-dir-generation.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/boost-accumulators/CONTROL b/ports/boost-accumulators/CONTROL
index 7c3b8aedc..4b72307ca 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.67.0
+Version: 1.68.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 f4e5abf16..1dc10c580 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.67.0
-    SHA512 f68e35b502f22af605d8d5c1648b856cbdeaa2f592ad1a7732ea2be6d9207271f4842320875bde693651479c39a394055fb2315e5422a6ebb623412fb44b2a04
+    REF boost-1.68.0
+    SHA512 a85e2f307a2f6c08378f595bca14d458da6ffb1b0f078d2be789a4ae8290296b2256ba91ed22ed89542a585efd8f6c1f7041711d8000649bd6141b22f1c77b81
     HEAD_REF master
 )
 
diff --git a/ports/boost-algorithm/CONTROL b/ports/boost-algorithm/CONTROL
index bf9846b26..2d392879d 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.67.0
+Version: 1.68.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 55f8ddad1..631f93053 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.67.0
-    SHA512 74509b979d71c1aa21734555022c056b4ab508e01e715d469b0021704654cc27db91ce41266bb567b62d5cfafe0f92d1c0fda67f917b5198b0326713240c2e77
+    REF boost-1.68.0
+    SHA512 e5d6fd1a64d2c153b8135a12ce8fdd830a8e8138ac34dca8c0737eee5ec95238159dcd7422377f1cc50860ab47d918faa3ae802bfcab0d3e86dce689c2933114
     HEAD_REF master
 )
 
diff --git a/ports/boost-align/CONTROL b/ports/boost-align/CONTROL
index 11f7f2090..f53211a11 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.67.0
+Version: 1.68.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 28c878dc4..74656ba75 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.67.0
-    SHA512 4dfbe372e977787067b7d270bd54f66919e48620300552f76ec3075e02e4514214d3bd8b5ff83599b7f277a8cafa95e550620231bfe366f38aa26ee51c6ef942
+    REF boost-1.68.0
+    SHA512 70379431769ffbfd3e5a6f1d9580a0d70933925ba7cf6a862fbe0f257b4ccb66b86ece6af7d78c16835d836012811708f179da2956c0851388f4ce38ff056b5c
     HEAD_REF master
 )
 
diff --git a/ports/boost-any/CONTROL b/ports/boost-any/CONTROL
index c420de0d9..f41679d93 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.67.0
+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
 Description: Boost any module
diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake
index a5fbf5279..3020577ab 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.67.0
-    SHA512 1fd58fdd94cb08078f77d9131568255f35afb63e52a66379d14b35d5d9572f97468fc8a70b966d2c13b28149ccc8659ec0ba70c3cbda62ae08b8f8f1961c15e4
+    REF boost-1.68.0
+    SHA512 bf9a7c3c761496a67a25cbb00ea5b7858ea629a6f99627f946a55e60b6c65c9eb0facd2e6aa613247001eebe4da34983083325e198869dc07854f7a41a799478
     HEAD_REF master
 )
 
diff --git a/ports/boost-array/CONTROL b/ports/boost-array/CONTROL
index 429743ad5..04b1dc039 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.67.0
+Version: 1.68.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 e0245f551..817cdc01a 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.67.0
-    SHA512 db8ae6ffa7b29405d3e140acc22dd5bba9c7eade435fa2235b4c54e1c45c1bb28b927e4168ce4811a0206b83fe99580feffc6ae36a8c6cf99f6b13a2eb0682cd
+    REF boost-1.68.0
+    SHA512 cf6fa97a21f688888fc2c8c3982681602ddcba04f7821c6af0ad512074983c9a93befdf8e0dcf4336f5dc6d26117f4376fecc508b4ada9bb7f186ce7592a1102
     HEAD_REF master
 )
 
diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL
index 2fdc3dc0a..b85abb532 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.67.0-1
-Build-Depends: boost-coroutine (!uwp), boost-date-time, boost-regex, boost-system, boost-vcpkg-helpers, openssl
+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
 Description: Boost asio module
diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake
index de750d6d3..ec0ccbee6 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.67.0
-    SHA512 b7497608afa49580eeb9a74feefc624eb66a3e6db21f2a65291ccb287fe60dc8d923a9143bc10e73b8508ec2ef094e6caf2ef96528790c5324b6aceced55f29f
+    REF boost-1.68.0
+    SHA512 287aa7b4e37e97df10d196b1b409d38c19a025c18228df1ba9bb7dc19d53c9f51b69699e71b04ddee030710e08cb9c4b34eb08f8284d3fa88a762ed6fd096dbe
     HEAD_REF master
 )
 
diff --git a/ports/boost-assert/CONTROL b/ports/boost-assert/CONTROL
index 701ae791f..c2fa170a7 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.67.0
+Version: 1.68.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 d37ed3bee..1b162fd25 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.67.0
-    SHA512 e0559f543bffc1acd6a95bf54978a29eff42c6e8c5f825a7b93cb652a5260bcfd5eb1a09b2859e9a3621c3438e7670e4e4132735acdce4d43608cfdf426e5444
+    REF boost-1.68.0
+    SHA512 fd5ffc755f9f0926adeb1d0f3ceea448094e5dcd94c3c9eaa203676bb790729c8e02e66633535f7eaa1df186d88eeb983ed894c181666489a6a3bf9323a8eac0
     HEAD_REF master
 )
 
diff --git a/ports/boost-assign/CONTROL b/ports/boost-assign/CONTROL
index 1f3046320..842661699 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.67.0
+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
 Description: Boost assign module
diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake
index a8b01985b..e223ea18b 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.67.0
-    SHA512 e7fd39fc4bcf7cc97c3f987a2cc7434c51d23fe47dbd480ac9203209c61db0883b479582adcfdef22b9f007df3467b43da72bef8b186ea8c5883a85013394dd2
+    REF boost-1.68.0
+    SHA512 95c2d653e5523d54664e7ed7844d0aa2ccb01c73be2c777b6f8f3c1c738f1bd41c20332d52add7fc6c46621558a09c986a6757b6374a0a54dddfba004a9bb3a0
     HEAD_REF master
 )
 
diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL
index 488cbe7de..b207ebc10 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.67.0
+Version: 1.68.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 12f253805..ae7fd3141 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.67.0
-    SHA512 4a4ab037e17c6c2a5a1ae5acb880392f863daa4cc87ca22349d9da565b229d68ce1befe96d7457778dddd40afb95266d6cb45552a46d9679f7bc935e8fb16b85
+    REF boost-1.68.0
+    SHA512 651c02ce0b58458114d4e196eecaf614a781c383ae9b42646d040b3e84babf9983efebed08bb60343eb9beeb566a6ae508ad230ffebae1e7731053529c723eab
     HEAD_REF master
 )
 
diff --git a/ports/boost-beast/CONTROL b/ports/boost-beast/CONTROL
index 867f09008..71ac84478 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.67.0
-Build-Depends: 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
+Version: 1.68.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 355d5bc3e..2a9658e11 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.67.0
-    SHA512 7530553985c8beee0b24b1ba77b8c6e2279315c74c20f8d6d2f2028fb6fed6c80f81eacb8a2de6fce651fcb6bf0c9d67f65234cb2e1fd433e0f6ceda1566e5b6
+    REF boost-1.68.0
+    SHA512 889b5285dd7cca86561bc81c8d152dbc1c281b6b9fedfdb95710de94c8582aaaa150ee1a9d9e11f18f79ef1b336ff44dbd2f7614b06342ea9d7b6ad8f2eb60dc
     HEAD_REF master
 )
 
diff --git a/ports/boost-bimap/CONTROL b/ports/boost-bimap/CONTROL
index 9bffc6bbc..64e293c97 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.67.0
-Build-Depends: boost-concept-check, boost-config, 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
+Version: 1.68.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 a9b8e0e12..51ee94385 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.67.0
-    SHA512 c142c149fcfd0a33e130779a0a9f9be41d077703137b6537bfc8c8ed7ff9031fd8e196f076791e00450a286c1ace56979ee7a0c59348f304f2d41daf12aba355
+    REF boost-1.68.0
+    SHA512 f8e994043e41eef2270f78e7d310ac3b86e667be93e7aa04e0fb97a207f75ee1c587fd4cfda741ab19e0e7e8313b24dafe57e93d9d78a6a08cc306fdff3f41d6
     HEAD_REF master
 )
 
diff --git a/ports/boost-bind/CONTROL b/ports/boost-bind/CONTROL
index bdc97f096..bb6c1825d 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.67.0
+Version: 1.68.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 e55b91055..3f7696f31 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.67.0
-    SHA512 4172a426fad408f06f7e36f90396158b8fb345ff7b4147ec3471771d465335c9b01f7e7dda040c842684a5c6eef596ea4c8f7b803489fbddfb016e48e3fcf8fd
+    REF boost-1.68.0
+    SHA512 da8c25851bf1083aceafe2972393544009ddefedbdfc40184c95e6a7fe9403ca73cbdfc4a8d583503952cefb6fe14c2f7068eb8019916100fe00aaf205198470
     HEAD_REF master
 )
 
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL
index 678914811..db12d3b3d 100644
--- a/ports/boost-build/CONTROL
+++ b/ports/boost-build/CONTROL
@@ -1,3 +1,3 @@
 Source: boost-build
-Version: 1.67.0
+Version: 1.68.0
 Description: Boost.Build
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake
index dfd507997..e420fc1a5 100644
--- a/ports/boost-build/portfile.cmake
+++ b/ports/boost-build/portfile.cmake
@@ -11,20 +11,20 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/build
-    REF boost-1.67.0
-    SHA512 93aa3f0c76245fefe2ceabde9c287e7738f79cdab71eeb42ba426f06e7846b5da5c00fc7581d7f31135687e10660521d34c7ffb1ce7299b70d7330a81b0e5acc
+    REF boost-1.68.0
+    SHA512 ede4ea6bba966bfdc590ea21b8787f090c690db851fd6eb19644f089de8828b6cec504a7f4be203d57017de2a0288f0e12772e50d9017287221520dca1676a79
     HEAD_REF master
 )
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.67.0/LICENSE_1_0.txt"
+    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.68.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.67.0/boostcpp.jam"
-    FILENAME "boost-1.67.0-boostcpp.jam"
+    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.68.0/boostcpp.jam"
+    FILENAME "boost-1.68.0-boostcpp.jam"
     SHA512 4d887b05b4873e651fd9bc20f04fc072c7d801fd50445c989517cd39c3a8aa132ed46c407fb0efb35825fc0fc1035393d5ac0da5922be2c120cf2bfff952b3bc
 )
 
diff --git a/ports/boost-callable-traits/CONTROL b/ports/boost-callable-traits/CONTROL
index 4951e77c5..637b50d0e 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.67.0
+Version: 1.68.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 7d262945f..166fb666a 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.67.0
-    SHA512 5a6dedd5b8c4f57d4e896dbd963927459a42cc2488dd09628b5cc484327d21b32d7f5f2d976a55b4a62783faa4688b6f020983030bfc1f4307acf7f66b179fbc
+    REF boost-1.68.0
+    SHA512 1c8d7e95d92996a046cc849216e00ee781b1ad8d9f6e4b7d584ea77bedf7a86a17ba0b43863d445f870a1a7991022e9c1a34fa7039de6fbd419a1bbc2e0e94e5
     HEAD_REF master
 )
 
diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL
index 529526653..2b34389d5 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.67.0
+Version: 1.68.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 2918d3e9d..c743a1919 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.67.0
-    SHA512 ce86585c30b7500dd9f75074325428b57278e5bd88e6accbee235477ff73a0056fffae40ec0d88bcd28bfa59c4b37f290a618dc5af684dc6fc89302358d5d049
+    REF boost-1.68.0
+    SHA512 a124d6588839405163dcf5de1a81bb8bc57cc0e8914b16ba1dc4cd2dd5497617a03c940c7ef53328ed724a3ee518169454af439168b7f257ad0b6ea8219c986c
     HEAD_REF master
 )
 
diff --git a/ports/boost-circular-buffer/CONTROL b/ports/boost-circular-buffer/CONTROL
index 53c0acf58..01fb2cc36 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.67.0
+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
 Description: Boost circular_buffer module
diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake
index ad1753f8e..24c85c55b 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.67.0
-    SHA512 1c1f085f81def77135b95fd3255ef0280c84c7f899b632b91c28bdc33dcfff8eaef3f9f233a356499756305a11c4a33022b72a46b990ec56db73ac4036711c45
+    REF boost-1.68.0
+    SHA512 da2f34f331b3fb24ed6147a67b242f3f4d14eac5fdf524ff57ac6acff0fe73b91bd1d374e61f0314465d5f09d3002bdb442cf2ac5c505b1276d4dbdf75b8cc2a
     HEAD_REF master
 )
 
diff --git a/ports/boost-compatibility/CONTROL b/ports/boost-compatibility/CONTROL
index 3379e76da..d7aab8193 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.67.0
+Version: 1.68.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 41f9b81fb..4f3b3258f 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.67.0
-    SHA512 d8733176ab4d208d5d44fe2a14c73d0309f62be5c2b9b9f50558c44c034c4f727260787185696bbaf5051b359bb14435cdc467644251e5d67b0b945d8f3b84a1
+    REF boost-1.68.0
+    SHA512 73124528957098af9480e776419d3a5ed86ec954695c020075e16730de5bbfd8f104e9463bdbc8996423d89ab5a775dc76b5b9127a44a2f53e4691324776bf17
     HEAD_REF master
 )
 
diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL
index 094eae8b6..2bcd3d1e1 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.67.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-uuid, boost-vcpkg-helpers
+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
 Description: Boost compute module
diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake
index a31f9d897..61441381f 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.67.0
-    SHA512 d7f470eb2dcf96198d68d61edf8d53491819f8e29452f80e4140e34a11e044ecd45cfdbcd28cc29da2e905c6f324872704d4a834c62242050a0d5fc46deda029
+    REF boost-1.68.0
+    SHA512 f80233128e18b68a592c0585c3721254378a45615a79f8d379ad1654548428a86defe7a5147caa8ad955f3f45a568b81e7d97c08cde46f36f7908e670162ed3f
     HEAD_REF master
 )
 
diff --git a/ports/boost-concept-check/CONTROL b/ports/boost-concept-check/CONTROL
index c5f814b20..3d215f848 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.67.0
+Version: 1.68.0
 Build-Depends: boost-config, boost-mpl, 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 fae7c074c..69ba3a7d2 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.67.0
-    SHA512 82b67cf07b455b4775bc10a872d3b181af6bf689c7b3cd14160da9434965607840dd200a33f9286cde6c8aabad13a0af863c584d93eb1510bfb8a099d0169076
+    REF boost-1.68.0
+    SHA512 6f7f819fb8e8d03eb8f2f323e50dda583254e4ead58093c74d84271cb4d2ea5c25cac0c0aeffe97a8e209425d844dd6d7fcd687d0690e09b5e8c6edcd0ea6af2
     HEAD_REF master
 )
 
diff --git a/ports/boost-config/CONTROL b/ports/boost-config/CONTROL
index ba249ccb3..49fc221ac 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.67.0
+Version: 1.68.0
 Build-Depends: boost-vcpkg-helpers
 Description: Boost config module
diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake
index 0e705c2b7..899814d49 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.67.0
-    SHA512 517dc632e009c052f7d594c715342a2d94a95e0bcf466c3e3fbab1de38b7314846733f98e7010c386a5bab81d365fb6a08be04d21bee8c93450df97c53a12791
+    REF boost-1.68.0
+    SHA512 2b10be87e3d1a9a64b8b4459ca3427bf6187c53eeaf4551cf3755e4ee6b45e16a28539db0780e6392a3bf862feccffb38042cfb3a8d7f230caa5139ee94b713e
     HEAD_REF master
 )
 
diff --git a/ports/boost-container-hash/CONTROL b/ports/boost-container-hash/CONTROL
index 1e50b4400..2facaaa42 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.67.0
+Version: 1.68.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 c9692bd76..223bd63eb 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.67.0
-    SHA512 6d9916c1ad2483c6877ecf5141c724319a9d65b672ad1c0d7cf5ee396755788cee78955b8cd4a1bf5f5351c68d78b0cc8a4993c70379639eb1a85cae940c06f3
+    REF boost-1.68.0
+    SHA512 a0d259fbf66444edbebfcbc02215d2c9bda1a7affa841caca49635bf627a434a8bcde6a8f8e8a49ca6a506d2705d5b6d9a62c7da2fa0626a84690f7c4515991b
     HEAD_REF master
 )
 
diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL
index bd2afdfc1..7f1ebd197 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.67.0
-Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-functional, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Version: 1.68.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 58ab998b4..cebcd4034 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.67.0
-    SHA512 559479466cf75ee7ce8f88d1c465f9c375722c954f2a833e842c732ba3dfc70bd30ae10e42e11afc043edc52767cddcf1f925b3c88f9d2c026f3e422ababd397
+    REF boost-1.68.0
+    SHA512 648fe7ee8442ac56604e515d64a7932f852319a216b345745714db4d37fce80cf46140a8b14d939c25d12372fb6ee3db55ebaf23f0928388735330d8ddeff7c1
     HEAD_REF master
 )
 
diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL
index 5797590fe..72a71a27f 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.67.0
+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
 Description: Boost context module
diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake
index ecdfe4d69..fbfdb98f0 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.67.0
-    SHA512 4d6f7c0211c6941c8089d844b4ceae45322c2089ce41c029a21ef9b4fabdc0030a0c99fcc6c6be43d10372a171726b03a62aecae0241b8f2427439a2a283c306
+    REF boost-1.68.0
+    SHA512 6010cac31d408a9e4a47640b521da810240c697b529e85f97650f022397a55f1b509baf72076fa6e9ebec556c7a38d3da5045e9584c4dbde3d85fa61a5f91043
     HEAD_REF master
 )
 
@@ -19,3 +19,9 @@ include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+
+# 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()
+\ No newline at end of file
diff --git a/ports/boost-contract/CONTROL b/ports/boost-contract/CONTROL
index b881538b1..55bd2d2f6 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.67.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 (!uwp), boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.68.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 a83fe112d..98dc19d93 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.67.0
-    SHA512 f0d069773d9c152be01ef803f05f134ee85190f44eec3147b8d9c025b7bf21f8b674141add0e249b0d8bb66b8d5d24f4f0e2d5b6e838ea72e38d3c64aa76c436
+    REF boost-1.68.0
+    SHA512 bcf68ae08245449f9bbe5987c7afc3a20b2b77c80d615e2463b6f215331032cefdf217976077e0c9622f1376d0226b53aae64ae4b4e53265179d208a0a0f743f
     HEAD_REF master
 )
 
diff --git a/ports/boost-conversion/CONTROL b/ports/boost-conversion/CONTROL
index 516434726..9d59d42ff 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.67.0
+Version: 1.68.0
 Build-Depends: boost-vcpkg-helpers
 Description: Boost conversion module
diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake
index 067f58c66..4821ee6a0 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.67.0
-    SHA512 6a8bdcec46a08b6b29a9288c24e6dd868c694ebd33ae8062c8ee9784be91d12031cda27841ea9f6212cdb8f0e9b9b21d68ccb96c3d38011cad5c93bfc62a568d
+    REF boost-1.68.0
+    SHA512 7b207134766cf68607e575374cb936c3718328a4d0e9ae1cc245bb0ef727a9d6961a11974cffb2b9abe99f82948d0f7b7f1e9404a55091d88fbce9aab1d673f5
     HEAD_REF master
 )
 
diff --git a/ports/boost-convert/CONTROL b/ports/boost-convert/CONTROL
index 807fe0380..96f967ed5 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.67.0
+Version: 1.68.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 693a9178d..5b85d0a77 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.67.0
-    SHA512 c51909030b2263a7f837e3732824d75b2fdf8b585c560f58e90ca8d2e6e3c48584cdc52e70f1058ef1e7fbe66085abd6053484025d14fb26201beddcf89c91ff
+    REF boost-1.68.0
+    SHA512 8493a2dcba56c6d7fe9cfb1cea1c4225be5112903071c450a2044462adc46e81bc4c98e3a1a5096b146069686250895dae00d0bdb7e1fbc2627325666e9b744d
     HEAD_REF master
 )
 
diff --git a/ports/boost-core/CONTROL b/ports/boost-core/CONTROL
index 2a765e76f..82b3cf767 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.67.0
+Version: 1.68.0
 Build-Depends: boost-assert, boost-config, boost-vcpkg-helpers
 Description: Boost core module
diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake
index 29a2b6a1f..1273a72c9 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.67.0
-    SHA512 3b00c5893012e420c0faf6de3b43c0c4ae4645ced19b7f10403c6a7cd194954df7a4462999ca78226b29858848690223657e4eef9b6cf36d92828d5642057381
+    REF boost-1.68.0
+    SHA512 3870a595e146172a9e126d0894b4809bc776d66490f3f77112ca34f2c5c559576c732e3dd381d9366b25e46ace6a548741875b9992949aafa7cb5d395e3c9c48
     HEAD_REF master
 )
 
diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL
index 6a0a4a69e..e2fcae43d 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.67.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 (!uwp), boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.68.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 4b0e88cd1..6f4f8d92f 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.67.0
-    SHA512 c636fc88a981d983f29cf5721c056d4c2cedbd48fe54d0aa4f2069ccb2c7438ee661167ff87298c22d7d84f6c61b1dd677d1ea91733e5e8fb04f7033d1559f63
+    REF boost-1.68.0
+    SHA512 47edf91ffdcd4ec8acb98b54f7baa19f280b4d865a6810ee26bbb13cc8f9233e8bbeb8771fa796e2b2fef393352981b737c7987da31095ef65f48f62a8a2d092
     HEAD_REF master
 )
 
diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL
index b9701bcb1..c5ba714e0 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.67.0
+Version: 1.68.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 55d637732..9ede6c004 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.67.0
-    SHA512 9ff6607abb4006a503da52915d2f8f653d68a64fd0501962eee49393229be7d9fa35f0f4564306413271f08d33317e55475c0789e36639a178044f1424215097
+    REF boost-1.68.0
+    SHA512 62601d2081a592394ce443b295a9e755513a5e0b10c8791c33dbc4436c37775765a9ac9e49a8a74182759796e1953d1d9fa13e6dcb021b602386eae77d6eda78
     HEAD_REF master
 )
 
diff --git a/ports/boost-crc/CONTROL b/ports/boost-crc/CONTROL
index 2c51d0629..bd8f43151 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.67.0
+Version: 1.68.0
 Build-Depends: boost-compatibility, boost-config, boost-integer, boost-vcpkg-helpers
 Description: Boost crc module
diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake
index a045eedee..03f0a43de 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.67.0
-    SHA512 9168aed67125e955abd8e689bbbcb780adc16345447e1b781344b13d66827ab24ad2af038e10153c64bc458b66cf2cfe2961ddb22a3c494a86429dab60349a18
+    REF boost-1.68.0
+    SHA512 8d29e20bae0b86bb7592b08a25d0a5c2b8ff83c1ee5aeef1cb9f1b97fe798f743b4ad6c3f1dc59fec54761b2440fc6c8cdfe6f7f4eb7c7352a3ff90c383abf87
     HEAD_REF master
 )
 
diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL
index 89af5c17e..348290261 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.67.0
+Version: 1.68.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 fd5ce947d..0e664c2de 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.67.0
-    SHA512 e164bc45bb7e4836521b31cb75a0fa3e960d0bdd0c7dabc4f8f457056c54b54bbd06f44a934aa5c7f2ee680f2f994b9fba47a0e460287c8e2d22b49450fc0872
+    REF boost-1.68.0
+    SHA512 c48d488cf72bc2a7e10e6068fe1b541718bf1f402ec20bbae56da4b0f712804e21ed7613dbcd5fcc6f90adc59d867bb88c4ddd35d3200e50d291ec9d213660f3
     HEAD_REF master
 )
 
diff --git a/ports/boost-detail/CONTROL b/ports/boost-detail/CONTROL
index ab5e1efd3..3782d8900 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.67.0
-Build-Depends: boost-compatibility, boost-config, boost-vcpkg-helpers
+Version: 1.68.0
+Build-Depends: boost-compatibility, boost-config, boost-core, boost-vcpkg-helpers
 Description: Boost detail module
diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake
index 93fe10eb1..0a4e1b2e1 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.67.0
-    SHA512 3746e61719cee4e7307677633edf170f8824b8fbd9aa7f159c9ff1feac662fc73f9a4bbe06fad9d9c5fbe356d6ec398d53223ddb7d85c01f906fe698f217f8b4
+    REF boost-1.68.0
+    SHA512 0e8188bc2ec189754a078b2b875d996dd485972ac995a999bf5ebbc6379ef299e7ba8d38066efac2d37d6a12e7ed6ee97d120ac334ea022a54609a18bd2447ec
     HEAD_REF master
 )
 
diff --git a/ports/boost-disjoint-sets/CONTROL b/ports/boost-disjoint-sets/CONTROL
index a3ea6717d..bce4318a6 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.67.0
+Version: 1.68.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 8115c4d8b..71afb65e0 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.67.0
-    SHA512 cc792b79935983656b40785520e3eef9b578a69fcc3c54b3ba24d60a8a36fccc86722dfc4ea621aec727d6c73b22586dbd38f253293dc46730cc418f6832bc33
+    REF boost-1.68.0
+    SHA512 3ce49942da8b37ad9a094bfbb7eda38efea2d50f70192246e955d4d34970b1069e1c04bdfa1272e6d92a31875b335e2eb2333ed66dbb8231d8206c5faac618a4
     HEAD_REF master
 )
 
diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL
index f5b9f1b63..f1787f9e1 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.67.0
+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
 Description: Boost dll module
diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake
index 51ce40f96..485476cc7 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.67.0
-    SHA512 bf8bb5e422abd2cded6aa1181570db487f2db786ce8261ed1816eae7e6a8386795f91d8c5ded981a691c19d82a5bffb2aabfe6f5c95ceccc6e22de35c854b21c
+    REF boost-1.68.0
+    SHA512 5f45561397b8860da4cf9839bb7dbc79127c90f4134d038933414eb44cd1b2af422ee83df08ff6561e7dbab408159e64ef1c34594d1037a978478bd3fb4fa3ca
     HEAD_REF master
 )
 
diff --git a/ports/boost-dynamic-bitset/CONTROL b/ports/boost-dynamic-bitset/CONTROL
index 7910a4010..9f7c179e2 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.67.0
+Version: 1.68.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 a612a4a7e..8ff4350fb 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.67.0
-    SHA512 242c7f79a50c98357017bfd09a3d2b27b2a9f1f8e12518eb497bd684ac9cf2dd6afdffb417a135a3648e40f4efb10c0f45703cff302212b8bdcf35ab1428955f
+    REF boost-1.68.0
+    SHA512 7fa486d3088966fedcc30cced1282b997da39134dc1dcae3382a532c5b64a1965b761f8fd130ca7901aabd77375a84c66597c509c612ba1f99c238c0a754974c
     HEAD_REF master
 )
 
diff --git a/ports/boost-endian/CONTROL b/ports/boost-endian/CONTROL
index 80aff90ad..325a29aa1 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.67.0
+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
 Description: Boost endian module
diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake
index 18ff7dfaa..79adace7e 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.67.0
-    SHA512 198cb5eb9b9f9a4ca6bd069c79f9222e748248d7f7f8231ab9b288334f3f77c37b398abc5d097463a4ce69b4f0de209f247d5f15b1ccdd0fcbf036009ddd73ad
+    REF boost-1.68.0
+    SHA512 40d7b241198f3146b0dc4ff7ea637f8fdc28b2dca12badaeea6434ba1c56f2bd6ab0027e84da3805ba57daf9e3f99994bb2fbcac491eca39bec4e16b363c7da1
     HEAD_REF master
 )
 
diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL
index 0a64b7cb9..f1d18a047 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.67.0
+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
 Description: Boost exception module
diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake
index 19c6c2058..e84166be9 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.67.0
-    SHA512 b5b27177ea5e434b7d8898b281a43ad1e74b02ce80b9cc184b34bebc3d43e39fe72b84003096f320b2fade1d0cfaa0a56d0a228fd96782cdd32c2fb143b78ae2
+    REF boost-1.68.0
+    SHA512 91eb014c73afe3dcedeacc827e12705530d97f1f3797cadcd17972ce016df630bb22eff27c5f2aec7380047264b90072ba4f17d37e93dbccd5cac7fdd7e32b2e
     HEAD_REF master
 )
 
diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL
index 1e200489f..1dd685de9 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.67.0
+Version: 1.68.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 244192dca..7fddd97ef 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.67.0
-    SHA512 2f29021b781a853fb0b00cb7a6e0a541f17d71af4f33e9a47fd875e06d3073e703dfba5cdc7a349b735a1083eff5039ebb227204f7e56f4ad949cafc485095b0
+    REF boost-1.68.0
+    SHA512 54325a9b6fcb7d153fd8705a44a802ad34d55af042bee9b74beebda6c66e470cf08bfe49ada6c8d9f2603847d7b695ceba7ebed8eaf1dc3fdf069d07717a47a9
     HEAD_REF master
 )
 
diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL
index 503a4af37..cf685a086 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.67.0
+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
 Description: Boost filesystem module
diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake
index c80609e37..d177e7b18 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.67.0
-    SHA512 a81dbf5dcf1b7bde572b02276ee25f78c5673d64aee8b5f864e6b2e04f29cdbf8ecd469b1f039bcda3b490372d3387121a896bf7faf30f767f63c107a1cf581d
+    REF boost-1.68.0
+    SHA512 0861e64016e5c133f811735701814e0d35b99366835fdb9de0238e6c194b1c029d8fae9a1bb32e518729eab33f4e65700f8a5e5f14f06c64085873946dbb9163
     HEAD_REF master
 )
 
diff --git a/ports/boost-flyweight/CONTROL b/ports/boost-flyweight/CONTROL
index 49feb377c..0817a8d62 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.67.0
+Version: 1.68.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 ab0e36ed3..cf4c0a141 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.67.0
-    SHA512 eec64c8c0d473e6bb07968c8cb2dd9c12788a72008d59c8b53b14ea15ada18e740c518df6bcece1cecd13f9511898c69e00693a769404d4e51e2f7efb6c00754
+    REF boost-1.68.0
+    SHA512 0d27d844d3f0899013d70f29c507cbefc67b76a4b9803aada0201946907705b1ac81aefda88855252806284e3ea9e074769f26eb65ae1d82e3ffec4a0ab59951
     HEAD_REF master
 )
 
diff --git a/ports/boost-foreach/CONTROL b/ports/boost-foreach/CONTROL
index 72cc98a56..914f3b565 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.67.0
+Version: 1.68.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 59977a213..4e84360d8 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.67.0
-    SHA512 67cce17f58564a1ab09f85f9da3c73135dab2171be9487723e69d1bf10cb1abef2aae3747d39ca605510505510943a114d7637d49dd5f3b097c191b4993052b5
+    REF boost-1.68.0
+    SHA512 501f7caf4f0f4119e110aaacd6530cc7ed6df75b39e9fbd4e3423e4089f7ebdf2ae918a09ae140fdee4ef4eb9f787df21fe1c664aa031cdf1bf4fc447c9c69b0
     HEAD_REF master
 )
 
diff --git a/ports/boost-format/CONTROL b/ports/boost-format/CONTROL
index 0b8cf858d..c23ee8cf7 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.67.0
+Version: 1.68.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 d88559d64..7e0537e06 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.67.0
-    SHA512 31d355d0986f18f32373a45ee6a5d4d8f688dcc3bd13fdf388dd77166459871deb33bc7ecc9dbbc46fcf546ba3ed8a475c5f4fdcf6377af320ec18d15a9a35d4
+    REF boost-1.68.0
+    SHA512 556acda0d0c7f7dc16cb83d0184aaa14dd0b1978f09c52dacc02a3e86d5d39a18e58d46818a18be36f781177538aa927c74cc48cc7bf5647aafc0ff1d4097d56
     HEAD_REF master
 )
 
diff --git a/ports/boost-function-types/CONTROL b/ports/boost-function-types/CONTROL
index bad8d7e56..9a9bcb58c 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.67.0
+Version: 1.68.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 ee327ef33..06ea8e7d3 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.67.0
-    SHA512 843c87d527615c70524cd537252619187aa8088aa5e7f46bffa7d1bd75ba8852901ee89a15490ea90b0be331712d0e8b4db369f9aede83c150b7201b430f0adc
+    REF boost-1.68.0
+    SHA512 1b3c41f5bb63b2ac6e2c303c66846c0e0041c536630dc0fe8260d72e91997d991fede951dc22809523c56f6bd951bf61e5c26f9fcef5d0b1721a1fcfa678008d
     HEAD_REF master
 )
 
diff --git a/ports/boost-function/CONTROL b/ports/boost-function/CONTROL
index 8a45b4ae9..67885ee6b 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.67.0
-Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-mpl, boost-preprocessor, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers, boost-bind
+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
 Description: Boost function module
diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake
index b8c0a6841..277bfb99a 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.67.0
-    SHA512 8484b7bcab099a0c96dc021a0a33551ecb0b56fee4bbc6c5a43becc0a82f307f3836204857bfc45aa2db255c7faf61831e8a46f537ebf9bd5730a408c7103c7c
+    REF boost-1.68.0
+    SHA512 71e472987e07a3b60a60231b8e8e18a5ea7883ac9535741fd3ee1e95358e92ac4e00ed94f2428e31483f68632504704b245ad9bc42500a987eb11bbdbce9a7cd
     HEAD_REF master
 )
 
diff --git a/ports/boost-functional/CONTROL b/ports/boost-functional/CONTROL
index 7b5b90be4..5abca38fb 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.67.0
-Build-Depends: boost-config, boost-mpl, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.68.0
+Build-Depends: boost-config, boost-core, boost-iterator, boost-mpl, 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 89ac3b17a..0dc76ca80 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.67.0
-    SHA512 05f8149975166b68a32e0e98b08b91e41b19d2304416afd62dfceaabf76323ee4b711aedc0e5379520d9e4decaeead1e6b8121737732f524d31664a3777670ba
+    REF boost-1.68.0
+    SHA512 ca784716ed5fe2991cffd60534088e810854fcae1286fc9483d972e2d3c4f5fa6141943d276afcd3064a85f7407ee6db44fd3fb29580501972f6f3ebb8d3bcf2
     HEAD_REF master
 )
 
diff --git a/ports/boost-fusion/CONTROL b/ports/boost-fusion/CONTROL
index 62c087b14..679e8267b 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.67.0
-Build-Depends: boost-config, boost-core, boost-detail, boost-functional, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.68.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 164c4f70d..0a3848099 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.67.0
-    SHA512 2ac1af4f1a9aa9b90fb7057a8133e668207225a46e23c5ec1e65020b8a63c6daeabbf799f0b7aa9946fc5f9dded1003e00c68645363fa9e15014f2af7ea1498b
+    REF boost-1.68.0
+    SHA512 335400ecf1e9ce1e2cb40beb449a06e4d620d018c17383ffb6ee26a5fd676e2add905636db777e839d63639724b5745b740a65d92578e213b25ce2041afe14f6
     HEAD_REF master
 )
 
diff --git a/ports/boost-geometry/CONTROL b/ports/boost-geometry/CONTROL
index 52879d024..1d044e1a2 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.67.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-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Version: 1.68.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 9b63741e9..320e8f6ca 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.67.0
-    SHA512 25a2a758804597054442747f9a3288989aee92e42212b1837562d3c629aa1ed0c210e86cb83f4501f7e4280550b194a727ef26ed222ef627a8d260549781bcd3
+    REF boost-1.68.0
+    SHA512 eecfacd3398238651d3bf02d6d8a8eaac15b262fca8652c6a5a60292ce6ded940176a061a705acdf7176732f48fe20ae388fff65c96b5742275506dd0a587e3c
     HEAD_REF master
 )
 
diff --git a/ports/boost-gil/CONTROL b/ports/boost-gil/CONTROL
index 94770b5ee..0326d1318 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.67.0
-Build-Depends: boost-bind, boost-concept-check, boost-config, boost-integer, boost-iterator, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+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
 Description: Boost gil module
diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake
index 94e470ac9..e278c7e99 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.67.0
-    SHA512 a40b89a97444d62ed1c6ba2c4ccf6442df9d8afddd7a9af8eacb0a587eb2952faabbd608ebd17030c10a3ce77f32dc6d4bed846fa78a0f57f4b992c0333a2d33
+    REF boost-1.68.0
+    SHA512 d3a965aca410f91c214d8f433273e08eefcc20f0e470baa2aba3385ce45a0e18307aae3b81ea619abe39066e4fd924476b7f29c8f45e1aff25a2a7d3eb4062fb
     HEAD_REF master
 )
 
diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL
index e7435bd2a..d63394336 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.67.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-dynamic-bitset, boost-function, boost-functional, 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.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
 Description: Boost graph_parallel module
diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake
index 71b44bef2..26323675b 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.67.0
-    SHA512 f83c9bfb65c519e545657bd2e2752b37ce45d5e21877dd8a8fc36c895c5612cf0284508188be6b46719a5a5b771d5ad1e0fcb00a3082f7f9c5fb0788f2b9d560
+    REF boost-1.68.0
+    SHA512 668f8d2569cad12e5b5b173b0da012c1c43eb27e4a74d036b7bacdee3417a5148c8b30ecccbbd1b2cd30a8ffc92b6272a268b5595d5965a22a068779f8c2d1c7
     HEAD_REF master
 )
 
diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL
index a3345ffa0..ffc3d629f 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.67.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-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-functional, 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
+Version: 1.68.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 75048b8b6..b8285391c 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.67.0
-    SHA512 afcfa95744da4f4ceefced30601d64a40fa600e3d41311f6140588d8a23e54fcb05226c381fcef0b8b992d61b95a915c867e50221c5290b6c54b915546b3935e
+    REF boost-1.68.0
+    SHA512 97c05b444d5a4fbf8a881d5f674098b88afc6a331867357ff46c5372bd666847431e49e5f9fdca39a54bb1f56654c8c23a3cbfcf254e56743e7e9b20fe7fcd30
     HEAD_REF master
 )
 
diff --git a/ports/boost-hana-msvc/portfile.cmake b/ports/boost-hana-msvc/portfile.cmake
index c56926499..a736e9324 100644
--- a/ports/boost-hana-msvc/portfile.cmake
+++ b/ports/boost-hana-msvc/portfile.cmake
@@ -2,10 +2,10 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO xiangfan-ms/hana
-    REF caa985795ab6c4b2c7bcf1458ccbb6ded65c15cb
-    SHA512 7ed65bda17042c42f7a76d88e66df61155800066119f6b256e20cf04dcd18d46584d3e44ad6555e9a17d9c0bf85fbf173ae6079f5a4a878341f959c855ebee6b
-    HEAD_REF master
+    REPO boostorg/hana
+    REF 7f1ae3b1bb52f6eb329300a93dc02309c94dfe01
+    SHA512 5fe1962ae270901b58eec83750edd02cc7192b4fae4add72849efbb9989dd5f9a0e3a85f3e3a7525fce38e6ef5bca210993b89d04a1c39bd0421bd0a6f4c92cb
+    HEAD_REF develop
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL
index a64771061..df3af582a 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
 Source: boost-hana
-Version: 1.67.0-1
+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)
 Description: Boost hana module
diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake
index ef2bc9bb3..ebc34aac3 100644
--- a/ports/boost-hana/portfile.cmake
+++ b/ports/boost-hana/portfile.cmake
@@ -10,8 +10,8 @@ else()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/hana
-    REF boost-1.67.0
-    SHA512 45e8b9da8c09bd6cb74f52068f0e4af43f40126227ad5c557e111c8edce2e8857f5a11c6ecc6c57833041a38d9355a7c0263f9b84cc335725c994a9cb029411b
+    REF boost-1.68.0
+    SHA512 93b20dc496ac6fa58ae75d523b8782b7c17398e93286698b48666e59af0c7df7410153dc02a8c4ca940d02ed8b948ea6f47b8f884ae2867e0cc8741e09e643ff
     HEAD_REF master
 )
 
diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL
index 5724d68e8..9dbacc49b 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.67.0
+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
 Description: Boost heap module
diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake
index bdccbce0d..4ac883b05 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.67.0
-    SHA512 e8c511c8e1cdf0f9f20cf5923657f5a6dff2348a50570b0590444764106030bb40d7efa6e2087818ca71a11bf5fe62642ea08a4a8d7b2b25051f68a46c383a6d
+    REF boost-1.68.0
+    SHA512 3aac4ee8f4ce4c578f83fefb19532aa859c966fa807a2f156a2428c4e9d44e3e5c09ff4588b43a9dfe46f32dadde03e942f8025551c267e677b3aad20343cbd1
     HEAD_REF master
 )
 
diff --git a/ports/boost-hof/CONTROL b/ports/boost-hof/CONTROL
index 886630ca5..38d3ebc63 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.67.0
+Version: 1.68.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 59fc83381..5b8d97df0 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.67.0
-    SHA512 797240bb1a3ac0ed5335dd858db7816f7f07ce99794e5d7b16b08de82ae1d80e7de9f029673569d9f880cc616037299d50571ad7ffb94e30b2d7b08392b4d1c3
+    REF boost-1.68.0
+    SHA512 2400bd9f4329813802e569c608cf997c8fa571e042ab3811e780f7f95e69dc91ae9a31fc591aee75f80e85218147c442ed1b95aad533c5c4843310b5f9ced4ed
     HEAD_REF master
 )
 
diff --git a/ports/boost-icl/CONTROL b/ports/boost-icl/CONTROL
index 2923589ef..1464e6c7c 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.67.0
-Build-Depends: boost-assert, boost-concept-check, boost-config, boost-date-time, boost-detail, boost-iterator, boost-move, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+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
 Description: Boost icl module
diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake
index 087769896..8ab45b5f1 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.67.0
-    SHA512 1234057200f4329631041a6c1bc644e3096cb24df3e3b3c19bddbe9915e2b2e27148640666befa61e165e6143f47f83280e3a89f84b70c93fa07e6ab38d7c854
+    REF boost-1.68.0
+    SHA512 cdeba509b2b41c8dfcd808c5c6d478035cf48b0110e66889a8f9bc2183a8f5635e263f761894a3370d5ca421a08f2ab8c4f03b384ff3fe3eaeb9dce113d3c2e5
     HEAD_REF master
 )
 
diff --git a/ports/boost-integer/CONTROL b/ports/boost-integer/CONTROL
index adde53632..795c28fe9 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.67.0
+Version: 1.68.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 17bd4fbcb..6c9e8140a 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.67.0
-    SHA512 bac11eb68d0f0a29919df25e29352daca3f24ab4c183f2f052fbbe1e4c93ac15657b24f9bd450b31910b33c68234581e834d51651585bbba7e69b10646ab224f
+    REF boost-1.68.0
+    SHA512 3d257bb5b8313c2a884fa9959efe1f6d287c06e1b5746cbc4f9ae5694e61dfb2821d07b355d7e544594c9922a1ec86009dc8f92de9fc4d7b74db3383a817b3ba
     HEAD_REF master
 )
 
diff --git a/ports/boost-interprocess/CONTROL b/ports/boost-interprocess/CONTROL
index 72f7f45a6..eaab7fe54 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.67.0
+Version: 1.68.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 b46d0dd91..8a6ab0b60 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.67.0
-    SHA512 ea4ece14b396220549bd3887330cd4a49149f303c936c03e27e232683235f62f759f44f0a473e24d3466bbadfd785633589caacaf620f861cddf03750c270467
+    REF boost-1.68.0
+    SHA512 f3899c4b6aa4619ff93715c2cca13782c7504cbb871adfb2e74e57534bd130b132a109726ecd5c3e9cf63794a90fd39c19f34f4011f702e6c427058bdaf9aad0
     HEAD_REF master
 )
 
diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL
index c9f43b7d1..43d56a644 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.67.0
-Build-Depends: boost-compatibility, boost-config, boost-logic (!uwp), boost-vcpkg-helpers
+Version: 1.68.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 373fe4777..dda65b7bc 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.67.0
-    SHA512 fb02438e6e29ab3ce21fbb87cd8562d278f9f352b3964cb7a62a6f0ea0b38567af5bfd12973cdd48c6235283b0b7b6ef9ecfd9c9a130b14c22a9764aec6c2102
+    REF boost-1.68.0
+    SHA512 68596d0516e21132d9ea490ad7cdc66ed17e58f27a4f2a602481ba5e1b38fa51d6d4300108c2eaa1c457493212ee36ecd6f1d2a4b6ca3d1a4fbee23ad0216b38
     HEAD_REF master
 )
 
diff --git a/ports/boost-intrusive/CONTROL b/ports/boost-intrusive/CONTROL
index d7d7ae3f0..7a2fb5c15 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.67.0
-Build-Depends: boost-assert, boost-config, boost-core, boost-functional, boost-move, boost-static-assert, boost-vcpkg-helpers
+Version: 1.68.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 73f5d7673..20e28c310 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.67.0
-    SHA512 9181b1c7ea651c4c8aa0ae226b2a35cb65521da105249b12af899e294ed1f20868002846a3f200b40d51c795c0a6e6b3b2b2f41ea59e817a842cb09aadcf9f9e
+    REF boost-1.68.0
+    SHA512 f37c6b1198dc811a8b169b9161ad89eb84db2283456b25f7d5eab770f2fe9ff1991da3655dceff23bc3d7bbf3b0d266f0f6f7e6e35fb44a3a6bdf8af651d4208
     HEAD_REF master
 )
 
diff --git a/ports/boost-io/CONTROL b/ports/boost-io/CONTROL
index 26764cae4..8167e9047 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.67.0
+Version: 1.68.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 729e22175..cfd71f00e 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.67.0
-    SHA512 a0549634a0d2afe1646437dab5b018a139f9e1b98fb3cb2a5730262700d64aa54a87a9676901ac192676fc5ee4b61aee11205f20acaa0da5746844ac292a913a
+    REF boost-1.68.0
+    SHA512 a1971233e7deccc8354abeb6ab9b4e5955e4ed8b37ab563c0b07e8afaeec6f5c218f06dd60b19df8b836125f431a7032fad4f8b25e14484db5fac1eb9d1cbe01
     HEAD_REF master
 )
 
diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL
index 462834bab..f88cc5424 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.67.0-1
-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, zlib, liblzma
+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
 Description: Boost iostreams module
diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake
index a6c4e7657..4463749be 100644
--- a/ports/boost-iostreams/portfile.cmake
+++ b/ports/boost-iostreams/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/iostreams
-    REF boost-1.67.0
-    SHA512 73fada0b6e236e0b86f28d8cf75e71dfb6b6a84622986cd72f39de3a310442e6122c91d22ba95bd29381dd559f5cac52a1e28cf97e7e8a6f0c70ccc4f38ceeba
+    REF boost-1.68.0
+    SHA512 a0c008537c2ceb8ea4f9d1fe7e66fea01f55d753e3b349aa3f664f7a0cd129f11770e520645a18feabde4110f6471194e8bae2479b95ac6d13d8b42be43c5f2e
     HEAD_REF master
     PATCHES "${CURRENT_PORT_DIR}/Removeseekpos.patch"
 )
diff --git a/ports/boost-iterator/CONTROL b/ports/boost-iterator/CONTROL
index f6acb2afa..e428601ec 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.67.0
-Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.68.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 e2163a620..88a664b8f 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.67.0
-    SHA512 245a63416ae578b494328798d578fe3f253e339abd10c047a14137181759b99d02a9eef4fa4872b794154378a1b80b12fd502849d67b8b13012e6b08b66b650e
+    REF boost-1.68.0
+    SHA512 e8e223bc5b9334618d676e2aefdeffdde6f31097b634d2ca1fa3d6e73976c42dd123ed76081e13d1f023a7d39f49cc53d63b28e541c2aae858cbf569818bd14e
     HEAD_REF master
 )
 
diff --git a/ports/boost-lambda/CONTROL b/ports/boost-lambda/CONTROL
index a1996dfbf..9355d323f 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.67.0
+Version: 1.68.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 b14d46c97..b8303375c 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.67.0
-    SHA512 d95b3df3321639c4ced7db0fa10e5f204d20961a95d185080a40477520a591b5806974ec7cb28256bbb8b58e2f635cac60fff47eefabe29c5c3fabda211e276f
+    REF boost-1.68.0
+    SHA512 7395399071a6d63027685e00f67af1db87e1f89bba54f7f78ee05d1e80d0c7253382f451dcff7c077088f6075f5bdd52d0dfdc745b8a337f575075c5bfd87f6f
     HEAD_REF master
 )
 
diff --git a/ports/boost-lexical-cast/CONTROL b/ports/boost-lexical-cast/CONTROL
index 68b6e1e05..24004d459 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.67.0
+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
 Description: Boost lexical_cast module
diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake
index 877a8cf84..bd61dffc0 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.67.0
-    SHA512 b3c0c4e94265784001d8b9fc317a2bafe4c83aede9311a7172a76b1c0bf47cc811f7963e9580d0d3f0527f16531abb204b9201c0cc611dd322bcfce2671fa54d
+    REF boost-1.68.0
+    SHA512 212bc947b64e07e2c3f41663dba157960895539a7662e13d53ccd3327c0cfb506d2294badd1b6c6f102ebc851ba602c384d1eaf85a4875e9d538dc23340cba75
     HEAD_REF master
 )
 
diff --git a/ports/boost-local-function/CONTROL b/ports/boost-local-function/CONTROL
index 415cba13d..ae5ba5580 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.67.0
+Version: 1.68.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 95d8334f6..b28718cb9 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.67.0
-    SHA512 dfe717ff4fd46a44422162fa00289a1f57aaed42215d238b4219d493bf4945564e1d6103599c0c3d90ed196eff2dc7ad6f0949e284ddfc9c6f400620b63ebaf8
+    REF boost-1.68.0
+    SHA512 063158b6a66f82521298b22a597442671219e76a038452cb163de6f095682cfbfaf998a2b69adcd2913f9cf8a633b7e99b1e540a60e3c95092162806b92d23f0
     HEAD_REF master
 )
 
diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL
index eca61edd4..3bc4af166 100644
--- a/ports/boost-locale/CONTROL
+++ b/ports/boost-locale/CONTROL
@@ -1,7 +1,7 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-locale
-Version: 1.67.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 (!uwp), boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
+Version: 1.68.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
 
 Feature: icu
diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake
index c4dbf9229..a6678b505 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.67.0
-    SHA512 220ed43884722e7a342b8fa5010e8659ccebcd106907c38052b411d710f110924a2b4622cb10e1302ad0553cf350430f02c63e3e66d45bb38b47d7eb022d01d9
+    REF boost-1.68.0
+    SHA512 6e7c85a307ff8c8f41b1002e02c5c68d9ca5c89e95063adc0f134a5c96be728334f1a0548f92c07f85ed639b73588e49df1b0c2d964fa83cee86c746634d5b94
     HEAD_REF master
 )
 
diff --git a/ports/boost-lockfree/CONTROL b/ports/boost-lockfree/CONTROL
index ca9746fdc..bc193d0ec 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.67.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
+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
 Description: Boost lockfree module
diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake
index af6f80454..d3563af0c 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.67.0
-    SHA512 d4287c5782191469a077f7cebfa64d72733f186fe627e9fa97a3856168423f9f606168bb67b47814ef2047f0b7434c02dc6ff93ba3f817923d3dff22f46360f9
+    REF boost-1.68.0
+    SHA512 ccdd2e1e1815140c6ef5f7ca7d2b5551038f14b4cebcc5ce95c15ee0799a2e9cc2c1027d166be975d06d9027386992ab5c40f8c1b633b9c82eb087c9ad648d8b
     HEAD_REF master
 )
 
diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL
index 6f4116b03..0d3860587 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.67.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 (!uwp), boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive
+Version: 1.68.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 5d9dbb622..cbc96ef87 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.67.0
-    SHA512 68046c749156e11c8c1aa256a54bc89d809b2fa627565051ef09481378cb401eeaec533585f34ce065abb1e416381be536ca19ad972d35b3096e4332d1ffee9d
+    REF boost-1.68.0
+    SHA512 d12f9b2d8f782e4df5df16fe6c5267c87266348f6c7c400a9c6ff0b1b7af34ee8baf3d0b4dc4aef20b0a5faf4582d5c90d3429df84d903773bef3e61df93a0d9
     HEAD_REF master
 )
 
diff --git a/ports/boost-logic/CONTROL b/ports/boost-logic/CONTROL
index 32310be7c..cad7c4d1c 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.67.0
+Version: 1.68.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 fce91a705..65810e540 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.67.0
-    SHA512 2a82bbfcea9d1a4ed8563374dc8796873b05ab474edebaea9a9e983148c80ce9bd76625d2bf7e40942c328321cf259ddc70f89550f43a4c6c3e36cb7e5cbe569
+    REF boost-1.68.0
+    SHA512 9d37657394355cad8286bafceefd93112552c2b867e2d4508a16eae8f051922f14f67f3a2cf903f8c371618c4eeed7d70a4bf9067b8404b66b6f224fda5ad85e
     HEAD_REF master
 )
 
diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL
index d9cc1cf1a..3667203a4 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.67.0
+Version: 1.68.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 cfeb034fa..3ad1251b8 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.67.0
-    SHA512 7d84aacd9a39daf61f836cf522331ea21b18413b28716a2620fcf49c05b32e0e2f7e14f7bd207fc1df7a6b450356158891ef2576335911b0d6a3f78326eb8c62
+    REF boost-1.68.0
+    SHA512 3727b6245fe3e6ba3af06f4653251b7d553dc01b83b06b812760e20fb9cd0bbbb2fe0bd7d3cc8b035f503d93e82e51ddb129b1e844944c1284560b212f663748
     HEAD_REF master
 )
 
diff --git a/ports/boost-metaparse/CONTROL b/ports/boost-metaparse/CONTROL
index 86ddf75f1..23d84cff6 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.67.0
+Version: 1.68.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 d25238629..b07eff75f 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.67.0
-    SHA512 d92a78f3dd56083464bb2544427e87c5208d716f509452ada3150fb1beb43caae4dba16daf6626ae0783d1ae0812bbe49be23a638138bccdca873037857ec7a4
+    REF boost-1.68.0
+    SHA512 2ab40e9ea0d14d4aa0b98b619a520d5fe974be9f89604d27eed0f1164762e239ce1b2d936faaed0574020dd5162dcc74a89a0ddf9835380abfa5aa10882cbe7a
     HEAD_REF master
 )
 
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index 0ee783390..93675e268 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-05-14
+Version: 2018-08-21
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam
index 8c24fff86..997c1234e 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.67.0 ;
-constant BOOST_VERSION_ABI_TAG : 1_67 ;
+constant BOOST_VERSION : 1.68.0 ;
+constant BOOST_VERSION_ABI_TAG : 1_68 ;
 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 d28762175..6e81aa163 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -309,7 +309,7 @@ function(boost_modular_build)
         string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
         string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
         string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
-        string(REPLACE "-1_67" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
+        string(REPLACE "-1_68" "" 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 4f68406d4..bfefee6c0 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.67.0
+Version: 1.68.0
 Build-Depends: boost-assert, boost-config, boost-detail, 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 f0b02398d..c7b0a9387 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.67.0
-    SHA512 4ff739fbd59db18b4e8ec6b2bd85072422a6253b964d5f12c49e8c0f022ad5760927f753c4b1e75bcb7c38fd8e6f7a9b31aa58b5f8672eb273011a8602dfeb80
+    REF boost-1.68.0
+    SHA512 7d7032d182a37ba8feb4d60520aac6c31e00c81f2dd7523846f9dddf5def6b78fc74d0f7dc769609d252fdac81a1cbf2e4897b862f35313084b69f6539abb7fa
     HEAD_REF master
 )
 
diff --git a/ports/boost-mp11/CONTROL b/ports/boost-mp11/CONTROL
index fa92b50d1..a251cdc33 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.67.0
+Version: 1.68.0
 Build-Depends: boost-config, boost-vcpkg-helpers
 Description: Boost mp11 module
diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake
index 95aa349b2..b64e20813 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.67.0
-    SHA512 baf1127b837db0902576bbb7f4bb09ad8f38f19ae45025879ae49ba9fef723647460b35a58f81d6bb7cf7dbbf94ff81cd32a948540e276660c8b8de5318f474b
+    REF boost-1.68.0
+    SHA512 828efcb915b5702c0ff673cbd1543110c60dbd06718fe225e6156d173926b9663bd56c3c7e11c2444245447d776e4135f280f0dfc0424ee1f224a49f95360be0
     HEAD_REF master
 )
 
diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL
index c6d33eb26..9ec537adc 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.67.0-1
+Version: 1.68.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 ac67bd677..583ee1c56 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.67.0
-    SHA512 fd9c5795db268dbd16bfc051344f6f58ca691dafefb05e2f89521db84d57c6f0ee3f750a75d06b3aaefb14261d0bc40f5e002932383ae0f03c6456d0086c6b8e
+    REF boost-1.68.0
+    SHA512 63d6d7d37a96aa5456c90d7c219603d9a36e94de5009af0cfbab7839f1756188ebda8c55f7333124e6d61a7d73e68a9c2dab6eb12f6b4c7ecd06ff5cad0bb231
     HEAD_REF master
 )
 
diff --git a/ports/boost-mpl/CONTROL b/ports/boost-mpl/CONTROL
index 350007a53..c267b3738 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.67.0
-Build-Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Version: 1.68.0
+Build-Depends: boost-bind, boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, 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 92f6df54b..dca0d86d8 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.67.0
-    SHA512 90143065ae6a180dd542ad50ceb111d221b587e6e109707c3421582996f0918828f42df69d1e44071981996f30fe59e969efa2271a8b70e70a10516f9b83b1f4
+    REF boost-1.68.0
+    SHA512 a35139c56fd06c560783844cb5b3ddc4643aa6aa7e3bce76e0b4f24d5b7ace962a0ade60973ab21083a06e824a4701c7b6c534376b2323934a21cda438f1de61
     HEAD_REF master
 )
 
diff --git a/ports/boost-msm/CONTROL b/ports/boost-msm/CONTROL
index 704e55def..7fbe896b4 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.67.0
+Version: 1.68.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 c22d53aa3..e376c8e70 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.67.0
-    SHA512 073afc97247d0cf6eb579cffafbd43696390b28125d7e104cba4b5e2ac6120b24f64c5fa167f5e5958d7e7fb93eb7ea698b660f9fcee781bd84068919f6512e7
+    REF boost-1.68.0
+    SHA512 166b5c7b3ced589c196c951b24461ee3cdb46c0d19823a32b5cb0f1577eaaf6738b9cce2a721a2ca5a4c7be009a7a4b890d5353132ba443a97bcff6108a70728
     HEAD_REF master
 )
 
diff --git a/ports/boost-multi-array/CONTROL b/ports/boost-multi-array/CONTROL
index efa6049e7..62dfc32dc 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.67.0
+Version: 1.68.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 93ff6b0aa..c89522d52 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.67.0
-    SHA512 a1f58b1223ffc6935d3ff9dd599dea294af36e9532adef471be0c971450ffd5ebafed6b0ab61637663df22e933b066eccac1fa50c783961d7a4bcf209c7d0fbb
+    REF boost-1.68.0
+    SHA512 ed2bc9d838644e814b83ea771d1952d88a8f997649bfcdeec1b8463946aa842139e8a8a269aada447428346e7d31b6aeb17ffa372fb2ade2e17dbffbaeac67f8
     HEAD_REF master
 )
 
diff --git a/ports/boost-multi-index/CONTROL b/ports/boost-multi-index/CONTROL
index 86e7733dd..96f917b71 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.67.0
-Build-Depends: boost-assert, boost-bind, boost-compatibility, boost-config, 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
+Version: 1.68.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 cc458c95a..a23f85ad4 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.67.0
-    SHA512 6630d086a99b5e36d344643030a1639ab1d9393ccc93b112d56cb6c674e97f67b4a9245e51d0b43416274f50d2af094551c814822c9b17abc19b52227042ad91
+    REF boost-1.68.0
+    SHA512 6e39d37e79c01ae952e3ba7ab12a2a69f6916d4a846bff3af98c1d5fc2b8ba83b59a782b610817a82c076496e087040a7f44fbb97ce4b6d1b4e87ef2595c4f5b
     HEAD_REF master
 )
 
diff --git a/ports/boost-multiprecision/CONTROL b/ports/boost-multiprecision/CONTROL
index b78a02113..532079c9a 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.67.0
-Build-Depends: boost-array, boost-assert, boost-config, 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.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
 Description: Boost multiprecision module
diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake
index 5ded1a0d8..d51ab1ce1 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.67.0
-    SHA512 a2481ad9856ab5024d86097967f187596f18eada71effa51313fb72b02809f5177582fe13bfa5db647f31b5a667b209bf044bc0598385408494c0f6284d0c8a2
+    REF boost-1.68.0
+    SHA512 5a90b41141829f38720b556252f32fae5e31d56deda779af371149c64f74f196cf9c2a5c466b945f1006ec1c44f497767e29f482cba248223bb762da32fd3f3c
     HEAD_REF master
 )
 
diff --git a/ports/boost-numeric-conversion/CONTROL b/ports/boost-numeric-conversion/CONTROL
index 674e4ca0a..5e0c9ab27 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.67.0
-Build-Depends: boost-config, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
+Version: 1.68.0
+Build-Depends: 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 b14d24011..722fca482 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.67.0
-    SHA512 0c1d46e4529bcec8eeb5b138f9ded9974688e14923eb148dc8e89f7fce93d07236be5448d28d9812f7b87bdd11391f0ab8ca57b659b7bedc820d0080b3a3f5d1
+    REF boost-1.68.0
+    SHA512 08fadfb49b2996b118684a90e450d8426ea20270ca2c0a677c61f88b033f3e77139559fa9507a1fa0dbd84621f44502f7bf2949166c8915411da2da543178c01
     HEAD_REF master
 )
 
diff --git a/ports/boost-odeint/CONTROL b/ports/boost-odeint/CONTROL
index 86baeb6a6..41d1cee43 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.67.0
+Version: 1.68.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 38293012e..c95fbf0c7 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.67.0
-    SHA512 9c18b9ec2f02c9b36afb06c80ad9e881ab7c41580c2fca5b5c5a62c0aa6e1c3e9bb72c8a28670749e3723ce4bce4397db45547ba4db76acd6088f07644cadaa0
+    REF boost-1.68.0
+    SHA512 2e7832eb60623f9dabe8a3c2adea0c89fe0c43f9723cdc4a4f30af573186818f462fb66f33b585e0c6e50bbcb1b2e18d598e1d1905e68e54bda7febf09c71350
     HEAD_REF master
 )
 
diff --git a/ports/boost-optional/CONTROL b/ports/boost-optional/CONTROL
index d20c879af..b7057d42e 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.67.0
-Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-mpl, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+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
 Description: Boost optional module
diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake
index 261634e12..00ba27665 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.67.0
-    SHA512 a161c9bc69cb39d9828be89d9113766d930ef0c1b12de113b5d103e8139fceabdaac0081664f14ef96f1f9df1fac0b36469010766da3ba4c054910244c452bc8
+    REF boost-1.68.0
+    SHA512 995436e8805a441e13a3fb8040b78dde9363759bd49db789744ba5afe1a90af05b05de882267aef1c76fe68c410172233e2c8b0559e74f6764b3b1a1207a6b9b
     HEAD_REF master
 )
 
diff --git a/ports/boost-parameter/CONTROL b/ports/boost-parameter/CONTROL
index 360daf3a3..b86aa90d2 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.67.0
-Build-Depends: boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Version: 1.68.0
+Build-Depends: boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
 Description: Boost parameter module
diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake
index 3e5ae71bc..7a95348a3 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.67.0
-    SHA512 f49f1cbedc0b09de484af7ffd9d00e129e9e8cc88fd82d47a95f89b06eae909973843347d1fe09936d686d026d2266384cf23b7dd9a5d7df2d8889629fea1684
+    REF boost-1.68.0
+    SHA512 28d4538ccc544884fa9641ffca89c8a7a4f4098330540d1929b798ea69bf571e6073c65b9d4162b9b357b127da798c0fa613410b6b8e24e3af6681d465532d2f
     HEAD_REF master
 )
 
diff --git a/ports/boost-phoenix/CONTROL b/ports/boost-phoenix/CONTROL
index f6cf5316b..dd0fb4d48 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.67.0
+Version: 1.68.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 3df599d31..cb12b27d9 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.67.0
-    SHA512 38095cd0de7a2fb03e4acaf27364a9f9797e1c92315b956f78a5f3d478fbd65a0b97dba53e9081418223864222f9a560f679b6c973ed994233e68b39fd3a5d63
+    REF boost-1.68.0
+    SHA512 5ce43db16a9f9e14d151475eb52120c497fbf7082a912af6fa64b4a4e59af9b33938968fb524a4f8f73be039fcfeb4ced19dfc7a3012fe2dc1eb85b621c5eb08
     HEAD_REF master
 )
 
diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL
index 9cdae8e73..aafb24154 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.67.0
-Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-type-erasure (!uwp), boost-type-traits, boost-vcpkg-helpers
+Version: 1.68.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 f6d495b04..72eb529e1 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.67.0
-    SHA512 9ebf5a9a682f0d79ee80dbc1a097dbd06f7c7d064798e25d72a369fa771beb6c37ed9553bc3b8cdbbcb40bc89a628155a850807f5487c714655d2fdb85102b66
+    REF boost-1.68.0
+    SHA512 c4b93a5dceaa1e41b3f585f79a34bf05d8bed30f78af86cdf829d910a6ea791420880f087063180a5332eb065b4427cf6c98d9d71a9375d10c0f33defbdb1bd6
     HEAD_REF master
 )
 
diff --git a/ports/boost-polygon/CONTROL b/ports/boost-polygon/CONTROL
index ea01f4bb0..36fb22386 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.67.0
+Version: 1.68.0
 Build-Depends: boost-config, boost-integer, boost-mpl, boost-utility, boost-vcpkg-helpers
 Description: Boost polygon module
diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake
index 83d6d5b5e..5fe881759 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.67.0
-    SHA512 d6fbf84a808065a5d6946ff0eae8af41d280dc6e30d34c1d1e6f9e5860884f94466d976db4b9537e94c40a76129ae0567cebd05a1116b80ff66629c423520753
+    REF boost-1.68.0
+    SHA512 ebb34e0d693215db2919096600ed9bea6b239a2486135f48a1a3bd683410b0c86c3b455bc2d58f7b6efad50020895d3fd8f4b4b0ee897eacdb7a980d0979e9ad
     HEAD_REF master
 )
 
diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL
index 7013cb6c4..b1de76796 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.67.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-thread (!uwp), boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+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
 Description: Boost pool module
diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake
index e85dd3329..5c52588d1 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.67.0
-    SHA512 fe6f9a5e147806e80fa706e7f02a1b4b6f48e044c6b2a7d7fce6685ec2ada960c17a1ae3fb8cf19661ca8e9e3b1b3a49a30328f9e5ca12f15514810733a1c299
+    REF boost-1.68.0
+    SHA512 b1b3d91ac85469c0b06d48bcc159b22974dc446f44d84aee459ba26f1bd114600819efec3b1679be87b91525a0d55ba9a9fbde4828b6436bad4013d9de4652e6
     HEAD_REF master
 )
 
diff --git a/ports/boost-predef/CONTROL b/ports/boost-predef/CONTROL
index 92b0e35cd..540b2026d 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.67.0
+Version: 1.68.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 5b495ed8d..b4f21e883 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.67.0
-    SHA512 c67076cb04de0ad0bfdc2fabc4112fe4a1ffb6c21a42e4e11a63e173ef3573e614fe515e7ad7af0cf6628a90fa44aad45013f79ae68d5f35df034953f84b75e1
+    REF boost-1.68.0
+    SHA512 fb353184d4a1cbe7a621d3076bff10061c38912ecfc94d4dab54e43eb40fda62455866b3076c4193d94338cc2fb3fe8bd31f5e20ac56931cd16c2413d6c426f7
     HEAD_REF master
 )
 
diff --git a/ports/boost-preprocessor/CONTROL b/ports/boost-preprocessor/CONTROL
index f6f683423..ac86f7128 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.67.0
+Version: 1.68.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 0626080f4..d829c5c13 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.67.0
-    SHA512 9bb18c25144c1428c6e9a32a670c041bc6165b862636b5c626e8b66959906988605f75548fc61539f91c32282b72c150b8b398f7fcee2fa2e5720032b74fd80f
+    REF boost-1.68.0
+    SHA512 7c16f996dc9ba6afbc748acc854e3dadc852d76a1a02fc9a61d46fe92edb412c889cfba72c5de5a8f85913711a7f0ad2df3e9d7c4fb20e6422c321847e17399a
     HEAD_REF master
 )
 
diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL
index a5654c920..4105702ed 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.67.0
+Version: 1.68.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 d59399e5f..c93860190 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.67.0
-    SHA512 a279fcd351c2f8a2087438b67e973f74e150c24585cf586fd59f81c0ec712f8c042768549823268618c7c9c106ed5d8153a7d020fc415ac40f5d78a2a7e93bb6
+    REF boost-1.68.0
+    SHA512 6e75874c9eb95e30c8ef098a724e61ce986d14846325b778433467c8940b3cdd5177b5467c36103a8712e8c2234e2a6a00755e440e457d1e03dc16b59a22aad0
     HEAD_REF master
 )
 
diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL
index f37b745ba..ced795473 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.67.0
+Version: 1.68.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 4f8624361..e33d189a3 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.67.0
-    SHA512 eccb93bbc8ba6808afb06764577184c3b58cb260e0a5ead5a79c43300379744b4c9649ecf18b9c88b3c22c9f1a28d4c7bcf77f638693a97f38bfd15e48b58804
+    REF boost-1.68.0
+    SHA512 debbeb71fd8b4b0a4cef0297b3de6f94758948a117eeff4ccb713ea733c2304ce5f0c17673a066c5faa8b87c3aa2e4602908c4d52d76e53d7c4c2120f76ab4f2
     HEAD_REF master
 )
 
diff --git a/ports/boost-property-map/CONTROL b/ports/boost-property-map/CONTROL
index f8142fa41..7ac2bc12a 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.67.0
+Version: 1.68.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 c2c4561fd..33c5c3228 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.67.0
-    SHA512 07360357577815c6545473d3b5ac64e6851031cc926bcc72419e0bbc49b291477a1e15663e79916044f2e8b946dee397dc1aede7eb2286d506fd86c87e81db48
+    REF boost-1.68.0
+    SHA512 57d8ad9bd9854702c18c3d0875d6d26386a1dff58cd4b21f9446f33752455715b78027f212a0954e40ea62fc98f5823cfef2e5ea6f6ce7c7e516bb3fa3d26a37
     HEAD_REF master
 )
 
diff --git a/ports/boost-property-tree/CONTROL b/ports/boost-property-tree/CONTROL
index cbb168eae..c4ff3e961 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.67.0
+Version: 1.68.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 8a87f7410..245919b9c 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.67.0
-    SHA512 b22b596af0a6a39a4671c44aa099cd4c2235a5f51e1400f14df2925a5a17487d8910253228c61b1198f0184e58e6e2940c7fde5c193549c21efe737bed363d67
+    REF boost-1.68.0
+    SHA512 07410c78fdb9ae1d8a16c6c2ed65caea3136365c04828b78c02074ee523cccbf8f9a7117fcb5524711a0204c8ed77f56adcb47313fa16f63e15801043c3e1763
     HEAD_REF master
 )
 
diff --git a/ports/boost-proto/CONTROL b/ports/boost-proto/CONTROL
index 9b6adca8f..42b2d3d4d 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.67.0
+Version: 1.68.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 34691bdf3..b5e42f617 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.67.0
-    SHA512 ed20abaad9b61d9a82f544a9ae3d05e1f908551958ea0a86b6325a2440a30c94c30caddc5354b603428df070a9eb418adad487d2cc3f2ea0c9a4bf361e8b2ca8
+    REF boost-1.68.0
+    SHA512 af03f0ad4d67d7d029fc9afec830e78295d34f0dd7af8dea57c3d931d042645f8a8458f1234112826072fb2eb9507ef39375ec412072b2be618621cec2934635
     HEAD_REF master
 )
 
diff --git a/ports/boost-ptr-container/CONTROL b/ports/boost-ptr-container/CONTROL
index 9c664a05d..e23e8bb67 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.67.0
+Version: 1.68.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 0f1892dda..9f36d7041 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.67.0
-    SHA512 d8349a2b3ebff817ffc42301b61d13536c341def39dd3ec9bf5f5abfa0c7ad545f6b5f8babd3cc276b7c171e55760ea2d0a03dcc0653ac7a245246c89d1b7117
+    REF boost-1.68.0
+    SHA512 bf800d67f0692485a04ab46dc9bbb04d542bfe941710796d82bd8d3e6b085d4c75b02d45507f145407317591734ffd83e4b0f9e823a4bee7071485fe94a88302
     HEAD_REF master
 )
 
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL
index 36bb42387..31bd01788 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.67.0-1
-Build-Depends: boost-bind, boost-config, 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.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
 Description: Boost python module
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake
index 73980e640..bdbe49f25 100644
--- a/ports/boost-python/portfile.cmake
+++ b/ports/boost-python/portfile.cmake
@@ -5,9 +5,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/python
-    REF boost-1.67.0
-    SHA512 59091af63626cc6e33f76bded8733b5fb044f7139197e6c887e8e279831954c1e8b67341b6b2f3c9dce97e67a166996321ea439609d225dab7f68762423d6211
+    REF boost-1.68.0
+    SHA512 17aacec09a653b718e1925f13fbce1a22a09d44011534e451a953600f4fef47b0e8a759d4e1588b74dbfc71ef38f1f13200d77668eca2ad1bc5b1e470e231a2f
     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-python/unwind-type.patch b/ports/boost-python/unwind-type.patch
new file mode 100644
index 000000000..62e9c8185
--- /dev/null
+++ b/ports/boost-python/unwind-type.patch
@@ -0,0 +1,31 @@
+diff --git a/include/boost/python/detail/unwind_type.hpp b/include/boost/python/detail/unwind_type.hpp
+index f6cdab6..da9633b 100644
+--- a/include/boost/python/detail/unwind_type.hpp
++++ b/include/boost/python/detail/unwind_type.hpp
+@@ -11,7 +11,7 @@
+ 
+ namespace boost { namespace python { namespace detail {
+ 
+-#ifndef _MSC_VER //if forward declared, msvc6.5 does not recognize them as inline
++#if !defined(_MSC_VER) || _MSC_VER >= 1915 //if forward declared, msvc6.5 does not recognize them as inline
+ // forward declaration, required (at least) by Tru64 cxx V6.5-042
+ template <class Generator, class U>
+ inline typename Generator::result_type
+@@ -83,7 +83,7 @@ struct unwind_helper<false>
+ 
+ template <class Generator, class U>
+ inline typename Generator::result_type
+-#ifndef _MSC_VER
++#if !defined(_MSC_VER) || _MSC_VER >= 1915
+ unwind_type(U const& p, Generator*)
+ #else
+ unwind_type(U const& p, Generator* = 0)
+@@ -148,7 +148,7 @@ struct unwind_helper2<reference_to_pointer_>
+ // why bother?
+ template <class Generator, class U>
+ inline typename Generator::result_type
+-#ifndef _MSC_VER
++#if !defined(_MSC_VER) || _MSC_VER >= 1915
+ unwind_type(boost::type<U>*, Generator*)
+ #else
+ unwind_type(boost::type<U>*p =0, Generator* =0)
diff --git a/ports/boost-qvm/CONTROL b/ports/boost-qvm/CONTROL
index ee0044271..5e6306563 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.67.0
+Version: 1.68.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 014723f28..c9cb0a104 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.67.0
-    SHA512 dce723e782bb19737a51e99c3535ab7101569ad217a475b25c742d4a35fd774d5b02883a3604b75a4141f8cbb385c82ed1496051032d1d993fb6218549885095
+    REF boost-1.68.0
+    SHA512 1e9babfa993b59cba1cd4c7fa2184576a50ca0f6acd6db91b2e7e1fa3931f1c32de7bae76a8990bdd6cf69551482e74900b66a5bfb1c91c46e2a72d90491a4a3
     HEAD_REF master
 )
 
diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL
index e9f682433..df1f75532 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.67.0
-Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, 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
+Version: 1.68.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 6112ed2c3..1f5c32b86 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.67.0
-    SHA512 482a25fed9c420407cb83c8003a78dc518bb3942e23c3b206a0f0e050148fbed91aa0526b78614189d162d7c65d7a3ffb566a1735b23e1d0d5d592af0cdc499f
+    REF boost-1.68.0
+    SHA512 dc9a4f65610324a021daf834443a49364a71b45d68ab3ec193221c464ffd1e824a48930da10633718ac4652c720db3cbb62d47114b3da98b31f4383c83bfc6b4
     HEAD_REF master
 )
 
diff --git a/ports/boost-range/CONTROL b/ports/boost-range/CONTROL
index a9c7421ea..ed079d74c 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.67.0
-Build-Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.68.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 c649c87ff..b3a68e39a 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.67.0
-    SHA512 f6c400a40937b09eee02eecbd579d67530fd4cae5f5f9a02cd3914cbcf6d4170870fa6c05a5a018e070f9ddc8c75c43dd93171f57a032ff5294ed19a3cc299af
+    REF boost-1.68.0
+    SHA512 a95bb972fa862e210aa77a214d803b5206dba238f1bdedd238bfd0ca3203b0b7c57b6c1738032d696e303049693028237f7eaa12766fa2c667ce6d8d27b6032f
     HEAD_REF master
 )
 
diff --git a/ports/boost-ratio/CONTROL b/ports/boost-ratio/CONTROL
index a58bbdab0..7e5543bd8 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.67.0
+Version: 1.68.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 45caa9299..1b637a1e8 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.67.0
-    SHA512 0ff5a25d9e9798c52cc017df6a7b52a2c13becb84ab6dda06244a92459f1602ff3843e71cda205ed9c831b4727929cbebc688e8b028e029005ffb8f04e39f259
+    REF boost-1.68.0
+    SHA512 0e4e7097ae51c30ae6ccbf112943a54d00421fa1c95f516554543b8f9c4fdde4602ff69e4b5c780a166058dbbe2d073162c0f857be3c07f7b20cc4842f9913f1
     HEAD_REF master
 )
 
diff --git a/ports/boost-rational/CONTROL b/ports/boost-rational/CONTROL
index fcc4de99f..2078f7f0a 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.67.0
+Version: 1.68.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 5ced46770..5db179cc1 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.67.0
-    SHA512 27fece61a7de96bf783a5f5d5b290934f76741848466fbe256c5517fb5671105d68e3126fd4b135c73a0290cbd81cff9849b599d14cdd948897d1ecc573ab016
+    REF boost-1.68.0
+    SHA512 a259b492d3ed3cc3d4bfae1bc6dfe3abe2678ea6379a1d4a48bd0b176952f5d0d0bd3c1cfbaa5a8e566fc0e59f3d4f267cf039f5f5a9d38e635fd4b999784fa0
     HEAD_REF master
 )
 
diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL
index edfbe8672..14ae738a3 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.67.0
-Build-Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-functional, 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.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
 Description: Boost regex module
 
 Feature: icu
diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake
index 8895931d6..0ab65b58d 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.67.0
-    SHA512 e3b3aaaf866aa9e6a4148c545f4d4a4ab8037dc8882ed7cd4eecd7727976d1a137a4c4e5599283f5d6f3616e865369d80733070f571fdb990555e4769f59ab83
+    REF boost-1.68.0
+    SHA512 57ea3b825011172e332f52aead9aae4b7d17dfceef68c5cc017607570c6818adfc73780f4d405a57aa93c3a7a3ca09bb74de2a9cb97e72c78700098ed6d2e63e
     HEAD_REF master
 )
 
diff --git a/ports/boost-scope-exit/CONTROL b/ports/boost-scope-exit/CONTROL
index fff7088b2..229ea3c8b 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.67.0
+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
 Description: Boost scope_exit module
diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake
index 61add4866..32d208047 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.67.0
-    SHA512 31386f5e44669a01c3396df8fa001c85c7c6231413f4ed788602bb2861db3535e0ed01c61c4b9bdccdcc0020ce92dbbf2bc02711abbbf8dbafe089305d21fb5a
+    REF boost-1.68.0
+    SHA512 fb1bf400f025836c64604994bd7de0d66227f2bb1bf5f3caf7b7e4db599702dd0ea229ff4c7b3a4efcab9545db8f20ac20d4b4354609047dd1e8b278d2220f43
     HEAD_REF master
 )
 
diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL
index d2c4357be..c513a6384 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.67.0
+Version: 1.68.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 b8229d3ec..f574fdf28 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.67.0
-    SHA512 719b69945ebdf9eca9849c74bfab38ce1e2c8b4a11ea7cdf98c3da6250887f1712c841b18e428c5bac421b007e3bd0efce9b2c12893395982df98826621dc3bc
+    REF boost-1.68.0
+    SHA512 13c35139ef8c67e297ca99fa2695b203f45a44788dc0c343075295baba07d0de113132314ddc4438d0d6cd87ad542510160e8cbe773a0f1d7fb24f377809d0b9
     HEAD_REF master
 )
 
diff --git a/ports/boost-signals/CONTROL b/ports/boost-signals/CONTROL
index 47f3c2382..10f1465f3 100644
--- a/ports/boost-signals/CONTROL
+++ b/ports/boost-signals/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-signals
-Version: 1.67.0
+Version: 1.68.0
 Build-Depends: boost-any, boost-build, boost-config, boost-core, boost-function, boost-iterator, boost-modular-build-helper, boost-optional, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost signals module
diff --git a/ports/boost-signals/portfile.cmake b/ports/boost-signals/portfile.cmake
index 32d456803..a5df93cdd 100644
--- a/ports/boost-signals/portfile.cmake
+++ b/ports/boost-signals/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/signals
-    REF boost-1.67.0
-    SHA512 420281efef7ad8742ead144e924b21a8aaac500e8075c0bdf9e1d835d2069b4514f9d0af9ff9b00270334413cbe501acee7cb3eb7a218a53aed0479ff4e8367b
+    REF boost-1.68.0
+    SHA512 3d5a26de28050e03779a26f6af5f96bdab0023d6be3047be9652a660c607e7839b46b3abb257ec5b1791e2e4dc5cbcbefe433244ddc6140ee64ae531b2c0b01d
     HEAD_REF master
 )
 
diff --git a/ports/boost-signals2/CONTROL b/ports/boost-signals2/CONTROL
index 0d90874ba..ce1b2ea24 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.67.0
+Version: 1.68.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 56ee81f08..f33e55483 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.67.0
-    SHA512 5c691c9275ac2f640a46a1f5a03debd326ce1c64905af6475ebe6caced3ffa4fe27a3a6b91ce60c72bcf06fcd5fbeba79afaef8314f2be655b1ad648d5a046e4
+    REF boost-1.68.0
+    SHA512 288e818d126fd2f4a6cededf802b74a5e3230483437e2338f179de6d9f22dbdad32c8040c56af2713811e7558326bd7c18a98e327eedcc5990dc9e25d0b35f26
     HEAD_REF master
 )
 
diff --git a/ports/boost-smart-ptr/CONTROL b/ports/boost-smart-ptr/CONTROL
index 6a6f5fb28..bdf02ec3a 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.67.0
+Version: 1.68.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 a83bc4a22..942a98163 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.67.0
-    SHA512 f8e9aaf7dce69fa21c1023bd990cc10957e2965261c9ac54cc4a045a6a4675f9e6a4796ec2e359f967d9670126434ec49ff0ba72fec0d041a86a569463e16d4c
+    REF boost-1.68.0
+    SHA512 5c791dd11d0b7d7662bfa936955dfbf9ff7e2e1993051a03997dbfee6b9b28e606ac94bad06a6eb112e8e089cf28721a4140761620a0c268ab8871d913e913d1
     HEAD_REF master
 )
 
diff --git a/ports/boost-sort/CONTROL b/ports/boost-sort/CONTROL
index 9a52c06cc..80cb3c99b 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.67.0
+Version: 1.68.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 a8f999030..67040df74 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.67.0
-    SHA512 dfd8f61aa342c226a88390f8b05d394fd8c019ebc8d008dbb3022bca4716d4e9623e9d2024fd3143ead3de89441b470dc234252b96d80dcd3d6e2be5ce4bd090
+    REF boost-1.68.0
+    SHA512 011642be7224c2892b63c01a589210dc0562d768a750a13622c181d0e8884cb0c8e2ab68f178bfaee2c895fdf8dd78815f6c8c1d58126e4db5d043068340d676
     HEAD_REF master
 )
 
diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL
index ee973c0b4..a9d82f0cc 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.67.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 (!uwp), boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+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
 Description: Boost spirit module
diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake
index f7b3f04f8..fd31b103c 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.67.0
-    SHA512 c5afd70ff38112232966e204e543b83316693a941f9da0300e9214ad3198601c805b2259f7e9ce58afc03b9e91403d98f94852b0e4eaa71b9e94157ca37aac9b
+    REF boost-1.68.0
+    SHA512 39e1824fcf0fb1358ab5c0df7c524ef0d27c40762e230f68f959e5e7f708c1bd2dffeaeff9ab2b420710bd3a089d48915a05ccfb1117056c96d3ddd66939696b
     HEAD_REF master
 )
 
diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL
index bba967212..b8c901dff 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.67.0
-Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Version: 1.68.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 5cb9ac5bc..84818f4ab 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.67.0
-    SHA512 30e425d113c155b7a1a9f5802ce5c0efa91223825e09bf6dc596e208b1fec7e1adacbabe6950f5d35037a8bd4e2c3841e95cb9a02419a652beabfb083c460edc
+    REF boost-1.68.0
+    SHA512 2700d80620a5b66e965c00a5e407aec2e075b0e567fe2031bd3671303fb4c4b3a4dc3d3ddb1cfb6058325470a0b51589aedf2a2ea0b46d53cbb754a2d3fb6027
     HEAD_REF master
 )
 
diff --git a/ports/boost-statechart/CONTROL b/ports/boost-statechart/CONTROL
index b98913b82..6425190a9 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.67.0
+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
 Description: Boost statechart module
diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake
index a76882124..73971e1c2 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.67.0
-    SHA512 2b63d4664b3fc20adf12106607ef1485700d5aeea9bbfc9005a9ac08984034a8a31c037a4ae3e99b4787187ed797844d26afb1140f73ef5009504549be64a6cf
+    REF boost-1.68.0
+    SHA512 f3d2a8d12bd85327928cba9f572e22f438721597675dd9ea22936a06d38a241aa6ef9ca6b5fc183dce20d76c2f306901d2337c12463e917d1ecf1c6d586735bf
     HEAD_REF master
 )
 
diff --git a/ports/boost-static-assert/CONTROL b/ports/boost-static-assert/CONTROL
index 58be1dfc7..7a39b5c23 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.67.0
+Version: 1.68.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 125f80bbb..9d5eb8adf 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.67.0
-    SHA512 6ffffe8c9bb799851dd5b3f03ec3038c7545ee55429a2c9124c6b7c5abbe43b8cb0cc860d758fbbeaa1810775da8f0ad1bfd25362a78866c1ecf5242bdb548eb
+    REF boost-1.68.0
+    SHA512 af109c668d083a9d7dc63b123b6621b919eab132589bad55a05c0fcdbb0939516a5a787512a87964a04362a4dd73af572293c3a3c2035d41401e78be34ca877e
     HEAD_REF master
 )
 
diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL
index 01985fbe6..8b06ccc8e 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.67.0
+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
 Description: Boost system module
diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake
index d61109754..fa81b9e0e 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.67.0
-    SHA512 3d7c8d9e0c4f3f5be95cf897e265adb1f2c96faa5dbc13b8050f988ddc94b9510531718b1726b147ab3484bff1ccf7bf18179084dcea968dcf80fd2f1c68686c
+    REF boost-1.68.0
+    SHA512 408c0219c9a7d284f7f6053c45c102843b18a52aca9120c9cf88ad752d6480dde21d883e2e4d9a6ecefada0d3bf02364e90d91f5f9cc61a53fd75ebc6e16a0ea
     HEAD_REF master
 )
 
diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL
index 182c9ccf6..a47306494 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.67.0-2
+Version: 1.68.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 d5834c60d..7db1284c0 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.67.0
-    SHA512 9af937ef02982039b5aab54e142b877fef6c46f71b7cc8c83d81f850f4b4229ee93425ab8a88e6888952686e1e23da6591da072432a06c1bceae83c793a43cf5
+    REF boost-1.68.0
+    SHA512 e576311fea904ca64fcbb7d3f9cd435e5b5f68810ee73eaa8d73fe6dfe15663fd4c943308aaa632a7db4e51e3a48ed8e7fcb98b54a70752305cd9a3edbde97e0
     HEAD_REF master
 )
 
diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL
index 6eeb13ebc..2929ec0b8 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.67.0
-Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-functional, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Version: 1.68.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/avoid-winapi.patch b/ports/boost-thread/avoid-winapi.patch
new file mode 100644
index 000000000..ed6a89ee7
--- /dev/null
+++ b/ports/boost-thread/avoid-winapi.patch
@@ -0,0 +1,13 @@
+diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
+index 5e378f7..6144621 100644
+--- a/include/boost/thread/win32/thread_primitives.hpp
++++ b/include/boost/thread/win32/thread_primitives.hpp
+@@ -70,7 +70,7 @@ namespace boost
+     {
+         namespace win32
+         {
+-            namespace detail { typedef ticks_type (WINAPI *gettickcount64_t)(); }
++            namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); }
+             extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64;
+ 
+             enum event_type
diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake
index 30f203d31..d260bcae9 100644
--- a/ports/boost-thread/portfile.cmake
+++ b/ports/boost-thread/portfile.cmake
@@ -5,9 +5,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/thread
-    REF boost-1.67.0
-    SHA512 e641484c2d021d0a8b77955bd9ee7f53f4a4c7f003b9260aa17c78b236a8cda4b1ec59c9fb16aab823b7be9d6da6a67c2d333308d8b1d5c9bbaa6a0de9018479
+    REF boost-1.68.0
+    SHA512 ccb1283550347d367390d26c7b64d630cefbdd69ed18d0bdd42a82c726942a76a10a06729630b6e8788d553cf6fee8123feebc3f5b751254cef7a022475b02e8
     HEAD_REF master
+    PATCHES avoid-winapi.patch
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
diff --git a/ports/boost-throw-exception/CONTROL b/ports/boost-throw-exception/CONTROL
index d6b606c78..3f5d2c688 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.67.0
+Version: 1.68.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 dca2f1ac4..a376fe37d 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.67.0
-    SHA512 ce049466973f338071acd51dab620c0a428eb6777384003f5ffc1a90128cf87d7f8283aeb351ca576a8cfabe46e603b7d748fbe2f03b46227b6eb9faf292f106
+    REF boost-1.68.0
+    SHA512 7ec624763becab452f437eaa6e03c0882f672735a2bc4c1edfa92ccf2acd1c667905ccf15ae0f40091f64b425d83025c7ade4b55bd7418e542b12d575a1c8f60
     HEAD_REF master
 )
 
diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL
index 67537375d..69056033b 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.67.0
+Version: 1.68.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 1f3b9dcda..029bdc2d3 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.67.0
-    SHA512 6028432edbdee4318d3295c9834417d31816efd8e16c5a0bcc41c0b1ffdd422c31eadb01cb0934684421bb07079476ecae41ec64d314c60d19d02ed9d995c682
+    REF boost-1.68.0
+    SHA512 5c84057890b0fc57f45f902c59d3f15ba9472d4538d13896b95232591cb2cde123df610b34eb2e3eec13e1cd9b13f652c558170466e0b7e7fe462bd167f84432
     HEAD_REF master
 )
 
diff --git a/ports/boost-tokenizer/CONTROL b/ports/boost-tokenizer/CONTROL
index ed1cb640e..0aab59b91 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.67.0
+Version: 1.68.0
 Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-vcpkg-helpers
 Description: Boost tokenizer module
diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake
index 15ebbe89c..e572b1d40 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.67.0
-    SHA512 2240809c63060f267c9b62171fcc1d959a199d8de65647de767c9829068a81e600d9084a8af0681bb09152e82789df2f13975a7ff1f0cd9ab6789347fe3154c6
+    REF boost-1.68.0
+    SHA512 f885c49fcafb3cfa4d1028722123d35fc42721cdda1894ccaf918aa25d88429bc8c2a9d73e15154a3982a2122e17bdfb08649578c2bd48f68e82a302e2bbce3b
     HEAD_REF master
 )
 
diff --git a/ports/boost-tti/CONTROL b/ports/boost-tti/CONTROL
index fb2d59aa3..e2b7b093f 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.67.0
+Version: 1.68.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 4e15f4095..99e582031 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.67.0
-    SHA512 e46b2a5cfd84c46577c499ee643f62804daf376fecaf15d3425b73d0221ab34dc2f882e31d7f8906adabafd271fc3707c6c5a2d99da8446a88951c4e828567f3
+    REF boost-1.68.0
+    SHA512 b14f7abbf2fe5f56b744803a4c803131ebe1b3762d2c85f624ead670619909db30fbd3ee3e5f1787b1f7377c25e5044553cf4df609c31209bbd9c2572b874247
     HEAD_REF master
 )
 
diff --git a/ports/boost-tuple/CONTROL b/ports/boost-tuple/CONTROL
index 7129158e3..8cd3cf3f8 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.67.0
+Version: 1.68.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 be031628c..96e2ae757 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.67.0
-    SHA512 de9e0836ec0f923483d2738de44f1738a5d9c00cd4ea3f0c61192e892bf026d16a5719f874811b04c6e9d27b0ee7ac80a3b88b30198ca06d54df181640b374b8
+    REF boost-1.68.0
+    SHA512 b3c31e1b0ccff578f2311cd315118f5d5f37c110ef6537266078cdd23af184806bbaf58fd39e32ebcd4e231117241b16f6c7734717bd3b9344935ce3e2ad2faf
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL
index 579b091a0..6c92109bb 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.67.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 (!uwp), boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-vmd
+Version: 1.68.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 c6c07eb1b..20016b7b1 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.67.0
-    SHA512 45bcade387e21315ea94f69981531ca38c367d6e7e8bcc82e67b86360d4f0e6a786ff94935a10a7b2e6bed21c0847008bbfa70e8adc5f3704f4eafef54664d86
+    REF boost-1.68.0
+    SHA512 d4f1f2063408e2de67ce660f13017be092b414e7a6fed90f6b460715bdb38ead27763244aa48888646501a6f031c981416d2e5076ab42d619b8a494e99f89ce3
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-index/CONTROL b/ports/boost-type-index/CONTROL
index ec217ec27..fbcda2c78 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.67.0
-Build-Depends: boost-config, boost-container-hash, boost-core, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Version: 1.68.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 1554e1258..e955e244d 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.67.0
-    SHA512 31a471bedaa8e30eb84e22e7f059938ffb25c649a80b203067da1c63bcb8d1fcd9cf61bff593fcdb6d463408bc6cb2775dbb589ac04bc6de7e0bc351e0b3abd9
+    REF boost-1.68.0
+    SHA512 5d31df2b8f92599d655ff46bdad6342dbce5f4e042054705d61d13b576e4c8d933a4fdb7ec9e5fca14f43dfc1c307911a269041f1742c2894690a94eb5d23b52
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-traits/CONTROL b/ports/boost-type-traits/CONTROL
index f7eab32a7..368cafe9e 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.67.0
+Version: 1.68.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
 Description: Boost type_traits module
diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake
index 0ae0417b2..427b9c699 100644
--- a/ports/boost-type-traits/portfile.cmake
+++ b/ports/boost-type-traits/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_traits
-    REF boost-1.67.0
-    SHA512 3a2c0b3498c9a71d668fcb0f0b46b7c97275396f5fe3703ceb2534a34bc497af10a655da72570ab9073a0a92db6ed079ed4ddd14fff54c791784d734a54d24bc
+    REF boost-1.68.0
+    SHA512 d9bdb5eb2e602085bf1f6d4339a7895c2f1a7227889e7c20088cc9fe35da5f1c44ff297c043f1713a8831b0785ef871b5ac02c8ad2b7ee305c1a6310678b5985
     HEAD_REF master
 )
 
diff --git a/ports/boost-typeof/CONTROL b/ports/boost-typeof/CONTROL
index 25c345a3e..a7ea199cf 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.67.0
+Version: 1.68.0
 Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost typeof module
diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake
index 2e7aaca5b..54693f1cb 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.67.0
-    SHA512 91b29446146a44aa0983c953086e45863b40e7d053670a0ef78f703d2419db7ac1615b42b7eca70e70088b7da9e9c37687e9ac570fc3995a74a9e78cae78280c
+    REF boost-1.68.0
+    SHA512 c01723f5e50b7bd7d190df73e4b5b7ffe6512c89d76080061dcd1d4a7dac45b450dda4e3edc7452613a7aad230414ad8ad728d56ed392f9d5571a99281315ada
     HEAD_REF master
 )
 
diff --git a/ports/boost-ublas/CONTROL b/ports/boost-ublas/CONTROL
index a6dd9d24e..68e20cac5 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.67.0
+Version: 1.68.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 db221b6cd..2829e600b 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.67.0
-    SHA512 5ff9cbbd1e9dd33eb1230e2d5247d80526be1d5f5d3e145dbdb2f95c1f61b86438a937174936cf4489fac81111b72ee317a6e653ae6c3d84b58bdc1cd2ce7a82
+    REF boost-1.68.0
+    SHA512 26bf61e43551a199e9a62d2d7f21fcb9407e9dc97b20317b17561d5c95256eced961eb30b1d8937533c1d9b77d56a148dfb82471b2228a92a3c53b63982cb02f
     HEAD_REF master
 )
 
diff --git a/ports/boost-units/CONTROL b/ports/boost-units/CONTROL
index 2d85d080a..e6645b1a3 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.67.0
+Version: 1.68.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 df480dbb5..50041db80 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.67.0
-    SHA512 33ce1386e67982d4b6f45fa78ce787332c7a753463650762a66da1064741fc6f9909fe1929416ec7918060300cedda93642fd6adb4a2d5f4c689f4d48b2a720f
+    REF boost-1.68.0
+    SHA512 8ec422fb52cf1761bd0e4f822807e8c9ed7a3c1642dc96e7447ffd903c9c38c045699b897a69714516e5654252b670fc5b7c795f6e6e54aeb7aed3adebdbccb8
     HEAD_REF master
 )
 
diff --git a/ports/boost-unordered/CONTROL b/ports/boost-unordered/CONTROL
index 50cd43f5f..62bcadd48 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.67.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, 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
+Version: 1.68.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 02fae3899..3c89877e9 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.67.0
-    SHA512 8eb086d4993ff7079b0919b0ad39ac16b37b4951eb9cf4d5f388aff37cf2b7ae42621277a23f8d870a35ff571de44ee1dc7b0faf108fdbf1ccdd8ed2d6be51d4
+    REF boost-1.68.0
+    SHA512 71b34649d70a610efa6d2e98019ee5db57aa5f09a4a388c8bf54e4a1ff02de8b581a249f7b917be58663e260599732eaaedeb297e7c20046013a811997991c16
     HEAD_REF master
 )
 
diff --git a/ports/boost-utility/CONTROL b/ports/boost-utility/CONTROL
index 481427860..271c5a718 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.67.0
+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
 Description: Boost utility module
diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake
index 1a919c18a..6d1af49f7 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.67.0
-    SHA512 4123a71af8234789b2b68f2a3b6e13e7ad3e46484e8b06ee2159d7337d101a2b1c8b8e7ca70ce29f0b71802f45014e1db03253e1f6515a6ad2f9d5ebced77caf
+    REF boost-1.68.0
+    SHA512 ee6ef15cd7291b5001f4a3a96e95790cfab2017b76f6eac3b9672983e56440d6184cb896257a9c4e365fe1e71b3c721b3b98a4d36d793a8bdf8d1c78585408e3
     HEAD_REF master
 )
 
diff --git a/ports/boost-uuid/CONTROL b/ports/boost-uuid/CONTROL
index 09af27bd7..dce434277 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.67.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-numeric-conversion, boost-predef, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tti, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Version: 1.68.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 b68c1f68b..41f903735 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.67.0
-    SHA512 224324198b24c4606ca0c3c370c8d344730e6851ccdff012eaa6024ede958b342c5b728ddbb0a5c52dedcd0ac628bf12213de14654348c3e18eb20aa73d8b7e4
+    REF boost-1.68.0
+    SHA512 cb03182301283785e123a77060426dfcc054c21663ce76d05c1d8dc57c529a8bceadb0c26deadff1ee5070d3bc687050819f272b8afe51ecfafe679631162fc1
     HEAD_REF master
 )
 
diff --git a/ports/boost-variant/CONTROL b/ports/boost-variant/CONTROL
index 246ee7355..b2f106c54 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.67.0
+Version: 1.68.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 8449a21aa..9a0f5a8da 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.67.0
-    SHA512 1fc6a0a98cdb2eca64f8a380e31724c70a9a0260ab2e433ad5812c580c9e2a867c6faf7ee17b0c6cf94b6410af1e509ac5d51e93b6fa1174b3d1c55ca62a10c7
+    REF boost-1.68.0
+    SHA512 532999093f3dbc2f6a96ce7230cf0f1248f079e185f07f99a7162e0a8e75b75fbfda89d21f13fd01d4f5740853e932d46b0e7f9301a9cef0ff15017f1c8cae98
     HEAD_REF master
 )
 
diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1
index 0635608fd..07b2e7a25 100644
--- a/ports/boost-vcpkg-helpers/generate-ports.ps1
+++ b/ports/boost-vcpkg-helpers/generate-ports.ps1
@@ -1,13 +1,36 @@
 [CmdletBinding()]
 param (
     $libraries = @(),
-    $version = "1.67.0"
+    $version = "1.68.0"
 )
 
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
 
-$libsDisabledInLinux = "python|fiber"
-$libsDisabledInUWP = "iostreams|filesystem|thread|context|contract|python|stacktrace|program[_-]options|coroutine`$|fiber|locale|test|type[_-]erasure|wave|log"
+function TransformReference()
+{
+    param (
+        [string]$library
+    )
+
+    if ($library -match "python|fiber")
+    {
+        # These two only work on windows desktop
+        "$library (windows)"
+    }
+    elseif ($library -match "thread|type[_-]erasure|contract")
+    {
+        # thread only works on x86-based processors
+        "$library (!arm)"
+    }
+    elseif ($library -match "iostreams|filesystem|context|stacktrace|coroutine`$|locale|test|wave|log`$")
+    {
+        "$library (!uwp)"
+    }
+    else
+    {
+        "$library"
+    }
+}
 
 function Generate()
 {
@@ -244,7 +267,7 @@ foreach ($library in $libraries)
     if (!(Test-Path $archive))
     {
         "Downloading boost/$library..."
-        & "$scriptsDir\..\..\downloads\tools\aria2-18.01.0-windows\aria2-1.33.1-win-32bit-build1\aria2c.exe" "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" -d "$scriptsDir/downloads" -o "$library-boost-$version.tar.gz"
+        & @(vcpkg fetch aria2)[-1] "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" -d "$scriptsDir/downloads" -o "$library-boost-$version.tar.gz"
     }
     $hash = vcpkg hash $archive
     $unpacked = "$scriptsDir/libs/$library-boost-$version"
@@ -266,10 +289,16 @@ foreach ($library in $libraries)
     try
     {
         $groups = $(
-            findstr /si /C:"#include <boost/" include/*
-            findstr /si /C:"#include <boost/" src/*
+            findstr /si /C:"include <boost/" include/*
+            findstr /si /C:"include <boost/" src/*
         ) |
-        % { $_ -replace "^[^:]*:","" -replace "boost/numeric/conversion/","boost/numeric_conversion/" -replace "boost/detail/([^/]+)/","boost/`$1/" -replace "#include ?<boost/([a-zA-Z0-9\._]*)(/|>).*", "`$1" -replace "/|\.hp?p?| ","" } | group | % name | % {
+        % { $_ `
+                -replace "^[^:]*:","" `
+                -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 "/|\.hp?p?| ","" } | group | % name | % {
             # mappings
             Write-Verbose "${library}: $_"
             if ($_ -match "aligned_storage") { "type_traits" }
@@ -308,14 +337,15 @@ foreach ($library in $libraries)
 
         $deps = @($groups | ? { $libraries_found -contains $_ })
 
-        if ($library -eq "regex")
-        {
-            $deps += @("container_hash")
-        }
-
         $deps = @($deps | ? {
             # Boost contains cycles, so remove a few dependencies to break the loop.
-            (($library -notmatch "core|assert|mpl|detail|type_traits") -or ($_ -notmatch "utility")) `
+            (($library -notmatch "core|assert|mpl|detail|throw_exception|type_traits") -or ($_ -notmatch "utility")) `
+            -and `
+            (($library -notmatch "range") -or ($_ -notmatch "algorithm"))`
+            -and `
+            (($library -ne "config") -or ($_ -notmatch "integer"))`
+            -and `
+            (($library -notmatch "random") -or ($_ -notmatch "multiprecision"))`
             -and `
             (($library -notmatch "lexical_cast") -or ($_ -notmatch "math"))`
             -and `
@@ -329,18 +359,7 @@ foreach ($library in $libraries)
             -and `
             (($library -notmatch "utility|concept_check") -or ($_ -notmatch "iterator"))
         } | % { "boost-$_" -replace "_","-" } | % {
-            if ($_ -match $libsDisabledInLinux -and $_ -match $libsDisabledInUWP)
-            {
-                "$_ (windows)"
-            }
-            elseif ($_ -match $libsDisabledInUWP)
-            {
-                "$_ (!uwp)"
-            }
-            else
-            {
-                $_
-            }
+            TransformReference $_
         })
 
         $deps += @("boost-vcpkg-helpers")
@@ -359,7 +378,7 @@ foreach ($library in $libraries)
         }
         elseif ($library -eq "iostreams")
         {
-            $deps += @("zlib", "bzip2")
+            $deps += @("zlib", "bzip2", "liblzma")
         }
         elseif ($library -eq "locale")
         {
@@ -380,19 +399,7 @@ foreach ($library in $libraries)
             -Depends $deps `
             -NeedsBuild $needsBuild
 
-        if ($library -match $libsDisabledInLinux -and $library -match $libsDisabledInUWP)
-        {
-            $libraries_in_boost_port += @("$library (windows)")
-        }
-        elseif ($library -match $libsDisabledInUWP)
-        {
-            $libraries_in_boost_port += @("$library (!uwp)")
-        }
-        else
-        {
-            $libraries_in_boost_port += @($library)
-        }
-
+        $libraries_in_boost_port += @(TransformReference $library)
     }
     finally
     {
diff --git a/ports/boost-vmd/CONTROL b/ports/boost-vmd/CONTROL
index b6bea6cff..a126cf997 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.67.0
+Version: 1.68.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 0d96a6606..460e5ff1d 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.67.0
-    SHA512 479b816decaf5bba27f6aee25af950bfce2df62ebd1e278cf62ad6260bb590ac93c284f09de43fc96d0504093937507d55bffd1ae751af6120a4632da02409d6
+    REF boost-1.68.0
+    SHA512 5d12edebb0beabb8b82d2aab15b50b35555e171eb5e289d67872c67d30fadcbd890f7c61db9a1b599572b5eebbb6978accf8673e86c6373181ff66c5c56b3cc8
     HEAD_REF master
 )
 
diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL
index aa1a8e707..7df45759c 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.67.0
+Version: 1.68.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 479770e92..b58a6f643 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.67.0
-    SHA512 e298b903dbeae5577938e92559b699a0f89abcff9299781c1857c401503b6c31b56420908aed6f0063b25508e97e978c39282352a1355d0924012e384994094b
+    REF boost-1.68.0
+    SHA512 988caa39d1958defdca1a89790bb1028d51060b1c8bf33047d175fe990c9565c4f60ba4d32215f9af6a433f286fe0201e1a9d45b365b3eac6148d0902d997080
     HEAD_REF master
 )
 
diff --git a/ports/boost-winapi/CONTROL b/ports/boost-winapi/CONTROL
index 9f3242243..aae04fe68 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.67.0
-Build-Depends: boost-config, boost-integer, boost-predef, boost-vcpkg-helpers
+Version: 1.68.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 30c36ee1f..0080662c9 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.67.0
-    SHA512 1a0935132e8058b3f592406aaf6bb6fa8df6c96c35e61e09d84e39c6ab00c50b87346789d309fdfb7de8f6252134a76a59c0dc214fe1f4ee25d82c379cf63a3c
+    REF boost-1.68.0
+    SHA512 640b144502bfc3ed06267d90a01d7eb7812898596c61e16048baaf98f49a27bffe5ccfddd6070d835c12d154c4669d1e2b862521f095a23868b192e62e439af1
     HEAD_REF master
 )
 
diff --git a/ports/boost-xpressive/CONTROL b/ports/boost-xpressive/CONTROL
index baa3e7216..f7202426d 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.67.0
+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
 Description: Boost xpressive module
diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake
index 2d4791918..5eae33972 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.67.0
-    SHA512 3883764ee2d0c5cfcf444319ae5c7ec547d27d0f54c1e2f4e4b134be25c3fbc7954bae1f783cac96386a63984dcff4197bd98176644c1d6bc50926256f39069d
+    REF boost-1.68.0
+    SHA512 3038a336a13232e567e1017b005bb6b95ffbc7ad0bcb55385afb33ba545d0d860edd79e1902263cd4e99703c75ca6d57d06be95ddec430f3b54b1f31fb05b84d
     HEAD_REF master
 )
 
diff --git a/ports/boost-yap/CONTROL b/ports/boost-yap/CONTROL
new file mode 100644
index 000000000..70b4727e6
--- /dev/null
+++ b/ports/boost-yap/CONTROL
@@ -0,0 +1,5 @@
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+Source: boost-yap
+Version: 1.68.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
new file mode 100644
index 000000000..3d99e46fa
--- /dev/null
+++ b/ports/boost-yap/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/yap
+    REF boost-1.68.0
+    SHA512 a8d920b8a0f60b26db2a0eff7718184dcd6f0405f9ebb5ca7a7c0bcb7b824e52a17a63f786c09a4de566a24c3a5178e9916e5d1b05dd13fd82083c2d4749d523
+    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/CONTROL b/ports/boost/CONTROL
index 23fc8ef59..13c43fb8b 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.67.0
+Version: 1.68.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 (!uwp), 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 (!uwp), 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 (!uwp), 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 (!uwp), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!uwp), 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
+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
 
 Feature: mpi
 Description: Build with MPI support
diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL
index 190d48875..55ca2a8c3 100644
--- a/ports/breakpad/CONTROL
+++ b/ports/breakpad/CONTROL
@@ -1,4 +1,4 @@
 Source: breakpad
-Version: 2018-07-30-2
+Version: 2018-09-18
 Build-Depends: libdisasm
 Description: a set of client and server components which implement a crash-reporting system.
diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake
index b5f2959fe..18b1b8152 100644
--- a/ports/breakpad/portfile.cmake
+++ b/ports/breakpad/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/breakpad
-    REF 9fecc95c72549452959431ddc0e4ec4e0cda8689
-    SHA512 b579c4f7058cfd86df343e41496c0d4fc0fb1160bf239fab9cfecfd3d60108367f43f1788d744a9d813d585e8a05e06adf90b01d619448a262522a969d8d5054
+    REF 54fa71efbe50fb2b58096d871575b59e12edba6d
+    SHA512 ecd1c6c5cc0e3984d05fe86ec11172e93b0e31c39ce0af9d0de08b8d03083686e2288e0cd787180c599446c277e58f48550ce4ab718019576c64fc403a592745
     HEAD_REF master
 )
 
diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL
index 512faf203..1256f920f 100644
--- a/ports/brotli/CONTROL
+++ b/ports/brotli/CONTROL
@@ -1,3 +1,3 @@
 Source: brotli
-Version: 1.0.2-3
+Version: 1.0.2-4
 Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.
diff --git a/ports/brotli/install.patch b/ports/brotli/install.patch
new file mode 100644
index 000000000..7896fbbb3
--- /dev/null
+++ b/ports/brotli/install.patch
@@ -0,0 +1,56 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ac55f6b..e016967 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -166,12 +166,11 @@ endforeach()
+ 
+ foreach(lib brotlicommon brotlidec brotlienc brotlicommon-static brotlidec-static brotlienc-static)
+   target_link_libraries(${lib} ${LIBM_LIBRARY})
+-  set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS})
+   set_target_properties(${lib} PROPERTIES
+     VERSION "${BROTLI_ABI_COMPATIBILITY}.${BROTLI_ABI_AGE}.${BROTLI_ABI_REVISION}"
+     SOVERSION "${BROTLI_ABI_COMPATIBILITY}"
+     POSITION_INDEPENDENT_CODE TRUE)
+-  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDE_DIRS}")
++  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>)
+ endforeach()
+ 
+ target_link_libraries(brotlidec brotlicommon)
+@@ -199,27 +198,35 @@ target_link_libraries(brotli ${BROTLI_LIBRARIES_STATIC})
+ if(NOT BROTLI_BUNDLED_MODE)
+   install(
+     TARGETS brotli
+-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++    RUNTIME DESTINATION tools/brotli
++    CONFIGURATIONS Release
+   )
+ 
++  if(BUILD_SHARED_LIBS)
+   install(
+     TARGETS ${BROTLI_LIBRARIES_CORE}
++    EXPORT brotli
+     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+   )
+-
++  else()
+   install(
+     TARGETS ${BROTLI_LIBRARIES_CORE_STATIC}
++    EXPORT brotli
+     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+   )
++  endif()
+ 
+   install(
+     DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli
+     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++    CONFIGURATIONS Release
+   )
++
++  install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli)
+ endif()
+ 
+ # Tests
diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake
index 64f1485a6..4a95f89a4 100644
--- a/ports/brotli/portfile.cmake
+++ b/ports/brotli/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF v1.0.2
     SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
     HEAD_REF master
+    PATCHES install.patch
 )
 
 vcpkg_configure_cmake(
@@ -16,30 +17,10 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/brotli)
-file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/brotli ${CURRENT_PACKAGES_DIR}/bin/brotli.exe)
-file(GLOB DEBUG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/brotli ${CURRENT_PACKAGES_DIR}/debug/bin/brotli.exe)
-file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/brotli)
-file(REMOVE ${EXES} ${DEBUG_EXES})
-
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(GLOB STATIC_LIBS "${CURRENT_PACKAGES_DIR}/lib/*-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/*-static.lib")
-    file(REMOVE ${STATIC_LIBS})
-else()
-    file(GLOB LIBS
-        "${CURRENT_PACKAGES_DIR}/lib/*.lib"
-        "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib"
-        "${CURRENT_PACKAGES_DIR}/lib/*.a"
-        "${CURRENT_PACKAGES_DIR}/debug/lib/*.a"
-    )
-    list(FILTER LIBS EXCLUDE REGEX "-static\\.lib\$")
-    list(FILTER LIBS EXCLUDE REGEX "-static\\.a\$")
-    file(REMOVE_RECURSE ${LIBS} ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/brotli RENAME copyright)
 
 vcpkg_copy_pdbs()
diff --git a/ports/brotli/vcpkg-cmake-wrapper.cmake b/ports/brotli/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..882106bcc
--- /dev/null
+++ b/ports/brotli/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,11 @@
+_find_package(${ARGS})
+foreach(T brotlicommon brotlidec brotlienc)
+    if(TARGET unofficial::brotli::${T} AND NOT TARGET unofficial::brotli::${T}-static)
+        _add_library(unofficial::brotli::${T}-static INTERFACE IMPORTED)
+        set_target_properties(unofficial::brotli::${T}-static PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}")
+    endif()
+    if(NOT TARGET unofficial::brotli::${T} AND TARGET unofficial::brotli::${T}-static)
+        _add_library(unofficial::brotli::${T} INTERFACE IMPORTED)
+        set_target_properties(unofficial::brotli::${T} PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}-static")
+    endif()
+endforeach()
diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake
index ef90e8d98..00d92c90a 100644
--- a/ports/bzip2/portfile.cmake
+++ b/ports/bzip2/portfile.cmake
@@ -38,3 +38,5 @@ file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+vcpkg_test_cmake(PACKAGE_NAME BZip2 MODULE)
diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt
index 5ace57604..137dba7f3 100644
--- a/ports/cairo/CMakeLists.txt
+++ b/ports/cairo/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.11)
 project(cairo C)
 
 # Add include directories
@@ -162,14 +162,10 @@ set(CMAKE_DEBUG_POSTFIX "d")
 
 find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
-
-# Make the pixman library available
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(PIXMAN_SUFFIX "d")
-endif()
-find_library(PIXMAN_LIBRARY NAMES pixman-1${PIXMAN_SUFFIX})
-
-find_package(Freetype CONFIG REQUIRED)
+find_package(Freetype REQUIRED)
+find_package(unofficial-glib CONFIG REQUIRED)
+find_package(unofficial-fontconfig CONFIG REQUIRED)
+find_package(unofficial-pixman CONFIG REQUIRED)
 
 # Cairo needs to be told which features of FreeType are availible
 add_definitions(
@@ -179,9 +175,6 @@ add_definitions(
     -DHAVE_FT_LOAD_SFNT_TABLE=1
     -DHAVE_FT_GET_X11_FONT_FORMAT=1)
 
-# Find FontConfig
-find_library(FONTCONFIG_LIBRARY fontconfig)
-
 # additional features for macOS
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   add_definitions(
@@ -196,20 +189,7 @@ endif()
 
 add_library(cairo ${SOURCES})
 
-if(MSVC)
-  # cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
-  # NOTE: options only available to MSVC, clang in macOS doesn't understand these flags
-  target_compile_options(cairo PUBLIC "/wd4244" PUBLIC "/wd4146" PUBLIC "/wd4312" PUBLIC "/wd4267" 
-                               PUBLIC "/wd4996" PUBLIC "/wd4311" PUBLIC "/wd4334" PUBLIC "/wd4101")
-endif()
-
-target_link_libraries(cairo gdi32 msimg32 user32 ZLIB::ZLIB PNG::PNG freetype ${PIXMAN_LIBRARY} ${FONTCONFIG_LIBRARY})
-
-install(TARGETS cairo
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION bin
-  ARCHIVE DESTINATION lib
-)
+target_link_libraries(cairo PRIVATE gdi32 msimg32 user32 ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 unofficial::fontconfig::fontconfig)
 
 # GObject support module
 
@@ -225,16 +205,43 @@ if(BUILD_SHARED_LIBS)
         PROPERTIES COMPILE_DEFINITIONS "cairo_public=__declspec(dllexport)")
 endif()
 
-# Make GLib's GObject available
-find_path(GLIB_INCLUDE_DIR glib.h)
-find_library(GLIB_LIBRARY NAMES glib-2.0)
-find_library(GOBJECT_LIBRARY NAMES gobject-2.0)
-set(GLIB_LIBRARIES ${GLIB_LIBRARY} ${GOBJECT_LIBRARY})
-
 add_library(cairo-gobject ${CAIRO_GOBJECT_SOURCES}) 
-target_link_libraries(cairo-gobject cairo ${GLIB_LIBRARIES})
-target_include_directories(cairo-gobject PRIVATE ${GLIB_INCLUDE_DIR})
-install(TARGETS cairo-gobject
+target_link_libraries(cairo-gobject PRIVATE cairo unofficial::glib::gobject unofficial::glib::glib)
+
+if(MSVC)
+    # cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
+    # NOTE: options only available to MSVC, clang in macOS doesn't understand these flags
+    target_compile_options(cairo PRIVATE
+        "/wd4244" "/wd4146" "/wd4312" "/wd4267" "/wd4996" "/wd4311" "/wd4334" "/wd4101"
+    )
+    target_compile_options(cairo-gobject PRIVATE
+        "/wd4244" "/wd4146" "/wd4312" "/wd4267" "/wd4996" "/wd4311" "/wd4334" "/wd4101"
+    )
+endif()
+
+install(TARGETS cairo cairo-gobject
+    EXPORT cairo-targets
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    ARCHIVE DESTINATION lib
+)
+
+install(
+    EXPORT cairo-targets
+    NAMESPACE unofficial::cairo::
+    FILE unofficial-cairo-targets.cmake
+    DESTINATION share/unofficial-cairo
+)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-cairo-config.cmake "
+include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)
+find_dependency(PNG)
+find_dependency(Freetype)
+find_dependency(unofficial-glib CONFIG)
+find_dependency(unofficial-fontconfig CONFIG)
+find_dependency(unofficial-pixman CONFIG)
+
+include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-cairo-targets.cmake)
+")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-cairo-config.cmake DESTINATION share/unofficial-cairo)
diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL
index eb1964c8a..2f182e84b 100644
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@@ -1,4 +1,4 @@
 Source: cairo
-Version: 1.15.8-2
+Version: 1.15.8-3
 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/cairo/portfile.cmake b/ports/cairo/portfile.cmake
index bc74654d0..53d944b54 100644
--- a/ports/cairo/portfile.cmake
+++ b/ports/cairo/portfile.cmake
@@ -1,25 +1,18 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
 set(CAIRO_VERSION 1.15.8)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cairo-${CAIRO_VERSION})
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://cairographics.org/snapshots/cairo-${CAIRO_VERSION}.tar.xz"
     FILENAME "cairo-${CAIRO_VERSION}.tar.xz"
     SHA512 5af1eebf432201dae0efaa5b6766b151d8273ea00dae48e104d56477005b4d423d64b5d11c512736a4cb076632fb2a572ec35becd922825a68d933bb5ff96ca1
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/export-only-in-shared-build.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/0001_fix_osx_defined.patch"
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${CAIRO_VERSION}
+    PATCHES
+        export-only-in-shared-build.patch
+        0001_fix_osx_defined.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src)
@@ -32,6 +25,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cairo TARGET_PATH share/unofficial-cairo)
+
 # Copy the appropriate header files.
 foreach(FILE
 "${SOURCE_PATH}/src/cairo.h"
@@ -64,3 +59,5 @@ file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cairo
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/cairo/COPYING ${CURRENT_PACKAGES_DIR}/share/cairo/copyright)
 
 vcpkg_copy_pdbs()
+
+vcpkg_test_cmake(PACKAGE_NAME unofficial-cairo)
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
index 41b534b59..10c288d42 100644
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
 Source: catch2
-Version: 2.3.0
+Version: 2.4.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 763ee1987..81a0f6d0d 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.3.0
-    SHA512 e9a089b504c339e87bda0fb1a4040d9d19c932a4bc7dca41bdad6edfcf8c428f4152ff1e0c898dfdf6b20bd5d901c343bed00ad89351fa5182f3c106e0fb4b03
+    REF v2.4.0
+    SHA512 7bd148271520dfce24f64bab084226387a6adc9f0a5439b6cb2fa6b4e44b495475ecd9bc5936c6fa4f17e45132e826d8d47410b33d6c218d7a3202f5bb0ccbf4
     HEAD_REF master
 )
 
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL
index 12765f391..ef39cf54e 100644
--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@@ -1,8 +1,8 @@
 Source: cgal
-Version: 4.12
+Version: 4.13-1
 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic
 Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.
 
 Feature: qt
-Build-Depends: qt5
+Build-Depends: qt5-base, qt5-3d, qt5-svg, qt5-xmlpatterns, qt5-script, eigen3
 Description: Qt GUI support for CGAL
diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake
index 1d9661862..bf261f66a 100644
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@@ -3,13 +3,13 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CGAL/cgal
-    REF f7c3c8212b56c0d6dae63787efc99093f4383415
-    SHA512 fc40483b5f0e2071c3458cbd67ee7e503f68b7f6a1bbb525b6003d1a440e662cb85c257167ce6d55a73e0cc49b27a7d2b56dcf6b5eeddc78772567fdc48ba160
+    REF releases/CGAL-4.13
+    SHA512 3a12d7f567487c282928a162a47737c41c22258556ca0083b9cf492fc8f0a7c334b491b14dbfd6a62e71feeeb1b4995769c13a604e0882548f21c41b996d4eaf
     HEAD_REF master
 )
 
 set(WITH_CGAL_Qt5  OFF)
-if("qt5" IN_LIST FEATURES)
+if("qt" IN_LIST FEATURES)
   set(WITH_CGAL_Qt5 ON)
 endif()
 
@@ -30,11 +30,31 @@ vcpkg_copy_pdbs()
 # Clean
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+else()
+    foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(REMOVE
+            ${ROOT}/cgal_create_CMakeLists
+            ${ROOT}/cgal_create_cmake_script
+            ${ROOT}/cgal_make_macosx_app
+        )
+    endforeach()
+endif()
 
 file(READ ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake _contents)
 string(REPLACE "CGAL_IGNORE_PRECONFIGURED_GMP" "1" _contents "${_contents}")
 string(REPLACE "CGAL_IGNORE_PRECONFIGURED_MPFR" "1" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake "${_contents}")
-
-# Handle copyright of suitesparse and metis
-file(COPY ${SOURCE_PATH}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal)
+file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "${_contents}")
+
+file(COPY ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cgal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cgal/copyright)
+
+file(
+    COPY
+        ${SOURCE_PATH}/Installation/LICENSE.BSL
+        ${SOURCE_PATH}/Installation/LICENSE.FREE_USE
+        ${SOURCE_PATH}/Installation/LICENSE.GPL
+        ${SOURCE_PATH}/Installation/LICENSE.LGPL
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal
+)
diff --git a/ports/chaiscript/CONTROL b/ports/chaiscript/CONTROL
index 7d6197531..8fbd830d9 100644
--- a/ports/chaiscript/CONTROL
+++ b/ports/chaiscript/CONTROL
@@ -1,3 +1,3 @@
 Source: chaiscript
-Version: 6.0.0
+Version: 6.1.0
 Description: Embedded Scripting Language Designed for C++
diff --git a/ports/chaiscript/portfile.cmake b/ports/chaiscript/portfile.cmake
index 3103eb302..a3611b0e1 100644
--- a/ports/chaiscript/portfile.cmake
+++ b/ports/chaiscript/portfile.cmake
@@ -14,8 +14,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ChaiScript/ChaiScript
-    REF v6.0.0
-    SHA512 612c175b9ee357512addcbe9ce0e2b9c34c40a45b5be85a3f75e2c0d391bc845996e2559c401e4899088b3e641c6c5b34af233bf2fd48d4de4531ea2815e2a96
+    REF v6.1.0
+    SHA512 7728abd8d3e1e8007f4d95c8065ba5a9154583bcd1d493bfd96d608ff91f4c9bb23e538378b77c1cfd6c637d6b4885af94ac0a2a9a34b6bae19581d9f1a831cc
     HEAD_REF master
 )
 
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL
index 07b9ade32..cc29aa2d5 100644
--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@@ -1,3 +1,3 @@
 Source: chakracore
-Version: 1.10.1
+Version: 1.11.1-1
 Description: Core part of the Chakra Javascript engine
diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake
index 6a40f4663..3d7b2630d 100644
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@@ -1,22 +1,16 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-if(VCPKG_CRT_LINKAGE STREQUAL static)
-    message(FATAL_ERROR "Static linking of the CRT is not yet supported.")
-endif()
-
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "UWP is not currently supported.")
 endif()
 
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/ChakraCore
-    REF v1.10.1
-    SHA512 e3a9a9e6506b603922e5a5ed1fb900d43dfd6c8e5e091e12bf902dbe58cd12753e6b7f59a895081cea880eb78bcc55571ee561fe03c96d6312608626a5b653f2
+    REF v1.11.1
+    SHA512 cabec836af505504ffff99050de79320fe32e7311842bc5c715dae18ae7e006b63bb56f4d071016708ddec05a2a07143677371a76a57def68fb7f428012452d3
     HEAD_REF master
 )
 
@@ -30,9 +24,14 @@ set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
 file(REMOVE_RECURSE ${BUILDTREE_PATH})
 file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH})
 
+set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage
+
 vcpkg_build_msbuild(
     PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln
-    OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props"
+    OPTIONS
+        "/p:DotNetSdkRoot=${NETFXSDK_PATH}/"
+        "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props"
+        "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}"
 )
 
 file(INSTALL
@@ -68,6 +67,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe
         ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe
         DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore)
+    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore)
 endif()
 
 vcpkg_copy_pdbs()
diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL
index c3acc587c..ecb4df9f9 100644
--- a/ports/cimg/CONTROL
+++ b/ports/cimg/CONTROL
@@ -1,3 +1,3 @@
 Source: cimg
-Version: 2.3.3
+Version: 2.3.6
 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 8704f0f7b..edf4839d3 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.3.3
+    REF v.2.3.6
     HEAD_REF master
-    SHA512 506dd0e55ecab3a1c3b230c97050b302614f187e7ec8634d8499353b278c783cd58408211abd3815d34b4e2b748e4481ccea79d1253d1df511fd3d0723ae4568)
+    SHA512 b2214e6f72eee0dd4fd20739030c4082bfe67923a7f2efe74709b42e07d58552a6b7d1306f0fddf9478294e822313fe3bae0bff5c141e7dbb4453d08b3d9b05d)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
diff --git a/ports/concurrentqueue/CONTROL b/ports/concurrentqueue/CONTROL
new file mode 100644
index 000000000..2dea27277
--- /dev/null
+++ b/ports/concurrentqueue/CONTROL
@@ -0,0 +1,3 @@
+Source: concurrentqueue
+Version: 1.0.0-beta
+Description: A fast multi-producer, multi-consumer lock-free concurrent queue for C++11
diff --git a/ports/concurrentqueue/portfile.cmake b/ports/concurrentqueue/portfile.cmake
new file mode 100644
index 000000000..9114d2a26
--- /dev/null
+++ b/ports/concurrentqueue/portfile.cmake
@@ -0,0 +1,15 @@
+# header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cameron314/concurrentqueue
+    REF 1d60c7f3004a87eaa9d9cbd647d66361c868558f
+    SHA512 4b435843291f4db5be6d3fb3dd33c38a1c3c0a2e2c22910b819f119cfca2867116c5d01dd5e7d302693d467821688aac5dc7334b4a9ef39275e682f1fb99585c
+    HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrentqueue RENAME copyright)
+
+file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h)
+file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index cd52abbbf..2693d2390 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.10.3-1
+Version: 2.10.6-1
 Build-Depends: zlib, openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp), websocketpp (!uwp), 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 5a26487c5..c84e6ff90 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.3
-    SHA512 0003d1230f7f26424b71f705fd95c3907b60ac0d574ef6199081a8edd385d1469f405cf973c074fe6a4fc71f585e5e42862940d285ba575075dec4cb27774c36
+    REF v2.10.6
+    SHA512 f0848f329df80ced68132600914f0f4ba1ed42c7c16188e0f2bd41cf0c50173c27ca42c8db72ff239ca881bc8789fa4d1e3189c492832f6c22d36d504b7ce8dd
     HEAD_REF master
 )
 
@@ -32,7 +32,14 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets()
+if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/share") # transition
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share)
+else()
+    vcpkg_fixup_cmake_targets() # v2.10.6 and below
+endif()
+
+
 
 file(INSTALL
     ${SOURCE_PATH}/license.txt
diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL
index 6fea020bd..89db4de57 100644
--- a/ports/cryptopp/CONTROL
+++ b/ports/cryptopp/CONTROL
@@ -1,3 +1,3 @@
 Source: cryptopp
-Version: 6.1.0-2
+Version: 7.0.0
 Description: Crypto++ is a free C++ class library of cryptographic schemes.
diff --git a/ports/cryptopp/cmake.patch b/ports/cryptopp/cmake.patch
index fbe725eb9..699ebd564 100644
--- a/ports/cryptopp/cmake.patch
+++ b/ports/cryptopp/cmake.patch
@@ -1,15 +1,19 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b6e1e6..a0adcf6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -329,6 +329,10 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
- 	SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FI\"winapifamily.h\"" )
- endif ()
- 
-+if(WINDOWS_STORE)
-+	add_definitions(-DCRYPTOPP_DISABLE_NACL=1)
-+endif()
-+
- # Enable PIC for all target machines except 32-bit i386 due to register pressures.
- if (NOT CRYPTOPP_I386)
- 	SET(CMAKE_POSITION_INDEPENDENT_CODE 1)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8cf9fa2..86a756b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -336,9 +336,13 @@ if (MSVC)
+   if (CMAKE_SYSTEM_VERSION MATCHES "10\\.0.*")
+     list(APPEND CRYPTOPP_COMPILE_DEFINITIONS "_WIN32_WINNT=0x0A00")
+   endif ()
+-  list(APPEND CRYPTOPP_COMPILE_OPTIONS "/FI\"winapifamily.h\"")
++  list(APPEND CRYPTOPP_COMPILE_OPTIONS "/FIwinapifamily.h")
+ endif ()
+ 
++if(WINDOWS_STORE)
++  add_definitions(-DCRYPTOPP_DISABLE_NACL=1)
++endif()
++
+ # Enable PIC for all target machines except 32-bit i386 due to register pressures.
+ if (NOT CRYPTOPP_I386)
+   SET(CMAKE_POSITION_INDEPENDENT_CODE 1)
diff --git a/ports/cryptopp/patch.patch b/ports/cryptopp/patch.patch
index 5c49d2757..937738d5b 100644
--- a/ports/cryptopp/patch.patch
+++ b/ports/cryptopp/patch.patch
@@ -1,8 +1,8 @@
-diff --git a/config.h b/config.h
-index b96b7aa..3f004ac 100644
---- a/config.h
-+++ b/config.h
-@@ -795,6 +795,7 @@ NAMESPACE_END
+diff --git a/config.h b/config.h
+index f06992a2..be6eda31 100644
+--- a/config.h
++++ b/config.h
+@@ -814,6 +814,7 @@ NAMESPACE_END
  #endif
  
  #ifdef CRYPTOPP_WIN32_AVAILABLE
diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake
index 6b4b844c4..82893be41 100644
--- a/ports/cryptopp/portfile.cmake
+++ b/ports/cryptopp/portfile.cmake
@@ -1,35 +1,30 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported. Building static.") # See note below
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
   OUT_SOURCE_PATH CMAKE_SOURCE_PATH
   REPO noloader/cryptopp-cmake
-  REF aab149932675e4bb777a9d3d6b3f8b8182583fd7
-  SHA512 748c77e936888d042bf4a72cc7ee3b7b2ecf16c003cb23296c1af413c9a0cba00cc942ecace26274fc8ac8bd4d848946beb9d7bf2253c5eab3315a4419ef5f1f
+  REF 2729870f277bd568a8e8183b5ba7799e0c2dbf96
+  SHA512 fff9468774f66a895ab44ce76d37b320aeaa9398514b66d5116ffe84705ef7a202586622d598ea03f7c1636587893d46c6eee5e0da965c58fb74131c4b76223c
   HEAD_REF master
+  PATCHES
+    cmake.patch
+    simon-speck.patch
 )
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO weidai11/cryptopp
-  REF CRYPTOPP_6_1_0
-  SHA512 4bc02fef33f1859a07434a4752c2575afd781056e9a91eed99a13cebe2c91d66cbc7173e34d362da63dad6d38f9594ff291accd27e111232996ccd536bba0f39
+  REF CRYPTOPP_7_0_0
+  SHA512 bc83f6adf0ae627c57ff9172d8cee69e7000d9b414ec903a50f11f9a68da08d1dd4985ddaffada86bf58e8168a2df065185efd932201d2df9db3f73025825e54
   HEAD_REF master
+  PATCHES patch.patch
 )
 
 file(COPY ${CMAKE_SOURCE_PATH}/cryptopp-config.cmake DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-vcpkg_apply_patches(
-  SOURCE_PATH "${SOURCE_PATH}"
-  PATCHES
-    "${CMAKE_CURRENT_LIST_DIR}/patch.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/cmake.patch"
-)
-
 # Dynamic linking should be avoided for Crypto++ to reduce the attack surface,
 # so generate a static lib for both dynamic and static vcpkg targets.
 # See also:
diff --git a/ports/cryptopp/simon-speck.patch b/ports/cryptopp/simon-speck.patch
new file mode 100644
index 000000000..a1d911930
--- /dev/null
+++ b/ports/cryptopp/simon-speck.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7d64977..4ec3ebd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -497,6 +497,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
+       set_source_files_properties(${SRC_DIR}/simeck-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
+       set_source_files_properties(${SRC_DIR}/simon128-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
+       set_source_files_properties(${SRC_DIR}/speck128-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
++      set_source_files_properties(${SRC_DIR}/simon-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
++      set_source_files_properties(${SRC_DIR}/speck-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
+       if (CRYPTOPP_IA32_SSE41 AND NOT DISABLE_SSE4)
+         set_source_files_properties(${SRC_DIR}/blake2-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1")
+         set_source_files_properties(${SRC_DIR}/simon64-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1")
diff --git a/ports/curl/0001_cmake.patch b/ports/curl/0001_cmake.patch
index 4298321b3..7796af413 100644
--- a/ports/curl/0001_cmake.patch
+++ b/ports/curl/0001_cmake.patch
@@ -1,28 +1,28 @@
 diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake
-index 12a7c61..9839c67 100644
+index 84822dba7..0d6219425 100644
 --- a/CMake/FindLibSSH2.cmake
 +++ b/CMake/FindLibSSH2.cmake
-@@ -12,7 +12,7 @@ endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)
- FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h
+@@ -12,7 +12,7 @@ endif()
+ find_path(LIBSSH2_INCLUDE_DIR libssh2.h
  )
  
--FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2
-+FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 libssh2
+-find_library(LIBSSH2_LIBRARY NAMES ssh2
++find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2
  )
  
  if(LIBSSH2_INCLUDE_DIR)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7b73b98..6c7c559 100644
+index e6dbb73f1..1e2ff138e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1132,7 +1132,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)
+@@ -1144,7 +1144,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)
  
  endfunction()
  
 -if(WIN32 AND NOT CYGWIN)
 +if(MSVC)
-+    set(CURL_INSTALL_CMAKE_DIR share/curl)
++  set(CURL_INSTALL_CMAKE_DIR share/curl)
 +elseif(WIN32 AND NOT CYGWIN)
-     set(CURL_INSTALL_CMAKE_DIR CMake)
+   set(CURL_INSTALL_CMAKE_DIR CMake)
  else()
-     set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl)
+   set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl)
diff --git a/ports/curl/0004_nghttp2_staticlib.patch b/ports/curl/0004_nghttp2_staticlib.patch
index c5cba9c5f..69c1854f9 100644
--- a/ports/curl/0004_nghttp2_staticlib.patch
+++ b/ports/curl/0004_nghttp2_staticlib.patch
@@ -6,7 +6,7 @@ index 490cc19..51c0a92 100644
    find_package(NGHTTP2 REQUIRED)
    include_directories(${NGHTTP2_INCLUDE_DIRS})
    list(APPEND CURL_LIBS ${NGHTTP2_LIBRARIES})
-+  if(CURL_STATICLIB)
++  if(NOT BUILD_SHARED_LIBS)
 +    add_definitions(-DNGHTTP2_STATICLIB)
 +  endif()
  endif()
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL
index 59eaaf095..95040eba1 100644
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@@ -1,5 +1,5 @@
 Source: curl
-Version: 7.61.0
+Version: 7.61.1-1
 Build-Depends: zlib
 Description: A library for transferring data with URLs
 Default-Features: ssl
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 075f9856e..0b156c4d0 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -1,14 +1,11 @@
 include(vcpkg_common_functions)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
-    REF curl-7_61_0
-    SHA512 b6d2f57059e72139540cb93b945703857cb447920ed9b283993611453fed623432290adc5a3558181e3decc15c7cf54fff475010d922957807a37d1a1449be6c
+    REF curl-7_61_1
+    SHA512 09fa3c87f8d516eabe3241247a5094c32ee0481961cf85bf78ecb13acdf23bb2ec82f113d2660271d22742c79e76d73fb122730fa28e34c7f5477c05a4a6534c
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
         ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch
@@ -21,10 +18,6 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)
 # Support HTTP2 TSL Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location.
 set(HTTP2_OPTIONS)
 if("http2" IN_LIST FEATURES)
-    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-        message(FATAL_ERROR "The http2 feature cannot be enabled when building for UWP.")
-    endif()
-
     set(HTTP2_OPTIONS -DUSE_NGHTTP2=ON)
 endif()
 
@@ -121,6 +114,8 @@ else()
     file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/curl-config ${CURRENT_PACKAGES_DIR}/debug/bin/curl-config)
     if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib")
         file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib ${CURRENT_PACKAGES_DIR}/lib/libcurl.lib)
+    endif()
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib")
         file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl.lib)
     endif()
 endif()
@@ -139,3 +134,5 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/curl/curl.h "${CURL_H}")
 vcpkg_copy_pdbs()
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+vcpkg_test_cmake(PACKAGE_NAME CURL MODULE)
diff --git a/ports/darts-clone/CMakeLists.txt b/ports/darts-clone/CMakeLists.txt
new file mode 100644
index 000000000..024cd2f74
--- /dev/null
+++ b/ports/darts-clone/CMakeLists.txt
@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.8)
+project(darts)
+
+if(MSVC)
+  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+add_library(darts src/darts.cc)
+
+target_include_directories(darts
+    PUBLIC
+        $<INSTALL_INTERFACE:include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
+install(
+  TARGETS darts
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(
+    DIRECTORY include/ DESTINATION include/
+  )
+endif()
diff --git a/ports/darts-clone/CONTROL b/ports/darts-clone/CONTROL
new file mode 100644
index 000000000..2d34f86c7
--- /dev/null
+++ b/ports/darts-clone/CONTROL
@@ -0,0 +1,3 @@
+Source: darts-clone
+Version:  1767ab87cffe
+Description: A static double-array trie structure
diff --git a/ports/darts-clone/portfile.cmake b/ports/darts-clone/portfile.cmake
new file mode 100644
index 000000000..2979e83b5
--- /dev/null
+++ b/ports/darts-clone/portfile.cmake
@@ -0,0 +1,26 @@
+include(vcpkg_common_functions)
+vcpkg_check_linkage(
+  ONLY_STATIC_LIBRARY
+)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO s-yata/darts-clone
+    REF 1767ab87cffe7302856d1bb41e1c21b1df93f19e
+    SHA512 63112a4d8d6302d2602a8f161bf5fe5ec1b5b3b3097de9b28331f5261d76c06efb48601c08df26f242ddc881b917928baf54f24ccebac65da29e94380b6db0f5
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG
+        -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright)
diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index 427998eb4..e625af354 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,3 +1,3 @@
 Source: directxmesh
-Version: jul2018
+Version: aug2018
 Description: DirectXMesh geometry processing library
 \ No newline at end of file
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index e8d48d1c8..4263b2aa8 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -12,8 +12,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXMesh
-    REF jul2018
-    SHA512 080306d23153c5db6d84cf1df7700d89a25405064806ca9b8d07291ebe80d89793dfe540a98313afc137964e2fb900158d40feee6bb2a68ef9af2d872f0ebe3c
+    REF aug2018
+    SHA512 5aaafd434024327b9ab59eab7f0247a5e0d439e5cad22929adc78edd41ac987c5da70e3ae26637beea923333651ceae3127f1ff274aad3497948508a1a8b1912
     HEAD_REF master
 )
 
diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index 9340c9f3e..3196c68b1 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtex
-Version: jul2018
+Version: aug2018b
 Description: DirectXTex texture processing library
 \ No newline at end of file
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 4ea0216b0..bcdeebfbd 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -12,8 +12,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTex
-    REF jul2018
-    SHA512 83408840bf1fedef240c808c59b94d9b77133cf6bc1803c49a4faf5a319fa4b16c26c16240748fb4dd29fb907a4366c724171c64deeb71b0a15214ee74859b4d
+    REF aug2018b
+    SHA512 51ccd4855d399db4980a0f859da25e9473cf5b4ae44f2594b13ba7813d4fd3f4c424ce750ca0b096e40999c935269522fb6bfe2b2e1910f0f8a6c6c1ea76c399
     HEAD_REF master
 )
 
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index 254c61337..1f0637c44 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtk
-Version: jul2018
+Version: aug2018
 Description: A collection of helper classes for writing DirectX 11.x code in C++.
diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index 317831c96..5ef37d1f2 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -12,8 +12,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK
-    REF jul2018
-    SHA512 1e962bc7f3ab730616bb7ec07d54904cbd636033ca0bba722170690dc906524968df66ad440e3423273120b9e4dc53a28ae7edb8a2568c58e5eed816d8e9a619
+    REF aug2018
+    SHA512 9408916864900a098bb77244144c71d1786b3fe76468c50a92fbf21f71407c7f7c6834d9e69a13b4b93161362252599ccb12f6a87b6ca7a8b23d12e6e73dd166
     HEAD_REF master
 )
 
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL
index 4b7b820d1..4e726c662 100644
--- a/ports/dlib/CONTROL
+++ b/ports/dlib/CONTROL
@@ -1,5 +1,5 @@
 Source: dlib
-Version: 19.15
+Version: 19.16
 Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas, clapack
 Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++
 
diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake
index 613b5d673..f6cdf4eeb 100644
--- a/ports/dlib/portfile.cmake
+++ b/ports/dlib/portfile.cmake
@@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO davisking/dlib
-    REF v19.15
-    SHA512 e815d4cd3cf75de4bf3df25597f1b13e831129b8e780909194be05bde4c811792886e7370980edf0fe294aa1ad7a69ba9b9ca729e05713d3ee4f6aa4236baaf7
+    REF v19.16
+    SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
     HEAD_REF master
 )
 
diff --git a/ports/docopt/001-fix-unresolved-symbol.patch b/ports/docopt/001-fix-unresolved-symbol.patch
new file mode 100644
index 000000000..3078fa44c
--- /dev/null
+++ b/ports/docopt/001-fix-unresolved-symbol.patch
@@ -0,0 +1,28 @@
+diff --git a/docopt.h b/docopt.h
+index 4c40741..06a04f8 100644
+--- a/docopt.h
++++ b/docopt.h
+@@ -85,6 +85,9 @@ namespace docopt {
+ 					    bool help = true,
+ 					    std::string const& version = {},
+ 					    bool options_first = false) noexcept;
++
++	/// Write out the contents to the ostream
++	std::ostream DOCOPT_API & operator<<(std::ostream&, value const&);
+ }
+ 
+ #ifdef DOCOPT_HEADER_ONLY
+diff --git a/docopt_value.h b/docopt_value.h
+index a923219..7f0d6d6 100644
+--- a/docopt_value.h
++++ b/docopt_value.h
+@@ -102,9 +102,6 @@ namespace docopt {
+ 		Kind kind = Kind::Empty;
+ 		Variant variant {};
+ 	};
+-
+-	/// Write out the contents to the ostream
+-	std::ostream& operator<<(std::ostream&, value const&);
+ }
+ 
+ namespace std {
diff --git a/ports/docopt/002-fix-install-path.patch b/ports/docopt/002-fix-install-path.patch
new file mode 100644
index 000000000..332e6e4c2
--- /dev/null
+++ b/ports/docopt/002-fix-install-path.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1aba5ae..5407e4a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,7 +113,10 @@ endif()
+ set(export_name "docopt-targets")
+ 
+ # Runtime package
+-install(TARGETS docopt EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS docopt EXPORT ${export_name}
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # Development package
+ install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/ports/docopt/CONTROL b/ports/docopt/CONTROL
new file mode 100644
index 000000000..0fc6d09c8
--- /dev/null
+++ b/ports/docopt/CONTROL
@@ -0,0 +1,3 @@
+Source: docopt
+Version: 2018-04-16-2
+Description: Command line arguments parser that will make you smile (C++11 port).
diff --git a/ports/docopt/install-one-flavor.patch b/ports/docopt/install-one-flavor.patch
new file mode 100644
index 000000000..f6cda826a
--- /dev/null
+++ b/ports/docopt/install-one-flavor.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bff867c..cc7d706 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,13 +113,15 @@ endif()
+ set(export_name "docopt-targets")
+ 
+ # Runtime package
++if(BUILD_SHARED_LIBS)
+ install(TARGETS docopt EXPORT ${export_name}
+ 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-
++else()
+ # Development package
+ install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
++endif()
+ install(FILES ${docopt_HEADERS} DESTINATION include/docopt)
+ 
+ # CMake Package
diff --git a/ports/docopt/portfile.cmake b/ports/docopt/portfile.cmake
new file mode 100644
index 000000000..5076bf742
--- /dev/null
+++ b/ports/docopt/portfile.cmake
@@ -0,0 +1,46 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO docopt/docopt.cpp
+    REF 4f491249e6def236937dbfac7602852e7d99aff8
+    SHA512 d3a61f8d8a8c11723064f3405f03eb838a2ac9aa574f86771b1db89a2dd81996b639215fe5d4465343b893bf71502da178c7af8d883c112c1e45f43c17d473b7
+    HEAD_REF master
+    PATCHES
+        001-fix-unresolved-symbol.patch
+        002-fix-install-path.patch
+        install-one-flavor.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DWITH_EXAMPLE=OFF
+        -DWITH_TESTS=OFF
+        -DUSE_BOOST_REGEX=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/docopt)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(READ ${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h _contents)
+    string(REPLACE "#ifdef DOCOPT_DLL" "#if 1" _contents "${_contents}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h "${_contents}")
+endif()
+
+# Header-only style when DOCOPT_HEADER_ONLY is defined
+file(COPY
+    ${SOURCE_PATH}/docopt.cpp
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include/docopt)
+
+# Handle copyright
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE-MIT
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/docopt RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL
index 3de9dedb3..214950929 100644
--- a/ports/doctest/CONTROL
+++ b/ports/doctest/CONTROL
@@ -1,3 +1,3 @@
 Source: doctest
-Version: 1.2.9
+Version: 2.0.0
 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 433a52f53..007b3a21d 100644
--- a/ports/doctest/portfile.cmake
+++ b/ports/doctest/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onqtam/doctest
-    REF 1.2.9
-    SHA512 9500570fb0ef7b06799fbe92b8f96eacf16eba630abe4f67a235901995192e31fafb812704f327f0a2582c8fe61c3bb458d2eaf3c4287f24c1ffbc04c46a2471
+    REF 2.0.0
+    SHA512 ad167201fa10890e868fab628d73588e66470fbf6d5bdf0cd4e4ce13510f0727411fa709eb748eb1b5de19307c75d2efbcd71cb678e3ef1d0632056d7af2f012
     HEAD_REF master
 )
 
diff --git a/ports/double-conversion/CONTROL b/ports/double-conversion/CONTROL
index fb0afdb9a..66cf5b1dd 100644
--- a/ports/double-conversion/CONTROL
+++ b/ports/double-conversion/CONTROL
@@ -1,3 +1,3 @@
 Source: double-conversion
-Version: 3.0.0-2
+Version: 3.1.0
 Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.
diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake
index 47f3fba4e..99be98024 100644
--- a/ports/double-conversion/portfile.cmake
+++ b/ports/double-conversion/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/double-conversion
-    REF v3.0.0
-    SHA512 5057af6e72f2aaace56ebdd9a0ddfa34318cbdfeabec5c361b60e6c92f160c8999c046c50f8c6f8d590eb8e97aa70bb6e97ba8148f0dc95dbc42f204fcdc1abf
+    REF 3.1.0
+    SHA512 ba797a7203bc7eb8ba697dc758a3341578f0405b5ab42fbd5a22d9fac09d11dd8cb5ed9ff9ff369e8ae9397ec74c04c62fca29d1bc469c6d2ea1a84a6dff9188
     HEAD_REF master
 )
 
@@ -26,35 +26,6 @@ vcpkg_install_cmake()
 if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion)
     vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/double-conversion)
 endif()
-if(NOT VCPKG_USE_HEAD_VERSION)
-    if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
-        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-            file(RENAME ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake
-                        ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionTargets-debug.cmake)
-        endif()
-        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-            file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends-release.cmake
-                        ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets-release.cmake)
-        endif()
-        file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends.cmake
-                    ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake)
-
-        file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake TARGETS_FILE)
-        string(REPLACE "double-conversionLibraryDepends" "double-conversionTargets" TARGETS_FILE "${TARGETS_FILE}")
-        file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake "${TARGETS_FILE}")
-
-        # Remove hardcoded paths from config file
-        file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake CONFIG_FILE)
-        string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion/double-conversionLibraryDepends.cmake"
-                    "\${double-conversion_CMAKE_DIR}/double-conversionTargets.cmake" CONFIG_FILE "${CONFIG_FILE}")
-        string(REPLACE "${CURRENT_PACKAGES_DIR}"
-                    "\${double-conversion_CMAKE_DIR}/../.." CONFIG_FILE "${CONFIG_FILE}")
-        file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake "${CONFIG_FILE}")
-
-        vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
-    endif()
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-endif()
 
 vcpkg_copy_pdbs()
 
diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL
index 74ee1d5eb..c45a2c740 100644
--- a/ports/eastl/CONTROL
+++ b/ports/eastl/CONTROL
@@ -1,4 +1,4 @@
 Source: eastl
-Version: 3.10.00
+Version: 3.12.01
 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 491ce8581..ddc5950b6 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.10.00
-    SHA512 281a8d79d30a39136d9a9c6fd63ca712b450cd45019aab1ac3a219bb8704e094a5b8f461a7cd7ab8480f41beca94f1589162fe4899406869898a2e1ffc497b78
+    REF 3.12.01
+    SHA512 22053823299386337934abb473be5bad4766db571656ee8f93eb04f6079c1860fd598ae8b7a955ca5dcf26661370d558aaf35037c989ec5a976feae87a445aad
     HEAD_REF master
 )
 
diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL
index 147603756..6076cf714 100644
--- a/ports/ecm/CONTROL
+++ b/ports/ecm/CONTROL
@@ -1,3 +1,3 @@
 Source: ecm
-Version: 5.40.0
+Version: 5.50.0
 Description: Extra CMake Modules (ECM), extra modules and scripts for CMake
diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake
index 56dcdcf7d..325a6505c 100644
--- a/ports/ecm/portfile.cmake
+++ b/ports/ecm/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/extra-cmake-modules
-    REF v5.40.0
-    SHA512 1f79d797770367e79c2c6dd73c125d32fcc5fe404b350d953b69cc6544babc1c73e2986c833635daaac85a5af966977e40fe41c01ac48ccc45d46d2e1636d21f
+    REF v5.50.0
+    SHA512 625f934b97c56cceed44d8fa0e335fb1f593806e52b8bfd2fd467561b4de2528940add756a8e903bd5502e912422cc3835e65e047cc4c205d3b8629452627abd
     HEAD_REF master
 )
 
diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL
index 1a4eff9c2..4bcfb031b 100644
--- a/ports/ecsutil/CONTROL
+++ b/ports/ecsutil/CONTROL
@@ -1,3 +1,4 @@
 Source: ecsutil
-Version: 1.0.1.2
+Version: 1.0.1.3
 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.
+Build-Depends: atlmfc
diff --git a/ports/ecsutil/disable-setversion.patch b/ports/ecsutil/disable-setversion.patch
new file mode 100644
index 000000000..2899a0108
--- /dev/null
+++ b/ports/ecsutil/disable-setversion.patch
@@ -0,0 +1,36 @@
+diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj
+index 05c5726..f8ac64e 100644
+--- a/ECSUtil/ECSUtil.vcxproj
++++ b/ECSUtil/ECSUtil.vcxproj
+@@ -274,7 +274,6 @@
+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+     </ResourceCompile>
+     <PostBuildEvent>
+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>
+     </PostBuildEvent>
+     <PostBuildEvent>
+       <Message>set version resource in DLL from source file</Message>
+@@ -361,7 +360,6 @@
+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+     </ResourceCompile>
+     <PostBuildEvent>
+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>
+     </PostBuildEvent>
+     <PostBuildEvent>
+       <Message>set version resource in DLL from source file</Message>
+@@ -445,7 +443,6 @@
+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+     </ResourceCompile>
+     <PostBuildEvent>
+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>
+     </PostBuildEvent>
+     <PostBuildEvent>
+       <Message>set version resource in DLL from source file</Message>
+@@ -541,7 +538,6 @@
+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+     </ResourceCompile>
+     <PostBuildEvent>
+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>
+     </PostBuildEvent>
+     <PostBuildEvent>
+       <Message>set version resource in DLL from source file</Message>
diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake
index 874759afc..7946b0738 100644
--- a/ports/ecsutil/portfile.cmake
+++ b/ports/ecsutil/portfile.cmake
@@ -1,80 +1,52 @@
-# 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(ECSUTIL_VERSION "v1.0.1.2")
-set(ECSUtil_HASH 399aec10a625ee6eb8f7869005b9221a1e4930c7e8774c20467ddc0e86312e7e1224fb29a1b54d3c9669b78708a23db548195f8973a19eb5559338f600688888)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
-
-#architecture detection
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-   set(ECSUtil_ARCH Win32)
+    set(PLATFORM x86)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-   set(ECSUtil_ARCH x64)
+    set(PLATFORM x64)
 else()
-   message(FATAL_ERROR "unsupported architecture")
+    message(FATAL_ERROR "Unsupported architecture")
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME)
+    message(FATAL_ERROR "Unsupported platform. ECSUTIL currently only supports windows desktop.")
 endif()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(ECSUtil_CONFIGURATION_RELEASE Release)
     set(ECSUtil_CONFIGURATION_DEBUG Debug)
 else()
-	if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
-	    set(ECSUtil_CONFIGURATION_RELEASE "Release Lib")
-		set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib")
-	else()
-	    set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static")
-		set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static")
-	endif()
+    if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
+        set(ECSUtil_CONFIGURATION_RELEASE "Release Lib")
+        set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib")
+    else()
+        set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static")
+        set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static")
+    endif()
 endif()
 
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip"
-    FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip"
-    SHA512 ${ECSUtil_HASH}
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO EMCECS/ecs-object-client-windows-cpp
+    REF v1.0.1.3
+    SHA512 0c79e522c687aa942e018f5bab619522523b3efee6e421439bda2a93dfa8e2c2665e136a6aae9cba2f8637c296822b91127cd06053c2a39be4e3324cd1792dda
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln
-	TARGET ECSUtil
+vcpkg_install_msbuild(
+    SOURCE_PATH ${SOURCE_PATH}
+    PROJECT_SUBPATH ECSUtil.sln
+    PLATFORM ${PLATFORM}
+    LICENSE_SUBPATH license.txt
+    TARGET ECSUtil
     RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE}
     DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG}
 )
 
-file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-    file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-	if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
-		file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-		file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-		file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-		file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-	else()
-		file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-		file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-		file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-		file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-	endif()
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-# Handle copyright
-file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright)
-
-vcpkg_copy_pdbs()
+file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll)
diff --git a/ports/embree2/CONTROL b/ports/embree2/CONTROL
index f67db62c5..f68824e00 100644
--- a/ports/embree2/CONTROL
+++ b/ports/embree2/CONTROL
@@ -1,4 +1,4 @@
 Source: embree2
-Version: 2.16.4-2
+Version: 2.16.4-3
 Description: High Performance Ray Tracing Kernels.
 Build-Depends: tbb
diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake
index 6b1b5f1e2..7979891bc 100644
--- a/ports/embree2/portfile.cmake
+++ b/ports/embree2/portfile.cmake
@@ -43,9 +43,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/models)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/models)
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree/doc)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree2)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree2/doc)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/embree)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/embree/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/embree/copyright)
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/embree2)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/embree2/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/embree2/copyright)
diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL
index a287dfcb8..7e5bcdb85 100644
--- a/ports/embree3/CONTROL
+++ b/ports/embree3/CONTROL
@@ -1,4 +1,4 @@
 Source: embree3
-Version: 3.2.0-1
+Version: 3.2.0-2
 Description: High Performance Ray Tracing Kernels.
 Build-Depends: tbb
diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake
index 0488ab781..e90ea2357 100644
--- a/ports/embree3/portfile.cmake
+++ b/ports/embree3/portfile.cmake
@@ -43,9 +43,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/models)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/models)
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree/doc)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree3)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree3/doc)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/embree)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/embree/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/embree/copyright)
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/embree3)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/embree3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/embree3/copyright)
diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL
index d03cf86a4..fa3a82458 100644
--- a/ports/entt/CONTROL
+++ b/ports/entt/CONTROL
@@ -1,3 +1,3 @@
 Source: entt
-Version: 2.7.1
+Version: 2.7.2
 Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. <https://github.com/skypjack/entt>
diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake
index 96a509270..c99554c59 100644
--- a/ports/entt/portfile.cmake
+++ b/ports/entt/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO skypjack/entt
-    REF v2.7.1
-    SHA512 6db7aa43194dd30026f409ee7f1012d48c3812ec99fc525864527142e5b94bef3950759874d7afcafa264af1c7ccfd39979c550c641e942cc6871e537938d508
+    REF v2.7.2
+    SHA512 334b94ef142bb234204315e47c9783f55c7639c59a214b772ce76c6b7cf4008280ab6762a3cf6049f51932773f5ae62e45d9423efe0dd5043b20103b1f857167
 )
 
 file(INSTALL
diff --git a/ports/esaxx/CONTROL b/ports/esaxx/CONTROL
new file mode 100644
index 000000000..48b7eebec
--- /dev/null
+++ b/ports/esaxx/CONTROL
@@ -0,0 +1,3 @@
+Source: esaxx
+Version: ca7cb332011ec37
+Description: This library provides the implementation of enhanced suffix array.
diff --git a/ports/esaxx/portfile.cmake b/ports/esaxx/portfile.cmake
new file mode 100644
index 000000000..93e24ff36
--- /dev/null
+++ b/ports/esaxx/portfile.cmake
@@ -0,0 +1,17 @@
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO hillbig/esaxx
+    REF ca7cb332011ec37a8436487f210f396b84bd8273
+    SHA512 8346fc93498f7979fd422db527d0e2db73080b2c372263a72a887ddc8328a29391bce6def5845f4500a180f5c2e641105d0ce108092e6eac9020c6bd67fb46df
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/esa.hxx
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+
+# Handle copyright/readme/package files
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/esaxx RENAME copyright)
diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL
index e96c322ec..a89b87f8e 100644
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@@ -1,4 +1,4 @@
 Source: exiv2
-Version: 2018-07-30
+Version: 2018-09-18
 Build-Depends: zlib, expat, libiconv
 Description: Image metadata library and tools http://www.exiv2.org
diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake
index 54a071f19..4af8fb986 100644
--- a/ports/exiv2/portfile.cmake
+++ b/ports/exiv2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Exiv2/exiv2
-    REF e67910a6691f5238e85d5a43477af7dd13f0574e
-    SHA512 6f7fddf25fd7c557911678f009412986df959dd32594b66d81524ae666fc260f5ba9df461eab3ad8e7f1cad939e355be7e0801f1e6ee275e9eddfc53961ad0ab
+    REF 37b8725565f42c260f9773fe4cfb8fa39f566746
+    SHA512 8be6079546099ac7267978ed3aa1c8e42215baa06b5da30c78918dac8193a725b3c38f6fb47fb50e7724580a964360163e2167b08c7e5929485fd3bd037338b0
     HEAD_REF master
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/iconv.patch"
 )
diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL
index edbcf2326..4cdb03f6e 100644
--- a/ports/expat/CONTROL
+++ b/ports/expat/CONTROL
@@ -1,3 +1,3 @@
 Source: expat
-Version: 2.2.5
+Version: 2.2.6
 Description: XML parser library written in C
diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake
index 485320a8b..7e2c322db 100644
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@@ -6,8 +6,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libexpat/libexpat
-    REF R_2_2_5
-    SHA512 61ce2a479521412e0c56c352106c4adfb61a6bedb883921aba3ebccc29311ddd192646ac2c51b41572728d4de6ab4cb60a1dbc71515d742a80a8b59d89ca74d6
+    REF R_2_2_6
+    SHA512 727fbd24041c9af71b32353448583a6d8b38ddf93b10c97510e847939c2ad2be9b40ff6e6e27b725bff277982c2fc96c75f19c4a3ac4a246133eb62870c963d8
     HEAD_REF master)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -43,3 +43,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     string(REPLACE "!defined(XML_STATIC)" "/* vcpkg static build !defined(XML_STATIC) */ 0" EXPAT_EXTERNAL_H "${EXPAT_EXTERNAL_H}")
 endif()
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/expat_external.h "${EXPAT_EXTERNAL_H}")
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/expat)
diff --git a/ports/expat/usage b/ports/expat/usage
new file mode 100644
index 000000000..a2d35a66e
--- /dev/null
+++ b/ports/expat/usage
@@ -0,0 +1,4 @@
+The package expat is compatible with built-in CMake targets:
+
+    find_package(EXPAT REQUIRED)
+    target_link_libraries(main PRIVATE EXPAT::EXPAT)
diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL
index 4df1a2e2b..c2e69703e 100644
--- a/ports/exprtk/CONTROL
+++ b/ports/exprtk/CONTROL
@@ -1,3 +1,3 @@
 Source: exprtk
-Version: 2018.04.30-46877b6
+Version: 2018.09.30-9836f21
 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine.
diff --git a/ports/exprtk/portfile.cmake b/ports/exprtk/portfile.cmake
index 69d9921ec..a863941af 100644
--- a/ports/exprtk/portfile.cmake
+++ b/ports/exprtk/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ArashPartow/exprtk
-    REF 46877b604cfcc0a0e592fc7a8a874cf2a9f90cf4
-    SHA512 1043b5b6aa64bc3f8d989d2aac3e3a125188b1526ab92e245ad526ab1fe37e10cb275f2b77d311b4d91bd4ea32e1d81dfcd8abf8373b723a8b664842690ee1ae
+    REF 9836f21d07b1bf799e6877324268708f61c01f73
+    SHA512 44acb6e835dc215d4338ff4c2b3444373a93475ece15b3f1bfdc0781f7c28992af7c289644bf9557d041f78c7435f5907e4ba606321aab17faee6f4a70562065
 )
 
 file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/fastfeat/CMakeLists.txt b/ports/fastfeat/CMakeLists.txt
new file mode 100644
index 000000000..89f1dc226
--- /dev/null
+++ b/ports/fastfeat/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.8)
+project(fastfeat)
+
+if(MSVC)
+  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+include_directories(.)
+file( GLOB SRCS *.c *.def)
+add_library(fastfeat ${SRCS})
+
+
+install(
+  TARGETS fastfeat
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(
+    FILES fast.h DESTINATION include
+  )
+endif()
diff --git a/ports/fastfeat/CONTROL b/ports/fastfeat/CONTROL
new file mode 100644
index 000000000..ff76128fc
--- /dev/null
+++ b/ports/fastfeat/CONTROL
@@ -0,0 +1,3 @@
+Source: fastfeat
+Version: 391d5e9
+Description: FAST feature detectors in C
diff --git a/ports/fastfeat/fastfeat.def b/ports/fastfeat/fastfeat.def
new file mode 100644
index 000000000..21e048362
--- /dev/null
+++ b/ports/fastfeat/fastfeat.def
@@ -0,0 +1,19 @@
+LIBRARY   fastfeat
+EXPORTS
+  fast9_detect_nonmax   @1
+  fast10_detect_nonmax   @2
+  fast9_corner_score @3
+  fast10_corner_score @4
+  fast11_corner_score @5
+  fast12_corner_score @6
+  fast9_detect @7
+  fast10_detect @8
+  fast11_detect @9
+  fast12_detect @10
+  fast9_score @11
+  fast10_score @12
+  fast11_score @13
+  fast12_score @14
+  fast11_detect_nonmax @15
+  fast12_detect_nonmax @16
+  nonmax_suppression @17
diff --git a/ports/fastfeat/portfile.cmake b/ports/fastfeat/portfile.cmake
new file mode 100644
index 000000000..95d178ea4
--- /dev/null
+++ b/ports/fastfeat/portfile.cmake
@@ -0,0 +1,28 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO edrosten/fast-C-src
+    REF 391d5e939eb1545d24c10533d7de424db8d9c191
+    SHA512 d6f401e2f80193c4f1f99e1ef59af7107d674c515574cf513c5977c4c95c49c0520d2a6e6787f617b42d9e3bd93c78b8fa7f1d8dc8901351820590078e62130e
+    HEAD_REF master
+)
+
+
+file(COPY
+${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+ ${CMAKE_CURRENT_LIST_DIR}/fastfeat.def
+DESTINATION ${SOURCE_PATH}
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS_DEBUG
+        -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fastfeat RENAME copyright)
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
index 51212bd32..b6a0e6ba5 100644
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@@ -30,22 +30,22 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/flatbuffers")
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin AND NOT EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin/flatc)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/flatc.exe)
+file(GLOB flatc_path ${CURRENT_PACKAGES_DIR}/bin/flatc*)
+if(flatc_path)
     make_directory(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
+    get_filename_component(flatc_executable ${flatc_path} NAME)
     file(
         RENAME
-        ${CURRENT_PACKAGES_DIR}/bin/flatc.exe
-        ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/flatc.exe
+        ${flatc_path}
+        ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable}
     )
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/flatbuffers)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/flatbuffers/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/flatbuffers/copyright)
+
diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index 64cdec426..88f41b36e 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,3 +1,3 @@
 Source: fmt
-Version: 5.1.0
+Version: 5.2.0
 Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index 3cd23d8fe..9389d2fbf 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
-    REF 5.1.0
-    SHA512 b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6
+    REF 5.2.0
+    SHA512 75d53e6d8087288607f75fb891bb8812c7b9fe65e5ab7a20cdffeb5e56bd1f48e0de24c8cf1c2dd603fe3ed76f9fa067804ec5d3560f177db8f0a747c36f9d1c
     HEAD_REF master
 )
 
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 9dd27d158..51a31ef8b 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2018.07.30.00
+Version: 2018.09.17.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/no-werror.patch b/ports/folly/no-werror.patch
new file mode 100644
index 000000000..e9ec920dc
--- /dev/null
+++ b/ports/folly/no-werror.patch
@@ -0,0 +1,12 @@
+diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake
+index b7d994b..a518cbe 100644
+--- a/CMake/FollyCompilerUnix.cmake
++++ b/CMake/FollyCompilerUnix.cmake
+@@ -16,7 +16,6 @@ function(apply_folly_compile_options_to_target THETARGET)
+       -std=gnu++14
+       -finput-charset=UTF-8
+       -fsigned-char
+-      -Werror
+       -Wall
+       -Wno-deprecated
+       -Wdeprecated-declarations
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 8ad63bd8c..e1ce597bf 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -12,16 +12,17 @@ include(vcpkg_common_functions)
 # Required to run build/generate_escape_tables.py et al.
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
+vcpkg_add_to_path("${PYTHON3_DIR}")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF v2018.07.30.00
-    SHA512 38e7b713572d4af0a6453d001eddc32c74b4ec100158300c0a3a61a88ec546b449f1973c2b624273da4278173782aa71695d981dba3c8f423f5b76ed1375d286
+    REF v2018.09.17.00
+    SHA512 fe1f5ff2b55262717cb0e923ee3d8b5a82c85432823911afc924c209fc7e97ab776a3820c4b17e003a7a55150c8e0061918eaee33bdf7ca12ec1090ed7537592
     HEAD_REF master
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/find-gflags.patch
+        find-gflags.patch
+        no-werror.patch
 )
 
 file(COPY
diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt
index 5fa5c547a..1c552468e 100644
--- a/ports/fontconfig/CMakeLists.txt
+++ b/ports/fontconfig/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.11)
 project(fontconfig C)
 
 add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONFIG_H)
@@ -6,8 +6,7 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONF
 # find dependencies
 find_package(unofficial-iconv CONFIG REQUIRED)
 find_package(Freetype REQUIRED)
-find_path(EXPAT_INCLUDE_DIR expat.h)
-find_library(EXPAT_LIBRARY expat)
+find_package(EXPAT REQUIRED)
 
 add_library(fontconfig
     src/fcatomic.c
@@ -49,9 +48,10 @@ else()
     target_include_directories(fontconfig PRIVATE ${FC_INCLUDE_DIR}/unix)
 endif()
 
-target_link_libraries(fontconfig PRIVATE unofficial::iconv::libiconv Freetype::Freetype ${EXPAT_LIBRARY})
+target_link_libraries(fontconfig PRIVATE unofficial::iconv::libiconv Freetype::Freetype EXPAT::EXPAT)
 
 install(TARGETS fontconfig
+    EXPORT fontconfig-targets
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)
@@ -73,3 +73,20 @@ if(NOT FC_SKIP_TOOLS)
     install(FILES fonts.conf DESTINATION tools/fontconfig/fonts)
     install(DIRECTORY conf.d DESTINATION tools/fontconfig/fonts FILES_MATCHING PATTERN "*.conf")
 endif()
+
+install(
+    EXPORT fontconfig-targets
+    NAMESPACE unofficial::fontconfig::
+    FILE unofficial-fontconfig-targets.cmake
+    DESTINATION share/unofficial-fontconfig
+)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake "
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-iconv CONFIG)
+find_dependency(Freetype)
+find_dependency(EXPAT)
+
+include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-fontconfig-targets.cmake)
+")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake DESTINATION share/unofficial-fontconfig)
diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL
index c0cf971da..536661659 100644
--- a/ports/fontconfig/CONTROL
+++ b/ports/fontconfig/CONTROL
@@ -1,4 +1,4 @@
 Source: fontconfig
-Version: 2.12.4-3
+Version: 2.12.4-7
 Description: Library for configuring and customizing font access.
 Build-Depends: freetype, expat, libiconv, dirent
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
index d35bbb64a..fff6eb477 100644
--- a/ports/fontconfig/portfile.cmake
+++ b/ports/fontconfig/portfile.cmake
@@ -1,18 +1,18 @@
 
 include(vcpkg_common_functions)
+
 set(FONTCONFIG_VERSION 2.12.4)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fontconfig-${FONTCONFIG_VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz"
     FILENAME "fontconfig-${FONTCONFIG_VERSION}.tar.gz"
-    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d)
-
-vcpkg_extract_source_archive(${ARCHIVE})
+    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d
+)
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/fcobjtypehash.patch"
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${FONTCONFIG_VERSION}
+    PATCHES fcobjtypehash.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -28,6 +28,9 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-fontconfig TARGET_PATH share/unofficial-fontconfig)
+
 vcpkg_copy_pdbs()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -40,3 +43,5 @@ endif()
 
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fontconfig)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/fontconfig/COPYING ${CURRENT_PACKAGES_DIR}/share/fontconfig/copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME unofficial-fontconfig)
diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL
index f4534c115..e33353ee7 100644
--- a/ports/forest/CONTROL
+++ b/ports/forest/CONTROL
@@ -1,3 +1,3 @@
 Source: forest
-Version: 9.0.1
+Version: 9.0.5
 Description: Template library of tree data structures
diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake
index 52a891b69..3b3d5c889 100644
--- a/ports/forest/portfile.cmake
+++ b/ports/forest/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xorz57/forest
-    REF bc6b82ce436dfbf60d6e8882252c55cf923ad99e
-    SHA512 e711148025c40fb73e6ae221fe5a4416bea006994d9ff958d565cd3cefa75c9ee7241087c7470ecb6530be073ac9171fe724351898ecd33db61f5752c3a950bc
+    REF 9.0.5
+    SHA512 1dd3ae568ea2ce66cab285f392b167a08eef29387fffef3e9283c3ddaf1d461e5f6408cbce17bbaa928ba773a7890ec31f2612e5a2280cc4fe4a02824fbcd4a3
     HEAD_REF master
 )
 
diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL
index 8baaba1dc..c6f595c2f 100644
--- a/ports/freeglut/CONTROL
+++ b/ports/freeglut/CONTROL
@@ -1,3 +1,3 @@
 Source: freeglut
-Version: 3.0.0-4
+Version: 3.0.0-5
 Description: Open source implementation of GLUT with source and binary backwards compatibility.
diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake
index 913fc90ff..3be83ed4a 100644
--- a/ports/freeglut/portfile.cmake
+++ b/ports/freeglut/portfile.cmake
@@ -25,6 +25,12 @@ else()
     set(FREEGLUT_DYNAMIC OFF)
 endif()
 
+# Patch header
+file(READ ${SOURCE_PATH}/include/GL/freeglut_std.h FREEGLUT_STDH)
+string(REGEX REPLACE "\"freeglut[_a-z]+.lib\""
+                     "\"freeglut.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}")
+file(WRITE ${SOURCE_PATH}/include/GL/freeglut_std.h "${FREEGLUT_STDH}")
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
@@ -36,14 +42,6 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-# Patch header
-file(READ ${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h FREEGLUT_STDH)
-string(REPLACE "pragma comment (lib, \"freeglut_staticd.lib\")"
-               "pragma comment (lib, \"freeglut.lib\")" FREEGLUT_STDH "${FREEGLUT_STDH}")
-string(REPLACE "pragma comment (lib, \"freeglutd.lib\")"
-               "pragma comment (lib, \"freeglut.lib\")" FREEGLUT_STDH "${FREEGLUT_STDH}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h "${FREEGLUT_STDH}")
-
 # Rename static lib (otherwise it's incompatible with FindGLUT.cmake)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
diff --git a/ports/freetype-gl/CONTROL b/ports/freetype-gl/CONTROL
index ba4db5391..df88ab84f 100644
--- a/ports/freetype-gl/CONTROL
+++ b/ports/freetype-gl/CONTROL
@@ -1,4 +1,4 @@
 Source: freetype-gl
-Version: 2018-02-25
+Version: 2018-09-18
 Description: OpenGL text using one vertex buffer, one texture and FreeType
 Build-Depends: glew, freetype
diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake
index c627ad43c..2a811d714 100644
--- a/ports/freetype-gl/portfile.cmake
+++ b/ports/freetype-gl/portfile.cmake
@@ -8,14 +8,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rougier/freetype-gl
-    REF bcd2b5fb5d19f1ea5d384d0edbdda2f6d0590fa0
-    SHA512 10bd8e874598e796c3123c8bc277ecb6f5d95c924c6d6bab1bec4700864c83e2f71bf9ac45c15eadba9e150660cbe9debe3509428b10264eb6a8ba64a80f3651
+    REF 7a290ac372d2bd94137a9fed6b2f5a6ac4360ec2
+    SHA512 bcdd34b7cee1ebe01ae83211e7b772742f9740aa713298f6fb72e7076f5fecdb3aea12f67a5fe04e8606d9533a0ceef7c1152368643dc51a7339b0e5dd307afa
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Use-external-Glew-and-Freetype.patch"
+    PATCHES 0001-Use-external-Glew-and-Freetype.patch
 )
 
 # make sure that no "internal" libraries are used by removing them
diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake
index 9cdcd0f09..d74c53220 100644
--- a/ports/freetype/portfile.cmake
+++ b/ports/freetype/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 set(FT_VERSION 2.8.1)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-${FT_VERSION})
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://download.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.bz2"
+    URLS "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.bz2"
     FILENAME "freetype-${FT_VERSION}.tar.bz2"
     SHA512 ca59e47f0fceeeb9b8032be2671072604d0c79094675df24187829c05e99757d0a48a0f8062d4d688e056f783aa8f6090d732ad116562e94784fccf1339eb823
 )
diff --git a/ports/fruit/CONTROL b/ports/fruit/CONTROL
new file mode 100644
index 000000000..4e7bd9f8d
--- /dev/null
+++ b/ports/fruit/CONTROL
@@ -0,0 +1,4 @@
+Source: fruit
+Version: 3.4.0-1
+Description: Fruit, a dependency injection framework for C++ by Google
+
diff --git a/ports/fruit/portfile.cmake b/ports/fruit/portfile.cmake
new file mode 100644
index 000000000..a945e63bd
--- /dev/null
+++ b/ports/fruit/portfile.cmake
@@ -0,0 +1,22 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/fruit
+    REF v3.4.0
+    SHA512 d78c76432c77acc4cc6ccf3fd9627a3fb2a0aa55d1baf7346422e9f1c1e048237d136588b44cfa943b542b43adbbb62fcd524e4a1cb870e9ffe8b7cf4dadb35d
+    HEAD_REF master
+)
+
+# TODO: Make boost an optional dependency?
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DFRUIT_USES_BOOST=False
+)
+
+vcpkg_install_cmake()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/fruit/copyright COPYONLY)
diff --git a/ports/gdal/0001-Fix-debug-crt-flags.patch b/ports/gdal/0001-Fix-debug-crt-flags.patch
index 753d53131..aab3d40ca 100644
--- a/ports/gdal/0001-Fix-debug-crt-flags.patch
+++ b/ports/gdal/0001-Fix-debug-crt-flags.patch
@@ -1,7 +1,7 @@
 diff -Nuar a/nmake.opt b/nmake.opt
 --- a/nmake.opt	2018-05-04 09:05:46.000000000 +0200
 +++ b/nmake.opt	2018-05-11 22:58:39.387603800 +0200
-@@ -120,11 +120,21 @@
+@@ -124,11 +124,21 @@
  CXX_PDB_FLAGS=
  !ENDIF
  
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
index be75e6693..7686d13ab 100644
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@@ -1,4 +1,13 @@
 Source: gdal
-Version: 2.3.0-1
+Version: 2.3.2
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
-Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, libmysql, openjpeg, libwebp, libxml2, liblzma
+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
+
+Feature: mysql-libmariadb
+Build-Depends: libmariadb
+Description: Add mysql support using libmariadb
diff --git a/ports/gdal/no-my-bool.patch b/ports/gdal/no-my-bool.patch
deleted file mode 100644
index 2589ff044..000000000
--- a/ports/gdal/no-my-bool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
---- a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp	2018-05-04 09:09:26.000000000 +0200
-+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp	2018-05-11 23:07:44.284558300 +0200
-@@ -235,7 +235,7 @@
-         // Enable automatic reconnection
-         // Must be called after mysql_real_connect() on MySQL < 5.0.19
-         // and at any point on more recent versions.
--        my_bool reconnect = 1;
-+        bool reconnect = 1;
-         mysql_options(hConn, MYSQL_OPT_RECONNECT, &reconnect);
-     }
- 
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index 70eea8583..1f3ca96e3 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -1,10 +1,10 @@
 # vcpkg portfile.cmake for GDAL
 #
 # NOTE: update the version and checksum for new GDAL release
-set(GDAL_VERSION_STR "2.3.0")
-set(GDAL_VERSION_PKG "230")
+set(GDAL_VERSION_STR "2.3.2")
+set(GDAL_VERSION_PKG "232")
 set(GDAL_VERSION_LIB "203")
-set(GDAL_PACKAGE_SUM "f3f790b7ecb28916d6d0628b15ddc6b396a25a8f1f374589ea5e95b5a50addc99e05e363113f907b6c96faa69870b5dc9fdf3d771f9c8937b4aa8819bd78b190")
+set(GDAL_PACKAGE_SUM "9eb26be57657b1f1eaada4794859584d53bd58e0d504eb12ab97e9c60353d0a565dc894a89829ee50fc549cb7d069a75b7895c0dd4cea887e010671f63e945b8")
 
 if (TRIPLET_SYSTEM_ARCH MATCHES "arm")
     message(FATAL_ERROR "ARM is currently not supported.")
@@ -22,21 +22,27 @@ vcpkg_download_distfile(ARCHIVE
     URLS "http://download.osgeo.org/gdal/${GDAL_VERSION_STR}/gdal${GDAL_VERSION_PKG}.zip"
     FILENAME "gdal${GDAL_VERSION_PKG}.zip"
     SHA512 ${GDAL_PACKAGE_SUM}
-    )
+)
 
 # Extract source into architecture specific directory, because GDALs' nmake based build currently does not
 # support out of source builds.
 set(SOURCE_PATH_DEBUG   ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-debug/gdal-${GDAL_VERSION_STR})
 set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-release/gdal-${GDAL_VERSION_STR})
 
-foreach(BUILD_TYPE debug release)
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    list(APPEND BUILD_TYPES "release")
+endif()
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    list(APPEND BUILD_TYPES "debug")
+endif()
+
+foreach(BUILD_TYPE IN LISTS BUILD_TYPES)
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
     vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
     vcpkg_apply_patches(
         SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}
         PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
-        ${CMAKE_CURRENT_LIST_DIR}/no-my-bool.patch
     )
 endforeach()
 
@@ -76,11 +82,6 @@ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" SQLITE_INCLUDE_DIR)
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib" SQLITE_LIBRARY_REL)
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib" SQLITE_LIBRARY_DBG)
 
-# Setup MySQL libraries + include path
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib" MYSQL_LIBRARY_REL)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib" MYSQL_LIBRARY_DBG)
-
 # Setup PostgreSQL libraries + include path
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PGSQL_INCLUDE_DIR)
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpq.lib" PGSQL_LIBRARY_REL)
@@ -106,7 +107,26 @@ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LZMA_INCLUDE_DIR)
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/lzma.lib" LZMA_LIBRARY_REL)
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/lzma.lib" LZMA_LIBRARY_DBG)
 
-set(NMAKE_OPTIONS
+if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES)
+    # Setup MySQL libraries + include path
+    if("mysql-libmysql" IN_LIST FEATURES)
+        file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR)
+        file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib" MYSQL_LIBRARY_REL)
+        file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib" MYSQL_LIBRARY_DBG)
+    endif()
+
+    if("mysql-libmariadb" IN_LIST FEATURES)
+        file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR)
+        file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib" MYSQL_LIBRARY_REL)
+        file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib" MYSQL_LIBRARY_DBG)
+    endif()
+
+    list(APPEND NMAKE_OPTIONS MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR})
+    list(APPEND NMAKE_OPTIONS_REL MYSQL_LIB=${MYSQL_LIBRARY_REL})
+    list(APPEND NMAKE_OPTIONS_DBG MYSQL_LIB=${MYSQL_LIBRARY_DBG})
+endif()
+
+list(APPEND NMAKE_OPTIONS
     GDAL_HOME=${NATIVE_PACKAGES_DIR}
     DATADIR=${NATIVE_DATA_DIR}
     HTMLDIR=${NATIVE_HTML_DIR}
@@ -117,7 +137,6 @@ set(NMAKE_OPTIONS
     EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR}
     CURL_INC=-I${CURL_INCLUDE_DIR}
     SQLITE_INC=-I${SQLITE_INCLUDE_DIR}
-    MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}
     PG_INC_DIR=${PGSQL_INCLUDE_DIR}
     OPENJPEG_ENABLED=YES
     OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR}
@@ -147,8 +166,8 @@ else()
     set(LINKAGE_FLAGS "/MD")
 endif()
 
-set(NMAKE_OPTIONS_REL
-    "${NMAKE_OPTIONS}"
+list(APPEND NMAKE_OPTIONS_REL
+    ${NMAKE_OPTIONS}
     CXX_CRT_FLAGS=${LINKAGE_FLAGS}
     PROJ_LIBRARY=${PROJ_LIBRARY_REL}
     PNG_LIB=${PNG_LIBRARY_REL}
@@ -156,15 +175,14 @@ set(NMAKE_OPTIONS_REL
     EXPAT_LIB=${EXPAT_LIBRARY_REL}
     "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib"
     SQLITE_LIB=${SQLITE_LIBRARY_REL}
-    MYSQL_LIB=${MYSQL_LIBRARY_REL}
     PG_LIB=${PGSQL_LIBRARY_REL}
     OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}
     WEBP_LIBS=${WEBP_LIBRARY_REL}
     LIBXML2_LIB=${XML2_LIBRARY_REL}
 )
 
-set(NMAKE_OPTIONS_DBG
-    "${NMAKE_OPTIONS}"
+list(APPEND NMAKE_OPTIONS_DBG
+    ${NMAKE_OPTIONS}
     CXX_CRT_FLAGS="${LINKAGE_FLAGS}d"
     PROJ_LIBRARY=${PROJ_LIBRARY_DBG}
     PNG_LIB=${PNG_LIBRARY_DBG}
@@ -172,36 +190,40 @@ set(NMAKE_OPTIONS_DBG
     EXPAT_LIB=${EXPAT_LIBRARY_DBG}
     "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib"
     SQLITE_LIB=${SQLITE_LIBRARY_DBG}
-    MYSQL_LIB=${MYSQL_LIBRARY_DBG}
     PG_LIB=${PGSQL_LIBRARY_DBG}
     OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}
     WEBP_LIBS=${WEBP_LIBRARY_DBG}
     LIBXML2_LIB=${XML2_LIBRARY_DBG}
     DEBUG=1
 )
-################
-# Release build
-################
-message(STATUS "Building ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+  ################
+  # Release build
+  ################
+  message(STATUS "Building ${TARGET_TRIPLET}-rel")
+  vcpkg_execute_required_process(
     COMMAND ${NMAKE} -f makefile.vc
     "${NMAKE_OPTIONS_REL}"
     WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
     LOGNAME nmake-build-${TARGET_TRIPLET}-release
-)
-message(STATUS "Building ${TARGET_TRIPLET}-rel done")
+  )
+  message(STATUS "Building ${TARGET_TRIPLET}-rel done")
+endif()
 
-################
-# Debug build
-################
-message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
-  COMMAND ${NMAKE} /G -f makefile.vc
-  "${NMAKE_OPTIONS_DBG}"
-  WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
-  LOGNAME nmake-build-${TARGET_TRIPLET}-debug
-)
-message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+  ################
+  # Debug build
+  ################
+  message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+  vcpkg_execute_required_process(
+    COMMAND ${NMAKE} /G -f makefile.vc
+    "${NMAKE_OPTIONS_DBG}"
+    WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+    LOGNAME nmake-build-${TARGET_TRIPLET}-debug
+  )
+  message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
+endif()
 
 message(STATUS "Packaging ${TARGET_TRIPLET}")
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html)
@@ -218,16 +240,27 @@ vcpkg_execute_required_process(
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
   file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib)
-  file(COPY ${SOURCE_PATH_DEBUG}/gdal.lib   DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-  file(COPY ${SOURCE_PATH_RELEASE}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib)
+
+  if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(COPY ${SOURCE_PATH_RELEASE}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+  endif()
+
+  if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(COPY ${SOURCE_PATH_DEBUG}/gdal.lib   DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib)
+  endif()
 else()
   file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
   file(REMOVE ${EXE_FILES} ${CURRENT_PACKAGES_DIR}/lib/gdal.lib)
-  file(COPY ${SOURCE_PATH_DEBUG}/gdal${GDAL_VERSION_LIB}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-  file(COPY ${SOURCE_PATH_DEBUG}/gdal_i.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/lib/gdal.lib)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib)
+
+  if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/lib/gdal.lib)
+  endif()
+  if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(COPY ${SOURCE_PATH_DEBUG}/gdal${GDAL_VERSION_LIB}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(COPY ${SOURCE_PATH_DEBUG}/gdal_i.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib)
+  endif()
 endif()
 
 # Copy over PDBs
diff --git a/ports/geos/CONTROL b/ports/geos/CONTROL
index 1a32a8103..0a4421eea 100644
--- a/ports/geos/CONTROL
+++ b/ports/geos/CONTROL
@@ -1,3 +1,3 @@
 Source: geos
-Version: 3.6.2-3
+Version: 3.6.3-2
 Description: Geometry Engine Open Source
diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake
index e5a404254..2f374e79d 100644
--- a/ports/geos/portfile.cmake
+++ b/ports/geos/portfile.cmake
@@ -1,53 +1,40 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geos-3.6.2)
+
+set(GEOS_VERSION 3.6.3)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.osgeo.org/geos/geos-3.6.2.tar.bz2"
-    FILENAME "geos-3.6.2.tar.bz2"
-    SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016
+    URLS "http://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2"
+    FILENAME "geos-${GEOS_VERSION}.tar.bz2"
+    SHA512 f88adcf363433e247a51fb1a2c0b53f39b71aba8a6c01dd08aa416c2e980fe274a195e6edcb5bb5ff8ea81b889da14a1a8fb2849e04669aeba3b6d55754dc96a
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(
-
-SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/geos_c-static-support.patch
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${GEOS_VERSION}
+    PATCHES geos_c-static-support.patch
 )
 
 # NOTE: GEOS provides CMake as optional build configuration, it might not be actively
 # maintained, so CMake build issues may happen between releases.
 
-# Pull modules referred in the main CMakeLists.txt but missing from the released package.
-# TODO: GEOS 3.6.3 or later will include the missing script in release package.
-file(DOWNLOAD http://svn.osgeo.org/geos/branches/3.6/cmake/modules/GenerateSourceGroups.cmake
-    ${SOURCE_PATH}/cmake/modules/GenerateSourceGroups.cmake)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    PREFER_NINJA
     OPTIONS
-    -DCMAKE_DEBUG_POSTFIX=d
-    -DGEOS_ENABLE_TESTS=False
+        -DCMAKE_DEBUG_POSTFIX=d
+        -DGEOS_ENABLE_TESTS=False
 )
 vcpkg_install_cmake()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-# Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/geos)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/geos/COPYING ${CURRENT_PACKAGES_DIR}/share/geos/copyright)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libgeos.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libgeosd.lib)
-else()
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/geos.lib ${CURRENT_PACKAGES_DIR}/debug/lib/geosd.lib)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/geos_c.lib ${CURRENT_PACKAGES_DIR}/debug/lib/geos_cd.lib)
 
+if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/geos-config)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/geos)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/geos-config ${CURRENT_PACKAGES_DIR}/share/geos/geos-config)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/geos-config)
 endif()
 
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/geos/copyright COPYONLY)
+
 vcpkg_copy_pdbs()
diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL
index 1fd781901..d225e60c8 100644
--- a/ports/glbinding/CONTROL
+++ b/ports/glbinding/CONTROL
@@ -1,3 +1,3 @@
 Source: glbinding
-Version: 2.1.1-3
+Version: 3.0.2-3
 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API
diff --git a/ports/glbinding/force-system-install.patch b/ports/glbinding/force-system-install.patch
new file mode 100644
index 000000000..1674f145a
--- /dev/null
+++ b/ports/glbinding/force-system-install.patch
@@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 011577a..e52d19d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,11 +42,13 @@ include(cmake/GenerateTemplateExportHeader.cmake)
+ # 
+ 
+ # Get git revision
++if(NOT DEFINED GIT_REV)
+ get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+ string(SUBSTRING "${GIT_SHA1}" 0 12 GIT_REV)
+ if(NOT GIT_SHA1)
+     set(GIT_REV "0")
+ endif()
++endif()
+ 
+ # Meta information about the project
+ set(META_PROJECT_NAME        "glbinding")
+@@ -135,7 +137,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU
+ endif()
+ 
+ # Installation paths
+-if(UNIX AND SYSTEM_DIR_INSTALL)
++if(1)
+     # Install into the system (/usr/bin or /usr/local/bin)
+     set(INSTALL_ROOT      "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_CMAKE     "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
+@@ -148,7 +150,7 @@ if(UNIX AND SYSTEM_DIR_INSTALL)
+     set(INSTALL_DOC       "share/doc/${project}")   # /usr/[local]/share/doc/<project>
+     set(INSTALL_SHORTCUTS "share/applications")     # /usr/[local]/share/applications
+     set(INSTALL_ICONS     "share/pixmaps")          # /usr/[local]/share/pixmaps
+-    set(INSTALL_INIT      "/etc/init")              # /etc/init (upstart init scripts)
++    set(INSTALL_INIT      "etc/init")              # /etc/init (upstart init scripts)
+ else()
+     # Install into local directory
+     set(INSTALL_ROOT      ".")                      # ./
diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
index cf3f64e5d..64063bc73 100644
--- a/ports/glbinding/portfile.cmake
+++ b/ports/glbinding/portfile.cmake
@@ -1,79 +1,34 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cginternals/glbinding
-    REF v2.1.1
-    SHA512 6c7251555801272a90c87a9386324eb6993102601a036fc7d9f9b4ebed64c74d011909566e5fc5a34ef8242e24915848296023daa1420c91aaf08cf9635be397
+    REF v3.0.2
+    SHA512 524ad20a11af7d8ee1764f53326b43efb3b3dbd6c64d1539f4d9fa2bcb7b58a6bd6caf460d6944aed4fd7439b82536d8f28a0f0f51c14c62c2f0c73baab9afcb
     HEAD_REF master
+    PATCHES force-system-install.patch
 )
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         -DOPTION_BUILD_TESTS=OFF
         -DOPTION_BUILD_GPU_TESTS=OFF
+        -DOPTION_BUILD_TOOLS=OFF
+        -DGIT_REV=0
+        -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
 )
 
-#vcpkg_build_cmake()
 vcpkg_install_cmake()
 
-
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
-file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/glbinding ${CURRENT_PACKAGES_DIR}/share/glbinding)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/glbinding/glbinding-export-debug.cmake GLBINDING_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" GLBINDING_DEBUG_MODULE "${GLBINDING_DEBUG_MODULE}")
-string(REPLACE "glbindingd.dll" "bin/glbindingd.dll" GLBINDING_DEBUG_MODULE "${GLBINDING_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-export-debug.cmake "${GLBINDING_DEBUG_MODULE}")
-file(READ ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-export-release.cmake RELEASE_CONF)
-string(REPLACE "glbinding.dll" "bin/glbinding.dll" RELEASE_CONF "${RELEASE_CONF}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-export-release.cmake "${RELEASE_CONF}")
-file(REMOVE ${CURRENT_PACKAGES_DIR}/glbinding-config.cmake)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/glbinding-config.cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-export.cmake ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/glbinding.dll ${CURRENT_PACKAGES_DIR}/bin/glbinding.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/glbindingd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/glbindingd.dll)
-endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/data ${CURRENT_PACKAGES_DIR}/share/data)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/data)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/AUTHORS
-            ${CURRENT_PACKAGES_DIR}/LICENSE
-            ${CURRENT_PACKAGES_DIR}/README.md
-            ${CURRENT_PACKAGES_DIR}/VERSION
-            ${CURRENT_PACKAGES_DIR}/debug/AUTHORS
-            ${CURRENT_PACKAGES_DIR}/debug/LICENSE
-            ${CURRENT_PACKAGES_DIR}/debug/README.md
-            ${CURRENT_PACKAGES_DIR}/debug/VERSION
-    )
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding/cmake/glbinding TARGET_PATH share/glbinding/cmake/glbinding)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding/cmake/glbinding-aux TARGET_PATH share/glbinding/cmake/glbinding-aux)
 
-# There are some executables that are only built if glfw is found by CMake (see source/tools/*/CMakeLists.txt).
-# glfw is not listed as a dependency for glbinding, so this only happen on systems where package glfw3 is present.
-# glbinding's CMake doesn't offer the choice to exlude those tools from the build process, so deleting them here:
-file(REMOVE ${CURRENT_PACKAGES_DIR}/glcontexts.exe
-            ${CURRENT_PACKAGES_DIR}/glfunctions.exe
-            ${CURRENT_PACKAGES_DIR}/glmeta.exe
-            ${CURRENT_PACKAGES_DIR}/glqueries.exe
-            ${CURRENT_PACKAGES_DIR}/debug/glcontextsd.exe
-            ${CURRENT_PACKAGES_DIR}/debug/glfunctionsd.exe
-            ${CURRENT_PACKAGES_DIR}/debug/glmetad.exe
-            ${CURRENT_PACKAGES_DIR}/debug/glqueriesd.exe
-)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/cmake/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/cmake/glbinding-aux/glbinding-aux-export.cmake)\nset(glbinding_FOUND TRUE)\n")
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/glbinding)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright)
 
-vcpkg_copy_pdbs()
-\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL
index 7dbcec7d4..c7c099c72 100644
--- a/ports/glm/CONTROL
+++ b/ports/glm/CONTROL
@@ -1,3 +1,3 @@
 Source: glm
-Version: 0.9.9.0
+Version: 0.9.9.2
 Description: OpenGL Mathematics (GLM) https://glm.g-truc.net
diff --git a/ports/glm/disable_warnings_as_error.patch b/ports/glm/disable_warnings_as_error.patch
new file mode 100644
index 000000000..f87616b1e
--- /dev/null
+++ b/ports/glm/disable_warnings_as_error.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 756673a3..5fbc8906 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -216,7 +216,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+ 		message("GLM: Visual C++ - ${CMAKE_CXX_COMPILER_ID} compiler")
+ 	endif()
+ 
+-	add_compile_options(/W4 /WX)
++	add_compile_options(/W4)
+ 	add_compile_options(/wd4309 /wd4324 /wd4389 /wd4127 /wd4267 /wd4146 /wd4201 /wd4464 /wd4514 /wd4701 /wd4820 /wd4365)
+ 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ endif()
diff --git a/ports/glm/ignore-warning-C4201.patch b/ports/glm/ignore-warning-C4201.patch
deleted file mode 100644
index b94b123db..000000000
--- a/ports/glm/ignore-warning-C4201.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp
-index f5c7f017..69c7274a 100644
---- a/glm/detail/type_vec1.hpp
-+++ b/glm/detail/type_vec1.hpp
-@@ -39,6 +39,10 @@ namespace glm
- #				pragma clang diagnostic push
- #				pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
- #				pragma clang diagnostic ignored "-Wnested-anon-types"
-+#			endif
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(push)
-+#				pragma warning(disable: 4201)
- #			endif
- 		
- 			union
-@@ -60,6 +64,9 @@ namespace glm
- #				endif//GLM_SWIZZLE*/
- 			};
- 		
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(pop)
-+#			endif
- #			if GLM_COMPILER & GLM_COMPILER_CLANG
- #				pragma clang diagnostic pop
- #			endif
-diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp
-index a9af32e3..b8b8f32e 100644
---- a/glm/detail/type_vec2.hpp
-+++ b/glm/detail/type_vec2.hpp
-@@ -38,6 +38,10 @@ namespace glm
- #				pragma clang diagnostic push
- #				pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
- #				pragma clang diagnostic ignored "-Wnested-anon-types"
-+#			endif
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(push)
-+#				pragma warning(disable: 4201)
- #			endif
- 		
- 			union
-@@ -60,6 +64,9 @@ namespace glm
- 
- 			};
- 		
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(pop)
-+#			endif
- #			if GLM_COMPILER & GLM_COMPILER_CLANG
- #				pragma clang diagnostic pop
- #			endif
-diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp
-index f85f0a5c..28e6c6ed 100644
---- a/glm/detail/type_vec3.hpp
-+++ b/glm/detail/type_vec3.hpp
-@@ -38,6 +38,10 @@ namespace glm
- #				pragma clang diagnostic push
- #				pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
- #				pragma clang diagnostic ignored "-Wnested-anon-types"
-+#			endif
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(push)
-+#				pragma warning(disable: 4201)
- #			endif
- 
- 			union
-@@ -59,6 +63,9 @@ namespace glm
- #				endif//GLM_SWIZZLE
- 			};
- 		
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(pop)
-+#			endif
- #			if GLM_COMPILER & GLM_COMPILER_CLANG
- #				pragma clang diagnostic pop
- #			endif
-diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp
-index 5e89b744..0a16bc2c 100644
---- a/glm/detail/type_vec4.hpp
-+++ b/glm/detail/type_vec4.hpp
-@@ -38,6 +38,10 @@ namespace glm
- #				pragma clang diagnostic push
- #				pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
- #				pragma clang diagnostic ignored "-Wnested-anon-types"
-+#			endif
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(push)
-+#				pragma warning(disable: 4201)
- #			endif
- 
- 			union
-@@ -61,6 +65,9 @@ namespace glm
- #				endif//GLM_SWIZZLE
- 			};
- 
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(pop)
-+#			endif
- #			if GLM_COMPILER & GLM_COMPILER_CLANG
- #				pragma clang diagnostic pop
- #			endif
-diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
-index 8af1c8bf..ff8c4aa6 100644
---- a/glm/gtc/quaternion.hpp
-+++ b/glm/gtc/quaternion.hpp
-@@ -49,6 +49,10 @@ namespace glm
- #				pragma clang diagnostic push
- #				pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
- #				pragma clang diagnostic ignored "-Wnested-anon-types"
-+#			endif
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(push)
-+#				pragma warning(disable: 4201)
- #			endif
- 		
- 			union
-@@ -57,6 +61,9 @@ namespace glm
- 				typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<P>::value>::type data;
- 			};
- 		
-+#			if GLM_COMPILER & GLM_COMPILER_VC
-+#				pragma warning(pop)
-+#			endif
- #			if GLM_COMPILER & GLM_COMPILER_CLANG
- #				pragma clang diagnostic pop
- #			endif
--- 
-2.15.1.windows.2
-
diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake
index b975cc370..90f7875fb 100644
--- a/ports/glm/portfile.cmake
+++ b/ports/glm/portfile.cmake
@@ -3,14 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO g-truc/glm
-    REF 0.9.9.0
-    SHA512 b7a6996cb98bc334130c33a339275b50ea28d8dfce300f3d14ac52edf0b5c38bf216d318f411e898edef428876c0b2d1f6a6e951f160f31425fe0852ad150421
+    REF 0.9.9.2
+    SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
     HEAD_REF master
 )
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/ignore-warning-C4201.patch"
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_warnings_as_error.patch"
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/globjects/CONTROL b/ports/globjects/CONTROL
index df9c862dc..b75b256c6 100644
--- a/ports/globjects/CONTROL
+++ b/ports/globjects/CONTROL
@@ -1,5 +1,5 @@
 Source: globjects
 Maintainer: mattias@mattiascibien.net
-Version: 1.0.0-1
+Version: 1.1.0-2018-09-19
 Build-Depends: glbinding, glm
 Description: C++ library strictly wrapping OpenGL objects. <https://github.com/cginternals/globjects>
diff --git a/ports/globjects/portfile.cmake b/ports/globjects/portfile.cmake
index 08fae6ec3..5019fea0d 100644
--- a/ports/globjects/portfile.cmake
+++ b/ports/globjects/portfile.cmake
@@ -1,66 +1,37 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/globjects-1.0.0)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/cginternals/globjects/archive/v1.0.0.zip"
-    FILENAME "globjects-1.0.0.zip"
-    SHA512 e03ae16786b11891a61f0e2f85b0d98a858d1bad3cf4c45944982d6a753dbaa8b28975dc02153360a5ac0f3be73fe86c91af130cfc0dda7459dd782f16868eeb
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cginternals/globjects
+    REF fe53c4a386506d3374df12ad6f1f67c4232aa389
+    SHA512 62b40675671acf050bfe4836da5b6b6a757185d296a86ad1079cf79e4a149820971ed46fce7379b73707dff368919b63d52044230a7ce75601441fe368d91e63
+    HEAD_REF master
+    PATCHES system-install.patch
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS
         -DOPTION_BUILD_TESTS=OFF
         -DOPTION_BUILD_GPU_TESTS=OFF
+        -DGIT_REV=0
 )
-#vcpkg_build_cmake()
+
 vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/globjects/cmake/globjects TARGET_PATH share/globjects/cmake/globjects)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
-file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/globjects ${CURRENT_PACKAGES_DIR}/share/globjects)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake "include(CMakeFindDependencyMacro)
+find_dependency(glm)
+find_dependency(glbinding)
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/globjects/globjects-export-debug.cmake globjects_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" globjects_DEBUG_MODULE "${globjects_DEBUG_MODULE}")
-string(REPLACE "globjectsd.dll" "bin/globjectsd.dll" globjects_DEBUG_MODULE "${globjects_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-export-debug.cmake "${globjects_DEBUG_MODULE}")
-file(READ ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-export-release.cmake RELEASE_CONF)
-string(REPLACE "globjects.dll" "bin/globjects.dll" RELEASE_CONF "${RELEASE_CONF}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-export-release.cmake "${RELEASE_CONF}")
-file(REMOVE ${CURRENT_PACKAGES_DIR}/globjects-config.cmake)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/globjects-config.cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-export.cmake ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/globjects.dll ${CURRENT_PACKAGES_DIR}/bin/globjects.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/globjectsd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/globjectsd.dll)
-endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/data ${CURRENT_PACKAGES_DIR}/share/data)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/data)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/AUTHORS
-            ${CURRENT_PACKAGES_DIR}/LICENSE
-            ${CURRENT_PACKAGES_DIR}/README.md
-            ${CURRENT_PACKAGES_DIR}/VERSION
-            ${CURRENT_PACKAGES_DIR}/debug/AUTHORS
-            ${CURRENT_PACKAGES_DIR}/debug/LICENSE
-            ${CURRENT_PACKAGES_DIR}/debug/README.md
-            ${CURRENT_PACKAGES_DIR}/debug/VERSION
-    )
+include(\${CMAKE_CURRENT_LIST_DIR}/cmake/globjects/globjects-export.cmake)
+")
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/globjects)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/globjects/LICENSE ${CURRENT_PACKAGES_DIR}/share/globjects/copyright)
 
 vcpkg_copy_pdbs()
diff --git a/ports/globjects/system-install.patch b/ports/globjects/system-install.patch
new file mode 100644
index 000000000..10e0c5b49
--- /dev/null
+++ b/ports/globjects/system-install.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6556346..48ba95d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,11 +42,13 @@ include(cmake/GenerateTemplateExportHeader.cmake)
+ # 
+ 
+ # Get git revision
++if(NOT DEFINED GIT_REV)
+ get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+ string(SUBSTRING "${GIT_SHA1}" 0 12 GIT_REV)
+ if(NOT GIT_SHA1)
+     set(GIT_REV "0")
+ endif()
++endif()
+ 
+ # Meta information about the project
+ set(META_PROJECT_NAME        "globjects")
+@@ -133,7 +135,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU
+ endif()
+ 
+ # Installation paths
+-if(UNIX AND SYSTEM_DIR_INSTALL)
++if(1)
+     # Install into the system (/usr/bin or /usr/local/bin)
+     set(INSTALL_ROOT      "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_CMAKE     "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
diff --git a/ports/glslang/0001-Fix-export-symbol-for-Windows.patch b/ports/glslang/0001-Fix-export-symbol-for-Windows.patch
deleted file mode 100644
index 80ce58da4..000000000
--- a/ports/glslang/0001-Fix-export-symbol-for-Windows.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 1ccadd2cb6db3ce5a00635f65db21e561eb7f705 Mon Sep 17 00:00:00 2001
-From: vlj <vljn.ovi@gmail.com>
-Date: Fri, 25 Nov 2016 17:12:35 +0100
-Subject: [PATCH] Fix export symbol for Windows.
-
----
- StandAlone/CMakeLists.txt     |  1 +
- StandAlone/ResourceLimits.cpp |  3 +++
- StandAlone/ResourceLimits.h   | 10 ++++++++++
- 3 files changed, 14 insertions(+)
-
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index 231ba27..3aff02e 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -2,6 +2,7 @@ add_library(glslang-default-resource-limits
-     ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp
- )
- set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
-+set_property(TARGET glslang-default-resource-limits PROPERTY COMPILE_DEFINITIONS DLLEXPORT)
- 
- target_include_directories(glslang-default-resource-limits
-     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-diff --git a/StandAlone/ResourceLimits.cpp b/StandAlone/ResourceLimits.cpp
-index e22ec80..634d9c9 100644
---- a/StandAlone/ResourceLimits.cpp
-+++ b/StandAlone/ResourceLimits.cpp
-@@ -41,6 +41,7 @@
- 
- namespace glslang {
- 
-+DLL_EXPORT
- const TBuiltInResource DefaultTBuiltInResource = {
-     /* .MaxLights = */ 32,
-     /* .MaxClipPlanes = */ 6,
-@@ -137,6 +138,7 @@ const TBuiltInResource DefaultTBuiltInResource = {
-         /* .generalConstantMatrixVectorIndexing = */ 1,
-     }};
- 
-+DLL_EXPORT
- std::string GetDefaultTBuiltInResourceString()
- {
-     std::ostringstream ostream;
-@@ -239,6 +241,7 @@ std::string GetDefaultTBuiltInResourceString()
-     return ostream.str();
- }
- 
-+DLL_EXPORT
- void DecodeResourceLimits(TBuiltInResource* resources, char* config)
- {
-     static const char* delims = " \t\n\r";
-diff --git a/StandAlone/ResourceLimits.h b/StandAlone/ResourceLimits.h
-index 9c3eb3e..932a59f 100644
---- a/StandAlone/ResourceLimits.h
-+++ b/StandAlone/ResourceLimits.h
-@@ -39,17 +39,27 @@
- 
- #include "glslang/Include/ResourceLimits.h"
- 
-+#ifdef DLLEXPORT
-+#define DLL_EXPORT __declspec(dllexport)
-+#else
-+#define DLL_EXPORT __declspec(dllimport)
-+#endif
-+
- namespace glslang {
- 
- // These are the default resources for TBuiltInResources, used for both
- //  - parsing this string for the case where the user didn't supply one,
- //  - dumping out a template for user construction of a config file.
-+
-+DLL_EXPORT
- extern const TBuiltInResource DefaultTBuiltInResource;
- 
- // Returns the DefaultTBuiltInResource as a human-readable string.
-+DLL_EXPORT
- std::string GetDefaultTBuiltInResourceString();
- 
- // Decodes the resource limits from |config| to |resources|.
-+DLL_EXPORT
- void DecodeResourceLimits(TBuiltInResource* resources, char* config);
- 
- }  // end namespace glslang
--- 
-2.10.2.windows.1
-
diff --git a/ports/glslang/CONTROL b/ports/glslang/CONTROL
index 22d5a054e..c92482843 100644
--- a/ports/glslang/CONTROL
+++ b/ports/glslang/CONTROL
@@ -1,3 +1,3 @@
 Source: glslang
-Version: 2018-03-02
+Version: 2018-03-02-1
 Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake
index 2182d9bcd..b7cbdb98e 100644
--- a/ports/glslang/portfile.cmake
+++ b/ports/glslang/portfile.cmake
@@ -1,8 +1,6 @@
 include(vcpkg_common_functions)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-  message(WARNING "Dynamic not supported. Building static")
-  set(VCPKG_LIBRARY_LINKAGE "static")
-endif()
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
@@ -15,6 +13,7 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
+  OPTIONS -DCMAKE_DEBUG_POSTFIX=d
 )
 
 vcpkg_install_cmake()
diff --git a/ports/gmmlib/CONTROL b/ports/gmmlib/CONTROL
new file mode 100644
index 000000000..a06044494
--- /dev/null
+++ b/ports/gmmlib/CONTROL
@@ -0,0 +1,3 @@
+Source: gmmlib
+Version: 18.3.pre2-1
+Description: intel's graphics memory management library
diff --git a/ports/gmmlib/portfile.cmake b/ports/gmmlib/portfile.cmake
new file mode 100644
index 000000000..6ed92151f
--- /dev/null
+++ b/ports/gmmlib/portfile.cmake
@@ -0,0 +1,32 @@
+include(vcpkg_common_functions)
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "Intel gmmlib currently only supports Linux platforms")
+endif()
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO intel/gmmlib
+    REF intel-gmmlib-18.3.pre2
+    SHA512 9831f6e6f001ba99d5b4860c68697dfc33535a20aa853716534a18b6e4df6c7b95039fff7ffe6f0303cfeb70db4c53ad26a6fa6a8fb6148fa4080e456bff3859
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DARCH=64
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/gmmlib/copyright COPYONLY)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Scripts)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Resource)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/GlobalInfo)
diff --git a/ports/graphicsmagick/CMakeLists.txt b/ports/graphicsmagick/CMakeLists.txt
index 27f9fb109..c156b69c7 100644
--- a/ports/graphicsmagick/CMakeLists.txt
+++ b/ports/graphicsmagick/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.6)
 project (graphicsmagick)
 
-find_package(Zlib REQUIRED)
+find_package(ZLIB REQUIRED)
 find_package(Bzip2 REQUIRED)
 find_package(JPEG REQUIRED)
 find_package(PNG REQUIRED)
@@ -29,13 +29,6 @@ include_directories("Magick++")
 include_directories("Magick++/lib")
 include_directories("wand")
 
-include_directories(${ZLIB_INCLUDE_DIRS})
-include_directories(${BZIP2_INCLUDE_DIR})
-include_directories(${NATIVE_JPEG_INCLUDE_PATH})
-include_directories(${PNG_INCLUDE_DIRS})
-include_directories(${TIFF_INCLUDE_DIRS})
-include_directories(${FREETYPE_INCLUDE_DIRS})
-
 file(READ "magick/magick_config.h.in" CONFIG_H)
 string(REPLACE "#undef HasBZLIB" "#define HasBZLIB" CONFIG_H "${CONFIG_H}")
 string(REPLACE "#undef HasJPEG" "#define HasJPEG" CONFIG_H "${CONFIG_H}")
@@ -108,18 +101,49 @@ add_library(graphicsmagick coders/art.c coders/avs.c
 		Magick++/lib/TypeMetric.cpp
 		wand/drawing_wand.c wand/magick_compat.c wand/magick_wand.c wand/pixel_wand.c)
 
-TARGET_LINK_LIBRARIES(graphicsmagick ${ZLIB_LIBRARIES})
-TARGET_LINK_LIBRARIES(graphicsmagick ${BZIP2_LIBRARIES})
-TARGET_LINK_LIBRARIES(graphicsmagick ${JPEG_LIBRARIES})
-TARGET_LINK_LIBRARIES(graphicsmagick ${PNG_LIBRARIES})
-TARGET_LINK_LIBRARIES(graphicsmagick ${TIFF_LIBRARIES})
-TARGET_LINK_LIBRARIES(graphicsmagick ${FREETYPE_LIBRARIES})
+TARGET_LINK_LIBRARIES(graphicsmagick PRIVATE
+    ZLIB::ZLIB
+    BZip2::BZip2
+    #${JPEG_LIBRARIES}
+    JPEG::JPEG
+    PNG::PNG
+    TIFF::TIFF
+    Freetype::Freetype
+)
+target_include_directories(graphicsmagick INTERFACE $<INSTALL_INTERFACE:include>)
 
 install(TARGETS graphicsmagick
+    EXPORT graphicsmagick-targets
     RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib)
 
+install(
+    EXPORT graphicsmagick-targets
+    FILE unofficial-graphicsmagick-targets.cmake
+    NAMESPACE unofficial::graphicsmagick::
+    DESTINATION share/unofficial-graphicsmagick
+)
+find_package(ZLIB REQUIRED)
+find_package(BZip2 REQUIRED)
+find_package(JPEG REQUIRED)
+find_package(PNG REQUIRED)
+find_package(TIFF REQUIRED)
+find_package(Freetype REQUIRED)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-graphicsmagick-config.cmake "
+include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)
+find_dependency(BZip2)
+find_dependency(JPEG)
+find_dependency(PNG)
+find_dependency(TIFF)
+find_dependency(Freetype)
+
+include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-graphicsmagick-targets.cmake)
+")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-graphicsmagick-config.cmake DESTINATION share/unofficial-graphicsmagick)
+
 option(INSTALL_HEADERS "Install development header files" ON)
 
 if (INSTALL_HEADERS)
diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL
index 1d6f327df..f8519040f 100644
--- a/ports/graphicsmagick/CONTROL
+++ b/ports/graphicsmagick/CONTROL
@@ -1,5 +1,5 @@
 Source: graphicsmagick
 Maintainer: josuegomes@gmail.com
-Version: 1.3.30
+Version: 1.3.30-1
 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff
 Description: Image processing library
diff --git a/ports/graphicsmagick/disable_graphicsmagick_modules.patch b/ports/graphicsmagick/disable_graphicsmagick_modules.patch
new file mode 100644
index 000000000..bfb91d0fd
--- /dev/null
+++ b/ports/graphicsmagick/disable_graphicsmagick_modules.patch
@@ -0,0 +1,11 @@
+--- a/magick/studio.h	2018-06-23 14:13:49.191541000 -0400
++++ b/magick/studio.h	2018-09-02 11:50:41.856753700 -0400
+@@ -414,7 +414,7 @@
+ #endif
+ 
+ #if defined(HasLTDL) || ( defined(MSWINDOWS) && defined(_DLL) )
+-#  define SupportMagickModules
++//#  define SupportMagickModules
+ #endif
+ 
+ #if defined(_MAGICKMOD_)
diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake
index 0c47813f6..b04842eb1 100644
--- a/ports/graphicsmagick/portfile.cmake
+++ b/ports/graphicsmagick/portfile.cmake
@@ -1,31 +1,41 @@
 include(vcpkg_common_functions)
 
 set(GM_VERSION 1.3.30)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/graphicsmagick-${GM_VERSION}-windows-source)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z"
     FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z"
     SHA512 9e4cfff57ae547f133e6208033213d3aa790cd8c95a061c101c63b8ae8896e7504d02f302efdd20ff24f72c07760a0a5e2b32e21fe454717ed1deb2edeef159c
-    )
-vcpkg_extract_source_archive(${ARCHIVE})
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF "${GM_VERSION}"
+    PATCHES
+        # GM always requires a dynamic BZIP2. This patch makes this dependent if _DLL is defined
+        dynamic_bzip2.patch
+
+        # Bake GM's own modules into the .dll itself.  This fixes a bug whereby
+        # 'vcpkg install graphicsmagick' did not lead to a copy of GM that could
+        # load either PNG or JPEG files (due to missing GM Modules, with names
+        # matching "IM_*.DLL").
+        disable_graphicsmagick_modules.patch
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/magick_types.h DESTINATION ${SOURCE_PATH}/magick)
 
-# GM always requires a dynamic BZIP2. This patch makes this dependent if _DLL is defined
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/dynamic_bzip2.patch)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
+    OPTIONS_DEBUG
+        -DINSTALL_HEADERS=OFF
 )
 
 vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-graphicsmagick TARGET_PATH share/unofficial-graphicsmagick)
+
 # copy license
 file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphicsmagick)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/copyright)
@@ -40,3 +50,5 @@ string(REPLACE "@windows_font_dir@" "$ENV{SYSTEMROOT}/Fonts/" TYPE_MGK "${TYPE_M
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk "${TYPE_MGK}")
 
 vcpkg_copy_pdbs()
+
+vcpkg_test_cmake(PACKAGE_NAME unofficial-graphicsmagick)
diff --git a/ports/graphite2/CONTROL b/ports/graphite2/CONTROL
index eb12bb450..f73126c5a 100644
--- a/ports/graphite2/CONTROL
+++ b/ports/graphite2/CONTROL
@@ -1,4 +1,4 @@
 Source: graphite2
-Version: 1.3.10
+Version: 1.3.12
 Description: Graphite is a "smart font" system developed specifically to handle the complexities of lesser-known languages of the world.
   Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications.
 \ No newline at end of file
diff --git a/ports/graphite2/disable-tests-docs.patch b/ports/graphite2/disable-tests-docs.patch
deleted file mode 100644
index ff92caa16..000000000
--- a/ports/graphite2/disable-tests-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3466c5f..6d5c6bd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,9 +63,13 @@ endif (GRAPHITE2_VM_TYPE STREQUAL "direct" AND NOT (CMAKE_COMPILER_IS_GNUCXX OR
- message(STATUS "Using vm machine type: ${GRAPHITE2_VM_TYPE}")
- 
- add_subdirectory(src)
-+if(NOT DISABLE_TESTS)
- add_subdirectory(tests)
-+endif()
-+if(NOT DISABLE_DOCS)
- add_subdirectory(doc)
--if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
-+endif()
-+if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE) AND NOT DISABLE_TESTS)
-     add_subdirectory(gr2fonttest)
- endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
- 
diff --git a/ports/graphite2/disable-tests.patch b/ports/graphite2/disable-tests.patch
new file mode 100644
index 000000000..d88c1cee5
--- /dev/null
+++ b/ports/graphite2/disable-tests.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a4c648e..db90735 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,11 +80,13 @@ if (BUILD_SHARED_LIBS)
+ endif (BUILD_SHARED_LIBS)
+ 
+ add_subdirectory(src)
++if(NOT DISABLE_TESTS)
+ add_subdirectory(tests)
+ add_subdirectory(doc)
+ if (NOT GRAPHITE2_NFILEFACE)
+     add_subdirectory(gr2fonttest)
+ endif (NOT GRAPHITE2_NFILEFACE)
++endif()
+ 
+ set(version 3.0.1)
+ set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
diff --git a/ports/graphite2/fix-static-build.patch b/ports/graphite2/fix-static-build.patch
deleted file mode 100644
index 7a51f43cf..000000000
--- a/ports/graphite2/fix-static-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3466c5f..d88b3bc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,11 +63,11 @@ endif (GRAPHITE2_VM_TYPE STREQUAL "direct" AND NOT (CMAKE_COMPILER_IS_GNUCXX OR
- message(STATUS "Using vm machine type: ${GRAPHITE2_VM_TYPE}")
- 
- add_subdirectory(src)
--add_subdirectory(tests)
--add_subdirectory(doc)
--if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
--    add_subdirectory(gr2fonttest)
--endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
-+# add_subdirectory(tests)
-+# add_subdirectory(doc)
-+# if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
-+#     add_subdirectory(gr2fonttest)
-+# endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
- 
- set(version 3.0.1)
- set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
diff --git a/ports/graphite2/portfile.cmake b/ports/graphite2/portfile.cmake
index eb017e9d8..f5292ba83 100644
--- a/ports/graphite2/portfile.cmake
+++ b/ports/graphite2/portfile.cmake
@@ -4,14 +4,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO silnrsi/graphite
-    REF 99658129785a218556929db0595a002a668b40b0
-    SHA512 50cf6f727a2ea13ccbf55b4dad282358c40973aa0a0d97db6d721208b70fe848791aab183062c7bed8ce5b0dc3fecd6b604f6defdd5ae89b46ce267069ee0ed1
+    REF 1.3.12
+    SHA512 d0aed05b54445a9664435d5aef9d78fc07a89be23d18b7b1339d37412b09faca6da3dc1e72524e4b114724b76aa6f36934e8ab1a01bd0752e353efa075c9e643
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-tests-docs.patch"
+    PATCHES disable-tests.patch
 )
 
 vcpkg_configure_cmake(
@@ -19,7 +15,6 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DDISABLE_TESTS=ON
-        -DDISABLE_DOCS=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/harfbuzz/0001-fix-cmake-export.patch b/ports/harfbuzz/0001-fix-cmake-export.patch
new file mode 100644
index 000000000..a5abffa41
--- /dev/null
+++ b/ports/harfbuzz/0001-fix-cmake-export.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e881dbd1..69496561 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -761,11 +761,17 @@ endif ()
+ 
+ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+   install(TARGETS harfbuzz
++    EXPORT harfbuzzConfig
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     FRAMEWORK DESTINATION Library/Frameworks
+   )
++  install(EXPORT harfbuzzConfig
++      NAMESPACE harfbuzz::
++      FILE harfbuzz-config.cmake
++      DESTINATION share/harfbuzz
++  )
+   if (HB_BUILD_UTILS)
+     install(TARGETS hb-view
+       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 8eaa04edf..f3c58ee6e 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,9 +1,13 @@
 Source: harfbuzz
-Version: 1.8.4
+Version: 1.8.4-2
 Description: HarfBuzz OpenType text shaping engine
 Build-Depends: freetype, ragel
 Default-Features: ucdn
 
+Feature: graphite2
+Build-Depends: graphite2
+Description: Graphite2 shaper support
+
 Feature: icu
 Build-Depends: icu
 Description: icu support for harfbuzz
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index 29fe88642..382b045e1 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -6,14 +6,11 @@ vcpkg_from_github(
     REF 1.8.4
     SHA512 92742b754713d1df8975d4d8467de04765784d7fd566b7e07e7e7a261b0338e997a5fc11fa4fe282d6d5540d242db40c993812fbc4a881becd95fd3aae598c80
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp-build.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/find-package-freetype-2.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/glib-cmake.patch"
+        0001-fix-uwp-build.patch
+        find-package-freetype-2.patch
+        glib-cmake.patch
+        0001-fix-cmake-export.patch
 )
 
 SET(HB_HAVE_ICU "OFF")
@@ -21,6 +18,11 @@ if("icu" IN_LIST FEATURES)
     SET(HB_HAVE_ICU "ON")
 endif()
 
+SET(HB_HAVE_GRAPHITE2 "OFF")
+if("graphite2" IN_LIST FEATURES)
+    SET(HB_HAVE_GRAPHITE2 "ON")
+endif()
+
 ## Unicode callbacks
 
 # Builtin (UCDN)
@@ -48,13 +50,17 @@ vcpkg_configure_cmake(
         -DHB_BUILTIN_UCDN=${BUILTIN_UCDN}
         -DHB_HAVE_ICU=${HB_HAVE_ICU}
         -DHB_HAVE_GLIB=${HAVE_GLIB}
+        -DHB_HAVE_GRAPHITE2=${HB_HAVE_GRAPHITE2}
     OPTIONS_DEBUG
         -DSKIP_INSTALL_HEADERS=ON
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/harfbuzz TARGET_PATH share/harfbuzz)
 vcpkg_copy_pdbs()
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/harfbuzz/COPYING ${CURRENT_PACKAGES_DIR}/share/harfbuzz/copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME harfbuzz)
diff --git a/ports/hwloc/CMakeLists.txt b/ports/hwloc/CMakeLists.txt
index 7f75c558c..1b2e1c802 100644
--- a/ports/hwloc/CMakeLists.txt
+++ b/ports/hwloc/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
-project(hwloc C)
+project(hwloc
+    LANGUAGES C
+    VERSION 1.11.7)
 
 configure_file(contrib/windows/hwloc_config.h include/hwloc/autogen/config.h COPYONLY)
 configure_file(contrib/windows/static-components.h include/static-components.h COPYONLY)
@@ -36,14 +38,30 @@ add_library(libhwloc
     src/dolib.c)
 
 set_target_properties(libhwloc PROPERTIES DEFINE_SYMBOL _USRDLL)
-target_include_directories(libhwloc PRIVATE ./include ./src ${CMAKE_CURRENT_BINARY_DIR}/include)
-target_compile_definitions(libhwloc PRIVATE _CRT_SECURE_NO_WARNINGS)
+
+add_executable(hwloc-info
+    utils/hwloc/hwloc-info.c)
+
+target_link_libraries(hwloc-info PRIVATE libhwloc)
+
+foreach(Target IN ITEMS libhwloc hwloc-info)
+    target_include_directories(${Target} PRIVATE ./include ./src ${CMAKE_CURRENT_BINARY_DIR}/include)
+    target_compile_definitions(${Target} PRIVATE _CRT_SECURE_NO_WARNINGS)
+endforeach(Target)
 
 install(TARGETS libhwloc
     RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib)
 
+install(TARGETS hwloc-info
+    RUNTIME DESTINATION tools/hwloc)
+if(BUILD_SHARED_LIBS)
+    install(TARGETS libhwloc
+        RUNTIME DESTINATION tools/hwloc)
+endif(BUILD_SHARED_LIBS)
+
+
 if(NOT HWLOC_SKIP_INCLUDES)
     install(FILES include/hwloc.h DESTINATION include)
     install(DIRECTORY include/hwloc DESTINATION include FILES_MATCHING PATTERN "*.h")
diff --git a/ports/hwloc/CONTROL b/ports/hwloc/CONTROL
index ef2564050..e2c820060 100644
--- a/ports/hwloc/CONTROL
+++ b/ports/hwloc/CONTROL
@@ -1,4 +1,4 @@
 Source: hwloc
-Version: 1.11.7-2
+Version: 1.11.7-3
 Description: Portable Hardware Locality (hwloc) 
   The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs. 
diff --git a/ports/hwloc/portfile.cmake b/ports/hwloc/portfile.cmake
index a2031bdcb..64a18ddc7 100644
--- a/ports/hwloc/portfile.cmake
+++ b/ports/hwloc/portfile.cmake
@@ -28,6 +28,8 @@ else()
 endif()
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/hwloc/autogen/config.h "${PUBLIC_CONFIG_H}")
 
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/tools)
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/hwloc)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/hwloc/COPYING ${CURRENT_PACKAGES_DIR}/share/hwloc/copyright)
diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL
index 9d8320762..0cb924a2a 100644
--- a/ports/icu/CONTROL
+++ b/ports/icu/CONTROL
@@ -1,3 +1,3 @@
 Source: icu
-Version: 61.1-1
+Version: 61.1-4
 Description: Mature and widely used Unicode and localization library.
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index afacc076c..2061111e9 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -1,50 +1,30 @@
-# 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)
-#
 if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
     message(FATAL_ERROR "Error: UWP builds are currently not supported.")
 endif()
 
 include(vcpkg_common_functions)
+
 set(VERSION 61.1)
 set(VERSION2 61_1)
 set(ICU_VERSION_MAJOR 61)
 
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/icu-${VERSION}/icu)
 vcpkg_download_distfile(
-	ARCHIVE
-    URLS "http://download.icu-project.org/files/icu4c/${VERSION}/icu4c-${VERSION2}-src.zip"
-    FILENAME "icu4c-${VERSION2}-src.zip"
-    SHA512 60fed25976b8c2fe2df0b0ab745ded24da237711ec8c1e1dbdfe6eaf2014fb6b3a4bcaa488174cf770737a1c159a2d3f48a86a139cbb277163f064e607b8928f
-	)
+    ARCHIVE
+    URLS "http://download.icu-project.org/files/icu4c/${VERSION}/icu4c-${VERSION2}-src.tgz"
+    FILENAME "icu4c-${VERSION2}-src.tgz"
+    SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
+)
 vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/icu-${VERSION})
 
 vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch)
-
-# Acquire tools
-vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)
-
-# Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".
-string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")
-string(REPLACE ";$ENV{SystemRoot}\\System32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "${NEWPATH}")
-set(ENV{PATH} "${NEWPATH}")
-set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch
+            ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch
+)
 
-set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)
-file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)
+set(CONFIGURE_OPTIONS "--disable-samples --disable-tests")
 
-set(CONFIGURE_OPTIONS "--host=i686-pc-mingw32 --disable-samples --disable-tests")
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --disable-static --enable-shared")
 else()
     set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --enable-static --disable-shared")
@@ -53,59 +33,118 @@ endif()
 set(CONFIGURE_OPTIONS_RELASE "--disable-debug --enable-release --prefix=${CURRENT_PACKAGES_DIR}")
 set(CONFIGURE_OPTIONS_DEBUG  "--enable-debug --disable-release --prefix=${CURRENT_PACKAGES_DIR}/debug")
 
-if(VCPKG_CRT_LINKAGE STREQUAL static)
-    set(ICU_RUNTIME "-MT")
+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(BASH bash)
+    set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -fPIC")
+    set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fPIC")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        # Configure release
+        message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+        file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+        set(ENV{CFLAGS} "-O2 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")
+        set(ENV{CXXFLAGS} "-O2 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}")
+        vcpkg_execute_required_process(
+            COMMAND ${BASH} --noprofile --norc -c
+                "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELASE}"
+            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
+            LOGNAME "configure-${TARGET_TRIPLET}-rel")
+        message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        # Configure debug
+        message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+        file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+        set(ENV{CFLAGS} "-O0 -g ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}")
+        set(ENV{CXXFLAGS} "-O0 -g ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}")
+        vcpkg_execute_required_process(
+            COMMAND ${BASH} --noprofile --norc -c
+                "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}"
+            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
+            LOGNAME "configure-${TARGET_TRIPLET}-dbg")
+        message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
+    endif()
+
 else()
-    set(ICU_RUNTIME "-MD")
-endif()
 
-# Configure release
-message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-set(ENV{CFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi")
-set(ENV{CXXFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi")
-set(ENV{LDFLAGS} "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF")
-vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c 
-        "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELASE}"
-    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
-    LOGNAME "configure-${TARGET_TRIPLET}-rel")
-message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
-
-# Configure debug
-message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-set(ENV{CFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1")
-set(ENV{CXXFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1")
-set(ENV{LDFLAGS} "-DEBUG")
-vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c 
-        "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}"
-    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
-    LOGNAME "configure-${TARGET_TRIPLET}-dbg")
-message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
+    set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --host=i686-pc-mingw32")
+
+    # Acquire tools
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)
+
+    # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".
+    string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")
+    string(REPLACE ";$ENV{SystemRoot}\\System32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "${NEWPATH}")
+    set(ENV{PATH} "${NEWPATH}")
+    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+
+    set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)
+    file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)
+
+    if(VCPKG_CRT_LINKAGE STREQUAL static)
+        set(ICU_RUNTIME "-MT")
+    else()
+        set(ICU_RUNTIME "-MD")
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        # Configure release
+        message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+        file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+        set(ENV{CFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")
+        set(ENV{CXXFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}")
+        set(ENV{LDFLAGS} "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF")
+        vcpkg_execute_required_process(
+            COMMAND ${BASH} --noprofile --norc -c
+                "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELASE}"
+            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
+            LOGNAME "configure-${TARGET_TRIPLET}-rel")
+        message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        # Configure debug
+        message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+        file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+        set(ENV{CFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}")
+        set(ENV{CXXFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}")
+        set(ENV{LDFLAGS} "-DEBUG")
+        vcpkg_execute_required_process(
+            COMMAND ${BASH} --noprofile --norc -c
+                "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}"
+            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
+            LOGNAME "configure-${TARGET_TRIPLET}-dbg")
+        message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
+    endif()
+endif()
 
 unset(ENV{CFLAGS})
 unset(ENV{CXXFLAGS})
 unset(ENV{LDFLAGS})
 
-# Build release
-message(STATUS "Package ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "make && make install"
-    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
-    LOGNAME "build-${TARGET_TRIPLET}-rel")
-message(STATUS "Package ${TARGET_TRIPLET}-rel done")
-
-# Build debug
-message(STATUS "Package ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "make && make install"
-    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
-    LOGNAME "build-${TARGET_TRIPLET}-dbg")
-message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    # Build release
+    message(STATUS "Package ${TARGET_TRIPLET}-rel")
+    vcpkg_execute_required_process(
+        COMMAND ${BASH} --noprofile --norc -c "make && make install"
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
+        LOGNAME "build-${TARGET_TRIPLET}-rel")
+    message(STATUS "Package ${TARGET_TRIPLET}-rel done")
+endif()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    # Build debug
+    message(STATUS "Package ${TARGET_TRIPLET}-dbg")
+    vcpkg_execute_required_process(
+        COMMAND ${BASH} --noprofile --norc -c "make && make install"
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
+        LOGNAME "build-${TARGET_TRIPLET}-dbg")
+    message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
+endif()
 
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/bin
@@ -123,19 +162,31 @@ file(GLOB TEST_LIBS
     ${CURRENT_PACKAGES_DIR}/debug/lib/*test*)
 file(REMOVE ${TEST_LIBS})
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     # copy icu dlls from lib to bin
-    file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/icu*${ICU_VERSION_MAJOR}.dll)
-    file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/icu*d${ICU_VERSION_MAJOR}.dll)
-    file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(COPY ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/icu*${ICU_VERSION_MAJOR}.dll)
+        file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/icu*d${ICU_VERSION_MAJOR}.dll)
+        file(COPY ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+    endif()
 else()
-    # rename static libraries to match import libs
-    # see https://gitlab.kitware.com/cmake/cmake/issues/16617
-    foreach(MODULE dt in io tu uc)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sicu${MODULE}.lib ${CURRENT_PACKAGES_DIR}/lib/icu${MODULE}.lib)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d.lib)
-    endforeach()
+    if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+        # rename static libraries to match import libs
+        # see https://gitlab.kitware.com/cmake/cmake/issues/16617
+        foreach(MODULE dt in io tu uc)
+            if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+                file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sicu${MODULE}.lib ${CURRENT_PACKAGES_DIR}/lib/icu${MODULE}.lib)
+            endif()
+
+            if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+                file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d.lib)
+            endif()
+        endforeach()
+    endif()
 
     # force U_STATIC_IMPLEMENTATION macro
     foreach(HEADER utypes.h utf_old.h platform.h)
diff --git a/ports/icu/remove-MD-from-configure.patch b/ports/icu/remove-MD-from-configure.patch
new file mode 100644
index 000000000..d35205ebf
--- /dev/null
+++ b/ports/icu/remove-MD-from-configure.patch
@@ -0,0 +1,18 @@
+diff -urN a/source/runConfigureICU b/source/runConfigureICU
+--- a/source/runConfigureICU	2018-03-26 21:38:44.000000000 +0800
++++ b/source/runConfigureICU	2018-08-26 09:04:53.197454400 +0800
+@@ -322,10 +322,10 @@
+         THE_COMP="Microsoft Visual C++"
+         CC=cl; export CC
+         CXX=cl; export CXX
+-        RELEASE_CFLAGS='-Gy -MD'
+-        RELEASE_CXXFLAGS='-Gy -MD'
+-        DEBUG_CFLAGS='-Zi -MDd'
+-        DEBUG_CXXFLAGS='-Zi -MDd'
++        RELEASE_CFLAGS='-Gy'
++        RELEASE_CXXFLAGS='-Gy'
++        DEBUG_CFLAGS='-Zi'
++        DEBUG_CXXFLAGS='-Zi'
+         DEBUG_LDFLAGS='-DEBUG'
+         ;;
+     *BSD)
diff --git a/ports/ideviceinstaller/portfile.cmake b/ports/ideviceinstaller/portfile.cmake
index ca6b79287..c5523e6ba 100644
--- a/ports/ideviceinstaller/portfile.cmake
+++ b/ports/ideviceinstaller/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     REPO libimobiledevice-win32/ideviceinstaller
     REF 1.1.2.23
     SHA512 d0801b3a38eb02206a6f06e05cc19b794c69a87c06895165f64522c61e07030046499c5f0e436981682f9e17f91eae87913cca091e2e039a74ee35a5136100d4
-    HEAD_REF master
+    HEAD_REF msvc-master
 )
 
 vcpkg_install_msbuild(
diff --git a/ports/idevicerestore/portfile.cmake b/ports/idevicerestore/portfile.cmake
index 81d302a40..e0f9a0888 100644
--- a/ports/idevicerestore/portfile.cmake
+++ b/ports/idevicerestore/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     REPO libimobiledevice-win32/idevicerestore
     REF 1.0.12
     SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915
-    HEAD_REF master
+    HEAD_REF msvc-master
 )
 
 vcpkg_install_msbuild(
diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt
index 5bcf278f7..1b4fc86e5 100644
--- a/ports/imgui/CMakeLists.txt
+++ b/ports/imgui/CMakeLists.txt
@@ -17,6 +17,7 @@ set(IMGUI_SOURCES
     imgui.cpp
     imgui_demo.cpp
     imgui_draw.cpp
+    imgui_widgets.cpp
 )
 
 add_library(${PROJECT_NAME}
diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL
index 03c1e0e7c..a973b215b 100644
--- a/ports/imgui/CONTROL
+++ b/ports/imgui/CONTROL
@@ -1,3 +1,3 @@
 Source: imgui
-Version: 1.62
+Version: 1.65
 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 b477ba7b7..1f427a068 100644
--- a/ports/imgui/portfile.cmake
+++ b/ports/imgui/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ocornut/imgui
-    REF v1.62
-    SHA512  aa9701481d108e6b2f030cac71fdef49e299cfa930c8ec7e74847757a059b8c629f09cb7d7d1eb4cb9d3ef263404906dfa52670850c6a490d56eaff981d56049
+    REF v1.65
+    SHA512  f68bbf84b781ea3e409beccb02b0bf8fe78d56e1ce7d8fce785f629758310ae75c9624ed62b2b6194e50f00cc7cc17f643191f4fbbad9236aa2e82a9ea4f6aac
     HEAD_REF master
 )
 
diff --git a/ports/intelrdfpmathlib/CMakeLists.txt b/ports/intelrdfpmathlib/CMakeLists.txt
new file mode 100644
index 000000000..809cd3477
--- /dev/null
+++ b/ports/intelrdfpmathlib/CMakeLists.txt
@@ -0,0 +1,289 @@
+cmake_minimum_required(VERSION 3.8)
+project(intelrdfpmathlib C)
+
+set(
+  intelrdfpmathlib_SOURCES
+  float128/dpml_exception.c
+  float128/dpml_four_over_pi.c
+  float128/dpml_ux_bessel.c
+  float128/dpml_ux_bid.c
+  float128/dpml_ux_cbrt.c
+  float128/dpml_ux_erf.c
+  float128/dpml_ux_exp.c
+  float128/dpml_ux_int.c
+  float128/dpml_ux_inv_hyper.c
+  float128/dpml_ux_inv_trig.c
+  float128/dpml_ux_lgamma.c
+  float128/dpml_ux_log.c
+  float128/dpml_ux_mod.c
+  float128/dpml_ux_ops.c
+  float128/dpml_ux_ops_64.c
+  float128/dpml_ux_pow.c
+  float128/dpml_ux_powi.c
+  float128/dpml_ux_sqrt.c
+  float128/dpml_ux_trig.c
+  float128/sqrt_tab_t.c
+  src/bid128.c
+  src/bid128_2_str_tables.c
+  src/bid128_acos.c
+  src/bid128_acosh.c
+  src/bid128_add.c
+  src/bid128_asin.c
+  src/bid128_asinh.c
+  src/bid128_atan.c
+  src/bid128_atan2.c
+  src/bid128_atanh.c
+  src/bid128_cbrt.c
+  src/bid128_compare.c
+  src/bid128_cos.c
+  src/bid128_cosh.c
+  src/bid128_div.c
+  src/bid128_erf.c
+  src/bid128_erfc.c
+  src/bid128_exp.c
+  src/bid128_exp10.c
+  src/bid128_exp2.c
+  src/bid128_expm1.c
+  src/bid128_fdimd.c
+  src/bid128_fma.c
+  src/bid128_fmod.c
+  src/bid128_frexp.c
+  src/bid128_hypot.c
+  src/bid128_ldexp.c
+  src/bid128_lgamma.c
+  src/bid128_llrintd.c
+  src/bid128_log.c
+  src/bid128_log10.c
+  src/bid128_log1p.c
+  src/bid128_log2.c
+  src/bid128_logb.c
+  src/bid128_logbd.c
+  src/bid128_lrintd.c
+  src/bid128_lround.c
+  src/bid128_minmax.c
+  src/bid128_modf.c
+  src/bid128_mul.c
+  src/bid128_nearbyintd.c
+  src/bid128_next.c
+  src/bid128_nexttowardd.c
+  src/bid128_noncomp.c
+  src/bid128_pow.c
+  src/bid128_quantexpd.c
+  src/bid128_quantize.c
+  src/bid128_rem.c
+  src/bid128_round_integral.c
+  src/bid128_scalb.c
+  src/bid128_scalbl.c
+  src/bid128_sin.c
+  src/bid128_sinh.c
+  src/bid128_sqrt.c
+  src/bid128_string.c
+  src/bid128_tan.c
+  src/bid128_tanh.c
+  src/bid128_tgamma.c
+  src/bid128_to_int16.c
+  src/bid128_to_int32.c
+  src/bid128_to_int64.c
+  src/bid128_to_int8.c
+  src/bid128_to_uint16.c
+  src/bid128_to_uint32.c
+  src/bid128_to_uint64.c
+  src/bid128_to_uint8.c
+  src/bid32_acos.c
+  src/bid32_acosh.c
+  src/bid32_add.c
+  src/bid32_asin.c
+  src/bid32_asinh.c
+  src/bid32_atan.c
+  src/bid32_atan2.c
+  src/bid32_atanh.c
+  src/bid32_cbrt.c
+  src/bid32_compare.c
+  src/bid32_cos.c
+  src/bid32_cosh.c
+  src/bid32_div.c
+  src/bid32_erf.c
+  src/bid32_erfc.c
+  src/bid32_exp.c
+  src/bid32_exp10.c
+  src/bid32_exp2.c
+  src/bid32_expm1.c
+  src/bid32_fdimd.c
+  src/bid32_fma.c
+  src/bid32_fmod.c
+  src/bid32_frexp.c
+  src/bid32_hypot.c
+  src/bid32_ldexp.c
+  src/bid32_lgamma.c
+  src/bid32_llrintd.c
+  src/bid32_log.c
+  src/bid32_log10.c
+  src/bid32_log1p.c
+  src/bid32_log2.c
+  src/bid32_logb.c
+  src/bid32_logbd.c
+  src/bid32_lrintd.c
+  src/bid32_lround.c
+  src/bid32_minmax.c
+  src/bid32_modf.c
+  src/bid32_mul.c
+  src/bid32_nearbyintd.c
+  src/bid32_next.c
+  src/bid32_nexttowardd.c
+  src/bid32_noncomp.c
+  src/bid32_pow.c
+  src/bid32_quantexpd.c
+  src/bid32_quantize.c
+  src/bid32_rem.c
+  src/bid32_round_integral.c
+  src/bid32_scalb.c
+  src/bid32_scalbl.c
+  src/bid32_sin.c
+  src/bid32_sinh.c
+  src/bid32_sqrt.c
+  src/bid32_string.c
+  src/bid32_sub.c
+  src/bid32_tan.c
+  src/bid32_tanh.c
+  src/bid32_tgamma.c
+  src/bid32_to_bid128.c
+  src/bid32_to_bid64.c
+  src/bid32_to_int16.c
+  src/bid32_to_int32.c
+  src/bid32_to_int64.c
+  src/bid32_to_int8.c
+  src/bid32_to_uint16.c
+  src/bid32_to_uint32.c
+  src/bid32_to_uint64.c
+  src/bid32_to_uint8.c
+  src/bid64_acos.c
+  src/bid64_acosh.c
+  src/bid64_add.c
+  src/bid64_asin.c
+  src/bid64_asinh.c
+  src/bid64_atan.c
+  src/bid64_atan2.c
+  src/bid64_atanh.c
+  src/bid64_cbrt.c
+  src/bid64_compare.c
+  src/bid64_cos.c
+  src/bid64_cosh.c
+  src/bid64_div.c
+  src/bid64_erf.c
+  src/bid64_erfc.c
+  src/bid64_exp.c
+  src/bid64_exp10.c
+  src/bid64_exp2.c
+  src/bid64_expm1.c
+  src/bid64_fdimd.c
+  src/bid64_fma.c
+  src/bid64_fmod.c
+  src/bid64_frexp.c
+  src/bid64_hypot.c
+  src/bid64_ldexp.c
+  src/bid64_lgamma.c
+  src/bid64_llrintd.c
+  src/bid64_log.c
+  src/bid64_log10.c
+  src/bid64_log1p.c
+  src/bid64_log2.c
+  src/bid64_logb.c
+  src/bid64_logbd.c
+  src/bid64_lrintd.c
+  src/bid64_lround.c
+  src/bid64_minmax.c
+  src/bid64_modf.c
+  src/bid64_mul.c
+  src/bid64_nearbyintd.c
+  src/bid64_next.c
+  src/bid64_nexttowardd.c
+  src/bid64_noncomp.c
+  src/bid64_pow.c
+  src/bid64_quantexpd.c
+  src/bid64_quantize.c
+  src/bid64_rem.c
+  src/bid64_round_integral.c
+  src/bid64_scalb.c
+  src/bid64_scalbl.c
+  src/bid64_sin.c
+  src/bid64_sinh.c
+  src/bid64_sqrt.c
+  src/bid64_string.c
+  src/bid64_tan.c
+  src/bid64_tanh.c
+  src/bid64_tgamma.c
+  src/bid64_to_bid128.c
+  src/bid64_to_int16.c
+  src/bid64_to_int32.c
+  src/bid64_to_int64.c
+  src/bid64_to_int8.c
+  src/bid64_to_uint16.c
+  src/bid64_to_uint32.c
+  src/bid64_to_uint64.c
+  src/bid64_to_uint8.c
+  src/bid_binarydecimal.c
+  src/bid_convert_data.c
+  src/bid_decimal_data.c
+  src/bid_decimal_globals.c
+  src/bid_dpd.c
+  src/bid_feclearexcept.c
+  src/bid_fegetexceptflag.c
+  src/bid_feraiseexcept.c
+  src/bid_fesetexceptflag.c
+  src/bid_fetestexcept.c
+  src/bid_flag_operations.c
+  src/bid_from_int.c
+  src/bid_round.c
+  src/strtod128.c
+  src/strtod32.c
+  src/strtod64.c
+  src/wcstod128.c
+  src/wcstod32.c
+  src/wcstod64.c
+)
+
+if(MSVC)
+  add_compile_options(/W3 )
+else()
+  add_compile_options(-w)
+endif()
+
+if(WIN32)
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    add_compile_options(-Defi2=1 -DEFI2=1)
+  else()
+    add_compile_options(-DIA32= -Dia32=1)
+  endif()
+else()
+  add_compile_options(-Defi2=1 -DEFI2=1)
+endif()
+
+
+include_directories(. src float128)
+
+add_library(intel_decimal128 ${intelrdfpmathlib_SOURCES})
+
+target_compile_definitions(
+  intel_decimal128 PRIVATE -DDECIMAL_CALL_BY_REFERENCE=0 -DDECIMAL_GLOBAL_ROUNDING=0 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=0
+)
+
+if(WIN32)
+  target_compile_definitions(intel_decimal128 PRIVATE -DWINDOWS=1 -DWNT=1 -Dwinnt=1)
+elseif(APPLE)
+  target_compile_definitions(intel_decimal128 PRIVATE -DLINUX=1 -Dmach=1)
+elseif(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|OpenBSD|NetBSD)")
+  target_compile_definitions(intel_decimal128 PRIVATE -DLINUX=1 -Dfreebsd=1)
+else()
+  target_compile_definitions(intel_decimal128 PRIVATE -DLINUX=1 -Dlinux=1)
+endif()
+
+install(
+  TARGETS  intel_decimal128
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(FILES src/dfp754.h DESTINATION include)
+endif()
diff --git a/ports/intelrdfpmathlib/CONTROL b/ports/intelrdfpmathlib/CONTROL
new file mode 100644
index 000000000..5c7fe7b59
--- /dev/null
+++ b/ports/intelrdfpmathlib/CONTROL
@@ -0,0 +1,3 @@
+Source: intelrdfpmathlib
+Version: 20U2
+Description: Intel(R) Decimal Floating-Point Math Library
diff --git a/ports/intelrdfpmathlib/portfile.cmake b/ports/intelrdfpmathlib/portfile.cmake
new file mode 100644
index 000000000..e463f0a77
--- /dev/null
+++ b/ports/intelrdfpmathlib/portfile.cmake
@@ -0,0 +1,25 @@
+include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/IntelRDFPMathLib20U2)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz"
+    FILENAME "IntelRDFPMathLib20U2.tar.gz"
+    SHA512 4d445855f41b066b784f0c6b4e52f854df4129fa9d43569b1e1518f002b860f69796459c78de46a8ea24fb6e7aefe7f8bc1f253e78971a5ef202dab2a7b1b75a
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+set(LIB_SOURCE_PATH "${SOURCE_PATH}/LIBRARY")
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION "${LIB_SOURCE_PATH}")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH "${LIB_SOURCE_PATH}"
+    PREFER_NINJA 
+    OPTIONS_DEBUG
+    -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/eula.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/IntelRDFPMathLib RENAME copyright)
diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL
new file mode 100644
index 000000000..7e36cb5d9
--- /dev/null
+++ b/ports/io2d/CONTROL
@@ -0,0 +1,4 @@
+Source: io2d
+Version: 0.1-1
+Description: a lightweight, cross platform drawing library
+Build-Depends: cairo, graphicsmagick
diff --git a/ports/io2d/find-package.patch b/ports/io2d/find-package.patch
new file mode 100644
index 000000000..10d83f95b
--- /dev/null
+++ b/ports/io2d/find-package.patch
@@ -0,0 +1,47 @@
+diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
+index 3d4791c..1864b7a 100644
+--- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
++++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
+@@ -23,7 +23,15 @@ target_compile_features(io2d_cairo PUBLIC cxx_std_17)
+ 
+ target_link_libraries(io2d_cairo PUBLIC io2d_core)
+ 
+-if(MSVC)
++if(DEFINED VCPKG_TARGET_TRIPLET)
++	find_package(unofficial-cairo CONFIG REQUIRED)
++	set(CAIRO_INCLUDE_DIR)
++	set(CAIRO_LIB_DEBUG "CAIRO_LIB_DEBUG-NOTFOUND")
++	set(CAIRO_LIB_RELEASE unofficial::cairo::cairo)
++	find_package(unofficial-graphicsmagick CONFIG REQUIRED)
++	set(GRAPHICSMAGICK_INCLUDE_DIR)
++	set(GRAPHICSMAGICK_LIB unofficial::graphicsmagick::graphicsmagick)
++elseif(MSVC)
+ 	find_path(CAIRO_INCLUDE_DIR cairo.h)
+ 	find_path(GRAPHICSMAGICK_INCLUDE_DIR magick/api.h)
+ 	find_library(CAIRO_LIB_DEBUG cairod)
+diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
+index abb1501..b7a6e71 100644
+--- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
++++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
+@@ -24,20 +24,7 @@ target_compile_features(io2d_cairo_win32 PUBLIC cxx_std_17)
+ target_link_libraries(io2d_cairo_win32 PUBLIC io2d_cairo)
+  
+ if(MSVC)
+-	target_compile_definitions(io2d_cairo_win32 PUBLIC -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS)
+-
+-	find_library(PIXMAN_LIB pixman-1)
+-	find_library(FREETYPE_LIB freetype)
+-	find_library(FONTCONFIG_LIB fontconfig)
+-	find_library(BZ_LIB bz2)
+-	find_library(JPEG_LIB jpeg)
+-	find_library(TIFF_LIB tiff)
+-	find_library(EXPAT_LIB expat)
+-	find_library(LZMA_LIB lzma)
+-	find_library(ICONV_LIB libiconv)
+-	find_library(CHARSET_LIB libcharset)
+-
+-	target_link_libraries(io2d_cairo_win32 PUBLIC ${PIXMAN_LIB} ${FREETYPE_LIB} ${FONTCONFIG_LIB} ${BZ_LIB} ${JPEG_LIB} ${TIFF_LIB} ${EXPAT_LIB} ${LZMA_LIB} ${ICONV_LIB} ${CHARSET_LIB})
++	target_compile_definitions(io2d_cairo_win32 PRIVATE -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS)
+ endif()
+  
+ install(
diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake
new file mode 100644
index 000000000..c1d536d57
--- /dev/null
+++ b/ports/io2d/portfile.cmake
@@ -0,0 +1,56 @@
+
+# Allow use of vcpkg functions
+include(vcpkg_common_functions)
+
+# For now, io2d is always a static library.
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+# Optionally, uncomment and modify one of the 'set(...)' calls below
+# to use io2d sources from a local directory, rather than Github.
+# set(SOURCE_PATH "C:\\Path\\To\\P0267_RefImpl\\")
+# set(SOURCE_PATH "/Path/To/P0267_RefImpl")
+
+# Retrieve and validate io2d source code, as-needed
+if ("${SOURCE_PATH}" STREQUAL "")
+    # TODO: point at cpp-io2d/(whatever), if and as needed
+    vcpkg_from_github(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO cpp-io2d/P0267_RefImpl
+        REF 21ae92c8be6916034e6e18f08aa57899a975dfb0
+        SHA512 5b674f98ca7705d6901af339a4189d5ce4f2c3118bfb99430734f355159602f177bc8d1b345c3a2f17947a62547553f7b91747a1f16da063707a4da7f990391d
+        HEAD_REF master
+        PATCHES find-package.patch
+    )
+endif()
+
+# Configure the library, using CMake
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DIO2D_WITHOUT_SAMPLES=1
+        -DIO2D_WITHOUT_TESTS=1
+        -DCMAKE_INSTALL_INCLUDEDIR:STRING=include
+)
+
+# Build + install the library, using CMake
+vcpkg_install_cmake()
+
+# Don't have duplicate header files in both include/ and debug/include/ folders
+# (within <vcpkg-root>/installed/io2d_*/, as installed by vcpkg_install_cmake()):
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/io2d)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake ${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake "
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-cairo CONFIG)
+find_dependency(unofficial-graphicsmagick CONFIG)
+
+include(\${CMAKE_CURRENT_LIST_DIR}/io2dTargets.cmake)
+")
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/io2d RENAME copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME io2d)
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index b8214fd9f..c89a34afc 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,3 +1,3 @@
 Source: jsonnet
-Version: 2018-07-30
+Version: 2018-09-18
 Description: Jsonnet - The data templating language
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index 71cc4029e..918a4de8d 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/jsonnet
-    REF 467a62662cb700289cb9b2e6d841d6897a155774
-    SHA512 a9b702c485bf8c9a87cfeee7612bb179bfec9153c25a1428277f07dd3b9d3f2508eb45cbd27b3533bed9a38d2b68bbabbde9702553ca7b90da0c1bd2411c83ee
+    REF 48df4a1007a88202495a30bf2fa65528335b35e6
+    SHA512 46734d797499d51a79c1c63d653bc8e6496d385a57c7a83a45c3ab82fa4f106abdb67a57b9641d5c9e1cf286f4f0a66cfdbc5e1987bda234d614c91d7be79c94
     HEAD_REF master
 )
 
diff --git a/ports/kangaru/CONTROL b/ports/kangaru/CONTROL
new file mode 100644
index 000000000..42f8277fd
--- /dev/null
+++ b/ports/kangaru/CONTROL
@@ -0,0 +1,3 @@
+Source: kangaru
+Version: 4.1.2
+Description: A dependency injection container for C++11, C++14 and later
diff --git a/ports/kangaru/portfile.cmake b/ports/kangaru/portfile.cmake
new file mode 100644
index 000000000..6de69896b
--- /dev/null
+++ b/ports/kangaru/portfile.cmake
@@ -0,0 +1,28 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO gracicot/kangaru
+    REF v4.1.2
+    SHA512 44ca94da38c80aa8495bb58cc26db0591d5e1b32b52c3ff242d95598856c5e84f25d7e7184c1e15e44d9a89987856740548fb070ad393cbe51da4bb79aa216d2
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS -DKANGARU_EXPORT=Off -DKANGARU_TEST=Off
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/kangaru")
+
+file(REMOVE_RECURSE
+	${CURRENT_PACKAGES_DIR}/lib
+	${CURRENT_PACKAGES_DIR}/debug
+)
+
+
+# Put the license file where vcpkg expects it
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/kangaru/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/kangaru/LICENSE ${CURRENT_PACKAGES_DIR}/share/kangaru/copyright)
diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL
new file mode 100644
index 000000000..c3e0e5dee
--- /dev/null
+++ b/ports/kf5archive/CONTROL
@@ -0,0 +1,4 @@
+Source: kf5archive
+Version: 5.50.0
+Description: File compression
+Build-Depends: ecm, qt5-base, zlib, bzip2
+\ No newline at end of file
diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake
new file mode 100644
index 000000000..6f587a096
--- /dev/null
+++ b/ports/kf5archive/portfile.cmake
@@ -0,0 +1,27 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/karchive
+    REF v5.50.0
+    SHA512 519dd69ef76c9655cdf9d8f16484244469a6d5d2185c1d588bad325a401dd11f35699e3c115dfd52e5db38aa26aea3d9b35c7e83b76a36bda926574a7d3ce50f
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DBUILD_HTML_DOCS=OFF
+            -DBUILD_MAN_DOCS=OFF
+            -DBUILD_QTHELP_DOCS=OFF
+            -DBUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Archive)
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc)
+file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5archive RENAME copyright)
diff --git a/ports/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL
new file mode 100644
index 000000000..cd1e09ccf
--- /dev/null
+++ b/ports/kf5holidays/CONTROL
@@ -0,0 +1,4 @@
+Source: kf5holidays
+Version: 5.50.0
+Description: Holiday calculation library
+Build-Depends: ecm, qt5-base, qt5-declarative, qt5-tools
+\ No newline at end of file
diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake
new file mode 100644
index 000000000..b56abec1a
--- /dev/null
+++ b/ports/kf5holidays/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kholidays
+    REF v5.50.0
+    SHA512 01c1258213e1bbab90b9af9c41965599637b1ccd4cd285cbe9bc11579fae1363162567ae14c33001b8b1cc085bae4dfdf4ed79b7ff27f93187bce79db662b4e2
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DBUILD_HTML_DOCS=OFF
+            -DBUILD_MAN_DOCS=OFF
+            -DBUILD_QTHELP_DOCS=OFF
+            -DBUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Holidays)
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/qml ${CURRENT_PACKAGES_DIR}/debug/qml )
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/qml ${CURRENT_PACKAGES_DIR}/qml )
+
+file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5holidays RENAME copyright)
diff --git a/ports/kf5plotting/CONTROL b/ports/kf5plotting/CONTROL
index a24b8e352..70439a5dc 100644
--- a/ports/kf5plotting/CONTROL
+++ b/ports/kf5plotting/CONTROL
@@ -1,4 +1,4 @@
 Source: kf5plotting
-Version: 5.37.0
+Version: 5.50.0
 Description: Lightweight plotting framework
-Build-Depends: ecm, qt5
+Build-Depends: ecm, qt5-base
diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake
index 39d6e8893..36f862d13 100644
--- a/ports/kf5plotting/portfile.cmake
+++ b/ports/kf5plotting/portfile.cmake
@@ -1,11 +1,12 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/kplotting-5.37.0)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://download.kde.org/stable/frameworks/5.37/kplotting-5.37.0.zip"
-    FILENAME "kplotting-5.37.0.zip"
-    SHA512 3a1b3f993123dea7141d280cd53ae1b5e49b859e9df39a188bac216758576106efd8b744e8f10f96fac158f980d79ae94d2b27f3d85a48fcd5673263ffce3c4e
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kplotting
+    REF v5.50.0
+    SHA512 512a0f8e8a5147f06345d86fa29effa8d0a59b62f5a24b70a09c4ddf5204d626e13f421be7c42d2103c5634e863db5ac8e6763db886351597f0798e05bc97f33
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -21,4 +22,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Plotting)
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/KF5plotting RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5plotting RENAME copyright)
diff --git a/ports/leptonica/CONTROL b/ports/leptonica/CONTROL
index e3543173f..5fd60614d 100644
--- a/ports/leptonica/CONTROL
+++ b/ports/leptonica/CONTROL
@@ -1,4 +1,4 @@
 Source: leptonica
-Version: 1.74.4-5
+Version: 1.76.0
 Description: An open source library containing software that is broadly useful for image processing and image analysis applications
 Build-Depends: libjpeg-turbo, zlib, libpng, tiff, giflib
diff --git a/ports/leptonica/fix-cmakelists.patch b/ports/leptonica/fix-cmakelists.patch
index 18eb8cde5..b08a971f6 100644
--- a/ports/leptonica/fix-cmakelists.patch
+++ b/ports/leptonica/fix-cmakelists.patch
@@ -1,34 +1,12 @@
---- a/src/CMakeLists.txt	Sun Jun 11 23:04:50 2017
-+++ b/src/CMakeLists.txt	Wed Aug 16 17:29:56 2017
-@@ -27,24 +27,31 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 945100a..6daad98 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -14,7 +14,6 @@ if (MSVC)
+     set_source_files_properties(${src} PROPERTIES LANGUAGE CXX)
  endif()
  
- if (GIF_LIBRARY)
-+    target_include_directories  (leptonica PUBLIC ${GIF_INCLUDE_DIR})
-     target_link_libraries       (leptonica ${GIF_LIBRARY})
- endif()
- if (JPEG_LIBRARY)
-+    target_include_directories  (leptonica PUBLIC ${JPEG_INCLUDE_DIR})
-     target_link_libraries       (leptonica ${JPEG_LIBRARY})
- endif()
- if (JP2K_FOUND)
-+    target_include_directories  (leptonica PUBLIC ${JP2K_INCLUDE_DIR})
-     target_link_libraries       (leptonica ${JP2K_LIBRARIES})
- endif()
- if (PNG_LIBRARY)
-+    target_include_directories  (leptonica PUBLIC ${PNG_INCLUDE_DIRS})
-     target_link_libraries       (leptonica ${PNG_LIBRARY})
- endif()
- if (TIFF_LIBRARY)
-+    target_include_directories  (leptonica PUBLIC ${TIFF_INCLUDE_DIR})
-     target_link_libraries       (leptonica ${TIFF_LIBRARY})
- endif()
- if (WEBP_FOUND)
-+    target_include_directories  (leptonica PUBLIC ${WEBP_INCLUDE_DIR})
-     target_link_libraries       (leptonica ${WEBP_LIBRARIES})
- endif()
- if (ZLIB_LIBRARY)
-+    target_include_directories  (leptonica PUBLIC ${ZLIB_INCLUDE_DIR})
-     target_link_libraries       (leptonica ${ZLIB_LIBRARY})
- endif()
+-string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
  
+ add_library                     (leptonica ${LIBRARY_TYPE} ${src} ${hdr})
+ set_target_properties           (leptonica PROPERTIES VERSION   ${VERSION_PLAIN})
diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake
index 156ed3dd2..d42fa6b90 100644
--- a/ports/leptonica/portfile.cmake
+++ b/ports/leptonica/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DanBloomberg/leptonica
-    REF 1.74.4
-    SHA512 3b9d0be937883f733f72cbdf0b624ec245d9256a8b4622997f437d309efd7ad9695ad1cbe2224d543eb3ef8c44833567b3cc9a95e9a774ef9046b7acaf0ae744
+    REF 1.76.0
+    SHA512 0d7575dc38d1e656a228ef30412a2cbb908b9c7c8636e4e96f4a7dc0429c04709316b8ad04893285ab430c1b2063d71537fc5b989a0f9dbdbec488713e1bab1f
     HEAD_REF master
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index dfcfa66b3..af3d528b8 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,4 +1,29 @@
 Source: libarchive
-Version: 3.3.2-2
+Version: 3.3.3-2
 Description: Library for reading and writing streaming archives
-Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl
+Build-Depends: zlib
+Default-Features: bzip2, libxml2, lz4, lzma, lzo, openssl
+
+Feature: bzip2
+Build-Depends: bzip2
+Description: BZip2 support
+
+Feature: libxml2
+Build-Depends: libxml2
+Description: Libxml2 support
+
+Feature: lz4
+Build-Depends: lz4
+Description: LZ4 support
+
+Feature: lzma
+Build-Depends: liblzma
+Description: LZMA support
+
+Feature: lzo
+Build-Depends: lzo
+Description: LZO support
+
+Feature: openssl
+Build-Depends: openssl
+Description: OpenSSL support
diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake
index 1e36af1bb..a2a35ad65 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -7,8 +7,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libarchive/libarchive
-    REF v3.3.2
-    SHA512 7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc
+    REF v3.3.3
+    SHA512 10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d
     HEAD_REF master
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch
@@ -17,11 +17,48 @@ vcpkg_from_github(
         ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch
 )
 
+set(BUILD_libarchive_bzip2 OFF)
+if("bzip2" IN_LIST FEATURES)
+  set(BUILD_libarchive_bzip2 ON)
+endif()
+
+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)
+  set(BUILD_libarchive_lz4 ON)
+endif()
+
+set(BUILD_libarchive_lzma OFF)
+if("lzma" IN_LIST FEATURES)
+  set(BUILD_libarchive_lzma ON)
+endif()
+
+set(BUILD_libarchive_lzo OFF)
+if("lzo" IN_LIST FEATURES)
+  set(BUILD_libarchive_lzo ON)
+endif()
+
+set(BUILD_libarchive_openssl OFF)
+if("openssl" IN_LIST FEATURES)
+  set(BUILD_libarchive_openssl ON)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DENABLE_LZO=OFF
+        -DENABLE_BZip2=${BUILD_libarchive_bzip2}
+        -DENABLE_LIBXML2=${BUILD_libarchive_libxml2}
+        -DENABLE_LZ4=${BUILD_libarchive_lz4}
+        -DENABLE_LZMA=${BUILD_libarchive_lzma}
+        -DENABLE_LZO=${BUILD_libarchive_lzo}
+        -DENABLE_OPENSSL=${BUILD_libarchive_openssl}
+        -DENABLE_PCREPOSIX=OFF
         -DENABLE_NETTLE=OFF
         -DENABLE_EXPAT=OFF
         -DENABLE_LibGCC=OFF
diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL
index 1a16c7a6a..afdb70cbe 100644
--- a/ports/libflac/CONTROL
+++ b/ports/libflac/CONTROL
@@ -1,4 +1,4 @@
 Source: libflac
-Version: 1.3.2-5
+Version: 1.3.2-6
 Description: Library for manipulating FLAC files
 Build-Depends: libogg
diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake
index 236f51c8e..894107447 100644
--- a/ports/libflac/portfile.cmake
+++ b/ports/libflac/portfile.cmake
@@ -1,17 +1,20 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flac-1.3.2)
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz"
-    FILENAME "flac-1.3.2.tar.xz"
-    SHA512 63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15)
 
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flac-1.3.2
+vcpkg_download_distfile(FLAC_MAX_MIN_PATCH
+    URLS "https://github.com/xiph/flac/commit/64f47c2d71ffba5aa8cd1d2a447339fd95f362f9.patch"
+    FILENAME "flac-max-min.patch"
+    SHA512 7ce9ccf9f081b478664cccd677c10269567672a8aa3a60839ef203b3d0a626d2b2c2f34d4c7fc897c31a436d7c22fb740bca5449a465dab39d60655417fe7772)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO xiph/flac
+    REF 1.3.2
+    SHA512 d0e177cadee371940516864bf72e1eb3d101a5f2779c854ecb8a3361a654a9b9e7efd303c83e2f308bacc7e54298d37705f677e2b955d4a9fe3470c364fa45f3
+    HEAD_REF master
     PATCHES
-    "${CMAKE_CURRENT_LIST_DIR}/uwp-library-console.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile2.patch"
+        "${FLAC_MAX_MIN_PATCH}"
+        "${CMAKE_CURRENT_LIST_DIR}/uwp-library-console.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile2.patch"
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL
index 9a2b518a4..f44900b72 100644
--- a/ports/libgit2/CONTROL
+++ b/ports/libgit2/CONTROL
@@ -1,4 +1,4 @@
 Source: libgit2
-Version: 0.27.4-1
+Version: 0.27.4-2
 Build-Depends: openssl (!windows&&!uwp)
 Description: Git linkable library
diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake
index be3139a81..0982e5be1 100644
--- a/ports/libgit2/portfile.cmake
+++ b/ports/libgit2/portfile.cmake
@@ -10,13 +10,17 @@ vcpkg_from_github(
     REPO libgit2/libgit2
     REF v0.27.4
     SHA512 d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61
-    HEAD_REF master)
+    HEAD_REF master
+)
+
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         -DBUILD_CLAR=OFF
+        -DSTATIC_CRT=${STATIC_CRT}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/libgo/CONTROL b/ports/libgo/CONTROL
index c5c06fd8b..18b37915a 100644
--- a/ports/libgo/CONTROL
+++ b/ports/libgo/CONTROL
@@ -1,4 +1,4 @@
 Source: libgo
-Version: 2.8-1
+Version: 2.8-2
 Build-Depends: boost-context
 Description: The best stackful coroutine by c++11.
diff --git a/ports/libgo/boost-168.patch b/ports/libgo/boost-168.patch
new file mode 100644
index 000000000..48a90023f
--- /dev/null
+++ b/ports/libgo/boost-168.patch
@@ -0,0 +1,20 @@
+diff --git a/libgo/ctx_boost_context/context.h b/libgo/ctx_boost_context/context.h
+index 2db71c0..2f321fb 100644
+--- a/libgo/ctx_boost_context/context.h
++++ b/libgo/ctx_boost_context/context.h
+@@ -1,4 +1,4 @@
+-#include <boost/context/all.hpp>
++#include <boost/context/execution_context.hpp>
+ 
+ #if BOOST_EXECUTION_CONTEXT == 2  // boost version >= 1.61
+ # include "context_v2.h"
+diff --git a/libgo/ctx_boost_context/context_v2.h b/libgo/ctx_boost_context/context_v2.h
+index e415af4..59e2e29 100644
+--- a/libgo/ctx_boost_context/context_v2.h
++++ b/libgo/ctx_boost_context/context_v2.h
+@@ -1,4 +1,4 @@
+-#include <boost/context/all.hpp>
++#include <boost/context/stack_context.hpp>
+ 
+ namespace co
+ {
diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake
index 01dabcb81..f0311eea4 100644
--- a/ports/libgo/portfile.cmake
+++ b/ports/libgo/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("libgo currently only supports static linkage")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,7 +8,9 @@ vcpkg_from_github(
     REF v2.8
     SHA512 44784de4aec36ea321195c11c99a73de4f6f51285febdf6980e8aaced1fdfc0a34c6b1a8acc8c6b424e747310a1d7fb1604f722084c28ab91f8ebee15667d59b
     HEAD_REF master
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake.patch
+    PATCHES
+        cmake.patch
+        boost-168.patch
 )
 
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake
index f1ee147f9..3ccd85c53 100644
--- a/ports/libiconv/portfile.cmake
+++ b/ports/libiconv/portfile.cmake
@@ -39,3 +39,5 @@ vcpkg_copy_pdbs()
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv)
+\ No newline at end of file
diff --git a/ports/libideviceactivation/portfile.cmake b/ports/libideviceactivation/portfile.cmake
index 117d8f472..7a462834e 100644
--- a/ports/libideviceactivation/portfile.cmake
+++ b/ports/libideviceactivation/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     REPO libimobiledevice-win32/libideviceactivation
     REF 1.0.38
     SHA512 2fd2d5636e83a6740251dca58c04429628f47661a56e573fc14f45ef68c54990717515305902cf04759a7c8fd19e66a30c8eb2ea20e6257d2c5405b690ea25a6
-    HEAD_REF master
+    HEAD_REF msvc-master
 )
 
 vcpkg_install_msbuild(
diff --git a/ports/libimobiledevice/portfile.cmake b/ports/libimobiledevice/portfile.cmake
index c17e43de5..4bc505163 100644
--- a/ports/libimobiledevice/portfile.cmake
+++ b/ports/libimobiledevice/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     REPO libimobiledevice-win32/libimobiledevice
     REF 1.2.1.215
     SHA512 192ac12eb4fdf518a934cb8061d4a40e48f483e969e34167f2a5346efac1d745e4041eff84d7175d106b1a3b3f806d5e69643daa1459e48e69bc9c38d722be3c
-    HEAD_REF master
+    HEAD_REF msvc-master
 )
 
 vcpkg_install_msbuild(
diff --git a/ports/libirecovery/CONTROL b/ports/libirecovery/CONTROL
index 0916cd698..c3f423b93 100644
--- a/ports/libirecovery/CONTROL
+++ b/ports/libirecovery/CONTROL
@@ -1,4 +1,4 @@
 Source: libirecovery
-Version: 1.0.25-1
+Version: 1.0.25-2
 Description: Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux
-Build-Depends: libusbmuxd, readline
-\ No newline at end of file
+Build-Depends: libusbmuxd, readline, getopt
+\ No newline at end of file
diff --git a/ports/libirecovery/portfile.cmake b/ports/libirecovery/portfile.cmake
index f03e7e44c..508150b07 100644
--- a/ports/libirecovery/portfile.cmake
+++ b/ports/libirecovery/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     REPO libimobiledevice-win32/libirecovery
     REF 1.0.25
     SHA512 0dd91d4fe3ded2bc1bbd91aea964e31e7f59bce18be01aa096e974f37dc1be281644d6c44e3f9b49470dd961e3df2e3ff8a09bcc6b803a959073e7d7d9a8d3e7
-    HEAD_REF master
+    HEAD_REF msvc-master
 )
 
 vcpkg_install_msbuild(
diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake
index 7f6bc4973..c077fd16c 100644
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@@ -1,11 +1,4 @@
 include(vcpkg_common_functions)
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO libjpeg-turbo/libjpeg-turbo
-    REF 1.5.3
-    SHA512 0e7a2cd9943b610f49b562c20a5c350a50326a87bce1d39f14fe45760ed2f89a0d2d3e3f0de9f6a7714f566aabadec6b2422b592591ebb98bbad600ea411fea7
-    HEAD_REF master
-)
 
 vcpkg_download_distfile(GETENV_PATCH
     URLS "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff"
@@ -13,10 +6,15 @@ vcpkg_download_distfile(GETENV_PATCH
     SHA512 4cd064521b5e4baba4adf972f9f574f6dd43a2cd3e3ad143ca2cdf0f165024406d4fd2ed094124d0c17c5370394140e82fdd892d3cdc49609acdf8f79db1758c
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/add-options-for-exes-docs-headers.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/linux-cmake.patch"
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libjpeg-turbo/libjpeg-turbo
+    REF 1.5.3
+    SHA512 0e7a2cd9943b610f49b562c20a5c350a50326a87bce1d39f14fe45760ed2f89a0d2d3e3f0de9f6a7714f566aabadec6b2422b592591ebb98bbad600ea411fea7
+    HEAD_REF master
+    PATCHES
+        add-options-for-exes-docs-headers.patch
+        linux-cmake.patch
         "${GETENV_PATCH}"
 )
 
@@ -67,3 +65,6 @@ file(COPY
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/copyright)
 vcpkg_copy_pdbs()
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jpeg)
+
+vcpkg_test_cmake(PACKAGE_NAME JPEG MODULE)
diff --git a/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..5b0dae6c7
--- /dev/null
+++ b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,28 @@
+_find_package(${ARGS})
+if(JPEG_FOUND AND NOT TARGET JPEG::JPEG)
+    # Backfill JPEG::JPEG to versions of cmake before 3.12
+    add_library(JPEG::JPEG UNKNOWN IMPORTED)
+    if(DEFINED JPEG_INCLUDE_DIRS)
+        set_target_properties(JPEG::JPEG PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${JPEG_INCLUDE_DIRS}")
+    endif()
+    if(EXISTS "${JPEG_LIBRARY}")
+        set_target_properties(JPEG::JPEG PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+            IMPORTED_LOCATION "${JPEG_LIBRARY}")
+    endif()
+    if(EXISTS "${JPEG_LIBRARY_RELEASE}")
+        set_property(TARGET JPEG::JPEG APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS RELEASE)
+        set_target_properties(JPEG::JPEG PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+            IMPORTED_LOCATION_RELEASE "${JPEG_LIBRARY_RELEASE}")
+    endif()
+    if(EXISTS "${JPEG_LIBRARY_DEBUG}")
+        set_property(TARGET JPEG::JPEG APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS DEBUG)
+        set_target_properties(JPEG::JPEG PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+            IMPORTED_LOCATION_DEBUG "${JPEG_LIBRARY_DEBUG}")
+    endif()
+endif()
diff --git a/ports/liblzma/CMakeLists.txt b/ports/liblzma/CMakeLists.txt
index 2c809a5aa..6b84c004a 100644
--- a/ports/liblzma/CMakeLists.txt
+++ b/ports/liblzma/CMakeLists.txt
@@ -12,7 +12,7 @@ if(NOT MSVC)
 endif()
 
 if(WIN32)
-    include_directories(windows)
+    include_directories(windows/vs2017)
 else()
     include_directories(${CMAKE_CURRENT_BINARY_DIR})
     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/config.h
diff --git a/ports/liblzma/CONTROL b/ports/liblzma/CONTROL
index c29002b9c..20c26f980 100644
--- a/ports/liblzma/CONTROL
+++ b/ports/liblzma/CONTROL
@@ -1,3 +1,3 @@
 Source: liblzma
-Version: 5.2.3-2
+Version: 5.2.4
 Description: Compression library with an API similar to that of zlib.
diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake
index f6b037c43..26b8bff78 100644
--- a/ports/liblzma/portfile.cmake
+++ b/ports/liblzma/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xz-mirror/xz
-    REF v5.2.3
-    SHA512 d126666e58c6536aa7ae6aa6aac480f421e25aa61c4b5e7adb3de7b99423275a94d583ceaf0b15d559eaf9bc9be18f381cd46e49b1f8cb238c1d715876731063
+    REF v5.2.4
+    SHA512 fce7dc65e77a9b89dbdd6192cb37efc39e3f2cf343f79b54d2dfcd845025dab0e1d5b0f59c264eab04e5cbaf914eeb4818d14cdaac3ae0c1c5de24418656a4b7
     HEAD_REF master
 )
 
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake
index 4486564f6..e37afb22f 100644
--- a/ports/libmariadb/portfile.cmake
+++ b/ports/libmariadb/portfile.cmake
@@ -23,33 +23,51 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-# remove debug header
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    # remove debug header
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+endif()
+
+if(VCPKG_BUILD_TYPE STREQUAL "debug")
+    # move headers
+    file(RENAME
+        ${CURRENT_PACKAGES_DIR}/debug/include
+        ${CURRENT_PACKAGES_DIR}/include)
+endif()
 
 # fix libmariadb lib & dll directory.
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/lib/mariadb/mariadbclient.lib
-        ${CURRENT_PACKAGES_DIR}/lib/mariadbclient.lib)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/mariadbclient.lib
-        ${CURRENT_PACKAGES_DIR}/debug/lib/mariadbclient.lib)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(RENAME
+            ${CURRENT_PACKAGES_DIR}/lib/mariadb/mariadbclient.lib
+            ${CURRENT_PACKAGES_DIR}/lib/mariadbclient.lib)
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(RENAME
+            ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/mariadbclient.lib
+            ${CURRENT_PACKAGES_DIR}/debug/lib/mariadbclient.lib)
+    endif()
 else()
-    file(MAKE_DIRECTORY
-        ${CURRENT_PACKAGES_DIR}/bin
-        ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll
-        ${CURRENT_PACKAGES_DIR}/bin/libmariadb.dll)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll
-        ${CURRENT_PACKAGES_DIR}/debug/bin/libmariadb.dll)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib
-        ${CURRENT_PACKAGES_DIR}/lib/libmariadb.lib)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib
-        ${CURRENT_PACKAGES_DIR}/debug/lib/libmariadb.lib)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+        file(RENAME
+            ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll
+            ${CURRENT_PACKAGES_DIR}/bin/libmariadb.dll)
+        file(RENAME
+            ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib
+            ${CURRENT_PACKAGES_DIR}/lib/libmariadb.lib)
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(RENAME
+            ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll
+            ${CURRENT_PACKAGES_DIR}/debug/bin/libmariadb.dll)
+        file(RENAME
+            ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib
+            ${CURRENT_PACKAGES_DIR}/debug/lib/libmariadb.lib)
+    endif()
 endif()
 
 # remove plugin folder
diff --git a/ports/libmaxminddb/CMakeLists.txt b/ports/libmaxminddb/CMakeLists.txt
new file mode 100644
index 000000000..c46c6319b
--- /dev/null
+++ b/ports/libmaxminddb/CMakeLists.txt
@@ -0,0 +1,34 @@
+cmake_minimum_required (VERSION 3.9)
+project(maxminddb C)
+
+set(CMAKE_DEBUG_POSTFIX d)
+set(CMAKE_SHARED_LIBRARY_PREFIX lib)
+set(CMAKE_STATIC_LIBRARY_PREFIX lib)
+
+if(MSVC)
+  add_compile_options(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+set(SRCS
+  src/maxminddb.c
+  src/data-pool.c
+)
+
+include_directories(. src include projects/VS12)
+
+add_library(maxminddb ${SRCS})
+
+if(WIN32)
+  target_link_libraries(maxminddb ws2_32)
+endif()
+
+install(
+  TARGETS maxminddb
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(FILES include/maxminddb.h projects/VS12/maxminddb_config.h DESTINATION include/maxminddb)
+endif()
diff --git a/ports/libmaxminddb/CONTROL b/ports/libmaxminddb/CONTROL
new file mode 100644
index 000000000..a075cdb55
--- /dev/null
+++ b/ports/libmaxminddb/CONTROL
@@ -0,0 +1,3 @@
+Source: libmaxminddb
+Version: 1.3.2-1
+Description: C library for the MaxMind DB file format
+\ No newline at end of file
diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake
new file mode 100644
index 000000000..f2b17342f
--- /dev/null
+++ b/ports/libmaxminddb/portfile.cmake
@@ -0,0 +1,26 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO maxmind/libmaxminddb
+    REF 1.3.2
+    SHA512 43ff5f4e3a413772cd315412afc1070fb80280405d8845dc9d94a795265a71007c6c182dc01da8e14bf7b8ab8defe05714bec543faa956e7fb0f0a7756e7df48
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG
+        -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmaxminddb RENAME copyright)
diff --git a/ports/libmodbus/CMakeLists.txt b/ports/libmodbus/CMakeLists.txt
new file mode 100644
index 000000000..0abb4b6a7
--- /dev/null
+++ b/ports/libmodbus/CMakeLists.txt
@@ -0,0 +1,113 @@
+cmake_minimum_required(VERSION 3.0)
+project(libmodbus VERSION 3.1.4)
+
+set(LIBMODBUS_VERSION ${PROJECT_VERSION})
+set(LIBMODBUS_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(LIBMODBUS_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(LIBMODBUS_VERSION_MICRO ${PROJECT_VERSION_PATCH})
+configure_file(src/modbus-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/modbus-version.h)
+
+if(WIN32)
+  set(HAVE_ERRNO_H 1)
+  set(HAVE_FCNTL_H 1)
+  set(HAVE_LIMITS_H 1)
+  set(HAVE_SYS_TYPES_H 1)
+  set(HAVE_TIME_H 1)
+  set(HAVE_MALLOC 1)
+  set(HAVE_MEMSET 1)
+  set(HAVE_STRERROR 1)
+else()
+  include(CheckIncludeFile)
+  check_include_file(arpa/inet.h HAVE_ARPA_INET_H)
+  check_include_file(byteswap.h HAVE_BYTESWAP_H)
+  check_include_file(errno.h HAVE_ERRNO_H)
+  check_include_file(fcntl.h HAVE_FCNTL_H)
+  check_include_file(limits.h HAVE_LIMITS_H)
+  check_include_file(linux/serial.h HAVE_LINUX_SERIAL_H)
+  check_include_file(netdb.h HAVE_NETDB_H)
+  check_include_file(netinet/in.h HAVE_NETINET_IN_H)
+  check_include_file(netinet/tcp.h HAVE_NETINET_TCP_H)
+  check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)
+  check_include_file(sys/params.h HAVE_SYS_PARAMS_H)
+  check_include_file(sys/socket.h HAVE_SYS_SOCKET_H)
+  check_include_file(sys/time.h HAVE_SYS_TIME_H)
+  check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+  check_include_file(termios.h HAVE_TERMIOS_H)
+  check_include_file(time.h HAVE_TIME_H)
+  check_include_file(unistd.h HAVE_UNISTD_H)
+
+  include(CheckFunctionExists)
+  check_function_exists(accept4 HAVE_ACCEPT4)
+  check_function_exists(fork HAVE_FORK)
+  check_function_exists(getaddrinfo HAVE_GETADDRINFO)
+  check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
+  check_function_exists(inet_ntoa HAVE_INET_NTOA)
+  check_function_exists(malloc HAVE_MALLOC)
+  check_function_exists(memset HAVE_MEMSET)
+  check_function_exists(select HAVE_SELECT)
+  check_function_exists(socket HAVE_SOCKET)
+  check_function_exists(strerror HAVE_STRERROR)
+  check_function_exists(strlcpy HAVE_STRLCPY)
+
+  include(CheckSymbolExists)
+  check_symbol_exists(TIOCSRS485 sys/ioctl.h HAVE_TIOCRS485)
+  check_symbol_exists(TIOCM_RTS sys/ioctl.h HAVE_TIOCM_RTS)
+endif()
+
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+
+if(BUILD_SHARED_LIBS)
+  add_compile_options(-DDLLBUILD=ON)
+endif()
+
+
+set(MODBUS_PUBLIC_HEADERS
+  src/modbus-rtu.h
+  src/modbus-tcp.h
+  src/modbus.h
+  ${CMAKE_CURRENT_BINARY_DIR}/modbus-version.h
+)
+
+add_library(modbus
+  src/modbus-data.c
+  src/modbus-rtu.c
+  src/modbus-tcp.c
+src/modbus.c)
+
+target_include_directories(modbus PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(modbus INTERFACE
+  $<INSTALL_INTERFACE:include>
+)
+set_target_properties(modbus PROPERTIES PUBLIC_HEADER "${MODBUS_PUBLIC_HEADERS}")
+
+if(CMAKE_COMPILER_IS_GNUCC)
+  target_compile_options(modbus PRIVATE -D_GNU_SOURCE)
+endif()
+
+if(WIN32)
+  target_link_libraries(modbus  wsock32 ws2_32)
+endif()
+
+set(LIBMODBUS_SOVERSION_VERSION 5.1.0)
+set(LIBMODBUS_SOVERSION_SOVERSION 5)
+
+
+set_target_properties(modbus PROPERTIES
+  VERSION ${LIBMODBUS_SOVERSION_VERSION}
+SOVERSION ${LIBMODBUS_SOVERSION_SOVERSION})
+
+
+install(
+  TARGETS modbus
+  EXPORT libmodbusConfig
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+install(EXPORT libmodbusConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(FILES ${MODBUS_PUBLIC_HEADERS} DESTINATION include/)
+endif()
diff --git a/ports/libmodbus/CONTROL b/ports/libmodbus/CONTROL
new file mode 100644
index 000000000..1fd7d4791
--- /dev/null
+++ b/ports/libmodbus/CONTROL
@@ -0,0 +1,3 @@
+Source: libmodbus
+Version: 3.1.4-1
+Description: libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol
diff --git a/ports/libmodbus/config.h.cmake b/ports/libmodbus/config.h.cmake
new file mode 100644
index 000000000..b8f7585be
--- /dev/null
+++ b/ports/libmodbus/config.h.cmake
@@ -0,0 +1,49 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#cmakedefine HAVE_ARPA_INET_H
+#cmakedefine HAVE_BYTESWAP_H
+#cmakedefine HAVE_ERRNO_H
+#cmakedefine HAVE_FCNTL_H
+#cmakedefine HAVE_LIMITS_H
+#cmakedefine HAVE_LINUX_SERIAL_H
+#cmakedefine HAVE_NETDB_H
+#cmakedefine HAVE_NETINET_IN_H
+#cmakedefine HAVE_NETINET_TCP_H
+#cmakedefine HAVE_SYS_IOCTL_H
+#cmakedefine HAVE_SYS_PARAMS_H
+#cmakedefine HAVE_SYS_SOCKET_H
+#cmakedefine HAVE_SYS_TIME_H
+#cmakedefine HAVE_SYS_TYPES_H
+#cmakedefine HAVE_TERMIOS_H
+#cmakedefine HAVE_TIME_H
+#cmakedefine HAVE_UNISTD_H
+
+#cmakedefine HAVE_ACCEPT4
+#cmakedefine HAVE_FORK
+#cmakedefine HAVE_GETADDRINFO
+#cmakedefine HAVE_GETTIMEOFDAY
+#cmakedefine HAVE_INET_NTOA
+#cmakedefine HAVE_MALLOC
+#cmakedefine HAVE_MEMSET
+#cmakedefine HAVE_SELECT
+#cmakedefine HAVE_SOCKET
+#cmakedefine HAVE_STRERROR
+#cmakedefine HAVE_STRLCPY
+
+#cmakedefine HAVE_TIOCRS485
+#cmakedefine HAVE_TIOCM_RTS
+
+#ifdef HAVE_TIOCM_RTS
+#define HAVE_DECL_TIOCM_RTS 1
+#else
+#define HAVE_DECL_TIOCM_RTS 0
+#endif
+
+#ifdef HAVE_TIOCRS485
+#define HAVE_DECL_TIOCSRS485 1
+#else
+#define HAVE_DECL_TIOCSRS485 0
+#endif
+
+#endif
+\ No newline at end of file
diff --git a/ports/libmodbus/portfile.cmake b/ports/libmodbus/portfile.cmake
new file mode 100644
index 000000000..8d6f2c062
--- /dev/null
+++ b/ports/libmodbus/portfile.cmake
@@ -0,0 +1,26 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO stephane/libmodbus
+  REF v3.1.4
+  SHA512 dc13b680a13ae2c952fe23cfe257a92a2be4823005b71b87e9520a3676df220b749d04c0825b1d1da02ac8b6995315e5cda2c8fd68e4672dd60e0b3fe739728b
+  HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+  SOURCE_PATH "${SOURCE_PATH}"
+  PREFER_NINJA
+  OPTIONS_DEBUG
+    -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake")
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmodbus RENAME copyright)
diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL
index 6f856c607..007718af7 100644
--- a/ports/libmysql/CONTROL
+++ b/ports/libmysql/CONTROL
@@ -1,4 +1,4 @@
 Source: libmysql
-Version: 8.0.4-2
+Version: 8.0.4-3
 Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
 Description: A MySQL client library for C development.
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
index 0e7b69edf..dfd38c41c 100644
--- a/ports/libmysql/portfile.cmake
+++ b/ports/libmysql/portfile.cmake
@@ -100,13 +100,18 @@ else()
         ${CURRENT_PACKAGES_DIR}/lib/mysqlclient.lib
         ${CURRENT_PACKAGES_DIR}/debug/lib/mysqlclient.lib)
 
-    # correct the dll directory
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/bin/libmysql.dll)
-    file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/bin/libmysql.pdb)
-    file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.dll)
-    file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.pdb)
+    # correct the dll directory
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+        file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/bin/libmysql.dll)
+        file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/bin/libmysql.pdb)
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.dll)
+        file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.pdb)
+    endif()
 endif()
 
 file(READ ${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h _contents)
diff --git a/ports/libplist/CONTROL b/ports/libplist/CONTROL
index 22e209d14..bb7db384c 100644
--- a/ports/libplist/CONTROL
+++ b/ports/libplist/CONTROL
@@ -1,3 +1,3 @@
 Source: libplist
-Version: 2.0.1.197-1
+Version: 2.0.1.197-2
 Description: A library to handle Apple Property List format in binary or XML 
diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake
index 71e12fd4c..51549e4ca 100644
--- a/ports/libplist/portfile.cmake
+++ b/ports/libplist/portfile.cmake
@@ -7,10 +7,13 @@ vcpkg_from_github(
     REPO libimobiledevice-win32/libplist
     REF 2.0.1.197
     SHA512 55e1817c61d608b11646eb9c28c445f9ee801c7beb2121bd810235561117262adb73dbecb23b9ef5b0c54b0fc8089e0a46acc0e8f4845329a50a663ab004052c
-    HEAD_REF master
+    HEAD_REF msvc-master
     PATCHES dllexport.patch
 )
 
+set(ENV{_CL_} "$ENV{_CL_} /GL-")
+set(ENV{_LINK_} "$ENV{_LINK_} /LTCG:OFF")
+
 vcpkg_install_msbuild(
     SOURCE_PATH ${SOURCE_PATH}
     PROJECT_SUBPATH libplist.sln
diff --git a/ports/libpqxx/CMakeLists.txt b/ports/libpqxx/CMakeLists.txt
index c33d8863f..1d0473376 100644
--- a/ports/libpqxx/CMakeLists.txt
+++ b/ports/libpqxx/CMakeLists.txt
@@ -1,9 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(libpqxx VERSION 6.0.0 LANGUAGES CXX)
-set(CMAKE_DEBUG_POSTFIX "D")
 
-find_library(LIBPQD libpqd)
-find_library(LIBPQ libpq)
+set(CMAKE_DEBUG_POSTFIX "d")
+set(CMAKE_CXX_STANDARD 14)
+
+find_library(LIBPQD NAMES libpqd pqd)
+find_library(LIBPQ NAMES libpq pq)
 find_path(LIBPQ_FE_H libpq-fe.h)
 find_path(POSTGRES_EXT_H postgres_ext.h)
 
diff --git a/ports/libpqxx/CONTROL b/ports/libpqxx/CONTROL
index 8860ddaf9..ce1a688e9 100644
--- a/ports/libpqxx/CONTROL
+++ b/ports/libpqxx/CONTROL
@@ -1,4 +1,4 @@
 Source: libpqxx
-Version: 6.0.0
+Version: 6.0.0-1
 Description: The official C++ client API for PostgreSQL
 Build-Depends: libpq
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL
index 5345138f8..431ba1dc7 100644
--- a/ports/libraw/CONTROL
+++ b/ports/libraw/CONTROL
@@ -1,4 +1,4 @@
 Source: libraw
-Version: 0.19.0
+Version: 0.19.0-1
 Build-Depends: lcms, jasper
 Description: raw image decoder library
diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake
index 3681d1d28..7badade25 100644
--- a/ports/libraw/portfile.cmake
+++ b/ports/libraw/portfile.cmake
@@ -47,24 +47,31 @@ else()
 endif()
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/libraw/libraw_types.h "${LIBRAW_H}")
 
-# Rename thread-safe version to be "raw.lib". This is unfortunately needed
-# because otherwise libraries that build on top of libraw have to choose.
-file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/raw.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib)
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/raw_r.lib ${CURRENT_PACKAGES_DIR}/lib/raw.lib)
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    # Rename thread-safe version to be "raw.lib". This is unfortunately needed
+    # because otherwise libraries that build on top of libraw have to choose.
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/raw.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/raw_r.lib ${CURRENT_PACKAGES_DIR}/lib/raw.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib)
+
+    # Cleanup
+    file(GLOB RELEASE_EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+    file(REMOVE ${RELEASE_EXECUTABLES})
+    file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+    file(REMOVE ${DEBUG_EXECUTABLES})
+endif()
 
-# Cleanup
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(GLOB RELEASE_EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
-file(REMOVE ${RELEASE_EXECUTABLES})
-file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
-file(REMOVE ${DEBUG_EXECUTABLES})
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 else()
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/raw.dll ${CURRENT_PACKAGES_DIR}/debug/bin/rawd.dll)
+    if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+        file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/raw.dll ${CURRENT_PACKAGES_DIR}/debug/bin/rawd.dll)
+    endif()
 endif()
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
 # Rename cmake module into a config in order to allow more flexible lookup rules
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libraw/FindLibRaw.cmake ${CURRENT_PACKAGES_DIR}/share/libraw/LibRaw-config.cmake)
 
diff --git a/ports/libusbmuxd/CONTROL b/ports/libusbmuxd/CONTROL
index b93c9d379..3773d17f9 100644
--- a/ports/libusbmuxd/CONTROL
+++ b/ports/libusbmuxd/CONTROL
@@ -1,4 +1,4 @@
 Source: libusbmuxd
-Version: 1.0.107-1
+Version: 1.0.107-2
 Description: A client library to multiplex connections from and to iOS devices
 Build-Depends: libplist
diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake
index b8eb19b2b..c4d338b19 100644
--- a/ports/libusbmuxd/portfile.cmake
+++ b/ports/libusbmuxd/portfile.cmake
@@ -7,10 +7,13 @@ vcpkg_from_github(
     REPO libimobiledevice-win32/libusbmuxd
     REF 1.0.109
     SHA512 104205ebcac96765f4bf0b42dbe5df084be4f87fc64454b4e02049fbd18caf9282d070f8949935977eda76fba68b6a909571afea58d4ad4091f02d0e6b7a08e0
-    HEAD_REF master
+    HEAD_REF msvc-master
     PATCHES dllexport.patch
 )
 
+set(ENV{_CL_} "$ENV{_CL_} /GL-")
+set(ENV{_LINK_} "$ENV{_LINK_} /LTCG:OFF")
+
 vcpkg_install_msbuild(
     SOURCE_PATH ${SOURCE_PATH}
     PROJECT_SUBPATH libusbmuxd.sln
diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL
index 29abd6bdf..5d9f3607f 100644
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@@ -1,3 +1,3 @@
 Source: libuv
-Version: 1.22.0
+Version: 1.23.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 29640eb62..29741433c 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.22.0
-    SHA512 e79cae6aa1d9cf2c8f7c0262c866fea2858d7104ece7c556e537e7d1cf884f191d5cd3e56539bfe857fa15dc50b57fdcb33019824cd585a2ca250a77d923af73
+    REF v1.23.0
+    SHA512 d1622ea9c03661ce2dfa18e1725fc1bfdf3b16d7e40babc552dcc5b2f86d52f4dd81cac9bf89914024b11e4ed3671264dfcfba867cfa3b1a2206b89c59c95851
     HEAD_REF v1.x
 )
 
diff --git a/ports/libvorbis/CONTROL b/ports/libvorbis/CONTROL
index 96b9ed8df..355d89e80 100644
--- a/ports/libvorbis/CONTROL
+++ b/ports/libvorbis/CONTROL
@@ -1,4 +1,4 @@
 Source: libvorbis
-Version: 1.3.6-112d3bd
+Version: 1.3.6-112d3bd-1
 Description: Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format.
 Build-Depends: libogg
diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake
index 6a862c84b..83db50e01 100644
--- a/ports/libvorbis/portfile.cmake
+++ b/ports/libvorbis/portfile.cmake
@@ -1,29 +1,27 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/vorbis-112d3bd0aaacad51305e1464d4b381dabad0e88b)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/xiph/vorbis/archive/112d3bd0aaacad51305e1464d4b381dabad0e88b.zip"
-    FILENAME "vorbis-112d3bd0aaacad51305e1464d4b381dabad0e88b.zip"
-    SHA512 94e773a34f3e8d1c8ed0422f0eab345b35f76a96760141af83d69d007ebf076fca2d083a77d36bfa4ea10dfefa03a8fa35201aced963655ab8a524aaa7580b11
-)
-
-vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO xiph/vorbis
+    REF 112d3bd0aaacad51305e1464d4b381dabad0e88b
+    SHA512 df20e072a5e024ca2b8fc0e2890bb8968c0c948a833149a6026d2eaf6ab57b88b6d00d0bfb3b8bfcf879c7875e7cfacb8c6bf454bfc083b41d76132c567ff7ae
+    HEAD_REF master
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001-Dont-export-vorbisenc-functions.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0002-Allow-deprecated-functions.patch
+        0001-Dont-export-vorbisenc-functions.patch
+        0002-Allow-deprecated-functions.patch
 )
 
-file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/include" OGG_INCLUDE)
-file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/lib/ogg.lib" OGG_LIB_REL)
-file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/debug/lib/ogg.lib" OGG_LIB_DBG)
+file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" OGG_INCLUDE)
+foreach(LIBNAME ogg.lib libogg.a libogg.dylib libogg.so)
+    if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/${LIBNAME}" OR EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/${LIBNAME}")
+        file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/${LIBNAME}" OGG_LIB_REL)
+        file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/${LIBNAME}" OGG_LIB_DBG)
+        break()
+    endif()
+endforeach()
+
+if(NOT OGG_LIB_REL)
+    message(FATAL_ERROR "Could not find libraries for dependency libogg!")
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -38,7 +36,6 @@ vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libvorbis)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libvorbis/COPYING ${CURRENT_PACKAGES_DIR}/share/libvorbis/copyright)
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libvorbis/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
diff --git a/ports/libwebsockets/CONTROL b/ports/libwebsockets/CONTROL
index bf33021a2..fdc4e7a55 100644
--- a/ports/libwebsockets/CONTROL
+++ b/ports/libwebsockets/CONTROL
@@ -1,4 +1,4 @@
 Source: libwebsockets
-Version: 3.0.0
+Version: 3.0.1
 Build-Depends: zlib, openssl
 Description: Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.
diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake
index 79903c3a4..7d95b5add 100644
--- a/ports/libwebsockets/portfile.cmake
+++ b/ports/libwebsockets/portfile.cmake
@@ -3,15 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO warmcat/libwebsockets
-    REF v3.0.0
-    SHA512 626edd00cc4f7559c67fc1663cbc4679a3c4e7a1b60944a7cf6968c6676073bbc15f9b90f4f2ea629394ebbcf84856663ae032a3557bae383bd0db54838d30e8
+    REF v3.0.1
+    SHA512 ba96af918dc53e5fe15792985892e726154ec6cd8b0e6b71ec133e1ac53792c42276fd6ae2c48c274acf4163579d8326e403201a8090fc58be29518c9c5b4304
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch
+        0001-Fix-UWP.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LWS_WITH_STATIC)
diff --git a/ports/libyaml/0001-fix-version.patch b/ports/libyaml/0001-fix-version.patch
new file mode 100644
index 000000000..c2a59d30f
--- /dev/null
+++ b/ports/libyaml/0001-fix-version.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1abdd77..60a6b44 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.0)
+ project (yaml C)
+ 
+ set (YAML_VERSION_MAJOR 0)
+-set (YAML_VERSION_MINOR 1)
+-set (YAML_VERSION_PATCH 7)
++set (YAML_VERSION_MINOR 2)
++set (YAML_VERSION_PATCH 1)
+ set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}")
+ 
+ option(BUILD_SHARED_LIBS "Build libyaml as a shared library" OFF)
diff --git a/ports/libyaml/CONTROL b/ports/libyaml/CONTROL
new file mode 100644
index 000000000..1c770b2b9
--- /dev/null
+++ b/ports/libyaml/CONTROL
@@ -0,0 +1,3 @@
+Source: libyaml
+Version: 0.2.1-1
+Description: A C library for parsing and emitting YAML.
diff --git a/ports/libyaml/portfile.cmake b/ports/libyaml/portfile.cmake
new file mode 100644
index 000000000..047692719
--- /dev/null
+++ b/ports/libyaml/portfile.cmake
@@ -0,0 +1,23 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO yaml/libyaml
+    REF 0.2.1
+    SHA512 8b91738183a6d81c2c0381b4279cff9d8f811dac643ce5e08aa869058f5653ad8a2d9d8f9e563b26ad75b617b80b10ccb32753984a50ed684529a90bdd248bff
+    HEAD_REF master
+    PATCHES 0001-fix-version.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/config.h)
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/libyaml/copyright COPYONLY)
diff --git a/ports/linenoise-ng/CONTROL b/ports/linenoise-ng/CONTROL
new file mode 100644
index 000000000..8023c7f7d
--- /dev/null
+++ b/ports/linenoise-ng/CONTROL
@@ -0,0 +1,3 @@
+Source: linenoise-ng
+Version: 4754bee2d8eb3
+Description: A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.
+\ No newline at end of file
diff --git a/ports/linenoise-ng/portfile.cmake b/ports/linenoise-ng/portfile.cmake
new file mode 100644
index 000000000..c5e448e86
--- /dev/null
+++ b/ports/linenoise-ng/portfile.cmake
@@ -0,0 +1,22 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO arangodb/linenoise-ng
+    REF 4754bee2d8eb3c4511e6ac87cac62255b2011e2f
+    SHA512 080c6b4cde911a162885a2e6fc95143ab481b4dcc0f8b871a55a071ccb4ab868b19201ec17475a3c3ceef1b82325d757913383b3c46da6946ddc8bfc0d82d9ca
+    HEAD_REF master
+)
+
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/linenoise-ng RENAME copyright)
diff --git a/ports/live555/CMakeLists.txt b/ports/live555/CMakeLists.txt
index 8be171fc2..9d126cda1 100644
--- a/ports/live555/CMakeLists.txt
+++ b/ports/live555/CMakeLists.txt
@@ -8,6 +8,10 @@ include_directories(
     UsageEnvironment/include
 )
 
+if (NOT MSVC)
+    add_compile_options(-DSOCKLEN_T=socklen_t)
+endif()
+
 file(GLOB BASIC_USAGE_ENVIRONMENT_SRCS BasicUsageEnvironment/*.c BasicUsageEnvironment/*.cpp)
 add_library(BasicUsageEnvironment ${BASIC_USAGE_ENVIRONMENT_SRCS})
 
diff --git a/ports/live555/CONTROL b/ports/live555/CONTROL
index 45b39704e..39c8e4a65 100644
--- a/ports/live555/CONTROL
+++ b/ports/live555/CONTROL
@@ -1,3 +1,3 @@
 Source: live555
-Version: 2018.07.07-1
+Version: latest
 Description: A complete RTSP server application
diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake
index 5602a9f18..55d15a88c 100644
--- a/ports/live555/portfile.cmake
+++ b/ports/live555/portfile.cmake
@@ -3,36 +3,41 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     set(VCPKG_LIBRARY_LINKAGE "static")
 endif()
 
-# The current Live555 version from http://www.live555.com/liveMedia/public/
-set(LIVE_VERSION 2018.07.07)
-set(LIVE_SHA e7d4ddf51e9666c6ebe9a46976035b68fea94be54825535ffb04006cd242b9d3ad08250305206442bed3500d1e8d628ccf44302c485f63a9e244b3f8b1e27fe4)
-
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}/live)
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.live555.com/liveMedia/public/live.${LIVE_VERSION}.tar.gz"
-    FILENAME "live.${LIVE_VERSION}.tar.gz"
-    SHA512 ${LIVE_SHA}
-)
-vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION})
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-
-file(GLOB HEADERS
-    "${SOURCE_PATH}/BasicUsageEnvironment/include/*.h*"
-    "${SOURCE_PATH}/groupsock/include/*.h*"
-    "${SOURCE_PATH}/liveMedia/include/*.h*"
-    "${SOURCE_PATH}/UsageEnvironment/include/*.h*"
-)
-
-file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/live555 RENAME copyright)
-
-vcpkg_copy_pdbs()
+if(NOT VCPKG_USE_HEAD_VERSION)
+	message(FATAL_ERROR "Live555 does not have persistent releases. Please re-run the installation with --head.")
+else()
+	# The current Live555 version from http://www.live555.com/liveMedia/public/
+	set(LIVE_VERSION latest)
+
+	include(vcpkg_common_functions)
+	set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}/live)
+	vcpkg_download_distfile(ARCHIVE
+		URLS "http://www.live555.com/liveMedia/public/live555-${LIVE_VERSION}.tar.gz"
+		FILENAME "live555-${LIVE_VERSION}.tar.gz"
+		SKIP_SHA512
+	)
+
+	vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION})
+
+	file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+	vcpkg_configure_cmake(
+		SOURCE_PATH ${SOURCE_PATH}
+		PREFER_NINJA
+	)
+
+	vcpkg_install_cmake()
+
+	file(GLOB HEADERS
+		"${SOURCE_PATH}/BasicUsageEnvironment/include/*.h*"
+		"${SOURCE_PATH}/groupsock/include/*.h*"
+		"${SOURCE_PATH}/liveMedia/include/*.h*"
+		"${SOURCE_PATH}/UsageEnvironment/include/*.h*"
+	)
+
+	file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+	file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/live555 RENAME copyright)
+
+	vcpkg_copy_pdbs()
+endif()
+
diff --git a/ports/lmdb/CONTROL b/ports/lmdb/CONTROL
index c926fd78f..12b605465 100644
--- a/ports/lmdb/CONTROL
+++ b/ports/lmdb/CONTROL
@@ -1,3 +1,3 @@
 Source: lmdb
-Version: 0.9.18-3
+Version: 0.9.18-4
 Description: LMDB is an extraordinarily fast, memory-efficient database
diff --git a/ports/lmdb/cmake/CMakeLists.txt b/ports/lmdb/cmake/CMakeLists.txt
index 32097e86a..dfa61785f 100644
--- a/ports/lmdb/cmake/CMakeLists.txt
+++ b/ports/lmdb/cmake/CMakeLists.txt
@@ -29,7 +29,9 @@ endif()
 set(SRCS lmdb mdb.c lmdb.h midl.c midl.h )
 add_library(lmdb ${SRCS})
 set_target_properties(lmdb PROPERTIES DEBUG_POSTFIX d)
-target_link_libraries(lmdb PRIVATE ntdll.lib)
+if (WIN32)
+  target_link_libraries(lmdb PRIVATE ntdll.lib)
+endif()
 
 install(TARGETS lmdb DESTINATION lib
         EXPORT lmdb-targets
diff --git a/ports/lmdb/portfile.cmake b/ports/lmdb/portfile.cmake
index 4c038071e..3ee4f340a 100644
--- a/ports/lmdb/portfile.cmake
+++ b/ports/lmdb/portfile.cmake
@@ -1,33 +1,26 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lmdb-LMDB_0.9.18/libraries/liblmdb)
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://github.com/LMDB/lmdb/archive/LMDB_0.9.18.zip"
-    FILENAME "LMDB_0.9.18.zip"
-    SHA512 46d7ba226af05443c871f83c6ae0ab2ddbeecd289df59c082e806e135fcaa69d9d9060a19a4a907c4f7046de30871126e91e540eca27fc94446e95ba5616155b
-)
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lmdb-LMDB_0.9.18
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/lmdb_45a88275d2a410e683bae4ef44881e0f55fa3c4d.patch
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO LMDB/lmdb
+    REF LMDB_0.9.18
+    SHA512 394e88d99d446eb30771d7cf7a661584683a0d6d8e976cc561b5eecbb2a5d0817bbd59994002afa4eae6c86a39f05f50ebc2eff77cd70dd8c67225df4611f5e6
+    HEAD_REF master
+    PATCHES lmdb_45a88275d2a410e683bae4ef44881e0f55fa3c4d.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}/libraries/liblmdb)
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH ${SOURCE_PATH}/libraries/liblmdb
     OPTIONS_DEBUG
         -DLMDB_INSTALL_HEADERS=OFF
 )
 
 vcpkg_install_cmake()
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/share/lmdb/lmdb-targets-debug.cmake LMDB_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LMDB_DEBUG_MODULE "${LMDB_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/lmdb/lmdb-targets-debug.cmake "${LMDB_DEBUG_MODULE}")
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/lmdb)
 
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lmdb RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lmdb RENAME copyright)
 
 vcpkg_copy_pdbs()
 \ No newline at end of file
diff --git a/ports/lodepng/CONTROL b/ports/lodepng/CONTROL
index 684e658f4..e6c10c474 100644
--- a/ports/lodepng/CONTROL
+++ b/ports/lodepng/CONTROL
@@ -1,3 +1,3 @@
 Source: lodepng
-Version: 2018-07-30
+Version: 2018-09-18-1
 Description: PNG encoder and decoder in C and C++
diff --git a/ports/lodepng/algorithm.patch b/ports/lodepng/algorithm.patch
new file mode 100644
index 000000000..796bdfc66
--- /dev/null
+++ b/ports/lodepng/algorithm.patch
@@ -0,0 +1,12 @@
+diff --git a/lodepng_util.cpp b/lodepng_util.cpp
+index 4b571bb..58ba81a 100644
+--- a/lodepng_util.cpp
++++ b/lodepng_util.cpp
+@@ -26,6 +26,7 @@ freely, subject to the following restrictions:
+ #include "lodepng_util.h"
+ #include <iostream>
+ #include "math.h"
++#include <algorithm>
+ 
+ namespace lodepng
+ {
diff --git a/ports/lodepng/portfile.cmake b/ports/lodepng/portfile.cmake
index 1d85c7084..367764456 100644
--- a/ports/lodepng/portfile.cmake
+++ b/ports/lodepng/portfile.cmake
@@ -3,9 +3,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO lvandeve/lodepng
-  REF 955a04e517c1ec266f77f28a89a51d8041a4f1a0
-  SHA512 97f516df220749f6a89b4621be23c419e83a439f8e2689fe9b4719a792909399aa2cf7294ce90f3ac28a13e31f703537e6c701ea032eab1d983093305ed04a5e
+  REF ceb6b482b5a16d2bb3d6b3c735ca2b16322780d5
+  SHA512 5293f6c629ff006410c9180cabac5f4de7643f04ec6c3d7ff46c1b09317ff9156d28ed4344a46db0b3a06937349590aa8958722ba0432178a347da58736cbf41
   HEAD_REF master
+  PATCHES algorithm.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/luabridge/CONTROL b/ports/luabridge/CONTROL
new file mode 100644
index 000000000..595e3b113
--- /dev/null
+++ b/ports/luabridge/CONTROL
@@ -0,0 +1,3 @@
+Source: luabridge
+Version: 2.1-1
+Description: A lightweight, dependency-free library for binding Lua to C++
diff --git a/ports/luabridge/portfile.cmake b/ports/luabridge/portfile.cmake
new file mode 100644
index 000000000..6ff91dd3a
--- /dev/null
+++ b/ports/luabridge/portfile.cmake
@@ -0,0 +1,20 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vinniefalco/LuaBridge
+    REF 2.1
+    SHA512 062efda16fe43a02bcc757aaebba839e0ec72a9a3b7bf1e5bc1427a54d664a52197c8bcd4ac584f0d04cce812c0f078e257716e8bca016bcabda82c2c332ac04
+    HEAD_REF master
+)
+
+file(
+    COPY ${SOURCE_PATH}/Source/LuaBridge
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+
+# Handle copyright
+configure_file(
+    ${SOURCE_PATH}/README.md
+    ${CURRENT_PACKAGES_DIR}/share/luabridge/copyright
+    COPYONLY
+)
diff --git a/ports/luasocket/CONTROL b/ports/luasocket/CONTROL
index c46c2afd3..ec478e62f 100644
--- a/ports/luasocket/CONTROL
+++ b/ports/luasocket/CONTROL
@@ -1,4 +1,4 @@
 Source: luasocket
-Version: 2018-06-12
+Version: 2018-09-18
 Description: LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.
 Build-Depends: lua
diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake
index 650e1ca2e..b7288fed1 100644
--- a/ports/luasocket/portfile.cmake
+++ b/ports/luasocket/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO diegonehab/luasocket
-    REF 4df569e9f867432f25f0bfbfa56b0962feb3326e
-    SHA512 ef4aa61f12822a6004096c422ba2ea4f109bee1cc2eb3847bd2b16f6ec2dd28b20a767bfd8b1ee73e355f7b0ced3c2f7c4cf5123e8d0472e25c193920c2d34a1
+    REF 288219fd6b53ce2e709745c9918aa4c4b7f715c9
+    SHA512 f7b1f90437655352ab69a733bc2b2a0080d116fb8b6896fce0eb8ba6c593e2e3f64684c956d387a198d5aa48c4a9208531ab5e96805d92f0d4ca3ed46179be0b
     HEAD_REF master)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/lz4/CONTROL b/ports/lz4/CONTROL
index bf2dd6c08..439116519 100644
--- a/ports/lz4/CONTROL
+++ b/ports/lz4/CONTROL
@@ -1,3 +1,3 @@
 Source: lz4
-Version: 1.8.2
+Version: 1.8.3
 Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
diff --git a/ports/lz4/portfile.cmake b/ports/lz4/portfile.cmake
index bbeee708f..bf0d3d52e 100644
--- a/ports/lz4/portfile.cmake
+++ b/ports/lz4/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lz4/lz4
-    REF v1.8.2
-    SHA512 5fadc79334d37739c947d6dfc24f48ce82989fc5ee4f2bb8201ccf7ee3230b9e6e7c8488beb64050a035369f4247161d258bdb539578bec224ccebfef1b8a763
+    REF v1.8.3
+    SHA512 5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f
     HEAD_REF dev)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL
index ae9d78cc9..04cb1003c 100644
--- a/ports/mbedtls/CONTROL
+++ b/ports/mbedtls/CONTROL
@@ -1,3 +1,3 @@
 Source: mbedtls
-Version: 2.12.0
+Version: 2.13.1
 Description: An open source, portable, easy to use, readable and flexible SSL library
diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake
index 495dfb53c..59d067f11 100644
--- a/ports/mbedtls/portfile.cmake
+++ b/ports/mbedtls/portfile.cmake
@@ -5,8 +5,8 @@ set(VCPKG_LIBRARY_LINKAGE static)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ARMmbed/mbedtls
-    REF mbedtls-2.12.0
-    SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
+    REF mbedtls-2.13.1
+    SHA512 1a70446b533534c075de38ce0839f7947077ffdddffa57172594b8f8a3c4a3fbdfa9b06d13c198008abad33633e509f06abe5362f603f63850d9ec44734b3c0b
     HEAD_REF master
 )
 
diff --git a/ports/milerius-sfml-imgui/CONTROL b/ports/milerius-sfml-imgui/CONTROL
new file mode 100644
index 000000000..a9f8e9096
--- /dev/null
+++ b/ports/milerius-sfml-imgui/CONTROL
@@ -0,0 +1,4 @@
+Source: milerius-sfml-imgui
+Version: 1.1
+Description: imgui dll for sfml usage
+Build-Depends: sfml (windows), imgui
diff --git a/ports/milerius-sfml-imgui/portfile.cmake b/ports/milerius-sfml-imgui/portfile.cmake
new file mode 100644
index 000000000..1520d5e35
--- /dev/null
+++ b/ports/milerius-sfml-imgui/portfile.cmake
@@ -0,0 +1,24 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Milerius/imgui-sfml-shared
+    REF 1.1
+    SHA512 191184f7b302f643bd7c241b69d9f9edc0d03c6f5a0b3a49f57ac84f3828202f8065291fb17993073a2c07f1237ba491de677c47e2f8160dc70ea77f20eb1946
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sfml-imgui)
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfml-imgui)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/sfml-imgui/copyright)
diff --git a/ports/modp-base64/CMakeLists.txt b/ports/modp-base64/CMakeLists.txt
new file mode 100644
index 000000000..d470ccc20
--- /dev/null
+++ b/ports/modp-base64/CMakeLists.txt
@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 3.8)
+project(libmodpbase64 C)
+
+if(MSVC)
+  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake"
+"${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
+
+
+include_directories(src ${CMAKE_CURRENT_BINARY_DIR})
+
+
+add_library(libmodpbase64  src/modp_b64.c libmodpbase64.def)
+
+
+install(
+  TARGETS libmodpbase64
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(
+    FILES src/modp_b64.h
+    DESTINATION include
+  )
+endif()
diff --git a/ports/modp-base64/CONTROL b/ports/modp-base64/CONTROL
new file mode 100644
index 000000000..3f277871a
--- /dev/null
+++ b/ports/modp-base64/CONTROL
@@ -0,0 +1,3 @@
+Source: modp-base64
+Version:
+Description:
diff --git a/ports/modp-base64/config.h.cmake b/ports/modp-base64/config.h.cmake
new file mode 100644
index 000000000..da32c2481
--- /dev/null
+++ b/ports/modp-base64/config.h.cmake
@@ -0,0 +1,4 @@
+#ifndef MODP_CONFIG_H
+#define MODP_CONFIG_H
+
+#endif
diff --git a/ports/modp-base64/libmodpbase64.def b/ports/modp-base64/libmodpbase64.def
new file mode 100644
index 000000000..defd83b15
--- /dev/null
+++ b/ports/modp-base64/libmodpbase64.def
@@ -0,0 +1,4 @@
+LIBRARY   libmodpbase64
+EXPORTS
+   modp_b64_encode   @1
+   modp_b64_decode   @2
diff --git a/ports/modp-base64/modp_b64_data.h b/ports/modp-base64/modp_b64_data.h
new file mode 100644
index 000000000..e3c54b4bc
--- /dev/null
+++ b/ports/modp-base64/modp_b64_data.h
@@ -0,0 +1,480 @@
+#include <stdint.h>
+#define CHAR62 '+'
+#define CHAR63 '/'
+#define CHARPAD '='
+static const char e0[256] = {
+ 'A',  'A',  'A',  'A',  'B',  'B',  'B',  'B',  'C',  'C',
+ 'C',  'C',  'D',  'D',  'D',  'D',  'E',  'E',  'E',  'E',
+ 'F',  'F',  'F',  'F',  'G',  'G',  'G',  'G',  'H',  'H',
+ 'H',  'H',  'I',  'I',  'I',  'I',  'J',  'J',  'J',  'J',
+ 'K',  'K',  'K',  'K',  'L',  'L',  'L',  'L',  'M',  'M',
+ 'M',  'M',  'N',  'N',  'N',  'N',  'O',  'O',  'O',  'O',
+ 'P',  'P',  'P',  'P',  'Q',  'Q',  'Q',  'Q',  'R',  'R',
+ 'R',  'R',  'S',  'S',  'S',  'S',  'T',  'T',  'T',  'T',
+ 'U',  'U',  'U',  'U',  'V',  'V',  'V',  'V',  'W',  'W',
+ 'W',  'W',  'X',  'X',  'X',  'X',  'Y',  'Y',  'Y',  'Y',
+ 'Z',  'Z',  'Z',  'Z',  'a',  'a',  'a',  'a',  'b',  'b',
+ 'b',  'b',  'c',  'c',  'c',  'c',  'd',  'd',  'd',  'd',
+ 'e',  'e',  'e',  'e',  'f',  'f',  'f',  'f',  'g',  'g',
+ 'g',  'g',  'h',  'h',  'h',  'h',  'i',  'i',  'i',  'i',
+ 'j',  'j',  'j',  'j',  'k',  'k',  'k',  'k',  'l',  'l',
+ 'l',  'l',  'm',  'm',  'm',  'm',  'n',  'n',  'n',  'n',
+ 'o',  'o',  'o',  'o',  'p',  'p',  'p',  'p',  'q',  'q',
+ 'q',  'q',  'r',  'r',  'r',  'r',  's',  's',  's',  's',
+ 't',  't',  't',  't',  'u',  'u',  'u',  'u',  'v',  'v',
+ 'v',  'v',  'w',  'w',  'w',  'w',  'x',  'x',  'x',  'x',
+ 'y',  'y',  'y',  'y',  'z',  'z',  'z',  'z',  '0',  '0',
+ '0',  '0',  '1',  '1',  '1',  '1',  '2',  '2',  '2',  '2',
+ '3',  '3',  '3',  '3',  '4',  '4',  '4',  '4',  '5',  '5',
+ '5',  '5',  '6',  '6',  '6',  '6',  '7',  '7',  '7',  '7',
+ '8',  '8',  '8',  '8',  '9',  '9',  '9',  '9',  '+',  '+',
+ '+',  '+',  '/',  '/',  '/',  '/'
+};
+
+static const char e1[256] = {
+ 'A',  'B',  'C',  'D',  'E',  'F',  'G',  'H',  'I',  'J',
+ 'K',  'L',  'M',  'N',  'O',  'P',  'Q',  'R',  'S',  'T',
+ 'U',  'V',  'W',  'X',  'Y',  'Z',  'a',  'b',  'c',  'd',
+ 'e',  'f',  'g',  'h',  'i',  'j',  'k',  'l',  'm',  'n',
+ 'o',  'p',  'q',  'r',  's',  't',  'u',  'v',  'w',  'x',
+ 'y',  'z',  '0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
+ '8',  '9',  '+',  '/',  'A',  'B',  'C',  'D',  'E',  'F',
+ 'G',  'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',  'P',
+ 'Q',  'R',  'S',  'T',  'U',  'V',  'W',  'X',  'Y',  'Z',
+ 'a',  'b',  'c',  'd',  'e',  'f',  'g',  'h',  'i',  'j',
+ 'k',  'l',  'm',  'n',  'o',  'p',  'q',  'r',  's',  't',
+ 'u',  'v',  'w',  'x',  'y',  'z',  '0',  '1',  '2',  '3',
+ '4',  '5',  '6',  '7',  '8',  '9',  '+',  '/',  'A',  'B',
+ 'C',  'D',  'E',  'F',  'G',  'H',  'I',  'J',  'K',  'L',
+ 'M',  'N',  'O',  'P',  'Q',  'R',  'S',  'T',  'U',  'V',
+ 'W',  'X',  'Y',  'Z',  'a',  'b',  'c',  'd',  'e',  'f',
+ 'g',  'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',  'p',
+ 'q',  'r',  's',  't',  'u',  'v',  'w',  'x',  'y',  'z',
+ '0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',  '8',  '9',
+ '+',  '/',  'A',  'B',  'C',  'D',  'E',  'F',  'G',  'H',
+ 'I',  'J',  'K',  'L',  'M',  'N',  'O',  'P',  'Q',  'R',
+ 'S',  'T',  'U',  'V',  'W',  'X',  'Y',  'Z',  'a',  'b',
+ 'c',  'd',  'e',  'f',  'g',  'h',  'i',  'j',  'k',  'l',
+ 'm',  'n',  'o',  'p',  'q',  'r',  's',  't',  'u',  'v',
+ 'w',  'x',  'y',  'z',  '0',  '1',  '2',  '3',  '4',  '5',
+ '6',  '7',  '8',  '9',  '+',  '/'
+};
+
+static const char e2[256] = {
+ 'A',  'B',  'C',  'D',  'E',  'F',  'G',  'H',  'I',  'J',
+ 'K',  'L',  'M',  'N',  'O',  'P',  'Q',  'R',  'S',  'T',
+ 'U',  'V',  'W',  'X',  'Y',  'Z',  'a',  'b',  'c',  'd',
+ 'e',  'f',  'g',  'h',  'i',  'j',  'k',  'l',  'm',  'n',
+ 'o',  'p',  'q',  'r',  's',  't',  'u',  'v',  'w',  'x',
+ 'y',  'z',  '0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
+ '8',  '9',  '+',  '/',  'A',  'B',  'C',  'D',  'E',  'F',
+ 'G',  'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',  'P',
+ 'Q',  'R',  'S',  'T',  'U',  'V',  'W',  'X',  'Y',  'Z',
+ 'a',  'b',  'c',  'd',  'e',  'f',  'g',  'h',  'i',  'j',
+ 'k',  'l',  'm',  'n',  'o',  'p',  'q',  'r',  's',  't',
+ 'u',  'v',  'w',  'x',  'y',  'z',  '0',  '1',  '2',  '3',
+ '4',  '5',  '6',  '7',  '8',  '9',  '+',  '/',  'A',  'B',
+ 'C',  'D',  'E',  'F',  'G',  'H',  'I',  'J',  'K',  'L',
+ 'M',  'N',  'O',  'P',  'Q',  'R',  'S',  'T',  'U',  'V',
+ 'W',  'X',  'Y',  'Z',  'a',  'b',  'c',  'd',  'e',  'f',
+ 'g',  'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',  'p',
+ 'q',  'r',  's',  't',  'u',  'v',  'w',  'x',  'y',  'z',
+ '0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',  '8',  '9',
+ '+',  '/',  'A',  'B',  'C',  'D',  'E',  'F',  'G',  'H',
+ 'I',  'J',  'K',  'L',  'M',  'N',  'O',  'P',  'Q',  'R',
+ 'S',  'T',  'U',  'V',  'W',  'X',  'Y',  'Z',  'a',  'b',
+ 'c',  'd',  'e',  'f',  'g',  'h',  'i',  'j',  'k',  'l',
+ 'm',  'n',  'o',  'p',  'q',  'r',  's',  't',  'u',  'v',
+ 'w',  'x',  'y',  'z',  '0',  '1',  '2',  '3',  '4',  '5',
+ '6',  '7',  '8',  '9',  '+',  '/'
+};
+
+
+
+#ifdef WORDS_BIGENDIAN
+
+
+/* SPECIAL DECODE TABLES FOR BIG ENDIAN (IBM/MOTOROLA/SUN) CPUS */
+
+static const uint32_t d0[256] = {
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x00f80000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00fc0000,
+0x00d00000, 0x00d40000, 0x00d80000, 0x00dc0000, 0x00e00000, 0x00e40000,
+0x00e80000, 0x00ec0000, 0x00f00000, 0x00f40000, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000,
+0x00040000, 0x00080000, 0x000c0000, 0x00100000, 0x00140000, 0x00180000,
+0x001c0000, 0x00200000, 0x00240000, 0x00280000, 0x002c0000, 0x00300000,
+0x00340000, 0x00380000, 0x003c0000, 0x00400000, 0x00440000, 0x00480000,
+0x004c0000, 0x00500000, 0x00540000, 0x00580000, 0x005c0000, 0x00600000,
+0x00640000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x00680000, 0x006c0000, 0x00700000, 0x00740000, 0x00780000,
+0x007c0000, 0x00800000, 0x00840000, 0x00880000, 0x008c0000, 0x00900000,
+0x00940000, 0x00980000, 0x009c0000, 0x00a00000, 0x00a40000, 0x00a80000,
+0x00ac0000, 0x00b00000, 0x00b40000, 0x00b80000, 0x00bc0000, 0x00c00000,
+0x00c40000, 0x00c80000, 0x00cc0000, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff
+};
+
+
+static const uint32_t d1[256] = {
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x0003e000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x0003f000,
+0x00034000, 0x00035000, 0x00036000, 0x00037000, 0x00038000, 0x00039000,
+0x0003a000, 0x0003b000, 0x0003c000, 0x0003d000, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000,
+0x00001000, 0x00002000, 0x00003000, 0x00004000, 0x00005000, 0x00006000,
+0x00007000, 0x00008000, 0x00009000, 0x0000a000, 0x0000b000, 0x0000c000,
+0x0000d000, 0x0000e000, 0x0000f000, 0x00010000, 0x00011000, 0x00012000,
+0x00013000, 0x00014000, 0x00015000, 0x00016000, 0x00017000, 0x00018000,
+0x00019000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x0001a000, 0x0001b000, 0x0001c000, 0x0001d000, 0x0001e000,
+0x0001f000, 0x00020000, 0x00021000, 0x00022000, 0x00023000, 0x00024000,
+0x00025000, 0x00026000, 0x00027000, 0x00028000, 0x00029000, 0x0002a000,
+0x0002b000, 0x0002c000, 0x0002d000, 0x0002e000, 0x0002f000, 0x00030000,
+0x00031000, 0x00032000, 0x00033000, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff
+};
+
+
+static const uint32_t d2[256] = {
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x00000f80, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000fc0,
+0x00000d00, 0x00000d40, 0x00000d80, 0x00000dc0, 0x00000e00, 0x00000e40,
+0x00000e80, 0x00000ec0, 0x00000f00, 0x00000f40, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000,
+0x00000040, 0x00000080, 0x000000c0, 0x00000100, 0x00000140, 0x00000180,
+0x000001c0, 0x00000200, 0x00000240, 0x00000280, 0x000002c0, 0x00000300,
+0x00000340, 0x00000380, 0x000003c0, 0x00000400, 0x00000440, 0x00000480,
+0x000004c0, 0x00000500, 0x00000540, 0x00000580, 0x000005c0, 0x00000600,
+0x00000640, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x00000680, 0x000006c0, 0x00000700, 0x00000740, 0x00000780,
+0x000007c0, 0x00000800, 0x00000840, 0x00000880, 0x000008c0, 0x00000900,
+0x00000940, 0x00000980, 0x000009c0, 0x00000a00, 0x00000a40, 0x00000a80,
+0x00000ac0, 0x00000b00, 0x00000b40, 0x00000b80, 0x00000bc0, 0x00000c00,
+0x00000c40, 0x00000c80, 0x00000cc0, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff
+};
+
+
+static const uint32_t d3[256] = {
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x0000003e, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x0000003f,
+0x00000034, 0x00000035, 0x00000036, 0x00000037, 0x00000038, 0x00000039,
+0x0000003a, 0x0000003b, 0x0000003c, 0x0000003d, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000,
+0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006,
+0x00000007, 0x00000008, 0x00000009, 0x0000000a, 0x0000000b, 0x0000000c,
+0x0000000d, 0x0000000e, 0x0000000f, 0x00000010, 0x00000011, 0x00000012,
+0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 0x00000018,
+0x00000019, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x0000001a, 0x0000001b, 0x0000001c, 0x0000001d, 0x0000001e,
+0x0000001f, 0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x00000024,
+0x00000025, 0x00000026, 0x00000027, 0x00000028, 0x00000029, 0x0000002a,
+0x0000002b, 0x0000002c, 0x0000002d, 0x0000002e, 0x0000002f, 0x00000030,
+0x00000031, 0x00000032, 0x00000033, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff
+};
+
+
+#else
+
+
+/* SPECIAL DECODE TABLES FOR LITTLE ENDIAN (INTEL) CPUS */
+
+static const uint32_t d0[256] = {
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x000000f8, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x000000fc,
+0x000000d0, 0x000000d4, 0x000000d8, 0x000000dc, 0x000000e0, 0x000000e4,
+0x000000e8, 0x000000ec, 0x000000f0, 0x000000f4, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000,
+0x00000004, 0x00000008, 0x0000000c, 0x00000010, 0x00000014, 0x00000018,
+0x0000001c, 0x00000020, 0x00000024, 0x00000028, 0x0000002c, 0x00000030,
+0x00000034, 0x00000038, 0x0000003c, 0x00000040, 0x00000044, 0x00000048,
+0x0000004c, 0x00000050, 0x00000054, 0x00000058, 0x0000005c, 0x00000060,
+0x00000064, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x00000068, 0x0000006c, 0x00000070, 0x00000074, 0x00000078,
+0x0000007c, 0x00000080, 0x00000084, 0x00000088, 0x0000008c, 0x00000090,
+0x00000094, 0x00000098, 0x0000009c, 0x000000a0, 0x000000a4, 0x000000a8,
+0x000000ac, 0x000000b0, 0x000000b4, 0x000000b8, 0x000000bc, 0x000000c0,
+0x000000c4, 0x000000c8, 0x000000cc, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff
+};
+
+
+static const uint32_t d1[256] = {
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x0000e003, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x0000f003,
+0x00004003, 0x00005003, 0x00006003, 0x00007003, 0x00008003, 0x00009003,
+0x0000a003, 0x0000b003, 0x0000c003, 0x0000d003, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000,
+0x00001000, 0x00002000, 0x00003000, 0x00004000, 0x00005000, 0x00006000,
+0x00007000, 0x00008000, 0x00009000, 0x0000a000, 0x0000b000, 0x0000c000,
+0x0000d000, 0x0000e000, 0x0000f000, 0x00000001, 0x00001001, 0x00002001,
+0x00003001, 0x00004001, 0x00005001, 0x00006001, 0x00007001, 0x00008001,
+0x00009001, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x0000a001, 0x0000b001, 0x0000c001, 0x0000d001, 0x0000e001,
+0x0000f001, 0x00000002, 0x00001002, 0x00002002, 0x00003002, 0x00004002,
+0x00005002, 0x00006002, 0x00007002, 0x00008002, 0x00009002, 0x0000a002,
+0x0000b002, 0x0000c002, 0x0000d002, 0x0000e002, 0x0000f002, 0x00000003,
+0x00001003, 0x00002003, 0x00003003, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff
+};
+
+
+static const uint32_t d2[256] = {
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x00800f00, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00c00f00,
+0x00000d00, 0x00400d00, 0x00800d00, 0x00c00d00, 0x00000e00, 0x00400e00,
+0x00800e00, 0x00c00e00, 0x00000f00, 0x00400f00, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000,
+0x00400000, 0x00800000, 0x00c00000, 0x00000100, 0x00400100, 0x00800100,
+0x00c00100, 0x00000200, 0x00400200, 0x00800200, 0x00c00200, 0x00000300,
+0x00400300, 0x00800300, 0x00c00300, 0x00000400, 0x00400400, 0x00800400,
+0x00c00400, 0x00000500, 0x00400500, 0x00800500, 0x00c00500, 0x00000600,
+0x00400600, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x00800600, 0x00c00600, 0x00000700, 0x00400700, 0x00800700,
+0x00c00700, 0x00000800, 0x00400800, 0x00800800, 0x00c00800, 0x00000900,
+0x00400900, 0x00800900, 0x00c00900, 0x00000a00, 0x00400a00, 0x00800a00,
+0x00c00a00, 0x00000b00, 0x00400b00, 0x00800b00, 0x00c00b00, 0x00000c00,
+0x00400c00, 0x00800c00, 0x00c00c00, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff
+};
+
+
+static const uint32_t d3[256] = {
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x003e0000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x003f0000,
+0x00340000, 0x00350000, 0x00360000, 0x00370000, 0x00380000, 0x00390000,
+0x003a0000, 0x003b0000, 0x003c0000, 0x003d0000, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000,
+0x00010000, 0x00020000, 0x00030000, 0x00040000, 0x00050000, 0x00060000,
+0x00070000, 0x00080000, 0x00090000, 0x000a0000, 0x000b0000, 0x000c0000,
+0x000d0000, 0x000e0000, 0x000f0000, 0x00100000, 0x00110000, 0x00120000,
+0x00130000, 0x00140000, 0x00150000, 0x00160000, 0x00170000, 0x00180000,
+0x00190000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x001a0000, 0x001b0000, 0x001c0000, 0x001d0000, 0x001e0000,
+0x001f0000, 0x00200000, 0x00210000, 0x00220000, 0x00230000, 0x00240000,
+0x00250000, 0x00260000, 0x00270000, 0x00280000, 0x00290000, 0x002a0000,
+0x002b0000, 0x002c0000, 0x002d0000, 0x002e0000, 0x002f0000, 0x00300000,
+0x00310000, 0x00320000, 0x00330000, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
+0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff
+};
+
+
+#endif
diff --git a/ports/modp-base64/portfile.cmake b/ports/modp-base64/portfile.cmake
new file mode 100644
index 000000000..3ff058474
--- /dev/null
+++ b/ports/modp-base64/portfile.cmake
@@ -0,0 +1,33 @@
+include(vcpkg_common_functions)
+
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/modp-base64-v2.0.0)
+vcpkg_download_distfile(ARCHIVE
+  URLS "https://web.archive.org/web/20060620024518/http://modp.com:80/release/base64/modp-base64-v2.0.0.tar.bz2"
+  FILENAME "modp-base64-v2.0.0.tar.bz2"
+  SHA512 474e20cbbc47f31af5e981a6a9028fcec57e3ae9bb5ba979aa5c5c4cab6f301208fe6f441a0106df4c223d89fb6f18b19ab8812cf9f3c9900e54524e35b45720
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+file(COPY
+  ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake
+  ${CMAKE_CURRENT_LIST_DIR}/libmodpbase64.def
+  DESTINATION ${SOURCE_PATH}
+)
+file(COPY
+  ${CMAKE_CURRENT_LIST_DIR}/modp_b64_data.h
+  DESTINATION ${SOURCE_PATH}/src
+)
+
+
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/modp-base64 RENAME copyright)
diff --git a/ports/monkeys-audio/CONTROL b/ports/monkeys-audio/CONTROL
index 7b28d4c08..e81e943bf 100644
--- a/ports/monkeys-audio/CONTROL
+++ b/ports/monkeys-audio/CONTROL
@@ -1,5 +1,4 @@
 Source: monkeys-audio
-Version: 4.3.3
+Version: 4.3.3-1
 Description: Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods.
   Audio files compressed with it ends with .ape extension.
-   
-\ No newline at end of file
diff --git a/ports/monkeys-audio/portfile.cmake b/ports/monkeys-audio/portfile.cmake
index 58a336737..fbde63a4a 100644
--- a/ports/monkeys-audio/portfile.cmake
+++ b/ports/monkeys-audio/portfile.cmake
@@ -1,15 +1,17 @@
+include(vcpkg_common_functions)
+
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message(FATAL_ERROR "${PORT} currently only support static build")
-endif()
 
-include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_STATIC_CRT)
+
+if(EXISTS ${CURRENT_BUILDTREES_DIR}/src/MAC_SDK_433.zip.extracted)
+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
+endif()
 
 set(VERSION 4.7)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
-set(PROJECT_PATH ${SOURCE_PATH}/Source/Projects/VS2017)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/433)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://monkeysaudio.com/files/MAC_SDK_433.zip"
@@ -17,39 +19,29 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 957ba262da29a8542ab82dc828328b19bf80ecf0d09165db935924b390cb6a3a2d9303a2e07b86b28ecf4210a66dd5c4be840205a9f09518189101033f1a13c8
 )
 
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH})
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES ${CMAKE_CURRENT_LIST_DIR}/use-dynamic-linkage.patch
-    )
-endif()
+file(REMOVE
+    ${SOURCE_PATH}/Shared/MACDll.dll
+    ${SOURCE_PATH}/Shared/MACDll.lib
+    ${SOURCE_PATH}/Shared/MACLib.lib
+)
 
-vcpkg_build_msbuild(
-    PROJECT_PATH ${PROJECT_PATH}/Console/Console.vcxproj
+vcpkg_install_msbuild(
+    SOURCE_PATH ${SOURCE_PATH}
+    PROJECT_SUBPATH Source/Projects/VS2017/Console/Console.vcxproj
 )
 
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
-file(COPY           ${CURRENT_BUILDTREES_DIR}/src/Shared/
+file(COPY           ${SOURCE_PATH}/Shared/
      DESTINATION    ${CURRENT_PACKAGES_DIR}/include/monkeys-audio
      FILES_MATCHING PATTERN "*.h")
 file(REMOVE         ${CURRENT_PACKAGES_DIR}/include/monkeys-audio/MACDll.h)
 
-file(COPY
-     ${PROJECT_PATH}/MACLib/Debug/MACLib.lib
-     ${PROJECT_PATH}/MACLib/Debug/MACLib.pdb
-     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/Console.lib ${CURRENT_PACKAGES_DIR}/debug/lib/Console.lib)
 
-file(COPY
-     ${PROJECT_PATH}/MACLib/Release/MACLib.lib
-     DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
+file(RENAME ${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/Console.exe ${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/mac.exe)
 
-file(INSTALL ${PROJECT_PATH}/Console/Release/Console.exe
-     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/monkeys-audio
-     RENAME mac.exe)
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/monkeys-audio RENAME copyright)
diff --git a/ports/monkeys-audio/use-dynamic-linkage.patch b/ports/monkeys-audio/use-dynamic-linkage.patch
deleted file mode 100644
index ab16f6353..000000000
--- a/ports/monkeys-audio/use-dynamic-linkage.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Source/Projects/VS2017/MACLib/MACLib.vcxproj b/Source/Projects/VS2017/MACLib/MACLib.vcxproj
-index ec3cf92..44c8e65 100644
---- a/Source/Projects/VS2017/MACLib/MACLib.vcxproj
-+++ b/Source/Projects/VS2017/MACLib/MACLib.vcxproj
-@@ -25,27 +25,27 @@
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
--    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-     <PlatformToolset>v141_xp</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>false</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-     <PlatformToolset>v141_xp</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>Unicode</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
--    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-     <PlatformToolset>v141_xp</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>false</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
--    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-     <PlatformToolset>v141_xp</PlatformToolset>
-     <UseOfMfc>false</UseOfMfc>
-     <CharacterSet>Unicode</CharacterSet>
diff --git a/ports/morton-nd/CONTROL b/ports/morton-nd/CONTROL
new file mode 100644
index 000000000..40065dbee
--- /dev/null
+++ b/ports/morton-nd/CONTROL
@@ -0,0 +1,3 @@
+Source: morton-nd
+Version: 2.0.0
+Description: (C++14) header-only library for fast Morton encoding/decoding in N dimensions.
diff --git a/ports/morton-nd/portfile.cmake b/ports/morton-nd/portfile.cmake
new file mode 100644
index 000000000..63c8ee95f
--- /dev/null
+++ b/ports/morton-nd/portfile.cmake
@@ -0,0 +1,16 @@
+#header-only library
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO kevinhartman/morton-nd
+    REF v2.0.0
+    SHA512 f349187a9c6094ebdc8dc10a0b028e119a82721946e2f629b3f64edade9665a97824d6a52496e470da61e5b65ae46c953346b271c2db11f5f2e3c7748de03daf
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/morton-nd)
+file(COPY ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/morton-nd)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/morton-nd/LICENSE ${CURRENT_PACKAGES_DIR}/share/morton-nd/copyright)
+
+file(GLOB HEADER_FILES ${SOURCE_PATH}/morton-nd/include/*.h)
+file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/morton-nd)
diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL
index 9171c29f7..37285222e 100644
--- a/ports/ms-gsl/CONTROL
+++ b/ports/ms-gsl/CONTROL
@@ -1,3 +1,3 @@
 Source: ms-gsl
-Version: 2018-07-30
+Version: 2018-09-18
 Description: Microsoft implementation of the Guidelines Support Library
 \ No newline at end of file
diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake
index 959c3b21b..22d6fc21e 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 5778149583e69b34ab375039ffcc5d51a4dd7b37
-    SHA512 d59d73b09ca9f3a1be21f13437ae456eaed3378284557eac5305bd97525a2286b650ecefff2c9e8575ab3ac54351c7b82f8ddc6ac93d99d757d0d9811a378def
+    REF 1995e86d1ad70519465374fb4876c6ef7c9f8c61
+    SHA512 00d512269f9f126c93882001704c2c1926556d72fd5e26f8ba223d92f09d9955194e7bf08b172483b5d649021b0b7b54eca3e3ea2337e16b4cd5a8313a85ba66
     HEAD_REF master
 )
 
diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL
index 221a7e643..09b9cba0d 100644
--- a/ports/nana/CONTROL
+++ b/ports/nana/CONTROL
@@ -1,4 +1,4 @@
 Source: nana
-Version: 1.6.1
+Version: 1.6.2
 Description: Cross-platform library for GUI programming in modern C++ style.
 Build-Depends: libpng, libjpeg-turbo, freetype (!uwp&&!windows), fontconfig (!uwp&&!windows)
diff --git a/ports/nana/portfile.cmake b/ports/nana/portfile.cmake
index 80c2d57f6..ff9f43145 100644
--- a/ports/nana/portfile.cmake
+++ b/ports/nana/portfile.cmake
@@ -11,8 +11,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cnjinhao/nana
-    REF v1.6.1
-    SHA512 79a5176afe1ab88050ee0f3797615d20783acaf5b94688ae1efe61d08983865046af0cd3271969139c50ef23d927c1599bdb35e06760f717b508971d8531c882
+    REF v1.6.2
+    SHA512 95271764813e64126abf2941bfc13b399ffe093c570891f65f331505066ce0dcad7df4170b2616951b7e0234ea2d6d21219cdfd15b112ecf598a3afa992cceb4
     HEAD_REF develop
 )
 
diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL
index 0343119a0..ef676937e 100644
--- a/ports/nanodbc/CONTROL
+++ b/ports/nanodbc/CONTROL
@@ -1,3 +1,3 @@
 Source: nanodbc
-Version: 2.12.4-1
+Version: 2.12.4-2
 Description: A small C++ wrapper for the native C ODBC API.
diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake
index fc735f03f..7019852ea 100644
--- a/ports/nanodbc/portfile.cmake
+++ b/ports/nanodbc/portfile.cmake
@@ -6,7 +6,7 @@ include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/nanodbc-2.12.4)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/lexicalunit/nanodbc/archive/v2.12.4.tar.gz"
+    URLS "https://github.com/nanodbc/nanodbc/archive/v2.12.4.tar.gz"
     FILENAME "nanodbc-2.12.4.tar.gz"
     SHA512 b9a924516b2a777e5f1497774997672320548722ed53413b0a7ad5d503e2f8ca1099f5059a912b7aae410928f4c4edcdfd02e4cfbf415976cd222697b354b4e6
 )
diff --git a/ports/nanomsg/CONTROL b/ports/nanomsg/CONTROL
index c39df5e95..8e7f6a2f0 100644
--- a/ports/nanomsg/CONTROL
+++ b/ports/nanomsg/CONTROL
@@ -1,4 +1,4 @@
 Source: nanomsg
-Version: 1.1.2
+Version: 1.1.4
 Description: a simple high-performance implementation of several "scalability protocols".
   These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket.
diff --git a/ports/nanomsg/portfile.cmake b/ports/nanomsg/portfile.cmake
index a869baea4..ca6d5c260 100644
--- a/ports/nanomsg/portfile.cmake
+++ b/ports/nanomsg/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nanomsg/nanomsg
-    REF 1.1.2
-    SHA512 f95ce24b34c25d139cf3de46585f6354e0311a9d5e7135ad71df62b8bb5df26f81a58b9773c39c320df2d0e97cd2905a8576f9f00b0a4d33774f1b610271cee5
+    REF 1.1.4
+    SHA512 a1f002f988f2d98eff03387b496fe15a099fef4eb9ccd1c46ade63fbbe5a4ad4cf9fa0fd1e612e1a6f2747bc2af63b7044ec1e920e1c9a0d8c8bc2191ad7046a
     HEAD_REF master
 )
 
@@ -23,6 +23,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/nanomsg")
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL
index 0214aa9a3..09297c507 100644
--- a/ports/nghttp2/CONTROL
+++ b/ports/nghttp2/CONTROL
@@ -1,3 +1,3 @@
 Source: nghttp2
-Version: 1.32.0
+Version: 1.33.0
 Description: Implementation of the Hypertext Transfer Protocol version 2 in C
diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake
index c2caa520c..96829566c 100644
--- a/ports/nghttp2/portfile.cmake
+++ b/ports/nghttp2/portfile.cmake
@@ -1,7 +1,7 @@
 include(vcpkg_common_functions)
 
 set(LIB_NAME nghttp2)
-set(LIB_VERSION 1.32.0)
+set(LIB_VERSION 1.33.0)
 
 set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
@@ -9,7 +9,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/nghttp2/nghttp2/releases/download/v${LIB_VERSION}/${LIB_FILENAME}"
     FILENAME "${LIB_FILENAME}"
-    SHA512 f5bd36230cd42bd544d75b71af44f2fa2798363ddc1efb05499f6c8e86d54acfe6fde20f3d544ed560324a30141408dba6bc7e03e5f03ee7f7df532fb21aecbd
+    SHA512 39c37a6579d1da6a6bcfb32c822f59943796ef4c11d82146924b8e279653c4afca496b6cc7fd65b0181f95fa5007a2dd0589038d6f4354c75d65e60d29528268
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL
index b0eee2bf9..8ee107a92 100644
--- a/ports/nlohmann-json/CONTROL
+++ b/ports/nlohmann-json/CONTROL
@@ -1,3 +1,3 @@
 Source: nlohmann-json
-Version: 3.1.2
+Version: 3.3.0
 Description: JSON for Modern C++
diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake
index 44f7a86dc..5cee9565e 100644
--- a/ports/nlohmann-json/portfile.cmake
+++ b/ports/nlohmann-json/portfile.cmake
@@ -1,11 +1,11 @@
 include(vcpkg_common_functions)
 
-set(SOURCE_VERSION 3.1.2)
+set(SOURCE_VERSION 3.3.0)
 
 vcpkg_download_distfile(HEADER
     URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/json.hpp"
     FILENAME "nlohmann-json-${SOURCE_VERSION}.hpp"
-    SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5
+    SHA512 c4e4bb84d1488f87a02c4e12409491225e345cc508e6dbbee1a3542fbd4953052c256d0fe78c4d3ce02d44c3a2155fe66f0c8a93a3851ddf94fec4f9f3fd6918
 )
 
 vcpkg_download_distfile(LICENSE
diff --git a/ports/nng/CONTROL b/ports/nng/CONTROL
new file mode 100644
index 000000000..b70aaa5b0
--- /dev/null
+++ b/ports/nng/CONTROL
@@ -0,0 +1,7 @@
+Source: nng
+Version: 1.0.1
+Description: NNG, like its predecessors nanomsg (and to some extent ZeroMQ), is a lightweight, broker-less library, offering a simple API to solve common recurring messaging problems, such as publish/subscribe, RPC-style request/reply, or service discovery.
+
+Feature: mbedtls
+Description: nng built with TLS support(needs mbedTLS)
+Build-Depends: mbedtls
diff --git a/ports/nng/fix-include-path.patch b/ports/nng/fix-include-path.patch
new file mode 100644
index 000000000..9c18b9933
--- /dev/null
+++ b/ports/nng/fix-include-path.patch
@@ -0,0 +1,14 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e59ee5b..b5f6a0d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -238,6 +238,9 @@ set_target_properties (${PROJECT_NAME} ${PROJECT_NAME}
+ target_link_libraries (${PROJECT_NAME} PRIVATE ${NNG_REQUIRED_LIBRARIES})
+ target_link_libraries (${PROJECT_NAME} PRIVATE Threads::Threads)
+ 
++# See: https://github.com/nanomsg/nanomsg/pull/949/
++target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
++
+ install (TARGETS ${PROJECT_NAME}
+     EXPORT ${PROJECT_NAME}-target
+     FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library
diff --git a/ports/nng/portfile.cmake b/ports/nng/portfile.cmake
new file mode 100644
index 000000000..d7465170a
--- /dev/null
+++ b/ports/nng/portfile.cmake
@@ -0,0 +1,51 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nanomsg/nng
+    REF ce9f0cb155ad0e97cfc7703d9d7c8e5bec3201bc
+    SHA512 e1fca685e3397398bd259d126560902e813d1e2fb5cdb04de9d3f2fd74961f53af53dbaf9a555113a5588f07a3859d16bdc64f0a0ff65a7b5cf89965e764e68d
+    HEAD_REF master
+    PATCHES fix-include-path.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" NNG_STATIC_LIB)
+
+if("mbedtls" IN_LIST FEATURES)
+    set(NNG_ENABLE_TLS ON)
+else()
+    set(NNG_ENABLE_TLS OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
+        -DNNG_STATIC_LIB=${NNG_STATIC_LIB}
+        -DNNG_TESTS=OFF
+        -DNNG_ENABLE_NNGCAT=OFF
+        -DNNG_ENABLE_TLS=${NNG_ENABLE_TLS}
+)
+
+vcpkg_install_cmake()
+
+# Move CMake config files to the right place
+if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+endif()
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/nng)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nng)
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Put the licence file where vcpkg expects it
+file(COPY
+    ${SOURCE_PATH}/LICENSE.txt
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/nng)
+file(RENAME
+    ${CURRENT_PACKAGES_DIR}/share/nng/LICENSE.txt
+    ${CURRENT_PACKAGES_DIR}/share/nng/copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/nuklear/CONTROL b/ports/nuklear/CONTROL
index 8132c1ce8..cfcacd03d 100644
--- a/ports/nuklear/CONTROL
+++ b/ports/nuklear/CONTROL
@@ -1,3 +1,3 @@
 Source: nuklear
-Version: 2018-07-01
+Version: 2018-09-18
 Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain
diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake
index b18e67fc7..e50f291f8 100644
--- a/ports/nuklear/portfile.cmake
+++ b/ports/nuklear/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO vurtun/nuklear
-    REF aeb18269131ab2c8d579aab935e15a8f4b040e38
-    SHA512 174595cb9c196af2c7648b6f88d43f66585a97fd99e3147c2ab2e371821a1b56cf60178a1aef53ee09afb9213548993cff6be615a32c5c16dca1e0858c19e162
+    REF 2a379bc03879dc22ceb3a03f957fdf4870716cc6
+    SHA512 5425267abcd410cf0f2e6d9e7a685eb33289f054b90fc5a9ea9630b5f9c03056c3ca92d0ee00d884806b9b1911bb2b30ebea447278d1eebcdda29347dd547d07
     HEAD_REF master
 )
 file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL
index cd7078c08..296608f0f 100644
--- a/ports/openal-soft/CONTROL
+++ b/ports/openal-soft/CONTROL
@@ -1,3 +1,3 @@
 Source: openal-soft
-Version: 1.18.2-2
+Version: 1.19.0
 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.
diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake
index f35e81b4e..0f1abb08c 100644
--- a/ports/openal-soft/portfile.cmake
+++ b/ports/openal-soft/portfile.cmake
@@ -6,16 +6,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kcat/openal-soft
-    REF openal-soft-1.18.2
-    SHA512 85c62d3d16d2a371c1930310eed7219031203824289d9a30d60000f8e124ffa67e1bbfb15f1ba6841ef7346e88c000b9cca51c79d32c02e5dc9870392c536723
+    REF openal-soft-1.19.0
+    SHA512 59623792e560c9ef8069b7b4e4c12c67c9814433fc57d5b5650951f3adad338570ec785bbac8f7e1e7596220bab433e9f29161ced7d1a37da4f5418f6a3b7581
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/dont-export-symbols-in-static-build.patch
-        ${CMAKE_CURRENT_LIST_DIR}/cmake-3-11.patch
+        dont-export-symbols-in-static-build.patch
+        cmake-3-11.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
index 0645c03a1..12bc943d7 100644
--- a/ports/openimageio/CONTROL
+++ b/ports/openimageio/CONTROL
@@ -1,5 +1,5 @@
 Source: openimageio
-Version: Release-1.8.12-1
+Version: Release-1.8.13
 Description: A library for reading and writing images, and a bunch of related classes, utilities, and application
 Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map
 
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index 86d83aba4..c5786db64 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenImageIO/oiio
-    REF Release-1.8.12
-    SHA512 2475792ff475d34b47b6af5ca71c6cf6d9d8c60452a506b1bf740b9dbb20ea72109117dc9a531b8302095de99f6280172723f26e23dc6e038256cbb43b697145
+    REF Release-1.8.13
+    SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e
     HEAD_REF master
     PATCHES
         # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES'
diff --git a/ports/openmesh/CONTROL b/ports/openmesh/CONTROL
index b803484eb..cf502b2a2 100644
--- a/ports/openmesh/CONTROL
+++ b/ports/openmesh/CONTROL
@@ -1,3 +1,3 @@
 Source: openmesh
-Version: 6.3
+Version: 7.0
 Description: A generic and efficient polygon mesh data structure
diff --git a/ports/openmesh/portfile.cmake b/ports/openmesh/portfile.cmake
index 26c167adb..7bfacfe0e 100644
--- a/ports/openmesh/portfile.cmake
+++ b/ports/openmesh/portfile.cmake
@@ -1,24 +1,18 @@
-# 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_from_gitlab(
+set(VERSION 7.0)
+
+# Note: upstream GitLab instance at https://graphics.rwth-aachen.de:9000 often goes down
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.tar.gz"
+    FILENAME "OpenMesh-${VERSION}.tar.gz"
+    SHA512 29280c8fe7208d39bd923c4d0444a24463e36b95402e6a75f42adc27bc1b261df9113442f69e1001dc1a8b1198488069ffb049742dcf6eac6ac1ecf4f216fad8
+)
+
+vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    GITLAB_URL "https://graphics.rwth-aachen.de:9000"
-    REPO "OpenMesh/OpenMesh"
-    REF "OpenMesh-7.0"
-    HEAD_REF "master"
-    SHA512 "70e414088c094199af31a8694fb91fa5f9b574b3cc86b30b3fb64d938e6a218f9f38d857c559f958276b01ec9263ef71cd4039444e50a8cb38e820243aac7956"
+    ARCHIVE "${ARCHIVE}"
+    REF "${VERSION}"
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/openssl-unix/CMakeLists.txt b/ports/openssl-unix/CMakeLists.txt
index fd5964506..7639d1d4e 100644
--- a/ports/openssl-unix/CMakeLists.txt
+++ b/ports/openssl-unix/CMakeLists.txt
@@ -36,10 +36,10 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(CFLAGS "-Wno-error=unused-command-line-argument ${CMAKE_C_FLAGS}")
 endif()
 if(CMAKE_C_COMPILER_TARGET)
-    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET} ${CMAKE_C_COMPILER_TARGET}")
+    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET}")
 endif()
 if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN)
-    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}")
+    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}")
 endif()
 if(CMAKE_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)
     set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
@@ -106,7 +106,7 @@ add_custom_command(
         no-md2
         ${PLATFORM}
         "--prefix=${CMAKE_INSTALL_PREFIX}"
-        "--openssldir=${CMAKE_INSTALL_PREFIX}"
+        "--openssldir=/etc/ssl"
         ${CFLAGS}
     COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
     VERBATIM
diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL
index db47c018b..6413eb371 100644
--- a/ports/openssl-unix/CONTROL
+++ b/ports/openssl-unix/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl-unix
-Version: 1.0.2o-1
+Version: 1.0.2p
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake
index 49561ccde..1484fc66c 100644
--- a/ports/openssl-unix/portfile.cmake
+++ b/ports/openssl-unix/portfile.cmake
@@ -3,7 +3,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM
 endif()
 
 include(vcpkg_common_functions)
-set(OPENSSL_VERSION 1.0.2o)
+set(OPENSSL_VERSION 1.0.2p)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
 
 vcpkg_find_acquire_program(PERL)
@@ -11,7 +11,7 @@ vcpkg_find_acquire_program(PERL)
 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
     URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz"
     FILENAME "openssl-${OPENSSL_VERSION}.tar.gz"
-    SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
+    SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
 )
 
 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
@@ -59,3 +59,5 @@ file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_D
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl)
 endif()
+
+vcpkg_test_cmake(PACKAGE_NAME OpenSSL MODULE)
diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake
index 167d98658..ef9801380 100644
--- a/ports/openssl-uwp/portfile.cmake
+++ b/ports/openssl-uwp/portfile.cmake
@@ -88,3 +88,5 @@ file(INSTALL
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+vcpkg_test_cmake(PACKAGE_NAME OpenSSL MODULE)
diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL
index a9c10c583..881c311d0 100644
--- a/ports/openssl-windows/CONTROL
+++ b/ports/openssl-windows/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl-windows
-Version: 1.0.2o
+Version: 1.0.2p-1
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake
index 22a6a2a28..d58d51431 100644
--- a/ports/openssl-windows/portfile.cmake
+++ b/ports/openssl-windows/portfile.cmake
@@ -3,7 +3,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME)
 endif()
 
 include(vcpkg_common_functions)
-set(OPENSSL_VERSION 1.0.2o)
+set(OPENSSL_VERSION 1.0.2p)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
 
 vcpkg_find_acquire_program(PERL)
@@ -14,7 +14,7 @@ set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
     URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz"
     FILENAME "openssl-${OPENSSL_VERSION}.tar.gz"
-    SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
+    SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
 )
 
 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
@@ -57,72 +57,76 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
 
 
-file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/openssl-${OPENSSL_VERSION})
-set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR})
-
-message(STATUS "Configure ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
-    COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS
-    WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
-    LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
-)
-vcpkg_execute_required_process(
-    COMMAND ${OPENSSL_DO}
-    WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
-    LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
-)
-message(STATUS "Configure ${TARGET_TRIPLET}-rel done")
-
-message(STATUS "Build ${TARGET_TRIPLET}-rel")
-# Openssl's buildsystem has a race condition which will cause JOM to fail at some point.
-# This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build.
-make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl)
-execute_process(
-    COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE}
-    WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
-    OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log
-    ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log
-)
-vcpkg_execute_required_process(
-    COMMAND nmake -f ${OPENSSL_MAKEFILE} install
-    WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
-    LOGNAME build-${TARGET_TRIPLET}-rel-1)
-
-message(STATUS "Build ${TARGET_TRIPLET}-rel done")
-
-
-message(STATUS "Configure ${TARGET_TRIPLET}-dbg")
-file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/openssl-${OPENSSL_VERSION})
-set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug)
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+    set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/openssl-${OPENSSL_VERSION})
+    set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR})
+
+    message(STATUS "Configure ${TARGET_TRIPLET}-rel")
+    vcpkg_execute_required_process(
+        COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS
+        WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+        LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
+    )
+    vcpkg_execute_required_process(
+        COMMAND ${OPENSSL_DO}
+        WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+        LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
+    )
+    message(STATUS "Configure ${TARGET_TRIPLET}-rel done")
+
+    message(STATUS "Build ${TARGET_TRIPLET}-rel")
+    # Openssl's buildsystem has a race condition which will cause JOM to fail at some point.
+    # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build.
+    make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl)
+    execute_process(
+        COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE}
+        WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+        OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log
+        ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log
+    )
+    vcpkg_execute_required_process(
+        COMMAND nmake -f ${OPENSSL_MAKEFILE} install
+        WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+        LOGNAME build-${TARGET_TRIPLET}-rel-1)
+
+    message(STATUS "Build ${TARGET_TRIPLET}-rel done")
+endif()
 
-vcpkg_execute_required_process(
-    COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS
-    WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
-    LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
-)
-vcpkg_execute_required_process(
-    COMMAND ${OPENSSL_DO}
-    WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
-    LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
-)
-message(STATUS "Configure ${TARGET_TRIPLET}-dbg done")
-
-message(STATUS "Build ${TARGET_TRIPLET}-dbg")
-make_directory(${SOURCE_PATH_DEBUG}/inc32/openssl)
-execute_process(
-    COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE}
-    WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
-    OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log
-    ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log
-)
-vcpkg_execute_required_process(
-    COMMAND nmake -f ${OPENSSL_MAKEFILE} install
-    WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
-    LOGNAME build-${TARGET_TRIPLET}-dbg-1)
 
-message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    message(STATUS "Configure ${TARGET_TRIPLET}-dbg")
+    file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+    set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/openssl-${OPENSSL_VERSION})
+    set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug)
+
+    vcpkg_execute_required_process(
+        COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS
+        WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+        LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
+    )
+    vcpkg_execute_required_process(
+        COMMAND ${OPENSSL_DO}
+        WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+        LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
+    )
+    message(STATUS "Configure ${TARGET_TRIPLET}-dbg done")
+
+    message(STATUS "Build ${TARGET_TRIPLET}-dbg")
+    make_directory(${SOURCE_PATH_DEBUG}/inc32/openssl)
+    execute_process(
+        COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE}
+        WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+        OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log
+        ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log
+    )
+    vcpkg_execute_required_process(
+        COMMAND nmake -f ${OPENSSL_MAKEFILE} install
+        WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+        LOGNAME build-${TARGET_TRIPLET}-dbg-1)
+
+    message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
+endif()
 
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@@ -155,3 +159,5 @@ vcpkg_copy_pdbs()
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME OpenSSL MODULE)
diff --git a/ports/opusfile/CONTROL b/ports/opusfile/CONTROL
index 5a9cf2002..82307c100 100644
--- a/ports/opusfile/CONTROL
+++ b/ports/opusfile/CONTROL
@@ -1,5 +1,5 @@
 Source: opusfile
-Version: 0.9-3
+Version: 0.11-1
 Description: Stand-alone decoder library for .opus streams
 Build-Depends: libogg, opus
 
diff --git a/ports/opusfile/portfile.cmake b/ports/opusfile/portfile.cmake
index c538a692f..30c633ca2 100644
--- a/ports/opusfile/portfile.cmake
+++ b/ports/opusfile/portfile.cmake
@@ -6,8 +6,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xiph/opusfile
-    REF v0.9
-    SHA512 8bada67cf12511fd914813fe782a5bf40a5d1ecadbe77e2e8d7bf40bf09bf0e6af3dfbc9b7987496dea813d3b120897cb9117f06521eeb098105e1a795ab702b
+    REF v0.11
+    SHA512 b67976176ffacbeecacd00815877d1b332e149430b49f68d41d6a2f95e6d291e979214903314e14b4cc3f20e07ec8975b906f12f12aef8c786f74f6160d8791d
     HEAD_REF master)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL
index f58156fd0..dc9396dd4 100644
--- a/ports/osg/CONTROL
+++ b/ports/osg/CONTROL
@@ -1,4 +1,4 @@
 Source: osg
-Version: 3.6.2-rc3
+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
diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake
index c6eddae40..ca5c18f59 100644
--- a/ports/osg/portfile.cmake
+++ b/ports/osg/portfile.cmake
@@ -19,8 +19,8 @@ endif()
 vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
 	REPO openscenegraph/OpenSceneGraph
-	REF OpenSceneGraph-3.6.2-rc3
-	SHA512 369c0790ad990cc0f5403209b6e8afe73069f4a467883f9031ac0539bdd090f2cd71487285e515da39bb5a5f67a15548edd479d489dc57374b481ed32ebed0eb
+	REF OpenSceneGraph-3.6.2
+	SHA512 6949dd4dea9dcffe4228086b72eafdb253bf1403b3b7a70a4727848c3cde23ad0270f41b1c3e2bdbfd410ec067ecce2052a5d26c61b032b6d46ce84b8c931bfb
 	HEAD_REF master
 )
 
diff --git a/ports/parson/CONTROL b/ports/parson/CONTROL
index 5a6d27896..1210c7e2e 100644
--- a/ports/parson/CONTROL
+++ b/ports/parson/CONTROL
@@ -1,3 +1,3 @@
 Source: parson
-Version: 2018-05-17
+Version: 2018-09-18
 Description: a lighweight json library written in C
diff --git a/ports/parson/portfile.cmake b/ports/parson/portfile.cmake
index 134520fbd..cfc1d861e 100644
--- a/ports/parson/portfile.cmake
+++ b/ports/parson/portfile.cmake
@@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kgabis/parson
-    REF 4f3eaa6849ba62404fc5756650168bb2056d0b46
-    SHA512 dd98ebdb7f39387e600d529b8c92986f20781e7ec6b2baffcdc553e834be826ada4724247750300a897cacdee8f942d3c7d540e6bb410c2854a9291a80df847f
+    REF 0a1896939faff5f69e179637fc49f678ff0128ba
+    SHA512 cb982ce7dbbe0b5a4d08a28a459e9dce5347f90d75b0a37c56698f5b79ad37aa0bd22fe6b6d5c8a6fda2dd83b072605486581360b8ed3591012ebaa1e1518fc6
     HEAD_REF master
 )
 
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
index 82f5cdea3..b1b20fe06 100644
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@@ -1,5 +1,5 @@
 Source: pcl
-Version: 1.8.1-10
+Version: 1.8.1-12
 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
 Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio
 
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 12c9ec398..dc4619ed3 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -6,19 +6,16 @@ vcpkg_from_github(
     REF pcl-1.8.1
     SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/cmakelists.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/config.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/config_install.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/find_flann.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/find_qhull.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/find_openni2.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/find_cuda.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/vs2017-15.4-workaround.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/boost_uuid_random_generator_compat.patch"
+    PATCHES cmakelists.patch
+            config.patch
+            config_install.patch
+            find_flann.patch
+            find_qhull.patch
+            find_openni2.patch
+            find_cuda.patch
+            vs2017-15.4-workaround.patch
+            boost_uuid_random_generator_compat.patch
+            uuid-detail-sha1.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
@@ -60,6 +57,7 @@ vcpkg_configure_cmake(
         # PCL
         -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
         -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
+        -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
         -DPCL_SHARED_LIBS=${PCL_SHARED_LIBS}
         # WITH
         -DWITH_CUDA=${WITH_CUDA}
diff --git a/ports/pcl/uuid-detail-sha1.patch b/ports/pcl/uuid-detail-sha1.patch
new file mode 100644
index 000000000..8c2536cab
--- /dev/null
+++ b/ports/pcl/uuid-detail-sha1.patch
@@ -0,0 +1,13 @@
+diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
+index 5b12331..b83f320 100644
+--- a/visualization/src/pcl_visualizer.cpp
++++ b/visualization/src/pcl_visualizer.cpp
+@@ -100,7 +100,7 @@
+ #include <pcl/visualization/pcl_visualizer.h>
+ #include <pcl/visualization/common/common.h>
+ #include <pcl/common/time.h>
+-#include <boost/uuid/sha1.hpp>
++#include <boost/uuid/detail/sha1.hpp>
+ #include <boost/filesystem.hpp>
+ #include <pcl/console/parse.h>
+ 
diff --git a/ports/pixman/CMakeLists.txt b/ports/pixman/CMakeLists.txt
index 8dc9940cb..d355fe8c6 100644
--- a/ports/pixman/CMakeLists.txt
+++ b/ports/pixman/CMakeLists.txt
@@ -46,14 +46,14 @@ file(GLOB SOURCES
 )
 
 add_library(pixman-1 ${SOURCES})
+target_include_directories(pixman-1 PUBLIC $<INSTALL_INTERFACE:include>)
 
 # pixman requires the three PACKAGE* definitions in order to compile. The USE_SSE2 definition lets it use SSE2 instructions for speed. Every target machine should have SSE2 these days.
 target_compile_definitions(pixman-1
-    PUBLIC
+    PRIVATE
         PACKAGE="pixman-1"
         PACKAGE_VERSION="0.34.0"
         PACKAGE_BUGREPORT=""
-    PRIVATE
         USE_SSE2
 )
 
@@ -63,7 +63,15 @@ if(MSVC)
 endif()
 
 install(TARGETS pixman-1
+  EXPORT pixman-targets
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
 )
+
+install(
+    EXPORT pixman-targets
+    NAMESPACE unofficial::pixman::
+    FILE unofficial-pixman-config.cmake
+    DESTINATION share/unofficial-pixman
+)
diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL
index 0deb60d33..d3a5cede7 100644
--- a/ports/pixman/CONTROL
+++ b/ports/pixman/CONTROL
@@ -1,3 +1,3 @@
 Source: pixman
-Version: 0.34.0-3
+Version: 0.34.0-4
 Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.
diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake
index 4fb37f6d9..83daa9a51 100644
--- a/ports/pixman/portfile.cmake
+++ b/ports/pixman/portfile.cmake
@@ -1,13 +1,16 @@
 include(vcpkg_common_functions)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pixman-0.34.0)
-
+set(PIXMAN_VERSION 0.34.0)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.cairographics.org/releases/pixman-0.34.0.tar.gz"
-    FILENAME "pixman-0.34.0.tar.gz"
+    URLS "https://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
+    FILENAME "pixman-${PIXMAN_VERSION}.tar.gz"
     SHA512 81caca5b71582b53aaac473bc37145bd66ba9acebb4773fa8cdb51f4ed7fbcb6954790d8633aad85b2826dd276bcce725e26e37997a517760e9edd72e2669a6d
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${PIXMAN_VERSION}
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/pixman)
 
@@ -18,6 +21,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-pixman TARGET_PATH share/unofficial-pixman)
+
 # Copy the appropriate header files.
 file(COPY
     "${SOURCE_PATH}/pixman/pixman.h"
@@ -36,3 +41,5 @@ file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pixma
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/pixman/COPYING ${CURRENT_PACKAGES_DIR}/share/pixman/copyright)
 
 vcpkg_copy_pdbs()
+
+vcpkg_test_cmake(PACKAGE_NAME unofficial-pixman)
diff --git a/ports/pmdk/CONTROL b/ports/pmdk/CONTROL
index 16c6138cc..4c667eac0 100644
--- a/ports/pmdk/CONTROL
+++ b/ports/pmdk/CONTROL
@@ -1,3 +1,3 @@
 Source: pmdk
-Version: 1.4.1-1
+Version: 1.4.2
 Description: Persistent Memory Development Kit
 \ No newline at end of file
diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake
index 302ce07bf..330a8abeb 100644
--- a/ports/pmdk/portfile.cmake
+++ b/ports/pmdk/portfile.cmake
@@ -18,8 +18,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pmem/pmdk
-    REF 1.4.1
-    SHA512 a4bffb393f07e5e2ffbd2a7835b906148401abf0f3cff28262cf8607691fc2d567d153358a3fb3a15197db699519c7b3a4699b67a51c15fecd707bc30795c5c7
+    REF 1.4.2
+    SHA512 87aa226487046aba14f3a0b51d066f4498a6021580fd203df45f0900fc0c0c5cdb192156a4c730a5a7dc5826e204d688531e5680145161750057803cb24d088d
     HEAD_REF master
     PATCHES
         "${CMAKE_CURRENT_LIST_DIR}/addPowerShellExecutionPolicy.patch"
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL
index 9656723bb..5817429fa 100644
--- a/ports/poco/CONTROL
+++ b/ports/poco/CONTROL
@@ -1,5 +1,5 @@
 Source: poco
-Version: 1.9.0
+Version: 1.9.0-1
 Build-Depends: zlib, pcre, sqlite3, expat
 Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.
 
diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake
index 271e223f8..c94a09387 100644
--- a/ports/poco/portfile.cmake
+++ b/ports/poco/portfile.cmake
@@ -6,15 +6,11 @@ vcpkg_from_github(
     REF poco-1.9.0-release
     SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/config_h.patch
-        ${CMAKE_CURRENT_LIST_DIR}/find_pcre.patch
-        ${CMAKE_CURRENT_LIST_DIR}/foundation-public-include-pcre.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-static-internal-pcre.patch
+        config_h.patch
+        find_pcre.patch
+        foundation-public-include-pcre.patch
+        fix-static-internal-pcre.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" POCO_STATIC)
@@ -46,8 +42,13 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/cpspc.exe ${CURRENT_PACKAGES_DIR}/tools/cpspc.exe)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.exe ${CURRENT_PACKAGES_DIR}/tools/f2cpsp.exe)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/cpspc.exe")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/cpspc.exe ${CURRENT_PACKAGES_DIR}/tools/cpspc.exe)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.exe ${CURRENT_PACKAGES_DIR}/tools/f2cpsp.exe)
+else()
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/cpspc ${CURRENT_PACKAGES_DIR}/tools/cpspc)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/f2cpsp ${CURRENT_PACKAGES_DIR}/tools/f2cpsp)
+endif()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE 
@@ -64,7 +65,7 @@ else()
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/poco)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Poco)
 
 # copy license
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/poco)
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL
index 3c480a1e4..c2be8e0f3 100644
--- a/ports/protobuf/CONTROL
+++ b/ports/protobuf/CONTROL
@@ -1,5 +1,5 @@
 Source: protobuf
-Version: 3.6.1-2
+Version: 3.6.1-4
 Description: Protocol Buffers - Google's data interchange format
 
 Feature: zlib
diff --git a/ports/protobuf/disable-lite.patch b/ports/protobuf/disable-lite.patch
new file mode 100644
index 000000000..ceb34671c
--- /dev/null
+++ b/ports/protobuf/disable-lite.patch
@@ -0,0 +1,41 @@
+diff --git a/cmake/install.cmake b/cmake/install.cmake
+index 82036cb..378db2d 100644
+--- a/cmake/install.cmake
++++ b/cmake/install.cmake
+@@ -15,10 +15,12 @@ foreach(_library ${_protobuf_libraries})
+     PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+     $<BUILD_INTERFACE:${protobuf_source_dir}/src>
+     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
++  if(NOT "${_library}" STREQUAL "libprotobuf-lite")
+   install(TARGETS ${_library} EXPORT protobuf-targets
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${_library}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${_library}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${_library})
++  endif()
+ endforeach()
+ 
+ if (protobuf_BUILD_PROTOC_BINARIES)
+@@ -26,7 +28,7 @@ if (protobuf_BUILD_PROTOC_BINARIES)
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
+ endif (protobuf_BUILD_PROTOC_BINARIES)
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ 
+ file(STRINGS extract_includes.bat.in _extract_strings
+   REGEX "^copy")
+@@ -107,12 +109,12 @@ configure_file(protobuf-options.cmake
+ # Allows the build directory to be used as a find directory.
+ 
+ if (protobuf_BUILD_PROTOC_BINARIES)
+-  export(TARGETS libprotobuf-lite libprotobuf libprotoc protoc
++  export(TARGETS libprotobuf libprotoc protoc
+     NAMESPACE protobuf::
+     FILE ${CMAKE_INSTALL_CMAKEDIR}/protobuf-targets.cmake
+   )
+ else (protobuf_BUILD_PROTOC_BINARIES)
+-  export(TARGETS libprotobuf-lite libprotobuf
++  export(TARGETS libprotobuf
+     NAMESPACE protobuf::
+     FILE ${CMAKE_INSTALL_CMAKEDIR}/protobuf-targets.cmake
+   )
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index 37919a820..1dc7e6cf5 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -7,7 +7,8 @@ vcpkg_from_github(
     SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
     HEAD_REF master
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch"
+        fix-uwp.patch
+        disable-lite.patch
 )
 
 if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
@@ -110,6 +111,10 @@ else()
     protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
 endif()
 
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/libprotobuf-lite.lib)
+    message(FATAL_ERROR "Expected to not build the lite runtime because it contains some of the same symbols as the full runtime.")
+endif()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     file(READ ${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h _contents)
     string(REPLACE "\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" "\#define PROTOBUF_USE_DLLS\n\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" _contents "${_contents}")
diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL
index c6f7f5b7e..67fdaea5d 100644
--- a/ports/pybind11/CONTROL
+++ b/ports/pybind11/CONTROL
@@ -1,4 +1,4 @@
 Source: pybind11
-Version: 2.2.3
+Version: 2.2.3-1
 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code.
 Build-Depends: python3 (windows)
 \ No newline at end of file
diff --git a/ports/pybind11/aliastemplates.patch b/ports/pybind11/aliastemplates.patch
new file mode 100644
index 000000000..a692ad583
--- /dev/null
+++ b/ports/pybind11/aliastemplates.patch
@@ -0,0 +1,45 @@
+From 598ec67e4d6727dd9455bcc9959e32fee02a80ac Mon Sep 17 00:00:00 2001
+From: Michael Goulding <Michael.Goulding@microsoft.com>
+Date: Wed, 18 Jul 2018 10:59:15 -0700
+Subject: [PATCH 1/2] VS 15.8.0 Preview 4.0 has a bug with alias templates
+
+---
+ include/pybind11/detail/common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h
+index 3c6722891..89d922190 100644
+--- a/include/pybind11/detail/common.h
++++ b/include/pybind11/detail/common.h
+@@ -476,7 +476,7 @@ template <typename...> struct void_t_impl { using type = void; };
+ template <typename... Ts> using void_t = typename void_t_impl<Ts...>::type;
+ 
+ /// Compile-time all/any/none of that check the boolean value of all template types
+-#ifdef __cpp_fold_expressions
++#if (!defined(_MSC_VER) || ( _MSC_VER >= 1916 )) && defined(__cpp_fold_expressions)
+ template <class... Ts> using all_of = bool_constant<(Ts::value && ...)>;
+ template <class... Ts> using any_of = bool_constant<(Ts::value || ...)>;
+ #elif !defined(_MSC_VER)
+
+From 7d534251ca67c5e725ed549900f04adeb5ddb99e Mon Sep 17 00:00:00 2001
+From: Michael Goulding <Michael.Goulding@microsoft.com>
+Date: Thu, 19 Jul 2018 10:27:41 -0700
+Subject: [PATCH 2/2] Address feedback
+
+---
+ include/pybind11/detail/common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h
+index 89d922190..8d65b260d 100644
+--- a/include/pybind11/detail/common.h
++++ b/include/pybind11/detail/common.h
+@@ -476,7 +476,7 @@ template <typename...> struct void_t_impl { using type = void; };
+ template <typename... Ts> using void_t = typename void_t_impl<Ts...>::type;
+ 
+ /// Compile-time all/any/none of that check the boolean value of all template types
+-#if (!defined(_MSC_VER) || ( _MSC_VER >= 1916 )) && defined(__cpp_fold_expressions)
++#if defined(__cpp_fold_expressions) && !(defined(_MSC_VER) && (_MSC_VER < 1916))
+ template <class... Ts> using all_of = bool_constant<(Ts::value && ...)>;
+ template <class... Ts> using any_of = bool_constant<(Ts::value || ...)>;
+ #elif !defined(_MSC_VER)
diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake
index 892f173fa..16a9b9726 100644
--- a/ports/pybind11/portfile.cmake
+++ b/ports/pybind11/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
     REF v2.2.3
     SHA512 3a43b43f44ae4a6453fe3b875384acc868310177216938cb564536e6b73c56002743137e5f61cf4ecbd6c56e3b39476ebf06aea33d460581fc7d8ba7b2a22a67
     HEAD_REF master
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/aliastemplates.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)
diff --git a/ports/python2/007-fix-build-path.patch b/ports/python2/007-fix-build-path.patch
new file mode 100644
index 000000000..5dc4633e0
--- /dev/null
+++ b/ports/python2/007-fix-build-path.patch
@@ -0,0 +1,14 @@
+diff --git a/PCbuild/python.props b/PCbuild/python.props
+index d2b1991..a22c054 100644
+--- a/PCbuild/python.props
++++ b/PCbuild/python.props
+@@ -26,8 +26,7 @@
+     <PySourcePath Condition="!HasTrailingSlash($(PySourcePath))">$(PySourcePath)\</PySourcePath>
+ 
+     <!-- Directory where build outputs are put -->
+-    <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\</BuildPath>
+-    <BuildPath Condition="'$(ArchName)' != 'win32'">$(BuildPath)\$(ArchName)\</BuildPath>
++    <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath>
+     <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath>
+ 
+     <!-- Directories of external projects. tcltk is handled in tcltk.props -->
diff --git a/ports/python2/portfile.cmake b/ports/python2/portfile.cmake
index c21b1f1e6..0c53ec128 100644
--- a/ports/python2/portfile.cmake
+++ b/ports/python2/portfile.cmake
@@ -43,6 +43,7 @@ vcpkg_apply_patches(
         ${CMAKE_CURRENT_LIST_DIR}/002-build-msvc.patch
         ${CMAKE_CURRENT_LIST_DIR}/003-build-msvc.patch
         ${_PYTHON_PATCHES}
+        ${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch
 )
 
 if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
diff --git a/ports/qt5-base/configure_qt.cmake b/ports/qt5-base/configure_qt.cmake
index 356361a9b..b66f6d22e 100644
--- a/ports/qt5-base/configure_qt.cmake
+++ b/ports/qt5-base/configure_qt.cmake
@@ -30,12 +30,13 @@ function(configure_qt)
     vcpkg_execute_required_process(
         COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}
             -debug
-            -prefix ${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
+            -prefix ${CURRENT_INSTALLED_DIR}/debug
+            -extprefix ${CURRENT_PACKAGES_DIR}/debug
+            -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
@@ -44,18 +45,19 @@ function(configure_qt)
         LOGNAME config-${TARGET_TRIPLET}-dbg
     )
     message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
-    
+
     message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
     vcpkg_execute_required_process(
         COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}
             -release
-            -prefix ${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
+            -prefix ${CURRENT_INSTALLED_DIR}
+            -extprefix ${CURRENT_PACKAGES_DIR}
+            -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}
@@ -64,4 +66,4 @@ function(configure_qt)
     )
     message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
 
-endfunction()
-\ No newline at end of file
+endfunction()
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL
new file mode 100755
index 000000000..adcc055c8
--- /dev/null
+++ b/ports/qt5-script/CONTROL
@@ -0,0 +1,3 @@
+Source: qt5-script
+Version: 5.9.2
+Description:Qt5 Script Module.
diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake
new file mode 100755
index 000000000..9e6f5f338
--- /dev/null
+++ b/ports/qt5-script/portfile.cmake
@@ -0,0 +1,5 @@
+
+include(vcpkg_common_functions)
+include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
+
+qt_modular_library(qtscript 3ce2e57a0a6b2382614f689edca0deed87afe944c1c41decb3b9f420449fa59f2b79e6330e78e01a950761a95903113eaa7fbf261886361114acf5015d93254c)
diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL
index 8e271f5ca..e35601ab5 100644
--- a/ports/re2/CONTROL
+++ b/ports/re2/CONTROL
@@ -1,3 +1,3 @@
 Source: re2
-Version: 2018-07-30
+Version: 2018-09-18
 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 06ba4f581..48aa9e48d 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 3b4a3d57f3a0231cfb70ad649099c3aed0499555
-    SHA512 3ff7ece9fafd595d5016d0ad1942dfc1747610cd93e505512179307f7abba2e16d1c830712f9b4a04278ad8bcdc182dc883bcdabad340f2d08264d34d8f08f92
+    REF 4c916c947ab7f2ba2d280bb8c87540c365d30695
+    SHA512 7f34073415b2afd36469a0ffedb5d6d38b0230a82d633f2b45538e66d00ff0e411ffff1e34f74747c68518b1fdf07f7a601c23d39b001a75bcf9dadfc1350f04
     HEAD_REF master
 )
 
diff --git a/ports/readerwriterqueue/CONTROL b/ports/readerwriterqueue/CONTROL
new file mode 100644
index 000000000..f02b34f1e
--- /dev/null
+++ b/ports/readerwriterqueue/CONTROL
@@ -0,0 +1,3 @@
+Source: readerwriterqueue
+Version: 1.0.0
+Description: A single-producer, single-consumer lock-free queue
diff --git a/ports/readerwriterqueue/portfile.cmake b/ports/readerwriterqueue/portfile.cmake
new file mode 100644
index 000000000..46fd0a8ca
--- /dev/null
+++ b/ports/readerwriterqueue/portfile.cmake
@@ -0,0 +1,15 @@
+# header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cameron314/readerwriterqueue
+    REF v1.0.0
+    SHA512 3bb8320e35e8911350df1bd5349e006f85cbd0863cc2bb8ac1912aaf7a5686f42966b7508a845cfdca280ab65a308148315c987ef333d74b6d085638dd6d8578
+    HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/readerwriterqueue RENAME copyright)
+
+file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h)
+file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL
index 62f249090..959292d5c 100644
--- a/ports/realsense2/CONTROL
+++ b/ports/realsense2/CONTROL
@@ -1,5 +1,5 @@
 Source: realsense2
-Version: 2.13.0
+Version: 2.16.1
 Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).
 
 Feature: tools
diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake
index e9edc21e2..e6073099c 100644
--- a/ports/realsense2/portfile.cmake
+++ b/ports/realsense2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO IntelRealSense/librealsense
-    REF v2.13.0
-    SHA512 5cee1371e83a0bcd24829c073c064c630347a6f69b59377603a75b5d036c6306e9b36285a7deef519bd63a42dfaf933c99709a25942407be97f1791361c4becf
+    REF v2.16.1
+    SHA512 e030f7b1833db787b8976ead734535fb2209a19317d74d4f68bd8f8cae38abe2343d584e88131a1a66bf6f9f1c0a17bc2c64540841a74cf6300fecf3e69f9dff
     HEAD_REF development
 )
 
diff --git a/ports/restbed/CONTROL b/ports/restbed/CONTROL
new file mode 100644
index 000000000..d0eab13ce
--- /dev/null
+++ b/ports/restbed/CONTROL
@@ -0,0 +1,4 @@
+Source: restbed
+Version: 4.16-07-28-2018
+Description: Corvusoft's Restbed framework brings asynchronous RESTful functionality to C++11 applications.
+Build-Depends: asio
+\ No newline at end of file
diff --git a/ports/restbed/cmake.patch b/ports/restbed/cmake.patch
new file mode 100644
index 000000000..5d73409f9
--- /dev/null
+++ b/ports/restbed/cmake.patch
@@ -0,0 +1,59 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b66143e..85c5315 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,9 @@ endif ( )
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake" )
+ 
+ find_package( asio REQUIRED )
++if(NOT DISABLE_TESTS)
+ find_package( catch REQUIRED )
++endif()
+ if ( BUILD_SSL )
+     find_package( openssl REQUIRED )
+ endif ( )
+@@ -54,6 +56,7 @@ include_directories( ${INCLUDE_DIR} SYSTEM ${asio_INCLUDE} ${kashmir_INCLUDE} ${
+ #
+ file( GLOB_RECURSE MANIFEST "${SOURCE_DIR}/*.cpp" )
+ 
++if(NOT BUILD_SHARED_LIBS)
+ set( STATIC_LIBRARY_NAME "${PROJECT_NAME}-static" )
+ add_library( ${STATIC_LIBRARY_NAME} STATIC ${MANIFEST} )
+ set_property( TARGET ${STATIC_LIBRARY_NAME} PROPERTY CXX_STANDARD 11 )
+@@ -64,7 +67,9 @@ if ( BUILD_SSL )
+ else ( )
+     target_link_libraries( ${STATIC_LIBRARY_NAME} )
+ endif ( )
++endif()
+ 
++if(BUILD_SHARED_LIBS)
+ set( SHARED_LIBRARY_NAME "${PROJECT_NAME}-shared" )
+ add_library( ${SHARED_LIBRARY_NAME} SHARED ${MANIFEST} )
+ set_property( TARGET ${SHARED_LIBRARY_NAME} PROPERTY CXX_STANDARD 11 )
+@@ -76,12 +81,15 @@ if ( BUILD_SSL )
+ else ( )
+     target_link_libraries( ${SHARED_LIBRARY_NAME} )
+ endif ( )
++endif()
+ 
++if(NOT DISABLE_TESTS)
+ enable_testing( )
+ add_subdirectory( "${PROJECT_SOURCE_DIR}/test/unit" )
+ add_subdirectory( "${PROJECT_SOURCE_DIR}/test/feature" )
+ add_subdirectory( "${PROJECT_SOURCE_DIR}/test/regression" )
+ add_subdirectory( "${PROJECT_SOURCE_DIR}/test/integration" )
++endif()
+ 
+ #
+ # Install
+@@ -90,5 +98,8 @@ file( GLOB ARTIFACTS "${SOURCE_DIR}/*.hpp" )
+ 
+ install( FILES "${INCLUDE_DIR}/${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
+ install( FILES ${ARTIFACTS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/corvusoft/${PROJECT_NAME}" )
+-install( TARGETS ${STATIC_LIBRARY_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library )
+-install( TARGETS ${SHARED_LIBRARY_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library )
++if(NOT BUILD_SHARED_LIBS)
++install( TARGETS ${STATIC_LIBRARY_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library )
++else()
++install( TARGETS ${SHARED_LIBRARY_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library )
++endif()
diff --git a/ports/restbed/portfile.cmake b/ports/restbed/portfile.cmake
new file mode 100644
index 000000000..60f1247d8
--- /dev/null
+++ b/ports/restbed/portfile.cmake
@@ -0,0 +1,28 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Corvusoft/restbed
+    REF 0f8af8d8ed183a88e208adeb22da0080d5d74d1e
+    SHA512 f0175a10c88f1ad4f16c8e4cff7ceea7b80c56b0724b59791c23e91f1ecf146dfdbda9e9238d31a35f21d8cdcc413b586cc633725dd0ba87de6b599a7087916f
+    HEAD_REF master
+    PATCHES cmake.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_SSL=OFF
+        -DDISABLE_TESTS=ON
+)
+
+vcpkg_install_cmake()
+
+#Remove include debug files
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/restbed/copyright COPYONLY)
diff --git a/ports/restinio/CONTROL b/ports/restinio/CONTROL
index 6eff3a238..1e0ad1d52 100644
--- a/ports/restinio/CONTROL
+++ b/ports/restinio/CONTROL
@@ -1,4 +1,4 @@
 Source: restinio
-Version: 0.4.7
+Version: 0.4.8
 Description: A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.
 Build-Depends: asio, fmt, http-parser
diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake
index ab196f7ec..2ce2b7263 100644
--- a/ports/restinio/portfile.cmake
+++ b/ports/restinio/portfile.cmake
@@ -1,12 +1,10 @@
 include(vcpkg_common_functions)
 
-set(RESTINIO_VERSION 0.4.7)
-
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sobjectizerteam/restinio-0.4
-    REF v.${RESTINIO_VERSION}
-    SHA512 bc6eebfce9a2fb7faf9af7b14d7c96ec7b28be992681f65701145d5712ae2efe562b964ee7498944a9aa38a53281ed0928c3d6c000c842dbdb87deae1b5ebcad
+    REF v.0.4.8
+    SHA512 da44a6df47f68294b1f26241d63ab282b16a8111580959ea5d69e18d9faca68fe9932451d07c4cd5732d5ac4e6fab6550842fd6bac6385a622fb618b4a916975
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL
index c86bfe250..33f0a1f63 100644
--- a/ports/rs-core-lib/CONTROL
+++ b/ports/rs-core-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: rs-core-lib
-Version: 2018-07-30
+Version: 2018-09-18
 Description: Minimal common utilities by Ross Smith
 
diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake
index feba9947d..927f34ea6 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 989a68109c28c8a4c9352fd166809f63f2e92ce4
-    SHA512 e4b0b0e20ffc67ed737fd26db9860d111f0a59e9d98b0350f5997225b0536768d9987f0fb75fdb08516b36e266ad11c1a0bd3bab7c14eb65ee18e5cd90ff03cb
+    REF 9ffa126a7ca1a717ffd2c055c5049a15e1507d54
+    SHA512 cdb02c546ff4514b63b3467b3296b0e5353ddcce8b774fa8accfbfd6559ab4a258af4822c219a5ce005719216c0c8c8707d377d2ce3ddb7d7a45fd9501787b60
     HEAD_REF master
 )
 
diff --git a/ports/sais/CONTROL b/ports/sais/CONTROL
new file mode 100644
index 000000000..3c6262c6b
--- /dev/null
+++ b/ports/sais/CONTROL
@@ -0,0 +1,3 @@
+Source: sais
+Version: 2.4.1
+Description: An implementation of the induced sorting algorithm
diff --git a/ports/sais/portfile.cmake b/ports/sais/portfile.cmake
new file mode 100644
index 000000000..0387f1313
--- /dev/null
+++ b/ports/sais/portfile.cmake
@@ -0,0 +1,26 @@
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sais-2.4.1)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://sites.google.com/site/yuta256/sais-2.4.1.zip"
+    FILENAME "sais-2.4.1.zip"
+    SHA512 6f6dd11f842f680bebc1d9b7f6b75752c9589c600fdd5e6373bb7290a686f1de35d4cc3226347e717f89a295363f7fee0ae8b1aa05ad341f4c2ea056fb5b1425
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+    -DBUILD_SAIS64=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/sais RENAME copyright)
diff --git a/ports/shaderc/CMakeLists.txt b/ports/shaderc/CMakeLists.txt
index 580ffa1d1..7ecdd03f9 100644
--- a/ports/shaderc/CMakeLists.txt
+++ b/ports/shaderc/CMakeLists.txt
@@ -15,8 +15,8 @@ ENDIF()
 
 add_library(glslang STATIC IMPORTED GLOBAL)
 set_property(TARGET glslang PROPERTY IMPORTED_LOCATION "${GLSLANG}")
-set(glslang_SOURCE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" CACHE STRING "glslang source dir")
-set_property(TARGET glslang APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+find_path(glslang_SOURCE_DIR glslang/Include/Common)
+set_property(TARGET glslang APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${glslang_SOURCE_DIR}")
 
 add_library(OSDependent STATIC IMPORTED GLOBAL)
 set_property(TARGET OSDependent PROPERTY IMPORTED_LOCATION "${OSDEPENDENT}")
diff --git a/ports/shaderc/CMakeLists_spirv.txt b/ports/shaderc/CMakeLists_spirv.txt
index 618177fa6..d9e013601 100644
--- a/ports/shaderc/CMakeLists_spirv.txt
+++ b/ports/shaderc/CMakeLists_spirv.txt
@@ -1,14 +1,8 @@
-option(SUFFIX_D "Add d Suffix to lib" ${SUFFIX_D})
-if(NOT SUFFIX_D)
-    find_library(SPIRVTOOLSOPT spirv-tools-opt)
-    find_library(SPIRVTOOLS spirv-tools)
-ELSE()
-    find_library(SPIRVTOOLSOPT spirv-tools-opt)
-    find_library(SPIRVTOOLS spirv-tools)
-ENDIF()
+find_library(SPIRVTOOLSOPT SPIRV-Tools-opt)
+find_library(SPIRVTOOLS SPIRV-Tools)
 
 add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
 set_property(TARGET SPIRV-Tools-opt PROPERTY IMPORTED_LOCATION "${SPIRVTOOLSOPT}")
 
 add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_property(TARGET SPIRV-Tools PROPERTY IMPORTED_LOCATION "${SPIRVTOOLS}")
-\ No newline at end of file
+set_property(TARGET SPIRV-Tools PROPERTY IMPORTED_LOCATION "${SPIRVTOOLS}")
diff --git a/ports/shaderc/CONTROL b/ports/shaderc/CONTROL
index 5a5c2c580..c428c0ea9 100644
--- a/ports/shaderc/CONTROL
+++ b/ports/shaderc/CONTROL
@@ -1,4 +1,4 @@
 Source: shaderc
-Version: 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-1
+Version: 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-2
 Description: A collection of tools, libraries and tests for shader compilation.
 Build-Depends: glslang, spirv-tools
diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake
index 2b925455b..d3ed5d023 100644
--- a/ports/shaderc/portfile.cmake
+++ b/ports/shaderc/portfile.cmake
@@ -1,11 +1,3 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
 
 vcpkg_from_github(
@@ -14,11 +6,8 @@ vcpkg_from_github(
     REF 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da
     SHA512 6fb45a0b01e6709c44a11658648b9271fe06bd94023dcc5042c47b5f2a04889c2efb0ab4c166f18728594ac9b9aa9f8b354af46d88eb7f7c39c7246f52f5a933
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH} 
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Do-not-generate-build-version.inc.patch
+    PATCHES
+        0001-Do-not-generate-build-version.inc.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/third_party/glslang)
@@ -36,11 +25,11 @@ endif()
 # shaderc uses python to manipulate copyright information
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
-set(ENV{PATH} "${PYTHON3_EXE_PATH};$ENV{PATH}")
+vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}")
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS -DSHADERC_SKIP_TESTS=true ${OPTIONS}
+    OPTIONS -DSHADERC_SKIP_TESTS=true ${OPTIONS} -Dglslang_SOURCE_DIR=${CURRENT_INSTALLED_DIR}/include
     OPTIONS_DEBUG -DSUFFIX_D=true
     OPTIONS_RELEASE -DSUFFIX_D=false
 )
diff --git a/ports/shiva-sfml/CONTROL b/ports/shiva-sfml/CONTROL
index 8ce55e5ce..0bd2f08c2 100644
--- a/ports/shiva-sfml/CONTROL
+++ b/ports/shiva-sfml/CONTROL
@@ -1,4 +1,4 @@
 Source: shiva-sfml
-Version: 0.9
+Version: 1.0
 Description: shiva-sfml plugins of shiva C++ engine
 Build-Depends: sfml (windows), shiva
diff --git a/ports/shiva-sfml/portfile.cmake b/ports/shiva-sfml/portfile.cmake
index 6d3296b12..d3b8d7d71 100644
--- a/ports/shiva-sfml/portfile.cmake
+++ b/ports/shiva-sfml/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Milerius/shiva
-        REF 0.9
-        SHA512 3086a77377d6cc80eeea78c70f9caab09211e5950720c78c06785002ac80824a75738c7d7b08b69ac3ddc8ca291abd6cf7632ceb6b5783ce2fe79b699ae8a84b
+        REF 1.0
+        SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1
         HEAD_REF master
 	)
 
@@ -12,8 +12,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-          -DSHIVA_BUILD_TESTS=OFF -DSHIVA_USE_SFML_AS_RENDERER=ON -DSHIVA_INSTALL_PLUGINS=ON -DSHIVA_BUILD_EXAMPLES=ON
-          
+          -DSHIVA_BUILD_TESTS=OFF -DSHIVA_USE_SFML_AS_RENDERER=ON -DSHIVA_INSTALL_PLUGINS=ON -DSHIVA_BUILD_EXAMPLES=OFF     
 )
 
 vcpkg_install_cmake()
diff --git a/ports/shiva/CONTROL b/ports/shiva/CONTROL
index 7623964e9..ef9154a29 100644
--- a/ports/shiva/CONTROL
+++ b/ports/shiva/CONTROL
@@ -1,4 +1,4 @@
 Source: shiva
-Version: 0.9
+Version: 1.0
 Description: Modern C++ Game Engine
-Build-Depends: boost-stacktrace, boost-filesystem, boost-dll, entt, eastl, lua (windows), luafilesystem (windows), sol2, pybind11, spdlog
+Build-Depends: boost-stacktrace, boost-filesystem, boost-dll, entt, lua (windows), luafilesystem (windows), sol2, pybind11, spdlog, nlohmann-json
diff --git a/ports/shiva/portfile.cmake b/ports/shiva/portfile.cmake
index 8ae50b610..1f64fa220 100644
--- a/ports/shiva/portfile.cmake
+++ b/ports/shiva/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Milerius/shiva
-        REF 0.9
-        SHA512 3086a77377d6cc80eeea78c70f9caab09211e5950720c78c06785002ac80824a75738c7d7b08b69ac3ddc8ca291abd6cf7632ceb6b5783ce2fe79b699ae8a84b
+        REF 1.0
+        SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1
         HEAD_REF master
 )
 
diff --git a/ports/simpleini/CONTROL b/ports/simpleini/CONTROL
new file mode 100644
index 000000000..b0c70335f
--- /dev/null
+++ b/ports/simpleini/CONTROL
@@ -0,0 +1,3 @@
+Source: simpleini
+Version: 2018-08-31-1
+Description: Cross-platform C++ library providing a simple API to read and write INI-style configuration files
diff --git a/ports/simpleini/portfile.cmake b/ports/simpleini/portfile.cmake
new file mode 100644
index 000000000..508043cd1
--- /dev/null
+++ b/ports/simpleini/portfile.cmake
@@ -0,0 +1,14 @@
+# header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO brofield/simpleini
+    REF fe082fa81f4a55ddceb55056622136be616b3c6f
+    SHA512 9ba3fc0e5d4d426a7943a6783f3e66203d3b822a9ac6bc2b261e877f70e099495ad22e03fd6ad3dd7aab422192701b2b450ace750ebd3bc6b4e6266c6d15184d
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/simpleini.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+file(INSTALL ${SOURCE_PATH}/LICENCE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/simpleini RENAME copyright)
diff --git a/ports/spirv-cross/CONTROL b/ports/spirv-cross/CONTROL
new file mode 100644
index 000000000..cfba267dd
--- /dev/null
+++ b/ports/spirv-cross/CONTROL
@@ -0,0 +1,3 @@
+Source: spirv-cross
+Version: 2018-08-07-1
+Description: SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.
diff --git a/ports/spirv-cross/portfile.cmake b/ports/spirv-cross/portfile.cmake
new file mode 100644
index 000000000..8ed881d41
--- /dev/null
+++ b/ports/spirv-cross/portfile.cmake
@@ -0,0 +1,30 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KhronosGroup/SPIRV-Cross
+    REF 2018-08-07
+    SHA512 1ac6ee6b2864d950199d4e856ae1576f9435827501baa5d53821a973cd68aaa03ec428094bf74c570784997baac5b2e3802ddc7f02844e2ee546741fa726bf91
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+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()
+
+# cleanup
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/spirv-cross/copyright COPYONLY)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake
index 5120dc4f1..11d332a39 100644
--- a/ports/spirv-tools/portfile.cmake
+++ b/ports/spirv-tools/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(WARNING "Dynamic not supported. Building static")
-    set(VCPKG_LIBRARY_LINKAGE "static")
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -23,12 +20,14 @@ vcpkg_from_github(
 
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
+vcpkg_add_to_path("${PYTHON3_DIR}")
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DSPIRV-Headers_SOURCE_DIR=${SPIRV_HEADERS_PATH}
+    OPTIONS
+        -DSPIRV-Headers_SOURCE_DIR=${SPIRV_HEADERS_PATH}
+        -DSPIRV_WERROR=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/strtk/CONTROL b/ports/strtk/CONTROL
index 0c9cf1720..613ee7db1 100644
--- a/ports/strtk/CONTROL
+++ b/ports/strtk/CONTROL
@@ -1,4 +1,4 @@
 Source: strtk
-Version: 2018.05.07-48c9554
+Version: 2018.09.30-b887974
 Description: robust, optimized and portable string processing algorithms for the C++ language
 Build-Depends: boost
diff --git a/ports/strtk/portfile.cmake b/ports/strtk/portfile.cmake
index f98f06930..1fed1a4a6 100644
--- a/ports/strtk/portfile.cmake
+++ b/ports/strtk/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ArashPartow/strtk
-    REF 48c9554b3f079e34205c0af661c81c6f75f1da05
-    SHA512 92a1b34808f20489d9b8c94aed384b08fcf2586967185c23a0027ee6d7170d5998e255d6aedc1fbb68327f48c0b106b8efd39f476e4041d6bcc5685c73fc1015
+    REF b88797408e614ff5a127df12cc520bf41769ada6
+    SHA512 3bb5bfc5f12f46180bc7751b865c5ef9120b3c8764ccc86ca2b4b344d6b9d1744e7bd45e9a9202fe4349f8ce75fbb0c37e807cb1e072f5aef28e790ec94646ca
 )
 
 file(COPY ${SOURCE_PATH}/strtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt
new file mode 100644
index 000000000..cc1dd3933
--- /dev/null
+++ b/ports/tbb/CMakeLists.txt
@@ -0,0 +1,18 @@
+project(tbb CXX)
+
+file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
+
+include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED)
+tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS extra_inc=big_iron.inc)
+
+set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir)
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    set(SUBDIR "${SUBDIR}_release")
+else()
+    set(SUBDIR "${SUBDIR}_debug")
+endif()
+
+file(GLOB OUTPUTS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.*)
+
+install(FILES ${OUTPUTS} DESTINATION lib)
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index e70178a80..e87106dc3 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
 Source: tbb
-Version: 2018_U5
+Version: 2018_U5-4
 Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index 8a66fe2e3..ac47360f8 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -1,91 +1,86 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-if (VCPKG_CRT_LINKAGE STREQUAL static)
-    message(FATAL_ERROR "TBB does not currently support static crt linkage")
+include(vcpkg_common_functions)
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 endif()
 
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO 01org/tbb
     REF 2018_U5
     SHA512 3e8d20276ccb1b50099f96b6cf968e3d0ada53caea1fa836ecb8652f1dca236fbbbf2c783e64ea2f761f7f21725064d19b72d176e35e4dc29706b8a30965153b
-    HEAD_REF tbb_2018)
+    HEAD_REF tbb_2018
+)
 
-if(TRIPLET_SYSTEM_ARCH STREQUAL x86)
-	set(BUILD_ARCH Win32)
-else()
-	set(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
-endif()
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-set(TBB_MSBUILD_PROJECT_DIR ${SOURCE_PATH}/build/vs2013)
+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    vcpkg_configure_cmake(
+        SOURCE_PATH ${SOURCE_PATH}
+        PREFER_NINJA
+    )
 
-vcpkg_build_msbuild(PROJECT_PATH ${TBB_MSBUILD_PROJECT_DIR}/makefile.sln PLATFORM ${BUILD_ARCH})
+    vcpkg_install_cmake()
+
+    # Settings for TBBConfigForSource.cmake.in
+    set(TBB_LIB_EXT a)
+    set(TBB_LIB_PREFIX lib)
+else()
+    if (VCPKG_CRT_LINKAGE STREQUAL static)
+        set(RELEASE_CONFIGURATION Release-MT)
+        set(DEBUG_CONFIGURATION Debug-MT)
+    else()
+        set(RELEASE_CONFIGURATION Release)
+        set(DEBUG_CONFIGURATION Debug)
+    endif()
+
+    vcpkg_install_msbuild(
+        SOURCE_PATH ${SOURCE_PATH}
+        PROJECT_SUBPATH build/vs2013/makefile.sln
+        RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION}
+        DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION}
+    )
+    # Settings for TBBConfigForSource.cmake.in
+    set(TBB_LIB_EXT lib)
+    set(TBB_LIB_PREFIX)
+endif()
 
-# Installation
-message(STATUS "Installing")
 file(COPY
   ${SOURCE_PATH}/include/tbb
   ${SOURCE_PATH}/include/serial
   DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
-set(DEBUG_OUTPUT_PATH ${TBB_MSBUILD_PROJECT_DIR}/${BUILD_ARCH}/Debug)
-set(RELEASE_OUTPUT_PATH ${TBB_MSBUILD_PROJECT_DIR}/${BUILD_ARCH}/Release)
-
-file(COPY
-  ${RELEASE_OUTPUT_PATH}/tbb.lib
-  ${RELEASE_OUTPUT_PATH}/tbbmalloc.lib
-  ${RELEASE_OUTPUT_PATH}/tbbmalloc_proxy.lib
-  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(COPY
-  ${DEBUG_OUTPUT_PATH}/tbb_debug.lib
-  ${DEBUG_OUTPUT_PATH}/tbbmalloc_debug.lib
-  ${DEBUG_OUTPUT_PATH}/tbbmalloc_proxy_debug.lib
-  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-
-file(COPY
-  ${RELEASE_OUTPUT_PATH}/tbb.dll
-  ${RELEASE_OUTPUT_PATH}/tbbmalloc.dll
-  ${RELEASE_OUTPUT_PATH}/tbbmalloc_proxy.dll
-  DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-file(COPY
-  ${DEBUG_OUTPUT_PATH}/tbb_debug.dll
-  ${DEBUG_OUTPUT_PATH}/tbbmalloc_debug.dll
-  ${DEBUG_OUTPUT_PATH}/tbbmalloc_proxy_debug.dll
-  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-
-vcpkg_copy_pdbs()
-
-include(${SOURCE_PATH}/cmake/TBBMakeConfig.cmake)
-tbb_make_config(TBB_ROOT ${CURRENT_PACKAGES_DIR}
-    CONFIG_DIR TBB_CONFIG_DIR # is set to ${CURRENT_PACKAGES_DIR}/cmake
-    SYSTEM_NAME "Windows"
-    CONFIG_FOR_SOURCE
-    TBB_RELEASE_DIR "\${_tbb_root}/bin"
-    TBB_DEBUG_DIR "\${_tbb_root}/debug/bin")
-
-file(COPY ${TBB_CONFIG_DIR}/TBBConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb)
-file(COPY ${TBB_CONFIG_DIR}/TBBConfigVersion.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb)
-file(REMOVE_RECURSE ${TBB_CONFIG_DIR})
+# Settings for TBBConfigForSource.cmake.in
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc)
+else()
+    set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc tbbmalloc_proxy)
+endif()
+file(READ "${SOURCE_PATH}/include/tbb/tbb_stddef.h" _tbb_stddef)
+string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" _tbb_ver_major "${_tbb_stddef}")
+string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" _tbb_ver_minor "${_tbb_stddef}")
+string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_tbb_stddef}")
+set(TBB_VERSION "${_tbb_ver_major}.${_tbb_ver_minor}")
+set(TBB_RELEASE_DIR "\${_tbb_root}/lib")
+set(TBB_DEBUG_DIR "\${_tbb_root}/debug/lib")
 
-# make it work with our installation layout
-file(READ ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake TBB_CONFIG_CMAKE)
-string(REPLACE
-"get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)"
-"get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)
-get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)" TBB_CONFIG_CMAKE "${TBB_CONFIG_CMAKE}")
+configure_file(
+    ${SOURCE_PATH}/cmake/templates/TBBConfigForSource.cmake.in
+    ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake
+    @ONLY
+)
+file(READ ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake _contents)
 string(REPLACE
-"\${_tbb_root}/bin/\${_tbb_component}.lib"
-"\${_tbb_root}/lib/\${_tbb_component}.lib" TBB_CONFIG_CMAKE "${TBB_CONFIG_CMAKE}")
-string(REPLACE
-"\${_tbb_root}/debug/bin/\${_tbb_component}_debug.lib"
-"\${_tbb_root}/debug/lib/\${_tbb_component}_debug.lib" TBB_CONFIG_CMAKE "${TBB_CONFIG_CMAKE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake "${TBB_CONFIG_CMAKE}")
-
-message(STATUS "Installing done")
+    "get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)"
+    "get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)\nget_filename_component(_tbb_root \"\${_tbb_root}\" PATH)"
+    _contents
+    "${_contents}"
+)
+string(REPLACE "SHARED IMPORTED)" "UNKNOWN IMPORTED)" _contents "${_contents}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake "${_contents}")
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb)
+file(COPY ${SOURCE_PATH}/LICENSE ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/tbb/LICENSE ${CURRENT_PACKAGES_DIR}/share/tbb/copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME TBB)
diff --git a/ports/tbb/usage b/ports/tbb/usage
new file mode 100644
index 000000000..ecea9834c
--- /dev/null
+++ b/ports/tbb/usage
@@ -0,0 +1,4 @@
+The package tbb provides CMake targets:
+
+    find_package(TBB CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE TBB::tbb)
diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL
index 6868dfb79..b654f4816 100644
--- a/ports/thrift/CONTROL
+++ b/ports/thrift/CONTROL
@@ -1,4 +1,4 @@
 Source: thrift
-Version: 2018-07-30
+Version: 2018-09-18
 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 5cd296c55..88c74d6e1 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 dabb539d64fb303a443c7962caccc9177669ca80
-    SHA512 5132e1f9d6afbaff736f34f5ab18bd0febed6143fe3042b86f0bab522b22324d10ff1fd3de7cef872fd2d434864ef98126636ad3a1cb4a0aae65ffcbabe4febe
+    REF 12f8b14fff9888dbfe6f5d6c64dc462254922a31
+    SHA512 e067b1e5533f323c7f3f20365388ab4dfd796bca427ec5e087e5bac2ae74412536eec1dea4f694c58e1b9e91763d16a8a07c25daa03676ec33bf8b1107913e47
     HEAD_REF master
 )
 
@@ -42,10 +42,10 @@ vcpkg_install_cmake()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/thrift RENAME copyright)
 
-file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe")
-if(EXES)
-    file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/thrift)
-    file(REMOVE ${EXES})
+file(GLOB COMPILER "${CURRENT_PACKAGES_DIR}/bin/thrift*")
+if(COMPILER)
+    file(COPY ${COMPILER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/thrift)
+    file(REMOVE ${COMPILER})
     vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/thrift)
 endif()
 
diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake
index 5ff4baa92..7062c1ce1 100644
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@@ -1,21 +1,20 @@
 include(vcpkg_common_functions)
 
 set(LIBTIFF_VERSION 4.0.9)
-set(LIBTIFF_HASH 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tiff-${LIBTIFF_VERSION})
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz"
     FILENAME "tiff-${LIBTIFF_VERSION}.tar.gz"
-    SHA512 ${LIBTIFF_HASH}
+    SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-component-options.patch
-            ${CMAKE_CURRENT_LIST_DIR}/fix-cxx-shared-libs.patch
-            ${CMAKE_CURRENT_LIST_DIR}/crt-secure-no-deprecate.patch
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${LIBTIFF_VERSION}
+    PATCHES
+        add-component-options.patch
+        fix-cxx-shared-libs.patch
+        crt-secure-no-deprecate.patch
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
@@ -53,5 +52,8 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff
     RENAME copyright
 )
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff)
 
 vcpkg_copy_pdbs()
+
+vcpkg_test_cmake(PACKAGE_NAME TIFF MODULE)
diff --git a/ports/tiff/usage b/ports/tiff/usage
new file mode 100644
index 000000000..d5312603a
--- /dev/null
+++ b/ports/tiff/usage
@@ -0,0 +1,4 @@
+The package tiff is compatible with built-in CMake targets:
+
+    find_package(TIFF REQUIRED)
+    target_link_libraries(main PRIVATE TIFF::TIFF)
diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake b/ports/tiff/vcpkg-cmake-wrapper.cmake
index fed3875b8..8edcb5e43 100644
--- a/ports/tiff/vcpkg-cmake-wrapper.cmake
+++ b/ports/tiff/vcpkg-cmake-wrapper.cmake
@@ -8,15 +8,16 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
     endif()
 
     find_package(JPEG)
-    list(APPEND TIFF_EXTRA_LIBRARIES ${JPEG_LIBRARIES})
-
     find_package(ZLIB)
 
     if(TARGET TIFF::TIFF)
-        set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${TIFF_EXTRA_LIBRARIES} ZLIB::ZLIB)
+        set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${TIFF_EXTRA_LIBRARIES} JPEG::JPEG ZLIB::ZLIB)
+        if(UNIX)
+            set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES m)
+        endif()
     endif()
     if(TIFF_LIBRARIES)
-        list(APPEND TIFF_LIBRARIES ${TIFF_EXTRA_LIBRARIES} ${ZLIB_LIBRARIES})
+        list(APPEND TIFF_LIBRARIES ${TIFF_EXTRA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
         if(UNIX)
             list(APPEND TIFF_LIBRARIES m)
         endif()
diff --git a/ports/tiny-dnn/CONTROL b/ports/tiny-dnn/CONTROL
index f7f010bc2..2ce2693ac 100644
--- a/ports/tiny-dnn/CONTROL
+++ b/ports/tiny-dnn/CONTROL
@@ -1,3 +1,3 @@
 Source: tiny-dnn
-Version: 2018-07-30
+Version: 2018-09-18
 Description: A C++14 implementation of deep learning. It is suitable for deep learning on limited computational resource.
diff --git a/ports/tiny-dnn/portfile.cmake b/ports/tiny-dnn/portfile.cmake
index daf9457cc..56946f95f 100644
--- a/ports/tiny-dnn/portfile.cmake
+++ b/ports/tiny-dnn/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tiny-dnn/tiny-dnn
-    REF a8de26ad40d955908c5ec4fc946c3c67dd381c6c
-    SHA512 4dc89f038a4dd4bd706077f1c72afdd503fa41edc3b1eb0e8c459c55c9a658d17add98e66dac48914e253df121818da3d277b1a0fac945f22efe9d76d2f9476e
+    REF 1aec6a1ece0ba7a5e018a070bd52e045d49d1411
+    SHA512 173607504cf4e6cc5f70febbfc305dd1fe7168bc6eff82c90d202caa342c3aecf13a3c3cc7f70f4f9674b5649d3a14180fb682742025c408e3e4ea9ec6b99f8a
     HEAD_REF master
 )
 
diff --git a/ports/tinyfiledialogs/CMakeLists.txt b/ports/tinyfiledialogs/CMakeLists.txt
new file mode 100644
index 000000000..4adabaf9a
--- /dev/null
+++ b/ports/tinyfiledialogs/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.4)
+project(tinyfiledialogs C)
+
+add_library(tinyfiledialogs tinyfiledialogs.c)
+
+install(
+    TARGETS tinyfiledialogs
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION bin
+)
diff --git a/ports/tinyfiledialogs/CONTROL b/ports/tinyfiledialogs/CONTROL
new file mode 100644
index 000000000..bb3a2ff33
--- /dev/null
+++ b/ports/tinyfiledialogs/CONTROL
@@ -0,0 +1,3 @@
+Source: tinyfiledialogs
+Version: 3.3.7-1
+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
new file mode 100644
index 000000000..66f1735a8
--- /dev/null
+++ b/ports/tinyfiledialogs/portfile.cmake
@@ -0,0 +1,37 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+set(SHA 03d35a86696859128d41f8b967c1ef3e39c980ce)
+
+vcpkg_download_distfile(HEADERFILE
+    URLS "https://sourceforge.net/p/tinyfiledialogs/code/ci/${SHA}/tree/tinyfiledialogs.h?format=raw"
+    FILENAME "tinyfiledialogs-h-${SHA}"
+    SHA512 e3503165bcbb665c2f09c19591f28eba63e50b8d20fd4e65f31ec6a33742879c007aa7402cfd429ff92a2847534f0f0cc1b979954372be0c6578d49ed5f3e18d
+)
+vcpkg_download_distfile(SOURCEFILE
+    URLS "https://sourceforge.net/p/tinyfiledialogs/code/ci/${SHA}/tree/tinyfiledialogs.c?format=raw"
+    FILENAME "tinyfiledialogs-c-${SHA}"
+    SHA512 263a9fcd11af3dcfd3cd7b6cfaad216cfdd94925639e613d43e7a2dbae2b4387fe8182cd72401e19b2891a08809bc68caece341df28e91b5894cc4b9ecd157f4
+)
+
+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})
+
+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)
+
+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/CONTROL b/ports/tinyspline/CONTROL
new file mode 100644
index 000000000..ef83e311b
--- /dev/null
+++ b/ports/tinyspline/CONTROL
@@ -0,0 +1,3 @@
+Source: tinyspline
+Version: 0.2.0-1
+Description: Library for NURBS, B-Splines, and B?zier curves, allowing you to handle splines with ease
diff --git a/ports/tinyspline/cmake.patch b/ports/tinyspline/cmake.patch
new file mode 100644
index 000000000..2cb6a2602
--- /dev/null
+++ b/ports/tinyspline/cmake.patch
@@ -0,0 +1,29 @@
+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/ports/tinyspline/portfile.cmake b/ports/tinyspline/portfile.cmake
new file mode 100644
index 000000000..a290cf3a7
--- /dev/null
+++ b/ports/tinyspline/portfile.cmake
@@ -0,0 +1,25 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO msteinbeck/tinyspline
+    REF 0.2.0
+    SHA512 50cf4927b311eeca6de7954f1b8d585cbf71355f5e5b0aac2f92f5f4ba37986df16eb3251f94a2304d27dab27d4f6b838b410f53e30de28bab53facf194eb640
+    HEAD_REF master
+    PATCHES
+        cmake.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}/src
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyspline/copyright COPYONLY)
diff --git a/ports/tinyutf8/CONTROL b/ports/tinyutf8/CONTROL
new file mode 100644
index 000000000..e67cee3fc
--- /dev/null
+++ b/ports/tinyutf8/CONTROL
@@ -0,0 +1,3 @@
+Source: tinyutf8
+Version: 2.1.1-1
+Description: TINYUTF8 is a library for extremely easy integration of Unicode into an arbitrary C++11 project.
diff --git a/ports/tinyutf8/fixbuild.patch b/ports/tinyutf8/fixbuild.patch
new file mode 100644
index 000000000..c1798ada1
--- /dev/null
+++ b/ports/tinyutf8/fixbuild.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ec8787..cfea5b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.1)
+ project(tinyutf8)
+ 
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ 
+ option(TINYUTF8_BUILD_STATIC "Build as static library" On)
+ 
+@@ -14,3 +14,14 @@ endif()
+ add_library(tinyutf8 ${LIB_BUILD_TYPE} lib/tinyutf8.cpp)
+ 
+ target_include_directories(tinyutf8 PUBLIC include)
++
++if(MSVC)
++    ADD_DEFINITIONS(-D_UNICODE)
++endif()
++
++install(TARGETS tinyutf8
++    RUNTIME DESTINATION bin
++    ARCHIVE DESTINATION lib
++    LIBRARY DESTINATION lib)
++
++install(FILES include/tinyutf8.h DESTINATION include)
+\ No newline at end of file
diff --git a/ports/tinyutf8/portfile.cmake b/ports/tinyutf8/portfile.cmake
new file mode 100644
index 000000000..c768260c9
--- /dev/null
+++ b/ports/tinyutf8/portfile.cmake
@@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DuffsDevice/tinyutf8
+    REF v2.1.1
+    SHA512 0be9cebe1ac962c89e0620586d4f8d4f3059b52394e13506f19723855d146c35e6a1205ae5430a53ba95a89c60216054bfad9c4e8e8f1ec047f4096585de2efc
+    HEAD_REF master
+    PATCHES fixbuild.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TINYUTF8_BUILD_STATIC)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DTINYUTF8_BUILD_STATIC=${TINYUTF8_BUILD_STATIC}
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENCE ${CURRENT_PACKAGES_DIR}/share/tinyutf8/copyright COPYONLY)
+
+# remove unneeded files
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/tl-expected/CONTROL b/ports/tl-expected/CONTROL
new file mode 100644
index 000000000..440efe9fa
--- /dev/null
+++ b/ports/tl-expected/CONTROL
@@ -0,0 +1,3 @@
+Source: tl-expected
+Version: 0.3-1
+Description: C++11/14/17 std::expected implementation with functional-style extensions 
diff --git a/ports/tl-expected/portfile.cmake b/ports/tl-expected/portfile.cmake
new file mode 100644
index 000000000..95a4861c2
--- /dev/null
+++ b/ports/tl-expected/portfile.cmake
@@ -0,0 +1,15 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO TartanLlama/expected
+    REF v0.3
+    SHA512 a228399f7103020ed814f1c755b82cf831b3d8c6aaa23dbc3aedc226b3cbd39c22075952dda3af84c8cf6f74ab1131c6997a2431ee62314bd82ccafdc9ab23a3
+    HEAD_REF master
+)
+
+# Install header file
+file(INSTALL ${SOURCE_PATH}/tl DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-expected RENAME copyright)
diff --git a/ports/tmx/CONTROL b/ports/tmx/CONTROL
new file mode 100644
index 000000000..9079cb85e
--- /dev/null
+++ b/ports/tmx/CONTROL
@@ -0,0 +1,4 @@
+Source: tmx
+Version: 1.0.0
+Description: A portable C library to load tiled maps in your games.
+Build-Depends: zlib, libxml2
diff --git a/ports/tmx/portfile.cmake b/ports/tmx/portfile.cmake
new file mode 100644
index 000000000..b3f70f4d1
--- /dev/null
+++ b/ports/tmx/portfile.cmake
@@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO baylej/tmx
+    REF tmx_1.0.0
+    HEAD_REF master
+    SHA512 d045c45efd03f91a81dae471cb9ddc80d222b3ac52e13b729deeaf3e07d0a03b8e0956b30336ef410c72ddbbf33bea6811da5454b88d44b1db75683ef2a9383a
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxExports.cmake ${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxTargets.cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/tmx")
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/tmx/tmxTargets.cmake ${CURRENT_PACKAGES_DIR}/share/tmx/tmxExports.cmake)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/tmx/copyright COPYONLY)
diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL
index 7fec5c07a..f6a3bc9c0 100644
--- a/ports/unicorn-lib/CONTROL
+++ b/ports/unicorn-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: unicorn-lib
-Version: 2018-07-30
+Version: 2018-09-18
 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 c62fe70bc..3b97d3c01 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 6d33ec8d828c3740cc6fd66ef03f395526450ad6
-    SHA512 4f802b4889e0683bd156a3dcc670cff737b532169f092d99434e2877b152bd2963984000a00bf928e11ba5142e10c5af8e0986f2c92fa6b7251d53cb688bd96a
+    REF 6456df41b6dfeecd35ec1d50eb86657512c76c40
+    SHA512 04756035039b93905713e7c7f2fac66d545f3792d39b9c2c95946c4423a9e1bdef7fe736488764800f494570a3e9a83adc84b60a750bf62b2af4508671f76afe
     HEAD_REF master
 )
 
diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL
index 74a6c282d..80d33202c 100644
--- a/ports/unicorn/CONTROL
+++ b/ports/unicorn/CONTROL
@@ -1,3 +1,3 @@
 Source: unicorn
-Version: 2018-07-30
+Version: 2018-09-18
 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 272dc0bc1..2a52c6be6 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 e3af0d086dc58f3a25f45da2446f99c13a63885e
-    SHA512 0049efa4ca7a1f40d03872bd310766f56bb4c5456544b0d50f78dcc149ac5e62f2e5ba9b1f651d92b4d8ac42780029f3b8ae5f2d7da3295d507226bfa592b8e6
+    REF 46999575fb9e82ccd925e835d0d7db47200e010d
+    SHA512 9a93157266f2f6b7f5b6fabefda77b4d617648f0112ff6b575be8c92eea16ea6c96b0575f040fd5a893240907492335c53c03c840fee58ca8808b39762fefc34
     HEAD_REF master
 )
 
diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL
index 553d44de9..4a2789309 100644
--- a/ports/uriparser/CONTROL
+++ b/ports/uriparser/CONTROL
@@ -1,3 +1,3 @@
 Source: uriparser
-Version: 0.8.5
+Version: 0.8.6
 Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode
diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake
index cb8f1b14a..262c43592 100644
--- a/ports/uriparser/portfile.cmake
+++ b/ports/uriparser/portfile.cmake
@@ -1,11 +1,10 @@
-
 include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uriparser/uriparser
-    REF uriparser-0.8.5
-    SHA512 b5a4eb316b96bdd5b87cac9fdd30b8988c158914e71030a45aafabd04df67a94bba9696782d98e9fa2169baf351e95ab1479bc76d8afe37968a941bc27a3ffb6
+    REF uriparser-0.8.6
+    SHA512 281063a3cde215142305815b6469f96fe670d3693ae1add36683368c8b7e8fb04624bfb9a57770f0c5b8b5586419cb713a6d98aa29c34b9b2382682a71bff084
     HEAD_REF master
 )
 
diff --git a/ports/usbmuxd/portfile.cmake b/ports/usbmuxd/portfile.cmake
index 56066e19e..34768cf88 100644
--- a/ports/usbmuxd/portfile.cmake
+++ b/ports/usbmuxd/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     REPO libimobiledevice-win32/usbmuxd
     REF 1.1.1.133
     SHA512 1a5f9abc239deeb15e2aab419ba9e88ef41ffa80396546fb65bc06b0f419cbabc80cdf95995caf71d5628d1537fb0329a73d923202e91ea43fcc7c32b840d047
-    HEAD_REF master
+    HEAD_REF master-msvc
 )
 
 vcpkg_install_msbuild(
diff --git a/ports/usrsctp/CONTROL b/ports/usrsctp/CONTROL
new file mode 100644
index 000000000..5e5f172ba
--- /dev/null
+++ b/ports/usrsctp/CONTROL
@@ -0,0 +1,3 @@
+Source: usrsctp
+Version: 35c1d97020a
+Description: This is a userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows.
diff --git a/ports/usrsctp/portfile.cmake b/ports/usrsctp/portfile.cmake
new file mode 100644
index 000000000..863b3f75c
--- /dev/null
+++ b/ports/usrsctp/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 sctplab/usrsctp
+    REF 35c1d97020a20014b989bba4f20225fd9429c4f4
+    SHA512 18786825ec2c8c8aeb6b0bcab97deeac40420f7a9bdb427c891b26633ff759266409381ae2545c5572a740322ae1a56f80da1a784d71e50fce97177c343d27ce
+    HEAD_REF master
+)
+
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(GLOB_RECURSE release_dlls ${CURRENT_PACKAGES_DIR}/lib/*.dll)
+file(GLOB_RECURSE debug_dlls ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
+
+if(release_dlls)
+  file(REMOVE ${release_dlls})
+endif()
+if(debug_dlls)
+  file(REMOVE ${debug_dlls})
+endif()
+
+
+file(INSTALL  ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/usrsctp RENAME copyright)
diff --git a/ports/vulkan-memory-allocator/CONTROL b/ports/vulkan-memory-allocator/CONTROL
new file mode 100644
index 000000000..ec6c0757a
--- /dev/null
+++ b/ports/vulkan-memory-allocator/CONTROL
@@ -0,0 +1,3 @@
+Source: vulkan-memory-allocator
+Version: 2.1.0-1
+Description: Easy to integrate Vulkan memory allocation library from GPUOpen
diff --git a/ports/vulkan-memory-allocator/portfile.cmake b/ports/vulkan-memory-allocator/portfile.cmake
new file mode 100644
index 000000000..c72af8935
--- /dev/null
+++ b/ports/vulkan-memory-allocator/portfile.cmake
@@ -0,0 +1,15 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
+    REF v2.1.0
+    SHA512 4d7d431d52503d4d448a8b571935678a8a04d8f4a7eceb6ad49cde4f78954e7a2a0a91e48c75382699a62d81cf00601aaa0a358d979ed8e14741a9956484b51e
+    HEAD_REF master
+)
+
+file(COPY "${SOURCE_PATH}/src/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-vulkan-memory-allocator)
+
+configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan-memory-allocator/copyright COPYONLY)
diff --git a/ports/vulkan-memory-allocator/unofficial-vulkan-memory-allocator-config.cmake b/ports/vulkan-memory-allocator/unofficial-vulkan-memory-allocator-config.cmake
new file mode 100644
index 000000000..fc9f62550
--- /dev/null
+++ b/ports/vulkan-memory-allocator/unofficial-vulkan-memory-allocator-config.cmake
@@ -0,0 +1,8 @@
+
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+
+add_library(unofficial::vulkan-memory-allocator::vulkan-memory-allocator INTERFACE IMPORTED)
+set_target_properties(unofficial::vulkan-memory-allocator::vulkan-memory-allocator PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include")
+set(_IMPORT_PREFIX)
diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
new file mode 100644
index 000000000..9397b3d61
--- /dev/null
+++ b/ports/wangle/CONTROL
@@ -0,0 +1,4 @@
+Source: wangle
+Version: v2018.07.30.00-1
+Build-Depends: folly, openssl, gtest, glog, libevent, double-conversion
+Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.
+\ No newline at end of file
diff --git a/ports/wangle/build.patch b/ports/wangle/build.patch
new file mode 100644
index 000000000..fce998fed
--- /dev/null
+++ b/ports/wangle/build.patch
@@ -0,0 +1,54 @@
+diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
+index 0302249..3bf1e6c 100644
+--- a/wangle/CMakeLists.txt
++++ b/wangle/CMakeLists.txt
+@@ -38,9 +38,9 @@ endif()
+ 
+ find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context)
+ find_package(OpenSSL REQUIRED)
+-find_package(Glog REQUIRED)
+-find_package(Gflags REQUIRED)
+-find_package(Libevent REQUIRED)
++find_package(Glog CONFIG REQUIRED)
++find_package(Gflags CONFIG REQUIRED)
++find_package(Libevent CONFIG REQUIRED)
+ find_package(DoubleConversion REQUIRED)
+ find_package(Threads REQUIRED)
+ if (UNIX AND NOT APPLE)
+@@ -116,11 +116,9 @@ if (BUILD_SHARED_LIBS)
+     PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 1)
+ endif()
+ 
+-target_include_directories(
+-  wangle
+-  PUBLIC
+-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>
+-    $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
++include_directories(
++   "${CMAKE_SOURCE_DIR}/.."
++   ${INCLUDE_INSTALL_DIR}
+     ${FOLLY_INCLUDE_DIR}
+     ${Boost_INCLUDE_DIR}
+     ${OPENSSL_INCLUDE_DIR}
+@@ -143,15 +141,19 @@ target_link_libraries(wangle PUBLIC
+ install(
+   TARGETS wangle
+   EXPORT wangle-exports
+-  DESTINATION ${LIB_INSTALL_DIR}
++  RUNTIME DESTINATION bin
++  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib
+ )
+ # We unfortunately cannot install wangle's headers with the install()
+ # statement above.  install(TARGETS) appears to only support installing
+ # PUBLIC_HEADER in a flat include directory, and not a deeper tree.
++if(NOT DISABLE_INSTALL_HEADERS)
+ foreach(dir ${WANGLE_HEADER_DIRS})
+-  install(DIRECTORY ${dir} DESTINATION "${INCLUDE_INSTALL_DIR}/wangle"
++  install(DIRECTORY ${dir} DESTINATION "include/wangle"
+           FILES_MATCHING PATTERN "*.h")
+ endforeach()
++endif()
+ 
+ # Install CMake package configuration files for wangle
+ include(CMakePackageConfigHelpers)
diff --git a/ports/wangle/gflags.patch b/ports/wangle/gflags.patch
new file mode 100644
index 000000000..20921c72c
--- /dev/null
+++ b/ports/wangle/gflags.patch
@@ -0,0 +1,31 @@
+diff --git a/wangle/cmake/FindGflags.cmake b/wangle/cmake/FindGflags.cmake
+index 0243aa3..be3780f 100644
+--- a/wangle/cmake/FindGflags.cmake
++++ b/wangle/cmake/FindGflags.cmake
+@@ -7,19 +7,11 @@
+ 
+ include(FindPackageHandleStandardArgs)
+ 
+-find_library(GFLAGS_LIBRARY gflags
+-  PATHS ${GFLAGS_LIBRARYDIR})
++find_package(gflags CONFIG REQUIRED)
+ 
+-find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h
+-  PATHS ${GFLAGS_INCLUDEDIR})
+-
+-find_package_handle_standard_args(gflags DEFAULT_MSG
+-  GFLAGS_LIBRARY
+-  GFLAGS_INCLUDE_DIR)
+-
+-mark_as_advanced(
+-  GFLAGS_LIBRARY
+-  GFLAGS_INCLUDE_DIR)
+-
+-set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY})
+-set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR})
++if(TARGET gflags_static)
++  set(GFLAGS_LIBRARIES gflags_static)
++else()
++  set(GFLAGS_LIBRARIES gflags_shared)
++endif()
++set(GFLAGS_INCLUDE_DIRS)
diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
new file mode 100644
index 000000000..8bd8e8c63
--- /dev/null
+++ b/ports/wangle/portfile.cmake
@@ -0,0 +1,35 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO facebook/wangle
+    REF v2018.07.30.00
+    SHA512 f83378a8751b47fac2c862e07ffeb2750fd681735e66d778657d7624fe3e839b2e2bfcb049ecd3a3516c206d93f9c168144599ded823720967e44037b536ba5d
+    HEAD_REF master
+    PATCHES
+        build.patch
+        gflags.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH "${SOURCE_PATH}/wangle"
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTS=OFF
+    OPTIONS_DEBUG
+        -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/wangle")
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE 
+    ${CURRENT_PACKAGES_DIR}/include/wangle/util/test
+    ${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs
+    ${CURRENT_PACKAGES_DIR}/include/wangle/service/test
+    ${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test
+)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wangle RENAME copyright)
diff --git a/ports/woff2/CONTROL b/ports/woff2/CONTROL
new file mode 100644
index 000000000..e4e6511ca
--- /dev/null
+++ b/ports/woff2/CONTROL
@@ -0,0 +1,4 @@
+Source: woff2
+Version: 1.0.2
+Build-Depends: brotli
+Description: font compression reference code
diff --git a/ports/woff2/portfile.cmake b/ports/woff2/portfile.cmake
new file mode 100644
index 000000000..41efbba0a
--- /dev/null
+++ b/ports/woff2/portfile.cmake
@@ -0,0 +1,32 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(
+  ONLY_STATIC_LIBRARY
+)
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO google/woff2
+  REF v1.0.2
+  SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
+  HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/ DESTINATION ${CURRENT_PACKAGES_DIR}/tools/woff2)
+file(REMOVE_RECURSE
+  ${CURRENT_PACKAGES_DIR}/bin
+  ${CURRENT_PACKAGES_DIR}/debug/bin
+  ${CURRENT_PACKAGES_DIR}/debug/include
+)
+
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/woff2)
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/woff2 RENAME copyright)
diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL
index de121050a..ff99b10b5 100644
--- a/ports/wt/CONTROL
+++ b/ports/wt/CONTROL
@@ -1,4 +1,4 @@
 Source: wt
-Version: 4.0.3-1
+Version: 4.0.4
 Description: Wt is a C++ library for developing web applications
 Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess
diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake
index b33e9110b..614480168 100644
--- a/ports/wt/portfile.cmake
+++ b/ports/wt/portfile.cmake
@@ -3,17 +3,13 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO emweb/wt
-    REF 4.0.3
-    SHA512 5985f72cbd3065ac696aad4d11711f2d69e066ee17141b56fd7c2616c7f7353586ab8d13db2baa90fa8f3cb116aa7c9044ee3cc42e99e8f5c8704f886ac3b2b6
+    REF 4.0.4
+    SHA512 7f9fee9b1c145adb610bf9b0860867a2f09699a1c914418938955c5648b3207db361ec48b3afe9e6faa6cc0b5874bedd44481fdd8adb8fc558cfc3dc17369ee7
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001-boost-1.66.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0002-link-glew.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0003-disable-boost-autolink.patch
+        0001-boost-1.66.patch
+        0002-link-glew.patch
+        0003-disable-boost-autolink.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS)
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL
index 245fb8f7f..44b664142 100644
--- a/ports/x264/CONTROL
+++ b/ports/x264/CONTROL
@@ -1,3 +1,3 @@
 Source: x264
-Version: 152-e9a5903edf8ca59-1
+Version: 157-303c484ec828ed0
 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format
diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake
index d5f85ecdd..67d7ab087 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -1,12 +1,12 @@
 include(vcpkg_common_functions)
 
-set(X264_VERSION 152)
+set(X264_VERSION 157)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mirror/x264
-    REF e9a5903edf8ca59ef20e6f4894c196f135af735e
-    SHA512 063da238264b33ab7ccf097c1f8a7d6b1bf1f0777b433ccbb6ab98090f050fa4d289eeff37b701b8fd7fb5ad460b7fa13d61b68b3f397bc78a8eaa50379e4878
+    REF 303c484ec828ed0d8bfe743500e70314d026c3bd
+    SHA512 faf210a3f9543028ed882c8348b243dd7ae6638e7b3ef43bec1326b717f23370f57c13d0ddb5e1ae94411088a2e33031a137b68ae9f64c18f8f33f601a0da54d
     HEAD_REF master
 )
 
diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL
index 339bd7954..80606821b 100644
--- a/ports/xlnt/CONTROL
+++ b/ports/xlnt/CONTROL
@@ -1,3 +1,3 @@
 Source: xlnt
-Version: 1.2.0-2
+Version: 1.3.0-1
 Description: Cross-platform user-friendly xlsx library for C++14
diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake
index 060227b2a..29a0e2201 100644
--- a/ports/xlnt/portfile.cmake
+++ b/ports/xlnt/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tfussell/xlnt
-    REF v1.2.0
-    SHA512 e95eeb23ffe0bd68081a3a1dccfc2164697d4fac4386ddb9cc1029180a499de250c28df34d1b3971ff26e95a55d822f43efe032aa989321ee29d3d3e7a8b5587
+    REF v1.3.0
+    SHA512 716b93a6138daf1e293980a3c26801bfd00aa713afdd9cbe9be672ccff8c86b69b26eb0f3e8259bd0844e04d0e6148b64467d7db6815c76ecf412715d506786f
     HEAD_REF master
 )
 
diff --git a/ports/yara/CMakeLists.txt b/ports/yara/CMakeLists.txt
index 783d322fb..89780ce42 100644
--- a/ports/yara/CMakeLists.txt
+++ b/ports/yara/CMakeLists.txt
@@ -17,12 +17,28 @@ include_directories(
   libyara/include
 )
 
+set(PROC_PLATFORM_SOURCE "libyara/proc/none.c")
+set(PROC_PLATFORM_INTERFACE "USE_NO_PROC")
+
+if(APPLE AND CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  set(PROC_PLATFORM_SOURCE "libyara/proc/mach.c")
+  set(PROC_PLATFORM_INTERFACE "USE_MACH_PROC")
+elseif(WIN32 OR MINGW OR CYGWIN)
+  set(PROC_PLATFORM_SOURCE "libyara/proc/windows.c")
+  set(PROC_PLATFORM_INTERFACE "USE_WINDOWS_PROC")
+elseif(UNIX AND CMAKE_SYSTEM_NAME MATCHES "Linux")
+  set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+  set(PROC_PLATFORM_SOURCE "libyara/proc/linux.c")
+  set(PROC_PLATFORM_INTERFACE "USE_LINUX_PROC")
+endif()
+
 set(
   libyara_sources
   libyara/ahocorasick.c
   libyara/arena.c
   libyara/atoms.c
   libyara/compiler.c
+  libyara/endian.c
   libyara/exec.c
   libyara/exefiles.c
   libyara/filemap.c
@@ -47,13 +63,14 @@ set(
   libyara/object.c
   libyara/parser.c
   libyara/proc.c
-  libyara/proc/windows.c
+  ${PROC_PLATFORM_SOURCE}  
   libyara/re.c
   libyara/re_grammar.c
   libyara/re_lexer.c
   libyara/rules.c
   libyara/scan.c
   libyara/sizedstr.c
+  libyara/stopwatch.c
   libyara/stream.c
   libyara/strutils.c
   libyara/threading.c
@@ -70,22 +87,40 @@ set( yarac_sources
   yarac.c
 )
 
-add_library(libyara ${libyara_sources})
 
-target_link_libraries(libyara PRIVATE OpenSSL::SSL OpenSSL::Crypto ${JANSSON_LIBRARY})
-target_compile_definitions(
-  libyara
-  PRIVATE
-  -DHAVE_LIBCRYPTO -DUSE_WINDOWS_PROC
-  -DCUCKOO_MODULE- DHASH_MODULE -DDOTNET_MODULE
+find_package(Threads REQUIRED)
+
+set(
+  libyara_dependencies 
+  OpenSSL::SSL
+  OpenSSL::Crypto 
+  Threads::Threads
+  ${JANSSON_LIBRARY}
 )
 
+if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
+  list(APPEND libyara_dependencies m)
+endif()
+
+set(
+  libyara_definitions
+  -DHAVE_LIBCRYPTO
+  -D${PROC_PLATFORM_INTERFACE}
+  -DCUCKOO_MODULE
+  -DHASH_MODULE
+  -DDOTNET_MODULE
+)
+
+add_library(libyara ${libyara_sources})
+target_link_libraries(libyara PRIVATE ${libyara_dependencies})
+target_compile_definitions(libyara PRIVATE ${libyara_definitions})
+
 
 add_executable(yara  ${yara_sources})
 add_executable(yarac  ${yarac_sources})
 
-target_link_libraries(yarac PRIVATE libyara OpenSSL::SSL OpenSSL::Crypto ${JANSSON_LIBRARY})
-target_link_libraries(yara PRIVATE libyara OpenSSL::SSL OpenSSL::Crypto ${JANSSON_LIBRARY})
+target_link_libraries(yarac PRIVATE libyara ${libyara_dependencies})
+target_link_libraries(yara PRIVATE libyara ${libyara_dependencies})
 
 install(
   TARGETS libyara
diff --git a/ports/yara/CONTROL b/ports/yara/CONTROL
index 8772a00c6..fb29eaad0 100644
--- a/ports/yara/CONTROL
+++ b/ports/yara/CONTROL
@@ -1,4 +1,4 @@
 Source: yara
-Version: e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9
+Version: e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-1
 Description: The pattern matching swiss knife
 Build-Depends: openssl, jansson
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL
index d2de1a290..ba419fb39 100644
--- a/ports/zeromq/CONTROL
+++ b/ports/zeromq/CONTROL
@@ -1,3 +1,3 @@
 Source: zeromq
-Version: 2018-07-30
+Version: 2018-09-18
 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 0f6add1a9..188eb0918 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 da8024d3c9bb9ee5fa7f0f2e9d05f7e01db73cbf
-    SHA512 2585e784eeb9b79ec2e83eae302593f8da4542d28e53dc6975447d6e44532baedb7145569712e8c76ab3972a3d46585e017dfeb895a45954f20b979f485d9647
+    REF ea517a28ff23cff24a3b2ead42e1f6a44e6fad0e
+    SHA512 11425b151192b39e770ece1df3139b99315a4647ec242e951b736cc232da79a0b80f635b071d87adaa7d3f6d4266ab67d31b8f95f31fe3ab278e53febc5ae796
     HEAD_REF master
 )
 
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
index d924e2135..bc36b2781 100644
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@@ -43,3 +43,5 @@ file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DI
 vcpkg_copy_pdbs()
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+vcpkg_test_cmake(PACKAGE_NAME ZLIB MODULE)
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 5554ddc1e..7ebbb2930 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -349,6 +349,7 @@ $arguments = (
 "/p:Platform=$platform",
 "/p:PlatformToolset=$platformToolset",
 "/p:TargetPlatformVersion=$windowsSDK",
+"/p:PreferredToolArchitecture=x64",
 "/verbosity:minimal",
 "/m",
 "/nologo",
diff --git a/scripts/cleanEnvironmentHelper.ps1 b/scripts/cleanEnvironmentHelper.ps1
index 0a133f5f8..a3792ecd3 100644
--- a/scripts/cleanEnvironmentHelper.ps1
+++ b/scripts/cleanEnvironmentHelper.ps1
@@ -17,7 +17,7 @@ foreach ($name in $nameSet)
     }
 
     # PATH needs to be concatenated as it has values in both machine and user environment. Any other values should be set.
-    if ($name -match 'path')
+    if ($name -eq 'path')
     {
         $pathValuePartial = @()
         # Machine values before user values
diff --git a/scripts/cmake/vcpkg_append_to_path.cmake b/scripts/cmake/vcpkg_append_to_path.cmake
new file mode 100644
index 000000000..6890dfe31
--- /dev/null
+++ b/scripts/cmake/vcpkg_append_to_path.cmake
@@ -0,0 +1,41 @@
+## # vcpkg_add_to_path
+##
+## Add a directory to the PATH environment variable
+##
+## ## Usage
+## ```cmake
+## vcpkg_add_to_path([PREPEND] <${PYTHON3_DIR}>)
+## ```
+##
+## ## Parameters
+## ### <positional>
+## The directory to add
+##
+## ### PREPEND
+## Prepends the directory.
+##
+## The default is to append.
+function(vcpkg_add_to_path)
+    if(NOT "${ARGC}" STREQUAL "1" AND NOT "${ARGC}" STREQUAL "2")
+        message(FATAL_ERROR "vcpkg_add_to_path() only accepts 1 or 2 arguments.")
+    endif()
+    if("${ARGV0}" STREQUAL "PREPEND")
+        if(NOT "${ARGC}" STREQUAL "2")
+            message(FATAL_ERROR "Expected second argument.")
+        endif()
+        if(CMAKE_HOST_WIN32)
+            set(ENV{PATH} "${ARGV1};$ENV{PATH}")
+        else()
+            set(ENV{PATH} "${ARGV1}:$ENV{PATH}")
+        endif()
+    else()
+        if(NOT "${ARGC}" STREQUAL "1")
+            message(FATAL_ERROR "Unexpected second argument: ${ARGV1}")
+        endif()
+        if(CMAKE_HOST_WIN32)
+            set(ENV{PATH} "$ENV{PATH};${ARGV0}")
+        else()
+            set(ENV{PATH} "$ENV{PATH}:${ARGV0}")
+        endif()
+    endif()
+endfunction()
+\ No newline at end of file
diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake
index 6677af00a..90a3e2814 100644
--- a/scripts/cmake/vcpkg_common_functions.cmake
+++ b/scripts/cmake/vcpkg_common_functions.cmake
@@ -1,4 +1,5 @@
 include(vcpkg_acquire_msys)
+include(vcpkg_append_to_path)
 include(vcpkg_check_linkage)
 include(vcpkg_download_distfile)
 include(vcpkg_extract_source_archive)
@@ -24,4 +25,5 @@ include(vcpkg_copy_tool_dependencies)
 include(vcpkg_get_program_files_32_bit)
 include(vcpkg_get_program_files_platform_bitness)
 include(vcpkg_get_windows_sdk)
-include(vcpkg_replace_string)
-\ No newline at end of file
+include(vcpkg_replace_string)
+include(vcpkg_test_cmake)
diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake
index db3e45594..949036c88 100644
--- a/scripts/cmake/vcpkg_download_distfile.cmake
+++ b/scripts/cmake/vcpkg_download_distfile.cmake
@@ -68,7 +68,12 @@ function(vcpkg_download_distfile VAR)
     set(downloaded_file_path ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME})
     set(download_file_path_part "${DOWNLOADS}/temp/${vcpkg_download_distfile_FILENAME}")
 
-    file(REMOVE_RECURSE "${DOWNLOADS}/temp")
+    # Works around issue #3399
+    if(IS_DIRECTORY "${DOWNLOADS}/temp")
+        file(REMOVE_RECURSE "${DOWNLOADS}/temp0")
+        file(RENAME "${DOWNLOADS}/temp" "${DOWNLOADS}/temp0")
+        file(REMOVE_RECURSE "${DOWNLOADS}/temp0")
+    endif()
     file(MAKE_DIRECTORY "${DOWNLOADS}/temp")
 
     function(test_hash FILE_PATH FILE_KIND CUSTOM_ERROR_ADVICE)
diff --git a/scripts/cmake/vcpkg_extract_source_archive.cmake b/scripts/cmake/vcpkg_extract_source_archive.cmake
index 3aafd4ca4..da0ac611a 100644
--- a/scripts/cmake/vcpkg_extract_source_archive.cmake
+++ b/scripts/cmake/vcpkg_extract_source_archive.cmake
@@ -29,25 +29,19 @@
 ## * [msgpack](https://github.com/Microsoft/vcpkg/blob/master/ports/msgpack/portfile.cmake)
 include(vcpkg_execute_required_process)
 
-function(vcpkg_extract_source_archive_ex)
-    cmake_parse_arguments(_vesae "" "ARCHIVE;WORKING_DIRECTORY" "" ${ARGN})
-
-    if(NOT _vesae_ARCHIVE)
-        message(FATAL_ERROR "Must specify ARCHIVE parameter to vcpkg_extract_source_archive_ex()")
-    endif()
-
-    if(DEFINED _vesae_WORKING_DIRECTORY)
-        set(WORKING_DIRECTORY ${_vesae_WORKING_DIRECTORY})
+function(vcpkg_extract_source_archive ARCHIVE)
+    if(NOT ARGC EQUAL 2)
+        set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src")
     else()
-        set(WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src)
+        set(WORKING_DIRECTORY ${ARGV1})
     endif()
 
-    get_filename_component(ARCHIVE_FILENAME ${_vesae_ARCHIVE} NAME)
+    get_filename_component(ARCHIVE_FILENAME "${ARCHIVE}" NAME)
     if(NOT EXISTS ${WORKING_DIRECTORY}/${ARCHIVE_FILENAME}.extracted)
-        message(STATUS "Extracting source ${_vesae_ARCHIVE}")
+        message(STATUS "Extracting source ${ARCHIVE}")
         file(MAKE_DIRECTORY ${WORKING_DIRECTORY})
         vcpkg_execute_required_process(
-            COMMAND ${CMAKE_COMMAND} -E tar xjf ${_vesae_ARCHIVE}
+            COMMAND ${CMAKE_COMMAND} -E tar xjf ${ARCHIVE}
             WORKING_DIRECTORY ${WORKING_DIRECTORY}
             LOGNAME extract
         )
@@ -55,13 +49,81 @@ function(vcpkg_extract_source_archive_ex)
     endif()
 endfunction()
 
-function(vcpkg_extract_source_archive ARCHIVE)
-    if(NOT ARGC EQUAL 2)
-        vcpkg_extract_source_archive_ex(ARCHIVE ${ARCHIVE})
-    else()
-        vcpkg_extract_source_archive_ex(
-            ARCHIVE ${ARCHIVE}
-            WORKING_DIRECTORY ${ARGV1}
+function(vcpkg_extract_source_archive_ex)
+    cmake_parse_arguments(_vesae "NO_REMOVE_ONE_LEVEL" "OUT_SOURCE_PATH;ARCHIVE;REF;WORKING_DIRECTORY" "PATCHES" ${ARGN})
+
+    if(NOT _vesae_ARCHIVE)
+        message(FATAL_ERROR "Must specify ARCHIVE parameter to vcpkg_extract_source_archive_ex()")
+    endif()
+
+    if(NOT DEFINED _vesae_OUT_SOURCE_PATH)
+        message(FATAL_ERROR "Must specify OUT_SOURCE_PATH parameter to vcpkg_extract_source_archive_ex()")
+    endif()
+
+    if(NOT DEFINED _vesae_WORKING_DIRECTORY)
+        set(_vesae_WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src)
+    endif()
+
+    if(NOT DEFINED _vesae_REF)
+        get_filename_component(_vesae_REF ${_vesae_ARCHIVE} NAME_WE)
+    endif()
+
+    string(REPLACE "/" "-" SANITIZED_REF "${_vesae_REF}")
+
+    # Take the last 10 chars of the REF
+    set(REF_MAX_LENGTH 10)
+    string(LENGTH ${SANITIZED_REF} REF_LENGTH)
+    math(EXPR FROM_REF ${REF_LENGTH}-${REF_MAX_LENGTH})
+    if(FROM_REF LESS 0)
+        set(FROM_REF 0)
+    endif()
+    string(SUBSTRING ${SANITIZED_REF} ${FROM_REF} ${REF_LENGTH} SHORTENED_SANITIZED_REF)
+
+    # Hash the archive hash along with the patches. Take the first 10 chars of the hash
+    file(SHA512 ${_vesae_ARCHIVE} PATCHSET_HASH)
+    foreach(PATCH IN LISTS _vesae_PATCHES)
+        get_filename_component(ABSOLUTE_PATCH "${PATCH}" ABSOLUTE BASE_DIR "${CURRENT_PORT_DIR}")
+        file(SHA512 ${ABSOLUTE_PATCH} CURRENT_HASH)
+        string(APPEND PATCHSET_HASH ${CURRENT_HASH})
+    endforeach()
+
+    string(SHA512 PATCHSET_HASH ${PATCHSET_HASH})
+    string(SUBSTRING ${PATCHSET_HASH} 0 10 PATCHSET_HASH)
+    set(SOURCE_PATH "${_vesae_WORKING_DIRECTORY}/${SHORTENED_SANITIZED_REF}-${PATCHSET_HASH}")
+
+    if(NOT EXISTS ${SOURCE_PATH})
+        set(TEMP_DIR "${_vesae_WORKING_DIRECTORY}/TEMP")
+        file(REMOVE_RECURSE ${TEMP_DIR})
+        vcpkg_extract_source_archive("${_vesae_ARCHIVE}" "${TEMP_DIR}")
+
+        if(_vesae_NO_REMOVE_ONE_LEVEL)
+            set(TEMP_SOURCE_PATH ${TEMP_DIR})
+        else()
+            file(GLOB _ARCHIVE_FILES "${TEMP_DIR}/*")
+            list(LENGTH _ARCHIVE_FILES _NUM_ARCHIVE_FILES)
+            set(TEMP_SOURCE_PATH)
+            foreach(dir IN LISTS _ARCHIVE_FILES)
+                if (IS_DIRECTORY ${dir})
+                    set(TEMP_SOURCE_PATH "${dir}")
+                    break()
+                endif()
+            endforeach()
+
+            if(NOT _NUM_ARCHIVE_FILES EQUAL 2 OR NOT TEMP_SOURCE_PATH)
+                message(FATAL_ERROR "Could not unwrap top level directory from archive. Pass NO_REMOVE_ONE_LEVEL to disable this.")
+            endif()
+        endif()
+
+        vcpkg_apply_patches(
+            SOURCE_PATH ${TEMP_SOURCE_PATH}
+            PATCHES ${_vesae_PATCHES}
         )
+
+        file(RENAME ${TEMP_SOURCE_PATH} ${SOURCE_PATH})
+        file(REMOVE_RECURSE ${TEMP_DIR})
     endif()
-endfunction()
-\ No newline at end of file
+
+    set(${_vesae_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
+    message(STATUS "Using source at ${SOURCE_PATH}")
+    return()
+endfunction()
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 39a722d93..4cb123fd6 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -128,23 +128,41 @@ function(vcpkg_find_acquire_program VAR)
   elseif(VAR MATCHES "MESON")
     set(PROGNAME meson)
     set(REQUIRED_INTERPRETER PYTHON3)
-    set(SCRIPTNAME meson.py)
-    set(PATHS ${DOWNLOADS}/tools/meson/meson-0.43.0)
-    set(URL "https://github.com/mesonbuild/meson/archive/0.43.0.zip")
-    set(ARCHIVE "meson-0.43.0.zip")
-    set(HASH dde4de72eff37046731224f32aa5f4618d45bdf148cec2d1af6e25e7522ebc2b04aedc9eceed483dfa93823a0ea7ea472d0c0c9380061bf3ee2f16b87dd1425e)
+    set(BREW_PACKAGE_NAME "meson")
+    set(APT_PACKAGE_NAME "meson")
+    if(CMAKE_HOST_WIN32)
+      set(SCRIPTNAME meson.py)
+    else()
+      set(SCRIPTNAME meson)
+    endif()
+    set(PATHS ${DOWNLOADS}/tools/meson/meson-0.47.1)
+    set(URL "https://github.com/mesonbuild/meson/archive/0.47.1.zip")
+    set(ARCHIVE "meson-0.47.1.zip")
+    set(HASH 0f6462835583a51707bee82d852018cfcb7444c0dad95b2ba08814e500a5cfe3f731dc6c1fb73c765d1120ee2a2d6600e15d8d393bab1993e84bd4354b2e6855)
   elseif(VAR MATCHES "FLEX")
+  if(CMAKE_HOST_WIN32)
     set(PROGNAME win_flex)
-    set(PATHS ${DOWNLOADS}/tools/win_flex)
-    set(URL "https://sourceforge.net/projects/winflexbison/files/win_flex_bison-2.5.9.zip/download")
-    set(ARCHIVE "win_flex_bison-2.5.9.zip")
-    set(HASH 9580f0e46893670a011645947c1becda69909a41a38bb4197fe33bd1ab7719da6b80e1be316f269e1a4759286870d49a9b07ef83afc4bac33232bd348e0bc814)
+      set(PATHS ${DOWNLOADS}/tools/win_flex)
+      set(URL "https://sourceforge.net/projects/winflexbison/files/win_flex_bison-2.5.9.zip/download")
+      set(ARCHIVE "win_flex_bison-2.5.9.zip")
+      set(HASH 9580f0e46893670a011645947c1becda69909a41a38bb4197fe33bd1ab7719da6b80e1be316f269e1a4759286870d49a9b07ef83afc4bac33232bd348e0bc814)
+    else()
+      set(PROGNAME flex)
+      set(APT_PACKAGE_NAME flex)
+      set(BREW_PACKAGE_NAME flex)
+    endif()
   elseif(VAR MATCHES "BISON")
-    set(PROGNAME win_bison)
-    set(PATHS ${DOWNLOADS}/tools/win_bison)
-    set(URL "https://sourceforge.net/projects/winflexbison/files/win_flex_bison-2.5.9.zip/download")
-    set(ARCHIVE "win_flex_bison-2.5.9.zip")
-    set(HASH 9580f0e46893670a011645947c1becda69909a41a38bb4197fe33bd1ab7719da6b80e1be316f269e1a4759286870d49a9b07ef83afc4bac33232bd348e0bc814)
+    if(CMAKE_HOST_WIN32)
+      set(PROGNAME win_bison)
+      set(PATHS ${DOWNLOADS}/tools/win_bison)
+      set(URL "https://sourceforge.net/projects/winflexbison/files/win_flex_bison-2.5.9.zip/download")
+      set(ARCHIVE "win_flex_bison-2.5.9.zip")
+      set(HASH 9580f0e46893670a011645947c1becda69909a41a38bb4197fe33bd1ab7719da6b80e1be316f269e1a4759286870d49a9b07ef83afc4bac33232bd348e0bc814)
+    else()
+      set(PROGNAME bison)
+      set(APT_PACKAGE_NAME bison)
+      set(BREW_PACKAGE_NAME bison)
+    endif()
   elseif(VAR MATCHES "GPERF")
     set(PROGNAME gperf)
     set(PATHS ${DOWNLOADS}/tools/gperf/bin)
diff --git a/scripts/cmake/vcpkg_from_bitbucket.cmake b/scripts/cmake/vcpkg_from_bitbucket.cmake
index a12d86b43..5f23714ea 100644
--- a/scripts/cmake/vcpkg_from_bitbucket.cmake
+++ b/scripts/cmake/vcpkg_from_bitbucket.cmake
@@ -11,6 +11,7 @@
 ##     [REF <v2.0.0>]
 ##     [SHA512 <45d0d7f8cc350...>]
 ##     [HEAD_REF <master>]
+##     [PATCHES <patch1.patch> <patch2.patch>...]
 ## )
 ## ```
 ##
@@ -40,6 +41,11 @@
 ##
 ## For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.
 ##
+## ### PATCHES
+## A list of patches to be applied to the extracted sources.
+##
+## Relative paths are based on the port directory.
+##
 ## ## Notes:
 ## At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
 ##
@@ -50,7 +56,7 @@
 ## * [blaze](https://github.com/Microsoft/vcpkg/blob/master/ports/blaze/portfile.cmake)
 function(vcpkg_from_bitbucket)
     set(oneValueArgs OUT_SOURCE_PATH REPO REF SHA512 HEAD_REF)
-    set(multipleValuesArgs)
+    set(multipleValuesArgs PATCHES)
     cmake_parse_arguments(_vdud "" "${oneValueArgs}" "${multipleValuesArgs}" ${ARGN})
 
     if(NOT _vdud_OUT_SOURCE_PATH)
@@ -115,7 +121,7 @@ function(vcpkg_from_bitbucket)
             string(REGEX REPLACE "\"hash\": \"([a-f0-9]+)\"" "\\1" _version ${x})
             string(SUBSTRING ${_version} 0 12 _version) # Get the 12 first numbers from commit hash
         else()
-            set(_version ${_vdud_REF})
+            string(SUBSTRING ${_vdud_REF} 0 12 _version) # Get the 12 first numbers from commit hash
         endif()
 
         vcpkg_download_distfile(ARCHIVE
@@ -123,8 +129,14 @@ function(vcpkg_from_bitbucket)
             SHA512 "${_vdud_SHA512}"
             FILENAME "${ORG_NAME}-${REPO_NAME}-${_vdud_REF}.tar.gz"
         )
-        vcpkg_extract_source_archive_ex(ARCHIVE "${ARCHIVE}")
-        set_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src ${_version})
+
+        vcpkg_extract_source_archive_ex(
+            OUT_SOURCE_PATH SOURCE_PATH
+            ARCHIVE "${ARCHIVE}"
+            REF "${_vdud_REF}"
+            PATCHES ${_vdud_PATCHES}
+        )
+        set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
         return()
     endif()
 
@@ -164,11 +176,6 @@ function(vcpkg_from_bitbucket)
         )
     endif()
 
-    vcpkg_extract_source_archive_ex(
-        ARCHIVE "${ARCHIVE}"
-        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head"
-    )
-
     # Parse the github refs response with regex.
     # TODO: use some JSON swiss-army-knife utility instead.
     file(READ "${ARCHIVE_VERSION}" _contents)
@@ -179,5 +186,12 @@ function(vcpkg_from_bitbucket)
     # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build.
     set(VCPKG_HEAD_VERSION ${_version} PARENT_SCOPE)
 
-    set_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src/head ${_vdud_HEAD_REF})
+    vcpkg_extract_source_archive_ex(
+        OUT_SOURCE_PATH SOURCE_PATH
+        ARCHIVE "${downloaded_file_path}"
+        REF "${_vdud_HEAD_REF}"
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head"
+        PATCHES ${_vdud_PATCHES}
+    )
+    set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
 endfunction()
diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake
index 33de8354d..48bfd828a 100644
--- a/scripts/cmake/vcpkg_from_github.cmake
+++ b/scripts/cmake/vcpkg_from_github.cmake
@@ -80,16 +80,16 @@ function(vcpkg_from_github)
     string(REGEX REPLACE "/.*" "" ORG_NAME ${_vdud_REPO})
 
     macro(set_TEMP_SOURCE_PATH BASE BASEREF)
-    set(TEMP_SOURCE_PATH "${BASE}/${REPO_NAME}-${BASEREF}")
-    if(NOT EXISTS ${TEMP_SOURCE_PATH})
-        # Sometimes GitHub strips a leading 'v' off the REF.
-        string(REGEX REPLACE "^v" "" REF ${BASEREF})
-        string(REPLACE "/" "-" REF ${REF})
-        set(TEMP_SOURCE_PATH "${BASE}/${REPO_NAME}-${REF}")
+        set(TEMP_SOURCE_PATH "${BASE}/${REPO_NAME}-${BASEREF}")
         if(NOT EXISTS ${TEMP_SOURCE_PATH})
-            message(FATAL_ERROR "Could not determine source path: '${BASE}/${REPO_NAME}-${BASEREF}' does not exist")
+            # Sometimes GitHub strips a leading 'v' off the REF.
+            string(REGEX REPLACE "^v" "" REF ${BASEREF})
+            string(REPLACE "/" "-" REF ${REF})
+            set(TEMP_SOURCE_PATH "${BASE}/${REPO_NAME}-${REF}")
+            if(NOT EXISTS ${TEMP_SOURCE_PATH})
+                message(FATAL_ERROR "Could not determine source path: '${BASE}/${REPO_NAME}-${BASEREF}' does not exist")
+            endif()
         endif()
-    endif()
     endmacro()
 
     if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED _vdud_HEAD_REF)
@@ -111,44 +111,14 @@ function(vcpkg_from_github)
             FILENAME "${ORG_NAME}-${REPO_NAME}-${SANITIZED_REF}.tar.gz"
         )
 
-        # Take the last 10 chars of the REF
-        set(REF_MAX_LENGTH 10)
-        string(LENGTH ${SANITIZED_REF} REF_LENGTH)
-        math(EXPR FROM_REF ${REF_LENGTH}-${REF_MAX_LENGTH})
-        if(FROM_REF LESS 0)
-            set(FROM_REF 0)
-        endif()
-        string(SUBSTRING ${SANITIZED_REF} ${FROM_REF} ${REF_LENGTH} SHORTENED_SANITIZED_REF)
-
-        # Hash the archive hash along with the patches. Take the first 10 chars of the hash
-        set(PATCHSET_HASH "${_vdud_SHA512}")
-        foreach(PATCH IN LISTS _vdud_PATCHES)
-            get_filename_component(ABSOLUTE_PATCH "${PATCH}" ABSOLUTE BASE_DIR "${CURRENT_PORT_DIR}")
-            file(SHA512 ${ABSOLUTE_PATCH} CURRENT_HASH)
-            string(APPEND PATCHSET_HASH ${CURRENT_HASH})
-        endforeach()
-
-        string(SHA512 PATCHSET_HASH ${PATCHSET_HASH})
-        string(SUBSTRING ${PATCHSET_HASH} 0 10 PATCHSET_HASH)
-        set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${SHORTENED_SANITIZED_REF}-${PATCHSET_HASH}")
-
-        if(NOT EXISTS ${SOURCE_PATH})
-            set(TEMP_DIR "${CURRENT_BUILDTREES_DIR}/src/TEMP")
-            file(REMOVE_RECURSE ${TEMP_DIR})
-            vcpkg_extract_source_archive_ex(ARCHIVE "${ARCHIVE}" WORKING_DIRECTORY ${TEMP_DIR})
-            set_TEMP_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src/TEMP ${SANITIZED_REF})
-
-            vcpkg_apply_patches(
-                SOURCE_PATH ${TEMP_SOURCE_PATH}
-                PATCHES ${_vdud_PATCHES}
-            )
-
-            file(RENAME ${TEMP_SOURCE_PATH} ${SOURCE_PATH})
-            file(REMOVE_RECURSE ${TEMP_DIR})
-        endif()
+        vcpkg_extract_source_archive_ex(
+            OUT_SOURCE_PATH SOURCE_PATH
+            ARCHIVE "${ARCHIVE}"
+            REF "${SANITIZED_REF}"
+            PATCHES ${_vdud_PATCHES}
+        )
 
         set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
-        message(STATUS "Using source at ${SOURCE_PATH}")
         return()
     endif()
 
@@ -189,11 +159,6 @@ function(vcpkg_from_github)
         )
     endif()
 
-    vcpkg_extract_source_archive_ex(
-        ARCHIVE "${ARCHIVE}"
-        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head"
-    )
-
     # Parse the github refs response with regex.
     # TODO: use some JSON swiss-army-knife utility instead.
     file(READ "${ARCHIVE_VERSION}" _contents)
@@ -206,11 +171,12 @@ function(vcpkg_from_github)
         set(VCPKG_HEAD_VERSION ${_version} PARENT_SCOPE)
     endif()
 
-    set_TEMP_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src/head ${SANITIZED_HEAD_REF})
-    vcpkg_apply_patches(
-        SOURCE_PATH ${TEMP_SOURCE_PATH}
+    vcpkg_extract_source_archive_ex(
+        OUT_SOURCE_PATH SOURCE_PATH
+        ARCHIVE "${downloaded_file_path}"
+        REF "${SANITIZED_HEAD_REF}"
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/head
         PATCHES ${_vdud_PATCHES}
     )
-    set(${_vdud_OUT_SOURCE_PATH} "${TEMP_SOURCE_PATH}" PARENT_SCOPE)
-    message(STATUS "Using source at ${TEMP_SOURCE_PATH}")
+    set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
 endfunction()
diff --git a/scripts/cmake/vcpkg_from_gitlab.cmake b/scripts/cmake/vcpkg_from_gitlab.cmake
index 2f2198fd6..f13bc054c 100644
--- a/scripts/cmake/vcpkg_from_gitlab.cmake
+++ b/scripts/cmake/vcpkg_from_gitlab.cmake
@@ -11,6 +11,7 @@
 ##     [REF <v10.7.3>]
 ##     [SHA512 <45d0d7f8cc350...>]
 ##     [HEAD_REF <master>]
+##     [PATCHES <patch1.patch> <patch2.patch>...]
 ## )
 ## ```
 ##
@@ -45,6 +46,11 @@
 ##
 ## For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.
 ##
+## ### PATCHES
+## A list of patches to be applied to the extracted sources.
+##
+## Relative paths are based on the port directory.
+##
 ## ## Notes:
 ## At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
 ##
@@ -76,28 +82,14 @@ function(vcpkg_from_gitlab)
         message(FATAL_ERROR "At least one of REF and HEAD_REF must be specified.")
     endif()
 
-    string(REGEX REPLACE ".*/" "" REPO_NAME ${_vdud_REPO})
-    string(REGEX REPLACE "/.*" "" ORG_NAME ${_vdud_REPO})
-
-    macro(set_TEMP_SOURCE_PATH BASE)
-        file(GLOB _ARCHIVE_FILES "${BASE}/${REPO_NAME}*")
-        foreach(dir ${_ARCHIVE_FILES})
-            if (IS_DIRECTORY ${dir})
-                list(APPEND _ARCHIVE_DIRS "${dir}")
-            endif()
-        endforeach()
-        list(LENGTH _ARCHIVE_DIRS _NUM_ARCHIVE_DIRS)
-        if(NOT 1 EQUAL ${_NUM_ARCHIVE_DIRS})
-            message(FATAL_ERROR "Could not determine source path: There were ${_NUM_ARCHIVE_DIRS} directories extracted from the archive that start with the repo name.")
-        endif()
-        list(GET _ARCHIVE_DIRS 0 TEMP_SOURCE_PATH)
-    endmacro()
-
     if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED _vdud_HEAD_REF)
         message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.")
         set(VCPKG_USE_HEAD_VERSION OFF)
     endif()
 
+    string(REGEX REPLACE ".*/" "" REPO_NAME ${_vdud_REPO})
+    string(REGEX REPLACE "/.*" "" ORG_NAME ${_vdud_REPO})
+
     # Handle --no-head scenarios
     if(NOT VCPKG_USE_HEAD_VERSION)
         if(NOT _vdud_REF)
@@ -112,43 +104,14 @@ function(vcpkg_from_gitlab)
             FILENAME "${ORG_NAME}-${REPO_NAME}-${SANITIZED_REF}.tar.gz"
         )
 
-        # Take the last 10 chars of the REF
-        set(REF_MAX_LENGTH 10)
-        string(LENGTH ${SANITIZED_REF} REF_LENGTH)
-        math(EXPR FROM_REF ${REF_LENGTH}-${REF_MAX_LENGTH})
-        if(FROM_REF LESS 0)
-            set(FROM_REF 0)
-        endif()
-        string(SUBSTRING ${SANITIZED_REF} ${FROM_REF} ${REF_LENGTH} SHORTENED_SANITIZED_REF)
-
-        # Hash the archive hash along with the patches. Take the first 10 chars of the hash
-        set(PATCHSET_HASH "${_vdud_SHA512}")
-        foreach(PATCH IN LISTS _vdud_PATCHES)
-            file(SHA512 ${PATCH} CURRENT_HASH)
-            string(APPEND PATCHSET_HASH ${CURRENT_HASH})
-        endforeach()
-
-        string(SHA512 PATCHSET_HASH ${PATCHSET_HASH})
-        string(SUBSTRING ${PATCHSET_HASH} 0 10 PATCHSET_HASH)
-        set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${SHORTENED_SANITIZED_REF}-${PATCHSET_HASH}")
-
-        if(NOT EXISTS ${SOURCE_PATH})
-            set(TEMP_DIR "${CURRENT_BUILDTREES_DIR}/src/TEMP")
-            file(REMOVE_RECURSE ${TEMP_DIR})
-            vcpkg_extract_source_archive_ex(ARCHIVE "${ARCHIVE}" WORKING_DIRECTORY ${TEMP_DIR})
-            set_TEMP_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src/TEMP ${SANITIZED_REF})
-
-            vcpkg_apply_patches(
-                SOURCE_PATH ${TEMP_SOURCE_PATH}
-                PATCHES ${_vdud_PATCHES}
-            )
-
-            file(RENAME ${TEMP_SOURCE_PATH} ${SOURCE_PATH})
-            file(REMOVE_RECURSE ${TEMP_DIR})
-        endif()
+        vcpkg_extract_source_archive_ex(
+            OUT_SOURCE_PATH SOURCE_PATH
+            ARCHIVE "${ARCHIVE}"
+            REF "${SANITIZED_REF}"
+            PATCHES ${_vdud_PATCHES}
+        )
 
         set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
-
         return()
     endif()
 
@@ -182,10 +145,6 @@ function(vcpkg_from_gitlab)
         )
     endif()
 
-    vcpkg_extract_source_archive_ex(
-        ARCHIVE "${ARCHIVE}"
-        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head"
-    )
     # There are issues with the Gitlab API project paths being URL-escaped, so we use git here to get the head revision
     execute_process(COMMAND ${GIT} ls-remote
         "${_vdud_GITLAB_URL}/${ORG_NAME}/${REPO_NAME}.git" "${_vdud_HEAD_REF}"
@@ -199,10 +158,12 @@ function(vcpkg_from_gitlab)
         set(VCPKG_HEAD_VERSION ${_version} PARENT_SCOPE)
     endif()
 
-    set_TEMP_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src/head ${SANITIZED_HEAD_REF})
-    vcpkg_apply_patches(
-        SOURCE_PATH ${TEMP_SOURCE_PATH}
+    vcpkg_extract_source_archive_ex(
+        OUT_SOURCE_PATH SOURCE_PATH
+        ARCHIVE "${downloaded_file_path}"
+        REF "${SANITIZED_HEAD_REF}"
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/head
         PATCHES ${_vdud_PATCHES}
     )
-    set(${_vdud_OUT_SOURCE_PATH} "${TEMP_SOURCE_PATH}" PARENT_SCOPE)
+    set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
 endfunction()
diff --git a/scripts/cmake/vcpkg_test_cmake.cmake b/scripts/cmake/vcpkg_test_cmake.cmake
new file mode 100644
index 000000000..718b2f69c
--- /dev/null
+++ b/scripts/cmake/vcpkg_test_cmake.cmake
@@ -0,0 +1,53 @@
+## # vcpkg_test_cmake
+##
+## Tests a built package for CMake `find_package()` integration.
+##
+## ## Usage:
+## ```cmake
+## vcpkg_test_cmake(PACKAGE_NAME <name> [MODULE])
+## ```
+##
+## ## Parameters:
+##
+## ### PACKAGE_NAME
+## The expected name to find with `find_package()`.
+##
+## ### MODULE
+## Indicates that the library expects to be found via built-in CMake targets.
+##
+function(vcpkg_test_cmake)
+    cmake_parse_arguments(_tc "MODULE" "PACKAGE_NAME" "" ${ARGN})
+
+    if(NOT DEFINED _tc_PACKAGE_NAME)
+      message(FATAL_ERROR "PACKAGE_NAME must be specified")
+    endif()
+    if(_tc_MODULE)
+      set(PACKAGE_TYPE MODULE)
+    else()
+      set(PACKAGE_TYPE CONFIG)
+    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)
+
+    # Generate test source CMakeLists.txt
+    set(VCPKG_TEST_CMAKELIST ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test/CMakeLists.txt)
+    file(WRITE  ${VCPKG_TEST_CMAKELIST} "cmake_minimum_required(VERSION 3.10)\n")
+    file(APPEND ${VCPKG_TEST_CMAKELIST} "set(CMAKE_PREFIX_PATH \"${CURRENT_PACKAGES_DIR};${CURRENT_INSTALLED_DIR}\")\n")
+    file(APPEND ${VCPKG_TEST_CMAKELIST} "\n")
+    file(APPEND ${VCPKG_TEST_CMAKELIST} "find_package(${_tc_PACKAGE_NAME} ${PACKAGE_TYPE} REQUIRED)\n")
+
+    # Run cmake config with a generated CMakeLists.txt
+    set(LOGPREFIX "${CURRENT_BUILDTREES_DIR}/test-cmake-${TARGET_TRIPLET}")
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} .
+      OUTPUT_FILE "${LOGPREFIX}-out.log"
+      ERROR_FILE "${LOGPREFIX}-err.log"
+      RESULT_VARIABLE error_code
+      WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test
+    )
+    if(error_code)
+      message(FATAL_ERROR "CMake integration test failed; unable to find_package(${_tc_PACKAGE_NAME} ${PACKAGE_TYPE} REQUIRED)")
+    endif()
+endfunction()
diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake
index e89ad4640..e44f53aa8 100644
--- a/scripts/templates/portfile.in.cmake
+++ b/scripts/templates/portfile.in.cmake
@@ -31,3 +31,6 @@ vcpkg_install_cmake()
 
 # Handle copyright
 # file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/@PORT@ RENAME copyright)
+
+# Post-build test for cmake libraries
+# vcpkg_test_cmake(PACKAGE_NAME @PORT@)
diff --git a/scripts/toolchains/osx.cmake b/scripts/toolchains/osx.cmake
index b8f261d09..9c4fdb12e 100644
--- a/scripts/toolchains/osx.cmake
+++ b/scripts/toolchains/osx.cmake
@@ -1,5 +1,11 @@
 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
     set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
+
+    set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "")
+    set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "")
+else()
+    set(CMAKE_SYSTEM_VERSION "17.0.0" CACHE STRING "")
+    set(CMAKE_SYSTEM_PROCESSOR "x86_64" CACHE STRING "")
 endif()
 set(CMAKE_SYSTEM_NAME Darwin CACHE STRING "")
 
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 320e86275..c2045433d 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -73,6 +73,13 @@
         <sha512>2456176ba3d506a07cf0cc4f61f080e1ff8cb4106426d66f354c5bb67a9a8720b5ddb26904275e61b1f623c932355f7dcde4cd17556cc895f11293c23c3a9bf3</sha512>
         <archiveName>aria2-1.33.1-win-32bit-build1.zip</archiveName>
     </tool>
+    <tool name="ninja" os="windows">
+        <version>1.8.2</version>
+        <exeRelativePath>ninja.exe</exeRelativePath>
+        <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip</url>
+        <sha512>9b9ce248240665fcd6404b989f3b3c27ed9682838225e6dc9b67b551774f251e4ff8a207504f941e7c811e7a8be1945e7bcb94472a335ef15e23a0200a32e6d5</sha512>
+        <archiveName>ninja-win.zip</archiveName>
+    </tool>
     <tool name="ninja" os="linux">
         <version>1.8.2</version>
         <exeRelativePath>ninja</exeRelativePath>
diff --git a/toolsrc/include/vcpkg/base/chrono.h b/toolsrc/include/vcpkg/base/chrono.h
index aa764a597..6f6e2b317 100644
--- a/toolsrc/include/vcpkg/base/chrono.h
+++ b/toolsrc/include/vcpkg/base/chrono.h
@@ -52,8 +52,10 @@ namespace vcpkg::Chrono
         static Optional<CTime> get_current_date_time();
         static Optional<CTime> parse(CStringView str);
 
-        constexpr CTime() noexcept : m_tm{0} {}
-        explicit constexpr CTime(tm t) noexcept : m_tm{t} {}
+        constexpr CTime() noexcept : m_tm {0} {}
+        explicit constexpr CTime(tm t) noexcept : m_tm {t} {}
+
+        CTime add_hours(const int hours) const;
 
         std::string to_string() const;
 
@@ -62,4 +64,6 @@ namespace vcpkg::Chrono
     private:
         mutable tm m_tm;
     };
+
+    tm get_current_date_time_local();
 }
diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h
index eee910841..b07ff25b3 100644
--- a/toolsrc/include/vcpkg/base/files.h
+++ b/toolsrc/include/vcpkg/base/files.h
@@ -20,7 +20,7 @@ namespace fs
 
     inline bool is_regular_file(file_status s) { return stdfs::is_regular_file(s); }
     inline bool is_directory(file_status s) { return stdfs::is_directory(s); }
-    inline bool status_known(file_status s) { return stdfs::status_known(s); }
+    inline bool is_symlink(file_status s) { return stdfs::is_symlink(s); }
 }
 
 namespace vcpkg::Files
@@ -55,7 +55,9 @@ namespace vcpkg::Files
                                const fs::path& newpath,
                                fs::copy_options opts,
                                std::error_code& ec) = 0;
+        virtual void copy_symlink(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) = 0;
         virtual fs::file_status status(const fs::path& path, std::error_code& ec) const = 0;
+        virtual fs::file_status symlink_status(const fs::path& path, std::error_code& ec) const = 0;
 
         virtual std::vector<fs::path> find_from_PATH(const std::string& name) const = 0;
 
diff --git a/toolsrc/include/vcpkg/base/system.h b/toolsrc/include/vcpkg/base/system.h
index 3c4326ade..af56e45c1 100644
--- a/toolsrc/include/vcpkg/base/system.h
+++ b/toolsrc/include/vcpkg/base/system.h
@@ -8,8 +8,6 @@
 
 namespace vcpkg::System
 {
-    tm get_current_date_time();
-
     fs::path get_exe_path_of_current_process();
 
     struct CMakeVariable
@@ -32,15 +30,15 @@ namespace vcpkg::System
     };
 
     int cmd_execute_clean(const CStringView cmd_line,
-                          const std::unordered_map<std::string, std::string>& extra_env = {});
+                          const std::unordered_map<std::string, std::string>& extra_env = {}) noexcept;
 
-    int cmd_execute(const CStringView cmd_line);
+    int cmd_execute(const CStringView cmd_line) noexcept;
 
 #if defined(_WIN32)
-    void cmd_execute_no_wait(const CStringView cmd_line);
+    void cmd_execute_no_wait(const CStringView cmd_line) noexcept;
 #endif
 
-    ExitCodeAndOutput cmd_execute_and_capture_output(const CStringView cmd_line);
+    ExitCodeAndOutput cmd_execute_and_capture_output(const CStringView cmd_line) noexcept;
 
     enum class Color
     {
diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h
index 1858a320f..fd7d832b3 100644
--- a/toolsrc/include/vcpkg/commands.h
+++ b/toolsrc/include/vcpkg/commands.h
@@ -119,6 +119,12 @@ namespace vcpkg::Commands
         void perform_and_exit(const VcpkgCmdArguments& args);
     }
 
+    namespace X_VSInstances
+    {
+        extern const CommandStructure COMMAND_STRUCTURE;
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
     namespace Hash
     {
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h
index bc28e3ff8..ae66ca355 100644
--- a/toolsrc/include/vcpkg/globalstate.h
+++ b/toolsrc/include/vcpkg/globalstate.h
@@ -18,5 +18,27 @@ namespace vcpkg
 
         static std::atomic<int> g_init_console_cp;
         static std::atomic<int> g_init_console_output_cp;
+        static std::atomic<bool> g_init_console_initialized;
+
+        struct CtrlCStateMachine
+        {
+            CtrlCStateMachine();
+
+            void transition_to_spawn_process() noexcept;
+            void transition_from_spawn_process() noexcept;
+            void transition_handle_ctrl_c() noexcept;
+
+        private:
+            enum class CtrlCState
+            {
+                normal,
+                blocked_on_child,
+                exit_requested,
+            };
+
+            std::atomic<CtrlCState> m_state;
+        };
+
+        static CtrlCStateMachine g_ctrl_c_state;
     };
 }
diff --git a/toolsrc/include/vcpkg/visualstudio.h b/toolsrc/include/vcpkg/visualstudio.h
index b93b145d9..cd99db352 100644
--- a/toolsrc/include/vcpkg/visualstudio.h
+++ b/toolsrc/include/vcpkg/visualstudio.h
@@ -6,6 +6,8 @@
 
 namespace vcpkg::VisualStudio
 {
+    std::vector<std::string> get_visual_studio_instances(const VcpkgPaths& paths);
+
     std::vector<Toolset> find_toolset_instances_preferred_first(const VcpkgPaths& paths);
 }
 
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 6f10c503d..3589881a7 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -33,6 +33,12 @@
 
 using namespace vcpkg;
 
+// 24 hours/day * 30 days/month * 6 months
+static constexpr int SURVEY_INTERVAL_IN_HOURS = 24 * 30 * 6;
+
+// Initial survey appears after 10 days. Therefore, subtract 24 hours/day * 10 days
+static constexpr int SURVEY_INITIAL_OFFSET_IN_HOURS = SURVEY_INTERVAL_IN_HOURS - 24 * 10;
+
 void invalid_command(const std::string& cmd)
 {
     System::println(System::Color::error, "invalid command: %s", cmd);
@@ -113,19 +119,19 @@ static void inner(const VcpkgCmdArguments& args)
 #endif
     Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Changing the working dir failed");
 
-    if (args.command != "autocomplete")
+    if (args.command == "install" || args.command == "remove" || args.command == "export" || args.command == "update")
     {
         Commands::Version::warn_if_vcpkg_version_mismatch(paths);
         std::string surveydate = *GlobalState::g_surveydate.lock();
         auto maybe_surveydate = Chrono::CTime::parse(surveydate);
         if (auto p_surveydate = maybe_surveydate.get())
         {
-            auto delta = std::chrono::system_clock::now() - p_surveydate->to_time_point();
-            // 24 hours/day * 30 days/month
-            if (std::chrono::duration_cast<std::chrono::hours>(delta).count() > 24 * 30)
+            const auto now = Chrono::CTime::get_current_date_time().value_or_exit(VCPKG_LINE_INFO);
+            const auto delta = now.to_time_point() - p_surveydate->to_time_point();
+            if (std::chrono::duration_cast<std::chrono::hours>(delta).count() > SURVEY_INTERVAL_IN_HOURS)
             {
                 std::default_random_engine generator(
-                    static_cast<unsigned int>(std::chrono::system_clock::now().time_since_epoch().count()));
+                    static_cast<unsigned int>(now.to_time_point().time_since_epoch().count()));
                 std::uniform_int_distribution<int> distribution(1, 4);
 
                 if (distribution(generator) == 1)
@@ -214,7 +220,9 @@ static void load_config()
 
     if (config.last_completed_survey.empty())
     {
-        config.last_completed_survey = config.user_time;
+        const auto now = Chrono::CTime::parse(config.user_time).value_or_exit(VCPKG_LINE_INFO);
+        const Chrono::CTime offset = now.add_hours(-SURVEY_INITIAL_OFFSET_IN_HOURS);
+        config.last_completed_survey = offset.to_string();
     }
 
     GlobalState::g_surveydate.lock()->assign(config.last_completed_survey);
@@ -261,6 +269,7 @@ int main(const int argc, const char* const* const argv)
 #if defined(_WIN32)
     GlobalState::g_init_console_cp = GetConsoleCP();
     GlobalState::g_init_console_output_cp = GetConsoleOutputCP();
+    GlobalState::g_init_console_initialized = true;
 
     SetConsoleCP(CP_UTF8);
     SetConsoleOutputCP(CP_UTF8);
@@ -275,6 +284,9 @@ int main(const int argc, const char* const* const argv)
         locked_metrics->track_property("cmdline", trimmed_command_line);
 #endif
     }
+
+    Checks::register_console_ctrl_handler();
+
     load_config();
 
     const auto vcpkg_feature_flags_env = System::get_environment_variable("VCPKG_FEATURE_FLAGS");
@@ -293,8 +305,6 @@ int main(const int argc, const char* const* const argv)
     if (const auto p = args.sendmetrics.get()) Metrics::g_metrics.lock()->set_send_metrics(*p);
     if (const auto p = args.debug.get()) GlobalState::debugging = *p;
 
-    Checks::register_console_ctrl_handler();
-
     if (GlobalState::debugging)
     {
         inner(args);
diff --git a/toolsrc/src/vcpkg/base/checks.cpp b/toolsrc/src/vcpkg/base/checks.cpp
index 72176e58c..cc439adfe 100644
--- a/toolsrc/src/vcpkg/base/checks.cpp
+++ b/toolsrc/src/vcpkg/base/checks.cpp
@@ -24,8 +24,11 @@ namespace vcpkg::Checks
         metrics->flush();
 
 #if defined(_WIN32)
-        SetConsoleCP(GlobalState::g_init_console_cp);
-        SetConsoleOutputCP(GlobalState::g_init_console_output_cp);
+        if (GlobalState::g_init_console_initialized)
+        {
+            SetConsoleCP(GlobalState::g_init_console_cp);
+            SetConsoleOutputCP(GlobalState::g_init_console_output_cp);
+        }
 #endif
 
         auto elapsed_us = GlobalState::timer.lock()->microseconds();
@@ -46,12 +49,11 @@ namespace vcpkg::Checks
 #if defined(_WIN32)
     static BOOL ctrl_handler(DWORD fdw_ctrl_type)
     {
+        switch (fdw_ctrl_type)
         {
-            auto locked_metrics = Metrics::g_metrics.lock();
-            locked_metrics->track_property("CtrlHandler", std::to_string(fdw_ctrl_type));
-            locked_metrics->track_property("error", "CtrlHandler was fired.");
+            case CTRL_C_EVENT: GlobalState::g_ctrl_c_state.transition_handle_ctrl_c(); return TRUE;
+            default: return FALSE;
         }
-        cleanup_and_exit(EXIT_FAILURE);
     }
 
     void register_console_ctrl_handler()
diff --git a/toolsrc/src/vcpkg/base/chrono.cpp b/toolsrc/src/vcpkg/base/chrono.cpp
index 2a76f5df0..405e76605 100644
--- a/toolsrc/src/vcpkg/base/chrono.cpp
+++ b/toolsrc/src/vcpkg/base/chrono.cpp
@@ -5,6 +5,61 @@
 
 namespace vcpkg::Chrono
 {
+    static std::time_t get_current_time_as_time_since_epoch()
+    {
+        using std::chrono::system_clock;
+        return system_clock::to_time_t(system_clock::now());
+    }
+
+    static std::time_t utc_mktime(tm* time_ptr)
+    {
+#if defined(_WIN32)
+        return _mkgmtime(time_ptr);
+#else
+        return timegm(time_ptr);
+#endif
+    }
+
+    static tm to_local_time(const std::time_t& t)
+    {
+        tm parts {};
+#if defined(_WIN32)
+        localtime_s(&parts, &t);
+#else
+        parts = *localtime(&t);
+#endif
+        return parts;
+    }
+
+    static Optional<tm> to_utc_time(const std::time_t& t)
+    {
+        tm parts {};
+#if defined(_WIN32)
+        const errno_t err = gmtime_s(&parts, &t);
+        if (err)
+        {
+            return nullopt;
+        }
+#else
+        auto null_if_failed = gmtime_r(&t, &parts);
+        if (null_if_failed == nullptr)
+        {
+            return nullopt;
+        }
+#endif
+        return parts;
+    }
+
+    static tm date_plus_hours(tm* date, const int hours)
+    {
+        using namespace std::chrono_literals;
+        static constexpr std::chrono::seconds SECONDS_IN_ONE_HOUR =
+            std::chrono::duration_cast<std::chrono::seconds>(1h);
+
+        const std::time_t date_in_seconds = utc_mktime(date) + (hours * SECONDS_IN_ONE_HOUR.count());
+        return to_utc_time(date_in_seconds).value_or_exit(VCPKG_LINE_INFO);
+    }
+
     static std::string format_time_userfriendly(const std::chrono::nanoseconds& nanos)
     {
         using std::chrono::duration_cast;
@@ -63,30 +118,14 @@ namespace vcpkg::Chrono
 
     Optional<CTime> CTime::get_current_date_time()
     {
-        CTime ret;
-
-#if defined(_WIN32)
-        struct _timeb timebuffer;
-
-        _ftime_s(&timebuffer);
-
-        const errno_t err = gmtime_s(&ret.m_tm, &timebuffer.time);
-
-        if (err)
+        const std::time_t ct = get_current_time_as_time_since_epoch();
+        const Optional<tm> opt = to_utc_time(ct);
+        if (auto p_tm = opt.get())
         {
-            return nullopt;
+            return CTime {*p_tm};
         }
-#else
-        time_t now = {0};
-        time(&now);
-        auto null_if_failed = gmtime_r(&now, &ret.m_tm);
-        if (null_if_failed == nullptr)
-        {
-            return nullopt;
-        }
-#endif
 
-        return ret;
+        return nullopt;
     }
 
     Optional<CTime> CTime::parse(CStringView str)
@@ -111,19 +150,28 @@ namespace vcpkg::Chrono
         ret.m_tm.tm_year -= 1900;
         if (ret.m_tm.tm_mon < 1) return nullopt;
         ret.m_tm.tm_mon -= 1;
-        mktime(&ret.m_tm);
+        utc_mktime(&ret.m_tm);
+
         return ret;
     }
 
+    CTime CTime::add_hours(const int hours) const { return CTime {date_plus_hours(&this->m_tm, hours)}; }
+
     std::string CTime::to_string() const
     {
-        std::array<char, 80> date{};
+        std::array<char, 80> date {};
         strftime(&date[0], date.size(), "%Y-%m-%dT%H:%M:%S.0Z", &m_tm);
         return &date[0];
     }
     std::chrono::system_clock::time_point CTime::to_time_point() const
     {
-        const time_t t = mktime(&m_tm);
+        const time_t t = utc_mktime(&m_tm);
         return std::chrono::system_clock::from_time_t(t);
     }
+
+    tm get_current_date_time_local()
+    {
+        const std::time_t now_time = get_current_time_as_time_since_epoch();
+        return Chrono::to_local_time(now_time);
+    }
 }
diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp
index 4ff0912d1..f9bce8631 100644
--- a/toolsrc/src/vcpkg/base/files.cpp
+++ b/toolsrc/src/vcpkg/base/files.cpp
@@ -216,11 +216,19 @@ namespace vcpkg::Files
         {
             return fs::stdfs::copy_file(oldpath, newpath, opts, ec);
         }
+        virtual void copy_symlink(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec)
+        {
+            return fs::stdfs::copy_symlink(oldpath, newpath, ec);
+        }
 
         virtual fs::file_status status(const fs::path& path, std::error_code& ec) const override
         {
             return fs::stdfs::status(path, ec);
         }
+        virtual fs::file_status symlink_status(const fs::path& path, std::error_code& ec) const override
+        {
+            return fs::stdfs::symlink_status(path, ec);
+        }
         virtual void write_contents(const fs::path& file_path, const std::string& data, std::error_code& ec) override
         {
             ec.clear();
diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp
index d968c6dac..d95752bba 100644
--- a/toolsrc/src/vcpkg/base/system.cpp
+++ b/toolsrc/src/vcpkg/base/system.cpp
@@ -19,19 +19,6 @@
 
 namespace vcpkg::System
 {
-    tm get_current_date_time()
-    {
-        using std::chrono::system_clock;
-        std::time_t now_time = system_clock::to_time_t(system_clock::now());
-        tm parts{};
-#if defined(_WIN32)
-        localtime_s(&parts, &now_time);
-#else
-        parts = *localtime(&now_time);
-#endif
-        return parts;
-    }
-
     fs::path get_exe_path_of_current_process()
     {
 #if defined(_WIN32)
@@ -133,7 +120,7 @@ namespace vcpkg::System
     static void windows_create_clean_process(const CStringView cmd_line,
                                              const std::unordered_map<std::string, std::string>& extra_env,
                                              PROCESS_INFORMATION& process_info,
-                                             DWORD dwCreationFlags)
+                                             DWORD dwCreationFlags) noexcept
     {
         static const std::string SYSTEM_ROOT = get_environment_variable("SystemRoot").value_or_exit(VCPKG_LINE_INFO);
         static const std::string SYSTEM_32 = SYSTEM_ROOT + R"(\system32)";
@@ -223,7 +210,7 @@ namespace vcpkg::System
         memset(&startup_info, 0, sizeof(STARTUPINFOW));
         startup_info.cb = sizeof(STARTUPINFOW);
 
-        // Basically we are wrapping it in quotes
+        // Wrapping the command in a single set of quotes causes cmd.exe to correctly execute
         const std::string actual_cmd_line = Strings::format(R"###(cmd.exe /c "%s")###", cmd_line);
         Debug::println("CreateProcessW(%s)", actual_cmd_line);
         bool succeeded = TRUE == CreateProcessW(nullptr,
@@ -242,7 +229,7 @@ namespace vcpkg::System
 #endif
 
 #if defined(_WIN32)
-    void cmd_execute_no_wait(const CStringView cmd_line)
+    void cmd_execute_no_wait(const CStringView cmd_line) noexcept
     {
         auto timer = Chrono::ElapsedTimer::create_started();
 
@@ -258,7 +245,8 @@ namespace vcpkg::System
     }
 #endif
 
-    int cmd_execute_clean(const CStringView cmd_line, const std::unordered_map<std::string, std::string>& extra_env)
+    int cmd_execute_clean(const CStringView cmd_line,
+                          const std::unordered_map<std::string, std::string>& extra_env) noexcept
     {
         auto timer = Chrono::ElapsedTimer::create_started();
 #if defined(_WIN32)
@@ -266,11 +254,13 @@ namespace vcpkg::System
         PROCESS_INFORMATION process_info;
         memset(&process_info, 0, sizeof(PROCESS_INFORMATION));
 
+        GlobalState::g_ctrl_c_state.transition_to_spawn_process();
         windows_create_clean_process(cmd_line, extra_env, process_info, NULL);
 
         CloseHandle(process_info.hThread);
 
         const DWORD result = WaitForSingleObject(process_info.hProcess, INFINITE);
+        GlobalState::g_ctrl_c_state.transition_from_spawn_process();
         Checks::check_exit(VCPKG_LINE_INFO, result != WAIT_FAILED, "WaitForSingleObject failed");
 
         DWORD exit_code = 0;
@@ -279,6 +269,7 @@ namespace vcpkg::System
         CloseHandle(process_info.hProcess);
 
         Debug::println("CreateProcessW() returned %lu after %d us", exit_code, static_cast<int>(timer.microseconds()));
+
         return static_cast<int>(exit_code);
 #else
         Debug::println("system(%s)", cmd_line.c_str());
@@ -289,16 +280,18 @@ namespace vcpkg::System
 #endif
     }
 
-    int cmd_execute(const CStringView cmd_line)
+    int cmd_execute(const CStringView cmd_line) noexcept
     {
         // Flush stdout before launching external process
         fflush(nullptr);
 
-        // Basically we are wrapping it in quotes
 #if defined(_WIN32)
+        // We are wrap the command line in quotes to cause cmd.exe to correctly process it
         const std::string& actual_cmd_line = Strings::format(R"###("%s")###", cmd_line);
         Debug::println("_wsystem(%s)", actual_cmd_line);
+        GlobalState::g_ctrl_c_state.transition_to_spawn_process();
         const int exit_code = _wsystem(Strings::to_utf16(actual_cmd_line).c_str());
+        GlobalState::g_ctrl_c_state.transition_from_spawn_process();
         Debug::println("_wsystem() returned %d", exit_code);
 #else
         Debug::println("_system(%s)", cmd_line);
@@ -308,11 +301,8 @@ namespace vcpkg::System
         return exit_code;
     }
 
-    ExitCodeAndOutput cmd_execute_and_capture_output(const CStringView cmd_line)
+    ExitCodeAndOutput cmd_execute_and_capture_output(const CStringView cmd_line) noexcept
     {
-        // Flush stdout before launching external process
-        fflush(stdout);
-
         auto timer = Chrono::ElapsedTimer::create_started();
 
 #if defined(_WIN32)
@@ -321,9 +311,13 @@ namespace vcpkg::System
         Debug::println("_wpopen(%s)", actual_cmd_line);
         std::wstring output;
         wchar_t buf[1024];
+        GlobalState::g_ctrl_c_state.transition_to_spawn_process();
+        // Flush stdout before launching external process
+        fflush(stdout);
         const auto pipe = _wpopen(Strings::to_utf16(actual_cmd_line).c_str(), L"r");
         if (pipe == nullptr)
         {
+            GlobalState::g_ctrl_c_state.transition_from_spawn_process();
             return {1, Strings::to_utf8(output.c_str())};
         }
         while (fgetws(buf, 1024, pipe))
@@ -332,10 +326,12 @@ namespace vcpkg::System
         }
         if (!feof(pipe))
         {
+            GlobalState::g_ctrl_c_state.transition_from_spawn_process();
             return {1, Strings::to_utf8(output.c_str())};
         }
 
         const auto ec = _pclose(pipe);
+        GlobalState::g_ctrl_c_state.transition_from_spawn_process();
 
         // On Win7, output from powershell calls contain a utf-8 byte order mark in the utf-16 stream, so we strip it
         // out if it is present. 0xEF,0xBB,0xBF is the UTF-8 byte-order mark
@@ -354,6 +350,8 @@ namespace vcpkg::System
         Debug::println("popen(%s)", actual_cmd_line);
         std::string output;
         char buf[1024];
+        // Flush stdout before launching external process
+        fflush(stdout);
         const auto pipe = popen(actual_cmd_line.c_str(), "r");
         if (pipe == nullptr)
         {
@@ -391,7 +389,7 @@ namespace vcpkg::System
 #if defined(_WIN32)
         const HANDLE console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
 
-        CONSOLE_SCREEN_BUFFER_INFO console_screen_buffer_info{};
+        CONSOLE_SCREEN_BUFFER_INFO console_screen_buffer_info {};
         GetConsoleScreenBufferInfo(console_handle, &console_screen_buffer_info);
         const auto original_color = console_screen_buffer_info.wAttributes;
 
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index 8e87fe7fe..7569f340f 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -63,7 +63,7 @@ namespace vcpkg::Build::Command
                            spec.name());
 
         const StatusParagraphs status_db = database_load_check(paths);
-        const Build::BuildPackageOptions build_package_options{
+        const Build::BuildPackageOptions build_package_options {
             Build::UseHeadVersion::NO,
             Build::AllowDownloads::YES,
             Build::CleanBuildtrees::NO,
@@ -76,8 +76,8 @@ namespace vcpkg::Build::Command
         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 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);
@@ -245,7 +245,7 @@ namespace vcpkg::Build
         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)",
+        return Strings::format(R"("%s" %s %s %s %s 2>&1 <NUL)",
                                toolset.vcvarsall.u8string(),
                                Strings::join(" ", toolset.vcvarsall_options),
                                arch,
@@ -381,9 +381,15 @@ namespace vcpkg::Build
             });
 
         auto command = make_build_env_cmd(pre_build_info, toolset);
-        if (!command.empty()) command.append(" && ");
+        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);
@@ -440,7 +446,7 @@ namespace vcpkg::Build
             auto buildtree_files = fs.get_files_non_recursive(buildtrees_dir);
             for (auto&& file : buildtree_files)
             {
-                if (fs.is_directory(file) && file.filename() != "src")
+                if (fs.is_directory(file)) // Will only keep the logs
                 {
                     std::error_code ec;
                     fs.remove_all(file, ec);
@@ -464,22 +470,22 @@ namespace vcpkg::Build
 
         std::vector<AbiEntry> abi_tag_entries;
 
-        abi_tag_entries.emplace_back(AbiEntry{"cmake", paths.get_tool_version(Tools::CMAKE)});
+        abi_tag_entries.emplace_back(AbiEntry {"cmake", paths.get_tool_version(Tools::CMAKE)});
 
         abi_tag_entries.insert(abi_tag_entries.end(), dependency_abis.begin(), dependency_abis.end());
 
         abi_tag_entries.emplace_back(
-            AbiEntry{"portfile", vcpkg::Hash::get_file_hash(fs, config.port_dir / "portfile.cmake", "SHA1")});
+            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")});
+            AbiEntry {"control", vcpkg::Hash::get_file_hash(fs, config.port_dir / "CONTROL", "SHA1")});
 
-        abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag});
+        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});
+        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", ""});
+            abi_tag_entries.emplace_back(AbiEntry {"head", ""});
 
         Util::sort(abi_tag_entries);
 
@@ -506,7 +512,7 @@ namespace vcpkg::Build
             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};
+            return AbiTagAndFile {Hash::get_file_hash(fs, abi_file_path, "SHA1"), abi_file_path};
         }
 
         System::println(
@@ -596,7 +602,7 @@ namespace vcpkg::Build
             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});
+                AbiEntry {status_it->get()->package.spec.name(), status_it->get()->package.abi});
         }
 
         const auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet);
@@ -642,7 +648,7 @@ namespace vcpkg::Build
             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);
+                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);
@@ -679,7 +685,7 @@ namespace vcpkg::Build
         }
 
         return do_build_package_and_clean_buildtrees(
-            paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config);
+            paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile {}).tag, config);
     }
 
     const std::string& to_string(const BuildResult build_result)
@@ -844,21 +850,21 @@ namespace vcpkg::Build
             if (variable_name == "VCPKG_PLATFORM_TOOLSET")
             {
                 pre_build_info.platform_toolset =
-                    variable_value.empty() ? nullopt : Optional<std::string>{variable_value};
+                    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};
+                    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};
+                    variable_value.empty() ? nullopt : Optional<std::string> {variable_value};
                 continue;
             }
 
diff --git a/toolsrc/src/vcpkg/commands.cpp b/toolsrc/src/vcpkg/commands.cpp
index 7204b6e78..db265514f 100644
--- a/toolsrc/src/vcpkg/commands.cpp
+++ b/toolsrc/src/vcpkg/commands.cpp
@@ -46,6 +46,7 @@ namespace vcpkg::Commands
             {"autocomplete", &Autocomplete::perform_and_exit},
             {"hash", &Hash::perform_and_exit},
             {"fetch", &Fetch::perform_and_exit},
+            {"x-vsinstances", &X_VSInstances::perform_and_exit},
         };
         return t;
     }
diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp
index 2569c2cea..237feebdd 100644
--- a/toolsrc/src/vcpkg/commands.edit.cpp
+++ b/toolsrc/src/vcpkg/commands.edit.cpp
@@ -92,8 +92,8 @@ namespace vcpkg::Commands::Edit
 
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
     {
-        static const fs::path VS_CODE_INSIDERS = fs::path{"Microsoft VS Code Insiders"} / "Code - Insiders.exe";
-        static const fs::path VS_CODE = fs::path{"Microsoft VS Code"} / "Code.exe";
+        static const fs::path VS_CODE_INSIDERS = fs::path {"Microsoft VS Code Insiders"} / "Code - Insiders.exe";
+        static const fs::path VS_CODE = fs::path {"Microsoft VS Code"} / "Code.exe";
 
         auto& fs = paths.get_filesystem();
 
@@ -128,6 +128,14 @@ namespace vcpkg::Commands::Edit
             candidate_paths.push_back(*pf / VS_CODE);
         }
 
+        const auto& app_data = System::get_environment_variable("APPDATA");
+        if (const auto* ad = app_data.get())
+        {
+            const fs::path default_base = fs::path {*ad}.parent_path() / "Local" / "Programs";
+            candidate_paths.push_back(default_base / VS_CODE_INSIDERS);
+            candidate_paths.push_back(default_base / VS_CODE);
+        }
+
         const std::vector<fs::path> from_registry = find_from_registry();
         candidate_paths.insert(candidate_paths.end(), from_registry.cbegin(), from_registry.cend());
 
@@ -147,6 +155,16 @@ namespace vcpkg::Commands::Edit
         const std::vector<std::string> arguments = create_editor_arguments(paths, options, ports);
         const auto args_as_string = Strings::join(" ", arguments);
         const auto cmd_line = Strings::format(R"("%s" %s -n)", env_editor.u8string(), args_as_string);
+
+        auto editor_exe = env_editor.filename().u8string();
+
+#ifdef _WIN32
+        if (editor_exe == "Code.exe" || editor_exe == "Code - Insiders.exe")
+        {
+            System::cmd_execute_no_wait(cmd_line + " <NUL");
+            Checks::exit_success(VCPKG_LINE_INFO);
+        }
+#endif
         Checks::exit_with_code(VCPKG_LINE_INFO, System::cmd_execute(cmd_line));
     }
 }
diff --git a/toolsrc/src/vcpkg/commands.env.cpp b/toolsrc/src/vcpkg/commands.env.cpp
index d078baedb..ea00617d4 100644
--- a/toolsrc/src/vcpkg/commands.env.cpp
+++ b/toolsrc/src/vcpkg/commands.env.cpp
@@ -23,9 +23,9 @@ namespace vcpkg::Commands::Env
     }};
 
     const CommandStructure COMMAND_STRUCTURE = {
-        Help::create_example_string("env --triplet x64-windows"),
-        0,
+        Help::create_example_string("env <optional command> --triplet x64-windows"),
         0,
+        1,
         {SWITCHES, {}},
         nullptr,
     };
@@ -64,11 +64,12 @@ namespace vcpkg::Commands::Env
         if (add_python) extra_env.emplace("PYTHONPATH", (paths.installed / triplet.to_string() / "python").u8string());
         if (path_vars.size() > 0) extra_env.emplace("PATH", Strings::join(";", path_vars));
 
-        if (env_cmd.empty())
-            System::cmd_execute_clean("cmd", extra_env);
-        else
-            System::cmd_execute_clean(env_cmd + " && cmd", extra_env);
+        std::string env_cmd_prefix = env_cmd.empty() ? "" : Strings::format("%s && ", env_cmd);
+        std::string env_cmd_suffix =
+            args.command_arguments.empty() ? "cmd" : Strings::format("cmd /c %s", args.command_arguments.at(0));
 
+        const std::string cmd = Strings::format("%s%s", env_cmd_prefix, env_cmd_suffix);
+        System::cmd_execute_clean(cmd, extra_env);
         Checks::exit_success(VCPKG_LINE_INFO);
     }
 }
diff --git a/toolsrc/src/vcpkg/commands.exportifw.cpp b/toolsrc/src/vcpkg/commands.exportifw.cpp
index ae106196a..62725a90a 100644
--- a/toolsrc/src/vcpkg/commands.exportifw.cpp
+++ b/toolsrc/src/vcpkg/commands.exportifw.cpp
@@ -13,7 +13,7 @@ namespace vcpkg::Export::IFW
 
     static std::string create_release_date()
     {
-        const tm date_time = System::get_current_date_time();
+        const tm date_time = Chrono::get_current_date_time_local();
 
         // Format is: YYYY-mm-dd
         // 10 characters + 1 null terminating character will be written for a total of 11 chars
diff --git a/toolsrc/src/vcpkg/commands.xvsinstances.cpp b/toolsrc/src/vcpkg/commands.xvsinstances.cpp
new file mode 100644
index 000000000..d748b6b2f
--- /dev/null
+++ b/toolsrc/src/vcpkg/commands.xvsinstances.cpp
@@ -0,0 +1,33 @@
+#include "pch.h"
+
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/visualstudio.h>
+
+namespace vcpkg::Commands::X_VSInstances
+{
+    const CommandStructure COMMAND_STRUCTURE = {
+        Help::create_example_string("x-vsinstances"),
+        0,
+        0,
+        {{}, {}},
+        nullptr,
+    };
+
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
+    {
+#if defined(_WIN32)
+        const ParsedArguments parsed_args = args.parse_arguments(COMMAND_STRUCTURE);
+
+        const auto instances = vcpkg::VisualStudio::get_visual_studio_instances(paths);
+        for (const std::string& instance : instances)
+        {
+            System::println(instance);
+        }
+
+        Checks::exit_success(VCPKG_LINE_INFO);
+#else
+        Checks::exit_with_message(VCPKG_LINE_INFO, "This command is not supported on non-windows platforms.");
+#endif
+    }
+}
diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp
index 8161c0a62..eec9a39f2 100644
--- a/toolsrc/src/vcpkg/export.cpp
+++ b/toolsrc/src/vcpkg/export.cpp
@@ -108,7 +108,7 @@ namespace vcpkg::Export
 
     static std::string create_export_id()
     {
-        const tm date_time = System::get_current_date_time();
+        const tm date_time = Chrono::get_current_date_time_local();
 
         // Format is: YYYYmmdd-HHMMSS
         // 15 characters + 1 null terminating character will be written for a total of 16 chars
@@ -227,10 +227,10 @@ namespace vcpkg::Export
     {
         const std::vector<fs::path> integration_files_relative_to_root = {
             {".vcpkg-root"},
-            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "applocal.ps1"},
-            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "vcpkg.targets"},
-            {fs::path{"scripts"} / "buildsystems" / "vcpkg.cmake"},
-            {fs::path{"scripts"} / "cmake" / "vcpkg_get_windows_sdk.cmake"},
+            {fs::path {"scripts"} / "buildsystems" / "msbuild" / "applocal.ps1"},
+            {fs::path {"scripts"} / "buildsystems" / "msbuild" / "vcpkg.targets"},
+            {fs::path {"scripts"} / "buildsystems" / "vcpkg.cmake"},
+            {fs::path {"scripts"} / "cmake" / "vcpkg_get_windows_sdk.cmake"},
         };
 
         for (const fs::path& file : integration_files_relative_to_root)
diff --git a/toolsrc/src/vcpkg/globalstate.cpp b/toolsrc/src/vcpkg/globalstate.cpp
index a4100acf7..a54c596fb 100644
--- a/toolsrc/src/vcpkg/globalstate.cpp
+++ b/toolsrc/src/vcpkg/globalstate.cpp
@@ -13,4 +13,48 @@ namespace vcpkg
 
     std::atomic<int> GlobalState::g_init_console_cp(0);
     std::atomic<int> GlobalState::g_init_console_output_cp(0);
+    std::atomic<bool> GlobalState::g_init_console_initialized(false);
+
+    GlobalState::CtrlCStateMachine GlobalState::g_ctrl_c_state;
+
+    GlobalState::CtrlCStateMachine::CtrlCStateMachine() : m_state(CtrlCState::normal) {}
+
+    void GlobalState::CtrlCStateMachine::transition_to_spawn_process() noexcept
+    {
+        auto expected = CtrlCState::normal;
+        auto transitioned = m_state.compare_exchange_strong(expected, CtrlCState::blocked_on_child);
+        if (!transitioned)
+        {
+            // Ctrl-C was hit and is asynchronously executing on another thread
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+    }
+    void GlobalState::CtrlCStateMachine::transition_from_spawn_process() noexcept
+    {
+        auto expected = CtrlCState::blocked_on_child;
+        auto transitioned = m_state.compare_exchange_strong(expected, CtrlCState::normal);
+        if (!transitioned)
+        {
+            // Ctrl-C was hit while blocked on the child process
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+    }
+    void GlobalState::CtrlCStateMachine::transition_handle_ctrl_c() noexcept
+    {
+        auto prev_state = m_state.exchange(CtrlCState::exit_requested);
+
+        if (prev_state == CtrlCState::normal)
+        {
+            // Not currently blocked on a child process and Ctrl-C has not been hit.
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+        else if (prev_state == CtrlCState::exit_requested)
+        {
+            // Ctrl-C was hit previously
+        }
+        else
+        {
+            // This is the case where we are currently blocked on a child process
+        }
+    }
 }
diff --git a/toolsrc/src/vcpkg/help.cpp b/toolsrc/src/vcpkg/help.cpp
index 743619937..2b409373d 100644
--- a/toolsrc/src/vcpkg/help.cpp
+++ b/toolsrc/src/vcpkg/help.cpp
@@ -7,6 +7,13 @@
 #include <vcpkg/install.h>
 #include <vcpkg/remove.h>
 
+// Write environment variable names as %VARIABLE% on Windows and $VARIABLE in *nix
+#ifdef _WIN32
+#define ENVVAR(VARNAME) "%%" #VARNAME "%%"
+#else
+#define ENVVAR(VARNAME) "$" #VARNAME
+#endif
+
 namespace vcpkg::Help
 {
     struct Topic
@@ -93,7 +100,7 @@ namespace vcpkg::Help
             "%s" // Integration help
             "\n"
             "  vcpkg export <pkg>... [opt]...  Exports a package\n"
-            "  vcpkg edit <pkg>                Open up a port for editing (uses %%EDITOR%%, default 'code')\n"
+            "  vcpkg edit <pkg>                Open up a port for editing (uses " ENVVAR(EDITOR) ", default 'code')\n"
             "  vcpkg import <pkg>              Import a pre-built library\n"
             "  vcpkg create <pkg> <url>\n"
             "             [archivename]        Create a new package\n"
@@ -104,10 +111,10 @@ namespace vcpkg::Help
             "\n"
             "Options:\n"
             "  --triplet <t>                   Specify the target architecture triplet.\n"
-            "                                  (default: %%VCPKG_DEFAULT_TRIPLET%%, see 'vcpkg help triplet')\n"
+            "                                  (default: " ENVVAR(VCPKG_DEFAULT_TRIPLET) ", see 'vcpkg help triplet')\n"
             "\n"
             "  --vcpkg-root <path>             Specify the vcpkg root directory\n"
-            "                                  (default: %%VCPKG_ROOT%%)\n"
+            "                                  (default: " ENVVAR(VCPKG_ROOT) ")\n"
             "\n"
             "For more help (including examples) see the accompanying README.md.",
             Commands::Integrate::INTEGRATE_COMMAND_HELPSTRING);
diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp
index 4bb84831e..1cfa2bf71 100644
--- a/toolsrc/src/vcpkg/install.cpp
+++ b/toolsrc/src/vcpkg/install.cpp
@@ -62,7 +62,7 @@ namespace vcpkg::Install
         auto files = fs.get_files_recursive(source_dir);
         for (auto&& file : files)
         {
-            const auto status = fs.status(file, ec);
+            const auto status = fs.symlink_status(file, ec);
             if (ec)
             {
                 System::println(System::Color::error, "failed: %s: %s", file.u8string(), ec.message());
@@ -111,6 +111,23 @@ namespace vcpkg::Install
                     output.push_back(Strings::format(R"(%s/%s)", destination_subdirectory, suffix));
                     break;
                 }
+                case fs::file_type::symlink:
+                {
+                    if (fs.exists(target))
+                    {
+                        System::println(System::Color::warning,
+                                        "File %s was already present and will be overwritten",
+                                        target.u8string(),
+                                        ec.message());
+                    }
+                    fs.copy_symlink(file, target, ec);
+                    if (ec)
+                    {
+                        System::println(System::Color::error, "failed: %s: %s", target.u8string(), ec.message());
+                    }
+                    output.push_back(Strings::format(R"(%s/%s)", destination_subdirectory, suffix));
+                    break;
+                }
                 default:
                     System::println(System::Color::error, "failed: %s: cannot handle file type", file.u8string());
                     break;
diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp
index 6fe11951f..90dcb7d64 100644
--- a/toolsrc/src/vcpkg/postbuildlint.cpp
+++ b/toolsrc/src/vcpkg/postbuildlint.cpp
@@ -617,7 +617,11 @@ namespace vcpkg::PostBuildLint
             const std::string cmd_line =
                 Strings::format(R"("%s" /directives "%s")", dumpbin_exe.u8string(), lib.u8string());
             System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line);
-            Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n   %s\n failed", cmd_line);
+            Checks::check_exit(VCPKG_LINE_INFO,
+                               ec_data.exit_code == 0,
+                               "Running command:\n   %s\n failed with message:\n%s",
+                               cmd_line,
+                               ec_data.output);
 
             for (const BuildType& bad_build_type : bad_build_types)
             {
diff --git a/toolsrc/src/vcpkg/remove.cpp b/toolsrc/src/vcpkg/remove.cpp
index 13cc9325e..921a04c23 100644
--- a/toolsrc/src/vcpkg/remove.cpp
+++ b/toolsrc/src/vcpkg/remove.cpp
@@ -55,7 +55,7 @@ namespace vcpkg::Remove
 
                 auto target = paths.installed / suffix;
 
-                const auto status = fs.status(target, ec);
+                const auto status = fs.symlink_status(target, ec);
                 if (ec)
                 {
                     System::println(System::Color::error, "failed: status(%s): %s", target.u8string(), ec.message());
@@ -66,7 +66,7 @@ namespace vcpkg::Remove
                 {
                     dirs_touched.push_back(target);
                 }
-                else if (fs::is_regular_file(status))
+                else if (fs::is_regular_file(status) || fs::is_symlink(status))
                 {
                     fs.remove(target, ec);
                     if (ec)
diff --git a/toolsrc/src/vcpkg/visualstudio.cpp b/toolsrc/src/vcpkg/visualstudio.cpp
index 9480a11bf..e3656a7d2 100644
--- a/toolsrc/src/vcpkg/visualstudio.cpp
+++ b/toolsrc/src/vcpkg/visualstudio.cpp
@@ -22,6 +22,17 @@ namespace vcpkg::VisualStudio
             LEGACY
         };
 
+        static std::string release_type_to_string(const ReleaseType& release_type)
+        {
+            switch (release_type)
+            {
+                case ReleaseType::STABLE: return "STABLE";
+                case ReleaseType::PRERELEASE: return "PRERELEASE";
+                case ReleaseType::LEGACY: return "LEGACY";
+                default: Checks::unreachable(VCPKG_LINE_INFO);
+            }
+        }
+
         static bool preferred_first_comparator(const VisualStudioInstance& left, const VisualStudioInstance& right)
         {
             const auto get_preference_weight = [](const ReleaseType& type) -> int {
@@ -51,10 +62,15 @@ namespace vcpkg::VisualStudio
         std::string version;
         ReleaseType release_type;
 
+        std::string to_string() const
+        {
+            return Strings::format("%s, %s, %s", root_path.u8string(), version, release_type_to_string(release_type));
+        }
+
         std::string major_version() const { return version.substr(0, 2); }
     };
 
-    static std::vector<VisualStudioInstance> get_visual_studio_instances(const VcpkgPaths& paths)
+    static std::vector<VisualStudioInstance> get_visual_studio_instances_internal(const VcpkgPaths& paths)
     {
         const auto& fs = paths.get_filesystem();
         std::vector<VisualStudioInstance> instances;
@@ -66,7 +82,7 @@ namespace vcpkg::VisualStudio
         if (fs.exists(vswhere_exe))
         {
             const auto code_and_output = System::cmd_execute_and_capture_output(
-                Strings::format(R"("%s" -prerelease -legacy -products * -format xml)", vswhere_exe.u8string()));
+                Strings::format(R"("%s" -all -prerelease -legacy -products * -format xml)", vswhere_exe.u8string()));
             Checks::check_exit(VCPKG_LINE_INFO,
                                code_and_output.exit_code == 0,
                                "Running vswhere.exe failed with message:\n%s",
@@ -114,9 +130,9 @@ namespace vcpkg::VisualStudio
         {
             // We want lexically_normal(), but it is not available
             // Correct root path might be 2 or 3 levels up, depending on if the path has trailing backslash. Try both.
-            auto common7_tools = fs::path{*path_as_string};
-            append_if_has_cl(fs::path{*path_as_string}.parent_path().parent_path());
-            append_if_has_cl(fs::path{*path_as_string}.parent_path().parent_path().parent_path());
+            auto common7_tools = fs::path {*path_as_string};
+            append_if_has_cl(fs::path {*path_as_string}.parent_path().parent_path());
+            append_if_has_cl(fs::path {*path_as_string}.parent_path().parent_path().parent_path());
         }
 
         // VS2015 instance from Program Files
@@ -125,6 +141,13 @@ namespace vcpkg::VisualStudio
         return instances;
     }
 
+    std::vector<std::string> get_visual_studio_instances(const VcpkgPaths& paths)
+    {
+        std::vector<VisualStudioInstance> sorted {get_visual_studio_instances_internal(paths)};
+        std::sort(sorted.begin(), sorted.end(), VisualStudioInstance::preferred_first_comparator);
+        return Util::fmap(sorted, [](const VisualStudioInstance& instance) { return instance.to_string(); });
+    }
+
     std::vector<Toolset> find_toolset_instances_preferred_first(const VcpkgPaths& paths)
     {
         using CPU = System::CPUArchitecture;
@@ -137,8 +160,8 @@ namespace vcpkg::VisualStudio
         std::vector<Toolset> found_toolsets;
         std::vector<Toolset> excluded_toolsets;
 
-        const SortedVector<VisualStudioInstance> sorted{get_visual_studio_instances(paths),
-                                                        VisualStudioInstance::preferred_first_comparator};
+        const SortedVector<VisualStudioInstance> sorted {get_visual_studio_instances_internal(paths),
+                                                         VisualStudioInstance::preferred_first_comparator};
 
         const bool v140_is_available = Util::find_if(sorted, [&](const VisualStudioInstance& vs_instance) {
                                            return vs_instance.major_version() == "14";
@@ -194,7 +217,7 @@ namespace vcpkg::VisualStudio
                     paths_examined.push_back(dumpbin_path);
                     if (fs.exists(dumpbin_path))
                     {
-                        const Toolset v141_toolset{
+                        const Toolset v141_toolset {
                             vs_instance.root_path, dumpbin_path, vcvarsall_bat, {}, V_141, supported_architectures};
 
                         const auto english_language_pack = dumpbin_path.parent_path() / "1033";
@@ -209,12 +232,12 @@ namespace vcpkg::VisualStudio
 
                         if (v140_is_available)
                         {
-                            const Toolset v140_toolset{vs_instance.root_path,
-                                                       dumpbin_path,
-                                                       vcvarsall_bat,
-                                                       {"-vcvars_ver=14.0"},
-                                                       V_140,
-                                                       supported_architectures};
+                            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);
                         }
 
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj
index abfe8a242..315c48174 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj
@@ -233,6 +233,7 @@
     <ClCompile Include="..\src\vcpkg\commands.search.cpp" />
     <ClCompile Include="..\src\vcpkg\commands.upgrade.cpp" />
     <ClCompile Include="..\src\vcpkg\commands.version.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.xvsinstances.cpp" />
     <ClCompile Include="..\src\vcpkg\dependencies.cpp" />
     <ClCompile Include="..\src\vcpkg\export.cpp" />
     <ClCompile Include="..\src\vcpkg\globalstate.cpp" />
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
index 42493d623..3e0ccd885 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
@@ -213,6 +213,9 @@
     <ClCompile Include="..\src\vcpkg\base\downloads.cpp">
       <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\vcpkg\commands.xvsinstances.cpp">
+      <Filter>Source Files\vcpkg</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\pch.h">
author	Bob Kast <bob.kast@emc.com>	2018-10-23 09:06:58 -0400
committer	Bob Kast <bob.kast@emc.com>	2018-10-23 09:06:58 -0400
commit	230d795ae3c3f2e45821b887c6065a81a8c04326 (patch)
tree	7b014a1547ff1cc9ef80add56eb03b17774a1ff6
parent	3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff)
parent	9b21ff9612916e24f89c6839599d3d50446597d8 (diff)
download	vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip