Merge master

author: Thad House <thadhouse1@gmail.com> 2019-05-31 13:49:13 -0700
committer: Thad House <thadhouse1@gmail.com> 2019-05-31 13:49:13 -0700
commit: 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch)
tree: 173ade0e6960917458afe9dd9fb0c3c2b7f32051
parent: f483ae4c7fd04eed671a1de595374f84175311e9 (diff)
parent: 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff)
download: vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz
vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip
1639 files changed, 18416 insertions, 8840 deletions
diff --git a/README.md b/README.md
index e32ef7025..9d526cdd2 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ For short description of available commands, run `vcpkg help`.
 ## Quick Start
 Prerequisites:
 - Windows 10, 8.1, 7, Linux, or MacOS
-- Visual Studio 2017 or Visual Studio 2015 Update 3 (on Windows)
+- Visual Studio 2015 Update 3 or newer (on Windows)
 - Git
 - *Optional:* CMake 3.12.4
 
diff --git a/docs/about/faq.md b/docs/about/faq.md
index b83674d05..504738479 100644
--- a/docs/about/faq.md
+++ b/docs/about/faq.md
@@ -1,7 +1,7 @@
 # Frequently Asked Questions
 
 ## Can I contribute a new library?
-Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md).
+Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md).  If you want to contribute but don't have a particular library in mind then take a look at the list of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+port+request+-+consider+making+a+PR%21%22).
 
 ## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg?
 Yes! See [the `export` command](../users/integration.md#export).
diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md
index eb03f1d94..a8f430836 100644
--- a/docs/maintainers/control-files.md
+++ b/docs/maintainers/control-files.md
@@ -1,81 +1,130 @@
 # CONTROL files
 
-Each port has some static metadata in the form of a `CONTROL` file. This file uses the same syntax and a subset of the fields from [the Debian `control` format][debian].
+The `CONTROL` file contains metadata about the port.  The syntax is based on [the Debian `control` format][debian] although we only support the subset of fields documented here.
 
-Field names are case-sensitive.
+Field names are case-sensitive and start the line without leading whitespace.  Paragraphs are separated by one or more empty lines.
 
 [debian]: https://www.debian.org/doc/debian-policy/ch-controlfields.html
 
 ## Source Paragraph
 
-The first paragraph appearing in a `CONTROL` file is the Source paragraph, which defines the core attributes of the package (name, version, and so on).
+The first paragraph in a `CONTROL` file is the Source paragraph.  It must have a `Source`, `Version`, and `Description` field.  It can optionally have a `Build-Depends` and `Default-Features` field.
+
+### Examples:
+```no-highlight
+Source: ace
+Version: 6.5.5-1
+Description: The ADAPTIVE Communication Environment
+```
 
-### Example:
 ```no-highlight
 Source: vtk
-Version: 8.1.0-1
+Version: 8.2.0-2
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
 ```
 
+
 ### Recognized fields
 
 #### Source
 The name of the port.
 
+When adding new ports be aware that the name may conflict with other projects that are not a part of vcpkg.  For example `json` conflicts with too many other projects so you should add a scope to the name such as `taocpp-json` to make it unique.  Verify there are no conflicts on a search engine as well as on other package collections.
+
+Package collections to check for conflicts:
+
++ [Repology](https://repology.org/projects/)
++ [Debian packages](https://www.debian.org/distrib/packages)
++ [Packages search](https://pkgs.org/)
+
 #### Version
 The port version.
 
-This field should be an alphanumeric string which may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bitstrings and are only evaluated for equality.
+This field is an alphanumeric string that may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bit strings and are only evaluated for equality.
 
 By convention, if a portfile is modified without incrementing the "upstream" version, a `-#` is appended to create a unique version string.
 
+Some projects do not have named releases.  In these cases use the date of the version   do not have labeled releases, in these cases use the date of the last commit in `YYYY-MM-DD` format.  See the `abseil` port as an example.
+
 Example:
 ```no-highlight
 Version: 1.0.5-2
 ```
+```no-highlight
+Version: 2019-3-21
+```
 
 #### Description
 A description of the library
 
-The first sentence of the description should concisely describe the purpose and contents of the library. Then, a larger description including the library's "proper name" should follow.
+By convention the first line of the description is a summary of the library.  An optional detailed description follows.  The detailed description can be multiple lines, all starting with whitespace.
 
-#### Maintainer
-Reserved for future use.
+Example:
+```no-highlight
+Description: C++ header-only JSON library
+```
+```no-highlight
+Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.
+  MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine 
+  to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
+````
 
 #### Build-Depends
-The list of dependencies required to build and use this library.
+Comma separated list of vcpkg ports the library has a dependency on.
+
+Vcpkg does not distinguish between build-only dependencies and runtime dependencies. The complete list of dependencies needed to successfully use the library should be specified.
+
+*For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies*
 
 Example:
 ```no-highlight
 Build-Depends: zlib, libpng, libjpeg-turbo, tiff
 ```
+If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax.
 
-Unlike dpkg, Vcpkg does not distinguish between build-only dependencies and runtime dependencies. The complete list of dependencies needed to successfully use the library should be specified.
+Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name.  There must be a space between the name of the port and the filter. __This will change in a future version to not depend on the triplet name.__
 
-*For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies*
+Example:
+```no-highlight
+Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[darwinssl] (osx)
+```
 
-Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name. __This will change in a future version to not depend on the triplet name.__
+#### Default-Feature
+Comma separated list of optional port features to install by default.
+
+This field is optional.
 
-Example:
 ```no-highlight
-Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (windows)
+Default-Features: dynamodb, s3, kinesis
 ```
 
 ## Feature Paragraphs
 
-After the Source Paragraph, `CONTROL` files can list zero or more Feature Paragraphs which declare features.
+Multiple optional features can be specified in the `CONTROL` files.  It must have a `Feature` and `Description` field.  It can optionally have a `Build-Depends` field.  It must be separated from other paragraphs by one or more empty lines.
 
 ### Example:
 ```no-highlight
 Source: vtk
-Version: 8.1.0-1
+Version: 8.2.0-2
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
+
+Feature: openvr
+Description: OpenVR functionality for VTK
+Build-Depends: sdl2, openvr
+
+Feature: qt
+Description: Qt functionality for VTK
+Build-Depends: qt5
 
 Feature: mpi
 Description: MPI functionality for VTK
 Build-Depends: msmpi, hdf5[parallel]
+
+Feature: python
+Description: Python functionality for VTK
+Build-Depends: python3
 ```
 
 ### Recognized fields
@@ -84,9 +133,9 @@ Build-Depends: msmpi, hdf5[parallel]
 The name of the feature.
 
 #### Description
-A description of the feature
+A description of the feature using the same syntax as the port  `Description` field.
 
 #### Build-Depends
 The list of dependencies required to build and use this feature.
 
-All dependencies from selected features are unioned together to produce the final dependency set for the build. This field follows the same syntax as `Build-Depends` in the Source Paragraph.
+On installation the dependencies from all selected features are combined to produce the full dependency list for the build. This field follows the same syntax as `Build-Depends` in the Source Paragraph.
diff --git a/ports/3fd/CONTROL b/ports/3fd/CONTROL
index 6f278f762..75eecaa31 100644
--- a/ports/3fd/CONTROL
+++ b/ports/3fd/CONTROL
@@ -1,4 +1,4 @@
 Source: 3fd
-Version: 2.6.2-2
+Version: 2.6.2-3
 Description: C++ Framework For Fast Development
 Build-Depends: boost-lockfree (windows), boost-regex (windows), poco (windows), sqlite3, rapidxml
diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake
index 1e7e9d601..40c902137 100644
--- a/ports/3fd/portfile.cmake
+++ b/ports/3fd/portfile.cmake
@@ -1,113 +1,105 @@
-include(vcpkg_common_functions)
-
-# Check architecture:
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(BUILD_ARCH "Win32")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(BUILD_ARCH "x64")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    set(BUILD_ARCH "ARM")
-else()
-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
-
-# Check library linkage:
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("3FD only supports static library linkage. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-# Check CRT linkage:
-if (VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "3FD can only be built with dynamic linkage to CRT!")
-endif()
-
-# Get source code:
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO faburaya/3FD
-    REF v2.6.2
-    SHA512 a2444cc07d8741540c6071ac59bc8c63785db52e412a843aa18a5dfa0144b5001d428e44bcb520238e3d476440bc74526343f025005f05d534e732645f59cbe0
-    HEAD_REF master
-    PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/remove-seekpos.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/DataException.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/RapidXML.patch"
-)
-
-# Copy the sources to ensure a clean, out-of-source build
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
-file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
-get_filename_component(LAST_DIR_NAME "${SOURCE_PATH}" NAME)
-set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all/${LAST_DIR_NAME}")
-
-# Build:
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP:
-    vcpkg_build_msbuild(
-        USE_VCPKG_INTEGRATION
-        PROJECT_PATH ${SOURCE_PATH}/3FD/3FD.WinRT.UWP.vcxproj
-        PLATFORM ${BUILD_ARCH}
-    )
-elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32:
-    vcpkg_build_msbuild(
-        USE_VCPKG_INTEGRATION
-        PROJECT_PATH ${SOURCE_PATH}/3FD/3FD.vcxproj
-        PLATFORM ${BUILD_ARCH}
-        TARGET Build
-    )
-else()
-    message(FATAL_ERROR "Unsupported system: 3FD is not currently ported to VCPKG in ${VCPKG_CMAKE_SYSTEM_NAME}!")
-endif()
-
-# Install:
-file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/3FD/*.h")
-file(INSTALL
-    ${HEADER_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD
-    PATTERN "*_impl*.h" EXCLUDE
-    PATTERN "*example*.h" EXCLUDE
-    PATTERN "stdafx.h" EXCLUDE
-    PATTERN "targetver.h" EXCLUDE
-)
-
-file(INSTALL ${SOURCE_PATH}/btree  DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD)
-file(INSTALL ${SOURCE_PATH}/OpenCL/CL DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD)
-
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/3FD)
-file(INSTALL
-    ${SOURCE_PATH}/3FD/3fd-config-template.xml
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/3FD
-)
-
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Visual C++, UWP app:
-    file(INSTALL
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.WinRT.UWP/3FD.WinRT.UWP.lib
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.WinRT.UWP/_3FD_WinRT_UWP.pri
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/WinRT.UWP/3FD.WinRT.UWP.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-    )
-    file(INSTALL
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.WinRT.UWP/3FD.WinRT.UWP.lib
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.WinRT.UWP/_3FD_WinRT_UWP.pri
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/WinRT.UWP/3FD.WinRT.UWP.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-    )
-else() # Visual C++, Win32 app:
-    file(INSTALL
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.lib
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-    )
-    file(INSTALL
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.lib
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-    )
-endif()
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/Acknowledgements.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd)
-
-vcpkg_copy_pdbs()
+include(vcpkg_common_functions)
+
+# Check architecture:
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(BUILD_ARCH "Win32")
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    set(BUILD_ARCH "x64")
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+    set(BUILD_ARCH "ARM")
+else()
+    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+# Check library linkage:
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
+
+# Get source code:
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO faburaya/3FD
+    REF v2.6.2
+    SHA512 a2444cc07d8741540c6071ac59bc8c63785db52e412a843aa18a5dfa0144b5001d428e44bcb520238e3d476440bc74526343f025005f05d534e732645f59cbe0
+    HEAD_REF master
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/remove-seekpos.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/DataException.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/RapidXML.patch"
+)
+
+# Copy the sources to ensure a clean, out-of-source build
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
+file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
+file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
+get_filename_component(LAST_DIR_NAME "${SOURCE_PATH}" NAME)
+set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all/${LAST_DIR_NAME}")
+
+# Build:
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP:
+    vcpkg_build_msbuild(
+        USE_VCPKG_INTEGRATION
+        PROJECT_PATH ${SOURCE_PATH}/3FD/3FD.WinRT.UWP.vcxproj
+        PLATFORM ${BUILD_ARCH}
+    )
+elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32:
+    vcpkg_build_msbuild(
+        USE_VCPKG_INTEGRATION
+        PROJECT_PATH ${SOURCE_PATH}/3FD/3FD.vcxproj
+        PLATFORM ${BUILD_ARCH}
+        TARGET Build
+    )
+else()
+    message(FATAL_ERROR "Unsupported system: 3FD is not currently ported to VCPKG in ${VCPKG_CMAKE_SYSTEM_NAME}!")
+endif()
+
+# Install:
+file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/3FD/*.h")
+file(INSTALL
+    ${HEADER_FILES}
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD
+    PATTERN "*_impl*.h" EXCLUDE
+    PATTERN "*example*.h" EXCLUDE
+    PATTERN "stdafx.h" EXCLUDE
+    PATTERN "targetver.h" EXCLUDE
+)
+
+file(INSTALL ${SOURCE_PATH}/btree  DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD)
+file(INSTALL ${SOURCE_PATH}/OpenCL/CL DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/3FD)
+file(INSTALL
+    ${SOURCE_PATH}/3FD/3fd-config-template.xml
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/3FD
+)
+
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Visual C++, UWP app:
+    file(INSTALL
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.WinRT.UWP/3FD.WinRT.UWP.lib
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.WinRT.UWP/_3FD_WinRT_UWP.pri
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/WinRT.UWP/3FD.WinRT.UWP.pdb
+        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+    )
+    file(INSTALL
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.WinRT.UWP/3FD.WinRT.UWP.lib
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.WinRT.UWP/_3FD_WinRT_UWP.pri
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/WinRT.UWP/3FD.WinRT.UWP.pdb
+        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+    )
+else() # Visual C++, Win32 app:
+    file(INSTALL
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.lib
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.pdb
+        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+    )
+    file(INSTALL
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.lib
+        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.pdb
+        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+    )
+endif()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/Acknowledgements.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd)
+
+vcpkg_copy_pdbs()
diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt
index 7235b95e2..b4147266f 100644
--- a/ports/abseil/CMakeLists.txt
+++ b/ports/abseil/CMakeLists.txt
@@ -6,7 +6,6 @@ add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 set(CMAKE_CXX_STANDARD 14)
 
 set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
     option(INSTALL_HEADERS "Install header files" ON)
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
index 9893bf7f8..65c35d7ec 100644
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@@ -1,5 +1,5 @@
 Source: abseil
-Version: 2019_01_30-1
+Version: 2019-05-08
 Description: an open-source collection designed to augment the C++ standard library.
   Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
   In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index ddf17c87c..b14618229 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -4,11 +4,13 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "Abseil currently only supports being built for desktop")
 endif()
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
-    REF 540e2537b92cd4abfae6ceddfe24304345461f32
-    SHA512 3cabab23ad159592562a30531052bb18c66fce75f93f84a6de17a7488b7d6651f645950c1adb8dfbacc651f2bc0db82c316de132baab38e3ef95ea5b5a0eb6d2
+    REF aa468ad75539619b47979911297efbb629c52e44
+    SHA512 4254d8599103d8f06b03f60a0386eba07f314184217d0bca404d41fc0bd0a8df287fe6d07158d10cde096af3097aff2ecc1a5e8f7c3046ecf956b5fde709ad1d
     HEAD_REF master
     PATCHES fix-usage-lnk-error.patch
 )
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 9d4d36cd5..8b76f644a 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -1,3 +1,13 @@
 Source: ace
 Version: 6.5.5-1
 Description: The ADAPTIVE Communication Environment
+
+Feature: wchar
+Description: Enable extra wide char functions in ACE
+
+Feature: ssl
+Description: Enable SSL/TLS features in ACE
+Build-Depends: openssl
+
+Feature: xml
+Description: Enable XML features in ACE
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index d33028c9a..264829dfb 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -2,6 +2,21 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
 
+if("wchar" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "uses_wchar=1")
+endif()
+if("zlib" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "zlib=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "zlib=0")
+endif()
+if("ssl" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "ssl=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "ssl=0")
+endif()
+list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
   if(NOT VCPKG_CMAKE_SYSTEM_NAME)
     set(DLL_DECORATOR s)
@@ -58,7 +73,7 @@ endif()
 
 # Invoke mwc.pl to generate the necessary solution and project files
 vcpkg_execute_required_process(
-    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} ace ${MPC_STATIC_FLAG}
+    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG}
     WORKING_DIRECTORY ${ACE_ROOT}
     LOGNAME mwc-${TARGET_TRIPLET}
 )
@@ -67,6 +82,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   vcpkg_build_msbuild(
     PROJECT_PATH ${SOURCE_PATH}/ace.sln
     PLATFORM ${MSBUILD_PLATFORM}
+    USE_VCPKG_INTEGRATION
   )
 endif()
 
@@ -106,6 +122,9 @@ install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/arpa")
 install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/net")
 install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/netinet")
 install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/sys")
+if("ssl" IN_LIST FEATURES)
+    install_ace_headers_subdirectory(${SOURCE_PATH} "SSL")
+endif()
 
 # Install the libraries
 function(install_ace_library SOURCE_PATH ACE_LIBRARY)
@@ -143,6 +162,9 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   install_ace_library(${ACE_ROOT} "ACE_QoS")
 endif()
 install_ace_library(${ACE_ROOT} "ACE_RLECompression")
+if("ssl" IN_LIST FEATURES)
+    install_ace_library(${ACE_ROOT} "ACE_SSL")
+endif()
 
 # Handle copyright
 file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
diff --git a/ports/ade/CONTROL b/ports/ade/CONTROL
new file mode 100644
index 000000000..ccce7f1db
--- /dev/null
+++ b/ports/ade/CONTROL
@@ -0,0 +1,3 @@
+Source: ade
+Version: 0.1.1d
+Description: ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.
+\ No newline at end of file
diff --git a/ports/ade/portfile.cmake b/ports/ade/portfile.cmake
new file mode 100644
index 000000000..95d001828
--- /dev/null
+++ b/ports/ade/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO opencv/ade
+    REF v0.1.1d
+    SHA512 c493cb57e59ba859ca0cbf5d48bae4233f22104dfb4a96864d07e9422bb700c27af2d53a602f2230d68b7bcc598920d0652c3d9fdf8fad94a7e5b4d21664a44e
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS_DEBUG
+    -DCMAKE_DEBUG_POSTFIX=d
+)
+
+vcpkg_install_cmake()
+
+file(COPY ${CURRENT_PACKAGES_DIR}/debug/share/ade/adeTargets-debug.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/ade/)
+
+file(READ ${CURRENT_PACKAGES_DIR}/share/ade/adeTargets-debug.cmake ADE_TARGET_DEBUG)
+string(REPLACE "/lib/"
+               "/debug/lib/" ADE_TARGET_DEBUG "${ADE_TARGET_DEBUG}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/ade/adeTargets-debug.cmake "${ADE_TARGET_DEBUG}")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ade RENAME copyright)
diff --git a/ports/alac-decoder/CMakeLists.txt b/ports/alac-decoder/CMakeLists.txt
index cafd05b18..1d82fc4e5 100644
--- a/ports/alac-decoder/CMakeLists.txt
+++ b/ports/alac-decoder/CMakeLists.txt
@@ -20,10 +20,6 @@ if(MSVC)
   add_compile_options(/W4 -D_CRT_SECURE_NO_WARNINGS -DTARGET_OS_WIN32)
 endif()
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 include_directories(.)
 
 add_library(libalac_decoder ${SRCS})
diff --git a/ports/alac-decoder/CONTROL b/ports/alac-decoder/CONTROL
index b2300174b..e2b3da2b1 100644
--- a/ports/alac-decoder/CONTROL
+++ b/ports/alac-decoder/CONTROL
@@ -1,3 +1,3 @@
-Source: alac-decoder
-Version: 0.2
-Description:  ALAC C implementation of a decoder, written from reverse engineering the file format
+Source: alac-decoder
+Version: 0.2-1
+Description:  ALAC C implementation of a decoder, written from reverse engineering the file format
diff --git a/ports/alac-decoder/portfile.cmake b/ports/alac-decoder/portfile.cmake
index c1390d7f8..ee4a109d9 100644
--- a/ports/alac-decoder/portfile.cmake
+++ b/ports/alac-decoder/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/alac_decoder)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://distfiles.macports.org/alac_decoder/alac_decoder-0.2.0.tgz"
diff --git a/ports/alac/CMakeLists.txt b/ports/alac/CMakeLists.txt
index 843189546..fbe190b56 100644
--- a/ports/alac/CMakeLists.txt
+++ b/ports/alac/CMakeLists.txt
@@ -35,10 +35,6 @@ if(MSVC)
   add_compile_options(/W4 -D_CRT_SECURE_NO_WARNINGS -DTARGET_OS_WIN32)
 endif()
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 include_directories(. codec convert-utility)
 
 add_library(libalac ${SRCS})
diff --git a/ports/alac/CONTROL b/ports/alac/CONTROL
index f50b135e9..07ca2b5a2 100644
--- a/ports/alac/CONTROL
+++ b/ports/alac/CONTROL
@@ -1,3 +1,3 @@
 Source: alac
-Version:  2017-11-03-c38887c5
+Version:  2017-11-03-c38887c5-1
 Description: The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.
diff --git a/ports/alac/portfile.cmake b/ports/alac/portfile.cmake
index 309ebfef9..ce5c6bad1 100644
--- a/ports/alac/portfile.cmake
+++ b/ports/alac/portfile.cmake
@@ -3,6 +3,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO macosforge/alac
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL
index 59a6580ba..f828892df 100644
--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@@ -1,4 +1,4 @@
 Source: alembic
-Version: 1.7.10
+Version: 1.7.11
 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/fix-C1083.patch b/ports/alembic/fix-C1083.patch
new file mode 100644
index 000000000..15de9f514
--- /dev/null
+++ b/ports/alembic/fix-C1083.patch
@@ -0,0 +1,49 @@
+diff --git a/lib/Alembic/Abc/Foundation.h b/lib/Alembic/Abc/Foundation.h
+index 9760c49..fbab6a0 100644
+--- a/lib/Alembic/Abc/Foundation.h
++++ b/lib/Alembic/Abc/Foundation.h
+@@ -40,11 +40,11 @@
+ #include <Alembic/AbcCoreAbstract/All.h>
+ #include <Alembic/Util/All.h>
+ 
+-#include <ImathVec.h>
+-#include <ImathBox.h>
+-#include <ImathMatrix.h>
+-#include <ImathQuat.h>
+-#include <ImathColor.h>
++#include <OpenEXR/ImathVec.h>
++#include <OpenEXR/ImathBox.h>
++#include <OpenEXR/ImathMatrix.h>
++#include <OpenEXR/ImathQuat.h>
++#include <OpenEXR/ImathColor.h>
+ 
+ #include <iostream>
+ #include <string>
+diff --git a/lib/Alembic/AbcGeom/Foundation.h b/lib/Alembic/AbcGeom/Foundation.h
+index 301efc3..2bb0f6b 100644
+--- a/lib/Alembic/AbcGeom/Foundation.h
++++ b/lib/Alembic/AbcGeom/Foundation.h
+@@ -39,8 +39,8 @@
+ 
+ #include <Alembic/Abc/All.h>
+ 
+-#include <ImathMatrixAlgo.h>
+-#include <ImathEuler.h>
++#include <OpenEXR/ImathMatrixAlgo.h>
++#include <OpenEXR/ImathEuler.h>
+ 
+ 
+ namespace Alembic {
+diff --git a/lib/Alembic/Util/Foundation.h b/lib/Alembic/Util/Foundation.h
+index d7f40dd..a41bb97 100644
+--- a/lib/Alembic/Util/Foundation.h
++++ b/lib/Alembic/Util/Foundation.h
+@@ -63,7 +63,7 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++#include <OpenEXR/half.h>
+ 
+ #include <iomanip>
+ #include <iostream>
diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake
index 1f01136b3..9e97ac89d 100644
--- a/ports/alembic/portfile.cmake
+++ b/ports/alembic/portfile.cmake
@@ -7,24 +7,18 @@ if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
     )
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Alembic does not support static linkage. Building dynamically.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alembic/alembic
-    REF 1.7.10
-    SHA512 e98ffaedb98dbc5c53fe9703d3063bb118d32c83c47e3af04c8fc96237034b02fe0fc2c628ca82bdd0e0ef17d9375f4f48e0022ce33380b9ad91970539611ced
+    REF 1.7.11
+    SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-    ${CMAKE_CURRENT_LIST_DIR}/fix-hdf5link.patch
-    ${CMAKE_CURRENT_LIST_DIR}/bypass-findhdf5.patch
+        fix-hdf5link.patch
+        bypass-findhdf5.patch
+        fix-C1083.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/aliyun-oss-c-sdk/CONTROL b/ports/aliyun-oss-c-sdk/CONTROL
new file mode 100644
index 000000000..430541401
--- /dev/null
+++ b/ports/aliyun-oss-c-sdk/CONTROL
@@ -0,0 +1,4 @@
+Source: aliyun-oss-c-sdk
+Version: 3.7.1-1
+Description: Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.
+Build-Depends: curl, apr-util
diff --git a/ports/aliyun-oss-c-sdk/patch.patch b/ports/aliyun-oss-c-sdk/patch.patch
new file mode 100644
index 000000000..31c18d897
--- /dev/null
+++ b/ports/aliyun-oss-c-sdk/patch.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0abcb93..75195a9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,5 +150,5 @@ INSTALL(FILES
+   oss_c_sdk/oss_xml.h
+   DESTINATION include/oss_c_sdk)
+ 
+-add_subdirectory(oss_c_sdk_sample)
+-add_subdirectory(oss_c_sdk_test)
++#add_subdirectory(oss_c_sdk_sample)
++#add_subdirectory(oss_c_sdk_test)
diff --git a/ports/aliyun-oss-c-sdk/portfile.cmake b/ports/aliyun-oss-c-sdk/portfile.cmake
new file mode 100644
index 000000000..2e3a2c73e
--- /dev/null
+++ b/ports/aliyun-oss-c-sdk/portfile.cmake
@@ -0,0 +1,26 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO aliyun/aliyun-oss-c-sdk
+    REF 3.7.1
+    SHA512 0c289832d87ea7fae60d0846617bc839a1529ab6d59c2bb520e2826b0374953e8078179c4043c5c85a56c38985189aa584036104a504da4cf1ea2d35a53c8fde
+    HEAD_REF master
+	PATCHES
+	patch.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+	PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/allegro5/CONTROL b/ports/allegro5/CONTROL
index a1515adff..0a18649f8 100644
--- a/ports/allegro5/CONTROL
+++ b/ports/allegro5/CONTROL
@@ -1,4 +1,4 @@
 Source: allegro5
-Version: 5.2.4.0
+Version: 5.2.5.0
 Description: Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.
 Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora, opus, opusfile
diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake
index bb9673536..b8619f99b 100644
--- a/ports/allegro5/portfile.cmake
+++ b/ports/allegro5/portfile.cmake
@@ -14,8 +14,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO liballeg/allegro5
-    REF 5.2.4.0
-    SHA512 46a7c7b65ffb49ae5c81e5a33d850b4ae94b59135fc9b15174ffe86133445ff328c623c2c48298d3f631cc6310d51f4f3f07b8b952ecbd360755001292cbda8b
+    REF 5.2.5.0
+    SHA512 9b97a46f0fd146c3958a5f8333822665ae06b984b3dbedc1356afdac8fe3248203347cb08b30ebda049a7320948c7844e9d00dc055c317836c2557b5bfc2ab04
     HEAD_REF master
 )
 
diff --git a/ports/amqpcpp/CONTROL b/ports/amqpcpp/CONTROL
index 3cf199118..d0642edb4 100644
--- a/ports/amqpcpp/CONTROL
+++ b/ports/amqpcpp/CONTROL
@@ -1,4 +1,4 @@
 Source: amqpcpp
-Version: 4.1.2
+Version: 4.1.4
 Description: AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker
 Build-Depends: openssl (linux)
diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake
index 64b02f686..697b8f802 100644
--- a/ports/amqpcpp/portfile.cmake
+++ b/ports/amqpcpp/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CopernicaMarketingSoftware/AMQP-CPP
-    REF v4.1.2
-    SHA512 e2015d3958d434532591f9a304c625bdebb9bb075af1e2b684c9b8b061df8a2fd6a407200c802ad7b88ee954bcdad854f44a43512f76adf225addf145fc0fb44
+    REF v4.1.4
+    SHA512 d589756ad8e27ce6b6772128479083293c4dbb8c7aa79b7b08f0036ced9ab76ecb75e55458f04de8e2745c9732a6322f4e910f3f8611633c5cd5c35fb7dcaed1
     HEAD_REF master
     PATCHES
         find-openssl.patch
diff --git a/ports/anax/CONTROL b/ports/anax/CONTROL
index 459692ac5..a11803305 100644
--- a/ports/anax/CONTROL
+++ b/ports/anax/CONTROL
@@ -1,3 +1,3 @@
-Source: anax
-Version: 2.1.0-4
-Description: An open source C++ entity system. <https://github.com/miguelmartin75/anax>
+Source: anax
+Version: 2.1.0-5
+Description: An open source C++ entity system. <https://github.com/miguelmartin75/anax>
diff --git a/ports/anax/portfile.cmake b/ports/anax/portfile.cmake
index 49fbb372d..346e45edb 100644
--- a/ports/anax/portfile.cmake
+++ b/ports/anax/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO miguelmartin75/anax
@@ -13,8 +15,6 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     DISABLE_PARALLEL_CONFIGURE
-    OPTIONS
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()
@@ -25,4 +25,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/anax)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/anax/LICENSE ${CURRENT_PACKAGES_DIR}/share/anax/copyright)
 
-vcpkg_copy_pdbs()
-\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/angelscript/CONTROL b/ports/angelscript/CONTROL
new file mode 100644
index 000000000..7c12ea845
--- /dev/null
+++ b/ports/angelscript/CONTROL
@@ -0,0 +1,3 @@
+Source: angelscript
+Version: 2.33.0
+Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer. 
diff --git a/ports/angelscript/LICENSE b/ports/angelscript/LICENSE
new file mode 100644
index 000000000..27105b90d
--- /dev/null
+++ b/ports/angelscript/LICENSE
@@ -0,0 +1,13 @@
+AngelCode Scripting Library
+
+Copyright © 2003-2018 Andreas Jönsson
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+    The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+    Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+    This notice may not be removed or altered from any source distribution.
diff --git a/ports/angelscript/mark-threads-private.patch b/ports/angelscript/mark-threads-private.patch
new file mode 100644
index 000000000..567c19aa1
--- /dev/null
+++ b/ports/angelscript/mark-threads-private.patch
@@ -0,0 +1,13 @@
+diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt
+index 7c800c5..982ad8b 100644
+--- a/angelscript/projects/cmake/CMakeLists.txt
++++ b/angelscript/projects/cmake/CMakeLists.txt
+@@ -145,7 +145,7 @@ endif()
+ 
+ # Don't override the default library output path to avoid conflicts when building for multiple target platforms
+ #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
+-target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads)
++target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads)
+ 
+ set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+ 
diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake
new file mode 100644
index 000000000..18128d220
--- /dev/null
+++ b/ports/angelscript/portfile.cmake
@@ -0,0 +1,50 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+
+include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip"
+    FILENAME "angelscript_2.33.0.zip"
+    SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE} 
+    # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag).
+    # REF 1.0.0
+    # (Optional) Read the docs for how to generate patches at: 
+    # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md
+    PATCHES
+       mark-threads-private.patch
+    #   002_more_port_fixes.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
+    # OPTIONS_RELEASE -DOPTIMIZE=1
+    # OPTIONS_DEBUG -DDEBUGGABLE=1
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Angelscript")
+
+# Handle copyright
+file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angelscript RENAME copyright)
+
+# Post-build test for cmake libraries
+# vcpkg_test_cmake(PACKAGE_NAME angelscript)
diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL
index 8fd8e8523..8bc53822e 100644
--- a/ports/angle/CONTROL
+++ b/ports/angle/CONTROL
@@ -1,5 +1,5 @@
 Source: angle
-Version: 2019-03-13-c2ee2cc-2
+Version: 2019-03-13-c2ee2cc-3
 Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
   The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
 Build-Depends: egl-registry
diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake
index 2ad6a7553..f0bda4a3d 100644
--- a/ports/angle/portfile.cmake
+++ b/ports/angle/portfile.cmake
@@ -1,44 +1,41 @@
-include(vcpkg_common_functions)
-
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU)
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
-else()
-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "ANGLE currently only supports being built as a dynamic library")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/angle
-    REF chromium/3672
-    SHA512 dd6a05f0f1f4544b8646c41ffcb4d5e3b41f5261771ada47889345a24d4e55e6370df55a26c354a7073efcde307644cec6c6064ea6fe498ed6b52c3017249f81
-    PATCHES
-        001-fix-uwp.patch
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/commit.h DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
-    OPTIONS
-        -D${ANGLE_CPU_BITNESS}=1
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/unofficial-angle)
-
-vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angle RENAME copyright)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU)
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+    set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
+else()
+    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/angle
+    REF chromium/3672
+    SHA512 dd6a05f0f1f4544b8646c41ffcb4d5e3b41f5261771ada47889345a24d4e55e6370df55a26c354a7073efcde307644cec6c6064ea6fe498ed6b52c3017249f81
+    PATCHES 
+        001-fix-uwp.patch
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/commit.h DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
+    OPTIONS
+        -D${ANGLE_CPU_BITNESS}=1
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/unofficial-angle)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angle RENAME copyright)
diff --git a/ports/any-lite/CONTROL b/ports/any-lite/CONTROL
new file mode 100644
index 000000000..6eaf3d167
--- /dev/null
+++ b/ports/any-lite/CONTROL
@@ -0,0 +1,3 @@
+Source: any-lite
+Version: 0.2.0
+Description: A C++17-like any, a type-safe container for single values of any type for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/any-lite/portfile.cmake b/ports/any-lite/portfile.cmake
new file mode 100644
index 000000000..aba905134
--- /dev/null
+++ b/ports/any-lite/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinmoene/any-lite
+    REF v0.2.0
+    SHA512 703900d7bac96d41f903b6cabba4bce15ef3cf7ef0a6a66de76230498ededff110e43d68d4a3fd6996869b2edd001f69bd53039a214d06b774ce99518f384a68
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DANY_LITE_OPT_BUILD_TESTS=OFF
+        -DANY_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/${PORT}
+)
+
+file( REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file( INSTALL
+    ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/apr-util/CONTROL b/ports/apr-util/CONTROL
index 1ff406efd..80ca3d94d 100644
--- a/ports/apr-util/CONTROL
+++ b/ports/apr-util/CONTROL
@@ -1,4 +1,4 @@
 Source: apr-util
-Version: 1.6.0-2
+Version: 1.6.0-3
 Description: Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation
 Build-Depends: expat, apr, openssl
diff --git a/ports/apr-util/apr.patch b/ports/apr-util/apr.patch
new file mode 100644
index 000000000..5a61cb9f9
--- /dev/null
+++ b/ports/apr-util/apr.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69e45541..19b86129 100644
+--- a/CMakeLists.txt	
++++ b/CMakeLists.txt
+@@ -35,7 +35,7 @@ IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
+   MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
+ ENDIF()
+ FOREACH(onelib ${APR_LIBRARIES})
+-  IF(NOT EXISTS ${onelib})
++  IF(${onelib} MATCHES "NOTFOUND")
+     MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
+   ENDIF()
+ ENDFOREACH()
diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake
index 6ac311d76..0b1c28351 100644
--- a/ports/apr-util/portfile.cmake
+++ b/ports/apr-util/portfile.cmake
@@ -10,7 +10,9 @@ vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_apply_patches(
   SOURCE_PATH ${SOURCE_PATH}
-  PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-vcpkg-expat.patch"
+  PATCHES 
+        use-vcpkg-expat.patch
+        apr.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
diff --git a/ports/arb/CMakeLists.txt b/ports/arb/CMakeLists.txt
index 3474c9974..300c2003b 100644
--- a/ports/arb/CMakeLists.txt
+++ b/ports/arb/CMakeLists.txt
@@ -5,7 +5,7 @@ project(arb C)
 set (DEPS mpir mpfr pthreads flint2 gettimeofday)
 set (mpir_lib gmp mpir)
 set (mpfr_lib mpfr)
-set (pthreads_lib pthreads pthread)
+set (pthreads_lib pthreads pthread pthreadVC2 pthreadVC3)
 set (flint2_lib ${LIBRARY_TYPE}_flint flint)
 set (gettimeofday_lib gettimeofday)
 
@@ -55,14 +55,8 @@ include_directories(BEFORE ${DEP_INCLUDE_DIRS})
 add_library(arb ${SRC})
 
 target_compile_definitions(arb PRIVATE HAVE_TLS=1 FLINT_REENTRANT=0)
-if (BUILD_SHARED_LIBS)
-    target_compile_definitions(arb PRIVATE MSC_USE_DLL)
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS yes)
-    MESSAGE( STATUS "Building shared libraries" )
-else ()
-    target_compile_definitions(arb PRIVATE PTW32_STATIC_LIB)
-    MESSAGE( STATUS "Building static libraries" )
-endif()
+target_compile_definitions(arb PRIVATE PTW32_STATIC_LIB)
+MESSAGE( STATUS "Building static libraries" )
 target_compile_definitions(arb PRIVATE "ARB_BUILD_DLL")
 
 target_link_libraries(arb ${DEPS})
@@ -91,4 +85,3 @@ if (BUILD_TESTS)
         endforeach ()
     endforeach ()
 endif ()
-
diff --git a/ports/arb/CONTROL b/ports/arb/CONTROL
index 2166fd1e0..540eedaee 100644
--- a/ports/arb/CONTROL
+++ b/ports/arb/CONTROL
@@ -1,4 +1,4 @@
-Source: arb
-Version: 2.11.1
-Description: a C library for arbitrary-precision interval arithmetic
-Build-Depends: flint
+Source: arb
+Version: 2.11.1-2
+Description: a C library for arbitrary-precision interval arithmetic
+Build-Depends: flint
diff --git a/ports/arb/portfile.cmake b/ports/arb/portfile.cmake
index 32bb3a23b..847120318 100644
--- a/ports/arb/portfile.cmake
+++ b/ports/arb/portfile.cmake
@@ -1,10 +1,7 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fredrik-johansson/arb
diff --git a/ports/argagg/CONTROL b/ports/argagg/CONTROL
new file mode 100644
index 000000000..d4265021d
--- /dev/null
+++ b/ports/argagg/CONTROL
@@ -0,0 +1,3 @@
+Source: argagg
+Version: 2019-01-25
+Description: A simple C++11 command line argument parser
diff --git a/ports/argagg/portfile.cmake b/ports/argagg/portfile.cmake
new file mode 100644
index 000000000..1f7ed54de
--- /dev/null
+++ b/ports/argagg/portfile.cmake
@@ -0,0 +1,27 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vietjtnguyen/argagg
+    REF e678cebf90d8f132f5e54f19c6b95b75e655226c
+    SHA512 10085caaf9bfb507ae7117b61bfe6174dc2af91c347393c3cbb994fe5b824d4b439e1e0d2e2580dc34568d8046529acc211f76863be047d05d3845e9ff19ccbf
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DARGAGG_BUILD_EXAMPLES=OFF
+        -DARGAGG_BUILD_TESTS=OFF
+        -DARGAGG_BUILD_DOCS=OFF
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/args/CONTROL b/ports/args/CONTROL
index 0fbd02824..0b5bd4e94 100644
--- a/ports/args/CONTROL
+++ b/ports/args/CONTROL
@@ -1,3 +1,3 @@
 Source: args
-Version: 2019-01-18
+Version: 2019-05-01
 Description: A simple header-only C++ argument parser library.
diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake
index 76e3d5ce7..a05612ba8 100644
--- a/ports/args/portfile.cmake
+++ b/ports/args/portfile.cmake
@@ -4,23 +4,26 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Taywee/args
-    REF f68b7e186cd2a020cbddfe3194c1d8ddfeeb1013
-    SHA512 affbda6f679257496de3d3f16db4d7e922ca39a0ef88f0c6b8a2803a7c89e7d12761fa8aa80e823e1c6b227936f1e3d5012b3ae82c0a64fb11179c74bb2e1d1c
+    REF 623e52cb128cfc572ad4e79de8d5f8861d13d017
+    SHA512 b951caed125fd937549db6702de8615eac0f380026ea4de5937721143b0929f5aa47ecc8068b7d9689822d303b25d6350f00a8e6346a53d51a0ea40872488533
     HEAD_REF master
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    OPTIONS
+    -DARGS_BUILD_UNITTESTS=OFF
+    -DARGS_BUILD_EXAMPLE=OFF
 )
 
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
 # Put the licence file where vcpkg expects it
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/args)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/args/LICENSE ${CURRENT_PACKAGES_DIR}/share/args/copyright)
 
-# Copy the args header files
-file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hxx")
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/examples ${CURRENT_PACKAGES_DIR}/include/test)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
 
 vcpkg_copy_pdbs()
diff --git a/ports/argtable2/CONTROL b/ports/argtable2/CONTROL
index 1d9b5bc0e..df44602ee 100644
--- a/ports/argtable2/CONTROL
+++ b/ports/argtable2/CONTROL
@@ -1,3 +1,3 @@
 Source: argtable2
-Version: 2.13-1
+Version: 2.13-2
 Description: Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.
diff --git a/ports/argtable2/portfile.cmake b/ports/argtable2/portfile.cmake
index 6123335ab..4cbec1278 100644
--- a/ports/argtable2/portfile.cmake
+++ b/ports/argtable2/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/argtable2-13)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://prdownloads.sourceforge.net/argtable/argtable2-13.tar.gz"
@@ -17,8 +20,6 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        # Due to missing dllexport flags we export all symbols
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE
         -DCMAKE_DEBUG_POSTFIX=d
 )
 
diff --git a/ports/armadillo/ArmadilloConfig.cmake b/ports/armadillo/ArmadilloConfig.cmake
deleted file mode 100644
index 4658b665c..000000000
--- a/ports/armadillo/ArmadilloConfig.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(ARMADILLO_FOUND TRUE)
-set(ARMADILLO_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include")
-set(ARMADILLO_LIBRARY_DIRS)
-set(ARMADILLO_LIBRARIES)
diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL
index 59a3ba1f4..d8edd620e 100644
--- a/ports/armadillo/CONTROL
+++ b/ports/armadillo/CONTROL
@@ -1,3 +1,3 @@
-Source: armadillo
-Version: 8.400.0-1
-Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use 
+Source: armadillo
+Version: 2019-04-16-f00d3225
+Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use
diff --git a/ports/armadillo/disable-wrapper.patch b/ports/armadillo/disable-wrapper.patch
deleted file mode 100644
index 06eb4a776..000000000
--- a/ports/armadillo/disable-wrapper.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7924a8f..853c2ee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,7 @@ include(CheckLibraryExists)
- ## You will then need to link your programs with -lblas -llapack instead of -larmadillo
- ## If you're using OpenBLAS, link your programs with -lopenblas -llapack instead of -larmadillo
- 
--set(ARMA_USE_WRAPPER true)
-+set(ARMA_USE_WRAPPER false)
- 
- 
- # the settings below will be automatically configured by the rest of this script
-@@ -379,7 +379,7 @@ message(STATUS "Generating ${PROJECT_BINARY_DIR}/tmp/include/config.hpp")
- configure_file(${PROJECT_BINARY_DIR}/tmp/include/armadillo_bits/config.hpp.cmake ${PROJECT_BINARY_DIR}/tmp/include/armadillo_bits/config.hpp)
- 
- message(STATUS "Generating ${PROJECT_SOURCE_DIR}/examples/Makefile")
--configure_file(${PROJECT_SOURCE_DIR}/examples/Makefile.cmake ${PROJECT_SOURCE_DIR}/examples/Makefile)
-+#configure_file(${PROJECT_SOURCE_DIR}/examples/Makefile.cmake ${PROJECT_SOURCE_DIR}/examples/Makefile)
- 
- 
- include_directories(${PROJECT_BINARY_DIR}/tmp/include/ ${CMAKE_REQUIRED_INCLUDES})
-@@ -439,11 +439,13 @@ PATTERN "*~" EXCLUDE
- PATTERN "*orig" EXCLUDE
- )
- 
-+if(ARMA_USE_WRAPPER)
- install(TARGETS armadillo EXPORT ArmadilloLibraryDepends
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--  
-+endif()
-+
- # Export the package for use from the build-tree
- # (this registers the build-tree with a global CMake-registry)
- export(PACKAGE armadillo)
-@@ -465,10 +467,11 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake_aux/InstallFiles/ArmadilloConfigVersi
-   "${PROJECT_BINARY_DIR}/ArmadilloConfigVersion.cmake" @ONLY)
- 
- # Install the export set for use with the install-tree
-+if(ARMA_USE_WRAPPER)
- install(EXPORT ArmadilloLibraryDepends DESTINATION
-   "${CMAKE_INSTALL_DATADIR}/Armadillo/CMake"
-   COMPONENT dev)
--
-+endif()
- 
- ## GLOBAL INSTALL FILES
- # Create ArmadilloConfig.cmake file for the use from the install tree
diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
index b8240089c..172984712 100644
--- a/ports/armadillo/portfile.cmake
+++ b/ports/armadillo/portfile.cmake
@@ -1,22 +1,14 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("Armadillo only supports static library linkage")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-#as conradsnicta/armadillo-code has no release, and the link http://sourceforge.net/projects/arma/files/armadillo-8.400.0.tar.xz is not worked, I use the latest commit for 8.400.x branch
-vcpkg_from_github(
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO conradsnicta/armadillo-code
-    REF a25f66da4c27d40a4a7699199cbf4dc747e712a7
-    SHA512 bf5e1de18c38503e46f72f4f9f145477b6b782baf0df42600acb8811c7a07a5d8c0cd2ac3015d4169c961876e4cbb0457a7c1417b55ba52c98d4f78d145f9ae6
-    HEAD_REF unstable
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-wrapper.patch
+    REF f00d3225b1c005775044369723f31cecc3cd6569
+    SHA512 ca3574edf5de8c752867403c3856ed9569fbed2ce9729585cae59be5751493c2e71121319b0a812e2ea56baada6b6f62fbc84ce6f1efb362347e5fd4141ccf1b
+    HEAD_REF 9.400.x
 )
 
 vcpkg_configure_cmake(
@@ -27,13 +19,11 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake TARGET_PATH share/armadillo)
 
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo/CMake)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/ArmadilloConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/Armadillo)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt  DESTINATION ${CURRENT_PACKAGES_DIR}/share/Armadillo RENAME copyright)
diff --git a/ports/armadillo/usage b/ports/armadillo/usage
deleted file mode 100644
index 26d82f0ef..000000000
--- a/ports/armadillo/usage
+++ /dev/null
@@ -1,5 +0,0 @@
-The package armadillo is compatible with built-in CMake targets:
-
-    find_package(Armadillo CONFIG REQUIRED)
-    target_include_directories(main PRIVATE ${ARMADILLO_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${ARMADILLO_LIBRARIES})
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL
index aaf6c0535..1bfaa8a97 100644
--- a/ports/arrow/CONTROL
+++ b/ports/arrow/CONTROL
@@ -1,4 +1,4 @@
 Source: arrow
-Version: 0.13.0
-Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog
+Version: 0.13.0-3
+Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser
 Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch
index 2e994af9b..3257dc437 100644
--- a/ports/arrow/all.patch
+++ b/ports/arrow/all.patch
@@ -1,7 +1,7 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
 index 52081c4..e1e13b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
 @@ -804,6 +804,9 @@ if(ARROW_USE_GLOG)
    list(APPEND ARROW_LINK_LIBS GLOG::glog)
    list(APPEND ARROW_STATIC_LINK_LIBS GLOG::glog)
@@ -12,10 +12,10 @@ index 52081c4..e1e13b5 100644
    add_definitions("-DARROW_USE_GLOG")
  endif()
  
-diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake
+diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake
 index e1429a2..6dee036 100644
---- a/cmake_modules/FindBrotli.cmake
-+++ b/cmake_modules/FindBrotli.cmake
+--- a/cpp/cmake_modules/FindBrotli.cmake
++++ b/cpp/cmake_modules/FindBrotli.cmake
 @@ -18,6 +18,7 @@
  #  find_package(Brotli)
  
@@ -110,10 +110,10 @@ index e1429a2..6dee036 100644
  find_package_handle_standard_args(Brotli
                                    REQUIRED_VARS
                                    BROTLI_COMMON_LIBRARY
-diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake
+diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake
 index 3606f5c..1d18b7c 100644
---- a/cmake_modules/FindLz4.cmake
-+++ b/cmake_modules/FindLz4.cmake
+--- a/cpp/cmake_modules/FindLz4.cmake
++++ b/cpp/cmake_modules/FindLz4.cmake
 @@ -19,24 +19,26 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX)
    set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static")
  endif()
@@ -157,10 +157,10 @@ index 3606f5c..1d18b7c 100644
      PATH_SUFFIXES "lib64" "lib" "bin")
    find_path(LZ4_INCLUDE_DIR NAMES lz4.h PATH_SUFFIXES "include")
  endif()
-diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake
+diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake
 index a4decf7..78ec7c8 100644
---- a/cmake_modules/FindThrift.cmake
-+++ b/cmake_modules/FindThrift.cmake
+--- a/cpp/cmake_modules/FindThrift.cmake
++++ b/cpp/cmake_modules/FindThrift.cmake
 @@ -65,6 +65,10 @@ if(MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX)
    set(THRIFT_MSVC_STATIC_LIB_SUFFIX md)
  endif()
@@ -191,10 +191,10 @@ index a4decf7..78ec7c8 100644
                 HINTS ${Thrift_ROOT}
                 PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib")
    find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h
-diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake
+diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
 index 17b58a3..fa2ab05 100644
---- a/cmake_modules/FindZSTD.cmake
-+++ b/cmake_modules/FindZSTD.cmake
+--- a/cpp/cmake_modules/FindZSTD.cmake
++++ b/cpp/cmake_modules/FindZSTD.cmake
 @@ -19,7 +19,11 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
    set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
  endif()
@@ -242,10 +242,10 @@ index 17b58a3..fa2ab05 100644
    find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include")
  endif()
  
-diff --git a/cmake_modules/FindgflagsAlt.cmake b/cmake_modules/FindgflagsAlt.cmake
+diff --git a/cpp/cmake_modules/FindgflagsAlt.cmake b/cpp/cmake_modules/FindgflagsAlt.cmake
 index a9b8684..fdb815a 100644
---- a/cmake_modules/FindgflagsAlt.cmake
-+++ b/cmake_modules/FindgflagsAlt.cmake
+--- a/cpp/cmake_modules/FindgflagsAlt.cmake
++++ b/cpp/cmake_modules/FindgflagsAlt.cmake
 @@ -15,18 +15,13 @@
  # specific language governing permissions and limitations
  # under the License.
@@ -270,10 +270,10 @@ index a9b8684..fdb815a 100644
  find_package_handle_standard_args(gflagsAlt REQUIRED_VARS gflags_LIB GFLAGS_INCLUDE_DIR)
  
  if(gflagsAlt_FOUND)
-diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
+diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
 index bdb122b..58c123e 100644
---- a/cmake_modules/ThirdpartyToolchain.cmake
-+++ b/cmake_modules/ThirdpartyToolchain.cmake
+--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
 @@ -923,10 +923,7 @@ if(ARROW_NEED_GFLAGS)
    elseif(gflags_SOURCE STREQUAL "SYSTEM")
      # gflagsConfig.cmake is not installed on Ubuntu/Debian
diff --git a/ports/arrow/findzstd.patch b/ports/arrow/findzstd.patch
new file mode 100644
index 000000000..c45f12d0b
--- /dev/null
+++ b/ports/arrow/findzstd.patch
@@ -0,0 +1,78 @@
+diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
+index 21b4981ec..818e4b5e1 100644
+--- a/cpp/cmake_modules/FindZSTD.cmake	
++++ b/cpp/cmake_modules/FindZSTD.cmake
+@@ -19,44 +19,60 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
+   set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
+ endif()
+ 
+-if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+-  set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
+-endif()
+-
++set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
+ set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+ set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
+ 
++set(ZSTD_LIB_NAMES_RELEASE zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
++                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++set(ZSTD_LIB_NAMES_DEBUG)
++foreach(_zstd_name ${ZSTD_LIB_NAMES_RELEASE})
++    list(APPEND ZSTD_LIB_NAMES_DEBUG ${_zstd_name}${ZSTD_LIB_NAME_DEBUG_SUFFIX})
++    if(DEFINED CMAKE_DEBUG_POSTFIX)
++        list(APPEND ZSTD_LIB_NAMES_DEBUG ${_zstd_name}${CMAKE_DEBUG_POSTFIX})
++    endif()
++endforeach()
++
+ pkg_check_modules(ZSTD_PC libzstd)
+ if(ZSTD_PC_FOUND)
+   set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
+ 
+   list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
+-  find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
++  find_library(ZSTD_LIBRARY_RELEASE ${ZSTD_LIB_NAMES_RELEASE}
+                PATHS ${ZSTD_PC_LIBRARY_DIRS}
+                NO_DEFAULT_PATH
+                PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
++  find_library(ZSTD_LIBRARY_DEBUG ${ZSTD_LIB_NAMES_DEBUG}
++               PATHS ${ZSTD_PC_LIBRARY_DIRS}
++               NO_DEFAULT_PATH
++               PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
++
+ elseif(ZSTD_ROOT)
+   message(STATUS "Using ZSTD_ROOT: ${ZSTD_ROOT}")
+-  find_library(ZSTD_LIB
+-               NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
+-                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++  find_library(ZSTD_LIBRARY_RELEASE
++               NAMES ${ZSTD_LIB_NAMES_RELEASE})
++  find_library(ZSTD_LIBRARY_DEBUG
++               NAMES ${ZSTD_LIB_NAMES_DEBUG})
+   find_path(ZSTD_INCLUDE_DIR
+             NAMES zstd.h
+             PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
+             NO_DEFAULT_PATH
+             PATH_SUFFIXES "include")
+ else()
+-  find_library(ZSTD_LIB
+-               NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
+-                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++  find_library(ZSTD_LIBRARY_RELEASE
++               NAMES ${ZSTD_LIB_NAMES_RELEASE})
++  find_library(ZSTD_LIBRARY_DEBUG
++               NAMES ${ZSTD_LIB_NAMES_DEBUG})
+   find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include")
+ endif()
+-
++select_library_configurations(ZSTD)
++set(ZSTD_LIB ${ZSTD_LIBRARY})
+ find_package_handle_standard_args(ZSTD REQUIRED_VARS ZSTD_LIB ZSTD_INCLUDE_DIR)
+ 
+ if(ZSTD_FOUND)
+   add_library(ZSTD::zstd UNKNOWN IMPORTED)
+   set_target_properties(ZSTD::zstd
+-                        PROPERTIES IMPORTED_LOCATION "${ZSTD_LIB}"
++                        PROPERTIES IMPORTED_LOCATION_RELEASE "${ZSTD_LIBRARY_RELEASE}"
++                                   IMPORTED_LOCATION_DEBUG "${ZSTD_LIBRARY_DEBUG}"
+                                    INTERFACE_INCLUDE_DIRECTORIES "${ZSTD_INCLUDE_DIR}")
+ endif()
diff --git a/ports/arrow/msvc-libname.patch b/ports/arrow/msvc-libname.patch
new file mode 100644
index 000000000..a997822d0
--- /dev/null
+++ b/ports/arrow/msvc-libname.patch
@@ -0,0 +1,13 @@
+diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
+index 0f014ba..fd2e7b3 100644
+--- a/cpp/cmake_modules/BuildUtils.cmake
++++ b/cpp/cmake_modules/BuildUtils.cmake
+@@ -289,7 +289,7 @@ function(ADD_ARROW_LIB LIB_NAME)
+       target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES})
+     endif()
+ 
+-    if(MSVC)
++    if(MSVC AND 0)
+       set(LIB_NAME_STATIC ${LIB_NAME}_static)
+     else()
+       set(LIB_NAME_STATIC ${LIB_NAME})
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
index 28b58e8bf..ed49d406e 100644
--- a/ports/arrow/portfile.cmake
+++ b/ports/arrow/portfile.cmake
@@ -10,70 +10,40 @@ vcpkg_from_github(
     REF apache-arrow-0.13.0
     SHA512 bbb14d11abf267a6902c7c9e0215ba7c5284f07482be2de42707145265d2809c89c2d4d8f8b918fdb8c33a5ecbd650875b987a1a694cdf653e766822be67a47d
     HEAD_REF master
-)
-
-set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp")
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${CPP_SOURCE_PATH}
     PATCHES
-    "${CMAKE_CURRENT_LIST_DIR}/all.patch"
+        all.patch
+        msvc-libname.patch
+        findzstd.patch
 )
 
 string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED)
 string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC)
 
-string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" IS_STATIC)
-
-if (IS_STATIC)
-    set(PARQUET_ARROW_LINKAGE static)
-    set(BOOST_USE_SHARED off)
-    set(USE_STATIC_CRT on)
-else()
-    set(PARQUET_ARROW_LINKAGE shared)
-    set(BOOST_USE_SHARED on)
-    set(USE_STATIC_CRT off)
-endif()
-
 vcpkg_configure_cmake(
-    SOURCE_PATH ${CPP_SOURCE_PATH}
+    SOURCE_PATH ${SOURCE_PATH}/cpp
     PREFER_NINJA
     OPTIONS
-    -DARROW_DEPENDENCY_SOURCE=SYSTEM
-    -DARROW_BUILD_TESTS=off
-    -DBOOST_ROOT=${CURRENT_INSTALLED_DIR}
-    -DARROW_PARQUET=ON
-    -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
-    -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
-    -DBUILD_STATIC=${ARROW_BUILD_STATIC}
-    -DBUILD_SHARED=${ARROW_BUILD_SHARED}
-    -DPARQUET_ARROW_LINKAGE=${PARQUET_ARROW_LINKAGE}
-    -DARROW_BOOST_USE_SHARED=${BOOST_USE_SHARED}
-    -DARROW_USE_STATIC_CRT=${USE_STATIC_CRT}
-    -DARROW_GFLAGS_USE_SHARED=off
-    -DARROW_JEMALLOC=off
+        -DARROW_DEPENDENCY_SOURCE=SYSTEM
+        -Duriparser_SOURCE=SYSTEM
+        -DARROW_BUILD_TESTS=off
+        -DARROW_PARQUET=ON
+        -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
+        -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
+        -DARROW_GFLAGS_USE_SHARED=off
+        -DARROW_JEMALLOC=off
+        -DARROW_BUILD_UTILITIES=OFF
 )
 
 vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()
 
-if(WIN32)
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/lib/arrow.lib)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow.lib)
-        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
-    else()
-        file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib)
-    endif()
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib)
+    message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.")
 endif()
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/arrow/cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowConfig.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowConfig.cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowConfigVersion.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowConfigVersion.cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowTargets-release.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets-release.cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowTargets.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets.cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/arrow/arrowTargets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets-debug.cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/arrow TARGET_PATH share/arrow)
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
 
diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL
index 06674892b..b4c5b6b5a 100644
--- a/ports/asmjit/CONTROL
+++ b/ports/asmjit/CONTROL
@@ -1,3 +1,3 @@
 Source: asmjit
-Version: 2019-01-30
+Version: 2019-03-29
 Description: Complete x86/x64 JIT and Remote Assembler for C++
diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake
index 21b2ed894..fa7a5ed77 100644
--- a/ports/asmjit/portfile.cmake
+++ b/ports/asmjit/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO asmjit/asmjit
-  REF 1e550aa568da993acb742ac19f2ab691a2806ad5
-  SHA512 e5cf195a6b94173b294cd739009128577dd687220b379490c3d1b616fb6220c085192834850913d9dc0a076b433104853ba9d4f8e48ce0705044891fea24039d
+  REF fc251c914e77cd079e58982cdab00a47539d7fc5
+  SHA512 3db4ed97ded545994ab2e75df5bb027832c3b7adf44bdabfb89a98af4cc51f5e48d4a353b9e99f205702258dfcec70257d6d6c08db78cec941019b3f8a48232a
   HEAD_REF master
 )
 
diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL
index fc52411f9..504cae234 100644
--- a/ports/assimp/CONTROL
+++ b/ports/assimp/CONTROL
@@ -1,4 +1,4 @@
-Source: assimp
-Version: 4.1.0-3
-Description: The Open Asset import library
-Build-Depends: zlib, rapidjson
+Source: assimp
+Version: 4.1.0-4
+Description: The Open Asset import library
+Build-Depends: zlib, rapidjson
diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake
index 4fe655f70..2945f51f9 100644
--- a/ports/assimp/portfile.cmake
+++ b/ports/assimp/portfile.cmake
@@ -17,12 +17,6 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib ${SOURCE_PATH}/contrib/gtest ${S
 set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
 set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(BUILD_SHARED_LIBS "ON")
-else()
-    set(BUILD_SHARED_LIBS "OFF")
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL
index b4bdda0eb..824052721 100644
--- a/ports/atk/CONTROL
+++ b/ports/atk/CONTROL
@@ -1,4 +1,4 @@
 Source: atk
-Version: 2.24.0-2
+Version: 2.24.0-3
 Description: GNOME Accessibility Toolkit
 Build-Depends: glib, gettext
diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake
index 8b65312e5..c3edfdf74 100644
--- a/ports/atk/portfile.cmake
+++ b/ports/atk/portfile.cmake
@@ -1,33 +1,31 @@
-# ATK uses DllMain
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "ATK only supports dynamic library and crt linkage")
-endif()
-
-include(vcpkg_common_functions)
-set(ATK_VERSION 2.24.0)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atk-${ATK_VERSION})
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
-    FILENAME "atk-${ATK_VERSION}.tar.xz"
-    SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962)
-
-vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}/atk
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-encoding.patch)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DCMAKE_PROGRAM_PATH=${CURRENT_INSTALLED_DIR}/tools/glib
-    OPTIONS_DEBUG
-        -DATK_SKIP_HEADERS=ON)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/atk)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/atk/COPYING ${CURRENT_PACKAGES_DIR}/share/atk/copyright)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
+
+set(ATK_VERSION 2.24.0)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atk-${ATK_VERSION})
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
+    FILENAME "atk-${ATK_VERSION}.tar.xz"
+    SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962)
+
+vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}/atk
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/fix-encoding.patch)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DCMAKE_PROGRAM_PATH=${CURRENT_INSTALLED_DIR}/tools/glib
+    OPTIONS_DEBUG
+        -DATK_SKIP_HEADERS=ON)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/atk)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/atk/COPYING ${CURRENT_PACKAGES_DIR}/share/atk/copyright)
diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL
index 3a8d55164..329a329b8 100644
--- a/ports/atkmm/CONTROL
+++ b/ports/atkmm/CONTROL
@@ -1,4 +1,4 @@
-Source: atkmm
-Version: 2.24.2
-Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
-Build-Depends: glib, gettext, atk, glibmm
+Source: atkmm
+Version: 2.24.2-1
+Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
+Build-Depends: glib, gettext, atk, glibmm
diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake
index 74cf021c8..4bc4fd299 100644
--- a/ports/atkmm/portfile.cmake
+++ b/ports/atkmm/portfile.cmake
@@ -1,10 +1,7 @@
-# ATK uses DllMain, so atkmm also
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atkmm-2.24.2)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz"
diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt
index 3e65666eb..9a6ad2377 100644
--- a/ports/aubio/CMakeLists.txt
+++ b/ports/aubio/CMakeLists.txt
@@ -19,7 +19,6 @@ add_definitions(
     -D_CRT_SECURE_NO_WARNINGS=1
 )
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 set(CMAKE_DEBUG_POSTFIX d)
 
 option(BUILD_TOOLS "Build and install tools" ON)
@@ -72,7 +71,7 @@ if(BUILD_TOOLS)
         target_link_libraries(${EXAMPLE_EXEC} PRIVATE aubio)
         target_compile_definitions(${EXAMPLE_EXEC} PRIVATE -DHAVE_WIN_HACKS=1)
     endforeach()
-    # Create and add fake config.h to avoid build errors (file is generated for 
+    # Create and add fake config.h to avoid build errors (file is generated for
     # cross-platform requirements in waf build-system)
     file(WRITE "${CMAKE_BINARY_DIR}/config.h" "")
     include_directories(${CMAKE_BINARY_DIR})
diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL
index 5c699e1dc..1f97f467c 100644
--- a/ports/aubio/CONTROL
+++ b/ports/aubio/CONTROL
@@ -1,4 +1,4 @@
-Source: aubio
-Version: 0.4.8
-Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.
-Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis, bzip2, liblzma
+Source: aubio
+Version: 0.4.9
+Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.
+Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis, bzip2, liblzma
diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake
index fec30f57c..177e890d5 100644
--- a/ports/aubio/portfile.cmake
+++ b/ports/aubio/portfile.cmake
@@ -1,10 +1,13 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aubio-3c230fae309e9ea3298783368dd71bae6172359a)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aubio/aubio
-    REF 0.4.8 
-    SHA512 0422ec9ceb645dd5cdb1ca8b17f552edf9197dbf9c929ca75aacfb89f092c02db8b6d2b8aec567ddc1df5b310770de77cd941b45ed74700c3d3584924f39b576
+    REF 0.4.9
+    SHA512 a22c7c581ce1f428270021591649273396e6dc222b3c7b3d46f5c4abf94a98be1ab89320cdbf1b6b60d4330eef23976439e3fc9e0f8d3cdd867dac4542fa48c9
     HEAD_REF master
 )
 
diff --git a/ports/aws-lambda-cpp/CONTROL b/ports/aws-lambda-cpp/CONTROL
index fb45cc22d..048f28fac 100644
--- a/ports/aws-lambda-cpp/CONTROL
+++ b/ports/aws-lambda-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: aws-lambda-cpp
-Version: 0.1.0
+Version: 0.1.0-1
 Build-Depends: curl
 Description: C++ Runtime for AWS Lambda.
diff --git a/ports/aws-lambda-cpp/portfile.cmake b/ports/aws-lambda-cpp/portfile.cmake
index 977c9bd40..4a4cddafd 100644
--- a/ports/aws-lambda-cpp/portfile.cmake
+++ b/ports/aws-lambda-cpp/portfile.cmake
@@ -1,5 +1,9 @@
 include(vcpkg_common_functions)
 
+if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    message(FATAL_ERROR "aws-lambda-cpp currently only supports Linux and Mac platforms")
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-lambda-cpp
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index a888cd33e..b1c7f58ab 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.7.41
+Version: 1.7.106
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
 Default-Features: dynamodb, s3, kinesis
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 2bdc103bb..4f334875d 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -10,8 +10,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
-    REF 1.7.41
-    SHA512 4cd6bf8aae464caadc696ff204da4d60caab3d4d95c058094b1fa499d53bd585dddc853cfc75295f7731f46a2a0e2a94339a2d83e6b21a12e9c80b7c53556ae9
+    REF 1.7.106
+    SHA512 58b03f25468ee5c57c47cf92fe6e1d9228754464af83a1253fdd14f2a6dabb6f5f49f1f003597c29cd1ce96649afae0560953d1f1d2c478c575b0d4c0f918635
     HEAD_REF master
 )
 
diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index 87ecfd32b..f7e0a0fdd 100644
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@@ -1,7 +1,7 @@
 Source: azure-c-shared-utility
-Version: 2019-03-18
+Version: 2019-05-16
 Description: Azure C SDKs common code
-Build-Depends: curl (linux), openssl (linux)
+Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c
 
 Feature: public-preview
 Description: Azure C SDKs common code (public preview)
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index de7f3e61a..ee5bebf5c 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -15,8 +15,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF bc83cba1230e98988ae5cd2328f4dcf8c49d5866
-        SHA512 48947709f9c07c8a910d40066a52b746f9ab15543837f44207b787674efd2b11e7a7eb849c88e20984f0e2141e5611f6d6edea39c8b82687f371c08ab274bd7b
+        REF f0642196af85aeb4f2717d9cc11176290f321fb8
+        SHA512 fd8ee6e2be11c13f7388e57eb9c98397b6cb026ca370131db55b6118908701cdff2a1eaabb89bfe84591d6ee17163d06b7b86ad615216203bcbf0c8595d45452
         HEAD_REF master
         PATCHES no-double-expand-cmake.patch
     )
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index a5725ed22..cfca96393 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,8 +1,8 @@
 Source: azure-iot-sdk-c
-Version: 2019-03-18
-Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c
+Version: 2019-05-16
+Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
 
 Feature: public-preview
 Description: A version of the azure-iot-sdk-c containing public-preview features.
-Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview]
+Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c, umock-c
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 42630117b..bfd7703c8 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -15,14 +15,15 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF 8c331e8552f754bb6e0502486ceee698625eb468
-        SHA512 cc6f34e04f237bb5e8e5445e033eefab00373d53a4847ab6089c9b8eb400ab87ced6905f1c78ea7d0da3e9a56145e86a58d2f226fcf38f08659330a33d68f82e
+        REF 11d5150aeb26635862cf50484af9c7e8badd52a0
+        SHA512 d2cf40bca9db2c66d78f889763af3a1d06abc0e9fce19542599daec56b092e03f01f892ff420a7b107a96e0eb533579ee7eccf249b56cf6600896c77ca619fc3
         HEAD_REF master
         PATCHES improve-external-deps.patch
     )
 endif()
 
 file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/)
+file(COPY ${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/azure-macro-utils-c/CONTROL b/ports/azure-macro-utils-c/CONTROL
new file mode 100644
index 000000000..72840172b
--- /dev/null
+++ b/ports/azure-macro-utils-c/CONTROL
@@ -0,0 +1,5 @@
+Source: azure-macro-utils-c
+Version: 2019-05-16
+Description: A library of macros for the Azure IoT SDK Suite
+Build-Depends: 
+
diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake
new file mode 100644
index 000000000..d516e59e9
--- /dev/null
+++ b/ports/azure-macro-utils-c/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 Azure/azure-macro-utils-c
+    REF 38729b4b7ac3ea8b7d71e394782b861ecb25193e
+    SHA512 c9c820e74aee403d45f257359318d3435e5d6534afe821da5679bc462e26ad256dd01ed253a80ba1c58343f850ef1026280533a152c4b0465527f6537b3092d3
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -Drun_int_tests=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_macro_utils_c)
+
+file(COPY ${SOURCE_PATH}/inc/azure_macro_utils/macro_utils.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure_macro_utils_c/include/azure_macro_utils)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug)
+
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-macro-utils-c/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
+
+
diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL
index 320ff71a6..c3f8babef 100644
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 6.0.0
-Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp)
+Version: 6.1.0
+Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
 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/builtin-uuid-osx.patch b/ports/azure-storage-cpp/builtin-uuid-osx.patch
new file mode 100644
index 000000000..1e2b918cc
--- /dev/null
+++ b/ports/azure-storage-cpp/builtin-uuid-osx.patch
@@ -0,0 +1,40 @@
+diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
+index 9171f8c..b2c7b93 100644
+--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
++++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
+@@ -13,6 +13,11 @@
+ #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ #
+ 
++if (APPLE)
++    set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/)
++    set(CMAKE_OSX_FRAMEWORK_HEADERS ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers)
++    set(UUID_LIBRARY "")
++endif()
+ 
+ if (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
+   # in cache already
+@@ -39,6 +44,7 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
+       /opt/include
+       [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+       /usr/freeware/include
++      ${CMAKE_OSX_FRAMEWORK_HEADERS}
+   )
+ 
+   find_library(UUID_LIBRARY
+@@ -88,13 +94,13 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
+   set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
+   set(UUID_LIBRARIES ${UUID_LIBRARY})
+ 
+-  if (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
++  if (UUID_INCLUDE_DIRS AND (UUID_LIBRARIES OR APPLE))
+      set(UUID_FOUND TRUE)
+   endif (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
+ 
+   if (UUID_FOUND)
+     if (NOT UUID_FIND_QUIETLY)
+-      message(STATUS "Found UUID : ${UUID_LIBRARIES}")
++      message(STATUS "Found UUID : ${UUID_INCLUDE_DIRS}  ${UUID_LIBRARIES}")
+     endif (NOT UUID_FIND_QUIETLY)
+   else (UUID_FOUND)
+     if (UUID_FIND_REQUIRED)
diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake
index 24d59281b..0a9662af3 100644
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@@ -7,11 +7,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-storage-cpp
-    REF v6.0.0
-    SHA512 e568c3c3fd10a688b4d2491987998b1e133e54853fbf94a238a0cc3955dfd4d68bedf79a0e30bb5f30e8dd3c2bf41999d7c8658571b7dca9a4058140258ca314
+    REF v6.1.0
+    SHA512 bc6a1da6287301b5bb5c31694d508c46447b71043d5b94a90ffe79b6dc045bc111ed0bcf3a7840e096ddc3ef6badbeef7fb905242e272a9f82f483d849a43e61
     HEAD_REF master
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/pplx-do-while.patch
+        # on osx use the uuid.h that is part of the osx sdk
+        builtin-uuid-osx.patch
 )
 
 vcpkg_configure_cmake(
@@ -20,6 +21,7 @@ vcpkg_configure_cmake(
         -DCMAKE_FIND_FRAMEWORK=LAST
         -DBUILD_TESTS=OFF
         -DBUILD_SAMPLES=OFF
+        -DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/include
 )
 
 vcpkg_install_cmake()
diff --git a/ports/azure-storage-cpp/pplx-do-while.patch b/ports/azure-storage-cpp/pplx-do-while.patch
deleted file mode 100644
index 0c2163442..000000000
--- a/ports/azure-storage-cpp/pplx-do-while.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h b/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h
-index 756163d..6fbfd44 100644
---- a/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h
-+++ b/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h
-@@ -366,7 +366,7 @@ namespace azure { namespace storage { namespace core {
-             // TODO: Reduce usage of auto variable types
- 
-             auto instance = std::make_shared<executor_impl>(command, options, context);
--            return pplx::details::do_while([instance]() -> pplx::task<bool>
-+            return details::_do_while([instance]() -> pplx::task<bool>
-             {
-                 // 0. Begin request 
-                 instance->validate_location_mode();
-diff --git a/Microsoft.WindowsAzure.Storage/includes/wascore/util.h b/Microsoft.WindowsAzure.Storage/includes/wascore/util.h
-index f3401f2..6a6aa48 100644
---- a/Microsoft.WindowsAzure.Storage/includes/wascore/util.h
-+++ b/Microsoft.WindowsAzure.Storage/includes/wascore/util.h
-@@ -127,6 +127,21 @@ namespace azure { namespace storage { namespace core {
-     };
- #endif
- 
-+    namespace details
-+    {
-+        template<class F, class T = bool>
-+        pplx::task<T> _do_while(F func)
-+        {
-+            pplx::task<T> first = func();
-+            return first.then([=](bool guard) -> pplx::task<T> {
-+                if (guard)
-+                    return azure::storage::core::details::_do_while<F,T>(func);
-+                else
-+                    return first;
-+            });
-+        }
-+    }
-+
- }}} // namespace azure::storage::core
- 
- #pragma pop_macro("max")
-diff --git a/Microsoft.WindowsAzure.Storage/src/util.cpp b/Microsoft.WindowsAzure.Storage/src/util.cpp
-index dd2250a..b8d1341 100644
---- a/Microsoft.WindowsAzure.Storage/src/util.cpp
-+++ b/Microsoft.WindowsAzure.Storage/src/util.cpp
-@@ -98,7 +98,7 @@ namespace azure { namespace storage {  namespace core {
-         auto obuffer = ostream.streambuf();
-         auto length_ptr = (length != std::numeric_limits<utility::size64_t>::max()) ? std::make_shared<utility::size64_t>(length) : nullptr;
-         auto total_ptr = std::make_shared<utility::size64_t>(0);
--        return pplx::details::do_while([istream, obuffer, buffer_size, length_ptr, total_ptr, max_length] () -> pplx::task<bool>
-+        return azure::storage::core::details::_do_while([istream, obuffer, buffer_size, length_ptr, total_ptr, max_length] () -> pplx::task<bool>
-         {
-             size_t read_length = buffer_size;
-             if ((length_ptr != nullptr) && (*length_ptr < read_length))
diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL
index 06db79ec4..2576f3e98 100644
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@@ -1,8 +1,8 @@
 Source: azure-uamqp-c
-Version: 2019-03-18
-Build-Depends: azure-c-shared-utility
+Version: 2019-05-16
+Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: AMQP library for C
 
 Feature: public-preview
 Description: AMQP library for C (public preview)
-Build-Depends: azure-c-shared-utility[public-preview]
+Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index e5b4b3d96..0bbc68b96 100644
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF 13f009ddd50a2837f651b0237de17db5f24c3af9
-        SHA512 649e1826c02a25c57031e1cf1ae92ff15f7caadd064d1dff4aa4ee579598af58ae03f778138cdf26918c1500ca1b8678a6f88c0ae24fd6fca37dab7b81b34984
+        REF 5ceebf6ec8d1973cfa80804077c7cef23d3b36af
+        SHA512 6dc7ffc386339db54ff387760119ae5ffd564642cd18d0dc177e6302167cc3b40bdd0f4d9e50478db8d2760166b15058b53b9eb2d1c160f234693a59ac762a75
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL
index 4f41f6931..c5cc71cfd 100644
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@@ -1,8 +1,8 @@
 Source: azure-uhttp-c
-Version: 2019-03-18
-Build-Depends: azure-c-shared-utility
+Version: 2019-05-16
+Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: Azure HTTP Library written in C
 
 Feature: public-preview
 Description: Azure HTTP Library written in C (public preview)
-Build-Depends: azure-c-shared-utility[public-preview]
+Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index e99276af7..f14d6dca0 100644
--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF 43dce924b32818f8ab851f972cffebc204edc5c4
-        SHA512 0e5e9e7dac0c8a1a01cea2fd9ef068f988ad3453f978957cbcb009126637fe5810001e273e7b300b4540914705a89250d96df652c4bb2c7f5348cd8ce7240d70
+        REF b8976adff02e543fc00e7db59eae9ce78dd014fe
+        SHA512 65ddccc07831309c4f3f8546bb1a45a6eff84674013311a15c99389d4fc33eaf2ef3da6c7c8e4bb03d32955d12c978190e7badb597379a9fefda4ebcf18827ec
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL
index eec4acb1b..98019eb69 100644
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@@ -1,8 +1,8 @@
 Source: azure-umqtt-c
-Version: 2019-03-18
-Build-Depends: azure-c-shared-utility
+Version: 2019-05-16
+Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: General purpose library for communication over the mqtt protocol
 
 Feature: public-preview
 Description: General purpose library for communication over the mqtt protocol (public preview)
-Build-Depends: azure-c-shared-utility[public-preview]
+Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index 9f7002f32..e7e5a8df3 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF ea9f6112d002bdff55c94df327bc7effc8393c78
-        SHA512 68fdc22eb07d32cb9cf489d878db3be8326225e3a067153af7b9e29eabc8ee25162507b7e8921b71b83d42703d5a3d8e040f4a9e61a19540789432e2cecb782f
+        REF c37883fbb05218fd940b87899a116af240f90c40
+        SHA512 21bbe6dfafcc96d35775ab83a75334fbfd41a55a82a7da483d5ff179aa3792424851f250007c9603ef17c789d8b23b1a8b81580fc2cf793fd00b487c321fdba3
         HEAD_REF master
     )
 endif()
diff --git a/ports/bde/CONTROL b/ports/bde/CONTROL
index 129bf8349..8fd05f2d0 100644
--- a/ports/bde/CONTROL
+++ b/ports/bde/CONTROL
@@ -1,3 +1,3 @@
 Source: bde
-Version: 3.2.0.0
+Version: 3.2.0.0-1
 Description: Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.
diff --git a/ports/bde/portfile.cmake b/ports/bde/portfile.cmake
index 5c72156e1..c3aed42fe 100644
--- a/ports/bde/portfile.cmake
+++ b/ports/bde/portfile.cmake
@@ -1,141 +1,136 @@
-include(vcpkg_common_functions)
-set(BDE_VERSION       3.2.0.0)
-set(BDE_TOOLS_VERSION 1.x)
-
-# Paths used in build
-set(SOURCE_PATH_DEBUG   ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bde-${BDE_VERSION})
-set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bde-${BDE_VERSION})
-
-# Acquire Python 2 and add it to PATH
-vcpkg_find_acquire_program(PYTHON2)
-get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
-
-# Acquire BDE Tools and add them to PATH
-vcpkg_from_github(
-    OUT_SOURCE_PATH TOOLS_PATH
-    REPO "bloomberg/bde-tools"
-    REF d4b1a7670829228f4ec81ecdccc598ce03ae8e80
-    SHA512 80af734c080adb225d5369157301ae0af18e02b1912351e34d23f5f2ba4e19f9ae2b5a367923f036330c9f9afd11a90cdf12680eb3e59b4297a312a1b713f17f
-    HEAD_REF master
-)
-message(STATUS "Configure bde-tools-v${BDE_TOOLS_VERSION}")
-if(VCPKG_CMAKE_SYSTEM_NAME)
-    set(ENV{PATH} "$ENV{PATH}:${PYTHON2_EXE_PATH}")
-    set(ENV{PATH} "$ENV{PATH}:${TOOLS_PATH}/bin")
-else()
-    set(ENV{PATH} "$ENV{PATH};${PYTHON2_EXE_PATH}")
-    set(ENV{PATH} "$ENV{PATH};${TOOLS_PATH}/bin")
-endif()
-
-# Acquire BDE sources
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO "bloomberg/bde"
-    REF 3720d132d0879f19b9084cca62ebc75f1f24e1a3
-    SHA512 234ebb71997f5b7d3951584235ead10f977689cef323ae1c198629a6b1995b1481d8a1515d827c46df10209bdc66e1f3cc7780dafee9ca0ff4172be47c460d78
-    HEAD_REF master
-)
-
-# Clean up previous builds
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-                    ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-
-# Identify waf executable and calculate configure args
-if(VCPKG_CMAKE_SYSTEM_NAME)
-    set(WAF_COMMAND waf)
-else()
-    set(WAF_COMMAND waf.bat)
-endif()
-set(CONFIGURE_COMMON_ARGS --use-flat-include-dir)
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=32)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=64)
-else()
-    message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --library-type=static)
-else()
-    message(FATAL_ERROR "Unsupported library linkage: ${VCPKG_LIBRARY_LINKAGE}")
-endif()
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-    if(VCPKG_CRT_LINKAGE STREQUAL static)
-        set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --msvc-runtime-type=static)
-    else()
-        set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --msvc-runtime-type=dynamic)
-    endif()
-endif()
-
-# Configure debug
-message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS}
-            --prefix=${CURRENT_PACKAGES_DIR}/debug --out=${SOURCE_PATH_DEBUG}
-            --build-type=debug
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME configure-${TARGET_TRIPLET}--dbg
-)
-message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
-
-# Build debug
-message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} build
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME build-${TARGET_TRIPLET}--dbg
-)
-message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
-
-# Install debug
-message(STATUS "Installing ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} install
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME install-${TARGET_TRIPLET}--dbg
-)
-# Include files should not be duplicated
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-# pkg-config files should point to correct include directory
-file(GLOB PC_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
-foreach(PC_FILE_NAME ${PC_FILES})
-    file(READ "${PC_FILE_NAME}" _contents)
-    string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/../include" _contents "${_contents}")
-    file(WRITE "${PC_FILE_NAME}" "${_contents}")
-endforeach()
-message(STATUS "Installing ${TARGET_TRIPLET}-dbg done")
-
-# Configure release
-message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS}
-            --prefix=${CURRENT_PACKAGES_DIR} --out=${SOURCE_PATH_RELEASE}
-            --build-type=release
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME configure-${TARGET_TRIPLET}--rel
-)
-message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
-
-# Build release
-message(STATUS "Building ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} build
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME build-${TARGET_TRIPLET}--rel
-)
-message(STATUS "Building ${TARGET_TRIPLET}-rel done")
-
-# Install release
-message(STATUS "Installing ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} install
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME install-${TARGET_TRIPLET}--rel
-)
-message(STATUS "Installing ${TARGET_TRIPLET}-rel done")
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE
-     DESTINATION ${CURRENT_PACKAGES_DIR}/share/bde
-     RENAME copyright
-)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --library-type=static)
+
+set(BDE_VERSION 3.2.0.0)
+set(BDE_TOOLS_VERSION 1.x)
+
+# Paths used in build
+set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bde-${BDE_VERSION})
+set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bde-${BDE_VERSION})
+
+# Acquire Python 2 and add it to PATH
+vcpkg_find_acquire_program(PYTHON2)
+get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
+
+# Acquire BDE Tools and add them to PATH
+vcpkg_from_github(
+    OUT_SOURCE_PATH TOOLS_PATH
+    REPO "bloomberg/bde-tools"
+    REF d4b1a7670829228f4ec81ecdccc598ce03ae8e80
+    SHA512 80af734c080adb225d5369157301ae0af18e02b1912351e34d23f5f2ba4e19f9ae2b5a367923f036330c9f9afd11a90cdf12680eb3e59b4297a312a1b713f17f
+    HEAD_REF master
+)
+message(STATUS "Configure bde-tools-v${BDE_TOOLS_VERSION}")
+if(VCPKG_CMAKE_SYSTEM_NAME)
+    set(ENV{PATH} "$ENV{PATH}:${PYTHON2_EXE_PATH}")
+    set(ENV{PATH} "$ENV{PATH}:${TOOLS_PATH}/bin")
+else()
+    set(ENV{PATH} "$ENV{PATH};${PYTHON2_EXE_PATH}")
+    set(ENV{PATH} "$ENV{PATH};${TOOLS_PATH}/bin")
+endif()
+
+# Acquire BDE sources
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "bloomberg/bde"
+    REF 3720d132d0879f19b9084cca62ebc75f1f24e1a3
+    SHA512 234ebb71997f5b7d3951584235ead10f977689cef323ae1c198629a6b1995b1481d8a1515d827c46df10209bdc66e1f3cc7780dafee9ca0ff4172be47c460d78
+    HEAD_REF master
+)
+
+# Clean up previous builds
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+                    ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+
+# Identify waf executable and calculate configure args
+if(VCPKG_CMAKE_SYSTEM_NAME)
+    set(WAF_COMMAND waf)
+else()
+    set(WAF_COMMAND waf.bat)
+endif()
+set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --use-flat-include-dir)
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=32)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=64)
+else()
+    message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --msvc-runtime-type=static)
+endif()
+
+# Configure debug
+message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+vcpkg_execute_required_process(
+    COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS}
+            --prefix=${CURRENT_PACKAGES_DIR}/debug --out=${SOURCE_PATH_DEBUG}
+            --build-type=debug
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME configure-${TARGET_TRIPLET}--dbg
+)
+message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
+
+# Build debug
+message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+vcpkg_execute_required_process(
+    COMMAND ${WAF_COMMAND} build
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME build-${TARGET_TRIPLET}--dbg
+)
+message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
+
+# Install debug
+message(STATUS "Installing ${TARGET_TRIPLET}-dbg")
+vcpkg_execute_required_process(
+    COMMAND ${WAF_COMMAND} install
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME install-${TARGET_TRIPLET}--dbg
+)
+# Include files should not be duplicated
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+# pkg-config files should point to correct include directory
+file(GLOB PC_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
+foreach(PC_FILE_NAME ${PC_FILES})
+    file(READ "${PC_FILE_NAME}" _contents)
+    string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/../include" _contents "${_contents}")
+    file(WRITE "${PC_FILE_NAME}" "${_contents}")
+endforeach()
+message(STATUS "Installing ${TARGET_TRIPLET}-dbg done")
+
+# Configure release
+message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+vcpkg_execute_required_process(
+    COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS}
+            --prefix=${CURRENT_PACKAGES_DIR} --out=${SOURCE_PATH_RELEASE}
+            --build-type=release
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME configure-${TARGET_TRIPLET}--rel
+)
+message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
+
+# Build release
+message(STATUS "Building ${TARGET_TRIPLET}-rel")
+vcpkg_execute_required_process(
+    COMMAND ${WAF_COMMAND} build
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME build-${TARGET_TRIPLET}--rel
+)
+message(STATUS "Building ${TARGET_TRIPLET}-rel done")
+
+# Install release
+message(STATUS "Installing ${TARGET_TRIPLET}-rel")
+vcpkg_execute_required_process(
+    COMMAND ${WAF_COMMAND} install
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME install-${TARGET_TRIPLET}--rel
+)
+message(STATUS "Installing ${TARGET_TRIPLET}-rel done")
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/bde
+     RENAME copyright
+)
diff --git a/ports/benchmark/CONTROL b/ports/benchmark/CONTROL
index ffdb53881..4df389778 100644
--- a/ports/benchmark/CONTROL
+++ b/ports/benchmark/CONTROL
@@ -1,3 +1,3 @@
 Source: benchmark
-Version: 1.4.1
+Version: 1.5
 Description: A library to support the benchmarking of functions, similar to unit-tests.
diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake
index 4528caa3b..76cdfb437 100644
--- a/ports/benchmark/portfile.cmake
+++ b/ports/benchmark/portfile.cmake
@@ -2,18 +2,15 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/benchmark
-    REF v1.4.1
-    SHA512 e9d71b4679cb4e4d755f7bb4101e131b37e209b6aebd0853e0c63eb11c42b75faa5da4ff8c265149808a475f3a1cfb140c5b49f877acfda908a4bb7add983aae
+    REF v1.5.0
+    SHA512 a0df9aa3d03f676e302c76d83b436de36eea0a8517ab50a8f5a11c74ccc68a1f5128fa02474901002d8e6b5a4d290ef0272a798ff4670eab3e2d78dc86bb6cd3
     HEAD_REF master
 )
 
diff --git a/ports/bigint/CONTROL b/ports/bigint/CONTROL
index 5247cbf81..9f508306c 100644
--- a/ports/bigint/CONTROL
+++ b/ports/bigint/CONTROL
@@ -1,3 +1,3 @@
-Source: bigint
-Version: 2010.04.30-2
-Description: C++ Big Integer Library
+Source: bigint
+Version: 2010.04.30-3
+Description: C++ Big Integer Library
diff --git a/ports/bigint/portfile.cmake b/ports/bigint/portfile.cmake
index 8a710aa54..61ce15816 100644
--- a/ports/bigint/portfile.cmake
+++ b/ports/bigint/portfile.cmake
@@ -1,10 +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)
 
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bigint-2010.04.30)
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/binn/CMakeLists.txt b/ports/binn/CMakeLists.txt
index 0c3995685..f92b00cb8 100644
--- a/ports/binn/CMakeLists.txt
+++ b/ports/binn/CMakeLists.txt
@@ -1,23 +1,21 @@
-cmake_minimum_required(VERSION 3.8)
-
-project(binn
-  VERSION 1.0
-  DESCRIPTION "Binn is a binary data serialization format designed to be compact, fast and easy to use."
-  HOMEPAGE_URL "https://github.com/liteserver/binn"
-)
-
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
-add_library (binn src/binn.h src/binn.c)
-
-target_include_directories(binn
-    PUBLIC 
-    ${PROJECT_SOURCE_DIR}/src
-)
-
-install(
-  TARGETS binn
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
+cmake_minimum_required(VERSION 3.8)
+
+project(binn
+  VERSION 1.0
+  DESCRIPTION "Binn is a binary data serialization format designed to be compact, fast and easy to use."
+  HOMEPAGE_URL "https://github.com/liteserver/binn"
+)
+
+add_library (binn src/binn.h src/binn.c)
+
+target_include_directories(binn
+    PUBLIC
+    ${PROJECT_SOURCE_DIR}/src
+)
+
+install(
+  TARGETS binn
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
diff --git a/ports/binn/CONTROL b/ports/binn/CONTROL
index f98abe1ec..b6259b52e 100644
--- a/ports/binn/CONTROL
+++ b/ports/binn/CONTROL
@@ -1,3 +1,3 @@
-Source: binn
-Version: 1.0
+Source: binn
+Version: 1.0
 Description: Binn is a binary data serialization format designed to be compact, fast and easy to use.
 \ No newline at end of file
diff --git a/ports/binn/portfile.cmake b/ports/binn/portfile.cmake
index 5115aacda..e470f0f40 100644
--- a/ports/binn/portfile.cmake
+++ b/ports/binn/portfile.cmake
@@ -1,26 +1,28 @@
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO liteserver/binn
-    REF 38019c11e582e5078436b8257887e79a33db8b28
-    SHA512 82c7ef211154303ebb4cb991e620da520231edd224de674d4dabc42760fd7b8b6dd7be167d6c0b6c04146ea7e077b0bcff14312be909cb4ebb1ec786863d3fb4
-    HEAD_REF master
-	PATCHES
-		0001_fix_uwp.patch
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-file(INSTALL ${SOURCE_PATH}/src/binn.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/binn)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-
-# Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/binn)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/binn/LICENSE ${CURRENT_PACKAGES_DIR}/share/binn/copyright)
-\ No newline at end of file
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO liteserver/binn
+    REF 38019c11e582e5078436b8257887e79a33db8b28
+    SHA512 82c7ef211154303ebb4cb991e620da520231edd224de674d4dabc42760fd7b8b6dd7be167d6c0b6c04146ea7e077b0bcff14312be909cb4ebb1ec786863d3fb4
+    HEAD_REF master
+    PATCHES
+        0001_fix_uwp.patch
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+file(INSTALL ${SOURCE_PATH}/src/binn.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/binn)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/binn)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/binn/LICENSE ${CURRENT_PACKAGES_DIR}/share/binn/copyright)
diff --git a/ports/bitsery/CONTROL b/ports/bitsery/CONTROL
new file mode 100644
index 000000000..3da15a785
--- /dev/null
+++ b/ports/bitsery/CONTROL
@@ -0,0 +1,3 @@
+Source: bitsery
+Version: 4.6.0
+Description: Header only C++ binary serialization library
diff --git a/ports/bitsery/fix-install-paths.patch b/ports/bitsery/fix-install-paths.patch
new file mode 100755
index 000000000..aa9130d8c
--- /dev/null
+++ b/ports/bitsery/fix-install-paths.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8125a28..8daee28 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,9 +34,9 @@ install(TARGETS bitsery
+ install(EXPORT bitseryTargets
+         FILE "BitseryConfig.cmake"
+         NAMESPACE Bitsery::
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/bitsery)
++        DESTINATION share/bitsery)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/BitseryConfigVersion.cmake
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/bitsery)
++        DESTINATION share/bitsery)
+ install(DIRECTORY include/bitsery
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
diff --git a/ports/bitsery/portfile.cmake b/ports/bitsery/portfile.cmake
new file mode 100644
index 000000000..bf3604a64
--- /dev/null
+++ b/ports/bitsery/portfile.cmake
@@ -0,0 +1,23 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+	OUT_SOURCE_PATH SOURCE_PATH
+	REPO fraillt/bitsery
+	REF v4.6.0
+	SHA512 519aec8730f4b6f8d26aff17d984101990ade02888664eb2c40bc1085e4dcffbbe83b08216149da234c8195d1940ec06744f16312f60e362f7005b205aa829a6
+	HEAD_REF master
+	PATCHES fix-install-paths.patch
+)
+
+vcpkg_configure_cmake(
+	SOURCE_PATH ${SOURCE_PATH}
+	PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+# Delete redundant and empty directories
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+# Install license
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitsery RENAME copyright)
diff --git a/ports/blend2d/CONTROL b/ports/blend2d/CONTROL
new file mode 100644
index 000000000..ef22b5264
--- /dev/null
+++ b/ports/blend2d/CONTROL
@@ -0,0 +1,10 @@
+Source: blend2d
+Version: beta_2019-04-30
+Description: Beta 2D Vector Graphics Powered by a JIT Compiler
+Default-Features: jit, logging
+
+Feature: jit
+Description: asmjit is used to jit compile pipelines
+
+Feature: logging
+Description: enables logging
diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake
new file mode 100644
index 000000000..c23c90afd
--- /dev/null
+++ b/ports/blend2d/portfile.cmake
@@ -0,0 +1,60 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO blend2d/blend2d
+  REF 69141350b5a654f328c8529ae301aa1e6bad5342
+  SHA512 d9bdd234f443c0ef8793dba1a76cc567bab3f9cf32d835d9e285f7ad946a56e0bc03eab30f61bbce51318e18a74ecfcfc965ac94e1ff6cef21e9b3ccc6a42120
+  HEAD_REF master
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_BUILD_STATIC)
+
+if(NOT ("jit" IN_LIST FEATURES))
+  set(BLEND2D_BUILD_NO_JIT TRUE)
+endif()
+if(NOT ("logging" IN_LIST FEATURES))
+  set(BLEND2D_BUILD_NO_LOGGING TRUE)
+endif()
+
+
+if(NOT BLEND2D_BUILD_NO_JIT)
+  vcpkg_from_github(
+    OUT_SOURCE_PATH ASMJIT_SOURCE_PATH
+    REPO asmjit/asmjit
+    REF f4e685cef003c40ad0d348d0c9eb2a1fe63d8521
+    SHA512 77981fc32e746fc88f5707b4a8e8557283261b2657248f0d4900f47bd500de4efe47619a53f32413ea3c6f116e084cac6fdb48b6b92d75e824585d94c785d2b1
+    HEAD_REF next-wip
+  )
+
+  file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/asmjit)
+
+  get_filename_component(ASMJIT_SOURCE_DIR_NAME ${ASMJIT_SOURCE_PATH} NAME)
+  file(COPY ${ASMJIT_SOURCE_PATH} DESTINATION ${SOURCE_PATH}/3rdparty)
+  file(RENAME ${SOURCE_PATH}/3rdparty/${ASMJIT_SOURCE_DIR_NAME} ${SOURCE_PATH}/3rdparty/asmjit)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBLEND2D_BUILD_STATIC=${BLEND2D_BUILD_STATIC}
+        -DBLEND2D_BUILD_NO_JIT=${BLEND2D_BUILD_NO_JIT}
+        -DBLEND2D_BUILD_NO_LOGGING=${BLEND2D_BUILD_NO_LOGGING}
+)
+
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+
+if(BLEND2D_BUILD_STATIC)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/blend2d RENAME copyright)
diff --git a/ports/blosc/CONTROL b/ports/blosc/CONTROL
index 1a2378aed..3a2f82d4f 100644
--- a/ports/blosc/CONTROL
+++ b/ports/blosc/CONTROL
@@ -1,4 +1,4 @@
 Source: blosc
-Version: 1.13.5-1
+Version: 1.16.3
 Build-Depends: lz4, snappy, zlib, zstd
 Description: A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`
diff --git a/ports/blosc/portfile.cmake b/ports/blosc/portfile.cmake
index 33d6f729a..a0d974b74 100644
--- a/ports/blosc/portfile.cmake
+++ b/ports/blosc/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Blosc/c-blosc
-    REF v1.13.5
-    SHA512 3ddc83c16c91d87959179f58bd23fe8e4bbd07c17312cdfdd0bc238a743e695f2914baf0b69efd923e8e54e8455699c8e528d3966d9126e15a8897d3c529db25
+    REF v1.16.3
+    SHA512 2ff67a6e955a641c3a2330140e5887d0ce3fdcbf6b205507798a4e848a35ba2e22bf8fd91133291bc73c4e48fb01c02139e47ab8e4774d0e2288872e625c9ffd
     HEAD_REF master
 )
 
diff --git a/ports/bond/CONTROL b/ports/bond/CONTROL
index eea3a85cb..62f48bd8a 100644
--- a/ports/bond/CONTROL
+++ b/ports/bond/CONTROL
@@ -1,5 +1,5 @@
-Source: bond
-Maintainer: bond@microsoft.com
-Version: 7.0.2-1
-Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. <https://github.com/Microsoft/bond>
-Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
+Source: bond
+Maintainer: bond@microsoft.com
+Version: 7.0.2-2
+Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. <https://github.com/Microsoft/bond>
+Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake
index b64be214c..a508e6a35 100644
--- a/ports/bond/portfile.cmake
+++ b/ports/bond/portfile.cmake
@@ -1,9 +1,7 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-7.0.2)
 
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/boost-accumulators/CONTROL b/ports/boost-accumulators/CONTROL
index d25e19fc6..2133992d2 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.69.0
+Version: 1.70.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 7b27e076f..dc0cd61b1 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.69.0
-    SHA512 82bb844f96ba5bc3ef97171830e2c7acd35eb500af211e2946aa51d1de1350acc2965200906d0656b8fd28eaf7d4781cc4e60b70fcbdad6c272ce8f6b47c608b
+    REF boost-1.70.0
+    SHA512 5f4b80082b033f1b5a8d2fa7f69410e334632d535011fefc6792331b2d77e27904b1cc7cef5a77891cec09cd329b08589552529c8feabb6b2da9676da3fc0dff
     HEAD_REF master
 )
 
diff --git a/ports/boost-algorithm/CONTROL b/ports/boost-algorithm/CONTROL
index fc11fcd75..38218d800 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.69.0
+Version: 1.70.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 ae1ce12a0..f0184ebba 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.69.0
-    SHA512 1f3711ce69db9c8d0e7f2703fe03f2743c0e3d8d8a5342122fa3603cd89733764c23b8758e3cfeb4a92e9ec9f4d33f115e79c84de5b53e816ae467233080bab7
+    REF boost-1.70.0
+    SHA512 3510cb1d837f04b26a009324ed123af756c2f47ec825e0148e11af4cf5a280e7df732552415015e18ccfb63e8077acebb5860c89af7dd3bb0fef878d67373aa2
     HEAD_REF master
 )
 
diff --git a/ports/boost-align/CONTROL b/ports/boost-align/CONTROL
index a977e771e..5e196d31a 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.69.0
+Version: 1.70.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 5a96db899..bcb356a7f 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.69.0
-    SHA512 7a2a05bed07c589c72ed87dce4f03b2e803a860e5696c958b6a393297ac95001d3cf521e121710b105a6e742d8160c9e52934d8ace9bdd91b524a69e64fd95bf
+    REF boost-1.70.0
+    SHA512 862c7e440e9fef88430a18bc3916f236578dca16dbcbc007f23fdbbf114933342d1c4f2c763d189fec510210aa011f3ff9f6f326a0a46ab549857f8afe4f64a1
     HEAD_REF master
 )
 
diff --git a/ports/boost-any/CONTROL b/ports/boost-any/CONTROL
index 6efa9ab4e..184be2107 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost any module
diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake
index 9c40ed38a..05e18ee94 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.69.0
-    SHA512 e6ca491c071992e542a480512d2b79add63c57428a527d4cffa5bf85448d9e7b7d2e7356e62d0346704cf881d62b2ca1c9cb3dcb68671b32623660d5cdd2ee96
+    REF boost-1.70.0
+    SHA512 ee0f9badba0d90807a8462fffc1c6880e06dd1cf43333a8f77c8b490007f4ebbdd30fae9046c18b2b8a48c2be8d0a28b3b4f3e8021a3b6491a319716aaa9bca3
     HEAD_REF master
 )
 
diff --git a/ports/boost-array/CONTROL b/ports/boost-array/CONTROL
index 2cb22727c..262b29c4a 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.69.0
+Version: 1.70.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 90a6ec6aa..25f50d3f8 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.69.0
-    SHA512 7d9eaea992faf31af6c0cf793d543e53dee6a5d827c232e3cc86b639cd4e5dc0d3b6daec46144fc1953083aa7d60e87d6292fa518be1d1b499bc58804c28a443
+    REF boost-1.70.0
+    SHA512 d741425add056b019c27b1bfc5f174d31945950f57a23be59dfa7f262902191142486112c1fa0002d58a4771e69c76435196d222aaddee148cc78796c5f3f05b
     HEAD_REF master
 )
 
diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL
index e1a35aeff..a0bff2adc 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.69.0-1
+Version: 1.70.0-1
 Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!uwp), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl
 Description: Boost asio module
diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake
index 9dd127495..dbb2b239c 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.69.0
-    SHA512 46597ccac219ceb484c638be06ba51a812f8b0e9559fe059542a2dbe5ed397f179f3430a3f24a3225e273de2bf351b44354c4f550c48ce491dff62d99618a64b
+    REF boost-1.70.0
+    SHA512 394c7e557d97bbb8b98453846a098c8ab7f4eb92d752bd4089d2020e0d5060cff1e53f5e50b2f8910e64b66c934b2bde4a7137bd1a6050e8b1279c2e4576b2e5
     HEAD_REF master
 )
 
diff --git a/ports/boost-assert/CONTROL b/ports/boost-assert/CONTROL
index 7ab47b739..bc8c11951 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.69.0
+Version: 1.70.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 2a7ad1e15..a4e951999 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.69.0
-    SHA512 d96dfd50ab45f71f67f0bb87624b71dff8bb74bfbba8d014896dd1f68ec3163b877394732567ff0fe4e4feb837ff248291b0fcc0743a907df11397b4cd94a275
+    REF boost-1.70.0
+    SHA512 8bd823a51b5cdad0b016f4b319c64c0965112b163fd0f721830e26195bc2de4a7767308ae6fdc044c621dc0fb14f60f890a994c36de2942095453854288497eb
     HEAD_REF master
 )
 
diff --git a/ports/boost-assign/CONTROL b/ports/boost-assign/CONTROL
index 9c4e469d5..ce4050e10 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.69.0
+Version: 1.70.0
 Build-Depends: boost-array, boost-config, boost-detail, boost-move, boost-mpl, boost-preprocessor, boost-ptr-container, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost assign module
diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake
index 6ac289794..2a92e2513 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.69.0
-    SHA512 c83961ff2281421001a041a77ab785f81fba1b3538fc96a2b8a5ea6ca950e9088ed820d46758cf4d076c0f31b6b92d948a39384f7e2f796659a76434e7b089b9
+    REF boost-1.70.0
+    SHA512 bae75fe87fe6de3c9b20e89ee818b2927cc1e6de90776163376113ff0ca103a338850b915b143e8d6047f733c0fa9c7517ca73688e830485bb66062898d3142f
     HEAD_REF master
 )
 
diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL
index 384cae7fc..29061c6f0 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.69.0
+Version: 1.70.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 634ad1bb4..e311b24f4 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.69.0
-    SHA512 17fe0249f1ceb8d9f6d1f2426a1ea1987bed2a33301cc03debc584f2557e48252a4b1c399f5f71764ef07bdfe48acd9a36a692c59710b64e5656a54a0703427f
+    REF boost-1.70.0
+    SHA512 00a1fd7731705a3298a19c4a40795d8ab2147a4940e55257ad33e8b7181f9d9a90ebdc0c2bb4f95c1a06ace0a2a5d39762674c2cd6598205151890df3859b251
     HEAD_REF master
 )
 
diff --git a/ports/boost-beast/CONTROL b/ports/boost-beast/CONTROL
index 1f7e1942f..a2fc18353 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.69.0
-Build-Depends: boost-align, boost-asio, boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Version: 1.70.0
+Build-Depends: boost-align, boost-asio, boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-logic, boost-mp11, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Description: Boost beast module
diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake
index c5ce1a1c3..d65e4318e 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.69.0
-    SHA512 bb6e3763f610abc1fa621f03e8f3e82b4c8e8643bf41eba5353c65d8bf3e84b10161a108148459f1dd8786204d7a3783e0c00caf88233f977b3e3ce93d7f0495
+    REF boost-1.70.0
+    SHA512 7f0c36d80f26b47b902bf78e066dfa3b1fd5ef5e5088c00d2aabef16805531b993efa94a25d84e8d1321c41fc021d46da25cb3ffe49fa42ae67813af333f453d
     HEAD_REF master
 )
 
diff --git a/ports/boost-bimap/CONTROL b/ports/boost-bimap/CONTROL
index 7f6bd2f0e..4f4ea28d0 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.69.0
+Version: 1.70.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 a9dcaa467..40f618a8f 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.69.0
-    SHA512 f6241910a5e94d10f9bc9b5c8dd2bd21c298145ff4eeff30e673e1bd421b962f07fd9c79b99952f896d11fa6874f5ecd64a8d060cf53ab1183735ae361879f40
+    REF boost-1.70.0
+    SHA512 9f6938bdbbd32a262cfd4c25b90930df6e0610aacff80a26b7a2caa38fdcaa309bdd7da0405e4529dfaf07314f887eb2b928db89aef1088fdbd7bd1da7bf5c0b
     HEAD_REF master
 )
 
diff --git a/ports/boost-bind/CONTROL b/ports/boost-bind/CONTROL
index a80dc4c38..fa0f4cb57 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.69.0
+Version: 1.70.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 4b4a6771a..5af3961be 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.69.0
-    SHA512 8445e5359d52cf71f0a818c507cfe4746e7966694691e6acaf7284855532245228bbfc3b26fb89d631e1a4d8de72d1a28e50ee60255c8955bef6a28a04b92105
+    REF boost-1.70.0
+    SHA512 951381fca83fe12382bb1388c9c9b4b8a6116300c55f46864550c5985c3f7b540f246601ddb57ed5b836075d942a999456d5f4557b28aa7fad83f82c0dc5573e
     HEAD_REF master
 )
 
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL
index 2886f3399..a2a96648e 100644
--- a/ports/boost-build/CONTROL
+++ b/ports/boost-build/CONTROL
@@ -1,3 +1,3 @@
 Source: boost-build
-Version: 1.69.0
+Version: 1.70.0-1
 Description: Boost.Build
diff --git a/ports/boost-build/arm64msvc.patch b/ports/boost-build/arm64msvc.patch
new file mode 100644
index 000000000..47f30acfb
--- /dev/null
+++ b/ports/boost-build/arm64msvc.patch
@@ -0,0 +1,63 @@
+diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam
+index e6c0b60..62c3a41 100644
+--- a/src/tools/msvc.jam
++++ b/src/tools/msvc.jam
+@@ -466,6 +466,7 @@ rule configure-version-specific ( toolset : version : conditions )
+         toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-i386)  : "/MACHINE:X86" ;
+         toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-ia64)  : "/MACHINE:IA64" ;
+         toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-arm)   : "/MACHINE:ARM" ;
++        toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-arm64) : "/MACHINE:ARM64" ;
+ 
+         # Make sure that manifest will be generated even if there is no
+         # dependencies to put there.
+@@ -1256,7 +1257,7 @@ local rule configure-really ( version ? : options * )
+         local below-8.0 = [ MATCH "^([67]\\.)" : $(version) ] ;
+         local below-11.0 = [ MATCH "^([6789]\\.|10\\.)" : $(version) ] ;
+         
+-        local cpu = i386 amd64 ia64 arm ;
++        local cpu = i386 amd64 ia64 arm arm64 ;
+         if $(below-8.0)
+         {
+             cpu = i386 ;
+@@ -1270,6 +1271,7 @@ local rule configure-really ( version ? : options * )
+         local setup-i386 ;
+         local setup-ia64 ;
+         local setup-arm ;
++        local setup-arm64 ;
+         local setup-phone-i386 ;
+         local setup-phone-arm ;
+ 
+@@ -1327,6 +1329,7 @@ local rule configure-really ( version ? : options * )
+             local default-setup-i386  = vcvars32.bat ;
+             local default-setup-ia64  = vcvarsx86_ia64.bat ;
+             local default-setup-arm   = vcvarsx86_arm.bat ;
++            local default-setup-arm64 = vcvarsx86_arm64.bat ;
+             local default-setup-phone-i386 = vcvarsphonex86.bat ;
+             local default-setup-phone-arm = vcvarsphonex86_arm.bat ;
+ 
+@@ -1338,6 +1341,7 @@ local rule configure-really ( version ? : options * )
+             local default-global-setup-options-i386  = x86 ;
+             local default-global-setup-options-ia64  = x86_ia64 ;
+             local default-global-setup-options-arm   = x86_arm ;
++            local default-global-setup-options-arm64 = x86_arm64 ;
+ 
+             # When using 64-bit Windows, and targeting 64-bit, it is possible to
+             # use a native 64-bit compiler, selected by the "amd64" & "ia64"
+@@ -1418,6 +1422,7 @@ local rule configure-really ( version ? : options * )
+         local default-assembler-i386  = "ml -coff" ;
+         local default-assembler-ia64  = ias ;
+         local default-assembler-ia64  = armasm ;
++        local default-assembler-arm64 = armasm64 ;
+ 
+         assembler = [ feature.get-values <assembler> : $(options) ] ;
+ 
+@@ -1932,6 +1937,9 @@ if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
+     <architecture>arm/<address-model>
+     <architecture>arm/<address-model>32 ;
+ 
++.cpu-arch-arm64 =
++    <architecture>arm/<address-model>
++    <architecture>arm/<address-model>64 ;
+ 
+ # Supported CPU types (only Itanium optimization options are supported from
+ # VC++ 2005 on). See
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake
index 6c54d0555..77da81057 100644
--- a/ports/boost-build/portfile.cmake
+++ b/ports/boost-build/portfile.cmake
@@ -8,24 +8,29 @@ elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_N
     return()
 endif()
 
+set(BOOST_VERSION 1.70.0)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/build
-    REF boost-1.69.0
-    SHA512 e8d89e75c83a08bab29f52b5100fccf1d2ddf492a532ae4cb8121a5f49819aebb8157d1a1fd7d514bd8a0fe444e5ebb1103b10c8579d5c234ab81110d9c334a8
+    REF boost-${BOOST_VERSION}
+    SHA512 be4e410a9656313519e089977a24da8f633db2182985f5d60e07e489f9eac8c887e8cab7e3cbd13f2b747bc3d9dab2899f174be1eaac73cfd7895015fb6b9b58
     HEAD_REF master
+	PATCHES
+	    # Add the support of arm64-windows
+        arm64msvc.patch
 )
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.69.0/LICENSE_1_0.txt"
+    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/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.69.0/boostcpp.jam"
-    FILENAME "boost-1.69.0-boostcpp.jam"
-    SHA512 1d05142f33b86a342674513cd5890b78601b0b3824540588f2c9e4c1fea43fadaa94f4a99495614445d3930861470fbfb8ad8c94b8bddf6a24ee65661a9bddc9
+    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/boostcpp.jam"
+    FILENAME "boost-${BOOST_VERSION}-boostcpp.jam"
+    SHA512 7fac16c1f082821dd52cae39601f60bbdbd5ce043fbd19699da54c74fc5df1ed2ad6d3cefd3ae9a0a7697a2c34737f0c9e2b4bd3590c1f45364254875289cd17
 )
 
 file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build RENAME copyright)
diff --git a/ports/boost-callable-traits/CONTROL b/ports/boost-callable-traits/CONTROL
index 60083adf5..ac0c45c3b 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.69.0
+Version: 1.70.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 985c900cf..8bc97f738 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.69.0
-    SHA512 0bdff6650b996b640b5853c540dab0a22cb6da13182512bfc34608d9bbb8f99ecd01b018106f91b827e5c9c2a9a7c7373128c85f4b533f472c81efab4eef45eb
+    REF boost-1.70.0
+    SHA512 73742aa4094cef8f4b24833036f99449343dd6c572919db8fb464f76dc527d99a5a57e52bbfe6b20089041aa43ecb7a87ec528a7aea2fef5a8b15f6ced553769
     HEAD_REF master
 )
 
diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL
index 7c154c473..6992e72d9 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.69.0
+Version: 1.70.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 562f3ea1e..e2eb7a4ab 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.69.0
-    SHA512 7de2282c65b4c25086f99602fcb4dc21b0470f327d1d8db530387754cd5710588ea196e0382b64df8c2160274d7d229ebf307d37cd7d0052b1beb182ac9dc641
+    REF boost-1.70.0
+    SHA512 a0498e5db8d3178479e08eb9b2b980447c5dc1b620ab45331fb42b1cdd94572feeb099498ac436f082fb850994e2f090123b8caffdec69e67cae23c94e8e6de9
     HEAD_REF master
 )
 
diff --git a/ports/boost-circular-buffer/CONTROL b/ports/boost-circular-buffer/CONTROL
index e56de0eb5..8119f6f86 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Description: Boost circular_buffer module
diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake
index f8f815b2b..f42f7d115 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.69.0
-    SHA512 2340ef5d04dff2be8dc6aadd697dd11992c86fcf84da4ea48cac17992b85ebd8f11b26e3772d77110db1ea7b81076c5c29647e8c13a17bbe47063ea1b511f809
+    REF boost-1.70.0
+    SHA512 c4aef9b30ed93000c663acb7536df6d7269be4e3a0c431daa2f5a0397505bc487c90259b0a24bb0145bf9c07fdecd8fbaa53ceca589f39a3b29f087d07f98113
     HEAD_REF master
 )
 
diff --git a/ports/boost-compatibility/CONTROL b/ports/boost-compatibility/CONTROL
index f59e7b652..d3465c69f 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.69.0
+Version: 1.70.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 f2c362ed4..41e268699 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.69.0
-    SHA512 2bac082f818b9138c529089751aea29d3848b90ee213ca58639667b3ffb8fa93235d4d5b3bc248f36dfa8fe79a30fc1f4628adc2637f09df1e0fac7b45e0a893
+    REF boost-1.70.0
+    SHA512 17f6b96eb29f95110f180209c27418a38be1fabe99dd0b50d206e4a628c42e87ffae343a8761a689145be15ae973721e7916a7326db8f45a5d0c8a0fb5639f6b
     HEAD_REF master
 )
 
diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL
index 858e9b4e3..a4c5168b3 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.69.0
+Version: 1.70.0
 Build-Depends: boost-algorithm, boost-array, boost-assert, boost-chrono, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-function-types, boost-fusion, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-preprocessor, boost-property-tree, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-uuid, boost-vcpkg-helpers
 Description: Boost compute module
diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake
index 43449f136..2b756df41 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.69.0
-    SHA512 885c91598fc5687e6b6054c49777713dc43843b755898700b6de519e115e1431cd9d11a533d30ad782412da0c2912995bea1a86bb6df7f45ee246cfabe86d452
+    REF boost-1.70.0
+    SHA512 d21c722340abd0f16c007060cac18b98be3d3056fb784c359203012f20d8ec1edf62bbe41e30b0129a1c478050d78fb34c1750c14ac7610f2bb63911006fd197
     HEAD_REF master
 )
 
diff --git a/ports/boost-concept-check/CONTROL b/ports/boost-concept-check/CONTROL
index e50fd5877..d198dcec4 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Description: Boost concept_check module
diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake
index a656e9806..f08d06864 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.69.0
-    SHA512 4a3c9833f8269d20486b1fb7e99a9203116f71ed8c6a4339abfe02982fbc3443e2d447e97a7a3915b3fa77db6ba66dc196dc249d3769b741421bb7377b58a061
+    REF boost-1.70.0
+    SHA512 5b495c9c6c76eac54a72e5f5cde41ac3957470b21d47abde4df8f74207b175dcaf104adf37603de9ef0cca7fba1ac702429af995371714eea0b9cdcc361f2f8e
     HEAD_REF master
 )
 
diff --git a/ports/boost-config/CONTROL b/ports/boost-config/CONTROL
index db6e4af38..b1b30fb36 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.69.0
+Version: 1.70.0
 Build-Depends: boost-compatibility, boost-vcpkg-helpers
 Description: Boost config module
diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake
index 362560350..5759efd79 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.69.0
-    SHA512 c5c6fabbe17f42bbfd0efcb42697eaaf688ceeb6d3a5e16c15e9e60353d99c593eb9b9587c3514642fccab23a869f7235e2531f57ab4e06840e8013f808cf8d8
+    REF boost-1.70.0
+    SHA512 c9132011f506b3803f736bc0f7498eb297bb2af7a9643f235055aa5d133c6cbbe04f11c88296a956acb9864ea8a5ea58df329df3dce1e0763ff0451f9e487fb4
     HEAD_REF master
 )
 
diff --git a/ports/boost-container-hash/CONTROL b/ports/boost-container-hash/CONTROL
index 4660d76cb..b2eb4a95d 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.69.0
+Version: 1.70.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 caf24b39a..16ae75279 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.69.0
-    SHA512 120a1b6d15344507ab3f81454e9c6059fd2fa3a16fc81b6b2a02c93ed5e4b8d1b180343726a38b44d60c25fcfd6427a2c3741c9e9cf18a26c878d4ad2b806b40
+    REF boost-1.70.0
+    SHA512 e08a01a0c4ede6b8e7be77c78e9a9c66680e7fc31ce64e3f43d2f535dfdcf6cce1d35cf7f0d120242bd749a7fd082d4b938c30e02438970be25613ee69b5baf1
     HEAD_REF master
 )
 
diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL
index 2e6613b0d..fa5d4f8f9 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.69.0
+Version: 1.70.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 dcf82dd8b..8e4d473e2 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.69.0
-    SHA512 8acfa595a188870f1cfb30bf1600997300260d81f56b8a28de8ab12065e0206b91c27d1203aa2541261ea734a09084d205d197097dbacd4858a736db56c9280a
+    REF boost-1.70.0
+    SHA512 fd0fdf2c26c0dc6ac977c069584282ac1dc1a8b4dae3609766af1cd1f1587126e5ff7ad2feffeb6c20d0679c245679e6c963e202d4ab2f6a6c74721f2e52e0cf
     HEAD_REF master
 )
 
diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL
index fa0348e55..493f018e0 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-thread (!arm), boost-vcpkg-helpers
 Description: Boost context module
diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake
index 78d5efa24..7c79f3bb4 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.69.0
-    SHA512 9764013a43d0c5d73b52a6da625c24ffa36b164eddce52157593e75b9d810a1bff5364a73735e848804be82fc356ef13dd5d796f80e6491fb4c9c57797f0a89d
+    REF boost-1.70.0
+    SHA512 b180cc8e6fceb457495a9e4e8c6118bd9d32d11e8aa30c477efa6c58474d03573744348146c542c4436a80b7cbf1f4ffa73034f31aaa045f8a9fc020f299342e
     HEAD_REF master
 )
 
diff --git a/ports/boost-contract/CONTROL b/ports/boost-contract/CONTROL
index 1667b1d72..7b03d05e2 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.69.0
+Version: 1.70.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 7a81ef146..8e034b901 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.69.0
-    SHA512 d1d0e8c2bb12a5176933e1848d7abdffee5ce58cb15ff73dbf24723cd436a632629023a28ce25fb4fd2d650b5fffd38cac700d5587f239a654a87b6a0c791755
+    REF boost-1.70.0
+    SHA512 867717f13da8df87330849eef5068538c5ea650f58ab9df581081480f8cf5ffe255b7503ac59a0b14d2063ddb9239bcfc72e02e0a66f86e77d7a2f32099afc34
     HEAD_REF master
 )
 
diff --git a/ports/boost-conversion/CONTROL b/ports/boost-conversion/CONTROL
index b3a43bcba..2d1fdf17a 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-config, boost-throw-exception, boost-typeof, boost-utility, boost-vcpkg-helpers
 Description: Boost conversion module
diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake
index e89c3a0e9..cda3c164b 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.69.0
-    SHA512 19e8c50e317166595d0b11927e040994c13bda8cab91b2fbc33de5875ac8270fbc4cef43d11149906f4fdd081a46d5e6635793a825c1e4984ec186a03c5f4121
+    REF boost-1.70.0
+    SHA512 2d061273c85b9769e433184ff2b2a3ceaf3ff39e66fac62e34097f1a6288aa72d5801e34c93c8e80a3200bbd3129d70d73f656fc958b78694dea39799b42b287
     HEAD_REF master
 )
 
diff --git a/ports/boost-convert/CONTROL b/ports/boost-convert/CONTROL
index 5bfa01743..33fa90d50 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.69.0
+Version: 1.70.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 b42f37b33..702206fc1 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.69.0
-    SHA512 2461fd507ddefbae59f2357cc5627d52826555913660a4c58910f8562815d0d0e41e7ad169075404ed72fe215d93850775c30f4a0335dc282868dd51f7e0b9be
+    REF boost-1.70.0
+    SHA512 0edc789070a74d7abf57170fddfc70f4b79b62720d771a650d148cefbf70b78e1a0a43a2fd85d5be94f4cb8452ec0ed33dfcbf0621a7980161de451576ab083e
     HEAD_REF master
 )
 
diff --git a/ports/boost-core/CONTROL b/ports/boost-core/CONTROL
index 200efff69..41f16e864 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-vcpkg-helpers
 Description: Boost core module
diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake
index be16b6b2a..df3b3e7f3 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.69.0
-    SHA512 43851113e0202e8b0d1fc479fb6e87a75152577f4309796335e9d23b26b00631beaf7780fb7404f421e1239a7e1c449c3d1c3634f697c562927c1b623fbd0d76
+    REF boost-1.70.0
+    SHA512 955f788c7ec2a1988df261606da42915e42e321f200c9729f7b1aa503224b8fce4fb784c8693374d7a31a6a45f4082fe3b489853bee85a6ee06184f7fb898626
     HEAD_REF master
 )
 
diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL
index 7fad1876a..c6bc86e94 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.69.0
+Version: 1.70.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 4ae5275a9..88326a6db 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.69.0
-    SHA512 12e8abb698d7b71fc39659e43386a7b33227065cb0ccc1f7c4ff972e0d75dca02e26306214a8aea613f4bd2f3741ca930bf412666312465d0b504cee68b27582
+    REF boost-1.70.0
+    SHA512 e63e92c1e6013ab79df4312ace30d5e9989ec30f10c4e97fe366b0f60b50675fa91cc323508e81065400a66d4931c1f5cba51287e6c2fca5567495ade1b94d46
     HEAD_REF master
 )
 
diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL
index 13eb90846..f1679befd 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.69.0
+Version: 1.70.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 7fe2063d9..42e7601e4 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.69.0
-    SHA512 278fdeedb5624d17a07ee4b9c1ea8864eb695042c19d59cd4cf519d89a9f33774bc2ee38b5e5c2eea18074abd23711d123549c0df414f65ecdb562256be5b3c3
+    REF boost-1.70.0
+    SHA512 8f087e33be6eeb1bea523abf871a6bb5252bcb0c40de3489d2713c8b242de97697e86fc2628fe0b0eefefef65307cdd0e0737ae7471fde083a2b09d7139f487c
     HEAD_REF master
 )
 
diff --git a/ports/boost-crc/CONTROL b/ports/boost-crc/CONTROL
index 06b2b72c8..9dc0e2045 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.69.0
+Version: 1.70.0
 Build-Depends: boost-array, boost-compatibility, boost-config, boost-integer, boost-type-traits, boost-vcpkg-helpers
 Description: Boost crc module
diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake
index 3ac1963a4..6528e2d59 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.69.0
-    SHA512 10cebe78edc8201bed71dd21fe3cab5e1cc7fe1bcb5a52be253f1ec33fabd7f9bb7e7c553785dd1752548c4b8ddd7262de83b84f476cafe8da8a71ac5a0e9e85
+    REF boost-1.70.0
+    SHA512 7318072d20d80b747991194477d78177345ce67b618d9dd8bbb6a5432673244c04717d5f41f3bf50daf18ff33d612225cd9109578c07019922609a6db4cccb3e
     HEAD_REF master
 )
 
diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL
index 8e8d74c82..e8d85f414 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.69.0
+Version: 1.70.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 114d9255e..9a128b701 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.69.0
-    SHA512 5e95ba32467b1431cd0d353f4bebdbf031d6ad6f18c3f462de5931a272b4448b628a68682ced538b11f28c1be0817378800d5e62764feb23736f7b5e96f33d1d
+    REF boost-1.70.0
+    SHA512 2ff8c459b3ec04fa6f57b8d94d052fbdc2b0c0774b064cbf681817a7dcc0239e1a6856e25674c9797668dcc2fab3b6f576a633286fcc8e5fe796d74c6f1a52a8
     HEAD_REF master
 )
 
diff --git a/ports/boost-detail/CONTROL b/ports/boost-detail/CONTROL
index da02cc028..593adbba9 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.69.0
+Version: 1.70.0
 Build-Depends: boost-compatibility, boost-config, boost-preprocessor, boost-vcpkg-helpers
 Description: Boost detail module
diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake
index f4cb94553..48c0a04d4 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.69.0
-    SHA512 f787d14e9d980b5f568320982952bdb122402d3a017d26e90a7552f3dfe4f4a8ffff12f6f7a83ba9434ae1affa6946016a549ae27df829fd323a7543e5f7a7ec
+    REF boost-1.70.0
+    SHA512 8cedb220dce3a4f6aaee13eacdd5c8246e707b724bd260d025b7ece9336dffaa645a3cf59f90ea02136a23126e9a93116485ad5d76e8b04d46e08f043c394018
     HEAD_REF master
 )
 
diff --git a/ports/boost-disjoint-sets/CONTROL b/ports/boost-disjoint-sets/CONTROL
index 800b96123..6ef6bfbbd 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.69.0
+Version: 1.70.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 5821422f1..68215afc8 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.69.0
-    SHA512 2d43ec3020249c232b35ce6ab6be541e4dbdddc4dbe9f0e2f92796e3200670df03c40651c0d7fe3f91f89b2524b0f023a4152e80d8b3ee7738ea5fa6880801e3
+    REF boost-1.70.0
+    SHA512 3d85e4f33491529dbc1082ab45d91b93e96d74253108c05f2d6542340c2cf9e4c817c6b9996d7de0e733f09e2e60eee038056db764e3e829662142f9dbe611ca
     HEAD_REF master
 )
 
diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL
index 6a06ccf7e..702bf37ef 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.69.0
-Build-Depends: boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-mpl, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Version: 1.70.0
+Build-Depends: boost-assert, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-mpl, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Description: Boost dll module
diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake
index 875401da8..7d3765d6a 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.69.0
-    SHA512 b2948d2e7dc7899533a4ee073d6386166ccaf2fcb40feaa2a98e86f453cd58d74d7e75100cb0e85064ef11fe7caf065e165344463cbe3631333b4c8a3c6a8f50
+    REF boost-1.70.0
+    SHA512 607bcbb31cc4f630bd921a62dd57c35ace268f8eb048bc4460fde85cd399c04bc2f6880a3e868b5a5e24de91a3db04066b89e952740b1d9b2e4f4704555f8226
     HEAD_REF master
 )
 
diff --git a/ports/boost-dynamic-bitset/CONTROL b/ports/boost-dynamic-bitset/CONTROL
index 95e899824..86b48d7da 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.69.0
+Version: 1.70.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 95798b5da..84296b749 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.69.0
-    SHA512 80e8b4f8f1fb0d5955e7f9ec92d6d39a214e0443d3a85b633dbc3abdb29d9b401ca1698097e12a25bbc94b6bd722a9cf7698ab4deb61a69ca8a2d84083765290
+    REF boost-1.70.0
+    SHA512 a646b54f6c85f0810da3b7346919c8b04b8e993773d42ba866909e932682989e9a31f23c590c84ec64e9fe19ff377586b8487822c9e48234643dc021e5d51c62
     HEAD_REF master
 )
 
diff --git a/ports/boost-endian/CONTROL b/ports/boost-endian/CONTROL
index bc2baadc4..33afff4cd 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost endian module
diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake
index 2fa8f985e..c99b81027 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.69.0
-    SHA512 13f96af6696b8ba353ab7c11dc2b26db50038b44c44287dd927b78b7ff55fa6fb37002980c878e850cfbe7b1d264722bd632db88404ac2df641b5094229e5e99
+    REF boost-1.70.0
+    SHA512 4cf95f9b28dc7936a26c1dbc73419c9a1caa770d4b3d8a613dfc77182c98cd34432c51a40a19f7720a2f061743c30b11f7df7193c5d194313901977c51a130b7
     HEAD_REF master
 )
 
diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL
index 737e7876a..869b64b78 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-vcpkg-helpers
 Description: Boost exception module
diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake
index bc699965c..c0c427674 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.69.0
-    SHA512 25dd5e1721e6c4668530a90c7bcd4d0adf7312562dbb62dc3a34ac88cb8d4206072dbd365608cd5fb1b3f5eab82686035bd4fba1f4e76b603b95e6d51b090e7d
+    REF boost-1.70.0
+    SHA512 6e8e40e9d5ee2478216f22279d00b835db3e0f43b8a5ff1e7bdbdab4479f86cff152f38a02171630e74ff6c61d58de7f6b9151496b18b9672be791dbd4b77e64
     HEAD_REF master
 )
 
diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL
index b25d07ded..5ef6fdd55 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.69.0
+Version: 1.70.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 bf09a86c9..c327f0121 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.69.0
-    SHA512 c76794d63742ce9b4cc2d0aea2bc806071ea8ce03bda3759ab225edfd2c92c30bb437027e8bb8d6e526406180589f1021f64611a001545a68be41c9a41714a47
+    REF boost-1.70.0
+    SHA512 d0f844808bf8644d3aad6db3cd44629c6355d6e7b028d99cecc104f97b5bcf765f4238c1c97f693af5693738813517a00c6e692840b24a2f59af376b4e7ac14f
     HEAD_REF master
 )
 
diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL
index 71630d843..db1233d57 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.69.0
-Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-system, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Description: Boost filesystem module
diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake
index 8fe22e891..af0af0517 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.69.0
-    SHA512 d278883d80245018a431fe5c169ecbfbf21380b3a1fb491a49aa74ad26a2db6336ef5309143ad19a08aacc9c647a264714823f415ef9fe3d4795f4b2d5cdcde9
+    REF boost-1.70.0
+    SHA512 c08d439dac95543f242528ee09e0bc71685988705c2bc4d98cb71f521b7966f86b6bec0a8c689a188b5e6a1d8629b2eeefdcc856cbe2fa407612548e26ee291c
     HEAD_REF master
 )
 
diff --git a/ports/boost-flyweight/CONTROL b/ports/boost-flyweight/CONTROL
index 0f6e0c74a..491e7a1be 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.69.0
+Version: 1.70.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 4d30fe96d..1f2d9a561 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.69.0
-    SHA512 85d2d5045c920bf46d0715805ecf3de13b59974b9a7add7baa66c9d726fdcb20e4e481a24724e52aaff050615d8c52742b764397512676065e654aeba50e81aa
+    REF boost-1.70.0
+    SHA512 5c8349be1c4c041362a9fb5d2c9da72aa52f2c36fdd88025753f042e6a37cce5818f5acbff4b8727e0997614945f9f9d6147241b52e7df2d2b308d0551da6cf6
     HEAD_REF master
 )
 
diff --git a/ports/boost-foreach/CONTROL b/ports/boost-foreach/CONTROL
index 4acd878b4..b168e81c2 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.69.0
+Version: 1.70.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 e5379ea48..b5a420c42 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.69.0
-    SHA512 fc7f18b8fbc4bbbe15c32ac8d75b8a783f4a24ae7e90371b57c3ac1571486d0c8ceae88ac943e8192fae5a8ee8e6ec6b59b17c295a4855762f148269a16d087d
+    REF boost-1.70.0
+    SHA512 c63f427066e8f964c58a3e721a037346afd62a4df6c01fd76ebce9fac5634087ac80b06ed8dc70171be51380d7a2fe65727fdcf5fb1bd993e005ae4689fe0bdd
     HEAD_REF master
 )
 
diff --git a/ports/boost-format/CONTROL b/ports/boost-format/CONTROL
index 0b2637ef5..c4f20397b 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.69.0
+Version: 1.70.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 783702c4f..fb901824e 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.69.0
-    SHA512 094cdc1dee2020b20c78f10b1478f820948ca31c0edb258c8fc38b21b8fcdee3648eba50d536805ca19536b83e54516160e43895e44ba5403f7e7c4b5dc75d90
+    REF boost-1.70.0
+    SHA512 a36cc172fec72b5fd989d6e11d8f2f80f93138a99b03a7b1443663ff81ce2f302dd50f25e0308229de9dd6f59b8510151f27255cdafcac152b185c7174d11a86
     HEAD_REF master
 )
 
diff --git a/ports/boost-function-types/CONTROL b/ports/boost-function-types/CONTROL
index cdfde4442..d27f00231 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.69.0
+Version: 1.70.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 580bb7496..f9f380a20 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.69.0
-    SHA512 642f95aa23254edfc650dc2eb729eb541f507de2ad8d20091e8bde35f4e471b04ab6a8140cd8bf891866e74ce739e3821fddae653a4cd11a2066d1d93061b253
+    REF boost-1.70.0
+    SHA512 6022a7045d39b18b76bd6ca57dd7e960d1242321a2c1adb5f9c7215e58ce472adfe2be40a4f3bd2f9d28e2fad30ad75ee896896dff15e5cfa446c085d9a5c9e2
     HEAD_REF master
 )
 
diff --git a/ports/boost-function/CONTROL b/ports/boost-function/CONTROL
index a5d118abb..e3b03f35c 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-integer, boost-preprocessor, boost-throw-exception, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers
 Description: Boost function module
diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake
index b5c19fc38..cc943013e 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.69.0
-    SHA512 58d764e454aacaffb0baf299483be98e3eacdbd8a4e209a6b91727a18c9839e561da5316b8238b397c62a6d9e49631226239d9d3ba20e77b9b1ce648ce3bf940
+    REF boost-1.70.0
+    SHA512 d655792b1262ef039348b09328614acd954685726dcaeccf564ca0a4c36f25f0d764dfc2544cf2c08977d516610db8fdf22671d16881187163226953da22e654
     HEAD_REF master
 )
 
diff --git a/ports/boost-functional/CONTROL b/ports/boost-functional/CONTROL
index 912eec3a2..e6628b2ed 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-core, boost-iterator, boost-mpl, boost-preprocessor, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost functional module
diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake
index 88956532b..9dbbb6b38 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.69.0
-    SHA512 08d4efb9732a1d3fcd91fcbf90cfbac0a4db80b50101c5466a5ade3bee90c7a5dd42375061fd302d9aea1e2f8d9f9b7986f2ed05f3f224c617741bd76776ceec
+    REF boost-1.70.0
+    SHA512 ca32f1e0292835ff059e907e2392b059cdb85e1c1b7b7850f9e490d59ecd4d95d7cc2f6ebd548a167018b179812045104692e638334d35243da26117f8ccceb7
     HEAD_REF master
 )
 
diff --git a/ports/boost-fusion/CONTROL b/ports/boost-fusion/CONTROL
index c648924a2..c91ce6870 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.69.0
+Version: 1.70.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 0d6f6a962..23844aee7 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.69.0
-    SHA512 fdf2dac6416f46c5d1dae6401bd224a55d693cfb7aee72f189d7cf7bc8103df2b68123f8d17e9a8081eacb83fa334e7a031098bd8626e77ef1cfc15617e821ad
+    REF boost-1.70.0
+    SHA512 709d374a225b0a92ccf52e2fcad02a182bd49bce372b1f57857b9b9409a2ee83c1f6f97f8b9e24ba5f1b22fc58f9a0895d56e83c2af772136216d2cdac237e48
     HEAD_REF master
 )
 
diff --git a/ports/boost-geometry/CONTROL b/ports/boost-geometry/CONTROL
index 4d1326f47..02bab4832 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.69.0
+Version: 1.70.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 9e4211f34..dbe2412eb 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.69.0
-    SHA512 a79a377497bb8270282032e77c62ba3afb25c2201dfdb26de37373141e1a4fa4edb3da4b2de22a1fccb1cbcb52c164ce98c8bb2b30b097509a38e062df85d3d6
+    REF boost-1.70.0
+    SHA512 78fd4f1f6f5956872c89f9b2d4cf20f7531ea55e50ad2dc33ee518e0f24a2e9a12e525ebbbb18ee884756e25cebb19307f199ddf1318dd4a07655e46e15d68dc
     HEAD_REF master
 )
 
diff --git a/ports/boost-gil/CONTROL b/ports/boost-gil/CONTROL
index f3ad97c66..0057978a4 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.69.0
-Build-Depends: boost-bind, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-iterator, boost-lambda, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-assert, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-mpl, boost-numeric-conversion, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
 Description: Boost gil module
diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake
index dcf0da0cd..8957f3e6f 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.69.0
-    SHA512 2875d2e41ce429c1e2b8175efcda75319383431887c30c07da0051cf7816e16ce0db13093bc4fff89d4d2f2f0224ebb6d3c8a00eb38c130f9234046fd52fe006
+    REF boost-1.70.0
+    SHA512 2b0149b690b9ae45e9e85fb1441b9d20f6f1238a710393f8acbda6cefb12483568f612eeaf5597d187edadf459d99bb8417c807b35360fb3596d107de73482cb
     HEAD_REF master
 )
 
diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL
index 861b1e550..569ca21f9 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, boost-filesystem (!uwp), boost-foreach, boost-function, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
 Description: Boost graph_parallel module
diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake
index 195508e2f..10899ea81 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.69.0
-    SHA512 4a475e105cb6c310c9edc59a43a272635af48c3b7fcc7c1b8f5d9f2f921f64a9a4e50dbc558a7f8d07038fd9f6af39b152a7997c9dc0c9094efdb11ff5ab9114
+    REF boost-1.70.0
+    SHA512 31331fa45061c87061137c2b1bdcce60e0bf2de93d292a7598135eb7b1bdadb8b46be8ac0d89c583b004d2a543f6a06765eafea3875a60b0b38e2986e53adfd9
     HEAD_REF master
 )
 
diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL
index b6df893ab..d99a2c013 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.69.0
+Version: 1.70.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 fcbfc07de..9d62779d4 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.69.0
-    SHA512 9e8a165d87c100e0b10ec0f1a88c29fe35c6056163a9c657b9a02a064199bb511a17b03720204e37b0651468690c5bb704ef28778ef718e8593930375e9e4a2e
+    REF boost-1.70.0
+    SHA512 51f0cfed08ad19d1f4782ffeaa9e415f1b25fd49d89429105d45a2f2ac72314b12c4fd37793e9453c422e005c9c6159257313a3334df445f8e7fb4129822b73a
     HEAD_REF master
 )
 
diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL
index ef0cff420..4d7599dd2 100644
--- a/ports/boost-hana/CONTROL
+++ b/ports/boost-hana/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-hana
-Version: 1.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers
 Description: Boost hana module
diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake
index ac7e385a3..20b299ce8 100644
--- a/ports/boost-hana/portfile.cmake
+++ b/ports/boost-hana/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/hana
-    REF boost-1.69.0
-    SHA512 d997bad499b654ccab90fa30114fa99c2504e06d61151bf41250f9e606808bc0dfb11b00a563de485e830aed7867b6968541547e0e9c1a0795ae4a09bdba0283
+    REF boost-1.70.0
+    SHA512 0a927fe46988a7f8ebe8a799437009349270244206f3f146fa33f37e081fba34f431dfce3b5a07fd1e7f77050f11c45e60277f4555fdc8004251b603eb88fa17
     HEAD_REF master
 )
 
diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL
index 1f7e4d7a4..ff2a65ea3 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.69.0
+Version: 1.70.0
 Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-integer, boost-intrusive, boost-iterator, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Description: Boost heap module
diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake
index 4ba500922..d4165de94 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.69.0
-    SHA512 331a8ccfb5d41f3881ada825162a6d1ddd33e161edbd5cece4d65844316a5280e9ba1932efa43a60d7c3c0f538cfde5941060183c09382f58955604e7e3b909e
+    REF boost-1.70.0
+    SHA512 5f264465ab572ccd804c1209948133033f8379bea549d671a10b8e5b9db74bf92c7c580f11b689bd553a5a252854e12179c9daf00d890ff37a913d0cba463806
     HEAD_REF master
 )
 
diff --git a/ports/boost-histogram/CONTROL b/ports/boost-histogram/CONTROL
new file mode 100644
index 000000000..a57571811
--- /dev/null
+++ b/ports/boost-histogram/CONTROL
@@ -0,0 +1,5 @@
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+Source: boost-histogram
+Version: 1.70.0
+Build-Depends: boost-assert, boost-callable-traits, boost-config, boost-core, boost-integer, boost-iterator, boost-mp11, boost-serialization, boost-throw-exception, boost-variant, boost-vcpkg-helpers
+Description: Boost histogram module
diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake
new file mode 100644
index 000000000..692adb096
--- /dev/null
+++ b/ports/boost-histogram/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/histogram
+    REF boost-1.70.0
+    SHA512 0eb1b9c64de27e0364c965710208d85ce2e19c009d88c4969a53f11dfb774c38bcfe1ed48bdc896e6e695bb536879e0ef1ce3ed2c7e72e15c3e480c7b625623f
+    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-hof/CONTROL b/ports/boost-hof/CONTROL
index f2cf84019..02262aaf9 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.69.0
+Version: 1.70.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 358e67eb4..acf7acbc8 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.69.0
-    SHA512 a49e800a59a3c3733aa647676899bd935c7623d18e6213b949def6ed2aff5cea240a503eb4a1cc2446fd3c7ef01f0d03f546cf4e49b16d9dced3530797670924
+    REF boost-1.70.0
+    SHA512 93a0be0e6b435ca99e606098add9e784ce46925d352a35d9d928070f4deccf1091196fda16627c73f6eb008ff86996917346b83813dee6e94c8cd3927f5c7233
     HEAD_REF master
 )
 
diff --git a/ports/boost-icl/CONTROL b/ports/boost-icl/CONTROL
index e723346ac..213b1a76a 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-concept-check, boost-config, boost-container, boost-date-time, boost-detail, boost-iterator, boost-move, boost-mpl, boost-range, boost-rational, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost icl module
diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake
index cf33c8ff9..f8adcccae 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.69.0
-    SHA512 520780eea6e2c7e0f9b81b899684d44655b95742fc4c3eaf812da527ff0dac607d760ab03bdeaeb2a963162651ed4a93a21c89101f957d0a959d3b88582623a1
+    REF boost-1.70.0
+    SHA512 440d2c657f0b3ff5c2755944e8eef0e068b16e84416fd7e3552dd976916b875a8cd73fae7ba205812593415a684d80791f86c7e262f3c5e3aa56711cff579722
     HEAD_REF master
 )
 
diff --git a/ports/boost-integer/CONTROL b/ports/boost-integer/CONTROL
index 85c1a888b..aadc1e67f 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.69.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
 Description: Boost integer module
diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake
index 36c15e9f2..4edb497ee 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.69.0
-    SHA512 69bb40592bdf3018facb083e9a9df12093f04e6f024526e39646cb3f4cc1ba5cf8468fd73a424050fc3b93046961fd3c83bb92e38e9f14b17324501ddec63115
+    REF boost-1.70.0
+    SHA512 914556323d480be24b9f59b3596702510d1188584eed70bc734e14ca3999a77d4119fc30eafe95548a99fc657467500193e250907f5dad5d05692d7c52607c12
     HEAD_REF master
 )
 
diff --git a/ports/boost-interprocess/CONTROL b/ports/boost-interprocess/CONTROL
index 566a7dbe2..7ad6c8ef5 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.69.0
+Version: 1.70.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 3dd4adf4d..dd50bbf7b 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.69.0
-    SHA512 1bad3bb5e9fa59c48607ea2d668b61fdc15d60ab0e9f6cd04d1fcd972932b2466e94203062a65142b1b810e26b0cb59fd0890aaa4b764ac03d16ab3c95454d73
+    REF boost-1.70.0
+    SHA512 1f496d61039a6cb9084a8bea1e70538fe36b81a76a7241de5e96735d98287ee82755593c1c07201b5b14cd70b515b47e134515864bf50f075cb76f669b0b31d3
     HEAD_REF master
 )
 
diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL
index 82c37ae68..6418e0985 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.69.0
+Version: 1.70.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 7d2d747c7..c1e5a4a29 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.69.0
-    SHA512 203e19a3c87fa50b22fe0c194f7774fc7dcf7ed7cd21add4bad8cdd1251783a7b173e1100cf33397d69aa3636a4dc4f2341f4a7dd8ac8c7c7f0781e9d48e1001
+    REF boost-1.70.0
+    SHA512 235bc027737963b9399c02b1ea5bc4e2024e439837f52f0d729c43df33c0202155ae1311ed114a7796ac24a5311f5c8f70deabc0a1cb8712c6bd02972bcfb974
     HEAD_REF master
 )
 
diff --git a/ports/boost-intrusive/CONTROL b/ports/boost-intrusive/CONTROL
index 0bde2258f..8a12b51ae 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.69.0
+Version: 1.70.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 6d358b98f..071df857a 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.69.0
-    SHA512 1f89c9d217934db8d5a3aa169a21deed59d0f50b49ac58258bbc1f8c539df7a03d6cac0cd8d1668e73747153599f24cac87c683b12e32d9cc5f7fda438ad1d66
+    REF boost-1.70.0
+    SHA512 6f8b68b6fbb3fb400d85b7525b0bd562b27760760d1f5057b59c0e208940de3da72ba61d98ea449851af2dc3296597a84a011c3087174d955832de24716cbd6c
     HEAD_REF master
 )
 
diff --git a/ports/boost-io/CONTROL b/ports/boost-io/CONTROL
index c5b043db0..db01201ea 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.69.0
+Version: 1.70.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 e2b759b91..ca85bb2d6 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.69.0
-    SHA512 d00c93d23edd21042888bd2abee97eef1a16a25d3621a66273fe10ae56c90381b3b5c94e1739afd2a4b829606f6dd16513bedf450f2d0109bb27108443dfab3f
+    REF boost-1.70.0
+    SHA512 9d879f365664b36a8d8574f9f305ebb44c2742975192565f67f37258b6597fd6a13aaa33727c078501ba6373405a53c8374fe800b0b9169bc92eee97b0947a91
     HEAD_REF master
 )
 
diff --git a/ports/boost-iostreams/CMakeLists.txt b/ports/boost-iostreams/CMakeLists.txt
index 454e74845..582377d4c 100644
--- a/ports/boost-iostreams/CMakeLists.txt
+++ b/ports/boost-iostreams/CMakeLists.txt
@@ -30,7 +30,7 @@ find_package(LibLZMA REQUIRED)
 target_include_directories(boost_iostreams PRIVATE ${LIBLZMA_INCLUDE_DIRS})
 target_link_libraries(boost_iostreams PRIVATE ${LIBLZMA_LIBRARIES})
 
-find_library(ZSTD_LIBRARY NAMES zstdd zstd_staticd zstd zstd_static)
+find_library(ZSTD_LIBRARY NAMES zstdd zstd_staticd zstd zstd_static NAMES_PER_DIR)
 target_link_libraries(boost_iostreams PRIVATE ${ZSTD_LIBRARY})
 
 install(TARGETS boost_iostreams
diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL
index c8763146c..84d1448b8 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.69.0-3
+Version: 1.70.0-1
 Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, liblzma, zlib, zstd
 Description: Boost iostreams module
diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake
index d15007e70..6c9e41ace 100644
--- a/ports/boost-iostreams/portfile.cmake
+++ b/ports/boost-iostreams/portfile.cmake
@@ -5,14 +5,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/iostreams
-    REF boost-1.69.0
-    SHA512 263d06f2533a345eb4fe3926742c6606b486d9f7d024a001f00b09592201ee987854036174b44c39c6d9a47b52262a96f9a8ebf2af215ef217fa11aa1209fe86
+    REF boost-1.70.0
+    SHA512 0b0d3b5408d389783d6538c6ed41d615dd0eda1a5c023ed490308b010ccdb34b34dfbb934caa9df5417168570b6d2963d95b0321ab9378dc43c8dc6d89aecf89
     HEAD_REF master
     PATCHES Removeseekpos.patch
 )
 
 vcpkg_download_distfile(LICENSE
-    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.67.0/LICENSE_1_0.txt"
+    URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.70.0/LICENSE_1_0.txt"
     FILENAME "boost_LICENSE_1_0.txt"
     SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
 )
diff --git a/ports/boost-iterator/CONTROL b/ports/boost-iterator/CONTROL
index 4d72f30c5..5ce5195ae 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.69.0
+Version: 1.70.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 05cdb6957..bcf1b97d4 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.69.0
-    SHA512 7f5fb06fdc48feb16eab33c6726713bc45fd4ed73598ffc55ba30a2cdd46ebc5d5fe858c0a2d93a348a0d3397891d8c33e6e2a5fce70aeca1d3be6586c269271
+    REF boost-1.70.0
+    SHA512 ef6b8ace53b73874efb80ba690bce03a13e86bb081282726de20a83efd5f2c58677f2c01f64a4733d81653e776074ef1a92ec67161aa5ba8ff0f3645b6df9fea
     HEAD_REF master
 )
 
diff --git a/ports/boost-lambda/CONTROL b/ports/boost-lambda/CONTROL
index 460510402..9cdda01cd 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.69.0
+Version: 1.70.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 d21189764..d9ba5ff5b 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.69.0
-    SHA512 6de7a65898b08ced82dc6ff0662d1373cedaa53f4aadb7a2c47f611fd67735ed8b88d539829047ce059c27404d33b119dea116661c0124a3445efa426da88f56
+    REF boost-1.70.0
+    SHA512 165b91102f0e344e4b3c58a6b1ead403613aaff9262d85fd8286640977aced9a9f1814e7cd8cd609769f6a15333aeb40b2aaa0705c2746e19b107283792a9e84
     HEAD_REF master
 )
 
diff --git a/ports/boost-lexical-cast/CONTROL b/ports/boost-lexical-cast/CONTROL
index 10a4c38de..3f4c4056b 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.69.0
+Version: 1.70.0
 Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Description: Boost lexical_cast module
diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake
index 2b975b3df..f203f29fd 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.69.0
-    SHA512 3cb8d3a300656b550d22959552e512369239a72336310678c13277f6f94fe29725c1645fdac4a0ff6035a2728e30baa3bd97e2e412d910eda2f882eb263fe3ed
+    REF boost-1.70.0
+    SHA512 20ff9790aa02177bb693a2c1bfd588725150a47cacb2d1048121982a6a2702e6dee30dcb3b4b3ae9c1dca269d144a08a085b0e229a9e2fbf0f7ae9b8ef25d31a
     HEAD_REF master
 )
 
diff --git a/ports/boost-local-function/CONTROL b/ports/boost-local-function/CONTROL
index 4ee73b1a1..a91ba6499 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.69.0
+Version: 1.70.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 b6c2696a9..d2b504817 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.69.0
-    SHA512 9bd3869a6abcaa0366adcb093dc13447b9402d4907b9df1433b74cee69651393a843e88ab16eb38f71c4549adef139796d43a55c28868b89415466f82e013ec3
+    REF boost-1.70.0
+    SHA512 7debd9d083fedd8446e98565bcc2fcab5091ba931166030143abef2351918f8a46a83a004b28e5ab4b413101052036424ec82d7b99428bc0e07660722e2c50c4
     HEAD_REF master
 )
 
diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL
index bbe8232ba..218b75c97 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.69.0
-Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
+Version: 1.70.0-2
+Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
 Description: Boost locale module
 
 Feature: icu
diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake
index 794c4e507..8643ce7ef 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.69.0
-    SHA512 64f738c10f35627a0949e5fa37743374f6d6644c05372d5b019468fc0273e13c024068462961376a663168ee29e7abb2c9c9c07078fc5797bb93e0b15baef2be
+    REF boost-1.70.0
+    SHA512 38ae2619d6b63239930e04f986a2bc06bd3c5ab6e13d7825c2b6eb29eb9eb2f52d74546774b9eb0ba3a4e68a4d404908386794282c2f467e8b01baea8f24fb42
     HEAD_REF master
 )
 
diff --git a/ports/boost-lockfree/CONTROL b/ports/boost-lockfree/CONTROL
index f389e1ced..9a362826f 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.69.0
+Version: 1.70.0
 Build-Depends: boost-align, boost-array, boost-assert, boost-atomic, boost-config, boost-core, boost-integer, boost-mpl, boost-parameter, boost-predef, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost lockfree module
diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake
index e3800b3ad..99330838f 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.69.0
-    SHA512 e0ea8c20973512d173bb1ef15c5e8b7f946b346ebcc2040283945d0db663a8afd61b854290670cc3d281be516c787af7eb2dbc310b20aaca610ba38888062eef
+    REF boost-1.70.0
+    SHA512 565539cffb0b688b02cb86b750fb9854e0d0f7a34c5dca859d5965ccee8512c5e6db493e8f7bcdf3c58b3ec2730852ad79089e7717183f358b07c0c743186c5f
     HEAD_REF master
 )
 
diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL
index 57dd3bb14..211cd892e 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.69.0
+Version: 1.70.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 1e52fe3cc..968508e9e 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.69.0
-    SHA512 d6ce7f8cc1ce2aac89adf920131b02197f37ced2d0f059a9353dc21770e34c539bbf771208f6ed293039cddb363b948b6ad4956f2819ed49478537a9305dba54
+    REF boost-1.70.0
+    SHA512 6f1b2a7692ece60abf94cdc340cc2b5b2a6c4ebeb80c4092b7846a7670e19db174f7c0df02640469e07e916b5d37448c73c73bcb14bb1632c26204a0a1274e1a
     HEAD_REF master
 )
 
diff --git a/ports/boost-logic/CONTROL b/ports/boost-logic/CONTROL
index b6797de7b..4bac34876 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.69.0
+Version: 1.70.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 b16b1817c..41fb1432b 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.69.0
-    SHA512 521144c4095b73fec427b8d424e8632de2795c9b34c5dd928499f2958a72d84f4ddaf20aa1a615ff1537506c7e088a45a1e4a7e17a9db9ea309309657e83b9c4
+    REF boost-1.70.0
+    SHA512 6cf4e2fa0c63de2c226a2f57ed57d07ab73cc359ebf23711b636badb9a6924992ea9edc0f9bfeefd15531ca2d06bdb3667b49bcc2f9deec64af6eafd52e944d5
     HEAD_REF master
 )
 
diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL
index 244fc4e99..9fb6605b8 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.69.0
-Build-Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.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-multiprecision, 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 f4adc4d66..8938bfe9f 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.69.0
-    SHA512 9aedd1d8e875d2c5ddd3e7feaeeeaf0524ee7111a26634559548f33f99d190ba33623951c781271c600880dbe8cf36d4b7f4c2212a6ec2c3804d488dec61c642
+    REF boost-1.70.0
+    SHA512 5573dc445196383ddb622514b5ea645076e1b2b94165d885c7c8924fc5d469d5f1c030817b36d9e7be78b47785a69bbcdac2da8f88817f1cd33ff47ded33dc70
     HEAD_REF master
 )
 
diff --git a/ports/boost-metaparse/CONTROL b/ports/boost-metaparse/CONTROL
index e5b51a0ff..003fbb359 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.69.0
+Version: 1.70.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 15e02b1a1..13274cdde 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.69.0
-    SHA512 f2720f51ecaa67a61f43eac0112fad40f67ab3c6fef431adb012f644063a10c9870b85f3accf35b09bf163cea59715e25e06cb93d0ba6c9769c44cebc3205b68
+    REF boost-1.70.0
+    SHA512 dd8883843be1a6e3dc8368b13081fc3451de0ed85985cf752858d80aa62e0846b4687c16a6aa1b6dc1e5e30d0603168c48197f70f031cf21586ba729352f0f09
     HEAD_REF master
 )
 
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index df109c57e..cd5f46115 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -158,9 +158,12 @@ add_custom_target(boost ALL
         threading=multi
         threadapi=pthread
         debug-symbols=on
+
+        stage
     WORKING_DIRECTORY ${SOURCE_PATH}/build
 )
 
+set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/stage/lib)
 install(
-    CODE "file(GLOB LIBS ${CMAKE_CURRENT_BINARY_DIR}/boost/build/*/*.a)\nif(LIBS)\nfile(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\")\nendif()"
+    CODE "file(GLOB LIBS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.*)\nif(LIBS)\nfile(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\")\nendif()"
 )
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index de02dea1d..c72ccb307 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: 2019-01-25
+Version: 1.70.0-2
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam
index d85c8d662..7721973a9 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.69.0 ;
-constant BOOST_VERSION_ABI_TAG : 1_69 ;
+constant BOOST_VERSION : 1.70.0 ;
+constant BOOST_VERSION_ABI_TAG : 1_70 ;
 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 8daa3265e..93e4b457f 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -40,8 +40,16 @@ function(boost_modular_build)
         set(BOOST_LIB_DEBUG_SUFFIX -vc140-mt-gd.lib)
     else()
         set(BOOST_LIB_PREFIX lib)
-        set(BOOST_LIB_RELEASE_SUFFIX .a)
-        set(BOOST_LIB_DEBUG_SUFFIX .a)
+        if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+            set(BOOST_LIB_RELEASE_SUFFIX .a)
+            set(BOOST_LIB_DEBUG_SUFFIX .a)
+        elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+            set(BOOST_LIB_RELEASE_SUFFIX .dylib)
+            set(BOOST_LIB_DEBUG_SUFFIX .dylib)
+        else()
+            set(BOOST_LIB_RELEASE_SUFFIX .so)
+            set(BOOST_LIB_DEBUG_SUFFIX .so)
+        endif()
     endif()
 
     if(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile.v2")
@@ -221,6 +229,8 @@ function(boost_modular_build)
         list(APPEND _bm_OPTIONS address-model=64 architecture=x86)
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
         list(APPEND _bm_OPTIONS address-model=32 architecture=arm)
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+        list(APPEND _bm_OPTIONS address-model=64 architecture=arm)
     else()
         list(APPEND _bm_OPTIONS address-model=32 architecture=x86)
     endif()
@@ -232,7 +242,7 @@ function(boost_modular_build)
             find_path(PATH_TO_CL cl.exe)
             find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "${PATH_TO_CL}/../../../lib/x86/store/references" NO_DEFAULT_PATH)
             if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND")
-                message(FATAL_ERROR "Could not find `platform.winmd` in VS2017. Do you have the Universal Windows Platform development workload installed?")
+                message(FATAL_ERROR "Could not find `platform.winmd` in VS. Do you have the Universal Windows Platform development workload installed?")
             endif()
         else()
             find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "$ENV{VS140COMNTOOLS}/../../VC/LIB/store/references")
@@ -251,10 +261,8 @@ function(boost_modular_build)
     configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY)
     configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)
 
-    if(VCPKG_PLATFORM_TOOLSET MATCHES "v141" OR VCPKG_PLATFORM_TOOLSET MATCHES "v142")
-        list(APPEND _bm_OPTIONS toolset=msvc-14.1)
-    elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
-        list(APPEND _bm_OPTIONS toolset=msvc-14.0)
+    if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.")
+        list(APPEND _bm_OPTIONS toolset=msvc)
     elseif(VCPKG_PLATFORM_TOOLSET MATCHES "external")
         list(APPEND _bm_OPTIONS toolset=gcc)
     else()
@@ -349,7 +357,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_69" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
+        string(REPLACE "-1_70" "" 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 8b0181ef4..c8b221057 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-static-assert, boost-vcpkg-helpers
 Description: Boost move module
diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake
index d13e4df9d..a36d02705 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.69.0
-    SHA512 c7cdc3d2452c4399f1e2f128e0d2e85c79ab5e4f45abee79b8fdd2e8df66e92974f6fa29e71e16e609fd69b5b9611a7d51ebbdd12af8af71d3cff6405c301f99
+    REF boost-1.70.0
+    SHA512 09291516819adcfed88c490607a865c6ef4beadac9ee4f948bab90e8fc4f04d958de4601ffff1c9da19793eac6de68b0dd5dfa541cb6a5182d9246d5b06d80d4
     HEAD_REF master
 )
 
diff --git a/ports/boost-mp11/CONTROL b/ports/boost-mp11/CONTROL
index 248956845..ca170f489 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.69.0
+Version: 1.70.0
 Build-Depends: boost-vcpkg-helpers
 Description: Boost mp11 module
diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake
index e9494bd22..e0979c6a2 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.69.0
-    SHA512 61ea485a6d325cbb7e728a4a3725d88db4d0672c092bc3aef442be6ef1f7535db6c107fe2a582a2c69bb81b927a32fab61e6d400a7b748e5d202cb3c544e99d4
+    REF boost-1.70.0
+    SHA512 d09415d5c69a1960c8af3c3e63a61aef62d2a35f00fe42e8dd8ad3eeb2f13eed48e0710485f444e79cfd7ab2fa3f72535e01d9b97337c89328b961fa20aeb047
     HEAD_REF master
 )
 
diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL
index 9f0d77592..b5b194de2 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.69.0-1
+Version: 1.70.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 ce760fab9..76a92ac7c 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.69.0
-    SHA512 4adda4da59b49f73a4da70fe091027046964191eeb24d29a16f027b3273ba5ac9e0552061cba15ded70db4839f7c8581c26f2b9dde16c2abfabb434fdbbcc106
+    REF boost-1.70.0
+    SHA512 be8c7abd31335b7290969179d95525855b11f79cacda0ee6d42d8fe130cbeec0768a8418b59ad1ad54c6e36a445622bd289aaabd74de297f576c70c90a871d7f
     HEAD_REF master
 )
 
diff --git a/ports/boost-mpl/CONTROL b/ports/boost-mpl/CONTROL
index a802cb87d..134fc468d 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
 Description: Boost mpl module
diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake
index 095ff4f46..e33bcbfc7 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.69.0
-    SHA512 eaaaa930246f277bc4194319094356927e0d100048158f3335087dff681e4535bbdddf891df8db8c51ed209137d93c6f0f951a3dbe0e7c846c483c643dd3096a
+    REF boost-1.70.0
+    SHA512 3691a6ff9e31d8c7ee3010e2c3a6d806e02e2e71ff05e422bc7c17cf774a0a8ceb650f315bd8939275529f0c24f19df3efcd31b677894ea2c1af251b9ab20b3e
     HEAD_REF master
 )
 
diff --git a/ports/boost-msm/CONTROL b/ports/boost-msm/CONTROL
index b3a91b3bf..a3a1749c5 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.69.0
+Version: 1.70.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 1c3fcf1bc..16ec20b85 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.69.0
-    SHA512 0dcdd9dbc76844d2eb5f98081f2612ab4bb0f2480f6912be5daff9fa601fbc065b4e187ae3baa9ee81f1aab31ddc561d645a70a44edfed314775b8e051ba0614
+    REF boost-1.70.0
+    SHA512 3e91a5be7bf9018c411902ebc6dd1c576a17f7d298ac3694073c12a003cb872fbde4756fbfb113d60d39dad6f683749cef26e21758c96967b06c34f31410467a
     HEAD_REF master
 )
 
diff --git a/ports/boost-multi-array/CONTROL b/ports/boost-multi-array/CONTROL
index 90aa03fbb..96721b8c7 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.69.0
+Version: 1.70.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 7492500b0..5285174aa 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.69.0
-    SHA512 f8fc2648333eecbe97c16560182b26e6e8f44299ab75d09fbe34ed45640dbffba7cd0a7b1fce33bdc8a0f49b611d2269bff74936082ef412628e7341c16ee423
+    REF boost-1.70.0
+    SHA512 16e0468e94d8691d6b808364c3b75063f0f0b5b27495bad9cd8fc8029b72bd272b23d82ad6003c8ab4ffc1fef8aef6871c3492c639ab0628130eb7e72183235e
     HEAD_REF master
 )
 
diff --git a/ports/boost-multi-index/CONTROL b/ports/boost-multi-index/CONTROL
index 64c284ed0..2abdffb00 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.69.0
+Version: 1.70.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 75129391c..f928aaec7 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.69.0
-    SHA512 c8cc6a523941c810397165b59f3ec4855319495aecdba05671de3df3b709749a551bafe5277bbf7162f4fabf3a1ce35a3ecef4783e58733ec482435c6cf05433
+    REF boost-1.70.0
+    SHA512 2068a3f7b493dcb5d3658e6c5d0134bd8009c90bea590fa97cc78d5b86386cfa42bb98a30b06c85270c2440ccc9aa092ec78fb9227bc9c90ad4e2d7480773e32
     HEAD_REF master
 )
 
diff --git a/ports/boost-multiprecision/CONTROL b/ports/boost-multiprecision/CONTROL
index 86644fd6f..2c3783254 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.69.0
-Build-Depends: boost-array, boost-assert, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-predef, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-array, boost-assert, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-mpl, boost-predef, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost multiprecision module
diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake
index 4d3a34e6a..f6d1a3b5f 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.69.0
-    SHA512 845a8e5aea10627fb9412ccd4aea4aa8315db00dd07d3b432a6574e6bf0d68574a69e98ae26591ebb47f45d98df9bea3b2392552ec23de8d18f068288a6b24c3
+    REF boost-1.70.0
+    SHA512 a583b0df0855146ad0ee841cfc9ad646be89b38cf0d895d9ba69f4e5b2013887343863678bfbaed055b55c54d2ebe4026dc38f2dc021b8c7f9f18bf540d9189c
     HEAD_REF master
 )
 
diff --git a/ports/boost-numeric-conversion/CONTROL b/ports/boost-numeric-conversion/CONTROL
index 824d164a6..9f73c1b57 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.69.0
+Version: 1.70.0
 Build-Depends: boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
 Description: Boost numeric_conversion module
diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake
index db73afa20..8a71be47d 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.69.0
-    SHA512 5b39ffc0eb4589483540ea49ea72ab86ae4f12b9c7a1e0902c1bf0a86e2f79d14b4cba107ae18c8390e69e0e4a83b96d4fddfba17ed6372821abd85052003b03
+    REF boost-1.70.0
+    SHA512 05a936bd820c40a9ddf84f5c05790aa13191ff00ab2232a046bbef11bc0adb0eb60ec630ab9397ca841d7b12d74a74ca2c7b53c33780db8e9607b4b757fd901e
     HEAD_REF master
 )
 
diff --git a/ports/boost-odeint/CONTROL b/ports/boost-odeint/CONTROL
index 8a96b34d8..840af1954 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.69.0
+Version: 1.70.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 a8bad4df7..91b9ce949 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.69.0
-    SHA512 058f4554fe2a573ef489ea4a7262078ff2c9d1682e389089f04d601c67feba6d258028f1be1715711d0302d33614aa8e04ad781ffcfa0c427f418b9096c53b90
+    REF boost-1.70.0
+    SHA512 1edcd84ee3f9bb8a421971285fe18b6b30af720042f80e87d6178682bb2ec7163185be08e7648f2bb944562f9abafe8bf34fe520412b7f1bd02e7195670c964b
     HEAD_REF master
 )
 
diff --git a/ports/boost-optional/CONTROL b/ports/boost-optional/CONTROL
index 1f2ea069d..7ed366b76 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost optional module
diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake
index 11c3b5b68..cb2556c23 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.69.0
-    SHA512 0bf1520af676a3f1fc34a074f8029018a9353fcf21dc3a3c895d2d3dcf68a2ecb0eae22e2edb9f687cc70e228c24f31a531b91b3d8160fa0559b9411401da64b
+    REF boost-1.70.0
+    SHA512 739fea7e373aa651268db2712cc2fb4ca18dce8c93626aa05f89657ae89b16ff755c1994d336ec7e72991120b01c9fed0310591cf78dc25c02bf42ce2b947a67
     HEAD_REF master
 )
 
diff --git a/ports/boost-outcome/CONTROL b/ports/boost-outcome/CONTROL
new file mode 100644
index 000000000..c97930c08
--- /dev/null
+++ b/ports/boost-outcome/CONTROL
@@ -0,0 +1,5 @@
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+Source: boost-outcome
+Version: 1.70.0
+Build-Depends: boost-config, boost-throw-exception, boost-vcpkg-helpers
+Description: Boost outcome module
diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake
new file mode 100644
index 000000000..c715bafb0
--- /dev/null
+++ b/ports/boost-outcome/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/outcome
+    REF boost-1.70.0
+    SHA512 7741d0aca8dd352a530f3b6a6878de492b5aca7f3ade7a86f17fa971dc054616dab0bb10c8d304a298b3e065ca16ab7dcd192d0fec4aaf237ed391390a93a0a8
+    HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-parameter-python/CONTROL b/ports/boost-parameter-python/CONTROL
index c4da4f4cc..3f047968d 100644
--- a/ports/boost-parameter-python/CONTROL
+++ b/ports/boost-parameter-python/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-parameter-python
-Version: 1.69.0
+Version: 1.70.0
 Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python (windows), boost-vcpkg-helpers
 Description: Boost parameter_python module
diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake
index 284476775..e29f53f51 100644
--- a/ports/boost-parameter-python/portfile.cmake
+++ b/ports/boost-parameter-python/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/parameter_python
-    REF boost-1.69.0
-    SHA512 1a50243b3f527a6bfd95964053e0c0624c5bd859d037770e0c41c4158b4ae4d0da6bcf493759b6cdd66cc08ee9c6c5d82fa4173f67b2a20f9715e2f30f90e6cb
+    REF boost-1.70.0
+    SHA512 d2f43ca744bedfdeda806c0d1b24216f4926401059450d12485dc2175e8731991476c1bb530d28c631d9bc034c7ce184b62daffe0c3a6449fc619ff5e3e4e2cb
     HEAD_REF master
 )
 
diff --git a/ports/boost-parameter/CONTROL b/ports/boost-parameter/CONTROL
index 01ec570d1..bddf7d0fb 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-detail, boost-mpl, boost-optional, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost parameter module
diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake
index 1e569ea28..d3ba3c0e0 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.69.0
-    SHA512 08d4397c3edd73a0d1e0485540846cd4d7b537d9046cf08ab841ae323de85d6df9a8a132d5204f514ff0d1d1b41047d63261875fbfd30ca1b1f9b3b0f93c6c81
+    REF boost-1.70.0
+    SHA512 a923427630563ebd77c0cdbbda37a4288e375f2ba1315a5596e8711b8854fb23e6984e88e1108b44cf6a909f6f8acc80867a34f86aed7ea6a18dbd766a93cc1a
     HEAD_REF master
 )
 
diff --git a/ports/boost-phoenix/CONTROL b/ports/boost-phoenix/CONTROL
index 33cd2bb96..0eefaa0d9 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.69.0
+Version: 1.70.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 3493ab0cb..eb5f0dffb 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.69.0
-    SHA512 e07e678fe7373ec33f331fecefb3951b5b6adbed0e2d9f22148a9d75327c1194c45ba2f0b403ba2978040400cd6fb0f604686ca77c48a2c3878c9e7d15ea33dd
+    REF boost-1.70.0
+    SHA512 d8e42ecd1e93fc3e48a1b1f0de9d2054f73e5d591da71af09f664b94edfa612ff377c20d2d913ed3790bca4d5ff74d176c50e298f979c88e5db5bf80ea239f2d
     HEAD_REF master
 )
 
diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL
index a45de2679..763d6ac19 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.69.0
+Version: 1.70.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 b2849bf72..9119ffba5 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.69.0
-    SHA512 636f406d1ee0e7f6612ea285d745fc64137fc7b499efb8e852933747a69cc0efbb41b2643514f5d264ea7df087fb950e8f77b433645847b785e376c729c1d098
+    REF boost-1.70.0
+    SHA512 c3ea37138000ed584ab1cc17441be7bce0962e542b9cf2af6cf3c76d78a9905e42d4ab6c32506ff7dbb44a25e8def60223c6075bc4b39e523d9c0b9fbf6cabb3
     HEAD_REF master
 )
 
diff --git a/ports/boost-polygon/CONTROL b/ports/boost-polygon/CONTROL
index 1a588f66d..026765118 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-integer, boost-vcpkg-helpers
 Description: Boost polygon module
diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake
index 46d0062dd..a8945fc3c 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.69.0
-    SHA512 4cd1a3a9856322f475cdf3d4643043143531cf78b9f951d7b533bbfcab38df1dfa55d2326a983dcb7c88635efe72f878215280532dcf47c6cee755bcdfe50f2f
+    REF boost-1.70.0
+    SHA512 c4d07fc5a419442e614376197611d131ae05cb25127bb3e300e0e9eb5c1336b2bae99522460b69a61dfd05e5e4785cf9b0a33b61fa199c738a9e16cbde3c34d7
     HEAD_REF master
 )
 
diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL
index 888b0cce7..3d6c00d2b 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Description: Boost pool module
diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake
index 23d73e65b..72c3df4e0 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.69.0
-    SHA512 b3fad5e548912a485599ee3e1db1989848dee84d5376fd9eda00d63044a6c10deb675a20518ac7626932770350015cdbe4e82cc74ee570edb8abeba85628b832
+    REF boost-1.70.0
+    SHA512 035a8fb9a0b4f4983a1da755182183ea636da4a87c58c9a9aa0e5b7f52eb4ac72c089cb34ca217a3bb7feb8475d3aafed78a7ab910078c11f4db5740809fe290
     HEAD_REF master
 )
 
diff --git a/ports/boost-predef/CONTROL b/ports/boost-predef/CONTROL
index 256939088..8853e304a 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.69.0
+Version: 1.70.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 9e5a39d8c..489c5b7c7 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.69.0
-    SHA512 0fadcf5e36fe83d777843d3a02c730a7f4af06cff52700ef032b196805307d92e4e8665e6387a4d4b1d046d76fffefd980c1208c8f3bc556e6d4d7bdeef2b7ee
+    REF boost-1.70.0
+    SHA512 2ff61f1beb2745151f64b2d63c0eedd5edad885c9561abde6464c470bc8b79ad5b61c9e949992ebde3ce877db0c24760cedacbdc87e86ca11bf5b0f2ca5fbeb2
     HEAD_REF master
 )
 
diff --git a/ports/boost-preprocessor/CONTROL b/ports/boost-preprocessor/CONTROL
index 276c211ae..0d90c853b 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.69.0
+Version: 1.70.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 202454897..712b4a73b 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.69.0
-    SHA512 33366ae1f998644ef9d151037598facbb832cfbacad07c15a5076b61d9d1f7f2d4e0f45af0e87a437af0b43b134f88392aaf697f0144c838b7c6ad274d0f8fd5
+    REF boost-1.70.0
+    SHA512 e5a0b7995e2be1aade07cfa0543d28cb90ea3704c745adb6db6095332150c588d48260c47990ba38f8d860d2964b87ef023f4958c6b67f9102e8bb877e1de95f
     HEAD_REF master
 )
 
diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL
index e07261e05..684f32338 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.69.0
+Version: 1.70.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 8c8c53218..353b8d648 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.69.0
-    SHA512 f01bfad34458fd245785efa12c070f8a21565698a181b55418f19e0ca948f219be6339ad9e43a0bd87a782ecca92e212671081dc18f7c9699e9b984e0e85d4e3
+    REF boost-1.70.0
+    SHA512 6265e0705e89ce2a9b3a0df212db76dd309a8bee905249070f0ebc3449207cfc9e30fa6b73dc1de83752c97a95dd214f9e922c87c0a5b03e7df978645620ea62
     HEAD_REF master
 )
 
diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL
index cd62877f0..51796a46d 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.69.0
+Version: 1.70.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 2d5308f8c..be596617e 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.69.0
-    SHA512 02a469c0746cef85b2493b46cfa62da87dd2134af33a874d103e6f225577c74264781c567010f2aeaa4a3c8632d1856e107575230c9c370c22e75e2d78c751ef
+    REF boost-1.70.0
+    SHA512 1a7aef92a0f3de1769a1cb4cee86f47d3278c723bc2203d0db96fc3ae6b7b15c47f22e61375e670a4cd40ca74eea32356e5768ca4079926b1e56cba9fcc6ecc5
     HEAD_REF master
 )
 
diff --git a/ports/boost-property-map/CONTROL b/ports/boost-property-map/CONTROL
index e9bcd373c..82f22f739 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.69.0
+Version: 1.70.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 ba2881c75..4200bb4d6 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.69.0
-    SHA512 6712f57133e12db2e094dae1895fedc995168c54b74052c02355f13164ea71ab393dbac1fe5f8236188a3282a30a91c39ee5dde4328b4e986f06da4bb3d0f033
+    REF boost-1.70.0
+    SHA512 b4c9ab834ce9c3f09105e5814734fb16f2f4061331427904c04dbcac64ac91ea76c2edb3d63e036c5ea3dac699c1da247cbe8861380020373cc64eada9491990
     HEAD_REF master
 )
 
diff --git a/ports/boost-property-tree/CONTROL b/ports/boost-property-tree/CONTROL
index c7398baa5..9856fa6ff 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.69.0
+Version: 1.70.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 856597cef..ea8432c7b 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.69.0
-    SHA512 4f0ccacbddc0bc6685a7234dcc80c10134e6e6beb872128d90246d5e9402f5e48ec26da8895bbe2d760e110256db9d16bde3dcccb59d1014afc9bf6970d48bab
+    REF boost-1.70.0
+    SHA512 872aa8e7869048b04bc3714b3a50f13aa17c90733d22ca7585c4c0fe237c922a72018023a5a9d6ce6a9ea00c0dbd5cd88d3115f02d39a8b5ed3e110e2c7a03d5
     HEAD_REF master
 )
 
diff --git a/ports/boost-proto/CONTROL b/ports/boost-proto/CONTROL
index 7aaaaf15e..00b2ca8d4 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.69.0
+Version: 1.70.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 5dc43fc70..1d6a0594b 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.69.0
-    SHA512 54cdc0f1350ac38388ba45bcb33bca3736ebe32214e6cd8c06a3a7471b0ede697ffc4124419ff13d93af667f728bb1713e5dc92c8a8dd1e28e9c526e3ea36ab4
+    REF boost-1.70.0
+    SHA512 63976484ce6895818715d4fa0073e526fca654a42a0353c1af66928faefb3764b0ec644f7876f38188ed7425cc3b75cb155cd75f1241fb2bb33938bb964a3ebf
     HEAD_REF master
 )
 
diff --git a/ports/boost-ptr-container/CONTROL b/ports/boost-ptr-container/CONTROL
index e86decd35..8250e74e5 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.69.0
+Version: 1.70.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 3cf955911..b61514cc8 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.69.0
-    SHA512 6df58700545067232139b2088e6abe28268a0a158f6827327ad243d616191b11097b9c6bed8705206ae5daa672555f3ed5c11c20352dc95f2c54aacec54d820a
+    REF boost-1.70.0
+    SHA512 b61e6b8d52d33d783163d8cad1aaaa1b092fc74b5022de235ab01fadab119c9ffb09f0d6a43f9154997b5cc12f60379a50e70d4ac65319eea965c6c6fea322a9
     HEAD_REF master
 )
 
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL
index 236c94c6a..f088b8ec1 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.69.0-1
+Version: 1.70.0-1
 Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3
 Description: Boost python module
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake
index 06b739663..912926d61 100644
--- a/ports/boost-python/portfile.cmake
+++ b/ports/boost-python/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/python
-    REF boost-1.69.0
-    SHA512 7ca3210a35ac43eae31c58d7ccd58e6410ec0d62a25ae7a03fb2db9baa4cf863fbaad1686c6ceaf804663c5707f6e60b4806f792f0aceb5c12a85b705d4242d0
+    REF boost-1.70.0
+    SHA512 0e540f68713460c64f195f56af1cbd00ae4fa98adc91a83a0c1fdb7e60950cf282cab02b772f06e7c268c3cd294566d6abfa1d1aa545c687a256d6863870f72d
     HEAD_REF master
     PATCHES unwind-type.patch
 )
diff --git a/ports/boost-qvm/CONTROL b/ports/boost-qvm/CONTROL
index e076506b1..7b338b30b 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.69.0
+Version: 1.70.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 2a9a48d31..a677cde90 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.69.0
-    SHA512 b801ce8f2e96364fbafa31d1a501706a81d57b7d6f2c0ce63c4ca103957f8a4504eb1797fa96e812dac032e4972b18bc973e8a4bc24cfb38ac3a367dad75b4f7
+    REF boost-1.70.0
+    SHA512 ea777d15e35dc22057e6b3a6b95204bade5592ded3175a0462c497cfd2e204dcbbb564ab5d8b99adf38bdfd4f41ce0443af9cc82f863d1977068222880ef5aab
     HEAD_REF master
 )
 
diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL
index c89a37d88..f1af030cc 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.69.0
-Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-dynamic-bitset, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-dynamic-bitset, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-multiprecision, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost random module
diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake
index 3024a3317..9c426b5ef 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.69.0
-    SHA512 13875116f5d4fd18eb3ec8b9e09bd1381bc0d5ce533552c555a233380ea91139b7b9e24ff7788c495c2838a3ab9efd400f627d86b09a7b176e2e63ec61d5e6d1
+    REF boost-1.70.0
+    SHA512 887c12de1235dd9ba5a211a23f6da6def14b0100060f94855ac187528a90cbeaf9202298476380ce436634b573f755820e32350f3af2436dddc14f94744c49d2
     HEAD_REF master
 )
 
diff --git a/ports/boost-range/CONTROL b/ports/boost-range/CONTROL
index 98735fddd..8ba112604 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.69.0
+Version: 1.70.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 394292b95..5c6334c21 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.69.0
-    SHA512 948a2ed81fa0d3b92a40f5aa51b564e221c06e0d5111cd346ebb2d11de96045a880f373befccf0ae49317f7c03f1a93813f530d4e1a5b9b016fcb1fa14664085
+    REF boost-1.70.0
+    SHA512 f6945ca391a577f6265d651cbcfd183e544b42db37a7fa21899f457c1ca94045865ce71ab9e0171a9aee3451575c18668b609da892d7676f2d9321e5db979371
     HEAD_REF master
 )
 
diff --git a/ports/boost-ratio/CONTROL b/ports/boost-ratio/CONTROL
index 7eed485c7..38abf0e8c 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.69.0
+Version: 1.70.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 fc6174fec..900a861bd 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.69.0
-    SHA512 c52acdde2a8b523f98294a77ad61411fb017dc30cf5232f872581c665fca632dae6955c5869240865f2f0868a96d3d25445506bcd7832a3a5def96ded771b3f8
+    REF boost-1.70.0
+    SHA512 0952107943f975644a81c2bf70c0a4c2580138a373d765ec9c037c33345436e210cc7f8f24fa2ddf0fe30cf7b25a592b8a62dc09ce95cd2326fef2647f355575
     HEAD_REF master
 )
 
diff --git a/ports/boost-rational/CONTROL b/ports/boost-rational/CONTROL
index 2ecdf706a..d117dae18 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.69.0
+Version: 1.70.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 299a9cdb2..fcb7f7027 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.69.0
-    SHA512 8115d3f45248918267e1f8630e62d2667302ca11957248a4b6377da58bb6c61b7a0f5e9c11b46133c860e19f90b862c2a466fb38e757f7f7fe88afae3e1ee3c4
+    REF boost-1.70.0
+    SHA512 b2b36bff63247d3456f4c0d298ea04eb285a283eed6278e71365b3b97c673e122e52608f143ec4fdcdb77d5bbda48326ce8785843f5458192054236330576a50
     HEAD_REF master
 )
 
diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL
index 18b331a48..d10267c3f 100644
--- a/ports/boost-regex/CONTROL
+++ b/ports/boost-regex/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-regex
-Version: 1.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-predef, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost regex module
 
diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake
index 1f6fa035b..54cb58dd5 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.69.0
-    SHA512 7ca27b7585ea3627117275711a29c3ed2a5882e0cad7028ccdf63fbd09380807ffa9e344705ea86846b75f45b85f04ad7cc28149c6ba61579684fd6f9febbd48
+    REF boost-1.70.0
+    SHA512 691608b794a8ed293afe8d7d31fc6cf0ddebd3c850467c33e7572f1a22080b1407aa1c157631abd6e9a3eea0b8c9d6ef477dde1e39e8859d8d8fdd73b98fb301
     HEAD_REF master
 )
 
diff --git a/ports/boost-safe-numerics/CONTROL b/ports/boost-safe-numerics/CONTROL
index 5eb2449ab..00e9cd754 100644
--- a/ports/boost-safe-numerics/CONTROL
+++ b/ports/boost-safe-numerics/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-safe-numerics
-Version: 1.69.0
-Build-Depends: boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-mpl, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-vcpkg-helpers
 Description: Boost safe_numerics module
diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake
index f3c41c5e8..506b5f40b 100644
--- a/ports/boost-safe-numerics/portfile.cmake
+++ b/ports/boost-safe-numerics/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/safe_numerics
-    REF boost-1.69.0
-    SHA512 708f23d304402671466c24a3c8acb1fd497799eb1c97d314c5ed78712d3906142f3ad5442e159cc304ace46b1e761b920bbe454ebf80df46127be78e98f25f8b
+    REF boost-1.70.0
+    SHA512 b5babfddc56f404602a5c071cef5505d534e1503ab08e9b6acc8e6fe4ebc87b9ae4db71d9c71cc3dcc739d17eea81ac0fe639f442db347e219be1acf39e6c2ef
     HEAD_REF master
 )
 
diff --git a/ports/boost-scope-exit/CONTROL b/ports/boost-scope-exit/CONTROL
index 22ce65238..d72178eae 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-detail, boost-function, boost-preprocessor, boost-typeof, boost-type-traits, boost-vcpkg-helpers
 Description: Boost scope_exit module
diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake
index e60cd1769..46584e781 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.69.0
-    SHA512 d89d5793f1916218892e3a9c2b4b59d637a613a053be09a9f4b74d73413f98e100868ddccbfbcc7d42af154757836532a16d5301fdd9ac6878d94f8bb9ac7a0d
+    REF boost-1.70.0
+    SHA512 e75c746d0829bedf336acb1b4b36c8f2e75cdb650e8f0c18c3a1b3298e81efde643be941bf27cdb3855e9ecc1c6cd15e484c2e54529828ac1fd3b17df7f616c4
     HEAD_REF master
 )
 
diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL
index e82a3cbda..911fe0968 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.69.0
+Version: 1.70.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 240762224..c1545ef1c 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.69.0
-    SHA512 1db8a9db4a972625b76cbe41b35c4c68940b0b0c3caf8fc3108142df922e359af00533d4a2125a6899a68a9c18b3719c0855da63821b4158c253499d677bd753
+    REF boost-1.70.0
+    SHA512 1df374bb3acfffde289d919941302ef988096d59745805ab118d2a31f628ef2fc3aa778bfe1f6434c75ce1db777805c8c092febbec9cb2080e0ed13d05d22156
     HEAD_REF master
 )
 
diff --git a/ports/boost-signals2/CONTROL b/ports/boost-signals2/CONTROL
index f20771f5a..b6ac55cf8 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.69.0
+Version: 1.70.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 74fc65c98..4be1b4f89 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.69.0
-    SHA512 96be2cce707e433dadfd23766870d0b01b67e0d156e4178022eedb29928844964c632eefe1da359266180ec7b7bf5f6083f30baa06eb4eb0092078366e9ac4cd
+    REF boost-1.70.0
+    SHA512 4b8db8941f70a3092992da11c7056916017f76d13c6445d3af4abe5f46dca7d8f3dc5d69e669cad607295b40ec387f65a54464166761a3e7503c841eb8f1aeac
     HEAD_REF master
 )
 
diff --git a/ports/boost-smart-ptr/CONTROL b/ports/boost-smart-ptr/CONTROL
index 491dcaa37..d5167c231 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.69.0
+Version: 1.70.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 cf3d86cd7..26b10dc10 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.69.0
-    SHA512 b11e39bde74287c2c9b24ea2c9509fb2f44714ee75e876e8c2c5754cf8c1c7a8f42570f7084393d031b4347abb1ac9715c779c19ecaf5917abb53e368c1e5868
+    REF boost-1.70.0
+    SHA512 c8b25aea25a01b96783ce5f2a9ce066cc2894b236b6f82e45a80913f67a37d113f3ffc0a5bbfa601e951b0a4dde8b12fb69dc7b07e551a206e28e48f6a4bd89c
     HEAD_REF master
 )
 
diff --git a/ports/boost-sort/CONTROL b/ports/boost-sort/CONTROL
index 903d8b8db..1aec3ee68 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.69.0
+Version: 1.70.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 79a6b239f..759291d62 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.69.0
-    SHA512 70756aeed4d2b179835ae86a91993d18ee388035b107536e8ab78b32309984ee72151c4359d834722b7e0cfb02262a6f4a708d724e8d154518976589b6f3897b
+    REF boost-1.70.0
+    SHA512 c9665e63eea1ec58d0fd664710b42161613efcd7f4123b94a829f38d7e0fe6309687c5c188ffcbd4986803992b119d1a00d759b2cd0e62a1ce76295510fe605e
     HEAD_REF master
 )
 
diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL
index d6fa7c194..e70aedd34 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.69.0
+Version: 1.70.0
 Build-Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem (!uwp), boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
 Description: Boost spirit module
diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake
index 49e6b4b66..4c7e20274 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.69.0
-    SHA512 2a27761676401c697de19f847fc000c0dd0fbcfac98f48c18d82bf4a8ff33cc53f05dd7843f596ddbaf3a60497bfb8b08f66a7dd4ec034fa3ea8730e45aef7ec
+    REF boost-1.70.0
+    SHA512 333e675b2742c55071d517e8dee0251d36b75ad4a11a70b48c74d060899710eb10e38afd20e9d40f28a041c792000c43c11208abad676ff923ca6d4866170a78
     HEAD_REF master
 )
 
diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL
index 26932388d..05c714885 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.69.0
-Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Version: 1.70.0
+Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-predef, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi
 Description: Boost stacktrace module
diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake
index 66df0a916..5efef9a4b 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.69.0
-    SHA512 ba8de7c238b60104d3d5b7c720121c52f08b430293736a2ad7636fe361827c7bda61d111357436807a77cd5c1a2973abcc2fd5924bf0f74d85a2a258afad366c
+    REF boost-1.70.0
+    SHA512 154c9caf3ff24f2a5f1d0af1dd5fcbc5b0b59039b30b495dd788086d731530ea724da496f639d995b700cb0a0c8ef0b9d03b63271386e2fe9bc935ef373d1fa7
     HEAD_REF master
 )
 
diff --git a/ports/boost-statechart/CONTROL b/ports/boost-statechart/CONTROL
index fa93f1c6c..9266a233b 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-bind, boost-config, boost-conversion, boost-core, boost-detail, boost-function, boost-mpl, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-type-traits, boost-vcpkg-helpers
 Description: Boost statechart module
diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake
index aac983e0a..47b354ea4 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.69.0
-    SHA512 7f3f17be8efde4017666f7009c55b53036d94aa7db61f0be8634f891486f4ccb1157b2a4f0b7e8a45e8a1bbf6bc5f0f154c9e769344a810e374fc7ea96ae7566
+    REF boost-1.70.0
+    SHA512 4a19b927898427c696afe3f9ae8ab7845e34075976d41d6d3845a3e4ccf17d16e3b9d1057400022d131b4f0258aeea230fc24c80f2ec55cc72e44b9573280753
     HEAD_REF master
 )
 
diff --git a/ports/boost-static-assert/CONTROL b/ports/boost-static-assert/CONTROL
index 5abb78a89..b3ffbb5e7 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.69.0
+Version: 1.70.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 7e45459d0..71c111d3b 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.69.0
-    SHA512 66e7931bab7cf87ad70e463f7154714d88cccf45b32c40adb68ac3af386158220d148df26beb2fc2f111e5cbc443744e32572e8ef26f279c3e81634f0d18ecf6
+    REF boost-1.70.0
+    SHA512 712f47459f97892cb3dc0b366c198ceee2f57e10f2986e9bfef087448fe3b1de988ccad9222c0f21a42db757975d9714a79d58f1e5092af1daaf777887be703b
     HEAD_REF master
 )
 
diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL
index 344927735..d83a45a42 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.69.0
+Version: 1.70.0
 Build-Depends: boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-vcpkg-helpers, boost-winapi
 Description: Boost system module
diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake
index fe1699d66..96fe08461 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.69.0
-    SHA512 64f49a8f2484e3a539a922d66ce05ece9d0ea214c3b1ddf66487ae4201d2a6050ef39da8b1f7dbdb48fbdbc04a1446df0f03cbe8fb85729fcf8b70f066c92053
+    REF boost-1.70.0
+    SHA512 3ad8ee46b99bab77b2ec3cb70ad01ae56156361fd1ad9c54b36b059a19e3c523d222e556e23ec71a80db2d095d4e37bcd7dae7d0745b5eee6e85b6bf121be4fe
     HEAD_REF master
 )
 
diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL
index fc4602edb..9d86dfee2 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.69.0-2
-Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.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-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost test module
diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake
index 2b165347e..a949d2a6b 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.69.0
-    SHA512 3a265dc888d749ec1aa5cd13889963b19705d7dbe4092941d8943d3f84a82fc67cee9c3e49cecd9769229b9adea1f09b45a7f4a494cca73cf894a402487ea621
+    REF boost-1.70.0
+    SHA512 5efda970fe5530ecb92a609f2aabb486c5a790206004ed72d4e854430a957d31ef016670b21be773aedaf80a203a18945febc1f8d9fdf9b55dbc05196fcbf450
     HEAD_REF master
 )
 
diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL
index 0bd043a56..a21747a08 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.69.0
+Version: 1.70.0
 Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Description: Boost thread module
diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake
index 712f1e310..f17812eb3 100644
--- a/ports/boost-thread/portfile.cmake
+++ b/ports/boost-thread/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/thread
-    REF boost-1.69.0
-    SHA512 4315662f1592e1f71a1b1a4a502c61df759a4993a376eeb61b5f01a18f4099379ad12989242ccb7d20029b7538b2629e11e707afe10d7fd721e6005c5eb25c56
+    REF boost-1.70.0
+    SHA512 2c29fc8f1ff805f126f162865c8bad51f8aa56942d54999fe0191bcf4bf8f472c070d7977e731ceb6d46ff9d0e6d39013a3df79bfe8f4ed4631906cd26c8537a
     HEAD_REF master
     PATCHES avoid-winapi.patch
 )
diff --git a/ports/boost-throw-exception/CONTROL b/ports/boost-throw-exception/CONTROL
index df3e41f63..b6cd1641a 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.69.0
+Version: 1.70.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 36c4fdff7..c3841366d 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.69.0
-    SHA512 fc9fa9eef9fba2e290598ff0469279f0eaba90918f62d1006837c415a5c49f45ff1b57852b9f03571047f075582498f9c114e7552b7f0d0b8f6edbabb890cc11
+    REF boost-1.70.0
+    SHA512 2b95ab70b141ea077c420c2fd6e139851aac6e6ccfb8a6772e7492066d3746f492f268a56ea79b2843e2631444d0a8dceba4551d98a3e315ef86017b307585fc
     HEAD_REF master
 )
 
diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL
index 6979036fb..271674b03 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.69.0
-Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-system, boost-throw-exception, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-predef, boost-system, boost-throw-exception, boost-vcpkg-helpers
 Description: Boost timer module
diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake
index db0933381..805efc619 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.69.0
-    SHA512 cfa6a8976b2b91ade5f22c8e8e37cbf687bbfc5bf2904f652287188a903bb1c25f537280a61293141436b71bb1bf0df1e14615948e76571ebf4d3b98fcb9470a
+    REF boost-1.70.0
+    SHA512 d00d5637b420346d65530a2d6df43cd91e6ac222fd4710ee630bdcede5e00ea4b30a20aa2f9181244530a6f9a434b8421208f5936a0dddb9386d9105b4594263
     HEAD_REF master
 )
 
diff --git a/ports/boost-tokenizer/CONTROL b/ports/boost-tokenizer/CONTROL
index 0ce98025a..b223b9231 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Description: Boost tokenizer module
diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake
index 225fcbe21..5c0fccb26 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.69.0
-    SHA512 a01120203c4caa6bcfcda803f7811f575b247410e7aa74815646f383a374946263e42987d1cff8a33a65c925cf9d3798854d14995446f637ff8e4e77a3b3b4bc
+    REF boost-1.70.0
+    SHA512 f1c48f599d9b0e8722d4b78a2def4760a48602838e03bc5a5e964ce4f78b7ffafad12ddd272fee1f576da06b231781e2fb95898ca7d1f09e68f9bbddcf4ee954
     HEAD_REF master
 )
 
diff --git a/ports/boost-tti/CONTROL b/ports/boost-tti/CONTROL
index 6c4c059c7..4f6e98679 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.69.0
+Version: 1.70.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 0e3237b42..5ac42c6d1 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.69.0
-    SHA512 1c8c0ea6e47ea4565d280e9ad465851d1f8abf14639676112a45e275889e1cfb9b517c5f12a9e26c32c465c24e93a843f46ea5854060ed7a96ba29bc1f5e687e
+    REF boost-1.70.0
+    SHA512 0933d8dac91052ad3a702130162e512f5c1c6a52e2d7bcbc96cd3424ca7eba6e51091e7a2639b17203ff3db84d22f8bf1c402567f471c26a87bc2468a7442e4c
     HEAD_REF master
 )
 
diff --git a/ports/boost-tuple/CONTROL b/ports/boost-tuple/CONTROL
index bd0d1a7ee..2b64a0472 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.69.0
+Version: 1.70.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 9a6582a65..985d651b1 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.69.0
-    SHA512 b298a179fd103f8da526315cab50bcbc1d2b6f63ad753add05353a943ab6ae1044412eddaafec760809a6ccb881dee6302c5014283eda20bc7563f3eea47c4a8
+    REF boost-1.70.0
+    SHA512 79baa5840f6533934c8c9dfd9e4a2af9705dd4e5243d4434ca9dd5edb5407805f8f28f1983e8883e62c735cb73b5743ba091263be0680a394216a83a0b387793
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL
index d937f7c6c..f9fc4e24f 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.69.0
+Version: 1.70.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 6fce4db2b..ee6015fad 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.69.0
-    SHA512 40445b1b5f3e3ce61c7d5d2bc0d5018b4ebe2ebbba4d05e941bfbc792a52b04f6dd0025b6502f105686dc55d74ccbc5f7ca61a96a36532ddb6879a9d8d2f6afd
+    REF boost-1.70.0
+    SHA512 b975d7efa5c50c711607c28bd8e4862754d589b2fc384e06170318debd7a1b3e72231409c5bebae44ac80f67ef8a8f466fda0e8775ad1473b7fd69c9c39c42c4
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-index/CONTROL b/ports/boost-type-index/CONTROL
index e147947ff..542bd4ea6 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.69.0
+Version: 1.70.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 a97f2000b..365de0ca4 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.69.0
-    SHA512 c323a0f779084272127e1da31efbd166bc1c8ba83083cafba19984c86a91aa87ce84bbfe95a5f439feffb53f286006c215b0b828d8626cc4bbde509ffb05d994
+    REF boost-1.70.0
+    SHA512 e7c6c36c4c24045fcb9ddd3a804b051b1076bab92488927b0fb5b6e9f551c45c19c09a33e4002e843fd00500e40dd7511ff23124f73fe889883f79e35fbb4bd3
     HEAD_REF master
 )
 
diff --git a/ports/boost-type-traits/CONTROL b/ports/boost-type-traits/CONTROL
index 24997fa5f..825b9e87d 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.69.0-1
+Version: 1.70.0-1
 Build-Depends: boost-config, boost-detail, boost-static-assert, boost-vcpkg-helpers
 Description: Boost type_traits module
diff --git a/ports/boost-type-traits/msvc-arm-2.patch b/ports/boost-type-traits/msvc-arm-2.patch
deleted file mode 100644
index f6f192ecb..000000000
--- a/ports/boost-type-traits/msvc-arm-2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/include/boost/type_traits/detail/is_function_cxx_11.hpp b/include/boost/type_traits/detail/is_function_cxx_11.hpp
-index 82303fb..de0ce7e 100644
---- a/include/boost/type_traits/detail/is_function_cxx_11.hpp
-+++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp
-@@ -96,7 +96,7 @@ namespace boost {
-    template <class Ret, class ...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_function<Ret(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- 
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
- #ifdef __CLR_VER
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-@@ -328,7 +328,7 @@ namespace boost {
-    template <class Ret, class ...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_function<Ret(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- 
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
- #ifdef __CLR_VER
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-diff --git a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-index d5f1c21..0465ae0 100644
---- a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-+++ b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-@@ -108,7 +108,7 @@ namespace boost {
-    template <class Ret, class C, class ...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret(C::*)(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- 
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
- #ifdef __CLR_VER
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-@@ -362,7 +362,7 @@ namespace boost {
-    template <class Ret, class C, class ...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret(C::*)(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- 
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
- #ifdef __CLR_VER
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
diff --git a/ports/boost-type-traits/msvc-arm.patch b/ports/boost-type-traits/msvc-arm.patch
index cf3d9005a..7ef352087 100644
--- a/ports/boost-type-traits/msvc-arm.patch
+++ b/ports/boost-type-traits/msvc-arm.patch
@@ -1,5 +1,5 @@
 diff --git a/include/boost/type_traits/detail/is_function_cxx_11.hpp b/include/boost/type_traits/detail/is_function_cxx_11.hpp
-index 3031130..82303fb 100644
+index 432af4e..97f029a 100644
 --- a/include/boost/type_traits/detail/is_function_cxx_11.hpp
 +++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp
 @@ -101,7 +101,7 @@ namespace boost {
@@ -10,8 +10,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -114,7 +114,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -118,7 +118,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -19,8 +19,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -127,7 +127,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -135,7 +135,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -28,8 +28,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -140,7 +140,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -152,7 +152,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -37,8 +37,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -154,7 +154,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -170,7 +170,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -46,8 +46,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -167,7 +167,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -187,7 +187,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -55,8 +55,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -180,7 +180,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -204,7 +204,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -64,8 +64,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -193,7 +193,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -221,7 +221,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -73,17 +73,17 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -207,7 +207,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -239,7 +239,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)&&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_function<Ret __stdcall(Args...)&&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -220,7 +220,7 @@ namespace boost {
+    struct is_function<Ret __stdcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -256,7 +256,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -91,8 +91,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -233,7 +233,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -273,7 +273,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -100,8 +100,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -246,7 +246,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -290,7 +290,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -109,8 +109,8 @@ index 3031130..82303fb 100644
 +#ifdef _M_IX86
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -333,7 +333,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -381,7 +381,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -119,7 +119,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -346,7 +346,7 @@ namespace boost {
+@@ -396,7 +396,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -128,7 +128,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -359,7 +359,7 @@ namespace boost {
+@@ -411,7 +411,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -137,7 +137,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -372,7 +372,7 @@ namespace boost {
+@@ -426,7 +426,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -146,7 +146,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -386,7 +386,7 @@ namespace boost {
+@@ -442,7 +442,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -155,7 +155,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -399,7 +399,7 @@ namespace boost {
+@@ -457,7 +457,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -164,7 +164,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -412,7 +412,7 @@ namespace boost {
+@@ -472,7 +472,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -173,7 +173,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -425,7 +425,7 @@ namespace boost {
+@@ -487,7 +487,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -182,7 +182,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -439,7 +439,7 @@ namespace boost {
+@@ -503,7 +503,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -191,7 +191,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -452,7 +452,7 @@ namespace boost {
+@@ -518,7 +518,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -200,7 +200,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -465,7 +465,7 @@ namespace boost {
+@@ -533,7 +533,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -209,7 +209,7 @@ index 3031130..82303fb 100644
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __stdcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -478,7 +478,7 @@ namespace boost {
+@@ -548,7 +548,7 @@ namespace boost {
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_function<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
@@ -219,222 +219,222 @@ index 3031130..82303fb 100644
     struct is_function<Ret __stdcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
     template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
 diff --git a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-index b77a4a5..d5f1c21 100644
+index d88a004..f02693e 100644
 --- a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
 +++ b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
 @@ -113,7 +113,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret (__clrcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -133,7 +133,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -128,7 +128,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -153,7 +153,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -143,7 +143,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -173,7 +173,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -158,7 +158,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -193,7 +193,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -174,7 +174,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -213,7 +213,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -189,7 +189,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -233,7 +233,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -204,7 +204,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -253,7 +253,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -219,7 +219,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -273,7 +273,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -235,7 +235,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -293,7 +293,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -250,7 +250,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -313,7 +313,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -265,7 +265,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -333,7 +333,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -280,7 +280,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -424,7 +424,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -367,7 +367,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -444,7 +444,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -382,7 +382,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -464,7 +464,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -397,7 +397,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -484,7 +484,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -412,7 +412,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -504,7 +504,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -428,7 +428,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -524,7 +524,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -443,7 +443,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -544,7 +544,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -458,7 +458,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -564,7 +564,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -473,7 +473,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -584,7 +584,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -489,7 +489,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -604,7 +604,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -504,7 +504,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -624,7 +624,7 @@ namespace boost {
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -519,7 +519,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -534,7 +534,7 @@ namespace boost {
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-    struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -645,7 +645,7 @@ namespace boost {
+    struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ 
  #endif
 -#ifndef _M_AMD64
 +#ifdef _M_IX86
     template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
     struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-    template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+ #ifndef __CLR_VER
diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake
index f2661a4ba..a3bc496b2 100644
--- a/ports/boost-type-traits/portfile.cmake
+++ b/ports/boost-type-traits/portfile.cmake
@@ -5,12 +5,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_traits
-    REF boost-1.69.0
-    SHA512 83d585933374420808aaf3743cda48d914bb7d536bf3f19e59bba1b24403a1482ff509e1f804a0b55d3bc434aceedcb0b75f873b9feaa9ba1c1a762a11d4fc94
+    REF boost-1.70.0
+    SHA512 e9c672bb0e02cea9be8179908dfbb0c21903a7e6b9fade6e6666c01af97d81e489983143eedd668df446a1fb532d3c5298458c18efacd747ce66b77170d0da14
     HEAD_REF master
     PATCHES
         msvc-arm.patch
-        msvc-arm-2.patch
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/boost-typeof/CONTROL b/ports/boost-typeof/CONTROL
index 8ee36b04c..fbf241061 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
 Description: Boost typeof module
diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake
index 66486e83c..b3c269834 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.69.0
-    SHA512 66932eaef89b406c1570bd469370cc62ad298ee7c1864d01a0380a32c90511711cb8b00776c203c8ed6eb2ecec8fb5c005bb932c2277e4fe29b182e485927b18
+    REF boost-1.70.0
+    SHA512 ff55aa51b66275a18c8d83d95eadc66aa410fc0e21e3cfee9ecb70051fe7fb8015b17ebd54541ef0eb96f638aafa61bd77df40dcc6d460e9227040336c61ec5c
     HEAD_REF master
 )
 
diff --git a/ports/boost-ublas/CONTROL b/ports/boost-ublas/CONTROL
index eca065013..0a801349e 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.69.0
-Build-Depends: boost-concept-check, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-compute, boost-concept-check, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost ublas module
diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake
index b46d7a830..f81cbb420 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.69.0
-    SHA512 ef39748840ebdb19dfab07f51120c771e08d82edcd526952d15db105b3779c17a8c6742c73a55b0427ad84b7dfa30d08337f331d915fed09b0de30b3606c2385
+    REF boost-1.70.0
+    SHA512 050be7c25c50b31274e6b19d2c882343ac6b065c093bab20f5c9ce4050db78886525299cc1814525f0ef7da6ae002aef0c3c1539f65e3d9646d0e399293b019e
     HEAD_REF master
 )
 
diff --git a/ports/boost-units/CONTROL b/ports/boost-units/CONTROL
index 1d1fa035c..ad757315d 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.69.0
+Version: 1.70.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 f823754e6..ac58d7284 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.69.0
-    SHA512 6a4a18e6dc8b2d8ddcd027bab0b30a6892639de6e85f25dd456b23fb36f162fd6ec142f49e7ab416bbd1e9d6f5eac541faaa46450896dbfa9691c31c855e217f
+    REF boost-1.70.0
+    SHA512 001bfe9ca2a6be94ec66c123ed983468cefebfebbee58f439bbb2a392fa152cb0818fc03a782bfd698693702df185242187d91ba6cbab8f742bb04d53cd1ca28
     HEAD_REF master
 )
 
diff --git a/ports/boost-unordered/CONTROL b/ports/boost-unordered/CONTROL
index 796d8bf7d..518e7ac5e 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.69.0
+Version: 1.70.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 aaf69b4fe..69c681d99 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.69.0
-    SHA512 51bbbdcc0661b502445e53091bb5ab859ece03ce549365ac58964459e0b7c162e10b166324b8b9c28a9a8aef5532fa31fed68bbb878e3d36f115a6279109e4b7
+    REF boost-1.70.0
+    SHA512 8fc3692777e6b7e997a888237628489bcac80b45ddb4ac2bf73809e7e689506ba8e2679915d8025369375610a7a63cf94f18bafb1fe638df57e76be468bae761
     HEAD_REF master
 )
 
diff --git a/ports/boost-utility/CONTROL b/ports/boost-utility/CONTROL
index 7850447a2..f1781fafc 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.69.0
+Version: 1.70.0
 Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
 Description: Boost utility module
diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake
index 521de5622..4297c262a 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.69.0
-    SHA512 92c97875eff9aee2724b4ae1ed04a6885b06c77fa14ce646423c6b7024bb1d86ef358ecc5d3fa3835b3d70adb968a49f647828fe181ae469aa6fd1fe0a1bc8cf
+    REF boost-1.70.0
+    SHA512 c81bb47c9d9d95b2a1e43f969b7ce91d148e207d4a5b5efe9d9ca5b0ef87f182216aae6e45c6bba52f8ba7b5d5601984c4551a5d84352d3d221433d8652c9570
     HEAD_REF master
 )
 
diff --git a/ports/boost-uuid/CONTROL b/ports/boost-uuid/CONTROL
index b17b48ef8..a20805a97 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.69.0
+Version: 1.70.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 b8c43c34a..f1baff5ee 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.69.0
-    SHA512 b6f1dbceb1ca2665df63b7d4745c185aca0812ede640e569d086d5f428b9babdfb15096ba5b2475bd59b87bc27b3f961388fe251a25fe0422f036058ab9c5856
+    REF boost-1.70.0
+    SHA512 8fa80562f79b6192d7086add50a6c89996106161df0e43a5738e460253cdb7f94c3a941e72fbce49c0ae5eca67429ca6eb42e08af647832941b624a82160e9cf
     HEAD_REF master
 )
 
diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1
index e49ee32e8..7ab6c9680 100644
--- a/ports/boost-vcpkg-helpers/generate-ports.ps1
+++ b/ports/boost-vcpkg-helpers/generate-ports.ps1
@@ -1,7 +1,7 @@
 [CmdletBinding()]
 param (
     $libraries = @(),
-    $version = "1.69.0"
+    $version = "1.70.0"
 )
 
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
@@ -215,6 +215,9 @@ $libraries_found = ls $scriptsDir/boost/libs -directory | % name | % {
         "ublas"
         "safe_numerics"
     }
+    elseif ($_ -eq "headers")
+    {
+    }
     else
     {
         $_
@@ -316,7 +319,7 @@ foreach ($library in $libraries)
             -and `
             (($library -ne "config") -or ($_ -notmatch "integer"))`
             -and `
-            (($library -notmatch "random") -or ($_ -notmatch "multiprecision"))`
+            (($library -notmatch "multiprecision") -or ($_ -notmatch "random|math"))`
             -and `
             (($library -notmatch "lexical_cast") -or ($_ -notmatch "math"))`
             -and `
diff --git a/ports/boost-vmd/CONTROL b/ports/boost-vmd/CONTROL
index 928a66dc2..b27488707 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.69.0
+Version: 1.70.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 176d487f0..0f8ac16c1 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.69.0
-    SHA512 d6b6a88a92849eb6c21aad27ee59e5a6d488524ea813cfa0fd9dc015b5c25e98da6ad97bd62d80d24d973b07b01ccf437f8b1d1f10b4e6aa7402ee8e594953c3
+    REF boost-1.70.0
+    SHA512 88290fb0718b4681f684ffabe756ae1f80fb91f658382444c1e71756ec8138e41db395601dbbd30081b7cda37076574b4de3a08384ced1142551ee04e3680128
     HEAD_REF master
 )
 
diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL
index d9cc98840..32235abb3 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.69.0
+Version: 1.70.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 294109a06..189eccc57 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.69.0
-    SHA512 aeb8ba65a0fcc85aae27aa5bba45b2a7421c2e04b64bb03ece77b6c7fa0f2d9282a5e19c64506bcd906357375deb7a1e5711334c74859995b1d0e70014248609
+    REF boost-1.70.0
+    SHA512 0ad42a92f8a7361fd0ba99b319826b74aaf81b5ac2b85f9fc1cd4e065a3931924a13151cdc827e11e7ad34d4526ebfcb55f64d40e7b2eabb1ab7f72e02d304c0
     HEAD_REF master
 )
 
diff --git a/ports/boost-winapi/CONTROL b/ports/boost-winapi/CONTROL
index 927d9e06f..64912f1e3 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.69.0
+Version: 1.70.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 78144f25d..0877a216f 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.69.0
-    SHA512 e1ed458c0ce6d5daa6e9fe577a0010e05e5bc290e485b4f2183e5f61b5ebb07983eab9f5477b3195049f232a699074a1a58f719b5d5b8c0f550ab9e3abae6764
+    REF boost-1.70.0
+    SHA512 aa14bbb4dad1a5fbbd0177918325cc8138268c7c311dca4aef9c4570b8630dceb4b5448e0fc440afca30bd9eef2cd37b5d99843f482131249065cf76d5654174
     HEAD_REF master
 )
 
diff --git a/ports/boost-xpressive/CONTROL b/ports/boost-xpressive/CONTROL
index 1be7e5128..f0d61399f 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.69.0
+Version: 1.70.0
 Build-Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
 Description: Boost xpressive module
diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake
index dad20d014..79bc1d026 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.69.0
-    SHA512 ac6ab9955ab4cb6e8a1905304595a9b33c71b4041673b6e942adc023bd67c7b64bf786976f40cb2daea6ce164f72fff50fc6fa583dd12d5978a4e3ba6524b523
+    REF boost-1.70.0
+    SHA512 4b242c54b50331cf4bc5318610efe2269ea3794264bec832debb39fb77910d26bb576837b35dce829fb13674a5b427231406e059f7dcbe68f01ba6317af988f6
     HEAD_REF master
 )
 
diff --git a/ports/boost-yap/CONTROL b/ports/boost-yap/CONTROL
index 97a727fd5..48dea0e8d 100644
--- a/ports/boost-yap/CONTROL
+++ b/ports/boost-yap/CONTROL
@@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-yap
-Version: 1.69.0
+Version: 1.70.0
 Build-Depends: boost-hana, boost-preprocessor, boost-type-index, boost-vcpkg-helpers
 Description: Boost yap module
diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake
index edbed9475..106114009 100644
--- a/ports/boost-yap/portfile.cmake
+++ b/ports/boost-yap/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/yap
-    REF boost-1.69.0
-    SHA512 12a6d5ed8491a9ebd258fa83ef752af88db38a9517a4da43fd20dd63a244271c7b889f92a32fc67f098230c7cbf530578c8ef163d6427144173183dc2fdc1156
+    REF boost-1.70.0
+    SHA512 f6211eed15eb28418513a525efc250993eed9aa940a20ed989e5f7af6c0890c06e3a0aa571e6825a8b15c62a7f238c7e269872f7b6c3bc3ab2e097a9f101fcf6
     HEAD_REF master
 )
 
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index fc51d7cec..b97b99f9a 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.69.0
+Version: 1.70.0
 Description: Peer-reviewed portable C++ source libraries
-Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp), boost-contract (!arm), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-parameter, boost-parameter-python (windows), boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-system, boost-test (!uwp), boost-thread (!arm), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!arm), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap
+Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp), boost-contract (!arm), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python (windows), boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-system, boost-test (!uwp), boost-thread (!arm), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!arm), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap
 
 Feature: mpi
 Description: Build with MPI support
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
index f405b8f45..8b9a200d4 100644
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@@ -10,7 +10,34 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_find_acquire_program(JOM)
+set(NUMBER_OF_PROCESSORS "1")
+if(DEFINED ENV{NUMBER_OF_PROCESSORS})
+    set(NUMBER_OF_PROCESSORS $ENV{NUMBER_OF_PROCESSORS})
+else()
+    if(APPLE)
+        set(job_count_command sysctl -n hw.physicalcpu)
+    else()
+        set(job_count_command nproc)
+    endif()
+    execute_process( 
+            COMMAND ${job_count_command}
+            OUTPUT_VARIABLE NUMBER_OF_PROCESSORS
+        )
+    string(REPLACE "\n" "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
+    string(REPLACE " " "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
+    if(NOT NUMBER_OF_PROCESSORS)
+        set(NUMBER_OF_PROCESSORS "1")
+    endif()
+endif()
+
+if(CMAKE_HOST_WIN32)
+    vcpkg_find_acquire_program(JOM)
+    set(build_tool "${JOM}" /J ${NUMBER_OF_PROCESSORS})
+else()
+    find_program(MAKE make)
+    set(build_tool "${MAKE}" -j${NUMBER_OF_PROCESSORS})
+endif()
+
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
@@ -57,26 +84,28 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
     endif()
     make_directory(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})
 
+    set(configure_arguments --cpu=${BOTAN_FLAG_CPU}
+                            ${BOTAN_FLAG_SHARED}
+                            ${BOTAN_FLAG_STATIC}
+                            ${BOTAN_FLAG_DEBUGMODE}
+                            "--distribution-info=vcpkg ${TARGET_TRIPLET}"
+                            --prefix=${BOTAN_FLAG_PREFIX}
+                            --link-method=copy)
+    if(CMAKE_HOST_WIN32)
+        list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX})
+    endif()    
+
     vcpkg_execute_required_process(
-        COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py"
-            --cc=msvc
-            --cpu=${BOTAN_FLAG_CPU}
-            ${BOTAN_FLAG_SHARED}
-            ${BOTAN_FLAG_STATIC}
-            ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX}
-            ${BOTAN_FLAG_DEBUGMODE}
-            "--distribution-info=vcpkg ${TARGET_TRIPLET}"
-            --prefix=${BOTAN_FLAG_PREFIX}
-            --link-method=copy
+        COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments}
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}"
         LOGNAME configure-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})
     message(STATUS "Configure ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done")
 
     message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}")
     vcpkg_execute_required_process(
-        COMMAND ${JOM}
+        COMMAND ${build_tool}
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}"
-        LOGNAME jom-build-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})
+        LOGNAME build-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})
     message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done")
 
     message(STATUS "Package ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}")
@@ -87,7 +116,7 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}"
         LOGNAME install-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})
 
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND CMAKE_HOST_WIN32)
         file(RENAME ${BOTAN_FLAG_PREFIX}/lib/botan${BOTAN_DEBUG_SUFFIX}.dll ${BOTAN_FLAG_PREFIX}/bin/botan${BOTAN_DEBUG_SUFFIX}.dll)
     endif()
 
@@ -98,8 +127,13 @@ BOTAN_BUILD(rel)
 BOTAN_BUILD(dbg)
 
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/botan)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/botan-cli.exe ${CURRENT_PACKAGES_DIR}/tools/botan/botan-cli.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/botan-cli.exe)
+
+set(cli_exe_name "botan")
+if(CMAKE_HOST_WIN32)
+    set(cli_exe_name "botan-cli.exe")
+endif()
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/${cli_exe_name} ${CURRENT_PACKAGES_DIR}/tools/botan/${cli_exe_name})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${cli_exe_name})
 
 file(RENAME ${CURRENT_PACKAGES_DIR}/include/botan-2/botan ${CURRENT_PACKAGES_DIR}/include/botan)
 
diff --git a/ports/box2d/CONTROL b/ports/box2d/CONTROL
index 220a5a058..943b1ec94 100644
--- a/ports/box2d/CONTROL
+++ b/ports/box2d/CONTROL
@@ -1,3 +1,3 @@
-Source: box2d
-Version: 2.3.1-374664b-1
-Description: Box2D (http://box2d.org) is an open source C++ engine for simulating rigid bodies in 2D.
+Source: box2d
+Version: 2.3.1-374664b-2
+Description: Box2D (http://box2d.org) is an open source C++ engine for simulating rigid bodies in 2D.
diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake
index c35f37444..24da7f143 100644
--- a/ports/box2d/portfile.cmake
+++ b/ports/box2d/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("Box2D only supports building as a static library")
-    set(VCPKG_LIBRARY_LINKAGE "static")
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL
index 55ca2a8c3..b9efe8ee6 100644
--- a/ports/breakpad/CONTROL
+++ b/ports/breakpad/CONTROL
@@ -1,4 +1,4 @@
 Source: breakpad
-Version: 2018-09-18
+Version: 2019-05-08
 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 18b1b8152..9bab01f23 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 54fa71efbe50fb2b58096d871575b59e12edba6d
-    SHA512 ecd1c6c5cc0e3984d05fe86ec11172e93b0e31c39ce0af9d0de08b8d03083686e2288e0cd787180c599446c277e58f48550ce4ab718019576c64fc403a592745
+    REF 21b48a72aa50dde84149267f6b7402522b846b24
+    SHA512 4ca2f877871c0a79c24ce4cc592dddb3ac4c2eac2a5962dad6d3d94edc91ac82afec3d7e4e7f81e7d9916eb83f8708e66759c38a6ef0e1b2c19691dd1518558a
     HEAD_REF master
 )
 
diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL
index 1256f920f..d61b8b25e 100644
--- a/ports/brotli/CONTROL
+++ b/ports/brotli/CONTROL
@@ -1,3 +1,3 @@
 Source: brotli
-Version: 1.0.2-4
+Version: 1.0.7
 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/portfile.cmake b/ports/brotli/portfile.cmake
index 4a95f89a4..fa0413711 100644
--- a/ports/brotli/portfile.cmake
+++ b/ports/brotli/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/brotli
-    REF v1.0.2
-    SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
+    REF v1.0.7
+    SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
     HEAD_REF master
     PATCHES install.patch
 )
diff --git a/ports/brynet/CONTROL b/ports/brynet/CONTROL
index 3309ab1cf..9133017a1 100644
--- a/ports/brynet/CONTROL
+++ b/ports/brynet/CONTROL
@@ -1,4 +1,4 @@
 Source: brynet
-Version: 1.0.0-1
+Version: 1.0.2
 Description: A C++ cross platform high performance tcp network library, and support SSL/HTTP/Websocket.
 Build-Depends: openssl
diff --git a/ports/brynet/portfile.cmake b/ports/brynet/portfile.cmake
index 9c9097bfc..141711827 100644
--- a/ports/brynet/portfile.cmake
+++ b/ports/brynet/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO IronsDu/brynet
-    REF v1.0.0
-    SHA512 f2ad0514d5b25828b38d929bf352a8a35c39816982f7a3aaca2b6d74a7e592d8a37d2af6b77d6babf2eec25063ed1bb50704e8871d18d7e5f777021d18604b9c
+    REF v1.0.2
+    SHA512 b07ceb858ed125959b3901415d6099939acf51a194950de8c65f063b6462a0ab424494659aedd889378bd4388cc9e71a0aedcb30108b6c2eef4d5e6ebea2cce8
     HEAD_REF master
 )
 
diff --git a/ports/bullet3/CONTROL b/ports/bullet3/CONTROL
index 36f8b1838..efcb927d2 100644
--- a/ports/bullet3/CONTROL
+++ b/ports/bullet3/CONTROL
@@ -1,3 +1,3 @@
-Source: bullet3
-Version: 2.87
-Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
+Source: bullet3
+Version: 2.88
+Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake
index f86f323f3..aef9757a7 100644
--- a/ports/bullet3/portfile.cmake
+++ b/ports/bullet3/portfile.cmake
@@ -1,28 +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_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bulletphysics/bullet3
-    REF 2.87
-    SHA512 649e470223295666eda6f7ff59d03097637c2645b5cd951977060ae14b89f56948ce03e437e83c986d26876f187d7ee34e790bc3882d5d66da9af89a4ab81c21
+    REF 2.88
+    SHA512 15face1940d496c96fd19a44139d11d2cbb629526c40432be4a0eef5fa9a532c842ec7318248c0359a080f2034111bf1a3c2d3a6fd789bec675bd368fac7bd93
     HEAD_REF master
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
         -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON
         -DBUILD_DEMOS=OFF
         -DBUILD_CPU_DEMOS=OFF
@@ -30,7 +20,6 @@ vcpkg_configure_cmake(
         -DBUILD_BULLET3=OFF
         -DBUILD_EXTRAS=OFF
         -DBUILD_UNIT_TESTS=OFF
-        -DBUILD_SHARED_LIBS=ON
         -DINSTALL_LIBS=ON
 )
 
@@ -44,4 +33,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics
 vcpkg_copy_pdbs()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3 RENAME copyright)
-\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3 RENAME copyright)
diff --git a/ports/butteraugli/CMakeLists.txt b/ports/butteraugli/CMakeLists.txt
index 6a2e5ca02..52963fbe0 100644
--- a/ports/butteraugli/CMakeLists.txt
+++ b/ports/butteraugli/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.8.0)
 project(butteraugli CXX)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 add_compile_options(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
 if(MSVC)
   add_compile_options(/W3 /wd4005 /wd4996 /wd4018)
diff --git a/ports/butteraugli/CONTROL b/ports/butteraugli/CONTROL
index 5d9c92dfd..621e42a8a 100644
--- a/ports/butteraugli/CONTROL
+++ b/ports/butteraugli/CONTROL
@@ -1,4 +1,4 @@
-Source: butteraugli
-Version: 2018-02-25
-Description: butteraugli estimates the psychovisual difference between two images
-Build-Depends: libpng, libjpeg-turbo
+Source: butteraugli
+Version: 2019-05-08
+Description: butteraugli estimates the psychovisual difference between two images
+Build-Depends: libpng, libjpeg-turbo
diff --git a/ports/butteraugli/portfile.cmake b/ports/butteraugli/portfile.cmake
index b6f690539..a3fb2a19d 100644
--- a/ports/butteraugli/portfile.cmake
+++ b/ports/butteraugli/portfile.cmake
@@ -1,10 +1,12 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/butteraugli
-    REF 856a4da68d02d30e3bf843e33536f2b3a698b249
-    SHA512 f02ee97f186b59cc685a63095e5618aedbfebf08ab2cf438189fc4214c7d562506368ec210c08df236132dc2f855b6b0a6226bd6dc27c1c04e9c1b0b0ac4f1df
+    REF 71b18b636b9c7d1ae0c1d3730b85b3c127eb4511
+    SHA512 2e73f8ad8953307eea956ed8bd828e110419d6d9f8a42685d225953d3a8017a79d0701bde0282459dc51198e75a99dcd99dd3c4e7ef065736c512a7b11ea0fdf
     HEAD_REF master
 )
 
diff --git a/ports/byte-lite/CONTROL b/ports/byte-lite/CONTROL
new file mode 100644
index 000000000..e16ff8e3c
--- /dev/null
+++ b/ports/byte-lite/CONTROL
@@ -0,0 +1,3 @@
+Source: byte-lite
+Version: 0.2.0
+Description: A C++17-like byte type for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/byte-lite/portfile.cmake b/ports/byte-lite/portfile.cmake
new file mode 100644
index 000000000..7fd9f5620
--- /dev/null
+++ b/ports/byte-lite/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinmoene/byte-lite
+    REF v0.2.0
+    SHA512 eefc730a39453dfc367a4478a84d4825cd85721d3c332a57321d0a5c3040a4d45921603ff24220f968dd21df61acea856ae30db8bae6c1e835a1755fb03c84b7
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBYTE_LITE_OPT_BUILD_TESTS=OFF
+        -DBYTE_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/c-ares/CONTROL b/ports/c-ares/CONTROL
index 204fd6668..525bd8985 100644
--- a/ports/c-ares/CONTROL
+++ b/ports/c-ares/CONTROL
@@ -1,4 +1,4 @@
 Source: c-ares
-Version: cares-1_15_0
+Version: 2019-5-2
 Description: A C library for asynchronous DNS requests
 Build-Depends:
diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake
index 999c3553e..094b52ff4 100644
--- a/ports/c-ares/portfile.cmake
+++ b/ports/c-ares/portfile.cmake
@@ -7,8 +7,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO c-ares/c-ares
-    REF cares-1_15_0
-    SHA512 3c925e0b3a25f3b656a145966ca763f77ae4ccefd87f2d9ae01cae786eeca0ce8397af4ab21da64f516b4603850638f969056184c310372d22aeb5cbfd2704c8
+    REF 9f1fdbf5dd633f81352fac0d6bc0d0c4d45be459
+    SHA512 2bb3696e839e37c6f2be4b979ae6d0eab2914d6f0ca043f688e3bb3071d2348cb64424049f019c16bc05d472dd61d5071e865edd229dce023a50f556a1961766
     HEAD_REF master
 )
 
diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL
index 6f39010be..f4a438357 100644
--- a/ports/caf/CONTROL
+++ b/ports/caf/CONTROL
@@ -1,4 +1,4 @@
-Source: caf
-Version: 0.16.2
-Build-Depends: openssl
-Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.
+Source: caf
+Version: 0.16.3
+Build-Depends: openssl
+Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake
index ae5e24c1b..2e34e888e 100644
--- a/ports/caf/portfile.cmake
+++ b/ports/caf/portfile.cmake
@@ -1,15 +1,12 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    set(VCPKG_LIBRARY_LINKAGE "static")
-    message("CAF only supports static library linkage")
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO actor-framework/actor-framework
-    REF 2cc4377715afc3d3c35848f9d59b9e6876afd875
-    SHA512 7e7962bf5a30122bde8be63f6de0058f865bd890e2d10f4d90f4885b7953467fb6532f69c1a77a35802de7c531f6aac192a2993b53a8dc0b05f503c3f4083a31
+    REF 0.16.3
+    SHA512 f7e567264ea1686a431eacbf2a62f49c0f4467df073ec983ae622d9417c28124eb456eb40d6a70dbe062ad58333944924f04f7e3fee5a7b76917890d98bedce1
     HEAD_REF master
 	PATCHES
 		openssl-version-override.patch
diff --git a/ports/caffe2/CONTROL b/ports/caffe2/CONTROL
index bbef1f62b..5cac9b00d 100644
--- a/ports/caffe2/CONTROL
+++ b/ports/caffe2/CONTROL
@@ -1,4 +1,4 @@
-Source: caffe2
-Version: 0.8.1-2
-Build-Depends: lmdb, gflags, glog, eigen3, protobuf
-Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.
+Source: caffe2
+Version: 0.8.1-3
+Build-Depends: lmdb, gflags, glog, eigen3, protobuf
+Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.
diff --git a/ports/caffe2/portfile.cmake b/ports/caffe2/portfile.cmake
index b3e0b2978..930b04dd7 100644
--- a/ports/caffe2/portfile.cmake
+++ b/ports/caffe2/portfile.cmake
@@ -1,14 +1,11 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
     message(FATAL_ERROR "Caffe2 cannot be built for the x86 architecture")
 endif()
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO caffe2/caffe2
@@ -36,7 +33,6 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-    -DBUILD_SHARED_LIBS=OFF
     # Set to ON to use python
     -DBUILD_PYTHON=OFF
     -DUSE_STATIC_RUNTIME=${USE_STATIC_RUNTIME}
diff --git a/ports/cairomm/CMakeLists.txt b/ports/cairomm/CMakeLists.txt
index db077217d..1274a6431 100644
--- a/ports/cairomm/CMakeLists.txt
+++ b/ports/cairomm/CMakeLists.txt
@@ -6,8 +6,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build/cmake")
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
 #get cairomm version
 file (STRINGS "configure.ac" CONFIGURE_AC_INIT REGEX "AC_INIT\\(\\[cairomm\\], \\[.*\\].*" )
 string(REGEX REPLACE "AC_INIT\\(\\[.*\\], \\[([0-9]+\\.[0-9]+\\.[0-9]+)\\].*" "\\1"  VERSION ${CONFIGURE_AC_INIT})
diff --git a/ports/cairomm/CONTROL b/ports/cairomm/CONTROL
index c92877435..df07bd81d 100644
--- a/ports/cairomm/CONTROL
+++ b/ports/cairomm/CONTROL
@@ -1,4 +1,4 @@
-Source: cairomm
-Version: 1.15.3-2
-Description: A C++ wrapper for the cairo graphics library
-Build-Depends: cairo, libsigcpp
+Source: cairomm
+Version: 1.15.3-3
+Description: A C++ wrapper for the cairo graphics library
+Build-Depends: cairo, libsigcpp
diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake
index 0f9ec03c7..857705649 100644
--- a/ports/cairomm/portfile.cmake
+++ b/ports/cairomm/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(CAIROMM_VERSION 1.15.3)
 set(CAIROMM_HASH a2c28786dbd167179561d8f580eeb11d10634a36dfdb1adeefc0279acf83ee906f01f264cb924845fc4ab98da1afac71e1ead742f283c1a32368ca9af28e464a)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cairomm-${CAIROMM_VERSION})
diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL
index e02002656..3014018b9 100644
--- a/ports/capnproto/CONTROL
+++ b/ports/capnproto/CONTROL
@@ -1,4 +1,4 @@
 Source: capnproto
-Version: 0.7.0
+Version: 0.7.0-1
 Description: Data interchange format and capability-based RPC system https://capnproto.org/
 Build-Depends: zlib
diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake
index 35ac53fcd..a9916a70a 100644
--- a/ports/capnproto/portfile.cmake
+++ b/ports/capnproto/portfile.cmake
@@ -3,16 +3,13 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
 endif()
 
 if(DEFINED VCPKG_CMAKE_SYSTEM_NAME)
-    # Undefined VCPKG_CMAKE_SYSTEM_NAME means Windows
     message(FATAL_ERROR "Error: CapnProto only build on Windows for now. See #5630 and #5635")
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("Building DLLs not supported. Building static instead.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO capnproto/capnproto
diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL
index 73fcc6541..a1b0fb53c 100644
--- a/ports/cartographer/CONTROL
+++ b/ports/cartographer/CONTROL
@@ -1,4 +1,4 @@
-Source: cartographer
-Version: 0.3.0-5
-Build-Depends: ceres[eigensparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
-Description: Google 2D & 3D SLAM package
+Source: cartographer
+Version: 1.0.0
+Build-Depends: ceres[suitesparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
+Description: Google 2D & 3D SLAM package
+\ No newline at end of file
diff --git a/ports/cartographer/disable-C2338-cartographer.patch b/ports/cartographer/disable-C2338-cartographer.patch
index d43367218..17452622d 100644
--- a/ports/cartographer/disable-C2338-cartographer.patch
+++ b/ports/cartographer/disable-C2338-cartographer.patch
@@ -1,10 +1,10 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bc92e9b..4c1826a 100644
+index 95bb132..fbd624d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -226,7 +226,7 @@ target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE
-   "${GMOCK_INCLUDE_DIRS}")
- target_link_libraries(${PROJECT_NAME} PUBLIC ${GMOCK_LIBRARY})
+@@ -237,7 +237,7 @@ if(${BUILD_PROMETHEUS})
+   target_compile_definitions(${PROJECT_NAME} PUBLIC USE_PROMETHEUS=1)
+ endif()
  
 -set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
 +set(TARGET_COMPILE_FLAGS "-D_DISABLE_EXTENDED_ALIGNED_STORAGE ${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
diff --git a/ports/cartographer/fix-build-error.patch b/ports/cartographer/fix-build-error.patch
new file mode 100644
index 000000000..9474c78dc
--- /dev/null
+++ b/ports/cartographer/fix-build-error.patch
@@ -0,0 +1,25 @@
+diff --git a/cartographer/common/internal/testing/thread_pool_for_testing.cc b/cartographer/common/internal/testing/thread_pool_for_testing.cc
+index f804e13..c987f68 100644
+--- a/cartographer/common/internal/testing/thread_pool_for_testing.cc
++++ b/cartographer/common/internal/testing/thread_pool_for_testing.cc
+@@ -16,7 +16,7 @@
+ 
+ #include "cartographer/common/internal/testing/thread_pool_for_testing.h"
+ 
+-#include <unistd.h>
++//#include <unistd.h>
+ #include <algorithm>
+ #include <chrono>
+ #include <numeric>
+diff --git a/cartographer/mapping/pose_graph_interface.h b/cartographer/mapping/pose_graph_interface.h
+index 6483ef4..6456720 100644
+--- a/cartographer/mapping/pose_graph_interface.h
++++ b/cartographer/mapping/pose_graph_interface.h
+@@ -18,6 +18,7 @@
+ #define CARTOGRAPHER_MAPPING_POSE_GRAPH_INTERFACE_H_
+ 
+ #include <vector>
++#include <array>
+ 
+ #include "cartographer/common/optional.h"
+ #include "cartographer/mapping/id.h"
diff --git a/ports/cartographer/fix-find-packages.patch b/ports/cartographer/fix-find-packages.patch
index 19694b704..3ab53bff9 100644
--- a/ports/cartographer/fix-find-packages.patch
+++ b/ports/cartographer/fix-find-packages.patch
@@ -1,146 +1,181 @@
- CMakeLists.txt                     | 45 ++++++++++++++++++++++----------------
- cartographer/common/math.h         |  4 +++-
- cartographer/common/thread_pool.cc |  2 +-
- cmake/functions.cmake              | 10 ++++-----
- 4 files changed, 35 insertions(+), 26 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55e9adc..bc92e9b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,18 +26,23 @@ option(BUILD_GRPC "build Cartographer gRPC support" false)
- set(GRPC_PLUGIN_PATH "/usr/local/bin/grpc_cpp_plugin")
- 
- include("${PROJECT_SOURCE_DIR}/cmake/functions.cmake")
--google_initialize_cartographer_project()
--google_enable_testing()
-+#google_initialize_cartographer_project()
-+#google_enable_testing()
- 
- find_package(Boost REQUIRED COMPONENTS iostreams)
- find_package(Ceres REQUIRED COMPONENTS SparseLinearAlgebraLibrary)
- find_package(Eigen3 REQUIRED)
--find_package(LuaGoogle REQUIRED)
-+find_package(Lua REQUIRED)
- find_package(Protobuf 3.0.0 REQUIRED)
-+find_package(glog REQUIRED)
-+find_package(gflags REQUIRED)
- 
--include(FindPkgConfig)
--PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16)
--
-+#include(FindPkgConfig)
-+#PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16)
-+if(CMAKE_BUILD_TYPE STREQUAL Debug)
-+    set(CAIRO_LIB_SUFFIX d)
-+endif()
-+find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX})
- # Only build the documentation if we can find Sphinx.
- find_package(Sphinx)
- if(SPHINX_FOUND)
-@@ -144,15 +149,15 @@ configure_file(
-   ${PROJECT_SOURCE_DIR}/cartographer/common/config.h.cmake
-   ${PROJECT_BINARY_DIR}/cartographer/common/config.h)
- 
--google_binary(cartographer_autogenerate_ground_truth
--  SRCS
--    cartographer/ground_truth/autogenerate_ground_truth_main.cc
--)
--
--google_binary(cartographer_compute_relations_metrics
--  SRCS
--    cartographer/ground_truth/compute_relations_metrics_main.cc
--)
-+#google_binary(cartographer_autogenerate_ground_truth
-+#  SRCS
-+#    cartographer/ground_truth/autogenerate_ground_truth_main.cc
-+#)
-+#
-+#google_binary(cartographer_compute_relations_metrics
-+#  SRCS
-+#    cartographer/ground_truth/compute_relations_metrics_main.cc
-+#)
- 
- if(${BUILD_GRPC})
-   google_binary(cartographer_grpc_server
-@@ -167,7 +172,7 @@ foreach(ABS_FIL ${ALL_TESTS})
-   get_filename_component(FIL_WE ${REL_FIL} NAME_WE)
-   # Replace slashes as required for CMP0037.
-   string(REPLACE "/" "." TEST_TARGET_NAME "${DIR}/${FIL_WE}")
--  google_test("${TEST_TARGET_NAME}" ${ABS_FIL})
-+  #google_test("${TEST_TARGET_NAME}" ${ABS_FIL})
-   if(${BUILD_GRPC})
-     target_link_libraries("${TEST_TARGET_NAME}" PUBLIC grpc++)
-   endif()
-@@ -190,8 +195,9 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
- target_link_libraries(${PROJECT_NAME} PUBLIC ${Boost_LIBRARIES})
- 
- # We expect find_package(Ceres) to have located these for us.
--target_link_libraries(${PROJECT_NAME} PUBLIC glog)
--target_link_libraries(${PROJECT_NAME} PUBLIC gflags)
-+#target_link_libraries(${PROJECT_NAME} PUBLIC glog)
-+#target_link_libraries(${PROJECT_NAME} PUBLIC gflags)
-+target_link_libraries(${PROJECT_NAME} PUBLIC ${CAIRO_LIBRARY})
- 
- target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
-   "${CAIRO_INCLUDE_DIRS}")
-@@ -201,7 +207,8 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
-   ${PROTOBUF_INCLUDE_DIR})
- # TODO(hrapp): This should not explicitly list pthread and use
- # PROTOBUF_LIBRARIES, but that failed on first try.
--target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread)
-+#target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread)
-+target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY})
- if(${BUILD_GRPC})
-   target_link_libraries(${PROJECT_NAME} PUBLIC grpc++)
- endif()
-diff --git a/cartographer/common/math.h b/cartographer/common/math.h
-index f0ae9e2..d32bdbe 100644
---- a/cartographer/common/math.h
-+++ b/cartographer/common/math.h
-@@ -16,7 +16,9 @@
- 
- #ifndef CARTOGRAPHER_COMMON_MATH_H_
- #define CARTOGRAPHER_COMMON_MATH_H_
--
-+ #ifndef M_PI
-+ #define M_PI 3.14159265358979323846
-+ #endif
- #include <cmath>
- #include <vector>
- 
-diff --git a/cartographer/common/thread_pool.cc b/cartographer/common/thread_pool.cc
-index fdda166..178472f 100644
---- a/cartographer/common/thread_pool.cc
-+++ b/cartographer/common/thread_pool.cc
-@@ -16,7 +16,7 @@
- 
- #include "cartographer/common/thread_pool.h"
- 
--#include <unistd.h>
-+//#include <unistd.h>
- #include <algorithm>
- #include <chrono>
- #include <numeric>
-diff --git a/cmake/functions.cmake b/cmake/functions.cmake
-index 3bfd343..b41a84e 100644
---- a/cmake/functions.cmake
-+++ b/cmake/functions.cmake
-@@ -118,12 +118,12 @@ macro(google_initialize_cartographer_project)
-   set(LIST_FILES_CMD "find ${PROJECT_SOURCE_DIR}/ -not -iwholename '*.git*' | sort | sed 's/^/#/'")
-   set(FILES_LIST_PATH "${PROJECT_BINARY_DIR}/AllFiles.cmake")
-   set(DETECT_CHANGES_CMD "bash" "-c" "${LIST_FILES_CMD} | diff -N -q ${FILES_LIST_PATH} - || ${LIST_FILES_CMD} > ${FILES_LIST_PATH}")
--  add_custom_target(${PROJECT_NAME}_detect_changes ALL
--    COMMAND ${DETECT_CHANGES_CMD}
--    VERBATIM
--  )
-+  #add_custom_target(${PROJECT_NAME}_detect_changes ALL
-+  #  COMMAND ${DETECT_CHANGES_CMD}
-+  #  VERBATIM
-+  #)
-   if(NOT EXISTS ${FILES_LIST_PATH})
--    execute_process(COMMAND ${DETECT_CHANGES_CMD})
-+   # execute_process(COMMAND ${DETECT_CHANGES_CMD})
-   endif()
-   include(${FILES_LIST_PATH})
- endmacro()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e3a686..f36f15a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,27 +25,33 @@ option(BUILD_GRPC "build Cartographer gRPC support" false)
+ option(BUILD_PROMETHEUS "build Prometheus monitoring support" false)
+ 
+ include("${PROJECT_SOURCE_DIR}/cmake/functions.cmake")
+-google_initialize_cartographer_project()
+-google_enable_testing()
++#google_initialize_cartographer_project()
++#google_enable_testing()
+ 
+ find_package(Boost REQUIRED COMPONENTS iostreams)
+ find_package(Ceres REQUIRED COMPONENTS SuiteSparse)
+ find_package(Eigen3 REQUIRED)
+-find_package(LuaGoogle REQUIRED)
++find_package(Lua REQUIRED)
+ find_package(Protobuf 3.0.0 REQUIRED)
++find_package(glog REQUIRED)
++find_package(gflags REQUIRED)
+ 
+ if (${BUILD_GRPC})
+   find_package(async_grpc REQUIRED)
+ endif()
+ 
+-include(FindPkgConfig)
+-PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16)
++#include(FindPkgConfig)
++#PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16)
++if(CMAKE_BUILD_TYPE STREQUAL Debug)
++    set(CAIRO_LIB_SUFFIX d)
++endif()
++find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX})
+ 
+ # Only build the documentation if we can find Sphinx.
+-find_package(Sphinx)
+-if(SPHINX_FOUND)
+-  add_subdirectory("docs")
+-endif()
++#find_package(Sphinx)
++#if(SPHINX_FOUND)
++#  add_subdirectory("docs")
++#endif()
+ 
+ # Install catkin package.xml
+ install(FILES package.xml DESTINATION share/cartographer)
+@@ -169,20 +175,20 @@ configure_file(
+   ${PROJECT_SOURCE_DIR}/cartographer/common/config.h.cmake
+   ${PROJECT_BINARY_DIR}/cartographer/common/config.h)
+ 
+-google_binary(cartographer_autogenerate_ground_truth
+-  SRCS
+-    cartographer/ground_truth/autogenerate_ground_truth_main.cc
+-)
+-
+-google_binary(cartographer_compute_relations_metrics
+-  SRCS
+-    cartographer/ground_truth/compute_relations_metrics_main.cc
+-)
+-
+-google_binary(cartographer_migrate_serialization_format
+-  SRCS
+-    cartographer/io/migrate_serialization_format_main.cc
+-)
++#google_binary(cartographer_autogenerate_ground_truth
++#  SRCS
++#    cartographer/ground_truth/autogenerate_ground_truth_main.cc
++#)
++#
++#google_binary(cartographer_compute_relations_metrics
++#  SRCS
++#    cartographer/ground_truth/compute_relations_metrics_main.cc
++#)
++#
++#google_binary(cartographer_migrate_serialization_format
++#  SRCS
++#    cartographer/io/migrate_serialization_format_main.cc
++#)
+ 
+ if(${BUILD_GRPC})
+   google_binary(cartographer_grpc_server
+@@ -213,8 +219,9 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${Boost_LIBRARIES})
+ 
+ # We expect find_package(Ceres) to have located these for us.
+-target_link_libraries(${PROJECT_NAME} PUBLIC glog)
+-target_link_libraries(${PROJECT_NAME} PUBLIC gflags)
++#target_link_libraries(${PROJECT_NAME} PUBLIC glog)
++#target_link_libraries(${PROJECT_NAME} PUBLIC gflags)
++target_link_libraries(${PROJECT_NAME} PUBLIC ${CAIRO_LIBRARY})
+ 
+ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
+   "${CAIRO_INCLUDE_DIRS}")
+@@ -224,7 +231,8 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
+   ${PROTOBUF_INCLUDE_DIR})
+ # TODO(hrapp): This should not explicitly list pthread and use
+ # PROTOBUF_LIBRARIES, but that failed on first try.
+-target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread)
++#target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread)
++target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY})
+ if(${BUILD_GRPC})
+   target_link_libraries(${PROJECT_NAME} PUBLIC grpc++)
+   target_link_libraries(${PROJECT_NAME} PUBLIC async_grpc)
+@@ -234,7 +242,7 @@ if(${BUILD_PROMETHEUS})
+   target_compile_definitions(${PROJECT_NAME} PUBLIC USE_PROMETHEUS=1)
+ endif()
+ 
+-set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
++set(TARGET_COMPILE_FLAGS "-D_DISABLE_EXTENDED_ALIGNED_STORAGE ${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES
+   COMPILE_FLAGS ${TARGET_COMPILE_FLAGS})
+ 
+@@ -255,7 +263,7 @@ foreach(ABS_FIL ${ALL_TESTS})
+   get_filename_component(FIL_WE ${REL_FIL} NAME_WE)
+   # Replace slashes as required for CMP0037.
+   string(REPLACE "/" "." TEST_TARGET_NAME "${DIR}/${FIL_WE}")
+-  google_test("${TEST_TARGET_NAME}" ${ABS_FIL})
++  #google_test("${TEST_TARGET_NAME}" ${ABS_FIL})
+   if(${BUILD_GRPC})
+     target_link_libraries("${TEST_TARGET_NAME}" PUBLIC grpc++)
+     target_link_libraries("${TEST_TARGET_NAME}" PUBLIC async_grpc)
+@@ -263,7 +271,7 @@ foreach(ABS_FIL ${ALL_TESTS})
+   if(${BUILD_PROMETHEUS})
+     target_link_libraries("${TEST_TARGET_NAME}" PUBLIC prometheus-cpp)
+   endif()
+-  target_link_libraries("${TEST_TARGET_NAME}" PUBLIC ${TEST_LIB})
++  #target_link_libraries("${TEST_TARGET_NAME}" PUBLIC ${TEST_LIB})
+ endforeach()
+ 
+ # Add the binary directory first, so that port.h is included after it has
+diff --git a/cartographer/common/math.h b/cartographer/common/math.h
+index c4a77ef..0248f66 100644
+--- a/cartographer/common/math.h
++++ b/cartographer/common/math.h
+@@ -17,6 +17,10 @@
+ #ifndef CARTOGRAPHER_COMMON_MATH_H_
+ #define CARTOGRAPHER_COMMON_MATH_H_
+ 
++#ifndef M_PI
++#define M_PI 3.14159265358979323846
++#endif
++
+ #include <cmath>
+ #include <vector>
+ 
+diff --git a/cartographer/common/thread_pool.cc b/cartographer/common/thread_pool.cc
+index bc3c743..db424d1 100644
+--- a/cartographer/common/thread_pool.cc
++++ b/cartographer/common/thread_pool.cc
+@@ -16,7 +16,7 @@
+ 
+ #include "cartographer/common/thread_pool.h"
+ 
+-#include <unistd.h>
++//#include <unistd.h>
+ #include <algorithm>
+ #include <chrono>
+ #include <numeric>
+diff --git a/cmake/functions.cmake b/cmake/functions.cmake
+index 3bfd343..3d961b0 100644
+--- a/cmake/functions.cmake
++++ b/cmake/functions.cmake
+@@ -118,12 +118,12 @@ macro(google_initialize_cartographer_project)
+   set(LIST_FILES_CMD "find ${PROJECT_SOURCE_DIR}/ -not -iwholename '*.git*' | sort | sed 's/^/#/'")
+   set(FILES_LIST_PATH "${PROJECT_BINARY_DIR}/AllFiles.cmake")
+   set(DETECT_CHANGES_CMD "bash" "-c" "${LIST_FILES_CMD} | diff -N -q ${FILES_LIST_PATH} - || ${LIST_FILES_CMD} > ${FILES_LIST_PATH}")
+-  add_custom_target(${PROJECT_NAME}_detect_changes ALL
+-    COMMAND ${DETECT_CHANGES_CMD}
+-    VERBATIM
+-  )
++  #add_custom_target(${PROJECT_NAME}_detect_changes ALL
++  #  COMMAND ${DETECT_CHANGES_CMD}
++  #  VERBATIM
++  #)
+   if(NOT EXISTS ${FILES_LIST_PATH})
+-    execute_process(COMMAND ${DETECT_CHANGES_CMD})
++    #execute_process(COMMAND ${DETECT_CHANGES_CMD})
+   endif()
+   include(${FILES_LIST_PATH})
+ endmacro()
diff --git a/ports/cartographer/portfile.cmake b/ports/cartographer/portfile.cmake
index 45a3c1b99..889adddfb 100644
--- a/ports/cartographer/portfile.cmake
+++ b/ports/cartographer/portfile.cmake
@@ -1,25 +1,27 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO googlecartographer/cartographer
-    REF a7ed7e224f98b396762c865b81b62dc3abea2e81
-    SHA512 2ab167c1c314591b4916baf70b8ad92ae542986c3578319d2454c904adae10f8027bc696579d6e2864d3606a6711563b82438e847527cad4ab0c2bd603a63eb7
+    REF 1.0.0
+    SHA512 4e3b38ee40d9758cbd51f087578b82efb7d1199b4b7696d31f45938ac06250caaea2b4d85ccb0a848c958ba187a0101ee95c87323ca236c613995b23b215041c
     HEAD_REF master
 	PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-find-packages.patch
-        ${CMAKE_CURRENT_LIST_DIR}/disable-C2338-cartographer.patch
+        fix-find-packages.patch
+        disable-C2338-cartographer.patch
+        fix-build-error.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=OFF 
-        -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF 
-        -Dgtest_disable_pthreads=ON 
+        -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=OFF
+        -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF
+        -Dgtest_disable_pthreads=ON
         -DCMAKE_USE_PTHREADS_INIT=OFF
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
     OPTIONS_DEBUG
         -DFORCE_DEBUG_BUILD=True
 )
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
index 8a6b57c53..7f78259db 100644
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
 Source: catch2
-Version: 2.6.0
+Version: 2.7.2
 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 63bcc3832..372b627ac 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.6.0
-    SHA512 8d693cce413421ca747a0a3864d72c20f30fb8e432eb1f13e69605a71cc4e536d6710561f989cce6783d28f8b667b8da42c624056c4d412852885a8cf0df1e5d
+    REF v2.7.2
+    SHA512 ac58cb3b676c73a361a494492e7b1f1b85cba7d08feb2d09b2269109a89b66aa37efead6b0a9fca64678f42a3395a3b02b6d461b4cb35310451ce849a79d04ae
     HEAD_REF master
 )
 
diff --git a/ports/cccapstone/CONTROL b/ports/cccapstone/CONTROL
index d81c1acda..05403f434 100644
--- a/ports/cccapstone/CONTROL
+++ b/ports/cccapstone/CONTROL
@@ -1,4 +1,4 @@
 Source: cccapstone
-Version: 9b4128ee1153e78288a1b5433e2c06a0d47a4c4e
+Version: 9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1
 Description: c++ bindings for capstone disasembly framework
 Build-Depends: capstone
diff --git a/ports/cccapstone/fix-include-path.patch b/ports/cccapstone/fix-include-path.patch
new file mode 100644
index 000000000..266308149
--- /dev/null
+++ b/ports/cccapstone/fix-include-path.patch
@@ -0,0 +1,24 @@
+diff --git a/cppbindings/CsCapstoneHelper.hh b/cppbindings/CsCapstoneHelper.hh
+index daf7a73..8ed5194 100644
+--- a/cppbindings/CsCapstoneHelper.hh
++++ b/cppbindings/CsCapstoneHelper.hh
+@@ -1,6 +1,6 @@
+ #pragma once
+ 
+-#include <capstone.h>
++#include <capstone/capstone.h>
+ #include <memory>
+ 
+ struct CS_HANDLE :
+diff --git a/cppbindings/CsIns.hpp b/cppbindings/CsIns.hpp
+index 6e8ba71..c723be9 100644
+--- a/cppbindings/CsIns.hpp
++++ b/cppbindings/CsIns.hpp
+@@ -1,6 +1,6 @@
+ #pragma once
+ 
+-#include <capstone.h>
++#include <capstone/capstone.h>
+ #include "CsCapstoneHelper.hh"
+ 
+ //x86_insn_group, x86_reg, x86_op_type, x86_insn
diff --git a/ports/cccapstone/portfile.cmake b/ports/cccapstone/portfile.cmake
index 69b8bcef7..d653783c3 100644
--- a/ports/cccapstone/portfile.cmake
+++ b/ports/cccapstone/portfile.cmake
@@ -5,6 +5,7 @@ vcpkg_from_github(
     REPO zer0mem/cccapstone
     SHA512 d0023586281f921314dbba501fa2c06d822b1adba0a0c32f30b78628ee935e5822caebe3881a5d1cc4cc696b82a7e348044d887a7f652303359d2853d2ee45fb
     HEAD_REF master
+    PATCHES fix-include-path.patch
 )
 
 file(INSTALL ${SOURCE_PATH}/cppbindings/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/cccapstone/cppbindings)
diff --git a/ports/ccd/CONTROL b/ports/ccd/CONTROL
index 9246cec90..d621c107a 100644
--- a/ports/ccd/CONTROL
+++ b/ports/ccd/CONTROL
@@ -1,3 +1,3 @@
 Source: ccd
-Version: 2.0.0-2
+Version: 2.1
 Description: Library for collision detection between two convex shapes
diff --git a/ports/ccd/portfile.cmake b/ports/ccd/portfile.cmake
index 0ce278220..ba9b3a6f6 100644
--- a/ports/ccd/portfile.cmake
+++ b/ports/ccd/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github( 
     OUT_SOURCE_PATH SOURCE_PATH 
     REPO danfis/libccd
-    REF 64f02f741ac94fccd0fb660a5bffcbe6d01d9939
-    SHA512 901b09d57e119e4661b3556bbefe5a4d58cb843bff5c76ee3952fe379ff183c878a04e86e6192006c11012309c6e93d42319e9d606abdf7ad723f6d8afeea47f
+    REF v2.1
+    SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d
     HEAD_REF master 
 ) 
 
diff --git a/ports/cctz/CMakeLists.txt b/ports/cctz/CMakeLists.txt
index af557830c..e21b1ca68 100644
--- a/ports/cctz/CMakeLists.txt
+++ b/ports/cctz/CMakeLists.txt
@@ -4,7 +4,6 @@ project(cctz CXX)
 set(CMAKE_CXX_STANDARD 14)
 
 set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
     option(INSTALL_HEADERS "Install header files" ON)
@@ -12,6 +11,8 @@ else()
     option(INSTALL_HEADERS "Install header files" OFF)
 endif()
 
+find_package(benchmark CONFIG REQUIRED)
+
 file(GLOB SOURCES src/*.cc)
 list(FILTER SOURCES EXCLUDE REGEX "_test.cc$|benchmarks|_tool.cc$")
 
@@ -19,6 +20,7 @@ file(GLOB HEADERS include/cctz/*.h)
 
 add_library(cctz ${SOURCES})
 target_include_directories(cctz PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
+target_link_libraries(cctz PRIVATE benchmark::benchmark benchmark::benchmark_main)
 
 if(INSTALL_HEADERS)
     install(FILES ${HEADERS} DESTINATION "include/cctz")
diff --git a/ports/cctz/CONTROL b/ports/cctz/CONTROL
index be0bf9602..2934951b4 100644
--- a/ports/cctz/CONTROL
+++ b/ports/cctz/CONTROL
@@ -1,3 +1,4 @@
 Source: cctz
-Version: 2.2
+Version: 2.3-2
+Build-Depends: benchmark
 Description: two libraries that cooperate with <chrono> to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.
diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake
index d243e1e65..d429e7f52 100644
--- a/ports/cctz/portfile.cmake
+++ b/ports/cctz/portfile.cmake
@@ -1,27 +1,30 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
-include(vcpkg_common_functions)
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/cctz
-    REF v2.2
-    SHA512 27a9116721a78aff4f692499a48b48ddab7210216b84cff4192414c3e769fede4018118422676981a41ccd09e517a0892d6d732ed7e347ac5e4026ae64999fa4
-    HEAD_REF master
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz TARGET_PATH share/unofficial-cctz)
-
-vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctz RENAME copyright)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/cctz
+    REF v2.3
+    SHA512 e688ddac1bff108e8315bf94cb61483b72b0d16f601e4e1eeb0fd5c064aefe5a573eee66e8903401aa4c2be71ea9f10dd6c9a9cdf8379f5bb6073248a21a83ff
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz TARGET_PATH share/unofficial-cctz)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctz RENAME copyright)
diff --git a/ports/ceres/0001_add_missing_include_path.patch b/ports/ceres/0001_add_missing_include_path.patch
new file mode 100644
index 000000000..8bb8dfb50
--- /dev/null
+++ b/ports/ceres/0001_add_missing_include_path.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 02c72b5..15a947e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -582,7 +582,7 @@ include_directories(
+ # Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS
+ # used by clients after find_package(Ceres) does not identify Eigen as
+ # as system headers.
+-include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
++include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}/Eigen)
+ 
+ if (SUITESPARSE)
+   include_directories(${SUITESPARSE_INCLUDE_DIRS})
diff --git a/ports/ceres/0002_cmakelists_fixes.patch b/ports/ceres/0002_cmakelists_fixes.patch
new file mode 100644
index 000000000..f806794a8
--- /dev/null
+++ b/ports/ceres/0002_cmakelists_fixes.patch
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 15a947e..62d8c59 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -374,27 +374,7 @@ if (MINIGLOG)
+                          GLOG_LIBRARY)
+ else (MINIGLOG)
+   unset(MINIGLOG_MAX_LOG_LEVEL CACHE)
+-  # Don't search with REQUIRED so that configuration continues if not found and
+-  # we can output an error messages explaining MINIGLOG option.
+-  find_package(Glog)
+-  if (NOT GLOG_FOUND)
+-    message(FATAL_ERROR "Can't find Google Log (glog). Please set either: "
+-      "glog_DIR (newer CMake built versions of glog) or GLOG_INCLUDE_DIR & "
+-      "GLOG_LIBRARY or enable MINIGLOG option to use minimal glog "
+-      "implementation.")
+-  endif(NOT GLOG_FOUND)
+-  # By default, assume gflags was found, updating the message if it was not.
+-  set(GLOG_GFLAGS_DEPENDENCY_MESSAGE
+-    " Assuming glog was built with gflags support as gflags was found. "
+-    "This will make gflags a public dependency of Ceres.")
+-  if (NOT GFLAGS_FOUND)
+-    set(GLOG_GFLAGS_DEPENDENCY_MESSAGE
+-      " Assuming glog was NOT built with gflags support as gflags was "
+-      "not found.  If glog was built with gflags, please set the "
+-      "gflags search locations such that it can be found by Ceres.  "
+-      "Otherwise, Ceres may fail to link due to missing gflags symbols.")
+-  endif(NOT GFLAGS_FOUND)
+-  message("-- Found Google Log (glog)." ${GLOG_GFLAGS_DEPENDENCY_MESSAGE})
++  find_package(Glog REQUIRED)
+ endif (MINIGLOG)
+ 
+ if (NOT SCHUR_SPECIALIZATIONS)
+@@ -917,8 +897,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake"
+         DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
+ install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake"
+               "${Ceres_SOURCE_DIR}/cmake/FindEigen.cmake"
+-              "${Ceres_SOURCE_DIR}/cmake/FindGlog.cmake"
+-              "${Ceres_SOURCE_DIR}/cmake/FindGflags.cmake"
+         DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
+ 
+ # Create an uninstall target to remove all installed files.
diff --git a/ports/ceres/0003_remove_unnecessary_cmake_modules.patch b/ports/ceres/0003_remove_unnecessary_cmake_modules.patch
new file mode 100644
index 000000000..698d410b9
--- /dev/null
+++ b/ports/ceres/0003_remove_unnecessary_cmake_modules.patch
@@ -0,0 +1,949 @@
+diff --git a/cmake/FindGflags.cmake b/cmake/FindGflags.cmake
+deleted file mode 100644
+index 32c04ea..0000000
+--- a/cmake/FindGflags.cmake
++++ /dev/null
+@@ -1,591 +0,0 @@
+-# Ceres Solver - A fast non-linear least squares minimizer
+-# Copyright 2015 Google Inc. All rights reserved.
+-# http://ceres-solver.org/
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions are met:
+-#
+-# * Redistributions of source code must retain the above copyright notice,
+-#   this list of conditions and the following disclaimer.
+-# * Redistributions in binary form must reproduce the above copyright notice,
+-#   this list of conditions and the following disclaimer in the documentation
+-#   and/or other materials provided with the distribution.
+-# * Neither the name of Google Inc. nor the names of its contributors may be
+-#   used to endorse or promote products derived from this software without
+-#   specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+-# POSSIBILITY OF SUCH DAMAGE.
+-#
+-# Author: alexs.mac@gmail.com (Alex Stewart)
+-#
+-
+-# FindGflags.cmake - Find Google gflags logging library.
+-#
+-# This module will attempt to find gflags, either via an exported CMake
+-# configuration (generated by gflags >= 2.1 which are built with CMake), or
+-# by performing a standard search for all gflags components.  The order of
+-# precedence for these two methods of finding gflags is controlled by:
+-# GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION.
+-#
+-# This module defines the following variables:
+-#
+-# GFLAGS_FOUND: TRUE iff gflags is found.
+-# GFLAGS_INCLUDE_DIRS: Include directories for gflags.
+-# GFLAGS_LIBRARIES: Libraries required to link gflags.
+-# GFLAGS_NAMESPACE: The namespace in which gflags is defined.  In versions of
+-#                   gflags < 2.1, this was google, for versions >= 2.1 it is
+-#                   by default gflags, although can be configured when building
+-#                   gflags to be something else (i.e. google for legacy
+-#                   compatibility).
+-# FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION: True iff the version of gflags
+-#                                             found was built & installed /
+-#                                             exported as a CMake package.
+-#
+-# The following variables control the behaviour of this module when an exported
+-# gflags CMake configuration is not found.
+-#
+-# GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION: TRUE/FALSE, iff TRUE then
+-#                           then prefer using an exported CMake configuration
+-#                           generated by gflags >= 2.1 over searching for the
+-#                           gflags components manually.  Otherwise (FALSE)
+-#                           ignore any exported gflags CMake configurations and
+-#                           always perform a manual search for the components.
+-#                           Default: TRUE iff user does not define this variable
+-#                           before we are called, and does NOT specify either
+-#                           GFLAGS_INCLUDE_DIR_HINTS or GFLAGS_LIBRARY_DIR_HINTS
+-#                           otherwise FALSE.
+-# GFLAGS_INCLUDE_DIR_HINTS: List of additional directories in which to
+-#                           search for gflags includes, e.g: /timbuktu/include.
+-# GFLAGS_LIBRARY_DIR_HINTS: List of additional directories in which to
+-#                           search for gflags libraries, e.g: /timbuktu/lib.
+-#
+-# The following variables are also defined by this module, but in line with
+-# CMake recommended FindPackage() module style should NOT be referenced directly
+-# by callers (use the plural variables detailed above instead).  These variables
+-# do however affect the behaviour of the module via FIND_[PATH/LIBRARY]() which
+-# are NOT re-called (i.e. search for library is not repeated) if these variables
+-# are set with valid values _in the CMake cache_. This means that if these
+-# variables are set directly in the cache, either by the user in the CMake GUI,
+-# or by the user passing -DVAR=VALUE directives to CMake when called (which
+-# explicitly defines a cache variable), then they will be used verbatim,
+-# bypassing the HINTS variables and other hard-coded search locations.
+-#
+-# GFLAGS_INCLUDE_DIR: Include directory for gflags, not including the
+-#                     include directory of any dependencies.
+-# GFLAGS_LIBRARY: gflags library, not including the libraries of any
+-#                 dependencies.
+-
+-# Reset CALLERS_CMAKE_FIND_LIBRARY_PREFIXES to its value when FindGflags was
+-# invoked, necessary for MSVC.
+-macro(GFLAGS_RESET_FIND_LIBRARY_PREFIX)
+-  if (MSVC AND CALLERS_CMAKE_FIND_LIBRARY_PREFIXES)
+-    set(CMAKE_FIND_LIBRARY_PREFIXES "${CALLERS_CMAKE_FIND_LIBRARY_PREFIXES}")
+-  endif()
+-endmacro(GFLAGS_RESET_FIND_LIBRARY_PREFIX)
+-
+-# Called if we failed to find gflags or any of it's required dependencies,
+-# unsets all public (designed to be used externally) variables and reports
+-# error message at priority depending upon [REQUIRED/QUIET/<NONE>] argument.
+-macro(GFLAGS_REPORT_NOT_FOUND REASON_MSG)
+-  unset(GFLAGS_FOUND)
+-  unset(GFLAGS_INCLUDE_DIRS)
+-  unset(GFLAGS_LIBRARIES)
+-  # Do not use unset, as we want to keep GFLAGS_NAMESPACE in the cache,
+-  # but simply clear its value.
+-  set(GFLAGS_NAMESPACE "" CACHE STRING
+-    "gflags namespace (google or gflags)" FORCE)
+-
+-  # Make results of search visible in the CMake GUI if gflags has not
+-  # been found so that user does not have to toggle to advanced view.
+-  mark_as_advanced(CLEAR GFLAGS_INCLUDE_DIR
+-                         GFLAGS_LIBRARY
+-                         GFLAGS_NAMESPACE)
+-
+-  gflags_reset_find_library_prefix()
+-
+-  # Note <package>_FIND_[REQUIRED/QUIETLY] variables defined by FindPackage()
+-  # use the camelcase library name, not uppercase.
+-  if (Gflags_FIND_QUIETLY)
+-    message(STATUS "Failed to find gflags - " ${REASON_MSG} ${ARGN})
+-  elseif (Gflags_FIND_REQUIRED)
+-    message(FATAL_ERROR "Failed to find gflags - " ${REASON_MSG} ${ARGN})
+-  else()
+-    # Neither QUIETLY nor REQUIRED, use no priority which emits a message
+-    # but continues configuration and allows generation.
+-    message("-- Failed to find gflags - " ${REASON_MSG} ${ARGN})
+-  endif ()
+-  return()
+-endmacro(GFLAGS_REPORT_NOT_FOUND)
+-
+-# Verify that all variable names passed as arguments are defined (can be empty
+-# but must be defined) or raise a fatal error.
+-macro(GFLAGS_CHECK_VARS_DEFINED)
+-  foreach(CHECK_VAR ${ARGN})
+-    if (NOT DEFINED ${CHECK_VAR})
+-      message(FATAL_ERROR "Ceres Bug: ${CHECK_VAR} is not defined.")
+-    endif()
+-  endforeach()
+-endmacro(GFLAGS_CHECK_VARS_DEFINED)
+-
+-# Use check_cxx_source_compiles() to compile trivial test programs to determine
+-# the gflags namespace.  This works on all OSs except Windows.  If using Visual
+-# Studio, it fails because msbuild forces check_cxx_source_compiles() to use
+-# CMAKE_BUILD_TYPE=Debug for the test project, which usually breaks detection
+-# because MSVC requires that the test project use the same build type as gflags,
+-# which would normally be built in Release.
+-#
+-# Defines: GFLAGS_NAMESPACE in the caller's scope with the detected namespace,
+-#          which is blank (empty string, will test FALSE is CMake conditionals)
+-#          if detection failed.
+-function(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE)
+-  # Verify that all required variables are defined.
+-  gflags_check_vars_defined(
+-    GFLAGS_INCLUDE_DIR GFLAGS_LIBRARY)
+-  # Ensure that GFLAGS_NAMESPACE is always unset on completion unless
+-  # we explicitly set if after having the correct namespace.
+-  set(GFLAGS_NAMESPACE "" PARENT_SCOPE)
+-
+-  include(CheckCXXSourceCompiles)
+-  # Setup include path & link library for gflags for CHECK_CXX_SOURCE_COMPILES.
+-  set(CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
+-  set(CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES})
+-  # First try the (older) google namespace.  Note that the output variable
+-  # MUST be unique to the build type as otherwise the test is not repeated as
+-  # it is assumed to have already been performed.
+-  check_cxx_source_compiles(
+-    "#include <gflags/gflags.h>
+-     int main(int argc, char * argv[]) {
+-       google::ParseCommandLineFlags(&argc, &argv, true);
+-       return 0;
+-     }"
+-     GFLAGS_IN_GOOGLE_NAMESPACE)
+-  if (GFLAGS_IN_GOOGLE_NAMESPACE)
+-    set(GFLAGS_NAMESPACE google PARENT_SCOPE)
+-    return()
+-  endif()
+-
+-  # Try (newer) gflags namespace instead.  Note that the output variable
+-  # MUST be unique to the build type as otherwise the test is not repeated as
+-  # it is assumed to have already been performed.
+-  set(CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
+-  set(CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES})
+-  check_cxx_source_compiles(
+-    "#include <gflags/gflags.h>
+-     int main(int argc, char * argv[]) {
+-        gflags::ParseCommandLineFlags(&argc, &argv, true);
+-        return 0;
+-     }"
+-     GFLAGS_IN_GFLAGS_NAMESPACE)
+-  if (GFLAGS_IN_GFLAGS_NAMESPACE)
+-    set(GFLAGS_NAMESPACE gflags PARENT_SCOPE)
+-    return()
+-  endif (GFLAGS_IN_GFLAGS_NAMESPACE)
+-endfunction(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE)
+-
+-# Use regex on the gflags headers to attempt to determine the gflags namespace.
+-# Checks both gflags.h (contained namespace on versions < 2.1.2) and
+-# gflags_declare.h, which contains the namespace on versions >= 2.1.2.
+-# In general, this method should only be used when
+-# GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE() cannot be used, or has
+-# failed.
+-#
+-# Defines: GFLAGS_NAMESPACE in the caller's scope with the detected namespace,
+-#          which is blank (empty string, will test FALSE is CMake conditionals)
+-#          if detection failed.
+-function(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_REGEX)
+-  # Verify that all required variables are defined.
+-  gflags_check_vars_defined(GFLAGS_INCLUDE_DIR)
+-  # Ensure that GFLAGS_NAMESPACE is always undefined on completion unless
+-  # we explicitly set if after having the correct namespace.
+-  set(GFLAGS_NAMESPACE "" PARENT_SCOPE)
+-
+-  # Scan gflags.h to identify what namespace gflags was built with.  On
+-  # versions of gflags < 2.1.2, gflags.h was configured with the namespace
+-  # directly, on >= 2.1.2, gflags.h uses the GFLAGS_NAMESPACE #define which
+-  # is defined in gflags_declare.h, we try each location in turn.
+-  set(GFLAGS_HEADER_FILE ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h)
+-  if (NOT EXISTS ${GFLAGS_HEADER_FILE})
+-    gflags_report_not_found(
+-      "Could not find file: ${GFLAGS_HEADER_FILE} "
+-      "containing namespace information in gflags install located at: "
+-      "${GFLAGS_INCLUDE_DIR}.")
+-  endif()
+-  file(READ ${GFLAGS_HEADER_FILE} GFLAGS_HEADER_FILE_CONTENTS)
+-
+-  string(REGEX MATCH "namespace [A-Za-z]+"
+-    GFLAGS_NAMESPACE "${GFLAGS_HEADER_FILE_CONTENTS}")
+-  string(REGEX REPLACE "namespace ([A-Za-z]+)" "\\1"
+-    GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}")
+-
+-  if (NOT GFLAGS_NAMESPACE)
+-    gflags_report_not_found(
+-      "Failed to extract gflags namespace from header file: "
+-      "${GFLAGS_HEADER_FILE}.")
+-  endif (NOT GFLAGS_NAMESPACE)
+-
+-  if (GFLAGS_NAMESPACE STREQUAL "google" OR
+-      GFLAGS_NAMESPACE STREQUAL "gflags")
+-    # Found valid gflags namespace from gflags.h.
+-    set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" PARENT_SCOPE)
+-    return()
+-  endif()
+-
+-  # Failed to find gflags namespace from gflags.h, gflags is likely a new
+-  # version, check gflags_declare.h, which in newer versions (>= 2.1.2) contains
+-  # the GFLAGS_NAMESPACE #define, which is then referenced in gflags.h.
+-  set(GFLAGS_DECLARE_FILE ${GFLAGS_INCLUDE_DIR}/gflags/gflags_declare.h)
+-  if (NOT EXISTS ${GFLAGS_DECLARE_FILE})
+-    gflags_report_not_found(
+-      "Could not find file: ${GFLAGS_DECLARE_FILE} "
+-      "containing namespace information in gflags install located at: "
+-      "${GFLAGS_INCLUDE_DIR}.")
+-  endif()
+-  file(READ ${GFLAGS_DECLARE_FILE} GFLAGS_DECLARE_FILE_CONTENTS)
+-
+-  string(REGEX MATCH "#define GFLAGS_NAMESPACE [A-Za-z]+"
+-    GFLAGS_NAMESPACE "${GFLAGS_DECLARE_FILE_CONTENTS}")
+-  string(REGEX REPLACE "#define GFLAGS_NAMESPACE ([A-Za-z]+)" "\\1"
+-    GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}")
+-
+-  if (NOT GFLAGS_NAMESPACE)
+-    gflags_report_not_found(
+-      "Failed to extract gflags namespace from declare file: "
+-      "${GFLAGS_DECLARE_FILE}.")
+-  endif (NOT GFLAGS_NAMESPACE)
+-
+-  if (GFLAGS_NAMESPACE STREQUAL "google" OR
+-      GFLAGS_NAMESPACE STREQUAL "gflags")
+-    # Found valid gflags namespace from gflags.h.
+-    set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" PARENT_SCOPE)
+-    return()
+-  endif()
+-endfunction(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_REGEX)
+-
+-# Protect against any alternative find_package scripts for this library having
+-# been called previously (in a client project) which set GFLAGS_FOUND, but not
+-# the other variables we require / set here which could cause the search logic
+-# here to fail.
+-unset(GFLAGS_FOUND)
+-
+-# -----------------------------------------------------------------
+-# By default, if the user has expressed no preference for using an exported
+-# gflags CMake configuration over performing a search for the installed
+-# components, and has not specified any hints for the search locations, then
+-# prefer a gflags exported configuration if available.
+-if (NOT DEFINED GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION
+-    AND NOT GFLAGS_INCLUDE_DIR_HINTS
+-    AND NOT GFLAGS_LIBRARY_DIR_HINTS)
+-  message(STATUS "No preference for use of exported gflags CMake configuration "
+-    "set, and no hints for include/library directories provided. "
+-    "Defaulting to preferring an installed/exported gflags CMake configuration "
+-    "if available.")
+-  set(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION TRUE)
+-endif()
+-
+-if (GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION)
+-  # Try to find an exported CMake configuration for gflags, as generated by
+-  # gflags versions >= 2.1.
+-  #
+-  # We search twice, s/t we can invert the ordering of precedence used by
+-  # find_package() for exported package build directories, and installed
+-  # packages (found via CMAKE_SYSTEM_PREFIX_PATH), listed as items 6) and 7)
+-  # respectively in [1].
+-  #
+-  # By default, exported build directories are (in theory) detected first, and
+-  # this is usually the case on Windows.  However, on OS X & Linux, the install
+-  # path (/usr/local) is typically present in the PATH environment variable
+-  # which is checked in item 4) in [1] (i.e. before both of the above, unless
+-  # NO_SYSTEM_ENVIRONMENT_PATH is passed).  As such on those OSs installed
+-  # packages are usually detected in preference to exported package build
+-  # directories.
+-  #
+-  # To ensure a more consistent response across all OSs, and as users usually
+-  # want to prefer an installed version of a package over a locally built one
+-  # where both exist (esp. as the exported build directory might be removed
+-  # after installation), we first search with NO_CMAKE_PACKAGE_REGISTRY which
+-  # means any build directories exported by the user are ignored, and thus
+-  # installed directories are preferred.  If this fails to find the package
+-  # we then research again, but without NO_CMAKE_PACKAGE_REGISTRY, so any
+-  # exported build directories will now be detected.
+-  #
+-  # To prevent confusion on Windows, we also pass NO_CMAKE_BUILDS_PATH (which
+-  # is item 5) in [1]), to not preferentially use projects that were built
+-  # recently with the CMake GUI to ensure that we always prefer an installed
+-  # version if available.
+-  #
+-  # [1] http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:find_package
+-  find_package(gflags QUIET
+-                      NO_MODULE
+-                      NO_CMAKE_PACKAGE_REGISTRY
+-                      NO_CMAKE_BUILDS_PATH)
+-  if (gflags_FOUND)
+-    message(STATUS "Found installed version of gflags: ${gflags_DIR}")
+-  else(gflags_FOUND)
+-    # Failed to find an installed version of gflags, repeat search allowing
+-    # exported build directories.
+-    message(STATUS "Failed to find installed gflags CMake configuration, "
+-      "searching for gflags build directories exported with CMake.")
+-    # Again pass NO_CMAKE_BUILDS_PATH, as we know that gflags is exported and
+-    # do not want to treat projects built with the CMake GUI preferentially.
+-    find_package(gflags QUIET
+-                        NO_MODULE
+-                        NO_CMAKE_BUILDS_PATH)
+-    if (gflags_FOUND)
+-      message(STATUS "Found exported gflags build directory: ${gflags_DIR}")
+-    endif(gflags_FOUND)
+-  endif(gflags_FOUND)
+-
+-  set(FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION ${gflags_FOUND})
+-
+-  # gflags v2.1 - 2.1.2 shipped with a bug in their gflags-config.cmake [1]
+-  # whereby gflags_LIBRARIES = "gflags", but there was no imported target
+-  # called "gflags", they were called: gflags[_nothreads]-[static/shared].
+-  # As this causes linker errors when gflags is not installed in a location
+-  # on the current library paths, detect if this problem is present and
+-  # fix it.
+-  #
+-  # [1] https://github.com/gflags/gflags/issues/110
+-  if (gflags_FOUND)
+-    # NOTE: This is not written as additional conditions in the outer
+-    #       if (gflags_FOUND) as the NOT TARGET "${gflags_LIBRARIES}"
+-    #       condition causes problems if gflags is not found.
+-    if (${gflags_VERSION} VERSION_LESS 2.1.3 AND
+-        NOT TARGET "${gflags_LIBRARIES}")
+-      message(STATUS "Detected broken gflags install in: ${gflags_DIR}, "
+-        "version: ${gflags_VERSION} <= 2.1.2 which defines gflags_LIBRARIES = "
+-        "${gflags_LIBRARIES} which is not an imported CMake target, see: "
+-        "https://github.com/gflags/gflags/issues/110.  Attempting to fix by "
+-        "detecting correct gflags target.")
+-      # Ordering here expresses preference for detection, specifically we do not
+-      # want to use the _nothreads variants if the full library is available.
+-      list(APPEND CHECK_GFLAGS_IMPORTED_TARGET_NAMES
+-        gflags-shared gflags-static
+-        gflags_nothreads-shared gflags_nothreads-static)
+-      foreach(CHECK_GFLAGS_TARGET ${CHECK_GFLAGS_IMPORTED_TARGET_NAMES})
+-        if (TARGET ${CHECK_GFLAGS_TARGET})
+-          message(STATUS "Found valid gflags target: ${CHECK_GFLAGS_TARGET}, "
+-            "updating gflags_LIBRARIES.")
+-          set(gflags_LIBRARIES ${CHECK_GFLAGS_TARGET})
+-          break()
+-        endif()
+-      endforeach()
+-      if (NOT TARGET ${gflags_LIBRARIES})
+-        message(STATUS "Failed to fix detected broken gflags install in: "
+-          "${gflags_DIR}, version: ${gflags_VERSION} <= 2.1.2, none of the "
+-          "imported targets for gflags: ${CHECK_GFLAGS_IMPORTED_TARGET_NAMES} "
+-          "are defined.  Will continue with a manual search for gflags "
+-          "components.  We recommend you build/install a version of gflags > "
+-          "2.1.2 (or master).")
+-        set(FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION FALSE)
+-      endif()
+-    endif()
+-  endif()
+-
+-  if (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION)
+-    message(STATUS "Detected gflags version: ${gflags_VERSION}")
+-    set(GFLAGS_FOUND ${gflags_FOUND})
+-    set(GFLAGS_INCLUDE_DIR ${gflags_INCLUDE_DIR})
+-    set(GFLAGS_LIBRARY ${gflags_LIBRARIES})
+-
+-    # gflags does not export the namespace in their CMake configuration, so
+-    # use our function to determine what it should be, as it can be either
+-    # gflags or google dependent upon version & configuration.
+-    #
+-    # NOTE: We use the regex method to determine the namespace here, as
+-    #       check_cxx_source_compiles() will not use imported targets, which
+-    #       is what gflags will be in this case.
+-    gflags_check_gflags_namespace_using_regex()
+-
+-    if (NOT GFLAGS_NAMESPACE)
+-      gflags_report_not_found(
+-        "Failed to determine gflags namespace using regex for gflags "
+-        "version: ${gflags_VERSION} exported here: ${gflags_DIR} using CMake.")
+-    endif (NOT GFLAGS_NAMESPACE)
+-  else (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION)
+-    message(STATUS "Failed to find an installed/exported CMake configuration "
+-      "for gflags, will perform search for installed gflags components.")
+-  endif (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION)
+-endif(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION)
+-
+-if (NOT GFLAGS_FOUND)
+-  # Either failed to find an exported gflags CMake configuration, or user
+-  # told us not to use one.  Perform a manual search for all gflags components.
+-
+-  # Handle possible presence of lib prefix for libraries on MSVC, see
+-  # also GFLAGS_RESET_FIND_LIBRARY_PREFIX().
+-  if (MSVC)
+-    # Preserve the caller's original values for CMAKE_FIND_LIBRARY_PREFIXES
+-    # s/t we can set it back before returning.
+-    set(CALLERS_CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}")
+-    # The empty string in this list is important, it represents the case when
+-    # the libraries have no prefix (shared libraries / DLLs).
+-    set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "" "${CMAKE_FIND_LIBRARY_PREFIXES}")
+-  endif (MSVC)
+-
+-  # Search user-installed locations first, so that we prefer user installs
+-  # to system installs where both exist.
+-  list(APPEND GFLAGS_CHECK_INCLUDE_DIRS
+-    /usr/local/include
+-    /usr/local/homebrew/include # Mac OS X
+-    /opt/local/var/macports/software # Mac OS X.
+-    /opt/local/include
+-    /usr/include)
+-  list(APPEND GFLAGS_CHECK_PATH_SUFFIXES
+-    gflags/include # Windows (for C:/Program Files prefix).
+-    gflags/Include ) # Windows (for C:/Program Files prefix).
+-
+-  list(APPEND GFLAGS_CHECK_LIBRARY_DIRS
+-    /usr/local/lib
+-    /usr/local/homebrew/lib # Mac OS X.
+-    /opt/local/lib
+-    /usr/lib)
+-  list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES
+-    gflags/lib # Windows (for C:/Program Files prefix).
+-    gflags/Lib ) # Windows (for C:/Program Files prefix).
+-
+-  # Search supplied hint directories first if supplied.
+-  find_path(GFLAGS_INCLUDE_DIR
+-    NAMES gflags/gflags.h
+-    HINTS ${GFLAGS_INCLUDE_DIR_HINTS}
+-    PATHS ${GFLAGS_CHECK_INCLUDE_DIRS}
+-    PATH_SUFFIXES ${GFLAGS_CHECK_PATH_SUFFIXES})
+-  if (NOT GFLAGS_INCLUDE_DIR OR
+-      NOT EXISTS ${GFLAGS_INCLUDE_DIR})
+-    gflags_report_not_found(
+-      "Could not find gflags include directory, set GFLAGS_INCLUDE_DIR "
+-      "to directory containing gflags/gflags.h")
+-  endif (NOT GFLAGS_INCLUDE_DIR OR
+-    NOT EXISTS ${GFLAGS_INCLUDE_DIR})
+-
+-  find_library(GFLAGS_LIBRARY NAMES gflags
+-    HINTS ${GFLAGS_LIBRARY_DIR_HINTS}
+-    PATHS ${GFLAGS_CHECK_LIBRARY_DIRS}
+-    PATH_SUFFIXES ${GFLAGS_CHECK_LIBRARY_SUFFIXES})
+-  if (NOT GFLAGS_LIBRARY OR
+-      NOT EXISTS ${GFLAGS_LIBRARY})
+-    gflags_report_not_found(
+-      "Could not find gflags library, set GFLAGS_LIBRARY "
+-      "to full path to libgflags.")
+-  endif (NOT GFLAGS_LIBRARY OR
+-    NOT EXISTS ${GFLAGS_LIBRARY})
+-
+-  # gflags typically requires a threading library (which is OS dependent), note
+-  # that this defines the CMAKE_THREAD_LIBS_INIT variable.  If we are able to
+-  # detect threads, we assume that gflags requires it.
+-  find_package(Threads QUIET)
+-  set(GFLAGS_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+-  # On Windows (including MinGW), the Shlwapi library is used by gflags if
+-  # available.
+-  if (WIN32)
+-    include(CheckIncludeFileCXX)
+-    check_include_file_cxx("shlwapi.h" HAVE_SHLWAPI)
+-    if (HAVE_SHLWAPI)
+-      list(APPEND GFLAGS_LINK_LIBRARIES shlwapi.lib)
+-    endif(HAVE_SHLWAPI)
+-  endif (WIN32)
+-
+-  # Mark internally as found, then verify. GFLAGS_REPORT_NOT_FOUND() unsets
+-  # if called.
+-  set(GFLAGS_FOUND TRUE)
+-
+-  # Identify what namespace gflags was built with.
+-  if (GFLAGS_INCLUDE_DIR AND NOT GFLAGS_NAMESPACE)
+-    # To handle Windows peculiarities / CMake bugs on MSVC we try two approaches
+-    # to detect the gflags namespace:
+-    #
+-    # 1) Try to use check_cxx_source_compiles() to compile a trivial program
+-    #    with the two choices for the gflags namespace.
+-    #
+-    # 2) [In the event 1) fails] Use regex on the gflags headers to try to
+-    #    determine the gflags namespace.  Whilst this is less robust than 1),
+-    #    it does avoid any interaction with msbuild.
+-    gflags_check_gflags_namespace_using_try_compile()
+-
+-    if (NOT GFLAGS_NAMESPACE)
+-      # Failed to determine gflags namespace using check_cxx_source_compiles()
+-      # method, try and obtain it using regex on the gflags headers instead.
+-      message(STATUS "Failed to find gflags namespace using using "
+-        "check_cxx_source_compiles(), trying namespace regex instead, "
+-        "this is expected on Windows.")
+-      gflags_check_gflags_namespace_using_regex()
+-
+-      if (NOT GFLAGS_NAMESPACE)
+-        gflags_report_not_found(
+-          "Failed to determine gflags namespace either by "
+-          "check_cxx_source_compiles(), or namespace regex.")
+-      endif (NOT GFLAGS_NAMESPACE)
+-    endif (NOT GFLAGS_NAMESPACE)
+-  endif (GFLAGS_INCLUDE_DIR AND NOT GFLAGS_NAMESPACE)
+-
+-  # Make the GFLAGS_NAMESPACE a cache variable s/t the user can view it, and could
+-  # overwrite it in the CMake GUI.
+-  set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" CACHE STRING
+-    "gflags namespace (google or gflags)" FORCE)
+-
+-  # gflags does not seem to provide any record of the version in its
+-  # source tree, thus cannot extract version.
+-
+-  # Catch case when caller has set GFLAGS_NAMESPACE in the cache / GUI
+-  # with an invalid value.
+-  if (GFLAGS_NAMESPACE AND
+-      NOT GFLAGS_NAMESPACE STREQUAL "google" AND
+-      NOT GFLAGS_NAMESPACE STREQUAL "gflags")
+-    gflags_report_not_found(
+-      "Caller defined GFLAGS_NAMESPACE:"
+-      " ${GFLAGS_NAMESPACE} is not valid, not google or gflags.")
+-  endif ()
+-  # Catch case when caller has set GFLAGS_INCLUDE_DIR in the cache / GUI and
+-  # thus FIND_[PATH/LIBRARY] are not called, but specified locations are
+-  # invalid, otherwise we would report the library as found.
+-  if (GFLAGS_INCLUDE_DIR AND
+-      NOT EXISTS ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h)
+-    gflags_report_not_found(
+-      "Caller defined GFLAGS_INCLUDE_DIR:"
+-      " ${GFLAGS_INCLUDE_DIR} does not contain gflags/gflags.h header.")
+-  endif (GFLAGS_INCLUDE_DIR AND
+-    NOT EXISTS ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h)
+-  # TODO: This regex for gflags library is pretty primitive, we use lowercase
+-  #       for comparison to handle Windows using CamelCase library names, could
+-  #       this check be better?
+-  string(TOLOWER "${GFLAGS_LIBRARY}" LOWERCASE_GFLAGS_LIBRARY)
+-  if (GFLAGS_LIBRARY AND
+-      NOT "${LOWERCASE_GFLAGS_LIBRARY}" MATCHES ".*gflags[^/]*")
+-    gflags_report_not_found(
+-      "Caller defined GFLAGS_LIBRARY: "
+-      "${GFLAGS_LIBRARY} does not match gflags.")
+-  endif (GFLAGS_LIBRARY AND
+-    NOT "${LOWERCASE_GFLAGS_LIBRARY}" MATCHES ".*gflags[^/]*")
+-
+-  gflags_reset_find_library_prefix()
+-
+-endif(NOT GFLAGS_FOUND)
+-
+-# Set standard CMake FindPackage variables if found.
+-if (GFLAGS_FOUND)
+-  set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR})
+-  set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES})
+-endif (GFLAGS_FOUND)
+-
+-# Handle REQUIRED / QUIET optional arguments.
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(Gflags DEFAULT_MSG
+-  GFLAGS_INCLUDE_DIRS GFLAGS_LIBRARIES GFLAGS_NAMESPACE)
+-
+-# Only mark internal variables as advanced if we found gflags, otherwise
+-# leave them visible in the standard GUI for the user to set manually.
+-if (GFLAGS_FOUND)
+-  mark_as_advanced(FORCE GFLAGS_INCLUDE_DIR
+-    GFLAGS_LIBRARY
+-    GFLAGS_NAMESPACE
+-    gflags_DIR) # Autogenerated by find_package(gflags)
+-endif (GFLAGS_FOUND)
+diff --git a/cmake/FindGlog.cmake b/cmake/FindGlog.cmake
+deleted file mode 100644
+index 979dced..0000000
+--- a/cmake/FindGlog.cmake
++++ /dev/null
+@@ -1,346 +0,0 @@
+-# Ceres Solver - A fast non-linear least squares minimizer
+-# Copyright 2015 Google Inc. All rights reserved.
+-# http://ceres-solver.org/
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions are met:
+-#
+-# * Redistributions of source code must retain the above copyright notice,
+-#   this list of conditions and the following disclaimer.
+-# * Redistributions in binary form must reproduce the above copyright notice,
+-#   this list of conditions and the following disclaimer in the documentation
+-#   and/or other materials provided with the distribution.
+-# * Neither the name of Google Inc. nor the names of its contributors may be
+-#   used to endorse or promote products derived from this software without
+-#   specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+-# POSSIBILITY OF SUCH DAMAGE.
+-#
+-# Author: alexs.mac@gmail.com (Alex Stewart)
+-#
+-
+-# FindGlog.cmake - Find Google glog logging library.
+-#
+-# This module defines the following variables:
+-#
+-# GLOG_FOUND: TRUE iff glog is found.
+-# GLOG_INCLUDE_DIRS: Include directories for glog.
+-# GLOG_LIBRARIES: Libraries required to link glog.
+-# FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION: True iff the version of glog found
+-#                                           was built & installed / exported
+-#                                           as a CMake package.
+-#
+-# The following variables control the behaviour of this module:
+-#
+-# GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION: TRUE/FALSE, iff TRUE then
+-#                           then prefer using an exported CMake configuration
+-#                           generated by glog > 0.3.4 over searching for the
+-#                           glog components manually.  Otherwise (FALSE)
+-#                           ignore any exported glog CMake configurations and
+-#                           always perform a manual search for the components.
+-#                           Default: TRUE iff user does not define this variable
+-#                           before we are called, and does NOT specify either
+-#                           GLOG_INCLUDE_DIR_HINTS or GLOG_LIBRARY_DIR_HINTS
+-#                           otherwise FALSE.
+-# GLOG_INCLUDE_DIR_HINTS: List of additional directories in which to
+-#                         search for glog includes, e.g: /timbuktu/include.
+-# GLOG_LIBRARY_DIR_HINTS: List of additional directories in which to
+-#                         search for glog libraries, e.g: /timbuktu/lib.
+-#
+-# The following variables are also defined by this module, but in line with
+-# CMake recommended FindPackage() module style should NOT be referenced directly
+-# by callers (use the plural variables detailed above instead).  These variables
+-# do however affect the behaviour of the module via FIND_[PATH/LIBRARY]() which
+-# are NOT re-called (i.e. search for library is not repeated) if these variables
+-# are set with valid values _in the CMake cache_. This means that if these
+-# variables are set directly in the cache, either by the user in the CMake GUI,
+-# or by the user passing -DVAR=VALUE directives to CMake when called (which
+-# explicitly defines a cache variable), then they will be used verbatim,
+-# bypassing the HINTS variables and other hard-coded search locations.
+-#
+-# GLOG_INCLUDE_DIR: Include directory for glog, not including the
+-#                   include directory of any dependencies.
+-# GLOG_LIBRARY: glog library, not including the libraries of any
+-#               dependencies.
+-
+-# Reset CALLERS_CMAKE_FIND_LIBRARY_PREFIXES to its value when
+-# FindGlog was invoked.
+-macro(GLOG_RESET_FIND_LIBRARY_PREFIX)
+-  if (MSVC AND CALLERS_CMAKE_FIND_LIBRARY_PREFIXES)
+-    set(CMAKE_FIND_LIBRARY_PREFIXES "${CALLERS_CMAKE_FIND_LIBRARY_PREFIXES}")
+-  endif()
+-endmacro(GLOG_RESET_FIND_LIBRARY_PREFIX)
+-
+-# Called if we failed to find glog or any of it's required dependencies,
+-# unsets all public (designed to be used externally) variables and reports
+-# error message at priority depending upon [REQUIRED/QUIET/<NONE>] argument.
+-macro(GLOG_REPORT_NOT_FOUND REASON_MSG)
+-  unset(GLOG_FOUND)
+-  unset(GLOG_INCLUDE_DIRS)
+-  unset(GLOG_LIBRARIES)
+-  # Make results of search visible in the CMake GUI if glog has not
+-  # been found so that user does not have to toggle to advanced view.
+-  mark_as_advanced(CLEAR GLOG_INCLUDE_DIR
+-                         GLOG_LIBRARY)
+-
+-  glog_reset_find_library_prefix()
+-
+-  # Note <package>_FIND_[REQUIRED/QUIETLY] variables defined by FindPackage()
+-  # use the camelcase library name, not uppercase.
+-  if (Glog_FIND_QUIETLY)
+-    message(STATUS "Failed to find glog - " ${REASON_MSG} ${ARGN})
+-  elseif (Glog_FIND_REQUIRED)
+-    message(FATAL_ERROR "Failed to find glog - " ${REASON_MSG} ${ARGN})
+-  else()
+-    # Neither QUIETLY nor REQUIRED, use no priority which emits a message
+-    # but continues configuration and allows generation.
+-    message("-- Failed to find glog - " ${REASON_MSG} ${ARGN})
+-  endif ()
+-  return()
+-endmacro(GLOG_REPORT_NOT_FOUND)
+-
+-# Protect against any alternative find_package scripts for this library having
+-# been called previously (in a client project) which set GLOG_FOUND, but not
+-# the other variables we require / set here which could cause the search logic
+-# here to fail.
+-unset(GLOG_FOUND)
+-
+-# -----------------------------------------------------------------
+-# By default, if the user has expressed no preference for using an exported
+-# glog CMake configuration over performing a search for the installed
+-# components, and has not specified any hints for the search locations, then
+-# prefer a glog exported configuration if available.
+-if (NOT DEFINED GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION
+-    AND NOT GLOG_INCLUDE_DIR_HINTS
+-    AND NOT GLOG_LIBRARY_DIR_HINTS)
+-  message(STATUS "No preference for use of exported glog CMake configuration "
+-    "set, and no hints for include/library directories provided. "
+-    "Defaulting to preferring an installed/exported glog CMake configuration "
+-    "if available.")
+-  set(GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION TRUE)
+-endif()
+-
+-if (GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION)
+-  # Try to find an exported CMake configuration for glog, as generated by
+-  # glog versions > 0.3.4
+-  #
+-  # We search twice, s/t we can invert the ordering of precedence used by
+-  # find_package() for exported package build directories, and installed
+-  # packages (found via CMAKE_SYSTEM_PREFIX_PATH), listed as items 6) and 7)
+-  # respectively in [1].
+-  #
+-  # By default, exported build directories are (in theory) detected first, and
+-  # this is usually the case on Windows.  However, on OS X & Linux, the install
+-  # path (/usr/local) is typically present in the PATH environment variable
+-  # which is checked in item 4) in [1] (i.e. before both of the above, unless
+-  # NO_SYSTEM_ENVIRONMENT_PATH is passed).  As such on those OSs installed
+-  # packages are usually detected in preference to exported package build
+-  # directories.
+-  #
+-  # To ensure a more consistent response across all OSs, and as users usually
+-  # want to prefer an installed version of a package over a locally built one
+-  # where both exist (esp. as the exported build directory might be removed
+-  # after installation), we first search with NO_CMAKE_PACKAGE_REGISTRY which
+-  # means any build directories exported by the user are ignored, and thus
+-  # installed directories are preferred.  If this fails to find the package
+-  # we then research again, but without NO_CMAKE_PACKAGE_REGISTRY, so any
+-  # exported build directories will now be detected.
+-  #
+-  # To prevent confusion on Windows, we also pass NO_CMAKE_BUILDS_PATH (which
+-  # is item 5) in [1]), to not preferentially use projects that were built
+-  # recently with the CMake GUI to ensure that we always prefer an installed
+-  # version if available.
+-  #
+-  # NOTE: We use the NAMES option as glog erroneously uses 'google-glog' as its
+-  #       project name when built with CMake, but exports itself as just 'glog'.
+-  #       On Linux/OS X this does not break detection as the project name is
+-  #       not used as part of the install path for the CMake package files,
+-  #       e.g. /usr/local/lib/cmake/glog, where the <glog> suffix is hardcoded
+-  #       in glog's CMakeLists.  However, on Windows the project name *is*
+-  #       part of the install prefix: C:/Program Files/google-glog/[include,lib].
+-  #       However, by default CMake checks:
+-  #       C:/Program Files/<FIND_PACKAGE_ARGUMENT_NAME='glog'> which does not
+-  #       exist and thus detection fails.  Thus we use the NAMES to force the
+-  #       search to use both google-glog & glog.
+-  #
+-  # [1] http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:find_package
+-  find_package(glog QUIET
+-                    NAMES google-glog glog
+-                    NO_MODULE
+-                    NO_CMAKE_PACKAGE_REGISTRY
+-                    NO_CMAKE_BUILDS_PATH)
+-  if (glog_FOUND)
+-    message(STATUS "Found installed version of glog: ${glog_DIR}")
+-  else()
+-    # Failed to find an installed version of glog, repeat search allowing
+-    # exported build directories.
+-    message(STATUS "Failed to find installed glog CMake configuration, "
+-      "searching for glog build directories exported with CMake.")
+-    # Again pass NO_CMAKE_BUILDS_PATH, as we know that glog is exported and
+-    # do not want to treat projects built with the CMake GUI preferentially.
+-    find_package(glog QUIET
+-                      NAMES google-glog glog
+-                      NO_MODULE
+-                      NO_CMAKE_BUILDS_PATH)
+-    if (glog_FOUND)
+-      message(STATUS "Found exported glog build directory: ${glog_DIR}")
+-    endif(glog_FOUND)
+-  endif(glog_FOUND)
+-
+-  set(FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION ${glog_FOUND})
+-
+-  if (FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION)
+-    message(STATUS "Detected glog version: ${glog_VERSION}")
+-    set(GLOG_FOUND ${glog_FOUND})
+-    # glog wraps the include directories into the exported glog::glog target.
+-    set(GLOG_INCLUDE_DIR "")
+-    set(GLOG_LIBRARY glog::glog)
+-  else (FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION)
+-    message(STATUS "Failed to find an installed/exported CMake configuration "
+-      "for glog, will perform search for installed glog components.")
+-  endif (FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION)
+-endif(GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION)
+-
+-if (NOT GLOG_FOUND)
+-  # Either failed to find an exported glog CMake configuration, or user
+-  # told us not to use one.  Perform a manual search for all glog components.
+-
+-  # Handle possible presence of lib prefix for libraries on MSVC, see
+-  # also GLOG_RESET_FIND_LIBRARY_PREFIX().
+-  if (MSVC)
+-    # Preserve the caller's original values for CMAKE_FIND_LIBRARY_PREFIXES
+-    # s/t we can set it back before returning.
+-    set(CALLERS_CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}")
+-    # The empty string in this list is important, it represents the case when
+-    # the libraries have no prefix (shared libraries / DLLs).
+-    set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "" "${CMAKE_FIND_LIBRARY_PREFIXES}")
+-  endif (MSVC)
+-
+-  # Search user-installed locations first, so that we prefer user installs
+-  # to system installs where both exist.
+-  list(APPEND GLOG_CHECK_INCLUDE_DIRS
+-    /usr/local/include
+-    /usr/local/homebrew/include # Mac OS X
+-    /opt/local/var/macports/software # Mac OS X.
+-    /opt/local/include
+-    /usr/include)
+-  # Windows (for C:/Program Files prefix).
+-  list(APPEND GLOG_CHECK_PATH_SUFFIXES
+-    glog/include
+-    glog/Include
+-    Glog/include
+-    Glog/Include
+-    google-glog/include # CMake installs with project name prefix.
+-    google-glog/Include)
+-
+-  list(APPEND GLOG_CHECK_LIBRARY_DIRS
+-    /usr/local/lib
+-    /usr/local/homebrew/lib # Mac OS X.
+-    /opt/local/lib
+-    /usr/lib)
+-  # Windows (for C:/Program Files prefix).
+-  list(APPEND GLOG_CHECK_LIBRARY_SUFFIXES
+-    glog/lib
+-    glog/Lib
+-    Glog/lib
+-    Glog/Lib
+-    google-glog/lib # CMake installs with project name prefix.
+-    google-glog/Lib)
+-
+-  # Search supplied hint directories first if supplied.
+-  find_path(GLOG_INCLUDE_DIR
+-    NAMES glog/logging.h
+-    HINTS ${GLOG_INCLUDE_DIR_HINTS}
+-    PATHS ${GLOG_CHECK_INCLUDE_DIRS}
+-    PATH_SUFFIXES ${GLOG_CHECK_PATH_SUFFIXES})
+-  if (NOT GLOG_INCLUDE_DIR OR
+-      NOT EXISTS ${GLOG_INCLUDE_DIR})
+-    glog_report_not_found(
+-      "Could not find glog include directory, set GLOG_INCLUDE_DIR "
+-      "to directory containing glog/logging.h")
+-  endif (NOT GLOG_INCLUDE_DIR OR
+-    NOT EXISTS ${GLOG_INCLUDE_DIR})
+-
+-  find_library(GLOG_LIBRARY NAMES glog
+-    HINTS ${GLOG_LIBRARY_DIR_HINTS}
+-    PATHS ${GLOG_CHECK_LIBRARY_DIRS}
+-    PATH_SUFFIXES ${GLOG_CHECK_LIBRARY_SUFFIXES})
+-  if (NOT GLOG_LIBRARY OR
+-      NOT EXISTS ${GLOG_LIBRARY})
+-    glog_report_not_found(
+-      "Could not find glog library, set GLOG_LIBRARY "
+-      "to full path to libglog.")
+-  endif (NOT GLOG_LIBRARY OR
+-    NOT EXISTS ${GLOG_LIBRARY})
+-
+-  # Mark internally as found, then verify. GLOG_REPORT_NOT_FOUND() unsets
+-  # if called.
+-  set(GLOG_FOUND TRUE)
+-
+-  # Glog does not seem to provide any record of the version in its
+-  # source tree, thus cannot extract version.
+-
+-  # Catch case when caller has set GLOG_INCLUDE_DIR in the cache / GUI and
+-  # thus FIND_[PATH/LIBRARY] are not called, but specified locations are
+-  # invalid, otherwise we would report the library as found.
+-  if (GLOG_INCLUDE_DIR AND
+-      NOT EXISTS ${GLOG_INCLUDE_DIR}/glog/logging.h)
+-    glog_report_not_found(
+-      "Caller defined GLOG_INCLUDE_DIR:"
+-      " ${GLOG_INCLUDE_DIR} does not contain glog/logging.h header.")
+-  endif (GLOG_INCLUDE_DIR AND
+-    NOT EXISTS ${GLOG_INCLUDE_DIR}/glog/logging.h)
+-  # TODO: This regex for glog library is pretty primitive, we use lowercase
+-  #       for comparison to handle Windows using CamelCase library names, could
+-  #       this check be better?
+-  string(TOLOWER "${GLOG_LIBRARY}" LOWERCASE_GLOG_LIBRARY)
+-  if (GLOG_LIBRARY AND
+-      NOT "${LOWERCASE_GLOG_LIBRARY}" MATCHES ".*glog[^/]*")
+-    glog_report_not_found(
+-      "Caller defined GLOG_LIBRARY: "
+-      "${GLOG_LIBRARY} does not match glog.")
+-  endif (GLOG_LIBRARY AND
+-    NOT "${LOWERCASE_GLOG_LIBRARY}" MATCHES ".*glog[^/]*")
+-
+-  glog_reset_find_library_prefix()
+-
+-endif(NOT GLOG_FOUND)
+-
+-# Set standard CMake FindPackage variables if found.
+-if (GLOG_FOUND)
+-  set(GLOG_INCLUDE_DIRS ${GLOG_INCLUDE_DIR})
+-  set(GLOG_LIBRARIES ${GLOG_LIBRARY})
+-endif (GLOG_FOUND)
+-
+-# If we are using an exported CMake glog target, the include directories are
+-# wrapped into the target itself, and do not have to be (and are not)
+-# separately specified.  In which case, we should not add GLOG_INCLUDE_DIRS
+-# to the list of required variables in order that glog be reported as found.
+-if (FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION)
+-  set(GLOG_REQUIRED_VARIABLES GLOG_LIBRARIES)
+-else()
+-  set(GLOG_REQUIRED_VARIABLES GLOG_INCLUDE_DIRS GLOG_LIBRARIES)
+-endif()
+-
+-# Handle REQUIRED / QUIET optional arguments.
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(Glog DEFAULT_MSG
+-  ${GLOG_REQUIRED_VARIABLES})
+-
+-# Only mark internal variables as advanced if we found glog, otherwise
+-# leave them visible in the standard GUI for the user to set manually.
+-if (GLOG_FOUND)
+-  mark_as_advanced(FORCE GLOG_INCLUDE_DIR
+-                         GLOG_LIBRARY
+-                         glog_DIR) # Autogenerated by find_package(glog)
+-endif (GLOG_FOUND)
diff --git a/ports/ceres/0004_use_glog_target.patch b/ports/ceres/0004_use_glog_target.patch
new file mode 100644
index 000000000..6ca328a8e
--- /dev/null
+++ b/ports/ceres/0004_use_glog_target.patch
@@ -0,0 +1,25 @@
+diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt
+index cc43fec..18b415b 100644
+--- a/internal/ceres/CMakeLists.txt
++++ b/internal/ceres/CMakeLists.txt
+@@ -152,17 +152,9 @@ else (SCHUR_SPECIALIZATIONS)
+ endif (SCHUR_SPECIALIZATIONS)
+ 
+ # Build the list of dependencies for Ceres based on the current configuration.
+-if (NOT MINIGLOG AND GLOG_FOUND)
+-  list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GLOG_LIBRARIES})
+-  if (GFLAGS_FOUND)
+-    # If glog & gflags are both found, we assume that glog was built with
+-    # gflags, as it is awkward to perform a try_compile() to verify this
+-    # when gflags is an imported target (as it is in newer versions).
+-    # As glog #includes gflags/gflags.h in glog/logging.h if compiled with
+-    # gflags, it is thus a public dependency for Ceres in this case.
+-    list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GFLAGS_LIBRARIES})
+-  endif()
+-endif (NOT MINIGLOG AND GLOG_FOUND)
++if (NOT MINIGLOG)
++  list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES glog::glog)
++endif (NOT MINIGLOG)
+ 
+ if (SUITESPARSE AND SUITESPARSE_FOUND)
+   # Define version information for use in Solver::FullReport.
diff --git a/ports/ceres/0005_fix_exported_ceres_config.patch b/ports/ceres/0005_fix_exported_ceres_config.patch
new file mode 100644
index 000000000..5cc41013e
--- /dev/null
+++ b/ports/ceres/0005_fix_exported_ceres_config.patch
@@ -0,0 +1,92 @@
+diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in
+index d0380de..bf4c2eb 100644
+--- a/cmake/CeresConfig.cmake.in
++++ b/cmake/CeresConfig.cmake.in
+@@ -237,85 +237,8 @@ endif (EIGEN_FOUND)
+ list(APPEND CERES_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS})
+ 
+ # Glog.
+-# Flag set during configuration and build of Ceres.
+-set(CERES_USES_MINIGLOG @MINIGLOG@)
+-set(CERES_USES_GFLAGS @GFLAGS@)
+-if (CERES_USES_MINIGLOG)
+-  set(MINIGLOG_INCLUDE_DIR ${CERES_INCLUDE_DIR}/ceres/internal/miniglog)
+-  if (NOT CERES_WAS_INSTALLED)
+-    # When Ceres was exported from the build tree, the miniglog headers
+-    # will be in Ceres internal source directory, not in the public headers
+-    # directory (they are copied with the public headers when installed).
+-    set(MINIGLOG_INCLUDE_DIR
+-      ${CERES_EXPORTED_SOURCE_DIR}/internal/ceres/miniglog)
+-  endif()
+-  if (NOT EXISTS ${MINIGLOG_INCLUDE_DIR})
+-    ceres_report_not_found(
+-      "Failed to find miniglog headers in expected include directory: "
+-      "${MINIGLOG_INCLUDE_DIR}, but Ceres was compiled with MINIGLOG enabled "
+-      "(in place of glog).")
+-  endif (NOT EXISTS ${MINIGLOG_INCLUDE_DIR})
+-  list(APPEND CERES_INCLUDE_DIRS ${MINIGLOG_INCLUDE_DIR})
+-  # Output message at standard log level (not the lower STATUS) so that
+-  # the message is output in GUI during configuration to warn user.
+-  message("-- Found Ceres compiled with miniglog substitute "
+-    "for glog, beware this will likely cause problems if glog is later linked.")
+-else (CERES_USES_MINIGLOG)
+-  # Append the locations of glog when Ceres was built to the search path hints.
+-  set(GLOG_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION@)
+-  if (GLOG_WAS_BUILT_WITH_CMAKE)
+-    set(glog_DIR @glog_DIR@)
+-    set(GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION TRUE)
+-  else()
+-    list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@)
+-    get_filename_component(CERES_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH)
+-    list(APPEND GLOG_LIBRARY_DIR_HINTS ${CERES_BUILD_GLOG_LIBRARY_DIR})
+-  endif()
+-
+-  # Search quietly s/t we control the timing of the error message if not found.
+-  find_package(Glog QUIET)
+-  if (GLOG_FOUND)
+-    message(STATUS "Found required Ceres dependency: glog")
+-  else (GLOG_FOUND)
+-    ceres_report_not_found("Missing required Ceres "
+-      "dependency: glog. Searched using GLOG_INCLUDE_DIR_HINTS: "
+-      "${GLOG_INCLUDE_DIR_HINTS} and glog_DIR: ${glog_DIR}.")
+-  endif (GLOG_FOUND)
+-  list(APPEND CERES_INCLUDE_DIRS ${GLOG_INCLUDE_DIRS})
+-
+-  # gflags is only a public dependency of Ceres via glog, thus is not required
+-  # if Ceres was built with MINIGLOG.
+-  if (CERES_USES_GFLAGS)
+-    # If gflags was found as an imported CMake target, we need to call
+-    # find_packge(Gflags) again here, as imported CMake targets are not
+-    # re-exported.  Without this, the 'gflags-shared' target name which is
+-    # present in CERES_LIBRARIES in this case would not be defined, and so
+-    # CMake will assume it is a library name (which it is not) and fail to link.
+-    #
+-    # Append the locations of gflags when Ceres was built to the search path
+-    # hints.
+-    set(GFLAGS_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION@)
+-    if (GFLAGS_WAS_BUILT_WITH_CMAKE)
+-      set(gflags_DIR @gflags_DIR@)
+-      set(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION TRUE)
+-    else()
+-      list(APPEND GFLAGS_INCLUDE_DIR_HINTS @GFLAGS_INCLUDE_DIR@)
+-      get_filename_component(CERES_BUILD_GFLAGS_LIBRARY_DIR @GFLAGS_LIBRARY@ PATH)
+-      list(APPEND GFLAGS_LIBRARY_DIR_HINTS ${CERES_BUILD_GFLAGS_LIBRARY_DIR})
+-    endif()
+-
+-    # Search quietly s/t we control the timing of the error message if not found.
+-    find_package(Gflags QUIET)
+-    if (GFLAGS_FOUND)
+-      message(STATUS "Found required Ceres dependency: gflags")
+-    else()
+-      ceres_report_not_found("Missing required Ceres "
+-        "dependency: gflags. Searched using GFLAGS_INCLUDE_DIR_HINTS: "
+-        "${GFLAGS_INCLUDE_DIR_HINTS} and gflags_DIR: ${gflags_DIR}.")
+-    endif()
+-    list(APPEND CERES_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR_HINTS})
+-  endif()
+-endif (CERES_USES_MINIGLOG)
++include (CMakeFindDependencyMacro)
++find_dependency (glog NO_MODULE)
+ 
+ # Import exported Ceres targets, if they have not already been imported.
+ if (NOT TARGET ceres AND NOT Ceres_BINARY_DIR)
diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL
index 208082de7..3c890ff53 100644
--- a/ports/ceres/CONTROL
+++ b/ports/ceres/CONTROL
@@ -1,5 +1,5 @@
 Source: ceres
-Version: 1.14.0-1
+Version: 1.14.0-3
 # eigen is always required by CMake, even if it isn't used.
 Build-Depends: glog, eigen3
 Description: non-linear optimization package
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake
index 98621116b..1c52b2d93 100644
--- a/ports/ceres/portfile.cmake
+++ b/ports/ceres/portfile.cmake
@@ -14,6 +14,12 @@ vcpkg_from_github(
     REF 1.14.0
     SHA512 6dddddf5bd5834332a69add468578ad527e4d94fe85c9751ddf5fe9ad11a34918bdd9c994c49dd6ffc398333d0ac9752ac89aaef1293e2fe0a55524e303d415d
     HEAD_REF master
+    PATCHES
+        0001_add_missing_include_path.patch
+        0002_cmakelists_fixes.patch
+        0003_remove_unnecessary_cmake_modules.patch
+        0004_use_glog_target.patch
+        0005_fix_exported_ceres_config.patch
 )
 
 set(SUITESPARSE OFF)
@@ -54,7 +60,7 @@ vcpkg_configure_cmake(
         -DLAPACK=${LAPACK}
         -DSUITESPARSE=${SUITESPARSE}
         -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=ON
-        -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF # TheiaSfm doesn't work well with this
+        -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF # TheiaSfm doesn't work well with this.
         -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE}
 )
 
@@ -69,10 +75,17 @@ endif()
 vcpkg_copy_pdbs()
 
 # Changes target search path
-file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_TARGETS)
-string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n    \${CERES_CURRENT_CONFIG_DIR}/../"
-               "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n    \${CERES_CURRENT_CONFIG_DIR}/../../" CERES_TARGETS "${CERES_TARGETS}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_TARGETS}")
+if(WIN32)
+  file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_TARGETS)
+  string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n    \${CERES_CURRENT_CONFIG_DIR}/../"
+                 "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n    \${CERES_CURRENT_CONFIG_DIR}/../../" CERES_TARGETS "${CERES_TARGETS}")
+  file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_TARGETS}")
+else()
+  file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_TARGETS)
+  string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n    \${CERES_CURRENT_CONFIG_DIR}/../../../"
+                 "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n    \${CERES_CURRENT_CONFIG_DIR}/../../" CERES_TARGETS "${CERES_TARGETS}")
+  file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_TARGETS}")
+endif()
 
 # Clean
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL
index e3131bb20..d42389635 100644
--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@@ -1,5 +1,5 @@
 Source: cgal
-Version: 4.14-1
+Version: 4.14-2
 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, boost-multiprecision
 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.
 
diff --git a/ports/cgal/cgal_target_fix.patch b/ports/cgal/cgal_target_fix.patch
new file mode 100644
index 000000000..2fa5155bb
--- /dev/null
+++ b/ports/cgal/cgal_target_fix.patch
@@ -0,0 +1,49 @@
+From a0bfaee9ebed49fb65c93d7fb00a0c24c1898841 Mon Sep 17 00:00:00 2001
+From: Laurent Rineau <laurent.rineau@cgal.org>
+Date: Fri, 10 May 2019 17:31:17 +0200
+Subject: [PATCH 1/2] Consider CGAL as an imported target
+
+---
+ Installation/lib/cmake/CGAL/CGALConfig.cmake | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake
+index c2b0aed549d..08d757aad7f 100644
+--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake
++++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake
+@@ -116,7 +116,11 @@ include(CGAL_setup_target_dependencies)
+ foreach(cgal_lib ${CGAL_LIBRARIES})
+   set(WITH_${cgal_lib} TRUE)
+   if(${cgal_lib}_FOUND AND NOT TARGET ${cgal_lib})
+-    add_library(${cgal_lib} INTERFACE)
++    if(CGAL_BUILDING_LIBS)
++      add_library(${cgal_lib} INTERFACE)
++    else()
++      add_library(${cgal_lib} INTERFACE IMPORTED GLOBAL)
++    endif()
+     if(NOT TARGET CGAL::${cgal_lib})
+       add_library(CGAL::${cgal_lib} ALIAS ${cgal_lib})
+     endif()
+
+From c2e8365303b97669fe50ea2427c9943049575be4 Mon Sep 17 00:00:00 2001
+From: Laurent Rineau <laurent.rineau@cgal.org>
+Date: Fri, 10 May 2019 17:47:58 +0200
+Subject: [PATCH 2/2] Actually, it can only work with CMake>=3.11
+
+---
+ Installation/lib/cmake/CGAL/CGALConfig.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake
+index 08d757aad7f..8ef95a85c94 100644
+--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake
++++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake
+@@ -116,7 +116,7 @@ include(CGAL_setup_target_dependencies)
+ foreach(cgal_lib ${CGAL_LIBRARIES})
+   set(WITH_${cgal_lib} TRUE)
+   if(${cgal_lib}_FOUND AND NOT TARGET ${cgal_lib})
+-    if(CGAL_BUILDING_LIBS)
++    if(CGAL_BUILDING_LIBS OR CMAKE_VERSION VERSION_LESS "3.11")
+       add_library(${cgal_lib} INTERFACE)
+     else()
+       add_library(${cgal_lib} INTERFACE IMPORTED GLOBAL)
diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake
index 58199cc54..873298305 100644
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@@ -13,6 +13,8 @@ vcpkg_from_github(
     REF releases/CGAL-4.14
     SHA512 c70b3ad475f6b2c03ecb540e195b4d26a709205c511b0c705dfddb5b14ef372453ce1d4d49ed342fcd21ba654dea793e91c058afae626276bfb3cfd72bccb382
     HEAD_REF master
+    PATCHES
+        cgal_target_fix.patch
 )
 
 set(WITH_CGAL_Qt5  OFF)
diff --git a/ports/cgicc/CONTROL b/ports/cgicc/CONTROL
index 6caa44df1..cf25b698d 100644
--- a/ports/cgicc/CONTROL
+++ b/ports/cgicc/CONTROL
@@ -1,3 +1,3 @@
-Source: cgicc
-Version: 3.2.19
-Description: GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web
+Source: cgicc
+Version: 3.2.19-1
+Description: GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web
diff --git a/ports/cgicc/portfile.cmake b/ports/cgicc/portfile.cmake
index 9851e0f80..58a970877 100644
--- a/ports/cgicc/portfile.cmake
+++ b/ports/cgicc/portfile.cmake
@@ -1,9 +1,8 @@
 
 include(vcpkg_common_functions)
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-      message(WARNING "Warning: Dynamic building not supported. Building static.")
-      set(VCPKG_LIBRARY_LINKAGE static)
-  endif()
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cgicc-3.2.19)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnu.org/gnu/cgicc/cgicc-3.2.19.tar.gz"
diff --git a/ports/cgltf/CONTROL b/ports/cgltf/CONTROL
new file mode 100644
index 000000000..4967e5715
--- /dev/null
+++ b/ports/cgltf/CONTROL
@@ -0,0 +1,3 @@
+Source: cgltf
+Version: 2019-04-30
+Description: Single-file glTF 2.0 parser written in C99
diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake
new file mode 100644
index 000000000..2d1569196
--- /dev/null
+++ b/ports/cgltf/portfile.cmake
@@ -0,0 +1,16 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jkuhlmann/cgltf
+    REF 093ef81bf63ec18ba6d9f61073da8881fb7619b3
+    SHA512 8801c13ee98780e845c7d28b27d523af86ab2a49499bbb235ee67a91dfacda3c7fddc9503d91918001a432267f890e82c2204a9c1462c64467034d334b0eadf2
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/cgltf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL
index 932988fe8..6368fb5fb 100644
--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@@ -1,3 +1,3 @@
 Source: chakracore
-Version: 1.11.5
+Version: 1.11.9
 Description: Core part of the Chakra Javascript engine
diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake
index c9cb48ac5..04b253b15 100644
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/ChakraCore
-    REF v1.11.5
-    SHA512 502cf6a4370719c60648d1af370f9da54858df746fb851cb0d67588fef334757e89f8dbf7c097762b0b341d72fe6b511355fe84a2d37c22a114f58f4290d19ee
+    REF v1.11.9
+    SHA512 4703e28f04925074bfc2057dcccee0427aacdd48f7b9f715d08a9385e4de9e804e1620cd49e8b3db7cd330d00ecd374bfaa3205dbe1f3cfce51ed0eea439a55e
     HEAD_REF master
 )
 
diff --git a/ports/check/CONTROL b/ports/check/CONTROL
index 4627d0422..8deb787bc 100644
--- a/ports/check/CONTROL
+++ b/ports/check/CONTROL
@@ -1,3 +1,3 @@
 Source: check
-Version: 0.12.0-1
+Version: 0.12.0-2
 Description: A unit testing framework for C
diff --git a/ports/check/fix-build-debug-mode.patch b/ports/check/fix-build-debug-mode.patch
new file mode 100644
index 000000000..edf430060
--- /dev/null
+++ b/ports/check/fix-build-debug-mode.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d66a5d..3b9a72d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,10 +39,6 @@ set(CHECK_VERSION
+ 
+ set(MEMORY_LEAKING_TESTS_ENABLED 1)
+ 
+-###############################################################################
+-# Set build features
+-set(CMAKE_BUILD_TYPE Debug)
+-
+ ###############################################################################
+ # Option
+ option(CHECK_ENABLE_TESTS
diff --git a/ports/check/portfile.cmake b/ports/check/portfile.cmake
index 1713a39a9..f7561db19 100644
--- a/ports/check/portfile.cmake
+++ b/ports/check/portfile.cmake
@@ -5,6 +5,8 @@ vcpkg_from_github(
     REF 0.12.0
     SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
     HEAD_REF master
+    PATCHES
+        fix-build-debug-mode.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/chmlib/CONTROL b/ports/chmlib/CONTROL
index b7f0cc863..32c86554e 100644
--- a/ports/chmlib/CONTROL
+++ b/ports/chmlib/CONTROL
@@ -1,3 +1,3 @@
-Source: chmlib
-Version: 0.40-2
-Description: CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.
+Source: chmlib
+Version: 0.40-3
+Description: CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.
diff --git a/ports/chmlib/portfile.cmake b/ports/chmlib/portfile.cmake
index e6a935b9f..99313c5cd 100644
--- a/ports/chmlib/portfile.cmake
+++ b/ports/chmlib/portfile.cmake
@@ -1,20 +1,18 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 set(CHMLIB_VERSION chmlib-0.40)
 set(CHMLIB_FILENAME ${CHMLIB_VERSION}.zip)
 set(CHMLIB_URL http://www.jedrea.com/chmlib/${CHMLIB_FILENAME})
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${CHMLIB_VERSION})
-include(vcpkg_common_functions)
 
 vcpkg_download_distfile(
     ARCHIVE
     URLS ${CHMLIB_URL}
     FILENAME ${CHMLIB_FILENAME}
     SHA512 ad3b0d49fcf99e724c0c38b9c842bae9508d0e4ad47122b0f489c113160f5344223d311abb79f25cbb0b662bb00e2925d338d60dd20a0c309bda2822cda4cd24
-)   
+)
 vcpkg_extract_source_archive(${ARCHIVE})
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL
index 6efe6545e..af149556a 100644
--- a/ports/cimg/CONTROL
+++ b/ports/cimg/CONTROL
@@ -1,3 +1,3 @@
 Source: cimg
-Version: 2.4.5
+Version: 2.6.2
 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 e19efd450..0d168fa11 100644
--- a/ports/cimg/portfile.cmake
+++ b/ports/cimg/portfile.cmake
@@ -2,9 +2,9 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "dtschump/CImg"
-    REF v.2.4.5
+    REF v.2.6.2
     HEAD_REF master
-    SHA512 0a306ba4265a0e68d358e1ca54c597e80b43e72205de161d0971cd5837ca7d48322725d6ec129381e708a1d11fb5697884a5901ac753080fd8d8c08b80b28138)
+    SHA512 6571c646c2d1c007212b3c8cd6794ff1722a0ffc4fcbbe26499cf1e74d3490e893cac5868c5b513602b336b5609316cd7f67c2e1f89b04fe79df5f93b9c6be7a)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
diff --git a/ports/cjson/CONTROL b/ports/cjson/CONTROL
new file mode 100644
index 000000000..7029313e3
--- /dev/null
+++ b/ports/cjson/CONTROL
@@ -0,0 +1,6 @@
+Source: cjson
+Version: 1.7.10-1
+Description: Ultralightweight JSON parser in ANSI C
+
+Feature: utils
+Description: Enable building the cJSON_Utils library
diff --git a/ports/cjson/fix-install-path.patch b/ports/cjson/fix-install-path.patch
new file mode 100644
index 000000000..96a65d996
--- /dev/null
+++ b/ports/cjson/fix-install-path.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 033a882..6e2b2e4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -149,7 +149,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
+ 
+ install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
+-install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_LIB}")
++install(TARGETS "${CJSON_LIB}"
++    EXPORT "${CJSON_LIB}"
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++    LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++    RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
++    INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++)
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+     install(TARGETS "${CJSON_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+ endif()
+@@ -186,7 +192,13 @@ if(ENABLE_CJSON_UTILS)
+     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson_utils.pc.in"
+         "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY)
+ 
+-    install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}")
++    install(TARGETS "${CJSON_UTILS_LIB}"
++        EXPORT "${CJSON_UTILS_LIB}"
++        ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++        LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++        RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
++        INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++    )
+     if (BUILD_SHARED_AND_STATIC_LIBS)
+         install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+     endif()
diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake
new file mode 100644
index 000000000..7db22d9ae
--- /dev/null
+++ b/ports/cjson/portfile.cmake
@@ -0,0 +1,63 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DaveGamble/cJSON
+    REF v1.7.10
+    SHA512 f8d7c9fe798b51ec3c69cabe4124d2f6372f0e6d282285e3ca951c58c971a9a520d87550530d750ff7f8055c0b6ff566f237b9af9eb345cf4f4fc4ff8c910740
+    HEAD_REF master
+    PATCHES
+        fix-install-path.patch
+)
+
+if("utils" IN_LIST FEATURES)
+    set(ENABLE_CJSON_UTILS ON)
+else()
+    set(ENABLE_CJSON_UTILS OFF)
+endif()
+
+if(CMAKE_HOST_WIN32)
+    string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_PUBLIC_SYMBOLS)
+else()
+    set(ENABLE_PUBLIC_SYMBOLS OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_SHARED_AND_STATIC_LIBS=OFF
+        -DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF
+        -DENABLE_PUBLIC_SYMBOLS=${ENABLE_PUBLIC_SYMBOLS}
+        -DENABLE_TARGET_EXPORT=ON # Export CMake config files
+        -DENABLE_CJSON_UTILS=${ENABLE_CJSON_UTILS}
+        -DENABLE_CJSON_TEST=OFF
+        -DENABLE_FUZZING=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cJSON)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+file(READ ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h _contents)
+if(ENABLE_PUBLIC_SYMBOLS)
+    string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "0 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}")
+    string(REPLACE "defined(CJSON_EXPORT_SYMBOLS)" "0 /* defined(CJSON_EXPORT_SYMBOLS) */" _contents "${_contents}")
+    string(REPLACE "defined(CJSON_IMPORT_SYMBOLS)" "1 /* defined(CJSON_IMPORT_SYMBOLS) */" _contents "${_contents}")
+else()
+    string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "1 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}")
+endif()
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h "${_contents}")
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL
index 284e6372c..1a862a113 100644
--- a/ports/clapack/CONTROL
+++ b/ports/clapack/CONTROL
@@ -1,4 +1,4 @@
 Source: clapack
-Version: 3.2.1-3
+Version: 3.2.1-4
 Description: CLAPACK (f2c'ed version of LAPACK)
-Build-Depends: openblas
+Build-Depends: openblas (!osx)
diff --git a/ports/clapack/fix-lack-library.patch b/ports/clapack/fix-lack-library.patch
index f586c04c5..8e9bd5178 100644
--- a/ports/clapack/fix-lack-library.patch
+++ b/ports/clapack/fix-lack-library.patch
@@ -1,19 +1,18 @@
-diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt
-index 2bdbd05..e77b3a3 100644
---- a/F2CLIBS/libf2c/CMakeLists.txt
-+++ b/F2CLIBS/libf2c/CMakeLists.txt
-@@ -60,3 +60,13 @@ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c)
- include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c)
- add_library(f2c STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
- set_property(TARGET f2c PROPERTY PREFIX lib)
-+
-+install(TARGETS f2c 
-+        RUNTIME DESTINATION bin
-+        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION lib)
-+        
-+install(TARGETS arithchk 
-+        RUNTIME DESTINATION tools
-+        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION lib)
-\ No newline at end of file
+diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt
+index ca1473f..fa54e94 100644
+--- a/F2CLIBS/libf2c/CMakeLists.txt
++++ b/F2CLIBS/libf2c/CMakeLists.txt
+@@ -63,3 +63,13 @@ if(UNIX)
+   target_link_libraries(f2c m)
+ endif()
+ set_property(TARGET f2c PROPERTY PREFIX lib)
++install(TARGETS f2c
++        RUNTIME DESTINATION bin
++        LIBRARY DESTINATION lib
++        ARCHIVE DESTINATION lib)
++
++install(TARGETS arithchk
++        RUNTIME DESTINATION tools
++        LIBRARY DESTINATION lib
++        ARCHIVE DESTINATION lib)
++
diff --git a/ports/clapack/link-to-math-lib.patch b/ports/clapack/link-to-math-lib.patch
new file mode 100644
index 000000000..c80a8d4ed
--- /dev/null
+++ b/ports/clapack/link-to-math-lib.patch
@@ -0,0 +1,12 @@
+diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt
+index 2bdbd05..ca1473f 100644
+--- a/F2CLIBS/libf2c/CMakeLists.txt
++++ b/F2CLIBS/libf2c/CMakeLists.txt
+@@ -59,4 +59,7 @@ endif()
+ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c)
+ include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c)
+ add_library(f2c STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
++if(UNIX)
++  target_link_libraries(f2c m)
++endif()
+ set_property(TARGET f2c PROPERTY PREFIX lib)
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake
index ec0eee40a..3c4608848 100644
--- a/ports/clapack/portfile.cmake
+++ b/ports/clapack/portfile.cmake
@@ -1,15 +1,3 @@
-# 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)
 
 if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
@@ -22,16 +10,13 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "clapack-3.2.1.tgz"
     SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-
-# apply patch can not add file
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/lapack.def DESTINATION ${SOURCE_PATH}/SRC)
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        use-other-blas-and-install-include.patch
-        fix-lack-library.patch
+vcpkg_extract_source_archive_ex(
+  OUT_SOURCE_PATH SOURCE_PATH
+  ARCHIVE ${ARCHIVE}
+  PATCHES
+    use-other-blas-and-install-include.patch
+    link-to-math-lib.patch
 )
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -41,13 +26,12 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
     )
 endif()
 
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/lapack.def DESTINATION ${SOURCE_PATH}/SRC)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-
-    # Disable this option if project cannot be built with Ninja
-    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )
 
 vcpkg_install_cmake()
diff --git a/ports/clara/CONTROL b/ports/clara/CONTROL
index cce19cdf1..b471db070 100644
--- a/ports/clara/CONTROL
+++ b/ports/clara/CONTROL
@@ -1,3 +1,3 @@
 Source: clara
-Version: 2018-11-01
+Version: 2019-03-29
 Description: A simple to use command line parser for C++
 \ No newline at end of file
diff --git a/ports/clara/portfile.cmake b/ports/clara/portfile.cmake
index 142b30120..583a07b53 100644
--- a/ports/clara/portfile.cmake
+++ b/ports/clara/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO philsquared/Clara
-    REF a6dfbbd011a79a5f729950d6f4b72c08f9529283
-    SHA512 ec3004807c35b54b2defbec7d794817cd90dad5e442fa30c7a4ef3f72d6fcfd789302388bae8752b98d7145071d43851326e476d053b15f800f9117e1a3a0d74
+    REF e3061072fd5a3739fbd11e56ecb7fef5fbd33e04
+    SHA512 5ad4b4842153e11b3e82579858c159a85c9ef76e8278ef97befecaedcd79508e89a3fcb5f5b5c3f0ac48064d5627e08cdd2a1db046a95f5b2d55d7b8a4437a92
     HEAD_REF master
 )
 file(INSTALL ${SOURCE_PATH}/single_include/clara.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/clblast/CONTROL b/ports/clblast/CONTROL
new file mode 100644
index 000000000..6b8d1c451
--- /dev/null
+++ b/ports/clblast/CONTROL
@@ -0,0 +1,4 @@
+Source: clblast
+Version: 1.5.0
+Build-Depends: opencl
+Description: A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.
+\ No newline at end of file
diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake
new file mode 100644
index 000000000..d21e1e471
--- /dev/null
+++ b/ports/clblast/portfile.cmake
@@ -0,0 +1,45 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO CNugteren/CLBlast
+    REF 1.5.0
+    SHA512 4d2ba302b3d1c449a5aaeeae97e3d0c03d8baec55276e66f80398fe87f11047f68cec6196eba1228cbfd2911bff9cf5cf5550df925d3b0f3e6ad91302817655c
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    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}/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/clblast.dll)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/clblast.dll ${CURRENT_PACKAGES_DIR}/bin/clblast.dll)
+endif()
+if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll  ${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll)
+endif()
+
+file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+if(EXE OR DEBUG_EXE)
+    file(REMOVE ${EXE} ${DEBUG_EXE})
+endif()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clblast)
+vcpkg_copy_pdbs()
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clblast)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/clblast/LICENSE ${CURRENT_PACKAGES_DIR}/share/clblast/copyright)
+\ No newline at end of file
diff --git a/ports/cli/CONTROL b/ports/cli/CONTROL
index 32d58ecfb..13fa3d73b 100644
--- a/ports/cli/CONTROL
+++ b/ports/cli/CONTROL
@@ -1,4 +1,4 @@
-Source: cli
-Version: 2019-03-21
-Description: A library for interactive command line interfaces in modern C++
-Build-Depends: boost-asio
-\ No newline at end of file
+Source: cli
+Version: 1.1
+Description: A library for interactive command line interfaces in modern C++
+Build-Depends: boost-asio
diff --git a/ports/cli/portfile.cmake b/ports/cli/portfile.cmake
index 0f6aae987..3a340b50f 100644
--- a/ports/cli/portfile.cmake
+++ b/ports/cli/portfile.cmake
@@ -1,20 +1,20 @@
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO daniele77/cli
-    REF f74c6eea9616e0a62f5b3be4e1d07ad432232e90
-    SHA512 9a5e25175844a7e9eacb05056c2e56e21be82efed6991d9c0e7d33e3a76f83d815455ec6e79d045ec15453354a1c50b0f91feef2766ae323931b4d4eb6caf1cf
-    HEAD_REF master
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cli TARGET_PATH share/cli)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cli RENAME copyright)
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO daniele77/cli
+    REF v1.1.0
+    SHA512 a3aeac666567359521d625442f5a03b35ea1e6cf7bd63cdc52dfea20397a1726ce34aeab08ffd7181b9390fb791c56e5aba0260e300329ff327282f1547940c8 
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cli TARGET_PATH share/cli)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cli RENAME copyright)
diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL
index d15d64155..3fe872020 100644
--- a/ports/cli11/CONTROL
+++ b/ports/cli11/CONTROL
@@ -1,3 +1,3 @@
 Source: cli11
-Version: 1.7.1
+Version: 1.8.0
 Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. <https://github.com/CLIUtils/CLI11>
diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake
index e00158d70..b1096cbac 100644
--- a/ports/cli11/portfile.cmake
+++ b/ports/cli11/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CLIUtils/CLI11
-    REF v1.7.1
-    SHA512 774ba3828c89ca8f0857a14d9823c11f116667f2fc305e6b2c73ccf3b194b50947821ec14073c618fc644bf6b597f6802cc2337d8a7425de4f42ba5b46e8370f
+    REF v1.8.0
+    SHA512 80071573e3eee524df1ed8cd1fc23c0e197f3ba113db361cb3c2cb843109ddb1c35a65bcb989364bc53d872a80f180e4859f9598da443b870a6260f991705182
     HEAD_REF master
 )
 
diff --git a/ports/clipp/CONTROL b/ports/clipp/CONTROL
new file mode 100644
index 000000000..ed8084936
--- /dev/null
+++ b/ports/clipp/CONTROL
@@ -0,0 +1,3 @@
+Source: clipp
+Version: 2019-04-30
+Description: command line interfaces for modern C++
+\ No newline at end of file
diff --git a/ports/clipp/portfile.cmake b/ports/clipp/portfile.cmake
new file mode 100644
index 000000000..ff86dbb3f
--- /dev/null
+++ b/ports/clipp/portfile.cmake
@@ -0,0 +1,19 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "muellan/clipp"
+    REF 2c32b2f1f7cc530b1ec1f62c92f698643bb368db
+    SHA512 4645fafe85a8099ea97b85e939747a12e9b3b92213b5b8207a9c277537377b77b5daebd88a4c090ea89cfff2937a9fc155da6e8b5558574d7129227c28826e1c
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clipp RENAME copyright)
diff --git a/ports/clockutils/CONTROL b/ports/clockutils/CONTROL
index 5a3325350..37c5ec8ca 100644
--- a/ports/clockutils/CONTROL
+++ b/ports/clockutils/CONTROL
@@ -1,3 +1,3 @@
 Source: clockutils
-Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-2
+Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3
 Description: A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.
diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake
index 28a1de440..7511158de 100644
--- a/ports/clockutils/portfile.cmake
+++ b/ports/clockutils/portfile.cmake
@@ -28,7 +28,6 @@ vcpkg_configure_cmake(
         -DCLOCKUTILS_BUILD_SHARED=${SHARED_FLAG}
 )
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/clp/CMakeLists.txt b/ports/clp/CMakeLists.txt
index 1fbdb4ab8..86305aa58 100644
--- a/ports/clp/CMakeLists.txt
+++ b/ports/clp/CMakeLists.txt
@@ -12,9 +12,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-if(BUILD_SHARED_LIBS AND MSVC)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif(BUILD_SHARED_LIBS AND MSVC)
+
 if(MSVC)
   set(
     CMAKE_CXX_FLAGS
@@ -36,8 +34,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 option(BUILD_SHARED_LIBS "" ON)
 
 #
-# 设置用于 install 的变量
-#
 # Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR
 include(GNUInstallDirs)
 
diff --git a/ports/clp/CONTROL b/ports/clp/CONTROL
index ac9b4178f..b10b63561 100644
--- a/ports/clp/CONTROL
+++ b/ports/clp/CONTROL
@@ -1,4 +1,4 @@
 Source: clp
-Version: 1.16.11-0
-Description: Clp (Coin-or linear programming) is an open-source linear programming solver written in C++. It is primarily meant to be used as a callable library, but a basic, stand-alone executable version is also available. 
+Version: 1.17.2
+Description: Clp (Coin-or linear programming) is an open-source linear programming solver written in C++. It is primarily meant to be used as a callable library, but a basic, stand-alone executable version is also available.
 Build-Depends: coinutils, osi
diff --git a/ports/clp/portfile.cmake b/ports/clp/portfile.cmake
index 08cf8af72..b76a9435c 100644
--- a/ports/clp/portfile.cmake
+++ b/ports/clp/portfile.cmake
@@ -1,46 +1,26 @@
-# 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_github(
-    OUT_SOURCE_PATH SOURCE_PATH 
-    REPO coin-or/Clp
-    REF releases/1.16.11
-    SHA512 4291ab6c4985491c100fab265ebeace88623a691f87890ed7b9240b4b1111fb55043be4e0f226cfa0e565f593f4df4c3661c570a39189f17f48b6f710a10fffe
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH})
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    set(BUILD_SHARED_LIBS ON)
-else()
-    set(BUILD_SHARED_LIBS OFF)
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    OPTIONS
-        -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Clp")
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clp RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME osi)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO coin-or/Clp
+    REF releases/1.17.2
+    SHA512 70c44f19fca58c64a745c22b6687f7885dfc88196e1dcb0c3be5b7187ccb541a7e85513eb448dd26a163dd78596c57762f4b103d4027056cf53c5c5a994dc35f
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Clp")
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clp RENAME copyright)
diff --git a/ports/cmark/CONTROL b/ports/cmark/CONTROL
index 6f756e824..8528ca579 100644
--- a/ports/cmark/CONTROL
+++ b/ports/cmark/CONTROL
@@ -1,3 +1,3 @@
-Source: cmark
-Version: 0.28.3-2
-Description: CommonMark parsing and rendering library
+Source: cmark
+Version: 0.29.0
+Description: CommonMark parsing and rendering library
diff --git a/ports/cmark/portfile.cmake b/ports/cmark/portfile.cmake
index 97324b4bf..da7ac329f 100644
--- a/ports/cmark/portfile.cmake
+++ b/ports/cmark/portfile.cmake
@@ -1,15 +1,12 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    # Note: fails due to missing cmark_export.h -- fix should be to always generate the correct export header.
-    message(FATAL_ERROR "cmark does not currently support static library linkage")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO commonmark/cmark
-    REF 0.28.3
-    SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29
+    REF 0.29.0
+    SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
     HEAD_REF master
     PATCHES
         "${CMAKE_CURRENT_LIST_DIR}/rename-shared-lib.patch"
diff --git a/ports/cmocka/CONTROL b/ports/cmocka/CONTROL
new file mode 100644
index 000000000..042cf23a7
--- /dev/null
+++ b/ports/cmocka/CONTROL
@@ -0,0 +1,3 @@
+Source: cmocka
+Version: 1.1.5-1
+Description: An elegant unit testing framework for C with support for mock objects
diff --git a/ports/cmocka/fix-uwp.patch b/ports/cmocka/fix-uwp.patch
new file mode 100644
index 000000000..cb3828b1c
--- /dev/null
+++ b/ports/cmocka/fix-uwp.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cmocka.c b/src/cmocka.c
+index 6bfc831..4c1c04b 100644
+--- a/src/cmocka.c
++++ b/src/cmocka.c
+@@ -3356,7 +3356,7 @@ int _run_tests(const UnitTest * const tests, const size_t number_of_tests) {
+ int _run_group_tests(const UnitTest * const tests, const size_t number_of_tests)
+ {
+     UnitTestFunction setup = NULL;
+-    const char *setup_name;
++    const char *setup_name = NULL;
+     size_t num_setups = 0;
+     UnitTestFunction teardown = NULL;
+     const char *teardown_name = NULL;
diff --git a/ports/cmocka/portfile.cmake b/ports/cmocka/portfile.cmake
new file mode 100644
index 000000000..a448d3a70
--- /dev/null
+++ b/ports/cmocka/portfile.cmake
@@ -0,0 +1,48 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.com
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cmocka/cmocka
+    REF cmocka-1.1.5
+    SHA512 4e305e500f448676be5503972c49089c51f38b47d8129add2205608ed73f9de8b911aee83c00da4ef52c0179a5b5ba0e3386f3bca839f18e7ab21787184d9990
+    HEAD_REF master
+    PATCHES
+        shared-lib.patch
+        static-lib.patch
+        fix-uwp.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIB)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DUNIT_TESTING=OFF
+        -DWITH_EXAMPLES=OFF
+        -DBUILD_STATIC_LIB=${BUILD_STATIC_LIB}
+        -DWITH_STATIC_LIB=${BUILD_STATIC_LIB}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+file(COPY
+    ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# Install usage
+configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
+
+# CMake integration test
+#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/cmocka/shared-lib.patch b/ports/cmocka/shared-lib.patch
new file mode 100644
index 000000000..8c2f76277
--- /dev/null
+++ b/ports/cmocka/shared-lib.patch
@@ -0,0 +1,22 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5684685..8555169 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -30,7 +30,7 @@ if (WIN32)
+         cmocka.def
+     )
+ endif (WIN32)
+-
++if (BUILD_SHARED_LIBS)
+ add_library(${CMOCKA_SHARED_LIBRARY} SHARED ${cmocka_SRCS})
+ 
+ target_include_directories(${CMOCKA_SHARED_LIBRARY}
+@@ -82,7 +82,7 @@ install(TARGETS
+             ${CMAKE_INSTALL_BINDIR}
+         COMPONENT
+             ${PROJECT_NAME})
+-
++endif (BUILD_SHARED_LIBS)
+ if (BUILD_STATIC_LIB)
+     add_library(${CMOCKA_STATIC_LIBRARY} STATIC ${cmocka_SRCS})
+ 
diff --git a/ports/cmocka/static-lib.patch b/ports/cmocka/static-lib.patch
new file mode 100644
index 000000000..f879fe25b
--- /dev/null
+++ b/ports/cmocka/static-lib.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00e568e..6e3489a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,9 +77,17 @@ install(
+ 
+ # cmake config files
+ if (WIN32)
++    if (BUILD_SHARED_LIBS)
+     set(CMOCKA_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX})
++    else()
++    set(CMOCKA_LIBRARY_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${CMOCKA_STATIC_LIBRARY}${CMAKE_IMPORT_LIBRARY_SUFFIX})
++    endif()
+ else()
++    if (BUILD_SHARED_LIBS)
+     set(CMOCKA_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
++    else()
++    set(CMOCKA_LIBRARY_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${CMOCKA_STATIC_LIBRARY}${CMAKE_STATIC_LIBRARY_SUFFIX})
++    endif()
+ endif()
+ 
+ set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE INTERNAL "")
diff --git a/ports/cmocka/usage b/ports/cmocka/usage
new file mode 100644
index 000000000..59f2a5da8
--- /dev/null
+++ b/ports/cmocka/usage
@@ -0,0 +1,5 @@
+The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
+
+    find_package(@PORT@ CONFIG REQUIRED)
+    target_include_directories(main PRIVATE ${CMOCKA_INCLUDE_DIR})
+    target_link_libraries(main PRIVATE ${CMOCKA_LIBRARIES})
diff --git a/ports/cmocka/vcpkg-cmake-wrapper.cmake b/ports/cmocka/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..49b486ff8
--- /dev/null
+++ b/ports/cmocka/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,10 @@
+_find_package(${ARGS})
+
+get_filename_component(_cmocka_lib_name ${CMOCKA_LIBRARY} NAME)
+
+set(CMOCKA_LIBRARY
+    debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/${_cmocka_lib_name}
+    optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/${_cmocka_lib_name}
+)
+
+set(CMOCKA_LIBRARIES ${CMOCKA_LIBRARY})
diff --git a/ports/coinutils/CMakeLists.txt b/ports/coinutils/CMakeLists.txt
index 953ab2b98..1a090c94d 100644
--- a/ports/coinutils/CMakeLists.txt
+++ b/ports/coinutils/CMakeLists.txt
@@ -1,111 +1,109 @@
-cmake_minimum_required(VERSION 3.11)
-
-project(CoinUtils LANGUAGES C CXX)
-
-set(PROJECT_VERSION 2.10.14)
-set(PROJECT_VERSION_MAJOR 2)
-set(PROJECT_VERSION_MINOR 10)
-set(PROJECT_VERSION_PATCH 14)
-
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-if(BUILD_SHARED_LIBS AND MSVC)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif(BUILD_SHARED_LIBS AND MSVC)
-if(MSVC)
-  set(
-    CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275"
-    )
-endif(MSVC)
-if(APPLE)
-  set(
-    CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions"
-    )
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
-      CACHE STRING "Minimum OS X deployment version")
-endif(APPLE)
-
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-# options
-option(BUILD_SHARED_LIBS "" ON)
-
-#
-# 设置用于 install 的变量
-#
-# Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR
-include(GNUInstallDirs)
-
-# Include module with fuction 'write_basic_package_version_file'
-include(CMakePackageConfigHelpers)
-
-# Layout. This works for all platforms: * <prefix>/lib*/cmake/<PROJECT-NAME> *
-# <prefix>/lib*/ * <prefix>/include/
-set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
-# Configuration
-set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
-set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
-set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
-set(namespace "Coin::")
-
-#
-# Add sources
-#
-include_directories(CoinUtils/src)
-
-file(GLOB UTILS_SOURCES
-          CoinUtils/src/*.hpp
-          CoinUtils/src/*.cpp
-          CoinUtils/src/*.h)
-add_library(${PROJECT_NAME} ${UTILS_SOURCES})
-
-target_include_directories(${PROJECT_NAME}
-                           PUBLIC $<INSTALL_INTERFACE:include/coin>)
-target_compile_definitions(${PROJECT_NAME}
-                           PUBLIC
-                           $<INSTALL_INTERFACE:-DHAVE_CMATH>
-                           $<INSTALL_INTERFACE:-D_CRT_SECURE_NO_WARNINGS>)
-
-install(TARGETS ${PROJECT_NAME}
-        EXPORT "${TARGETS_EXPORT_NAME}"
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib
-        RUNTIME DESTINATION bin
-        INCLUDES
-        DESTINATION include)
-
-install(DIRECTORY CoinUtils/src/
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin
-        FILES_MATCHING
-        PATTERN "*.h"
-        PATTERN "*.hpp")
-
-#
-# Install Libraries
-#
-# Configure '<PROJECT-NAME>ConfigVersion.cmake' Use: * PROJECT_VERSION
-write_basic_package_version_file("${version_config}"
-                                 COMPATIBILITY SameMajorVersion)
-
-# Configure '<PROJECT-NAME>Config.cmake' Use variables: * TARGETS_EXPORT_NAME *
-# PROJECT_NAME
-configure_package_config_file("Config.cmake.in"
-                              "${project_config}"
-                              INSTALL_DESTINATION
-                              "${config_install_dir}")
-
-# Config * <prefix>/lib/cmake/Foo/FooConfig.cmake *
-# <prefix>/lib/cmake/Foo/FooConfigVersion.cmake
-install(FILES "${project_config}" "${version_config}"
-        DESTINATION "${config_install_dir}")
-
-# Config * <prefix>/lib/cmake/Foo/FooTargets.cmake
-install(EXPORT "${TARGETS_EXPORT_NAME}"
-        NAMESPACE "${namespace}"
-        DESTINATION "${config_install_dir}")
+cmake_minimum_required(VERSION 3.11)
+
+project(CoinUtils LANGUAGES C CXX)
+
+set(PROJECT_VERSION 2.10.14)
+set(PROJECT_VERSION_MAJOR 2)
+set(PROJECT_VERSION_MINOR 10)
+set(PROJECT_VERSION_PATCH 14)
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+if(MSVC)
+  set(
+    CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275"
+    )
+endif(MSVC)
+if(APPLE)
+  set(
+    CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions"
+    )
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
+      CACHE STRING "Minimum OS X deployment version")
+endif(APPLE)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+# options
+option(BUILD_SHARED_LIBS "" ON)
+
+#
+# 设置用于 install 的变量
+#
+# Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR
+include(GNUInstallDirs)
+
+# Include module with fuction 'write_basic_package_version_file'
+include(CMakePackageConfigHelpers)
+
+# Layout. This works for all platforms: * <prefix>/lib*/cmake/<PROJECT-NAME> *
+# <prefix>/lib*/ * <prefix>/include/
+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
+# Configuration
+set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
+set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
+set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
+set(namespace "Coin::")
+
+#
+# Add sources
+#
+include_directories(CoinUtils/src)
+
+file(GLOB UTILS_SOURCES
+          CoinUtils/src/*.hpp
+          CoinUtils/src/*.cpp
+          CoinUtils/src/*.h)
+add_library(${PROJECT_NAME} ${UTILS_SOURCES})
+
+target_include_directories(${PROJECT_NAME}
+                           PUBLIC $<INSTALL_INTERFACE:include/coin>)
+target_compile_definitions(${PROJECT_NAME}
+                           PUBLIC
+                           $<INSTALL_INTERFACE:-DHAVE_CMATH>
+                           $<INSTALL_INTERFACE:-D_CRT_SECURE_NO_WARNINGS>)
+
+install(TARGETS ${PROJECT_NAME}
+        EXPORT "${TARGETS_EXPORT_NAME}"
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+        RUNTIME DESTINATION bin
+        INCLUDES
+        DESTINATION include)
+
+install(DIRECTORY CoinUtils/src/
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin
+        FILES_MATCHING
+        PATTERN "*.h"
+        PATTERN "*.hpp")
+
+#
+# Install Libraries
+#
+# Configure '<PROJECT-NAME>ConfigVersion.cmake' Use: * PROJECT_VERSION
+write_basic_package_version_file("${version_config}"
+                                 COMPATIBILITY SameMajorVersion)
+
+# Configure '<PROJECT-NAME>Config.cmake' Use variables: * TARGETS_EXPORT_NAME *
+# PROJECT_NAME
+configure_package_config_file("Config.cmake.in"
+                              "${project_config}"
+                              INSTALL_DESTINATION
+                              "${config_install_dir}")
+
+# Config * <prefix>/lib/cmake/Foo/FooConfig.cmake *
+# <prefix>/lib/cmake/Foo/FooConfigVersion.cmake
+install(FILES "${project_config}" "${version_config}"
+        DESTINATION "${config_install_dir}")
+
+# Config * <prefix>/lib/cmake/Foo/FooTargets.cmake
+install(EXPORT "${TARGETS_EXPORT_NAME}"
+        NAMESPACE "${namespace}"
+        DESTINATION "${config_install_dir}")
diff --git a/ports/coinutils/CONTROL b/ports/coinutils/CONTROL
index 64573dfb9..9ea94ddf5 100644
--- a/ports/coinutils/CONTROL
+++ b/ports/coinutils/CONTROL
@@ -1,3 +1,3 @@
-Source: coinutils
-Version: 2.10.14-0
-Description: CoinUtils (Coin-or Utilities) is an open-source collection of classes and functions that are generally useful to more than one COIN-OR project
+Source: coinutils
+Version: 2.11.2
+Description: CoinUtils (Coin-or Utilities) is an open-source collection of classes and functions that are generally useful to more than one COIN-OR project
diff --git a/ports/coinutils/Config.cmake.in b/ports/coinutils/Config.cmake.in
index ec01d2e5b..a53c57495 100644
--- a/ports/coinutils/Config.cmake.in
+++ b/ports/coinutils/Config.cmake.in
@@ -1,5 +1,5 @@
-
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
-check_required_components("@PROJECT_NAME@")
+
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+check_required_components("@PROJECT_NAME@")
diff --git a/ports/coinutils/portfile.cmake b/ports/coinutils/portfile.cmake
index 59582e800..109ff7994 100644
--- a/ports/coinutils/portfile.cmake
+++ b/ports/coinutils/portfile.cmake
@@ -1,49 +1,28 @@
-# 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_github(
-    OUT_SOURCE_PATH SOURCE_PATH 
-    REPO coin-or/CoinUtils
-    REF releases/2.10.14
-    SHA512 2d5108e096f126cf98750a4892ca4d946d0bad41b65f29001c116c5ad15aa4900c3091d163fa16b6a55f0518344c6681ad95bbc6efa431c77aaaaa751494c48b
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH})
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    OPTIONS
-        -DBUILD_SHARED_LIBS=OFF
-    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/CoinUtils")
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/coinutils RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME coinutils)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO coin-or/CoinUtils
+    REF releases/2.11.2
+    SHA512 4ffc1458676daffc46f2448c8962156f1f6a14d41f176462ebb695487ae3e96ae159e078f8f28ac5df4cd22544b3f19f09692725976624454d106ad33d31e30b
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/CoinUtils")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/coinutils RENAME copyright)
diff --git a/ports/concurrentqueue/CMakeLists.txt b/ports/concurrentqueue/CMakeLists.txt
new file mode 100644
index 000000000..99de84178
--- /dev/null
+++ b/ports/concurrentqueue/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.5)
+project(concurrentqueue C)
+
+add_library(concurrentqueue INTERFACE)
+
+target_include_directories(concurrentqueue INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
+
+install(TARGETS concurrentqueue
+    EXPORT concurrentqueue
+)
+install(EXPORT concurrentqueue FILE unofficial-concurrentqueue-targets.cmake NAMESPACE unofficial::concurrentqueue:: DESTINATION share/unofficial-concurrentqueue)
diff --git a/ports/concurrentqueue/CONTROL b/ports/concurrentqueue/CONTROL
index 2dea27277..34080b423 100644
--- a/ports/concurrentqueue/CONTROL
+++ b/ports/concurrentqueue/CONTROL
@@ -1,3 +1,3 @@
 Source: concurrentqueue
-Version: 1.0.0-beta
+Version: 1.0.0-beta-dea078c
 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
index 1d0de7d05..29069c153 100644
--- a/ports/concurrentqueue/portfile.cmake
+++ b/ports/concurrentqueue/portfile.cmake
@@ -4,11 +4,29 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cameron314/concurrentqueue
-    REF 1d60c7f3004a87eaa9d9cbd647d66361c868558f
-    SHA512 4b435843291f4db5be6d3fb3dd33c38a1c3c0a2e2c22910b819f119cfca2867116c5d01dd5e7d302693d467821688aac5dc7334b4a9ef39275e682f1fb99585c
+    REF dea078cf5b6e742cd67a0d725e36f872feca4de4
+    SHA512 edd47bcc025ffab7ac62cea168a9672a20cdbe139267426e97553fa1c796f1547d8414915518ee6be34a68d05e8a8171291f958c5eac0434ea8ba953bff85dbe
     HEAD_REF master
 )
 
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-concurrentqueue TARGET_PATH share/unofficial-concurrentqueue)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-config.in.cmake
+    ${CURRENT_PACKAGES_DIR}/share/unofficial-concurrentqueue/unofficial-concurrentqueue-config.cmake
+    @ONLY
+)
+
 file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrentqueue RENAME copyright)
 
 file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h)
diff --git a/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake b/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake
new file mode 100644
index 000000000..c3639637a
--- /dev/null
+++ b/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake
@@ -0,0 +1,6 @@
+if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)
+    include(CMakeFindDependencyMacro)
+    find_dependency(Threads)
+endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-targets.cmake)
+\ No newline at end of file
diff --git a/ports/constexpr/CONTROL b/ports/constexpr/CONTROL
index e8cb4749f..85b3bc0c7 100644
--- a/ports/constexpr/CONTROL
+++ b/ports/constexpr/CONTROL
@@ -1,3 +1,3 @@
-Source: constexpr
-Version: 1.0
-Description: Small MIT License Library of general stdlib functions written as C++11 constexpr functions.
+Source: constexpr
+Version: 1.0-1
+Description: Small MIT License Library of general stdlib functions written as C++11 constexpr functions.
diff --git a/ports/constexpr/portfile.cmake b/ports/constexpr/portfile.cmake
index 9563b6c15..e56b57e61 100644
--- a/ports/constexpr/portfile.cmake
+++ b/ports/constexpr/portfile.cmake
@@ -1,12 +1,13 @@
 #header-only library
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/constexpr-a98b1db39c909e0130d21d3910d4faf97035a625)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/elbeno/constexpr/archive/a98b1db39c909e0130d21d3910d4faf97035a625.zip"
-    FILENAME "constexpr-a98b1db39c909e0130d21d3910d4faf97035a625.zip"
-    SHA512 847e09f9df30cb5fbd8aa280679ff359d73c9e9454ffe3090f66975a15665080629e9a664d057f039b17430d42b5e5f5f3f92831e73c15024060991090209c2e
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO elbeno/constexpr
+    REF a98b1db39c909e0130d21d3910d4faf97035a625
+    SHA512 8802ee43b510ea1f0c00949eecd84eb2bf3ac721802e6bc6755db9e6e2742d8b97fef427eca7d4d9a282c60a18ca10401386022eac995bd22624f45e3fc2c370
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 # Put the licence file where vcpkg expects it
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE)
diff --git a/ports/coroutine/CONTROL b/ports/coroutine/CONTROL
index 2afe8ae17..075a32b26 100644
--- a/ports/coroutine/CONTROL
+++ b/ports/coroutine/CONTROL
@@ -1,4 +1,4 @@
 Source: coroutine
-Version: 1.4.1
+Version: 1.4.1-1
 Build-Depends: ms-gsl
 Description: C++ coroutine helper/example library
diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake
index 56b7535d6..f8bf5cdcf 100644
--- a/ports/coroutine/portfile.cmake
+++ b/ports/coroutine/portfile.cmake
@@ -4,34 +4,26 @@ if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86)
     message(FATAL_ERROR "This library doesn't support x86 arch. Please use x64 instead. If it is critical, create an issue at the repo: github.com/luncliff/coroutine")
 endif()
 
-# changed to 1.4.1
-set(VERSION_1_4_COMMIT 8399236a4adf1cb49ef51133fb887027e3d77141)
+# changed to 1.4.2
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO            luncliff/coroutine
-    REF             ${VERSION_1_4_COMMIT}
-    SHA512          35adf0aa3a923b869e02d1e33987f6c9922f90918e84feaf5a41e46334b7555db75f55c6dd797f74112010ef5e682ee6f5fbf58be84af88a8f8f084f3d6dac05
+    REF             1.4.2
+    SHA512          fc2544116a5bee97b8ef1501fc7f1b805248f0a0c601111f1a317e813aa1d3f9a2e08ab1b140cc36e22d9c90249301110ec5b5e55a40fb39217cf5f40998920d
     HEAD_REF        master
 )
 
 # package: 'ms-gsl'
-set(GSL_INCLUDE_DIR ${CURRENT_INSTALLED_DIR}/include 
+set(GSL_INCLUDE_DIR ${CURRENT_INSTALLED_DIR}/include
     CACHE PATH "path to include C++ core guideline support library" FORCE)
 message(STATUS "Using ms-gsl at ${GSL_INCLUDE_DIR}")
 
-set(DLL_LINKAGE false)
-if(${VCPKG_LIBRARY_LINKAGE} MATCHES dynamic)
-    message(STATUS "Using DLL linkage")
-    set(DLL_LINKAGE true)
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         -DGSL_INCLUDE_DIR=${GSL_INCLUDE_DIR}
         -DTEST_DISABLED=True
-        -DBUILD_SHARED_LIBS=${DLL_LINKAGE}
 )
 
 vcpkg_install_cmake()
@@ -42,20 +34,6 @@ file(
     RENAME      copyright
 )
 
-if(WIN32 AND DLL_LINKAGE)
-    file(INSTALL        ${CURRENT_PACKAGES_DIR}/debug/lib/coroutine.dll
-         DESTINATION    ${CURRENT_PACKAGES_DIR}/debug/bin
-    )
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/debug/lib/coroutine.dll)
-
-    file(INSTALL        ${CURRENT_PACKAGES_DIR}/lib/coroutine.dll
-         DESTINATION    ${CURRENT_PACKAGES_DIR}/bin
-    )
-    file(REMOVE         ${CURRENT_PACKAGES_DIR}/lib/coroutine.dll)
-endif()
 # removed duplicates in debug
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-
-# unset used variables
-unset(DLL_LINKAGE)
diff --git a/ports/cpp-netlib/CONTROL b/ports/cpp-netlib/CONTROL
new file mode 100644
index 000000000..361c4dced
--- /dev/null
+++ b/ports/cpp-netlib/CONTROL
@@ -0,0 +1,4 @@
+Source: cpp-netlib
+Version: 0.13.0-final
+Description: A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library
+Build-Depends: boost
+\ No newline at end of file
diff --git a/ports/cpp-netlib/portfile.cmake b/ports/cpp-netlib/portfile.cmake
new file mode 100644
index 000000000..b57efdbf1
--- /dev/null
+++ b/ports/cpp-netlib/portfile.cmake
@@ -0,0 +1,37 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cpp-netlib/cpp-netlib
+    REF cpp-netlib-0.13.0-final
+    SHA512 1839bf1acb7917acd2957f1008a44ed26a38849afb5843bfa0d5c557dde530afab4183d8d273a87d6416aad2b3a59fdecdef5fbb62bc91ed484486c80a1de5eb
+    HEAD_REF master
+)
+
+ vcpkg_configure_cmake(
+      SOURCE_PATH ${SOURCE_PATH}
+      PREFER_NINJA
+	  OPTIONS
+      -DCPP-NETLIB_BUILD_TESTS=off
+      -DCPP-NETLIB_BUILD_EXAMPLES=off
+	  
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+if(WIN32 AND NOT CYGWIN)
+  vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/${PORT})
+else()
+  vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cppnetlib)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
index 5f001f04d..4030f9ce9 100644
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@@ -1,4 +1,4 @@
-Source: cpp-redis
-Version: 4.3.1
-Build-Depends: tacopie
-Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
+Source: cpp-redis
+Version: 4.3.1-1
+Build-Depends: tacopie
+Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake
index c9feba68d..ee19a6510 100644
--- a/ports/cpp-redis/portfile.cmake
+++ b/ports/cpp-redis/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cylix/cpp_redis
@@ -27,7 +29,6 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG}
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE
 )
 
 vcpkg_install_cmake()
diff --git a/ports/cppcms/CONTROL b/ports/cppcms/CONTROL
index 8f8726ddc..f33c94ed9 100644
--- a/ports/cppcms/CONTROL
+++ b/ports/cppcms/CONTROL
@@ -1,4 +1,4 @@
-Source: cppcms
-Version: 1.1.0-1
-Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development
-Build-Depends: icu, pcre, openssl, zlib
+Source: cppcms
+Version: 1.1.0-2
+Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development
+Build-Depends: icu, pcre, openssl, zlib
diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake
index 328ba20db..c9ccca85b 100644
--- a/ports/cppcms/portfile.cmake
+++ b/ports/cppcms/portfile.cmake
@@ -1,13 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "cppcms doesn't support static linkage. Building dynamic instead.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
-if(VCPKG_CRT_LINKAGE STREQUAL static)
-    message(FATAL_ERROR "cppcms doesn't support static CRT linkage.")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/cppcodec/CONTROL b/ports/cppcodec/CONTROL
new file mode 100644
index 000000000..32f72bf2f
--- /dev/null
+++ b/ports/cppcodec/CONTROL
@@ -0,0 +1,3 @@
+Source: cppcodec
+Version: 0.2
+Description: Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32.
+\ No newline at end of file
diff --git a/ports/cppcodec/portfile.cmake b/ports/cppcodec/portfile.cmake
new file mode 100644
index 000000000..b445f4d47
--- /dev/null
+++ b/ports/cppcodec/portfile.cmake
@@ -0,0 +1,24 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO tplgy/cppcodec
+    REF v0.2
+    SHA512 50c9c81cdb12560c87e513e1fd22c1ad24ea37b7d20a0e3044d43fb887f4c6494c69468e4d0811cd2fc1ae8fdb01b01cfb9f3cfdd8611d4bb0221cbd38cbead3
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+       -DBUILD_TESTING=OFF
+    
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+    
diff --git a/ports/cppfs/CONTROL b/ports/cppfs/CONTROL
index 30ec75f00..d94532e8a 100644
--- a/ports/cppfs/CONTROL
+++ b/ports/cppfs/CONTROL
@@ -1,7 +1,7 @@
-Source: cppfs
-Version: 1.2.0
-Description: Cross-platform C++ file system library supporting multiple backends
-
-Feature: ssh
-Description: SSH backend for cppfs
-Build-Depends: libssh2,openssl,zlib
+Source: cppfs
+Version: 1.2.0-1
+Description: Cross-platform C++ file system library supporting multiple backends
+
+Feature: ssh
+Description: SSH backend for cppfs
+Build-Depends: libssh2,openssl,zlib
diff --git a/ports/cppfs/portfile.cmake b/ports/cppfs/portfile.cmake
index 33ea7e605..b108c5574 100644
--- a/ports/cppfs/portfile.cmake
+++ b/ports/cppfs/portfile.cmake
@@ -15,11 +15,6 @@ if(${TARGET_TRIPLET} MATCHES "uwp")
     message(FATAL_ERROR "cppfs does not support uwp")
 endif()
 
-set(SHARED_LIBS Off)
-if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic")
-    set(SHARED_LIBS On)
-endif()
-
 set(SSH_BACKEND OFF)
 if("ssh" IN_LIST FEATURES)
     set(SSH_BACKEND ON)
@@ -31,10 +26,9 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS 
+    OPTIONS
         -DOPTION_BUILD_SSH_BACKEND=${SSH_BACKEND}
         -DOPTION_BUILD_TESTS=Off
-        -DBUILD_SHARED_LIBS=${SHARED_LIBS}
         -DOPTION_FORCE_SYSTEM_DIR_INSTALL=On
 )
 
diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL
index d2c09e78b..d3f13de82 100644
--- a/ports/cppgraphqlgen/CONTROL
+++ b/ports/cppgraphqlgen/CONTROL
@@ -1,4 +1,4 @@
 Source: cppgraphqlgen
-Version: 2.1.0
-Build-Depends: pegtl, rapidjson
+Version: 3.0.0
+Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson
 Description: C++ GraphQL schema service generator
diff --git a/ports/cppgraphqlgen/bigobj.patch b/ports/cppgraphqlgen/bigobj.patch
deleted file mode 100644
index 396dd58e6..000000000
--- a/ports/cppgraphqlgen/bigobj.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.orig	2019-04-11 10:26:38.546721500 -0500
-+++ CMakeLists.txt	2019-04-11 10:27:19.863951400 -0500
-@@ -34,6 +34,9 @@ add_executable(schemagen
-   GraphQLTree.cpp
-   GraphQLResponse.cpp
-   SchemaGenerator.cpp)
-+if(MSVC)
-+  set_source_files_properties(GraphQLTree.cpp PROPERTIES COMPILE_FLAGS /bigobj)
-+endif()
- target_link_libraries(schemagen PRIVATE taocpp::pegtl)
- target_include_directories(schemagen PRIVATE
-   ${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake
index ba3d6036d..5c92e1a60 100644
--- a/ports/cppgraphqlgen/portfile.cmake
+++ b/ports/cppgraphqlgen/portfile.cmake
@@ -3,25 +3,25 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cppgraphqlgen
-    REF v2.1.0
-    SHA512 6fdeade25fc5c4af18d0288b80044a94cc9dcba9eed1640ec2cce06741b874f027930761964ed72073a25e083c0cf2fb828b9cf9732099c8a4f185776b1e1b8a
+    REF v3.0.0
+    SHA512 26da9b559b7220f44bc1aabd68250a4cf869329a5496ac439f9bc7cea5137e0ef9068dc6e868adf441cd5c212f21dd08f0a21db393eb4c237525961eefd49389
     HEAD_REF master
-    PATCHES
-    bigobj.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DBUILD_TESTS=OFF -DUPDATE_SAMPLES=OFF
-    OPTIONS_RELEASE -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen
-    OPTIONS_DEBUG -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/debug/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/debug/tools/cppgraphqlgen
+    OPTIONS -DGRAPHQL_BUILD_TESTS=OFF -DGRAPHQL_UPDATE_SAMPLES=OFF
+    OPTIONS_RELEASE -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/tools
+    OPTIONS_DEBUG -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/debug/tools
 )
 
 vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets()
 
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)
+
 vcpkg_copy_pdbs()
 
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen/copyright COPYONLY)
diff --git a/ports/cppitertools/CONTROL b/ports/cppitertools/CONTROL
new file mode 100644
index 000000000..8c5f387ec
--- /dev/null
+++ b/ports/cppitertools/CONTROL
@@ -0,0 +1,4 @@
+Source: cppitertools
+Version: 2019-04-14-2
+Description: Range-based for loop add-ons inspired by the Python builtins and itertools library
+Build-Depends: boost-optional
diff --git a/ports/cppitertools/portfile.cmake b/ports/cppitertools/portfile.cmake
new file mode 100644
index 000000000..f19069a3b
--- /dev/null
+++ b/ports/cppitertools/portfile.cmake
@@ -0,0 +1,20 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ryanhaining/cppitertools
+    REF 97bfd33cdc268426b20f189c13d3ed88f5e1f4c2
+    SHA512 7b8926cf00b5be17fa89a1d1aea883e60848187bb00d637c40a20f6e11811add4785f2f461e530a6cd557d3be16490799ffcd7ea90bd7b58fdca549c3df03e8c
+    HEAD_REF master
+)
+
+file(GLOB INCLUDE_FILES ${SOURCE_PATH}/*.hpp)
+file(GLOB INCLUDE_INTERNAL_FILES ${SOURCE_PATH}/internal/*.hpp)
+
+file(COPY ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${INCLUDE_INTERNAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/internal)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index 230f3c23d..e5331ab14 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,6 +1,6 @@
 Source: cpprestsdk
-Version: 2.10.12
-Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows)
+Version: 2.10.13-1
+Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows), boost-asio (!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.
 Default-Features: default-features
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index b97e561b1..6747c0b2c 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.12
-    SHA512 a0839c11f71271464632095c1b91bd555220d1c87c4e7637d8424a51739e5abcd91e9257d1171d06470427ba48defd2be12bb34f5352c9590219b9f54292e3a8
+    REF v2.10.13
+    SHA512 43e60ee1266e0009f04452736a1b5127439d54416060f81544613007a8bcc084705bedd482ec3519140e79a6f56bddba6d25e9752228595bb8f83ce560ae39b8
     HEAD_REF master
 )
 
diff --git a/ports/cpptoml/CONTROL b/ports/cpptoml/CONTROL
new file mode 100644
index 000000000..2409ddbd2
--- /dev/null
+++ b/ports/cpptoml/CONTROL
@@ -0,0 +1,3 @@
+Source: cpptoml
+Version: v0.1.1
+Description: A header-only library for parsing TOML configuration files.
diff --git a/ports/cpptoml/portfile.cmake b/ports/cpptoml/portfile.cmake
new file mode 100644
index 000000000..093feb9aa
--- /dev/null
+++ b/ports/cpptoml/portfile.cmake
@@ -0,0 +1,16 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO skystrife/cpptoml
+	
+	REF fededad7169e538ca47e11a9ee9251bc361a9a65
+	SHA512 2ec50f4585bca33bb343170470048a7d7e7902f1ffa5709cf84ddf9f53a899ff1cc9ffa49e059f6dad93d13823c4d2661bc8109e4356078cdbdfef1a2be6a622 
+	
+    HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h")
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpptoml RENAME copyright)
diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch
new file mode 100644
index 000000000..9b9b11352
--- /dev/null
+++ b/ports/cpr/001-cpr-config.patch
@@ -0,0 +1,94 @@
+diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt
+index a6db5bd..90bec48 100644
+--- a/cpr/CMakeLists.txt
++++ b/cpr/CMakeLists.txt
+@@ -1,47 +1,46 @@
+-message(STATUS "Using CURL_INCLUDE_DIRS: ${CURL_INCLUDE_DIRS}.")
+-include_directories(
+-    ${CPR_INCLUDE_DIRS}
+-    ${CURL_INCLUDE_DIRS})
+-
+ add_library(${CPR_LIBRARIES}
++  auth.cpp
++  cookies.cpp
++  cprtypes.cpp
++  digest.cpp
++  error.cpp
++  multipart.cpp
++  parameters.cpp
++  payload.cpp
++  proxies.cpp
++  session.cpp
++  timeout.cpp
++  util.cpp
++  ssl_options.cpp
++)
++
++target_link_libraries( ${CPR_LIBRARIES}
++  PUBLIC ${CURL_LIBRARIES}
++)
++
++target_include_directories(${CPR_LIBRARIES}
++  PUBLIC 
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
++    $<INSTALL_INTERFACE:include>
++  PRIVATE
++    $<BUILD_INTERFACE:${CURL_INCLUDE_DIRS}>
++)
++
+ 
+-    # Source files
+-    auth.cpp
+-    cookies.cpp
+-    cprtypes.cpp
+-    digest.cpp
+-    error.cpp
+-    multipart.cpp
+-    parameters.cpp
+-    payload.cpp
+-    proxies.cpp
+-    session.cpp
+-    timeout.cpp
+-    util.cpp
+-    ssl_options.cpp
++set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
++install(
++  TARGETS ${CPR_LIBRARIES}
++  EXPORT ${TARGETS_EXPORT_NAME}
++  RUNTIME DESTINATION bin
++  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib
++)
+ 
+-    # Header files (useful in IDEs)
+-    "${CPR_INCLUDE_DIRS}/cpr/api.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/auth.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/body.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/cookies.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/cpr.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/cprtypes.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/curlholder.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/defines.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/digest.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/error.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/max_redirects.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/multipart.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/parameters.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/payload.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/proxies.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/response.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/session.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/timeout.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/util.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/ssl_options.h")
++install(
++  EXPORT ${TARGETS_EXPORT_NAME} 
++  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
++)
+ 
+-message(STATUS "Using CURL_LIBRARIES: ${CURL_LIBRARIES}.")
+-target_link_libraries(${CPR_LIBRARIES}
+-    ${CURL_LIBRARIES})
++if (NOT DISABLE_INSTALL_HEADERS)
++  install(DIRECTORY ${CPR_INCLUDE_DIRS}/cpr DESTINATION include)
++endif()
diff --git a/ports/cpr/002_cpr_fixcase.patch b/ports/cpr/002_cpr_fixcase.patch
new file mode 100644
index 000000000..4dbc97119
--- /dev/null
+++ b/ports/cpr/002_cpr_fixcase.patch
@@ -0,0 +1,13 @@
+diff --git a/cpr/error.cpp b/cpr/error.cpp
+index 713cb10..4143f93 100644
+--- a/cpr/error.cpp
++++ b/cpr/error.cpp
+@@ -38,8 +38,6 @@ ErrorCode Error::getErrorCodeForCurlError(std::int32_t curl_code) {
+             return ErrorCode::SSL_LOCAL_CERTIFICATE_ERROR;
+         case CURLE_SSL_CIPHER:
+             return ErrorCode::GENERIC_SSL_ERROR;
+-        case CURLE_SSL_CACERT:
+-            return ErrorCode::SSL_CACERT_ERROR;
+         case CURLE_USE_SSL_FAILED:
+             return ErrorCode::GENERIC_SSL_ERROR;
+         case CURLE_SSL_ENGINE_INITFAILED:
diff --git a/ports/cpr/CONTROL b/ports/cpr/CONTROL
index a8cdbf052..89cc6b847 100644
--- a/ports/cpr/CONTROL
+++ b/ports/cpr/CONTROL
@@ -1,4 +1,4 @@
 Source: cpr
-Version: 1.3.0-4
+Version: 1.3.0-7
 Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.
 Build-Depends: curl[core]
diff --git a/ports/cpr/cprConfig.cmake b/ports/cpr/cprConfig.cmake
new file mode 100644
index 000000000..501fcd96a
--- /dev/null
+++ b/ports/cpr/cprConfig.cmake
@@ -0,0 +1,27 @@
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was Config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+include("${CMAKE_CURRENT_LIST_DIR}/cprTargets.cmake")
+check_required_components("cpr")
diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake
index 56e9c6cf4..9e2c40a0d 100644
--- a/ports/cpr/portfile.cmake
+++ b/ports/cpr/portfile.cmake
@@ -8,7 +8,9 @@ vcpkg_from_github(
     REF 1.3.0
     SHA512 fd08f8a592a5e1fb8dc93158a4850b81575983c08527fb415f65bd9284f93c804c8680d16c548744583cd26b9353a7d4838269cfc59ccb6003da8941f620c273
     HEAD_REF master
-    PATCHES enable-install.patch
+    PATCHES
+        001-cpr-config.patch
+        002_cpr_fixcase.patch
 )
 
 vcpkg_configure_cmake(
@@ -23,8 +25,13 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/cprConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/lib/cmake/cpr)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cpr)
+
 vcpkg_copy_pdbs()
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpr)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/cpr/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpr/copyright)
diff --git a/ports/crc32c/CONTROL b/ports/crc32c/CONTROL
index ada730a7d..013cc542e 100644
--- a/ports/crc32c/CONTROL
+++ b/ports/crc32c/CONTROL
@@ -1,3 +1,3 @@
 Source: crc32c
-Version: 1.0.6-1
+Version: 1.0.7
 Description: CRC32C implementation with support for CPU-specific acceleration instructions.
diff --git a/ports/crc32c/portfile.cmake b/ports/crc32c/portfile.cmake
index 85883c7e2..1802c0c35 100644
--- a/ports/crc32c/portfile.cmake
+++ b/ports/crc32c/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO google/crc32c
-  REF 1.0.6
-  SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
+  REF 1.0.7
+  SHA512 fe384ea15976b1317b7f6be3a447ae2cf25e0baa80f6c5e1231719a2af8863bc156b3d33156f24eca85504083730937f81fb624311d27e94ba3d2456bf3d34fa
   HEAD_REF master
   PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_export_symbols.patch
 )
diff --git a/ports/crossguid/CONTROL b/ports/crossguid/CONTROL
index 533f0c78e..574d444d2 100644
--- a/ports/crossguid/CONTROL
+++ b/ports/crossguid/CONTROL
@@ -1,4 +1,4 @@
-Source: crossguid
-Version: 0.2.2-2018-06-16
-Build-Depends: libuuid (!windows&!uwp&!osx&!android)
-Description: CrossGuid is a minimal, cross platform, C++ GUID library.
+Source: crossguid
+Version: 0.2.2-2018-06-16-1
+Build-Depends: libuuid (!windows&!uwp&!osx&!android)
+Description: CrossGuid is a minimal, cross platform, C++ GUID library.
diff --git a/ports/crossguid/portfile.cmake b/ports/crossguid/portfile.cmake
index 90d692626..5ee715e58 100644
--- a/ports/crossguid/portfile.cmake
+++ b/ports/crossguid/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO graeme-hill/crossguid
@@ -7,11 +10,6 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message(STATUS "Warning: Dynamic building not supported. Building static instead")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/crow/CONTROL b/ports/crow/CONTROL
index 0b33939d5..e2200c813 100644
--- a/ports/crow/CONTROL
+++ b/ports/crow/CONTROL
@@ -1,3 +1,3 @@
-Source: crow
-Version: 0.1
-Description: Very fast and easy to use C++ micro web framework
+Source: crow
+Version: 0.1-1
+Description: Very fast and easy to use C++ micro web framework
diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake
index de9471fcc..ff6f84d90 100644
--- a/ports/crow/portfile.cmake
+++ b/ports/crow/portfile.cmake
@@ -1,12 +1,12 @@
 include(vcpkg_common_functions)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/crow-0.1)
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://github.com/ipkn/crow/archive/v0.1.tar.gz"
-    FILENAME "crow-v0.1.tar.gz"
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ipkn/crow
+    REF v0.1
     SHA512 5a97c5b8cda3ffe79001aa382d4391eddde30027401bbb1d9c85c70ea715f556d3659f5eac0b9d9192c19d13718f19ad6bdf49d67bef03b21e75300d60e7d02a
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
 file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/crow RENAME copyright)
diff --git a/ports/ctre/CONTROL b/ports/ctre/CONTROL
index 3351ecf25..1dfd8f094 100644
--- a/ports/ctre/CONTROL
+++ b/ports/ctre/CONTROL
@@ -1,3 +1,3 @@
 Source: ctre
-Version: 2.2-1
+Version: 2.6.4
 Description: A Compile time PCRE (almost) compatible regular expression matcher 
diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake
index 76a4a7857..d3de402a4 100644
--- a/ports/ctre/portfile.cmake
+++ b/ports/ctre/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hanickadot/compile-time-regular-expressions
-    REF v2.2
-    SHA512 f6f18e3e5bc654ff94cd540a3b665615151678541575dfc8d4113c317fba5ea83f57694dc330c174110e6263c9b64a128f2a9234cc626a952e7518c423fda703
+    REF v2.6.4
+    SHA512 421122787e3220c5c8935e0d80f06b3d9ba953fface3dc7f4a6e1aadf9fa75468394eb0d2b679f263c17f2b849fd191eff9b532c781278d75a9c54a109dd3ecb
     HEAD_REF master
 )
 
diff --git a/ports/curl/0001_cmake.patch b/ports/curl/0001_cmake.patch
index 7796af413..33ede7b90 100644
--- a/ports/curl/0001_cmake.patch
+++ b/ports/curl/0001_cmake.patch
@@ -1,28 +1,13 @@
-diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake
-index 84822dba7..0d6219425 100644
---- a/CMake/FindLibSSH2.cmake
-+++ b/CMake/FindLibSSH2.cmake
-@@ -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
- )
- 
- if(LIBSSH2_INCLUDE_DIR)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e6dbb73f1..1e2ff138e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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)
-+elseif(WIN32 AND NOT CYGWIN)
-   set(CURL_INSTALL_CMAKE_DIR CMake)
- else()
-   set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl)
+diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake
+index 84822db..0d62194 100644
+--- a/CMake/FindLibSSH2.cmake
++++ b/CMake/FindLibSSH2.cmake
+@@ -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
+ )
+ 
+ if(LIBSSH2_INCLUDE_DIR)
diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch
index 111ca98e8..565903ad2 100644
--- a/ports/curl/0002_fix_uwp.patch
+++ b/ports/curl/0002_fix_uwp.patch
@@ -1,92 +1,92 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7b73b98..72f6171 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -882,7 +882,9 @@ check_symbol_exists(setsockopt     "${CURL_INCLUDES}" HAVE_SETSOCKOPT)
- check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME)
- 
- # symbol exists in win32, but function does not.
--if(WIN32)
-+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+  add_definitions(-D_WIN32_WINNT=0x0A00 -DHAVE_STRUCT_POLLFD -D_WINSOCK_DEPRECATED_NO_WARNINGS)
-+elseif(WIN32)
-   if(ENABLE_INET_PTON)
-     check_function_exists(inet_pton HAVE_INET_PTON)
-     # _WIN32_WINNT_VISTA (0x0600)
-diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c
-index 8337c72..41867b2 100644
---- a/lib/curl_gethostname.c
-+++ b/lib/curl_gethostname.c
-@@ -21,6 +21,7 @@
-  ***************************************************************************/
- 
- #include "curl_setup.h"
-+#include "curl/curl.h"
- 
- #include "curl_gethostname.h"
- 
-@@ -64,9 +65,10 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen)
- #ifdef DEBUGBUILD
- 
-   /* Override host name when environment variable CURL_GETHOSTNAME is set */
--  const char *force_hostname = getenv("CURL_GETHOSTNAME");
-+  char *force_hostname = curl_getenv("CURL_GETHOSTNAME");
-   if(force_hostname) {
-     strncpy(name, force_hostname, namelen);
-+    free(force_hostname);
-     err = 0;
-   }
-   else {
-diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
-index e896276..268f0ea 100644
---- a/lib/curl_ntlm_core.c
-+++ b/lib/curl_ntlm_core.c
-@@ -743,9 +743,12 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
- 
-   /* Calculate the timestamp */
- #ifdef DEBUGBUILD
--  char *force_timestamp = getenv("CURL_FORCETIME");
--  if(force_timestamp)
-+  char *force_timestamp = curl_getenv("CURL_FORCETIME");
-+  if (force_timestamp)
-+  {
-     tw = CURL_OFF_T_C(11644473600) * 10000000;
-+    free(force_timestamp);
-+  }
-   else
- #endif
-     tw = ((curl_off_t)time(NULL) + CURL_OFF_T_C(11644473600)) * 10000000;
-diff --git a/lib/ftp.c b/lib/ftp.c
-index 8042edf..3442df7 100644
---- a/lib/ftp.c
-+++ b/lib/ftp.c
-@@ -4260,7 +4260,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
-     /* prevpath is "raw" so we convert the input path before we compare the
-        strings */
-     size_t dlen;
--    char *path;
-+    char *path = NULL;
-     CURLcode result =
-       Curl_urldecode(conn->data, data->state.path, 0, &path, &dlen, TRUE);
-     if(result) {
-diff --git a/lib/rand.c b/lib/rand.c
-index 2670af9..0d18d37 100644
---- a/lib/rand.c
-+++ b/lib/rand.c
-@@ -44,7 +44,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
-   static bool seeded = FALSE;
- 
- #ifdef CURLDEBUG
--  char *force_entropy = getenv("CURL_ENTROPY");
-+  char *force_entropy = curl_getenv("CURL_ENTROPY");
-   if(force_entropy) {
-     if(!seeded) {
-       unsigned int seed = 0;
-@@ -58,6 +58,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
-     else
-       randseed++;
-     *rnd = randseed;
-+    free(force_entropy);
-     return CURLE_OK;
-   }
- #endif
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38b7b7d..5b3d33e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -897,7 +897,9 @@ check_symbol_exists(setsockopt     "${CURL_INCLUDES}" HAVE_SETSOCKOPT)
+ check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME)
+ 
+ # symbol exists in win32, but function does not.
+-if(WIN32)
++if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++  add_definitions(-D_WIN32_WINNT=0x0A00 -DHAVE_STRUCT_POLLFD -D_WINSOCK_DEPRECATED_NO_WARNINGS)
++elseif(WIN32)
+   if(ENABLE_INET_PTON)
+     check_function_exists(inet_pton HAVE_INET_PTON)
+     # _WIN32_WINNT_VISTA (0x0600)
+diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c
+index 8337c72..41867b2 100644
+--- a/lib/curl_gethostname.c
++++ b/lib/curl_gethostname.c
+@@ -21,6 +21,7 @@
+  ***************************************************************************/
+ 
+ #include "curl_setup.h"
++#include "curl/curl.h"
+ 
+ #include "curl_gethostname.h"
+ 
+@@ -64,9 +65,10 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen)
+ #ifdef DEBUGBUILD
+ 
+   /* Override host name when environment variable CURL_GETHOSTNAME is set */
+-  const char *force_hostname = getenv("CURL_GETHOSTNAME");
++  char *force_hostname = curl_getenv("CURL_GETHOSTNAME");
+   if(force_hostname) {
+     strncpy(name, force_hostname, namelen);
++    free(force_hostname);
+     err = 0;
+   }
+   else {
+diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
+index e7060eb..9cd76f7 100644
+--- a/lib/curl_ntlm_core.c
++++ b/lib/curl_ntlm_core.c
+@@ -726,10 +726,11 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
+ 
+   /* Calculate the timestamp */
+ #ifdef DEBUGBUILD
+-  char *force_timestamp = getenv("CURL_FORCETIME");
+-  if(force_timestamp)
++  char *force_timestamp = curl_getenv("CURL_FORCETIME");
++  if(force_timestamp) {
+     tw = CURL_OFF_T_C(11644473600) * 10000000;
+-  else
++    free(force_timestamp);
++  }
+ #endif
+     tw = ((curl_off_t)time(NULL) + CURL_OFF_T_C(11644473600)) * 10000000;
+ 
+diff --git a/lib/ftp.c b/lib/ftp.c
+index 825aaaa..3b96670 100644
+--- a/lib/ftp.c
++++ b/lib/ftp.c
+@@ -4262,7 +4262,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
+     /* prevpath is "raw" so we convert the input path before we compare the
+        strings */
+     size_t dlen;
+-    char *path;
++    char *path = NULL;
+     CURLcode result =
+       Curl_urldecode(conn->data, ftp->path, 0, &path, &dlen, TRUE);
+     if(result) {
+diff --git a/lib/rand.c b/lib/rand.c
+index 6ee45fe..b2d712d 100644
+--- a/lib/rand.c
++++ b/lib/rand.c
+@@ -44,7 +44,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
+   static bool seeded = FALSE;
+ 
+ #ifdef CURLDEBUG
+-  char *force_entropy = getenv("CURL_ENTROPY");
++  char *force_entropy = curl_getenv("CURL_ENTROPY");
+   if(force_entropy) {
+     if(!seeded) {
+       unsigned int seed = 0;
+@@ -58,6 +58,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
+     else
+       randseed++;
+     *rnd = randseed;
++    free(force_entropy);
+     return CURLE_OK;
+   }
+ #endif
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL
index a84dab006..3f5539de7 100644
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@@ -1,5 +1,5 @@
 Source: curl
-Version: 7.61.1-5
+Version: 7.65.0-1
 Build-Depends: zlib
 Description: A library for transferring data with URLs
 Default-Features: ssl
@@ -15,7 +15,7 @@ Build-Depends: nghttp2, curl[ssl]
 Description: HTTP2 support
 
 Feature: ssl
-Build-Depends: curl[openssl] (!windows), curl[winssl] (windows)
+Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[sectransp] (osx)
 Description: Default SSL backend
 
 Feature: ssh
@@ -33,3 +33,6 @@ Description: SSL support (Secure Channel / "WinSSL")
 Feature: mbedtls
 Build-Depends: mbedtls
 Description: SSL support (mbedTLS)
+
+Feature: sectransp
+Description: SSL support (sectransp)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 4c742025b..294c7a758 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
-    REF curl-7_61_1
-    SHA512 09fa3c87f8d516eabe3241247a5094c32ee0481961cf85bf78ecb13acdf23bb2ec82f113d2660271d22742c79e76d73fb122730fa28e34c7f5477c05a4a6534c
+    REF curl-7_65_0
+    SHA512 436b6b42654c1db2b3f69df410a7f28401a50faf18e74f328a93585c147541e697664b0e9e7df03239fd76c797c1bb4f435f4c668a6b0ad28bdd67e17f786491
     HEAD_REF master
     PATCHES
         0001_cmake.patch
@@ -40,6 +40,19 @@ if("mbedtls" IN_LIST FEATURES)
     set(USE_MBEDTLS ON)
 endif()
 
+set(USE_SECTRANSP OFF)
+set(SECTRANSP_OPTIONS)
+if("sectransp" IN_LIST FEATURES)
+    if(NOT VCPKG_CMAKE_SYSTEM_NAME OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
+        message(FATAL_ERROR "sectransp is not supported on non-Apple platforms")
+    endif()
+    set(USE_SECTRANSP ON)
+    set(SECTRANSP_OPTIONS
+        -DCURL_CA_PATH=none
+    )
+endif()
+
+
 # SSH
 set(USE_LIBSSH2 OFF)
 if("ssh" IN_LIST FEATURES)
@@ -70,15 +83,12 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     )
 endif()
 
-vcpkg_find_acquire_program(PERL)
-get_filename_component(PERL_PATH ${PERL} DIRECTORY)
-vcpkg_add_to_path(${PERL_PATH})
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         ${UWP_OPTIONS}
+        ${SECTRANSP_OPTIONS}
         ${HTTP2_OPTIONS}
         -DBUILD_TESTING=OFF
         -DBUILD_CURL_EXE=${BUILD_CURL_EXE}
@@ -87,8 +97,10 @@ vcpkg_configure_cmake(
         -DCMAKE_USE_OPENSSL=${USE_OPENSSL}
         -DCMAKE_USE_WINSSL=${USE_WINSSL}
         -DCMAKE_USE_MBEDTLS=${USE_MBEDTLS}
+        -DCMAKE_USE_SECTRANSP=${USE_SECTRANSP}
         -DCMAKE_USE_LIBSSH2=${USE_LIBSSH2}
         -DHTTP_ONLY=${USE_HTTP_ONLY}
+        -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
     OPTIONS_RELEASE
         -DBUILD_CURL_EXE=${BUILD_CURL_EXE}
     OPTIONS_DEBUG
@@ -98,10 +110,12 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/curl)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/curl)
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/CURL)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CURL)
 elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/curl)
     vcpkg_fixup_cmake_targets(CONFIG_PATH share/curl)
+else()
+    message(FATAL_ERROR "Could not locate the curl config files")
 endif()
 
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl RENAME copyright)
@@ -109,9 +123,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # the native CMAKE_EXECUTABLE_SUFFIX does not work in portfiles, so emulate it
 if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Windows
-	set(EXECUTABLE_SUFFIX ".exe")
+    set(EXECUTABLE_SUFFIX ".exe")
 else()
-	set(EXECUTABLE_SUFFIX "")
+    set(EXECUTABLE_SUFFIX "")
 endif()
 
 if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}")
@@ -120,43 +134,21 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}")
     vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/curl)
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        file(READ "${CURRENT_PACKAGES_DIR}/share/curl/curl-target-release.cmake" RELEASE_MODULE)
+        file(READ "${CURRENT_PACKAGES_DIR}/share/curl/CURLTargets-release.cmake" RELEASE_MODULE)
         string(REPLACE "\${_IMPORT_PREFIX}/bin/curl${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/curl/curl${EXECUTABLE_SUFFIX}" RELEASE_MODULE "${RELEASE_MODULE}")
-        file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/curl-target-release.cmake" "${RELEASE_MODULE}")
+        file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/CURLTargets-release.cmake" "${RELEASE_MODULE}")
     endif()
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+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)
-    # Drop debug suffix, as FindCURL.cmake does not look for it
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d.lib")
-        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl.lib)
-        # Fixup libcurl-target-debug.cmake to match
-        file(READ "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" DEBUG_MODULE)
-        string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/libcurl-d.lib" "\${_IMPORT_PREFIX}/debug/lib/libcurl.lib" DEBUG_MODULE "${DEBUG_MODULE}")
-        file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" "${DEBUG_MODULE}")
-    endif()
 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)
-        # Fixup libcurl-target-release.cmake to match
-        file(READ "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-release.cmake" RELEASE_MODULE)
-        string(REPLACE "\${_IMPORT_PREFIX}/lib/libcurl_imp.lib" "\${_IMPORT_PREFIX}/lib/libcurl.lib" RELEASE_MODULE "${RELEASE_MODULE}")
-        file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-release.cmake" "${RELEASE_MODULE}")
-    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)
-        # Fixup libcurl-target-debug.cmake to match
-        file(READ "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" DEBUG_MODULE)
-        string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/libcurl-d_imp.lib" "\${_IMPORT_PREFIX}/debug/lib/libcurl.lib" DEBUG_MODULE "${DEBUG_MODULE}")
-        file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" "${DEBUG_MODULE}")
-    endif()
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-
 file(READ ${CURRENT_PACKAGES_DIR}/include/curl/curl.h CURL_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     string(REPLACE "#ifdef CURL_STATICLIB" "#if 1" CURL_H "${CURL_H}")
diff --git a/ports/cutelyst2/CONTROL b/ports/cutelyst2/CONTROL
index 265e8d7af..499e039ce 100644
--- a/ports/cutelyst2/CONTROL
+++ b/ports/cutelyst2/CONTROL
@@ -1,4 +1,4 @@
 Source: cutelyst2
-Version: 2.5.2-2
+Version: 2.7.0
 Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework
 Build-Depends: qt5-base
diff --git a/ports/cutelyst2/portfile.cmake b/ports/cutelyst2/portfile.cmake
index f22cad892..755cc3ed5 100644
--- a/ports/cutelyst2/portfile.cmake
+++ b/ports/cutelyst2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cutelyst/cutelyst
-    REF 7f594d2b2d227e9e6a0474a55906db7d1ee1cd7e
-    SHA512 de04efd7bd9b07f7b0dd2b014eed93e26f0760ef8e458f8c56dc655977235f237bbc71cfe1c05d6791c2237073497ca4566548327ad01b99b4dbec7c491542c7
+    REF v2.7.0
+    SHA512 78848d6d4e79149d9e9ae07211875dd212eb046bcdde7cde0bd781ed89d006247b21bc7a37c4e028d0982bb0f69654d469eb37b857dc0d585e9adc79ecd6291d
     HEAD_REF master
 )
 
diff --git a/ports/cxxopts/CONTROL b/ports/cxxopts/CONTROL
index 6b3928ce1..a13aeb734 100644
--- a/ports/cxxopts/CONTROL
+++ b/ports/cxxopts/CONTROL
@@ -1,3 +1,3 @@
 Source: cxxopts
-Version: 2.1.1
+Version: 2.1.2
 Description: This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options
diff --git a/ports/cxxopts/portfile.cmake b/ports/cxxopts/portfile.cmake
index 0710eb09b..d3b4fec56 100644
--- a/ports/cxxopts/portfile.cmake
+++ b/ports/cxxopts/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jarro2783/cxxopts
-    REF  v2.1.1
-    SHA512 1da6ed65c3e0ee3e0beb39a5d0bccf6e32f44bbb37f8e849ada1421f03630981e4ede6d9966284bb642af6e75c71a1c9f7c9262ba9578d183d4514c011cbfa8e
+    REF v2.1.2
+    SHA512 7ee3725995d4d0f78b75d1d87f10290f20529ca4aa430eb8dd1c59d98c6e99c54b54fc545926b59f499d02ae4f75f9064b3b5ebbab3f74031d3638e7a2378440
     HEAD_REF master
 )
 
diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL
index 215579eae..88b4cdb7b 100644
--- a/ports/darknet/CONTROL
+++ b/ports/darknet/CONTROL
@@ -1,5 +1,5 @@
 Source: darknet
-Version: 0.2.5
+Version: 0.2.5-1
 Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.
 Build-Depends: pthreads (windows), stb
 Default-Features: weights
diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake
index 4b28c5011..986bdb03d 100644
--- a/ports/darknet/portfile.cmake
+++ b/ports/darknet/portfile.cmake
@@ -61,7 +61,6 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty)
 
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
   OPTIONS
     -DENABLE_CUDA=${ENABLE_CUDA}
     -DENABLE_OPENCV=${ENABLE_OPENCV}
diff --git a/ports/date/CONTROL b/ports/date/CONTROL
index 99d514b8d..0a67f589b 100644
--- a/ports/date/CONTROL
+++ b/ports/date/CONTROL
@@ -1,5 +1,5 @@
 Source: date
-Version: 9dc96fd
+Version: ed0368f
 Description: A date and time library based on the C++11/14/17 <chrono> header
 
 Feature: remote-api
diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake
index 5eedde942..c82db3330 100644
--- a/ports/date/portfile.cmake
+++ b/ports/date/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 
 if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
   message(WARNING
-    "You will need to also install http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml into your install location.\n"
+    "You will need to also install https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml into your install location.\n"
     "See https://howardhinnant.github.io/date/tz.html"
   )
 endif()
@@ -10,8 +10,8 @@ endif()
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO HowardHinnant/date
-  REF 9dc96fd9b5e4e1e7885aa80dc24a3ceb407c3730
-  SHA512 1acb78f1ae7f5b1278a9e034fa5ccbb64643ad381ef9bd76bf42fb04d714c6742f2129b6892024cd98bb925e1a6136337fccb636e3f991b428be1ed05ab8901e
+  REF ed0368fc75427ef05cefdf19a39b60d7bed2f039
+  SHA512 5f6a0d7e094fd1ab7b6a1ea9a96e467138220e9207e2eda68f71b68d6c56759e7470fabdfa920d92876e9c9b466e56ea8102333f407a46bb4cba43a2dfeb5e3a
   HEAD_REF master
 )
 
diff --git a/ports/dcmtk/CONTROL b/ports/dcmtk/CONTROL
index 2ef092eba..ab248db1c 100644
--- a/ports/dcmtk/CONTROL
+++ b/ports/dcmtk/CONTROL
@@ -1,3 +1,3 @@
 Source: dcmtk
-Version: 3.6.3
+Version: 3.6.3-1
 Description: This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.
diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake
index f93c3f408..d11878a0e 100644
--- a/ports/dcmtk/portfile.cmake
+++ b/ports/dcmtk/portfile.cmake
@@ -1,49 +1,46 @@
-include(vcpkg_common_functions)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("DCMTK only supports static library linkage")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO DCMTK/dcmtk
-    REF DCMTK-3.6.3
-    SHA512 5863d0c05f046075b998bced7c8c71bf8e969dd366f26d48cdf26012ea744ae4a22784a5c3c12e12b0f188e997c93a6890ef0c3c336865ea93f13c45f70b258d
-    HEAD_REF master
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DDCMTK_WITH_DOXYGEN=OFF
-        -DDCMTK_WITH_ZLIB=OFF
-        -DDCMTK_WITH_OPENSSL=OFF
-        -DDCMTK_WITH_PNG=OFF
-        -DDCMTK_WITH_TIFF=OFF
-        -DDCMTK_WITH_XML=OFF
-        -DDCMTK_WITH_ICONV=OFF
-        -DDCMTK_FORCE_FPIC_ON_UNIX=ON
-        -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF
-        -DDCMTK_ENABLE_BUILTIN_DICTIONARY=ON
-        -DDCMTK_ENABLE_PRIVATE_TAGS=ON
-        -DBUILD_APPS=OFF
-        -DDCMTK_ENABLE_CXX11=ON
-        -DCMAKE_DEBUG_POSTFIX="d"
-    OPTIONS_DEBUG
-        -DINSTALL_HEADERS=OFF
-        -DINSTALL_OTHER=OFF
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-vcpkg_fixup_cmake_targets()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/dcmtk RENAME copyright)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DCMTK/dcmtk
+    REF DCMTK-3.6.3
+    SHA512 5863d0c05f046075b998bced7c8c71bf8e969dd366f26d48cdf26012ea744ae4a22784a5c3c12e12b0f188e997c93a6890ef0c3c336865ea93f13c45f70b258d
+    HEAD_REF master
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DDCMTK_WITH_DOXYGEN=OFF
+        -DDCMTK_WITH_ZLIB=OFF
+        -DDCMTK_WITH_OPENSSL=OFF
+        -DDCMTK_WITH_PNG=OFF
+        -DDCMTK_WITH_TIFF=OFF
+        -DDCMTK_WITH_XML=OFF
+        -DDCMTK_WITH_ICONV=OFF
+        -DDCMTK_FORCE_FPIC_ON_UNIX=ON
+        -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF
+        -DDCMTK_ENABLE_BUILTIN_DICTIONARY=ON
+        -DDCMTK_ENABLE_PRIVATE_TAGS=ON
+        -DBUILD_APPS=OFF
+        -DDCMTK_ENABLE_CXX11=ON
+        -DCMAKE_DEBUG_POSTFIX="d"
+    OPTIONS_DEBUG
+        -DINSTALL_HEADERS=OFF
+        -DINSTALL_OTHER=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/dcmtk RENAME copyright)
diff --git a/ports/devicenameresolver/CONTROL b/ports/devicenameresolver/CONTROL
index 2207c9590..1accbf8c5 100644
--- a/ports/devicenameresolver/CONTROL
+++ b/ports/devicenameresolver/CONTROL
@@ -1,3 +1,3 @@
 Source: devicenameresolver
-Version: 2016-06-26-0850d88fa6
+Version: 2016-06-26-0850d88fa6-1
 Description: a little library that resolves a path from a (virtual) device name.
diff --git a/ports/devicenameresolver/add-string-headfile.patch b/ports/devicenameresolver/add-string-headfile.patch
new file mode 100644
index 000000000..da78f227b
--- /dev/null
+++ b/ports/devicenameresolver/add-string-headfile.patch
@@ -0,0 +1,12 @@
+diff --git a/NativeWinApi.h b/NativeWinApi.h
+index 63fced1..582306b 100644
+--- a/NativeWinApi.h
++++ b/NativeWinApi.h
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <windows.h>
++#include <string>
+ 
+ #define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L)
+ #define STATUS_SUCCESS   ((NTSTATUS)0x00000000L)
diff --git a/ports/devicenameresolver/portfile.cmake b/ports/devicenameresolver/portfile.cmake
index 75088de8c..743da3e6a 100644
--- a/ports/devicenameresolver/portfile.cmake
+++ b/ports/devicenameresolver/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_bitbucket(
     REF 0850d88fa6a759d79b3c859933870d9aa602aa79
     SHA512 9161411d3c8c17f49f5ff9482a007a6608872c948ef856aa7076a45c246e8d777e4cd6b54169d9c1b9e99e7b383436e1a084e168fafff1ca5f2b28260bac1452
     HEAD_REF master
+    PATCHES add-string-headfile.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index d8e03d986..a9f4aa9b7 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,3 +1,3 @@
 Source: directxmesh
-Version: nov2018
-Description: DirectXMesh geometry processing library
-\ No newline at end of file
+Version: apr2019
+Description: DirectXMesh geometry processing library
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 31b74abea..53cd44b0c 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
   message(FATAL_ERROR "DirectXMesh only supports dynamic CRT linkage")
@@ -12,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXMesh
-    REF nov2018
-    SHA512 b1abeabd81c7d6c12adfea1ca8d563aa7c22ba1a64aa7a49b7839c0788922cec604a041dddbd3aca6a3b7c8412b1117dfee9c1163862de10757a7747669017ed
+    REF apr2019
+    SHA512 a9e0dbf6483633a1727592de7e2fa733de993daff848d9ec2241ce54b67c7d24ed0419058f2f6ce256021dcf7e16d178b62ed9b8c7a1756504ab044f8740be1d
     HEAD_REF master
 )
 
diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index d86662ef2..6ca6a224b 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtex
-Version: nov2018
-Description: DirectXTex texture processing library
-\ No newline at end of file
+Version: apr2019
+Description: DirectXTex texture processing library
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 93eb8d6d1..94f9b69cb 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
     message(FATAL_ERROR "DirectXTex only supports dynamic CRT linkage")
@@ -12,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTex
-    REF nov2018
-    SHA512 bcf721820e0a4069b7b1daac44d776b2c69a6ebdc0a817fb2e1fcd94938df8b3fbabc1827c28050d0db4b26cc42a011987f50b7db04487a7075741b34ddb58a8
+    REF apr2019
+    SHA512 3e50c5beb25416a0720614321bb2b712b5677b50989909ca703801080023f8f8ad168bbe4e5dc522500325989a8f6982026d7dc5029ee28d9dcfe35efdd002de
     HEAD_REF master
 )
 
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index c3e9b194c..035c5d3a4 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtk
-Version: nov2018
+Version: apr2019
 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 16828462e..245c8a4af 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
   message(FATAL_ERROR "DirectXTK only supports dynamic CRT linkage")
@@ -12,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK
-    REF nov2018
-    SHA512 ee696245c914c1ede99c12d301e15f3d70ae7a0375b6c6f94afcbb1fd1a80844d1cd053a87f66c2008394a1b8f1165db0e835344a0311f0a8418c32aff9f592a
+    REF apr2019
+    SHA512 811ed222c1650d34a8475e44719cca8972a85d96f9ccb10548e1501eb9d28fd8685de90832b517cdcbf21ae8c9160dea69000e8dca06fab745a15a7acc14ba98
     HEAD_REF master
 )
 
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL
index 60393a1d9..41ffd54f7 100644
--- a/ports/directxtk12/CONTROL
+++ b/ports/directxtk12/CONTROL
@@ -1,3 +1,3 @@
-Source: directxtk12
-Version: dec2016
-Description: A collection of helper classes for writing DirectX 12 code in C++.
+Source: directxtk12
+Version: dec2016-1
+Description: A collection of helper classes for writing DirectX 12 code in C++.
diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake
index 6a545ccbd..d51a82b81 100644
--- a/ports/directxtk12/portfile.cmake
+++ b/ports/directxtk12/portfile.cmake
@@ -1,13 +1,11 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
   message(FATAL_ERROR "DirectXTk12 only supports dynamic CRT linkage")
 endif()
 
-include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK12-dec2016)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/Microsoft/DirectXTK12/archive/dec2016.tar.gz"
diff --git a/ports/dirent/CONTROL b/ports/dirent/CONTROL
index 96aab8334..8fb9b1fa8 100644
--- a/ports/dirent/CONTROL
+++ b/ports/dirent/CONTROL
@@ -1,3 +1,3 @@
 Source: dirent
-Version: 1.23.1
+Version: 1.23.2
 Description: Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.
diff --git a/ports/dirent/portfile.cmake b/ports/dirent/portfile.cmake
index 70ed405cc..80aab02f0 100644
--- a/ports/dirent/portfile.cmake
+++ b/ports/dirent/portfile.cmake
@@ -7,8 +7,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tronkko/dirent
-    REF 1.23.1
-    SHA512 13c59f0d225ccc09a2b92a29b41b6644dabdb0b39df7bb528d5ac60dbe71a2770eaa37d3890e0df21065bc798e9cc018e174d34c6697da7da665caafe062bbc2
+    REF 1.23.2
+    SHA512 e7a991445ee9ca8f1118753df559d28beb283b3c0d25edcfb23dd5322f2bdfeadffe802d0c908bb6d4dfc17bf5ec38bdecfa717319fb4e26682bee0ba0d14c5c
     HEAD_REF master
 )
 file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL
index ab2e80e87..43c689bc4 100644
--- a/ports/dlib/CONTROL
+++ b/ports/dlib/CONTROL
@@ -1,6 +1,6 @@
 Source: dlib
-Version: 19.16-1
-Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas, clapack
+Version: 19.17
+Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas (!osx), clapack (!osx)
 Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++
 
 Feature: cuda
diff --git a/ports/dlib/find_blas.patch b/ports/dlib/find_blas.patch
new file mode 100644
index 000000000..3ea8d30ae
--- /dev/null
+++ b/ports/dlib/find_blas.patch
@@ -0,0 +1,11 @@
+--- a/dlib/cmake_utils/find_blas.cmake
++++ b/dlib/cmake_utils/find_blas.cmake
+@@ -414,7 +414,7 @@
+ if (lapack_found)
+    include(CheckFunctionExists)
+    include(CheckFortranFunctionExists)
+-   set(CMAKE_REQUIRED_LIBRARIES ${lapack_libraries})
++   set(CMAKE_REQUIRED_LIBRARIES ${lapack_libraries} ${blas_libraries})
+ 
+    check_function_exists("sgesv" LAPACK_FOUND_C_UNMANGLED)
+    check_function_exists("sgesv_" LAPACK_FOUND_C_MANGLED)
diff --git a/ports/dlib/force_finding_packages.patch b/ports/dlib/force_finding_packages.patch
new file mode 100644
index 000000000..cd8be1607
--- /dev/null
+++ b/ports/dlib/force_finding_packages.patch
@@ -0,0 +1,147 @@
+--- a/dlib/CMakeLists.txt
++++ b/dlib/CMakeLists.txt
+@@ -430,70 +430,9 @@
+       endif()
+ 
+       if (DLIB_PNG_SUPPORT)
+-         # try to find libpng 
+-         find_package(PNG QUIET)
+-         # Make sure there isn't something wrong with the version of LIBPNG
+-         # installed on this system.  Also never link to anything from anaconda
+-         # since it's probably broken.
+-         if (PNG_FOUND AND NOT ("${PNG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)") AND NOT BUILDING_PYTHON_IN_MSVC)
+-            set(CMAKE_REQUIRED_LIBRARIES ${PNG_LIBRARIES})
+-            CHECK_FUNCTION_EXISTS(png_create_read_struct LIBPNG_IS_GOOD)
+-         endif()
+-         if (PNG_FOUND AND LIBPNG_IS_GOOD)
+-            include_directories(${PNG_INCLUDE_DIR})
+-            set (dlib_needed_libraries ${dlib_needed_libraries} ${PNG_LIBRARIES})
+-            set(REQUIRES_LIBS " libpng")
+-         else()
+-            # If we can't find libpng then statically compile it in.
+-            include_directories(external/libpng external/zlib)
+-            set(source_files ${source_files}
+-               external/libpng/arm/arm_init.c
+-               external/libpng/arm/filter_neon_intrinsics.c
+-               external/libpng/png.c
+-               external/libpng/pngerror.c
+-               external/libpng/pngget.c
+-               external/libpng/pngmem.c
+-               external/libpng/pngpread.c
+-               external/libpng/pngread.c
+-               external/libpng/pngrio.c
+-               external/libpng/pngrtran.c
+-               external/libpng/pngrutil.c
+-               external/libpng/pngset.c
+-               external/libpng/pngtrans.c
+-               external/libpng/pngwio.c
+-               external/libpng/pngwrite.c
+-               external/libpng/pngwtran.c
+-               external/libpng/pngwutil.c
+-               external/zlib/adler32.c
+-               external/zlib/compress.c
+-               external/zlib/crc32.c
+-               external/zlib/deflate.c
+-               external/zlib/gzclose.c
+-               external/zlib/gzlib.c
+-               external/zlib/gzread.c
+-               external/zlib/gzwrite.c
+-               external/zlib/infback.c
+-               external/zlib/inffast.c
+-               external/zlib/inflate.c
+-               external/zlib/inftrees.c
+-               external/zlib/trees.c
+-               external/zlib/uncompr.c
+-               external/zlib/zutil.c
+-               )
+-
+-            include(cmake_utils/check_if_neon_available.cmake)
+-            if (ARM_NEON_IS_AVAILABLE)
+-               message (STATUS "NEON instructions will be used for libpng.")
+-               enable_language(ASM)
+-               set(source_files ${source_files}
+-                  external/libpng/arm/arm_init.c
+-                  external/libpng/arm/filter_neon_intrinsics.c
+-                  external/libpng/arm/filter_neon.S
+-                  )
+-               set_source_files_properties(external/libpng/arm/filter_neon.S PROPERTIES COMPILE_FLAGS "${CMAKE_ASM_FLAGS} ${CMAKE_CXX_FLAGS} -x assembler-with-cpp")
+-            endif()
+-            set(REQUIRES_LIBS "")
+-         endif()
++         find_package(PNG REQUIRED)
++         include_directories(${PNG_INCLUDE_DIR})
++         set (dlib_needed_libraries ${dlib_needed_libraries} ${PNG_LIBRARIES})
+          set(source_files ${source_files}
+             image_loader/png_loader.cpp
+             image_saver/save_png.cpp
+@@ -501,68 +440,8 @@
+       endif()
+ 
+       if (DLIB_JPEG_SUPPORT)
+-         # try to find libjpeg 
+-         find_package(JPEG QUIET)
+-         # Make sure there isn't something wrong with the version of libjpeg 
+-         # installed on this system.  Also don't use the installed libjpeg
+-         # if this is an APPLE system because apparently it's broken (as of 2015/01/01).
+-         if (JPEG_FOUND AND NOT ("${JPEG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)") AND NOT BUILDING_PYTHON_IN_MSVC)
+-            set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
+-            CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD)
+-         endif()
+-         if (JPEG_FOUND AND LIBJPEG_IS_GOOD)
+-            include_directories(${JPEG_INCLUDE_DIR})
+-            set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY})
+-         else()
+-            # If we can't find libjpeg then statically compile it in.
+-            add_definitions(-DDLIB_JPEG_STATIC)
+-            set(source_files ${source_files}
+-               external/libjpeg/jcomapi.cpp
+-               external/libjpeg/jdapimin.cpp
+-               external/libjpeg/jdapistd.cpp
+-               external/libjpeg/jdatasrc.cpp
+-               external/libjpeg/jdcoefct.cpp
+-               external/libjpeg/jdcolor.cpp
+-               external/libjpeg/jddctmgr.cpp
+-               external/libjpeg/jdhuff.cpp
+-               external/libjpeg/jdinput.cpp
+-               external/libjpeg/jdmainct.cpp
+-               external/libjpeg/jdmarker.cpp
+-               external/libjpeg/jdmaster.cpp
+-               external/libjpeg/jdmerge.cpp
+-               external/libjpeg/jdphuff.cpp
+-               external/libjpeg/jdpostct.cpp
+-               external/libjpeg/jdsample.cpp
+-               external/libjpeg/jerror.cpp
+-               external/libjpeg/jidctflt.cpp
+-               external/libjpeg/jidctfst.cpp
+-               external/libjpeg/jidctint.cpp
+-               external/libjpeg/jidctred.cpp
+-               external/libjpeg/jmemmgr.cpp
+-               external/libjpeg/jmemnobs.cpp
+-               external/libjpeg/jquant1.cpp
+-               external/libjpeg/jquant2.cpp
+-               external/libjpeg/jutils.cpp  
+-               external/libjpeg/jcapimin.cpp
+-               external/libjpeg/jdatadst.cpp
+-               external/libjpeg/jcparam.cpp
+-               external/libjpeg/jcapistd.cpp
+-               external/libjpeg/jcmarker.cpp
+-               external/libjpeg/jcinit.cpp
+-               external/libjpeg/jcmaster.cpp
+-               external/libjpeg/jcdctmgr.cpp
+-               external/libjpeg/jccoefct.cpp  
+-               external/libjpeg/jccolor.cpp  
+-               external/libjpeg/jchuff.cpp  
+-               external/libjpeg/jcmainct.cpp  
+-               external/libjpeg/jcphuff.cpp  
+-               external/libjpeg/jcprepct.cpp  
+-               external/libjpeg/jcsample.cpp
+-               external/libjpeg/jfdctint.cpp
+-               external/libjpeg/jfdctflt.cpp
+-               external/libjpeg/jfdctfst.cpp
+-               )
+-         endif()
++         find_package(JPEG REQUIRED)
++         include_directories(${JPEG_INCLUDE_DIR})
+          set(source_files ${source_files}
+             image_loader/jpeg_loader.cpp
+             image_saver/save_jpeg.cpp
diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake
index ebfd00766..114c9b934 100644
--- a/ports/dlib/portfile.cmake
+++ b/ports/dlib/portfile.cmake
@@ -1,19 +1,18 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("dlib only supports static linkage")
-    set(VCPKG_LIBRARY_LINKAGE "static")
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO davisking/dlib
-    REF v19.16
-    SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
+    REF v19.17
+    SHA512 8574f48d0cc55685d494b3933079c16526fc7cfa3df85a76d51a1f13bebeccf3b6d7247981b53bd1c9e6e664e42245e518cefadf3420be1ab25b5dd6b8d55441
     HEAD_REF master
     PATCHES
         fix-mac-jpeg.patch
         fix-sqlite3-fftw-linkage.patch
+        force_finding_packages.patch
+        find_blas.patch
 )
 
 file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libjpeg)
@@ -32,7 +31,7 @@ endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA 
+    PREFER_NINJA
     OPTIONS
         -DDLIB_LINK_WITH_SQLITE3=ON
         -DDLIB_USE_FFTW=ON
@@ -43,7 +42,7 @@ vcpkg_configure_cmake(
         -DDLIB_USE_CUDA=${WITH_CUDA}
         -DDLIB_GIF_SUPPORT=OFF
         -DDLIB_USE_MKL_FFT=OFF
-        -DCMAKE_DEBUG_POSTFIX=d	
+        -DCMAKE_DEBUG_POSTFIX=d
     OPTIONS_DEBUG
         -DDLIB_ENABLE_ASSERTS=ON
         #-DDLIB_ENABLE_STACK_TRACE=ON
@@ -61,7 +60,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/all)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/appveyor)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/test)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/travis) 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/travis)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_neon)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cudnn)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cuda)
@@ -78,5 +77,5 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/dlib/config.h "${_contents}")
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/dlib/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dlib)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/dlib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/dlib/COPYRIGHT)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/dlib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/dlib/copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL
index 2291f0556..bf1253499 100644
--- a/ports/doctest/CONTROL
+++ b/ports/doctest/CONTROL
@@ -1,3 +1,3 @@
 Source: doctest
-Version: 2.3.1
+Version: 2.3.2
 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 859e2be99..dbb94990e 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 2.3.1
-    SHA512 b8cb502054e05d6e348fa008b44eb49e7932e0ee15e413953ecfd3092ebc490e5924ee669f22abb85e349033e307e7e19ad44b0c6a98973a8ffe4c7aef9017b2
+    REF 2.3.2
+    SHA512 316c804d04c51e38ee54edb321c3f6c11e8b45d542add865e930a36430bb2b768c4302ec85a7470d2df7952981432ec4c1da662be46021eff0fa377f5cea85ba
     HEAD_REF master
 )
 
diff --git a/ports/double-conversion/CONTROL b/ports/double-conversion/CONTROL
index a80898deb..47c9e063c 100644
--- a/ports/double-conversion/CONTROL
+++ b/ports/double-conversion/CONTROL
@@ -1,3 +1,3 @@
-Source: double-conversion
-Version: 3.1.0-1
-Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.
+Source: double-conversion
+Version: 3.1.4
+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 875b1aa0a..d7fd15f21 100644
--- a/ports/double-conversion/portfile.cmake
+++ b/ports/double-conversion/portfile.cmake
@@ -1,18 +1,18 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/double-conversion
-    REF 3.1.0
-    SHA512 ba797a7203bc7eb8ba697dc758a3341578f0405b5ab42fbd5a22d9fac09d11dd8cb5ed9ff9ff369e8ae9397ec74c04c62fca29d1bc469c6d2ea1a84a6dff9188
+    REF v3.1.4
+    SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
     HEAD_REF master
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=True
 )
 
 vcpkg_install_cmake()
diff --git a/ports/draco/CONTROL b/ports/draco/CONTROL
index 53da07b77..afdeb1e6d 100644
--- a/ports/draco/CONTROL
+++ b/ports/draco/CONTROL
@@ -1,4 +1,4 @@
-Source: draco
-Version: 1.3.3-1
-Description: A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.
-Build-Depends:
+Source: draco
+Version: 1.3.3-2
+Description: A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.
+Build-Depends:
diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake
index 4b95739ca..3486134fb 100644
--- a/ports/draco/portfile.cmake
+++ b/ports/draco/portfile.cmake
@@ -1,22 +1,7 @@
-# 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_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/draco
diff --git a/ports/duilib/CONTROL b/ports/duilib/CONTROL
new file mode 100644
index 000000000..9154664ea
--- /dev/null
+++ b/ports/duilib/CONTROL
@@ -0,0 +1,3 @@
+Source: duilib
+Version: 2019-4-28-1
+Description: Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines.
diff --git a/ports/duilib/enable-static.patch b/ports/duilib/enable-static.patch
new file mode 100644
index 000000000..6f069d4a7
--- /dev/null
+++ b/ports/duilib/enable-static.patch
@@ -0,0 +1,20 @@
+diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt
+index 96b8fe4..99dc314 100644
+--- a/DuiLib/CMakeLists.txt
++++ b/DuiLib/CMakeLists.txt
+@@ -19,8 +19,14 @@ if (MSVC)
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /source-charset:.936")
+ endif()
+ 
++if (BUILD_SHARED_LIBS STREQUAL ON)
++  SET(LINKAGE SHARED)
++else()
++  SET(LINKAGE STATIC)
++endif()
++
+ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+-add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src})
++add_library(duilib ${LINKAGE} ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src})
+ 
+ add_definitions(-DUILIB_EXPORTS)
+ target_link_libraries(duilib comctl32 gdi32 user32)
diff --git a/ports/duilib/fix-arm-build.patch b/ports/duilib/fix-arm-build.patch
new file mode 100644
index 000000000..c4dbd902e
--- /dev/null
+++ b/ports/duilib/fix-arm-build.patch
@@ -0,0 +1,11 @@
+diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt
+index 6a4da5a..4961174 100644
+--- a/DuiLib/CMakeLists.txt
++++ b/DuiLib/CMakeLists.txt
+@@ -18,5 +18,5 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+ add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src})
+ 
+ add_definitions(-DUILIB_EXPORTS)
+-target_link_libraries(duilib comctl32)
++target_link_libraries(duilib comctl32 gdi32 user32)
+ set_target_properties(duilib PROPERTIES OUTPUT_NAME "duilib")
diff --git a/ports/duilib/fix-encoding.patch b/ports/duilib/fix-encoding.patch
new file mode 100644
index 000000000..cf0947e77
--- /dev/null
+++ b/ports/duilib/fix-encoding.patch
@@ -0,0 +1,28 @@
+diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt
+index 4961174..96b8fe4 100644
+--- a/DuiLib/CMakeLists.txt
++++ b/DuiLib/CMakeLists.txt
+@@ -14,6 +14,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Core)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Layout)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Utils)
+ 
++if (MSVC)
++  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /source-charset:.936")
++  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /source-charset:.936")
++endif()
++
+ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+ add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src})
+ 
+diff --git a/DuiLib/Control/UIGifAnim.cpp b/DuiLib/Control/UIGifAnim.cpp
+index 870c9da..61aa32f 100644
+--- a/DuiLib/Control/UIGifAnim.cpp
++++ b/DuiLib/Control/UIGifAnim.cpp
+@@ -319,7 +319,6 @@ namespace DuiLib
+ 
+ 		while (!pData)
+ 		{
+-			//读不到图片, 则直接去读取bitmap.m_lpstr指向的路径
+ 			HANDLE hFile = ::CreateFile(pstrGifPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, \
+ 				FILE_ATTRIBUTE_NORMAL, NULL);
+ 			if( hFile == INVALID_HANDLE_VALUE ) break;
diff --git a/ports/duilib/fix-post-build-errors.patch b/ports/duilib/fix-post-build-errors.patch
new file mode 100644
index 000000000..35fa5cc89
--- /dev/null
+++ b/ports/duilib/fix-post-build-errors.patch
@@ -0,0 +1,11 @@
+diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt
+index 835d430..6a4da5a 100644
+--- a/DuiLib/CMakeLists.txt
++++ b/DuiLib/CMakeLists.txt
+@@ -20,6 +20,3 @@ add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src}
+ add_definitions(-DUILIB_EXPORTS)
+ target_link_libraries(duilib comctl32)
+ set_target_properties(duilib PROPERTIES OUTPUT_NAME "duilib")
+-add_custom_command(TARGET duilib POST_BUILD
+-  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+-  ${PROJECT_BINARY_DIR}/lib/duilib.dll ${PROJECT_SOURCE_DIR}/bin/duilib.dll)
diff --git a/ports/duilib/portfile.cmake b/ports/duilib/portfile.cmake
new file mode 100644
index 000000000..7e30c9940
--- /dev/null
+++ b/ports/duilib/portfile.cmake
@@ -0,0 +1,37 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO duilib/duilib
+	REF d7f3a331a0fc6ba48429cd9e5c427570cc73bc35
+	SHA512 6381cac467d42e4811859411a5fa620e52075622e8fbec38a6ab320c33bc7d6fdddc809c150d6a10cc40c55a651345bda9387432898d24957b6ab0f5c4b5391c
+    HEAD_REF master
+    PATCHES 
+        "fix-post-build-errors.patch"
+        "fix-arm-build.patch"
+        "fix-encoding.patch"
+        "enable-static.patch"
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}/DuiLib
+    PREFER_NINJA
+)
+
+vcpkg_build_cmake()
+
+file(INSTALL ${SOURCE_PATH}/DuiLib DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+else()
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/duilib RENAME copyright)
diff --git a/ports/duktape/CMakeLists.txt b/ports/duktape/CMakeLists.txt
index f62a9c56e..3a9c869de 100644
--- a/ports/duktape/CMakeLists.txt
+++ b/ports/duktape/CMakeLists.txt
@@ -1,20 +1,21 @@
-# CMAKE project for duktape
-option(SOURCE_PATH   "Root directory.")
-
 project (duktape)
 
-file(GLOB_RECURSE DUKTAPE_SOURCES "${SOURCE_PATH}/src/*.c")
-file(GLOB_RECURSE DUKTAPE_HEADERS "${SOURCE_PATH}/src/*.h")
+file(GLOB_RECURSE DUKTAPE_SOURCES "src/*.c")
+file(GLOB_RECURSE DUKTAPE_HEADERS "src/*.h")
 
 if (BUILD_SHARED_LIBS)
     add_definitions(-DDUK_F_DLL_BUILD)
 endif ()
 
+include_directories("src/")
+
 add_library(duktape ${DUKTAPE_SOURCES} ${DUKTAPE_HEADERS})
 
 set_target_properties("duktape" PROPERTIES PUBLIC_HEADER "${DUKTAPE_HEADERS}")
 
 install(TARGETS duktape
+        EXPORT duktape-targets
         ARCHIVE DESTINATION "lib"
         RUNTIME DESTINATION "bin"
         PUBLIC_HEADER DESTINATION "include")
+
diff --git a/ports/duktape/CONTROL b/ports/duktape/CONTROL
index b0f599dd8..ea322ac05 100644
--- a/ports/duktape/CONTROL
+++ b/ports/duktape/CONTROL
@@ -1,4 +1,4 @@
-Source: duktape
-Version: 2.0.3-4
-Description: Embeddable Javascript engine with a focus on portability and compact footprint.
-Build-Depends:
+Source: duktape
+Version: 2.3.0
+Description: Embeddable Javascript engine with a focus on portability and compact footprint.
+Build-Depends:
diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake
index f4aa4f805..ef1476a52 100644
--- a/ports/duktape/portfile.cmake
+++ b/ports/duktape/portfile.cmake
@@ -1,21 +1,52 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/duktape-2.0.3)
-set(CMAKE_PATH ${CMAKE_CURRENT_LIST_DIR})
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://github.com/svaarala/duktape/releases/download/v2.0.3/duktape-2.0.3.tar.xz"
-    FILENAME "duktape-2.0.3.tar.xz"
-    SHA512 ba21731242d953d82c677e1205e3596e270e6d57156a0bca8068fc3b6a35996af69bcfac979b871a7e3eab31f28a06cb99078f0b3eaac54be9c5899f57f4100e
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    message("${PORT} currently requires the following tools from the system package manager:\n    python-yaml\n\nThis can be installed on Ubuntu systems via apt-get install python-yaml PYTHON2-yaml (depending on your current python default interpreter)")
+endif() 
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO svaarala/duktape
+    REF v2.3.0
+    SHA512 dd715eab481b948cf71d3ad16d2544166eb53da0df8936a4ac9c33e1f1277ef6efe542782a4c7f689f6c0c8963d7094749af455ff6a8c59593aa56ebb57e5c6f
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+if(CMAKE_HOST_WIN32)
+    set(EXECUTABLE_SUFFIX ".exe")
+else()
+    set(EXECUTABLE_SUFFIX "")
+endif()
+
+vcpkg_find_acquire_program(PYTHON2)
+get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON2_DIR}")
+if(NOT EXISTS ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX})
+    if(NOT EXISTS ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX})
+        vcpkg_download_distfile(GET_PIP
+            URLS "https://bootstrap.pypa.io/get-pip.py"
+            FILENAME "tools/python/python2/get-pip.py"
+            SHA512 99520d223819708b8f6e4b839d1fa215e4e8adc7fcd0db6c25a0399cf2fa10034b35673cf450609303646d12497f301ef53b7e7cc65c78e7bce4af0c673555ad
+        )
+        execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYTHON2_DIR}/get-pip.py)
+    endif()
+    execute_process(COMMAND ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install pyyaml)
+else()
+    execute_process(COMMAND ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX} pyyaml)
+endif()
+
+execute_process(COMMAND ${PYTHON2} ${SOURCE_PATH}/tools/configure.py --source-directory ${SOURCE_PATH}/src-input --output-directory ${SOURCE_PATH}/src --config-metadata ${SOURCE_PATH}/config -DDUK_USE_FASTINT)
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/duk_config.h.patch"
+    PATCHES
+        duk_config.h.patch 
 )
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${CMAKE_PATH}
-    OPTIONS -DSOURCE_PATH=${SOURCE_PATH}
+    SOURCE_PATH ${SOURCE_PATH}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/dx/CONTROL b/ports/dx/CONTROL
index ac226a66a..8f901cad3 100644
--- a/ports/dx/CONTROL
+++ b/ports/dx/CONTROL
@@ -1,3 +1,3 @@
 Source: dx
-Version: 1.0.1
-Description: A modern C++ library for DirectX programming
-\ No newline at end of file
+Version: 1.0.1-1
+Description: A modern C++ library for DirectX programming
diff --git a/ports/dx/portfile.cmake b/ports/dx/portfile.cmake
index d607e5ed0..ee8eadcc7 100644
--- a/ports/dx/portfile.cmake
+++ b/ports/dx/portfile.cmake
@@ -1,20 +1,21 @@
-#header-only library
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/dx-1.0.1)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/sdcb/dx/archive/v1.0.1.tar.gz"
-    FILENAME "dx-1.0.1.tar.gz"
-    SHA512 b40eb4daf774bfdb394b207bb29652fbf44361f5d8f9b60509c7a3215cd403dbf0c10454979c0c2e97d839496ef20940070a42837375993cd67d58afacc990e0
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-file(INSTALL
-	${SOURCE_PATH}/dx.h
-	${SOURCE_PATH}/debug.h
-	${SOURCE_PATH}/handle.h
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include/dx
-)
-
-file(INSTALL
-	${SOURCE_PATH}/LICENSE
-	DESTINATION ${CURRENT_PACKAGES_DIR}/share/dx RENAME copyright)
-\ No newline at end of file
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO sdcb/dx
+    REF v1.0.1
+    SHA512 b40eb4daf774bfdb394b207bb29652fbf44361f5d8f9b60509c7a3215cd403dbf0c10454979c0c2e97d839496ef20940070a42837375993cd67d58afacc990e0
+    HEAD_REF master
+)
+
+file(INSTALL
+	${SOURCE_PATH}/dx.h
+	${SOURCE_PATH}/debug.h
+	${SOURCE_PATH}/handle.h
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include/dx
+)
+
+file(INSTALL
+	${SOURCE_PATH}/LICENSE
+	DESTINATION ${CURRENT_PACKAGES_DIR}/share/dx RENAME copyright)
diff --git a/ports/dxut/CONTROL b/ports/dxut/CONTROL
index 372a98d72..e36c9d6f1 100644
--- a/ports/dxut/CONTROL
+++ b/ports/dxut/CONTROL
@@ -1,3 +1,3 @@
-Source: dxut
-Version: 11.14-2
-Description: A "GLUT"-like framework for Direct3D 11.x Win32 desktop applications
-\ No newline at end of file
+Source: dxut
+Version: 11.14-3
+Description: A "GLUT"-like framework for Direct3D 11.x Win32 desktop applications
diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake
index cc12d769b..f89fe3982 100644
--- a/ports/dxut/portfile.cmake
+++ b/ports/dxut/portfile.cmake
@@ -1,13 +1,11 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
   message(FATAL_ERROR "DXUT only supports dynamic CRT linkage")
 endif()
 
-include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DXUT-sept2016)
 vcpkg_download_distfile(ARCHIVE_FILE
     URLS "https://github.com/Microsoft/DXUT/archive/sept2016.tar.gz"
@@ -33,7 +31,7 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/include
 	FILES_MATCHING PATTERN "*.h"
 )
-file(REMOVE_RECURSE 
+file(REMOVE_RECURSE
 	${CURRENT_PACKAGES_DIR}/include/Bin)
 
 file(INSTALL
diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL
index a597fe506..2b6f5984e 100644
--- a/ports/eastl/CONTROL
+++ b/ports/eastl/CONTROL
@@ -1,4 +1,4 @@
 Source: eastl
-Version: 3.13.00
+Version: 3.13.05-1
 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.
+  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/fixchar8_t.patch b/ports/eastl/fixchar8_t.patch
new file mode 100644
index 000000000..51fcfe69a
--- /dev/null
+++ b/ports/eastl/fixchar8_t.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake
+index 566fbee..4fcca61 100644
+--- a/scripts/CMake/CommonCppFlags.cmake
++++ b/scripts/CMake/CommonCppFlags.cmake
+@@ -54,7 +54,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+         message(FATAL_ERROR "Building with a gcc version less than 4.7.3 is not supported.")
+     endif()
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive- /Zc:char8_t-")
+ endif()
+ 
+ 
diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake
index 63e6ab6fa..13cf14a21 100644
--- a/ports/eastl/portfile.cmake
+++ b/ports/eastl/portfile.cmake
@@ -1,16 +1,15 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported by EASTL. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO electronicarts/EASTL
-    REF 3.13.00
-    SHA512 5a0a0491e98c1ef18d979865c02f46b3252ecf2757d2f9c5bb07181dfb7b45ff1bba900640fce3771aa4ac06a3e432ce514d1d358ff2066261d0197385419ddb
+    REF 3.13.05
+    SHA512 2364554339203c972f10d58ebe8f14fb221a40451f4cd2c3c5acd6891e8580c1a0a5d4ba592c91349d3feca50d9880648bb37358820a1c9552dde3f7af400a82
     HEAD_REF master
+    PATCHES fixchar8_t.patch # can be removed after electronicarts/EASTL#274 is resolved
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL
index ee257603f..0d1f5e97c 100644
--- a/ports/ebml/CONTROL
+++ b/ports/ebml/CONTROL
@@ -1,3 +1,3 @@
 Source: ebml
-Version: 1.3.7
+Version: 1.3.9
 Description: a C++ libary to parse EBML files
diff --git a/ports/ebml/export-endofstreamx.patch b/ports/ebml/export-endofstreamx.patch
deleted file mode 100644
index f89035230..000000000
--- a/ports/ebml/export-endofstreamx.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d880a71996ba50c18d2e2d33ce4018b22566d9f4 Mon Sep 17 00:00:00 2001
-From: evpobr <evpobr@gmail.com>
-Date: Sat, 17 Feb 2018 12:39:27 +0500
-Subject: [PATCH] Export SafeReadIOCallback::EndOfStreamX class from DLL
-
----
- ebml/SafeReadIOCallback.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ebml/SafeReadIOCallback.h b/ebml/SafeReadIOCallback.h
-index ea96727..3d9de07 100644
---- a/ebml/SafeReadIOCallback.h
-+++ b/ebml/SafeReadIOCallback.h
-@@ -45,7 +45,7 @@ class EBML_DLL_API EbmlBinary;
- 
- class EBML_DLL_API SafeReadIOCallback {
- public:
--  class EndOfStreamX {
-+  class EBML_DLL_API EndOfStreamX {
-   public:
-     size_t mMissingBytes;
-     EndOfStreamX(std::size_t MissingBytes);
--- 
-2.15.1.windows.2
-
diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake
index 3eb8d642d..f4817db1a 100644
--- a/ports/ebml/portfile.cmake
+++ b/ports/ebml/portfile.cmake
@@ -1,16 +1,15 @@
 include(vcpkg_common_functions)
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
+    message(FATAL_ERROR "ebml does not currently support UWP")
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Matroska-Org/libebml
-    REF release-1.3.7
-    SHA512 754dee128db2eb6f0ba09962312ddda79f3178238464dd6161cce50bd08fd4193490a48bb537c4e2a388dc339951909a8857617cb30500d76d5689da4f855b47
+    REF release-1.3.9
+    SHA512 3ae22ed491024b276edde9237df0e41a8e5a4e142ec6783c77d5286d7825fb59be62f336d07f7042baac8fc7ac004ad7cc4605754c5801d65547449ea04c287f
     HEAD_REF master
-    PATCHES export-endofstreamx.patch
 )
 
 vcpkg_configure_cmake(
@@ -21,11 +20,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if (WIN32)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
-else ()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ebml)
-endif ()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EBML)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL
index 6b8ee2938..0e05e6f72 100644
--- a/ports/ecm/CONTROL
+++ b/ports/ecm/CONTROL
@@ -1,3 +1,3 @@
 Source: ecm
-Version: 5.56.0
+Version: 5.58.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 1ccb9a5fc..8211fb97a 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.56.0
-    SHA512 6a65eeaae1974e4bb3b8910875d29cf48ee4d83627aa38179213110aa7e5a058e1721de53eb629baa8e27fd0853a8bbd5aaa2dc001ae4651626d9b7a83c79fa5
+    REF v5.58.0
+    SHA512 c08408c5842789ce61d17642025edca022bcc0b78aba3d7dc0af5a6973f5f26ebe6f65e6d97e516e64eaf778d4a70397c76a96c45a6ee8bda3f2a9d9fff5966e
     HEAD_REF master
 )
 
diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL
index a82e3ba45..3d6136dda 100644
--- a/ports/ecsutil/CONTROL
+++ b/ports/ecsutil/CONTROL
@@ -1,4 +1,4 @@
 Source: ecsutil
-Version: 1.0.3.1
+Version: 1.0.6.1
 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.
 Build-Depends: atlmfc
diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake
index cc5a70854..966281a4f 100644
--- a/ports/ecsutil/portfile.cmake
+++ b/ports/ecsutil/portfile.cmake
@@ -28,8 +28,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO EMCECS/ecs-object-client-windows-cpp
-    REF v1.0.3.1
-    SHA512 0bed2a0296dcb0ea952734feb44a9f35b01d1c6e08dc132cc2d006003df21e5e1a3070ab44f5c9e6986b230c292d62f695f7a06700e7ef8d50efc87f92d5814f
+    REF v1.0.6.1
+    SHA512 4b16b9ce1dbc9f541fe95a40c10678cd2b0192acc94bc3d57e58fbdf37964af84cdc901686555aad1f58d133632b1ad6f57976a5ac71aed1fce2fb44a2d0f8d3
     HEAD_REF master
     PATCHES NoLibSyms.patch
 )
diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL
index 2586620a0..3993a35f0 100644
--- a/ports/eigen3/CONTROL
+++ b/ports/eigen3/CONTROL
@@ -1,3 +1,3 @@
 Source: eigen3
-Version: 3.3.7
+Version: 3.3.7-1
 Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.
diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake
index 9ba268350..31806319f 100644
--- a/ports/eigen3/portfile.cmake
+++ b/ports/eigen3/portfile.cmake
@@ -1,5 +1,12 @@
 include(vcpkg_common_functions)
 
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
+    message(WARNING "eigen3's buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eigenteam/eigen-git-mirror
diff --git a/ports/embree2/CONTROL b/ports/embree2/CONTROL
index f68824e00..1c749f8f6 100644
--- a/ports/embree2/CONTROL
+++ b/ports/embree2/CONTROL
@@ -1,4 +1,4 @@
 Source: embree2
-Version: 2.16.4-3
+Version: 2.17.7
 Description: High Performance Ray Tracing Kernels.
 Build-Depends: tbb
diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake
index 7979891bc..446f379f0 100644
--- a/ports/embree2/portfile.cmake
+++ b/ports/embree2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO embree/embree
-    REF v2.16.4
-    SHA512 235f7273044c8971eb7f7ecca5f4556d2e75ec958fc10d8861792fdd889a0e1c115bcf45bf6de7c2c44117032af96cd49a252399a2454627dcb82fd943222a01
+    REF v2.17.7
+    SHA512 3ea548e5ed85f68dc1f9dfe864711f9b731e0df8a2258257f77db08bbdbe3a9014a626313e3ff41174f3b26f09dc8ff523900119ff4c8465bfff53f621052873
     HEAD_REF devel2
 )
 
@@ -18,6 +18,7 @@ endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
         -DEMBREE_ISPC_SUPPORT=OFF
diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL
index 7e5bcdb85..77d06de9b 100644
--- a/ports/embree3/CONTROL
+++ b/ports/embree3/CONTROL
@@ -1,4 +1,4 @@
 Source: embree3
-Version: 3.2.0-2
+Version: 3.5.2
 Description: High Performance Ray Tracing Kernels.
 Build-Depends: tbb
diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake
index e90ea2357..142be6cd6 100644
--- a/ports/embree3/portfile.cmake
+++ b/ports/embree3/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO embree/embree
-    REF v3.2.0
-    SHA512 296617251e4a9a95a5ceec10ce8f23daf180a8a61fd78bc5782dca7d5b15bddaa0b6f352e47d657a366ef9176a730ef2edc42451fbad8071c5ce8fbfb4515e51
+    REF v3.5.2
+    SHA512 f00403c8bc76428088a38990117245b5b11ac90a2df21fa12c2d5c2e8af45fb3708abb705c612e0d9d7b0cfe4edb51c8b9630b60081b39fcb4370f31ee37acc7
     HEAD_REF master
 )
 
@@ -18,6 +18,7 @@ endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
         -DEMBREE_ISPC_SUPPORT=OFF
diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL
index 9676b708b..b2525e2f9 100644
--- a/ports/ensmallen/CONTROL
+++ b/ports/ensmallen/CONTROL
@@ -1,5 +1,5 @@
 Source: ensmallen
-Version: 1.14.0
+Version: 1.15.0
 Description: A header-only C++ library for mathematical optimization.
 Build-Depends: openblas, clapack, armadillo
 
diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake
index dd03620f5..e98be1863 100644
--- a/ports/ensmallen/portfile.cmake
+++ b/ports/ensmallen/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mlpack/ensmallen
-    REF ensmallen-1.14.0
-    SHA512 a0b3660a0d01f5bc79fe302f08161a0b4d16fa006cc1d95cf24e046d2a4ab48de49b7644023837ed93426b982fbd0861d6c2774c0a80f4d2392ce494291ff70a
+    REF ensmallen-1.15.0
+    SHA512 4264bbba856e8fd4fb00d8a4e5f90d93b853d5358cea0ab7231f38d22af3b1e22b238af03edf292086937c16fe7575549d0a1e4fba1d49c85452ec1d3cc9f31a
     HEAD_REF master
 	PATCHES
 		disable_tests.patch
diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL
index 16dbcfc32..0a41ad86d 100644
--- a/ports/entityx/CONTROL
+++ b/ports/entityx/CONTROL
@@ -1,3 +1,3 @@
 Source: entityx
-Version: 1.2.0-3
+Version: 1.3.0
 Description: EntityX - A fast, type-safe C++ Entity-Component system. <https://github.com/alecthomas/entityx>
diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake
index bc6afccc3..36e3ddf19 100644
--- a/ports/entityx/portfile.cmake
+++ b/ports/entityx/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alecthomas/entityx
-    REF 1.2.0
-    SHA512 682aa302cb4495666aab2c0b39a286f88cb28046bc8b2deb603402105e15e4b9692e32807077abc3f465e42a4e0f34a7e69169bc74fc5579a5c3d0e17b02fdb8
+    REF 1.3.0
+    SHA512 724a3f421f802e60a1106ff8a69435c9a9da14e35c3e88565bbc17bff3a17f2d9771818aac83320cc4f14de0ec770a66f1eb7cbf4318f43abd516c63e077c07d
     HEAD_REF master
     PATCHES
         fix-cmake.patch
diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL
index 3489f8e78..47770ebd1 100644
--- a/ports/entt/CONTROL
+++ b/ports/entt/CONTROL
@@ -1,3 +1,3 @@
 Source: entt
-Version: 2.7.3-1
+Version: 3.0.0
 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 e69ed624f..af331821d 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.3
-    SHA512 ffdb26f43ebf0090eed5de589df4194282e2ab89e5014bfe4acc2670729b86c93ea85e25b4b1e72de975287b8f0aa9e72d89e1cfb649e0a0f4f72838b00e5215
+    REF v3.0.0
+    SHA512 4c68d202bf00cb3f317bcf6e3c0d281e97718f6e4e198b2e280ec8bbfb7d1493e369ec30d2aea40aec3dbb5715a03bf445d1ea4f033621531e63998800bf2564
     HEAD_REF master
 )
 
diff --git a/ports/expected-lite/CONTROL b/ports/expected-lite/CONTROL
new file mode 100644
index 000000000..315f1d01a
--- /dev/null
+++ b/ports/expected-lite/CONTROL
@@ -0,0 +1,3 @@
+Source: expected-lite
+Version: 0.3.0
+Description: Expected objects in C++11 and later in a single-file header-only library
diff --git a/ports/expected-lite/portfile.cmake b/ports/expected-lite/portfile.cmake
new file mode 100644
index 000000000..b8f1ac440
--- /dev/null
+++ b/ports/expected-lite/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinmoene/expected-lite
+    REF v0.3.0
+    SHA512 b24b58ff7bd6d5f355935854b6b5e67c7e9b2f1b6383ecdd2a1655833f414fd1189a07000b40c45a6df8a8641602c5eca19eb5e8639ac6cfe59e3d94bc102ab3
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DEXPECTED_LITE_OPT_BUILD_TESTS=OFF
+        -DEXPECTED_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL
index 995b9165a..e2de3bdf3 100644
--- a/ports/exprtk/CONTROL
+++ b/ports/exprtk/CONTROL
@@ -1,3 +1,3 @@
 Source: exprtk
-Version: 2019-01-09
+Version: 2019-03-29
 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 56cc29941..c82f9cfa5 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 e0e880c3797ea363d24782ba63fe362f7d94f89c
-    SHA512 bd367a07b5dc266f5e335204b256572f682595532be396c7617c7c72f370a49702ee8c073a93614463a3742efe65df9f3f509d6c16efe31a63a1e7b08f9c0b1a
+    REF 9fad72832c70348725c073e369a3321781001766
+    SHA512 6a2a4bdc331806bb5f97737316cc126ab5e8ec75626dd5a63e854a24b7ae41cddccfee8ea09168ed0d272a92dd89cfc9878507ecf70c3f03d5b4f5e53d877727
 )
 
 file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/fann/CONTROL b/ports/fann/CONTROL
index 84b062a30..20fc0dde6 100644
--- a/ports/fann/CONTROL
+++ b/ports/fann/CONTROL
@@ -1,3 +1,3 @@
 Source: fann
-Version: 2.2.0
-Description: Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.
-\ No newline at end of file
+Version: 2.2.0-1
+Description: Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.
diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake
index d18d040e2..de4af3550 100644
--- a/ports/fann/portfile.cmake
+++ b/ports/fann/portfile.cmake
@@ -1,53 +1,50 @@
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO libfann/fann
-    REF 2.2.0
-    SHA512 b307539a39d93078a489710ac77aa8c6e324f3cf5ef80299ce257d10c043913764abef83aceac5278a5bd243b1ee245b4e8331a9e13c774aa63c9cb604f86bdd
-    HEAD_REF master
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-vcpkg_install_cmake()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "FANN does not support static linkage. Building dynamically.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    # Finish Directories
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/fann.dll ${CURRENT_PACKAGES_DIR}/bin/fann.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/doublefann.dll ${CURRENT_PACKAGES_DIR}/bin/doublefann.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/fixedfann.dll ${CURRENT_PACKAGES_DIR}/bin/fixedfann.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/floatfann.dll ${CURRENT_PACKAGES_DIR}/bin/floatfann.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/fann.lib ${CURRENT_PACKAGES_DIR}/lib/fann.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/doublefann.lib ${CURRENT_PACKAGES_DIR}/lib/doublefann.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/fixedfann.lib ${CURRENT_PACKAGES_DIR}/lib/fixedfann.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/floatfann.lib ${CURRENT_PACKAGES_DIR}/lib/floatfann.lib)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fann.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/doublefann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/doublefann.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fixedfann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fixedfann.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/floatfann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/floatfann.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fann.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/doublefann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/doublefann.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fixedfann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fixedfann.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/floatfann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/floatfann.lib)
-
-    # Remove useless config file and include path
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
-endif()
-
-# Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
-
-vcpkg_copy_pdbs()
-\ No newline at end of file
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libfann/fann
+    REF 2.2.0
+    SHA512 b307539a39d93078a489710ac77aa8c6e324f3cf5ef80299ce257d10c043913764abef83aceac5278a5bd243b1ee245b4e8331a9e13c774aa63c9cb604f86bdd
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+vcpkg_install_cmake()
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    # Finish Directories
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/fann.dll ${CURRENT_PACKAGES_DIR}/bin/fann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/doublefann.dll ${CURRENT_PACKAGES_DIR}/bin/doublefann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/fixedfann.dll ${CURRENT_PACKAGES_DIR}/bin/fixedfann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/floatfann.dll ${CURRENT_PACKAGES_DIR}/bin/floatfann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/fann.lib ${CURRENT_PACKAGES_DIR}/lib/fann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/doublefann.lib ${CURRENT_PACKAGES_DIR}/lib/doublefann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/fixedfann.lib ${CURRENT_PACKAGES_DIR}/lib/fixedfann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/floatfann.lib ${CURRENT_PACKAGES_DIR}/lib/floatfann.lib)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/doublefann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/doublefann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fixedfann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fixedfann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/floatfann.dll ${CURRENT_PACKAGES_DIR}/debug/bin/floatfann.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/doublefann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/doublefann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/fixedfann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fixedfann.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/floatfann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/floatfann.lib)
+
+    # Remove useless config file and include path
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+endif()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/fastlz/CONTROL b/ports/fastlz/CONTROL
index 51c95cec8..354b8d5b8 100644
--- a/ports/fastlz/CONTROL
+++ b/ports/fastlz/CONTROL
@@ -1,3 +1,3 @@
 Source: fastlz
-Version: 1.0-1
+Version: 1.0-2
 Description: A lightning-fast lossless compression library
diff --git a/ports/fastlz/portfile.cmake b/ports/fastlz/portfile.cmake
index 16a727246..857dd7d0b 100644
--- a/ports/fastlz/portfile.cmake
+++ b/ports/fastlz/portfile.cmake
@@ -1,19 +1,19 @@
-set(FASTLZ_HASH f1217348a868bdb9ee0730244475aee05ab329c5)
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FastLZ-${FASTLZ_HASH})
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/ariya/FastLZ/archive/${FASTLZ_HASH}.zip"
-    FILENAME "fastlz-${FASTLZ_HASH}.zip"
-    SHA512 edfefbf4151e7ea6451a6fbb6d464a2a0f48ab50622f936634ec3ea4542ad3e1f075892a422e0fc5a23f2092be4ec890e6f91c4622bcd0d195fed84d4044d5df
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ariya/FastLZ
+    REF f1217348a868bdb9ee0730244475aee05ab329c5
+    SHA512 444465aa5d830f54b86112cbd0431099d8e1a11d46bd02e1dc5dc0b3d772736624287e6bc328159195197d0d08cb659d39c59c5336ffa432032f3798e04f4440
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL
index e486cf90a..58b150645 100644
--- a/ports/fcl/CONTROL
+++ b/ports/fcl/CONTROL
@@ -1,4 +1,4 @@
-Source: fcl
-Version: 0.5.0-4
-Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles
-Build-Depends: ccd, octomap
+Source: fcl
+Version: 0.5.0-5
+Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles
+Build-Depends: ccd, octomap
diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake
index 92781872f..1bb4e9a15 100644
--- a/ports/fcl/portfile.cmake
+++ b/ports/fcl/portfile.cmake
@@ -1,17 +1,14 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-vcpkg_from_github( 
-    OUT_SOURCE_PATH SOURCE_PATH 
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
     REPO flexible-collision-library/fcl
     REF 54e9619bc2b084ee50e986ac3308160d663481c4
     SHA512 11bfa3fdeeda6766769a34d2248ca32b6b13ecb32b412c068aa1c7aa3495d55b3f7a82a93621965904f9813c3fd0f128a84f796ae5731d2ff15b85935a0e1261
-    HEAD_REF fcl-0.5 
-) 
+    HEAD_REF fcl-0.5
+)
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/fdk-aac/CMakeLists.txt b/ports/fdk-aac/CMakeLists.txt
index 869703c19..a7f6c09b2 100644
--- a/ports/fdk-aac/CMakeLists.txt
+++ b/ports/fdk-aac/CMakeLists.txt
@@ -169,9 +169,6 @@ include_directories(
   libFDK/include
   libPCMutils/include
 )
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
 
 add_library(fdk-aac ${libfdk_aac_SOURCES})
 
diff --git a/ports/fdk-aac/CONTROL b/ports/fdk-aac/CONTROL
index a298acd1b..5da063ee8 100644
--- a/ports/fdk-aac/CONTROL
+++ b/ports/fdk-aac/CONTROL
@@ -1,3 +1,3 @@
-Source: fdk-aac
-Version: 2018-07-08
-Description: A standalone library of the Fraunhofer FDK AAC code
+Source: fdk-aac
+Version: 2018-07-08-1
+Description: A standalone library of the Fraunhofer FDK AAC code
diff --git a/ports/fdk-aac/portfile.cmake b/ports/fdk-aac/portfile.cmake
index 04de017da..000c00b1f 100644
--- a/ports/fdk-aac/portfile.cmake
+++ b/ports/fdk-aac/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO mstorsjo/fdk-aac
diff --git a/ports/fdlibm/CONTROL b/ports/fdlibm/CONTROL
index e519980bb..c1562c970 100644
--- a/ports/fdlibm/CONTROL
+++ b/ports/fdlibm/CONTROL
@@ -1,3 +1,3 @@
 Source: fdlibm
-Version: 5.3-2
+Version: 5.3-3
 Description: FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic
diff --git a/ports/fdlibm/portfile.cmake b/ports/fdlibm/portfile.cmake
index 6e528f368..ef069289d 100644
--- a/ports/fdlibm/portfile.cmake
+++ b/ports/fdlibm/portfile.cmake
@@ -1,24 +1,37 @@
-include(vcpkg_common_functions)
-
-vcpkg_from_git(
-    OUT_SOURCE_PATH SOURCE_PATH
-    URL https://android.googlesource.com/platform/external/fdlibm
-    REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac
-    SHA512 bc788c840a57716f996513980d31b203bd86ce9af1ac3656a187266bfdc2fbb22a9ddf88f79ffc91dd75f3f1f1e4fd3449a42b566ffe5e49e9384efd91a68613
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def 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
-configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY)
+include(vcpkg_common_functions)
+
+# vcpkg_from_git uses git archive to generate the hash, 
+# depending on what system or git settings this runs with it will result in a different hash
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(FDLIBM_HASH 825dcbbb88e3ebda6d928e1794da58d5135d37e36551c12de7eeab58a67adc4f5629c65d6afde567daeb489c287302116b2a5bbdb16693a3b068bbe16b250cf7)
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(FDLIBM_HASH 954c75f9f7540f4efb21b1f8de296149c648c0ba10d5e9cc99a247164b9e99b6dc37349a9ddaa04ba93dc035562457665aacf7146926d716cd406b63b97c5d44)
+else()
+    # depending on how git is configured the hash could be 
+    #  bc788c840a57716f996513980d31b203bd86ce9af1ac3656a187266bfdc2fbb22a9ddf88f79ffc91dd75f3f1f1e4fd3449a42b566ffe5e49e9384efd91a68613
+    set(FDLIBM_HASH 75c49ba2875b73e0bfe3a4595be1478ce6041236653b803b02ba00997652c969c351c9647923692af0799149da86c737467ab2954bd8845a2f75b14fde71ac29)
+endif()
+
+vcpkg_from_git(
+    OUT_SOURCE_PATH SOURCE_PATH
+    URL https://android.googlesource.com/platform/external/fdlibm
+    REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac
+    SHA512 ${FDLIBM_HASH}
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def 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
+configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY)
+ 
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index ce961fa55..037fcb975 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.1-4
+Version: 4.1-5
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
   FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
 
@@ -23,6 +23,10 @@ Feature: lzma
 Build-Depends: liblzma
 Description: lzma support in ffmpeg
 
+Feature: bzip2
+Build-Depends: bzip2
+Description: bzip2 support in ffmpeg
+
 Feature: x264
 Build-Depends: x264, ffmpeg[gpl]
 Description: x264 support in ffmpeg
diff --git a/ports/ffmpeg/fixed-debug-bzip2-link.patch b/ports/ffmpeg/fixed-debug-bzip2-link.patch
new file mode 100644
index 000000000..29e2913fa
--- /dev/null
+++ b/ports/ffmpeg/fixed-debug-bzip2-link.patch
@@ -0,0 +1,33 @@
+diff -urN a/configure b/configure
+--- a/configure	2018-09-08 20:53:33.556275600 +0800
++++ b/configure	2018-09-08 20:55:46.238584400 +0800
+@@ -4753,6 +4753,8 @@
+ enable $subarch
+ enabled spic && enable_weak pic
+ 
++bzlib_name=bz2
++
+ # OS specific
+ case $target_os in
+     aix)
+@@ -4914,6 +4916,11 @@
+         objformat="win32"
+         ranlib=:
+         enable dos_paths
++        if [ -z "${extra_cflags##*-MDd*}" ] || [ -z "${extra_cflags##*-MTd*}" ]; then
++            bzlib_name=bz2d
++        else
++            bzlib_name=bz2
++        fi
+         ;;
+     cygwin*)
+         target_os=cygwin
+@@ -5734,7 +5741,7 @@
+     check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)"
+ 
+ disabled  zlib || check_lib  zlib.h      zlibVersion    -lz    || disable  zlib
+-disabled bzlib || check_lib bzlib.h BZ2_bzlibVersion    -lbz2  || disable bzlib
++disabled bzlib || check_lib bzlib.h BZ2_bzlibVersion    -l$bzlib_name  || disable bzlib
+ disabled  lzma || check_lib  lzma.h lzma_version_number -llzma || disable lzma
+ 
+ check_lib math.h sin -lm && LIBM="-lm"
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 786d82ea1..ed1203c1d 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_extract_source_archive_ex(
         fix_windowsinclude-in-ffmpegexe-1.patch
         fix_windowsinclude-in-ffmpegexe-2.patch
         fix_windowsinclude-in-ffmpegexe-3.patch
+        fixed-debug-bzip2-link.patch
 )
 
 if (${SOURCE_PATH} MATCHES " ")
@@ -43,7 +44,6 @@ else()
 endif()
 
 set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}")
-set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}")
 
 set(_csc_PROJECT_PATH ffmpeg)
 
@@ -102,12 +102,11 @@ else()
     set(OPTIONS "${OPTIONS} --disable-lzma")
 endif()
 
-# bzip2's debug library is named "bz2d", which isn't found by ffmpeg
-# if("bzip2" IN_LIST FEATURES)
-#     set(OPTIONS "${OPTIONS} --enable-bzip2")
-# else()
-#     set(OPTIONS "${OPTIONS} --disable-bzip2")
-# endif()
+if("bzip2" IN_LIST FEATURES)
+    set(OPTIONS "${OPTIONS} --enable-bzlib")
+else()
+    set(OPTIONS "${OPTIONS} --disable-bzlib")
+endif()
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     set(ENV{LIBPATH} "$ENV{LIBPATH};$ENV{_WKITS10}references\\windows.foundation.foundationcontract\\2.0.0.0\\;$ENV{_WKITS10}references\\windows.foundation.universalapicontract\\3.0.0.0\\")
@@ -151,6 +150,9 @@ if(WIN32)
     endif()
 endif()
 
+set(ENV_LIB "$ENV{LIB}")
+
+set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;${ENV_LIB}")
 message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
 file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
 vcpkg_execute_required_process(
@@ -163,6 +165,7 @@ vcpkg_execute_required_process(
     LOGNAME build-${TARGET_TRIPLET}-rel
 )
 
+set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/debug/lib;${ENV_LIB}")
 message(STATUS "Building ${_csc_PROJECT_PATH} for Debug")
 file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
 vcpkg_execute_required_process(
diff --git a/ports/fftw3/CONTROL b/ports/fftw3/CONTROL
index 1ff42851f..e8c796e5b 100644
--- a/ports/fftw3/CONTROL
+++ b/ports/fftw3/CONTROL
@@ -1,5 +1,5 @@
 Source: fftw3
-Version: 3.3.8-3
+Version: 3.3.8-6
 Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).
 
 Feature: openmp
diff --git a/ports/fftw3/fix-dynamic.patch b/ports/fftw3/fix-dynamic.patch
deleted file mode 100644
index a39d1b968..000000000
--- a/ports/fftw3/fix-dynamic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fftw3.h	2017-01-15 13:03:24.000000000 +0100
-+++ b/fftw3.h	2017-02-24 04:05:36.051091700 +0100
-@@ -47,6 +47,8 @@
- #ifndef FFTW3_H
- #define FFTW3_H
- 
-+#define FFTW_DLL
-+
- #include <stdio.h>
- 
- #ifdef __cplusplus
diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake
index 17ce37ea2..91f8f34a6 100644
--- a/ports/fftw3/portfile.cmake
+++ b/ports/fftw3/portfile.cmake
@@ -1,13 +1,4 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fftw-3.3.8)
-
-# This can be removed in the next source code update
-if(EXISTS "${SOURCE_PATH}/CMakeLists.txt")
-    file(READ "${SOURCE_PATH}/CMakeLists.txt" _contents)
-    if("${_contents}" MATCHES "-D_OPENMP -DLIBFFTWF33_EXPORTS /openmp /bigobj")
-        file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
-    endif()
-endif()
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://www.fftw.org/fftw-3.3.8.tar.gz"
@@ -15,14 +6,13 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 )
 
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/omp_test.patch
-        ${CMAKE_CURRENT_LIST_DIR}/patch_targets.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fftw3_arch_fix.patch
+        omp_test.patch
+        patch_targets.patch
+        fftw3_arch_fix.patch
 )
 
 if ("openmp" IN_LIST FEATURES)
@@ -68,8 +58,12 @@ else()
     set(HAVE_THREADS OFF)
 endif()
 
-foreach(PRECISION ENABLE_DEFAULT_PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE)
-    if(${PRECISION} MATCHES "ENABLE_LONG_DOUBLE")
+set(ENABLE_FLOAT_CMAKE fftw3f)
+set(ENABLE_LONG_DOUBLE_CMAKE fftw3l)
+set(ENABLE_DEFAULT_PRECISION_CMAKE fftw3)
+
+foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)
+    if(PRECISION STREQUAL "ENABLE_LONG_DOUBLE")
         vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
         PREFER_NINJA
@@ -77,6 +71,8 @@ foreach(PRECISION ENABLE_DEFAULT_PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE)
             -D${PRECISION}=ON
             -DENABLE_OPENMP=${ENABLE_OPENMP}
             -DENABLE_THREADS=${HAVE_THREADS}
+            -DWITH_COMBINED_THREADS=${HAVE_THREADS}
+            -DBUILD_TESTS=OFF
         )
     else()
         vcpkg_configure_cmake(
@@ -91,27 +87,29 @@ foreach(PRECISION ENABLE_DEFAULT_PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE)
             -DHAVE_AVX2=${HAVE_AVX2}
             -DHAVE_FMA=${HAVE_FMA}
             -DENABLE_THREADS=${HAVE_THREADS}
+            -DWITH_COMBINED_THREADS=${HAVE_THREADS}
+            -DBUILD_TESTS=OFF
         )
     endif()
 
     vcpkg_install_cmake()
-    vcpkg_copy_pdbs()
 
-    file(COPY ${SOURCE_PATH}/api/fftw3.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+    vcpkg_copy_pdbs()
 
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/${${PRECISION}_CMAKE})
+endforeach()
 
-    if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
-        vcpkg_apply_patches(
-               SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
-               PATCHES
-                       ${CMAKE_CURRENT_LIST_DIR}/fix-dynamic.patch)
-    endif()
+file(READ ${SOURCE_PATH}/api/fftw3.h _contents)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    string(REPLACE "defined(FFTW_DLL)" "0" _contents "${_contents}")
+else()
+    string(REPLACE "defined(FFTW_DLL)" "1" _contents "${_contents}")
+endif()
+file(WRITE ${SOURCE_PATH}/include/fftw3.h "${_contents}")
 
-    # Cleanup
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-endforeach()
+# Cleanup
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fftw3)
diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL
index 9456fdb71..b5c027cda 100644
--- a/ports/fizz/CONTROL
+++ b/ports/fizz/CONTROL
@@ -1,4 +1,4 @@
 Source: fizz
-Version: 2019.01.14.00
+Version: 2019.05.13.00
 Build-Depends: folly, openssl, libsodium, zlib
 Description: a TLS 1.3 implementation by Facebook
diff --git a/ports/fizz/depend-zlib.patch b/ports/fizz/depend-zlib.patch
deleted file mode 100644
index 6e574b62e..000000000
--- a/ports/fizz/depend-zlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
-index ab3b48f..c84890e 100644
---- a/fizz/CMakeLists.txt
-+++ b/fizz/CMakeLists.txt
-@@ -35,6 +35,7 @@ endif()
- 
- find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context)
- find_package(OpenSSL REQUIRED)
-+find_package(ZLIB REQUIRED)
- find_package(Glog REQUIRED)
- find_package(Gflags REQUIRED)
- find_package(Libevent REQUIRED)
-@@ -169,6 +170,7 @@ target_link_libraries(fizz
-     ${FOLLY_LIBRARIES}
-     ${Boost_LIBRARIES}
-     ${OPENSSL_LIBRARIES}
-+    ${ZLIB_LIBRARIES}
-     # Don't use the sodium target here because it will break clients that
-     # consume fizz's exported targets (fizz-targets.cmake) since the sodium
-     # target is not exported.
diff --git a/ports/fizz/find-zlib.patch b/ports/fizz/find-zlib.patch
new file mode 100644
index 000000000..34e93168e
--- /dev/null
+++ b/ports/fizz/find-zlib.patch
@@ -0,0 +1,14 @@
+diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
+index 0c95883..52585aa 100644
+--- a/fizz/CMakeLists.txt
++++ b/fizz/CMakeLists.txt
+@@ -86,6 +86,9 @@ else()
+   list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
+ endif()
+ 
++find_package(ZLIB REQUIRED)
++list(APPEND FIZZ_SHINY_DEPENDENCIES ZLIB::ZLIB)
++
+ set(FIZZ_HEADER_DIRS
+   base
+   client
diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
index add950fe3..3ebe020a9 100644
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@@ -5,10 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
-    REF v2019.01.14.00
-    SHA512 9182e5e6eb795842fdc536adaae9aeae7ddd17a34776bda303015dbac95c95a1ceb42ea77c3b69c1018a9ea33bbd469fd23955ac7efcc2bfcc84e899c89b5981
+    REF v2019.05.13.00
+    SHA512 f1ce2a74ad0c06fb29b37bf02dce832ffc6581723e92f11bfde075307cb0d0e2000e686e48f2f77f07a8abc425a61c2621b7d1211551ee93867cb042f1100598
     HEAD_REF master
-    PATCHES depend-zlib.patch
+    PATCHES find-zlib.patch
 )
 
 # Prefer installed config files
@@ -23,6 +23,7 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DBUILD_TESTS=OFF
+        -DBUILD_EXAMPLES=OFF
         -DINCLUDE_INSTALL_DIR:STRING=include
 )
 
@@ -32,7 +33,11 @@ vcpkg_copy_pdbs()
 
 file(READ ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake _contents)
 string(REPLACE "lib/cmake/fizz" "share/fizz" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake "${_contents}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake
+"include(CMakeFindDependencyMacro)
+find_dependency(folly CONFIG)
+find_dependency(ZLIB)
+${_contents}")
 
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL
index 5fdc23b2e..316ac10be 100644
--- a/ports/flann/CONTROL
+++ b/ports/flann/CONTROL
@@ -1,3 +1,4 @@
 Source: flann
-Version: 1.9.1-9
+Version: jan2019
+Build-Depends: lz4
 Description: Fast Library for Approximate Nearest Neighbors
diff --git a/ports/flann/export-all-symbols-of-flann-cpp.patch b/ports/flann/export-all-symbols-of-flann-cpp.patch
deleted file mode 100644
index 86f172ff3..000000000
--- a/ports/flann/export-all-symbols-of-flann-cpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 49c53f0..b9cf76b 100644
---- a/src/cpp/CMakeLists.txt
-+++ b/src/cpp/CMakeLists.txt
-@@ -52,6 +52,7 @@ set_target_properties(flann_cpp PROPERTIES
-    VERSION ${FLANN_VERSION}
-    SOVERSION ${FLANN_SOVERSION}
-    DEFINE_SYMBOL FLANN_EXPORTS
-+   WINDOWS_EXPORT_ALL_SYMBOLS ON
- )
- 
- if (BUILD_CUDA_LIB)
diff --git a/ports/flann/fix_targets.patch b/ports/flann/fix_targets.patch
new file mode 100644
index 000000000..b9ebe7cb7
--- /dev/null
+++ b/ports/flann/fix_targets.patch
@@ -0,0 +1,243 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4b94d2..e55195b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,9 +146,6 @@ if (BUILD_CUDA_LIB)
+     endif(CUDA_FOUND)
+ endif(BUILD_CUDA_LIB)
+ 
+-find_package(PkgConfig REQUIRED)
+-pkg_check_modules(LZ4 REQUIRED liblz4)
+-
+ #set the C/C++ include path to the "include" directory
+ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp)
+ 
+diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
+index 6b95a71..2c95b6e 100644
+--- a/cmake/Config.cmake.in
++++ b/cmake/Config.cmake.in
+@@ -3,3 +3,5 @@
+ include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
+ check_required_components("flann")
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(lz4)
+diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake
+index afe4742..0cf8289 100644
+--- a/cmake/flann_utils.cmake
++++ b/cmake/flann_utils.cmake
+@@ -1,8 +1,7 @@
+ macro(GET_OS_INFO)
+     string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
+-    set(FLANN_LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+-    set(FLANN_INCLUDE_INSTALL_DIR
+-        "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
++    set(FLANN_LIB_INSTALL_DIR "lib")
++    set(FLANN_INCLUDE_INSTALL_DIR "include")
+ endmacro(GET_OS_INFO)
+ 
+ 
+@@ -27,7 +26,7 @@ macro(find_hdf5)
+     set( HDF5_IS_PARALLEL FALSE )
+     foreach( _dir ${HDF5_INCLUDE_DIRS} )
+         if( EXISTS "${_dir}/H5pubconf.h" )
+-            file( STRINGS "${_dir}/H5pubconf.h" 
++            file( STRINGS "${_dir}/H5pubconf.h"
+                 HDF5_HAVE_PARALLEL_DEFINE
+                 REGEX "HAVE_PARALLEL 1" )
+             if( HDF5_HAVE_PARALLEL_DEFINE )
+@@ -106,7 +105,7 @@ endmacro(flann_add_pyunit)
+ 
+ macro(flann_download_test_data _name _md5)
+     string(REPLACE "/" "_" _dataset_name dataset_${_name})
+-    
++
+     add_custom_target(${_dataset_name}
+         COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/bin/download_checkmd5.py http://people.cs.ubc.ca/~mariusm/uploads/FLANN/datasets/${_name} ${TEST_OUTPUT_PATH}/${_name} ${_md5}
+         VERBATIM)
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 3f4655a..918b94a 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,9 +1,10 @@
+ add_custom_target(examples ALL)
+ 
++find_package(lz4 REQUIRED)
+ 
+ if (BUILD_C_BINDINGS)
+     add_executable(flann_example_c flann_example.c)
+-    target_link_libraries(flann_example_c -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
++    target_link_libraries(flann_example_c lz4::lz4)
+     target_link_libraries(flann_example_c flann)
+     set_target_properties(flann_example_c PROPERTIES COMPILE_FLAGS -std=c99)
+ 
+@@ -15,7 +16,7 @@ if (HDF5_FOUND)
+     include_directories(${HDF5_INCLUDE_DIR})
+ 
+     add_executable(flann_example_cpp flann_example.cpp)
+-    target_link_libraries(flann_example_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
++    target_link_libraries(flann_example_cpp lz4::lz4)
+     target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES} flann_cpp)
+     if (HDF5_IS_PARALLEL)
+         target_link_libraries(flann_example_cpp ${MPI_LIBRARIES})
+@@ -27,7 +28,7 @@ if (HDF5_FOUND)
+ 
+     if (USE_MPI AND HDF5_IS_PARALLEL)
+         add_executable(flann_example_mpi flann_example_mpi.cpp)
+-        target_link_libraries(flann_example_mpi -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
++        target_link_libraries(flann_example_mpi lz4::lz4)
+         target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
+ 
+         add_dependencies(examples flann_example_mpi)
+@@ -36,7 +37,3 @@ if (HDF5_FOUND)
+ else()
+     message("hdf5 library not found, not compiling flann_example.cpp")
+ endif()
+-
+-
+-
+-
+diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
+index b30f3da..1535d37 100644
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
+@@ -8,12 +8,13 @@ file(GLOB_RECURSE C_SOURCES flann.cpp)
+ file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp)
+ file(GLOB_RECURSE CU_SOURCES *.cu)
+ 
+-add_library(flann_cpp_s STATIC ${CPP_SOURCES})
+-target_link_libraries(flann_cpp_s ${LZ4_LIBRARIES})
+-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+-    set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC)
+-endif()
+-set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA)
++find_package(lz4 REQUIRED)
++
++set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++
++add_library(flann_cpp STATIC ${CPP_SOURCES})
++target_link_libraries(flann_cpp PRIVATE lz4::lz4)
++set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
+ 
+ if (BUILD_CUDA_LIB)
+     SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA")
+@@ -25,48 +26,11 @@ if (BUILD_CUDA_LIB)
+     else()
+ 	    set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" )
+     endif()
+-    cuda_add_library(flann_cuda_s STATIC ${CU_SOURCES})
+-    set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
+-endif()
+-
+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+-    add_library(flann_cpp SHARED "")
+-    set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
+-    target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
+-
+-    if (BUILD_CUDA_LIB)
+-	    cuda_add_library(flann_cuda SHARED "")
+-        set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX)
+-        target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive)
+-        set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
+-    # 	target_link_libraries(flann_cuda cudpp_x86_64)
+-    endif()
+-else()
+-    add_library(flann_cpp SHARED ${CPP_SOURCES})
+-    target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
+-    # export lz4 headers, so that MSVC to creates flann_cpp.lib
+-    set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES)
+-    if (BUILD_CUDA_LIB)
+-		cuda_add_library(flann_cuda SHARED ${CPP_SOURCES})
+-        set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
+-    endif()
+-endif()
+-
+-set_target_properties(flann_cpp PROPERTIES
+-   VERSION ${FLANN_VERSION}
+-   SOVERSION ${FLANN_SOVERSION}
+-   DEFINE_SYMBOL FLANN_EXPORTS
+-)
+-
+-if (BUILD_CUDA_LIB)
+-    set_target_properties(flann_cuda PROPERTIES
+-       VERSION ${FLANN_VERSION}
+-       SOVERSION ${FLANN_SOVERSION}
+-       DEFINE_SYMBOL FLANN_EXPORTS
+-    )
++    cuda_add_library(flann_cuda STATIC ${CU_SOURCES})
++    set_property(TARGET flann_cuda PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
++    set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
+ endif()
+ 
+-
+ if (USE_MPI AND HDF5_IS_PARALLEL)
+     add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp)
+     target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
+@@ -80,31 +44,9 @@ endif()
+ 
+ 
+ if (BUILD_C_BINDINGS)
+-    add_library(flann_s STATIC ${C_SOURCES})
+-    target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
+-    if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+-        set_target_properties(flann_s PROPERTIES COMPILE_FLAGS -fPIC)
+-    endif()
+-    set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
+-
+-    if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+-        add_library(flann SHARED "")
+-        set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
+-        target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
+-    else()
+-        add_library(flann SHARED ${C_SOURCES})
+-        target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
+-
+-        if(MINGW AND OPENMP_FOUND)
+-          target_link_libraries(flann gomp)
+-        endif()
+-    endif()
+-
+-    set_target_properties(flann PROPERTIES
+-       VERSION ${FLANN_VERSION}
+-       SOVERSION ${FLANN_SOVERSION}
+-       DEFINE_SYMBOL FLANN_EXPORTS
+-    )
++    add_library(flann STATIC ${C_SOURCES})
++    target_link_libraries(flann PRIVATE lz4::lz4)
++    set_property(TARGET flann PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
+ endif()
+ 
+ if(WIN32)
+@@ -118,9 +60,9 @@ endif(WIN32)
+ 
+ 
+ install (
+-    TARGETS flann_cpp flann_cpp_s
++    TARGETS flann_cpp
+     EXPORT ${targets_export_name}
+-    INCLUDES DESTINATION include
++    INCLUDES DESTINATION ${FLANN_INCLUDE_INSTALL_DIR}
+     RUNTIME DESTINATION bin
+     LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
+     ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}
+@@ -128,9 +70,9 @@ install (
+ 
+ if (BUILD_CUDA_LIB)
+     install (
+-        TARGETS flann_cuda flann_cuda_s
++        TARGETS flann_cuda
+         EXPORT ${targets_export_name}
+-        INCLUDES DESTINATION include
++        INCLUDES DESTINATION ${FLANN_INCLUDE_INSTALL_DIR}
+         RUNTIME DESTINATION bin
+         LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
+         ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}
+@@ -139,7 +81,7 @@ endif()
+ 
+ if (BUILD_C_BINDINGS)
+     install (
+-        TARGETS flann flann_s
++        TARGETS flann
+         EXPORT ${targets_export_name}
+         INCLUDES DESTINATION include
+         RUNTIME DESTINATION bin
diff --git a/ports/flann/flann-linux.patch b/ports/flann/flann-linux.patch
deleted file mode 100644
index da95aa7a2..000000000
--- a/ports/flann/flann-linux.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/cpp/CMakeLists b/src/cpp/CMakeLists.txt
-index e6c8ae06..c15a8e90 100644
---- a/src/cpp/CMakeLists.txt	
-+++ b/src/cpp/CMakeLists.txt
-@@ -35,7 +35,7 @@ if (BUILD_CUDA_LIB)
- endif()
- 
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
--    add_library(flann_cpp SHARED "")
-+    add_library(flann_cpp SHARED ${CPP_SOURCES})
-     set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
-     target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
- 
-@@ -90,7 +90,7 @@ if (BUILD_C_BINDINGS)
-     set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
- 
-     if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
--        add_library(flann SHARED "")
-+        add_library(flann SHARED ${C_SOURCES})
-         set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
-         target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
-     else()
diff --git a/ports/flann/no-write-src-dir.patch b/ports/flann/no-write-src-dir.patch
deleted file mode 100644
index c44c869cc..000000000
--- a/ports/flann/no-write-src-dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index eb84c8a..e6c8ae0 100644
---- a/src/cpp/CMakeLists.txt
-+++ b/src/cpp/CMakeLists.txt
-@@ -2,7 +2,13 @@
- 
- add_definitions(-D_FLANN_VERSION=${FLANN_VERSION})
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/flann/config.h)
-+include_directories(${CMAKE_CURRENT_BINARY_DIR}/flann)
-+
-+install (
-+    FILES ${CMAKE_CURRENT_BINARY_DIR}/flann/config.h
-+    DESTINATION include/flann
-+)
- 
- file(GLOB_RECURSE C_SOURCES flann.cpp lz4.c lz4hc.c)
- file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp lz4.c lz4hc.c)
diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake
index f8c6b96d4..17770bd29 100644
--- a/ports/flann/portfile.cmake
+++ b/ports/flann/portfile.cmake
@@ -1,15 +1,17 @@
 include(vcpkg_common_functions)
 
+#the port uses inside the CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, which is discouraged by vcpkg.
+#Since it's its author choice, we should not disallow it, but unfortunately looks like it's broken, so we block it anyway...
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mariusmuja/flann
-    REF  1.9.1
-    SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
+    REF  aa40936816f4feaa714d3a09f92a495da017d95c
+    SHA512 f6f2e75f4ce4bc4bc4cc1feab27fe683b8a5f9f5dcea35de4df5136a683b5dff5e68776008821a16ccf1a52a9807cb053c0062deba4fe121948248acd52864ef
     HEAD_REF master
     PATCHES
-        export-all-symbols-of-flann-cpp.patch
-        no-write-src-dir.patch
-        flann-linux.patch
+        fix_targets.patch
 )
 
 vcpkg_configure_cmake(
@@ -21,36 +23,15 @@ vcpkg_configure_cmake(
         -DBUILD_DOC=OFF
         -DBUILD_PYTHON_BINDINGS=OFF
         -DBUILD_MATLAB_BINDINGS=OFF
-        -DCMAKE_DEBUG_POSTFIX=-gd
+        -DCMAKE_DEBUG_POSTFIX=d
         -DHDF5_NO_FIND_PACKAGE_CONFIG_FILE=ON
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    set(LIB_PREFIX "")
-    set(LIB_SUFFIX ".lib")
-else()
-    set(LIB_PREFIX "lib")
-    set(LIB_SUFFIX ".a")
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann-gd${LIB_SUFFIX})
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_cpp${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_cpp-gd${LIB_SUFFIX})
-
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_s${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann${LIB_SUFFIX})
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_s-gd${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann-gd${LIB_SUFFIX})
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_cpp_s${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_cpp${LIB_SUFFIX})
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_cpp_s-gd${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_cpp-gd${LIB_SUFFIX})
-elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_s${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_s-gd${LIB_SUFFIX})
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_cpp_s${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_cpp_s-gd${LIB_SUFFIX})
-endif()
-
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/flann/COPYING ${CURRENT_PACKAGES_DIR}/share/flann/copyright)
diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL
index f9f318630..c0b505eed 100644
--- a/ports/flatbuffers/CONTROL
+++ b/ports/flatbuffers/CONTROL
@@ -1,4 +1,4 @@
-Source: flatbuffers
-Version: 1.10.0
-Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/
-  FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility.
+Source: flatbuffers
+Version: 1.10.0-1
+Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/
+ FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility.
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
index fe7704d8c..e055766b6 100644
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@@ -1,9 +1,7 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("Building DLLs not supported. Building static instead.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/flatbuffers
@@ -50,4 +48,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bi
 # 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/flint/CONTROL b/ports/flint/CONTROL
index 90797aa29..0526b782a 100644
--- a/ports/flint/CONTROL
+++ b/ports/flint/CONTROL
@@ -1,4 +1,4 @@
 Source: flint
-Version: 2.5.2-2
+Version: 2.5.2-3
 Description: Fast Library for Number Theory
 Build-Depends: mpir, mpfr, pthreads, gettimeofday
diff --git a/ports/flint/dll_flint.patch b/ports/flint/dll_flint.patch
index 15a6660b2..c8cecb7bf 100644
--- a/ports/flint/dll_flint.patch
+++ b/ports/flint/dll_flint.patch
@@ -16,7 +16,7 @@ index 3c8edd3..5c861d2 100644
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <LargeAddressAware>true</LargeAddressAware>
 -      <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
      <PostBuildEvent>
        <Command>postbuild $(IntDir) DLL
@@ -34,7 +34,7 @@ index 3c8edd3..5c861d2 100644
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <LargeAddressAware>true</LargeAddressAware>
 -      <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
      <PostBuildEvent>
        <Command>postbuild $(IntDir) DLL
@@ -52,7 +52,7 @@ index 3c8edd3..5c861d2 100644
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <LargeAddressAware>true</LargeAddressAware>
 -      <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
      <PostBuildEvent>
        <Command>postbuild $(IntDir) DLL
@@ -70,7 +70,7 @@ index 3c8edd3..5c861d2 100644
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <LargeAddressAware>true</LargeAddressAware>
 -      <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
      <PostBuildEvent>
        <Command>postbuild $(IntDir) DLL
diff --git a/ports/fltk/CONTROL b/ports/fltk/CONTROL
index 8261b63a5..90f186ae2 100644
--- a/ports/fltk/CONTROL
+++ b/ports/fltk/CONTROL
@@ -1,4 +1,4 @@
 Source: fltk
-Version: 1.3.4-5
+Version: 1.3.4-6
 Description: FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.
 Build-Depends: zlib, libpng, libjpeg-turbo
diff --git a/ports/fltk/add-link-libraries.patch b/ports/fltk/add-link-libraries.patch
new file mode 100644
index 000000000..547c9717c
--- /dev/null
+++ b/ports/fltk/add-link-libraries.patch
@@ -0,0 +1,13 @@
+diff --git a/CMake/macros.cmake b/CMake/macros.cmake
+index 4def62d..27b4901 100644
+--- a/CMake/macros.cmake
++++ b/CMake/macros.cmake
+@@ -67,6 +67,8 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
+ 		COMPILE_DEFINITIONS "FL_DLL"
+ 		)
+ 	endif (${LIBTYPE} STREQUAL "SHARED")
++
++    target_link_libraries(${LIBRARY_NAME} gdi32 gdiplus user32 advapi32 ole32 shell32 comdlg32)
+     endif (MSVC)
+ 
+     install(TARGETS ${LIBRARY_NAME}
diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake
index c6c6fd830..5b7e246a3 100644
--- a/ports/fltk/portfile.cmake
+++ b/ports/fltk/portfile.cmake
@@ -17,7 +17,9 @@ vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_apply_patches(
     SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fltk-1.3.4-1
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/findlibsfix.patch"
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/findlibsfix.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/add-link-libraries.patch"
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -26,6 +28,12 @@ else()
     set(BUILD_SHARED OFF)
 endif()
 
+if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
+    set(OPTION_USE_GL "-DOPTION_USE_GL=OFF")
+else()
+    set(OPTION_USE_GL)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -35,6 +43,7 @@ vcpkg_configure_cmake(
         -DOPTION_USE_SYSTEM_LIBPNG=ON
         -DOPTION_USE_SYSTEM_LIBJPEG=ON
         -DOPTION_BUILD_SHARED_LIBS=${BUILD_SHARED}
+        ${OPTION_USE_GL}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/fluidsynth/CONTROL b/ports/fluidsynth/CONTROL
index 7fbb29a5b..fc79995bc 100644
--- a/ports/fluidsynth/CONTROL
+++ b/ports/fluidsynth/CONTROL
@@ -1,4 +1,4 @@
 Source: fluidsynth
-Version: 1.1.10
+Version: 2.0.5
 Description: FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.
 Build-Depends: glib
 \ No newline at end of file
diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake
index ed0cf532d..5060faa8e 100644
--- a/ports/fluidsynth/portfile.cmake
+++ b/ports/fluidsynth/portfile.cmake
@@ -4,8 +4,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fluidsynth-1.1.10)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FluidSynth/fluidsynth
-    REF v1.1.10
-    SHA512 7ff7757baf6dee37f65a4fd214ffab1aa1434cfd1545deb4108fe2e9b0ed19d616880b2740a693b51ade0a4be998a671910b43cae26eb67fb97b16a513752cbc
+    REF v2.0.5
+    SHA512 5344ac889d2927dc2465bae40096d756a9bf9b1100e287ba0621c55ffc76f9cb8fa763f6bc832d701cd0ad2997965cf344f58ae4b3dd445eb3491e3659c093d9
     HEAD_REF master
 )
 
diff --git a/ports/fmi4cpp/CONTROL b/ports/fmi4cpp/CONTROL
index 38d3b8e7f..2a05be3b5 100644
--- a/ports/fmi4cpp/CONTROL
+++ b/ports/fmi4cpp/CONTROL
@@ -1,7 +1,11 @@
 Source: fmi4cpp
-Version: 0.5.3
+Version: 0.7.0
 Description: FMI 2.0 implementation written in modern C++
-Build-Depends: boost-property-tree, bzip2 (linux), openssl (linux), libzip, spdlog
+Build-Depends: boost-property-tree, libzip[openssl]
+
+Feature: curl
+Build-Depends: curl
+Description: Allows loading FMUs from URL
 
 Feature: odeint
 Build-Depends: boost-ublas, boost-odeint
diff --git a/ports/fmi4cpp/portfile.cmake b/ports/fmi4cpp/portfile.cmake
index 676efea3e..0952f5c5a 100644
--- a/ports/fmi4cpp/portfile.cmake
+++ b/ports/fmi4cpp/portfile.cmake
@@ -15,11 +15,16 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO NTNU-IHB/FMI4cpp
-    REF v0.5.3
-    SHA512 1c62f1fce4d3c0c18bc0a470827be13bc143ec8152ac75781e4d61d332b97389afc5943001e7cb8ae0ea7ebc141d88b00033de73a3d5696923a3f1c05f8ff904
+    REF v0.7.0
+    SHA512 5846f5b28badb5b4836ffd9d284f602dd243df20d3c82cab5e2b62b8be37e0ab05b7422bca066f37ca67ee0d5b35abd2febe87f623fc3b9854d245e86e1e21fe
     HEAD_REF master
 )
 
+set(WITH_CURL OFF)
+if("curl" IN_LIST FEATURES)
+    set(WITH_CURL ON)
+endif()
+
 set(WITH_ODEINT OFF)
 if("odeint" IN_LIST FEATURES)
     set(WITH_ODEINT ON)
@@ -28,15 +33,16 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS 
+    OPTIONS
         -DFMI4CPP_BUILD_TOOL=OFF
         -DFMI4CPP_BUILD_TESTS=OFF
         -DFMI4CPP_BUILD_EXAMPLES=OFF
+        -DFMI4CPP_WITH_CURL=${WITH_CURL}
 	-DFMI4CPP_WITH_ODEINT=${WITH_ODEINT}
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/FMI4cpp")
+vcpkg_fixup_cmake_targets()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index 79e7804d5..7c2d5d930 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,3 +1,3 @@
 Source: fmt
-Version: 5.3.0-1
+Version: 5.3.0-2
 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 228ed7651..f1778d985 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -18,10 +18,12 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmt RENAME copyright)
 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}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll)
+    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll)
+    endif()
 
     # Force FMT_SHARED to 1
     file(READ ${CURRENT_PACKAGES_DIR}/include/fmt/core.h FMT_CORE_H)
@@ -32,12 +34,14 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 vcpkg_fixup_cmake_targets()
 
-file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE)
-string(REPLACE "lib/fmtd.dll" "bin/fmtd.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE})
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}")
-file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake FMT_RELEASE_MODULE)
-string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_RELEASE_MODULE ${FMT_RELEASE_MODULE})
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake "${FMT_RELEASE_MODULE}")
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+    file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE)
+    string(REPLACE "lib/fmtd.dll" "bin/fmtd.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE})
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}")
+    file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake FMT_RELEASE_MODULE)
+    string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_RELEASE_MODULE ${FMT_RELEASE_MODULE})
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake "${FMT_RELEASE_MODULE}")
+endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 vcpkg_copy_pdbs()
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index e780db110..1d673877f 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,7 +1,7 @@
 Source: folly
-Version: 2019.01.28.00-1
+Version: 2019.05.13.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
+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, boost-smart-ptr
 Default-Features: zlib
 
 Feature: zlib
diff --git a/ports/folly/boost-1.70.patch b/ports/folly/boost-1.70.patch
new file mode 100644
index 000000000..97c01116d
--- /dev/null
+++ b/ports/folly/boost-1.70.patch
@@ -0,0 +1,23 @@
+diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
+index d75e012..03019f3 100644
+--- a/folly/portability/PThread.cpp
++++ b/folly/portability/PThread.cpp
+@@ -18,6 +18,9 @@
+ 
+ #if !FOLLY_HAVE_PTHREAD && _WIN32
+ #include <boost/thread/tss.hpp> // @manual
++#include <boost/thread/exceptions.hpp>
++#include <boost/shared_ptr.hpp>
++#include <boost/thread/thread_only.hpp>
+ 
+ #include <errno.h>
+ 
+@@ -684,7 +687,7 @@ int pthread_setspecific(pthread_key_t key, const void* value) {
+     // function, which we don't want to do.
+     boost::detail::set_tss_data(
+         realKey,
+-        boost::shared_ptr<boost::detail::tss_cleanup_function>(),
++        0,0,
+         const_cast<void*>(value),
+         false);
+     return 0;
diff --git a/ports/folly/find-double-conversion.patch b/ports/folly/find-double-conversion.patch
new file mode 100644
index 000000000..53f49e831
--- /dev/null
+++ b/ports/folly/find-double-conversion.patch
@@ -0,0 +1,25 @@
+diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
+index 1522db2..5ed2ea9 100644
+--- a/CMake/folly-deps.cmake
++++ b/CMake/folly-deps.cmake
+@@ -17,9 +17,17 @@ find_package(Boost 1.51.0 MODULE
+ list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
+ 
+-find_package(DoubleConversion MODULE REQUIRED)
+-list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
++find_package(double-conversion CONFIG REQUIRED)
++if (double-conversion_FOUND)
++  message(STATUS "Found double-conversion from package config")
++  set(FOLLY_HAVE_DOUBLE_CONVERSION ON)
++  # How to obtain link libraries from target? double-conversion doesn't set property INTERFACE_LINK_LIBRARIES
++  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
++else()
++  find_package(DoubleConversion MODULE)
++  list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
++  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
++endif()
+ 
+ set(FOLLY_HAVE_LIBGFLAGS OFF)
+ find_package(gflags CONFIG REQUIRED)
diff --git a/ports/folly/find-gflags.patch b/ports/folly/find-gflags.patch
deleted file mode 100644
index a3e011683..000000000
--- a/ports/folly/find-gflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index 437c0cd..5530a35 100644
---- a/CMake/folly-deps.cmake
-+++ b/CMake/folly-deps.cmake
-@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
- 
- set(FOLLY_HAVE_LIBGFLAGS OFF)
--find_package(gflags CONFIG QUIET)
-+find_package(gflags CONFIG REQUIRED)
- if (gflags_FOUND)
-   message(STATUS "Found gflags from package config")
-   set(FOLLY_HAVE_LIBGFLAGS ON)
diff --git a/ports/folly/missing-include-atomic.patch b/ports/folly/missing-include-atomic.patch
new file mode 100644
index 000000000..54c1a4817
--- /dev/null
+++ b/ports/folly/missing-include-atomic.patch
@@ -0,0 +1,12 @@
+diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
+index 2891c4c..7c98975 100644
+--- a/folly/portability/PThread.cpp
++++ b/folly/portability/PThread.cpp
+@@ -28,6 +28,7 @@
+ #include <mutex>
+ #include <shared_mutex>
+ #include <thread>
++#include <atomic>
+ 
+ #include <folly/lang/Assume.h>
+ #include <folly/portability/Windows.h>
diff --git a/ports/folly/no-werror.patch b/ports/folly/no-werror.patch
deleted file mode 100644
index 32fbc9494..000000000
--- a/ports/folly/no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake
-index a9cc2c1..de7d714 100644
---- a/CMake/FollyCompilerUnix.cmake
-+++ b/CMake/FollyCompilerUnix.cmake
-@@ -34,7 +34,6 @@ function(apply_folly_compile_options_to_target THETARGET)
-       -std=${CXX_STD}
-       -finput-charset=UTF-8
-       -fsigned-char
--      -Werror
-       -Wall
-       -Wno-deprecated
-       -Wno-deprecated-declarations
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 3c695cc99..e77c084f6 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -1,13 +1,10 @@
+include(vcpkg_common_functions)
+
 if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
   message(FATAL_ERROR "Folly only supports the x64 architecture.")
 endif()
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 # Required to run build/generate_escape_tables.py et al.
 vcpkg_find_acquire_program(PYTHON3)
@@ -17,12 +14,13 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF v2019.01.28.00
-    SHA512 cdd32d863bd98b31332fbcb25a548407857ffd8e611fb5d243821f43fcf240cb796fb4520dddec5537f398c10492e1ecb03de22f7ec0384b98411e9906f40d09
+    REF v2019.05.13.00
+    SHA512 5dfeef0c2845b15e32a29119921d65e349a7ae9bcfa25c406d42d8df1614d2542153cd0ad8d0cf22592045b24272375a7839af91579d6be685cb8a3512586689
     HEAD_REF master
     PATCHES
-        find-gflags.patch
-        no-werror.patch
+        missing-include-atomic.patch
+        boost-1.70.patch
+        reorder-glog-gflags.patch
 )
 
 file(COPY
@@ -80,15 +78,17 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/folly)
 # We substitute with generator expressions so that the right libraries are linked for debug and release.
 set(FOLLY_TARGETS_CMAKE "${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake")
 FILE(READ ${FOLLY_TARGETS_CMAKE} _contents)
-STRING(REPLACE 
-[[
-"Threads::Threads;Iphlpapi.lib;Ws2_32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_context-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_context-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_chrono-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_chrono-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_date_time-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_date_time-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_filesystem-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_filesystem-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_program_options-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_program_options-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_regex-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_regex-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_system-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_system-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_thread-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_thread-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_atomic-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_atomic-vc140-mt-gd.lib>;${_IMPORT_PREFIX}/lib/double-conversion.lib;${_IMPORT_PREFIX}/lib/ssleay32.lib;${_IMPORT_PREFIX}/lib/libeay32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/zlib.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/zlibd.lib>;gflags;glog::glog;event"
-]]
-[[
-"Threads::Threads;Iphlpapi.lib;Ws2_32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_context-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_context-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_chrono-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_chrono-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_date_time-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_date_time-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_filesystem-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_filesystem-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_program_options-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_program_options-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_regex-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_regex-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_system-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_system-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_thread-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_thread-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_atomic-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_atomic-vc140-mt-gd.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/double-conversion.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/double-conversion.lib>;${_IMPORT_PREFIX}/lib/ssleay32.lib;${_IMPORT_PREFIX}/lib/libeay32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/zlib.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/zlibd.lib>;gflags;glog::glog;event"
-]]
-    _contents "${_contents}")
+string(REPLACE "\${_IMPORT_PREFIX}/lib/zlib.lib" "ZLIB::ZLIB" _contents "${_contents}")
+STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
+STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
+string(REPLACE "-vc140-mt.lib" "-vc140-mt\$<\$<CONFIG:DEBUG>:-gd>.lib" _contents "${_contents}")
 FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}")
+FILE(READ ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake _contents)
+FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake
+"include(CMakeFindDependencyMacro)
+find_dependency(Threads)
+find_dependency(glog CONFIG)
+${_contents}")
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
diff --git a/ports/folly/reorder-glog-gflags.patch b/ports/folly/reorder-glog-gflags.patch
new file mode 100644
index 000000000..85fd1d9fb
--- /dev/null
+++ b/ports/folly/reorder-glog-gflags.patch
@@ -0,0 +1,28 @@
+diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
+index e0bbcbb..fb45331 100644
+--- a/CMake/folly-deps.cmake
++++ b/CMake/folly-deps.cmake
+@@ -24,6 +24,11 @@ find_package(DoubleConversion MODULE REQUIRED)
+ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
+ 
++find_package(Glog MODULE)
++set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
++list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
++list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
++
+ find_package(Gflags MODULE)
+ set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
+@@ -31,11 +36,6 @@ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY})
+ list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
+ 
+-find_package(Glog MODULE)
+-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
+-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
+-
+ find_package(LibEvent MODULE REQUIRED)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL
index 8e34f77a1..32981a12f 100644
--- a/ports/forest/CONTROL
+++ b/ports/forest/CONTROL
@@ -1,3 +1,3 @@
 Source: forest
-Version: 10.1.1-1
+Version: 11.0.1
 Description: Template library of tree data structures
diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake
index cc0189711..7dcccb979 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 10.1.7
-    SHA512 104cf76817faf7f6cf82b8c5168b7e611a29de13cf948c55bea02ae97909756d726a8130380a6bc8c96b86466eb779a178f6ffceac16cbc24af468eb19e7dcc9
+    REF 11.0.1
+    SHA512 cb9245445c52c9e2e544c556cd87ecfd1e598bf0ed71a20368b32bd47b611f9696a8e50e06ecb98814af8e6e254bde9e7f98ca0d28c62f86ce9ff45805c2a1e5
     HEAD_REF master
 )
 
diff --git a/ports/forge/CONTROL b/ports/forge/CONTROL
index 391d6c8fe..f4317486e 100644
--- a/ports/forge/CONTROL
+++ b/ports/forge/CONTROL
@@ -1,4 +1,4 @@
 Source: forge
 Version: 1.0.3-1
-Description: Helps with high performance visulizations involving OpenGL-CUDA/OpenCL interop.
+Description: Helps with high performance visualizations involving OpenGL-CUDA/OpenCL interop.
 Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows)
diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL
index c6f595c2f..15b0ac2e3 100644
--- a/ports/freeglut/CONTROL
+++ b/ports/freeglut/CONTROL
@@ -1,3 +1,3 @@
 Source: freeglut
-Version: 3.0.0-5
+Version: 3.0.0-6
 Description: Open source implementation of GLUT with source and binary backwards compatibility.
diff --git a/ports/freeglut/macOS_Xquartz.patch b/ports/freeglut/macOS_Xquartz.patch
new file mode 100644
index 000000000..423b3b901
--- /dev/null
+++ b/ports/freeglut/macOS_Xquartz.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f68b27f..4339858 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -220,6 +220,16 @@ ENDIF()
+ IF(FREEGLUT_GLES)
+   ADD_DEFINITIONS(-DFREEGLUT_GLES)
+   LIST(APPEND LIBS GLESv2 GLESv1_CM EGL)
++ELSEIF(APPLE)
++  # on OSX FindOpenGL uses framework version of OpenGL, but we need X11 version
++  FIND_PATH(GLX_INCLUDE_DIR GL/glx.h
++            PATHS /opt/X11/include /usr/X11/include /usr/X11R6/include)
++  FIND_LIBRARY(OPENGL_gl_LIBRARY GL
++               PATHS /opt/X11/lib /usr/X11/lib /usr/X11R6/lib)
++  FIND_LIBRARY(OPENGL_glu_LIBRARY GLU
++               PATHS /opt/X11/lib /usr/X11/lib /usr/X11R6/lib)
++  LIST(APPEND LIBS ${OPENGL_gl_LIBRARY})
++  INCLUDE_DIRECTORIES(${GLX_INCLUDE_DIR})
+ ELSE()
+   FIND_PACKAGE(OpenGL REQUIRED)
+   LIST(APPEND LIBS ${OPENGL_gl_LIBRARY})
diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake
index 3be83ed4a..86d691593 100644
--- a/ports/freeglut/portfile.cmake
+++ b/ports/freeglut/portfile.cmake
@@ -5,18 +5,19 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "freeglut-3.0.0.tar.gz"
     SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+  OUT_SOURCE_PATH SOURCE_PATH
+  ARCHIVE ${ARCHIVE}
+  PATCHES
+    use_targets_to_export_x11_dependency.patch
+    macOS_Xquartz.patch
+)
 
 if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev")
+    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n    xrandr\n    xi\n    xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.")
 endif()
 
-# disable debug suffix, because FindGLUT.cmake from CMake 3.8 doesn't support it
-file(READ ${SOURCE_PATH}/CMakeLists.txt FREEGLUT_CMAKELISTS)
-string(REPLACE "SET( CMAKE_DEBUG_POSTFIX \"d\" )"
-               "\#SET( CMAKE_DEBUG_POSTFIX \"d\" )" FREEGLUT_CMAKELISTS "${FREEGLUT_CMAKELISTS}")
-file(WRITE ${SOURCE_PATH}/CMakeLists.txt "${FREEGLUT_CMAKELISTS}")
-
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(FREEGLUT_STATIC OFF)
     set(FREEGLUT_DYNAMIC ON)
@@ -27,8 +28,10 @@ endif()
 
 # Patch header
 file(READ ${SOURCE_PATH}/include/GL/freeglut_std.h FREEGLUT_STDH)
-string(REGEX REPLACE "\"freeglut[_a-z]+.lib\""
+string(REGEX REPLACE "\"freeglut_static.lib\""
                      "\"freeglut.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}")
+string(REGEX REPLACE "\"freeglut_staticd.lib\""
+                     "\"freeglutd.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}")
 file(WRITE ${SOURCE_PATH}/include/GL/freeglut_std.h "${FREEGLUT_STDH}")
 
 vcpkg_configure_cmake(
@@ -46,7 +49,7 @@ vcpkg_install_cmake()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
         file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglutd.lib)
     endif()
 endif()
 
@@ -59,3 +62,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/freeglut/COPYING ${CURRENT_PACKAGES_DI
 
 vcpkg_copy_pdbs()
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/glut)
+endif()
diff --git a/ports/freeglut/use_targets_to_export_x11_dependency.patch b/ports/freeglut/use_targets_to_export_x11_dependency.patch
new file mode 100644
index 000000000..9933efd44
--- /dev/null
+++ b/ports/freeglut/use_targets_to_export_x11_dependency.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d3260b..edf034a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -257,8 +257,6 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ INCLUDE(CheckIncludeFiles)
+ IF(UNIX AND NOT(ANDROID OR BLACKBERRY))
+     FIND_PACKAGE(X11 REQUIRED)
+-    INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
+-    LIST(APPEND LIBS ${X11_LIBRARIES})
+     IF(X11_Xrandr_FOUND)
+         SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE)
+         LIST(APPEND LIBS ${X11_Xrandr_LIB})
+@@ -339,9 +337,15 @@ ENDIF()
+ 
+ IF(FREEGLUT_BUILD_SHARED_LIBS)
+     ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS})
++    IF(UNIX AND NOT(ANDROID OR BLACKBERRY))
++        TARGET_LINK_LIBRARIES(freeglut PRIVATE X11::X11)
++    ENDIF()
+ ENDIF()
+ IF(FREEGLUT_BUILD_STATIC_LIBS)
+     ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS})
++    IF(UNIX AND NOT(ANDROID OR BLACKBERRY))
++        TARGET_LINK_LIBRARIES(freeglut_static PRIVATE X11::X11)
++    ENDIF()
+ ENDIF()
+ 
+ 
diff --git a/ports/freeglut/vcpkg-cmake-wrapper.cmake b/ports/freeglut/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..5d57ad490
--- /dev/null
+++ b/ports/freeglut/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,10 @@
+_find_package(${ARGS})
+if(GLUT_FOUND)
+    find_library(XRANDR_LIBRARY NAMES xrandr Xrandr)
+    if(XRANDR_LIBRARY)
+        list(APPEND GLUT_LIBRARIES ${XRANDR_LIBRARY})
+        if(TARGET GLUT::GLUT)
+            set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${XRANDR_LIBRARY})
+        endif()
+    endif()
+endif()
diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake
index 3fea39a0e..dc57a5691 100644
--- a/ports/freeimage/portfile.cmake
+++ b/ports/freeimage/portfile.cmake
@@ -6,8 +6,24 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "FreeImage3180.zip"
     SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
+vcpkg_extract_source_archive_ex(
+  OUT_SOURCE_PATH SOURCE_PATH
+  ARCHIVE ${ARCHIVE}
+  PATCHES
+    "${CMAKE_CURRENT_LIST_DIR}/disable-plugins-depending-on-internal-third-party-libraries.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-jpeg.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-jxrlib.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-libtiff.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-openjpeg.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-png-zlib.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-rawlib.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-webp.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-openexr.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-freeimage-config-include.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/fix-function-overload.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-typedef-as-already-declared.patch"
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/FreeImageConfig-static.h DESTINATION ${SOURCE_PATH})
@@ -25,21 +41,6 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibWebP)
 file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibRawLite)
 file(REMOVE_RECURSE ${SOURCE_PATH}/Source/OpenEXR)
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-plugins-depending-on-internal-third-party-libraries.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-jpeg.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-jxrlib.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-libtiff.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-openjpeg.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-png-zlib.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-rawlib.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-webp.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-openexr.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-freeimage-config-include.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/fix-function-overload.patch"
-)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/freeimage/use-typedef-as-already-declared.patch b/ports/freeimage/use-typedef-as-already-declared.patch
new file mode 100644
index 000000000..80d367bcb
--- /dev/null
+++ b/ports/freeimage/use-typedef-as-already-declared.patch
@@ -0,0 +1,15 @@
+diff --git a/Source/FreeImage.h b/Source/FreeImage.h
+index 1fd9c2f..59de277 100644
+--- a/Source/FreeImage.h
++++ b/Source/FreeImage.h
+@@ -160,8 +160,8 @@ typedef uint8_t BYTE;
+ typedef uint16_t WORD;
+ typedef uint32_t DWORD;
+ typedef int32_t LONG;
+-typedef int64_t INT64;
+-typedef uint64_t UINT64;
++typedef long long int INT64;
++typedef long long unsigned int UINT64;
+ #else
+ // MS is not C99 ISO compliant
+ typedef long BOOL;
diff --git a/ports/freeopcua/CONTROL b/ports/freeopcua/CONTROL
index b6d20b57a..9ff439241 100644
--- a/ports/freeopcua/CONTROL
+++ b/ports/freeopcua/CONTROL
@@ -1,4 +1,4 @@
 Source: freeopcua
-Version: 20190125-1
+Version: 20190125-2
 Description: OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.
 Build-Depends: boost-asio,boost-system,boost-program-options,boost-filesystem,boost-thread,boost-format,boost-foreach,boost-property-tree,boost-date-time
diff --git a/ports/freeopcua/boost-1.70.patch b/ports/freeopcua/boost-1.70.patch
new file mode 100644
index 000000000..d099af4cc
--- /dev/null
+++ b/ports/freeopcua/boost-1.70.patch
@@ -0,0 +1,29 @@
+diff --git a/src/server/opc_tcp_async.cpp b/src/server/opc_tcp_async.cpp
+index 9c34d72..9e68d9b 100644
+--- a/src/server/opc_tcp_async.cpp
++++ b/src/server/opc_tcp_async.cpp
+@@ -106,7 +106,11 @@ public:
+      */
+     typedef std::promise<void> Promise;
+     Promise promise;
++#if BOOST_VERSION >= 107000
++    boost::asio::post(Socket.get_executor(), bind(&Promise::set_value, &promise));
++#else
+     Socket.get_io_service().post(bind(&Promise::set_value, &promise));
++#endif
+     promise.get_future().wait();
+   }
+ 
+@@ -372,7 +376,11 @@ void OpcTcpServer::Shutdown()
+    */
+   typedef std::promise<void> Promise;
+   Promise promise;
+-  acceptor.get_io_service().post(bind(&Promise::set_value, &promise));
++#if BOOST_VERSION >= 107000
++    boost::asio::post(acceptor.get_executor(), bind(&Promise::set_value, &promise));
++#else
++    acceptor.get_io_service().post(bind(&Promise::set_value, &promise));
++#endif
+   promise.get_future().wait();
+ }
+ 
diff --git a/ports/freeopcua/portfile.cmake b/ports/freeopcua/portfile.cmake
index 981dd9383..57ca771ce 100644
--- a/ports/freeopcua/portfile.cmake
+++ b/ports/freeopcua/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
         uri_facade_win.patch
         serverObj.patch
         include_asio_first.patch
+        boost-1.70.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL
index 6a2d5d480..c96bb051a 100644
--- a/ports/freerdp/CONTROL
+++ b/ports/freerdp/CONTROL
@@ -1,4 +1,4 @@
 Source: freerdp
-Version: 2.0.0-rc1~vcpkg1
+Version: 2.0.0-rc4-1
 Description: A free implementation of the Remote Desktop Protocol (RDP)
 Build-Depends: openssl
diff --git a/ports/freerdp/FixGitRevisionDetection.patch b/ports/freerdp/FixGitRevisionDetection.patch
deleted file mode 100644
index dd0b33cb5..000000000
--- a/ports/freerdp/FixGitRevisionDetection.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7d0c833dc33135d435c018930949d10cfacead04 Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Thu, 11 May 2017 02:56:48 +0300
-Subject: [PATCH] Disable automatic git revision detection
-
----
- CMakeLists.txt | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bf93d9a05..b62c31cae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -113,12 +113,6 @@ if(CCACHE AND WITH_CCACHE)
- 	set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
- endif(CCACHE AND WITH_CCACHE)
- 
--include(GetGitRevisionDescription)
--git_get_exact_tag(GIT_REVISION --tags --always)
--
--if (${GIT_REVISION} STREQUAL "n/a")
--	git_rev_parse (GIT_REVISION --short)
--endif()
- if(CMAKE_CROSSCOMPILING)
- 	SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
- endif(CMAKE_CROSSCOMPILING)
--- 
-2.11.0.windows.1
-
diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake
index cd27da88c..7fa0b3c72 100644
--- a/ports/freerdp/portfile.cmake
+++ b/ports/freerdp/portfile.cmake
@@ -1,79 +1,74 @@
 include(vcpkg_common_functions)
 
-set(FREERDP_VERSION 2.0.0-rc1)
-set(FREERDP_REVISION 2.0.0-rc1)
-set(FREERDP_HASH 5d8fd7d6900feac1e42bfc0ebc111524205c3baa093958ced42d03635076ae7d88cd86439a22ff0656bc53f0302daee5a114a4ac26328ae598ee086490926182)
-
-string(REGEX REPLACE "\\+" "-" FREERDP_VERSION_ESCAPED ${FREERDP_VERSION})
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FreeRDP-${FREERDP_VERSION_ESCAPED})
-
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeRDP/FreeRDP
-    REF ${FREERDP_REVISION}
-    SHA512 ${FREERDP_HASH}
+    REF 2.0.0-rc4
+    SHA512 b4a4d4a58d09010bc45fb90cca148dc4421a4cf0cd5caf288aa702212ef081f14fc418b91f1b79ec8631f582c9ebcdd3031d3333b6a892adb29c402492abb649
     HEAD_REF master
+    PATCHES
+        DontInstallSystemRuntimeLibs.patch
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/DontInstallSystemRuntimeLibs.patch
-            ${CMAKE_CURRENT_LIST_DIR}/FixGitRevisionDetection.patch
-)
-
-if(VCPKG_CRT_LINKAGE STREQUAL static)
+if(VCPKG_CRT_LINKAGE STREQUAL "static")
     set(FREERDP_CRT_LINKAGE -DMSVC_RUNTIME=static)
 endif()
 
+get_filename_component(SOURCE_VERSION "${SOURCE_PATH}" NAME)
+file(WRITE "${SOURCE_PATH}/.source_version" "${SOURCE_VERSION}-vcpkg")
+
+file(REMOVE ${SOURCE_PATH}/cmake/FindOpenSSL.cmake) # Remove outdated Module
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DGIT_REVISION=${FREERDP_VERSION}
-            ${FREERDP_CRT_LINKAGE})
+    OPTIONS
+        ${FREERDP_CRT_LINKAGE}
+)
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-   file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freerdp-client2.dll" "${CURRENT_PACKAGES_DIR}/bin/freerdp-client2.dll")
-   file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freerdp2.dll"        "${CURRENT_PACKAGES_DIR}/bin/freerdp2.dll")
-   file(RENAME "${CURRENT_PACKAGES_DIR}/lib/winpr-tools2.dll"    "${CURRENT_PACKAGES_DIR}/bin/winpr-tools2.dll")
-   file(RENAME "${CURRENT_PACKAGES_DIR}/lib/winpr2.dll"          "${CURRENT_PACKAGES_DIR}/bin/winpr2.dll")
-
-   file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freerdp-client2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/freerdp-client2.dll")
-   file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freerdp2.dll"        "${CURRENT_PACKAGES_DIR}/debug/bin/freerdp2.dll")
-   file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/winpr-tools2.dll"    "${CURRENT_PACKAGES_DIR}/debug/bin/winpr-tools2.dll")
-   file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/winpr2.dll"          "${CURRENT_PACKAGES_DIR}/debug/bin/winpr2.dll")
-endif()
-
-if(NOT TARGET_TRIPLET MATCHES "uwp")
-    file(GLOB_RECURSE TOOLS_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
-    file(GLOB_RECURSE TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+file(GLOB_RECURSE TOOLS_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
 
+if(TOOLS_RELEASE)
     file(COPY ${TOOLS_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
+    file(GLOB_RECURSE TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
     file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG})
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freerdp-client2.dll" "${CURRENT_PACKAGES_DIR}/bin/freerdp-client2.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freerdp2.dll"        "${CURRENT_PACKAGES_DIR}/bin/freerdp2.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/winpr-tools2.dll"    "${CURRENT_PACKAGES_DIR}/bin/winpr-tools2.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/winpr2.dll"          "${CURRENT_PACKAGES_DIR}/bin/winpr2.dll")
+
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freerdp-client2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/freerdp-client2.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freerdp2.dll"        "${CURRENT_PACKAGES_DIR}/debug/bin/freerdp2.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/winpr-tools2.dll"    "${CURRENT_PACKAGES_DIR}/debug/bin/winpr-tools2.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/winpr2.dll"          "${CURRENT_PACKAGES_DIR}/debug/bin/winpr2.dll")
+else()
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+foreach(PACKAGE FreeRDP-Client2 FreeRDP2 WinPR2)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE} ${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp/${PACKAGE})
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE} ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE})
+endforeach()
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/freerdp)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/freerdp/LICENSE ${CURRENT_PACKAGES_DIR}/share/freerdp/copyright)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 TARGET_PATH share/freerdp-client)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2 TARGET_PATH share/freerdp)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 TARGET_PATH share/winpr)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-endif()
-
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/freerdp/cmake)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/freerdp)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/freerdp/LICENSE ${CURRENT_PACKAGES_DIR}/share/freerdp/copyright)
diff --git a/ports/freetds/CONTROL b/ports/freetds/CONTROL
new file mode 100644
index 000000000..4a7a008bb
--- /dev/null
+++ b/ports/freetds/CONTROL
@@ -0,0 +1,8 @@
+Source: freetds
+Version: 1.1.6
+Description: Implementation of the Tabular Data Stream protocol
+Default-Features: openssl
+
+Feature: openssl
+Build-Depends: openssl
+Description: OpenSSL support
diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake
new file mode 100644
index 000000000..65b8afde4
--- /dev/null
+++ b/ports/freetds/portfile.cmake
@@ -0,0 +1,69 @@
+# 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/freetds-1.1.6)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.freetds.org/files/stable/freetds-1.1.6.tar.bz2"
+    FILENAME "freetds-1.1.6.tar.bz2"
+    SHA512 160c8638302fd36a3f42d031dbd58525cde899b64d320f6187ce5865ea2c049a1af63be419623e4cd18ccf229dd2ee7ec509bc5721c3371de0f31710dad7470d
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+set(BUILD_freetds_openssl OFF)
+if("openssl" IN_LIST FEATURES)
+    set(BUILD_freetds_openssl ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DWITH_OPENSSL=${BUILD_freetds_openssl}
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql)
+
+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}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freetds)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/freetds/COPYING ${CURRENT_PACKAGES_DIR}/share/freetds/copyright)
diff --git a/ports/freetype-gl/CONTROL b/ports/freetype-gl/CONTROL
index df88ab84f..c76ba3681 100644
--- a/ports/freetype-gl/CONTROL
+++ b/ports/freetype-gl/CONTROL
@@ -1,4 +1,4 @@
 Source: freetype-gl
-Version: 2018-09-18
+Version: 2019-03-29-1
 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 2a811d714..c23a21da9 100644
--- a/ports/freetype-gl/portfile.cmake
+++ b/ports/freetype-gl/portfile.cmake
@@ -1,15 +1,12 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rougier/freetype-gl
-    REF 7a290ac372d2bd94137a9fed6b2f5a6ac4360ec2
-    SHA512 bcdd34b7cee1ebe01ae83211e7b772742f9740aa713298f6fb72e7076f5fecdb3aea12f67a5fe04e8606d9533a0ceef7c1152368643dc51a7339b0e5dd307afa
+    REF a91a3dda326ceaf66b7279bf64ba07014d3f81b8
+    SHA512 8e04573dfb400e14e2c1d3a2cd851a66f8218ccfdaa4f701ed9369d7f040d7028582e72af9b236af42d9d3c6c128014670e8ae0261c6f4770affd1aea1454b1e
     HEAD_REF master
     PATCHES 0001-Use-external-Glew-and-Freetype.patch
 )
diff --git a/ports/fuzzylite/CONTROL b/ports/fuzzylite/CONTROL
index 422a8af2e..b6faaa30f 100644
--- a/ports/fuzzylite/CONTROL
+++ b/ports/fuzzylite/CONTROL
@@ -1,3 +1,3 @@
 Source: fuzzylite
-Version: 6.0-1
+Version: 6.0-2
 Description: A fuzzy logic control library in C++
diff --git a/ports/fuzzylite/portfile.cmake b/ports/fuzzylite/portfile.cmake
index 976ca66de..c4b70a72f 100644
--- a/ports/fuzzylite/portfile.cmake
+++ b/ports/fuzzylite/portfile.cmake
@@ -30,7 +30,6 @@ vcpkg_configure_cmake(
         -DFL_BUILD_TESTS=OFF
 )
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
diff --git a/ports/g3log/CONTROL b/ports/g3log/CONTROL
new file mode 100644
index 000000000..717166079
--- /dev/null
+++ b/ports/g3log/CONTROL
@@ -0,0 +1,3 @@
+Source: g3log
+Version: 2019-05-14-1
+Description: Asynchronous logger with Dynamic Sinks
diff --git a/ports/g3log/portfile.cmake b/ports/g3log/portfile.cmake
new file mode 100644
index 000000000..f07ae0b1c
--- /dev/null
+++ b/ports/g3log/portfile.cmake
@@ -0,0 +1,41 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KjellKod/g3log
+    REF 376c417ad170228fa6d1b9994a6e07a2ac143a51
+    SHA512 fd442b895f0be2489d2be099b1faca5c964f1a3880e3867726efb5f5a17192fbf2c2d60cf118e1b68bea73cf328f0b16c0265ec0f0c0fbbb1f62f68a994f5b86
+    HEAD_REF master
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" G3_SHARED_LIB)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" G3_SHARED_RUNTIME)
+
+# https://github.com/KjellKod/g3log#prerequisites
+set(VERSION "1.3.2-95")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DG3_SHARED_LIB=${G3_SHARED_LIB} # Options.cmake
+        -DG3_SHARED_RUNTIME=${G3_SHARED_RUNTIME} # Options.cmake
+        -DADD_FATAL_EXAMPLE=OFF
+        -DADD_G3LOG_BENCH_PERFORMANCE=OFF
+        -DADD_G3LOG_UNIT_TEST=OFF
+        -DVERSION=${VERSION}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g3logger TARGET_PATH share/g3logger)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME g3logger)
diff --git a/ports/gamma/CMakeLists.txt b/ports/gamma/CMakeLists.txt
index 6bb48f193..1f1581ba1 100644
--- a/ports/gamma/CMakeLists.txt
+++ b/ports/gamma/CMakeLists.txt
@@ -8,8 +8,6 @@ find_library(LIBSNDFILE_LIB NAMES libsndfile-1 libsndfile)
 find_path(PORTAUDIO_H portaudio.h)
 find_library(PORTAUDIO_LIB NAMES portaudio)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
 set(SOURCEFILES
         src/arr.cpp
         src/AudioIO.cpp
diff --git a/ports/gamma/CONTROL b/ports/gamma/CONTROL
index b70639ea6..7e9a41e99 100644
--- a/ports/gamma/CONTROL
+++ b/ports/gamma/CONTROL
@@ -1,4 +1,4 @@
 Source: gamma
-Version: gamma-2018-01-27
+Version: gamma-2018-01-27-1
 Build-Depends: libsndfile, portaudio
 Description: Gamma is a cross-platform, C++ library for doing generic synthesis and filtering of signals. It is oriented towards real-time sound and graphics applications, but is equally useful for non-real-time tasks. Gamma is designed to be "light-footed" in terms of memory and processing making it highly suitable for plug-in development or embedding in other C++ projects.
diff --git a/ports/gamma/portfile.cmake b/ports/gamma/portfile.cmake
index 139e6a48a..a96a32d3c 100644
--- a/ports/gamma/portfile.cmake
+++ b/ports/gamma/portfile.cmake
@@ -1,16 +1,16 @@
-# Instead of official release, base on commit hash for now.
-set(GAMMA_RELEASE_TAG "cc442ad0c5da369966cd937a96925c7b9a04e9e5")
-
 include(vcpkg_common_functions)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Gamma-${GAMMA_RELEASE_TAG})
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+set(GAMMA_RELEASE_TAG "cc442ad0c5da369966cd937a96925c7b9a04e9e5")
 
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/LancePutnam/Gamma/archive/cc442ad0c5da369966cd937a96925c7b9a04e9e5.zip"
-    FILENAME "gamma-${GAMMA_RELEASE_TAG}.zip"
-    SHA512 de44f4d07db0b2cf09e77508d993273d09788dfa919d549393bb77534922b65e9d8a1b8193b4b02c72e6bc4dd060b41b18ff3520a36d4c28f6e2fb4b1e859ee7
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "LancePutnam/Gamma"
+    REF ${GAMMA_RELEASE_TAG}
+    SHA512 431f17f053ca1c5ba0117b7ae7af8efae9df454593437de00dfea8ee04991b5701bee99d79deb074e60e397981a7fc1ce3476ec118d0f369e71e2cbaa696383d
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
diff --git a/ports/gcem/CONTROL b/ports/gcem/CONTROL
index b3c280cd7..095da5e8e 100644
--- a/ports/gcem/CONTROL
+++ b/ports/gcem/CONTROL
@@ -1,3 +1,3 @@
 Source: gcem
-Version: 1.8.1
+Version: 1.12.0
 Description: A C++ compile-time math library using generalized constant expressions
diff --git a/ports/gcem/portfile.cmake b/ports/gcem/portfile.cmake
index 4a13af1c2..3d27f4dcd 100644
--- a/ports/gcem/portfile.cmake
+++ b/ports/gcem/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kthohr/gcem
-    REF v1.8.1
-    SHA512 dd82a917822ffdfb3f224599340d2a0499e47db8d469d9febf3d37cd796fae3c8186a4fc05cc727d3ef82655359166caafbb5ddee3b79ba7becf1a53cce20e4a
+    REF v1.12.0
+    SHA512 cb28dce44e8aac2a4369bc1dd796243f0f9ff25bdd2effcff198b6e4ad1161ed4d33d2fdc7aca0ca9b538c769c1ae36ebfd7fcfbefd289bb1a62cdbea1957f74
     HEAD_REF master
 )
 
diff --git a/ports/gdal/0003-Fix-std-fabs.patch b/ports/gdal/0003-Fix-std-fabs.patch
new file mode 100644
index 000000000..4a6ba7cb3
--- /dev/null
+++ b/ports/gdal/0003-Fix-std-fabs.patch
@@ -0,0 +1,10 @@
+--- a/ogrlinestring.cpp	Fri Dec 14 22:34:20 2018
++++ b/ogrlinestring.cpp	Wed Mar 27 11:00:00 2019
+@@ -34,6 +34,7 @@
+ #include <cstdlib>
+ #include <algorithm>
+ #include <limits>
++#include <cmath>
+
+ CPL_CVSID("$Id: ogrlinestring.cpp 61153d33d7f055c3442ff728adbfa8e09582464b 2019-03-10 14:23:51 +0100 Even Rouault $")
+
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
index a5c79363a..c0b8820b2 100644
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@@ -1,8 +1,12 @@
 Source: gdal
-Version: 2.4.0-2
+Version: 2.4.1-5
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
-Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5
+Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib
 
 Feature: mysql-libmariadb
 Build-Depends: libmariadb
 Description: Add mysql support using libmariadb
+
+Feature: libspatialite
+Build-Depends: libspatialite
+Description: Create or update SpatiaLite databases using libspatialite
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index 8c0c9a04d..b880c9184 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -1,21 +1,17 @@
 # vcpkg portfile.cmake for GDAL
 #
 # NOTE: update the version and checksum for new GDAL release
-set(GDAL_VERSION_STR "2.4.0")
-set(GDAL_VERSION_PKG "240")
+include(vcpkg_common_functions)
+
+set(GDAL_VERSION_STR "2.4.1")
+set(GDAL_VERSION_PKG "241")
 set(GDAL_VERSION_LIB "204")
-set(GDAL_PACKAGE_SUM "a8543425d7bdbb5ab94638a490fe5b62e37983fbb89e1eea98b0e31d5fa76b7568e7b633c90ac429c87a6c9e8d9e1358b48428f3885aac8d574d1f01e9631f7f")
+set(GDAL_PACKAGE_SUM "edb9679ee6788334cf18971c803615ac9b1c72bc0c96af8fd4852cb7e8f58e9c4f3d9cb66406bc8654419612e1a7e9d0e62f361712215f4a50120f646bb0a738")
 
 if (TRIPLET_SYSTEM_ARCH MATCHES "arm")
     message(FATAL_ERROR "ARM is currently not supported.")
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    list(APPEND NMAKE_OPTIONS "DLLBUILD=0")
-endif()
-
-include(vcpkg_common_functions)
-
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.osgeo.org/gdal/${GDAL_VERSION_STR}/gdal${GDAL_VERSION_PKG}.zip"
     FILENAME "gdal${GDAL_VERSION_PKG}.zip"
@@ -51,251 +47,362 @@ foreach(BUILD_TYPE IN LISTS BUILD_TYPES)
           ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
       )
     endif()
+    vcpkg_apply_patches(
+        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}/ogr
+        PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-std-fabs.patch
+    )
 endforeach()
 
+if (WIN32) # Build in WINDOWS
+  # Check build system first
+  find_program(NMAKE nmake REQUIRED)
+  
+  file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR)
+  file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal" NATIVE_DATA_DIR)
+  file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal/html" NATIVE_HTML_DIR)
+  
+  # Setup proj4 libraries + include path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PROJ_INCLUDE_DIR)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/proj.lib" PROJ_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib" PROJ_LIBRARY_DBG)
+  
+  # Setup libpng libraries + include path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PNG_INCLUDE_DIR)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" PNG_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRARY_DBG)
+  
+  # Setup zlib libraries + include path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" ZLIB_INCLUDE_DIR)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" ZLIB_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib" ZLIB_LIBRARY_DBG)
+
+  # Setup geos libraries + include path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR)
+  if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+      file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL)
+      file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG)
+  else()
+      file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL)
+      file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG)
+  endif()
+  
+  # Setup expat libraries + include path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/expat.lib" EXPAT_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib" EXPAT_LIBRARY_DBG)
+  
+  # Setup curl libraries + include path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CURL_INCLUDE_DIR)
+  if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib")
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" CURL_LIBRARY_REL)
+  elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib")
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib" CURL_LIBRARY_REL)
+  endif()
+  if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib")
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib" CURL_LIBRARY_DBG)
+  elseif(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib")
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib" CURL_LIBRARY_DBG)
+  endif()
+  
+  # Setup sqlite3 libraries + include path
+  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 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)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.lib" PGSQL_LIBRARY_DBG)
+  
+  # Setup OpenJPEG libraries + include path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" OPENJPEG_INCLUDE_DIR)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/openjp2.lib" OPENJPEG_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/openjp2.lib" OPENJPEG_LIBRARY_DBG)
+  
+  # Setup WebP libraries + include path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" WEBP_INCLUDE_DIR)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/webp.lib" WEBP_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" WEBP_LIBRARY_DBG)
+  
+  # Setup libxml2 libraries + include path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XML2_INCLUDE_DIR)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" XML2_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" XML2_LIBRARY_DBG)
+  
+  # Setup liblzma libraries + include path
+  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)
+  
+  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()
+  
+  if ("libspatialite" IN_LIST FEATURES)
+    # Setup spatialite libraries + include path
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/spatialite" SPATIALITE_INCLUDE_DIR)
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib" SPATIALITE_LIBRARY_REL)
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib" SPATIALITE_LIBRARY_DBG)
+    set(HAVE_SPATIALITE "-DHAVE_SPATIALITE")
+  endif()
+  
+  list(APPEND NMAKE_OPTIONS
+      GDAL_HOME=${NATIVE_PACKAGES_DIR}
+      DATADIR=${NATIVE_DATA_DIR}
+      HTMLDIR=${NATIVE_HTML_DIR}
+      GEOS_DIR=${GEOS_INCLUDE_DIR}
+      "GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS"
+      PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR}
+      EXPAT_DIR=${EXPAT_INCLUDE_DIR}
+      EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR}
+      CURL_INC=-I${CURL_INCLUDE_DIR}
+      "SQLITE_INC=-I${SQLITE_INCLUDE_DIR} ${HAVE_SPATIALITE}"
+      PG_INC_DIR=${PGSQL_INCLUDE_DIR}
+      OPENJPEG_ENABLED=YES
+      OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR}
+      OPENJPEG_VERSION=20100
+      WEBP_ENABLED=YES
+      WEBP_CFLAGS=-I${WEBP_INCLUDE_DIR}
+      LIBXML2_INC=-I${XML2_INCLUDE_DIR}
+      PNG_EXTERNAL_LIB=1
+      PNGDIR=${PNG_INCLUDE_DIR}
+      ZLIB_INC=-I${ZLIB_INCLUDE_DIR}
+      ZLIB_EXTERNAL_LIB=1
+      MSVC_VER=1900
+  )
+  
+  if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+      list(APPEND NMAKE_OPTIONS WIN64=YES)
+  endif()
+  
+  if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+      list(APPEND NMAKE_OPTIONS PROJ_FLAGS=-DPROJ_STATIC)
+      list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB)
+  else()
+      # Enables PDBs for release and debug builds
+      list(APPEND NMAKE_OPTIONS WITH_PDB=1)
+  endif()
+  
+  if (VCPKG_CRT_LINKAGE STREQUAL static)
+      set(LINKAGE_FLAGS "/MT")
+  else()
+      set(LINKAGE_FLAGS "/MD")
+  endif()
+  
+  list(APPEND NMAKE_OPTIONS_REL
+      ${NMAKE_OPTIONS}
+      CXX_CRT_FLAGS=${LINKAGE_FLAGS}
+      PROJ_LIBRARY=${PROJ_LIBRARY_REL}
+      PNG_LIB=${PNG_LIBRARY_REL}
+      GEOS_LIB=${GEOS_LIBRARY_REL}
+      EXPAT_LIB=${EXPAT_LIBRARY_REL}
+      "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib"
+      "SQLITE_LIB=${SQLITE_LIBRARY_REL} ${SPATIALITE_LIBRARY_REL}"
+      OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}
+      WEBP_LIBS=${WEBP_LIBRARY_REL}
+      LIBXML2_LIB=${XML2_LIBRARY_REL}
+      ZLIB_LIB=${ZLIB_LIBRARY_REL}
+  )
+  if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+      # Static Build does not like PG_LIB
+      list(APPEND NMAKE_OPTIONS_REL PG_LIB=${PGSQL_LIBRARY_REL})
+  endif()
+  
+  list(APPEND NMAKE_OPTIONS_DBG
+      ${NMAKE_OPTIONS}
+      CXX_CRT_FLAGS="${LINKAGE_FLAGS}d"
+      PROJ_LIBRARY=${PROJ_LIBRARY_DBG}
+      PNG_LIB=${PNG_LIBRARY_DBG}
+      GEOS_LIB=${GEOS_LIBRARY_DBG}
+      EXPAT_LIB=${EXPAT_LIBRARY_DBG}
+      "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib"
+      "SQLITE_LIB=${SQLITE_LIBRARY_DBG} ${SPATIALITE_LIBRARY_DBG}"
+      OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}
+      WEBP_LIBS=${WEBP_LIBRARY_DBG}
+      LIBXML2_LIB=${XML2_LIBRARY_DBG}
+      ZLIB_LIB=${ZLIB_LIBRARY_DBG}
+      DEBUG=1
+  )
+  if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+      # Static Build does not like PG_LIB
+      list(APPEND NMAKE_OPTIONS_DBG PG_LIB=${PGSQL_LIBRARY_DBG})
+  endif()
+  # Begin build 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")
+  endif()
+  
+  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}")
+  
+  if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html)
+  endif()
 
-find_program(NMAKE nmake REQUIRED)
-
-file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR)
-file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal" NATIVE_DATA_DIR)
-file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal/html" NATIVE_HTML_DIR)
-
-# Setup proj4 libraries + include path
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PROJ_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/proj.lib" PROJ_LIBRARY_REL)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib" PROJ_LIBRARY_DBG)
-
-# Setup libpng libraries + include path
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PNG_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" PNG_LIBRARY_REL)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRARY_DBG)
-
-# Setup geos libraries + include path
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL)
-    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG)
-else()
-    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL)
-    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG)
-endif()
-
-# Setup expat libraries + include path
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/expat.lib" EXPAT_LIBRARY_REL)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib" EXPAT_LIBRARY_DBG)
-
-# Setup curl libraries + include path
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CURL_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" CURL_LIBRARY_REL)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl.lib" CURL_LIBRARY_DBG)
-
-# Setup sqlite3 libraries + include path
-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 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)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.lib" PGSQL_LIBRARY_DBG)
-
-# Setup OpenJPEG libraries + include path
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" OPENJPEG_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/openjp2.lib" OPENJPEG_LIBRARY_REL)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/openjp2.lib" OPENJPEG_LIBRARY_DBG)
-
-# Setup WebP libraries + include path
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" WEBP_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/webp.lib" WEBP_LIBRARY_REL)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" WEBP_LIBRARY_DBG)
-
-# Setup libxml2 libraries + include path
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XML2_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" XML2_LIBRARY_REL)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" XML2_LIBRARY_DBG)
-
-# Setup liblzma libraries + include path
-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)
-
-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}
-    GEOS_DIR=${GEOS_INCLUDE_DIR}
-    "GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS"
-    PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR}
-    EXPAT_DIR=${EXPAT_INCLUDE_DIR}
-    EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR}
-    CURL_INC=-I${CURL_INCLUDE_DIR}
-    SQLITE_INC=-I${SQLITE_INCLUDE_DIR}
-    PG_INC_DIR=${PGSQL_INCLUDE_DIR}
-    OPENJPEG_ENABLED=YES
-    OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR}
-    OPENJPEG_VERSION=20100
-    WEBP_ENABLED=YES
-    WEBP_CFLAGS=-I${WEBP_INCLUDE_DIR}
-    LIBXML2_INC=-I${XML2_INCLUDE_DIR}
-    PNG_EXTERNAL_LIB=1
-    PNGDIR=${PNG_INCLUDE_DIR}
-    MSVC_VER=1900
-)
-
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    list(APPEND NMAKE_OPTIONS WIN64=YES)
-endif()
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    list(APPEND NMAKE_OPTIONS PROJ_FLAGS=-DPROJ_STATIC)
-    list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB)
-else()
-    # Enables PDBs for release and debug builds
-    list(APPEND NMAKE_OPTIONS WITH_PDB=1)
-endif()
-
-if (VCPKG_CRT_LINKAGE STREQUAL static)
-    set(LINKAGE_FLAGS "/MT")
-else()
-    set(LINKAGE_FLAGS "/MD")
-endif()
-
-list(APPEND NMAKE_OPTIONS_REL
-    ${NMAKE_OPTIONS}
-    CXX_CRT_FLAGS=${LINKAGE_FLAGS}
-    PROJ_LIBRARY=${PROJ_LIBRARY_REL}
-    PNG_LIB=${PNG_LIBRARY_REL}
-    GEOS_LIB=${GEOS_LIBRARY_REL}
-    EXPAT_LIB=${EXPAT_LIBRARY_REL}
-    "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib"
-    SQLITE_LIB=${SQLITE_LIBRARY_REL}
-    OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}
-    WEBP_LIBS=${WEBP_LIBRARY_REL}
-    LIBXML2_LIB=${XML2_LIBRARY_REL}
-)
-if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    # Static Build does not like PG_LIB
-    list(APPEND NMAKE_OPTIONS_REL PG_LIB=${PGSQL_LIBRARY_REL})
-endif()
-
-list(APPEND NMAKE_OPTIONS_DBG
-    ${NMAKE_OPTIONS}
-    CXX_CRT_FLAGS="${LINKAGE_FLAGS}d"
-    PROJ_LIBRARY=${PROJ_LIBRARY_DBG}
-    PNG_LIB=${PNG_LIBRARY_DBG}
-    GEOS_LIB=${GEOS_LIBRARY_DBG}
-    EXPAT_LIB=${EXPAT_LIBRARY_DBG}
-    "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib"
-    SQLITE_LIB=${SQLITE_LIBRARY_DBG}
-    OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}
-    WEBP_LIBS=${WEBP_LIBRARY_DBG}
-    LIBXML2_LIB=${XML2_LIBRARY_DBG}
-    DEBUG=1
-)
-if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    # Static Build does not like PG_LIB
-    list(APPEND NMAKE_OPTIONS_DBG PG_LIB=${PGSQL_LIBRARY_DBG})
-endif()
-
-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}"
+    "install"
+    "devinstall"
     WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
-    LOGNAME nmake-build-${TARGET_TRIPLET}-release
+    LOGNAME nmake-install-${TARGET_TRIPLET}
   )
-  message(STATUS "Building ${TARGET_TRIPLET}-rel done")
-endif()
-
-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}")
-
-if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-  file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html)
-endif()
-
-vcpkg_execute_required_process(
-  COMMAND ${NMAKE} -f makefile.vc
-  "${NMAKE_OPTIONS_REL}"
-  "install"
-  "devinstall"
-  WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
-  LOGNAME nmake-install-${TARGET_TRIPLET}
-)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal_i.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)
+  
+  if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal_i.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()
+  
+    set(GDAL_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/gdal)
+    file(MAKE_DIRECTORY ${GDAL_TOOL_PATH})
+  
+    file(GLOB GDAL_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+    file(COPY ${GDAL_TOOLS} DESTINATION ${GDAL_TOOL_PATH})
+    file(REMOVE_RECURSE ${GDAL_TOOLS})
+  
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal.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()
-
-  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)
+  
+  # Copy over PDBs
+  vcpkg_copy_pdbs()
+
+elseif (UNIX) # Build in UNIX
+  # Check build system first
+  find_program(MAKE make)
+  if (NOT MAKE)
+      message(FATAL_ERROR "MAKE not found")
   endif()
-
-else()
-
-  set(GDAL_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/gdal)
-  file(MAKE_DIRECTORY ${GDAL_TOOL_PATH})
-
-  file(GLOB GDAL_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
-  file(COPY ${GDAL_TOOLS} DESTINATION ${GDAL_TOOL_PATH})
-  file(REMOVE_RECURSE ${GDAL_TOOLS})
-
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal.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)
+    ################
+    # Release build
+    ################
+    message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+    set(OUT_PATH_RELEASE ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-release)
+    file(MAKE_DIRECTORY ${OUT_PATH_RELEASE})
+    vcpkg_execute_required_process(
+      COMMAND "${SOURCE_PATH_RELEASE}/configure" --prefix=${OUT_PATH_RELEASE}
+      WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+      LOGNAME config-${TARGET_TRIPLET}-rel
+    )
+    
+    message(STATUS "Building ${TARGET_TRIPLET}-rel")
+    vcpkg_execute_required_process(
+      COMMAND make
+      WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+      LOGNAME make-build-${TARGET_TRIPLET}-release
+    )
+    
+    message(STATUS "Installing ${TARGET_TRIPLET}-rel")
+    vcpkg_execute_required_process(
+      COMMAND make install
+      WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+      LOGNAME make-install-${TARGET_TRIPLET}-release
+    )
+    
+    file(REMOVE_RECURSE ${OUT_PATH_RELEASE}/lib/gdalplugins)
+    file(COPY ${OUT_PATH_RELEASE}/lib/pkgconfig DESTINATION ${OUT_PATH_RELEASE}/share/gdal)
+    file(REMOVE_RECURSE ${OUT_PATH_RELEASE}/lib/pkgconfig)
+    file(COPY ${OUT_PATH_RELEASE}/lib DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${OUT_PATH_RELEASE}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${OUT_PATH_RELEASE}/share DESTINATION ${CURRENT_PACKAGES_DIR})
+    message(STATUS "Installing ${TARGET_TRIPLET}-rel done")
   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)
+    ################
+    # Debug build
+    ################
+    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+    set(OUT_PATH_DEBUG ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-debug)
+    file(MAKE_DIRECTORY ${OUT_PATH_DEBUG})
+    vcpkg_execute_required_process(
+      COMMAND "${SOURCE_PATH_DEBUG}/configure" --prefix=${OUT_PATH_DEBUG}
+      WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+      LOGNAME config-${TARGET_TRIPLET}-debug
+    )
+    
+    message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+    vcpkg_execute_required_process(
+      COMMAND make
+      WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+      LOGNAME make-build-${TARGET_TRIPLET}-debug
+    )
+    
+    message(STATUS "Installing ${TARGET_TRIPLET}-dbg")
+    vcpkg_execute_required_process(
+      COMMAND make -j install
+      WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+      LOGNAME make-install-${TARGET_TRIPLET}-debug
+    )
+    
+    file(REMOVE_RECURSE ${OUT_PATH_DEBUG}/lib/gdalplugins)
+    file(REMOVE_RECURSE ${OUT_PATH_DEBUG}/lib/pkgconfig)
+    file(COPY ${OUT_PATH_DEBUG}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
+    message(STATUS "Installing ${TARGET_TRIPLET}-dbg done")
   endif()
+else() # Other build system
+  message(FATAL_ERROR "Unsupport build system.")
 endif()
 
-# Copy over PDBs
-vcpkg_copy_pdbs()
-
 # Handle copyright
 configure_file(${SOURCE_PATH_RELEASE}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/gdal/copyright COPYONLY)
diff --git a/ports/gdcm/CONTROL b/ports/gdcm/CONTROL
new file mode 100644
index 000000000..127a89c67
--- /dev/null
+++ b/ports/gdcm/CONTROL
@@ -0,0 +1,4 @@
+Source: gdcm
+Version: 3.0.0
+Description: Grassroots DICOM library
+Build-Depends: zlib, expat, openjpeg
diff --git a/ports/gdcm2/find-openjpeg.patch b/ports/gdcm/find-openjpeg.patch
index c3fff18f5..c3fff18f5 100644
--- a/ports/gdcm2/find-openjpeg.patch
+++ b/ports/gdcm/find-openjpeg.patch
diff --git a/ports/gdcm/fix-share-path.patch b/ports/gdcm/fix-share-path.patch
new file mode 100644
index 000000000..931094681
--- /dev/null
+++ b/ports/gdcm/fix-share-path.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6ac16ab..842d833 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -246,15 +246,15 @@ if(NOT GDCM_INSTALL_LIB_DIR)
+ endif()
+ 
+ if(NOT GDCM_INSTALL_DATA_DIR)
+-  set(GDCM_INSTALL_DATA_DIR "share/${subdir}")
++  set(GDCM_INSTALL_DATA_DIR "share/${projectname}")
+ endif()
+ 
+ if(NOT GDCM_INSTALL_INCLUDE_DIR)
+-  set(GDCM_INSTALL_INCLUDE_DIR "include/${subdir}")
++  set(GDCM_INSTALL_INCLUDE_DIR "include/${projectname}")
+ endif()
+ 
+ if(NOT GDCM_INSTALL_DOC_DIR)
+-  set(GDCM_INSTALL_DOC_DIR "share/doc/${subdir}")
++  set(GDCM_INSTALL_DOC_DIR "share/doc/${projectname}")
+ endif()
+ 
+ if(NOT GDCM_INSTALL_MAN_DIR)
+@@ -262,7 +262,7 @@ if(NOT GDCM_INSTALL_MAN_DIR)
+ endif()
+ 
+ if(NOT GDCM_INSTALL_PACKAGE_DIR)
+-  set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${subdir}
++  set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${projectname}
+     CACHE INTERNAL "")
+ endif()
+ 
diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake
new file mode 100644
index 000000000..80b0ab6d8
--- /dev/null
+++ b/ports/gdcm/portfile.cmake
@@ -0,0 +1,49 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO malaterre/GDCM
+    REF v3.0.0
+    SHA512 2ac076dd49011234f4431ffe67fcba84a1ca9042ec5fc4dfc8aed2ed16bec5f499fa7aa666e5630796afc266ce76741d931cca333534b55fdc477e25a9189d33
+    HEAD_REF master
+    PATCHES
+        find-openjpeg.patch
+        fix-share-path.patch
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(GDCM_BUILD_SHARED_LIBS ON)
+else()
+    set(GDCM_BUILD_SHARED_LIBS OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS
+        -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF
+        -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS}
+        -DGDCM_INSTALL_INCLUDE_DIR=include
+        -DGDCM_USE_SYSTEM_EXPAT=ON
+        -DGDCM_USE_SYSTEM_ZLIB=ON
+        -DGDCM_USE_SYSTEM_OPENJPEG=ON
+        -DGDCM_BUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm TARGET_PATH share/gdcm)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdcm RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/gdcm2/CONTROL b/ports/gdcm2/CONTROL
index a3a083ed8..88d473b65 100644
--- a/ports/gdcm2/CONTROL
+++ b/ports/gdcm2/CONTROL
@@ -1,4 +1,4 @@
 Source: gdcm2
-Version: 2.8.8-2
-Description: Grassroots DICOM library
-Build-Depends: zlib, expat, openjpeg
+Version: deprecated
+Description: This port was renamed to gdcm.  The gdcm2 name is deprecated.
+Build-Depends: gdcm
+\ No newline at end of file
diff --git a/ports/gdcm2/portfile.cmake b/ports/gdcm2/portfile.cmake
index a6aad4e11..0015715fb 100644
--- a/ports/gdcm2/portfile.cmake
+++ b/ports/gdcm2/portfile.cmake
@@ -1,46 +1 @@
-include(vcpkg_common_functions)
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO malaterre/GDCM
-    REF v2.8.8
-    SHA512 92efa1b85e38a5e463933c36a275e1392608c9da4d7c3ab17acfa70bfa112bc03e8705086eaac4a3ad5153fde5116ccc038093adaa8598b18000f403f39db738
-    HEAD_REF master
-    PATCHES find-openjpeg.patch
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(GDCM_BUILD_SHARED_LIBS ON)
-else()
-    set(GDCM_BUILD_SHARED_LIBS OFF)
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    OPTIONS
-        -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF
-        -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS}
-        -DGDCM_INSTALL_INCLUDE_DIR=include
-        -DGDCM_USE_SYSTEM_EXPAT=ON
-        -DGDCM_USE_SYSTEM_ZLIB=ON
-        -DGDCM_USE_SYSTEM_OPENJPEG=ON
-        -DGDCM_BUILD_TESTING=OFF
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm-2.8 TARGET_PATH share/gdcm)
-
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdcm2 RENAME copyright)
-
-vcpkg_copy_pdbs()
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+\ No newline at end of file
diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL
index 2a0fbfaf3..7d485d95b 100644
--- a/ports/gdk-pixbuf/CONTROL
+++ b/ports/gdk-pixbuf/CONTROL
@@ -1,4 +1,4 @@
-Source: gdk-pixbuf
-Version: 2.36.9-1
-Description: Image loading library.
-Build-Depends: gettext, zlib, libpng, glib
+Source: gdk-pixbuf
+Version: 2.36.9-2
+Description: Image loading library.
+Build-Depends: gettext, zlib, libpng, glib
diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake
index 72469abff..06f06cb5d 100644
--- a/ports/gdk-pixbuf/portfile.cmake
+++ b/ports/gdk-pixbuf/portfile.cmake
@@ -1,11 +1,9 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 set(GDK_PIXBUF_VERSION 2.36)
 set(GDK_PIXBUF_PATCH 9)
-include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH})
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz"
diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL
index 7b19ca9cf..87688018b 100644
--- a/ports/geogram/CONTROL
+++ b/ports/geogram/CONTROL
@@ -1,7 +1,7 @@
 Source: geogram
-Version: 1.6.9-2
+Version: 1.6.9-3
 Description: Geogram is a programming library of geometric algorithms.
-Build-Depends: openblas, clapack
+Build-Depends: openblas (!osx), clapack
 
 Feature: graphics
 Description: Build viewers and geogram_gfx library.
diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake
index 46709f6c3..44f74f107 100644
--- a/ports/geogram/portfile.cmake
+++ b/ports/geogram/portfile.cmake
@@ -24,10 +24,30 @@ endif()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(VORPALINE_BUILD_DYNAMIC FALSE)
-    set(VORPALINE_PLATFORM Win-vs-generic)
+    if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+        set(VORPALINE_PLATFORM Win-vs-generic)
+    endif()
+    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux")
+        message("geogram on Linux only supports dynamic library linkage. Building dynamic.")
+        set(VCPKG_LIBRARY_LINKAGE dynamic)
+        set(VORPALINE_PLATFORM Linux64-gcc-dynamic )
+    endif()
+    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin")
+        message("geogram on Darwin only supports dynamic library linkage. Building dynamic.")
+        set(VCPKG_LIBRARY_LINKAGE dynamic)
+        set(VORPALINE_PLATFORM Darwin-clang-dynamic)
+    endif()
 else()
     set(VORPALINE_BUILD_DYNAMIC TRUE)
-    set(VORPALINE_PLATFORM Win-vs-dynamic-generic)
+    if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+        set(VORPALINE_PLATFORM Win-vs-generic)
+    endif()
+    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux")
+        set(VORPALINE_PLATFORM Linux64-gcc-dynamic )
+    endif()
+    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin")
+        set(VORPALINE_PLATFORM Darwin-clang-dynamic)
+    endif()
 endif()
 
 vcpkg_configure_cmake(
diff --git a/ports/geographiclib/CONTROL b/ports/geographiclib/CONTROL
index 993239b96..da326dc97 100644
--- a/ports/geographiclib/CONTROL
+++ b/ports/geographiclib/CONTROL
@@ -1,3 +1,3 @@
 Source: geographiclib
-Version: 1.47-patch1-4
+Version: 1.47-patch1-5
 Description: a small set of C++ classes for performing conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems.
diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake
index 96b633aec..95db365cf 100644
--- a/ports/geographiclib/portfile.cmake
+++ b/ports/geographiclib/portfile.cmake
@@ -11,16 +11,17 @@
 #
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geographiclib-1.47)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "https://jaist.dl.sourceforge.net/project/geographiclib/distrib/GeographicLib-1.47-patch1.zip"
     FILENAME "geographiclib-1.47-patch1.zip"
     SHA512 d8fdfd7ae093057ec1a4ab922457fe71a3fb9975df5b673c276d62a0e9c4f212dc63652830b9d89e3890bc96aafd335992943cf6a1bce8260acf932d1eb7abfd
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/remove-tools-and-fix-version.patch"
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES
+           remove-tools-and-fix-version.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -44,39 +45,14 @@ else()
 endif()
 
 vcpkg_install_cmake()
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
-file(GLOB GEOGRAPHICLIB_CMAKE_FILES ${CURRENT_PACKAGES_DIR}/cmake/*.cmake ${CURRENT_PACKAGES_DIR}/debug/cmake/*.cmake)
-file(COPY ${GEOGRAPHICLIB_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib)
-
-file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/geographiclib-targets.cmake GEOGRAPHICLIB_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}/include" "\${_IMPORT_PREFIX}/../include" GEOGRAPHICLIB_MODULE "${GEOGRAPHICLIB_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-targets.cmake "${GEOGRAPHICLIB_MODULE}")
-
-file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/geographiclib-targets-debug.cmake GEOGRAPHICLIB_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/../debug" GEOGRAPHICLIB_DEBUG_MODULE "${GEOGRAPHICLIB_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-targets-debug.cmake "${GEOGRAPHICLIB_DEBUG_MODULE}")
-
-file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/geographiclib-namespace-targets-debug.cmake GEOGRAPHICLIB_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/../debug" GEOGRAPHICLIB_DEBUG_MODULE "${GEOGRAPHICLIB_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-namespace-targets-debug.cmake "${GEOGRAPHICLIB_DEBUG_MODULE}")
-
 
-file(READ ${CURRENT_PACKAGES_DIR}/cmake/geographiclib-targets-release.cmake GEOGRAPHICLIB_RELEASE_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/.." GEOGRAPHICLIB_RELEASE_MODULE "${GEOGRAPHICLIB_RELEASE_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-targets-release.cmake "${GEOGRAPHICLIB_RELEASE_MODULE}")
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/geographiclib)
+vcpkg_copy_pdbs()
 
-file(READ ${CURRENT_PACKAGES_DIR}/cmake/geographiclib-namespace-targets-release.cmake GEOGRAPHICLIB_RELEASE_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/.." GEOGRAPHICLIB_RELEASE_MODULE "${GEOGRAPHICLIB_RELEASE_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-namespace-targets-release.cmake "${GEOGRAPHICLIB_RELEASE_MODULE}")
-
-
-file(COPY ${CURRENT_BUILDTREES_DIR}/src/GeographicLib-1.47/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/geographiclib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/geographiclib/copyright)
-
-file(GLOB EXE_FILES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
+file(COPY ${CURRENT_PACKAGES_DIR}/lib/pkgconfig DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-# file(REMOVE_RECURSE ${EXE_FILES})
+
+file(INSTALL ${SOURCE_PATH}/00README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib RENAME readme)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib RENAME copyright)
+\ No newline at end of file
diff --git a/ports/gettext/0001-Fix-macro-definitions.patch b/ports/gettext/0001-Fix-macro-definitions.patch
index 07529da97..eeed3a0ce 100644
--- a/ports/gettext/0001-Fix-macro-definitions.patch
+++ b/ports/gettext/0001-Fix-macro-definitions.patch
@@ -1,18 +1,3 @@
-diff --git a/gettext-runtime/intl/printf-parse.c b/gettext-runtime/intl/printf-parse.c
-index 0e2d2c7..e1dc39b 100644
---- a/gettext-runtime/intl/printf-parse.c
-+++ b/gettext-runtime/intl/printf-parse.c
-@@ -48,7 +48,9 @@
- #include <stddef.h>
- 
- /* Get intmax_t.  */
--#if defined IN_LIBINTL || defined IN_LIBASPRINTF
-+#if defined _MSC_VER
-+# define intmax_t long int
-+#elif defined IN_LIBINTL || defined IN_LIBASPRINTF
- # if HAVE_STDINT_H_WITH_UINTMAX
- #  include <stdint.h>
- # endif
 diff --git a/gettext-runtime/intl/xsize.h b/gettext-runtime/intl/xsize.h
 index c256665..7400ea1 100644
 --- a/gettext-runtime/intl/xsize.h
diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt
index cfd460e20..1ec9aa285 100644
--- a/ports/gettext/CMakeLists.txt
+++ b/ports/gettext/CMakeLists.txt
@@ -119,6 +119,9 @@ endif()
 if(NOT WIN32)
     target_link_libraries(libintl PRIVATE Threads::Threads)
 endif()
+if (WIN32)
+    target_link_libraries(libintl PRIVATE Advapi32.lib)
+endif()
 
 install(TARGETS libintl
   EXPORT unofficial-gettext-targets
diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL
index 386fbd09c..be85f1d66 100644
--- a/ports/gettext/CONTROL
+++ b/ports/gettext/CONTROL
@@ -1,4 +1,4 @@
 Source: gettext
-Version: 0.19-8
+Version: 0.19-10
 Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl.
 Build-Depends: libiconv
diff --git a/ports/gettext/config.win32.h b/ports/gettext/config.win32.h
index 0d3c1d34e..b68467cf3 100644
--- a/ports/gettext/config.win32.h
+++ b/ports/gettext/config.win32.h
@@ -229,7 +229,7 @@
 /* #undef HAVE_INCLUDE_NEXT */
 
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-/* #undef HAVE_INTMAX_T */
+#define HAVE_INTMAX_T 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 /* #undef HAVE_INTTYPES_H */
@@ -330,11 +330,11 @@
 #define HAVE_STDDEF_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
+#define HAVE_STDINT_H 1
 
 /* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
    uintmax_t. */
-/* #undef HAVE_STDINT_H_WITH_UINTMAX */
+#define HAVE_STDINT_H_WITH_UINTMAX 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
@@ -382,7 +382,7 @@
 /* #undef HAVE_TSEARCH */
 
 /* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-/* #undef HAVE_UINTMAX_T */
+#define HAVE_UINTMAX_T 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 /* #undef HAVE_UNISTD_H */
@@ -624,11 +624,7 @@
 
 /* Define to unsigned long or unsigned long long if <stdint.h> and
    <inttypes.h> don't define. */
-#ifdef _WIN64
-#define uintmax_t unsigned __int64
-#elif _WIN32
-#define uintmax_t unsigned __int32
-#endif
+/* #undef uintmax_t */
 
 #define __libc_lock_t                   gl_lock_t
 #define __libc_lock_define              gl_lock_define
diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake
index aeca810ed..7ca1478f7 100644
--- a/ports/giflib/portfile.cmake
+++ b/ports/giflib/portfile.cmake
@@ -4,18 +4,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 set(GIFLIB_VERSION 5.1.4)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://downloads.sourceforge.net/sourceforge/giflib/giflib-${GIFLIB_VERSION}.tar.bz2"
+    URLS "https://nchc.dl.sourceforge.net/project/giflib/giflib-${GIFLIB_VERSION}.tar.bz2"
     FILENAME "giflib-${GIFLIB_VERSION}.tar.bz2"
     SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 )
 
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+    set(ADDITIONAL_PATCH "fix-compile-error.patch")
+endif()
+
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${GIFLIB_VERSION}
     PATCHES
         msvc-guard-unistd-h.patch
-        fix-compile-error.patch
+        ${ADDITIONAL_PATCH}
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL
index f63cec773..a6db3dcde 100644
--- a/ports/glbinding/CONTROL
+++ b/ports/glbinding/CONTROL
@@ -1,3 +1,3 @@
 Source: glbinding
-Version: 3.0.2-5
+Version: 3.1.0
 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API
diff --git a/ports/glbinding/fix-uwpmacro.patch b/ports/glbinding/fix-uwpmacro.patch
new file mode 100644
index 000000000..61c179662
--- /dev/null
+++ b/ports/glbinding/fix-uwpmacro.patch
@@ -0,0 +1,33 @@
+diff --git a/source/glbinding/CMakeLists.txt b/source/glbinding/CMakeLists.txt
+index 97654c8..bca68d1 100644
+--- a/source/glbinding/CMakeLists.txt
++++ b/source/glbinding/CMakeLists.txt
+@@ -261,6 +261,11 @@ target_link_libraries(${target}
+ # Compile definitions
+ # 
+ 
++
++if (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++  target_compile_definitions(${target} PRIVATE SYSTEM_WINDOWS WINDOWS_STORE)
++endif()
++
+ target_compile_definitions(${target}
+     PRIVATE
+     # since we use stl and stl is intended to use exceptions, exceptions should not be disabled
+diff --git a/source/glbinding/source/getProcAddress.cpp b/source/glbinding/source/getProcAddress.cpp
+index c1cfc5c..7e5f8bc 100644
+--- a/source/glbinding/source/getProcAddress.cpp
++++ b/source/glbinding/source/getProcAddress.cpp
+@@ -18,7 +18,11 @@ namespace glbinding {
+ 
+ ProcAddress getProcAddress(const char * name)
+ {
+-    static auto module = LoadLibrary(_T("OPENGL32.DLL"));
++#ifdef WINDOWS_STORE
++	static auto module = ::LoadPackagedLibrary(_T("OPENGL32.DLL"), 0);
++#else
++	static auto module = ::LoadLibrary(_T("OPENGL32.DLL"));
++#endif
+ 
+ 	// Prevent static linking of opengl32
+ 	static auto wglGetProcAddress_ = reinterpret_cast<void * (__stdcall *)(const char *)>(::GetProcAddress(module, "wglGetProcAddress"));
diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
index e645e5021..659d7c23c 100644
--- a/ports/glbinding/portfile.cmake
+++ b/ports/glbinding/portfile.cmake
@@ -2,10 +2,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cginternals/glbinding
-    REF d7a1873ad741fb13a9c6dcbae93d0cda45a11933
-    SHA512 70848d8ddad3e2ddfc54549ed3cdde569991858135140b30b50fa6e92c5aec6e3dd235418e091456f9b68da2fad09fbef117dedac7b48c26bcab62b6f0fa791f
+    REF v3.1.0
+    SHA512 d7294c9a0dc47a7c107b134e5dfa78c5812fc6bf739b9fd778fa7ce946d5ea971839a65c3985e0915fd75311e4a85fb221d33a71856c460199eab0e7622f7151
     HEAD_REF master
-    PATCHES force-system-install.patch
+    PATCHES 
+		force-system-install.patch
+		fix-uwpmacro.patch
 )
 
 vcpkg_configure_cmake(
@@ -47,7 +49,7 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
     file(WRITE ${TARGET_CMAKE} "${_contents}")
 endforeach()
 
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/glbinding-aux/glbinding-aux-export.cmake)\nset(glbinding_FOUND TRUE)\n")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/glbinding-aux/glbinding-aux-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/KHRplatform/KHRplatform-export.cmake)\nset(glbinding_FOUND TRUE)\n")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
diff --git a/ports/glfw3/CONTROL b/ports/glfw3/CONTROL
index 0c8eb3e58..96a63e080 100644
--- a/ports/glfw3/CONTROL
+++ b/ports/glfw3/CONTROL
@@ -1,3 +1,3 @@
 Source: glfw3
-Version: 3.2.1-3
+Version: 3.3
 Description: GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.
diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake
index dcc7da89d..ea3e4eaec 100644
--- a/ports/glfw3/portfile.cmake
+++ b/ports/glfw3/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO glfw/glfw
-    REF 3.2.1
-    SHA512 c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc
+    REF 3.3
+    SHA512 e74bb7ba0c1c3a524a193c4fb5a2d13ba0e75f8e309612ea19cdcc944859d6e2fe29d8b2e3db76236e1011b637564ddd5f4a176dcccfeb84d09bda060f08f774
     HEAD_REF master
     PATCHES move-cmake-min-req.patch
 )
@@ -45,7 +45,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     endif()
 endif()
 
-file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glfw3)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/glfw3/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/glfw3/copyright)
+file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/glfw3)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/glfw3/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/glfw3/copyright)
 
 vcpkg_copy_pdbs()
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt
index 6e9e62a4f..49e4e1112 100644
--- a/ports/glib/CMakeLists.txt
+++ b/ports/glib/CMakeLists.txt
@@ -4,6 +4,9 @@ project(glib C)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_C_STANDARD 11)
 
+if(MSVC)
+    add_compile_options(/utf-8)
+endif()
 set(GLIB_DLL_SUFFIX 2)
 set(GLIB_LIB_SUFFIX 2.0)
 
@@ -131,7 +134,7 @@ target_compile_definitions(glib PRIVATE GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIB
 target_link_libraries(glib PRIVATE ${PCRE_LIBRARY} unofficial::iconv::libiconv unofficial::iconv::libcharset ${LIBINTL_LIBRARY})
 if(WIN32)
     target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE)
-    target_link_libraries(glib PRIVATE ws2_32 winmm)
+    target_link_libraries(glib PRIVATE ws2_32 winmm advapi32 ole32 shell32)
 else()
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     find_package(Threads REQUIRED)
@@ -246,7 +249,7 @@ target_compile_definitions(gio PRIVATE GIO_COMPILATION G_LOG_DOMAIN="GLib-GIO")
 target_link_libraries(gio PRIVATE glib gmodule gobject ZLIB::ZLIB ${LIBRESOLV_LIBRARY} ${LIBINTL_LIBRARY})
 target_include_directories(gio PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gio> $<INSTALL_INTERFACE:include/gio>)
 if(WIN32)
-    target_link_libraries(gio PRIVATE ws2_32 shlwapi dnsapi iphlpapi)
+    target_link_libraries(gio PRIVATE ws2_32 shlwapi dnsapi iphlpapi advapi32 shell32)
 elseif(APPLE)
     target_link_libraries(gio PRIVATE xdgmime kqueue)
 else()
@@ -262,7 +265,11 @@ endforeach()
 
 macro(add_glib_tool TOOL_NAME)
     add_executable(${TOOL_NAME} ${ARGN})
-    target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY})
+    if(WIN32)
+        target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY} shell32)
+    else()
+        target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY})
+    endif()
     target_compile_definitions(${TOOL_NAME} PRIVATE GLIB_COMPILATION)
     list(APPEND GLIB_TOOLS ${TOOL_NAME})
 endmacro()
diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL
index 7d5b3857b..9197a6037 100644
--- a/ports/glib/CONTROL
+++ b/ports/glib/CONTROL
@@ -1,4 +1,4 @@
 Source: glib
-Version: 2.52.3-13
+Version: 2.52.3-14-1
 Description: Portable, general-purpose utility library.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv
diff --git a/ports/glib/arm64-defines.patch b/ports/glib/arm64-defines.patch
new file mode 100644
index 000000000..c1b5181c6
--- /dev/null
+++ b/ports/glib/arm64-defines.patch
@@ -0,0 +1,78 @@
+diff --git a/config.h.win32 b/config.h.win32
+index 999641d65..531843e0e 100644
+--- a/config.h.win32
++++ b/config.h.win32
+@@ -728,7 +728,7 @@
+ 
+ /* The size of `void *', as computed by sizeof. */
+ #ifdef _MSC_VER
+-#if (defined(_M_X64) || defined(_M_AMD64))
++#if (defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64))
+ #define SIZEOF_VOID_P 8
+ #elif (defined(_M_IX86))
+ #define SIZEOF_VOID_P 4
+diff --git a/config.h.win32.in b/config.h.win32.in
+index eaf7e2818..049c5e9f4 100644
+--- a/config.h.win32.in
++++ b/config.h.win32.in
+@@ -728,7 +728,7 @@
+ 
+ /* The size of `void *', as computed by sizeof. */
+ #ifdef _MSC_VER
+-#if (defined(_M_X64) || defined(_M_AMD64))
++#if (defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64))
+ #define SIZEOF_VOID_P 8
+ #elif (defined(_M_IX86))
+ #define SIZEOF_VOID_P 4
+diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
+index 9b3619cb1..6400572a2 100644
+--- a/gio/gdbusaddress.c
++++ b/gio/gdbusaddress.c
+@@ -1469,7 +1469,7 @@ get_session_address_dbus_launch (GError **error)
+ 	  wcscat (args, rundll_path);
+ 	  wcscat (args, L"\" ");
+ 	  wcscat (args, gio_path_short);
+-#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
++#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64)
+ 	  wcscat (args, L",g_win32_run_session_bus");
+ #elif defined (_MSC_VER)
+ 	  wcscat (args, L",_g_win32_run_session_bus@16");
+diff --git a/glib/gatomic.c b/glib/gatomic.c
+index e3e49fab4..e257e4377 100644
+--- a/glib/gatomic.c
++++ b/glib/gatomic.c
+@@ -474,7 +474,7 @@ gsize
+ #elif defined (G_PLATFORM_WIN32)
+ 
+ #include <windows.h>
+-#if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) && !(defined _MSC_VER && _MSC_VER <= 1200)
++#if !defined(_M_ARM64) && !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) && !(defined _MSC_VER && _MSC_VER <= 1200)
+ #define InterlockedAnd _InterlockedAnd
+ #define InterlockedOr _InterlockedOr
+ #define InterlockedXor _InterlockedXor
+diff --git a/glib/glibconfig.h.win32 b/glib/glibconfig.h.win32
+index d9f893a15..b75a86f10 100644
+--- a/glib/glibconfig.h.win32
++++ b/glib/glibconfig.h.win32
+@@ -68,7 +68,7 @@ typedef unsigned __int64 guint64;
+ #define G_GINT64_FORMAT "I64i"
+ #define G_GUINT64_FORMAT "I64u"
+ 
+-#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
++#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64)
+ 
+ #define GLIB_SIZEOF_VOID_P 8
+ #define GLIB_SIZEOF_LONG   4
+diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in
+index 9a91c5e96..f0b88c976 100644
+--- a/glib/glibconfig.h.win32.in
++++ b/glib/glibconfig.h.win32.in
+@@ -68,7 +68,7 @@ typedef unsigned __int64 guint64;
+ #define G_GINT64_FORMAT "I64i"
+ #define G_GUINT64_FORMAT "I64u"
+ 
+-#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
++#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64)
+ 
+ #define GLIB_SIZEOF_VOID_P 8
+ #define GLIB_SIZEOF_LONG   4
diff --git a/ports/glib/fix-arm-builds.patch b/ports/glib/fix-arm-builds.patch
new file mode 100644
index 000000000..257ee75c6
--- /dev/null
+++ b/ports/glib/fix-arm-builds.patch
@@ -0,0 +1,46 @@
+diff --git a/gio/tests/plugin_resources.c b/gio/tests/plugin_resources.c
+index 4c1b0214b..bbfc7ae07 100644
+--- a/gio/tests/plugin_resources.c
++++ b/gio/tests/plugin_resources.c
+@@ -80,13 +80,13 @@ GResource *_g_plugin_get_resource (void)
+  */
+ 
+ /* We need to account for differences between the mangling of symbols
+- * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed
+- * with an underscore but symbols on x64 are not.
++ * for x86 and x64/ARM/ARM64 programs, as symbols on x86 are prefixed
++ * with an underscore but symbols on x64/ARM/ARM64 are not.
+  */
+-#ifdef _WIN64
+-#define G_MSVC_SYMBOL_PREFIX ""
+-#else
++#ifdef _M_IX86
+ #define G_MSVC_SYMBOL_PREFIX "_"
++#else
++#define G_MSVC_SYMBOL_PREFIX ""
+ #endif
+ 
+ #define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX)
+diff --git a/glib/gconstructor.h b/glib/gconstructor.h
+index dccb0314c..fa1139302 100644
+--- a/glib/gconstructor.h
++++ b/glib/gconstructor.h
+@@ -40,13 +40,13 @@
+  */
+ 
+ /* We need to account for differences between the mangling of symbols
+- * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed
+- * with an underscore but symbols on x64 are not.
++ * for x86 and x64/ARM/ARM64 programs, as symbols on x86 are prefixed
++ * with an underscore but symbols on x64/ARM/ARM64 are not.
+  */
+-#ifdef _WIN64
+-#define G_MSVC_SYMBOL_PREFIX ""
+-#else
++#ifdef _M_IX86
+ #define G_MSVC_SYMBOL_PREFIX "_"
++#else
++#define G_MSVC_SYMBOL_PREFIX ""
+ #endif
+ 
+ #define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX)
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
index b1ffc863d..44a499320 100644
--- a/ports/glib/portfile.cmake
+++ b/ports/glib/portfile.cmake
@@ -1,20 +1,15 @@
- # Glib uses winapi functions not available in WindowsStore
+include(vcpkg_common_functions)
+
+# Glib uses winapi functions not available in WindowsStore
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
     message(FATAL_ERROR "Error: UWP builds are currently not supported.")
 endif()
 
 # Glib relies on DllMain on Windows
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message("Glib relies on DllMain and therefore cannot be built statically")
-        set(VCPKG_LIBRARY_LINKAGE "dynamic")
-    endif()
-    if(VCPKG_CRT_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Glib only supports dynamic library and crt linkage")
-    endif()
+if (NOT VCPKG_CMAKE_SYSTEM_NAME)
+    vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 endif()
 
-include(vcpkg_common_functions)
 set(GLIB_VERSION 2.52.3)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.52/glib-${GLIB_VERSION}.tar.xz"
@@ -27,6 +22,8 @@ vcpkg_extract_source_archive_ex(
     REF ${GLIB_VERSION}
     PATCHES
         use-libiconv-on-windows.patch
+        arm64-defines.patch
+        fix-arm-builds.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -53,4 +50,3 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/glib)
 
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/glib)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/glib/COPYING ${CURRENT_PACKAGES_DIR}/share/glib/copyright)
-
diff --git a/ports/glibmm/CMakeLists.txt b/ports/glibmm/CMakeLists.txt
index 9f0165786..8e7f8f0fe 100644
--- a/ports/glibmm/CMakeLists.txt
+++ b/ports/glibmm/CMakeLists.txt
@@ -40,8 +40,6 @@ if(APPLE)
   link_libraries(${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${FOUNDATION_LIBRARY})
 endif()
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-
 if(BUILD_SHARED_LIBS)
     add_definitions(-DGLIBMM_DLL -DGIOMM_DLL)
 else()
diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL
index a7ccbe937..efef52d3f 100644
--- a/ports/glibmm/CONTROL
+++ b/ports/glibmm/CONTROL
@@ -1,4 +1,4 @@
-Source: glibmm
-Version: 2.52.1-7
-Description: This is glibmm, a C++ API for parts of glib that are useful for C++. See http://www.gtkmm.org.
-Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp
+Source: glibmm
+Version: 2.52.1-8
+Description: This is glibmm, a C++ API for parts of glib that are useful for C++. See http://www.gtkmm.org.
+Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp
diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake
index 792bf3dde..40eee279c 100644
--- a/ports/glibmm/portfile.cmake
+++ b/ports/glibmm/portfile.cmake
@@ -1,9 +1,12 @@
 # Glib uses winapi functions not available in WindowsStore, so glibmm also
+include(vcpkg_common_functions)
+
 if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
     message(FATAL_ERROR "Error: UWP builds are currently not supported.")
 endif()
 
-include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glibmm-2.52.1)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz"
diff --git a/ports/glm/CMakeLists.txt b/ports/glm/CMakeLists.txt
new file mode 100644
index 000000000..678604b86
--- /dev/null
+++ b/ports/glm/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+
+project(glm LANGUAGES CXX)
+
+include(GNUInstallDirs)
+
+add_library(glm INTERFACE)
+target_include_directories(glm INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+install(
+    TARGETS glm EXPORT glm-config
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/
+)
+
+install(
+    EXPORT glm-config DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glm
+)
+
+install(
+    DIRECTORY ${CMAKE_SOURCE_DIR}/glm
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    FILES_MATCHING PATTERN "*.hpp*" PATTERN "*.inl*" PATTERN "*.h*"
+)
diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL
index 3da56cf54..3bea7f0ed 100644
--- a/ports/glm/CONTROL
+++ b/ports/glm/CONTROL
@@ -1,3 +1,3 @@
 Source: glm
-Version: 0.9.9.3
+Version: 0.9.9.5-3
 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
deleted file mode 100644
index f87616b1e..000000000
--- a/ports/glm/disable_warnings_as_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/portfile.cmake b/ports/glm/portfile.cmake
index 7eca98766..d38589a88 100644
--- a/ports/glm/portfile.cmake
+++ b/ports/glm/portfile.cmake
@@ -3,28 +3,22 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO g-truc/glm
-    REF 0.9.9.3
-    SHA512 44152ea6438763feda3b78813287fd59d3574a9630a41647a157825bf5ce4a18fbbecae5a5ccd94acc118ed3d42cbce53d3a67f25632d0c00ab77e7de2bb4650
+    REF 0.9.9.5
+    SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
     HEAD_REF master
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_warnings_as_error.patch"
-)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/glm")
-
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Put the license file where vcpkg expects it
 file(COPY ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/glm/)
diff --git a/ports/globjects/CONTROL b/ports/globjects/CONTROL
index b75b256c6..e05b2393f 100644
--- a/ports/globjects/CONTROL
+++ b/ports/globjects/CONTROL
@@ -1,5 +1,5 @@
 Source: globjects
 Maintainer: mattias@mattiascibien.net
-Version: 1.1.0-2018-09-19
+Version: 1.1.0-2018-09-19-1
 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 5019fea0d..164edec71 100644
--- a/ports/globjects/portfile.cmake
+++ b/ports/globjects/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cginternals/globjects
-    REF fe53c4a386506d3374df12ad6f1f67c4232aa389
-    SHA512 62b40675671acf050bfe4836da5b6b6a757185d296a86ad1079cf79e4a149820971ed46fce7379b73707dff368919b63d52044230a7ce75601441fe368d91e63
+    REF dc68b09a53ec20683d3b3a12ed8d9cb12602bb9a
+    SHA512 5145df795a73a8d74e983e143fd57441865f3082860efb89a3aa8c4d64c2eb6f0256a8049ccd5479dd77e53ef6638d9c903b29a8ef2b41a076003d9595912500
     HEAD_REF master
     PATCHES system-install.patch
 )
diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL
index 21cedc5e6..4c11abf2a 100644
--- a/ports/gmime/CONTROL
+++ b/ports/gmime/CONTROL
@@ -1,4 +1,4 @@
 Source: gmime
-Version: 3.2.3
+Version: 3.2.3-1
 Build-Depends: zlib, glib, libiconv, libidn2
 Description: GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).
diff --git a/ports/gmime/gmime.def b/ports/gmime/gmime.def
index e73d0fa01..3f04d4e04 100644
--- a/ports/gmime/gmime.def
+++ b/ports/gmime/gmime.def
@@ -12,6 +12,7 @@ g_mime_certificate_get_digest_algo
 g_mime_certificate_get_email
 g_mime_certificate_get_expires
 g_mime_certificate_get_fingerprint
+g_mime_certificate_get_id_validity
 g_mime_certificate_get_issuer_name
 g_mime_certificate_get_issuer_serial
 g_mime_certificate_get_key_id
@@ -19,6 +20,7 @@ g_mime_certificate_get_name
 g_mime_certificate_get_pubkey_algo
 g_mime_certificate_get_trust
 g_mime_certificate_get_type
+g_mime_certificate_get_user_id
 g_mime_certificate_list_add
 g_mime_certificate_list_clear
 g_mime_certificate_list_contains
@@ -37,12 +39,14 @@ g_mime_certificate_set_digest_algo
 g_mime_certificate_set_email
 g_mime_certificate_set_expires
 g_mime_certificate_set_fingerprint
+g_mime_certificate_set_id_validity
 g_mime_certificate_set_issuer_name
 g_mime_certificate_set_issuer_serial
 g_mime_certificate_set_key_id
 g_mime_certificate_set_name
 g_mime_certificate_set_pubkey_algo
 g_mime_certificate_set_trust
+g_mime_certificate_set_user_id
 g_mime_charset_best
 g_mime_charset_best_name
 g_mime_charset_can_encode
@@ -144,6 +148,7 @@ g_mime_filter_best_new
 g_mime_filter_charset_get_type
 g_mime_filter_charset_new
 g_mime_filter_checksum_get_digest
+g_mime_filter_checksum_get_string
 g_mime_filter_checksum_get_type
 g_mime_filter_checksum_new
 g_mime_filter_complete
@@ -156,8 +161,12 @@ g_mime_filter_filter
 g_mime_filter_from_get_type
 g_mime_filter_from_new
 g_mime_filter_get_type
+g_mime_filter_gzip_get_comment
+g_mime_filter_gzip_get_filename
 g_mime_filter_gzip_get_type
 g_mime_filter_gzip_new
+g_mime_filter_gzip_set_comment
+g_mime_filter_gzip_set_filename
 g_mime_filter_html_get_type
 g_mime_filter_html_new
 g_mime_filter_openpgp_new
@@ -245,6 +254,9 @@ g_mime_message_add_mailbox
 g_mime_message_foreach
 g_mime_message_get_addresses
 g_mime_message_get_all_recipients
+g_mime_message_get_autocrypt_gossip_headers
+g_mime_message_get_autocrypt_gossip_headers_from_inner_part
+g_mime_message_get_autocrypt_header
 g_mime_message_get_bcc
 g_mime_message_get_body
 g_mime_message_get_cc
@@ -373,12 +385,14 @@ g_mime_parser_options_get_fallback_charsets
 g_mime_parser_options_get_parameter_compliance_mode
 g_mime_parser_options_get_rfc2047_compliance_mode
 g_mime_parser_options_get_type
+g_mime_parser_options_get_warning_callback
 g_mime_parser_options_new
 g_mime_parser_options_set_address_compliance_mode
 g_mime_parser_options_set_allow_addresses_without_domain
 g_mime_parser_options_set_fallback_charsets
 g_mime_parser_options_set_parameter_compliance_mode
 g_mime_parser_options_set_rfc2047_compliance_mode
+g_mime_parser_options_set_warning_callback
 g_mime_parser_set_format
 g_mime_parser_set_header_regex
 g_mime_parser_set_persist_stream
@@ -504,9 +518,11 @@ g_mime_stream_mem_new_with_buffer
 g_mime_stream_mem_new_with_byte_array
 g_mime_stream_mem_set_byte_array
 g_mime_stream_mem_set_owner
+g_mime_stream_mmap_get_owner
 g_mime_stream_mmap_get_type
 g_mime_stream_mmap_new
 g_mime_stream_mmap_new_with_bounds
+g_mime_stream_mmap_set_owner
 g_mime_stream_null_set_count_newlines
 g_mime_stream_null_get_count_newlines
 g_mime_stream_null_get_type
@@ -544,6 +560,7 @@ g_mime_utils_header_encode_phrase
 g_mime_utils_header_encode_text
 g_mime_utils_header_format_date
 g_mime_utils_header_printf
+g_mime_utils_header_unfold
 g_mime_utils_quote_string
 g_mime_utils_structured_header_fold
 g_mime_utils_text_is_8bit
diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake
index dbe678834..29dcd68b0 100644
--- a/ports/gmime/portfile.cmake
+++ b/ports/gmime/portfile.cmake
@@ -4,14 +4,18 @@ set(LIB_NAME gmime)
 set(LIB_VERSION 3.2.3)
 
 set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.xz)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.gnome.org/sources/gmime/3.2/${LIB_FILENAME}"
     FILENAME "${LIB_FILENAME}"
     SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${LIB_VERSION}
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
diff --git a/ports/gmmlib/CONTROL b/ports/gmmlib/CONTROL
index a06044494..ae6f760a9 100644
--- a/ports/gmmlib/CONTROL
+++ b/ports/gmmlib/CONTROL
@@ -1,3 +1,3 @@
 Source: gmmlib
-Version: 18.3.pre2-1
+Version: 19.1.2
 Description: intel's graphics memory management library
diff --git a/ports/gmmlib/portfile.cmake b/ports/gmmlib/portfile.cmake
index 6ed92151f..d3bf8dbec 100644
--- a/ports/gmmlib/portfile.cmake
+++ b/ports/gmmlib/portfile.cmake
@@ -9,8 +9,8 @@ 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
+    REF intel-gmmlib-19.1.2
+    SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243
     HEAD_REF master
 )
 
diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL
index 006b8fe2b..ca4078bf2 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: google-cloud-cpp
-Version: 0.8.0-1
+Version: 0.9.0
 Build-Depends: grpc, curl[ssl], crc32c
 Description: C++ Client Libraries for Google Cloud Platform APIs.
diff --git a/ports/google-cloud-cpp/cmake-libcurl-target.patch b/ports/google-cloud-cpp/cmake-libcurl-target.patch
deleted file mode 100644
index 97e66e69f..000000000
--- a/ports/google-cloud-cpp/cmake-libcurl-target.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/cmake/IncludeCurl.cmake b/cmake/IncludeCurl.cmake
-index d3323e3b8..6ea7ca3e6 100644
---- a/cmake/IncludeCurl.cmake
-+++ b/cmake/IncludeCurl.cmake
-@@ -39,13 +39,13 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-     # stage/module/FindCURL.html for details).  Until then, define the target
-     # ourselves if it is missing.
-     find_package(CURL REQUIRED)
--    if (NOT TARGET CURL::CURL)
--        add_library(CURL::CURL UNKNOWN IMPORTED)
--        set_property(TARGET CURL::CURL
-+    if (NOT TARGET CURL::libcurl)
-+        add_library(CURL::libcurl UNKNOWN IMPORTED)
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-                               "${CURL_INCLUDE_DIR}")
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
-     endif ()
-@@ -56,7 +56,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-     if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
-         find_package(OpenSSL REQUIRED)
-         find_package(ZLIB REQUIRED)
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_LINK_LIBRARIES
-                               OpenSSL::SSL
-@@ -64,7 +64,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-                               ZLIB::ZLIB)
-         message(STATUS "CURL linkage will be static")
-         if (WIN32)
--            set_property(TARGET CURL::CURL
-+            set_property(TARGET CURL::libcurl
-                          APPEND
-                          PROPERTY INTERFACE_LINK_LIBRARIES
-                                   crypt32
-@@ -72,7 +72,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-                                   ws2_32)
-         endif ()
-         if (APPLE)
--            set_property(TARGET CURL::CURL
-+            set_property(TARGET CURL::libcurl
-                          APPEND
-                          PROPERTY INTERFACE_LINK_LIBRARIES ldap)
-         endif ()
-diff --git a/cmake/external/curl.cmake b/cmake/external/curl.cmake
-index 54753ada9..2a83e19df 100644
---- a/cmake/external/curl.cmake
-+++ b/cmake/external/curl.cmake
-@@ -88,10 +88,10 @@ if (NOT TARGET curl_project)
-     endif ()
- 
-     include(ExternalProjectHelper)
--    add_library(CURL::CURL INTERFACE IMPORTED)
--    add_dependencies(CURL::CURL curl_project)
--    set_library_properties_for_external_project(CURL::CURL curl)
--    set_property(TARGET CURL::CURL
-+    add_library(CURL::libcurl INTERFACE IMPORTED)
-+    add_dependencies(CURL::libcurl curl_project)
-+    set_library_properties_for_external_project(CURL::libcurl curl)
-+    set_property(TARGET CURL::libcurl
-                  APPEND
-                  PROPERTY INTERFACE_LINK_LIBRARIES
-                           c-ares::cares
-@@ -99,7 +99,7 @@ if (NOT TARGET curl_project)
-                           OpenSSL::Crypto
-                           ZLIB::ZLIB)
-     if (WIN32)
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_LINK_LIBRARIES
-                               crypt32
-@@ -107,7 +107,7 @@ if (NOT TARGET curl_project)
-                               ws2_32)
-     endif ()
-     if (APPLE)
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_LINK_LIBRARIES ldap)
-     endif ()
-diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt
-index 1e750af8a..a0a04caab 100644
---- a/google/cloud/storage/CMakeLists.txt
-+++ b/google/cloud/storage/CMakeLists.txt
-@@ -226,7 +226,7 @@ target_link_libraries(storage_client
-                       PUBLIC google_cloud_cpp_common
-                              nlohmann_json
-                              Crc32c::crc32c
--                             CURL::CURL
-+                             CURL::libcurl
-                              Threads::Threads
-                              OpenSSL::SSL
-                              OpenSSL::Crypto
-@@ -396,7 +396,7 @@ if (BUILD_TESTING)
-                                           GTest::gmock_main
-                                           GTest::gmock
-                                           GTest::gtest
--                                          CURL::CURL
-+                                          CURL::libcurl
-                                           storage_common_options
-                                           nlohmann_json)
-             if (MSVC)
-diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in
-index 660829ae4..a4d261815 100644
---- a/google/cloud/storage/config.cmake.in
-+++ b/google/cloud/storage/config.cmake.in
-@@ -19,13 +19,13 @@ find_dependency(google_cloud_cpp_common)
- find_dependency(OpenSSL)
- find_dependency(ZLIB)
- 
--# Some versions of FindCURL do not define CURL::CURL, so we define it ourselves.
--if (NOT TARGET CURL::CURL)
--    add_library(CURL::CURL UNKNOWN IMPORTED)
--    set_property(TARGET CURL::CURL
-+# Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves.
-+if (NOT TARGET CURL::libcurl)
-+    add_library(CURL::libcurl UNKNOWN IMPORTED)
-+    set_property(TARGET CURL::libcurl
-                  APPEND
-                  PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
--    set_property(TARGET CURL::CURL
-+    set_property(TARGET CURL::libcurl
-                  APPEND
-                  PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
- endif ()
-diff --git a/google/cloud/storage/tests/CMakeLists.txt b/google/cloud/storage/tests/CMakeLists.txt
-index 9e5fb663d..987958396 100644
---- a/google/cloud/storage/tests/CMakeLists.txt
-+++ b/google/cloud/storage/tests/CMakeLists.txt
-@@ -50,7 +50,7 @@ foreach (fname ${storage_client_integration_tests})
-                                   GTest::gmock_main
-                                   GTest::gmock
-                                   GTest::gtest
--                                  CURL::CURL
-+                                  CURL::libcurl
-                                   Threads::Threads
-                                   nlohmann_json
-                                   storage_common_options)
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index b227b3b53..289c51a01 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -5,11 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GoogleCloudPlatform/google-cloud-cpp
-    REF v0.8.0
-    SHA512 cdb527169c7badab395eb38ba554022a364a99b9cb32705bf69a9613cee74acc1e2402e00ffdcb740467e85603e617f73b01e557afeb1f2786872f8d60f3a75a
+    REF v0.9.0
+    SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b
     HEAD_REF master
 	PATCHES
-		cmake-libcurl-target.patch # Not needed _after_ v0.8.0
 		cmake-libcurl-find-config.patch
 )
 
diff --git a/ports/graphicsmagick/CMakeLists.txt b/ports/graphicsmagick/CMakeLists.txt
index c156b69c7..34c05a7b2 100644
--- a/ports/graphicsmagick/CMakeLists.txt
+++ b/ports/graphicsmagick/CMakeLists.txt
@@ -2,20 +2,20 @@ cmake_minimum_required (VERSION 3.6)
 project (graphicsmagick)
 
 find_package(ZLIB REQUIRED)
-find_package(Bzip2 REQUIRED)
+find_package(BZip2 REQUIRED)
 find_package(JPEG REQUIRED)
 find_package(PNG REQUIRED)
 find_package(TIFF REQUIRED)
 find_package(Freetype REQUIRED)
 
-add_definitions(-D_MAGICKLIB_ -D_WANDLIB_ -DMAGICK_IMPLEMENTATION -D_VISUALC_)
+add_definitions(-D_MAGICKLIB_ -D_WANDLIB_ -DMAGICK_IMPLEMENTATION)
 
 if (BUILD_SHARED_LIBS)
     add_definitions(-D_DLL -DDLL)
 endif ()
 
 if (MSVC)
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+    add_definitions( -D_VISUALC_ -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
 endif ()
 
 if (WIN32)
@@ -35,11 +35,20 @@ string(REPLACE "#undef HasJPEG" "#define HasJPEG" CONFIG_H "${CONFIG_H}")
 string(REPLACE "#undef HasPNG" "#define HasPNG" CONFIG_H "${CONFIG_H}")
 string(REPLACE "#undef HasTIFF" "#define HasTIFF" CONFIG_H "${CONFIG_H}")
 string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}")
-string(REPLACE "#undef HasWINGDI32" "#define HasWINGDI32" CONFIG_H "${CONFIG_H}")
+string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}")
+string(REPLACE "#undef HAVE_FT2BUILD_H" "#define HAVE_FT2BUILD_H" CONFIG_H "${CONFIG_H}")
 string(REPLACE "#undef HasZLIB" "#define HasZLIB" CONFIG_H "${CONFIG_H}")
 string(REPLACE "#undef QuantumDepth" "#define QuantumDepth 16" CONFIG_H "${CONFIG_H}")
 string(REPLACE "#undef restrict" "#define restrict" CONFIG_H "${CONFIG_H}")
 string(REPLACE "#undef size_t" "/* #undef size_t */" CONFIG_H "${CONFIG_H}")
+if (WIN32)
+string(REPLACE "#undef HasWINGDI32" "#define HasWINGDI32" CONFIG_H "${CONFIG_H}")
+else ()
+string(REPLACE "#undef HAVE_VSNPRINTF" "#define HAVE_VSNPRINTF" CONFIG_H "${CONFIG_H}")
+string(REPLACE "#undef MagickLibSubdir" "#define MagickLibSubdir \"magick\"" CONFIG_H "${CONFIG_H}")
+string(REPLACE "#undef MagickLibConfigSubDir" "#define MagickLibConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}")
+string(REPLACE "#undef MagickShareConfigSubDir" "#define MagickShareConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}")
+endif ()
 file(WRITE "magick/magick_config.h" "${CONFIG_H}")
 
 file(READ "magick/magick_config_api.h.in" CONFIG_API_H)
diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL
index 7b89a8fd9..5b56e636c 100644
--- a/ports/graphicsmagick/CONTROL
+++ b/ports/graphicsmagick/CONTROL
@@ -1,5 +1,5 @@
 Source: graphicsmagick
 Maintainer: josuegomes@gmail.com
-Version: 1.3.31
+Version: 1.3.31-1
 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff
 Description: Image processing library
diff --git a/ports/graphicsmagick/magick_types.h b/ports/graphicsmagick/magick_types.h
index a27979210..93404cb4e 100644
--- a/ports/graphicsmagick/magick_types.h
+++ b/ports/graphicsmagick/magick_types.h
@@ -92,33 +92,33 @@ extern "C" {
 #else
 
   /* The following typedefs are subtituted when using Unixish configure */
-  typedef @INT8_T@   magick_int8_t;
-  typedef @UINT8_T@  magick_uint8_t;
+  typedef signed char   magick_int8_t;
+  typedef unsigned char  magick_uint8_t;
 
-  typedef @INT16_T@  magick_int16_t;
-  typedef @UINT16_T@ magick_uint16_t;
+  typedef signed short  magick_int16_t;
+  typedef unsigned short magick_uint16_t;
 
-  typedef @INT32_T@  magick_int32_t;
-#  define MAGICK_INT32_F @INT32_F@
-  typedef @UINT32_T@ magick_uint32_t;
-#  define MAGICK_UINT32_F @UINT32_F@
+  typedef signed int  magick_int32_t;
+#  define MAGICK_INT32_F ""
+  typedef unsigned int magick_uint32_t;
+#  define MAGICK_UINT32_F ""
 
-  typedef @INT64_T@  magick_int64_t;
-#  define MAGICK_INT64_F @INT64_F@
-  typedef @UINT64_T@ magick_uint64_t;
-#  define MAGICK_UINT64_F @UINT64_F@
+  typedef signed long  magick_int64_t;
+#  define MAGICK_INT64_F "l"
+  typedef unsigned long magick_uint64_t;
+#  define MAGICK_UINT64_F "l"
 
-  typedef @UINTMAX_T@ magick_uintmax_t;
-#  define MAGICK_UINTMAX_F @UINTMAX_F@
+  typedef unsigned long magick_uintmax_t;
+#  define MAGICK_UINTMAX_F "l"
 
-  typedef @UINTPTR_T@ magick_uintptr_t;
-#  define MAGICK_UINTPTR_F @UINTPTR_F@
+  typedef unsigned long magick_uintptr_t;
+#  define MAGICK_UINTPTR_F "l"
 
-#  define MAGICK_SIZE_T_F @MAGICK_SIZE_T_F@
-#  define MAGICK_SIZE_T @MAGICK_SIZE_T@
+#  define MAGICK_SIZE_T_F "l"
+#  define MAGICK_SIZE_T unsigned long
 
-#  define MAGICK_SSIZE_T_F @MAGICK_SSIZE_T_F@
-#  define MAGICK_SSIZE_T @MAGICK_SSIZE_T@
+#  define MAGICK_SSIZE_T_F "l"
+#  define MAGICK_SSIZE_T signed long
 
 #endif
 
diff --git a/ports/graphqlparser/CONTROL b/ports/graphqlparser/CONTROL
index 0f6ed481e..128c49498 100644
--- a/ports/graphqlparser/CONTROL
+++ b/ports/graphqlparser/CONTROL
@@ -1,3 +1,3 @@
 Source: graphqlparser
-Version: 0.7.0
+Version: 0.7.0-1
 Description: A GraphQL query parser in C++ with C and C++ APIs
diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake
index 6e175fe6b..bab77a0c7 100644
--- a/ports/graphqlparser/portfile.cmake
+++ b/ports/graphqlparser/portfile.cmake
@@ -6,7 +6,9 @@ vcpkg_from_github(
     REF v0.7.0
     SHA512 973292b164d0d2cfe453a2f01559dbdb1b9d22b6304f6a3aabf71e2c0a3e24ab69dfd72a086764ad5befecf0005620f8e86f552dacc324f9615a05f31de7cede
     HEAD_REF master
-    PATCHES win-cmake.patch
+    PATCHES
+        win-cmake.patch
+        static-compile-fix.patch
 )
 
 if(UNIX)
diff --git a/ports/graphqlparser/static-compile-fix.patch b/ports/graphqlparser/static-compile-fix.patch
new file mode 100644
index 000000000..3f2756d71
--- /dev/null
+++ b/ports/graphqlparser/static-compile-fix.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 56741c2..313308a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,8 +142,11 @@ if (UNIX)
+ elseif(WIN32)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.lib
+ 	DESTINATION lib)
++  # do not install pdb when static compilation.
++  if (BUILD_SHARED_LIBS)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.pdb
+ 	DESTINATION bin)
++  endif()
+ endif()
+ 
+ IF (test)
diff --git a/ports/grpc/fix-uwp.patch b/ports/grpc/00001-fix-uwp.patch
index 1811fdf92..6f7f2d90f 100644
--- a/ports/grpc/fix-uwp.patch
+++ b/ports/grpc/00001-fix-uwp.patch
@@ -1,148 +1,148 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1013dc561..b02d07ccba 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,6 +90,9 @@ if(UNIX)
- endif()
- if(WIN32)
-   set(_gRPC_PLATFORM_WINDOWS ON)
-+  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+    set(_gRPC_PLATFORM_UWP ON)
-+  endif()
- endif()
- 
- set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-@@ -107,6 +110,9 @@ if (MSVC)
-   add_definitions(/wd4267)
-   # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
-   add_definitions(/wd4987 /wd4774 /wd4819 /wd4996 /wd4619)
-+  if(_gRPC_PLATFORM_UWP)
-+    add_definitions(-DGRPC_ARES=0)
-+  endif()
- endif()
- 
- if (gRPC_USE_PROTO_LITE)
-@@ -177,6 +183,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
- #     ``.proto`` files
- #
- function(protobuf_generate_grpc_cpp)
-+  if(_gRPC_PLATFORM_UWP)
-+    return()
-+  endif()
-+
-   if(NOT ARGN)
-     message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
-     return()
-@@ -211,6 +221,7 @@ function(protobuf_generate_grpc_cpp)
-   endforeach()
- endfunction()
- 
-+if(NOT _gRPC_PLATFORM_UWP)
- add_custom_target(plugins
-   DEPENDS
-   grpc_cpp_plugin
-@@ -240,6 +251,8 @@ add_custom_target(tools_cxx
- add_custom_target(tools
-   DEPENDS tools_c tools_cxx)
- 
-+endif()
-+
- if (gRPC_BUILD_TESTS)
- add_custom_target(buildtests_c)
- add_dependencies(buildtests_c algorithm_test)
-@@ -3795,7 +3808,6 @@ foreach(_hdr
-     DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
-   )
- endforeach()
--endif (gRPC_BUILD_CODEGEN)
- 
- 
- if (gRPC_INSTALL)
-@@ -3805,6 +3817,7 @@ if (gRPC_INSTALL)
-     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-   )
- endif()
-+endif (gRPC_BUILD_CODEGEN)
- 
- if (gRPC_BUILD_TESTS)
- 
-@@ -3925,7 +3938,7 @@ foreach(_hdr
-     DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
-   )
- endforeach()
--endif (gRPC_BUILD_CODEGEN)
-+
- 
- 
- if (gRPC_INSTALL)
-@@ -3935,6 +3948,7 @@ if (gRPC_INSTALL)
-     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-   )
- endif()
-+endif (gRPC_BUILD_CODEGEN)
- 
- if (gRPC_BUILD_TESTS)
- 
-@@ -4926,7 +4940,6 @@ foreach(_hdr
-     DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
-   )
- endforeach()
--endif (gRPC_BUILD_CODEGEN)
- 
- 
- if (gRPC_INSTALL)
-@@ -4936,6 +4949,7 @@ if (gRPC_INSTALL)
-     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-   )
- endif()
-+endif (gRPC_BUILD_CODEGEN)
- 
- if (gRPC_BUILD_TESTS)
- 
-diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc
-index 61c366098e..aac2ce0a9f 100644
---- a/src/core/lib/iomgr/resource_quota.cc
-+++ b/src/core/lib/iomgr/resource_quota.cc
-@@ -937,7 +937,7 @@ void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size,
- void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) {
-   gpr_mu_lock(&resource_user->mu);
-   grpc_resource_quota* resource_quota = resource_user->resource_quota;
--  gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size);
-+  gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast<gpr_atm>(size));
-   GPR_ASSERT(prior >= static_cast<long>(size));
-   bool was_zero_or_negative = resource_user->free_pool <= 0;
-   resource_user->free_pool += static_cast<int64_t>(size);
-diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-index 55efe0e..f538f26 100644
---- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-@@ -60,6 +60,8 @@ bool check_bios_data(const char* bios_data_file) {
- 
- static void init_mu(void) { gpr_mu_init(&g_mu); }
- 
-+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
-+
- static bool run_powershell() {
-   SECURITY_ATTRIBUTES sa;
-   sa.nLength = sizeof(sa);
-@@ -97,8 +99,12 @@ static bool run_powershell() {
-   CloseHandle(h);
-   return true;
- }
-+#endif
- 
- bool grpc_alts_is_running_on_gcp() {
-+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
-+  g_is_on_compute_engine = false;
-+#else
-   gpr_once_init(&g_once, init_mu);
-   gpr_mu_lock(&g_mu);
-   if (!g_compute_engine_detection_done) {
-@@ -108,6 +114,7 @@ bool grpc_alts_is_running_on_gcp() {
-     g_compute_engine_detection_done = true;
-   }
-   gpr_mu_unlock(&g_mu);
-+#endif
-   return g_is_on_compute_engine;
- }
- 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ba68c4a13..258a1609f6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -90,6 +90,9 @@ if(UNIX)
+ endif()
+ if(WIN32)
+   set(_gRPC_PLATFORM_WINDOWS ON)
++  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++    set(_gRPC_PLATFORM_UWP ON)
++  endif()
+ endif()
+ 
+ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+@@ -107,6 +110,9 @@ if (MSVC)
+   add_definitions(/wd4267)
+   # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
+   add_definitions(/wd4987 /wd4774 /wd4819 /wd4996 /wd4619)
++  if(_gRPC_PLATFORM_UWP)
++    add_definitions(-DGRPC_ARES=0)
++  endif()
+ endif()
+ 
+ if (gRPC_USE_PROTO_LITE)
+@@ -177,6 +183,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
+ #     ``.proto`` files
+ #
+ function(protobuf_generate_grpc_cpp)
++  if(_gRPC_PLATFORM_UWP)
++    return()
++  endif()
++
+   if(NOT ARGN)
+     message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
+     return()
+@@ -218,6 +228,7 @@ function(protobuf_generate_grpc_cpp)
+   endforeach()
+ endfunction()
+ 
++if(NOT _gRPC_PLATFORM_UWP)
+ add_custom_target(plugins
+   DEPENDS
+   grpc_cpp_plugin
+@@ -247,6 +258,8 @@ add_custom_target(tools_cxx
+ add_custom_target(tools
+   DEPENDS tools_c tools_cxx)
+ 
++endif()
++
+ if (gRPC_BUILD_TESTS)
+ add_custom_target(buildtests_c)
+ add_dependencies(buildtests_c algorithm_test)
+@@ -4029,7 +4042,6 @@ foreach(_hdr
+     DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
+   )
+ endforeach()
+-endif (gRPC_BUILD_CODEGEN)
+ 
+ if (gRPC_BUILD_CODEGEN)
+ 
+@@ -4040,6 +4052,7 @@ if (gRPC_INSTALL)
+     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
+   )
+ endif()
++endif (gRPC_BUILD_CODEGEN)
+ 
+ endif (gRPC_BUILD_CODEGEN)
+ if (gRPC_BUILD_TESTS)
+@@ -4163,7 +4176,7 @@ foreach(_hdr
+     DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
+   )
+ endforeach()
+-endif (gRPC_BUILD_CODEGEN)
++
+ 
+ if (gRPC_BUILD_CODEGEN)
+ 
+@@ -4174,6 +4187,7 @@ if (gRPC_INSTALL)
+     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
+   )
+ endif()
++endif (gRPC_BUILD_CODEGEN)
+ 
+ endif (gRPC_BUILD_CODEGEN)
+ if (gRPC_BUILD_TESTS)
+@@ -5196,7 +5210,6 @@ foreach(_hdr
+     DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
+   )
+ endforeach()
+-endif (gRPC_BUILD_CODEGEN)
+ 
+ if (gRPC_BUILD_CODEGEN)
+ 
+@@ -5207,6 +5220,7 @@ if (gRPC_INSTALL)
+     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
+   )
+ endif()
++endif (gRPC_BUILD_CODEGEN)
+ 
+ endif (gRPC_BUILD_CODEGEN)
+ if (gRPC_BUILD_TESTS)
+diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc
+index dffac348c5..a59becb046 100644
+--- a/src/core/lib/iomgr/resource_quota.cc
++++ b/src/core/lib/iomgr/resource_quota.cc
+@@ -940,7 +940,7 @@ void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size,
+ void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) {
+   gpr_mu_lock(&resource_user->mu);
+   grpc_resource_quota* resource_quota = resource_user->resource_quota;
+-  gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size);
++  gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast<gpr_atm>(size));
+   GPR_ASSERT(prior >= static_cast<long>(size));
+   bool was_zero_or_negative = resource_user->free_pool <= 0;
+   resource_user->free_pool += static_cast<int64_t>(size);
+diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
+index 55efe0e9dd..f538f26edf 100644
+--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
++++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
+@@ -60,6 +60,8 @@ bool check_bios_data(const char* bios_data_file) {
+ 
+ static void init_mu(void) { gpr_mu_init(&g_mu); }
+ 
++#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
++
+ static bool run_powershell() {
+   SECURITY_ATTRIBUTES sa;
+   sa.nLength = sizeof(sa);
+@@ -97,8 +99,12 @@ static bool run_powershell() {
+   CloseHandle(h);
+   return true;
+ }
++#endif
+ 
+ bool grpc_alts_is_running_on_gcp() {
++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
++  g_is_on_compute_engine = false;
++#else
+   gpr_once_init(&g_once, init_mu);
+   gpr_mu_lock(&g_mu);
+   if (!g_compute_engine_detection_done) {
+@@ -108,6 +114,7 @@ bool grpc_alts_is_running_on_gcp() {
+     g_compute_engine_detection_done = true;
+   }
+   gpr_mu_unlock(&g_mu);
++#endif
+   return g_is_on_compute_engine;
+ }
+ 
diff --git a/ports/grpc/00002-static-linking-in-linux.patch b/ports/grpc/00002-static-linking-in-linux.patch
new file mode 100644
index 000000000..e8005edaa
--- /dev/null
+++ b/ports/grpc/00002-static-linking-in-linux.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3839e22..91720a9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,6 +99,11 @@ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+ 
+ add_definitions(-DPB_FIELD_32BIT)
+ 
++if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS)
++  # Force to static link
++  set(CMAKE_EXE_LINKER_FLAGS "-Bstatic")
++endif()
++
+ if (MSVC)
+   include(cmake/msvc_static_runtime.cmake)
+   add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
diff --git a/ports/grpc/00003-undef-base64-macro.patch b/ports/grpc/00003-undef-base64-macro.patch
new file mode 100644
index 000000000..8417e3eea
--- /dev/null
+++ b/ports/grpc/00003-undef-base64-macro.patch
@@ -0,0 +1,13 @@
+diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
+index 09306110c6..eb0ad96a7a 100644
+--- a/src/core/lib/transport/transport.cc
++++ b/src/core/lib/transport/transport.cc
+@@ -134,6 +134,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
+   refcount->slice_refcount.sub_refcount = &refcount->slice_refcount;
+ }
+ 
++#undef move64
++
+ static void move64(uint64_t* from, uint64_t* to) {
+   *to += *from;
+   *from = 0;
diff --git a/ports/grpc/00004-link-gdi32-on-windows.patch b/ports/grpc/00004-link-gdi32-on-windows.patch
new file mode 100644
index 000000000..8aede4656
--- /dev/null
+++ b/ports/grpc/00004-link-gdi32-on-windows.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e820737201..3eb4795660 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -158,7 +158,7 @@ elseif(UNIX)
+ endif()
+ 
+ if(WIN32 AND MSVC)
+-  set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32)
++  set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 gdi32)
+ endif()
+ 
+ # Create directory for generated .proto files
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index f1b1d9798..c2ce84cc2 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,4 +1,4 @@
 Source: grpc
-Version: 1.19.1
+Version: 1.20.1-1
 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp)
 Description: An RPC library and framework
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 355f9a179..e8576d533 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -1,6 +1,8 @@
 include(vcpkg_common_functions)
 
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
 # This snippet is a workaround for users who are upgrading from an extremely old version of this
 # port, which cloned directly into `src\`
@@ -11,13 +13,17 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
-    REF v1.19.1
-    SHA512  4bb127d946fc16887fd4cf75215f0bc9f6d17dbd36fc4f1b191a64914f96c49dddb41f1b6c72fd24ea0a40f242b4398248f32fcb1fe9a764367be1c2edda9142
+    REF v1.20.1
+    SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
     HEAD_REF master
-    PATCHES fix-uwp.patch
+    PATCHES 
+        00001-fix-uwp.patch
+        00002-static-linking-in-linux.patch
+        00003-undef-base64-macro.patch
+        00004-link-gdi32-on-windows.patch
 )
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
     set(gRPC_BUILD_CODEGEN OFF)
 else()
     set(gRPC_BUILD_CODEGEN ON)
@@ -29,6 +35,12 @@ else()
     set(gRPC_MSVC_STATIC_RUNTIME OFF)
 endif()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(gRPC_STATIC_LINKING ON)
+else()
+    set(gRPC_STATIC_LINKING OFF)
+endif()
+
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     set(cares_CARES_PROVIDER OFF)
 else()
@@ -41,6 +53,7 @@ vcpkg_configure_cmake(
     OPTIONS
         -DgRPC_INSTALL=ON
         -DgRPC_BUILD_TESTS=OFF
+        -DgRPC_STATIC_LINKING=${gRPC_STATIC_LINKING}
         -DgRPC_MSVC_STATIC_RUNTIME=${gRPC_MSVC_STATIC_RUNTIME}
         -DgRPC_ZLIB_PROVIDER=package
         -DgRPC_SSL_PROVIDER=package
diff --git a/ports/gtk/CMakeLists.txt b/ports/gtk/CMakeLists.txt
index 22e30b1a7..9c265c7e5 100644
--- a/ports/gtk/CMakeLists.txt
+++ b/ports/gtk/CMakeLists.txt
@@ -12,6 +12,11 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
     set(CAIRO_LIB_SUFFIX d)
 endif()
 
+if (WIN32)
+  # Set utf-8 charset to avoid compile error C2001
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
+endif()
+
 # find dependencies
 # glib
 find_path(GLIB_INCLUDE_DIR glib.h)
diff --git a/ports/gtk/CONTROL b/ports/gtk/CONTROL
index c470f8ac8..ac0d4764f 100644
--- a/ports/gtk/CONTROL
+++ b/ports/gtk/CONTROL
@@ -1,4 +1,4 @@
 Source: gtk
-Version: 3.22.19-2
+Version: 3.22.19-3
 Description: Portable library for creating graphical user interfaces.
 Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext
diff --git a/ports/gtkmm/CONTROL b/ports/gtkmm/CONTROL
index a0812ef67..36bcea3f7 100644
--- a/ports/gtkmm/CONTROL
+++ b/ports/gtkmm/CONTROL
@@ -1,4 +1,4 @@
 Source: gtkmm
-Version: 3.22.2
+Version: 3.22.2-1
 Description: gtkmm is the official C++ interface for the popular GUI library GTK+.
 Build-Depends: glib, atk, gtk, gdk-pixbuf, pango, cairo, libepoxy, gettext, glibmm, atkmm, cairomm, pangomm
diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake
index 707e64a9b..d3fc01bb7 100644
--- a/ports/gtkmm/portfile.cmake
+++ b/ports/gtkmm/portfile.cmake
@@ -4,13 +4,10 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
 message(FATAL_ERROR "Error: UWP builds are currently not supported.")
 endif()
 
-# Glibmm relies on DllMain, so gtkmm also
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-message(STATUS "Warning: Static building not supported. Building dynamic.")
-set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gtkmm-3.22.2)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.2.tar.xz"
diff --git a/ports/gts/CONTROL b/ports/gts/CONTROL
index faa409619..0aa1251e4 100644
--- a/ports/gts/CONTROL
+++ b/ports/gts/CONTROL
@@ -1,4 +1,4 @@
-Source: gts
-Version: 0.7.6
-Description: A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles
-Build-Depends: glib
+Source: gts
+Version: 0.7.6-1
+Description: A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles
+Build-Depends: glib
diff --git a/ports/gts/portfile.cmake b/ports/gts/portfile.cmake
index 14a5e2bfa..71a62e756 100644
--- a/ports/gts/portfile.cmake
+++ b/ports/gts/portfile.cmake
@@ -1,13 +1,7 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message("gts does not support building statically -- building dynamically instead")
-    set(VCPKG_LIBRARY_LINKAGE "dynamic")
-endif()
+include(vcpkg_common_functions)
 
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    message("gts can only be built dynamically, and therefore cannot static link the CRT")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  finetjul/gts
diff --git a/ports/guetzli/CMakeLists.txt b/ports/guetzli/CMakeLists.txt
index 5d594aabd..d24b2326d 100644
--- a/ports/guetzli/CMakeLists.txt
+++ b/ports/guetzli/CMakeLists.txt
@@ -5,10 +5,6 @@ if(MSVC)
   add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
 endif()
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 find_path(butteraugli_include butteraugli/butteraugli.h)
 find_library(butteraugli_library NAMES butteraugli_lib)
 find_package(PNG REQUIRED)
diff --git a/ports/guetzli/CONTROL b/ports/guetzli/CONTROL
index 1bbfbe444..dd8e76575 100644
--- a/ports/guetzli/CONTROL
+++ b/ports/guetzli/CONTROL
@@ -1,4 +1,4 @@
-Source: guetzli
-Version: 2018-07-30
-Description: Perceptual JPEG encoder
-Build-Depends: libpng, butteraugli
+Source: guetzli
+Version: 2018-07-30-2
+Description: Perceptual JPEG encoder
+Build-Depends: libpng, butteraugli
diff --git a/ports/guetzli/butteraugli.patch b/ports/guetzli/butteraugli.patch
new file mode 100644
index 000000000..ac124ca54
--- /dev/null
+++ b/ports/guetzli/butteraugli.patch
@@ -0,0 +1,13 @@
+diff --git a/guetzli/butteraugli_comparator.cc b/guetzli/butteraugli_comparator.cc
+index 142c203..f4e710d 100644
+--- a/guetzli/butteraugli_comparator.cc
++++ b/guetzli/butteraugli_comparator.cc
+@@ -56,7 +56,7 @@ ButteraugliComparator::ButteraugliComparator(const int width, const int height,
+       height_(height),
+       target_distance_(target_distance),
+       rgb_orig_(*rgb),
+-      comparator_(LinearRgb(width_, height_, *rgb)),
++      comparator_(LinearRgb(width_, height_, *rgb), 1.0f),
+       distance_(0.0),
+       stats_(stats) {}
+ 
diff --git a/ports/guetzli/portfile.cmake b/ports/guetzli/portfile.cmake
index cb5a44687..5e1041461 100644
--- a/ports/guetzli/portfile.cmake
+++ b/ports/guetzli/portfile.cmake
@@ -1,11 +1,14 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/guetzli
     REF 0b78c7cc8b1b6cbaaf3d08b1facb599bcec1d101
     SHA512 54c5198c4c066858dd1377a32e765f46a589f3444bea303b54326453d0e8e71f959d3aaf2c72f4714fd27891f4d93288e7fa96baf1fd10f127929c1fcfa5ae1c
     HEAD_REF master
+    PATCHES butteraugli.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/gumbo/CONTROL b/ports/gumbo/CONTROL
index 82c41213e..6889b526d 100644
--- a/ports/gumbo/CONTROL
+++ b/ports/gumbo/CONTROL
@@ -1,3 +1,3 @@
-Source: gumbo
-Version: 0.10.1-2
-Description: An HTML5 parsing library in pure C99
+Source: gumbo
+Version: 0.10.1-3
+Description: An HTML5 parsing library in pure C99
diff --git a/ports/gumbo/portfile.cmake b/ports/gumbo/portfile.cmake
index a09ac8619..715decc23 100644
--- a/ports/gumbo/portfile.cmake
+++ b/ports/gumbo/portfile.cmake
@@ -1,8 +1,6 @@
 include(vcpkg_common_functions)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-  message(WARNING "Dynamic linking not supported -- building static instead")
-  set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/halide/CONTROL b/ports/halide/CONTROL
index 5539ebd32..4418e56de 100644
--- a/ports/halide/CONTROL
+++ b/ports/halide/CONTROL
@@ -1,3 +1,3 @@
-Source: halide
-Version: release_2018_02_15
-Description: Halide is a programming language designed to make it easier to write high-performance image processing code on modern machines.
+Source: halide
+Version: release_2018_02_15-1
+Description: Halide is a programming language designed to make it easier to write high-performance image processing code on modern machines.
diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake
index 169723518..6c6e6fe9d 100644
--- a/ports/halide/portfile.cmake
+++ b/ports/halide/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(TARGET_ARCHITECTURE 32)
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 399f13111..a0fdfdd95 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,5 +1,5 @@
 Source: harfbuzz
-Version: 2.3.1-3
+Version: 2.4.0
 Description: HarfBuzz OpenType text shaping engine
 Build-Depends: freetype, ragel, gettext (osx)
 Default-Features: ucdn
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index e1a8199c0..bfcd3cea0 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO harfbuzz/harfbuzz
-    REF 2.3.1
-    SHA512 c90f8a530bf49e91f5297f6a3c2f4be65f8907e3b41892cd5fbc1353ce7036aae7e182bfd0ea8cb32b0310cbe7284a3de8b6622e08db9736c3f0bba6cb1f9f01
+    REF 2.4.0
+    SHA512 dd3a5caec689cffdd887bd3ca646ceaee804a0501d1d4ad1e9d9d48d9e4a87a02b76a9aa354dc69528b7d2a17c2431fce67c1681c72ad8246c2f5a1be498d52a
     HEAD_REF master
     PATCHES
         0001-fix-cmake-export.patch
diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL
index 229d659e7..6ec2cea9b 100644
--- a/ports/hdf5/CONTROL
+++ b/ports/hdf5/CONTROL
@@ -1,11 +1,11 @@
-Source: hdf5
-Version: 1.10.5-4
-Description: HDF5 is a data model, library, and file format for storing and managing data
-Build-Depends: zlib, szip
-
-Feature: parallel
-Description: parallel support for HDF5
-Build-Depends: msmpi
-
-Feature: cpp
-Description: Builds cpp lib
+Source: hdf5
+Version: 1.10.5-5
+Description: HDF5 is a data model, library, and file format for storing and managing data
+Build-Depends: zlib, szip
+
+Feature: parallel
+Description: parallel support for HDF5
+Build-Depends: msmpi
+
+Feature: cpp
+Description: Builds cpp lib
diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake
index eef241163..cb1541fed 100644
--- a/ports/hdf5/portfile.cmake
+++ b/ports/hdf5/portfile.cmake
@@ -41,7 +41,6 @@ vcpkg_configure_cmake(
         -DBUILD_TESTING=OFF
         -DHDF5_BUILD_EXAMPLES=OFF
         -DHDF5_BUILD_TOOLS=OFF
-        -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
         -DHDF5_BUILD_CPP_LIB=${ENABLE_CPP}
         -DHDF5_ENABLE_PARALLEL=${ENABLE_PARALLEL}
         -DHDF5_ENABLE_Z_LIB_SUPPORT=ON
diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL
index e99f115ae..d77e210b6 100644
--- a/ports/hpx/CONTROL
+++ b/ports/hpx/CONTROL
@@ -1,5 +1,5 @@
 Source: hpx
-Version: 1.2.1-0
+Version: 1.2.1-1
 Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
-Description: The C++ Standards Library for Concurrency and Parallelism 
+Description: The C++ Standards Library for Concurrency and Parallelism
   HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case.
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake
index 2955905ce..3e687e50d 100644
--- a/ports/hpx/portfile.cmake
+++ b/ports/hpx/portfile.cmake
@@ -1,90 +1,87 @@
-include(vcpkg_common_functions)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building of HPX not supported yet. Building dynamic.") 
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO STEllAR-GROUP/hpx
-    REF 1.2.1
-    SHA512 46e9e36cbd9bec935b2a1efce8167c641de88aca8e4dd9c2e3269a1d82ab2965812b5483b6dff4465634f454757b19ad4f73ddcc5ddd73d6efbf28d0819f7dc7
-    HEAD_REF master
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        "-DBOOST_ROOT=${CURRENT_INSTALLED_DIR}/share/boost"
-        "-DHWLOC_ROOT=${CURRENT_INSTALLED_DIR}/share/hwloc"
-        -DHPX_WITH_VCPKG=ON
-        -DHPX_WITH_TESTS=OFF
-        -DHPX_WITH_EXAMPLES=OFF
-        -DHPX_WITH_TOOLS=OFF
-        -DHPX_WITH_RUNTIME=OFF
-)
-
-vcpkg_install_cmake()
-
-# post build cleanup
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/HPX)
-
-file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}/share/hpx/*.cmake")
-foreach(CMAKE_FILE IN LISTS CMAKE_FILES)
-    file(READ ${CMAKE_FILE} _contents)
-    string(REGEX REPLACE
-        "lib/([A-Za-z0-9_.-]+\\.dll)"
-        "bin/\\1"
-        _contents "${_contents}")
-    string(REGEX REPLACE
-        "lib/hpx/([A-Za-z0-9_.-]+\\.dll)"
-        "bin/hpx/\\1"
-        _contents "${_contents}")
-    file(WRITE ${CMAKE_FILE} "${_contents}")
-endforeach()
-
-file(READ "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" _contents)
-string(REPLACE "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \"\${CMAKE_CURRENT_LIST_DIR}/../../lib/cmake/HPX\")" "list(APPEND CMAKE_MODULE_PATH \"\${CMAKE_CURRENT_LIST_DIR}\")" _contents "${_contents}")
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" "${_contents}")
-
-file(INSTALL
-    ${SOURCE_PATH}/LICENSE_1_0.txt
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/hpx RENAME copyright)
-
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll)
-if(DLLS)
-    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE ${DLLS})
-endif()
-
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll)
-if(DLLS)
-    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin/hpx)
-    file(REMOVE ${DLLS})
-endif()
-
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
-if(DLLS)
-    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(REMOVE ${DLLS})
-endif()
-
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll)
-if(DLLS)
-    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/hpx)
-    file(REMOVE ${DLLS})
-endif()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/bazel)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/bazel)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
-
-vcpkg_copy_pdbs()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO STEllAR-GROUP/hpx
+    REF 1.2.1
+    SHA512 46e9e36cbd9bec935b2a1efce8167c641de88aca8e4dd9c2e3269a1d82ab2965812b5483b6dff4465634f454757b19ad4f73ddcc5ddd73d6efbf28d0819f7dc7
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        "-DBOOST_ROOT=${CURRENT_INSTALLED_DIR}/share/boost"
+        "-DHWLOC_ROOT=${CURRENT_INSTALLED_DIR}/share/hwloc"
+        -DHPX_WITH_VCPKG=ON
+        -DHPX_WITH_TESTS=OFF
+        -DHPX_WITH_EXAMPLES=OFF
+        -DHPX_WITH_TOOLS=OFF
+        -DHPX_WITH_RUNTIME=OFF
+)
+
+vcpkg_install_cmake()
+
+# post build cleanup
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/HPX)
+
+file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}/share/hpx/*.cmake")
+foreach(CMAKE_FILE IN LISTS CMAKE_FILES)
+    file(READ ${CMAKE_FILE} _contents)
+    string(REGEX REPLACE
+        "lib/([A-Za-z0-9_.-]+\\.dll)"
+        "bin/\\1"
+        _contents "${_contents}")
+    string(REGEX REPLACE
+        "lib/hpx/([A-Za-z0-9_.-]+\\.dll)"
+        "bin/hpx/\\1"
+        _contents "${_contents}")
+    file(WRITE ${CMAKE_FILE} "${_contents}")
+endforeach()
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" _contents)
+string(REPLACE "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \"\${CMAKE_CURRENT_LIST_DIR}/../../lib/cmake/HPX\")" "list(APPEND CMAKE_MODULE_PATH \"\${CMAKE_CURRENT_LIST_DIR}\")" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" "${_contents}")
+
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE_1_0.txt
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/hpx RENAME copyright)
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll)
+if(DLLS)
+    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+    file(REMOVE ${DLLS})
+endif()
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll)
+if(DLLS)
+    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin/hpx)
+    file(REMOVE ${DLLS})
+endif()
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
+if(DLLS)
+    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE ${DLLS})
+endif()
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll)
+if(DLLS)
+    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/hpx)
+    file(REMOVE ${DLLS})
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/bazel)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/bazel)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+
+vcpkg_copy_pdbs()
diff --git a/ports/http-parser/CMakeLists.txt b/ports/http-parser/CMakeLists.txt
index 284c8e903..cf3961cb7 100644
--- a/ports/http-parser/CMakeLists.txt
+++ b/ports/http-parser/CMakeLists.txt
@@ -1,10 +1,6 @@
 cmake_minimum_required(VERSION 3.4)
 project(http-parser C)
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 if(CMAKE_BUILD_TYPE MATCHES "Release")
   add_definitions(-DHTTP_PARSER_STRICT=0)
 endif()
diff --git a/ports/http-parser/CONTROL b/ports/http-parser/CONTROL
index c50a53849..486b2a78c 100644
--- a/ports/http-parser/CONTROL
+++ b/ports/http-parser/CONTROL
@@ -1,3 +1,3 @@
-Source: http-parser
-Version: 2.9.0
-Description: HTTP Parser.
-\ No newline at end of file
+Source: http-parser
+Version: 2.9.2
+Description: HTTP Parser.
diff --git a/ports/http-parser/portfile.cmake b/ports/http-parser/portfile.cmake
index 5e9929789..8a208a5e7 100644
--- a/ports/http-parser/portfile.cmake
+++ b/ports/http-parser/portfile.cmake
@@ -1,9 +1,12 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nodejs/http-parser
-    REF v2.9.0
-    SHA512 40acecbf71b9f0b4ae857c74c3ec0784d7f341a0cb83cf82b308387d0c5b56d38b282241aaf8ca93816970f2a9e67989f3d9d456459f3986c29fe51ab520155e
+    REF v2.9.2
+    SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
     HEAD_REF master
 )
 
diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL
index 171eb1129..d60dbf04b 100644
--- a/ports/icu/CONTROL
+++ b/ports/icu/CONTROL
@@ -1,3 +1,3 @@
 Source: icu
-Version: 61.1-5
+Version: 61.1-6
 Description: Mature and widely used Unicode and localization library.
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index 2061111e9..91cba5db7 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -209,3 +209,11 @@ vcpkg_copy_pdbs()
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/icu)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/icu/LICENSE ${CURRENT_PACKAGES_DIR}/share/icu/copyright)
+
+# Deal with a stale process created by MSYS
+if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    vcpkg_execute_required_process(
+        COMMAND TASKKILL /F /IM gpg-agent.exe /fi "memusage gt 2"
+        WORKING_DIRECTORY ${SOURCE_PATH}
+    )
+endif()
diff --git a/ports/idevicerestore/CONTROL b/ports/idevicerestore/CONTROL
index dc781eb5c..36c31d97c 100644
--- a/ports/idevicerestore/CONTROL
+++ b/ports/idevicerestore/CONTROL
@@ -1,4 +1,4 @@
 Source: idevicerestore
-Version: 1.0.12-1
+Version: 1.0.12-2
 Description: Restore/upgrade firmware of iOS devices
 Build-Depends: libimobiledevice, curl, libirecovery, libzip
 \ No newline at end of file
diff --git a/ports/idevicerestore/libcurl_d.patch b/ports/idevicerestore/libcurl_d.patch
new file mode 100644
index 000000000..1d9d3f3d7
--- /dev/null
+++ b/ports/idevicerestore/libcurl_d.patch
@@ -0,0 +1,23 @@
+diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj
+index fa209fae..cf89306b 100644
+--- a/idevicerestore.vcxproj
++++ b/idevicerestore.vcxproj	
+@@ -94,7 +94,7 @@
+       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+@@ -105,7 +105,7 @@
+       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+
diff --git a/ports/idevicerestore/libcurl_imp.patch b/ports/idevicerestore/libcurl_imp.patch
new file mode 100644
index 000000000..f93dfb2b5
--- /dev/null
+++ b/ports/idevicerestore/libcurl_imp.patch
@@ -0,0 +1,40 @@
+diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj
+index fa209fae..cf89306b 100644
+--- a/idevicerestore.vcxproj
++++ b/idevicerestore.vcxproj	
+@@ -94,7 +94,7 @@
+       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+@@ -105,7 +105,7 @@
+       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+@@ -120,7 +120,7 @@
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+@@ -135,7 +135,7 @@
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemGroup>
diff --git a/ports/idevicerestore/portfile.cmake b/ports/idevicerestore/portfile.cmake
index e0f9a0888..271c249c6 100644
--- a/ports/idevicerestore/portfile.cmake
+++ b/ports/idevicerestore/portfile.cmake
@@ -8,6 +8,18 @@ vcpkg_from_github(
     HEAD_REF msvc-master
 )
 
+if(${VCPKG_LIBRARY_LINKAGE} MATCHES dynamic)
+    vcpkg_apply_patches(
+        SOURCE_PATH ${SOURCE_PATH}
+        PATCHES
+            libcurl_imp.patch)
+else()
+    vcpkg_apply_patches(
+        SOURCE_PATH ${SOURCE_PATH}
+        PATCHES
+            libcurl_d.patch)
+endif()
+
 vcpkg_install_msbuild(
     SOURCE_PATH ${SOURCE_PATH}
     PROJECT_SUBPATH idevicerestore.vcxproj
diff --git a/ports/if97/CONTROL b/ports/if97/CONTROL
index 7e5bb74fb..6279dea80 100644
--- a/ports/if97/CONTROL
+++ b/ports/if97/CONTROL
@@ -1,3 +1,3 @@
 Source: if97
-Version: 2.1.0
+Version: 2.1.2
 Description: This repository implements the IF97 formulation for the properties of pure water substance.
diff --git a/ports/if97/portfile.cmake b/ports/if97/portfile.cmake
index 4f8d28e82..c07d11e5c 100644
--- a/ports/if97/portfile.cmake
+++ b/ports/if97/portfile.cmake
@@ -1,11 +1,10 @@
 include(vcpkg_common_functions)
-set(PORT_VERSION 2.1.0)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CoolProp/IF97
-    REF v${PORT_VERSION}
-    SHA512 f8cde0538af395d8d82998bd71f28d89cd5c6fcfdf16410b0630a0f8b59ec86ff8a748b05681e65cbece051db5be6b960b6ea4fc8bce83b4309f46896083164a
+    REF v2.1.2
+    SHA512 a7625fcc1ca0763df5b4cf5be741babbaefc09022940b4fc5ee1c05121751282c18ebd87ae58e1eee9bdb46dab5ae6fb4ed9a31fc2c53dc6de5cbd243fa4c8e9
     HEAD_REF master
 )
 
diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt
index 1b4fc86e5..4a2ce7628 100644
--- a/ports/imgui/CMakeLists.txt
+++ b/ports/imgui/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.8)
 project(imgui CXX)
 
 set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 set(IMGUI_INCLUDES_PUBLIC
     imgui.h
diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL
index 41c394eac..e0843acd7 100644
--- a/ports/imgui/CONTROL
+++ b/ports/imgui/CONTROL
@@ -1,3 +1,3 @@
 Source: imgui
-Version: 1.68
+Version: 1.70
 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 2c731a11c..3fa363886 100644
--- a/ports/imgui/portfile.cmake
+++ b/ports/imgui/portfile.cmake
@@ -1,18 +1,12 @@
 include(vcpkg_common_functions)
 
-if (TARGET_TRIPLET MATCHES "^x(86|64)-windows$" AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(WARNING "\
-The author of imgui strongly advises users of this lib against using a DLL. \
-For more details, please visit: \
-https://github.com/Microsoft/vcpkg/issues/5110"
-    )
-endif ()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ocornut/imgui
-    REF v1.68
-    SHA512 4a7996f188816eb1caa3130546fbfbe2069a8a338daf0540ae09e7c7d6a40082e25144e91c94f53d7ff6023925c92ce591e4d59614e08b1ca7b91097519bf4a4
+    REF v1.70
+    SHA512 b1a0fba339a9b19a49316494e58eabacd250e85e8ee17552c03ed99f50886072c882979039f18139e504c4406cf31aea3e9ce391d4641318f0022fa9b51bb9c4
     HEAD_REF master
 )
 
diff --git a/ports/inih/CONTROL b/ports/inih/CONTROL
index ac3051c82..22721b8ae 100644
--- a/ports/inih/CONTROL
+++ b/ports/inih/CONTROL
@@ -1,3 +1,3 @@
-Source: inih
-Version: 42
-Description: Simple .INI file parser
+Source: inih
+Version: 43
+Description: Simple .INI file parser
diff --git a/ports/inih/portfile.cmake b/ports/inih/portfile.cmake
index 1d705977f..75e538ae3 100644
--- a/ports/inih/portfile.cmake
+++ b/ports/inih/portfile.cmake
@@ -1,10 +1,12 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO benhoyt/inih
-    REF r42
-    SHA512 bb414bf03e2055f47149d69bd373923cc663f5e044cd021fd34ac646effc485db8cedb128123aaac7e2abc16c98bee98f34d89108a4bab9af50b8cd05eb7af8d
+    REF r43
+    SHA512 4ad87d69b033886d170257174f0dd97c475f86e311b875bbaf6835e5c4c5c0d98d788702b3880a0befb304f5440ee61de3ea1948f1432198949265013f4146e4
     HEAD_REF master
 )
 
@@ -13,8 +15,6 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL
index 7e36cb5d9..2376ce6de 100644
--- a/ports/io2d/CONTROL
+++ b/ports/io2d/CONTROL
@@ -1,4 +1,4 @@
 Source: io2d
-Version: 0.1-1
+Version: 0.1-2
 Description: a lightweight, cross platform drawing library
-Build-Depends: cairo, graphicsmagick
+Build-Depends: cairo (!osx), graphicsmagick (!osx)
diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake
index c1d536d57..0375a9689 100644
--- a/ports/io2d/portfile.cmake
+++ b/ports/io2d/portfile.cmake
@@ -24,6 +24,10 @@ if ("${SOURCE_PATH}" STREQUAL "")
 endif()
 
 # Configure the library, using CMake
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin)
+    set(IO2D_DEFAULT_OPTION "-DIO2D_DEFAULT=COREGRAPHICS_MAC")
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -31,6 +35,7 @@ vcpkg_configure_cmake(
         -DIO2D_WITHOUT_SAMPLES=1
         -DIO2D_WITHOUT_TESTS=1
         -DCMAKE_INSTALL_INCLUDEDIR:STRING=include
+        ${IO2D_DEFAULT_OPTION}
 )
 
 # Build + install the library, using CMake
@@ -42,14 +47,16 @@ 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)
+if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin)
+    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)
-")
+    include(\${CMAKE_CURRENT_LIST_DIR}/io2dTargets.cmake)
+    ")
+endif()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/io2d RENAME copyright)
 
diff --git a/ports/ismrmrd/CONTROL b/ports/ismrmrd/CONTROL
index 77d6e2e8d..3725293f7 100644
--- a/ports/ismrmrd/CONTROL
+++ b/ports/ismrmrd/CONTROL
@@ -1,8 +1,4 @@
 Source: ismrmrd
-Version: 1.3.2-3
+Version: 1.4
 Description: ISMRM Raw Data Format
-Build-Depends: pugixml
-
-Feature: dataset
-Description: Dataset and file support
-Build-Depends: hdf5
-\ No newline at end of file
+Build-Depends: pugixml, hdf5
diff --git a/ports/ismrmrd/optional_hdf5_dependency.patch b/ports/ismrmrd/optional_hdf5_dependency.patch
deleted file mode 100644
index 7c4772ed5..000000000
--- a/ports/ismrmrd/optional_hdf5_dependency.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 456d4f4..3c235f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,7 @@ set (ISMRMRD_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake CACHE PATH
- 
- # command line options
- option(USE_SYSTEM_PUGIXML "Use pugixml installed on the system" OFF)
-+option(USE_HDF5_DATASET_SUPPORT "Use HDF5 library for dataset support" OFF)
- 
- # and include it to the search list
- list(APPEND CMAKE_MODULE_PATH ${ISMRMRD_CMAKE_DIR})
-@@ -91,18 +92,23 @@ endif()
- set(ISMRMRD_VERSION_STRING ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR}.${ISMRMRD_VERSION_PATCH})
- set(ISMRMRD_SOVERSION ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR})
- 
--# Find HDF5 for dataset support
--find_package(HDF5 1.8 COMPONENTS C)
--
--if (HDF5_FOUND)
--    set (ISMRMRD_DATASET_SUPPORT true)
--    set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
--    set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
--    set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
--else (HDF5_FOUND)
-+if (USE_HDF5_DATASET_SUPPORT)
-+    # Find HDF5 for dataset support
-+    find_package(HDF5 1.8 COMPONENTS C)
-+
-+    if (HDF5_FOUND)
-+        set (ISMRMRD_DATASET_SUPPORT true)
-+        set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
-+        set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
-+        set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
-+    elseif (USE_HDF5_DATASET_SUPPORT)
-+        set (ISMRMRD_DATASET_SUPPORT false)
-+        # Dataset and file support was explicitly requested, force failure rather than succeed without support.
-+        message (FATAL_ERROR "HDF5 not found. Dataset and file support unavailable!")
-+    endif (HDF5_FOUND)
-+else (USE_HDF5_DATASET_SUPPORT)
-     set (ISMRMRD_DATASET_SUPPORT false)
--    message (WARNING "HDF5 not found. Dataset and file support unavailable!")
--endif (HDF5_FOUND)
-+endif (USE_HDF5_DATASET_SUPPORT)
- 
- # Generate the version.h header file
- find_package(Git)
-@@ -127,7 +133,7 @@ install(FILES ${CMAKE_BINARY_DIR}/include/ismrmrd/version.h DESTINATION include/
- 
- #  ---   Main Library  (begin) ----
- # in windows, install the HDF5 dependencies
--if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
-+if (USE_HDF5_DATASET_SUPPORT AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
-     if(DEFINED ENV{HDF5_ROOT})
-         set(HDF5_BIN_DIR $ENV{HDF5_ROOT}/bin)
-     else (DEFINED ENV{HDF5_ROOT})
-@@ -135,7 +141,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
-     endif (DEFINED ENV{HDF5_ROOT})
-     message("Install hdf5 libraries from ${HDF5_BIN_DIR} ")
-     install( DIRECTORY ${HDF5_BIN_DIR} DESTINATION bin/.. FILES_MATCHING PATTERN "*.dll" )
--endif (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
-+endif (USE_HDF5_DATASET_SUPPORT AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
- 
- # include directories for main library
- set(ISMRMRD_TARGET_INCLUDE_DIRS
-@@ -199,9 +205,9 @@ install(FILES cmake/FindIsmrmrd.cmake cmake/FindFFTW3.cmake DESTINATION share/is
- add_subdirectory(doc)
- 
- add_subdirectory(utilities)
--if (HDF5_FOUND)
-+if (USE_HDF5_DATASET_SUPPORT)
-     add_subdirectory(examples/c)
--endif (HDF5_FOUND)
-+endif (USE_HDF5_DATASET_SUPPORT)
- 
- # TODO: make this work on Windows
- if (NOT WIN32)
diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake
index 7bc30d028..2422752ea 100644
--- a/ports/ismrmrd/portfile.cmake
+++ b/ports/ismrmrd/portfile.cmake
@@ -1,32 +1,29 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "ismrmrd only supports dynamic library and crt linkage")
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
+
+if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+    set(WIN32_INCLUDE_STDDEF "x86-windows-include-stddef.patch")
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ismrmrd/ismrmrd
-    REF v1.3.2
-    SHA512 eb806f71c4b183105b3270d658a68195e009c0f7ca37f54f76d650a4d5c83c44d26b5f12a4c47c608aae9990cd04f1204b0c57e6438ca34a271fd54880133106
+    REF 0d05ad0cf0b09adb975566ff6a817a01d69f4325 
+    SHA512 7127658c3339ca3022a61093fb037aa02ac0cec4885e03657935dc41bc7266e74b437108cd0a9455c91bc74bdbb6e3a182752effca3564a36d3ddc29d3972496 
     HEAD_REF master
-	PATCHES
-		# Makes optional hdf5 dependency explicit
-		optional_hdf5_dependency.patch
+    PATCHES
+        ${WIN32_INCLUDE_STDDEF}
 )
 
-if ("dataset" IN_LIST FEATURES)
-    set(ENABLE_DATASET ON)
-else()
-    set(ENABLE_DATASET OFF)
-endif()
+
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS 
 		-DUSE_SYSTEM_PUGIXML=ON
-		-DUSE_HDF5_DATASET_SUPPORT=${ENABLE_DATASET}
+		-DUSE_HDF5_DATASET_SUPPORT=ON
 )
 
 vcpkg_install_cmake()
@@ -34,9 +31,6 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/ismrmrd/cmake)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-
 if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll)
     file(COPY ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll)
@@ -47,11 +41,37 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll)
 endif()
 
-file(COPY ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_info.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ismrmrd)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/FindFFTW3.cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/FindFFTW3.cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/ismrmrd/FindFFTW3.cmake)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/ismrmrd/cmake)
+
+set(ISMRMRD_CMAKE_DIRS ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+foreach(ISMRMRD_CMAKE_DIR IN LISTS ISMRMRD_CMAKE_DIRS)
+if (EXISTS ${ISMRMRD_CMAKE_DIR})
+    file(GLOB ISMRMRD_CMAKE_FILES "${ISMRMRD_CMAKE_DIR}/ISMRMRD/ISMRMRD*.cmake")
+    foreach(ICF ${ISMRMRD_CMAKE_FILES})
+        file(COPY ${ICF} DESTINATION ${CURRENT_PACKAGES_DIR}/share/ismrmrd/cmake/)
+    endforeach()
+endif()
+endforeach()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${ISMRMRD_CMAKE_DIRS})
+
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_info.exe)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_info.exe)
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_c_example.exe)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_c_example.exe)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_read_timing_test.exe)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_read_timing_test.exe)
+
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ismrmrd)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/ismrmrd/LICENSE ${CURRENT_PACKAGES_DIR}/share/ismrmrd/copyright)
 
diff --git a/ports/ismrmrd/x86-windows-include-stddef.patch b/ports/ismrmrd/x86-windows-include-stddef.patch
new file mode 100644
index 000000000..3855f86d5
--- /dev/null
+++ b/ports/ismrmrd/x86-windows-include-stddef.patch
@@ -0,0 +1,14 @@
+diff --git a/include/ismrmrd/ismrmrd.h b/include/ismrmrd/ismrmrd.h
+index 40614eb..e5e3e25 100644
+--- a/include/ismrmrd/ismrmrd.h
++++ b/include/ismrmrd/ismrmrd.h
+@@ -30,6 +30,9 @@ typedef unsigned __int32 uint32_t;
+ typedef __int64 int64_t;
+ typedef unsigned __int64 uint64_t;
+ #endif
++#if _WIN32
++#include <stddef.h>     /* for size_t */
++#endif
+ #else /* non MS C or C++ compiler */
+ #include <stdint.h>
+ #include <stddef.h>     /* for size_t */
diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL
index 79df1234e..3feedf496 100644
--- a/ports/itk/CONTROL
+++ b/ports/itk/CONTROL
@@ -1,8 +1,8 @@
-Source: itk
-Version: 4.13.0-906736bd
-Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.
-Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp]
-
-Feature: vtk
-Description: Build ITKVtkGlue module.
-Build-Depends: vtk
+Source: itk
+Version: 4.13.0-906736bd-3
+Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.
+Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp], openjpeg
+
+Feature: vtk
+Description: Build ITKVtkGlue module.
+Build-Depends: vtk
diff --git a/ports/itk/fix_conflict_with_openjp2_pc.patch b/ports/itk/fix_conflict_with_openjp2_pc.patch
new file mode 100644
index 000000000..fc2ad1132
--- /dev/null
+++ b/ports/itk/fix_conflict_with_openjp2_pc.patch
@@ -0,0 +1,33 @@
+diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+index 6e3504d..1d641c2 100644
+--- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
++++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+@@ -375,7 +375,8 @@ else()
+ endif()
+ 
+ if(GDCM_USE_SYSTEM_OPENJPEG)
+-  find_package(OpenJPEG 2.0.0 REQUIRED)
++  # openjpeg version in vcpkg is already greater than 2.0.0 and openjpeg has no version.cmake file
++  find_package(OpenJPEG REQUIRED)
+   set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
+ else()
+   set(GDCM_OPENJPEG_LIBRARIES itkgdcmopenjp2)
+diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
+index 4ffe98e..a269690 100644
+--- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
++++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
+@@ -347,12 +347,8 @@ endif()
+ 
+ #-----------------------------------------------------------------------------
+ # pkgconfig support
+-# enabled by default on Unix, disabled by default on other platforms
+-if(UNIX)
+-  option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" ON)
+-else()
+-  option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
+-endif()
++# Cannot use the built-in openjp2 because the configuration path is under buildtrees
++option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
+ if(BUILD_PKGCONFIG_FILES)
+   # install in lib and not share (see multi-arch note above)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
diff --git a/ports/itk/hdf5_config_mode_find_package.patch b/ports/itk/hdf5_config_mode_find_package.patch
deleted file mode 100644
index f106d7151..000000000
--- a/ports/itk/hdf5_config_mode_find_package.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/Modules/ThirdParty/HDF5/CMakeLists.txt b/Modules/ThirdParty/HDF5/CMakeLists.txt
-index 6caa63b..f118c73 100644
---- a/Modules/ThirdParty/HDF5/CMakeLists.txt
-+++ b/Modules/ThirdParty/HDF5/CMakeLists.txt
-@@ -1,7 +1,7 @@
- project(ITKHDF5)
- set(ITKHDF5_THIRD_PARTY 1)
- 
--if (BUILD_SHARED_LIBS)
-+if (ITK_BUILD_SHARED_LIBS)
-    add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB=1)
- endif()
- if(ITK_USE_SYSTEM_HDF5)
-@@ -20,11 +20,10 @@ endif()
- ")
-   endif()
- 
--  set(ITKHDF5_LIBRARIES )
--  if(BUILD_SHARED_LIBS)
--    list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_SHARED_LIBRARY} ${HDF5_CXX_SHARED_LIBRARY})
-+  if(ITK_BUILD_SHARED_LIBS)
-+    set(ITKHDF5_LIBRARIES hdf5::hdf5-shared hdf5::hdf5_cpp-shared)
-   else()
--    list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_STATIC_LIBRARY} ${HDF5_CXX_STATIC_LIBRARY})
-+    set(ITKHDF5_LIBRARIES hdf5::hdf5-static hdf5::hdf5_cpp-static)
-   endif()
- 
-   set(ITKHDF5_INCLUDE_DIRS
-@@ -33,11 +32,6 @@ endif()
-   set(ITKHDF5_SYSTEM_INCLUDE_DIRS
-     ${HDF5_INCLUDE_DIR}
-     ${HDF5_INCLUDE_DIR_CPP}
--    ${HDF5_INCLUDE_DIRS}
--    ${HDF5_INCLUDE_DIR_CPP}
--    )
--  list(APPEND ITKHDF5_LIBRARIES
--    ${HDF5_LIBRARIES}
-     )
-   set(ITKHDF5_NO_SRC 1)
- else()
-@@ -45,7 +39,7 @@ else()
-     ${ITKHDF5_SOURCE_DIR}/src
-     ${ITKHDF5_BINARY_DIR}/src
-     )
--  if(BUILD_SHARED_LIBS)
-+  if(ITK_BUILD_SHARED_LIBS)
-     set(ITKHDF5_LIBRARIES hdf5_cpp-shared hdf5-shared)
-   else()
-     set(ITKHDF5_LIBRARIES hdf5_cpp-static hdf5-static)
-diff --git a/Modules/ThirdParty/HDF5/itk-module-init.cmake b/Modules/ThirdParty/HDF5/itk-module-init.cmake
-index a9207a8..e36c2d9 100644
---- a/Modules/ThirdParty/HDF5/itk-module-init.cmake
-+++ b/Modules/ThirdParty/HDF5/itk-module-init.cmake
-@@ -2,12 +2,8 @@ option(ITK_USE_SYSTEM_HDF5 "Use an outside build of HDF5." ${ITK_USE_SYSTEM_LIBR
- mark_as_advanced(ITK_USE_SYSTEM_HDF5)
- if(ITK_USE_SYSTEM_HDF5)
-   if(BUILD_SHARED_LIBS)
--    find_package(HDF5 QUIET NO_MODULE COMPONENTS CXX C shared)
-+    find_package(HDF5 REQUIRED NO_MODULE COMPONENTS CXX C shared)
-   else()
--    find_package(HDF5 QUIET NO_MODULE COMPONENTS CXX C static)
--  endif()
--
--  if(NOT HDF5_FOUND)
--    find_package(HDF5 REQUIRED COMPONENTS CXX C)
-+    find_package(HDF5 REQUIRED NO_MODULE COMPONENTS CXX C static)
-   endif()
- endif()
diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake
index 77a62ac2a..e4f415a1a 100644
--- a/ports/itk/portfile.cmake
+++ b/ports/itk/portfile.cmake
@@ -1,11 +1,19 @@
 include(vcpkg_common_functions)
 
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 50 AND CMAKE_HOST_WIN32)
+    message(WARNING "ITKs buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO InsightSoftwareConsortium/ITK
     REF 906736bd453e95ccf03b318d3d07cb7884285161
     SHA512 8ac62262d46e7acbb0e5b2e964292ec17e1687bb162b8cec666e5b67acbe3449f093a0b1c03737e9951cb88248ed890805ffd57df6eae21220488620da833c57
     HEAD_REF master
+    PATCHES fix_conflict_with_openjp2_pc.patch
 )
 
 if ("vtk" IN_LIST FEATURES)
@@ -14,14 +22,6 @@ else()
     set(ITKVtkGlue OFF)
 endif()
 
-# directory path length needs to be shorter than 50 characters
-set(ITK_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/ITK)
-if(EXISTS ${ITK_BUILD_DIR})
-  file(REMOVE_RECURSE ${ITK_BUILD_DIR})
-endif()
-file(RENAME ${SOURCE_PATH} ${ITK_BUILD_DIR})
-set(SOURCE_PATH "${ITK_BUILD_DIR}")
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -50,7 +50,7 @@ vcpkg_configure_cmake(
 
         -DITK_SKIP_PATH_LENGTH_CHECKS=ON
 
-        # I havn't tried Python wrapping in vcpkg
+        # I haven't tried Python wrapping in vcpkg
         #-DITK_WRAP_PYTHON=ON
         #-DITK_PYTHON_VERSION=3
 
@@ -60,6 +60,7 @@ vcpkg_configure_cmake(
         -DModule_IOSTL=ON # example how to turn on a non-default module
         -DModule_MorphologicalContourInterpolation=ON # example how to turn on a remote module
         -DModule_RLEImage=ON # example how to turn on a remote module
+        -DGDCM_USE_SYSTEM_OPENJPEG=ON #Use port openjpeg instead of own third-party
         ${ADDITIONAL_OPTIONS}
 )
 
diff --git a/ports/jack2/CONTROL b/ports/jack2/CONTROL
index b99701797..e011b2711 100644
--- a/ports/jack2/CONTROL
+++ b/ports/jack2/CONTROL
@@ -1,4 +1,4 @@
-Source: jack2
-Version: 1.9.12
-Description: Cross-platform API that enables device sharing and inter-application audio routing
-
+Source: jack2
+Version: 1.9.12-1
+Description: Cross-platform API that enables device sharing and inter-application audio routing
+
diff --git a/ports/jack2/portfile.cmake b/ports/jack2/portfile.cmake
index a82f1be62..f7109aafd 100644
--- a/ports/jack2/portfile.cmake
+++ b/ports/jack2/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/jasper/CONTROL b/ports/jasper/CONTROL
index ede42e377..6b8ee20c9 100644
--- a/ports/jasper/CONTROL
+++ b/ports/jasper/CONTROL
@@ -1,4 +1,4 @@
 Source: jasper
-Version: 2.0.14-1
+Version: 2.0.16-1
 Description: Open source implementation of the JPEG-2000 Part-1 standard
 Build-Depends: libjpeg-turbo
diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake
index 6e753ed74..6d11d166b 100644
--- a/ports/jasper/portfile.cmake
+++ b/ports/jasper/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mdadams/jasper
-    REF version-2.0.14
-    SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
+    REF version-2.0.16
+    SHA512 b3bca227f833567c9061c4a29c0599784ed6a131b5cceddfd1696542d19add821eda445ce6d83782b454b266723b24d0f028cbc644a25c0e3a75304e615b34ee
     HEAD_REF master)
 
 vcpkg_apply_patches(
@@ -30,6 +30,8 @@ vcpkg_configure_cmake(
         -DJAS_ENABLE_DOC=OFF
         -DJAS_ENABLE_PROGRAMS=OFF
         -DJAS_ENABLE_SHARED=${JAS_ENABLE_SHARED}
+    OPTIONS_DEBUG
+        -DCMAKE_DEBUG_POSTFIX=d # Due to CMakes FindJasper
 )
 
 vcpkg_install_cmake()
diff --git a/ports/jbig2dec/CONTROL b/ports/jbig2dec/CONTROL
index 0ff000f44..4b6a2e2f0 100644
--- a/ports/jbig2dec/CONTROL
+++ b/ports/jbig2dec/CONTROL
@@ -1,4 +1,4 @@
 Source: jbig2dec
-Version: 0.13
+Version: 0.16
 Description: a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later.
 
diff --git a/ports/jbig2dec/portfile.cmake b/ports/jbig2dec/portfile.cmake
index 90e56bd9b..c54bf69f1 100644
--- a/ports/jbig2dec/portfile.cmake
+++ b/ports/jbig2dec/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ArtifexSoftware/jbig2dec
-    REF 0.13
-    SHA512 11d1209810d6c80a095ec59d6af44010d4664f4ba744c0c14bdad9564359cf31dd0095b072fa63de381f2de57116e523883aa8843cc8d9baa2c3a8b9b1fc3527
+    REF 0.16
+    SHA512 a8aa1b1f14466104eed412c38604b2450d1acc1c73faaaf81d5211ac7f4d636bf8d177285f6550f1f5211b31d14f1c14d83571e3e899700ebfc9af00912ed874
     HEAD_REF master
 )
 
diff --git a/ports/jbigkit/CMakeLists.txt b/ports/jbigkit/CMakeLists.txt
index 79bb11a2b..2b82410b6 100644
--- a/ports/jbigkit/CMakeLists.txt
+++ b/ports/jbigkit/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.4)
 project(libjbig C)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
 set(SOURCES
     "libjbig/jbig.c"
     "libjbig/jbig_ar.c"
diff --git a/ports/jbigkit/CONTROL b/ports/jbigkit/CONTROL
index f0a7cc426..f21907db4 100644
--- a/ports/jbigkit/CONTROL
+++ b/ports/jbigkit/CONTROL
@@ -1,3 +1,3 @@
-Source: jbigkit
-Version: 2.1-1
-Description: A software implementation of the JBIG1 data compression standard (ITU-T T.82)
+Source: jbigkit
+Version: 2.1-3
+Description: A software implementation of the JBIG1 data compression standard (ITU-T T.82)
diff --git a/ports/jbigkit/portfile.cmake b/ports/jbigkit/portfile.cmake
index 5781de29b..9e63a426f 100644
--- a/ports/jbigkit/portfile.cmake
+++ b/ports/jbigkit/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(JBIGKIT_VERSION 2.1)
 set(JBIGKIT_HASH c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf)
 
@@ -17,11 +19,10 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA)
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jbigkit)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/jbigkit/COPYING ${CURRENT_PACKAGES_DIR}/share/jbigkit/copyright)
-\ No newline at end of file
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/jbigkit/COPYING ${CURRENT_PACKAGES_DIR}/share/jbigkit/copyright)
diff --git a/ports/jemalloc/CONTROL b/ports/jemalloc/CONTROL
index 7f6fa5ae2..19d4fbcc0 100644
--- a/ports/jemalloc/CONTROL
+++ b/ports/jemalloc/CONTROL
@@ -1,4 +1,4 @@
-Source: jemalloc
-Version: 4.3.1-3
-Description: jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support
-Build-Depends:
+Source: jemalloc
+Version: 4.3.1-4
+Description: jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support
+Build-Depends:
diff --git a/ports/jemalloc/portfile.cmake b/ports/jemalloc/portfile.cmake
index 3b99f21f5..49e89b8d0 100644
--- a/ports/jemalloc/portfile.cmake
+++ b/ports/jemalloc/portfile.cmake
@@ -1,10 +1,7 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jemalloc/jemalloc-cmake
diff --git a/ports/jsmn/CONTROL b/ports/jsmn/CONTROL
new file mode 100644
index 000000000..b19e26585
--- /dev/null
+++ b/ports/jsmn/CONTROL
@@ -0,0 +1,3 @@
+Source: jsmn
+Version: 2019-04-27
+Description: A minimalistic JSON parser in C.
diff --git a/ports/jsmn/portfile.cmake b/ports/jsmn/portfile.cmake
new file mode 100644
index 000000000..0b7599ccb
--- /dev/null
+++ b/ports/jsmn/portfile.cmake
@@ -0,0 +1,16 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO zserge/jsmn
+    REF fdcef3ebf886fa210d14956d3c068a653e76a24e
+    SHA512 ec3a6b106b868238aa626e5b4477ace4414f385a35c695a583598975202b73a2a446143eb5f0ea73b0a84113c610ea36e64341fccecd1d1ddd9080e06f599575
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/jsmn.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/json11/CONTROL b/ports/json11/CONTROL
index 3145a079a..d624f9e7b 100644
--- a/ports/json11/CONTROL
+++ b/ports/json11/CONTROL
@@ -1,3 +1,3 @@
-Source: json11
-Version: 2017-06-20
-Description: json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.
+Source: json11
+Version: 2017-06-20-1
+Description: json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.
diff --git a/ports/json11/portfile.cmake b/ports/json11/portfile.cmake
index 533c0457c..f6592693a 100644
--- a/ports/json11/portfile.cmake
+++ b/ports/json11/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dropbox/json11
@@ -7,11 +10,6 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/jsoncons/CONTROL b/ports/jsoncons/CONTROL
index 91896b6e2..8b01549ef 100644
--- a/ports/jsoncons/CONTROL
+++ b/ports/jsoncons/CONTROL
@@ -1,3 +1,3 @@
 Source: jsoncons
-Version: v0.122.0
+Version: 0.125.0
 Description: A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSONPath, CSV, MessagePack, CBOR, BSON, UBJSON
diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake
index c2218ba63..fb00be0ad 100644
--- a/ports/jsoncons/portfile.cmake
+++ b/ports/jsoncons/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO danielaparker/jsoncons
-    REF v0.122.0
-    SHA512 3fd52e45cc876e3cb3d773a2c7f022224dc1f288db89755d14a93a4e62977f767c6ccfb4aa22b2bc91664223bd15cd5c1bf408e8e298ad81f7b3ef811d8b3121
+    REF v0.125.0
+    SHA512 60969fa9bb47c8ee2e01c9333322940c7e9063e4c7761fa54f9d2bba8e49815145e2b48f2bc528a5b3b5316aded2930cdf410a29ce608df09a561a4650d20e15
     HEAD_REF master
 )
 
diff --git a/ports/jsoncpp/CONTROL b/ports/jsoncpp/CONTROL
index 8fdfe14da..4c7084d8e 100644
--- a/ports/jsoncpp/CONTROL
+++ b/ports/jsoncpp/CONTROL
@@ -1,3 +1,3 @@
-Source: jsoncpp
-Version: 1.8.4
-Description: jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.
+Source: jsoncpp
+Version: 1.8.4-1
+Description: jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.
diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake
index f1badbd1e..f04620fd5 100644
--- a/ports/jsoncpp/portfile.cmake
+++ b/ports/jsoncpp/portfile.cmake
@@ -21,7 +21,6 @@ vcpkg_configure_cmake(
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON
             -DBUILD_STATIC_LIBS:BOOL=${JSONCPP_STATIC}
-            -DBUILD_SHARED_LIBS:BOOL=${JSONCPP_DYNAMIC}
             -DJSONCPP_WITH_PKGCONFIG_SUPPORT:BOOL=OFF
             -DJSONCPP_WITH_TESTS:BOOL=OFF
 )
diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch
new file mode 100644
index 000000000..3a666ee4b
--- /dev/null
+++ b/ports/jsonnet/001-enable-msvc.patch
@@ -0,0 +1,78 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8682cc8..88b95c1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,8 @@ set(GLOBAL_OUTPUT_PATH_SUFFIX "" CACHE STRING
+ 
+ project(jsonnet C CXX)
+ 
++add_definitions(-D_CRT_SECURE_NO_WARNINGS)
++
+ # Discourage in-source builds because they overwrite the hand-written Makefile.
+ # Use `cmake . -B<dir>` or the CMake GUI to do an out-of-source build.
+ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} AND
+@@ -73,17 +75,6 @@ elseif (BUILD_TESTS AND USE_SYSTEM_GTEST)
+ 	add_subdirectory(/usr/src/googletest ${GLOBAL_OUTPUT_PATH}/googletest-build)
+ endif()
+ 
+-# Compiler flags.
+-if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR
+-        ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+-    set(OPT "-O3")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Wextra -pedantic -std=c99 -O3 ${OPT}")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC ${OPT}")
+-else()
+-    # TODO: Windows support.
+-    message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported")
+-endif()
+-
+ # Look for libraries in global output path.
+ link_directories(${GLOBAL_OUTPUT_PATH})
+ 
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index f1c32b8..1a45a51 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE
+     string_utils.cpp
+     vm.cpp)
+ 
+-add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
++add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
+ add_dependencies(libjsonnet md5 stdlib)
+ target_link_libraries(libjsonnet md5)
+ 
+@@ -36,13 +36,12 @@ target_link_libraries(libjsonnet md5)
+ # this step the output would be |liblibjsonnet|.
+ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet
+ 	VERSION 0.12.1 SOVERSION 0)
+-install(TARGETS libjsonnet DESTINATION lib)
++install(TARGETS libjsonnet DESTINATION lib RUNTIME DESTINATION bin)
+ 
+ # Static library for jsonnet command-line tool.
+ add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE})
+ add_dependencies(libjsonnet_static md5 stdlib)
+ target_link_libraries(libjsonnet_static md5)
+-set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet)
+ 
+ # Tests
+ 
+diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
+index a481d9f..9fe768e 100644
+--- a/stdlib/CMakeLists.txt
++++ b/stdlib/CMakeLists.txt
+@@ -2,14 +2,6 @@
+ 
+ add_executable(to_c_array to_c_array.cpp)
+ 
+-# Custom command that will only build stdlib when it changes.
+-add_custom_command(
+-	OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h
+-	COMMAND ${GLOBAL_OUTPUT_PATH}/to_c_array
+-			    ${PROJECT_SOURCE_DIR}/stdlib/std.jsonnet
+-					${PROJECT_SOURCE_DIR}/core/std.jsonnet.h
+-	DEPENDS to_c_array std.jsonnet)
+-
+ # Standard library build target that libjsonnet can depend on.
+ add_custom_target(stdlib ALL
+ 	DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h)
diff --git a/ports/jsonnet/CMakeLists.txt b/ports/jsonnet/CMakeLists.txt
deleted file mode 100644
index 4f749e5b8..000000000
--- a/ports/jsonnet/CMakeLists.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(jsonnet)
-
-if(MSVC)
-  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
-endif()
-
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
-set( jsonnet_sources
-  core/desugarer.cpp
-  core/formatter.cpp
-  core/lexer.cpp
-  core/libjsonnet.cpp
-  core/parser.cpp
-  core/pass.cpp
-  core/static_analysis.cpp
-  core/string_utils.cpp
-  core/vm.cpp
-)
-
-include_directories(third_party/md5 include cpp core stdlib)
-
-add_library(md5 STATIC third_party/md5/md5.cpp)
-
-add_library(libjsonnet ${jsonnet_sources})
-target_link_libraries(libjsonnet md5)
-
-add_library(libjsonnet++ cpp/libjsonnet++.cpp)
-target_link_libraries(libjsonnet++ libjsonnet)
-
-add_executable(jsonnet cmd/jsonnet.cpp)
-target_link_libraries(jsonnet libjsonnet)
-
-
-install(
-  TARGETS libjsonnet libjsonnet++
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
-if(NOT DISABLE_INSTALL_TOOLS)
-  install (
-    TARGETS jsonnet
-    RUNTIME DESTINATION tools/jsonnet
-  )
-endif()
-
-if(NOT DISABLE_INSTALL_HEADERS)
-  install(FILES include/libjsonnet++.h include/libjsonnet.h DESTINATION include)
-endif()
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index 49618f59e..c478c789c 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,3 +1,3 @@
 Source: jsonnet
-Version: 2018-11-01-2
+Version: 2019-05-08
 Description: Jsonnet - The data templating language
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index ee3c43890..d1f9ca153 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -1,11 +1,17 @@
 include(vcpkg_common_functions)
 
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+  vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
 vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/jsonnet
-    REF a0876b301daf8f45e16ac5f7bb814d0617772bb0
-    SHA512 a57380ecc578b11f3a763202abb7ab703f2cc3c098ca7602d0bd199594a9e8d1cebc6d51332658edb08bf088e565d6afae0cb2faaf127fa33542a406de1ac055
-    HEAD_REF master
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO google/jsonnet
+  REF c323f5ce5b8aa663585d23dc0fb94d4b166c6f16
+  SHA512 d9f84c39929e9e80272e2b834f68a13b48c1cb4d64b70f5b6fa16e677555d947f7cf57372453e23066a330faa6a429b9aa750271b46f763581977a223d238785
+  HEAD_REF master
+  PATCHES
+	001-enable-msvc.patch
 )
 
 if (WIN32)
@@ -22,11 +28,10 @@ else()
   )
 endif()
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
-  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
+  PREFER_NINJA
+  OPTIONS -DBUILD_JSONNET=OFF -DBUILD_TESTS=OFF
 )
 
 vcpkg_install_cmake()
@@ -34,3 +39,4 @@ vcpkg_copy_pdbs()
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/jsonnet)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jsonnet RENAME copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/jwt-cpp/CONTROL b/ports/jwt-cpp/CONTROL
new file mode 100644
index 000000000..4f44063fe
--- /dev/null
+++ b/ports/jwt-cpp/CONTROL
@@ -0,0 +1,3 @@
+Source: jwt-cpp
+Version: 2019-05-07
+Description: A header only library for creating and validating json web tokens in c++
+\ No newline at end of file
diff --git a/ports/jwt-cpp/fix-picojson.patch b/ports/jwt-cpp/fix-picojson.patch
new file mode 100644
index 000000000..44c04fe58
--- /dev/null
+++ b/ports/jwt-cpp/fix-picojson.patch
@@ -0,0 +1,12 @@
+diff --git a/include/jwt-cpp/jwt.h b/include/jwt-cpp/jwt.h
+index ec56810..a26fd97 100644
+--- a/include/jwt-cpp/jwt.h
++++ b/include/jwt-cpp/jwt.h
+@@ -1,6 +1,6 @@
+ #pragma once
+ #define PICOJSON_USE_INT64
+-#include "picojson.h"
++#include "picojson/picojson.h"
+ #include "base.h"
+ #include <set>
+ #include <chrono>
diff --git a/ports/jwt-cpp/fix-warning.patch b/ports/jwt-cpp/fix-warning.patch
new file mode 100644
index 000000000..d013a7782
--- /dev/null
+++ b/ports/jwt-cpp/fix-warning.patch
@@ -0,0 +1,31 @@
+diff --git a/include/jwt-cpp/base.h b/include/jwt-cpp/base.h
+index dfca7fc..4d05c0b 100644
+--- a/include/jwt-cpp/base.h
++++ b/include/jwt-cpp/base.h
+@@ -2,6 +2,10 @@
+ #include <string>
+ #include <array>
+ 
++#ifdef _MSC_VER
++#pragma warning(disable : 4267)
++#endif
++
+ namespace jwt {
+ 	namespace alphabet {
+ 		struct base64 {
+diff --git a/include/jwt-cpp/jwt.h b/include/jwt-cpp/jwt.h
+index ec56810..313cef2 100644
+--- a/include/jwt-cpp/jwt.h
++++ b/include/jwt-cpp/jwt.h
+@@ -12,6 +12,11 @@
+ #include <openssl/ec.h>
+ #include <openssl/err.h>
+ 
++#ifdef _MSC_VER
++#pragma warning(disable : 4267)
++#pragma warning(disable : 4067)
++#endif
++
+ //If openssl version less than 1.1
+ #if OPENSSL_VERSION_NUMBER < 269484032
+ #define OPENSSL10
diff --git a/ports/jwt-cpp/portfile.cmake b/ports/jwt-cpp/portfile.cmake
new file mode 100644
index 000000000..89ff9b04c
--- /dev/null
+++ b/ports/jwt-cpp/portfile.cmake
@@ -0,0 +1,23 @@
+#header-only library
+include(vcpkg_common_functions)
+
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/jwt-cpp)
+
+vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
+    REPO Thalhammer/jwt-cpp
+    REF 1d2b1bac13e54f99df4f890cd674ec149c135762
+    SHA512 a45f12104e38a8b05a0ea5b5f91034b65d85dd048664bbda4f2909df32688726d599161e3d6541fd6f36c784d21c24a4d2666f670c3281b9e9130bc8a96fce39
+    HEAD_REF master
+    PATCHES fix-picojson.patch
+            fix-warning.patch)
+
+# Copy the header files
+file(GLOB HEADER_FILES ${SOURCE_PATH}/include/jwt-cpp/*)
+file(COPY ${HEADER_FILES}
+     DESTINATION ${CURRENT_PACKAGES_DIR}/include/jwt-cpp
+     REGEX "\.(gitattributes|gitignore|picojson.h)$" EXCLUDE)
+
+# Put the licence file where vcpkg expects it
+file(COPY ${SOURCE_PATH}/LICENSE
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/jwt-cpp)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/jwt-cpp/LICENSE ${CURRENT_PACKAGES_DIR}/share/jwt-cpp/copyright)
+\ No newline at end of file
diff --git a/ports/jxrlib/CMakeLists.txt b/ports/jxrlib/CMakeLists.txt
index 17f16bea4..727b96906 100644
--- a/ports/jxrlib/CMakeLists.txt
+++ b/ports/jxrlib/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Copyright Mathieu Malaterre <malat@debian.org>
 # BSD (Same as jxrlib)
-# Based on https://jxrlib.codeplex.com/discussions/440294 
+# Based on https://jxrlib.codeplex.com/discussions/440294
 # and modified for vcpkg packaging
 cmake_minimum_required(VERSION 2.8)
 project(jxrlib C)
@@ -18,6 +18,10 @@ macro(JXR_MAKE_OBJ SET_NAME)
   endforeach()
 endmacro()
 
+if(NOT MSVC)
+  add_definitions(-D__ANSI__)
+endif()
+
 include(TestBigEndian)
 test_big_endian(ISBIGENDIAN)
 if(ISBIGENDIAN)
@@ -99,4 +103,4 @@ install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h
 )
 install(DIRECTORY common/include/ DESTINATION ${JXRLIB_INSTALL_INCLUDE_DIR}
   FILES_MATCHING PATTERN "*.h"
-)
-\ No newline at end of file
+)
diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL
index 2d3fa4ac4..2f8ba2aaf 100644
--- a/ports/jxrlib/CONTROL
+++ b/ports/jxrlib/CONTROL
@@ -1,3 +1,3 @@
-Source: jxrlib
-Version: 1.1-5
-Description: Open source implementation of the jpegxr image format standard.
+Source: jxrlib
+Version: 1.1-6
+Description: Open source implementation of the jpegxr image format standard.
diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake
index 9b7cca5fb..49869b43f 100644
--- a/ports/jxrlib/portfile.cmake
+++ b/ports/jxrlib/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
 
 vcpkg_from_github(
@@ -11,13 +14,14 @@ vcpkg_from_github(
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-# The file guiddef.h is part of the Windows SDK,
-# we then remove the local copy shipped with jxrlib
-file(REMOVE ${SOURCE_PATH}/common/include/guiddef.h)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux)
+  # The file guiddef.h is part of the Windows SDK,
+  # we then remove the local copy shipped with jxrlib
+  file(REMOVE ${SOURCE_PATH}/common/include/guiddef.h)
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS:BOOL=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/kangaru/CONTROL b/ports/kangaru/CONTROL
index 42f8277fd..278546bad 100644
--- a/ports/kangaru/CONTROL
+++ b/ports/kangaru/CONTROL
@@ -1,3 +1,3 @@
 Source: kangaru
-Version: 4.1.2
+Version: 4.1.3
 Description: A dependency injection container for C++11, C++14 and later
diff --git a/ports/kangaru/portfile.cmake b/ports/kangaru/portfile.cmake
index 6de69896b..ffcb68bfb 100644
--- a/ports/kangaru/portfile.cmake
+++ b/ports/kangaru/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gracicot/kangaru
-    REF v4.1.2
-    SHA512 44ca94da38c80aa8495bb58cc26db0591d5e1b32b52c3ff242d95598856c5e84f25d7e7184c1e15e44d9a89987856740548fb070ad393cbe51da4bb79aa216d2
+    REF v4.1.3
+    SHA512 7cfec493dff475c8fe88e336638897096359d3781ab8944aa6bb8f5b68a4dbc993f769142d0143ae5db751159cee1b125ea2728e8b73747950572c84ea354090
     HEAD_REF master
 )
 
diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL
index c3e0e5dee..942167471 100644
--- a/ports/kf5archive/CONTROL
+++ b/ports/kf5archive/CONTROL
@@ -1,4 +1,4 @@
 Source: kf5archive
-Version: 5.50.0
+Version: 5.58.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
index 6f587a096..4e028695f 100644
--- a/ports/kf5archive/portfile.cmake
+++ b/ports/kf5archive/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/karchive
-    REF v5.50.0
-    SHA512 519dd69ef76c9655cdf9d8f16484244469a6d5d2185c1d588bad325a401dd11f35699e3c115dfd52e5db38aa26aea3d9b35c7e83b76a36bda926574a7d3ce50f
+    REF v5.58.0
+    SHA512 8ac1ff25db7e27881cbea640744639a087a8fc87251337bca5c557b3ef3ec2b3490d3d1f2caf8fc22e0671dad1945e9263a59d22e4d1c395bd3b422cbb7ad1de
     HEAD_REF master
 )
 
diff --git a/ports/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL
index cd1e09ccf..7110145aa 100644
--- a/ports/kf5holidays/CONTROL
+++ b/ports/kf5holidays/CONTROL
@@ -1,4 +1,4 @@
 Source: kf5holidays
-Version: 5.50.0
+Version: 5.58.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
index b56abec1a..64209c5cb 100644
--- a/ports/kf5holidays/portfile.cmake
+++ b/ports/kf5holidays/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kholidays
-    REF v5.50.0
-    SHA512 01c1258213e1bbab90b9af9c41965599637b1ccd4cd285cbe9bc11579fae1363162567ae14c33001b8b1cc085bae4dfdf4ed79b7ff27f93187bce79db662b4e2
+    REF v5.58.0
+    SHA512 1451603816617eef7e37c67085d12f34ce2e4b10db97220222450c9a7c5dc3200479718b86ea39b279bab93651790a8c70941ac1280458de7864ca04f9cf6471
     HEAD_REF master
 )
 
diff --git a/ports/kf5plotting/CONTROL b/ports/kf5plotting/CONTROL
index 70439a5dc..ac2b98d6f 100644
--- a/ports/kf5plotting/CONTROL
+++ b/ports/kf5plotting/CONTROL
@@ -1,4 +1,4 @@
 Source: kf5plotting
-Version: 5.50.0
+Version: 5.58.0
 Description: Lightweight plotting framework
 Build-Depends: ecm, qt5-base
diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake
index 36f862d13..a5a4e1d46 100644
--- a/ports/kf5plotting/portfile.cmake
+++ b/ports/kf5plotting/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kplotting
-    REF v5.50.0
-    SHA512 512a0f8e8a5147f06345d86fa29effa8d0a59b62f5a24b70a09c4ddf5204d626e13f421be7c42d2103c5634e863db5ac8e6763db886351597f0798e05bc97f33
+    REF v5.58.0
+    SHA512 4d2fd69bad6c3117084811453bd32fdd92d1f1df89dba489e6109caad9268107d908e0df6f3e35a460878aa32fe4744173cf96ff292858d657c49582ee1674fc
     HEAD_REF master
 )
 
diff --git a/ports/laszip/CONTROL b/ports/laszip/CONTROL
index 5f6bac68b..c528a4879 100644
--- a/ports/laszip/CONTROL
+++ b/ports/laszip/CONTROL
@@ -1,3 +1,3 @@
 Source: laszip
-Version: 3.2.2-1
+Version: 3.4.1
 Description: LASzip - free and lossless LiDAR compression
diff --git a/ports/laszip/portfile.cmake b/ports/laszip/portfile.cmake
index 92edbafb7..b72f7a0a2 100644
--- a/ports/laszip/portfile.cmake
+++ b/ports/laszip/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LASzip/LASzip
-    REF 3.2.2
-    SHA512 c4dac1fd525b1889fa8cc77f168bc3c83053619402ec13ac0ae58665cfd4440b9135ce30c4ade925a0ac9db7e3f717344859e511b2207841c84dc2453c6cf7f7
+    REF 3.4.1
+    SHA512 875303d4672c61778694b8a969cc1e4239564f2fa81b35cba472f7eb28c71ca9bf052ca633dcdc8cbfb486a6c6849caed9833669fd1ba0aa5ee0065e7e2013f1
     HEAD_REF master
 )
 
diff --git a/ports/lcms/CONTROL b/ports/lcms/CONTROL
index fd9c9d429..96bb6e658 100644
--- a/ports/lcms/CONTROL
+++ b/ports/lcms/CONTROL
@@ -1,4 +1,4 @@
 Source: lcms
-Version: 2.8-5
+Version: 2.9
 Build-Depends:
 Description: Little CMS.
diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake
index 4e125fa86..deb6c9d3c 100644
--- a/ports/lcms/portfile.cmake
+++ b/ports/lcms/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github( 
     OUT_SOURCE_PATH SOURCE_PATH 
     REPO mm2/Little-CMS
-    REF lcms2.8
-    SHA512 22ee94aa3333db4248607d8aa84343d324e04b30c154c46672c6f668e14a369b9b72f2557b8465218b6e9a2676cf8fa37d617b4aa13a013dc2337197a599e63a
+    REF lcms2.9
+    SHA512 b565ed3714c9beaf13e15b3798abbc6c295443357c8db3299cecd9794620bb1d7c50ad258cf887c7bbf66efacb8d8699a7ee579f8c73598740915caa3044ae70
     HEAD_REF master
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/remove_library_directive.patch"
 ) 
diff --git a/ports/lest/CONTROL b/ports/lest/CONTROL
index 20913e218..38b01027b 100644
--- a/ports/lest/CONTROL
+++ b/ports/lest/CONTROL
@@ -1,3 +1,3 @@
 Source: lest
-Version: 1.34.1
+Version: 1.35.1
 Description: A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant)
diff --git a/ports/lest/portfile.cmake b/ports/lest/portfile.cmake
index cb2d9a080..d5948d97b 100644
--- a/ports/lest/portfile.cmake
+++ b/ports/lest/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO martinmoene/lest
-    REF v1.34.1
-    SHA512 7f4b0e49c1cf4c55d21752259ee45f9265aba254b9c15f84e77f9ae3e5ef3443abcb43fafe8e16d84bbdffee72dae842de0ed661c2caeb9607fcb188eb3ec7d1
+    REF v1.35.1
+    SHA512 06b786cbca37cb4d20737d040176bf34398090d566310b88558b788804d8b832c682f1814f5c68ef11192243dbde5643e73b78be4fb1407b831bcde43adb002c
 )
 
 file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/leveldb/CONTROL b/ports/leveldb/CONTROL
index 515d7dfea..5f95fda4b 100644
--- a/ports/leveldb/CONTROL
+++ b/ports/leveldb/CONTROL
@@ -1,3 +1,3 @@
 Source: leveldb
-Version: 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-2
+Version: 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-3
 Description: LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.
diff --git a/ports/leveldb/portfile.cmake b/ports/leveldb/portfile.cmake
index 9d6892977..6a2555e5c 100644
--- a/ports/leveldb/portfile.cmake
+++ b/ports/leveldb/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/libaiff/CMakeLists.txt b/ports/libaiff/CMakeLists.txt
index 9dcfd46d2..db531b5c0 100644
--- a/ports/libaiff/CMakeLists.txt
+++ b/ports/libaiff/CMakeLists.txt
@@ -10,10 +10,6 @@ if(MSVC)
   add_compile_options(/W4 -D_CRT_SECURE_NO_WARNINGS -DHAVE_INTTYPES_H -DHAVE_STDINT_H  -DHAVE_STRING_H -DHAVE_STDLIB_H)
 endif()
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 include_directories(.)
 
 add_library(libaiff ${SRC})
diff --git a/ports/libaiff/CONTROL b/ports/libaiff/CONTROL
index 21078bfe8..0ed9a9cf2 100644
--- a/ports/libaiff/CONTROL
+++ b/ports/libaiff/CONTROL
@@ -1,3 +1,3 @@
-Source: libaiff
-Version:   5.0
-Description: LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features 
+Source: libaiff
+Version:   5.0-1
+Description: LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features
diff --git a/ports/libaiff/portfile.cmake b/ports/libaiff/portfile.cmake
index 17277159e..14f2848ba 100644
--- a/ports/libaiff/portfile.cmake
+++ b/ports/libaiff/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libaiff-5.0)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/aifftools/files/libaiff/LibAiff%205.0/libaiff-5.0-release.tar.gz"
diff --git a/ports/libbf/CONTROL b/ports/libbf/CONTROL
index 3b51a52e1..35ee0fbcc 100644
--- a/ports/libbf/CONTROL
+++ b/ports/libbf/CONTROL
@@ -1,3 +1,3 @@
 Source: libbf
-Version: 1.0.0
+Version: 1.0.0-1
 Description: Bloom filters for C++11.
 \ No newline at end of file
diff --git a/ports/libbf/portfile.cmake b/ports/libbf/portfile.cmake
index b339e94cc..c7a9ef42e 100644
--- a/ports/libbf/portfile.cmake
+++ b/ports/libbf/portfile.cmake
@@ -1,4 +1,4 @@
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "libbf does not support MSVC")
 endif()
 
diff --git a/ports/libcroco/CMakeLists.txt b/ports/libcroco/CMakeLists.txt
new file mode 100644
index 000000000..cb29f04cb
--- /dev/null
+++ b/ports/libcroco/CMakeLists.txt
@@ -0,0 +1,137 @@
+cmake_minimum_required(VERSION 3.11)
+project(libcroco C)
+
+find_package(unofficial-glib CONFIG REQUIRED)
+find_package(LibXml2 REQUIRED)
+if(NOT WIN32)
+    find_package(Threads REQUIRED)
+    find_package(unofficial-iconv REQUIRED)
+endif()
+find_path(GLIB_INCLUDE_DIR glib.h)
+
+file(GLOB SOURCES
+	src/cr-utils.c
+	src/cr-utils.h
+	src/cr-input.c
+	src/cr-input.h
+	src/cr-enc-handler.c
+	src/cr-enc-handler.h
+	src/cr-num.c
+	src/cr-num.h
+	src/cr-rgb.c
+	src/cr-rgb.h
+	src/cr-token.c
+	src/cr-token.h
+	src/cr-tknzr.c
+	src/cr-tknzr.h
+	src/cr-term.c
+	src/cr-term.h
+	src/cr-attr-sel.c
+	src/cr-attr-sel.h
+	src/cr-pseudo.c
+	src/cr-pseudo.h
+	src/cr-additional-sel.c
+	src/cr-additional-sel.h
+	src/cr-simple-sel.c
+	src/cr-simple-sel.h
+	src/cr-selector.c
+	src/cr-selector.h
+	src/cr-doc-handler.c
+	src/cr-doc-handler.h
+	src/cr-parser.c
+	src/cr-parser.h
+	src/cr-declaration.c
+	src/cr-declaration.h
+	src/cr-statement.c
+	src/cr-statement.h
+	src/cr-stylesheet.c
+	src/cr-stylesheet.h
+	src/cr-cascade.c
+	src/cr-cascade.h
+	src/cr-om-parser.c
+	src/cr-om-parser.h
+	src/cr-style.c
+	src/cr-style.h
+	src/cr-sel-eng.c
+	src/cr-sel-eng.h
+	src/cr-fonts.c
+	src/cr-fonts.h
+	src/cr-prop-list.c
+	src/cr-prop-list.h
+	src/cr-parsing-location.c
+	src/cr-parsing-location.h
+	src/cr-string.c
+	src/cr-string.h
+	src/libcroco.def
+)
+
+set(CMAKE_DEBUG_POSTFIX "d")
+
+add_library(libcroco ${SOURCES})
+
+target_include_directories(libcroco PRIVATE ${GLIB_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
+target_link_libraries(libcroco PRIVATE 
+    unofficial::glib::gio
+    unofficial::glib::glib
+    unofficial::glib::gmodule
+    unofficial::glib::gobject
+    ${LIBXML2_LIBRARIES}
+)
+
+install(TARGETS libcroco
+    EXPORT libcroco-targets
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
+
+install(FILES
+	src/libcroco.h
+	src/cr-additional-sel.h
+	src/cr-attr-sel.h
+	src/cr-cascade.h
+	src/cr-declaration.h
+	src/cr-doc-handler.h
+	src/cr-enc-handler.h
+	src/cr-input.h
+	src/cr-num.h
+	src/cr-om-parser.h
+	src/cr-parser.h
+	src/cr-pseudo.h
+	src/cr-rgb.h
+	src/cr-selector.h
+	src/cr-simple-sel.h
+	src/cr-statement.h
+	src/cr-stylesheet.h
+	src/cr-term.h
+	src/cr-tknzr.h
+	src/cr-token.h
+	src/cr-utils.h
+	src/cr-fonts.h
+	src/cr-sel-eng.h
+	src/cr-style.h
+	src/cr-prop-list.h
+	src/cr-parsing-location.h
+	src/cr-string.h
+	src/libcroco-config.h
+    DESTINATION include/libcroco
+)
+
+install(
+    EXPORT libcroco-targets
+    NAMESPACE unofficial::libcroco::
+    FILE unofficial-libcroco-targets.cmake
+    DESTINATION share/unofficial-libcroco
+)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake "
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-glib CONFIG)
+find_dependency(LibXml2)
+if(NOT WIN32)
+    find_dependency(Threads)
+    find_dependency(unofficial-iconv)
+endif()
+include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-libcroco-targets.cmake)
+")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake DESTINATION share/unofficial-libcroco)
diff --git a/ports/libcroco/CONTROL b/ports/libcroco/CONTROL
new file mode 100644
index 000000000..a0d05daaf
--- /dev/null
+++ b/ports/libcroco/CONTROL
@@ -0,0 +1,4 @@
+Source: libcroco
+Version: 0.6.13
+Description: A standalone css2 parsing and manipulation library
+Build-Depends: glib, libxml2
diff --git a/ports/libcroco/portfile.cmake b/ports/libcroco/portfile.cmake
new file mode 100644
index 000000000..e8da1e612
--- /dev/null
+++ b/ports/libcroco/portfile.cmake
@@ -0,0 +1,34 @@
+include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://download.gnome.org/sources/libcroco/0.6/libcroco-0.6.13.tar.xz"
+    FILENAME "libcroco-0.6.13.tar.xz"
+    SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE} 
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+configure_file(${SOURCE_PATH}/config.h.win32 ${SOURCE_PATH}/src/config.h COPYONLY)
+file(READ "${SOURCE_PATH}/src/libcroco.symbols" SYMBOLS)
+string(REGEX REPLACE ";[^\n]*\n" "" DEF "EXPORTS\n${SYMBOLS}")
+file(WRITE "${SOURCE_PATH}/src/libcroco.def" "${DEF}")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcroco RENAME copyright)
+
+# Post-build test for cmake libraries
+ vcpkg_test_cmake(PACKAGE_NAME libcroco)
diff --git a/ports/libdisasm/CMakeLists.txt b/ports/libdisasm/CMakeLists.txt
index 96889e794..9d640a9b9 100644
--- a/ports/libdisasm/CMakeLists.txt
+++ b/ports/libdisasm/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.9)
 project(libdisasm C)
 
 set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 set(SRCS
   ia32_implicit.c
diff --git a/ports/libdisasm/CONTROL b/ports/libdisasm/CONTROL
index c6044e88d..e55dfab7d 100644
--- a/ports/libdisasm/CONTROL
+++ b/ports/libdisasm/CONTROL
@@ -1,3 +1,3 @@
-Source: libdisasm
-Version: 0.23-1
-Description: x86 Disassembler Library.
+Source: libdisasm
+Version: 0.23-2
+Description: x86 Disassembler Library.
diff --git a/ports/libdisasm/portfile.cmake b/ports/libdisasm/portfile.cmake
index 19919bed6..e4bbaba54 100644
--- a/ports/libdisasm/portfile.cmake
+++ b/ports/libdisasm/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-      message(WARNING "Warning: Dynamic building not supported. Building static.")
-      set(VCPKG_LIBRARY_LINKAGE static)
-  endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 set(BASE_PATH ${CURRENT_BUILDTREES_DIR}/src/libdisasm-0.23)
 set(SOURCE_PATH ${BASE_PATH}/libdisasm)
diff --git a/ports/libdshowcapture/CONTROL b/ports/libdshowcapture/CONTROL
index 2d6e37de2..3d88262c8 100644
--- a/ports/libdshowcapture/CONTROL
+++ b/ports/libdshowcapture/CONTROL
@@ -1,3 +1,3 @@
-Source: libdshowcapture
-Version: 0.6.0
-Description: Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows.
+Source: libdshowcapture
+Version: 0.6.0-1
+Description: Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows.
diff --git a/ports/libdshowcapture/portfile.cmake b/ports/libdshowcapture/portfile.cmake
index 372e1b6dc..fa0e2d8a8 100644
--- a/ports/libdshowcapture/portfile.cmake
+++ b/ports/libdshowcapture/portfile.cmake
@@ -17,7 +17,7 @@ vcpkg_build_cmake(TARGET libdshowcapture)
 
 # Copy files
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libdshowcapture RENAME copyright)
-if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
     file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
 endif()
diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL
index 79ffdbf46..876fa0ab9 100644
--- a/ports/libepoxy/CONTROL
+++ b/ports/libepoxy/CONTROL
@@ -1,3 +1,3 @@
-Source: libepoxy
-Version: 1.4.3-1
-Description: Epoxy is a library for handling OpenGL function pointer management for you
+Source: libepoxy
+Version: 1.5.3
+Description: Epoxy is a library for handling OpenGL function pointer management for you
diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake
index e50754db3..d4fc00fbc 100644
--- a/ports/libepoxy/portfile.cmake
+++ b/ports/libepoxy/portfile.cmake
@@ -1,19 +1,17 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO anholt/libepoxy
-    REF 1.4.3
-    SHA512 41c7a4eea66c89346b0ec71407b2d22bf645ed0ef81ebad560370903f138ed48abb6bc6bcc88c75a3a05497acc6720397db828d61301599c05040263a9f4f7f0
+    REF 1.5.3
+    SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
     HEAD_REF master)
 
 vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS 
-        -Denable-glx=no 
+    OPTIONS
+        -Denable-glx=no
         -Denable-egl=no)
 vcpkg_install_meson()
 vcpkg_copy_pdbs()
diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL
index 67cd29d7c..e9577f803 100644
--- a/ports/libevent/CONTROL
+++ b/ports/libevent/CONTROL
@@ -1,4 +1,4 @@
-Source: libevent
-Version: 2.1.8-4
-Build-Depends: openssl
-Description: An event notification library
+Source: libevent
+Version: 2.1.8-5
+Build-Depends: openssl
+Description: An event notification library
diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake
index 61bbb9847..28028ce3c 100644
--- a/ports/libevent/portfile.cmake
+++ b/ports/libevent/portfile.cmake
@@ -1,7 +1,7 @@
 include(vcpkg_common_functions)
 
 if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
-    message(FATAL_ERROR "libevent does not currently support UWP")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
 
 vcpkg_from_github(
diff --git a/ports/libffi/CMakeLists.txt b/ports/libffi/CMakeLists.txt
index 2be7a2574..29e14bdac 100644
--- a/ports/libffi/CMakeLists.txt
+++ b/ports/libffi/CMakeLists.txt
@@ -50,12 +50,6 @@ include_directories(include)
 
 add_definitions(-DHAVE_CONFIG_H)
 add_definitions(-DFFI_BUILDING)
-if(BUILD_SHARED_LIBS)
-    if(WIN32)
-        add_definitions(-DFFI_EXPORT_DATA)
-    endif()
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
 
 set(FFI_SOURCES
     src/x86/ffi.c
diff --git a/ports/libffi/CONTROL b/ports/libffi/CONTROL
index b008d7595..882d7ca94 100644
--- a/ports/libffi/CONTROL
+++ b/ports/libffi/CONTROL
@@ -1,3 +1,3 @@
 Source: libffi
-Version: 3.1-4
+Version: 3.1-5
 Description: Portable, high level programming interface to various calling conventions
diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake
index b72a6cd5a..bbb4daf83 100644
--- a/ports/libffi/portfile.cmake
+++ b/ports/libffi/portfile.cmake
@@ -1,8 +1,11 @@
+include(vcpkg_common_functions)
+
 if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86 AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
     message(FATAL_ERROR "Architecture not supported")
 endif()
 
-include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libffi/libffi
diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL
index a909508a2..56f297798 100644
--- a/ports/libgd/CONTROL
+++ b/ports/libgd/CONTROL
@@ -1,28 +1,28 @@
-Source: libgd
-Version: 2.2.5
-Description: Open source code library for the dynamic creation of images by programmers.
-Default-Features: fontconfig, freetype, jpeg, png, tiff, webp
-
-Feature: fontconfig
-Description: Support for fontconfig
-Build-Depends: fontconfig
-
-Feature: freetype
-Description: Support for freetype
-Build-Depends: freetype
-
-Feature: jpeg
-Description: Support for jpeg
-Build-Depends: libjpeg-turbo
-
-Feature: png
-Description: Support for png
-Build-Depends: libpng
-
-Feature: tiff
-Description: Support for tiff
-Build-Depends: tiff
-
-Feature: webp
-Description: Support for webp
-Build-Depends: libwebp
+Source: libgd
+Version: 2.2.5-3
+Description: Open source code library for the dynamic creation of images by programmers.
+Default-Features: fontconfig, freetype, jpeg, png, tiff, webp
+
+Feature: fontconfig
+Description: Support for fontconfig
+Build-Depends: fontconfig
+
+Feature: freetype
+Description: Support for freetype
+Build-Depends: freetype
+
+Feature: jpeg
+Description: Support for jpeg
+Build-Depends: libjpeg-turbo
+
+Feature: png
+Description: Support for png
+Build-Depends: libpng
+
+Feature: tiff
+Description: Support for tiff
+Build-Depends: tiff
+
+Feature: webp
+Description: Support for webp
+Build-Depends: libwebp
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake
index 23c1d360b..6ef2127d5 100644
--- a/ports/libgd/portfile.cmake
+++ b/ports/libgd/portfile.cmake
@@ -19,34 +19,34 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindPackageHandleStandardArgs.c
 file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindPNG.cmake)
 
 set(ENABLE_PNG OFF)
-if("png" IN_LIST FEATURES) 
-    set(ENABLE_PNG ON) 
+if("png" IN_LIST FEATURES)
+    set(ENABLE_PNG ON)
 endif()
 
 set(ENABLE_JPEG OFF)
-if("jpeg" IN_LIST FEATURES) 
-    set(ENABLE_JPEG ON) 
-endif() 
+if("jpeg" IN_LIST FEATURES)
+    set(ENABLE_JPEG ON)
+endif()
 
 set(ENABLE_TIFF OFF)
-if("tiff" IN_LIST FEATURES) 
-    set(ENABLE_TIFF ON) 
+if("tiff" IN_LIST FEATURES)
+    set(ENABLE_TIFF ON)
 endif()
 
 set(ENABLE_FREETYPE OFF)
-if("freetype" IN_LIST FEATURES) 
-    set(ENABLE_FREETYPE ON) 
+if("freetype" IN_LIST FEATURES)
+    set(ENABLE_FREETYPE ON)
 endif()
 
 set(ENABLE_WEBP OFF)
-if("webp" IN_LIST FEATURES) 
-    set(ENABLE_WEBP ON) 
+if("webp" IN_LIST FEATURES)
+    set(ENABLE_WEBP ON)
 endif()
 
 set(ENABLE_FONTCONFIG OFF)
-if("fontconfig" IN_LIST FEATURES) 
-    set(ENABLE_FONTCONFIG ON) 
-endif() 
+if("fontconfig" IN_LIST FEATURES)
+    set(ENABLE_FONTCONFIG ON)
+endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
   set(LIBGD_SHARED_LIBS ON)
@@ -65,11 +65,9 @@ vcpkg_configure_cmake(
             -DENABLE_FREETYPE=${ENABLE_FREETYPE}
             -DENABLE_WEBP=${ENABLE_WEBP}
             -DENABLE_FONTCONFIG=${ENABLE_FONTCONFIG}
-            -DBUILD_SHARED_LIBS=${LIBGD_SHARED_LIBS}
             -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS}
 )
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
diff --git a/ports/libgeotiff/0001-Updates-to-CMake-configuration-to-align-with-other-C.patch b/ports/libgeotiff/0001-Updates-to-CMake-configuration-to-align-with-other-C.patch
deleted file mode 100644
index 93476fd2f..000000000
--- a/ports/libgeotiff/0001-Updates-to-CMake-configuration-to-align-with-other-C.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 77b4bf4e649d55b1f1df38494114727f972ec806 Mon Sep 17 00:00:00 2001
-From: Howard Butler <hobu.inc@gmail.com>
-Date: Mon, 11 Dec 2017 15:21:56 +0000
-Subject: [PATCH 1/5] Updates to CMake configuration to align with other CMake
- norms (BUILD_SHARED_LIBS mostly)
-
-git-svn-id: https://svn.osgeo.org/metacrs/geotiff/trunk/libgeotiff@2801 4e78687f-474d-0410-85f9-8d5e500ac6b2
-Signed-off-by: Hiroshi Miura <miurahr@linux.com>
----
- CMakeLists.txt                | 22 ++--------------------
- cmake/project-config.cmake.in |  5 ++++-
- 2 files changed, 6 insertions(+), 21 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0c70973..55ececf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,7 +9,6 @@ PROJECT(GeoTIFF)
- 
- SET(GEOTIFF_LIB_NAME geotiff)
- SET(GEOTIFF_LIBRARY_TARGET geotiff_library)
--SET(GEOTIFF_ARCHIVE_TARGET geotiff_archive)
- 
- ##############################################################################
- # CMake settings
-@@ -416,32 +415,15 @@ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/epsg_incode_header.h"
- 
- SET(XTIFF_SOURCES libxtiff/xtiff.c)
- 
--#---
--# Static libgeotiff archive
--# NOTE: Did not put XTIFF_SOURCES in static lib because libxtiff.a is written out
--#       currently.
--#---
- if (MSVC OR CMAKE_CONFIGURATION_TYPES)
-   # For multi-config systems and for Visual Studio, the debug versions
-   # of the libraries have a _d suffix.
-   set (CMAKE_DEBUG_POSTFIX _d)
- endif ()
- 
--ADD_LIBRARY(${GEOTIFF_ARCHIVE_TARGET} STATIC
--    ${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES})
--SET_TARGET_PROPERTIES(${GEOTIFF_ARCHIVE_TARGET} PROPERTIES
--    OUTPUT_NAME ${GEOTIFF_LIB_NAME})
--
--# Shared libgeotiff library
--ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET} SHARED
-+ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET}
-     ${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES} ${XTIFF_SOURCES})
- 
--# Windows:
--IF(WIN32 AND MSVC)
--    SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES IMPORT_SUFFIX "_i.lib")
--ENDIF(WIN32 AND MSVC)
--
--
- # Unix, linux:
- IF(UNIX)
-    SET_TARGET_PROPERTIES(
-@@ -478,7 +460,7 @@ TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_TARGET}
- #   LIBRARY DESTINATION ${GEOTIFF_LIB_DIR}
- #   ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR})
- 
--INSTALL( TARGETS ${GEOTIFF_ARCHIVE_TARGET} ${GEOTIFF_LIBRARY_TARGET}
-+INSTALL( TARGETS ${GEOTIFF_LIBRARY_TARGET}
- 	 EXPORT depends
- 	 RUNTIME DESTINATION bin
-          LIBRARY DESTINATION lib
-diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
-index 6b5499f..dc5b999 100644
---- a/cmake/project-config.cmake.in
-+++ b/cmake/project-config.cmake.in
-@@ -32,8 +32,11 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin")
- 
- message (STATUS "  include directory: \${@PROJECT_NAME@_INCLUDE_DIRS}")
- 
-+if(BUILD_SHARED_LIBS)
- set (@PROJECT_NAME@_SHARED_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
--set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_ARCHIVE_TARGET@)
-+else()
-+set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
-+endif()
- # Read in the exported definition of the library
- include ("${_DIR}/@PROJECT_NAME_LOWER@-depends.cmake")
- 
--- 
-2.16.1
-
diff --git a/ports/libgeotiff/0002-Fix-directory-output.patch b/ports/libgeotiff/0002-Fix-directory-output.patch
deleted file mode 100644
index d6b79e54c..000000000
--- a/ports/libgeotiff/0002-Fix-directory-output.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2b60f0a2c264bf3730e89739384a6d50991b2fc4 Mon Sep 17 00:00:00 2001
-From: Hiroshi Miura <miurahr@linux.com>
-Date: Wed, 14 Feb 2018 12:31:53 +0900
-Subject: [PATCH 2/5] Fix directory output
-
-Signed-off-by: Hiroshi Miura <miurahr@linux.com>
----
- cmake/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 47a2b00..b41f2fa 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -10,8 +10,8 @@ if (NOT WIN32)
-   set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
-   set (PROJECT_ROOT_DIR "../../..")
- else ()
--  set (INSTALL_CMAKE_DIR "cmake")
--  set (PROJECT_ROOT_DIR "..")
-+  set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}")
-+  set (PROJECT_ROOT_DIR "../..")
- endif ()
- 
- configure_file (project-config.cmake.in project-config.cmake @ONLY)
--- 
-2.16.1
-
diff --git a/ports/libgeotiff/0004-Fix-libxtiff-installation.patch b/ports/libgeotiff/0004-Fix-libxtiff-installation.patch
deleted file mode 100644
index f7da51ab0..000000000
--- a/ports/libgeotiff/0004-Fix-libxtiff-installation.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3a7c42f304ec3bb149e31bbd21c9c84048c3047c Mon Sep 17 00:00:00 2001
-From: Hiroshi Miura <miurahr@linux.com>
-Date: Thu, 15 Feb 2018 13:11:01 +0900
-Subject: [PATCH 4/5] Fix libxtiff installation
-
-Signed-off-by: Hiroshi Miura <miurahr@linux.com>
----
- CMakeLists.txt          | 9 ++-------
- libxtiff/CMakeLists.txt | 9 ---------
- 2 files changed, 2 insertions(+), 16 deletions(-)
- delete mode 100644 libxtiff/CMakeLists.txt
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e2fe3d..c52cfb4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -354,11 +354,6 @@ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
- # INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR})
- INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include)
- 
--###############################################################################
--# Build libxtiff library
--
--ADD_SUBDIRECTORY(libxtiff)
--
- ###############################################################################
- # Build libgeotiff library
- 
-@@ -406,6 +401,8 @@ FOREACH(epsg_csv_file ${GEOTIFF_CSV_DATA})
-     ENDIF()
- ENDFOREACH()
- 
-+SET(XTIFF_SOURCES libxtiff/xtiff.c)
-+
- SET(EPSG_INCODE_EXPLANATION
-     "This file is autogenerated by CMake, based on the INCODE_EPSG_* options specified during configure.\n
-     Choosing an EPSG CSV file for inclusion into code will run csv/csv2c.py on the file and include the\n
-@@ -414,8 +411,6 @@ STRING(REPLACE ";" "\n" EPSG_INCLUDEFILE_POINTER_STRING "${epsg_includefile_poin
- FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/epsg_incode_header.h"
-     "/* ${EPSG_INCODE_EXPLANATION} */\n${epsg_includefile_externconst}; \n\n/* Pointers to csv data included in code */\nstatic const datafile_t files[] = {\n${EPSG_INCLUDEFILE_POINTER_STRING}\n  { NULL, NULL }};")
- 
--SET(XTIFF_SOURCES libxtiff/xtiff.c)
--
- if (MSVC OR CMAKE_CONFIGURATION_TYPES)
-   # For multi-config systems and for Visual Studio, the debug versions
-   # of the libraries have a _d suffix.
-diff --git a/libxtiff/CMakeLists.txt b/libxtiff/CMakeLists.txt
-deleted file mode 100644
-index a0bbb96..0000000
---- a/libxtiff/CMakeLists.txt
-+++ /dev/null
-@@ -1,9 +0,0 @@
--###############################################################################
--#
--# CMake configuration file to build libxtiff library
--#
--# Author: Mateusz Loskot <mateusz@loskot.net>
--#
--###############################################################################
--
--ADD_LIBRARY(xtiff STATIC xtiff.c)
--- 
-2.16.1
-
diff --git a/ports/libgeotiff/0005-Control-shared-library-build-with-option.patch b/ports/libgeotiff/0005-Control-shared-library-build-with-option.patch
deleted file mode 100644
index ed9a4e88a..000000000
--- a/ports/libgeotiff/0005-Control-shared-library-build-with-option.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 84e537f3bd0db74b22ffebb3746d292daf4f4e59 Mon Sep 17 00:00:00 2001
-From: Hiroshi Miura <miurahr@linux.com>
-Date: Thu, 15 Feb 2018 13:17:14 +0900
-Subject: [PATCH 5/5] Control shared library build with option
-
-Signed-off-by: Hiroshi Miura <miurahr@linux.com>
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c52cfb4..5890203 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,14 +5,15 @@
- # Author: Mateusz Loskot <mateusz@loskot.net>
- #
- ###############################################################################
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)
- PROJECT(GeoTIFF)
- 
- SET(GEOTIFF_LIB_NAME geotiff)
- SET(GEOTIFF_LIBRARY_TARGET geotiff_library)
-+option(BUILD_SHARE_LIBS "Set ON to build shared library." ON)
- 
- ##############################################################################
- # CMake settings
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
- 
- SET(CMAKE_COLOR_MAKEFILE ON)
- 
--- 
-2.16.1
-
diff --git a/ports/libgeotiff/0006-Fix-utility-link-error.patch b/ports/libgeotiff/0006-Fix-utility-link-error.patch
deleted file mode 100644
index ef0963b26..000000000
--- a/ports/libgeotiff/0006-Fix-utility-link-error.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2625b4a85b6cacf9b6ede3cf30af16eb795044e9 Mon Sep 17 00:00:00 2001
-From: Hiroshi Miura <miurahr@linux.com>
-Date: Sat, 24 Feb 2018 08:36:31 +0900
-Subject: [PATCH 6/6] Fix utility link error
-
-Signed-off-by: Hiroshi Miura <miurahr@linux.com>
----
- bin/CMakeLists.txt | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
-index 583ae36..6c6cc21 100644
---- a/bin/CMakeLists.txt
-+++ b/bin/CMakeLists.txt
-@@ -6,10 +6,6 @@
- #
- ###############################################################################
- 
--INCLUDE_DIRECTORIES(
--    .
--    ${CMAKE_SOURCE_DIR})
--
- IF(WIN32 AND MSVC)
-     SET(GETOPT_SOURCE getopt.c)
- ENDIF()
-@@ -22,12 +18,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build")
- 
- FOREACH(utility ${GEOTIFF_UTILITIES})
-     ADD_EXECUTABLE(${utility} ${utility}.c ${GETOPT_SOURCE})
--    TARGET_LINK_LIBRARIES(${utility} xtiff ${GEOTIFF_LIBRARY_TARGET})
-+    TARGET_LINK_LIBRARIES(${utility} ${GEOTIFF_LIBRARY_TARGET})
- ENDFOREACH()
- 
- ADD_EXECUTABLE(geotifcp geotifcp.c ${GETOPT_SOURCE})
- TARGET_LINK_LIBRARIES(geotifcp
--    xtiff
-     ${GEOTIFF_LIBRARY_TARGET}
-     ${JPEG_LIBRARIES}
-     ${ZLIB_LIBRARIES})
--- 
-2.16.1
-
diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL
index edfa7f0cb..28cbee52d 100644
--- a/ports/libgeotiff/CONTROL
+++ b/ports/libgeotiff/CONTROL
@@ -1,4 +1,4 @@
 Source: libgeotiff
-Version: 1.4.2-7
-Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags.
+Version: 1.4.2-9
+Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags.
 Build-Depends: tiff, proj4, zlib, libjpeg-turbo
diff --git a/ports/libgeotiff/cmakelists.patch b/ports/libgeotiff/cmakelists.patch
new file mode 100644
index 000000000..689c6df5b
--- /dev/null
+++ b/ports/libgeotiff/cmakelists.patch
@@ -0,0 +1,124 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0c70973..617978c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -190,22 +190,6 @@ IF(WITH_TIFF)
+     endif ()
+ 
+     IF(TIFF_FOUND)
+-        # Confirm required API is available
+-        INCLUDE(CheckFunctionExists)
+-        SET(CMAKE_REQUIRED_LIBRARIES ${TIFF_LIBRARIES})
+-
+-        CHECK_FUNCTION_EXISTS(TIFFOpen HAVE_TIFFOPEN)
+-        IF(NOT HAVE_TIFFOPEN)
+-            SET(TIFF_FOUND) # ReSET to NOT found for TIFF library
+-            MESSAGE(FATAL_ERROR "Failed to link with libtiff - TIFFOpen function not found")
+-        ENDIF()
+-
+-        CHECK_FUNCTION_EXISTS(TIFFMergeFieldInfo HAVE_TIFFMERGEFIELDINFO)
+-        IF(NOT HAVE_TIFFMERGEFIELDINFO)
+-            SET(TIFF_FOUND) # ReSET to NOT found for TIFF library
+-            MESSAGE(FATAL_ERROR "Failed to link with libtiff - TIFFMergeFieldInfo function not found. libtiff 3.6.0 Beta or later required. Please upgrade or use an older version of libgeotiff")
+-        ENDIF()
+-
+         INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
+         ADD_DEFINITIONS(-DHAVE_TIFF=1)
+     ENDIF(TIFF_FOUND)
+@@ -354,11 +338,6 @@ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
+ # INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR})
+ INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include)
+ 
+-###############################################################################
+-# Build libxtiff library
+-
+-ADD_SUBDIRECTORY(libxtiff)
+-
+ ###############################################################################
+ # Build libgeotiff library
+ 
+@@ -427,13 +406,9 @@ if (MSVC OR CMAKE_CONFIGURATION_TYPES)
+   set (CMAKE_DEBUG_POSTFIX _d)
+ endif ()
+ 
+-ADD_LIBRARY(${GEOTIFF_ARCHIVE_TARGET} STATIC
+-    ${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES})
+-SET_TARGET_PROPERTIES(${GEOTIFF_ARCHIVE_TARGET} PROPERTIES
+-    OUTPUT_NAME ${GEOTIFF_LIB_NAME})
+ 
+ # Shared libgeotiff library
+-ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET} SHARED
++ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET}
+     ${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES} ${XTIFF_SOURCES})
+ 
+ # Windows:
+@@ -478,7 +453,7 @@ TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_TARGET}
+ #   LIBRARY DESTINATION ${GEOTIFF_LIB_DIR}
+ #   ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR})
+ 
+-INSTALL( TARGETS ${GEOTIFF_ARCHIVE_TARGET} ${GEOTIFF_LIBRARY_TARGET}
++INSTALL( TARGETS ${GEOTIFF_LIBRARY_TARGET}
+ 	 EXPORT depends
+ 	 RUNTIME DESTINATION bin
+          LIBRARY DESTINATION lib
+diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
+index 7b12341..b6b1d0c 100644
+--- a/bin/CMakeLists.txt
++++ b/bin/CMakeLists.txt
+@@ -6,9 +6,6 @@
+ #
+ ###############################################################################
+ 
+-INCLUDE_DIRECTORIES(
+-    .
+-    ${CMAKE_SOURCE_DIR})
+ 
+ IF(WIN32 AND MSVC)
+     SET(GETOPT_SOURCE getopt.c)
+@@ -22,12 +19,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build")
+ 
+ FOREACH(utility ${GEOTIFF_UTILITIES})
+     ADD_EXECUTABLE(${utility} ${utility}.c ${GETOPT_SOURCE})
+-    TARGET_LINK_LIBRARIES(${utility} xtiff ${GEOTIFF_LIBRARY_TARGET})
++    TARGET_LINK_LIBRARIES(${utility} ${GEOTIFF_LIBRARY_TARGET})
+ ENDFOREACH()
+ 
+ ADD_EXECUTABLE(geotifcp geotifcp.c ${GETOPT_SOURCE})
+ TARGET_LINK_LIBRARIES(geotifcp
+-    xtiff
+     ${GEOTIFF_LIBRARY_TARGET}
+     ${JPEG_LIBRARIES}
+     ${ZLIB_LIBRARIES})
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 47a2b00..ffbd004 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -6,13 +6,8 @@
+ # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
+ # path to the root from there.  (Note that the whole install tree can
+ # be relocated.)
+-if (NOT WIN32)
+-  set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
+-  set (PROJECT_ROOT_DIR "../../..")
+-else ()
+-  set (INSTALL_CMAKE_DIR "cmake")
+-  set (PROJECT_ROOT_DIR "..")
+-endif ()
++  set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}")
++  set (PROJECT_ROOT_DIR "../..")
+ 
+ configure_file (project-config.cmake.in project-config.cmake @ONLY)
+ configure_file (project-config-version.cmake.in
+diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
+index 6b5499f..e4ddd11 100644
+--- a/cmake/project-config.cmake.in
++++ b/cmake/project-config.cmake.in
+@@ -33,7 +33,7 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin")
+ message (STATUS "  include directory: \${@PROJECT_NAME@_INCLUDE_DIRS}")
+ 
+ set (@PROJECT_NAME@_SHARED_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
+-set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_ARCHIVE_TARGET@)
++set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
+ # Read in the exported definition of the library
+ include ("${_DIR}/@PROJECT_NAME_LOWER@-depends.cmake")
+ 
diff --git a/ports/libgeotiff/geotiff-config.patch b/ports/libgeotiff/geotiff-config.patch
new file mode 100644
index 000000000..284c64146
--- /dev/null
+++ b/ports/libgeotiff/geotiff-config.patch
@@ -0,0 +1,17 @@
+diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
+index 0dd376aca..0615081bd 100644
+--- a/cmake/project-config.cmake.in	
++++ b/cmake/project-config.cmake.in
+@@ -23,6 +23,12 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}")
+ message (STATUS
+   "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}")
+ 
++#Find dependencies
++if(@WITH_PROJ4@)
++  include(CMakeFindDependencyMacro)
++  find_dependency(PROJ4)
++endif()
++
+ # Tell the user project where to find our headers and libraries
+ get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+ get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake
index fc79fe15d..1e4bb3370 100644
--- a/ports/libgeotiff/portfile.cmake
+++ b/ports/libgeotiff/portfile.cmake
@@ -1,12 +1,11 @@
 include(vcpkg_common_functions)
 
 set(LIBGEOTIFF_VERSION 1.4.2)
-set(LIBGEOTIFF_HASH 059c6e05eb0c47f17b102c7217a2e1636e76d622c4d1bdcf0bd89fb3505f3130bffa881e21c73cfd2ca0d6863b81322f85784658ba3539b53b63c3a8f38d1deb)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz"
     FILENAME "libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz"
-    SHA512 ${LIBGEOTIFF_HASH}
+    SHA512 059c6e05eb0c47f17b102c7217a2e1636e76d622c4d1bdcf0bd89fb3505f3130bffa881e21c73cfd2ca0d6863b81322f85784658ba3539b53b63c3a8f38d1deb
 )
 
 vcpkg_extract_source_archive_ex(
@@ -14,11 +13,8 @@ vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
     REF ${LIBGEOTIFF_VERSION}
     PATCHES
-        0001-Updates-to-CMake-configuration-to-align-with-other-C.patch
-        0002-Fix-directory-output.patch
-        0004-Fix-libxtiff-installation.patch
-        0005-Control-shared-library-build-with-option.patch
-        0006-Fix-utility-link-error.patch
+        cmakelists.patch
+        geotiff-config.patch
 )
 
 # Delete FindPROJ4.cmake
@@ -32,35 +28,40 @@ vcpkg_configure_cmake(
         -DWITH_PROJ4=ON
         -DWITH_ZLIB=ON
         -DWITH_JPEG=ON
-    OPTIONS_RELEASE -DWITH_UTILITIES=ON
-    OPTIONS_DEBUG   -DWITH_UTILITIES=OFF
+        -DWITH_UTILITIES=ON
 )
 
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
-configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libgeotiff/copyright COPYONLY)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc)
 
 if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     file(GLOB GEOTIFF_UTILS ${CURRENT_PACKAGES_DIR}/bin/*)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
 else()
     file(GLOB GEOTIFF_UTILS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+    file(GLOB GEOTIFF_UTILS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+    file(REMOVE ${GEOTIFF_UTILS_DEBUG})
 endif()
 
 file(COPY ${GEOTIFF_UTILS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/libgeotiff)
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libgeotiff)
+file(REMOVE ${GEOTIFF_UTILS})
 
-file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
-if(EXES)
-    file(REMOVE ${EXES})
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
 endif()
 
-# Move and cleanup doc files
-file(RENAME ${CURRENT_PACKAGES_DIR}/doc ${CURRENT_PACKAGES_DIR}/share/libgeotiff/doc) 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) 
-
 vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/GeoTIFF)
+file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-config-version.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff)
+file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff)
+file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-depends-release.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff)
+file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-depends-debug.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff)
+file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-depends.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgeotiff RENAME copyright)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/doc ${CURRENT_PACKAGES_DIR}/share/libgeotiff/doc)
diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL
index f44900b72..55a90bea5 100644
--- a/ports/libgit2/CONTROL
+++ b/ports/libgit2/CONTROL
@@ -1,4 +1,4 @@
 Source: libgit2
-Version: 0.27.4-2
+Version: 0.28.1
 Build-Depends: openssl (!windows&&!uwp)
 Description: Git linkable library
diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake
index 0982e5be1..3516788b7 100644
--- a/ports/libgit2/portfile.cmake
+++ b/ports/libgit2/portfile.cmake
@@ -8,8 +8,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libgit2/libgit2
-    REF v0.27.4
-    SHA512 d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61
+    REF v0.28.1
+    SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647
     HEAD_REF master
 )
 
diff --git a/ports/libideviceactivation/CONTROL b/ports/libideviceactivation/CONTROL
index 2d5e23661..cbc1aef46 100644
--- a/ports/libideviceactivation/CONTROL
+++ b/ports/libideviceactivation/CONTROL
@@ -1,4 +1,4 @@
 Source: libideviceactivation
-Version: 1.0.38-1
+Version: 1.2.68
 Description: A library to handle the activation process of iOS devices
 Build-Depends: libimobiledevice, libxml2, curl
 \ No newline at end of file
diff --git a/ports/libideviceactivation/libcurl_d.patch b/ports/libideviceactivation/libcurl_d.patch
new file mode 100644
index 000000000..69f1bf53b
--- /dev/null
+++ b/ports/libideviceactivation/libcurl_d.patch
@@ -0,0 +1,22 @@
+diff --git a/libideviceactivation.vcxproj b/libideviceactivation.vcxproj
+index ba473f7a..47a20d15 100644
+--- a/libideviceactivation.vcxproj	
++++ b/libideviceactivation.vcxproj
+@@ -76,7 +76,7 @@
+       <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>libcurl-d.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+@@ -89,7 +89,7 @@
+       <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>libcurl-d.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/ports/libideviceactivation/libcurl_imp.patch b/ports/libideviceactivation/libcurl_imp.patch
new file mode 100644
index 000000000..bf1bfefac
--- /dev/null
+++ b/ports/libideviceactivation/libcurl_imp.patch
@@ -0,0 +1,40 @@
+diff --git a/libideviceactivation.vcxproj b/libideviceactivation.vcxproj
+index ba473f7a..47a20d15 100644
+--- a/libideviceactivation.vcxproj	
++++ b/libideviceactivation.vcxproj
+@@ -76,7 +76,7 @@
+       <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>libcurl-d_imp.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+@@ -89,7 +89,7 @@
+       <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>libcurl-d_imp.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+@@ -106,7 +106,7 @@
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+-      <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>libcurl_imp.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+@@ -123,7 +123,7 @@
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+-      <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>libcurl_imp.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemGroup>
diff --git a/ports/libideviceactivation/portfile.cmake b/ports/libideviceactivation/portfile.cmake
index 7a462834e..a904b52ef 100644
--- a/ports/libideviceactivation/portfile.cmake
+++ b/ports/libideviceactivation/portfile.cmake
@@ -5,11 +5,23 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libimobiledevice-win32/libideviceactivation
-    REF 1.0.38
-    SHA512 2fd2d5636e83a6740251dca58c04429628f47661a56e573fc14f45ef68c54990717515305902cf04759a7c8fd19e66a30c8eb2ea20e6257d2c5405b690ea25a6
+    REF v1.2.68
+    SHA512 c2742bba2d90c21e853255c9ef1b9a63560c3e65541a0a3daaace9b0c48d236b7947008dbcd6e42622251015b686758ebc6b564e379d831cb4f52af812430140
     HEAD_REF msvc-master
 )
 
+if(${VCPKG_LIBRARY_LINKAGE} MATCHES dynamic)
+    vcpkg_apply_patches(
+        SOURCE_PATH ${SOURCE_PATH}
+        PATCHES
+            libcurl_imp.patch)
+else()
+    vcpkg_apply_patches(
+        SOURCE_PATH ${SOURCE_PATH}
+        PATCHES
+            libcurl_d.patch)
+endif()
+
 vcpkg_install_msbuild(
     SOURCE_PATH ${SOURCE_PATH}
     PROJECT_SUBPATH libideviceactivation.sln
diff --git a/ports/libidn2/CMakeLists.txt b/ports/libidn2/CMakeLists.txt
index a1eb9f9ce..d7a5d771e 100644
--- a/ports/libidn2/CMakeLists.txt
+++ b/ports/libidn2/CMakeLists.txt
@@ -4,8 +4,6 @@ project(libidn2 C)
 
 find_package(unofficial-iconv REQUIRED)
 
-set(CMAKE_DEBUG_POSTFIX "d")
-
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL
index 2fc289034..5fcac82b6 100644
--- a/ports/libidn2/CONTROL
+++ b/ports/libidn2/CONTROL
@@ -1,4 +1,4 @@
 Source: libidn2
-Version: 2.0.5-1
+Version: 2.1.1-1
 Build-Depends: libiconv
 Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.
diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake
index 85cc9e6ce..d7de30f41 100644
--- a/ports/libidn2/portfile.cmake
+++ b/ports/libidn2/portfile.cmake
@@ -1,12 +1,12 @@
 include(vcpkg_common_functions)
 
-set(IDN2_VERSION 2.0.5)
-set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz)
+set(IDN2_VERSION 2.1.1)
+set(IDN2_FILENAME libidn2-${IDN2_VERSION}a.tar.gz)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}"
     FILENAME "${IDN2_FILENAME}"
-    SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79
+    SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
 )
 
 vcpkg_extract_source_archive_ex(
diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL
index 88f6e689a..a3ee5e4bb 100644
--- a/ports/libjpeg-turbo/CONTROL
+++ b/ports/libjpeg-turbo/CONTROL
@@ -1,3 +1,3 @@
 Source: libjpeg-turbo
-Version: 1.5.3-2
+Version: 2.0.1-1
 Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.
diff --git a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
index bd10a21bb..af82c77b8 100644
--- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
+++ b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
@@ -1,66 +1,74 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 131b437..c29e604 100644
+index efeb51a..5c7d829 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -62,6 +62,9 @@ option(WITH_JAVA "Build Java wrapper for the TurboJPEG library" FALSE)
- option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_SIMD=0 WITH_TURBOJPEG=0 WITH_ARITH_ENC=0 WITH_ARITH_DEC=0)" FALSE)
+@@ -147,6 +147,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
+ boolean_number(ENABLE_SHARED)
  option(ENABLE_STATIC "Build static libraries" TRUE)
- option(ENABLE_SHARED "Build shared libraries" TRUE)
+ boolean_number(ENABLE_STATIC)
 +option(ENABLE_EXECUTABLES "Build executables" TRUE)
++boolean_number(ENABLE_EXECUTABLES)
 +option(INSTALL_DOCS "Install doc files" TRUE)
++boolean_number(INSTALL_DOCS)
 +option(INSTALL_HEADERS "Install header files" TRUE)
++boolean_number(INSTALL_HEADERS)
+ option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE)
+ boolean_number(REQUIRE_SIMD)
+ option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_ARITH_DEC=0 WITH_ARITH_ENC=0 WITH_JAVA=0 WITH_SIMD=0 WITH_TURBOJPEG=0 )" FALSE)
+@@ -593,17 +599,19 @@ if(WITH_TURBOJPEG)
+         LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
+     endif()
  
- if(WITH_12BIT)
-   set(WITH_SIMD FALSE)
-@@ -279,14 +282,16 @@ if(WITH_TURBOJPEG)
-     target_link_libraries(turbojpeg jpeg-static)
-     set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "")
- 
--    add_executable(tjunittest tjunittest.c tjutil.c)
+-    add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
 -    target_link_libraries(tjunittest turbojpeg)
 +    if(ENABLE_EXECUTABLES)
-+      add_executable(tjunittest tjunittest.c tjutil.c)
++      add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
 +      target_link_libraries(tjunittest turbojpeg)
  
--    add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c
--      wrppm.c)
--    target_link_libraries(tjbench turbojpeg jpeg-static)
--    set_property(TARGET tjbench PROPERTY COMPILE_FLAGS
--      "-DBMP_SUPPORTED -DPPM_SUPPORTED")
-+      add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c
-+        wrppm.c)
-+      target_link_libraries(tjbench turbojpeg jpeg-static)
-+      set_property(TARGET tjbench PROPERTY COMPILE_FLAGS
-+        "-DBMP_SUPPORTED -DPPM_SUPPORTED")
+-    add_executable(tjbench tjbench.c tjutil.c)
+-    target_link_libraries(tjbench turbojpeg)
+-    if(UNIX)
+-      target_link_libraries(tjbench m)
+-    endif()
++      add_executable(tjbench tjbench.c tjutil.c)
++      target_link_libraries(tjbench turbojpeg)
++      if(UNIX)
++        target_link_libraries(tjbench m)
++      endif()
+ 
+-    add_executable(tjexample tjexample.c)
+-    target_link_libraries(tjexample turbojpeg)
++      add_executable(tjexample tjexample.c)
++      target_link_libraries(tjexample turbojpeg)
 +    endif()
    endif()
  
    if(ENABLE_STATIC)
-@@ -299,14 +304,16 @@ if(WITH_TURBOJPEG)
-       add_dependencies(turbojpeg-static simd)
+@@ -616,14 +624,16 @@ if(WITH_TURBOJPEG)
+       set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
      endif()
  
--    add_executable(tjunittest-static tjunittest.c tjutil.c)
+-    add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
+-      md5/md5hl.c)
 -    target_link_libraries(tjunittest-static turbojpeg-static)
 +    if(ENABLE_EXECUTABLES)
-+      add_executable(tjunittest-static tjunittest.c tjutil.c)
++      add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
++        md5/md5hl.c)
 +      target_link_libraries(tjunittest-static turbojpeg-static)
  
--    add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c
--      wrbmp.c wrppm.c)
--    target_link_libraries(tjbench-static turbojpeg-static jpeg-static)
--    set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS
--      "-DBMP_SUPPORTED -DPPM_SUPPORTED")
-+      add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c
-+        wrbmp.c wrppm.c)
-+      target_link_libraries(tjbench-static turbojpeg-static jpeg-static)
-+      set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS
-+        "-DBMP_SUPPORTED -DPPM_SUPPORTED")
-+    endif()
+-    add_executable(tjbench-static tjbench.c tjutil.c)
+-    target_link_libraries(tjbench-static turbojpeg-static)
+-    if(UNIX)
+-      target_link_libraries(tjbench-static m)
++      add_executable(tjbench-static tjbench.c tjutil.c)
++      target_link_libraries(tjbench-static turbojpeg-static)
++      if(UNIX)
++        target_link_libraries(tjbench-static m)
++      endif()
+     endif()
    endif()
  endif()
- 
-@@ -318,7 +325,7 @@ else()
+@@ -639,7 +649,7 @@ else()
    set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
  endif()
  
@@ -69,96 +77,119 @@ index 131b437..c29e604 100644
    add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c
      ${CJPEG_BMP_SOURCES})
    set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-@@ -334,10 +341,11 @@ if(ENABLE_STATIC)
-   set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "-DUSE_SETMODE")
+@@ -655,9 +665,11 @@ if(ENABLE_STATIC)
+   set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
  endif()
  
 -add_executable(rdjpgcom rdjpgcom.c)
--
--add_executable(wrjpgcom wrjpgcom.c)
 +if(ENABLE_EXECUTABLES)
 +  add_executable(rdjpgcom rdjpgcom.c)
  
+-add_executable(wrjpgcom wrjpgcom.c)
 +  add_executable(wrjpgcom wrjpgcom.c)
 +endif()
  
- #
- # Tests
-@@ -917,24 +925,30 @@ add_custom_target(installer
+ 
+ ###############################################################################
+@@ -1326,26 +1338,32 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
  
  if(WITH_TURBOJPEG)
    if(ENABLE_SHARED)
 -    install(TARGETS turbojpeg tjbench
 +    install(TARGETS turbojpeg
-       ARCHIVE DESTINATION lib
-       LIBRARY DESTINATION lib
-       RUNTIME DESTINATION bin)
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +    if(ENABLE_EXECUTABLES)
 +      install(TARGETS tjbench
-+        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +    endif()
    endif()
    if(ENABLE_STATIC)
-     install(TARGETS turbojpeg-static ARCHIVE DESTINATION lib)
+     install(TARGETS turbojpeg-static ARCHIVE
+       DESTINATION ${CMAKE_INSTALL_LIBDIR})
 -    if(NOT ENABLE_SHARED)
 +    if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
-       install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static.exe
-         DESTINATION bin RENAME tjbench.exe)
+       install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static${EXE}
+         DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
      endif()
    endif()
--  install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include)
+-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
+-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +  if(INSTALL_HEADERS)
-+    install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include)
++    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
++      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +  endif()
  endif()
  
  if(ENABLE_STATIC)
-   install(TARGETS jpeg-static ARCHIVE DESTINATION lib)
+   install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 -  if(NOT ENABLE_SHARED)
 +  if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
-     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static.exe
-       DESTINATION bin RENAME cjpeg.exe)
-     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static.exe
-@@ -944,17 +958,23 @@ if(ENABLE_STATIC)
+     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static${EXE}
+       DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME cjpeg${EXE})
+     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static${EXE}
+@@ -1355,21 +1373,25 @@ if(ENABLE_STATIC)
    endif()
  endif()
  
--install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin)
+-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +if(ENABLE_EXECUTABLES)
-+  install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin)
++  install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +endif()
  
--install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md
--  ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt
--  ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt
--  ${CMAKE_SOURCE_DIR}/wizard.txt
--  DESTINATION doc)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
+-  ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
+-  ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-if(WITH_JAVA)
+-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
+-    DESTINATION ${CMAKE_INSTALL_DOCDIR})
 +if(INSTALL_DOCS)
-+  install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md
-+    ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt
-+    ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt
-+    ${CMAKE_SOURCE_DIR}/wizard.txt
-+    DESTINATION doc)
-+endif()
++  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
++    ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
++    ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
++    ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
++    ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
++    ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
++    ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
++  if(WITH_JAVA)
++    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
++      DESTINATION ${CMAKE_INSTALL_DOCDIR})
++  endif()
+ endif()
  
--install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h
--  ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h
--  DESTINATION include)
+-if(UNIX OR MINGW)
++if((UNIX OR MINGW) AND INSTALL_DOCS)
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
+     ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
+     ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
+@@ -1380,10 +1402,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
+   ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
+-  ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
+-  ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
+-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +if(INSTALL_HEADERS)
-+  install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h
-+    ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h
-+    DESTINATION include)
++  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
++    ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
++    ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +endif()
  
- configure_file("${CMAKE_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in"
-   "cmake_uninstall.cmake" IMMEDIATE @ONLY)
-
+ include(cmakescripts/BuildPackages.cmake)
+ 
 diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
-index d423cce..9da7c6e 100644
+index 2bab832..afbb56a 100755
 --- a/sharedlib/CMakeLists.txt
 +++ b/sharedlib/CMakeLists.txt
-@@ -50,24 +50,31 @@ else()
- 	set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
+@@ -70,24 +70,33 @@ else()
+   set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
  endif()
  
 -add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
@@ -182,24 +213,26 @@ index d423cce..9da7c6e 100644
  
 -add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
 -target_link_libraries(jpegtran jpeg)
--set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "-DUSE_SETMODE")
+-set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
 +  add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
 +  target_link_libraries(jpegtran jpeg)
-+  set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "-DUSE_SETMODE")
++  set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
  
 -add_executable(jcstest ../jcstest.c)
 -target_link_libraries(jcstest jpeg)
 +  add_executable(jcstest ../jcstest.c)
 +  target_link_libraries(jcstest jpeg)
++endif()
  
 -install(TARGETS jpeg cjpeg djpeg jpegtran
++install(TARGETS jpeg
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++
++if(ENABLE_EXECUTABLES)
 +  install(TARGETS cjpeg djpeg jpegtran
-+    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION lib
-+    RUNTIME DESTINATION bin)
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +endif()
-+
-+install(TARGETS jpeg
-   ARCHIVE DESTINATION lib
-   LIBRARY DESTINATION lib
-   RUNTIME DESTINATION bin)
diff --git a/ports/libjpeg-turbo/linux-cmake.patch b/ports/libjpeg-turbo/linux-cmake.patch
deleted file mode 100644
index 48a04279f..000000000
--- a/ports/libjpeg-turbo/linux-cmake.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c29e604..6e467be 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,10 +29,6 @@ pad_number(VERSION_MINOR 3)
- pad_number(VERSION_REVISION 3)
- set(LIBJPEG_TURBO_VERSION_NUMBER ${VERSION_MAJOR}${VERSION_MINOR}${VERSION_REVISION})
- 
--if(NOT WIN32)
--  message(FATAL_ERROR "Platform not supported by this build system.  Use autotools instead.")
--endif()
--
- string(TIMESTAMP BUILD "%Y%m%d")
- 
- # This does nothing except when using MinGW.  CMAKE_BUILD_TYPE has no meaning
-@@ -166,8 +162,10 @@ endif()
- 
- if(64BIT)
-   message(STATUS "64-bit build")
-+  add_compile_options(-DSIZEOF_SIZE_T=8)
- else()
-   message(STATUS "32-bit build")
-+  add_compile_options(-DSIZEOF_SIZE_T=4)
- endif()
- 
- if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake
index 002818c47..1e1f6ca42 100644
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@@ -1,21 +1,16 @@
 include(vcpkg_common_functions)
 
-vcpkg_download_distfile(GETENV_PATCH
-    URLS "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff"
-    FILENAME "libjpeg-turbo-bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff"
-    SHA512 4cd064521b5e4baba4adf972f9f574f6dd43a2cd3e3ad143ca2cdf0f165024406d4fd2ed094124d0c17c5370394140e82fdd892d3cdc49609acdf8f79db1758c
-)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libjpeg-turbo/libjpeg-turbo
-    REF 1.5.3
-    SHA512 0e7a2cd9943b610f49b562c20a5c350a50326a87bce1d39f14fe45760ed2f89a0d2d3e3f0de9f6a7714f566aabadec6b2422b592591ebb98bbad600ea411fea7
+    REF 2.0.1
+    SHA512 d456515dcda7c5e2e257c9fd1441f3a5cff0d33281237fb9e3584bbec08a181c4b037947a6f87d805977ec7528df39b12a5d32f6e8db878a62bcc90482f86e0e
     HEAD_REF master
     PATCHES
         add-options-for-exes-docs-headers.patch
-        linux-cmake.patch
-        "${GETENV_PATCH}"
+		
+        #workaround for vcpkg bug see #5697 on github for more information
+        workaround_cmake_system_processor.patch
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
@@ -51,14 +46,20 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 # Rename libraries for static builds
-if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
-elseif(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib")
+    endif()
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
+    endif()
+else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
+    endif()
 endif()
 
 file(COPY
@@ -70,4 +71,7 @@ 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)
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
+
 vcpkg_test_cmake(PACKAGE_NAME JPEG MODULE)
diff --git a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch
new file mode 100644
index 000000000..613504dfa
--- /dev/null
+++ b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2f137a..3754095 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,7 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}")
+ 
+ # Detect CPU type and whether we're building 64-bit or 32-bit code
+ math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8")
+-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC)
++string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" CMAKE_SYSTEM_PROCESSOR_LC)
+ if(CMAKE_SYSTEM_PROCESSOR_LC MATCHES "x86_64" OR
+   CMAKE_SYSTEM_PROCESSOR_LC MATCHES "amd64" OR
+   CMAKE_SYSTEM_PROCESSOR_LC MATCHES "i[0-9]86" OR
diff --git a/ports/liblemon/CONTROL b/ports/liblemon/CONTROL
index 3e072b7ae..c21960b72 100644
--- a/ports/liblemon/CONTROL
+++ b/ports/liblemon/CONTROL
@@ -1,3 +1,3 @@
-Source: liblemon
-Version: 1.3.1-3
-Description: Library for Efficient Modeling and Optimization in Networks
+Source: liblemon
+Version: 1.3.1-4
+Description: Library for Efficient Modeling and Optimization in Networks
diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake
index 689903024..b41322a87 100644
--- a/ports/liblemon/portfile.cmake
+++ b/ports/liblemon/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("Dynamic linkage not supported. Building static instead.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 set(VERSION 1.3.1)
 
diff --git a/ports/liblinear/CONTROL b/ports/liblinear/CONTROL
index e4e855c52..71e01deab 100644
--- a/ports/liblinear/CONTROL
+++ b/ports/liblinear/CONTROL
@@ -1,3 +1,3 @@
 Source: liblinear
-Version: 221
+Version: 230
 Description: A Library for Large Linear Classification
diff --git a/ports/liblinear/portfile.cmake b/ports/liblinear/portfile.cmake
index a73fa044b..2c71b869a 100644
--- a/ports/liblinear/portfile.cmake
+++ b/ports/liblinear/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cjlin1/liblinear
-    REF v221
-    SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753
+    REF v230
+    SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
     HEAD_REF master
 )
 
diff --git a/ports/liblo/CONTROL b/ports/liblo/CONTROL
index b5c4f6861..5e05c95e3 100644
--- a/ports/liblo/CONTROL
+++ b/ports/liblo/CONTROL
@@ -1,3 +1,3 @@
 Source: liblo
-Version: 0.29-1
+Version: 0.30
 Description: liblo is an implementation of the Open Sound Control protocol for POSIX systems
 \ No newline at end of file
diff --git a/ports/liblo/portfile.cmake b/ports/liblo/portfile.cmake
index 4dae62903..27e41af18 100644
--- a/ports/liblo/portfile.cmake
+++ b/ports/liblo/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO radarsat1/liblo
-    REF 0.29
-    SHA512 45648f2b2280e056b045dc0f08491baa7c154a983af95cf79438ac8fafd8f03a44c337a4beb0e01dce1f4d7352a03dc9088244d8db77dcdbfa6e39874dd6250f
+    REF 0.30
+    SHA512 d36c141c513f869e6d1963bd0d584030038019b8be0b27bb9a684722b6e7a38e942ad2ee7c2e67ac13b965560937aad97259435ed86034aa2dc8cb92d23845d8
     HEAD_REF master
 )
 
diff --git a/ports/liblzma/CMakeLists.txt b/ports/liblzma/CMakeLists.txt
index 6b84c004a..a9927c2b6 100644
--- a/ports/liblzma/CMakeLists.txt
+++ b/ports/liblzma/CMakeLists.txt
@@ -1,22 +1,15 @@
 cmake_minimum_required(VERSION 3.0)
-project(liblzma)
+project(LibLZMA)
 
-add_definitions(-DHAVE_CONFIG_H)
-if(BUILD_SHARED_LIBS)
-    add_definitions(-DLIBLZMADLL_EXPORTS)
-    add_definitions(-DDLL_EXPORT)
-endif()
-
-if(NOT MSVC)
-    add_definitions(-DHAVE_VISIBILITY=1)
-endif()
+set(INSTALL_BIN_DIR      "bin"                CACHE PATH   "Path where exe and dll will be installed")
+set(INSTALL_LIB_DIR      "lib"                CACHE PATH   "Path where lib will be installed")
+set(INSTALL_INCLUDE_DIR  "include"            CACHE PATH   "Path where headers will be installed")
+set(INSTALL_CMAKE_DIR    "share/liblzma"      CACHE PATH   "Path where cmake configs will be installed")
+set(CMAKE_DEBUG_POSTFIX  "d"                  CACHE STRING "Append a suffix to debug libraries")
 
-if(WIN32)
-    include_directories(windows/vs2017)
-else()
-    include_directories(${CMAKE_CURRENT_BINARY_DIR})
+if(NOT WIN32)
     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/config.h
-    """
+    "
 #define TUKLIB_SYMBOL_PREFIX lzma_
 #define ASSUME_RAM 128
 #define HAVE_CHECK_CRC32 1
@@ -58,19 +51,10 @@ else()
 #define PACKAGE_NAME \"XZ Utils\"
 #define PACKAGE_URL \"http://tukaani.org/xz/\"
 #define SIZEOF_SIZE_T (sizeof(size_t))
-""")
+")
 endif()
-include_directories(src/liblzma/common)
-include_directories(src/common)
-include_directories(src/liblzma/api)
-include_directories(src/liblzma/check)
-include_directories(src/liblzma/delta)
-include_directories(src/liblzma/lz)
-include_directories(src/liblzma/lzma)
-include_directories(src/liblzma/rangecoder)
-include_directories(src/liblzma/simple)
 
-add_library(lzma
+add_library(LibLZMA
     src/common/tuklib_cpucores.c
     src/common/tuklib_physmem.c
     src/liblzma/check/check.c
@@ -143,14 +127,56 @@ add_library(lzma
     src/liblzma/simple/simple_decoder.c
     src/liblzma/simple/simple_encoder.c
     src/liblzma/simple/sparc.c
-    src/liblzma/simple/x86.c)
+    src/liblzma/simple/x86.c
+)
 
-install(TARGETS lzma
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib)
+if(MSVC)
+    target_include_directories(LibLZMA PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/windows/vs2017>)
+else()
+    target_compile_definitions(LibLZMA PRIVATE -DHAVE_VISIBILITY=1)
+endif()
 
-if(NOT LIBLZMA_SKIP_HEADERS)
-    install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma DESTINATION include)
-    install(FILES ${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma.h DESTINATION include)
+if(BUILD_SHARED_LIBS)
+    target_compile_definitions(LibLZMA PRIVATE -DDLL_EXPORT)
+    target_compile_definitions(LibLZMA PUBLIC -DLIBLZMADLL_EXPORTS)
+else()
+    target_compile_definitions(LibLZMA PUBLIC -DLZMA_API_STATIC)
 endif()
+target_compile_definitions(LibLZMA PUBLIC -DHAVE_CONFIG_H)
+
+target_include_directories(LibLZMA PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/common>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/common>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/check>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/delta>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/lz>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/rangecoder>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/simple>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/lzma>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/api>
+    $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>
+)
+
+set_target_properties(LibLZMA PROPERTIES OUTPUT_NAME "lzma")
+
+set_target_properties(LibLZMA PROPERTIES PUBLIC_HEADER
+"${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/base.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/bcj.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/block.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/check.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/container.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/delta.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/filter.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/hardware.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/index.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/index_hash.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/lzma12.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/stream_flags.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/version.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/vli.h"
+)
+
+install(TARGETS LibLZMA EXPORT LibLZMATargets
+    RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+    ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+    LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+    PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/lzma"
+)
+
+install(FILES "${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma.h"
+    DESTINATION "${INSTALL_INCLUDE_DIR}"
+)
+
+install(EXPORT LibLZMATargets
+    FILE LibLZMAConfig.cmake
+    NAMESPACE LibLZMA::
+    DESTINATION "${INSTALL_CMAKE_DIR}"
+)
diff --git a/ports/liblzma/CONTROL b/ports/liblzma/CONTROL
index c94576a3f..1a2ee8147 100644
--- a/ports/liblzma/CONTROL
+++ b/ports/liblzma/CONTROL
@@ -1,3 +1,3 @@
-Source: liblzma
-Version: 5.2.4-1
-Description: Compression library with an API similar to that of zlib.
+Source: liblzma
+Version: 5.2.4-2
+Description: Compression library with an API similar to that of zlib.
diff --git a/ports/liblzma/auto-define-lzma-api-static.patch b/ports/liblzma/auto-define-lzma-api-static.patch
deleted file mode 100644
index d897e2457..000000000
--- a/ports/liblzma/auto-define-lzma-api-static.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/lzma.h b/lzma.h
-index ce675a7..ac0fc98 100644
---- a/lzma.h
-+++ b/lzma.h
-@@ -187,6 +187,9 @@
-  * need to worry about LZMA_API_STATIC. Also the calling convention is
-  * omitted on Cygwin but not on MinGW.
-  */
-+ 
-+#define LZMA_API_STATIC
-+ 
- #ifndef LZMA_API_IMPORT
- #	if !defined(LZMA_API_STATIC) && defined(_WIN32) && !defined(__GNUC__)
- #		define LZMA_API_IMPORT __declspec(dllimport)
diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake
index 5534b10e4..e7260309b 100644
--- a/ports/liblzma/portfile.cmake
+++ b/ports/liblzma/portfile.cmake
@@ -15,21 +15,67 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS_DEBUG
-        -DLIBLZMA_SKIP_HEADERS=ON
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
-        PATCHES
-            ${CMAKE_CURRENT_LIST_DIR}/auto-define-lzma-api-static.patch)
+file(APPEND ${CURRENT_PACKAGES_DIR}/share/liblzma/LibLZMAConfig.cmake
+"
+include(\${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
+find_path(LibLZMA_INCLUDE_DIR
+    NAMES lzma.h
+    PATH_SUFFIXES lzma
+)
+if(NOT LibLZMA_LIBRARY)
+    find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma LZMA LibLZMA PATHS \${_IMPORT_PREFIX}/lib/)
+    find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad LZMAd LibLZMAd PATHS \${_IMPORT_PREFIX}/debug/lib/)
+    select_library_configurations(LibLZMA)
+endif()
+set(LibLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
+set(LibLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\")
+set(LZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
+set(LZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\")
+set(LZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
+set(LZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\")
+set(LIBLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
+set(LIBLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\")
+set(LIBLZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
+set(LIBLZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\")
+
+if(LIBLZMA_INCLUDE_DIR AND EXISTS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\")
+    file(STRINGS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\" LIBLZMA_HEADER_CONTENTS REGEX \"#define LZMA_VERSION_[A-Z]+ [0-9]+\")
+
+    string(REGEX REPLACE \".*#define LZMA_VERSION_MAJOR ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_MAJOR \"\${LIBLZMA_HEADER_CONTENTS}\")
+    string(REGEX REPLACE \".*#define LZMA_VERSION_MINOR ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_MINOR \"\${LIBLZMA_HEADER_CONTENTS}\")
+    string(REGEX REPLACE \".*#define LZMA_VERSION_PATCH ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_PATCH \"\${LIBLZMA_HEADER_CONTENTS}\")
+
+    set(LIBLZMA_VERSION_STRING \"\${LIBLZMA_VERSION_MAJOR}.\${LIBLZMA_VERSION_MINOR}.\${LIBLZMA_VERSION_PATCH}\")
+    unset(LIBLZMA_HEADER_CONTENTS)
 endif()
 
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/liblzma/COPYING ${CURRENT_PACKAGES_DIR}/share/liblzma/copyright)
+## We're using new code known now as XZ, even library still been called LZMA
+## it can be found in http://tukaani.org/xz/
+## Avoid using old codebase
+#if (LIBLZMA_LIBRARY)
+#   include(\${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
+#   CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_auto_decoder \"\" LIBLZMA_HAS_AUTO_DECODER)
+#   CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_easy_encoder \"\" LIBLZMA_HAS_EASY_ENCODER)
+#   CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_lzma_preset \"\" LIBLZMA_HAS_LZMA_PRESET)
+#endif ()
+
+set(LibLZMA_FOUND TRUE CACHE BOOL \"\")
+set(LZMA_FOUND TRUE CACHE BOOL \"\")
+set(LIBLZMA_FOUND TRUE CACHE BOOL \"\")
+")
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  file(APPEND ${CURRENT_PACKAGES_DIR}/share/liblzma/LibLZMAConfig.cmake "add_definitions(-DLZMA_API_STATIC)")
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma)
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma)
+file(INSTALL  ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma RENAME copyright)
diff --git a/ports/liblzma/usage b/ports/liblzma/usage
deleted file mode 100644
index 6f5a281a5..000000000
--- a/ports/liblzma/usage
+++ /dev/null
@@ -1,5 +0,0 @@
-The package liblzma is compatible with built-in CMake targets:
-
-    find_package(LibLZMA REQUIRED)
-    target_include_directories(main PRIVATE ${LIBLZMA_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${LIBLZMA_LIBRARIES})
diff --git a/ports/liblzma/vcpkg-cmake-wrapper.cmake b/ports/liblzma/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..b7572d736
--- /dev/null
+++ b/ports/liblzma/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,4 @@
+list(REMOVE_ITEM ARGS "NO_MODULE")
+list(REMOVE_ITEM ARGS "CONFIG")
+list(REMOVE_ITEM ARGS "MODULE")
+_find_package(${ARGS} CONFIG)
diff --git a/ports/libmad/CMakeLists.txt b/ports/libmad/CMakeLists.txt
index 522c0fbea..47db84c41 100644
--- a/ports/libmad/CMakeLists.txt
+++ b/ports/libmad/CMakeLists.txt
@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 project(libmad)
 
- IF(MSVC)
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
- ENDIF(MSVC)
- 
 set(SOURCES
     bit.c
     bit.h
@@ -38,7 +34,7 @@ add_library(
     mad
     ${SOURCES}
 )
- 
+
 target_compile_definitions(mad
     PRIVATE _LIB _MBCS ASO_ZEROCHECK HAVE_CONFIG_H FPM_DEFAULT
     PRIVATE _CRT_SECURE_NO_WARNINGS
diff --git a/ports/libmad/CONTROL b/ports/libmad/CONTROL
index daf25faa1..ae26eebab 100644
--- a/ports/libmad/CONTROL
+++ b/ports/libmad/CONTROL
@@ -1,3 +1,3 @@
-Source: libmad
-Version: 0.15.1-1
-Description: high-quality MPEG audio decoder
+Source: libmad
+Version: 0.15.1-2
+Description: high-quality MPEG audio decoder
diff --git a/ports/libmad/portfile.cmake b/ports/libmad/portfile.cmake
index 65b926d55..cc5027963 100644
--- a/ports/libmad/portfile.cmake
+++ b/ports/libmad/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libmad-0.15.1b)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.sourceforge.net/mad/libmad-0.15.1b.tar.gz"
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL
index 0eff30a4b..147cf11a2 100644
--- a/ports/libmariadb/CONTROL
+++ b/ports/libmariadb/CONTROL
@@ -1,3 +1,3 @@
 Source: libmariadb
-Version: 3.0.2-1
+Version: 3.0.10-1
 Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
diff --git a/ports/libmariadb/disable-test-build.patch b/ports/libmariadb/disable-test-build.patch
new file mode 100644
index 000000000..c877fb50b
--- /dev/null
+++ b/ports/libmariadb/disable-test-build.patch
@@ -0,0 +1,34 @@
+diff --git a/unittest/libmariadb/CMakeLists.txt b/unittest/libmariadb/CMakeLists.txt
+index 9cea916..a39ba94 100644
+--- a/unittest/libmariadb/CMakeLists.txt
++++ b/unittest/libmariadb/CMakeLists.txt
+@@ -58,16 +58,16 @@ ENDIF()
+ 
+ ADD_LIBRARY(ma_getopt ma_getopt.c)
+ 
+-FOREACH(API_TEST ${API_TESTS})
+-  IF (NOT TARGET ${API_TEST})
+-    ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
+-  ENDIF()
+-  TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
+-  ADD_TEST(${API_TEST} ${EXECUTABLE_OUTPUT_PATH}/${API_TEST})
+-  SET_TESTS_PROPERTIES(${API_TEST} PROPERTIES TIMEOUT 180)
+-ENDFOREACH(API_TEST)
+-
+-FOREACH(API_TEST ${MANUAL_TESTS})
+-  ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
+-  TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
+-ENDFOREACH()
++#FOREACH(API_TEST ${API_TESTS})
++#  IF (NOT TARGET ${API_TEST})
++#    ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
++#  ENDIF()
++#  TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
++#  ADD_TEST(${API_TEST} ${EXECUTABLE_OUTPUT_PATH}/${API_TEST})
++#  SET_TESTS_PROPERTIES(${API_TEST} PROPERTIES TIMEOUT 180)
++#ENDFOREACH(API_TEST)
++#
++#FOREACH(API_TEST ${MANUAL_TESTS})
++#  ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
++#  TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
++#ENDFOREACH()
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake
index 95b852698..0089ec0a3 100644
--- a/ports/libmariadb/portfile.cmake
+++ b/ports/libmariadb/portfile.cmake
@@ -8,10 +8,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MariaDB/mariadb-connector-c
-    REF v3.0.2
-    SHA512 a5086ff149b1ca0e1b652013475c5f3793824416a60ec35018b6dcd502bd38b50fa040271ff8d308520dadecc9601671fccf67046fcda2425f1d7c59e1c6c52f
+    REF v3.0.10
+    SHA512 43f89ead531d1b2f6ede943486bf39f606124762309c294b0f3e185937aef7439cb345103fc065e7940ed64c01ca1bf16940cd2fb0d80da60f39009c3b5a910b
     HEAD_REF master
-    PATCHES md.patch
+    PATCHES
+            md.patch
+            disable-test-build.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/libmaxminddb/CONTROL b/ports/libmaxminddb/CONTROL
index a075cdb55..f8b7f85be 100644
--- a/ports/libmaxminddb/CONTROL
+++ b/ports/libmaxminddb/CONTROL
@@ -1,3 +1,3 @@
 Source: libmaxminddb
-Version: 1.3.2-1
+Version: 1.3.2-2
 Description: C library for the MaxMind DB file format
 \ No newline at end of file
diff --git a/ports/libmaxminddb/fix-linux-build.patch b/ports/libmaxminddb/fix-linux-build.patch
new file mode 100644
index 000000000..334b0f64c
--- /dev/null
+++ b/ports/libmaxminddb/fix-linux-build.patch
@@ -0,0 +1,19 @@
+diff --git a/include/maxminddb.h b/include/maxminddb.h
+index de1fdf8..1d17bc3 100644
+--- a/include/maxminddb.h
++++ b/include/maxminddb.h
+@@ -24,11 +24,12 @@ extern "C" {
+ #include <stdio.h>
+ #include <sys/types.h>
+ 
++/* libmaxminddb package version from configure */
++#define PACKAGE_VERSION "1.3.2"
++
+ #ifdef _WIN32
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+-/* libmaxminddb package version from configure */
+-#define PACKAGE_VERSION "1.3.2"
+ 
+ typedef ADDRESS_FAMILY sa_family_t;
+ 
diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake
index f2b17342f..bbc13472e 100644
--- a/ports/libmaxminddb/portfile.cmake
+++ b/ports/libmaxminddb/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     REF 1.3.2
     SHA512 43ff5f4e3a413772cd315412afc1070fb80280405d8845dc9d94a795265a71007c6c182dc01da8e14bf7b8ab8defe05714bec543faa956e7fb0f0a7756e7df48
     HEAD_REF master
+    PATCHES fix-linux-build.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/libmicrohttpd/CMakeLists.txt b/ports/libmicrohttpd/CMakeLists.txt
index d76c09122..b54bb7b53 100644
--- a/ports/libmicrohttpd/CMakeLists.txt
+++ b/ports/libmicrohttpd/CMakeLists.txt
@@ -50,10 +50,6 @@ set(HEADERS
   src/microhttpd/mhd_compat.h
 )
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 include_directories(${HEADERS} src/include w32/common)
 
 add_library(libmicrohttpd ${SRC})
diff --git a/ports/libmicrohttpd/CONTROL b/ports/libmicrohttpd/CONTROL
index 2c5815aed..2c24d4497 100644
--- a/ports/libmicrohttpd/CONTROL
+++ b/ports/libmicrohttpd/CONTROL
@@ -1,3 +1,3 @@
-Source: libmicrohttpd
-Version: 0.9.55-1
-Description: GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application
+Source: libmicrohttpd
+Version: 0.9.63
+Description: GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application
diff --git a/ports/libmicrohttpd/portfile.cmake b/ports/libmicrohttpd/portfile.cmake
index 8b11e3e9c..51f4780a9 100644
--- a/ports/libmicrohttpd/portfile.cmake
+++ b/ports/libmicrohttpd/portfile.cmake
@@ -1,15 +1,17 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libmicrohttpd-0.9.55)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libmicrohttpd-0.9.63)
 vcpkg_download_distfile(ARCHIVE
-    URLS "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.55.tar.gz"
-    FILENAME "libmicrohttpd-0.9.55.tar.gz"
-    SHA512 b410e7253d7c98c40b5e8b8dcd1f93bcbb05c88717190e8dae73073d36465e8e5cfa53c6c5098de60051a5ec64dc423fd94f4b06537d8146b744aa99f5a0b173
+    URLS "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.63.tar.gz"
+    FILENAME "libmicrohttpd-0.9.63.tar.gz"
+    SHA512 cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/libmupdf/CMakeLists.txt b/ports/libmupdf/CMakeLists.txt
index 76ed52c5a..6018c50aa 100644
--- a/ports/libmupdf/CMakeLists.txt
+++ b/ports/libmupdf/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.9)
 project(libmupdf C)
 
 set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/mupdf/pdf/name-table.h")
   execute_process(
@@ -50,4 +49,4 @@ install(TARGETS libmupdf
 if(BUILD_EXAMPLES)
   add_executable(mu-office-test source/tests/mu-office-test.c)
   target_link_libraries(mu-office-test PRIVATE libmupdf)
-endif()
-\ No newline at end of file
+endif()
diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL
index df04d00a2..12060296d 100644
--- a/ports/libmupdf/CONTROL
+++ b/ports/libmupdf/CONTROL
@@ -1,4 +1,4 @@
-Source: libmupdf
-Version: 1.12.0-1
-Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec
-Description: a lightweight PDF, XPS, and E-book library
+Source: libmupdf
+Version: 1.12.0-2
+Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec
+Description: a lightweight PDF, XPS, and E-book library
diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake
index 2af2327cc..b2a56c808 100644
--- a/ports/libmupdf/portfile.cmake
+++ b/ports/libmupdf/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ArtifexSoftware/mupdf
diff --git a/ports/libnoise/CONTROL b/ports/libnoise/CONTROL
new file mode 100644
index 000000000..53009a450
--- /dev/null
+++ b/ports/libnoise/CONTROL
@@ -0,0 +1,3 @@
+Source: libnoise
+Version: 1.0.0
+Description: A general-purpose library that generates three-dimensional coherent noise. Useful for terrain generation and procedural texture generation. Uses a broad number of techniques (Perlin noise, ridged multifractal, etc.) and combinations of those techniques.
diff --git a/ports/libnoise/portfile.cmake b/ports/libnoise/portfile.cmake
new file mode 100644
index 000000000..28465f585
--- /dev/null
+++ b/ports/libnoise/portfile.cmake
@@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+
+set( LIBNOISE_VERSION "1.0.0" )
+set( LIBNOISE_COMMIT "d7e68784a2b24c632868506780eba336ede74ecd" )
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO RobertHue/libnoise
+    REF ${LIBNOISE_COMMIT}
+    SHA512 8c4d654acb4ae3d90ee62ebdf0447f876022dcb887ebfad88f39b09d29183a58e6fc1b1f1d03edff804975c8befcc6eda33c44797495285aae338c2e869a14d7
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+# Include files should not be duplicated into the /debug/include directory.
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/libnoise)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libnoise/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libnoise/copyright)
+
+# Post-build test for cmake libraries
+vcpkg_test_cmake(PACKAGE_NAME libnoise)
+\ No newline at end of file
diff --git a/ports/libodb-boost/CONTROL b/ports/libodb-boost/CONTROL
index 5913d752b..24f7d18b9 100644
--- a/ports/libodb-boost/CONTROL
+++ b/ports/libodb-boost/CONTROL
@@ -1,4 +1,4 @@
 Source: libodb-boost
-Version: 2.4.0-1
+Version: 2.4.0-2
 Description: Description: Boost support for the ODB ORM library
 Build-Depends: libodb
diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake
index 3f8dfc061..212e6b01a 100644
--- a/ports/libodb-boost/portfile.cmake
+++ b/ports/libodb-boost/portfile.cmake
@@ -17,7 +17,7 @@ vcpkg_configure_cmake(
     OPTIONS_DEBUG
         -DLIBODB_INSTALL_HEADERS=OFF
 )
-vcpkg_build_cmake()
+
 vcpkg_install_cmake()
 
 file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake LIBODB_DEBUG_TARGETS)
diff --git a/ports/libodb-pgsql/CONTROL b/ports/libodb-pgsql/CONTROL
index f89d1f37c..d6be72f08 100644
--- a/ports/libodb-pgsql/CONTROL
+++ b/ports/libodb-pgsql/CONTROL
@@ -1,4 +1,4 @@
 Source: libodb-pgsql
-Version: 2.4.0-1
+Version: 2.4.0-2
 Description: Description: PostgreSQL support for the ODB ORM library
 Build-Depends: libodb, libpq
diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake
index cef945c73..3e31f2aa7 100644
--- a/ports/libodb-pgsql/portfile.cmake
+++ b/ports/libodb-pgsql/portfile.cmake
@@ -17,7 +17,7 @@ vcpkg_configure_cmake(
     OPTIONS_DEBUG
         -DLIBODB_INSTALL_HEADERS=OFF
 )
-vcpkg_build_cmake()
+
 vcpkg_install_cmake()
 
 file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_pgsqlConfig-debug.cmake LIBODB_DEBUG_TARGETS)
diff --git a/ports/libodb-sqlite/CONTROL b/ports/libodb-sqlite/CONTROL
index 6a98869bd..e523de989 100644
--- a/ports/libodb-sqlite/CONTROL
+++ b/ports/libodb-sqlite/CONTROL
@@ -1,4 +1,4 @@
 Source: libodb-sqlite
-Version: 2.4.0-2
+Version: 2.4.0-3
 Description: Sqlite support for the ODB ORM library
 Build-Depends: libodb, sqlite3
diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake
index 143d32efb..b301169a7 100644
--- a/ports/libodb-sqlite/portfile.cmake
+++ b/ports/libodb-sqlite/portfile.cmake
@@ -25,7 +25,7 @@ vcpkg_configure_cmake(
     OPTIONS_DEBUG
         -DLIBODB_INSTALL_HEADERS=OFF
 )
-vcpkg_build_cmake()
+
 vcpkg_install_cmake()
 
 file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake LIBODB_DEBUG_TARGETS)
diff --git a/ports/libodb/CONTROL b/ports/libodb/CONTROL
index 28a9f85f4..9e963c89b 100644
--- a/ports/libodb/CONTROL
+++ b/ports/libodb/CONTROL
@@ -1,3 +1,3 @@
 Source: libodb
-Version: 2.4.0-3
+Version: 2.4.0-4
 Description: ODB library, base runtime for the ODB ORM solution
diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake
index 017979dc4..1ca5d4a1a 100644
--- a/ports/libodb/portfile.cmake
+++ b/ports/libodb/portfile.cmake
@@ -25,7 +25,7 @@ vcpkg_configure_cmake(
     OPTIONS_DEBUG
         -DLIBODB_INSTALL_HEADERS=OFF
 )
-vcpkg_build_cmake()
+
 vcpkg_install_cmake()
 file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS)
 string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
diff --git a/ports/libogg/CONTROL b/ports/libogg/CONTROL
index 87169b6ef..965e4e46f 100644
--- a/ports/libogg/CONTROL
+++ b/ports/libogg/CONTROL
@@ -1,3 +1,3 @@
-Source: libogg
-Version: 1.3.3-1
-Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.
+Source: libogg
+Version: 1.3.3-2
+Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.
diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake
index ad8955fa8..3a37e1744 100644
--- a/ports/libogg/portfile.cmake
+++ b/ports/libogg/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xiph/ogg
@@ -11,8 +14,6 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/libp7-baical/CONTROL b/ports/libp7-baical/CONTROL
index ea1739798..8369b65f4 100644
--- a/ports/libp7-baical/CONTROL
+++ b/ports/libp7-baical/CONTROL
@@ -1,3 +1,3 @@
 Source: libp7-baical
-Version: 4.4-3
+Version: 4.4-4
 Description: P7 is a library for high-speed sending telemetry & trace data from application
diff --git a/ports/libp7-baical/portfile.cmake b/ports/libp7-baical/portfile.cmake
index 3edc89c47..fcc51caed 100644
--- a/ports/libp7-baical/portfile.cmake
+++ b/ports/libp7-baical/portfile.cmake
@@ -26,7 +26,6 @@ vcpkg_configure_cmake(
     PREFER_NINJA
 )
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
diff --git a/ports/libpcap/CONTROL b/ports/libpcap/CONTROL
new file mode 100644
index 000000000..c0509704c
--- /dev/null
+++ b/ports/libpcap/CONTROL
@@ -0,0 +1,3 @@
+Source: libpcap
+Version: 1.9.0
+Description: A portable C/C++ library for network traffic capture
diff --git a/ports/libpcap/portfile.cmake b/ports/libpcap/portfile.cmake
new file mode 100644
index 000000000..665e6b603
--- /dev/null
+++ b/ports/libpcap/portfile.cmake
@@ -0,0 +1,75 @@
+include(vcpkg_common_functions)
+
+vcpkg_download_distfile(
+    SOURCE_ARCHIVE_PATH
+    URLS http://www.tcpdump.org/release/libpcap-1.9.0.tar.gz
+    FILENAME libpcap-1.9.0.tar.gz
+    SHA512 0ff25641f1e9d29082766caef45888c19214f770c4f378818caa73fcbc4ae54ad9195549c2499d4879ff46e35741d93b2b02cc5f3d6aa99e85a32194cf10bfe7
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${SOURCE_ARCHIVE_PATH}
+    REF 1.9.0
+)
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    message(FATAL_ERROR "Package only supports linux platform.")
+endif()
+
+message(
+"libpcap currently requires the following libraries from the system package manager:
+    flex
+    libbison-dev
+
+These can be installed on Ubuntu systems via sudo apt install flex libbison-dev"
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(SHARED_STATIC --enable-static --disable-shared)
+else()
+    set(SHARED_STATIC --disable-static --enable-shared)
+endif()
+
+set(OPTIONS ${SHARED_STATIC})
+
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -fPIC -O0 -g -I${SOURCE_PATH}/include")
+set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
+vcpkg_execute_required_process(
+    COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug --enable-usb=no --enable-netmap=no --enable-bluetooth=no --enable-dbus=no --enable-rdma=no --enable-shared=no --with-libnl=no
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+    LOGNAME configure-${TARGET_TRIPLET}-dbg
+)
+message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+vcpkg_execute_required_process(
+    COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+    LOGNAME install-${TARGET_TRIPLET}-dbg
+)
+
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -fPIC -O3 -I${SOURCE_PATH}/include")
+set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
+vcpkg_execute_required_process(
+    COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR} --enable-usb=no --enable-netmap=no --enable-bluetooth=no --enable-dbus=no --enable-rdma=no --enable-shared=no --with-libnl=no
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+    LOGNAME configure-${TARGET_TRIPLET}-rel
+)
+message(STATUS "Building ${TARGET_TRIPLET}-rel")
+vcpkg_execute_required_process(
+    COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+    LOGNAME install-${TARGET_TRIPLET}-rel
+)
+
+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 ${CURRENT_PACKAGES_DIR}/debug/share)
+configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/libpcap/copyright COPYONLY)
diff --git a/ports/libpff/CMakeLists.txt b/ports/libpff/CMakeLists.txt
new file mode 100644
index 000000000..276db5d80
--- /dev/null
+++ b/ports/libpff/CMakeLists.txt
@@ -0,0 +1,81 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(libpff C)
+
+find_package(zlib REQUIRED)
+
+if(MSVC)
+    add_compile_definitions(_CRT_SECURE_NO_DEPRECATE)
+    add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE)
+endif()
+
+add_compile_definitions(HAVE_LOCAL_LIBCERROR)
+add_compile_definitions(HAVE_LOCAL_LIBCTHREADS)
+add_compile_definitions(HAVE_LOCAL_LIBCDATA)
+add_compile_definitions(HAVE_LOCAL_LIBCLOCALE)
+add_compile_definitions(HAVE_LOCAL_LIBCNOTIFY)
+add_compile_definitions(HAVE_LOCAL_LIBCSPLIT)
+add_compile_definitions(HAVE_LOCAL_LIBCFILE)
+add_compile_definitions(HAVE_LOCAL_LIBCPATH)
+add_compile_definitions(HAVE_LOCAL_LIBUNA)
+add_compile_definitions(HAVE_LOCAL_LIBBFIO)
+add_compile_definitions(HAVE_LOCAL_LIBFCACHE)
+add_compile_definitions(HAVE_LOCAL_LIBFDATA)
+add_compile_definitions(HAVE_LOCAL_LIBFDATETIME)
+add_compile_definitions(HAVE_LOCAL_LIBFGUID)
+add_compile_definitions(HAVE_LOCAL_LIBFWNT)
+add_compile_definitions(HAVE_LOCAL_LIBFMAPI)
+add_compile_definitions(HAVE_LOCAL_LIBFVALUE)
+add_compile_definitions(ZLIB_DLL)
+
+add_compile_definitions(LIBPFF_DLL_EXPORT)
+
+if(MSVC)
+    set(LIB_RC libpff/libpff.rc)
+endif()
+
+
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
+# Add CMake find_package() integration
+set(PROJECT_TARGET_NAME "unofficial-${PROJECT_NAME}")
+set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_TARGET_NAME}Config.cmake")
+set(TARGETS_EXPORT_NAME "${PROJECT_TARGET_NAME}Targets")
+set(NAMESPACE "unofficial-libpff::")
+
+# Source files
+file(GLOB LIB_SRC lib*/*.c)
+
+# Headers
+file(GLOB LIB_INST_HEADERS include/libpff/*.h)
+
+add_library(${PROJECT_NAME} ${LIB_SRC} ${LIB_RC})
+
+target_include_directories(${PROJECT_NAME} PRIVATE ./include ./common)
+target_include_directories(${PROJECT_NAME} PRIVATE ./libbfio ./libcdata ./libcerror ./libcfile ./libclocale ./libcnotify)
+target_include_directories(${PROJECT_NAME} PRIVATE ./libcpath ./libcsplit ./libcthreads ./libfcache ./libfdata ./libfdatetime)
+target_include_directories(${PROJECT_NAME} PRIVATE ./libfguid ./libfmapi ./libfvalue ./libfwnt ./libuna)
+
+target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
+
+install(TARGETS ${PROJECT_NAME}
+        EXPORT ${TARGETS_EXPORT_NAME}
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+        INCLUDES DESTINATION include)
+
+install(FILES ${LIB_INST_HEADERS} DESTINATION include/libpff)
+install(FILES include/libpff.h DESTINATION include)
+
+
+# Generate and install unofficial-libpffConfig.cmake
+configure_package_config_file("Config.cmake.in" "${PROJECT_CONFIG}" INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}")
+install(FILES "${PROJECT_CONFIG}" DESTINATION "${CONFIG_INSTALL_DIR}")
+
+# Generate and install unofficial-libpffTargets*.cmake
+install(EXPORT ${TARGETS_EXPORT_NAME}
+        NAMESPACE ${NAMESPACE}
+        DESTINATION "${CONFIG_INSTALL_DIR}")
diff --git a/ports/libpff/CONTROL b/ports/libpff/CONTROL
new file mode 100644
index 000000000..0aeb07a19
--- /dev/null
+++ b/ports/libpff/CONTROL
@@ -0,0 +1,4 @@
+Source: libpff
+Version: 2018-07-14
+Build-Depends: zlib
+Description: Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.
diff --git a/ports/libpff/Config.cmake.in b/ports/libpff/Config.cmake.in
new file mode 100644
index 000000000..bd6bd4532
--- /dev/null
+++ b/ports/libpff/Config.cmake.in
@@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+check_required_components("@PROJECT_NAME@")
diff --git a/ports/libpff/portfile.cmake b/ports/libpff/portfile.cmake
new file mode 100644
index 000000000..f9a56a86e
--- /dev/null
+++ b/ports/libpff/portfile.cmake
@@ -0,0 +1,39 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+set(LIB_VERSION 20180714)
+set(LIB_FILENAME libpff-experimental-${LIB_VERSION}.tar.gz)
+
+# Release distribution file contains configured sources, while the source code in the repository does not.
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/libyal/libpff/releases/download/${LIB_VERSION}/${LIB_FILENAME}"
+    FILENAME "${LIB_FILENAME}"
+    SHA512 7207ba87607ea2fd4609a081c2f4b061344a783e188605e88df99fd473f2a8da1269b065e57b054f4622888d40aa8f2b8272dc4748334ddfe358b28d443d6ad1
+)
+
+ vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${LIB_VERSION}
+)
+
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libpff" TARGET_PATH "share/unofficial-libpff")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+# License and man
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libpff" RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/libpng-apng/CONTROL b/ports/libpng-apng/CONTROL
index 81db06eee..e6b75f486 100644
--- a/ports/libpng-apng/CONTROL
+++ b/ports/libpng-apng/CONTROL
@@ -1,4 +1,4 @@
 Source: libpng-apng
-Version: 1.6.36-1
+Version: 1.6.37
 Build-Depends: zlib
 Description: libpng-apng is a library implementing an interface for reading and writing (A)PNG ((Animated) Portable Network Graphics) format files. This is backward compatible with the regular libpng, both in library usage and format.
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL
index 378e1a139..1baecccf3 100644
--- a/ports/libpng/CONTROL
+++ b/ports/libpng/CONTROL
@@ -1,4 +1,4 @@
 Source: libpng
-Version: 1.6.36-1
+Version: 1.6.37-1
 Build-Depends: zlib
 Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index 51237b675..ab552b8e6 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -3,12 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO glennrp/libpng
-    REF v1.6.36
-    SHA512 aeb00b48347c9e84d31995b3fe7e40580029734aa8103d774eee5745f5ca1fd1fd91a15f32d492277ab94346e4e7f731ee9bfea1783f930094f9f87eb3d9397d
+    REF v1.6.37
+    SHA512 ccb3705c23b2724e86d072e2ac8cfc380f41fadfd6977a248d588a8ad57b6abe0e4155e525243011f245e98d9b7afbe2e8cc7fd4ff7d82fcefb40c0f48f88918
     HEAD_REF master
     PATCHES
-        "use-abort-on-all-platforms.patch"
-        "skip-install-symlink.patch"
+        use-abort-on-all-platforms.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -45,15 +44,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     endif()
 endif()
 
-# Remove CMake config files as they are incorrectly generated and everyone uses built-in FindPNG anyway.
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/libpng ${CURRENT_PACKAGES_DIR}/debug/lib/libpng)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng TARGET_PATH share/libpng)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/)
+
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpng)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libpng/LICENSE ${CURRENT_PACKAGES_DIR}/share/libpng/copyright)
 
 vcpkg_copy_pdbs()
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
 if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/png)
 endif()
diff --git a/ports/libpng/skip-install-symlink.patch b/ports/libpng/skip-install-symlink.patch
deleted file mode 100644
index c31177d7e..000000000
--- a/ports/libpng/skip-install-symlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48c6fa2..589e5f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -868,7 +868,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
--  if(PNG_SHARED)
-+  if(PNG_SHARED AND NOT SKIP_INSTALL_SYMLINK)
-     # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
-     if(CYGWIN OR MINGW)
-       CREATE_SYMLINK(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
-@@ -881,7 +881,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-     endif(NOT WIN32)
-   endif(PNG_SHARED)
- 
--  if(PNG_STATIC)
-+  if(PNG_STATIC AND NOT SKIP_INSTALL_SYMLINK)
-     if(NOT WIN32 OR CYGWIN OR MINGW)
-       CREATE_SYMLINK( libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-       install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/ports/libpng/usage b/ports/libpng/usage
deleted file mode 100644
index 19203399c..000000000
--- a/ports/libpng/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-The package libpng is compatible with built-in CMake targets:
-
-    find_package(PNG REQUIRED)
-    target_link_libraries(main PRIVATE PNG::PNG)
diff --git a/ports/libpq/CMakeLists.txt b/ports/libpq/CMakeLists.txt
index 13c129317..3d5d6e508 100644
--- a/ports/libpq/CMakeLists.txt
+++ b/ports/libpq/CMakeLists.txt
@@ -141,7 +141,7 @@ endif()
 
 target_link_libraries(libpq PRIVATE OpenSSL::SSL)
 if(WIN32)
-    target_link_libraries(libpq PRIVATE ws2_32 secur32 advapi32 shell32)
+    target_link_libraries(libpq PRIVATE ws2_32 secur32 advapi32 shell32 crypt32)
 endif()
 target_include_directories(libpq PRIVATE src/include src/port ${CMAKE_CURRENT_BINARY_DIR}/include)
 set_target_properties(libpq PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL
index ac0793b13..54b2259e8 100644
--- a/ports/libpq/CONTROL
+++ b/ports/libpq/CONTROL
@@ -1,4 +1,4 @@
 Source: libpq
-Version: 9.6.1-6
+Version: 9.6.1-7
 Description: The official database access API of postgresql
 Build-Depends: openssl, zlib (linux)
diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 7b23aed32..5dd4e197c 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -1,11 +1,19 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/postgresql-9.6.3)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} currently only supports being built for desktop")
+endif()
+
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.postgresql.org/pub/source/v9.6.3/postgresql-9.6.3.tar.bz2"
     FILENAME "postgresql-9.6.3.tar.bz2"
     SHA512 97141972e154e6b0e756ee6a4e20f26e82022a9fd4c56305314a3a5567a79ece638e4ac3d513b46138737ae6bd27a098f30013a94767db151181aac9c01290a1
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
diff --git a/ports/libpqxx/CONTROL b/ports/libpqxx/CONTROL
index 900b21f52..1b7bc7649 100644
--- a/ports/libpqxx/CONTROL
+++ b/ports/libpqxx/CONTROL
@@ -1,4 +1,4 @@
 Source: libpqxx
-Version: 6.4.3
+Version: 6.4.4
 Description: The official C++ client API for PostgreSQL
 Build-Depends: libpq
diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake
index e8eaee1f0..944698ceb 100644
--- a/ports/libpqxx/portfile.cmake
+++ b/ports/libpqxx/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jtv/libpqxx
-    REF 6.4.3
-    SHA512  d2d54adf4f498cba0ec20bb37b7a32d18b25e298d81b1884aecb3edec99beca6a10683478e6ca02953ace0b20d335a87b926bf77cbe3cb40822cf12649ea65c5
+    REF 6.4.4
+    SHA512 a168dbc7af210c711fa9f0f6e20d9d3abea167d412a642f591b104a109f11f4c262a27b6919340d405400a58baf7bcc663f7d3ec1b4ecd03f0a4b6c2960b5099
     HEAD_REF master
 	PATCHES
 		fix-deprecated-bug.patch
diff --git a/ports/libqrencode/CONTROL b/ports/libqrencode/CONTROL
index 056d6a92b..c2c126cad 100644
--- a/ports/libqrencode/CONTROL
+++ b/ports/libqrencode/CONTROL
@@ -1,4 +1,4 @@
 Source: libqrencode
-Version: 4.0.0-2
+Version: 4.0.2
 Build-Depends: libpng, libiconv
 Description: libqrencode - a fast and compact QR Code encoding library
diff --git a/ports/libqrencode/portfile.cmake b/ports/libqrencode/portfile.cmake
index 72af0103e..cfcd4650a 100644
--- a/ports/libqrencode/portfile.cmake
+++ b/ports/libqrencode/portfile.cmake
@@ -3,15 +3,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fukuchi/libqrencode
-    REF v4.0.0
-    SHA512 0e4855c7983d4c73eb4a7f9cb081679547957c9f4a30cb943f2ae25e3a6496a202d3489f46e248386499d05a68c6a36e24f64af57ef4d6f447ef3a39e08374ee
+    REF v4.0.2
+    SHA512 847e32bd13358319f3beabde103b5335a6e11c3f9275425b74e89a00b0ee4d67af8a428f12acc8b80a0419382480e5aeb02e58602a69ee750c21b28f357af6bc
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/remove-deprecated-attribute.patch
+    PATCHES remove-deprecated-attribute.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/librabbitmq/CONTROL b/ports/librabbitmq/CONTROL
index 19b131f82..afd552b9b 100644
--- a/ports/librabbitmq/CONTROL
+++ b/ports/librabbitmq/CONTROL
@@ -1,4 +1,4 @@
 Source: librabbitmq
-Version: 0.8.0
+Version: 0.9.0
 Build-Depends: openssl
 Description: A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.
diff --git a/ports/librabbitmq/fix-uwpwarning.patch b/ports/librabbitmq/fix-uwpwarning.patch
new file mode 100644
index 000000000..896145970
--- /dev/null
+++ b/ports/librabbitmq/fix-uwpwarning.patch
@@ -0,0 +1,13 @@
+diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt
+index bd5369a..f6d703f 100644
+--- a/librabbitmq/CMakeLists.txt
++++ b/librabbitmq/CMakeLists.txt
+@@ -113,7 +113,7 @@ set(RABBITMQ_SOURCES
+     ${AMQP_SSL_SRCS}
+ )
+ 
+-add_definitions(-DAMQP_BUILD)
++add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS)
+ 
+ set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT})
+ 
diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake
index cfdcf9527..02ca27c8d 100644
--- a/ports/librabbitmq/portfile.cmake
+++ b/ports/librabbitmq/portfile.cmake
@@ -3,9 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO alanxz/rabbitmq-c
-  REF v0.8.0
-  SHA512 54e1c98a6b0eb7de848c9fac13dcde6455a6f71acee9e62a96c171f0e3e1cf860a70837f07b633d1a55b1ffd3d33ed7186b52495fa4c6e755b69a7e728eb9f1a
+  REF v0.9.0
+  SHA512 a63fe267a3ec112a5e9456a03066132b91f897181947fba18ea3efb14ca0a69996d7dfaecda61a0dd360e03a4e56569e70592e1674b75d20b937a118e1acfc64
   HEAD_REF master
+  PATCHES
+	fix-uwpwarning.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
@@ -15,8 +17,6 @@ vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   OPTIONS
     -DBUILD_EXAMPLES=OFF
-    -DBUILD_SHARED_LIBS=${BUILD_SHARED}
-    -DBUILD_STATIC_LIBS=${BUILD_STATIC}
     -DBUILD_TESTS=OFF
     -DBUILD_TOOLS=OFF
 )
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL
index 8dc420fda..0e4eda530 100644
--- a/ports/libraw/CONTROL
+++ b/ports/libraw/CONTROL
@@ -1,4 +1,4 @@
 Source: libraw
-Version: 0.19.0-3
+Version: 0.19.2
 Build-Depends: lcms, jasper
 Description: raw image decoder library
diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake
index e62079ad3..ccb5b1ccf 100644
--- a/ports/libraw/portfile.cmake
+++ b/ports/libraw/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LibRaw/LibRaw
-    REF 0.19.0
-    SHA512 4fbcce6567463cff1784d0ab9e908906acf79ad3d5af3d52d231f99941b3c3e5daf9049ce2d32a56ba7ec523138ad0c1ff8b61d38fe33abcf1aa6deafd4927f2
+    REF 0.19.2
+    SHA512 78808a0d5f8a2b0f8e52699783d677c645abfdbcf824ea118542ae047767512b7a3d9a3ccfcb786bbfae6ce788df9b2c58afb89dd78e78e755061b742b50bea6
     HEAD_REF master
 )
 
diff --git a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch
new file mode 100644
index 000000000..fa1884a2e
--- /dev/null
+++ b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch
@@ -0,0 +1,254 @@
+diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
+index 3c80458..e8d3bf5 100644
+--- a/apps/ocspcheck/CMakeLists.txt
++++ b/apps/ocspcheck/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-if(NOT MSVC)
+-
+ set(
+ 	OCSPCHECK_SRC
+ 	http.c
+@@ -13,13 +11,27 @@ else()
+         set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
+ endif()
+ 
++check_function_exists(getopt HAVE_GETOPT)
++if(HAVE_GETOPT)
++	add_definitions(-DHAVE_GETOPT)
++else()
++	set(GETOPT_SRC compat/getopt.c)
++endif()
++
++check_function_exists(ftruncate HAVE_FTRUNCATE)
++if(HAVE_FTRUNCATE)
++	add_definitions(-DHAVE_FTRUNCATE)
++else()
++	set(FTRUNCATE_SRC compat/ftruncate.c)
++endif()
++
+ if(NOT "${OPENSSLDIR}" STREQUAL "")
+ 	add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
+ else()
+ 	add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
+ endif()
+ 
+-add_executable(ocspcheck ${OCSPCHECK_SRC})
++add_executable(ocspcheck ${OCSPCHECK_SRC} ${GETOPT_SRC} ${FTRUNCATE_SRC})
+ target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat)
+ target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
+ 
+@@ -28,5 +40,3 @@ if(ENABLE_LIBRESSL_INSTALL)
+ 	install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
+ 
+ endif(ENABLE_LIBRESSL_INSTALL)
+-
+-endif()
+diff --git a/apps/ocspcheck/compat/ftruncate.c b/apps/ocspcheck/compat/ftruncate.c
+new file mode 100644
+index 0000000..e825e50
+--- /dev/null
++++ b/apps/ocspcheck/compat/ftruncate.c
+@@ -0,0 +1,17 @@
++/*
++ * Public domain
++ *
++ * Kinichiro Inoguchi <inoguchi@openbsd.org>
++ */
++
++#ifdef _WIN32
++
++#include <unistd.h>
++
++int
++ftruncate(int fd, off_t length)
++{
++	return _chsize(fd, length);
++}
++
++#endif
+diff --git a/apps/ocspcheck/compat/getopt.c b/apps/ocspcheck/compat/getopt.c
+new file mode 100644
+index 0000000..ff05743
+--- /dev/null
++++ b/apps/ocspcheck/compat/getopt.c
+@@ -0,0 +1,131 @@
++/*
++ * Public domain
++ *
++ * EternalPhane <eternalphane@gmail.com>
++ */
++
++#include <stdlib.h>
++#include <string.h>
++
++#include "getopt.h"
++
++char *optarg = NULL;
++int optind = 0, optopt = '?';
++
++typedef int bool;
++#define true 1
++#define false 0
++
++static int nonopt_begin = 0, nonopt_end = 0;
++
++void clear_buf();
++
++void permute(char *const argv[])
++{
++    static char* buf = NULL;
++    if (!argv && buf)
++        return free(buf);
++    if (!buf)
++        atexit(clear_buf);
++    if (nonopt_begin == nonopt_end)
++    {
++        nonopt_begin = nonopt_end = optind;
++        return;
++    }
++    int nonopt_size = nonopt_end - nonopt_begin,
++        opt_size = optind - nonopt_end;
++    if (nonopt_size <= opt_size)
++    {
++        if (!realloc(buf, nonopt_size))
++            free(buf), buf = malloc(nonopt_size);
++        memcpy(buf, nonopt_begin, nonopt_size);
++        memmove(nonopt_begin, nonopt_end, opt_size);
++        memcpy(nonopt_begin + opt_size, buf, nonopt_size);
++    }
++    else
++    {
++        if (!realloc(buf, opt_size))
++            free(buf), buf = malloc(opt_size);
++        memcpy(buf, nonopt_end, opt_size);
++        memmove(nonopt_begin + opt_size, nonopt_begin, nonopt_size);
++        memcpy(nonopt_begin, buf, opt_size);
++    }
++    nonopt_begin += opt_size;
++    nonopt_end = optind;
++}
++
++void clear_buf()
++{
++    permute(NULL);
++}
++
++int getopt(int argc, char *const argv[], const char *optstring)
++{
++    static char *nextchar = NULL;
++    static bool posixly_correct = false, always_return_nonopt = false;
++    if (optind >= argc)
++        return -1;
++    if (!optind)
++    {
++        nonopt_begin = nonopt_end = 0;
++        posixly_correct = '+' == optstring[0] || getenv("POSIXLY_CORRECT");
++        always_return_nonopt = '-' == optstring[0];
++        if (posixly_correct || always_return_nonopt)
++            optstring++;
++    }
++    if (!nextchar || !*nextchar)
++    {
++        if (!posixly_correct && !always_return_nonopt)
++        {
++            int temp = optind++;
++            for (;;)
++            {
++                if (++temp >= argc || !strcmp("--", argv[temp]))
++                {
++                    permute(argv);
++                    if (temp < argc)
++                    {
++                        optind = temp + 1;
++                        permute(argv);
++                    }
++                    optind = nonopt_begin;
++                    return -1;
++                }
++                if ('-' == argv[temp][0] && argv[temp][1])
++                    break;
++            }
++            if (temp > optind)
++            {
++                permute(argv);
++                nonopt_end = optind = temp;
++            }
++            nextchar = argv[optind] + 1;
++        }
++        else
++        {
++            if (++optind >= argc || !strcmp("--", argv[optind]))
++                return -1;
++            if ('-' != argv[optind][0] || !argv[optind][1])
++                return posixly_correct ? -1 : (optarg = argv[optind++], 1);
++        }
++    }
++    const char *temp = strchr(optstring, *nextchar++);
++    if (!temp)
++        return optopt = *(nextchar - 1), '?';
++    if (':' == temp[1])
++    {
++        bool err = false;
++        if (':' == temp[2])
++            optarg = *nextchar ? nextchar : NULL;
++        else if (*nextchar)
++            optarg = nextchar;
++        else if ('-' != argv[++optind][0])
++            optarg = argv[optind];
++        else
++            return nextchar = argv[optind] + 1,
++                optopt = *temp,
++                ':' == optstring[0] ? ':' : '?';
++        nextchar += strlen(nextchar);
++    }
++    return *temp;
++}
+diff --git a/apps/ocspcheck/compat/getopt.h b/apps/ocspcheck/compat/getopt.h
+new file mode 100644
+index 0000000..ada142e
+--- /dev/null
++++ b/apps/ocspcheck/compat/getopt.h
+@@ -0,0 +1,15 @@
++/*
++ * Public domain
++ *
++ * EternalPhane <eternalphane@gmail.com>
++ */
++
++#ifndef GETOPT_H__
++#define GETOPT_H__
++
++extern char *optarg;
++extern int optind, opterr, optopt;
++
++int getopt(int argc, char *const argv[], const char *optstring);
++
++#endif
+\ No newline at end of file
+diff --git a/apps/ocspcheck/ocspcheck.c b/apps/ocspcheck/ocspcheck.c
+index 551a8fa..c608578 100644
+--- a/apps/ocspcheck/ocspcheck.c
++++ b/apps/ocspcheck/ocspcheck.c
+@@ -519,6 +519,10 @@ main(int argc, char **argv)
+ 	ssize_t written, w;
+ 	short port;
+ 
++#ifndef HAVE_GETOPT
++#include "getopt.h"
++#endif
++
+ 	while ((ch = getopt(argc, argv, "C:i:No:v")) != -1) {
+ 		switch (ch) {
+ 		case 'C':
+diff --git a/include/compat/unistd.h b/include/compat/unistd.h
+index f521b94..f11db44 100644
+--- a/include/compat/unistd.h
++++ b/include/compat/unistd.h
+@@ -23,6 +23,7 @@ ssize_t pwrite(int d, const void *buf, size_t nbytes, off_t offset);
+ #include <io.h>
+ #include <process.h>
+ 
++#define STDIN_FILENO    0
+ #define STDOUT_FILENO   1
+ #define STDERR_FILENO   2
+ 
diff --git a/ports/libressl/0002-suppress-msvc-warnings.patch b/ports/libressl/0002-suppress-msvc-warnings.patch
new file mode 100644
index 000000000..7a5bf0038
--- /dev/null
+++ b/ports/libressl/0002-suppress-msvc-warnings.patch
@@ -0,0 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a6a7554..b20fd4b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -111,6 +111,11 @@ if(WIN32)
+ 	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32)
+ endif()
+ 
++if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912)
++	message(STATUS "Setting /Qspectre switch")
++	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
++endif()
++
+ if(MSVC)
+ 	add_definitions(-Dinline=__inline)
+ 	message(STATUS "Using [${CMAKE_C_COMPILER_ID}] compiler")
+@@ -123,16 +128,29 @@ if(MSVC)
+ 			"C4127" # conditional expression is constant
+ 			"C4146" # unary minus operator applied to unsigned type,
+ 				# result still unsigned
++			"C4242" # 'identifier' : conversion from 'type1' to 'type2',
++				# possible loss of data
+ 			"C4244" # 'argument' : conversion from 'type1' to 'type2',
+ 				# possible loss of data
+ 			"C4245" # 'conversion' : conversion from 'type1' to 'type2',
+ 				# signed/unsigned mismatch
++			"C4255" # 'function' : no function prototype given:
++				# converting '()' to '(void)'
+ 			"C4267" # 'var' : conversion from 'size_t' to 'type',
+ 				# possible loss of data
++			"C4388" # 'expression': signed/unsigned mismatch
+ 			"C4389" # 'operator' : signed/unsigned mismatch
++			"C4464" # relative include path contains '..'
++			"C4668" # 'symbol' is not defined as a preprocessor macro,
++				# replacing with '0' for 'directives'
+ 			"C4706" # assignment within conditional expression
++			"C4710" # 'function' : function not inlined
++			"C4711" # function 'function' selected for inline expansion
++			"C4820" # 'bytes' bytes padding added after construct 'member_name'
+ 			"C4996" # The POSIX name for this item is deprecated.
+ 				# Instead, use the ISO C and C++ conformant name
++			"C5045" # Compiler will insert Spectre mitigation for memory load
++				# if /Qspectre switch specified
+ 		)
+ 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
+ 		add_definitions(-D_CRT_SUPPRESS_RESTRICT)
+
diff --git a/ports/libressl/CONTROL b/ports/libressl/CONTROL
new file mode 100644
index 000000000..989dbfdeb
--- /dev/null
+++ b/ports/libressl/CONTROL
@@ -0,0 +1,6 @@
+Source: libressl
+Version: 2.9.1
+Description: LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.
+
+Feature: tools
+Description: Build openssl and ocspcheck executables
+\ No newline at end of file
diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake
new file mode 100644
index 000000000..d99ee1b62
--- /dev/null
+++ b/ports/libressl/portfile.cmake
@@ -0,0 +1,90 @@
+cmake_minimum_required(VERSION 3.13)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+  message(FATAL_ERROR "${PORT} does not support ARM")
+endif()
+
+include(vcpkg_common_functions)
+
+set(LIBRESSL_VERSION 2.9.1)
+set(LIBRESSL_HASH 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354)
+
+vcpkg_download_distfile(
+    LIBRESSL_SOURCE_ARCHIVE
+    URLS https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz
+    FILENAME ${PORT}-${LIBRESSL_VERSION}.tar.gz
+    SHA512 ${LIBRESSL_HASH}
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE "${LIBRESSL_SOURCE_ARCHIVE}"
+    REF ${LIBRESSL_VERSION}
+    PATCHES
+        0001-enable-ocspcheck-on-msvc.patch
+        0002-suppress-msvc-warnings.patch
+)
+
+set(BUILD_SHARED_LIBS OFF)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(BUILD_SHARED_LIBS ON)
+endif()
+
+set(LIBRESSL_APPS OFF)
+if("tools" IN_LIST FEATURES)
+    set(LIBRESSL_APPS ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DLIBRESSL_APPS=${LIBRESSL_APPS}
+        -DLIBRESSL_TESTS=OFF
+        -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+    OPTIONS_DEBUG
+        -DLIBRESSL_APPS=OFF
+)
+
+vcpkg_install_cmake()
+
+if(LIBRESSL_APPS)
+    if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+        set(EXECUTABLE_SUFFIX .exe)
+    endif()
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl${EXECUTABLE_SUFFIX}")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ocspcheck${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/ocspcheck${EXECUTABLE_SUFFIX}")
+    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl")
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    file(REMOVE_RECURSE
+        "${CURRENT_PACKAGES_DIR}/bin"
+        "${CURRENT_PACKAGES_DIR}/debug/bin"
+    )
+endif()
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/etc/ssl/certs"
+    "${CURRENT_PACKAGES_DIR}/share/man"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+endif()
+
+vcpkg_copy_pdbs()
+
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+if((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) AND BUILD_SHARED_LIBS)
+    file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib")
+    foreach(LIB ${LIBS})
+        string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}")
+        execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "${LIB}" "${LINK}")
+    endforeach()
+endif()
diff --git a/ports/librsync/001-enable-static-libs.patch b/ports/librsync/001-enable-static-libs.patch
new file mode 100644
index 000000000..4512cdeb9
--- /dev/null
+++ b/ports/librsync/001-enable-static-libs.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f0135cb..c30312a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -339,7 +339,7 @@ set(rsync_LIB_SRCS
+     src/whole.c
+     ${blake2_SRCS})
+ 
+-add_library(rsync SHARED ${rsync_LIB_SRCS})
++add_library(rsync ${rsync_LIB_SRCS})
+ target_link_libraries(rsync ${blake2_LIBS})
+ 
+ # Optionally link zlib and bzip2 if
diff --git a/ports/librsync/CONTROL b/ports/librsync/CONTROL
index b51be6105..b17a132eb 100644
--- a/ports/librsync/CONTROL
+++ b/ports/librsync/CONTROL
@@ -1,3 +1,3 @@
 Source: librsync
-Version: 2.0.2
+Version: 2.0.2-1
 Description: librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.
diff --git a/ports/librsync/portfile.cmake b/ports/librsync/portfile.cmake
index 0f9cfad55..f39578dd3 100644
--- a/ports/librsync/portfile.cmake
+++ b/ports/librsync/portfile.cmake
@@ -1,11 +1,15 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO librsync/librsync
     REF v2.0.2
     SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
     HEAD_REF master
+    PATCHES
+        001-enable-static-libs.patch
 )
 
 vcpkg_configure_cmake(
@@ -14,7 +18,6 @@ vcpkg_configure_cmake(
     OPTIONS -DBUILD_RDIFF:BOOL=OFF
             -DENABLE_COMPRESSION:BOOL=OFF
             -DENABLE_TRACE:BOOL=OFF
-            -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS:BOOL=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/libsndfile/CONTROL b/ports/libsndfile/CONTROL
index d448f694c..d8de159b2 100644
--- a/ports/libsndfile/CONTROL
+++ b/ports/libsndfile/CONTROL
@@ -1,5 +1,5 @@
 Source: libsndfile
-Version: 1.0.29-6830c42-5
+Version: 1.0.29-6830c42-6
 Description: Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo
 Default-Features: external-libs
 
diff --git a/ports/libsndfile/fix-install-path.patch b/ports/libsndfile/fix-install-path.patch
new file mode 100644
index 000000000..38c6ff734
--- /dev/null
+++ b/ports/libsndfile/fix-install-path.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc35414..d629adf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -641,12 +641,12 @@ if (ENABLE_PACKAGE_CONFIG)
+ 		LibSndFileConfig.cmake
+ 		INSTALL_DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
+ 
+-	install(EXPORT LibSndFileTargets DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
++	install(EXPORT LibSndFileTargets DESTINATION share/libsndfile)
+ 	install(FILES
+ 				${CMAKE_CURRENT_BINARY_DIR}/LibSndFileConfig.cmake
+ 				${CMAKE_CURRENT_BINARY_DIR}/LibSndFileConfigVersion.cmake
+ 			DESTINATION
+-				${CMAKE_INSTALL_PACKAGEDIR})
++				share/libsndfile)
+ 
+ elseif (NOT ENABLE_PACKAGE_CONFIG)
+ 
+@@ -698,9 +698,9 @@ set (html_DATA
+ 	doc/embedded_files.html
+ 	doc/octave.html
+ 	doc/tutorial.html)
+-install (FILES ${html_DATA} DESTINATION ${CMAKE_INSTALL_DOCDIR})
++#install (FILES ${html_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/libsndfile)
+ 
+-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/sndfile.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++#install (FILES ${CMAKE_CURRENT_BINARY_DIR}/sndfile.pc DESTINATION share/libsndfile/pkgconfig)
+ 
+ #
+ # Testing
diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake
index 1ba590fd7..7c103b6a2 100644
--- a/ports/libsndfile/portfile.cmake
+++ b/ports/libsndfile/portfile.cmake
@@ -7,8 +7,9 @@ vcpkg_from_github(
     SHA512 b13c5d7bc27218eff8a8c4ce89a964b4920b1d3946e4843e60be965d77ec205845750a82bf654a7c2c772bf3a24f6ff5706881b24ff12115f2525c8134b6d0b9
     HEAD_REF master
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize-addendum.patch"
+        uwp-createfile-getfilesize.patch
+        uwp-createfile-getfilesize-addendum.patch
+        fix-install-path.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" CRT_LIB_STATIC)
@@ -25,15 +26,23 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DBUILD_EXAMPLES=0 -DBUILD_REGTEST=0 -DBUILD_TESTING=0 -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC} -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DDISABLE_EXTERNAL_LIBS=${SNDFILE_WITHOUT_EXTERNAL_LIBS}
-    OPTIONS_RELEASE -DBUILD_PROGRAMS=${BUILD_EXECUTABLES}
-    # Setting ENABLE_PACKAGE_CONFIG=0 has no effect
-    OPTIONS_DEBUG -DBUILD_PROGRAMS=0
+    OPTIONS 
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_REGTEST=OFF
+        -DBUILD_TESTING=OFF
+        -DENABLE_BOW_DOCS=OFF
+        -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC}
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC}
+        -DDISABLE_EXTERNAL_LIBS=${SNDFILE_WITHOUT_EXTERNAL_LIBS}
+    OPTIONS_RELEASE
+        -DBUILD_PROGRAMS=${BUILD_EXECUTABLES}
+    OPTIONS_DEBUG
+        -DBUILD_PROGRAMS=0
 )
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/libsndfile)
 
 # Fix applied for 6830c421899e32f8d413a903a21a9b6cf384d369
 file(READ "${CURRENT_PACKAGES_DIR}/share/libsndfile/LibSndFileTargets.cmake" _contents)
@@ -44,11 +53,23 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc/libsndfile ${CURRENT_PACKAGES_DIR}/share/${PORT}/doc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
 
+if(CMAKE_HOST_WIN32)
+    set(EXECUTABLE_SUFFIX ".exe")
+    set(SHARED_LIB_SUFFIX ".dll")
+else()
+    set(EXECUTABLE_SUFFIX)
+    set(SHARED_LIB_SUFFIX)
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libsndfile-1${SHARED_LIB_SUFFIX})
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libnsdfile-1${SHARED_LIB_SUFFIX})
+endif()
+
 if(BUILD_EXECUTABLES)
-    file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+    file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX})
     file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
     file(REMOVE ${TOOLS})
     vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
diff --git a/ports/libsodium/CMakeLists.txt b/ports/libsodium/CMakeLists.txt
new file mode 100644
index 000000000..62e4d1875
--- /dev/null
+++ b/ports/libsodium/CMakeLists.txt
@@ -0,0 +1,742 @@
+cmake_minimum_required(VERSION 3.9)
+
+file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/configure.ac config_ac_contents)
+
+foreach (line ${config_ac_contents})
+    if (line MATCHES "AC_INIT\\(\\[libsodium\\],\\[([0-9.]+)\\],")
+        set(VERSION ${CMAKE_MATCH_1})
+    elseif (line MATCHES "SODIUM_LIBRARY_VERSION_(MAJOR|MINOR)=([0-9]+)")
+        set(SODIUM_LIBRARY_VERSION_${CMAKE_MATCH_1} ${CMAKE_MATCH_2})
+    endif ()
+endforeach ()
+
+message("VERSION: ${VERSION}")
+message("SODIUM_LIBRARY_VERSION_MAJOR: ${SODIUM_LIBRARY_VERSION_MAJOR}")
+message("SODIUM_LIBRARY_VERSION_MINOR: ${SODIUM_LIBRARY_VERSION_MINOR}")
+
+project(sodium VERSION ${VERSION} LANGUAGES C ASM)
+
+include(CheckCSourceCompiles)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CMakePackageConfigHelpers)
+include(CTest)
+include(GNUInstallDirs)
+include(TestBigEndian)
+
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_DISABLE_SOURCE_CHANGES ON)
+set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+
+option(BUILD_SHARED_LIBS "Build shared library" ${BUILD_SHARED_LIBS})
+option(ENABLE_SSP "Compile with -fstack-protector" ON)
+option(ENABLE_PIE "Compile with -fPIE" ON)
+option(ENABLE_BLOCKING_RANDOM "Enable blocking random" OFF)
+option(ENABLE_MINIMAL "Only compile the minimum set of functions required for the high-level API" OFF)
+option(ENABLE_PTHREADS "Use pthreads library" ON)
+option(ENABLE_RETPOLINE "Use return trampolines for indirect calls" OFF)
+
+if (ENABLE_MINIMAL)
+    set(SODIUM_LIBRARY_MINIMAL_DEF "#define SODIUM_LIBRARY_MINIMAL 1")
+endif ()
+
+configure_file(
+    src/libsodium/include/sodium/version.h.in
+    ${CMAKE_BINARY_DIR}/sodium/version.h
+)
+
+file(GLOB sodium_headers
+    ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/*.h
+    ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium.h
+    ${CMAKE_BINARY_DIR}/sodium/version.h
+)
+
+if (UNIX)
+    file(GLOB_RECURSE sodium_sources
+        ${PROJECT_SOURCE_DIR}/src/libsodium/*.c
+        ${PROJECT_SOURCE_DIR}/src/libsodium/*.S # HAVE_AVX_ASM
+    )
+else ()
+    file(GLOB_RECURSE sodium_sources
+        ${PROJECT_SOURCE_DIR}/src/libsodium/*.c
+    ) 
+endif ()
+
+if (MSVC)
+    enable_language(RC)
+
+    list(APPEND sodium_sources
+        builds/msvc/resource.rc
+    )
+endif ()
+
+add_library(${PROJECT_NAME}
+    ${sodium_headers}
+    ${sodium_sources}
+)
+
+set_target_properties(${PROJECT_NAME}
+    PROPERTIES
+        PREFIX ""
+        OUTPUT_NAME "lib${PROJECT_NAME}"
+)
+
+test_big_endian(IS_BIG_ENDIAN)
+
+if (IS_BIG_ENDIAN)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE NATIVE_BIG_ENDIAN)
+else ()
+    target_compile_definitions(${PROJECT_NAME} PRIVATE NATIVE_LITTLE_ENDIAN)
+endif ()
+
+macro (sodium_check_func func var)
+    check_function_exists(${func} ${var})
+    if (${var})
+        target_compile_definitions(${PROJECT_NAME} PRIVATE ${var}=1)
+    endif ()
+endmacro ()
+
+if (MSVC)
+    target_compile_options(${PROJECT_NAME}
+        PRIVATE
+            /D_CONSOLE
+            /D_CRT_SECURE_NO_WARNINGS
+            /DCPU_UNALIGNED_ACCESS=1
+            /MP
+            /Dinline=__inline
+            /wd4068 # Unknown pragma
+            /wd4197
+            /wd4244 # Macro redefinition
+    )
+
+    target_link_libraries(${PROJECT_NAME}
+        PUBLIC
+            advapi32
+    )
+else ()
+    if (ENABLE_BLOCKING_RANDOM)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE USE_BLOCKING_RANDOM)
+    endif ()
+
+    if (ENABLE_PTHREADS)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_PTHREAD)
+        target_compile_options(${PROJECT_NAME} PRIVATE -ftls-model=local-dynamic)
+        target_compile_options(${PROJECT_NAME} PUBLIC -pthread)
+    endif ()
+
+    if (ENABLE_SSP)
+        target_compile_options(${PROJECT_NAME} PRIVATE -fstack-protector-all)
+    endif ()
+
+    if (ENABLE_PIE)
+        target_compile_options(${PROJECT_NAME} PRIVATE -fPIE)
+    endif ()
+
+    if (ENABLE_RETPOLINE)
+        target_compile_options(${PROJECT_NAME}
+            PRIVATE
+                -mindirect-branch=thunk-inline
+                -mindirect-branch-register
+        )
+    endif ()
+
+    target_compile_options(${PROJECT_NAME}
+        PRIVATE
+            -flax-vector-conversions
+            -fvisibility=hidden
+            -fPIC
+            -fwrapv
+            -Wall
+            -Wextra
+            -Wbad-function-cast
+            -Wcast-qual
+            #-Wdiv-by-zero
+            -Wduplicated-branches
+            -Wduplicated-cond
+            -Wfloat-equal
+            -Wformat=2
+            -Wlogical-op
+            -Wmaybe-uninitialized
+            -Wmisleading-indentation
+            -Wmissing-declarations
+            -Wmissing-prototypes
+            -Wnested-externs
+            #-Wno-type-limits
+            #-Wno-unknown-pragmas
+            -Wnormalized=id
+            -Wnull-dereference
+            -Wold-style-declaration
+            -Wpointer-arith
+            -Wredundant-decls
+            -Wrestrict
+            #-Wsometimes-uninitialized
+            -Wstrict-prototypes
+            -Wswitch-enum
+            #-Wvariable-decl
+            -Wwrite-strings
+            -Wl,-z,relro
+            -Wl,-z,now
+            -Wl,-z,noexecstack
+    )
+
+    if (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
+        CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+        target_compile_options(${PROJECT_NAME}
+            PRIVATE
+                -Wno-unknown-warning-option
+                -Wshorten-64-to-32
+        )
+    endif ()
+
+    check_include_file(sys/mman.h HAVE_SYS_MMAN_H)
+    if (HAVE_SYS_MMAN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_SYS_MMAN_H)
+    endif ()
+
+    sodium_check_func(arc4random HAVE_SAFE_ARC4RANDOM)
+    sodium_check_func(mmap HAVE_MMAP)
+    sodium_check_func(mlock HAVE_MLOCK)
+    sodium_check_func(madvise HAVE_MADVISE)
+    sodium_check_func(mprotect HAVE_MPROTECT)
+    sodium_check_func(memset_s HAVE_MEMSET_S)
+    sodium_check_func(explicit_bzero HAVE_EXPLICIT_BZERO)
+    sodium_check_func(explicit_memset HAVE_EXPLICIT_MEMSET)
+    sodium_check_func(nanosleep HAVE_NANOSLEEP)
+    sodium_check_func(posix_memalign HAVE_POSIX_MEMALIGN)
+    sodium_check_func(getpid HAVE_GETPID)
+
+    check_c_source_compiles(
+        "
+        #pragma GCC target(\"mmx\")
+        #include <mmintrin.h>
+        int main(void)
+        {
+          __m64 x = _mm_setzero_si64();
+        }
+        "
+        HAVE_MMINTRIN_H
+    )
+
+    if (HAVE_MMINTRIN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_MMINTRIN_H=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -mmmx)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #pragma GCC target(\"sse2\")
+        #ifndef __SSE2__
+        # define __SSE2__
+        #endif
+        
+        #include <emmintrin.h>
+        int main(void) {
+          __m128d x = _mm_setzero_pd();
+          __m128i z = _mm_srli_epi64(_mm_setzero_si128(), 26);
+        }
+        "
+        HAVE_EMMINTRIN_H
+    )
+
+    if (HAVE_EMMINTRIN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_EMMINTRIN_H=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -msse2)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #pragma GCC target(\"sse3\")
+        #include <pmmintrin.h>
+        int main(void) {
+          __m128 x = _mm_addsub_ps(_mm_cvtpd_ps(_mm_setzero_pd()), _mm_cvtpd_ps(_mm_setzero_pd()));
+        }
+        "
+        HAVE_PMMINTRIN_H
+    )
+
+    if (HAVE_PMMINTRIN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_PMMINTRIN_H=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -msse3)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #pragma GCC target(\"ssse3\")
+        #include <tmmintrin.h>
+        int main(void) {
+          __m64 x = _mm_abs_pi32(_m_from_int(0));
+        }
+        "
+        HAVE_TMMINTRIN_H
+    )
+
+    if (HAVE_TMMINTRIN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_TMMINTRIN_H=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -mssse3)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #pragma GCC target(\"sse4.1\")
+        #include <smmintrin.h>
+        int main(void) {
+          __m128i x = _mm_minpos_epu16(_mm_setzero_si128());
+        }
+        "
+        HAVE_SMMINTRIN_H
+    )
+
+    if (HAVE_SMMINTRIN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_SMMINTRIN_H=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -msse4.1)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #ifdef __native_client__
+        # error NativeClient detected - Avoiding AVX opcodes
+        #endif
+        #pragma GCC target(\"avx\")
+        #include <immintrin.h>
+        int main(void) {
+          _mm256_zeroall();
+        }
+        "
+        HAVE_AVXINTRIN_H
+    )
+
+    if (HAVE_AVXINTRIN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVXINTRIN_H=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -mavx)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #ifdef __native_client__
+        # error NativeClient detected - Avoiding AVX2 opcodes
+        #endif
+        #pragma GCC target(\"avx2\")
+        #include <immintrin.h>
+        int main(void) {
+          __m256 x = _mm256_set1_ps(3.14);
+          __m256 y = _mm256_permutevar8x32_ps(x, _mm256_set1_epi32(42));
+          return _mm256_movemask_ps(_mm256_cmp_ps(x, y, _CMP_NEQ_OQ));
+        }
+        "
+        HAVE_AVX2INTRIN_H
+    )
+
+    if (HAVE_AVX2INTRIN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVX2INTRIN_H=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -mavx2)
+
+        check_c_source_compiles(
+            "
+            #ifdef __native_client__
+            # error NativeClient detected - Avoiding AVX2 opcodes
+            #endif
+            #pragma GCC target(\"avx2\")
+            #include <immintrin.h>
+            int main(void) {
+              __m256i y = _mm256_broadcastsi128_si256(_mm_setzero_si128());
+            }
+            "
+            _mm256_broadcastsi128_si256_DEFINED
+        )
+
+        if (NOT _mm256_broadcastsi128_si256_DEFINED)
+            target_compile_definitions(${PROJECT_NAME}
+                PRIVATE
+                    _mm256_broadcastsi128_si256=_mm_broadcastsi128_si256
+            )
+        endif ()
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #ifdef __native_client__
+        # error NativeClient detected - Avoiding AVX512F opcodes
+        #endif
+        #pragma GCC target(\"avx512f\")
+        #include <immintrin.h>
+        
+        #ifndef __AVX512F__
+        # error No AVX512 support
+        #elif defined(__clang__)
+        # if __clang_major__ < 4
+        #  error Compiler AVX512 support may be broken
+        # endif
+        #elif defined(__GNUC__)
+        # if __GNUC__ < 6
+        #  error Compiler AVX512 support may be broken
+        # endif
+        #endif
+ 
+        int main(void) {
+          __m512i x = _mm512_setzero_epi32();
+          __m512i y = _mm512_permutexvar_epi64(_mm512_setr_epi64(0, 1, 4, 5, 2, 3, 6, 7), x);
+        }
+        "
+        HAVE_AVX512FINTRIN_H
+    )
+
+    if (HAVE_AVX512FINTRIN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVX512FINTRIN_H=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -mavx512f)
+    else ()
+        target_compile_options(${PROJECT_NAME} PRIVATE -mno-avx512f)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #ifdef __native_client__
+        # error NativeClient detected - Avoiding AESNI opcodes
+        #endif
+        #pragma GCC target(\"aes\")
+        #pragma GCC target(\"pclmul\")
+        #include <wmmintrin.h>
+
+        int main(void) {
+          __m128i x = _mm_aesimc_si128(_mm_setzero_si128());
+          __m128i y = _mm_clmulepi64_si128(_mm_setzero_si128(), _mm_setzero_si128(), 0);
+        }
+        "
+        HAVE_WMMINTRIN_H
+    )
+
+    if (HAVE_WMMINTRIN_H)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_WMMINTRIN_H=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -maes -mpclmul)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #ifdef __native_client__
+        # error NativeClient detected - Avoiding RDRAND opcodes
+        #endif
+        #pragma GCC target(\"rdrnd\")
+        #include <immintrin.h>
+
+        int main(void) {
+          unsigned long long x;
+          _rdrand64_step(&x);
+        }
+        "
+        HAVE_RDRAND
+    )
+
+    if (HAVE_RDRAND)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_RDRAND=1)
+        target_compile_options(${PROJECT_NAME} PRIVATE -mrdrnd)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #include <intrin.h>
+
+        int main(void) {
+          (void) _xgetbv(0);
+        }
+        "
+        HAVE__XGETBV
+    )
+
+    if (HAVE__XGETBV)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE__XGETBV=1)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        int main(void) {
+          int a = 42;
+          int *pnt = &a;
+          __asm__ __volatile__ (\"\" : : \"r\"(pnt) : \"memory\");
+        }
+        "
+        HAVE_INLINE_ASM
+    )
+
+    if (HAVE_INLINE_ASM)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_INLINE_ASM=1)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        int main(void) {
+        #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
+        # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
+        #  error Windows x86_64 calling conventions are not supported yet
+        # endif
+        /* neat */
+        #else
+        # error !x86_64
+        #endif
+          unsigned char i = 0, o = 0, t;
+          __asm__ __volatile__ (\"pxor %%xmm12, %%xmm6 \n\"
+            \"movb (%[i]), %[t] \n\"
+            \"addb %[t], (%[o]) \n\"
+            : [t] \"=&r\"(t)
+            : [o] \"D\"(&o), [i] \"S\"(&i)
+            : \"memory\", \"flags\", \"cc\");
+        }
+        "
+        HAVE_AMD64_ASM
+    )
+
+    if (HAVE_AMD64_ASM)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AMD64_ASM=1)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        int main(void) {
+        #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
+        # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
+        #  error Windows x86_64 calling conventions are not supported yet
+        # endif
+        /* neat */
+        #else
+        # error !x86_64
+        #endif
+          __asm__ __volatile__ (\"vpunpcklqdq %xmm0,%xmm13,%xmm0\");
+        }
+        "
+        HAVE_AVX_ASM
+    )
+
+    if (HAVE_AVX_ASM)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_AVX_ASM=1)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #if !defined(__clang__) && !defined(__GNUC__) && !defined(__SIZEOF_INT128__)
+        # error mode(TI) is a gcc extension, and __int128 is not available
+        #endif
+        #if defined(__clang__) && !defined(__x86_64__) && !defined(__aarch64__)
+        # error clang does not properly handle the 128-bit type on 32-bit systems
+        #endif
+        #ifndef NATIVE_LITTLE_ENDIAN
+        # error libsodium currently expects a little endian CPU for the 128-bit type
+        #endif
+        #ifdef __EMSCRIPTEN__
+        # error emscripten currently doesn't support some operations on integers larger than 64 bits
+        #endif
+        #include <stddef.h>
+        #include <stdint.h>
+        #if defined(__SIZEOF_INT128__)
+        typedef unsigned __int128 uint128_t;
+        #else
+        typedef unsigned uint128_t __attribute__((mode(TI)));
+        #endif
+        void fcontract(uint128_t *t) {
+          *t += 0x8000000000000 - 1;
+          *t *= *t;
+          *t >>= 84;
+        }
+
+        int main(void) {
+          (void) fcontract;
+        }
+        "
+        HAVE_TI_MODE
+    )
+
+    if (HAVE_TI_MODE)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_TI_MODE=1)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        int main(void) {
+          unsigned int cpu_info[4];
+          __asm__ __volatile__ (\"xchgl %%ebx, %k1; cpuid; xchgl %%ebx, %k1\" :
+            \"=a\" (cpu_info[0]), \"=&r\" (cpu_info[1]),
+            \"=c\" (cpu_info[2]), \"=d\" (cpu_info[3]) :
+            \"0\" (0U), \"2\" (0U));
+        }
+        "
+        HAVE_CPUID
+    )
+
+    if (HAVE_CPUID)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CPUID=1)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #if !defined(__ELF__) && !defined(__APPLE_CC__)
+        # error Support for weak symbols may not be available
+        #endif
+        __attribute__((weak)) void __dummy(void *x) { }
+        void f(void *x) { __dummy(x); }
+        int main(void) {}
+        "
+        HAVE_WEAK_SYMBOLS
+    )
+
+    if (HAVE_WEAK_SYMBOLS)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_WEAK_SYMBOLS=1)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        int main(void) {
+          static volatile int _sodium_lock;
+          __sync_lock_test_and_set(&_sodium_lock, 1);
+          __sync_lock_release(&_sodium_lock);
+        }
+        "
+        HAVE_ATOMIC_OPS
+    )
+
+    if (HAVE_ATOMIC_OPS)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_ATOMIC_OPS=1)
+    endif ()
+
+    check_c_source_compiles(
+        "
+        #include <limits.h>
+        #include <stdint.h>
+        int main(void) {
+          (void) SIZE_MAX;
+          (void) UINT64_MAX;
+        }
+        "
+        STDC_LIMIT_MACROS_REQUIRED
+    )
+
+    if (STDC_LIMIT_MACROS_REQUIRED)
+        target_compile_definitions(${PROJECT_NAME}
+            PRIVATE
+                __STDC_LIMIT_MACROS
+                __STDC_CONSTANT_MACROS
+        )
+    endif ()
+
+    # include/sodium/private/common.h
+    target_compile_definitions(${PROJECT_NAME} PRIVATE CONFIGURED=1)
+endif ()
+
+if (BUILD_SHARED_LIBS)
+    if (MSVC)
+        target_compile_definitions(${PROJECT_NAME}
+            PRIVATE
+                SODIUM_DLL_EXPORT
+        )
+    endif ()
+else ()
+    target_compile_definitions(${PROJECT_NAME}
+        PUBLIC
+            SODIUM_STATIC
+    )
+endif ()
+
+target_include_directories(${PROJECT_NAME}
+    PRIVATE
+        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium>
+        $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/sodium>
+)
+
+if (BUILD_TESTING)
+    file(GLOB sodium_test_sources ${PROJECT_SOURCE_DIR}/test/default/*.c)
+
+    foreach (test_src ${sodium_test_sources})
+        get_filename_component(test_name ${test_src} NAME_WE)
+        
+        add_executable(${test_name} ${test_src})
+        
+        if (MSVC)
+            target_compile_definitions(${test_name} PRIVATE _CRT_SECURE_NO_WARNINGS)
+        endif ()
+        
+        target_include_directories(${test_name}
+            PRIVATE
+                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/libsodium/include>
+                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium>
+                $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
+                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/test/quirks>
+        )
+
+        target_link_libraries(${test_name} PRIVATE ${PROJECT_NAME})
+
+        add_custom_command(TARGET ${test_name} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${CMAKE_CURRENT_LIST_DIR}/test/default/${test_name}.exp"
+            $<TARGET_FILE_DIR:${test_name}>)
+
+        add_test(
+            NAME ${test_name}
+            COMMAND ${test_name}
+            WORKING_DIRECTORY $<TARGET_FILE_DIR:${test_name}>
+        )
+    endforeach ()
+endif ()
+
+install(DIRECTORY src/libsodium/include/
+    DESTINATION include/
+    USE_SOURCE_PERMISSIONS
+    PATTERN "*.h"
+    PATTERN "*.h.in" EXCLUDE
+    REGEX "private($|/)" EXCLUDE
+)
+
+install(FILES ${CMAKE_BINARY_DIR}/sodium/version.h
+    DESTINATION include/sodium
+)
+
+install(TARGETS ${PROJECT_NAME}
+    EXPORT ${PROJECT_NAME}-targets
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+install(EXPORT ${PROJECT_NAME}-targets
+    FILE unofficial-${PROJECT_NAME}Targets.cmake
+    NAMESPACE unofficial-${PROJECT_NAME}::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-${PROJECT_NAME}
+)
+
+set(TARGET_NAME unofficial-${PROJECT_NAME}::${PROJECT_NAME})
+
+configure_package_config_file(
+    ${PROJECT_NAME}Config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}Config.cmake
+    INSTALL_DESTINATION ${PROJECT_BINARY_DIR}
+)
+
+write_basic_package_version_file(
+    ${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake
+    VERSION ${VERSION}
+    COMPATIBILITY AnyNewerVersion
+)
+
+unset(TARGET_NAME)
+
+install(
+    FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}Config.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-${PROJECT_NAME}
+)
+
+# References:
+# https://github.com/boost-cmake/bcm/wiki/Cmake-best-practices-and-guidelines
+# https://github.com/jedisct1/libsodium/pull/74/files
+# https://github.com/jedisct1/libsodium/pull/156/files
+# https://github.com/jedisct1/libsodium/pull/181/files
+# https://github.com/jedisct1/libsodium/issues/378
+# https://github.com/jedisct1/libsodium/issues/636
+# https://github.com/jedisct1/libsodium/issues/771
+# https://github.com/jedisct1/libsodium/blob/gyp/sodium.gyp
+# https://github.com/imefisto/cmake-libsodium
+# https://github.com/Cyberunner23/libsodium-CMake
+# https://stackoverflow.com/questions/29901352/appending-to-cmake-c-flags
+# https://stackoverflow.com/questions/986426/what-do-stdc-limit-macros-and-stdc-constant-macros-mean
+# https://gcc.gnu.org/onlinedocs/gcc/Option-Summary.html
+# https://stackoverflow.com/questions/15132185/mixing-c-and-assembly-sources-and-build-with-cmake
+# https://stackoverflow.com/questions/647892/how-to-check-header-files-and-library-functions-in-cmake-like-it-is-done-in-auto
+# https://stackoverflow.com/questions/31038963/how-do-you-rename-a-library-filename-in-cmake
diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL
index b84d40caf..a994a1729 100644
--- a/ports/libsodium/CONTROL
+++ b/ports/libsodium/CONTROL
@@ -1,3 +1,3 @@
 Source: libsodium
-Version: 1.0.17-1
+Version: 1.0.17-2
 Description: A modern and easy-to-use crypto library
diff --git a/ports/libsodium/disable-tests.patch b/ports/libsodium/disable-tests.patch
deleted file mode 100644
index 24bcc1d83..000000000
--- a/ports/libsodium/disable-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/msvc-scripts/sodium.props b/msvc-scripts/sodium.props
-index 41e1e47..3126455 100644
---- a/msvc-scripts/sodium.props
-+++ b/msvc-scripts/sodium.props
-@@ -17,9 +17,9 @@
-     <PreBuildEvent>
-       <Message>Process .in files</Message>
-     </PreBuildEvent>
--    <PostBuildEvent>
-+    <!-- <PostBuildEvent>
-       <Command>"$(SolutionDir)/test/default/wintest.bat" $(Configuration) $(Platform)</Command>
--    </PostBuildEvent>
-+    </PostBuildEvent> -->
-     <PostBuildEvent>
-       <Message>Run the test suite</Message>
-     </PostBuildEvent>
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake
index 60628b08e..b8321c6ac 100644
--- a/ports/libsodium/portfile.cmake
+++ b/ports/libsodium/portfile.cmake
@@ -6,73 +6,52 @@ vcpkg_from_github(
     REF 1.0.17
     SHA512 faf6ab57d113b6b1614b51390823a646f059018327b6f493e9e918a908652d0932a75a1a6683032b7a3869f516f387d67acdf944568387feddff7b2f5b6e77d6
     HEAD_REF master
-    PATCHES
-        "disable-tests.patch"
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    set(LIBSODIUM_RELEASE_CONFIGURATION ReleaseDLL)
-    set(LIBSODIUM_DEBUG_CONFIGURATION DebugDLL)
-else()
-    set(LIBSODIUM_RELEASE_CONFIGURATION Release)
-    set(LIBSODIUM_DEBUG_CONFIGURATION Debug)
-endif()
-
-IF(VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
-    SET(BUILD_ARCH "Win32")
-ELSE()
-    SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE})
-ENDIF()
-
-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj
-    RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION}
-    DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION}
-    OPTIONS
-        /p:ForceImportBeforeCppTargets=${SOURCE_PATH}/builds/msvc/properties/${BUILD_ARCH}.props
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+    ${SOURCE_PATH}/CMakeLists.txt
+    COPYONLY
 )
 
-file(INSTALL
-    ${SOURCE_PATH}/src/libsodium/include/sodium.h
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/sodiumConfig.cmake.in
+    ${SOURCE_PATH}/sodiumConfig.cmake.in
+    COPYONLY
 )
 
-file(GLOB LIBSODIUM_HEADERS "${SOURCE_PATH}/src/libsodium/include/sodium/*.h")
-file(INSTALL
-    ${LIBSODIUM_HEADERS}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include/sodium
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTING=OFF
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(READ ${CURRENT_PACKAGES_DIR}/include/sodium/export.h _contents)
-    string(REPLACE "#ifdef SODIUM_STATIC" "#if 1 //#ifdef SODIUM_STATIC" _contents "${_contents}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/sodium/export.h "${_contents}")
-endif ()
+vcpkg_install_cmake()
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(INSTALL
-        ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll
-        DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-    )
-    file(INSTALL
-    ${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-    )
-endif()
+vcpkg_copy_pdbs()
 
-file(INSTALL
-    ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/unofficial-sodium
+    TARGET_PATH share/unofficial-sodium
 )
-file(INSTALL
-    ${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
 )
 
-vcpkg_copy_pdbs()
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string(
+        ${CURRENT_PACKAGES_DIR}/include/sodium/export.h
+        "#ifdef SODIUM_STATIC"
+        "#if 1 //#ifdef SODIUM_STATIC"
+    )
+endif ()
 
-file(INSTALL
+configure_file(
     ${SOURCE_PATH}/LICENSE
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsodium
-    RENAME copyright
+    ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright
+    COPYONLY
 )
+
+#vcpkg_test_cmake(PACKAGE_NAME unofficial-sodium)
diff --git a/ports/libsodium/sodiumConfig.cmake.in b/ports/libsodium/sodiumConfig.cmake.in
new file mode 100644
index 000000000..d416e2bca
--- /dev/null
+++ b/ports/libsodium/sodiumConfig.cmake.in
@@ -0,0 +1,61 @@
+# sodium cmake module
+# This module sets the following variables in your project:
+#
+#   sodium_FOUND - true if sodium found on the system
+#   sodium_INCLUDE_DIR - the directory containing sodium headers
+#   sodium_LIBRARY_DEBUG
+#   sodium_LIBRARY_RELEASE
+#   sodium_LIBRARIES
+#   sodium_VERSION
+#
+
+include(FindPackageHandleStandardArgs)
+include(SelectLibraryConfigurations)
+
+@PACKAGE_INIT@
+
+if (NOT TARGET @TARGET_NAME@)
+    include("${CMAKE_CURRENT_LIST_DIR}/unofficial-@PROJECT_NAME@Targets.cmake")
+
+    set(@PROJECT_NAME@_VERSION @VERSION@)
+
+    get_target_property(@PROJECT_NAME@_INCLUDE_DIR @TARGET_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
+
+    get_target_property(@PROJECT_NAME@_LIBRARY_DEBUG @TARGET_NAME@ IMPORTED_IMPLIB_DEBUG)
+    if (@PROJECT_NAME@_LIBRARY_DEBUG MATCHES ".*-NOTFOUND")
+        get_target_property(@PROJECT_NAME@_LIBRARY_DEBUG @TARGET_NAME@ IMPORTED_LOCATION_DEBUG)
+    else ()
+        get_target_property(@PROJECT_NAME@_DLL_DEBUG @TARGET_NAME@ IMPORTED_LOCATION_DEBUG)
+    endif ()
+
+    get_target_property(@PROJECT_NAME@_LIBRARY_RELEASE @TARGET_NAME@ IMPORTED_IMPLIB_RELEASE)
+    if (@PROJECT_NAME@_LIBRARY_RELEASE MATCHES ".*-NOTFOUND")
+        get_target_property(@PROJECT_NAME@_LIBRARY_RELEASE @TARGET_NAME@ IMPORTED_LOCATION_RELEASE)
+    else ()
+        get_target_property(@PROJECT_NAME@_DLL_RELEASE @TARGET_NAME@ IMPORTED_LOCATION_RELEASE)
+    endif ()
+
+    select_library_configurations(@PROJECT_NAME@)
+endif ()
+
+find_package_handle_standard_args(
+    @PROJECT_NAME@
+    REQUIRED_VARS
+        @PROJECT_NAME@_INCLUDE_DIR
+        @PROJECT_NAME@_LIBRARIES
+    VERSION_VAR
+        @PROJECT_NAME@_VERSION
+)
+
+mark_as_advanced(@PROJECT_NAME@_INCLUDE_DIR)
+
+if (WIN32)
+    mark_as_advanced(@PROJECT_NAME@_DLL_DEBUG)
+    mark_as_advanced(@PROJECT_NAME@_DLL_RELEASE)
+endif()
+
+
+# References:
+# https://github.com/jedisct1/libsodium/blob/master/contrib/Findsodium.cmake
+# https://github.com/QuantStack/xeus/blob/master/xeusConfig.cmake.in
+# https://github.com/zeromq/libzmq/blob/master/builds/cmake/ZeroMQConfig.cmake.in
diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL
index bb19a0605..c535d33e1 100644
--- a/ports/libspatialite/CONTROL
+++ b/ports/libspatialite/CONTROL
@@ -1,5 +1,5 @@
 Source: libspatialite
-Version: 4.3.0a-2
+Version: 4.3.0a-3
 Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.
 Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv
 
diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake
index 59a1499f4..b73733ff2 100644
--- a/ports/libspatialite/portfile.cmake
+++ b/ports/libspatialite/portfile.cmake
@@ -33,10 +33,10 @@ else()
     set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libgeos_c.lib ${CURRENT_INSTALLED_DIR}/lib/libgeos.lib")
     set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libgeos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib")
     set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib")
-    set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzma.lib ws2_32.lib")
+    set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib")
 endif()
 
-set(LIBS_ALL_DBG 
+set(LIBS_ALL_DBG
     "${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib \
     ${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib \
     ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \
@@ -46,7 +46,7 @@ set(LIBS_ALL_DBG
     ${GEOS_LIBS_DBG} \
     ${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib"
    )
-set(LIBS_ALL_REL 
+set(LIBS_ALL_REL
     "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib \
     ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib \
     ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \
diff --git a/ports/libsquish/CONTROL b/ports/libsquish/CONTROL
new file mode 100644
index 000000000..9cc2e5097
--- /dev/null
+++ b/ports/libsquish/CONTROL
@@ -0,0 +1,3 @@
+Source: libsquish
+Version: 1.15
+Description: Open source DXT compression library.
diff --git a/ports/libsquish/fix-export-symbols.patch b/ports/libsquish/fix-export-symbols.patch
new file mode 100644
index 000000000..febf2eb51
--- /dev/null
+++ b/ports/libsquish/fix-export-symbols.patch
@@ -0,0 +1,98 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a36e574..a3ecdde 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,6 +75,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ ADD_LIBRARY(squish ${SQUISH_SRCS} ${SQUISH_HDRS})
+ 
++INCLUDE(GenerateExportHeader)
++GENERATE_EXPORT_HEADER(squish
++    EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/squish_export.h
++    )
++
++list(APPEND SQUISH_HDRS "squish_export.h")
++
+ SET_TARGET_PROPERTIES(
+     squish PROPERTIES
+     PUBLIC_HEADER "${SQUISH_HDRS}"
+@@ -109,9 +116,12 @@ IF (BUILD_SQUISH_EXTRA)
+     ENDIF (PNG_FOUND)
+ ENDIF (BUILD_SQUISH_EXTRA)
+ 
++INCLUDE(GNUInstallDirs)
++
+ INSTALL(
+     TARGETS squish
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib
+-    PUBLIC_HEADER DESTINATION include
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     )
+diff --git a/squish.h b/squish.h
+index 14c9bb5..aaffbb2 100644
+--- a/squish.h
++++ b/squish.h
+@@ -26,6 +26,8 @@
+ #ifndef SQUISH_H
+ #define SQUISH_H
+ 
++#include "squish_export.h"
++
+ //! All squish API functions live in this namespace.
+ namespace squish {
+ 
+@@ -176,7 +178,7 @@ inline void Compress( u8 const* rgba, void* block, int flags, float* metric = 0
+     however, DXT1 will be used by default if none is specified. All other flags
+     are ignored.
+ */
+-void Decompress( u8* rgba, void const* block, int flags );
++SQUISH_EXPORT void Decompress( u8* rgba, void const* block, int flags );
+ 
+ // -----------------------------------------------------------------------------
+ 
+@@ -194,7 +196,7 @@ void Decompress( u8* rgba, void const* block, int flags );
+     function supports arbitrary size images by allowing the outer blocks to
+     be only partially used.
+ */
+-int GetStorageRequirements( int width, int height, int flags );
++SQUISH_EXPORT int GetStorageRequirements( int width, int height, int flags );
+ 
+ // -----------------------------------------------------------------------------
+ 
+@@ -249,8 +251,8 @@ int GetStorageRequirements( int width, int height, int flags );
+     Windows platform but for other platforms like MacOS X a different
+     gamma value may be more suitable.
+ */
+-void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 );
+-void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 );
++SQUISH_EXPORT void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 );
++SQUISH_EXPORT void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 );
+ 
+ // -----------------------------------------------------------------------------
+ 
+@@ -274,8 +276,8 @@ void CompressImage( u8 const* rgba, int width, int height, void* blocks, int fla
+ 
+     Internally this function calls squish::Decompress for each block.
+ */
+-void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags );
+-void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags );
++SQUISH_EXPORT void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags );
++SQUISH_EXPORT void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags );
+ 
+ // -----------------------------------------------------------------------------
+ 
+@@ -299,8 +301,8 @@ void DecompressImage( u8* rgba, int width, int height, void const* blocks, int f
+ 
+     Internally this function calls squish::Decompress for each block.
+ */
+-void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
+-void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
++SQUISH_EXPORT void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
++SQUISH_EXPORT void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
+ 
+ // -----------------------------------------------------------------------------
+ 
diff --git a/ports/libsquish/portfile.cmake b/ports/libsquish/portfile.cmake
new file mode 100644
index 000000000..dbebf9566
--- /dev/null
+++ b/ports/libsquish/portfile.cmake
@@ -0,0 +1,40 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+
+include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://downloads.sourceforge.net/project/libsquish/libsquish-1.15.tgz"
+    FILENAME "libsquish-1.15.tgz"
+    SHA512 5b569b7023874c7a43063107e2e428ea19e6eb00de045a4a13fafe852ed5402093db4b65d540b5971ec2be0d21cb97dfad9161ebfe6cf6e5376174ff6c6c3e7a
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE} 
+    NO_REMOVE_ONE_LEVEL
+    REF v1.15
+    PATCHES
+        fix-export-symbols.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsquish)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libsquish/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/libsquish/copyright)
diff --git a/ports/libssh2/CONTROL b/ports/libssh2/CONTROL
index 4a95c72b6..79cca7867 100644
--- a/ports/libssh2/CONTROL
+++ b/ports/libssh2/CONTROL
@@ -1,4 +1,4 @@
 Source: libssh2
-Version: 1.8.0-4
+Version: 1.8.2
 Build-Depends: zlib, openssl
 Description: The SSH library
diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake
index e080cf81e..e8a4e3565 100644
--- a/ports/libssh2/portfile.cmake
+++ b/ports/libssh2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libssh2/libssh2
-    REF libssh2-1.8.0
-    SHA512 c157db0628126d6348ed52a698fbdd7e20b54b6115123bd7d238f02fda5c68ca7a1585aed8a2376df0840f4a3823743133996192001ae54864ab53c954b938e7
+    REF libssh2-1.8.2
+    SHA512 f676f8c2d1c66cd086ad5a1d328e3eb3a033afd4511577451c5664a4e0c4c1ea006fa1885f332fb2b3842b2eb30456322efdd2abf97c2f148c2be0d53e3e5624
     HEAD_REF master
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch"
 )
diff --git a/ports/libstemmer/CONTROL b/ports/libstemmer/CONTROL
index c09295b62..a5275ea71 100644
--- a/ports/libstemmer/CONTROL
+++ b/ports/libstemmer/CONTROL
@@ -1,3 +1,3 @@
-Source: libstemmer
-Version: 2017-9-3
-Description: Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval
+Source: libstemmer
+Version: 2017-9-4
+Description: Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval
diff --git a/ports/libstemmer/portfile.cmake b/ports/libstemmer/portfile.cmake
index 9a76c3a94..ed4d86c4e 100644
--- a/ports/libstemmer/portfile.cmake
+++ b/ports/libstemmer/portfile.cmake
@@ -1,8 +1,7 @@
 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)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libstemmer_c)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://snowball.tartarus.org/dist/libstemmer_c.tgz"
diff --git a/ports/libstk/CONTROL b/ports/libstk/CONTROL
index e8f1382b5..1de9780e1 100644
--- a/ports/libstk/CONTROL
+++ b/ports/libstk/CONTROL
@@ -1,3 +1,3 @@
 Source: libstk
-Version: 4.6.0-2
+Version: 4.6.1
 Description: The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language. 
diff --git a/ports/libstk/portfile.cmake b/ports/libstk/portfile.cmake
index 1d8ec73f1..84b929773 100644
--- a/ports/libstk/portfile.cmake
+++ b/ports/libstk/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO thestk/stk
-    REF v4.6.0
-    SHA512 8e40dbd9e2b315df769262889fdf15b4a67843984d27a1f939d8bc6e820abb662eeae3b934fa81097222c67f7922681fe170006bebe5597cbd51b0a8624a6733
+    REF 4.6.1
+    SHA512 61d4db7b4a45446e231dedc13e139cb488e2ce805278f0b20aa95e69ddb1fa9be549ab5f1fe24c69aa865ebc2940d5fba6e3819a1a7fb1d68e236131fcfb4cac
     HEAD_REF master
 )
 
diff --git a/ports/libtheora/CONTROL b/ports/libtheora/CONTROL
index 7324f0526..114d42b05 100644
--- a/ports/libtheora/CONTROL
+++ b/ports/libtheora/CONTROL
@@ -1,4 +1,4 @@
 Source: libtheora
-Version: 1.2.0alpha1-20170719~vcpkg1-1
+Version: 1.2.0alpha1-20170719~vcpkg1-3
 Description: Theora is a free and open video compression format from the Xiph.org Foundation.
 Build-Depends: libogg
diff --git a/ports/libtheora/FindOGG.cmake b/ports/libtheora/FindOGG.cmake
index fc0d15feb..ba3c8b1b6 100644
--- a/ports/libtheora/FindOGG.cmake
+++ b/ports/libtheora/FindOGG.cmake
@@ -1,6 +1,6 @@
 find_path(OGG_INCLUDE_DIR NAMES ogg/ogg.h)
 
-find_library(OGG_LIBRARY NAMES ogg)
+find_library(OGG_LIBRARY NAMES ogg libogg)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(OGG DEFAULT_MSG OGG_LIBRARY OGG_INCLUDE_DIR)
diff --git a/ports/libtheora/portfile.cmake b/ports/libtheora/portfile.cmake
index 9312d6685..50e6fc653 100644
--- a/ports/libtheora/portfile.cmake
+++ b/ports/libtheora/portfile.cmake
@@ -31,7 +31,6 @@ vcpkg_configure_cmake(
         -DUSE_X86=${THEORA_X86_OPT}
 )
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL
index 519d08553..7712808c0 100644
--- a/ports/libtorrent/CONTROL
+++ b/ports/libtorrent/CONTROL
@@ -1,4 +1,4 @@
 Source: libtorrent
-Version: 1.2.0-1
+Version: 2019-04-19
 Description: An efficient feature complete C++ BitTorrent implementation 
 Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision
diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
index fb84c9794..bc05d14c7 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -3,10 +3,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arvidn/libtorrent
-    REF libtorrent_1_2_0
-    SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
+    REF 76c2794923c4c101ff715be11d794f7fefc6c524
+    SHA512 3e154857bb56318ebe725326e1832aa387dc85840be80ebe76c0265e8fded43bc3006d528784c8805e30c3fba41b4108ccf81170870d1686dc499048367563ea
     HEAD_REF master
-    PATCHES add-datetime-to-boost-libs.patch
+    PATCHES
+        add-datetime-to-boost-libs.patch
+        windows-boost-1.70.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTORRENT_SHARED)
diff --git a/ports/libtorrent/windows-boost-1.70.patch b/ports/libtorrent/windows-boost-1.70.patch
new file mode 100644
index 000000000..b0bf1f642
--- /dev/null
+++ b/ports/libtorrent/windows-boost-1.70.patch
@@ -0,0 +1,13 @@
+diff --git a/src/ip_notifier.cpp b/src/ip_notifier.cpp
+index 37e5623..daa25f8 100644
+--- a/src/ip_notifier.cpp
++++ b/src/ip_notifier.cpp
+@@ -380,7 +380,7 @@ struct ip_change_notifier_impl final : ip_change_notifier
+ 		}
+ 		else
+ 		{
+-			m_hnd.get_io_service().post([cb, err]()
++			lt::get_io_service(m_hnd).post([cb, err]()
+ 			{ cb(error_code(err, system_category())); });
+ 		}
+ 	}
diff --git a/ports/libunibreak/CONTROL b/ports/libunibreak/CONTROL
index a8df4119f..26fc64c37 100644
--- a/ports/libunibreak/CONTROL
+++ b/ports/libunibreak/CONTROL
@@ -1,3 +1,3 @@
-Source: libunibreak
-Version: 4.0-1
-Description: an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.
+Source: libunibreak
+Version: 4.1
+Description: an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.
diff --git a/ports/libunibreak/portfile.cmake b/ports/libunibreak/portfile.cmake
index 6ec8bdd74..29e5a4fc0 100644
--- a/ports/libunibreak/portfile.cmake
+++ b/ports/libunibreak/portfile.cmake
@@ -1,13 +1,12 @@
 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
   REPO adah1972/libunibreak
-  REF  libunibreak_4_0
-  SHA512  f11295133a1c65f365a5287f7377f69ac7998f19b06d44818fb55c8a5ba3edabc36de8d1b7c0d38db9d982f0e443d0a751f6d51841865094122df4cd74c9af3b
+  REF libunibreak_4_1
+  SHA512 9dea703a9c969f58944817cf014f27b2e9c373dff1b26cbc7d2539a1797e61480893841cf3c7398870be7ddd974a899c8d60b07a238e343a698c17e9e4ba7a10
   HEAD_REF master
 )
 
diff --git a/ports/libusb-win32/CONTROL b/ports/libusb-win32/CONTROL
index eba6e283d..17a571287 100644
--- a/ports/libusb-win32/CONTROL
+++ b/ports/libusb-win32/CONTROL
@@ -1,3 +1,3 @@
 Source: libusb-win32
-Version: 1.2.6.0-1
+Version: 1.2.6.0-2
 Description: Allows user space applications to access many USB device on Windows.
diff --git a/ports/libusb-win32/portfile.cmake b/ports/libusb-win32/portfile.cmake
index a93b39bca..df12a9179 100644
--- a/ports/libusb-win32/portfile.cmake
+++ b/ports/libusb-win32/portfile.cmake
@@ -21,7 +21,6 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA)
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
diff --git a/ports/libuuid/CONTROL b/ports/libuuid/CONTROL
index 04bfbe47b..265fdeebf 100644
--- a/ports/libuuid/CONTROL
+++ b/ports/libuuid/CONTROL
@@ -1,3 +1,3 @@
 Source: libuuid
-Version: 1.0.3-1
+Version: 1.0.3-2
 Description: Universally unique id library
diff --git a/ports/libuuid/portfile.cmake b/ports/libuuid/portfile.cmake
index 7989e830d..c5cd287f6 100644
--- a/ports/libuuid/portfile.cmake
+++ b/ports/libuuid/portfile.cmake
@@ -1,5 +1,9 @@
 include(vcpkg_common_functions)
 
+if (NOT ((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")))
+    message(FATAL_ERROR "libuuid currently only supports unix platforms.")
+endif()
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libuuid-1.0.3)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://sourceforge.net/projects/libuuid/files/libuuid-1.0.3.tar.gz"
diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL
index 8f452cb4f..0066853b2 100644
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@@ -1,3 +1,3 @@
 Source: libuv
-Version: 1.27.0
+Version: 1.29.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 d870d8e76..b95d4f295 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.27.0
-    SHA512 42dfb7bee21f3f875ae5e6e4531aff52cff59d4c000f9cee1bde1b12c127beb7adefd6d6a11c6f0180868ee5ef15351a21a36c10b1be0aa7bedc15f0c50f87e0
+    REF v1.29.0
+    SHA512 19f1f25ffdb287a755f773488e3da5fd5b5b43c333e3dfb019bbac430ccd77456da96dbf60c38b97c87880f90f08438366e29bbcc8d81a28f777f39fca8af529
     HEAD_REF v1.x
 )
 
diff --git a/ports/libvorbis/CONTROL b/ports/libvorbis/CONTROL
index d60bd25af..780d94a25 100644
--- a/ports/libvorbis/CONTROL
+++ b/ports/libvorbis/CONTROL
@@ -1,4 +1,4 @@
 Source: libvorbis
-Version: 1.3.6-9eadecc-1
+Version: 1.3.6-9eadecc-3
 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/ogg.patch b/ports/libvorbis/ogg.patch
new file mode 100644
index 000000000..323e2c7e2
--- /dev/null
+++ b/ports/libvorbis/ogg.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bbc045ba..a23630f5 100644
+--- a/CMakeLists.txt	
++++ b/CMakeLists.txt
+@@ -57,10 +57,10 @@ if(NOT OGG_ROOT)
+     find_package(PkgConfig QUIET)
+     pkg_check_modules(PC_OGG QUIET ogg)
+     find_path(OGG_INCLUDE_DIRS NAMES ogg/ogg.h HINTS ${PC_OGG_INCLUDE_DIRS} PATH_SUFFIXES ogg)
+-    find_library(OGG_LIBRARIES NAMES ogg HINTS ${PC_OGG_LIBRARY_DIRS})
++    find_library(OGG_LIBRARIES NAMES ogg libogg HINTS ${PC_OGG_LIBRARY_DIRS})
+ else()
+     find_path(OGG_INCLUDE_DIRS NAMES ogg/ogg.h HINTS ${OGG_ROOT}/include PATH_SUFFIXES ogg)
+-    find_library(OGG_LIBRARIES NAMES ogg HINTS ${OGG_ROOT}/lib ${OGG_ROOT}/lib64)
++    find_library(OGG_LIBRARIES NAMES ogg libogg HINTS ${OGG_ROOT}/lib ${OGG_ROOT}/lib64)
+ endif()
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(OGG DEFAULT_MSG OGG_INCLUDE_DIRS OGG_LIBRARIES)
diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake
index 504aeaf22..0e1ef5d42 100644
--- a/ports/libvorbis/portfile.cmake
+++ b/ports/libvorbis/portfile.cmake
@@ -8,27 +8,12 @@ vcpkg_from_github(
     PATCHES
         0001-Dont-export-vorbisenc-functions.patch
         0002-Allow-deprecated-functions.patch
+        ogg.patch
 )
 
-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}
     PREFER_NINJA
-    OPTIONS -DOGG_INCLUDE_DIRS=${OGG_INCLUDE}
-    OPTIONS_RELEASE -DOGG_LIBRARIES=${OGG_LIB_REL}
-    OPTIONS_DEBUG -DOGG_LIBRARIES=${OGG_LIB_DBG}
 )
 
 vcpkg_install_cmake()
@@ -38,4 +23,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 # Handle copyright
 configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libvorbis/copyright COPYONLY)
 
-vcpkg_copy_pdbs()
+vcpkg_copy_pdbs() 
diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL
index 77a44f195..50d23a717 100644
--- a/ports/libvpx/CONTROL
+++ b/ports/libvpx/CONTROL
@@ -1,3 +1,3 @@
-Source: libvpx
-Version: 1.7.0-1
-Description: The reference software implementation for the video coding formats VP8 and VP9.
+Source: libvpx
+Version: 1.7.0-2
+Description: The reference software implementation for the video coding formats VP8 and VP9.
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
index d253008e7..009a0161d 100644
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@@ -1,10 +1,7 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported by libvpx yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(LIBVPX_VERSION 1.7.0)
 set(LIBVPX_HASH 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0)
 
diff --git a/ports/libwebm/CONTROL b/ports/libwebm/CONTROL
index 959d5bb24..9634893b3 100644
--- a/ports/libwebm/CONTROL
+++ b/ports/libwebm/CONTROL
@@ -1,3 +1,3 @@
 Source: libwebm
-Version: 1.0.0.27-4
+Version: 1.0.0.27-5
 Description: WebM File Parser
diff --git a/ports/libwebm/portfile.cmake b/ports/libwebm/portfile.cmake
index 9817a5bc3..024933ec5 100644
--- a/ports/libwebm/portfile.cmake
+++ b/ports/libwebm/portfile.cmake
@@ -21,21 +21,13 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS ${LIBWEBM_CRT_LINKAGE}
+    -DCMAKE_DEBUG_POSTFIX=d
 )
 
 vcpkg_install_cmake()
 
-if((NOT VCPKG_CMAKE_SYSTEM_NAME) AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/libwebm.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libwebmd.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/webm.lib ${CURRENT_PACKAGES_DIR}/debug/lib/webmd.lib)
-endif()
-
 vcpkg_copy_pdbs()
 
-if((NOT VCPKG_CMAKE_SYSTEM_NAME) AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/libwebm.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/libwebmd.pdb)
-endif()
-
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(COPY ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebm)
diff --git a/ports/libwebp/0001-build-fixes.patch b/ports/libwebp/0001-build-fixes.patch
index c25ecbfee..490978727 100644
--- a/ports/libwebp/0001-build-fixes.patch
+++ b/ports/libwebp/0001-build-fixes.patch
@@ -2,13 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 499ddce..895fda9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -159,6 +159,10 @@ add_definitions(-DHAVE_CONFIG_H)
+@@ -159,6 +159,12 @@ add_definitions(-DHAVE_CONFIG_H)
  if(MSVC)
    # avoid security warnings for e.g., fopen() used in the examples.
    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 +  add_definitions(-DWEBP_HAVE_JUST_SDL_H)
 +  if(BUILD_SHARED_LIBS)
 +    add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\))
++  else()
++    add_definitions(-DFREEGLUT_STATIC)
 +  endif()
  else()
    add_definitions(-Wall)
diff --git a/ports/libwebp/0003-remove-missing-symbol.patch b/ports/libwebp/0003-remove-missing-symbol.patch
new file mode 100644
index 000000000..218481bbc
--- /dev/null
+++ b/ports/libwebp/0003-remove-missing-symbol.patch
@@ -0,0 +1,13 @@
+diff --git a/examples/gifdec.c b/examples/gifdec.c
+index 4219352..ab0592a 100644
+--- a/examples/gifdec.c
++++ b/examples/gifdec.c
+@@ -310,7 +310,7 @@ void GIFDisplayError(const GifFileType* const gif, int gif_error) {
+ #else
+   (void)gif;
+   fprintf(stderr, "GIFLib Error %d: ", gif_error);
+-  PrintGifError();
++  //PrintGifError();
+   fprintf(stderr, "\n");
+ #endif
+ }
diff --git a/ports/libwebp/0004-add-missing-linked-library.patch b/ports/libwebp/0004-add-missing-linked-library.patch
new file mode 100644
index 000000000..49a34ef4d
--- /dev/null
+++ b/ports/libwebp/0004-add-missing-linked-library.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a98540c..a3697cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -479,6 +479,10 @@ if(WEBP_BUILD_VWEBP)
+                                        ${CMAKE_CURRENT_SOURCE_DIR}/src
+                                        ${CMAKE_CURRENT_BINARY_DIR}/src
+                                        ${OPENGL_INCLUDE_DIR})
++    if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE))
++      find_package(X11 REQUIRED)
++      target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB})
++    endif()
+     install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+     if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+       check_c_compiler_flag("-Wno-deprecated-declarations" HAS_NO_DEPRECATED)
diff --git a/ports/libwebp/0005-fix-static-build.patch b/ports/libwebp/0005-fix-static-build.patch
new file mode 100644
index 000000000..f17713efd
--- /dev/null
+++ b/ports/libwebp/0005-fix-static-build.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7585fac..83edb3a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -540,7 +540,7 @@ if(WEBP_BUILD_EXTRAS)
+   find_package(SDL)
+   if(SDL_FOUND)
+     add_executable(vwebp_sdl ${VWEBP_SDL_SRCS})
+-    target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp)
++    target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp dxguid winmm)
+     target_include_directories(vwebp_sdl
+                                PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+                                        ${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL
index ed3ff55ca..f4f01570a 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,8 +1,8 @@
 Source: libwebp
-Version: 1.0.2-2
+Version: 1.0.2-4
 Description: Lossy compression of digital photographic images.
 Build-Depends: opengl
 
 Feature: all
 Description: enable all webp features
-Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut, sdl1
+Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows)
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index bae24ddff..49590a982 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -9,6 +9,9 @@ vcpkg_from_github(
   PATCHES
     0001-build-fixes.patch
     0002-cmake-config-add-backwards-compatibility.patch
+    0003-remove-missing-symbol.patch
+    0004-add-missing-linked-library.patch
+    0005-fix-static-build.patch
 )
 
 set(WEBP_BUILD_ANIM_UTILS OFF)
@@ -30,6 +33,10 @@ if("all" IN_LIST FEATURES)
   set(WEBP_BUILD_EXTRAS ON)
 endif()
 
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    message("WebP currently requires the following library from the system package manager:\n    Xxf86vm\n\nThis can be installed on Ubuntu systems via apt-get install libxxf86vm-dev")
+endif()
+
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
@@ -59,26 +66,53 @@ vcpkg_copy_pdbs()
 vcpkg_fixup_cmake_targets(CONFIG_PATH "share/WebP/cmake/" TARGET_PATH "share/WebP/")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
+#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it
+if(CMAKE_HOST_WIN32)
+set(EXECUTABLE_SUFFIX ".exe")
+else()
+set(EXECUTABLE_SUFFIX "")
+endif()
+
 if("all" IN_LIST FEATURES)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2webp.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/img2webp.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp_sdl.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpinfo.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpmux.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webp_quality.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2webp${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/img2webp${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp_sdl${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpinfo${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpmux${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webp_quality${EXECUTABLE_SUFFIX})
   file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libwebp/)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/get_disto.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/get_disto.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gif2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/gif2webp.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/img2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/img2webp.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp_sdl.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpinfo.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpinfo.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpmux.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpmux.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webp_quality.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webp_quality.exe)
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/get_disto${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/get_disto${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/get_disto${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/gif2webp${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gif2webp${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/gif2webp${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/img2webp${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/img2webp${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/img2webp${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/vwebp${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp_sdl${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/webpinfo${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpinfo${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpinfo${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/webpmux${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpmux${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpmux${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/webp_quality${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webp_quality${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/webp_quality${EXECUTABLE_SUFFIX})
+  endif()
   vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libwebp)
 endif()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebp/COPYING ${CURRENT_PACKAGES_DIR}/share/libwebp/copyright)
diff --git a/ports/libxlsxwriter/0001-fix-build-error.patch b/ports/libxlsxwriter/0001-fix-build-error.patch
new file mode 100644
index 000000000..5e00c96de
--- /dev/null
+++ b/ports/libxlsxwriter/0001-fix-build-error.patch
@@ -0,0 +1,41 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fe566fe..e76ed46 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -306,31 +306,11 @@ endif()
+ 
+ include(GNUInstallDirs)
+ 
+-if(MSVC)
+-    if(CMAKE_CL_64)
+-        set(MSVC_FOLDER_PREFIX x64)
+-    else()
+-        set(MSVC_FOLDER_PREFIX Win32)
+-    endif()
+-
+-    install(TARGETS ${PROJECT_NAME}
+-        LIBRARY DESTINATION "lib/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}"
+-        ARCHIVE DESTINATION "lib/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}"
+-        RUNTIME DESTINATION "bin/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}"
+-    )
+-    if (NOT BUILD_SHARED_LIBS)
+-        install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb
+-            DESTINATION "lib/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}"
+-        )
+-    endif()
+-
+-else(MSVC)
+-    install(TARGETS ${PROJECT_NAME}
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    )
+-endif(MSVC)
++install(TARGETS ${PROJECT_NAME}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++)
+ install(FILES include/xlsxwriter.h DESTINATION include)
+ install(DIRECTORY include/xlsxwriter
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
diff --git a/ports/libxlsxwriter/0002-fix-uwp-build.patch b/ports/libxlsxwriter/0002-fix-uwp-build.patch
new file mode 100644
index 000000000..b6ae20479
--- /dev/null
+++ b/ports/libxlsxwriter/0002-fix-uwp-build.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e76ed46..32ffa04 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -211,6 +211,9 @@ target_sources(${PROJECT_NAME}
+ )
+ target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES})
+ target_compile_definitions(${PROJECT_NAME} PRIVATE ${LXW_PRIVATE_COMPILE_DEFINITIONS})
++if (WINDOWSSTORE)
++  target_compile_definitions(${PROJECT_NAME} PRIVATE -DIOWIN32_USING_WINRT_API)
++endif()
+ target_include_directories(${PROJECT_NAME}
+     PRIVATE ${LXW_PRIVATE_INCLUDE_DIRS}
+     PUBLIC include include/xlsxwriter
diff --git a/ports/libxlsxwriter/CONTROL b/ports/libxlsxwriter/CONTROL
new file mode 100644
index 000000000..0cf7ed965
--- /dev/null
+++ b/ports/libxlsxwriter/CONTROL
@@ -0,0 +1,4 @@
+Source: libxlsxwriter
+Version: 0.8.6-1
+Description: Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.
+Build-Depends: zlib
diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake
new file mode 100644
index 000000000..f60d2f88d
--- /dev/null
+++ b/ports/libxlsxwriter/portfile.cmake
@@ -0,0 +1,33 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH 
+    REPO jmcnamara/libxlsxwriter
+    REF RELEASE_0.8.6
+    SHA512 60822dc5f87531edc97cf774e234f25229a605d4430061c24b95c387318e6e05dde1b0f2f433cea14c6f84ee901c1dffe0d174bfd7e2a8459f59bcee900097db
+	HEAD_REF master
+	PATCHES
+        0001-fix-build-error.patch
+        0002-fix-uwp-build.patch
+)
+
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  set(USE_WINDOWSSTORE ON)
+else()
+  set(USE_WINDOWSSTORE OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+	PREFER_NINJA
+	OPTIONS -DWINDOWSSTORE=${USE_WINDOWSSTORE}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_copy_pdbs()
+
+file(COPY ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/License.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+\ No newline at end of file
diff --git a/ports/libxmlpp/CMakeLists.txt b/ports/libxmlpp/CMakeLists.txt
index 697d6bbc2..bbaae7cda 100644
--- a/ports/libxmlpp/CMakeLists.txt
+++ b/ports/libxmlpp/CMakeLists.txt
@@ -3,8 +3,6 @@ project(libxmlpp)
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-
 find_path(GLIBMM_INCLUDE_DIR NAMES glibmm.h)
 find_library(GLIBMM_LIBRARY NAMES glibmm)
 find_library(GIOMM_LIBRARY NAMES giomm)
diff --git a/ports/libxmlpp/CONTROL b/ports/libxmlpp/CONTROL
index 890d1471d..31b54a74c 100644
--- a/ports/libxmlpp/CONTROL
+++ b/ports/libxmlpp/CONTROL
@@ -1,4 +1,4 @@
-Source: libxmlpp
-Version: 2.40.1-2
-Description: a C++ wrapper for the libxml XML parser library.
-Build-Depends: libxml2, glibmm
+Source: libxmlpp
+Version: 2.40.1-3
+Description: a C++ wrapper for the libxml XML parser library.
+Build-Depends: libxml2, glibmm
diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake
index 9c39d6397..3919e4bf2 100644
--- a/ports/libxmlpp/portfile.cmake
+++ b/ports/libxmlpp/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(LIBXMLPP_VERSION 2.40.1)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libxml++-${LIBXMLPP_VERSION})
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/libxmp-lite/CMakeLists.txt b/ports/libxmp-lite/CMakeLists.txt
index 9495e0eb4..e1f14f377 100644
--- a/ports/libxmp-lite/CMakeLists.txt
+++ b/ports/libxmp-lite/CMakeLists.txt
@@ -39,8 +39,6 @@ else()
     option(INSTALL_HEADERS "Install header files" ON)
 endif()
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
 add_library(libxmp-lite ${SOURCES})
 target_compile_definitions(libxmp-lite PRIVATE
             LIBXMP_CORE_PLAYER=1
diff --git a/ports/libxmp-lite/CONTROL b/ports/libxmp-lite/CONTROL
index 1f7e8dded..bc1b7ef36 100644
--- a/ports/libxmp-lite/CONTROL
+++ b/ports/libxmp-lite/CONTROL
@@ -1,3 +1,3 @@
-Source: libxmp-lite
-Version: 4.4.1
-Description: Lightweight version of libxmp that supports MOD, S3M, XM and IT modules.
+Source: libxmp-lite
+Version: 4.4.1-1
+Description: Lightweight version of libxmp that supports MOD, S3M, XM and IT modules.
diff --git a/ports/libxmp-lite/portfile.cmake b/ports/libxmp-lite/portfile.cmake
index ac67940a1..5af0f25f3 100644
--- a/ports/libxmp-lite/portfile.cmake
+++ b/ports/libxmp-lite/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libxmp-lite-4.4.1)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://sourceforge.net/projects/xmp/files/libxmp/4.4.1/libxmp-lite-4.4.1.tar.gz"
diff --git a/ports/live555/CONTROL b/ports/live555/CONTROL
index 1a59ed6e7..39c8e4a65 100644
--- a/ports/live555/CONTROL
+++ b/ports/live555/CONTROL
@@ -1,3 +1,3 @@
 Source: live555
-Version: 2019.03.06
+Version: latest
 Description: A complete RTSP server application
diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake
index d31a4a6c8..c89d4e0a1 100644
--- a/ports/live555/portfile.cmake
+++ b/ports/live555/portfile.cmake
@@ -1,40 +1,44 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("live555 cannot currently be built dynamically. Building static instead.")
-    set(VCPKG_LIBRARY_LINKAGE "static")
-endif()
+include(vcpkg_common_functions)
 
-# The current Live555 version from http://www.live555.com/live.2019.03.06
-set(LIVE_VERSION 2019.03.06)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY) 
+
+if(NOT VCPKG_USE_HEAD_VERSION)
+    # Live555 only makes the latest releases available for download on their site
+    message(FATAL_ERROR "Live555 does not have persistent releases. Please re-run the installation with --head.")
+endif()
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}/live)
+
+set(LIVE_VERSION latest)
+
 vcpkg_download_distfile(ARCHIVE
-	URLS "http://www.live555.com/live.2019.03.06.tar.gz"
-	FILENAME "live555-${LIVE_VERSION}.tar.gz"
-	SHA512 cf3cbf57ec43d392fa82f06bd02f6d829208c9a9ec1c505d9eb6c5e2dd3393bbd8829b6216163deb8ea8356c180f30f610a639044a6941df5c9a92f29d4f1a75
+    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})
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE} 
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
-	SOURCE_PATH ${SOURCE_PATH}
-	PREFER_NINJA
+    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*"
+    "${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()
-
-
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL
index d4e631680..1bc8335fc 100644
--- a/ports/llvm/CONTROL
+++ b/ports/llvm/CONTROL
@@ -1,4 +1,4 @@
 Source: llvm
-Version: 7.0.0-2
+Version: 7.0.0-3
 Description: The LLVM Compiler Infrastructure
 Build-Depends: atlmfc (windows)
diff --git a/ports/llvm/fix-build-error.patch b/ports/llvm/fix-build-error.patch
new file mode 100644
index 000000000..a311fb959
--- /dev/null
+++ b/ports/llvm/fix-build-error.patch
@@ -0,0 +1,16 @@
+diff --git a/tools/clang/tools/libclang/CMakeLists.txt b/tools/clang/tools/libclang/CMakeLists.txt
+index e539c83..09c1ea3 100644
+--- a/tools/clang/tools/libclang/CMakeLists.txt
++++ b/tools/clang/tools/libclang/CMakeLists.txt
+@@ -56,10 +56,7 @@ if (TARGET clangTidyPlugin)
+   endif()
+ endif ()
+ 
+-find_library(DL_LIBRARY_PATH dl)
+-if (DL_LIBRARY_PATH)
+-  list(APPEND LIBS dl)
+-endif()
++list(APPEND LIBS "${DL_LIBRARY_PATH}")
+ 
+ option(LIBCLANG_BUILD_STATIC
+   "Build libclang as a static library (in addition to a shared one)" OFF)
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a471ec1ae..1828ea86e 100644
--- a/ports/llvm/portfile.cmake
+++ b/ports/llvm/portfile.cmake
@@ -28,7 +28,9 @@ endif()
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake-modules-to-share.patch
+    PATCHES 
+            install-cmake-modules-to-share.patch
+            fix-build-error.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)
diff --git a/ports/lmdb/CONTROL b/ports/lmdb/CONTROL
index 12b605465..6072f7d8e 100644
--- a/ports/lmdb/CONTROL
+++ b/ports/lmdb/CONTROL
@@ -1,3 +1,3 @@
 Source: lmdb
-Version: 0.9.18-4
+Version: 0.9.23
 Description: LMDB is an extraordinarily fast, memory-efficient database
diff --git a/ports/lmdb/portfile.cmake b/ports/lmdb/portfile.cmake
index 3ee4f340a..504c3935c 100644
--- a/ports/lmdb/portfile.cmake
+++ b/ports/lmdb/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LMDB/lmdb
-    REF LMDB_0.9.18
-    SHA512 394e88d99d446eb30771d7cf7a661584683a0d6d8e976cc561b5eecbb2a5d0817bbd59994002afa4eae6c86a39f05f50ebc2eff77cd70dd8c67225df4611f5e6
+    REF LMDB_0.9.23
+    SHA512 47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120
     HEAD_REF master
     PATCHES lmdb_45a88275d2a410e683bae4ef44881e0f55fa3c4d.patch
 )
diff --git a/ports/lodepng/CMakeLists.txt b/ports/lodepng/CMakeLists.txt
index 0ffd39549..5da3aed3d 100644
--- a/ports/lodepng/CMakeLists.txt
+++ b/ports/lodepng/CMakeLists.txt
@@ -5,11 +5,6 @@ if(MSVC)
   add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
 endif()
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
-
 include_directories(".")
 
 add_library(lodepng  lodepng.cpp lodepng_util.cpp)
diff --git a/ports/lodepng/CONTROL b/ports/lodepng/CONTROL
index e6c10c474..2c881316c 100644
--- a/ports/lodepng/CONTROL
+++ b/ports/lodepng/CONTROL
@@ -1,3 +1,3 @@
-Source: lodepng
-Version: 2018-09-18-1
-Description: PNG encoder and decoder in C and C++
+Source: lodepng
+Version: 2018-09-18-2
+Description: PNG encoder and decoder in C and C++
diff --git a/ports/lodepng/portfile.cmake b/ports/lodepng/portfile.cmake
index 367764456..83df5a5e0 100644
--- a/ports/lodepng/portfile.cmake
+++ b/ports/lodepng/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO lvandeve/lodepng
diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL
index dcdae01a5..278285dc5 100644
--- a/ports/log4cplus/CONTROL
+++ b/ports/log4cplus/CONTROL
@@ -1,4 +1,4 @@
 Source: log4cplus
-Version: REL_2_0_3
+Version: 2.0.4
 Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration
 Build-Depends: catch
diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake
index 672d855de..748311b24 100644
--- a/ports/log4cplus/portfile.cmake
+++ b/ports/log4cplus/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO log4cplus/log4cplus
-    REF REL_2_0_3
-    SHA512 c4c8887137214a9c66545ffa7f13cbede3db1536916681081f53c0a272cfb17d5e42cdc54c2c1bdd6eb5f86c3c3ce0840cbf827f792848ecb8f97636f1fcddf2
+    REF REL_2_0_4
+    SHA512 194e37b8de7be377dabe911d1cec831de41f5ce14dd617b5333739a7ab8dbc3061aa24351abe811588db507aa1563a637023b26684fb21bbfc88d24b4e4ce062
     HEAD_REF master
 )
 
diff --git a/ports/loguru/CONTROL b/ports/loguru/CONTROL
new file mode 100644
index 000000000..baa9503b0
--- /dev/null
+++ b/ports/loguru/CONTROL
@@ -0,0 +1,4 @@
+Source: loguru
+Version: v2.0.0
+Description: A lightweight and flexible C++ logging library
+Build-Depends:
+\ No newline at end of file
diff --git a/ports/loguru/copyright b/ports/loguru/copyright
new file mode 100644
index 000000000..334edabf8
--- /dev/null
+++ b/ports/loguru/copyright
@@ -0,0 +1,3 @@
+This software is in the public domain. Where that dedication is not recognized, you are granted a perpetual, irrevocable license to copy, modify and distribute it as you see fit.
+
+That being said, I would appreciate credit! If you find Loguru useful, tweet me at @ernerfeldt mail me at emil.ernerfeldt@gmail.com.
+\ No newline at end of file
diff --git a/ports/loguru/portfile.cmake b/ports/loguru/portfile.cmake
new file mode 100644
index 000000000..80efb0eea
--- /dev/null
+++ b/ports/loguru/portfile.cmake
@@ -0,0 +1,12 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO emilk/loguru
+    REF v2.0.0
+    SHA512 d6358f843689d10a44dc7bf590305cbfb89727e26d971ca4fe439e5468cdb7bcee2aa858368250e9654fb5ecebf63bca9742451881dae78068fecb18f279d988
+    HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/loguru.hpp  DESTINATION ${CURRENT_PACKAGES_DIR}/include/loguru)
+file(COPY ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/loguru)
+\ No newline at end of file
diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt
index 3fa62fe2c..01a1d5a12 100644
--- a/ports/lua/CMakeLists.txt
+++ b/ports/lua/CMakeLists.txt
@@ -9,9 +9,6 @@
 
 PROJECT ( lua )
 
-IF( NOT WIN32 )
-    message( FATAL_ERROR "Written for window only" )
-ENDIF()
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
@@ -33,21 +30,45 @@ src/ltable.c src/ltablib.c src/ltm.c src/lundump.c src/lutf8lib.c src/lvm.c src/
 
 IF (COMPILE_AS_CPP)
     SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUA} src/lua.c src/luac.c PROPERTIES LANGUAGE CXX)
+ELSE ()
+    SET (CMAKE_C_STANDARD 99)
 ENDIF ()
 
 # append headers to sources to make them show up in MSVC GUI
 LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA})
 
-# remove warnings
-ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS )
+IF (WIN32)
+    # remove warnings
+    ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS )
+ENDIF ()
+
+IF (UNIX)
+    ADD_DEFINITIONS (-DLUA_USE_POSIX)
+    FIND_LIBRARY (LIB_MATH NAMES m)
+    IF (LIB_MATH)
+        LINK_LIBRARIES (${LIB_MATH})
+    ENDIF ()
+ENDIF ()
 
 #DLL
 ADD_LIBRARY ( lua ${SRC_LIBLUA} )
 
-IF (BUILD_SHARED_LIBS)
+IF (BUILD_SHARED_LIBS AND WIN32)
     TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_BUILD_AS_DLL )
 ENDIF ()
 
+IF (UNIX)
+    IF (APPLE)
+        TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_USE_DLOPEN)
+    ELSE ()
+        FIND_LIBRARY (LIB_DLOPEN NAMES dl)
+        IF (LIB_DLOPEN)
+            TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_USE_DLOPEN)
+            TARGET_LINK_LIBRARIES (lua ${LIB_DLOPEN})
+        ENDIF ()
+    ENDIF ()
+ENDIF ()
+
 INSTALL ( TARGETS lua
     RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
     LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
@@ -59,6 +80,21 @@ IF (NOT DEFINED SKIP_INSTALL_TOOLS)
     ADD_EXECUTABLE ( luai src/lua.c )  # interpreter
     TARGET_LINK_LIBRARIES ( luai lua )
     SET_TARGET_PROPERTIES ( luai PROPERTIES OUTPUT_NAME lua PDB_NAME luai )
+    IF (UNIX)
+        IF (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+            SET (_LIB_READLINE_NAME edit)
+        ELSE ()
+            SET (_LIB_READLINE_NAME readline)
+        ENDIF ()
+        FIND_LIBRARY (LIB_READLINE NAMES ${_LIB_READLINE_NAME})
+        IF (LIB_READLINE)
+            TARGET_COMPILE_DEFINITIONS (luai PUBLIC -DLUA_USE_READLINE)
+            TARGET_LINK_LIBRARIES(luai ${LIB_READLINE})
+            IF (_LIB_READLINE_NAME STREQUAL edit)
+                TARGET_INCLUDE_DIRECTORIES (luai PUBLIC /usr/include/edit)
+            ENDIF ()
+        ENDIF ()
+    ENDIF ()
     INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/lua )
 ENDIF ()
 
diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL
index 836ae345a..23f31a1fd 100644
--- a/ports/lua/CONTROL
+++ b/ports/lua/CONTROL
@@ -1,3 +1,3 @@
 Source: lua
-Version: 5.3.4-4
+Version: 5.3.5-1
 Description: a powerful, fast, lightweight, embeddable scripting language
diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake
index a1dcbd379..e3c972ac4 100644
--- a/ports/lua/portfile.cmake
+++ b/ports/lua/portfile.cmake
@@ -7,13 +7,16 @@
 #
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lua-5.3.4)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.lua.org/ftp/lua-5.3.4.tar.gz"
-    FILENAME "lua-5.3.4.tar.gz"
-    SHA512 739e31f82e6a60fa99910c2005e991b3a1e21339af52847f653cb190b30842054d189ca116ffcfdf9b36e07888c9ce5642b1dd2988cc7eff9f8789f9a2e34997
+    URLS "https://www.lua.org/ftp/lua-5.3.5.tar.gz"
+    FILENAME "lua-5.3.5.tar.gz"
+    SHA512 4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4
+)
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES vs2015-impl-c99.patch
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
@@ -30,13 +33,15 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(READ ${CURRENT_PACKAGES_DIR}/include/luaconf.h LUA_CONF_H)
-    string(REPLACE "defined(LUA_BUILD_AS_DLL)" "1" LUA_CONF_H "${LUA_CONF_H}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/luaconf.h "${LUA_CONF_H}")
+    if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+        file(READ ${CURRENT_PACKAGES_DIR}/include/luaconf.h LUA_CONF_H)
+        string(REPLACE "defined(LUA_BUILD_AS_DLL)" "1" LUA_CONF_H "${LUA_CONF_H}")
+        file(WRITE ${CURRENT_PACKAGES_DIR}/include/luaconf.h "${LUA_CONF_H}")
+    endif()
 endif()
 
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lua)
 
 # Handle copyright
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lua)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lua/copyright)
 vcpkg_copy_pdbs()
diff --git a/ports/lua/vs2015-impl-c99.patch b/ports/lua/vs2015-impl-c99.patch
new file mode 100644
index 000000000..e281e83cf
--- /dev/null
+++ b/ports/lua/vs2015-impl-c99.patch
@@ -0,0 +1,11 @@
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -54,7 +54,7 @@
+ 
+ #if defined(LUA_USE_WINDOWS)
+ #define LUA_DL_DLL	/* enable support for DLL */
+-#define LUA_USE_C89	/* broadly, Windows is C89 */
++//#define LUA_USE_C89	/* broadly, Windows is C89 */
+ #endif
+ 
+ 
diff --git a/ports/luabridge/CONTROL b/ports/luabridge/CONTROL
index 595e3b113..7c2a41aa4 100644
--- a/ports/luabridge/CONTROL
+++ b/ports/luabridge/CONTROL
@@ -1,3 +1,3 @@
 Source: luabridge
-Version: 2.1-1
+Version: 2.3.1
 Description: A lightweight, dependency-free library for binding Lua to C++
diff --git a/ports/luabridge/portfile.cmake b/ports/luabridge/portfile.cmake
index 6ff91dd3a..9b9ccbb42 100644
--- a/ports/luabridge/portfile.cmake
+++ b/ports/luabridge/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO vinniefalco/LuaBridge
-    REF 2.1
-    SHA512 062efda16fe43a02bcc757aaebba839e0ec72a9a3b7bf1e5bc1427a54d664a52197c8bcd4ac584f0d04cce812c0f078e257716e8bca016bcabda82c2c332ac04
+    REF 2.3.1
+    SHA512 6478410ec5863f40087f023a68c585b4c84974aa27dd522552094f6c823bee9820edc77685a9932b5d7d74f26cced4d624810dbfbaa3694f55c0b7803d2d5216
     HEAD_REF master
 )
 
diff --git a/ports/luasocket/CONTROL b/ports/luasocket/CONTROL
index b349ee344..609af7ae5 100644
--- a/ports/luasocket/CONTROL
+++ b/ports/luasocket/CONTROL
@@ -1,4 +1,4 @@
 Source: luasocket
-Version: 2018-09-18-1
+Version: 2019-05-07
 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 3cce06af1..0f4bfbf6d 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 288219fd6b53ce2e709745c9918aa4c4b7f715c9
-    SHA512 f7b1f90437655352ab69a733bc2b2a0080d116fb8b6896fce0eb8ba6c593e2e3f64684c956d387a198d5aa48c4a9208531ab5e96805d92f0d4ca3ed46179be0b
+    REF 733af884f1aa18ff469bf3c4d18810e815853211
+    SHA512 632d66a9460636758428261b5b0d8669a90492de716915c07d1d1bf66c795bc9599f9edcd4345bbc3ef06830d670303b6cfb56c206e022b4bc5307fec2a20395
     HEAD_REF master)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/lz4/CMakeLists.txt b/ports/lz4/CMakeLists.txt
index b082ab374..8f94cbeb6 100644
--- a/ports/lz4/CMakeLists.txt
+++ b/ports/lz4/CMakeLists.txt
@@ -6,21 +6,43 @@ if(BUILD_SHARED_LIBS)
 endif()
 add_definitions(-DXXH_NAMESPACE=LZ4_)
 
+set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Install prefix")
+set(INSTALL_BIN_DIR      "bin"                       CACHE PATH "Path where exe and dll will be installed")
+set(INSTALL_LIB_DIR      "lib"                       CACHE PATH "Path where lib will be installed")
+set(INSTALL_INCLUDE_DIR  "include"                   CACHE PATH "Path where headers will be installed")
+set(INSTALL_CMAKE_DIR    "share/lz4"                 CACHE PATH "Path where cmake configs will be installed")
+
+file(GLOB LZ4_HEADERS lib/*.h)
+
 add_library(lz4
+    ${LZ4_HEADERS}
     lib/lz4.c
     lib/lz4frame.c
     lib/lz4hc.c
-    lib/xxhash.c)
+    lib/xxhash.c
+)
+
+target_include_directories(lz4 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/lib> $<INSTALL_INTERFACE:include>)
+set_target_properties(lz4 PROPERTIES PUBLIC_HEADER ${LZ4_HEADERS})
 
 install(TARGETS lz4
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib)
-
-if(NOT LZ4_SKIP_INCLUDES)
-    install(FILES
-        lib/lz4.h
-        lib/lz4frame.h
-        lib/lz4hc.h
-        DESTINATION include)
-endif()
+    EXPORT lz4Config
+    RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+    ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+    LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+    PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
+    PRIVATE_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
+    COMPONENT dev
+)
+
+FILE(GLOB lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/*.h")
+INSTALL(FILES ${lz4h} DESTINATION "${INSTALL_INCLUDE_DIR}")
+
+install(EXPORT lz4Config
+  FILE lz4Config.cmake
+  NAMESPACE lz4::
+  DESTINATION "${INSTALL_CMAKE_DIR}"
+)
+
+# Export the package for use from the build-tree (this registers the build-tree with a global CMake-registry)
+export(PACKAGE lz4)
diff --git a/ports/lz4/CONTROL b/ports/lz4/CONTROL
index 439116519..cdfb882ae 100644
--- a/ports/lz4/CONTROL
+++ b/ports/lz4/CONTROL
@@ -1,3 +1,3 @@
-Source: lz4
-Version: 1.8.3
-Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
+Source: lz4
+Version: 1.9.1-1
+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 bf0d3d52e..e7f1ee461 100644
--- a/ports/lz4/portfile.cmake
+++ b/ports/lz4/portfile.cmake
@@ -1,32 +1,39 @@
-include(vcpkg_common_functions)
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO lz4/lz4
-    REF v1.8.3
-    SHA512 5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f
-    HEAD_REF dev)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS_DEBUG
-        -DLZ4_SKIP_INCLUDES=ON
-        -DCMAKE_DEBUG_POSTFIX=d)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-foreach(FILE lz4.h lz4frame.h)
-    file(READ ${CURRENT_PACKAGES_DIR}/include/${FILE} LZ4_HEADER)
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "1" LZ4_HEADER "${LZ4_HEADER}")
-    else()
-        string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "0" LZ4_HEADER "${LZ4_HEADER}")
-    endif()
-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/${FILE} "${LZ4_HEADER}")
-endforeach()
-
-file(COPY ${SOURCE_PATH}/lib/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lz4)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/lz4/LICENSE ${CURRENT_PACKAGES_DIR}/share/lz4/copyright)
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lz4/lz4
+    REF v1.9.1
+    SHA512 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e
+    HEAD_REF dev
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG
+        -DCMAKE_DEBUG_POSTFIX=d
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+foreach(FILE lz4.h lz4frame.h)
+    file(READ ${CURRENT_PACKAGES_DIR}/include/${FILE} LZ4_HEADER)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "1" LZ4_HEADER "${LZ4_HEADER}")
+    else()
+        string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "0" LZ4_HEADER "${LZ4_HEADER}")
+    endif()
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/${FILE} "${LZ4_HEADER}")
+endforeach()
+
+vcpkg_fixup_cmake_targets()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(COPY ${SOURCE_PATH}/lib/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lz4)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/lz4/LICENSE ${CURRENT_PACKAGES_DIR}/share/lz4/copyright)
+
diff --git a/ports/mathgl/CONTROL b/ports/mathgl/CONTROL
new file mode 100644
index 000000000..211c435e8
--- /dev/null
+++ b/ports/mathgl/CONTROL
@@ -0,0 +1,48 @@
+Source: mathgl
+Version: 2.4.3
+Description: MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions
+Default-Features: opengl, jpeg, png, zlib
+
+Feature: hdf5
+Build-Depends: hdf5
+Description: hdf5 module
+
+Feature: fltk
+Build-Depends: fltk
+Description: fltk module
+
+Feature: gif
+Build-Depends: giflib
+Description: gif module
+
+Feature: png
+Build-Depends: libpng
+Description: png module
+
+Feature: zlib
+Build-Depends: zlib
+Description: zlib module
+
+Feature: jpeg
+Build-Depends: libjpeg-turbo
+Description: jpeg module
+
+Feature: gsl
+Build-Depends: gsl
+Description: gsl module
+
+Feature: opengl
+Build-Depends: opengl
+Description: opengl module
+
+Feature: glut
+Build-Depends: freeglut
+Description: glut module
+
+Feature: wx
+Build-Depends: wxwidgets
+Description: wx module
+
+Feature: qt5
+Build-Depends: qt5
+Description: qt5 module
diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake
new file mode 100644
index 000000000..dd44353e0
--- /dev/null
+++ b/ports/mathgl/portfile.cmake
@@ -0,0 +1,121 @@
+include(vcpkg_common_functions)
+
+set(MATHGL_VERSION "2.4.3")
+vcpkg_download_distfile(ARCHIVE
+  URLS "https://downloads.sourceforge.net/project/mathgl/mathgl/mathgl%20${MATHGL_VERSION}/mathgl-${MATHGL_VERSION}.tar.gz"
+  FILENAME "mathgl-${MATHGL_VERSION}.tar.gz"
+  SHA512 e47fc8171ce80c8b33a8f03d9375bc036455dae539b47cf4ee922f8fa36f5afcf8b3f0666997764e453eb698c0e8c03da36dd0ac2bf71c158e95309b247d27de
+)
+
+vcpkg_extract_source_archive_ex(
+  OUT_SOURCE_PATH SOURCE_PATH
+  ARCHIVE ${ARCHIVE}
+  REF ${MATHGL_VERSION}
+  PATCHES
+    type_fix.patch
+)
+
+set(enable-hdf5 OFF)
+if("hdf5" IN_LIST FEATURES)
+  set(enable-hdf5 ON)
+endif()
+
+set(enable-fltk OFF)
+if("fltk" IN_LIST FEATURES)
+  set(enable-fltk ON)
+endif()
+
+set(enable-gif OFF)
+if("gif" IN_LIST FEATURES)
+  set(enable-gif ON)
+endif()
+
+set(enable-png OFF)
+if("png" IN_LIST FEATURES)
+  set(enable-png ON)
+endif()
+
+set(enable-zlib OFF)
+if("zlib" IN_LIST FEATURES)
+  set(enable-zlib ON)
+endif()
+
+set(enable-jpeg OFF)
+if("jpeg" IN_LIST FEATURES)
+  set(enable-jpeg ON)
+endif()
+
+set(enable-gsl OFF)
+if("gsl" IN_LIST FEATURES)
+  set(enable-gsl ON)
+endif()
+
+set(enable-opengl OFF)
+if("opengl" IN_LIST FEATURES)
+  set(enable-opengl ON)
+endif()
+
+set(enable-glut OFF)
+if("glut" IN_LIST FEATURES)
+  set(enable-glut ON)
+endif()
+
+set(enable-wx OFF)
+if("wx" IN_LIST FEATURES)
+  set(enable-wx ON)
+endif()
+
+set(enable-qt5 OFF)
+if("qt5" IN_LIST FEATURES)
+  set(enable-qt5 ON)
+endif()
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+   -Denable-hdf5=${enable-hdf5}
+   -Denable-fltk=${enable-fltk}
+   -Denable-gif=${enable-gif}
+   -Denable-png=${enable-png}
+   -Denable-zlib=${enable-zlib}
+   -Denable-jpeg=${enable-jpeg}
+   -Denable-gsl=${enable-gsl}
+   -Denable-opengl=${enable-opengl}
+   -Denable-glut=${enable-glut}
+   -Denable-wx=${enable-wx}
+   -Denable-qt5=${enable-qt5}
+)
+
+vcpkg_install_cmake()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/mathgl)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/mathgl2-config.cmake)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/mathgl2-config.cmake)
+else()
+  vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mathgl TARGET_PATH share/mathgl)
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it
+if(CMAKE_HOST_WIN32)
+  set(EXECUTABLE_SUFFIX ".exe")
+else()
+  set(EXECUTABLE_SUFFIX "")
+endif()
+
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mglconv${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mgltask${EXECUTABLE_SUFFIX})
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/mathgl/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mglconv${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/mathgl/mglconv${EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mgltask${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/mathgl/mgltask${EXECUTABLE_SUFFIX})
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/mathgl)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mathgl RENAME copyright)
diff --git a/ports/mathgl/type_fix.patch b/ports/mathgl/type_fix.patch
new file mode 100644
index 000000000..288f6b1a0
--- /dev/null
+++ b/ports/mathgl/type_fix.patch
@@ -0,0 +1,62 @@
+diff --git a/src/complex.cpp b/src/complex.cpp
+index 2fcc14c..fb3498f 100755
+--- a/src/complex.cpp
++++ b/src/complex.cpp
+@@ -863,12 +863,12 @@ void MGL_EXPORT mgl_datac_insert_(uintptr_t *d, const char *dir, int *at, int *n
+ void MGL_EXPORT mgl_datac_delete_(uintptr_t *d, const char *dir, int *at, int *num, int)
+ {	mgl_datac_delete(_DC_,*dir,*at,*num);	}
+ //-----------------------------------------------------------------------------
+-void MGL_EXPORT mgl_datac_set_value(HADT dat, dual v, long i, long j, long k)
++void MGL_EXPORT mgl_datac_set_value(HADT dat, mdual v, long i, long j, long k)
+ {
+ 	if(i>=0 && i<dat->nx && j>=0 && j<dat->ny && k>=0 && k<dat->nz)
+ 		dat->a[i+dat->nx*(j+dat->ny*k)]=v;
+ }
+-void MGL_EXPORT mgl_datac_set_value_(uintptr_t *d, dual *v, int *i, int *j, int *k)
++void MGL_EXPORT mgl_datac_set_value_(uintptr_t *d, mdual *v, int *i, int *j, int *k)
+ {	mgl_datac_set_value(_DC_,*v,*i,*j,*k);	}
+ //-----------------------------------------------------------------------------
+ cmdual MGL_EXPORT mgl_datac_get_value(HCDT dat, long i, long j, long k)
+diff --git a/src/complex_io.cpp b/src/complex_io.cpp
+index 2fcd40a..49feb5c 100755
+--- a/src/complex_io.cpp
++++ b/src/complex_io.cpp
+@@ -343,14 +343,14 @@ void MGL_EXPORT mgl_datac_create(HADT d,long mx,long my,long mz)
+ void MGL_EXPORT mgl_datac_create_(uintptr_t *d, int *nx,int *ny,int *nz)
+ {	mgl_datac_create(_DC_,*nx,*ny,*nz);	}
+ //-----------------------------------------------------------------------------
+-void MGL_EXPORT mgl_datac_link(HADT d, dual *A, long mx,long my,long mz)
++void MGL_EXPORT mgl_datac_link(HADT d, mdual *A, long mx,long my,long mz)
+ {
+ 	if(!A)	return;
+ 	if(!d->link && d->a)	delete [](d->a);
+ 	d->nx = mx>0 ? mx:1;	d->ny = my>0 ? my:1;	d->nz = mz>0 ? mz:1;
+-	d->link=true;	d->a=A;	d->NewId();
++	d->link=true;	d->a=(dual*)A;	d->NewId();
+ }
+-void MGL_EXPORT mgl_datac_link_(uintptr_t *d, dual *A, int *nx,int *ny,int *nz)
++void MGL_EXPORT mgl_datac_link_(uintptr_t *d, mdual *A, int *nx,int *ny,int *nz)
+ {	mgl_datac_link(_DC_,A,*nx,*ny,*nz);	}
+ //-----------------------------------------------------------------------------
+ int MGL_EXPORT mgl_datac_read_dim(HADT d, const char *fname,long mx,long my,long mz)
+diff --git a/utils/mgltask.cpp b/utils/mgltask.cpp
+index b9bb7da..4566512 100755
+--- a/utils/mgltask.cpp
++++ b/utils/mgltask.cpp
+@@ -2,6 +2,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#define _USE_MATH_DEFINES
+ #include <math.h>
+ #include <time.h>
+ //===================================================================
+@@ -100,7 +101,7 @@ int main(int argc, char *argv[])
+ 	double x1[10],x2[10],dx[10],x[10];
+ 	int k,i,n=argc-3;//=(argc==4) ? 1:2;
+ 	FILE *fm,*fo;
+-	
++
+ 	// first place zeros
+ 	for(i=0;i<10;i++)
+ 	{
diff --git a/ports/matio/CONTROL b/ports/matio/CONTROL
index 659c46fca..a501977d6 100644
--- a/ports/matio/CONTROL
+++ b/ports/matio/CONTROL
@@ -1,4 +1,4 @@
 Source: matio
-Version: 1.5.13-1
+Version: 1.5.15
 Description: MATLAB MAT File I/O Library
 Build-Depends: zlib, hdf5
diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake
index f51424d55..859bfdea6 100644
--- a/ports/matio/portfile.cmake
+++ b/ports/matio/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tbeu/matio
-    REF v1.5.13
-    SHA512 8525ee2c3f0e5cccf3dbae888d09a9477cbd1f2b17160fd15cc8e18792b027954ac18404ea74465ec6b8b5d057661502b1fc31fa6d119113139004c1bce7f712
+    REF v1.5.15
+    SHA512 5e80aef3e929ff306810861ba14bc82bdd9cb3090de60dbd6905cfa35706d8cbe6c40471e8abf41e5d0836c10083c359449d34bdf32c6b2022a73986e8303eb3
     HEAD_REF master
 )
 
diff --git a/ports/matroska/CONTROL b/ports/matroska/CONTROL
index 627c2e93f..eca20aca6 100644
--- a/ports/matroska/CONTROL
+++ b/ports/matroska/CONTROL
@@ -1,4 +1,4 @@
 Source: matroska
-Version: 1.4.9-1
+Version: 1.5.2
 Description: a C++ libary to parse Matroska files (.mkv and .mka)
 Build-Depends: ebml
diff --git a/ports/matroska/portfile.cmake b/ports/matroska/portfile.cmake
index 946ee81bc..bf41c8f1a 100644
--- a/ports/matroska/portfile.cmake
+++ b/ports/matroska/portfile.cmake
@@ -1,14 +1,14 @@
 include(vcpkg_common_functions)
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
+    message(FATAL_ERROR "matroska does not currently support UWP")
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Matroska-Org/libmatroska
-    REF release-1.4.9
-    SHA512 0c2e7324d62e1fc28b00a899f1d2fda88a3de474ea25c51624d716b869db72b4645b64cc434a0bdb7cefdd63b354de59920d4011889554f95a2905020b139fb1
+    REF release-1.5.2
+    SHA512  5e819d611455efb1dd49ea26b6b124899b1f6ba07b4af93b2f3437ffe7c2c0089a922ef894a7c8612faddadeea75142d0604ee54e6c5822439dc8c65008e119b
     HEAD_REF master
 )
 
@@ -20,11 +20,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if (WIN32)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
-else ()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/matroska)
-endif ()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Matroska)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
diff --git a/ports/meschach/CMakeLists.txt b/ports/meschach/CMakeLists.txt
index 648fe5af9..e60d29097 100644
--- a/ports/meschach/CMakeLists.txt
+++ b/ports/meschach/CMakeLists.txt
@@ -71,10 +71,6 @@ file(GLOB  meschach_headers "*.h")
 
 include_directories(".")
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 add_library(meschach ${meschach_srcs})
 target_compile_definitions(meschach PRIVATE -DHAVE_MEMORY_H -DHAVE_COMPLEX_H)
 
diff --git a/ports/meschach/CONTROL b/ports/meschach/CONTROL
index a8418b2b1..84a3bf0d4 100644
--- a/ports/meschach/CONTROL
+++ b/ports/meschach/CONTROL
@@ -1,3 +1,3 @@
-Source: meschach
-Version: 1.2b-1
-Description: Matrix computations in C
+Source: meschach
+Version: 1.2b-2
+Description: Matrix computations in C
diff --git a/ports/meschach/portfile.cmake b/ports/meschach/portfile.cmake
index dd9d93085..1ec6fcd04 100644
--- a/ports/meschach/portfile.cmake
+++ b/ports/meschach/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://homepage.math.uiowa.edu/~dstewart/meschach/mesch12b.tar.gz"
diff --git a/ports/metis/CONTROL b/ports/metis/CONTROL
index 305887de0..65571b0bd 100644
--- a/ports/metis/CONTROL
+++ b/ports/metis/CONTROL
@@ -1,3 +1,3 @@
 Source: metis
-Version: 5.1.0-2
+Version: 5.1.0-3
 Description: Serial Graph Partitioning and Fill-reducing Matrix Ordering
diff --git a/ports/metis/portfile.cmake b/ports/metis/portfile.cmake
index d2c8de800..4f8d4520d 100644
--- a/ports/metis/portfile.cmake
+++ b/ports/metis/portfile.cmake
@@ -1,13 +1,8 @@
-# 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_check_linkage(ONLY_STATIC_LIBRARY)
+set(OPTIONS -DSHARED=OFF)
+
 set(METIS_VERSION 5.1.0)
 
 vcpkg_download_distfile(ARCHIVE
@@ -28,16 +23,9 @@ vcpkg_extract_source_archive_ex(
         fix-gklib-vs14-math.patch
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-  set(OPTIONS -DSHARED=ON -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON)
-else()
-  set(OPTIONS -DSHARED=OFF)
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS
-        ${OPTIONS}
+    OPTIONS ${OPTIONS}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/minhook/CONTROL b/ports/minhook/CONTROL
new file mode 100644
index 000000000..95209891b
--- /dev/null
+++ b/ports/minhook/CONTROL
@@ -0,0 +1,3 @@
+Source: minhook
+Version: 1.3.3
+Description: The Minimalistic x86/x64 API Hooking Library for Windows.
+\ No newline at end of file
diff --git a/ports/minhook/install-destination.patch b/ports/minhook/install-destination.patch
new file mode 100644
index 000000000..13f3dc379
--- /dev/null
+++ b/ports/minhook/install-destination.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df947af..6a894d8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,7 +113,7 @@ install(
+     "${CMAKE_CURRENT_BINARY_DIR}/minhook-config.cmake"
+     "${CMAKE_CURRENT_BINARY_DIR}/minhook-config-version.cmake"
+   DESTINATION 
+-    "lib/minhook"
++    share/minhook
+ )
+ 
+ ###################
+@@ -133,7 +133,7 @@ install(
+   NAMESPACE 
+     minhook::
+   DESTINATION 
+-    "lib/minhook"
++    share/minhook
+ )
+ 
+ install(
diff --git a/ports/minhook/portfile.cmake b/ports/minhook/portfile.cmake
new file mode 100644
index 000000000..13779a338
--- /dev/null
+++ b/ports/minhook/portfile.cmake
@@ -0,0 +1,49 @@
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
+include(vcpkg_common_functions)
+
+if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+    set(BUILD_ARCH "Win32")
+    set(OUTPUT_DIR "Win32")
+elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
+    set(BUILD_ARCH "x64")
+    set(OUTPUT_DIR "Win64")
+else()
+    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+# Download files to enable CMake support for minhook - Adds CMakeLists.txt and minhook-config.cmake.in
+vcpkg_download_distfile(
+    CMAKE_SUPPORT_PATCH
+    URLS https://github.com/TsudaKageyu/minhook/commit/3f2e34976c1685ee372a09f54c0c8c8f4240ef90.patch
+    FILENAME minhook-cmake-support.patch
+    SHA512 5f353b167e2c31e5e06258420c78fbae0095368cf687ff06a350d6b69b30476824785dde5dbcea3e30ff827e7cdb293727a73e6b1e6875f00aa891b2980c3877
+)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO TsudaKageyu/minhook
+    REF v1.3.3
+    SHA512 9f10c92a926a06cde1e4092b664a3aab00477e8b9f20cee54e1d2b3747fad91043d199a2753f7e083497816bbefc5d75d9162d2098dd044420dbca555e80b060
+    HEAD_REF master
+    PATCHES
+        "${CMAKE_SUPPORT_PATCH}"
+        install-destination.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(COPY ${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/minhook-targets-debug.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/minisat-master-keying/CONTROL b/ports/minisat-master-keying/CONTROL
index ca37399f2..84021f371 100644
--- a/ports/minisat-master-keying/CONTROL
+++ b/ports/minisat-master-keying/CONTROL
@@ -1,7 +1,5 @@
 Source: minisat-master-keying
-Version: 2.2-mod-1
+Version: 2.2-mod-2
 Description: A minimalistic high-performance SAT solver
-  This is a modernized, cross-platform, CMake-enabled fork of the
-  original MiniSat. Since the original library is no longer under
-  development, post issues and pull requests should be posted to
-  https://github.com/master-keying/minisat
+  This is a modernized, cross-platform, CMake-enabled fork of the original MiniSat. 
+  Since the original library is no longer under development, post issues and pull requests should be posted to https://github.com/master-keying/minisat
diff --git a/ports/minisat-master-keying/portfile.cmake b/ports/minisat-master-keying/portfile.cmake
index e035c2fe4..0578623c1 100644
--- a/ports/minisat-master-keying/portfile.cmake
+++ b/ports/minisat-master-keying/portfile.cmake
@@ -1,10 +1,7 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO master-keying/minisat
diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt
index 4ccf6972a..edb9b3c7b 100644
--- a/ports/minizip/CMakeLists.txt
+++ b/ports/minizip/CMakeLists.txt
@@ -36,10 +36,6 @@ if(WIN32)
   list(APPEND HEADERS ${MIN_SRC}/iowin32.h)
 endif()
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 add_library(minizip ${SRC})
 
 target_link_libraries(minizip PRIVATE ZLIB::ZLIB)
diff --git a/ports/minizip/CONTROL b/ports/minizip/CONTROL
index 60398b039..b0c606ded 100644
--- a/ports/minizip/CONTROL
+++ b/ports/minizip/CONTROL
@@ -1,4 +1,4 @@
-Source: minizip
-Version: 1.2.11-3
-Description: Zip compression library
-Build-Depends: bzip2, zlib
+Source: minizip
+Version: 1.2.11-4
+Description: Zip compression library
+Build-Depends: bzip2, zlib
diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake
index 927951d70..15289b767 100644
--- a/ports/minizip/portfile.cmake
+++ b/ports/minizip/portfile.cmake
@@ -4,6 +4,8 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
   message(FATAL_ERROR "WindowsStore not supported")
 endif()
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO madler/zlib
diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL
index 457cb769f..d57aa4ca3 100644
--- a/ports/mlpack/CONTROL
+++ b/ports/mlpack/CONTROL
@@ -1,5 +1,5 @@
 Source: mlpack
-Version: 3.0.4
+Version: 3.1.0-1
 Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.
 Build-Depends: openblas, clapack, boost, armadillo
 
diff --git a/ports/mlpack/cmakelists.patch b/ports/mlpack/cmakelists.patch
index bc251980a..6c39a4293 100644
--- a/ports/mlpack/cmakelists.patch
+++ b/ports/mlpack/cmakelists.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -252,7 +252,7 @@
+@@ -284,7 +284,7 @@
  # script Armadillo uses to find these.
  if (WIN32)
    find_library(LAPACK_LIBRARY
@@ -9,7 +9,7 @@
        PATHS "C:/Program Files/Armadillo"
        PATH_SUFFIXES "examples/lib_win32/")
  
-@@ -261,7 +261,7 @@
+@@ -293,7 +293,7 @@
    endif ()
  
    find_library(BLAS_LIBRARY
@@ -18,17 +18,7 @@
        PATHS "C:/Program Files/Armadillo"
        PATH_SUFFIXES "examples/lib_win32/")
  
-@@ -281,6 +281,9 @@
- # Unfortunately this configuration variable is necessary and will need to be
- # updated as time goes on and new versions are released.
- set(Boost_ADDITIONAL_VERSIONS
-+  "1.69.0" "1.69"
-+  "1.68.0" "1.68"
-+  "1.67.0" "1.67"
-   "1.66.0" "1.66"
-   "1.65.1" "1.65.0" "1.65"
-   "1.64.1" "1.64.0" "1.64"
-@@ -307,19 +310,11 @@
+@@ -392,19 +392,11 @@
      REQUIRED
  )
  
diff --git a/ports/mlpack/meta_info_extractor.patch b/ports/mlpack/meta_info_extractor.patch
deleted file mode 100644
index 3a9fa00dd..000000000
--- a/ports/mlpack/meta_info_extractor.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- a/src/mlpack/core/cv/meta_info_extractor.hpp
-+++ b/src/mlpack/core/cv/meta_info_extractor.hpp
-@@ -38,50 +38,142 @@
-          bool NumClasses>
- struct TrainForm;
- 
--template<typename PT, typename WT, typename... SignatureParams>
--struct TrainFormBase
--{
--  using PredictionsType = PT;
--  using WeightsType = WT;
--
--  /* A minimum number of parameters that should be inferred */
--  static const size_t MinNumberOfAdditionalArgs = 1;
--
--  template<typename Class, typename RT, typename... Ts>
--  using Type = RT(Class::*)(SignatureParams..., Ts...);
--};
--
--template<typename MT, typename PT>
--struct TrainForm<MT, PT, void, false, false> : public TrainFormBase<PT, void,
--    const MT&, const PT&> {};
--
--template<typename MT, typename PT>
--struct TrainForm<MT, PT, void, true, false> : public TrainFormBase<PT, void,
--    const MT&, const data::DatasetInfo&, const PT&> {};
--
--template<typename MT, typename PT, typename WT>
--struct TrainForm<MT, PT, WT, false, false> : public TrainFormBase<PT, WT,
--    const MT&, const PT&, const WT&> {};
--
--template<typename MT, typename PT, typename WT>
--struct TrainForm<MT, PT, WT, true, false> : public TrainFormBase<PT, WT,
--    const MT&, const data::DatasetInfo&, const PT&, const WT&> {};
--
--template<typename MT, typename PT>
--struct TrainForm<MT, PT, void, false, true> : public TrainFormBase<PT, void,
--    const MT&, const PT&, const size_t> {};
--
--template<typename MT, typename PT>
--struct TrainForm<MT, PT, void, true, true> : public TrainFormBase<PT, void,
--    const MT&, const data::DatasetInfo&, const PT&, const size_t> {};
--
--template<typename MT, typename PT, typename WT>
--struct TrainForm<MT, PT, WT, false, true> : public TrainFormBase<PT, WT,
--    const MT&, const PT&, const size_t, const WT&> {};
--
--template<typename MT, typename PT, typename WT>
--struct TrainForm<MT, PT, WT, true, true> : public TrainFormBase<PT, WT,
--    const MT&, const data::DatasetInfo&, const PT&, const size_t, const WT&> {};
-+#if _MSC_VER <= 1916 // Visual Studio 2017 version 15.9 or older.
-+  // Due to an internal MSVC compiler bug (MSVC ) we can't use two parameter
-+  // packs. So we have to write multiple TrainFormBase forms.
-+  template<typename PT, typename WT, typename T1, typename T2>
-+  struct TrainFormBase4
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(T1, T2, Ts...);
-+  };
-+
-+  template<typename PT, typename WT, typename T1, typename T2, typename T3>
-+  struct TrainFormBase5
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(T1, T2, T3, Ts...);
-+  };
-+
-+  template<typename PT, typename WT, typename T1, typename T2, typename T3,
-+      typename T4>
-+  struct TrainFormBase6
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(T1, T2, T3, T4, Ts...);
-+  };
-+
-+  template<typename PT, typename WT, typename T1, typename T2, typename T3,
-+      typename T4, typename T5>
-+  struct TrainFormBase7
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(T1, T2, T3, T4, T5, Ts...);
-+  };
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, false, false> : public TrainFormBase4<PT, void,
-+      const MT&, const PT&> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, true, false> : public TrainFormBase5<PT, void,
-+      const MT&, const data::DatasetInfo&, const PT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, false, false> : public TrainFormBase5<PT, WT,
-+      const MT&, const PT&, const WT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, true, false> : public TrainFormBase6<PT, WT,
-+      const MT&, const data::DatasetInfo&, const PT&, const WT&> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, false, true> : public TrainFormBase5<PT, void,
-+      const MT&, const PT&, const size_t> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, true, true> : public TrainFormBase6<PT, void,
-+      const MT&, const data::DatasetInfo&, const PT&, const size_t> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, false, true> : public TrainFormBase6<PT, WT,
-+      const MT&, const PT&, const size_t, const WT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, true, true> : public TrainFormBase7<PT, WT,
-+      const MT&, const data::DatasetInfo&, const PT&,
-+      const size_t, const WT&> {};
-+#else
-+  template<typename PT, typename WT, typename... SignatureParams>
-+  struct TrainFormBase
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(SignatureParams..., Ts...);
-+  };
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, false, false> : public TrainFormBase<PT, void,
-+      const MT&, const PT&> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, true, false> : public TrainFormBase<PT, void,
-+      const MT&, const data::DatasetInfo&, const PT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, false, false> : public TrainFormBase<PT, WT,
-+      const MT&, const PT&, const WT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, true, false> : public TrainFormBase<PT, WT,
-+      const MT&, const data::DatasetInfo&, const PT&, const WT&> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, false, true> : public TrainFormBase<PT, void,
-+      const MT&, const PT&, const size_t> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, true, true> : public TrainFormBase<PT, void,
-+      const MT&, const data::DatasetInfo&, const PT&, const size_t> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, false, true> : public TrainFormBase<PT, WT,
-+      const MT&, const PT&, const size_t, const WT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, true, true> : public TrainFormBase<PT, WT,
-+      const MT&, const data::DatasetInfo&, const PT&,
-+      const size_t, const WT&> {};
-+#endif
- 
- /* A struct for indication that a right method form can't be found */
- struct NotFoundMethodForm
diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake
index 9bd69ed8b..c7bf89bc1 100644
--- a/ports/mlpack/portfile.cmake
+++ b/ports/mlpack/portfile.cmake
@@ -1,43 +1,42 @@
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO mlpack/mlpack
-    REF mlpack-3.0.4
-    SHA512 07730a826efb55a41fce2286de8df15421e7a7189b9cdc4699c6a32e3d4b1964a98e3829a60513994ef747640952229e7a3b744ac0ae324f5e5e57f982a86f66
-    HEAD_REF master
-	PATCHES 
-		meta_info_extractor.patch
-		cmakelists.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MLPACK_SHARED_LIBS)
-
-set(BUILD_TOOLS OFF)
-if("tools" IN_LIST FEATURES)
-    set(BUILD_TOOLS ON)
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-	OPTIONS
-		-DBUILD_TESTS=${BUILD_TOOLS}
-		-DBUILD_CLI_EXECUTABLES=${BUILD_TOOLS}
-		-DBUILD_SHARED_LIBS=${MLPACK_SHARED_LIBS}
-)
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mlpack RENAME copyright)
-
-if(BUILD_TOOLS)
-	file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
-	file(GLOB MLPACK_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
-	file(COPY ${MLPACK_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-	file(REMOVE ${MLPACK_TOOLS})
-	file(GLOB MLPACK_TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
-	file(REMOVE ${MLPACK_TOOLS_DEBUG})
-endif()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mlpack/mlpack
+    REF mlpack-3.1.0
+    SHA512 dc305a9a2f7232d3957206a346d0ac97ba13b933d5dbef45329002b8380ecc0982621c0b97f6c5ee82d0a26ad53b1cdd7a9b991fb749efc8546394988ac40a5b
+    HEAD_REF master
+	PATCHES 
+		cmakelists.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MLPACK_SHARED_LIBS)
+
+set(BUILD_TOOLS OFF)
+if("tools" IN_LIST FEATURES)
+    set(BUILD_TOOLS ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+	OPTIONS
+		-DBUILD_TESTS=${BUILD_TOOLS}
+		-DBUILD_CLI_EXECUTABLES=${BUILD_TOOLS}
+		-DBUILD_SHARED_LIBS=${MLPACK_SHARED_LIBS}
+)
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mlpack RENAME copyright)
+
+if(BUILD_TOOLS)
+	file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+	file(GLOB MLPACK_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+	file(COPY ${MLPACK_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+	file(REMOVE ${MLPACK_TOOLS})
+	file(GLOB MLPACK_TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+	file(REMOVE ${MLPACK_TOOLS_DEBUG})
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/moos-core/CONTROL b/ports/moos-core/CONTROL
index 2aadbb9e4..64f94d6db 100644
--- a/ports/moos-core/CONTROL
+++ b/ports/moos-core/CONTROL
@@ -1,4 +1,3 @@
 Source: moos-core
-Version: 10.4.0
-Description: A very light weight, easy to use middleware. See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
-Build-Depends:
+Version: 10.4.0-2
+Description: A very light weight, easy to use middleware. See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
+\ No newline at end of file
diff --git a/ports/moos-core/portfile.cmake b/ports/moos-core/portfile.cmake
index d6eab11f7..196b3e648 100644
--- a/ports/moos-core/portfile.cmake
+++ b/ports/moos-core/portfile.cmake
@@ -1,21 +1,17 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO themoos/core-moos
     REF v10.4.0
-    SHA512 8a82074bd219bbedbe56c2187afe74a55a252b0654a675c64d1f75e62353b0874e7b405d9f677fadb297e955d11aea50a07e8f5f3546be3c4ddab76fe356a51e 
+    SHA512 8a82074bd219bbedbe56c2187afe74a55a252b0654a675c64d1f75e62353b0874e7b405d9f677fadb297e955d11aea50a07e8f5f3546be3c4ddab76fe356a51e
     HEAD_REF master
+    PATCHES
+        cmake_fix.patch
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake_fix.patch
-)
-
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
-
 message(STATUS "MOOS VCPKG SOURCE_PATH ${SOURCE_PATH}")
 message(STATUS "MOOS INSTALL -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}")
 
@@ -23,7 +19,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DBUILD_SHARED_LIBS=${BUILD_SHARED}
+        -DBUILD_SHARED_LIBS=OFF
         -DCMAKE_ENABLE_EXPORT=OFF
 )
 
@@ -31,30 +27,15 @@ vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/MOOS")
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/MOOS)
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/MOOSDB")
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/MOOSDB ${CURRENT_PACKAGES_DIR}/tools/MOOS/MOOSDB)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/atm ${CURRENT_PACKAGES_DIR}/tools/MOOS/atm)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gtm ${CURRENT_PACKAGES_DIR}/tools/MOOS/gtm)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ktm ${CURRENT_PACKAGES_DIR}/tools/MOOS/ktm)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mqos ${CURRENT_PACKAGES_DIR}/tools/MOOS/mqos)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mtm ${CURRENT_PACKAGES_DIR}/tools/MOOS/mtm)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/umm ${CURRENT_PACKAGES_DIR}/tools/MOOS/umm)
+set(MOOS_EXEC_SUFFIX "")
+if (WIN32)
+    set(MOOS_EXEC_SUFFIX ".exe")
 endif()
 
-
-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)
+# Stage tools
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Put the licence file where vcpkg expects it
-file(COPY
-    ${SOURCE_PATH}/Core/GPLCore.txt
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME
-    ${CURRENT_PACKAGES_DIR}/share/${PORT}/GPLCore.txt
-    ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
-
-
+file(COPY ${SOURCE_PATH}/Core/GPLCore.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/moos-essential/CONTROL b/ports/moos-essential/CONTROL
index 311b9d480..c47dfa433 100644
--- a/ports/moos-essential/CONTROL
+++ b/ports/moos-essential/CONTROL
@@ -1,4 +1,4 @@
-Source: moos-essential
-Version: 10.0.1
-Description: a set of useful applications that leverage the core-moos communications layer See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
-Build-Depends: moos-core
+Source: moos-essential
+Version: 10.0.1-1
+Description: a set of useful applications that leverage the core-moos communications layer See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
+Build-Depends: moos-core
diff --git a/ports/moos-essential/portfile.cmake b/ports/moos-essential/portfile.cmake
index 3f26a4e86..f0a55923e 100644
--- a/ports/moos-essential/portfile.cmake
+++ b/ports/moos-essential/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO themoos/essential-moos
     REF b897ea86dba8b61412dc48ac0cfb5ff34cdaf5f6
-    SHA512 7284744d211dcdcb0cd321eec96f3632ccda690e8894261f4f09a06bc8faefb2de68f4f2f755f4eeef5bb586044e98ac65cdd18c15193a1a4632bd2f4208c52f 
+    SHA512 7284744d211dcdcb0cd321eec96f3632ccda690e8894261f4f09a06bc8faefb2de68f4f2f755f4eeef5bb586044e98ac65cdd18c15193a1a4632bd2f4208c52f
     HEAD_REF master
 )
 
@@ -16,13 +16,9 @@ vcpkg_apply_patches(
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix.patch
 )
 
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
-        -DBUILD_SHARED_LIBS=${BUILD_SHARED}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/moos-ui/CONTROL b/ports/moos-ui/CONTROL
index 28ee5e664..07de10690 100644
--- a/ports/moos-ui/CONTROL
+++ b/ports/moos-ui/CONTROL
@@ -1,6 +1,6 @@
-Source: moos-ui
-Version: 10.0.1
-Description: set of user interface tools to use and leverage the MOOS project. See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
-Build-Depends: moos-core
-
-
+Source: moos-ui
+Version: 10.0.1-1
+Description: set of user interface tools to use and leverage the MOOS project. See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
+Build-Depends: moos-core
+
+
diff --git a/ports/moos-ui/portfile.cmake b/ports/moos-ui/portfile.cmake
index 5229c8855..3f4b880e2 100644
--- a/ports/moos-ui/portfile.cmake
+++ b/ports/moos-ui/portfile.cmake
@@ -8,28 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-#vcpkg_apply_patches(
-#    SOURCE_PATH ${SOURCE_PATH}
-#    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fltk.patch
-#)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
-
-
-#if ("gui" IN_LIST FEATURES)
-#    set(BUILD_GRAPHICAL_TOOLS            ON )
-#    message(STATUS "Building graphical tools")
-#else()
-#    set(BUILD_GRAPHICAL_TOOLS            OFF )
-#    message(STATUS "Not building graphical tools")
-#endif()
-
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DBUILD_SHARED_LIBS=${BUILD_SHARED}
         -DBUILD_CONSOLE_TOOLS=ON
         -DBUILD_GRAPHICAL_TOOLS=OFF #${BUILD_GRAPHICAL_TOOLS}
 )
diff --git a/ports/mosquitto/CONTROL b/ports/mosquitto/CONTROL
index 8d4d2de0c..a80d0da7a 100644
--- a/ports/mosquitto/CONTROL
+++ b/ports/mosquitto/CONTROL
@@ -1,8 +1,6 @@
-Source: mosquitto
-Version: 1.5.0-1
-Build-Depends: c-ares, libwebsockets, openssl, pthreads
-Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and
-  3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it
-  suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded
-  computers or microcontrollers like the Arduino. you can see more information from this url
-  https://mosquitto.org/download/
+Source: mosquitto
+Version: 1.5.0-3
+Build-Depends: c-ares, libwebsockets, openssl, pthreads
+Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.
+  MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
+  You can see more information from this url https://mosquitto.org/download/
diff --git a/ports/mosquitto/fix-dependence-pthreads.patch b/ports/mosquitto/fix-dependence-pthreads.patch
deleted file mode 100644
index d21786646..000000000
--- a/ports/mosquitto/fix-dependence-pthreads.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 6355eaa..490df32 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -6,7 +6,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
- if (${WITH_THREADING} STREQUAL ON)
- 	add_definitions("-DWITH_THREADING")
- 	if (WIN32)
--		find_library(PTHREAD_LIBRARIES NAMES pthreadsVC2)
-+		find_library(PTHREAD_LIBRARIES NAMES pthreadVC2)
- 		find_path(PTHREAD_INCLUDE_DIR pthread.h)
- 	else (WIN32)
- 		find_library(LIBPTHREAD pthread)
diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake
index 25ba0e598..92a8988d4 100644
--- a/ports/mosquitto/portfile.cmake
+++ b/ports/mosquitto/portfile.cmake
@@ -1,13 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message("mosquitto only supports dynamic linkage")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "mosquitto does not support static CRT linkage")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -15,14 +8,9 @@ vcpkg_from_github(
     REF v1.5
     SHA512 f6a5c8e71d642ef931176fe428fb79353933facc2db226d9e55b87d4ff9bd6610a1bd05d71159e30c8afb1fda542d233630ae164770e652baa7ea51117211489
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/win64-cmake.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/output_folders-cmake.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/fix-dependence-pthreads.patch"
+        win64-cmake.patch
+        output_folders-cmake.patch
 )
 
 vcpkg_configure_cmake(
@@ -34,7 +22,7 @@ vcpkg_configure_cmake(
         -DWITH_TLS=ON
         -DWITH_TLS_PSK=ON
         -DWITH_THREADING=ON
-        -DDOCUMENTATION=OFF 
+        -DDOCUMENTATION=OFF
     OPTIONS_RELEASE
         -DENABLE_DEBUG=OFF
     OPTIONS_DEBUG
diff --git a/ports/mosquitto/win64-cmake.patch b/ports/mosquitto/win64-cmake.patch
index a7ac936e0..360bf006b 100644
--- a/ports/mosquitto/win64-cmake.patch
+++ b/ports/mosquitto/win64-cmake.patch
@@ -15,7 +15,7 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
 index d537e77..272b60a 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -6,12 +6,8 @@ option(WITH_THREADING "Include client library threading support?" ON)
+@@ -6,12 +6,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
  if (${WITH_THREADING} STREQUAL ON)
  	add_definitions("-DWITH_THREADING")
  	if (WIN32)
@@ -25,8 +25,7 @@ index d537e77..272b60a 100644
 -			set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
 -		endif (CMAKE_CL_64)
 -		set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
-+		find_library(PTHREAD_LIBRARIES NAMES pthreadsVC2)
-+		find_path(PTHREAD_INCLUDE_DIR pthread.h)
++		find_package(pthread REQUIRED)
  	else (WIN32)
  		find_library(LIBPTHREAD pthread)
  		if (LIBPTHREAD)
diff --git a/ports/ms-angle/CONTROL b/ports/ms-angle/CONTROL
index c3cf500b3..6d68b4e56 100644
--- a/ports/ms-angle/CONTROL
+++ b/ports/ms-angle/CONTROL
@@ -1,4 +1,4 @@
 Source: ms-angle
-Version: 2018-04-18
+Version: 2018-04-18-1
 Description: The UWP version of a conformant OpenGL ES implementation for Windows, Mac and Linux.
   The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
diff --git a/ports/ms-angle/portfile.cmake b/ports/ms-angle/portfile.cmake
index afaec0bf3..0a8dc8c9b 100644
--- a/ports/ms-angle/portfile.cmake
+++ b/ports/ms-angle/portfile.cmake
@@ -1,37 +1,33 @@
-include(vcpkg_common_functions)
-
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    message(FATAL_ERROR "This portfile does not support Linux or OSX")
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "ANGLE currently only supports being built as a dynamic library")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO microsoft/angle
-    REF ms-master
-    SHA512 eecdb7012c0630b24fde540fb6a558f4ee5326fc1218773b779953d0fe0ef02da68ceb2577822cfc0374392a88b871201bfe291e3b85c3dd005edc83f84fec1f
-)
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-uwp.patch
-)
-
-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=1
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/ms-angle)
-
-vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ms-angle RENAME copyright)
+include(vcpkg_common_functions)
+
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    message(FATAL_ERROR "This portfile does not support Linux or OSX")
+endif()
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/angle
+    REF ms-master
+    SHA512 eecdb7012c0630b24fde540fb6a558f4ee5326fc1218773b779953d0fe0ef02da68ceb2577822cfc0374392a88b871201bfe291e3b85c3dd005edc83f84fec1f
+    PATCHES
+    PATCHES
+        001-fix-uwp.patch
+)
+
+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=1
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/ms-angle)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ms-angle RENAME copyright)
diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL
index 913ed8375..4d32f7770 100644
--- a/ports/ms-gsl/CONTROL
+++ b/ports/ms-gsl/CONTROL
@@ -1,3 +1,3 @@
 Source: ms-gsl
-Version: 2019-01-18
+Version: 2019-04-19
 Description: Microsoft implementation of the Guidelines Support Library
diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake
index b424ec3a7..68303601f 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 7d78b743e43ecba06ca47426d03d9d16076dec16
-    SHA512 2174ad6a1eaced41e00f0781d13e68ca981644c20ba66e8e6e10b75d910203d860a93d3e9875a0560a9b7aee88e5703880014af67ab32028bffebb06f79811b7
+    REF b74b286d5e333561b0f1ef1abd18de2606624455
+    SHA512 5d2d9812fab638228eb8802df21d271bd94321f6174f1fa15a3d3a60dc742cdce1ee0701f2096625cca13df934b0d2511f9b4fcc0913780de234ac76403f2482
     HEAD_REF master
 )
 
diff --git a/ports/msix/CMakeLists.txt b/ports/msix/CMakeLists.txt
index 4c193bbb3..166d9042b 100644
--- a/ports/msix/CMakeLists.txt
+++ b/ports/msix/CMakeLists.txt
@@ -1 +1,15 @@
-add_custom_target(LIBS)
-\ No newline at end of file
+cmake_minimum_required(VERSION 3.14)
+
+add_custom_target(LIBS)
+
+find_package(XercesC CONFIG REQUIRED)
+add_library(xerces-c INTERFACE IMPORTED GLOBAL)
+target_link_libraries(xerces-c INTERFACE XercesC::XercesC)
+
+find_package(ZLIB REQUIRED)
+
+add_library(zlib INTERFACE IMPORTED GLOBAL)
+add_library(zlibstatic INTERFACE IMPORTED GLOBAL)
+
+target_link_libraries(zlib INTERFACE ZLIB::ZLIB)
+target_link_libraries(zlibstatic INTERFACE ZLIB::ZLIB)
diff --git a/ports/msix/CONTROL b/ports/msix/CONTROL
index 52ec64556..ae41a6ba1 100644
--- a/ports/msix/CONTROL
+++ b/ports/msix/CONTROL
@@ -1,5 +1,5 @@
-Source: msix
-Version: 1.0
-Build-Depends: xerces-c, zlib
-Description: The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.
-  The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details.
+Source: msix
+Version: MsixCoreInstaller-preview
+Build-Depends: xerces-c, zlib, openssl (!uwp&!windows)
+Description: The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.
+  The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details.
diff --git a/ports/msix/install-cmake.patch b/ports/msix/install-cmake.patch
index e44cc9b3c..d33613ae6 100644
--- a/ports/msix/install-cmake.patch
+++ b/ports/msix/install-cmake.patch
@@ -1,35 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ee0443..8c0a868 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -266,3 +266,5 @@ message(STATUS "sample processed")
+ add_subdirectory(test)
+ message(STATUS "tests processed")
+ message(STATUS "DONE!")
++
++install(TARGETS msix)
 diff --git a/src/msix/CMakeLists.txt b/src/msix/CMakeLists.txt
-index 586c140..41a24ae 100644
+index 817040b..6b16b69 100644
 --- a/src/msix/CMakeLists.txt
 +++ b/src/msix/CMakeLists.txt
-@@ -129,6 +129,17 @@ set(LIB_SOURCES
- # Define the library
- add_library(${LIBRARY_NAME} SHARED ${LIB_SOURCES} ${LIB_PUBLIC_HEADERS} ${LIB_PRIVATE_HEADERS})
- 
-+if(INSTALL_LIBMSIX)
-+    install(TARGETS ${LIBRARY_NAME}
-+        RUNTIME DESTINATION bin
-+        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION lib
-+    )
-+    if(INSTALL_HEADERS)
-+        install(FILES ${LIB_PUBLIC_HEADERS} DESTINATION include)
-+    endif()
-+endif()
-+
- # specify that this library is to be built with C++14
- set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 14)
+@@ -164,9 +164,9 @@ message(STATUS "PAL: Compression     = ${CompressionObject}")
+ include(msix_resources)
  
-@@ -149,8 +160,10 @@ include_directories(
- 	${CMAKE_PROJECT_ROOT}/lib/xerces/src
+ set(LIB_PUBLIC_HEADERS
+-    ../inc/AppxPackaging.hpp
+-    ../inc/MSIXWindows.hpp
+-    ../inc/MsixErrors.hpp
++    ${CMAKE_CURRENT_SOURCE_DIR}/../inc/AppxPackaging.hpp
++    ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MSIXWindows.hpp
++    ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MsixErrors.hpp
  )
  
--target_link_libraries(${PROJECT_NAME} PRIVATE zlibstatic)
--target_link_libraries(${PROJECT_NAME} PRIVATE xerces-c)
-+find_package(ZLIB REQUIRED)
-+find_package(XercesC REQUIRED)
-+target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
-+target_link_libraries(${PROJECT_NAME} PRIVATE XercesC::XercesC)
- 
- IF(AOSP)
-     target_link_libraries(${PROJECT_NAME} PRIVATE -latomic)
+ # Bundle specific files
diff --git a/ports/msix/portfile.cmake b/ports/msix/portfile.cmake
index 552d57699..1445e5845 100644
--- a/ports/msix/portfile.cmake
+++ b/ports/msix/portfile.cmake
@@ -1,46 +1,51 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message("msix only supports dynamic library linkage")
-    set(VCPKG_LIBRARY_LINKAGE "dynamic")
-endif()
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "msix only supports dynamic crt linkage")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/msix-packaging
-    REF v1.0
-    SHA512 11abf60da3414ce59f4347df8b2872ad6aa8a3c1e077f6e0be5c66ce90f14340cec5e58c30fb42ed17a10d5296dc0718bb8cddd665bdc20359bf7f0be4b0b4dc
+    REF MsixCoreInstaller-preview
+    SHA512 b034559da8e4d5fedc79b3ef65b6f8e9bca69c92f3d85096e7ea84a0e394fa04a92f84079524437ceebd6c006a12dac9cc2e46197154257bbf7449ded031d3e8
     HEAD_REF master
+    PATCHES install-cmake.patch
 )
 
 file(REMOVE_RECURSE ${SOURCE_PATH}/lib)
 file(MAKE_DIRECTORY ${SOURCE_PATH}/lib)
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/lib)
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake.patch
-)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(PLATFORM WIN32)
+    set(CRYPTO_LIB crypt32)
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(PLATFORM LINUX)
+    set(CRYPTO_LIB openssl)
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(PLATFORM MACOS)
+    set(CRYPTO_LIB openssl)
+else()
+    message(FATAL_ERROR "Unknown system: ${VCPKG_CMAKE_SYSTEM_NAME}")
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-        -DWIN32=ON
         -DINSTALL_LIBMSIX=ON
-    OPTIONS_RELEASE
-        -DINSTALL_HEADERS=ON
+        -DUSE_SHARED_ZLIB=ON
+        -D${PLATFORM}=ON
+        -DXML_PARSER=xerces
+        -DCRYPTO_LIB=${CRYPTO_LIB}
 )
 
 vcpkg_install_cmake()
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
 file(INSTALL
     ${SOURCE_PATH}/LICENSE
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/msix RENAME copyright)
 
 vcpkg_copy_pdbs()
-
diff --git a/ports/mujs/CONTROL b/ports/mujs/CONTROL
index c61c7031e..a15fdf7bb 100644
--- a/ports/mujs/CONTROL
+++ b/ports/mujs/CONTROL
@@ -1,3 +1,3 @@
-Source: mujs
-Version: 2018-07-30
-Description: An embeddable Javascript interpreter in C
+Source: mujs
+Version: 2018-07-30-1
+Description: An embeddable Javascript interpreter in C
diff --git a/ports/mujs/portfile.cmake b/ports/mujs/portfile.cmake
index f8c64c867..f9eff13b5 100644
--- a/ports/mujs/portfile.cmake
+++ b/ports/mujs/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-  message(WARNING "building static")
-  set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL
index 09b9cba0d..fdf241afb 100644
--- a/ports/nana/CONTROL
+++ b/ports/nana/CONTROL
@@ -1,4 +1,4 @@
 Source: nana
-Version: 1.6.2
+Version: 1.7.1
 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 ff9f43145..981bc4244 100644
--- a/ports/nana/portfile.cmake
+++ b/ports/nana/portfile.cmake
@@ -1,18 +1,16 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(WARNING "You will need to install Xorg dependencies to use nana:\napt install libx11-dev libxft-dev\n")
 endif()
 
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cnjinhao/nana
-    REF v1.6.2
-    SHA512 95271764813e64126abf2941bfc13b399ffe093c570891f65f331505066ce0dcad7df4170b2616951b7e0234ea2d6d21219cdfd15b112ecf598a3afa992cceb4
+    REF v1.7.1
+    SHA512 43bd6f6321557184431935b4fdd636427458e79333879f6310685a70ee25f4344851910e67c52145382c38a3cea9d1761b40c8edbc072a7cc9c62406ed402549
     HEAD_REF develop
 )
 
diff --git a/ports/nanopb/CONTROL b/ports/nanopb/CONTROL
index 0916582fe..40d18ea9e 100644
--- a/ports/nanopb/CONTROL
+++ b/ports/nanopb/CONTROL
@@ -1,3 +1,3 @@
 Source: nanopb
-Version: 2019-02-12-1
+Version: 2019-02-12-2
 Description: A small code-size Protocol Buffers implementation in ANSI C.
diff --git a/ports/nanopb/portfile.cmake b/ports/nanopb/portfile.cmake
index 278b3c7bb..35d662c40 100644
--- a/ports/nanopb/portfile.cmake
+++ b/ports/nanopb/portfile.cmake
@@ -1,12 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(WARNING "\
-The author of nanopb advises using this lib as a static library. \
-For more details, please visit: \
-https://github.com/nanopb/nanopb/pull/383#issuecomment-467852459"
-    )
-endif ()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 message(WARNING "\
 The nanopb's code generator is not installed as part of the installation \
@@ -19,8 +13,6 @@ vcpkg_from_github(
     REF d1305ddef1c18b4cb33992254494ccd255701aaa
     SHA512 70e588b0ff13846005658a9fafe57551dc2c126a32f351fe0b6c166c142c42b3bcc44567288f609f2f3a5adc1fe1bf1c585fec8c5fe90817b5b3ab47955aa1fc
     HEAD_REF master
-    PATCHES
-        shared-lib.patch
 )
 
 string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" BUILD_STATIC_LIBS)
diff --git a/ports/nanopb/shared-lib.patch b/ports/nanopb/shared-lib.patch
deleted file mode 100644
index 0d5960e72..000000000
--- a/ports/nanopb/shared-lib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b818734..174b650 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,6 +67,7 @@ endif()
- 
- if(nanopb_BUILD_RUNTIME)
-     if(BUILD_SHARED_LIBS)
-+        set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-         add_library(protobuf-nanopb SHARED
-             pb.h
-             pb_common.h
-@@ -79,7 +80,8 @@ if(nanopb_BUILD_RUNTIME)
-             SOVERSION ${nanopb_SOVERSION})
-         install(TARGETS protobuf-nanopb EXPORT nanopb-targets
-             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--	    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+	    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-         target_include_directories(protobuf-nanopb INTERFACE
-           $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-         )
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL
index 512fdb8b2..902a166eb 100644
--- a/ports/netcdf-c/CONTROL
+++ b/ports/netcdf-c/CONTROL
@@ -1,4 +1,4 @@
 Source: netcdf-c
-Version: 4.6.2-1
+Version: 4.7.0
 Build-Depends: hdf5, curl
 Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.
diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake
index 4f9046106..a965ce70e 100644
--- a/ports/netcdf-c/portfile.cmake
+++ b/ports/netcdf-c/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Unidata/netcdf-c
-    REF v4.6.2
-    SHA512 7c7084e80cf2fb86cd05101f5be7b74797ee96bf49afadfae6ab32ceed6cd9a049bfa90175e7cc0742806bcd2f61156e33fe7930c7b646661d9c89be6b20dea3
+    REF v4.7.0
+    SHA512 6602799780105c60ac8c873ed4055c1512dc8bebf98de01e1cce572d113ffb3bf3ca522475b93255c415340f672c55dc6785e0bdbcc39055314683da1d02141a
     HEAD_REF master
     PATCHES
         no-install-deps.patch
diff --git a/ports/netcdf-cxx4/CONTROL b/ports/netcdf-cxx4/CONTROL
index 0d21780ae..b926a2522 100644
--- a/ports/netcdf-cxx4/CONTROL
+++ b/ports/netcdf-cxx4/CONTROL
@@ -1,4 +1,4 @@
 Source: netcdf-cxx4
-Version: 4.3.0-2
+Version: 4.3.0-4
 Build-Depends: netcdf-c
 Description: a set of machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.
diff --git a/ports/netcdf-cxx4/portfile.cmake b/ports/netcdf-cxx4/portfile.cmake
index 68dcbf661..961694965 100644
--- a/ports/netcdf-cxx4/portfile.cmake
+++ b/ports/netcdf-cxx4/portfile.cmake
@@ -1,32 +1,19 @@
-# 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}
-#
-
-if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static")
-    set(HDF5_USE_STATIC_LIBRARIES ON)
-endif()
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message(STATUS "Warning: DLLs not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+set(HDF5_USE_STATIC_LIBRARIES ON)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/netcdf-cxx4-4.3.0)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Unidata/netcdf-cxx4/archive/v4.3.0.zip"
-    FILENAME "netcdf-cxx4-4.3.0.zip"
-    SHA512 c0ae933446c5bb019ab90c097787cefe15a0161b6b768e0251e9e0b21c92ca8d42d98babcbe07b81b8db08cd1e9fba7befb853611a76debfdfba0aee4fb4b0bc
-)
-vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-destination.patch
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Unidata/netcdf-cxx4
+    REF v4.3.0
+    SHA512 8e77333c979513721209e6b3fde31c298e18a45d7ea08123056e8120469eb8c4024d71289fab2b9182ee19ee7b6ad22bd133525bef048a497ede4aa2e9017465
+    HEAD_REF master
+    PATCHES
+        install-destination.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/nlopt/0001_export_symbols.patch b/ports/nlopt/0001_export_symbols.patch
deleted file mode 100644
index 8db70a139..000000000
--- a/ports/nlopt/0001_export_symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8ab743870873066a66b30d68907ccc4ade250a5 Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Mon, 4 Sep 2017 01:25:38 +0300
-Subject: [PATCH] export symbols
-
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f630c18..c266b39 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,6 +20,8 @@ endif ()
- 
- project (nlopt)
- 
-+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-+
- list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- 
- option (WITH_CXX "enable cxx routines" OFF)
--- 
-2.12.2.windows.2
-
diff --git a/ports/nlopt/CONTROL b/ports/nlopt/CONTROL
index c80774878..f6d91c785 100644
--- a/ports/nlopt/CONTROL
+++ b/ports/nlopt/CONTROL
@@ -1,3 +1,3 @@
 Source: nlopt
-Version: 2.4.2-1226c127
+Version: 2.6.1
 Description: a library for nonlinear local and global optimization, for functions with and without gradient information.
diff --git a/ports/nlopt/portfile.cmake b/ports/nlopt/portfile.cmake
index f9d204b33..301c92e30 100644
--- a/ports/nlopt/portfile.cmake
+++ b/ports/nlopt/portfile.cmake
@@ -1,19 +1,15 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stevengj/nlopt
-    REF 1226c1276dacf3687464c65eb165932281493a35
-    SHA512 889f60cd6970b17296871396366bd0d868011d71ca4b88cb6da906283f928e5b443ab18c5af48a0701c8bf68b6d66288a3e4f248e0ab8183251aa7c3b0cfd652
+    REF v2.6.1
+    SHA512 e9b8ee75536a568e75150dc0a169d951b670d54ca9d2797f9db6f2751811d9d21be367fa6794a0bc76370715caf5356b368c9c12ad416f3cfb74ae8fa8eabd5c
     HEAD_REF master
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001_export_symbols.patch)
-
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/nmslib/CONTROL b/ports/nmslib/CONTROL
index be3c8b486..7b65617c3 100644
--- a/ports/nmslib/CONTROL
+++ b/ports/nmslib/CONTROL
@@ -1,8 +1,8 @@
-Source: nmslib
-Version: 1.7.2
-Description: Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.
-#
-# ## Extras are currently unsupported for Windows, waiting for fixes.
-# Feature: extra
-# Description: Build extra algorithms and tools for nmslib. Note that this feature requires a large bunch of dependencies.
-# Build-Depends: gsl, eigen3, boost-system, boost-filesystem, boost-timer, boost-foreach, boost-format, boost-math, boost-random, boost-dynamic-bitset, boost-program-options
+Source: nmslib
+Version: 1.7.2-1
+Description: Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.
+#
+# ## Extras are currently unsupported for Windows, waiting for fixes.
+# Feature: extra
+# Description: Build extra algorithms and tools for nmslib. Note that this feature requires a large bunch of dependencies.
+# Build-Depends: gsl, eigen3, boost-system, boost-filesystem, boost-timer, boost-foreach, boost-format, boost-math, boost-random, boost-dynamic-bitset, boost-program-options
diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake
index 8743aae80..49a194ba1 100644
--- a/ports/nmslib/portfile.cmake
+++ b/ports/nmslib/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "nmslib only supports static linkage. Building statically.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -39,7 +36,7 @@ vcpkg_copy_pdbs()
 set(SUBFOLDERS factory method space)
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/nmslib)
 foreach(SUBFOLER ${SUBFOLDERS})
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/nmslib/${SUBFOLER}) 
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/nmslib/${SUBFOLER})
 endforeach()
 
 file(GLOB HEADERS ${CURRENT_PACKAGES_DIR}/include/*.h ${CURRENT_PACKAGES_DIR}/include/*/*.h)
@@ -50,7 +47,7 @@ foreach(HEADER ${HEADERS})
 endforeach(HEADER ${HEADERS})
 
 foreach(SUBFOLER ${SUBFOLDERS})
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/${SUBFOLER}/) 
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/${SUBFOLER}/)
 endforeach()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/nonius/CONTROL b/ports/nonius/CONTROL
new file mode 100644
index 000000000..3c321bf4e
--- /dev/null
+++ b/ports/nonius/CONTROL
@@ -0,0 +1,4 @@
+Source: nonius
+Version: 2019-04-20
+Description: A C++ micro-benchmarking framework
+Build-Depends: boost-algorithm, boost-lexical-cast, boost-math
diff --git a/ports/nonius/portfile.cmake b/ports/nonius/portfile.cmake
new file mode 100644
index 000000000..5762797cd
--- /dev/null
+++ b/ports/nonius/portfile.cmake
@@ -0,0 +1,16 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libnonius/nonius
+    REF 6396b7ad6685843eea63754ffa567dd66353c1a8
+    SHA512 3b824a6011f1dbe116271dd76e8214ed98d73dfc215d7c9242bf298eb0e7ee3a3e3198f477b49fdbe098ac6e3e4edd8ca7bd2e03cc2036189bf3630ef3fcdca2
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/include/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/nrf-ble-driver/001-arm64-support.patch b/ports/nrf-ble-driver/001-arm64-support.patch
new file mode 100644
index 000000000..03cec37b6
--- /dev/null
+++ b/ports/nrf-ble-driver/001-arm64-support.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99daa24..9a18ee5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -259,6 +259,9 @@ endforeach(SD_API_VER)
+ # Additional special linkage libraries
+ foreach(SD_API_VER ${SD_API_VERS})
+     if(WIN32)
++        # arm64-windows support
++        target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_STATIC_LIB} PRIVATE "advapi32")
++        target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_SHARED_LIB} PRIVATE "advapi32")
+     elseif(APPLE)
+         target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_STATIC_LIB} PRIVATE "-framework CoreFoundation" "-framework IOKit")
+         target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_SHARED_LIB} PRIVATE "-framework CoreFoundation" "-framework IOKit")
diff --git a/ports/nrf-ble-driver/CONTROL b/ports/nrf-ble-driver/CONTROL
new file mode 100644
index 000000000..0386cede5
--- /dev/null
+++ b/ports/nrf-ble-driver/CONTROL
@@ -0,0 +1,4 @@
+Source: nrf-ble-driver
+Version: 4.1.0
+Description: BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.
+Build-Depends: asio, catch2
+\ No newline at end of file
diff --git a/ports/nrf-ble-driver/portfile.cmake b/ports/nrf-ble-driver/portfile.cmake
new file mode 100644
index 000000000..8a642b144
--- /dev/null
+++ b/ports/nrf-ble-driver/portfile.cmake
@@ -0,0 +1,47 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    message(
+    "nrf-ble-driver currently requires the following libraries from the system package manager:
+        libudev-dev
+    These can be installed on Ubuntu systems via sudo apt install libudev-dev"
+    )
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO NordicSemiconductor/pc-ble-driver
+    REF v4.1.0
+    SHA512 f8a995826caf4022f68b149d0f3619d1d656e3960a927eda29c634bf06cad8341c95a5b51ec7e50b28814f5332a4800faf88eb5b4e8ebec153f9cad05b3a703e
+    HEAD_REF master
+    PATCHES
+        001-arm64-support.patch
+)
+
+# Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH.
+# Git should always be available as it is downloaded during the bootstrap phase.
+# Append instead of prepend to $PATH to honor the user's git executable as a general rule.
+find_program(GIT NAMES git git.cmd)
+get_filename_component(GIT_EXE_DIRPATH "${GIT}" DIRECTORY)
+set(ENV{PATH} "$ENV{PATH};${GIT_EXE_DIRPATH}")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DDISABLE_EXAMPLES= -DDISABLE_TESTS= -DNRF_BLE_DRIVER_VERSION=4.1.0 -DCONNECTIVITY_VERSION=4.1.0
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+\ No newline at end of file
diff --git a/ports/nuklear/CONTROL b/ports/nuklear/CONTROL
index f7d01c295..cefb1656c 100644
--- a/ports/nuklear/CONTROL
+++ b/ports/nuklear/CONTROL
@@ -1,3 +1,3 @@
 Source: nuklear
-Version: 2018-11-01
+Version: 2019-03-29
 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 b7e6bfff8..a6ef9e34f 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 181cfd86c47ae83eceabaf4e640587b844e613b6
-    SHA512 33f6200d046c96b8d42ff851ba788bf4f57d8aa99591b866e8691204378f23d5dce06343521834cd10ffaecc42566d97ce2c3becf48caaadf0cdc270cf69bdbb
+    REF 509c75b086351e82865f26a507235b60a63e1538
+    SHA512 d86fe93a8da8db955ccd28b353c19ea92aeb54efcf7a47ca160a576f4d52dbedc3abf7d547387a066851928c4f43c961b1daff097b3677a118c89f247042336a
     HEAD_REF master
 )
 file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/numactl/CONTROL b/ports/numactl/CONTROL
new file mode 100644
index 000000000..4c5c03687
--- /dev/null
+++ b/ports/numactl/CONTROL
@@ -0,0 +1,3 @@
+Source: numactl
+Version: 2.0.12
+Description: NUMA support for Linux
diff --git a/ports/numactl/portfile.cmake b/ports/numactl/portfile.cmake
new file mode 100644
index 000000000..3319d282f
--- /dev/null
+++ b/ports/numactl/portfile.cmake
@@ -0,0 +1,73 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO numactl/numactl
+    REF v2.0.12
+    SHA512 3814efd924d1c9152a30f6ae5b665afc20648226cd475d72b933c0ec4f30249af4e25110de17f144734b787ed765644dca09a657219806ab5c9c550abd45bf8e
+    HEAD_REF master
+)
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    message(FATAL_ERROR "Package only supports linux platform.")
+endif()
+
+message(
+"numactl currently requires the following libraries from the system package manager:
+    autoconf libtool
+These can be installed on Ubuntu systems via sudo apt install autoconf libtool"
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(SHARED_STATIC --enable-static --disable-shared)
+else()
+    set(SHARED_STATIC --disable-static --enable-shared)
+endif()
+
+set(OPTIONS ${SHARED_STATIC})
+vcpkg_execute_required_process(
+    COMMAND ${SOURCE_PATH}/autogen.sh
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME setup-${TARGET_TRIPLET}
+)
+
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -fPIC -O0 -g -I${SOURCE_PATH}/include")
+set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
+vcpkg_execute_required_process(
+    COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+    LOGNAME configure-${TARGET_TRIPLET}-dbg
+)
+message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+vcpkg_execute_required_process(
+    COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+    LOGNAME install-${TARGET_TRIPLET}-dbg
+)
+
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -fPIC -O3 -I${SOURCE_PATH}/include")
+set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
+vcpkg_execute_required_process(
+    COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+    LOGNAME configure-${TARGET_TRIPLET}-rel
+)
+message(STATUS "Building ${TARGET_TRIPLET}-rel")
+vcpkg_execute_required_process(
+    COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+    LOGNAME install-${TARGET_TRIPLET}-rel
+)
+
+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 ${CURRENT_PACKAGES_DIR}/debug/share)
+configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/numactl/copyright COPYONLY)
diff --git a/ports/nvtt/CONTROL b/ports/nvtt/CONTROL
index 19ef69da0..e52645ba7 100644
--- a/ports/nvtt/CONTROL
+++ b/ports/nvtt/CONTROL
@@ -1,3 +1,3 @@
 Source: nvtt
-Version: 2.1.0-1
-Description: Texture processing tools with support for Direct3D 10 and 11 formats.
-\ No newline at end of file
+Version: 2.1.0-3
+Description: Texture processing tools with support for Direct3D 10 and 11 formats.
diff --git a/ports/nvtt/bc6h.patch b/ports/nvtt/bc6h.patch
new file mode 100644
index 000000000..3e68ff516
--- /dev/null
+++ b/ports/nvtt/bc6h.patch
@@ -0,0 +1,14 @@
+diff --git a/src/bc6h/CMakeLists.txt b/src/bc6h/CMakeLists.txt
+index 635e0f3a..f758df43 100644
+--- a/src/bc6h/CMakeLists.txt	
++++ b/src/bc6h/CMakeLists.txt
+@@ -20,3 +20,8 @@ IF(NOT WIN32)
+         SET_TARGET_PROPERTIES(bc6h PROPERTIES COMPILE_FLAGS -fPIC)
+     ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ ENDIF(NOT WIN32)
++
++INSTALL(TARGETS bc6h 
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib/static)
+\ No newline at end of file
diff --git a/ports/nvtt/bc7.patch b/ports/nvtt/bc7.patch
new file mode 100644
index 000000000..c94fcef23
--- /dev/null
+++ b/ports/nvtt/bc7.patch
@@ -0,0 +1,14 @@
+diff --git a/src/bc7/CMakeLists.txt b/src/bc7/CMakeLists.txt
+index 2eb01c06..0c36895b 100644
+--- a/src/bc7/CMakeLists.txt	
++++ b/src/bc7/CMakeLists.txt
+@@ -28,3 +28,8 @@ IF(NOT WIN32)
+         SET_TARGET_PROPERTIES(bc7 PROPERTIES COMPILE_FLAGS -fPIC)
+     ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ ENDIF(NOT WIN32)
++
++INSTALL(TARGETS bc7 
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib/static)
+\ No newline at end of file
diff --git a/ports/nvtt/portfile.cmake b/ports/nvtt/portfile.cmake
index 30e2e5cc6..cd6008853 100644
--- a/ports/nvtt/portfile.cmake
+++ b/ports/nvtt/portfile.cmake
@@ -1,17 +1,7 @@
-# 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}
-#
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO castano/nvidia-texture-tools
@@ -19,7 +9,10 @@ vcpkg_from_github(
     SHA512 6c5c9588af57023fc384de080cbe5c5ccd8707d04a9533384c606efd09730d780cb21bcf2d3576102a3facd2f281cacb2625958d74575e71550fd98da92e38b6
     HEAD_REF master
     PATCHES
-        "001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch"
+        001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch
+        bc6h.patch
+        bc7.patch
+        squish.patch
 )
 
 vcpkg_configure_cmake(
@@ -27,6 +20,7 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DNVTT_SHARED=0
+        -DCMAKE_DEBUG_POSTFIX=_d # required by OSG
 )
 
 vcpkg_install_cmake()
@@ -34,7 +28,7 @@ vcpkg_install_cmake()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
-    
+
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/nvtt/squish.patch b/ports/nvtt/squish.patch
new file mode 100644
index 000000000..36ce7be76
--- /dev/null
+++ b/ports/nvtt/squish.patch
@@ -0,0 +1,13 @@
+diff --git a/src/nvtt/squish/CMakeLists.txt b/src/nvtt/squish/CMakeLists.txt
+index 832013e1..76824137 100644
+--- a/src/nvtt/squish/CMakeLists.txt	
++++ b/src/nvtt/squish/CMakeLists.txt
+@@ -33,3 +33,7 @@ IF(NOT WIN32)
+     ENDIF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+ ENDIF(NOT WIN32)
+ 
++INSTALL(TARGETS squish 
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib/static)
+\ No newline at end of file
diff --git a/ports/observer-ptr-lite/CONTROL b/ports/observer-ptr-lite/CONTROL
new file mode 100644
index 000000000..547e64289
--- /dev/null
+++ b/ports/observer-ptr-lite/CONTROL
@@ -0,0 +1,3 @@
+Source: observer-ptr-lite
+Version: 0.4.0
+Description: A C++17-like observer_ptr for C++98 and later in a single-file header-only library
diff --git a/ports/observer-ptr-lite/portfile.cmake b/ports/observer-ptr-lite/portfile.cmake
new file mode 100644
index 000000000..4fea768f5
--- /dev/null
+++ b/ports/observer-ptr-lite/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinmoene/observer-ptr-lite
+    REF v0.4.0
+    SHA512 4e53d8e0ce595604880bda423440071e7c207dd63e7b6bfa09cc7a870a010f09c51c31e640142c565ce261c4911acab13c6e9f5970853ad8fc2da3e4034ab7d7
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DNSOP_OPT_BUILD_TESTS=OFF
+        -DNSOP_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/octomap/001-fix-exported-targets.patch b/ports/octomap/001-fix-exported-targets.patch
new file mode 100644
index 000000000..fe02db6e9
--- /dev/null
+++ b/ports/octomap/001-fix-exported-targets.patch
@@ -0,0 +1,82 @@
+diff --git a/octomap/src/CMakeLists.txt b/octomap/src/CMakeLists.txt
+index 9ac6dcb..526ad76 100644
+--- a/octomap/src/CMakeLists.txt
++++ b/octomap/src/CMakeLists.txt
+@@ -8,16 +8,14 @@ SET (octomap_SRCS
+   OcTreeNode.cpp
+   OcTreeStamped.cpp
+   ColorOcTree.cpp
+-  )
++)
+ 
+-# dynamic and static libs, see CMake FAQ:
+-ADD_LIBRARY( octomap SHARED ${octomap_SRCS})
+-set_target_properties( octomap PROPERTIES
++ADD_LIBRARY(octomap ${octomap_SRCS})
++set_target_properties(octomap PROPERTIES
+   VERSION ${OCTOMAP_VERSION}
+   SOVERSION ${OCTOMAP_SOVERSION}
++  OUTPUT_NAME "octomap"
+ )
+-ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS})
+-SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") 
+ 
+ TARGET_LINK_LIBRARIES(octomap octomath)
+ 
+@@ -25,7 +23,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
+   file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
+ endif()
+ 
+-export(TARGETS octomap octomap-static
++export(TARGETS octomap
+   APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake")
+ 
+ ADD_SUBDIRECTORY( testing )
+@@ -66,7 +64,7 @@ TARGET_LINK_LIBRARIES(intersection_example octomap)
+ ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp)
+ TARGET_LINK_LIBRARIES(octree2pointcloud octomap)
+ 
+-install(TARGETS octomap octomap-static
++install(TARGETS octomap
+   EXPORT octomap-targets
+   INCLUDES DESTINATION include
+   ${INSTALL_TARGETS_DEFAULT_ARGS}
+@@ -84,4 +82,3 @@ install(TARGETS
+ 	compare_octrees
+ 	${INSTALL_TARGETS_DEFAULT_ARGS}
+ )
+-
+diff --git a/octomap/src/math/CMakeLists.txt b/octomap/src/math/CMakeLists.txt
+index 22127ad..cd256c7 100644
+--- a/octomap/src/math/CMakeLists.txt
++++ b/octomap/src/math/CMakeLists.txt
+@@ -5,26 +5,22 @@ SET (octomath_SRCS
+  )
+ 
+ 
+-ADD_LIBRARY( octomath SHARED ${octomath_SRCS})
++ADD_LIBRARY(octomath ${octomath_SRCS})
+ 
+ SET_TARGET_PROPERTIES( octomath PROPERTIES
+   VERSION ${OCTOMAP_VERSION}
+   SOVERSION ${OCTOMAP_SOVERSION}
+   INSTALL_NAME_DIR ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}   # this seems to be necessary for MacOS X
+ )
+-# INSTALL_NAME_DIR seems to be necessary for MacOS X
+-
+-ADD_LIBRARY( octomath-static STATIC ${octomath_SRCS})
+-SET_TARGET_PROPERTIES(octomath-static PROPERTIES OUTPUT_NAME "octomath")
+ 
+ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
+   file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
+ endif()
+ 
+-export(TARGETS octomath octomath-static
++export(TARGETS octomath
+   APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake")
+ 
+-install(TARGETS octomath octomath-static
++install(TARGETS octomath
+   EXPORT octomap-targets
+   INCLUDES DESTINATION include
+   ${INSTALL_TARGETS_DEFAULT_ARGS}
diff --git a/ports/octomap/CONTROL b/ports/octomap/CONTROL
index 71e76163a..3669f3850 100644
--- a/ports/octomap/CONTROL
+++ b/ports/octomap/CONTROL
@@ -1,3 +1,3 @@
 Source: octomap
-Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-5
+Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-6
 Description: An Efficient Probabilistic 3D Mapping Framework Based on Octrees
diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake
index 98630922e..113f6fc04 100644
--- a/ports/octomap/portfile.cmake
+++ b/ports/octomap/portfile.cmake
@@ -1,24 +1,24 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message("Octomap does not currently support building purely static. Building dynamic instead.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OctoMap/octomap
     REF cefed0c1d79afafa5aeb05273cf1246b093b771c
     SHA512 8fdea8b33680488d41e570d55ff88c20b923efb9d48238031f9b96d2e3917dbe7e49699769de63794f4b1d24e40a99615151e72487f30de340a3abf6522ea156
     HEAD_REF master
+    PATCHES
+      "001-fix-exported-targets.patch"
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBUILD_OCTOVIS_SUBPROJECT=OFF
         -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()
@@ -50,10 +50,15 @@ else()
 endif()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/octomap)
+
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/octomap")
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/octomap)
diff --git a/ports/octomap/vcpkg-cmake-wrapper.cmake b/ports/octomap/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..2dd237e71
--- /dev/null
+++ b/ports/octomap/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,15 @@
+_find_package(${ARGS})
+
+if(TARGET octomap AND NOT TARGET octomap-static)
+    add_library(octomap-static INTERFACE IMPORTED)
+    set_target_properties(octomap-static PROPERTIES INTERFACE_LINK_LIBRARIES "octomap")    
+
+    add_library(octomath-static INTERFACE IMPORTED)
+    set_target_properties(octomath-static PROPERTIES INTERFACE_LINK_LIBRARIES "octomath")
+elseif(TARGET octomap-static AND NOT TARGET octomap)
+    add_library(octomap INTERFACE IMPORTED)
+    set_target_properties(octomap PROPERTIES INTERFACE_LINK_LIBRARIES "octomap-static")
+    
+    add_library(octomath INTERFACE IMPORTED)
+    set_target_properties(octomath PROPERTIES INTERFACE_LINK_LIBRARIES "octomath-static")
+endif()
diff --git a/ports/ode/CONTROL b/ports/ode/CONTROL
index 952e85629..6f88319e6 100644
--- a/ports/ode/CONTROL
+++ b/ports/ode/CONTROL
@@ -1,3 +1,3 @@
-Source: ode
-Version: 0.15.1 
-Description: Open Dynamics Engine
+Source: ode
+Version: 0.15.1-1
+Description: Open Dynamics Engine
diff --git a/ports/ode/portfile.cmake b/ports/ode/portfile.cmake
index 2bd55e060..a1f617fe3 100644
--- a/ports/ode/portfile.cmake
+++ b/ports/ode/portfile.cmake
@@ -36,23 +36,23 @@ else ()
     set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
 endif()
 
-# The build system of ode outputs its artifacts in this subdirectory 
-# of the source directory 
+# The build system of ode outputs its artifacts in this subdirectory
+# of the source directory
 set(DEBUG_ARTIFACTS_PATH ${SOURCE_PATH}/lib/Debug)
 set(RELEASE_ARTIFACTS_PATH ${SOURCE_PATH}/lib/Release)
 
-# To avoid contamination from previous build, we clean the directory 
+# To avoid contamination from previous build, we clean the directory
 file(REMOVE_RECURSE ${DEBUG_ARTIFACTS_PATH} ${RELEASE_ARTIFACTS_PATH})
 
-# Configure the project using the embedded premake4 
+# Configure the project using the embedded premake4
 message(STATUS "Configuring ${TARGET_TRIPLET}")
-# Consistently with the debian package we only ship ODE built with double precision 
+# Consistently with the debian package we only ship ODE built with double precision
 set(premake_OPTIONS "--only-double")
-# TODO: use vcpkg's libccd 
+# TODO: use vcpkg's libccd
 list(APPEND premake_OPTIONS --with-libccd)
-if(DEFINED VCPKG_LIBRARY_LINKAGE AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     list(APPEND premake_OPTIONS --only-shared)
-elseif(DEFINED VCPKG_LIBRARY_LINKAGE AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
+elseif(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     list(APPEND premake_OPTIONS --only-static)
 endif()
 if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static)
@@ -75,11 +75,11 @@ vcpkg_build_msbuild(PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/ode
                     PLATFORM ${MSBUILD_PLATFORM}
                     WORKING_DIRECTORY ${SOURCE_PATH}/build)
 
-# Install headers 
+# Install headers
 file(GLOB HEADER_FILES ${SOURCE_PATH}/include/ode/*.h)
 file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ode)
-    
-# Install libraries 
+
+# Install libraries
 file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/*.lib ${DEBUG_ARTIFACTS_PATH}/*.exp)
 file(INSTALL ${LIB_DEBUG_FILES}
      DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
@@ -89,7 +89,7 @@ if (DEFINED VCPKG_LIBRARY_LINKAGE AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
    file(INSTALL ${BIN_DEBUG_FILES}
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif ()
-     
+
 file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/*.lib ${RELEASE_ARTIFACTS_PATH}/*.exp)
 file(INSTALL ${LIB_RELEASE_FILES}
      DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
diff --git a/ports/ompl/001-disable-extra-components.patch b/ports/ompl/001-disable-extra-components.patch
deleted file mode 100644
index b1bb8bc39..000000000
--- a/ports/ompl/001-disable-extra-components.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbde81b..da11bfe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -173,12 +173,13 @@ endif()
- # R is needed for running Planner Arena locally
- find_program(R_EXEC R)
- 
--add_subdirectory(py-bindings)
-+# VCPKG PATCH: Disable extra components from library.
-+# add_subdirectory(py-bindings)
- add_subdirectory(src)
--add_subdirectory(tests)
--add_subdirectory(demos)
--add_subdirectory(scripts)
--add_subdirectory(doc)
-+# add_subdirectory(tests)
-+# add_subdirectory(demos)
-+# add_subdirectory(scripts)
-+# add_subdirectory(doc)
- 
- target_link_flags(ompl)
- set(PKG_NAME "ompl")
diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL
index 082853664..bf9ad3a1f 100644
--- a/ports/ompl/CONTROL
+++ b/ports/ompl/CONTROL
@@ -1,4 +1,8 @@
 Source: ompl
-Version: 1.4.1-2
+Version: 1.4.2-1
 Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms
-Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, eigen3
-\ No newline at end of file
+Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3
+
+Feature: app
+Description: Add support for reading meshes and performing collision checking
+Build-Depends: assimp, fcl
diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake
index f03c3dd15..c8fdc9927 100644
--- a/ports/ompl/portfile.cmake
+++ b/ports/ompl/portfile.cmake
@@ -1,41 +1,33 @@
-# 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)
 
 string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
 if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
-    message(WARNING "Ompl's buildsystem uses very long paths and may fail on your system.\n"
+    message(WARNING "OMPL's buildsystem uses very long paths and may fail on your system.\n"
         "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
     )
 endif()
 
-set(OMPL_VERSION 1.4.1)
+
+set(OMPL_VERSION 1.4.2)
+set(OMPL_DISTNAME "ompl")
+set(OMPL_CHECKSUM "1dc477ee471c0570fd94838b072105960e09186f29634e2f61d885153df36532ab40e30912b534c61f222c09dad63fc6097d324b53c265f9284f20c585d3095c")
+
+if("app" IN_LIST FEATURES)
+    set(OMPL_DISTNAME "omplapp")
+    set(OMPL_CHECKSUM "04812a659fd81c2c541907911cbf4e5987be034546e8e48ed3d11b2b2f9ad3f7931f15d30a32ce3b64deb66b13875970797ac5072e92bfa0841e8d27d85fcb18")
+endif()
+
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/ompl/ompl/archive/${OMPL_VERSION}.zip"
-    FILENAME "ompl-${OMPL_VERSION}.zip"
-    SHA512 2552476e86fdd4d61a5663d401c18f873424127d04d2342f1e0e5d4a15212b952c9de59f1a2483c2c71ee3cc3aadbe1b5912ae7fa262c218dd0b22daadfcd95c
+    URLS "https://bitbucket.org/ompl/ompl/downloads/${OMPL_DISTNAME}-${OMPL_VERSION}-Source.tar.gz"
+    FILENAME "${OMPL_DISTNAME}-${OMPL_VERSION}.tar.gz"
+    SHA512 ${OMPL_CHECKSUM}
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${OMPL_VERSION}
-    PATCHES 
-        "001-disable-extra-components.patch"
 )
-# For some reason, demos and tests are being installed 
-# even when disabling the correct OMPL options.
-# The "001-disable-extra-components.patch" avoids that issue.
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -52,9 +44,25 @@ vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/ompl/cmake)
 
-# Remove debug distribution
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+# Remove debug distribution and other, move ompl_benchmark to tools/ dir
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+    ${CURRENT_PACKAGES_DIR}/share/man
+    ${CURRENT_PACKAGES_DIR}/share/ompl/demos
+    ${CURRENT_PACKAGES_DIR}/share/ompl/ompl.conf
+    ${CURRENT_PACKAGES_DIR}/share/ompl/plannerarena
+)
+if ("app" IN_LIST FEATURES)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/ompl)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ompl_benchmark.exe ${CURRENT_PACKAGES_DIR}/tools/ompl/ompl_benchmark.exe)
+    file(REMOVE_RECURSE
+        ${CURRENT_PACKAGES_DIR}/bin
+        ${CURRENT_PACKAGES_DIR}/debug/bin
+        ${CURRENT_PACKAGES_DIR}/share/ompl/resources
+        ${CURRENT_PACKAGES_DIR}/share/ompl/webapp
+    )
+endif()
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ompl RENAME copyright)
diff --git a/ports/oniguruma/CONTROL b/ports/oniguruma/CONTROL
index bf7a481ab..1780b4505 100644
--- a/ports/oniguruma/CONTROL
+++ b/ports/oniguruma/CONTROL
@@ -1,5 +1,5 @@
 Source: oniguruma
-Version: 2019-02-26
+Version: 6.9.2
 Description: Modern and flexible regular expressions library
 
 Feature: non-posix
diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake
index 40652b590..586bfbe07 100644
--- a/ports/oniguruma/portfile.cmake
+++ b/ports/oniguruma/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kkos/oniguruma
-    REF 502b1f416746ed8700498229bbfceb180e400fbc
-    SHA512 0faf12f415de59716d8faa4d3dc026874c3bd6a3624f75f2a184843025294eb885d57164ae6dcb916cba5c7d1a4da4bcb0dc23fce3ceae5b34b7320e8f0e2c02
+    REF v6.9.2
+    SHA512 b5578560f469c2e123280159a23a0e59045bf2452fd3efe09393c5e99ecc6323f965d2189a4e7e6e3a108c1d02b9b041f3fe991cd8ab64f7289003a5a07b4434
     HEAD_REF master
 )
 
@@ -23,6 +23,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_copy_pdbs()
+
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 
 file(REMOVE_RECURSE
@@ -47,4 +49,4 @@ endif()
 configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
 
 # CMake integration test
-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/open62541/CONTROL b/ports/open62541/CONTROL
index abf413d79..ed2224f0f 100644
--- a/ports/open62541/CONTROL
+++ b/ports/open62541/CONTROL
@@ -1,3 +1,3 @@
 Source: open62541
-Version: 0.3.0
+Version: 0.3.0-1
 Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.
diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake
index 951ad9b48..a8c345eb8 100644
--- a/ports/open62541/portfile.cmake
+++ b/ports/open62541/portfile.cmake
@@ -37,7 +37,7 @@ if(NOT EXISTS ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX})
         vcpkg_download_distfile(GET_PIP
             URLS "https://bootstrap.pypa.io/get-pip.py"
             FILENAME "tools/python/python3/get-pip.py"
-            SHA512 fdbcef1037dca7cc914e2304af657ebd08239cd18c3e79786dc25c8ea39957674e012d7ea8ae2c99006e4b61d3a5e24669ac5771dc186697fd9fdb40b6cc07ae
+            SHA512 99520d223819708b8f6e4b839d1fa215e4e8adc7fcd0db6c25a0399cf2fa10034b35673cf450609303646d12497f301ef53b7e7cc65c78e7bce4af0c673555ad
         )
         execute_process(COMMAND ${PYTHON3_DIR}/python${EXECUTABLE_SUFFIX} ${PYTHON3_DIR}/get-pip.py)
     endif()
diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL
index cc30df1de..3591a3f70 100644
--- a/ports/openal-soft/CONTROL
+++ b/ports/openal-soft/CONTROL
@@ -1,3 +1,3 @@
 Source: openal-soft
-Version: 1.19.1-1
+Version: 1.19.1-2
 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.
diff --git a/ports/openal-soft/fix-arm-builds.patch b/ports/openal-soft/fix-arm-builds.patch
new file mode 100644
index 000000000..87fecbca2
--- /dev/null
+++ b/ports/openal-soft/fix-arm-builds.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 39b80250..e2a1ed76 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1409,6 +1409,7 @@ ELSE()
+         ELSEIF(CMAKE_COMPILER_IS_GNUCC)
+             SET(SUBSYS_FLAG ${SUBSYS_FLAG} "-mwindows")
+         ENDIF()
++        SET(COMMON_LIB ${COMMON_LIB} shell32 ole32)
+     ENDIF()
+ 
+     IF(WIN32 AND ALSOFT_BUILD_ROUTER)
+diff --git a/native-tools/CMakeLists.txt b/native-tools/CMakeLists.txt
+index 5e816bba..16f3be12 100644
+--- a/native-tools/CMakeLists.txt
++++ b/native-tools/CMakeLists.txt
+@@ -24,6 +24,11 @@ set_target_properties(bsincgen PROPERTIES OUTPUT_NAME bsincgen)
+ set_target_properties(bsincgen PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}")
+ set_target_properties(bsincgen PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}")
+ target_compile_definitions(bsincgen PRIVATE ${CPP_DEFS})
++set(BSINCGEN_LIB )
+ if(HAVE_LIBM)
+-    target_link_libraries(bsincgen m)
++    set(BSINCGEN_LIB ${BSINCGEN_LIB} m)
+ endif(HAVE_LIBM)
++if(WIN32)
++    set(BSINCGEN_LIB ${BSINCGEN_LIB} shell32)
++endif()
++target_link_libraries(bsincgen ${BSINCGEN_LIB})
+\ No newline at end of file
diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake
index 0af13af6c..a753030c8 100644
--- a/ports/openal-soft/portfile.cmake
+++ b/ports/openal-soft/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
     PATCHES
         dont-export-symbols-in-static-build.patch
         cmake-3-11.patch
+        fix-arm-builds.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -30,7 +31,6 @@ endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
         -DLIBTYPE=${OPENAL_LIBTYPE}
         -DALSOFT_UTILS=OFF
@@ -54,6 +54,7 @@ vcpkg_configure_cmake(
         -DALSOFT_REQUIRE_WINMM=${ALSOFT_REQUIRE_WINDOWS}
         -DALSOFT_REQUIRE_DSOUND=${ALSOFT_REQUIRE_WINDOWS}
         -DALSOFT_REQUIRE_MMDEVAPI=${ALSOFT_REQUIRE_WINDOWS}
+        -DALSOFT_CPUEXT_NEON=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL
index c7f019185..40249c332 100644
--- a/ports/openblas/CONTROL
+++ b/ports/openblas/CONTROL
@@ -1,3 +1,3 @@
 Source: openblas
-Version: 0.3.5-2
+Version: 0.3.6-2
 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake
index dae730b6f..cccb5e3b1 100644
--- a/ports/openblas/portfile.cmake
+++ b/ports/openblas/portfile.cmake
@@ -16,20 +16,13 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     message(FATAL_ERROR "openblas can only be built for x64 currently")
 endif()
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message("openblas currenly only supports dynamic library linkage")
-        set(VCPKG_LIBRARY_LINKAGE "dynamic")
-    endif()
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xianyi/OpenBLAS
-    REF v0.3.5
-    SHA512 91b3074eb922453bf843158b4281cde65db9e8bbdd7590e75e9e6cdcb486157f7973f2936f327bb3eb4f1702ce0ba51ae6729d8d4baf2d986c50771e8f696df0
+    REF v0.3.6
+    SHA512 1ad980176a51f70d8b0b2d158da8c01f30f77b7cf385b24a6340d3c5feb1513bd04b9390487d05cc9557db7dc5f7c135b1688dec9f17ebef35dba884ef7ddee9
     HEAD_REF develop
-    PATCHES 
+    PATCHES
         uwp.patch
         fix-space-path.patch
 )
@@ -45,6 +38,9 @@ vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${SED_EXE_PATH}")
 
+set(COMMON_OPTIONS
+    -DBUILD_WITHOUT_LAPACK=ON)
+
 # for UWP version, must build non uwp first for helper
 # binaries.
 if(VCPKG_CMAKE_SYSTEM_NAME  STREQUAL "WindowsStore")
@@ -58,7 +54,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME  STREQUAL "WindowsStore")
 
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
-        OPTIONS -DTARGET=NEHALEM -DBUILD_WITHOUT_LAPACK=ON
+        OPTIONS
+            ${COMMON_OPTIONS}
+            -DTARGET=NEHALEM
     )
 
     # add just built path to environment for gen_config_h.exe,
@@ -74,17 +72,24 @@ if(VCPKG_CMAKE_SYSTEM_NAME  STREQUAL "WindowsStore")
 
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
-        OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DVS_WINRT_COMPONENT=TRUE -DBUILD_WITHOUT_LAPACK=ON 
-        "-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel")
+        OPTIONS 
+            ${COMMON_OPTIONS}
+            -DCMAKE_SYSTEM_PROCESSOR=AMD64
+            -DVS_WINRT_COMPONENT=TRUE
+            "-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel")
 
 elseif(NOT VCPKG_CMAKE_SYSTEM_NAME)
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
-        OPTIONS -DBUILD_WITHOUT_LAPACK=ON)
+        OPTIONS
+            ${COMMON_OPTIONS})
 else()
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
-        OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DNOFORTRAN=ON)
+        OPTIONS
+            ${COMMON_OPTIONS}
+            -DCMAKE_SYSTEM_PROCESSOR=AMD64
+            -DNOFORTRAN=ON)
 endif()
 
 
diff --git a/ports/openblas/uwp.patch b/ports/openblas/uwp.patch
index 93d0795a6..50a8e9b29 100644
--- a/ports/openblas/uwp.patch
+++ b/ports/openblas/uwp.patch
@@ -1,3 +1,4 @@
+diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
 --- a/cmake/prebuild.cmake	2019-01-28 03:05:58.422245700 -0600
 +++ b/cmake/prebuild.cmake	2019-01-28 03:07:02.885495800 -0600
 @@ -37,6 +37,9 @@
@@ -32,3 +33,18 @@
  
    # append config data from getarch_2nd to the TARGET file and read in CMake vars
    file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT})
+
+diff --git a/cmake/system.cmake b/cmake/system.cmake
+index a060d98..52ffa5a 100644
+--- a/cmake/system.cmake
++++ b/cmake/system.cmake
+@@ -13,6 +13,9 @@ if(CMAKE_CROSSCOMPILING AND NOT DEFINED TARGET)
+     set(TARGET "ARMV8")
+   elseif(ARM)
+     set(TARGET "ARMV7") # TODO: Ask compiler which arch this is
++  elseif(${HOST_OS} STREQUAL "WINDOWSSTORE")
++    set(CMAKE_CROSSCOMPILING 0)
++    add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
+   else()
+     message(FATAL_ERROR "When cross compiling, a TARGET is required.")
+   endif()
diff --git a/ports/opencl/CONTROL b/ports/opencl/CONTROL
index 89d4ad0e1..633c95e51 100644
--- a/ports/opencl/CONTROL
+++ b/ports/opencl/CONTROL
@@ -1,3 +1,3 @@
-Source: opencl
-Version: 2.2 (2017.07.18)
-Description: C/C++ headers and ICD loader (Installable Client Driver) for OpenCL
+Source: opencl
+Version: 2.2 (2017.07.18)-1
+Description: C/C++ headers and ICD loader (Installable Client Driver) for OpenCL
diff --git a/ports/opencl/portfile.cmake b/ports/opencl/portfile.cmake
index f7e1bdd2f..54096512f 100644
--- a/ports/opencl/portfile.cmake
+++ b/ports/opencl/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 # OpenCL C headers
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -52,11 +54,6 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message(STATUS "Building the ICD loader as a static library is not supported. Building as DLLs instead.")
-    set(VCPKG_LIBRARY_LINKAGE "dynamic")
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 88ade6e28..3b5145535 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,5 +1,5 @@
 Source: opencv
-Version: 3.4.3-7
+Version: 3.4.3-8
 Build-Depends: zlib
 Description: computer vision library
 Default-Features: opengl, jpeg, png, tiff, eigen, flann
@@ -50,7 +50,7 @@ Build-Depends: vtk
 Description: vtk support for opencv
 
 Feature: gdcm
-Build-Depends: gdcm2
+Build-Depends: gdcm
 Description: GDCM support for opencv
 
 Feature: webp
@@ -81,5 +81,8 @@ Feature: eigen
 Build-Depends: eigen3
 Description: Eigen support for opencv
 
+Feature: world
+Description: Compile to a single package support for opencv
+
 Feature: nonfree
 Description: allow nonfree and unredistributable libraries
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index 9ea245ed3..a3d8c894b 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -20,6 +20,11 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
 
 set(CMAKE_MODULE_PATH)
 
+set(BUILD_opencv_world OFF)
+if("world" IN_LIST FEATURES)
+  set(BUILD_opencv_world ON)
+endif()
+
 set(BUILD_opencv_dnn OFF)
 set(WITH_PROTOBUF OFF)
 if("dnn" IN_LIST FEATURES)
@@ -274,6 +279,7 @@ vcpkg_configure_cmake(
         -DBUILD_opencv_python3=OFF
         -DBUILD_opencv_saliency=${BUILD_opencv_saliency}
         -DBUILD_opencv_sfm=${BUILD_opencv_sfm}
+        -DBUILD_opencv_world=${BUILD_opencv_world}
         # PROTOBUF
         -DPROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES}
         -DUPDATE_PROTO_FILES=${UPDATE_PROTO_FILES}
@@ -388,6 +394,14 @@ string(REPLACE "${CURRENT_INSTALLED_DIR}"
                "\${_VCPKG_INSTALLED_DIR}/\${VCPKG_TARGET_TRIPLET}" OPENCV_MODULES "${OPENCV_MODULES}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}")
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES)
+  string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)"
+                 "set(CMAKE_IMPORT_FILE_VERSION 1)
+                 find_package(TIFF REQUIRED)" OPENCV_MODULES "${OPENCV_MODULES}")
+  file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}")
+endif()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL
index ea85a082f..5fd21f6da 100644
--- a/ports/openexr/CONTROL
+++ b/ports/openexr/CONTROL
@@ -1,4 +1,4 @@
 Source: openexr
-Version: 2.3.0-2
+Version: 2.3.0-3
 Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications
 Build-Depends: zlib
diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake
index f06ee4841..256a133b4 100644
--- a/ports/openexr/portfile.cmake
+++ b/ports/openexr/portfile.cmake
@@ -60,11 +60,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(OPENEXR_PORT_DIR "openexr")
-else()
-  set(OPENEXR_PORT_DIR "OpenEXR")
-endif()
+set(OPENEXR_PORT_DIR "openexr")
 
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR})
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/copyright)
diff --git a/ports/openjpeg/CONTROL b/ports/openjpeg/CONTROL
index 1b7a3697d..110bae11a 100644
--- a/ports/openjpeg/CONTROL
+++ b/ports/openjpeg/CONTROL
@@ -1,3 +1,3 @@
 Source: openjpeg
-Version: 2.3.0
+Version: 2.3.1-1
 Description: JPEG 2000 image library
diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake
index de683a089..2296734ad 100644
--- a/ports/openjpeg/portfile.cmake
+++ b/ports/openjpeg/portfile.cmake
@@ -1,9 +1,10 @@
 include(vcpkg_common_functions)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uclouvain/openjpeg
-    REF v2.3.0
-    SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
+    REF v2.3.1
+    SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
     HEAD_REF master
 )
 
diff --git a/ports/openmama/CONTROL b/ports/openmama/CONTROL
index 600b78091..3b281e8c7 100644
--- a/ports/openmama/CONTROL
+++ b/ports/openmama/CONTROL
@@ -1,4 +1,4 @@
 Source: openmama
-Version: 6.2.2
+Version: 6.2.3
 Build-Depends: libevent, apr, qpid-proton
 Description: OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages.
diff --git a/ports/openmama/portfile.cmake b/ports/openmama/portfile.cmake
index e84e49284..62f76cf0b 100644
--- a/ports/openmama/portfile.cmake
+++ b/ports/openmama/portfile.cmake
@@ -6,8 +6,8 @@ vcpkg_find_acquire_program(SCONS)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenMAMA/OpenMAMA
-    REF OpenMAMA-6.2.2-release
-    SHA512 e12dbd911dbb5416178d5f2ca874ef8ea90edbea8edb64ad77f096ea491b3dea1cca1c3ac4fe73a59a154f56b570a4834cce0943e16a10a29c6d6af90c2ef6f1
+    REF OpenMAMA-6.2.3-release
+    SHA512 2d641a34f4301f8aa0a33cc6c1172e2d3215792955a56f13858d758cedfea1c2ec3ae466112f06f9be7a67d80569f12238eca98008e6623558183b08dcd954c0
     HEAD_REF next
 )
 
diff --git a/ports/openmvg/CONTROL b/ports/openmvg/CONTROL
index ce974a9d6..5006dc8dd 100644
--- a/ports/openmvg/CONTROL
+++ b/ports/openmvg/CONTROL
@@ -1,4 +1,11 @@
-Source: openmvg
-Version: 1.4-1
-Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.
-Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib
+Source: openmvg
+Version: 1.4-2
+Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.
+Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib
+
+Feature: opencv
+Build-Depends: opencv[contrib]
+Description: opencv support for openmvg
+
+Feature: openmp
+Description: openmp support for openmvg
diff --git a/ports/openmvg/fixcmake.patch b/ports/openmvg/fixcmake.patch
index 2ee976dd5..66eff4fd3 100644
--- a/ports/openmvg/fixcmake.patch
+++ b/ports/openmvg/fixcmake.patch
@@ -1,119 +1,421 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 654bebd..6d1c671 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -39,6 +39,10 @@ option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF)
- # ==============================================================================
- option(OpenMVG_USE_OCVSIFT "Add or not OpenCV SIFT in available features" OFF)
- 
-+if(OpenMVG_BUILD_SHARED AND MSVC)
-+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-+endif(OpenMVG_BUILD_SHARED AND MSVC)
-+
- # ==============================================================================
- # OpenMVG version
- # ==============================================================================
-@@ -88,11 +92,11 @@ endif()
- # ==============================================================================
- # Check that submodule have been initialized and updated
- # ==============================================================================
--if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
--  message(FATAL_ERROR
--    "\n submodule(s) are missing, please update your repository:\n"
--    "  > git submodule update -i\n")
--endif()
-+# if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
-+#   message(FATAL_ERROR
-+#     "\n submodule(s) are missing, please update your repository:\n"
-+#     "  > git submodule update -i\n")
-+# endif()
- 
- # ==============================================================================
- # Additional cmake find modules
-@@ -184,12 +188,12 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES)
- endif (OpenMVG_BUILD_OPENGL_EXAMPLES)
- 
- # Dependencies install rules
--install(
--  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/
--  DESTINATION include/openMVG_dependencies
--  COMPONENT headers
--  FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
--)
-+# install(
-+#   DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/
-+#   DESTINATION include/openMVG_dependencies
-+#   COMPONENT headers
-+#   FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
-+# )
- 
- # ==============================================================================
- # --END-- SUBMODULE CONFIGURATION
-diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake
-index c997b87..74c3aae 100644
---- a/src/cmakeFindModules/FindClp.cmake
-+++ b/src/cmakeFindModules/FindClp.cmake
-@@ -51,8 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "")
-         SET(CLP_INCLUDE_DIR ${CLP_DIR})
- 
-         FIND_LIBRARY(CLP_LIBRARY NAMES Clp)
--        FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver)
--        FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp)
-+        FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp)
-+        FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp)
- 
-         # locate Clp libraries
-         IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY)
-diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt
-index 80b1fe6..cb396c7 100644
---- a/src/openMVG/matching/CMakeLists.txt
-+++ b/src/openMVG/matching/CMakeLists.txt
-@@ -38,7 +38,7 @@ target_link_libraries(openMVG_matching
-     openMVG_features
-     Threads::Threads
- )
--if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN)
-+if (NOT OpenMVG_USE_INTERNAL_FLANN)
- target_link_libraries(openMVG_matching
-   PUBLIC
-     ${FLANN_LIBRARIES}
-diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt
-index 816a941..f0b7145 100644
---- a/src/third_party/CMakeLists.txt
-+++ b/src/third_party/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_subdirectory(stlplus3)
- set(STLPLUS_LIBRARY openMVG_stlplus PARENT_SCOPE)
- 
- # Add graph library
--if(DEFINED OpenMVG_USE_INTERNAL_LEMON)
-+if(OpenMVG_USE_INTERNAL_LEMON)
-   add_subdirectory(lemon)
-   set_property(TARGET openMVG_lemon PROPERTY FOLDER OpenMVG/3rdParty/lemon)
-   set_property(TARGET check PROPERTY FOLDER OpenMVG/3rdParty/lemon)
-@@ -68,7 +68,7 @@ endif (NOT TIFF_FOUND)
- add_subdirectory(vectorGraphics)
- 
- # Add ceres-solver (A Nonlinear Least Squares Minimizer)
--if (DEFINED OpenMVG_USE_INTERNAL_CERES)
-+if (OpenMVG_USE_INTERNAL_CERES)
-   add_subdirectory(cxsparse)
-   add_subdirectory(ceres-solver)
-   set_property(TARGET openMVG_cxsparse PROPERTY FOLDER OpenMVG/3rdParty/ceres)
-@@ -76,7 +76,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES)
- endif()
- 
- # Add an Approximate Nearest Neighbor library
--if (DEFINED OpenMVG_USE_INTERNAL_FLANN)
-+if (OpenMVG_USE_INTERNAL_FLANN)
-   set(FLANN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/flann/src/cpp)
-   add_subdirectory(flann)
- endif()
-@@ -90,7 +90,7 @@ add_subdirectory(fast)
- ##
- # Install Header only libraries if necessary
- ##
--if (DEFINED OpenMVG_USE_INTERNAL_EIGEN)
-+if (OpenMVG_USE_INTERNAL_EIGEN)
-   #Configure Eigen install
-   set(EIGEN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen)
-   add_subdirectory(eigen)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 654bebd..5264bfc 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -17,27 +17,16 @@ endif()
+ # ==============================================================================
+ # OpenMVG build options
+ # ==============================================================================
+-option(OpenMVG_BUILD_SHARED "Build OpenMVG shared libs" OFF)
+-option(OpenMVG_BUILD_TESTS "Build OpenMVG tests" OFF)
+-option(OpenMVG_BUILD_DOC "Build OpenMVG documentation" ON)
+-option(OpenMVG_BUILD_EXAMPLES "Build OpenMVG samples applications." ON)
+-option(OpenMVG_BUILD_OPENGL_EXAMPLES "Build OpenMVG openGL examples" OFF)
+-option(OpenMVG_BUILD_SOFTWARES "Build OpenMVG softwares" ON)
+-option(OpenMVG_BUILD_GUI_SOFTWARES "Build OpenMVG GUI softwares (QT5)" ON)
+-option(OpenMVG_BUILD_COVERAGE "Enable code coverage generation (gcc only)" OFF)
+-option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON)
+ # ==============================================================================
+ # Opencv is not used by openMVG but some samples show how to use openCV
+ #  and openMVG simultaneously
+ # ==============================================================================
+-option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF)
+ 
+ # ==============================================================================
+ # Since OpenCV 3, SIFT is no longer in the default modules. See
+ # https://github.com/itseez/opencv_contrib for more informations.
+ # Enable this to be able to use OpenCV SIFT in main_ComputeFeatures_OpenCV.
+ # ==============================================================================
+-option(OpenMVG_USE_OCVSIFT "Add or not OpenCV SIFT in available features" OFF)
+ 
+ # ==============================================================================
+ # OpenMVG version
+@@ -85,15 +74,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   register_definitions(-DOPENMVG_STD_UNORDERED_MAP)
+ endif()
+ 
+-# ==============================================================================
+-# Check that submodule have been initialized and updated
+-# ==============================================================================
+-if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
+-  message(FATAL_ERROR
+-    "\n submodule(s) are missing, please update your repository:\n"
+-    "  > git submodule update -i\n")
+-endif()
+-
+ # ==============================================================================
+ # Additional cmake find modules
+ # ==============================================================================
+@@ -129,7 +109,6 @@ if (OpenMVG_USE_OPENMP)
+   find_package(OpenMP)
+   if (OPENMP_FOUND)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+-    option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" ON)
+     register_definitions(-DOPENMVG_USE_OPENMP)
+     if (NOT MSVC)
+       if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+@@ -140,11 +119,6 @@ if (OpenMVG_USE_OPENMP)
+       endif()
+     endif (NOT MSVC)
+   endif (OPENMP_FOUND)
+-else (OpenMVG_USE_OPENMP)
+-    option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" OFF)
+-    include(UpdateCacheVariable)
+-    UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENMP OFF)
+-    remove_definitions(-DOPENMVG_USE_OPENMP)
+ endif (OpenMVG_USE_OPENMP)
+ 
+ # ==============================================================================
+@@ -183,14 +157,6 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES)
+   set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw)
+ endif (OpenMVG_BUILD_OPENGL_EXAMPLES)
+ 
+-# Dependencies install rules
+-install(
+-  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/
+-  DESTINATION include/openMVG_dependencies
+-  COMPONENT headers
+-  FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
+-)
+-
+ # ==============================================================================
+ # --END-- SUBMODULE CONFIGURATION
+ # ==============================================================================
+@@ -226,14 +192,8 @@ ENDMACRO(UNIT_TEST)
+ # - external by default
+ # - internal if cereal not found
+ # ==============================================================================
+-find_package(cereal QUIET CONFIG)
+-if (NOT cereal_FOUND)
+-  set(CEREAL_INCLUDE_DIRS
+-    ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/cereal/include)
+-  set(OpenMVG_USE_INTERNAL_CEREAL ON)
+-else()
+-  get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES)
+-endif()
++find_package(cereal REQUIRED CONFIG)
++get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES)
+ 
+ # ==============================================================================
+ # Eigen
+@@ -242,14 +202,8 @@ endif()
+ # - external if EIGEN_INCLUDE_DIR_HINTS is defined
+ # - internal if Eigen not found
+ # ==============================================================================
+-find_package(eigen3 QUIET)
+-if (NOT eigen3_FOUND)
+-  set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen)
+-  set(OpenMVG_USE_INTERNAL_EIGEN ON)
+-  find_package(Eigen QUIET)
+-else()
+-  set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+-endif()
++find_package(eigen3 REQUIRED)
++set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+ 
+ # ==============================================================================
+ # Ceres
+@@ -257,17 +211,7 @@ endif()
+ # - external by default if CERES_DIR_HINTS or find_package found a valid Ceres
+ # - internal if ceres not found (ceres-solver+cxsparse+miniglog)
+ # ==============================================================================
+-find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS})
+-if (NOT Ceres_FOUND)
+-  set(OpenMVG_USE_INTERNAL_CERES ON)
+-  set(CERES_INCLUDE_DIRS
+-    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/include
+-    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/internal/ceres/miniglog
+-    ${PROJECT_BINARY_DIR}/third_party/ceres-solver/config)
+-    FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/VERSION" CERES_CONFIG)
+-    STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG})
+-  set(CERES_LIBRARIES openMVG_ceres)
+-endif()
++find_package(Ceres REQUIRED)
+ 
+ # ==============================================================================
+ # Flann
+@@ -275,14 +219,7 @@ endif()
+ # - internal by default (flann),
+ # - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found
+ # ==============================================================================
+-if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS)
+-  set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
+-  set(OpenMVG_USE_INTERNAL_FLANN ON)
+-endif()
+-find_package(Flann QUIET)
+-if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN)
+-  set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
+-endif()
++find_package(flann REQUIRED)
+ 
+ # ==============================================================================
+ # CoinUtils
+@@ -290,15 +227,7 @@ endif()
+ # - internal by default (CoinUtils),
+ # - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found
+ # ==============================================================================
+-if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
+-  set(COINUTILS_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/)
+-  set(OpenMVG_USE_INTERNAL_COINUTILS ON)
+-endif()
+-find_package(CoinUtils QUIET)
+-if (NOT COINUTILS_FOUND OR OpenMVG_USE_INTERNAL_COINUTILS)
+-  set(COINUTILS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/)
+-  set(COINUTILS_LIBRARY lib_CoinUtils)
+-endif()
++find_package(CoinUtils REQUIRED)
+ 
+ ## ==============================================================================
+ ## Clp
+@@ -306,17 +235,7 @@ endif()
+ ## - internal by default (Clp),
+ ## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found
+ ## ==============================================================================
+-if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
+-  set(CLP_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/)
+-  set(OpenMVG_USE_INTERNAL_CLP ON)
+-endif()
+-find_package(Clp QUIET)
+-if (NOT CLP_FOUND OR OpenMVG_USE_INTERNAL_CLP)
+-  set(CLP_INCLUDE_DIRS
+-     ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/
+-     ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/OsiClp/)
+-  set(CLP_LIBRARIES lib_clp lib_OsiClpSolver)
+-endif()
++find_package(Clp REQUIRED)
+ 
+ # ==============================================================================
+ # Osi
+@@ -324,15 +243,7 @@ endif()
+ # - internal by default (Osi),
+ # - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found
+ # ==============================================================================
+-if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
+-  set(OSI_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/)
+-  set(OpenMVG_USE_INTERNAL_OSI ON)
+-endif()
+-find_package(Osi QUIET)
+-if (NOT OSI_FOUND OR OpenMVG_USE_INTERNAL_OSI)
+-  set(OSI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/Osi/)
+-  set(OSI_LIBRARY lib_Osi)
+-endif()
++find_package(Osi REQUIRED)
+ 
+ # ==============================================================================
+ # Internal CLP/OSI/COINUTILS libraries:
+@@ -351,17 +262,7 @@ endif()
+ # - internal by default (Lemon),
+ # - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found
+ # ==============================================================================
+-if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS)
+-  set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon)
+-  set(OpenMVG_USE_INTERNAL_LEMON ON)
+-endif()
+-find_package(Lemon QUIET)
+-if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON)
+-  set(LEMON_INCLUDE_DIRS
+-    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon
+-    ${PROJECT_BINARY_DIR}/third_party/lemon)
+-  set(LEMON_LIBRARY openMVG_lemon)
+-endif()
++find_package(Lemon REQUIRED)
+ 
+ # ==============================================================================
+ # OpenCV
+@@ -369,12 +270,7 @@ endif()
+ # - only external and enabled only if OpenMVG_USE_OPENCV is set to ON
+ # ==============================================================================
+ if (OpenMVG_USE_OPENCV)
+-  find_package( OpenCV QUIET )
+-  if (NOT OpenCV_FOUND OR OpenCV_VERSION VERSION_LESS "3.0.0")
+-    message(STATUS "OpenCV was not found (note that OpenCV version >= 3.0.0 is required). -> Disabling OpenCV support.")
+-    UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENCV OFF)
+-    UPDATE_CACHE_VARIABLE(OpenMVG_USE_OCVSIFT OFF)
+-  endif()
++  find_package( OpenCV REQUIRED )
+ endif()
+ 
+ 
+@@ -469,67 +365,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT})
+ 
+ message("\n")
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_CEREAL)
++if (OpenMVG_USE_INTERNAL_CEREAL)
+   message(STATUS "CEREAL: (internal)")
+ else()
+   message(STATUS "CEREAL: (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN)
++if (OpenMVG_USE_INTERNAL_EIGEN)
+   message(STATUS "EIGEN: " ${EIGEN_VERSION} " (internal)")
+ else()
+   message(STATUS "EIGEN: " ${EIGEN_VERSION} " (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_CERES)
++if (OpenMVG_USE_INTERNAL_CERES)
+   message(STATUS "CERES: " ${CERES_VERSION} " (internal)")
+ else()
+   message(STATUS "CERES: " ${CERES_VERSION} " (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_FLANN)
++if (OpenMVG_USE_INTERNAL_FLANN)
+   message(STATUS "FLANN: " ${FLANN_VERSION} " (internal)")
+ else()
+   message(STATUS "FLANN: " ${FLANN_VERSION} " (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_TIFF)
++if (OpenMVG_USE_INTERNAL_TIFF)
+   message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (internal)")
+ else()
+   message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_PNG)
++if (OpenMVG_USE_INTERNAL_PNG)
+   message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (internal)")
+ else()
+   message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_JPEG)
++if (OpenMVG_USE_INTERNAL_JPEG)
+   message(STATUS "LIBJPEG (internal)")
+ else()
+   message(STATUS "LIBJPEG (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_CLP)
++if (OpenMVG_USE_INTERNAL_CLP)
+   message(STATUS "CLP: " ${CLP_VERSION} " (internal)")
+ else()
+   message(STATUS "CLP: " ${CLP_VERSION} " (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_COINUTILS)
++if (OpenMVG_USE_INTERNAL_COINUTILS)
+   message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (internal)")
+ else()
+   message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_OSI)
++if (OpenMVG_USE_INTERNAL_OSI)
+   message(STATUS "OSI: " ${OSI_VERSION} " (internal)")
+ else()
+   message(STATUS "OSI: " ${OSI_VERSION} " (external)")
+ endif()
+ 
+-if (DEFINED OpenMVG_USE_INTERNAL_LEMON)
++if (OpenMVG_USE_INTERNAL_LEMON)
+   message(STATUS "LEMON: " ${LEMON_VERSION} " (internal)")
+ else()
+   message(STATUS "LEMON: " ${LEMON_VERSION} " (external)")
+diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake
+index c997b87..74c3aae 100644
+--- a/src/cmakeFindModules/FindClp.cmake
++++ b/src/cmakeFindModules/FindClp.cmake
+@@ -51,8 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "")
+         SET(CLP_INCLUDE_DIR ${CLP_DIR})
+ 
+         FIND_LIBRARY(CLP_LIBRARY NAMES Clp)
+-        FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver)
+-        FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp)
++        FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp)
++        FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp)
+ 
+         # locate Clp libraries
+         IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY)
+diff --git a/src/openMVG/linearProgramming/CMakeLists.txt b/src/openMVG/linearProgramming/CMakeLists.txt
+index cc5212f..acc57dd 100644
+--- a/src/openMVG/linearProgramming/CMakeLists.txt
++++ b/src/openMVG/linearProgramming/CMakeLists.txt
+@@ -15,16 +15,12 @@ target_link_libraries(openMVG_linearProgramming
+   PUBLIC
+     openMVG_numeric
+   PRIVATE
+-    ${CLP_LIBRARIES}     # clp + solver wrapper
+-    ${COINUTILS_LIBRARY} # container tools
+-    ${OSI_LIBRARY}       # generic LP
++    Coin::Clp       # clp + solver wrapper
++    Coin::CoinUtils # container tools
++    Coin::Osi       # generic LP
+ )
+ 
+ target_include_directories(openMVG_linearProgramming
+-  PRIVATE
+-    ${CLP_INCLUDE_DIRS}
+-    ${COINUTILS_INCLUDE_DIRS}
+-    ${OSI_INCLUDE_DIRS}
+   PUBLIC
+     $<INSTALL_INTERFACE:include>
+ )
+diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt
+index 80b1fe6..a091b47 100644
+--- a/src/openMVG/matching/CMakeLists.txt
++++ b/src/openMVG/matching/CMakeLists.txt
+@@ -18,6 +18,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST})
+ 
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
++find_package(flann REQUIRED)
+ 
+ set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX)
+ add_library(openMVG_matching
+@@ -38,10 +39,10 @@ target_link_libraries(openMVG_matching
+     openMVG_features
+     Threads::Threads
+ )
+-if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN)
++if (NOT OpenMVG_USE_INTERNAL_FLANN)
+ target_link_libraries(openMVG_matching
+   PUBLIC
+-    ${FLANN_LIBRARIES}
++    flann::flann
+ )
+ endif()
+ set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}")
+diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt
+index 816a941..f0b7145 100644
+--- a/src/third_party/CMakeLists.txt
++++ b/src/third_party/CMakeLists.txt
+@@ -18,7 +18,7 @@ add_subdirectory(stlplus3)
+ set(STLPLUS_LIBRARY openMVG_stlplus PARENT_SCOPE)
+ 
+ # Add graph library
+-if(DEFINED OpenMVG_USE_INTERNAL_LEMON)
++if(OpenMVG_USE_INTERNAL_LEMON)
+   add_subdirectory(lemon)
+   set_property(TARGET openMVG_lemon PROPERTY FOLDER OpenMVG/3rdParty/lemon)
+   set_property(TARGET check PROPERTY FOLDER OpenMVG/3rdParty/lemon)
+@@ -68,7 +68,7 @@ endif (NOT TIFF_FOUND)
+ add_subdirectory(vectorGraphics)
+ 
+ # Add ceres-solver (A Nonlinear Least Squares Minimizer)
+-if (DEFINED OpenMVG_USE_INTERNAL_CERES)
++if (OpenMVG_USE_INTERNAL_CERES)
+   add_subdirectory(cxsparse)
+   add_subdirectory(ceres-solver)
+   set_property(TARGET openMVG_cxsparse PROPERTY FOLDER OpenMVG/3rdParty/ceres)
+@@ -76,7 +76,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES)
+ endif()
+ 
+ # Add an Approximate Nearest Neighbor library
+-if (DEFINED OpenMVG_USE_INTERNAL_FLANN)
++if (OpenMVG_USE_INTERNAL_FLANN)
+   set(FLANN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/flann/src/cpp)
+   add_subdirectory(flann)
+ endif()
+@@ -90,7 +90,7 @@ add_subdirectory(fast)
+ ##
+ # Install Header only libraries if necessary
+ ##
+-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN)
++if (OpenMVG_USE_INTERNAL_EIGEN)
+   #Configure Eigen install
+   set(EIGEN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen)
+   add_subdirectory(eigen)
diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake
index 26480bb3d..04a7e57ee 100644
--- a/ports/openmvg/portfile.cmake
+++ b/ports/openmvg/portfile.cmake
@@ -1,109 +1,103 @@
-# 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)
-
-string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
-if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
-    message(WARNING "Openmvg's buildsystem uses very long paths and may fail on your system.\n"
-        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
-    )
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH 
-    REPO openMVG/openMVG
-    REF v1.4
-    SHA512 949cf3680375c87b06db0f4713c846422c98d1979d49e9db65761f63f6f3212f0fcd8425f23c6112f04fbbb90b241638c2fd9329bb6b8b612c1d073aac55759a
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR} fixcmake.patch)
-
-
-# remove some deps to prevent conflict
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/cxsparse)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/eigen)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/flann)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/jpeg)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/lemon)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/png)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/tiff)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/zlib)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(OpenMVG_BUILD_SHARED ON)
-else()
-    set(OpenMVG_BUILD_SHARED OFF)
-endif()
-
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/src
-    # PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
-    OPTIONS
-        -DOpenMVG_BUILD_SHARED=${OpenMVG_BUILD_SHARED}
-        -DOpenMVG_BUILD_DOC=OFF
-        -DOpenMVG_BUILD_EXAMPLES=OFF
-        -DOpenMVG_BUILD_SOFTWARES=OFF
-        -DOpenMVG_BUILD_GUI_SOFTWARES=OFF
-        # TODO, use packgeconfig.cmake file instead
-        -DEIGEN_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/
-        -DCERES_DIR_HINTS=${CURRENT_INSTALLED_DIR}/ceres
-        -DFLANN_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/flann
-        -DLEMON_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/lemon
-        -DCOINUTILS_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/coin
-        -DCLP_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/coin
-        -DOSI_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/coin
-        -DOpenMVG_USE_INTERNAL_CLP=OFF
-        -DOpenMVG_USE_INTERNAL_COINUTILS=OFF
-        -DOpenMVG_USE_INTERNAL_OSI=OFF
-        -DOpenMVG_USE_INTERNAL_EIGEN=OFF
-        -DOpenMVG_USE_INTERNAL_CEREAL=OFF
-        -DOpenMVG_USE_INTERNAL_CERES=OFF
-        -DOpenMVG_USE_INTERNAL_FLANN=OFF
-        -DTARGET_ARCHITECTURE=core # disable instruction like avx
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    OPTIONS_RELEASE
-        -DFLANN_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/flann_cpp.lib
-    OPTIONS_DEBUG 
-        -DFLANN_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/flann_cpp-gd.lib
-)
-
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "share/openMVG/cmake")
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data)
-file(GLOB REMOVE_CMAKE ${CURRENT_PACKAGES_DIR}/lib/*.cmake)
-file(REMOVE_RECURSE ${REMOVE_CMAKE})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-if(OpenMVG_BUILD_SHARED)
-    # release
-    file(GLOB DLL_FILES  ${CURRENT_PACKAGES_DIR}/lib/*.dll)
-    file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE_RECURSE ${DLL_FILES})
-    # debug
-    file(GLOB DLL_FILES  ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
-    file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(REMOVE_RECURSE ${DLL_FILES})
-endif()
-vcpkg_copy_pdbs()
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvg RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME openmvg)
+include(vcpkg_common_functions)
+
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
+    message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
+#the port produces some empty dlls when building shared libraries, since some components do not export anything, breaking the internal build itself
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO openMVG/openMVG
+    REF v1.4
+    SHA512 949cf3680375c87b06db0f4713c846422c98d1979d49e9db65761f63f6f3212f0fcd8425f23c6112f04fbbb90b241638c2fd9329bb6b8b612c1d073aac55759a
+    PATCHES
+        fixcmake.patch
+)
+
+set(ENABLE_OPENCV OFF)
+if("opencv" IN_LIST FEATURES)
+  set(ENABLE_OPENCV ON)
+endif()
+
+set(ENABLE_OPENMP OFF)
+if("openmp" IN_LIST FEATURES)
+  set(ENABLE_OPENMP ON)
+endif()
+
+# remove some deps to prevent conflict
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/cxsparse)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/eigen)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/flann)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/jpeg)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/lemon)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/png)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/tiff)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/zlib)
+
+# remove some cmake modules to force using our configs
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindEigen.cmake)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindLemon.cmake)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindFlann.cmake)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindCoinUtils.cmake)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindClp.cmake)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindOsi.cmake)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}/src
+    PREFER_NINJA
+    OPTIONS
+        -DOpenMVG_BUILD_SHARED=OFF
+        -DOpenMVG_BUILD_TESTS=OFF
+        -DOpenMVG_BUILD_DOC=OFF
+        -DOpenMVG_BUILD_EXAMPLES=OFF
+        -DOpenMVG_BUILD_OPENGL_EXAMPLES=OFF
+        -DOpenMVG_BUILD_SOFTWARES=OFF
+        -DOpenMVG_BUILD_GUI_SOFTWARES=OFF
+        -DOpenMVG_BUILD_COVERAGE=OFF
+        -DOpenMVG_USE_OPENMP=${ENABLE_OPENMP}
+        -DOpenMVG_USE_OPENCV=${ENABLE_OPENCV}
+        -DOpenMVG_USE_OCVSIFT=${ENABLE_OPENCV}
+        -DOpenMVG_USE_INTERNAL_CLP=OFF
+        -DOpenMVG_USE_INTERNAL_COINUTILS=OFF
+        -DOpenMVG_USE_INTERNAL_OSI=OFF
+        -DOpenMVG_USE_INTERNAL_EIGEN=OFF
+        -DOpenMVG_USE_INTERNAL_CEREAL=OFF
+        -DOpenMVG_USE_INTERNAL_CERES=OFF
+        -DOpenMVG_USE_INTERNAL_FLANN=OFF
+        -DOpenMVG_USE_INTERNAL_LEMON=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH "share/openMVG/cmake")
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+#remove extra deprecated cmake target files left in unappropriate folders
+file(GLOB REMOVE_CMAKE ${CURRENT_PACKAGES_DIR}/lib/*.cmake)
+file(REMOVE_RECURSE ${REMOVE_CMAKE})
+file(GLOB REMOVE_CMAKE ${CURRENT_PACKAGES_DIR}/debug/lib/*.cmake)
+file(REMOVE_RECURSE ${REMOVE_CMAKE})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data)
+
+if(OpenMVG_BUILD_SHARED)
+    # release
+    file(GLOB DLL_FILES  ${CURRENT_PACKAGES_DIR}/lib/*.dll)
+    file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+    file(REMOVE_RECURSE ${DLL_FILES})
+    # debug
+    file(GLOB DLL_FILES  ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
+    file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE ${DLL_FILES})
+endif()
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvg RENAME copyright)
diff --git a/ports/openmvs/CONTROL b/ports/openmvs/CONTROL
new file mode 100644
index 000000000..2b6c20b71
--- /dev/null
+++ b/ports/openmvs/CONTROL
@@ -0,0 +1,4 @@
+Source: openmvs
+Version: 0.9
+Description: OpenMVS: open Multi-View Stereo reconstruction library
+Build-Depends: zlib, boost, eigen3, ceres, opencv, cgal, glew, glfw3, vcglib
diff --git a/ports/openmvs/glfw3_target_compat.patch b/ports/openmvs/glfw3_target_compat.patch
new file mode 100644
index 000000000..85cbb5490
--- /dev/null
+++ b/ports/openmvs/glfw3_target_compat.patch
@@ -0,0 +1,43 @@
+diff --git a/apps/Viewer/CMakeLists.txt b/apps/Viewer/CMakeLists.txt
+index f1690a6..78466cd 100644
+--- a/apps/Viewer/CMakeLists.txt
++++ b/apps/Viewer/CMakeLists.txt
+@@ -16,28 +16,7 @@ else()
+ 	MESSAGE("-- Can't find GLEW. Continuing without it.")
+ 	RETURN()
+ endif()
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-	FIND_PACKAGE(PkgConfig QUIET)
+-	pkg_search_module(GLFW QUIET glfw3)
+-	if(GLFW_FOUND)
+-		INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIRS})
+-		ADD_DEFINITIONS(${GLFW_DEFINITIONS})
+-		MESSAGE(STATUS "GLFW3 ${GLFW_VERSION} found (include: ${GLFW_INCLUDE_DIRS})")
+-	else()
+-		MESSAGE("-- Can't find GLFW3. Continuing without it.")
+-		RETURN()
+-	endif()
+-else()
+-	FIND_PACKAGE(glfw3 QUIET)
+-	if(glfw3_FOUND)
+-		INCLUDE_DIRECTORIES(${glfw3_INCLUDE_DIRS})
+-		ADD_DEFINITIONS(${glfw3_DEFINITIONS})
+-		MESSAGE(STATUS "GLFW3 ${glfw3_VERSION} found (include: ${glfw3_INCLUDE_DIRS})")
+-	else()
+-		MESSAGE("-- Can't find GLFW3. Continuing without it.")
+-		RETURN()
+-	endif()
+-endif()
++FIND_PACKAGE(glfw3 REQUIRED)
+ 
+ # List sources files
+ FILE(GLOB PCH_C "Common.cpp")
+@@ -54,7 +33,7 @@ FILE(GLOB LIBRARY_FILES_H "*.h" "*.inl")
+ LIST(REMOVE_ITEM LIBRARY_FILES_C ${PCH_C})
+ SET(LIBRARY_FILES_C "${PCH_C};${LIBRARY_FILES_C}")
+ 
+-cxx_executable_with_flags_no_pch(${VIEWER_NAME} "Apps" "${cxx_default}" "MVS;${OPENGL_LIBRARIES};${GLEW_LIBRARY};${GLFW_STATIC_LIBRARIES};GLEW::GLEW;${glfw3_LIBRARY};${GLFW3_LIBRARY};glfw" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H})
++cxx_executable_with_flags_no_pch(${VIEWER_NAME} "Apps" "${cxx_default}" "MVS;${OPENGL_LIBRARIES};${GLEW_LIBRARY};GLEW::GLEW;glfw" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H})
+ 
+ # Manually set Common.h as the precompiled header
+ set_target_pch(${VIEWER_NAME} Common.h)
diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake
new file mode 100644
index 000000000..790951b18
--- /dev/null
+++ b/ports/openmvs/portfile.cmake
@@ -0,0 +1,68 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cdcseacave/openMVS
+    REF v0.9
+    SHA512 a1081ee8562324137273846526c6570c77b35dba6a1a46df4e67f19cf7d0a1a4d4f6091b9444b66e0ca322f466b418ce4535d0c7ce10000df389cbe615f0c0b6
+    HEAD_REF master
+    PATCHES
+        glfw3_target_compat.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/openmvs)
+else()
+  vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CMake/OpenMVS TARGET_PATH share/openmvs)
+endif()
+
+#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it
+if(CMAKE_HOST_WIN32)
+set(EXECUTABLE_SUFFIX ".exe")
+else()
+set(EXECUTABLE_SUFFIX "")
+endif()
+
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX})
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openmvs/)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/DensifyPointCloud${EXECUTABLE_SUFFIX})
+endif()
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceCOLMAP${EXECUTABLE_SUFFIX})
+endif()
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceVisualSFM${EXECUTABLE_SUFFIX})
+endif()
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/ReconstructMesh${EXECUTABLE_SUFFIX})
+endif()
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/RefineMesh${EXECUTABLE_SUFFIX})
+endif()
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/TextureMesh${EXECUTABLE_SUFFIX})
+endif()
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openmvs)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvs RENAME copyright)
diff --git a/ports/openni2/CONTROL b/ports/openni2/CONTROL
index 26fcebaba..d7e75fb7d 100644
--- a/ports/openni2/CONTROL
+++ b/ports/openni2/CONTROL
@@ -1,4 +1,4 @@
-Source: openni2
-Version: 2.2.0.33-7
-Build-Depends: kinectsdk1
-Description: OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.
+Source: openni2
+Version: 2.2.0.33-8
+Build-Depends: kinectsdk1
+Description: OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.
diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake
index fb7eeade6..8ef2514b3 100644
--- a/ports/openni2/portfile.cmake
+++ b/ports/openni2/portfile.cmake
@@ -1,21 +1,10 @@
-# UWP Not Support
+include(vcpkg_common_functions)
 if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "Error: UWP builds are currently not supported.")
 endif()
 
-# Static Build Not Support
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message(STATUS "Warning: Static building not supported. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE "dynamic")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
-# Static CRT linkage not supported
-if (VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "Warning: Static CRT linkage is not supported.")
-endif()
-
-# Download Source Code
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenNI/OpenNI2
@@ -223,4 +212,4 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACK
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openni2)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright)
-\ No newline at end of file
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright)
diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL
index 1bfa6651a..aa0348e0b 100644
--- a/ports/openssl-uwp/CONTROL
+++ b/ports/openssl-uwp/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl-uwp
-Version: 1.0.2q-winrt-1
+Version: 1.0.2r
 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-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake
index 83eff7dcc..8efd7bd20 100644
--- a/ports/openssl-uwp/portfile.cmake
+++ b/ports/openssl-uwp/portfile.cmake
@@ -1,7 +1,6 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-    message("Static building not supported yet")
-endif()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "This portfile only supports UWP")
@@ -9,6 +8,8 @@ endif()
 
 if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
     set(UWP_PLATFORM  "arm")
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+    set(UWP_PLATFORM  "arm64")
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     set(UWP_PLATFORM  "x64")
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
@@ -17,25 +18,19 @@ else ()
     message(FATAL_ERROR "Unsupported architecture")
 endif()
 
-include(vcpkg_common_functions)
-
-
 vcpkg_find_acquire_program(PERL)
 vcpkg_find_acquire_program(JOM)
 get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY)
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${JOM_EXE_PATH}")
 
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2q_WinRT.zip"
-    FILENAME "openssl-microsoft-1.0.2q_WinRT.zip"
-    SHA512 828ddeb10b7d04155df64cb38f3d8b8109ff01494fed7f6c1063673e45414c1c309379e8bbe72478bd0fbae649d6749877c20b1b4a91db136a0853745f4da6b6
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    PATCHES 
+    REPO Microsoft/openssl
+    REF OpenSSL_1_0_2r_WinRT
+    SHA512 3045693fca4b042b69675f6164d8cc82106582cf31081d65a0adbd528f04e77fa48b3761f3be7bdf8ab962a093b28fec0ae6d7da02058f2b049f79b784c39c2e
+    HEAD_REF master
+    PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch
         ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-configure-unicode.patch
 )
diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL
index b2db99e4c..663e290b2 100644
--- a/ports/openvdb/CONTROL
+++ b/ports/openvdb/CONTROL
@@ -1,5 +1,5 @@
 Source: openvdb
-Version: 6.0.0-1
+Version: 6.0.0-2
 Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess
 Description: Sparse volume data structure and tools
 
diff --git a/ports/openvdb/blosc.patch b/ports/openvdb/blosc.patch
new file mode 100644
index 000000000..2b9782a1b
--- /dev/null
+++ b/ports/openvdb/blosc.patch
@@ -0,0 +1,24 @@
+diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
+index 5ac3780c..61ba83bc 100644
+--- a/cmake/FindBlosc.cmake	
++++ b/cmake/FindBlosc.cmake
+@@ -45,8 +45,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( Blosc
+ 
+ IF ( BLOSC_FOUND )
+ 
+-  SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
+-    CACHE STRING "Blosc library directories")
++#  SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
++#    CACHE STRING "Blosc library directories")
+ 
+   SET ( _blosc_library_name "blosc" )
+ 
+@@ -61,8 +61,6 @@ IF ( BLOSC_FOUND )
+   ENDIF()
+ 
+   FIND_LIBRARY ( BLOSC_blosc_LIBRARY ${_blosc_library_name}
+-    PATHS ${BLOSC_LIBRARYDIR}
+-    NO_DEFAULT_PATH
+     NO_SYSTEM_ENVIRONMENT_PATH
+     )
+ 
diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake
index 5b24e7600..d1c4cb8ce 100644
--- a/ports/openvdb/portfile.cmake
+++ b/ports/openvdb/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
         0002-add-custom-options.patch
         0003-build-only-necessary-targets.patch
         0004-add-necessary-head.patch
+        blosc.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
diff --git a/ports/optional-bare/CONTROL b/ports/optional-bare/CONTROL
new file mode 100644
index 000000000..0c9fe1411
--- /dev/null
+++ b/ports/optional-bare/CONTROL
@@ -0,0 +1,3 @@
+Source: optional-bare
+Version: 1.1.0
+Description: A simple version of a C++17-like optional for default-constructible, copyable types, for C++98 and later in a single-file header-only library
diff --git a/ports/optional-bare/portfile.cmake b/ports/optional-bare/portfile.cmake
new file mode 100644
index 000000000..6474d81c7
--- /dev/null
+++ b/ports/optional-bare/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinmoene/optional-bare
+    REF v1.1.0
+    SHA512 0eed103c4e909991b596c0cd23d6206662e3ca71cd8148e27c19d8e071c2a16e18cc940a6cd4f8571510f5e64577157f94c561fb889330bb7a868af64c2f3aa0
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DOPTIONAL_BARE_OPT_BUILD_TESTS=OFF
+        -DOPTIONAL_BARE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/optional-lite/CONTROL b/ports/optional-lite/CONTROL
new file mode 100644
index 000000000..076a05640
--- /dev/null
+++ b/ports/optional-lite/CONTROL
@@ -0,0 +1,3 @@
+Source: optional-lite
+Version: 3.2.0
+Description: A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/optional-lite/portfile.cmake b/ports/optional-lite/portfile.cmake
new file mode 100644
index 000000000..1716c89ad
--- /dev/null
+++ b/ports/optional-lite/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinmoene/optional-lite
+    REF v3.2.0
+    SHA512 7c3f93dc718953118ab18edb55f6c8dc1555febb6ee491d3f7df4a8d06aba245bbfba31883a711995bb6b8d6de9f44c805cbba44b9e322f3bb5c3272106f66ec
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DOPTIONAL_LITE_OPT_BUILD_TESTS=OFF
+        -DOPTIONAL_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/opusfile/CMakeLists.txt b/ports/opusfile/CMakeLists.txt
index 51ea8f894..c70ea98bc 100644
--- a/ports/opusfile/CMakeLists.txt
+++ b/ports/opusfile/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.4)
 project(opusfile C)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4090")
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 find_path(OGG_INCLUDE_DIR ogg/ogg.h)
 find_library(OGG_LIBRARY ogg)
@@ -34,7 +33,7 @@ if(BUILD_OPUSURL)
     target_compile_definitions(opusurl PRIVATE OP_ENABLE_HTTP)
     target_include_directories(opusurl PRIVATE include)
     target_link_libraries(opusurl PRIVATE opusfile OpenSSL::SSL ws2_32.lib crypt32.lib)
-	
+
     install(TARGETS opusurl
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
@@ -42,6 +41,6 @@ if(BUILD_OPUSURL)
 endif()
 
 if(NOT OPUSFILE_SKIP_HEADERS)
-    install(FILES include/opusfile.h 
+    install(FILES include/opusfile.h
         DESTINATION include/opus)
 endif()
diff --git a/ports/opusfile/CONTROL b/ports/opusfile/CONTROL
index 82307c100..65f6bada7 100644
--- a/ports/opusfile/CONTROL
+++ b/ports/opusfile/CONTROL
@@ -1,8 +1,8 @@
-Source: opusfile
-Version: 0.11-1
-Description: Stand-alone decoder library for .opus streams
-Build-Depends: libogg, opus
-
-Feature: opusurl
-Description: Support decoding of http(s) streams
-Build-Depends: openssl
+Source: opusfile
+Version: 0.11-2
+Description: Stand-alone decoder library for .opus streams
+Build-Depends: libogg, opus
+
+Feature: opusurl
+Description: Support decoding of http(s) streams
+Build-Depends: openssl
diff --git a/ports/opusfile/portfile.cmake b/ports/opusfile/portfile.cmake
index 30c633ca2..aae9303f8 100644
--- a/ports/opusfile/portfile.cmake
+++ b/ports/opusfile/portfile.cmake
@@ -1,8 +1,11 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
     message(FATAL_ERROR "UWP builds not supported")
 endif()
 
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xiph/opusfile
@@ -18,11 +21,11 @@ else()
     set(BUILD_OPUSURL OFF)
 endif()
 
-vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} 
+vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DBUILD_OPUSURL=${BUILD_OPUSURL} 
-    OPTIONS_DEBUG 
+        -DBUILD_OPUSURL=${BUILD_OPUSURL}
+    OPTIONS_DEBUG
         -DOPUSFILE_SKIP_HEADERS=ON)
 
 vcpkg_install_cmake()
diff --git a/ports/osg-qt/CONTROL b/ports/osg-qt/CONTROL
index f1b20deb9..acc5db392 100644
--- a/ports/osg-qt/CONTROL
+++ b/ports/osg-qt/CONTROL
@@ -1,4 +1,4 @@
 Source: osg-qt
-Version: 3.5.7
+Version: Qt4
 Description:  osgQt - Qt project for making use of OpenSceneGraph(OSG)
 Build-Depends: osg, protobuf, qt5-base
 \ No newline at end of file
diff --git a/ports/osg-qt/portfile.cmake b/ports/osg-qt/portfile.cmake
index aed06665c..1ab23e63f 100644
--- a/ports/osg-qt/portfile.cmake
+++ b/ports/osg-qt/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openscenegraph/osgQt
-    REF 6d324db8a56feb7d1976e9fb3f1de9bf7d255646
-    SHA512 6c6c0220de1b2314bc0e8ba149ef794229e0858914014dab91d577965acb19925dd64b8ee08add7b77f9353951ccf18f8e80b648509f894f3c2aaa08204b7625
+    REF Qt4
+    SHA512 426a4ba88f680978d24817248b99c68cafa4517144e6e3d2480612870c4a224bb955539cacb438274d4ee1c93c36d94f8437d142070b2ecde2b81517bf357e71
     HEAD_REF master
 )
 
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL
index e78458d25..f5690f9bc 100644
--- a/ports/osg/CONTROL
+++ b/ports/osg/CONTROL
@@ -1,5 +1,5 @@
 Source: osg
-Version: 3.6.2-1
+Version: 3.6.3-1
 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/collada.patch b/ports/osg/collada.patch
index 7c856c86d..9787b7f5c 100644
--- a/ports/osg/collada.patch
+++ b/ports/osg/collada.patch
@@ -59,6 +59,103 @@ index 8c9c2fc33..6a8ab04ca 100644
  )
  
  FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
+@@ -15,6 +15,8 @@
+ 
+ 
+ # Check if COLLADA_DIR is set, otherwise use ACTUAL_3DPARTY_DIR:
++include(SelectLibraryConfigurations)
++
+ SET( COLLADA_ENV_VAR_AVAILABLE $ENV{COLLADA_DIR} )
+ IF ( COLLADA_ENV_VAR_AVAILABLE )
+     SET(COLLADA_DOM_ROOT "$ENV{COLLADA_DIR}/dom" CACHE PATH "Location of Collada DOM directory" FORCE)
+@@ -192,31 +194,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+         ENDIF(WIN32)
+     ENDIF(LIBXML2_FOUND)
+ 
+-    FIND_PACKAGE(ZLIB)
+-    IF (ZLIB_FOUND)
+-        IF (ZLIB_LIBRARY_RELEASE)
+-            SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY_RELEASE}" CACHE FILEPATH "" FORCE)
+-        ELSE(ZLIB_LIBRARY_RELEASE)
+-            SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE)
+-        ENDIF(ZLIB_LIBRARY_RELEASE)
+-        IF (ZLIB_LIBRARY_DEBUG)
+-            SET(COLLADA_ZLIB_LIBRARY_DEBUG "${ZLIB_LIBRARY_DEBUG}" CACHE FILEPATH "" FORCE)
+-        ELSE(ZLIB_LIBRARY_DEBUG)
+-            SET(COLLADA_ZLIB_LIBRARY_DEBUG "${COLLADA_ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE)
+-        ENDIF(ZLIB_LIBRARY_DEBUG)
+-    ELSE(ZLIB_FOUND)
+-        IF(WIN32)
+-            FIND_LIBRARY(COLLADA_ZLIB_LIBRARY
+-                NAMES zlib
+-                PATHS
+-                ${COLLADA_DOM_ROOT}/external-libs/libxml2/win32/lib
+-                ${COLLADA_DOM_ROOT}/external-libs/libxml2/mingw/lib
+-                ${ACTUAL_3DPARTY_DIR}/lib
+-            )
+-        ENDIF(WIN32)
+-    ENDIF(ZLIB_FOUND)
++    FIND_PACKAGE(ZLIB REQUIRED)
+ 
+-    FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY
++    FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY_RELEASE
+         NAMES pcrecpp
+         PATHS
+         ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}
+@@ -233,8 +213,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+         ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
+         ${ACTUAL_3DPARTY_DIR}/lib
+     )
++    select_library_configurations(COLLADA_PCRECPP)
+ 
+-    FIND_LIBRARY(COLLADA_PCRE_LIBRARY
++    FIND_LIBRARY(COLLADA_PCRE_LIBRARY_RELEASE
+         NAMES pcre
+         PATHS
+         ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}
+@@ -251,8 +232,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+         ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
+         ${ACTUAL_3DPARTY_DIR}/lib
+     )
++    select_library_configurations(COLLADA_PCRE)
+ 
+-    FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY
++    FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY_RELEASE
+         NAMES minizip
+         PATHS
+         ${COLLADA_DOM_ROOT}/external-libs/minizip/win32/lib
+@@ -267,8 +249,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+         ${COLLADA_DOM_ROOT}/external-libs/minizip/mac
+         ${ACTUAL_3DPARTY_DIR}/lib
+     )
+-
+-    FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
++    select_library_configurations(COLLADA_MINIZIP)
++    
++    FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_RELEASE
+         NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_63
+         PATHS
+         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
+@@ -283,8 +266,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
+         ${ACTUAL_3DPARTY_DIR}/lib
+     )
++    select_library_configurations(COLLADA_BOOST_FILESYSTEM)
+ 
+-    FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
++    FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_RELEASE
+         NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_55  libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_63
+         PATHS
+         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
+@@ -299,7 +283,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
+         ${ACTUAL_3DPARTY_DIR}/lib
+     )
+-
++    select_library_configurations(COLLADA_BOOST_SYSTEM_LIBRARY)
+ 
+ SET(COLLADA_FOUND "NO")
+ IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
 diff --git a/src/osgPlugins/dae/CMakeLists.txt b/src/osgPlugins/dae/CMakeLists.txt
 index af03fb866..7eadfc2f3 100644
 --- a/src/osgPlugins/dae/CMakeLists.txt
diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake
index 98a0ec293..cb759ca1a 100644
--- a/ports/osg/portfile.cmake
+++ b/ports/osg/portfile.cmake
@@ -1,26 +1,15 @@
-# 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_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
 	REPO openscenegraph/OpenSceneGraph
-	REF OpenSceneGraph-3.6.2
-	SHA512 6949dd4dea9dcffe4228086b72eafdb253bf1403b3b7a70a4727848c3cde23ad0270f41b1c3e2bdbfd410ec067ecce2052a5d26c61b032b6d46ce84b8c931bfb
+	REF OpenSceneGraph-3.6.3
+	SHA512 5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322
 	HEAD_REF master
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/collada.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/static.patch"
+        collada.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -28,21 +17,16 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 else()
     set(OSG_DYNAMIC ON)
 endif()
-
+file(REMOVE ${SOURCE_PATH}/CMakeModules/FindSDL2.cmake)
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    # PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
         -DOSG_USE_UTF8_FILENAME=ON
-        -DDYNAMIC_OPENSCENEGRAPH=${OSG_DYNAMIC}
-        -DDYNAMIC_OPENTHREADS=${OSG_DYNAMIC}
-        -DBUILD_OSG_EXAMPLES=ON
-        -DBUILD_OSG_APPLICATIONS=ON
 )
 
 vcpkg_install_cmake()
 
-# handle osg tools and plugins 
+# handle osg tools and plugins
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 set(OSG_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/osg)
@@ -54,12 +38,12 @@ file(REMOVE_RECURSE ${OSG_TOOLS})
 file(GLOB OSG_TOOLS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
 file(REMOVE_RECURSE ${OSG_TOOLS_DBG})
 
-file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.2/*.dll)
-file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/osg/osgPlugins-3.6.2)
-file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.2/*.dll)
-file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-3.6.2)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.2/)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.2/)
+file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.3/*.dll)
+file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/osg/osgPlugins-3.6.3)
+file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.3/*.dll)
+file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-3.6.3)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.3/)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.3/)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/osg)
diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL
index 3b2ba3e4b..c46d03451 100644
--- a/ports/osgearth/CONTROL
+++ b/ports/osgearth/CONTROL
@@ -1,4 +1,4 @@
-Source: osgearth
-Version: 2.10
-Description:  osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.
-Build-Depends: osg
+Source: osgearth
+Version: 2.10.1
+Description:  osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.
+Build-Depends: osg
diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake
index 21243fced..6bc95df7c 100644
--- a/ports/osgearth/portfile.cmake
+++ b/ports/osgearth/portfile.cmake
@@ -1,13 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building will not support load data through plugins.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
-if(VCPKG_CRT_LINKAGE STREQUAL static)
-    message(FATAL_ERROR "osgearth does not support static CRT linkage")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
 file(GLOB OSG_PLUGINS_SUBDIR ${CURRENT_INSTALLED_DIR}/tools/osg/osgPlugins-*)
 list(LENGTH OSG_PLUGINS_SUBDIR OSG_PLUGINS_SUBDIR_LENGTH)
@@ -26,8 +19,8 @@ vcpkg_download_distfile(
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gwaldron/osgearth
-    REF osgearth-2.10
-    SHA512 ba742f4fc8dbbdaee65e413d477b713cad8da313a1dc68327997359aca88dadc871b03ad4b09172e3e048164989c2797108db67f14edff8ee5a0c63a8fe1bb0c
+    REF osgearth-2.10.1
+    SHA512 a74e6922ae29f85b4227b23a83dbccba92e08b7880533c281ceb244703c38b51a02823fdee3199c975c969db963b35ebad0e3bfed3c1e218a36d130b20a48e5b
     HEAD_REF master
     PATCHES ${VS2017PATCH}
 )
diff --git a/ports/osi/CMakeLists.txt b/ports/osi/CMakeLists.txt
index ab061f169..7f4ca5ed1 100644
--- a/ports/osi/CMakeLists.txt
+++ b/ports/osi/CMakeLists.txt
@@ -12,9 +12,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-if(BUILD_SHARED_LIBS AND MSVC)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif(BUILD_SHARED_LIBS AND MSVC)
+
 if(MSVC)
   set(
     CMAKE_CXX_FLAGS
@@ -36,8 +34,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 option(BUILD_SHARED_LIBS "" ON)
 
 #
-# 设置用于 install 的变量
-#
 # Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR
 include(GNUInstallDirs)
 
diff --git a/ports/osi/CONTROL b/ports/osi/CONTROL
index 457085c68..f75de858a 100644
--- a/ports/osi/CONTROL
+++ b/ports/osi/CONTROL
@@ -1,4 +1,4 @@
 Source: osi
-Version: 0.107.9-0
-Description: Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver. 
+Version: 0.108.4
+Description: Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver.
 Build-Depends: coinutils
diff --git a/ports/osi/portfile.cmake b/ports/osi/portfile.cmake
index 6cb2e1217..793e0d94c 100644
--- a/ports/osi/portfile.cmake
+++ b/ports/osi/portfile.cmake
@@ -1,45 +1,26 @@
-# 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_github(
-    OUT_SOURCE_PATH SOURCE_PATH 
-    REPO coin-or/Osi
-    REF releases/0.107.9
-    SHA512 52501e2fa81ad9ec1412596b5945e11f2d5c5c91bdb148f41dad9efb8e4a033cfc2f76e389b9e546593b89ae6c7f74c32e6c5b78337c967ad0c90cd6a7183a28
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH})
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    set(BUILD_SHARED_LIBS ON)
-else()
-    set(BUILD_SHARED_LIBS OFF)
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    OPTIONS
-        -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Osi")
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/osi RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME osi)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO coin-or/Osi
+    REF releases/0.108.4
+    SHA512 43c4da11c7e8b83ef67b10b60fa0be9bd2302965a26447f85c4cf9e747b999710954948e041b7203ac69f5d3cb75ba9c383838184bee8399a95b9ba59eff3f06
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Osi")
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/osi RENAME copyright)
diff --git a/ports/paho-mqtt/CONTROL b/ports/paho-mqtt/CONTROL
index 1541c7fa5..4d819f5b1 100644
--- a/ports/paho-mqtt/CONTROL
+++ b/ports/paho-mqtt/CONTROL
@@ -1,4 +1,4 @@
 Source: paho-mqtt
-Version: 1.2.1
+Version: 1.2.1-1
 Description: Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things
 Build-Depends: openssl
diff --git a/ports/paho-mqtt/fix-install-path.patch b/ports/paho-mqtt/fix-install-path.patch
new file mode 100644
index 000000000..512052e1a
--- /dev/null
+++ b/ports/paho-mqtt/fix-install-path.patch
@@ -0,0 +1,48 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 418e2f2..f05aad4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,9 +62,9 @@ ENDIF()
+ ### packaging settings
+ SET(CPACK_PACKAGE_VENDOR "Eclipse Paho")
+ SET(CPACK_PACKAGE_NAME "Eclipse-Paho-MQTT-C")
+-INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION .)
++INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION share/paho-mqtt)
+ FILE(GLOB samples "src/samples/*.c")
+-INSTALL(FILES ${samples} DESTINATION samples)
++INSTALL(FILES ${samples} DESTINATION share/paho-mqtt/samples)
+ IF (WIN32)
+     SET(CPACK_GENERATOR "ZIP")
+ ELSEIF(PAHO_BUILD_DEB_PACKAGE)
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 06e4c5d..9cf7c21 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -37,4 +37,4 @@ FOREACH(DOXYFILE_SRC DoxyfileV3ClientAPI;DoxyfileV3AsyncAPI;DoxyfileV3ClientInte
+     SET(DOXYTARGETS ${DOXYTARGETS} ${DOXYFILE_SRC}.target)
+ ENDFOREACH(DOXYFILE_SRC)
+ ADD_CUSTOM_TARGET(doc ALL DEPENDS ${DOXYTARGETS})
+-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share)
++INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share/paho-mqtt)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c57185b..98c7f31 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -84,7 +84,7 @@ INSTALL(TARGETS paho-mqtt3c paho-mqtt3a
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ INSTALL(TARGETS MQTTVersion
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++    RUNTIME DESTINATION tools/paho-mqtt)
+ 
+ IF (PAHO_BUILD_STATIC)
+     ADD_LIBRARY(paho-mqtt3c-static STATIC $<TARGET_OBJECTS:common_obj> MQTTClient.c)
+@@ -98,7 +98,7 @@ IF (PAHO_BUILD_STATIC)
+ ENDIF()
+ 
+ INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h
+-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/paho-mqtt)
+ 
+ IF (PAHO_WITH_SSL)
+     SET(OPENSSL_SEARCH_PATH "" CACHE PATH "Directory containing OpenSSL libraries and includes")
diff --git a/ports/paho-mqtt/fix-static-build.patch b/ports/paho-mqtt/fix-static-build.patch
new file mode 100644
index 000000000..5e6aab047
--- /dev/null
+++ b/ports/paho-mqtt/fix-static-build.patch
@@ -0,0 +1,97 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 14b94b1..508c5b1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -65,28 +65,29 @@ ENDIF()
+ ADD_LIBRARY(common_obj OBJECT ${common_src})
+ SET_PROPERTY(TARGET common_obj PROPERTY POSITION_INDEPENDENT_CODE ON)
+ 
+-ADD_EXECUTABLE(MQTTVersion MQTTVersion.c)
+-
+-ADD_LIBRARY(paho-mqtt3c SHARED $<TARGET_OBJECTS:common_obj> MQTTClient.c)
+-ADD_LIBRARY(paho-mqtt3a SHARED $<TARGET_OBJECTS:common_obj> MQTTAsync.c)
+-
+-TARGET_LINK_LIBRARIES(paho-mqtt3c ${LIBS_SYSTEM})
+-TARGET_LINK_LIBRARIES(paho-mqtt3a ${LIBS_SYSTEM})
+-
+-TARGET_LINK_LIBRARIES(MQTTVersion paho-mqtt3a paho-mqtt3c ${LIBS_SYSTEM})
+-SET_TARGET_PROPERTIES(
+-    paho-mqtt3c paho-mqtt3a PROPERTIES
+-    VERSION ${CLIENT_VERSION}
+-    SOVERSION ${PAHO_VERSION_MAJOR})
+-
+-INSTALL(TARGETS paho-mqtt3c paho-mqtt3a
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-INSTALL(TARGETS MQTTVersion
+-    RUNTIME DESTINATION tools/paho-mqtt)
+-
+-IF (PAHO_BUILD_STATIC)
++IF (NOT PAHO_BUILD_STATIC)
++    ADD_EXECUTABLE(MQTTVersion MQTTVersion.c)
++    
++    ADD_LIBRARY(paho-mqtt3c SHARED $<TARGET_OBJECTS:common_obj> MQTTClient.c)
++    ADD_LIBRARY(paho-mqtt3a SHARED $<TARGET_OBJECTS:common_obj> MQTTAsync.c)
++    
++    TARGET_LINK_LIBRARIES(paho-mqtt3c ${LIBS_SYSTEM})
++    TARGET_LINK_LIBRARIES(paho-mqtt3a ${LIBS_SYSTEM})
++    
++    TARGET_LINK_LIBRARIES(MQTTVersion paho-mqtt3a paho-mqtt3c ${LIBS_SYSTEM})
++    SET_TARGET_PROPERTIES(
++        paho-mqtt3c paho-mqtt3a PROPERTIES
++        VERSION ${CLIENT_VERSION}
++        SOVERSION ${PAHO_VERSION_MAJOR})
++    
++    INSTALL(TARGETS paho-mqtt3c paho-mqtt3a
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++    INSTALL(TARGETS MQTTVersion
++        RUNTIME DESTINATION tools/paho-mqtt)
++ELSE()
++    message("Build as static library")
+     ADD_LIBRARY(paho-mqtt3c-static STATIC $<TARGET_OBJECTS:common_obj> MQTTClient.c)
+     ADD_LIBRARY(paho-mqtt3a-static STATIC $<TARGET_OBJECTS:common_obj> MQTTAsync.c)
+ 
+@@ -132,22 +133,24 @@ IF (PAHO_WITH_SSL)
+     ADD_LIBRARY(common_ssl_obj OBJECT ${common_src})
+     SET_PROPERTY(TARGET common_ssl_obj PROPERTY POSITION_INDEPENDENT_CODE ON)
+     SET_PROPERTY(TARGET common_ssl_obj PROPERTY COMPILE_DEFINITIONS "OPENSSL=1")
+-    ADD_LIBRARY(paho-mqtt3cs SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c)
+-    ADD_LIBRARY(paho-mqtt3as SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c)
+-
+-    TARGET_LINK_LIBRARIES(paho-mqtt3cs ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM})
+-    TARGET_LINK_LIBRARIES(paho-mqtt3as ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM})
+-    SET_TARGET_PROPERTIES(
+-        paho-mqtt3cs paho-mqtt3as PROPERTIES
+-        VERSION ${CLIENT_VERSION}
+-        SOVERSION ${PAHO_VERSION_MAJOR}
+-        COMPILE_DEFINITIONS "OPENSSL=1")
+-    INSTALL(TARGETS paho-mqtt3cs paho-mqtt3as
+-        ARCHIVE DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+-        LIBRARY DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+-        RUNTIME DESTINATION  ${CMAKE_INSTALL_BINDIR})
+-
+-    IF (PAHO_BUILD_STATIC)
++    
++    IF (NOT PAHO_BUILD_STATIC)
++        ADD_LIBRARY(paho-mqtt3cs SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c)
++        ADD_LIBRARY(paho-mqtt3as SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c)
++    
++        TARGET_LINK_LIBRARIES(paho-mqtt3cs ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM})
++        TARGET_LINK_LIBRARIES(paho-mqtt3as ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM})
++        SET_TARGET_PROPERTIES(
++            paho-mqtt3cs paho-mqtt3as PROPERTIES
++            VERSION ${CLIENT_VERSION}
++            SOVERSION ${PAHO_VERSION_MAJOR}
++            COMPILE_DEFINITIONS "OPENSSL=1")
++        INSTALL(TARGETS paho-mqtt3cs paho-mqtt3as
++            ARCHIVE DESTINATION  ${CMAKE_INSTALL_LIBDIR}
++            LIBRARY DESTINATION  ${CMAKE_INSTALL_LIBDIR}
++            RUNTIME DESTINATION  ${CMAKE_INSTALL_BINDIR})
++    ELSE()
++        message("Build as static library")
+         ADD_LIBRARY(paho-mqtt3cs-static STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c)
+         ADD_LIBRARY(paho-mqtt3as-static STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c)
+ 
diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake
index 41c8eeb28..5453abf1b 100644
--- a/ports/paho-mqtt/portfile.cmake
+++ b/ports/paho-mqtt/portfile.cmake
@@ -6,17 +6,13 @@ vcpkg_from_github(
   REF v1.2.1
   SHA512 98828852ecd127445591df31416adaebebd30848c027361ae62af6b14b84e3cf2a4b90cab692b983148cbf93f710a9e2dd722a3da8c4fd17eb2149e4227a8860
   HEAD_REF master
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC)
-
-
-vcpkg_apply_patches(
-  SOURCE_PATH ${SOURCE_PATH}
   PATCHES
-  "${CMAKE_CURRENT_LIST_DIR}/remove_compiler_options.patch"
+         remove_compiler_options.patch
+         fix-install-path.patch
+         fix-static-build.patch
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC)
 
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
@@ -24,62 +20,11 @@ vcpkg_configure_cmake(
   OPTIONS -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_STATIC=${PAHO_BUILD_STATIC} -DPAHO_ENABLE_TESTING=FALSE
 )
 
-
-vcpkg_build_cmake()
-
-file(GLOB DLLS
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/*.dll"
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll"
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll"
-)
-file(GLOB LIBS
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/*.lib"
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.lib"
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.lib"
-)
-file(GLOB DEBUG_DLLS
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/*.dll"
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll"
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll"
-)
-file(GLOB DEBUG_LIBS
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/*.lib"
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.lib"
-  "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.lib"
-)
-if(DLLS)
-  file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-endif()
-if(LIBS)
-  file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-endif()
-if(DEBUG_DLLS)
-  file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-if(DEBUG_LIBS)
-  file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-endif()
-file(COPY ${SOURCE_PATH}/src/MQTTAsync.h ${SOURCE_PATH}/src/MQTTClient.h ${SOURCE_PATH}/src/MQTTClientPersistence.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-  foreach(libname paho-mqtt3as-static paho-mqtt3cs-static paho-mqtt3a-static paho-mqtt3c-static)
-    foreach(foldername "lib" "debug/lib")
-      string(REPLACE "-static" "" outlibname ${libname})
-      file(RENAME ${CURRENT_PACKAGES_DIR}/${foldername}/${libname}.lib  ${CURRENT_PACKAGES_DIR}/${foldername}/${outlibname}.lib)
-    endforeach()
-  endforeach()
-endif()
-
-foreach(libname paho-mqtt3a paho-mqtt3c)
-  foreach(root "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/debug")
-    file(REMOVE
-      ${root}/lib/${libname}.lib
-      ${root}/bin/${libname}.dll
-    )
-  endforeach()
-endforeach()
-
+vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/paho-mqtt/README.md ${CURRENT_PACKAGES_DIR}/share/paho-mqtt/readme)
 file(INSTALL ${SOURCE_PATH}/about.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/paho-mqtt RENAME copyright)
diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt
index cc21d3eee..f0e6d85e7 100644
--- a/ports/pango/CMakeLists.txt
+++ b/ports/pango/CMakeLists.txt
@@ -11,6 +11,11 @@ else()
   configure_file(./config.h.unix ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY)
 endif()
 
+if (WIN32)
+  # Set utf-8 charset to avoid compile error C2001
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
+endif()
+
 add_definitions(-DHAVE_CONFIG_H)
 include_directories(. ./pango ${CMAKE_CURRENT_BINARY_DIR})
 
diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL
index 9b176290b..f58bf18ec 100644
--- a/ports/pango/CONTROL
+++ b/ports/pango/CONTROL
@@ -1,4 +1,4 @@
 Source: pango
-Version: 1.40.11-3
+Version: 1.40.11-4
 Description: Text and font handling library.
 Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!windows-static)
diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL
index 1cbf2ad98..593c753b2 100644
--- a/ports/pangolin/CONTROL
+++ b/ports/pangolin/CONTROL
@@ -1,4 +1,4 @@
-Source: pangolin
-Version: 0.5-5
-Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg
-Description: Lightweight GUI Library
+Source: pangolin
+Version: 0.5-6
+Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg
+Description: Lightweight GUI Library
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
index cd6a4fe78..ac4d31625 100644
--- a/ports/pangolin/portfile.cmake
+++ b/ports/pangolin/portfile.cmake
@@ -1,12 +1,14 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stevenlovegrove/Pangolin
     REF v0.5
     SHA512 7ebeec108f33f1aa8b1ad08e3ca128a837b22d33e3fc580021f981784043b023a1bf563bbfa8b51d46863db770b336d24fc84ee3d836b85e0da1848281b2a5b2
     HEAD_REF master
-	PATCHES 
+	PATCHES
         deprecated_constants.patch # Change from upstream pangolin to address build failures from latest ffmpeg library
         fix-includepath-error.patch # include path has one more ../
 )
@@ -19,7 +21,6 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
         -DBUILD_EXTERN_GLEW=OFF
         -DBUILD_EXTERN_LIBPNG=OFF
         -DBUILD_EXTERN_LIBJPEG=OFF
diff --git a/ports/parallel-hashmap/CONTROL b/ports/parallel-hashmap/CONTROL
index 8935060a4..1f839fed1 100644
--- a/ports/parallel-hashmap/CONTROL
+++ b/ports/parallel-hashmap/CONTROL
@@ -1,3 +1,3 @@
 Source: parallel-hashmap
-Version: 1.1.0
+Version: 1.22
 Description: A header-only, very fast and memory-friendly hash map family.
diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake
index 9c2c02289..a94d30c45 100644
--- a/ports/parallel-hashmap/portfile.cmake
+++ b/ports/parallel-hashmap/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO greg7mdp/parallel-hashmap
-    REF 1.1.0
-    SHA512 ff9497d2a8009c9aa955f50e66269e5963a86d8593e3eb07ef968a8ea5e162fea7e145d6d4d9e7aa91380b49f22166d1a08445fa40d02f43327e4c39612f52d9
+    REF 1.22
+    SHA512 930ad0a2fd95310bd2d99c858a09416ca1c02bb823a49f96ec38cfc9ec4029b95b3dc3eacff88dc93df2cad968008b2db3cbb1c458c6cceddc542bb0ca74fad9
     HEAD_REF master
 )
 
diff --git a/ports/parmetis/CONTROL b/ports/parmetis/CONTROL
index bb2237654..bdc95557a 100644
--- a/ports/parmetis/CONTROL
+++ b/ports/parmetis/CONTROL
@@ -1,4 +1,4 @@
-Source: parmetis
-Version: 4.0.3-1
-Description: Parallel Graph Partitioning and Fill-reducing Matrix Ordering
-Build-Depends: metis, msmpi
+Source: parmetis
+Version: 4.0.3-2
+Description: Parallel Graph Partitioning and Fill-reducing Matrix Ordering
+Build-Depends: metis, msmpi
diff --git a/ports/parmetis/portfile.cmake b/ports/parmetis/portfile.cmake
index ba34e47e8..63b2cb87b 100644
--- a/ports/parmetis/portfile.cmake
+++ b/ports/parmetis/portfile.cmake
@@ -1,13 +1,8 @@
-# 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_check_linkage(ONLY_STATIC_LIBRARY)
+set(ADDITIONAL_OPTIONS -DSHARED=OFF)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz"
     FILENAME "parmetis-4.0.3.tar.gz"
@@ -25,12 +20,6 @@ vcpkg_extract_source_archive_ex(
         use_stdint.patch
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-  set(ADDITIONAL_OPTIONS -DSHARED=ON -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON)
-else()
-  set(ADDITIONAL_OPTIONS -DSHARED=OFF)
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
diff --git a/ports/parson/CONTROL b/ports/parson/CONTROL
index 614ff7243..e97403221 100644
--- a/ports/parson/CONTROL
+++ b/ports/parson/CONTROL
@@ -1,3 +1,3 @@
 Source: parson
-Version: 2018-12-14
+Version: 2019-04-19
 Description: a lighweight json library written in C
diff --git a/ports/parson/portfile.cmake b/ports/parson/portfile.cmake
index 16c5578f1..579c44678 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 302fba9cbb31ffc523bf10a1ce705040194c289d
-    SHA512 ecc1594fe6e27b8919ccdaf3c7e082d0d47aa5e20aec52235762b9cab8e371adec5a1760f4ea36405bf97cfb587d2bcbd81221f97a9d39290673e2ce61f5a49f
+    REF 809ef4b7d829d3929223387661b8e229e7191340
+    SHA512 ba29478c7603a50c825f90e7d6d1fcb3f80a3ee0091fba07320544fc5a735653259cb1bb207e3124a36553569493e352f8a1d3233fc2d5dc4a9ec55a74e95b54
     HEAD_REF master
 )
 
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
index a9f23813d..3e3884c48 100644
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@@ -1,5 +1,5 @@
 Source: pcl
-Version: 1.9.1-1
+Version: 1.9.1-3
 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/boost-1.70.patch b/ports/pcl/boost-1.70.patch
new file mode 100644
index 000000000..1c8a02121
--- /dev/null
+++ b/ports/pcl/boost-1.70.patch
@@ -0,0 +1,13 @@
+diff --git a/segmentation/include/pcl/segmentation/supervoxel_clustering.h b/segmentation/include/pcl/segmentation/supervoxel_clustering.h
+index 05e6002..99e3a07 100644
+--- a/segmentation/include/pcl/segmentation/supervoxel_clustering.h
++++ b/segmentation/include/pcl/segmentation/supervoxel_clustering.h
+@@ -525,7 +525,7 @@ namespace pcl
+       };
+ 
+       //Make boost::ptr_list can access the private class SupervoxelHelper
+-      friend void boost::checked_delete<> (const typename pcl::SupervoxelClustering<PointT>::SupervoxelHelper *);
++      //friend void boost::checked_delete<> (const typename pcl::SupervoxelClustering<PointT>::SupervoxelHelper *);
+ 
+       typedef boost::ptr_list<SupervoxelHelper> HelperListT;
+       HelperListT supervoxel_helpers_;
diff --git a/ports/pcl/find_flann.patch b/ports/pcl/find_flann.patch
deleted file mode 100644
index 263be2926..000000000
--- a/ports/pcl/find_flann.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
-index 1cecacfa9..3169d6d7b 100644
---- a/cmake/Modules/FindFLANN.cmake
-+++ b/cmake/Modules/FindFLANN.cmake
-@@ -10,8 +10,8 @@
- # look for shared ones
- 
- if(FLANN_USE_STATIC)
--  set(FLANN_RELEASE_NAME flann_cpp_s)
--  set(FLANN_DEBUG_NAME flann_cpp_s-gd)
-+  set(FLANN_RELEASE_NAME flann_cpp)
-+  set(FLANN_DEBUG_NAME flann_cpp-gd)
- else(FLANN_USE_STATIC)
-   set(FLANN_RELEASE_NAME flann_cpp)
-   set(FLANN_DEBUG_NAME flann_cpp-gd)
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 4036d5346..971abe025 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -6,11 +6,15 @@ vcpkg_from_github(
     REF pcl-1.9.1
     SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf
     HEAD_REF master
-    PATCHES pcl_utils.patch
-            pcl_config.patch
-            find_flann.patch
+    PATCHES
+        pcl_utils.patch
+        pcl_config.patch
+        use_flann_targets.patch
+        boost-1.70.patch
 )
 
+file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake)
+
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
 
 set(WITH_OPENNI2 OFF)
diff --git a/ports/pcl/use_flann_targets.patch b/ports/pcl/use_flann_targets.patch
new file mode 100644
index 000000000..7e6289267
--- /dev/null
+++ b/ports/pcl/use_flann_targets.patch
@@ -0,0 +1,155 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0b4c1a3..94bb484 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -280,11 +280,9 @@ find_package(Eigen REQUIRED)
+ include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
+ 
+ # FLANN (required)
+-if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32))
+-  set(FLANN_USE_STATIC ON)
+-endif()
++set(FLANN_USE_STATIC ON)
+ find_package(FLANN 1.7.0 REQUIRED)
+-include_directories(${FLANN_INCLUDE_DIRS})
++find_package(lz4)
+ 
+ # libusb-1.0
+ option(WITH_LIBUSB "Build USB RGBD-Camera drivers" TRUE)
+diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
+index 6fadb59..6a9c5b7 100755
+--- a/PCLConfig.cmake.in
++++ b/PCLConfig.cmake.in
+@@ -226,12 +226,6 @@ endmacro(find_rssdk)
+ 
+ #remove this as soon as flann is shipped with FindFlann.cmake
+ macro(find_flann)
+-  if(PCL_ALL_IN_ONE_INSTALLER)
+-    set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann")
+-  elseif(NOT FLANN_ROOT)
+-    get_filename_component(FLANN_ROOT "@FLANN_INCLUDE_DIRS@" PATH)
+-  endif(PCL_ALL_IN_ONE_INSTALLER)
+-
+   set(FLANN_USE_STATIC @FLANN_USE_STATIC@)
+   find_package(FLANN)
+ endmacro(find_flann)
+@@ -651,7 +645,7 @@ endif(NOT "${PCL_DEFINITIONS}" STREQUAL "")
+ pcl_remove_duplicate_libraries(PCL_COMPONENTS PCL_LIBRARIES)
+ 
+ # Add 3rd party libraries, as user code might include our .HPP implementations
+-list(APPEND PCL_LIBRARIES ${BOOST_LIBRARIES} ${QHULL_LIBRARIES} ${OPENNI_LIBRARIES} ${OPENNI2_LIBRARIES} ${ENSENSO_LIBRARIES} ${davidSDK_LIBRARIES} ${DSSDK_LIBRARIES} ${RSSDK_LIBRARIES} ${FLANN_LIBRARIES} ${VTK_LIBRARIES})
++list(APPEND PCL_LIBRARIES ${BOOST_LIBRARIES} ${QHULL_LIBRARIES} ${OPENNI_LIBRARIES} ${OPENNI2_LIBRARIES} ${ENSENSO_LIBRARIES} ${davidSDK_LIBRARIES} ${DSSDK_LIBRARIES} ${RSSDK_LIBRARIES} flann::flann_cpp ${VTK_LIBRARIES})
+ 
+ find_package_handle_standard_args(PCL DEFAULT_MSG PCL_LIBRARIES PCL_INCLUDE_DIRS)
+ mark_as_advanced(PCL_LIBRARIES PCL_INCLUDE_DIRS PCL_LIBRARY_DIRS)
+diff --git a/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt b/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt
+index 9693792..dcd4373 100755
+--- a/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt
++++ b/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+ 
+-# we need FindFLANN.cmake 
++# we need FindFLANN.cmake
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ project(vfh_cluster_classifier)
+@@ -14,16 +14,15 @@ find_package(HDF5)
+ if(HDF5_FOUND)
+ 
+   find_package(FLANN)
+-  include_directories(${FLANN_INCLUDE_DIRS})
+ 
+   include_directories(${HDF5_INCLUDE_DIR})
+ 
+   add_executable(build_tree build_tree.cpp)
+   target_link_libraries(build_tree ${PCL_LIBRARIES} ${Boost_LIBRARIES}
+-                                 ${FLANN_LIBRARIES} ${HDF5_hdf5_LIBRARY})
++                                 flann::flann_cpp ${HDF5_hdf5_LIBRARY})
+ 
+   add_executable(nearest_neighbors nearest_neighbors.cpp)
+-  target_link_libraries(nearest_neighbors ${PCL_LIBRARIES} 
+-                                        ${Boost_LIBRARIES} ${FLANN_LIBRARIES} ${HDF5_hdf5_LIBRARY} 
++  target_link_libraries(nearest_neighbors ${PCL_LIBRARIES}
++                                        ${Boost_LIBRARIES} flann::flann_cpp ${HDF5_hdf5_LIBRARY}
+                                         )
+ endif(HDF5_FOUND)
+diff --git a/kdtree/CMakeLists.txt b/kdtree/CMakeLists.txt
+index 311dffc..1a7712f 100755
+--- a/kdtree/CMakeLists.txt
++++ b/kdtree/CMakeLists.txt
+@@ -9,18 +9,18 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS} EXT_DEPS flann)
+ PCL_ADD_DOC("${SUBSYS_NAME}")
+ 
+ if(build)
+-    set(srcs 
++    set(srcs
+         src/kdtree_flann.cpp
+         )
+ 
+-    set(incs 
++    set(incs
+         "include/pcl/${SUBSYS_NAME}/kdtree.h"
+         "include/pcl/${SUBSYS_NAME}/io.h"
+         "include/pcl/${SUBSYS_NAME}/flann.h"
+         "include/pcl/${SUBSYS_NAME}/kdtree_flann.h"
+         )
+ 
+-    set(impl_incs 
++    set(impl_incs
+         "include/pcl/${SUBSYS_NAME}/impl/io.hpp"
+         "include/pcl/${SUBSYS_NAME}/impl/kdtree_flann.hpp"
+         )
+@@ -28,7 +28,7 @@ if(build)
+     set(LIB_NAME "pcl_${SUBSYS_NAME}")
+     include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
+     PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs})
+-    target_link_libraries("${LIB_NAME}" pcl_common ${FLANN_LIBRARIES})
++    target_link_libraries("${LIB_NAME}" pcl_common flann::flann_cpp)
+     set(EXT_DEPS flann)
+     PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}"
+                        "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
+@@ -38,4 +38,3 @@ if(build)
+     PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})
+ 
+ endif(build)
+-
+diff --git a/search/CMakeLists.txt b/search/CMakeLists.txt
+index cd82a0e..1d15241 100755
+--- a/search/CMakeLists.txt
++++ b/search/CMakeLists.txt
+@@ -38,7 +38,7 @@ if(build)
+     set(LIB_NAME "pcl_${SUBSYS_NAME}")
+     include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
+     PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs})
+-    target_link_libraries("${LIB_NAME}" pcl_common ${FLANN_LIBRARIES} pcl_octree pcl_kdtree)
++    target_link_libraries("${LIB_NAME}" pcl_common flann::flann_cpp pcl_octree pcl_kdtree)
+     list(APPEND EXT_DEPS flann)
+     PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "")
+ 
+@@ -46,4 +46,3 @@ if(build)
+     PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})
+ 
+ endif(build)
+-
+diff --git a/test/features/CMakeLists.txt b/test/features/CMakeLists.txt
+index cedb0cb..4b37c73 100755
+--- a/test/features/CMakeLists.txt
++++ b/test/features/CMakeLists.txt
+@@ -81,14 +81,14 @@ if (build)
+     PCL_ADD_TEST(feature_flare_estimation test_flare_estimation
+                  FILES test_flare_estimation.cpp
+                  LINK_WITH pcl_gtest pcl_features pcl_io
+-                 ARGUMENTS "${PCL_SOURCE_DIR}/test/bun0.pcd")				 
++                 ARGUMENTS "${PCL_SOURCE_DIR}/test/bun0.pcd")
+     PCL_ADD_TEST(feature_shot_lrf_estimation test_shot_lrf_estimation
+                  FILES test_shot_lrf_estimation.cpp
+                  LINK_WITH pcl_gtest pcl_features pcl_io
+                  ARGUMENTS "${PCL_SOURCE_DIR}/test/bun0.pcd")
+     PCL_ADD_TEST(features_narf test_narf
+                  FILES test_narf.cpp
+-                 LINK_WITH pcl_gtest pcl_features ${FLANN_LIBRARIES})
++                 LINK_WITH pcl_gtest pcl_features flann::flann_cpp)
+     PCL_ADD_TEST(a_ii_normals_test test_ii_normals
+                  FILES test_ii_normals.cpp
+                  LINK_WITH pcl_gtest pcl_io pcl_features
diff --git a/ports/pdal-c/CONTROL b/ports/pdal-c/CONTROL
index 2a52378b5..061e1a659 100644
--- a/ports/pdal-c/CONTROL
+++ b/ports/pdal-c/CONTROL
@@ -1,4 +1,4 @@
-Source: pdal-c
-Version: 1.8-1
-Description:  C API for the Point Data Abstraction Library (PDAL)
-Build-Depends: pdal
+Source: pdal-c
+Version: 1.8-2
+Description:  C API for the Point Data Abstraction Library (PDAL)
+Build-Depends: pdal
diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake
index 8a478c547..bdfdd387e 100644
--- a/ports/pdal-c/portfile.cmake
+++ b/ports/pdal-c/portfile.cmake
@@ -1,10 +1,6 @@
-# vcpkg portfile.cmake for pdal-c, the C API for PDAL
-
 include(vcpkg_common_functions)
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building will not support load data through plugins.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/pdal/FindGeoTIFF.cmake b/ports/pdal/FindGeoTIFF.cmake
deleted file mode 100644
index 51a5fb2d8..000000000
--- a/ports/pdal/FindGeoTIFF.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-find_path(GEOTIFF_INCLUDE_DIR geotiff.h)
-
-find_library(GEOTIFF_LIBRARY_DEBUG NAMES geotiff_d)
-find_library(GEOTIFF_LIBRARY_RELEASE NAMES geotiff)
-
-include(SelectLibraryConfigurations)
-select_library_configurations(GEOTIFF)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-    GEOTIFF DEFAULT_MSG
-    GEOTIFF_LIBRARY GEOTIFF_INCLUDE_DIR
-)
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake
index 6ab78024f..2ceaf99ab 100644
--- a/ports/pdal/portfile.cmake
+++ b/ports/pdal/portfile.cmake
@@ -21,14 +21,10 @@ vcpkg_extract_source_archive_ex(
 )
 
 file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp")
-
-# Deploy custom CMake modules to enforce expected dependencies look-up
-foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF)
-    file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake")
-    file(COPY ${CMAKE_CURRENT_LIST_DIR}/${_module}.cmake
-        DESTINATION ${SOURCE_PATH}/cmake/modules/
-    )
-endforeach()
+file(REMOVE "${SOURCE_PATH}/cmake/modules/FindGDAL.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake/modules/FindGEOS.cmake")
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/cmake/modules/)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGEOS.cmake DESTINATION ${SOURCE_PATH}/cmake/modules/)
 
 # NOTE: CMake native BUILD_SHARED_LIBS option will be set by vcpkg_configure_cmake
 # TODO: Remove this as soon as PDAL switches to use BUILD_SHARED_LIBS
diff --git a/ports/pegtl-2/CONTROL b/ports/pegtl-2/CONTROL
new file mode 100644
index 000000000..fcbcd3bba
--- /dev/null
+++ b/ports/pegtl-2/CONTROL
@@ -0,0 +1,3 @@
+Source: pegtl-2
+Version: 2.8.0
+Description: The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). This version maintains compatibility with C++11.
diff --git a/ports/pegtl-2/portfile.cmake b/ports/pegtl-2/portfile.cmake
new file mode 100644
index 000000000..79d6bb97e
--- /dev/null
+++ b/ports/pegtl-2/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO taocpp/pegtl
+    REF 2.8.0
+    SHA512 1652b0061cd4cbd0e687855ee2e61e97d020606c54329de8769c3a3f411002323900c11eaf0da28e107c17e269025f577f9205b7500c5bbb16502687be8ee77b
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DPEGTL_BUILD_TESTS=OFF
+        -DPEGTL_BUILD_EXAMPLES=OFF
+        -DPEGTL_INSTALL_INCLUDE_DIR=include/pegtl-2
+        -DPEGTL_INSTALL_DOC_DIR=share/pegtl-2
+        -DPEGTL_INSTALL_CMAKE_DIR=share/pegtl-2/cmake
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/pegtl-2/cmake)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+# Handle copyright
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl-2/LICENSE ${CURRENT_PACKAGES_DIR}/share/pegtl-2/copyright)
+
+# Handle collision with latest pegtl
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl-2/pegtl-config.cmake ${CURRENT_PACKAGES_DIR}/share/pegtl-2/pegtl-2-config.cmake)
diff --git a/ports/pegtl/CONTROL b/ports/pegtl/CONTROL
index b890e1bc3..f7f685e0d 100644
--- a/ports/pegtl/CONTROL
+++ b/ports/pegtl/CONTROL
@@ -1,3 +1,3 @@
 Source: pegtl
-Version: 2.8.0
+Version: 3.0.0-pre
 Description: The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).
diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake
index 1f53e7305..f12b170b5 100644
--- a/ports/pegtl/portfile.cmake
+++ b/ports/pegtl/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO taocpp/pegtl
-    REF 2.8.0
-    SHA512 1652b0061cd4cbd0e687855ee2e61e97d020606c54329de8769c3a3f411002323900c11eaf0da28e107c17e269025f577f9205b7500c5bbb16502687be8ee77b
+    REF c5d158ffab4baa0e1c3f6d54c0684f05a2412f74
+    SHA512 efd5d36ca14c27948005cd034e72e24855f6046141c316a1d4b7186af9753fd035dab8303dc86e2f2de1b185f5fa3f5d678672892b1fc4ab69e827492a94e897
     HEAD_REF master
 )
 
@@ -13,6 +13,8 @@ vcpkg_configure_cmake(
     OPTIONS
         -DPEGTL_BUILD_TESTS=OFF
         -DPEGTL_BUILD_EXAMPLES=OFF
+        -DPEGTL_INSTALL_DOC_DIR=share/pegtl
+        -DPEGTL_INSTALL_CMAKE_DIR=share/pegtl/cmake
 )
 
 vcpkg_install_cmake()
@@ -22,4 +24,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/pegtl/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pegtl RENAME copyright)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE ${CURRENT_PACKAGES_DIR}/share/pegtl/copyright)
diff --git a/ports/pfultz2-linq/CONTROL b/ports/pfultz2-linq/CONTROL
new file mode 100644
index 000000000..e8185c327
--- /dev/null
+++ b/ports/pfultz2-linq/CONTROL
@@ -0,0 +1,4 @@
+Source: pfultz2-linq
+Version: 2019-05-14
+Description: Linq for list comprehension in C++
+Build-Depends: boost-fusion, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-range, boost-static-assert, boost-type-traits, boost-unordered, boost-utility
diff --git a/ports/pfultz2-linq/portfile.cmake b/ports/pfultz2-linq/portfile.cmake
new file mode 100644
index 000000000..de0980b6a
--- /dev/null
+++ b/ports/pfultz2-linq/portfile.cmake
@@ -0,0 +1,30 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO pfultz2/Linq
+    REF 7ff0a73fed52be5e11df3d79128ce7b11f430af2
+    SHA512 6768e28bf17568436b4c3fed18f6b1edbe048b871ebee25580419b805498beb0800e473ecdc5acc0f9f89bec47d16fd3806018ce6395bdf14a8e2975cde9381f
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/linq TARGET_PATH share/linq)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME linq)
diff --git a/ports/piex/CONTROL b/ports/piex/CONTROL
index 43411e564..3fb98201f 100644
--- a/ports/piex/CONTROL
+++ b/ports/piex/CONTROL
@@ -1,3 +1,3 @@
-Source: piex
-Version: 2018-03-13
-Description: The Preview Image Extractor (PIEX) is designed to find and extract the largest
+Source: piex
+Version: 2018-03-13-1
+Description: The Preview Image Extractor (PIEX) is designed to find and extract the largest
diff --git a/ports/piex/portfile.cmake b/ports/piex/portfile.cmake
index 039c2c41d..3238c013c 100644
--- a/ports/piex/portfile.cmake
+++ b/ports/piex/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
diff --git a/ports/pixman/CMakeLists.txt b/ports/pixman/CMakeLists.txt
index 55adf8b9c..1b8c311c1 100644
--- a/ports/pixman/CMakeLists.txt
+++ b/ports/pixman/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(pixman VERSION 0.34.0 LANGUAGES C)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 set(CMAKE_DEBUG_POSTFIX "d")
 
 if(UNIX)
@@ -41,21 +40,29 @@ file(GLOB SOURCES
 "pixman-timer.c"
 "pixman-trap.c"
 "pixman-utils.c"
-"pixman-sse2.c"
 )
 
-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
+# pixman requires the three PACKAGE* definitions in order to compile.
+set(PIXMAN_DEFS 
     PRIVATE
-        PACKAGE="pixman-1"
-        PACKAGE_VERSION="0.34.0"
-        PACKAGE_BUGREPORT=""
-        USE_SSE2
+    PACKAGE="pixman-1"
+    PACKAGE_VERSION="0.34.0"
+    PACKAGE_BUGREPORT=""
 )
 
+if(VCPKG_TARGET_TRIPLET STREQUAL arm64-windows OR VCPKG_TARGET_TRIPLET STREQUAL arm-windows)
+    # don't enable SSE2 for arm64-windows and arm-windows
+else()
+    # The USE_SSE2 definition lets it use SSE2 instructions for speed. Every x86/64 target machine should have SSE2 these days.
+    set(PIXMAN_DEFS ${PIXMAN_DEFS} USE_SSE2)
+    file(GLOB SSE2_SOURCES "pixman-sse2.c")
+    set(SOURCES ${SOURCES} ${SSE2_SOURCES})
+endif()
+
+add_library(pixman-1 ${SOURCES})
+target_include_directories(pixman-1 PUBLIC $<INSTALL_INTERFACE:include>)
+target_compile_definitions(pixman-1 ${PIXMAN_DEFS})
+
 if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
     target_compile_options(pixman-1 PRIVATE -msse2)
 endif()
diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL
index 7ea0dc3d7..066d81076 100644
--- a/ports/pixman/CONTROL
+++ b/ports/pixman/CONTROL
@@ -1,3 +1,3 @@
 Source: pixman
-Version: 0.38.0-1
+Version: 0.38.0-3
 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 e81972fd7..649bee489 100644
--- a/ports/pixman/portfile.cmake
+++ b/ports/pixman/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(PIXMAN_VERSION 0.38.0)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
diff --git a/ports/platform-folders/CONTROL b/ports/platform-folders/CONTROL
index d964e1d08..9ce30f45a 100644
--- a/ports/platform-folders/CONTROL
+++ b/ports/platform-folders/CONTROL
@@ -1,3 +1,3 @@
-Source: platform-folders
-Version: 4.0.0-4
-Description: A C++ library to look for special directories like "My Documents" and "%APPDATA%"
+Source: platform-folders
+Version: 4.0.0-5
+Description: A C++ library to look for special directories like "My Documents" and "%APPDATA%"
diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake
index a08610e18..c66848096 100644
--- a/ports/platform-folders/portfile.cmake
+++ b/ports/platform-folders/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(TARGET_BUILD_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -13,14 +16,13 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
 		-DBUILD_TESTING=OFF
-		-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
     file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(INSTALL ${TARGET_BUILD_PATH}-rel/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/)	
+    file(INSTALL ${TARGET_BUILD_PATH}-rel/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/)
     file(INSTALL ${TARGET_BUILD_PATH}-dbg/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/)
 endif()
 
diff --git a/ports/plib/CONTROL b/ports/plib/CONTROL
index f1509d029..b5abf0011 100644
--- a/ports/plib/CONTROL
+++ b/ports/plib/CONTROL
@@ -1,3 +1,3 @@
-Source: plib
-Version: 1.8.5-2
-Description: A suite of portable game libraries
+Source: plib
+Version: 1.8.5-3
+Description: A suite of portable game libraries
diff --git a/ports/plib/portfile.cmake b/ports/plib/portfile.cmake
index 16c5673c9..ed0f03af0 100644
--- a/ports/plib/portfile.cmake
+++ b/ports/plib/portfile.cmake
@@ -1,9 +1,7 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("Note: plib only supports static library linkage")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/plib-1.8.5)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz"
diff --git a/ports/pmdk/CONTROL b/ports/pmdk/CONTROL
index 4c667eac0..803544c91 100644
--- a/ports/pmdk/CONTROL
+++ b/ports/pmdk/CONTROL
@@ -1,3 +1,3 @@
 Source: pmdk
-Version: 1.4.2
-Description: Persistent Memory Development Kit
-\ No newline at end of file
+Version: 1.6-1
+Description: Persistent Memory Development Kit
diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake
index 330a8abeb..4bede2bb9 100644
--- a/ports/pmdk/portfile.cmake
+++ b/ports/pmdk/portfile.cmake
@@ -1,12 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Static building not supported. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "Static CRT linkage is not supported")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
 if (TRIPLET_SYSTEM_ARCH MATCHES "arm")
     message(FATAL_ERROR "ARM is currently not supported")
@@ -18,8 +12,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pmem/pmdk
-    REF 1.4.2
-    SHA512 87aa226487046aba14f3a0b51d066f4498a6021580fd203df45f0900fc0c0c5cdb192156a4c730a5a7dc5826e204d688531e5680145161750057803cb24d088d
+    REF 1.6
+    SHA512 f66e4edf1937d51abfa7c087b65a64109cd3d2a8d9587d6c4fc28a1003d67ec1f35a0011c9a9d0bfe76ad7227be83e86582f8405c988eac828d8ae5d0a399483
     HEAD_REF master
     PATCHES
         "${CMAKE_CURRENT_LIST_DIR}/addPowerShellExecutionPolicy.patch"
@@ -32,7 +26,7 @@ string(REPLACE "pmdk-" "" PMDK_VERSION "${PMDK_VERSION}")
 # Build only the selected projects
 vcpkg_build_msbuild(
     PROJECT_PATH ${SOURCE_PATH}/src/PMDK.sln
-    TARGET "Solution Items\\libpmem,Solution Items\\libpmemlog,Solution Items\\libpmemblk,Solution Items\\libpmemobj,Solution Items\\libpmemcto,Solution Items\\libpmempool,Solution Items\\libvmem,Solution Items\\Tools\\pmempool"
+    TARGET "Solution Items\\libpmem,Solution Items\\libpmemlog,Solution Items\\libpmemblk,Solution Items\\libpmemobj,Solution Items\\libpmempool,Solution Items\\libvmem,Solution Items\\Tools\\pmempool"
     OPTIONS /p:SRCVERSION=${PMDK_VERSION}
 )
 
@@ -44,29 +38,27 @@ file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/*.h)
 file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/libpmemobj/*.h)
 file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/libpmemobj)
-file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/libpmemobj++/*.hpp)
-file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/libpmemobj++)
 
 # Remove unneeded header files
 file(REMOVE ${CURRENT_PACKAGES_DIR}/include/libvmmalloc.h)
 file(REMOVE ${CURRENT_PACKAGES_DIR}/include/librpmem.h)
 
 # Install libraries (debug)
-file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/lib[pv]mem*.lib ${DEBUG_ARTIFACTS_PATH}/lib[pv]mem*.exp)
+file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/libs/libpmem*.lib)
 file(INSTALL ${LIB_DEBUG_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libpmemcommon.lib)
-file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/lib[pv]mem*.dll)
+file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/libs/libpmem*.dll)
 file(INSTALL ${LIB_DEBUG_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
 
 # Install libraries (release)
-file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/lib[pv]mem*.lib ${RELEASE_ARTIFACTS_PATH}/lib[pv]mem*.exp)
+file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/libs/libpmem*.lib)
 file(INSTALL ${LIB_RELEASE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libpmemcommon.lib)
-file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/lib[pv]mem*.dll)
+file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/libs/libpmem*.dll)
 file(INSTALL ${LIB_RELEASE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
 
 # Install tools (release only)
-file(INSTALL ${RELEASE_ARTIFACTS_PATH}/pmempool.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pmdk)
+file(INSTALL ${RELEASE_ARTIFACTS_PATH}/libs/pmempool.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pmdk)
 
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/pmdk)
 
diff --git a/ports/pngwriter/CONTROL b/ports/pngwriter/CONTROL
index 667dafa24..286244e93 100644
--- a/ports/pngwriter/CONTROL
+++ b/ports/pngwriter/CONTROL
@@ -1,4 +1,4 @@
-Source: pngwriter
-Version: 0.7.0-1
-Build-Depends: zlib, libpng, freetype
-Description: PNGwriter is a very easy to use open source graphics library that uses PNG as its output format
+Source: pngwriter
+Version: 0.7.0-2
+Build-Depends: zlib, libpng, freetype
+Description: PNGwriter is a very easy to use open source graphics library that uses PNG as its output format
diff --git a/ports/pngwriter/portfile.cmake b/ports/pngwriter/portfile.cmake
index 937010522..06793058a 100644
--- a/ports/pngwriter/portfile.cmake
+++ b/ports/pngwriter/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("Only static linkage is supported by pngwriter.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL
index 640d9b91c..29291a730 100644
--- a/ports/poco/CONTROL
+++ b/ports/poco/CONTROL
@@ -1,5 +1,5 @@
 Source: poco
-Version: 2.0.0-pre
+Version: 2.0.0-pre-1
 Build-Depends: expat, libpq, pcre, sqlite3, zlib
 Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems. (https://github.com/pocoproject/poco)
 
diff --git a/ports/poco/arm64_pcre.patch b/ports/poco/arm64_pcre.patch
new file mode 100644
index 000000000..faf8ce99c
--- /dev/null
+++ b/ports/poco/arm64_pcre.patch
@@ -0,0 +1,62 @@
+diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
+index 3f26008..d0bbd31 100644
+--- a/Foundation/include/Poco/Platform.h
++++ b/Foundation/include/Poco/Platform.h
+@@ -193,7 +193,7 @@
+ 	#else
+ 		#define POCO_ARCH_LITTLE_ENDIAN 1
+ 	#endif
+-#elif defined(__arm64__) || defined(__arm64)
++#elif defined(__arm64__) || defined(__arm64) || defined(_M_ARM64)
+ 	#define POCO_ARCH POCO_ARCH_ARM64
+ 	#if defined(__ARMEB__)
+ 		#define POCO_ARCH_BIG_ENDIAN 1
+diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp
+index 4d655da..26567c8 100644
+--- a/Foundation/src/EventLogChannel.cpp
++++ b/Foundation/src/EventLogChannel.cpp
+@@ -11,6 +11,7 @@
+ // SPDX-License-Identifier:	BSL-1.0
+ //
+ 
++#pragma comment(lib,"advapi32.lib")
+ 
+ #include "Poco/EventLogChannel.h"
+ #include "Poco/Message.h"
+diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
+index e2b6a06..1b045c1 100644
+--- a/Foundation/src/utils.h
++++ b/Foundation/src/utils.h
+@@ -54,7 +54,7 @@
+ // disabled.)
+ // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
+ #if defined(_M_X64) || defined(__x86_64__) || \
+-    defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || \
++    defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || defined(_M_ARM64) || \
+     defined(__avr32__) || \
+     defined(__hppa__) || defined(__ia64__) || \
+     defined(__mips__) || \
+diff --git a/Net/src/Net.cpp b/Net/src/Net.cpp
+index e81b4b5..36ae436 100644
+--- a/Net/src/Net.cpp
++++ b/Net/src/Net.cpp
+@@ -11,6 +11,7 @@
+ // SPDX-License-Identifier:	BSL-1.0
+ //
+ 
++#pragma comment(lib,"advapi32.lib")
+ 
+ #include "Poco/Net/Net.h"
+ 
+diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp
+index 4c2ad7d..cf1de17 100644
+--- a/Util/src/WinRegistryKey.cpp
++++ b/Util/src/WinRegistryKey.cpp
+@@ -11,6 +11,7 @@
+ // SPDX-License-Identifier:	BSL-1.0
+ //
+ 
++#pragma comment(lib,"advapi32.lib")
+ 
+ #include "Poco/Util/WinRegistryKey.h"
+ #include "Poco/Exception.h"
diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake
index 2aaa89295..36a127489 100644
--- a/ports/poco/portfile.cmake
+++ b/ports/poco/portfile.cmake
@@ -17,6 +17,8 @@ vcpkg_from_github(
         static_pcre.patch
         # Fix source path of PDF
         unbundled_pdf.patch
+        # Add the support of arm64-windows
+        arm64_pcre.patch
 )
 
 # define Poco linkage type
diff --git a/ports/podofo/unique_ptr.patch b/ports/podofo/0001-unique_ptr.patch
index 5c70e8471..5c70e8471 100644
--- a/ports/podofo/unique_ptr.patch
+++ b/ports/podofo/0001-unique_ptr.patch
diff --git a/ports/podofo/002-HAVE_UNISTD_H.patch b/ports/podofo/0002-HAVE_UNISTD_H.patch
index 6aed4b279..6aed4b279 100644
--- a/ports/podofo/002-HAVE_UNISTD_H.patch
+++ b/ports/podofo/0002-HAVE_UNISTD_H.patch
diff --git a/ports/podofo/0003-uwp_fix.patch b/ports/podofo/0003-uwp_fix.patch
new file mode 100644
index 000000000..91872d7eb
--- /dev/null
+++ b/ports/podofo/0003-uwp_fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/base/PdfCompilerCompat.h b/src/base/PdfCompilerCompat.h
+index 706875f..8efb349 100644
+--- a/src/base/PdfCompilerCompat.h
++++ b/src/base/PdfCompilerCompat.h
+@@ -113,6 +113,10 @@
+ #define NOMINMAX
+ #endif
+ 
++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
++#include <combaseapi.h>
++#endif
++
+ // Integer types - fixed size types guaranteed to work anywhere
+ // because we detect the right underlying type name to use with
+ // CMake. Use typedefs rather than macros for saner error messages
diff --git a/ports/podofo/CONTROL b/ports/podofo/CONTROL
index 233a7011c..083248c3c 100644
--- a/ports/podofo/CONTROL
+++ b/ports/podofo/CONTROL
@@ -1,7 +1,7 @@
 Source: podofo
-Version: 0.9.6-5
+Version: 0.9.6-7
 Description: PoDoFo is a library to work with the PDF file format
-Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl (!windows&!uwp), freetype
+Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl, freetype
 
 Feature: fontconfig
 Description: Enable font manager support on Unix platforms.
diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake
index 5fa631b18..759b6dbe1 100644
--- a/ports/podofo/portfile.cmake
+++ b/ports/podofo/portfile.cmake
@@ -6,13 +6,19 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "podofo-${PODOFO_VERSION}.tar.gz"
     SHA512 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130
 )
+
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  set(ADDITIONAL_PATCH "0003-uwp_fix.patch")
+endif()
+
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${PODOFO_VERSION}
-    PATCHES 
-        "unique_ptr.patch"
-        "002-HAVE_UNISTD_H.patch"
+    PATCHES
+        0001-unique_ptr.patch
+        0002-HAVE_UNISTD_H.patch
+        ${ADDITIONAL_PATCH}
 )
 
 set(PODOFO_NO_FONTMANAGER ON)
@@ -28,6 +34,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM
     set(IS_WIN32 ON)
 endif()
 
+file(REMOVE ${SOURCE_PATH}/cmake/modules/FindOpenSSL.cmake)
+file(REMOVE ${SOURCE_PATH}/cmake/modules/FindZLIB.cmake)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/pqp/CONTROL b/ports/pqp/CONTROL
index 69a72c33e..5eb701bc6 100644
--- a/ports/pqp/CONTROL
+++ b/ports/pqp/CONTROL
@@ -1,3 +1,3 @@
-Source: pqp
-Version: 1.3-2
-Description: a proximity query package
+Source: pqp
+Version: 1.3-3
+Description: a proximity query package
diff --git a/ports/pqp/portfile.cmake b/ports/pqp/portfile.cmake
index 077d76d6a..a674e3af3 100644
--- a/ports/pqp/portfile.cmake
+++ b/ports/pqp/portfile.cmake
@@ -1,8 +1,7 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pqp-1.3/PQP_v1.3)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://gamma.cs.unc.edu/software/downloads/SSV/pqp-1.3.tar.gz"
diff --git a/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch b/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch
index 9be5438aa..2f1f9ca29 100644
--- a/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch
+++ b/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch
@@ -15,8 +15,8 @@ index 294a50b..c7fb6bf 100644
      if(MSVC_VERSION EQUAL 1800)
        set(PROJ_COMPILER_NAME "msvc-12.0") #Visual Studio 2013
      endif()
-+    if(MSVC_VERSION EQUAL 1900)
-+      set(PROJ_COMPILER_NAME "msvc-14.0") #Visual Studio 2015
++    if(MSVC_VERSION GREATER_EQUAL 1900)
++      set(PROJ_COMPILER_NAME "msvc-14.0") #Visual Studio 2015/2017/2019
 +    endif()
    endif(MSVC)
    
diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index f7532a967..64974e4ba 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -1,29 +1,27 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/proj-4.9.3)
+
+set(PROJ4_VERSION 4.9.3)
+
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.osgeo.org/proj/proj-4.9.3.zip"
-    FILENAME "proj-4.9.3.zip"
+    URLS "http://download.osgeo.org/proj/proj-${PROJ4_VERSION}.zip"
+    FILENAME "proj-${PROJ4_VERSION}.zip"
     SHA512 c9703008cd1f75fe1239b180158e560b9b88ae2ffd900b72923c716908eb86d1abbc4230647af5e3131f8c34481bdc66b03826d669620161ffcfbe67801cb631
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}/
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${PROJ4_VERSION}
     PATCHES
-    ${CMAKE_CURRENT_LIST_DIR}/0001-CMake-add-detection-of-recent-visual-studio-versions.patch
-    ${CMAKE_CURRENT_LIST_DIR}/0002-CMake-fix-error-by-only-setting-properties-for-targe.patch
-    ${CMAKE_CURRENT_LIST_DIR}/0003-CMake-configurable-cmake-config-install-location.patch
+        0001-CMake-add-detection-of-recent-visual-studio-versions.patch
+        0002-CMake-fix-error-by-only-setting-properties-for-targe.patch
+        0003-CMake-configurable-cmake-config-install-location.patch
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    list(APPEND CMAKE_OPTIONS "-DBUILD_LIBPROJ_SHARED=YES")
-else()
-    list(APPEND CMAKE_OPTIONS "-DBUILD_LIBPROJ_SHARED=NO")
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS ${CMAKE_OPTIONS}
+    OPTIONS
+    -DBUILD_LIBPROJ_SHARED=${BUILD_SHARED_LIBS}
     -DPROJ_LIB_SUBDIR=lib
     -DPROJ_INCLUDE_SUBDIR=include
     -DPROJ_DATA_SUBDIR=share/proj4
@@ -36,7 +34,6 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/proj4)
 
 # Rename library and adapt cmake configuration
@@ -68,11 +65,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
     endif()
 endif()
 
-# Remove duplicate headers installed from debug build
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-# Remove data installed from debug build
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-# Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/proj4)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/proj4/COPYING ${CURRENT_PACKAGES_DIR}/share/proj4/copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/proj4 RENAME copyright)
diff --git a/ports/pthread/CONTROL b/ports/pthread/CONTROL
new file mode 100644
index 000000000..6ce319325
--- /dev/null
+++ b/ports/pthread/CONTROL
@@ -0,0 +1,4 @@
+Source: pthread
+Version: 3.0.0
+Build-Depends: pthreads
+Description: empty package, linking to other port
diff --git a/ports/pthread/portfile.cmake b/ports/pthread/portfile.cmake
new file mode 100644
index 000000000..9aefc8241
--- /dev/null
+++ b/ports/pthread/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/pthreads/CMakeLists.txt b/ports/pthreads/CMakeLists.txt
deleted file mode 100644
index 32f25e716..000000000
--- a/ports/pthreads/CMakeLists.txt
+++ /dev/null
@@ -1,216 +0,0 @@
-cmake_minimum_required(VERSION 3.9.0)
-
-project(pthreads)
-
-set(PTHREAD_PUBLIC_HEADERS pthread.h sched.h semaphore.h)
-
-set(PTHREAD_SHARED_SOURCES
-  autostatic.c
-  barrier.c
-  cancel.c
-  cleanup.c
-  condvar.c
-  create.c
-  dll.c
-  errno.c
-  exit.c
-  fork.c
-  global.c
-  misc.c
-  mutex.c
-  nonportable.c
-  private.c
-  rwlock.c
-  sched.c
-  semaphore.c
-  signal.c
-  spin.c
-  sync.c
-  tsd.c
-  attr.C
-  version.rc
-)
-set(PTHREAD_STATIC_SOURCES
-  autostatic.c
-  cleanup.c
-  create.c
-  dll.c
-  errno.c
-  fork.c
-  global.c
-  pthread_attr_destroy.c
-  pthread_attr_getdetachstate.c
-  pthread_attr_getinheritsched.c
-  pthread_attr_getschedparam.c
-  pthread_attr_getschedpolicy.c
-  pthread_attr_getscope.c
-  pthread_attr_getstackaddr.c
-  pthread_attr_getstacksize.c
-  pthread_attr_init.c
-  pthread_attr_setdetachstate.c
-  pthread_attr_setinheritsched.c
-  pthread_attr_setschedparam.c
-  pthread_attr_setschedpolicy.c
-  pthread_attr_setscope.c
-  pthread_attr_setstackaddr.c
-  pthread_attr_setstacksize.c
-  pthread_barrier_destroy.c
-  pthread_barrier_init.c
-  pthread_barrier_wait.c
-  pthread_barrierattr_destroy.c
-  pthread_barrierattr_getpshared.c
-  pthread_barrierattr_init.c
-  pthread_barrierattr_setpshared.c
-  pthread_cancel.c
-  pthread_cond_destroy.c
-  pthread_cond_init.c
-  pthread_cond_signal.c
-  pthread_cond_wait.c
-  pthread_condattr_destroy.c
-  pthread_condattr_getpshared.c
-  pthread_condattr_init.c
-  pthread_condattr_setpshared.c
-  pthread_delay_np.c
-  pthread_detach.c
-  pthread_equal.c
-  pthread_exit.c
-  pthread_getconcurrency.c
-  pthread_getschedparam.c
-  pthread_getspecific.c
-  pthread_getunique_np.c
-  pthread_getw32threadhandle_np.c
-  pthread_join.c
-  pthread_key_create.c
-  pthread_key_delete.c
-  pthread_kill.c
-  pthread_mutex_consistent.c
-  pthread_mutex_destroy.c
-  pthread_mutex_init.c
-  pthread_mutex_lock.c
-  pthread_mutex_timedlock.c
-  pthread_mutex_trylock.c
-  pthread_mutex_unlock.c
-  pthread_mutexattr_destroy.c
-  pthread_mutexattr_getkind_np.c
-  pthread_mutexattr_getpshared.c
-  pthread_mutexattr_getrobust.c
-  pthread_mutexattr_gettype.c
-  pthread_mutexattr_init.c
-  pthread_mutexattr_setkind_np.c
-  pthread_mutexattr_setpshared.c
-  pthread_mutexattr_setrobust.c
-  pthread_mutexattr_settype.c
-  pthread_num_processors_np.c
-  pthread_once.c
-  pthread_rwlock_destroy.c
-  pthread_rwlock_init.c
-  pthread_rwlock_rdlock.c
-  pthread_rwlock_tryrdlock.c
-  pthread_rwlock_trywrlock.c
-  pthread_rwlock_unlock.c
-  pthread_rwlock_wrlock.c
-  pthread_rwlockattr_destroy.c
-  pthread_rwlockattr_getpshared.c
-  pthread_rwlockattr_init.c
-  pthread_rwlockattr_setpshared.c
-  pthread_self.c
-  pthread_setcancelstate.c
-  pthread_setcanceltype.c
-  pthread_setconcurrency.c
-  pthread_setschedparam.c
-  pthread_setspecific.c
-  pthread_spin_destroy.c
-  pthread_spin_init.c
-  pthread_spin_lock.c
-  pthread_spin_trylock.c
-  pthread_spin_unlock.c
-  pthread_testcancel.c
-  pthread_timechange_handler_np.c
-  pthread_win32_attach_detach_np.c
-  ptw32_calloc.c
-  ptw32_callUserDestroyRoutines.c
-  ptw32_cond_check_need_init.c
-  ptw32_getprocessors.c
-  ptw32_is_attr.c
-  ptw32_MCS_lock.c
-  ptw32_mutex_check_need_init.c
-  ptw32_new.c
-  ptw32_processInitialize.c
-  ptw32_processTerminate.c
-  ptw32_relmillisecs.c
-  ptw32_reuse.c
-  ptw32_rwlock_check_need_init.c
-  ptw32_semwait.c
-  ptw32_spinlock_check_need_init.c
-  ptw32_threadDestroy.c
-  ptw32_threadStart.c
-  ptw32_throw.c
-  ptw32_timespec.c
-  ptw32_tkAssocCreate.c
-  ptw32_tkAssocDestroy.c
-  sched_get_priority_max.c
-  sched_get_priority_min.c
-  sched_getscheduler.c
-  sched_setscheduler.c
-  sched_yield.c
-  sem_close.c
-  sem_destroy.c
-  sem_getvalue.c
-  sem_init.c
-  sem_open.c
-  sem_post_multiple.c
-  sem_post.c
-  sem_timedwait.c
-  sem_trywait.c
-  sem_unlink.c
-  sem_wait.c
-  signal.c
-  w32_CancelableWait.c
-)
-
-
-
-add_definitions(-DPTW32_ARCH="${PTW32_ARCH}" -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED)
-
-if(BUILD_SHARED_LIBS)
-  set(PTHREAD_SOURCES  ${PTHREAD_SHARED_SOURCES})
-  add_definitions(-DPTW32_BUILD)
-else()
-  set(PTHREAD_SOURCES  ${PTHREAD_STATIC_SOURCES})
-  add_definitions(-DPTW32_STATIC_LIB)
-endif()
-
-
-if(PTHREADS_BUILD_CPP)
-  set(PTHREADS_EXCEPTION_SCHEME CE)
-  add_definitions(/__CLEANUP_CXX)
-elseif(PTHREADS_BUILD_SEH)
-  set(PTHREADS_EXCEPTION_SCHEME SE)
-  add_definitions(/__CLEANUP_SEH)
-else()
-  set(PTHREADS_EXCEPTION_SCHEME C)
-endif()
-
-set(PTHREADS_COMPATIBILITY_VERSION 2)
-set(CMAKE_DEBUG_POSTFIX d)
-set(PTHREADS_COMPILER V)
-
-set(PTHREADS_LIBRARY "pthread${PTHREADS_COMPILER}${PTHREADS_EXCEPTION_SCHEME}${PTHREADS_COMPATIBILITY_VERSION}")
-
-add_library(pthreads ${PTHREAD_SOURCES})
-target_include_directories(pthreads PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-set_target_properties(pthreads PROPERTIES OUTPUT_NAME ${PTHREADS_LIBRARY})
-if(NOT DISABLE_INSTALL_HEADERS)
-  set_property(TARGET pthreads PROPERTY PUBLIC_HEADER ${PTHREAD_PUBLIC_HEADERS})
-endif()
-
-install(
-  TARGETS pthreads EXPORT pthreads-config
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  PUBLIC_HEADER DESTINATION include
-  INCLUDES DESTINATION include
-)
-install(EXPORT pthreads-config DESTINATION share/pthreads)
-
diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL
index d22280d90..70f3af246 100644
--- a/ports/pthreads/CONTROL
+++ b/ports/pthreads/CONTROL
@@ -1,3 +1,3 @@
 Source: pthreads
-Version: 2.9.1-5
+Version: 3.0.0-1
 Description: pthreads for windows
diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake
index 43489adb6..4debe0d26 100644
--- a/ports/pthreads/portfile.cmake
+++ b/ports/pthreads/portfile.cmake
@@ -6,49 +6,93 @@ if(VCPKG_CMAKE_SYSTEM_NAME)
   return()
 endif()
 
+set(PTHREADS4W_VERSION "3.0.0")
+
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pthreads-w32-2-9-1-release)
 vcpkg_download_distfile(ARCHIVE
-  URLS "https://www.mirrorservice.org/sites/sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.tar.gz"
-  FILENAME "pthreads-w32-2-9-1-release.tar.gz"
-  SHA512 9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551
+  URLS "https://sourceforge.net/projects/pthreads4w/files/pthreads4w-code-v${PTHREADS4W_VERSION}.zip/download"
+  FILENAME "pthreads4w-code-v${PTHREADS4W_VERSION}.zip"
+  SHA512 49e541b66c26ddaf812edb07b61d0553e2a5816ab002edc53a38a897db8ada6d0a096c98a9af73a8f40c94283df53094f76b429b09ac49862465d8697ed20013
+)
+
+vcpkg_extract_source_archive_ex(
+  OUT_SOURCE_PATH SOURCE_PATH
+  ARCHIVE ${ARCHIVE}
+  REF ${PTHREADS4W_VERSION}
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+find_program(NMAKE nmake REQUIRED)
 
-vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
-  OPTIONS -DPTW32_ARCH=${VCPKG_TARGET_ARCHITECTURE}
-  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+################
+# Release build
+################
+message(STATUS "Building ${TARGET_TRIPLET}-rel")
+file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL)
+vcpkg_execute_required_process(
+    COMMAND ${NMAKE} -f Makefile all install
+        "DESTROOT=\"${INST_DIR_REL}\""
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME nmake-build-${TARGET_TRIPLET}-release
 )
+message(STATUS "Building ${TARGET_TRIPLET}-rel done")
 
-vcpkg_install_cmake()
+################
+# Debug build
+################
+message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG)
+vcpkg_execute_required_process(
+    COMMAND ${NMAKE} /G -f Makefile all install
+        "DESTROOT=\"${INST_DIR_DBG}\""
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME nmake-build-${TARGET_TRIPLET}-debug
+)
+message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
 
-vcpkg_fixup_cmake_targets()
+file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVC3d.dll")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVCE3d.dll")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVSE3d.dll")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVC3.dll")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVCE3.dll")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVSE3.dll")
 
-vcpkg_copy_pdbs()
+file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3d.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3d.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3d.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3.lib")
 
-file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/*.h")
-foreach(HEADER ${HEADERS})
-  file(READ "${HEADER}" _contents)
-  string(REPLACE "defined(_TIMESPEC_DEFINED)" "1" _contents "${_contents}")
-  string(REPLACE "defined(PTW32_RC_MSC)" "1" _contents "${_contents}")
-  if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    string(REPLACE "!defined(PTW32_STATIC_LIB)" "0" _contents "${_contents}")
-  endif()
-  file(WRITE "${HEADER}" "${_contents}")
-endforeach()
+file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVC3d.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3d.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3d.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3.lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3.lib")
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright)
-file(INSTALL 
-    ${CURRENT_PACKAGES_DIR}/lib/pthreadVC2.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link
-    RENAME pthread.lib
-)
-file(INSTALL 
-    ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC2d.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link
-    RENAME pthread.lib
-)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+  file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib")
+  file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib")
+  file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3.lib")
+  file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib")
+  file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib")
+  file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib")
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVC3.lib)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3.lib)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3.lib)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3d.lib)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3d.lib)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3d.lib)
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthread)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads_windows)
diff --git a/ports/pthreads/vcpkg-cmake-wrapper.cmake b/ports/pthreads/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..ec5c473fb
--- /dev/null
+++ b/ports/pthreads/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,218 @@
+#.rst:
+# PThreads4W config wrap for vcpkg
+# ------------
+#
+# Find the PThread4W includes and library.
+#
+# Result Variables
+# ^^^^^^^^^^^^^^^^
+#
+# This script defines the following variables:
+#
+# ``PThreads4W_FOUND``
+#   True if PThreads4W library found
+#
+# ``PThreads4W_VERSION``
+#   Containing the PThreads4W version tag (manually defined)
+#
+# ``PThreads4W_INCLUDE_DIR``
+#   Location of PThreads4W headers
+#
+# ``PThreads4W_LIBRARY``
+#   List of libraries to link with when using PThreads4W (no exception handling)
+#
+# ``PThreads4W_CXXEXC_LIBRARY``
+#   List of libraries to link with when using PThreads4W (C++ exception handling)
+#
+# ``PThreads4W_STRUCTEXC_LIBRARY``
+#   List of libraries to link with when using PThreads4W (struct exception handling)
+#
+# Result Targets
+# ^^^^^^^^^^^^^^^^
+#
+# This script defines the following targets:
+#
+# ``PThreads4W::PThreads4W``
+#   Target to use PThreads4W (no exception handling)
+#
+# ``PThreads4W::PThreads4W_CXXEXC``
+#   Target to use PThreads4W (C++ exception handling)
+#
+# ``PThreads4W::PThreads4W_STRUCTEXC``
+#   Target to use PThreads4W (struct exception handling)
+#
+
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
+
+if(NOT PThreads4W_INCLUDE_DIR)
+  find_path(PThreads4W_INCLUDE_DIR NAMES pthread.h)
+endif()
+
+set(PThreads4W_MAJOR_VERSION 3)
+set(PThreads4W_MINOR_VERSION 0)
+set(PThreads4W_PATCH_VERSION 0)
+set(PThreads_VERSION "${PThreads4W_MAJOR_VERSION}.${PThreads4W_MINOR_VERSION}.${PThreads4W_PATCH_VERSION}")
+
+# Allow libraries to be set manually
+if(NOT PThreads4W_LIBRARY)
+  find_library(PThreads4W_LIBRARY_RELEASE NAMES pthreadVC${PThreads4W_MAJOR_VERSION})
+  find_library(PThreads4W_LIBRARY_DEBUG NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d)
+  select_library_configurations(PThreads4W)
+endif()
+if(NOT PThreads4W_CXXEXC_LIBRARY)
+  find_library(PThreads4W_CXXEXC_LIBRARY_RELEASE NAMES pthreadVCE${PThreads4W_MAJOR_VERSION})
+  find_library(PThreads4W_CXXEXC_LIBRARY_DEBUG NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d)
+  select_library_configurations(PThreads4W_CXXEXC)
+endif()
+if(NOT PThreads4W_STRUCTEXC_LIBRARY)
+  find_library(PThreads4W_STRUCTEXC_LIBRARY_RELEASE NAMES pthreadVSE${PThreads4W_MAJOR_VERSION})
+  find_library(PThreads4W_STRUCTEXC_LIBRARY_DEBUG NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d)
+  select_library_configurations(PThreads4W_STRUCTEXC)
+endif()
+if(WIN32)
+  string( REPLACE ".lib" ".dll" PThreads4W_LIBRARY_RELEASE_DLL "${PThreads4W_LIBRARY_RELEASE}" )
+  string( REPLACE ".lib" ".dll" PThreads4W_LIBRARY_DEBUG_DLL   "${PThreads4W_LIBRARY_DEBUG}" )
+  string( REPLACE ".lib" ".dll" PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL "${PThreads4W_CXXEXC_LIBRARY_RELEASE}" )
+  string( REPLACE ".lib" ".dll" PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL   "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" )
+  string( REPLACE ".lib" ".dll" PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE}" )
+  string( REPLACE ".lib" ".dll" PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL   "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" )
+endif()
+
+find_package_handle_standard_args(PThreads4W DEFAULT_MSG PThreads4W_LIBRARY PThreads4W_CXXEXC_LIBRARY PThreads4W_STRUCTEXC_LIBRARY PThreads4W_INCLUDE_DIR)
+mark_as_advanced(PThreads4W_INCLUDE_DIR PThreads4W_LIBRARY PThreads4W_CXXEXC_LIBRARY PThreads4W_STRUCTEXC_LIBRARY)
+
+#Compatibility definitions, deprecated
+set(PTHREAD_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "" FORCE)
+set(PTHREADS_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "" FORCE)
+set(PThreads_windows_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "" FORCE)
+set(PTHREAD_LIBRARIES ${PThreads4W_LIBRARY} CACHE STRING "" FORCE)
+set(PTHREADS_LIBRARIES ${PThreads4W_LIBRARY} CACHE STRING "" FORCE)
+set(PTHREAD_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "" FORCE)
+set(PTHREADS_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "" FORCE)
+set(LIBPTHREAD ${PThreads4W_LIBRARY} CACHE STRING "" FORCE)
+set(LIBPTHREADS ${PThreads4W_LIBRARY} CACHE STRING "" FORCE)
+set(PThreads_windows_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "" FORCE)
+
+
+#TARGETS
+if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W_CXXEXC )
+  if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL}" )
+    add_library( PThreads4W::PThreads4W_CXXEXC      SHARED IMPORTED )
+    set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL}"
+      IMPORTED_IMPLIB                   "${PThreads4W_CXXEXC_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${PThreads4W_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL}" )
+      set_property( TARGET PThreads4W::PThreads4W_CXXEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL}"
+        IMPORTED_IMPLIB_DEBUG             "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" )
+    endif()
+  else()
+    add_library( PThreads4W::PThreads4W_CXXEXC      UNKNOWN IMPORTED )
+    set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${PThreads4W_CXXEXC_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${PThreads4W_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" )
+      set_property( TARGET PThreads4W::PThreads4W_CXXEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" )
+    endif()
+  endif()
+endif()
+
+if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W_STRUCTEXC )
+  if( EXISTS "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL}" )
+    add_library( PThreads4W::PThreads4W_STRUCTEXC      SHARED IMPORTED )
+    set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL}"
+      IMPORTED_IMPLIB                   "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${PThreads4W_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL}" )
+      set_property( TARGET PThreads4W::PThreads4W_STRUCTEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL}"
+        IMPORTED_IMPLIB_DEBUG             "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" )
+    endif()
+  else()
+    add_library( PThreads4W::PThreads4W_STRUCTEXC      UNKNOWN IMPORTED )
+    set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${PThreads4W_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" )
+      set_property( TARGET PThreads4W::PThreads4W_STRUCTEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" )
+    endif()
+  endif()
+endif()
+
+if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W )
+  if( EXISTS "${PThreads4W_LIBRARY_RELEASE_DLL}" )
+    add_library( PThreads4W::PThreads4W      SHARED IMPORTED )
+    set_target_properties( PThreads4W::PThreads4W PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${PThreads4W_LIBRARY_RELEASE_DLL}"
+      IMPORTED_IMPLIB                   "${PThreads4W_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${PThreads4W_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${PThreads4W_LIBRARY_DEBUG_DLL}" )
+      set_property( TARGET PThreads4W::PThreads4W APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( PThreads4W::PThreads4W PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${PThreads4W_LIBRARY_DEBUG_DLL}"
+        IMPORTED_IMPLIB_DEBUG             "${PThreads4W_LIBRARY_DEBUG}" )
+    endif()
+  else()
+    add_library( PThreads4W::PThreads4W      UNKNOWN IMPORTED )
+    set_target_properties( PThreads4W::PThreads4W PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${PThreads4W_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${PThreads4W_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${PThreads4W_LIBRARY_DEBUG}" )
+      set_property( TARGET PThreads4W::PThreads4W APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( PThreads4W::PThreads4W PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${PThreads4W_LIBRARY_DEBUG}" )
+    endif()
+  endif()
+endif()
+
+#Compatibility targets, deprecated
+if( PThreads4W_FOUND AND NOT TARGET PThreads_windows::PThreads_windows )
+  if( EXISTS "${PThreads4W_LIBRARY_RELEASE_DLL}" )
+    add_library( PThreads_windows::PThreads_windows      SHARED IMPORTED )
+    set_target_properties( PThreads_windows::PThreads_windows PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${PThreads4W_LIBRARY_RELEASE_DLL}"
+      IMPORTED_IMPLIB                   "${PThreads4W_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${PThreads4W_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${PThreads4W_LIBRARY_DEBUG_DLL}" )
+      set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( PThreads_windows::PThreads_windows PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${PThreads4W_LIBRARY_DEBUG_DLL}"
+        IMPORTED_IMPLIB_DEBUG             "${PThreads4W_LIBRARY_DEBUG}" )
+    endif()
+  else()
+    add_library( PThreads_windows::PThreads_windows      UNKNOWN IMPORTED )
+    set_target_properties( PThreads_windows::PThreads_windows PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${PThreads4W_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${PThreads4W_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${PThreads4W_LIBRARY_DEBUG}" )
+      set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( PThreads_windows::PThreads_windows PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${PThreads4W_LIBRARY_DEBUG}" )
+    endif()
+  endif()
+endif()
diff --git a/ports/pystring/CMakeLists.txt b/ports/pystring/CMakeLists.txt
index 6fccf78d9..ecfdaa4fb 100644
--- a/ports/pystring/CMakeLists.txt
+++ b/ports/pystring/CMakeLists.txt
@@ -5,10 +5,6 @@ if(MSVC)
   add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
 endif()
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 add_library(libpystring pystring.cpp)
 
 install(
diff --git a/ports/pystring/CONTROL b/ports/pystring/CONTROL
index 6b4f14035..9bdd7daf2 100644
--- a/ports/pystring/CONTROL
+++ b/ports/pystring/CONTROL
@@ -1,3 +1,3 @@
-Source: pystring
-Version:  1.1.3-1
-Description: Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string
+Source: pystring
+Version:  1.1.3-2
+Description: Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string
diff --git a/ports/pystring/portfile.cmake b/ports/pystring/portfile.cmake
index d6e9700f8..8384bc018 100644
--- a/ports/pystring/portfile.cmake
+++ b/ports/pystring/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO imageworks/pystring
diff --git a/ports/qpid-proton/CONTROL b/ports/qpid-proton/CONTROL
index 2c2a1f3e9..88fa09d74 100644
--- a/ports/qpid-proton/CONTROL
+++ b/ports/qpid-proton/CONTROL
@@ -1,4 +1,4 @@
-Source: qpid-proton
-Version: 0.24.0-1
-Build-Depends: openssl, libuv (osx)
-Description: Qpid Proton is a high-performance, lightweight messaging library.
-\ No newline at end of file
+Source: qpid-proton
+Version: 0.28.0
+Build-Depends: openssl (!windows&!uwp), libuv (osx), jsoncpp
+Description: Qpid Proton is a high-performance, lightweight messaging library.
diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake
index 64a43d431..53aebeb0c 100644
--- a/ports/qpid-proton/portfile.cmake
+++ b/ports/qpid-proton/portfile.cmake
@@ -1,48 +1,43 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message("qpid-proton does not support static linkage. Building dynamically.")
-    set(VCPKG_LIBRARY_LINKAGE "dynamic")
-endif()
-
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "qpid-proton does not support static CRT linkage.")
-endif()
-
 include(vcpkg_common_functions)
 
-# Use this throughout rather than literal string
-set(QPID_PROTON_VERSION 0.24.0)
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_find_acquire_program(PYTHON2)
 
-# Go grab the code. Set SHA512 to 1 to get correct sha from download
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/qpid-proton
-    REF ${QPID_PROTON_VERSION}
-    SHA512 a22154d5ea96330e22245a54233101256f02d10ee814a7f0f4b654e56128615acee0cfc0387cbec9b877dd20cc23a5b1635aa9e1d1b60a4b9aa985e449dcb62e
+    REF 0.28.0
+    SHA512 dc253218a076ea56d64e0aaeb6ef9e7345bb9ac700c58b8ea6cb9b3c79d66b0667bcc62cbb45f9ce3455fa8f97b7dfb1c2096d269d1b5b9c5c650ef61a126cfe
     HEAD_REF next
 )
 
-# Run cmake configure step
-vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
-                      OPTIONS
-                          -DPYTHON_EXECUTABLE=${PYTHON2})
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DPYTHON_EXECUTABLE=${PYTHON2}
+        -DENABLE_JSONCPP=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON
+)
 
-# Run cmake install step
 vcpkg_install_cmake()
 
-# Copy across any pdbs generated
 vcpkg_copy_pdbs()
 
-# Rename share subdirectory
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/proton-${QPID_PROTON_VERSION}
-            ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(GLOB SHARE_DIR ${CURRENT_PACKAGES_DIR}/share/*)
+file(RENAME ${SHARE_DIR} ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp/Proton)
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp/Proton)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tmp/Proton TARGET_PATH share/proton)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ProtonCpp TARGET_PATH share/protoncpp)
 
-# Vcpkg expects file with name "copyright"
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt
             ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
 
-# Remove extraneous unrequired-for-vcpkg files
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/examples)
diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL
index fedcd7bd8..515dd5513 100644
--- a/ports/qt5-3d/CONTROL
+++ b/ports/qt5-3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-3d
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake
index 96df50dd7..444fbbcf2 100644
--- a/ports/qt5-3d/portfile.cmake
+++ b/ports/qt5-3d/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qt3d 4c054b1075e976043fca5033a27be8a3f0d2df5dde5da4a536a9e7d61cdfd91007a2bf687bc19ad59724a2d53a9730b5d2446238bb7c6289d6a5dd3bf220a409)
+qt_modular_library(qt3d 679c2dbc60fc53c1c5469369f25244bd844c2e6e723a1b451f7cbb50bfa018e6fb715214e5a5df6fb32d7c7936bb6c99d85e299fe2b76344bcf774c93ed0acd0)
diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
index 486dbf518..60ca38370 100644
--- a/ports/qt5-activeqt/CONTROL
+++ b/ports/qt5-activeqt/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-activeqt
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 ActiveQt Module - ActiveX components
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake
index 9914ef6fd..1e63132d8 100644
--- a/ports/qt5-activeqt/portfile.cmake
+++ b/ports/qt5-activeqt/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtactiveqt ff2871a7c0fa2674354f8bbd32196d8b2af34212e09e0f8c1df23182353959464dfb8c96800e45dae380f239082f62ed6f1904e72dc93e43141edb4f2606edd9)
+qt_modular_library(qtactiveqt 477c42653a59739aeeb17ab54bdd5cc50bc72a117250926e940c34d3f81d1b92356074056fb49f3cd811a88840377836b2d97cea8cbc62ae1d895168e7860753)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/plugins/platforminputcontexts)
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index 7574d011d..8ad87a0ae 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-base
-Version: 5.12.1-4
+Version: 5.12.3-1
 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
 Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
diff --git a/ports/qt5-base/configure_qt.cmake b/ports/qt5-base/configure_qt.cmake
index 332c003ec..c39623562 100644
--- a/ports/qt5-base/configure_qt.cmake
+++ b/ports/qt5-base/configure_qt.cmake
@@ -9,7 +9,7 @@ function(configure_qt)
     get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-    set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
+    vcpkg_add_to_path("${PERL_EXE_PATH}")
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
         list(APPEND _csc_OPTIONS "-static")
@@ -24,46 +24,49 @@ function(configure_qt)
     else()
         set(CONFIGURE_BAT "configure")
     endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+        vcpkg_execute_required_process(
+            COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}
+                -debug
+                -prefix ${CURRENT_INSTALLED_DIR}/debug
+                -extprefix ${CURRENT_PACKAGES_DIR}/debug
+                -hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5
+                -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
+                -datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
+                -plugindir ${CURRENT_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
+                -platform ${_csc_PLATFORM}
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+            LOGNAME config-${TARGET_TRIPLET}-dbg
+        )
+        message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
+    endif()
 
-    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-    vcpkg_execute_required_process(
-        COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}
-            -debug
-            -prefix ${CURRENT_INSTALLED_DIR}/debug
-            -extprefix ${CURRENT_PACKAGES_DIR}/debug
-            -hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5
-            -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
-            -datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
-            -plugindir ${CURRENT_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
-            -platform ${_csc_PLATFORM}
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        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_INSTALLED_DIR}
-            -extprefix ${CURRENT_PACKAGES_DIR}
-            -hostbindir ${CURRENT_PACKAGES_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}
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME config-${TARGET_TRIPLET}-rel
-    )
-    message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        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_INSTALLED_DIR}
+                -extprefix ${CURRENT_PACKAGES_DIR}
+                -hostbindir ${CURRENT_PACKAGES_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}
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+            LOGNAME config-${TARGET_TRIPLET}-rel
+        )
+        message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
+    endif()
 
 endfunction()
diff --git a/ports/qt5-base/fix-gui-configure-json.patch b/ports/qt5-base/fix-gui-configure-json.patch
deleted file mode 100644
index 060fd0b3c..000000000
--- a/ports/qt5-base/fix-gui-configure-json.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 89934c8f..70d08177 100644
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -239,7 +239,8 @@
-             "sources": [
-                 { "type": "pkgConfig", "args": "freetype2" },
-                 { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
--                { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
-+                { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
-+                { "libs": "-lfreetype" }
-             ],
-             "use": [
-                 { "lib": "zlib", "condition": "features.system-zlib" }
-@@ -250,7 +251,7 @@
-             "test": {
-                 "tail": [
-                     "#ifndef FC_RGBA_UNKNOWN",
--                    "#  error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define",
-+                    "#  error This version of fontconfig is too old, it is missing the FC_RGBA_UNKNOWN define",
-                     "#endif"
-                 ],
-                 "main": [
-@@ -1436,7 +1437,7 @@
-         },
-         "eglfs_x11": {
-             "label": "EGLFS X11",
--            "condition": "features.eglfs && features.xcb && features.xcb-xlib && features.egl_x11",
-+            "condition": "features.eglfs && features.xcb-xlib && features.egl_x11",
-             "output": [ "privateFeature" ]
-         },
-         "gif": {
-@@ -1569,7 +1570,6 @@
-         },
-         "xcb-xlib": {
-             "label": "XCB Xlib",
--            "emitIf": "features.xcb",
-             "condition": "features.xlib && libs.xcb_xlib",
-             "output": [ "privateFeature" ]
-         },
diff --git a/ports/qt5-base/install_qt.cmake b/ports/qt5-base/install_qt.cmake
index 482802f38..4eed6cbe5 100644
--- a/ports/qt5-base/install_qt.cmake
+++ b/ports/qt5-base/install_qt.cmake
@@ -25,37 +25,56 @@ function(install_qt)
     endif()
     vcpkg_find_acquire_program(PYTHON3)
     get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
-    set(ENV{PATH} "${PYTHON3_EXE_PATH};$ENV{PATH}")
-    set(_path "$ENV{PATH}")
+    vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}")
 
-    message(STATUS "Package ${TARGET_TRIPLET}-dbg")
-    set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/debug/bin;${_path}")
-    vcpkg_execute_required_process(
-        COMMAND ${INVOKE}
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        LOGNAME build-${TARGET_TRIPLET}-dbg
-    )
-    vcpkg_execute_required_process(
-        COMMAND ${INVOKE} install
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        LOGNAME package-${TARGET_TRIPLET}-dbg
-    )
-    message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
+    if (CMAKE_HOST_WIN32)
+	# flex and bison for ANGLE library
+	vcpkg_find_acquire_program(FLEX)
+	get_filename_component(FLEX_EXE_PATH ${FLEX} DIRECTORY)
+	get_filename_component(FLEX_DIR ${FLEX_EXE_PATH} NAME)
+
+	file(COPY ${FLEX_EXE_PATH} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tools" )
+	set(FLEX_TEMP "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tools/${FLEX_DIR}")
+	file(RENAME "${FLEX_TEMP}/win_bison.exe" "${FLEX_TEMP}/bison.exe")
+	file(RENAME "${FLEX_TEMP}/win_flex.exe" "${FLEX_TEMP}/flex.exe")
+	vcpkg_add_to_path("${FLEX_TEMP}")
+   endif()
+
+   set(_path "$ENV{PATH}")
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        message(STATUS "Package ${TARGET_TRIPLET}-dbg")
+        vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin")
+        vcpkg_execute_required_process(
+            COMMAND ${INVOKE}
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+            LOGNAME build-${TARGET_TRIPLET}-dbg
+        )
+        vcpkg_execute_required_process(
+            COMMAND ${INVOKE} install
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+            LOGNAME package-${TARGET_TRIPLET}-dbg
+        )
+        message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
+    endif()
     
-    message(STATUS "Package ${TARGET_TRIPLET}-rel")
-    set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/bin;${_path}")
-    vcpkg_execute_required_process(
-        COMMAND ${INVOKE}
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME build-${TARGET_TRIPLET}-rel
-    )
-    vcpkg_execute_required_process(
-        COMMAND ${INVOKE} install
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME package-${TARGET_TRIPLET}-rel
-    )
-    message(STATUS "Package ${TARGET_TRIPLET}-rel done")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        message(STATUS "Package ${TARGET_TRIPLET}-rel")
+        set(ENV{PATH} "${_path}")
+        vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
+        vcpkg_execute_required_process(
+            COMMAND ${INVOKE}
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+            LOGNAME build-${TARGET_TRIPLET}-rel
+        )
+        vcpkg_execute_required_process(
+            COMMAND ${INVOKE} install
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+            LOGNAME package-${TARGET_TRIPLET}-rel
+        )
+        message(STATUS "Package ${TARGET_TRIPLET}-rel done")
+    endif()
     
     set(ENV{PATH} "${_path}")
     
-endfunction()
-\ No newline at end of file
+endfunction()
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 4b8869196..47d6ce2e7 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -1,224 +1,252 @@
-include(vcpkg_common_functions)
-
-string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
-if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
-    message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n"
-        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
-    )
-endif()
-
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-include(configure_qt)
-include(install_qt)
-
-set(MAJOR_MINOR 5.12)
-set(FULL_VERSION ${MAJOR_MINOR}.1)
-set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz")
-
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
-    FILENAME ${ARCHIVE_NAME}
-    SHA512 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25
-)
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE "${ARCHIVE_FILE}"
-    REF ${FULL_VERSION}
-    PATCHES
-        fix-gui-configure-json.patch
-)
-
-# Remove vendored dependencies to ensure they are not picked up by the build
-foreach(DEPENDENCY freetype zlib harfbuzzng libjpeg libpng double-conversion sqlite)
-    if(EXISTS ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
-        file(REMOVE_RECURSE ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
-    endif()
-endforeach()
-
-file(REMOVE_RECURSE ${SOURCE_PATH}/include/QtZlib)
-
-# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
-set(ENV{_CL_} "/utf-8")
-
-set(CORE_OPTIONS
-    -confirm-license
-    -opensource
-    -system-zlib
-    -system-libjpeg
-    -system-libpng
-    -system-freetype
-    -system-pcre
-    -system-doubleconversion
-    -system-sqlite
-    -system-harfbuzz
-    -no-fontconfig
-    -nomake examples
-    -nomake tests
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    list(APPEND CORE_OPTIONS
-        -static
-    )
-endif()
-
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    set(PLATFORM "win32-msvc")
-
-    configure_qt(
-        SOURCE_PATH ${SOURCE_PATH}
-        PLATFORM ${PLATFORM}
-        OPTIONS
-            ${CORE_OPTIONS}
-            -mp
-            -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop"
-        OPTIONS_RELEASE
-            LIBJPEG_LIBS="-ljpeg"
-            ZLIB_LIBS="-lzlib"
-            LIBPNG_LIBS="-llibpng16"
-            PSQL_LIBS="-llibpq"
-            PCRE2_LIBS="-lpcre2-16"
-            FREETYPE_LIBS="-lfreetype"
-        OPTIONS_DEBUG
-            LIBJPEG_LIBS="-ljpegd"
-            ZLIB_LIBS="-lzlibd"
-            LIBPNG_LIBS="-llibpng16d"
-            PSQL_LIBS="-llibpqd"
-            PCRE2_LIBS="-lpcre2-16d"
-            FREETYPE_LIBS="-lfreetyped"
-    )
-
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    configure_qt(
-        SOURCE_PATH ${SOURCE_PATH}
-        PLATFORM "linux-g++"
-        OPTIONS
-            ${CORE_OPTIONS}
-        OPTIONS_RELEASE
-            "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a"
-            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
-            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a"
-            "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a"
-            "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
-            "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a"
-            "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a -ldl -lpthread"
-            "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libsqlite3.a -ldl -lpthread"
-        OPTIONS_DEBUG
-            "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a"
-            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
-            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
-            "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
-            "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
-            "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libfreetyped.a"
-            "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.a ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a ${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a -ldl -lpthread"
-            "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libsqlite3.a -ldl -lpthread"
-    )
-
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-configure_qt(
-    SOURCE_PATH ${SOURCE_PATH}
-    PLATFORM "macx-clang"
-    OPTIONS
-        ${CORE_OPTIONS}
-    OPTIONS_RELEASE
-        "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a"
-        "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
-        "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a"
-        "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a"
-        "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
-        "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a"
-        "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a -ldl -lpthread"
-        "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libsqlite3.a -ldl -lpthread"
-        "HARFBUZZ_LIBS=${CURRENT_INSTALLED_DIR}/lib/libharfbuzz.a -framework ApplicationServices"
-    OPTIONS_DEBUG
-        "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a"
-        "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
-        "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
-        "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
-        "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
-        "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libfreetyped.a"
-        "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.a ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a ${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a -ldl -lpthread"
-        "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libsqlite3.a -ldl -lpthread"
-        "HARFBUZZ_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libharfbuzz.a -framework ApplicationServices"
-)
-endif()
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    install_qt(DISABLE_PARALLEL) # prevent race condition on Mac
-else()
-    install_qt()
-endif()
-
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
-
-file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
-list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
-file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
-file(REMOVE ${BINARY_TOOLS})
-file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*")
-list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
-file(REMOVE ${BINARY_TOOLS})
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
-
-vcpkg_execute_required_process( 
-    COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py
-    WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake
-    LOGNAME fix-cmake
-)
-
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5)
-
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
-    #---------------------------------------------------------------------------
-    # qtmain(d) vs. Qt5AxServer(d)
-    #---------------------------------------------------------------------------
-    # Qt applications have to either link to qtmain(d) or to Qt5AxServer(d),
-    # never both. See http://doc.qt.io/qt-5/activeqt-server.html for more info.
-    #
-    # Create manual-link folders:
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-    #
-    # Either have users explicitly link against qtmain.lib, qtmaind.lib:
-    file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-    file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl)
-    file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-    file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl)
-
-    #---------------------------------------------------------------------------
-    # Qt5Bootstrap: only used to bootstrap qmake dependencies
-    #---------------------------------------------------------------------------
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.lib)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.prl)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.lib ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.prl ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.prl)
-    #---------------------------------------------------------------------------
-endif()
-
-file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")
-file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
-file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
-foreach(PRL_FILE IN LISTS PRL_FILES)
-    file(READ "${PRL_FILE}" _contents)
-    string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
-    string(REPLACE "${CMAKE_DEBUG_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
-    file(WRITE "${PRL_FILE}" "${_contents}")
-endforeach()
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5core)
-
-file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION  ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-# 
-\ No newline at end of file
+include(vcpkg_common_functions)
+
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
+    message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+include(configure_qt)
+include(install_qt)
+
+set(MAJOR_MINOR 5.12)
+set(FULL_VERSION ${MAJOR_MINOR}.3)
+set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz")
+
+vcpkg_download_distfile(ARCHIVE_FILE
+    URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
+    FILENAME ${ARCHIVE_NAME}
+    SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
+)
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE "${ARCHIVE_FILE}"
+    REF ${FULL_VERSION}
+)
+
+# Remove vendored dependencies to ensure they are not picked up by the build
+foreach(DEPENDENCY freetype zlib harfbuzzng libjpeg libpng double-conversion sqlite)
+    if(EXISTS ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
+        file(REMOVE_RECURSE ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
+    endif()
+endforeach()
+
+file(REMOVE_RECURSE ${SOURCE_PATH}/include/QtZlib)
+
+# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
+set(ENV{_CL_} "/utf-8")
+
+set(CORE_OPTIONS
+    -confirm-license
+    -opensource
+    -system-zlib
+    -system-libjpeg
+    -system-libpng
+    -system-freetype
+    -system-pcre
+    -system-doubleconversion
+    -system-sqlite
+    -system-harfbuzz
+    -no-fontconfig
+    -nomake examples
+    -nomake tests
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    list(APPEND CORE_OPTIONS
+        -static
+    )
+endif()
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(PLATFORM "win32-msvc")
+
+    configure_qt(
+        SOURCE_PATH ${SOURCE_PATH}
+        PLATFORM ${PLATFORM}
+        OPTIONS
+            ${CORE_OPTIONS}
+            -mp
+            -opengl dynamic # other options are "-no-opengl", "-opengl angle", and "-opengl desktop"
+        OPTIONS_RELEASE
+            LIBJPEG_LIBS="-ljpeg"
+            ZLIB_LIBS="-lzlib"
+            LIBPNG_LIBS="-llibpng16"
+            PSQL_LIBS="-llibpq"
+            PCRE2_LIBS="-lpcre2-16"
+            FREETYPE_LIBS="-lfreetype"
+        OPTIONS_DEBUG
+            LIBJPEG_LIBS="-ljpegd"
+            ZLIB_LIBS="-lzlibd"
+            LIBPNG_LIBS="-llibpng16d"
+            PSQL_LIBS="-llibpqd"
+            PCRE2_LIBS="-lpcre2-16d"
+            FREETYPE_LIBS="-lfreetyped"
+    )
+
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    configure_qt(
+        SOURCE_PATH ${SOURCE_PATH}
+        PLATFORM "linux-g++"
+        OPTIONS
+            ${CORE_OPTIONS}
+        OPTIONS_RELEASE
+            "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a"
+            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
+            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a"
+            "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a"
+            "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
+            "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a"
+            "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a -ldl -lpthread"
+            "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libsqlite3.a -ldl -lpthread"
+        OPTIONS_DEBUG
+            "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a"
+            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
+            "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
+            "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
+            "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
+            "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libfreetyped.a"
+            "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.a ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a ${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a -ldl -lpthread"
+            "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libsqlite3.a -ldl -lpthread"
+    )
+
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+configure_qt(
+    SOURCE_PATH ${SOURCE_PATH}
+    PLATFORM "macx-clang"
+    OPTIONS
+        ${CORE_OPTIONS}
+    OPTIONS_RELEASE
+        "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a"
+        "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
+        "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a"
+        "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a"
+        "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpng16.a"
+        "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a"
+        "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a -ldl -lpthread"
+        "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libsqlite3.a -ldl -lpthread"
+        "HARFBUZZ_LIBS=${CURRENT_INSTALLED_DIR}/lib/libharfbuzz.a -framework ApplicationServices"
+    OPTIONS_DEBUG
+        "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a"
+        "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
+        "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
+        "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a"
+        "LIBPNG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a"
+        "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libfreetyped.a"
+        "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.a ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a ${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a -ldl -lpthread"
+        "SQLITE_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libsqlite3.a -ldl -lpthread"
+        "HARFBUZZ_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libharfbuzz.a -framework ApplicationServices"
+)
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    install_qt(DISABLE_PARALLEL) # prevent race condition on Mac
+else()
+    install_qt()
+endif()
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
+    list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
+    file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
+    file(REMOVE ${BINARY_TOOLS})
+
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
+endif()
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*")
+    list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
+    file(REMOVE ${BINARY_TOOLS})
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+    endif()
+
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
+endif()
+
+vcpkg_execute_required_process(
+    COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py
+    WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake
+    LOGNAME fix-cmake
+)
+
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5)
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
+    #---------------------------------------------------------------------------
+    # qtmain(d) vs. Qt5AxServer(d)
+    #---------------------------------------------------------------------------
+    # Qt applications have to either link to qtmain(d) or to Qt5AxServer(d),
+    # never both. See http://doc.qt.io/qt-5/activeqt-server.html for more info.
+    #
+    # Create manual-link folders:
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+    endif()
+    #
+    # Either have users explicitly link against qtmain.lib, qtmaind.lib:
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+        file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+        file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
+        file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl)
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+        file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+        file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib)
+        file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl)
+    endif()
+
+    #---------------------------------------------------------------------------
+    # Qt5Bootstrap: only used to bootstrap qmake dependencies
+    #---------------------------------------------------------------------------
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.lib)
+        file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.prl)
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.lib ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.prl ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.prl)
+    endif()
+    #---------------------------------------------------------------------------
+endif()
+
+file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
+endif()
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
+endif()
+foreach(PRL_FILE IN LISTS PRL_FILES)
+    file(READ "${PRL_FILE}" _contents)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        string(REPLACE "${CMAKE_DEBUG_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
+    endif()
+    file(WRITE "${PRL_FILE}" "${_contents}")
+endforeach()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins)
+endif()
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins)
+endif()
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5core)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION  ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+#
diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake
index 6b5727755..8e00aaca7 100644
--- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake
+++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake
@@ -1,66 +1,66 @@
-_find_package(${ARGS})
-
-function(add_qt_library _target)
-    foreach(_lib IN LISTS ARGN)
-        find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES plugins/platforms)
-        find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} PATH_SUFFIXES plugins/platforms)
-        set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
-        \$<\$<NOT:\$<CONFIG:DEBUG>>:${${_lib}_LIBRARY_RELEASE}>\$<\$<CONFIG:DEBUG>:${${_lib}_LIBRARY_DEBUG}>)
-    endforeach()
-endfunction()
-
-get_target_property(_target_type Qt5::Core TYPE)
-if("${_target_type}" STREQUAL "STATIC_LIBRARY")
-    find_package(ZLIB)
-    find_package(JPEG)
-    find_package(PNG)
-    find_package(Freetype)
-    find_package(sqlite3 CONFIG)
-    find_package(PostgreSQL MODULE REQUIRED)
-    find_package(double-conversion CONFIG)
-    find_package(OpenSSL)
-    find_package(harfbuzz CONFIG)
-
-    set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
-        ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz
-        ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto  
-    )
-
-    add_qt_library(Qt5::Core 
-        pcre2-16 
-        Qt5ThemeSupport
-        Qt5EventDispatcherSupport
-        Qt5PlatformCompositorSupport 
-        Qt5FontDatabaseSupport)
-
-    if(MSVC)
-       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
-           Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib)
-
-      add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d)
-
-    elseif(APPLE)
-       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES           
-            "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" 
-            "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" 
-            "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration"
-            "-weak_framework Carbon"
-            "-weak_framework QuartzCore"
-            "-weak_framework CoreVideo"
-            "-weak_framework Metal"
-            "-weak_framework CoreText"
-            "-weak_framework ApplicationServices"
-            "-weak_framework CoreGraphics"
-            "-weak_framework OpenGL"
-            "-weak_framework AGL"
-            "-weak_framework ImageIO" 
-            "z" "m"
-            cups)
-        add_qt_library(Qt5::Core 
-            Qt5GraphicsSupport
-            Qt5ClipboardSupport
-            Qt5AccessibilitySupport
-            qcocoa)
-    endif()
-
-endif()
+_find_package(${ARGS})
+
+function(add_qt_library _target)
+    foreach(_lib IN LISTS ARGN)
+        find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES debug/plugins/platforms)
+        find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} PATH_SUFFIXES plugins/platforms)
+        set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+        \$<\$<NOT:\$<CONFIG:DEBUG>>:${${_lib}_LIBRARY_RELEASE}>\$<\$<CONFIG:DEBUG>:${${_lib}_LIBRARY_DEBUG}>)
+    endforeach()
+endfunction()
+
+get_target_property(_target_type Qt5::Core TYPE)
+if("${_target_type}" STREQUAL "STATIC_LIBRARY")
+    find_package(ZLIB)
+    find_package(JPEG)
+    find_package(PNG)
+    find_package(Freetype)
+    find_package(sqlite3 CONFIG)
+    find_package(PostgreSQL MODULE REQUIRED)
+    find_package(double-conversion CONFIG)
+    find_package(OpenSSL)
+    find_package(harfbuzz CONFIG)
+
+    set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+        ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz
+        ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto
+    )
+
+    add_qt_library(Qt5::Core
+        pcre2-16
+        Qt5ThemeSupport
+        Qt5EventDispatcherSupport
+        Qt5PlatformCompositorSupport
+        Qt5FontDatabaseSupport)
+
+    if(MSVC)
+       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+           Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib)
+
+      add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d)
+
+    elseif(APPLE)
+       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+            "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices"
+            "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices"
+            "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration"
+            "-weak_framework Carbon"
+            "-weak_framework QuartzCore"
+            "-weak_framework CoreVideo"
+            "-weak_framework Metal"
+            "-weak_framework CoreText"
+            "-weak_framework ApplicationServices"
+            "-weak_framework CoreGraphics"
+            "-weak_framework OpenGL"
+            "-weak_framework AGL"
+            "-weak_framework ImageIO"
+            "z" "m"
+            cups)
+        add_qt_library(Qt5::Core
+            Qt5GraphicsSupport
+            Qt5ClipboardSupport
+            Qt5AccessibilitySupport
+            qcocoa)
+    endif()
+
+endif()
diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL
index 0b5964bb3..672aaf2d1 100644
--- a/ports/qt5-charts/CONTROL
+++ b/ports/qt5-charts/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-charts
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-charts/portfile.cmake b/ports/qt5-charts/portfile.cmake
index cb3c99d2a..0d7b7f170 100644
--- a/ports/qt5-charts/portfile.cmake
+++ b/ports/qt5-charts/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtcharts 1915581f9cd644e0c6d9d38f5881ce388437ab1fa45554c01625ffd5c51067188450ff9329ccfcab17222389876658bd1e4595a426e75ef637311888451cfcd2)
+qt_modular_library(qtcharts f5940589c7a2dc5fcd3484397613f13ab41311c8ffb70a3484e64dc5bad24e18c94c9ebbe6716c1ec7c81b7863113ebfdb593f2d194608b2e3fb0b0b5c9c9102)
diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL
index 45319857c..741af6767 100644
--- a/ports/qt5-connectivity/CONTROL
+++ b/ports/qt5-connectivity/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-connectivity
-Version: 5.12.0
+Version: 5.12.3
 Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-connectivity/portfile.cmake b/ports/qt5-connectivity/portfile.cmake
index 91e15366a..5cc8777e5 100644
--- a/ports/qt5-connectivity/portfile.cmake
+++ b/ports/qt5-connectivity/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtconnectivity 89a16da0bb958da3123a2cebec45b954b034b2a586490c8217769e2e0f22080676e57f847c9a6622ea2129f539ac8732e0968f38517236c9880ff9b715492ede)
+qt_modular_library(qtconnectivity 4da406d88c3cf216d53c524d3896f50b19dae124baec904233dbb67163a30a955dee29148b5f5b71c35cb28638912423bb1cf4d38c62aeefa7353bd29e97a269)
diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL
index 2b6627465..5ef4728df 100644
--- a/ports/qt5-datavis3d/CONTROL
+++ b/ports/qt5-datavis3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-datavis3d
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-datavis3d/portfile.cmake b/ports/qt5-datavis3d/portfile.cmake
index 4927f7007..cc9df8c4a 100644
--- a/ports/qt5-datavis3d/portfile.cmake
+++ b/ports/qt5-datavis3d/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtdatavis3d a0eff0f58515720d9c8e37bce16a3f6f719ca748c6228f183eb7e2fe2cc024195e5122cc29b9d0dba3319a9d6147105c0b253fb5e633e16db1fb20cca563d956)
+qt_modular_library(qtdatavis3d cb295deb9aa33132294d7d7f4daaa53dd9ab4815e2d3a2c916d88e1882e018a49d8d66db9088f69375d8da759a3f3566f251802aaba82d74cad2eb45d9bbbcff)
diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL
index 87b5a8da0..1ef033d17 100644
--- a/ports/qt5-declarative/CONTROL
+++ b/ports/qt5-declarative/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-declarative
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake
index adda51330..badeab882 100644
--- a/ports/qt5-declarative/portfile.cmake
+++ b/ports/qt5-declarative/portfile.cmake
@@ -2,6 +2,11 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtdeclarative e06032da5c1c151200215f55728b9ce0fac299076f0ca3150143525a56bcce15eb72f6aa982b439e3920d1cd7a30468b3f0913f135d644ecda277d763fb5e1b5)
+qt_modular_library(qtdeclarative 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts)
-\ No newline at end of file
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts)
+
+set(qt5decpath ${CURRENT_PACKAGES_DIR}/share/qt5/debug/mkspecs/modules/qt_lib_qmldevtools_private.pri)
+file(READ "${qt5decpath}" _contents)
+string(REPLACE [[QT.qmldevtools_private.libs = $$QT_MODULE_HOST_LIB_BASE]] [[QT.qmldevtools_private.libs = $$QT_MODULE_LIB_BASE]]  _contents "${_contents}")
+file(WRITE "${qt5decpath}" "${_contents}")
+\ No newline at end of file
diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL
index 323bf6747..741c249cd 100644
--- a/ports/qt5-gamepad/CONTROL
+++ b/ports/qt5-gamepad/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-gamepad
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-gamepad/portfile.cmake b/ports/qt5-gamepad/portfile.cmake
index 7967f7f41..71bc35517 100644
--- a/ports/qt5-gamepad/portfile.cmake
+++ b/ports/qt5-gamepad/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtgamepad 5e5f2c06103493880793f94aa062b1eccccbe0f53ded457969a0d77e864cee31759267a19edc68f3a015e261b84727f34b991b4a6b3c838600a68b030e77fa1e)
+qt_modular_library(qtgamepad fd4902b11021eb6b28b5d6e31e9857ddaace6de05106c665fa429223033e28f187ede5deaec6a7e27588c5db4fb1cc250a936f2ee2cadb24f1df31ddfc4b3123)
diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL
index 3e4fadbe8..71250701b 100644
--- a/ports/qt5-graphicaleffects/CONTROL
+++ b/ports/qt5-graphicaleffects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-graphicaleffects
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 GraphicalEffects Module.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-graphicaleffects/portfile.cmake b/ports/qt5-graphicaleffects/portfile.cmake
index 2ea131939..c639e4668 100644
--- a/ports/qt5-graphicaleffects/portfile.cmake
+++ b/ports/qt5-graphicaleffects/portfile.cmake
@@ -4,4 +4,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtgraphicaleffects f7c93fa9b33a4096d5a150a6db984400daecc0ee16203402f1d465fddd288a9ea55625fcbd4ccd4c0b8addaa458d7955244b076a9c6c13a83d7c61c6029ddd81)
+qt_modular_library(qtgraphicaleffects 3c5e6d7dc51a92d48cce8424ab1fe60ee75b71ebe2e6bb22e719a35bdaf2210b03f90ac066569f5c086ed67ed1463510625307328299310fad7c587e9fd8b385)
diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL
index bfb362834..7033b42c5 100644
--- a/ports/qt5-imageformats/CONTROL
+++ b/ports/qt5-imageformats/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-imageformats
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake
index 001661111..1d66c9a23 100644
--- a/ports/qt5-imageformats/portfile.cmake
+++ b/ports/qt5-imageformats/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtimageformats 1514c5d7a285d718fdf1f3ba11f00029551af70e8b7bd927e061c55a35fca6978164da2846f26b6d57a4c81af2a75eb3f8358f46fa74bd70ba3407aa3bbcb0e5)
+qt_modular_library(qtimageformats 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc)
 
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL
index fd647d83b..b881c1fae 100644
--- a/ports/qt5-location/CONTROL
+++ b/ports/qt5-location/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-location
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake
index 1fde2fa48..55e7b23ce 100644
--- a/ports/qt5-location/portfile.cmake
+++ b/ports/qt5-location/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtlocation 08dceeef8681b1266763197d8d4cab1d2ae8e8d0b62ae50ab44c64698588652d6ecf976b8f0095fa33b3a93b66b43fd4acbde4ebc47af8bdd79ce708c4237ed2)
+qt_modular_library(qtlocation 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082)
diff --git a/ports/qt5-macextras/CONTROL b/ports/qt5-macextras/CONTROL
index 8344c9240..e0c686414 100644
--- a/ports/qt5-macextras/CONTROL
+++ b/ports/qt5-macextras/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-macextras
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-macextras/portfile.cmake b/ports/qt5-macextras/portfile.cmake
index ed8e2bb5b..a833541d9 100644
--- a/ports/qt5-macextras/portfile.cmake
+++ b/ports/qt5-macextras/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtmacextras 0d307b85e09fd97f36c5ee333297ceda4c709f6dc995dba4e8b8c1a85bd95c83ed80ee641e13e05fe3b965060c7847ba1835b7e6d9099a03c8bf9f2c4bae1ded)
+qt_modular_library(qtmacextras 56887c2a2d20c41a133af87aec8975e17c6335ffc51093f23a904e02a78f59a8117c7932827ca5dd33f538360e6fd9cfc9d0091c6f4c1e0b96528b5324c74033)
diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL
index f8e6f4894..4dc0032f9 100644
--- a/ports/qt5-modularscripts/CONTROL
+++ b/ports/qt5-modularscripts/CONTROL
@@ -1,3 +1,3 @@
-Source: qt5-modularscripts
-Version: 2019-03-21
-Description: Vcpkg helpers to package qt5 modules
+Source: qt5-modularscripts
+Version: 2019-04-30
+Description: Vcpkg helpers to package qt5 modules
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake
index 9f6d23fa1..dd3abb94f 100644
--- a/ports/qt5-modularscripts/qt_modular_library.cmake
+++ b/ports/qt5-modularscripts/qt_modular_library.cmake
@@ -9,7 +9,7 @@ function(qt_modular_fetch_library NAME HASH TARGET_SOURCE_PATH)
     endif()
 
     set(MAJOR_MINOR 5.12)
-    set(FULL_VERSION ${MAJOR_MINOR}.1)
+    set(FULL_VERSION ${MAJOR_MINOR}.3)
     set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz")
 
     vcpkg_download_distfile(ARCHIVE_FILE
@@ -86,8 +86,12 @@ function(qt_modular_build_library SOURCE_PATH)
     endif()
 
     file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")
-    file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
-    file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
+    endif()
     foreach(PRL_FILE IN LISTS PRL_FILES)
         file(READ "${PRL_FILE}" _contents)
         string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
@@ -106,7 +110,9 @@ function(qt_modular_build_library SOURCE_PATH)
 
     #Move release and debug dlls to the correct directory
     if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+        file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT})    
+    endif()
+    if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/tools/qt5)
         file(RENAME ${CURRENT_PACKAGES_DIR}/debug/tools/qt5 ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT})
     endif()
 
@@ -126,9 +132,13 @@ function(qt_modular_build_library SOURCE_PATH)
         file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools)
     endif()
 
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qt5/debug/include)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qt5/debug/include)
+    endif()
 
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+    endif()
 
     #Find the relevant license file and install it
     if(EXISTS "${SOURCE_PATH}/LICENSE.LGPLv3")
diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL
index 0b99078fb..87da5cd92 100644
--- a/ports/qt5-mqtt/CONTROL
+++ b/ports/qt5-mqtt/CONTROL
@@ -1,5 +1,4 @@
 Source: qt5-mqtt
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 MQTT module.
 Build-Depends: qt5-modularscripts, qt5-base
-
diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake
index 8c797abb0..e9b8c3c75 100644
--- a/ports/qt5-mqtt/portfile.cmake
+++ b/ports/qt5-mqtt/portfile.cmake
@@ -5,8 +5,8 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmak
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO qt/qtmqtt
-    REF v5.12.1
-    SHA512 c6f4000a032caaf5224ca6fe2442f22eddc26e3e53cc101885c717b706156cada716e45ff92d267928b87e1e5ceae5e81694f4b7c289d9836e75f27fd012de42
+    REF cf41d84738f0ed0c779f75db94d413ad938fb901
+    SHA512 e9a818999e4befb0b945d609a1ee28a3e2d7e3b6d8c12ab82ae827fdb8f6bf5e8b82114c1850438d634fa24c9ac608ebae1d461385bd4e088f8cabf7eec0182c
     HEAD_REF dev
 )
 
diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL
index 25f96138b..cdc7e20c7 100644
--- a/ports/qt5-multimedia/CONTROL
+++ b/ports/qt5-multimedia/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-multimedia
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake
index 77aee6d10..d6292a1ba 100644
--- a/ports/qt5-multimedia/portfile.cmake
+++ b/ports/qt5-multimedia/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtmultimedia cdf9161648abd9f6c6d20171a75e9edefd77a46e946263f7e22e9f2ae69a55132688c31e46378cdc74c3bdf528fd94383b7e3b20bd8befa485a02cabb398dea0)
+qt_modular_library(qtmultimedia 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963)
diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL
index b4653798f..241e52cdc 100644
--- a/ports/qt5-networkauth/CONTROL
+++ b/ports/qt5-networkauth/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-networkauth
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Network Authorization Module
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake
index 40fda857c..ef4e63989 100644
--- a/ports/qt5-networkauth/portfile.cmake
+++ b/ports/qt5-networkauth/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtnetworkauth 219117019cb98b87a84d351aa6b5479f3fa220c82fd4ff7409d2003c79402ead21454dcd1280be4db78b77045707dfa0fbbdefc738b9ac1142bf338a67447c60)
+qt_modular_library(qtnetworkauth 07bf159360fe126c23387c6ed5b955218771ac37848ddb83542733c786b415f9aa5c22fd4a965fff591869d2d819bba420b69718e487df3cce382f411f493142)
diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL
index 0c2df22e9..14a21138a 100644
--- a/ports/qt5-purchasing/CONTROL
+++ b/ports/qt5-purchasing/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-purchasing
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-purchasing/portfile.cmake b/ports/qt5-purchasing/portfile.cmake
index 3ea4b192c..c172817df 100644
--- a/ports/qt5-purchasing/portfile.cmake
+++ b/ports/qt5-purchasing/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtpurchasing 655283a32f02a4a5bb8b890081fa1276e1a0c1396f50bb5c8ea849b55a60d8dde368f05072ab786fb8bb14cc41be8394d635bf4af791f2ef289796e04395dbb6)
+qt_modular_library(qtpurchasing 3069ece2083d0661a3599c631cf0832a80e01262b5858ffd407bc0d80e35711f2f973b2c085b6dd5539f3ec26004c684df99d477e58ab62da63d705a8a5616c9)
diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL
index 8b0552337..287daebe1 100644
--- a/ports/qt5-quickcontrols/CONTROL
+++ b/ports/qt5-quickcontrols/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 QuickControls Module.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-quickcontrols/portfile.cmake b/ports/qt5-quickcontrols/portfile.cmake
index ac74db9d5..bb4aa8a66 100644
--- a/ports/qt5-quickcontrols/portfile.cmake
+++ b/ports/qt5-quickcontrols/portfile.cmake
@@ -4,4 +4,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtquickcontrols 2275a9f0e3ddf7a4f42de5608b01686bf7faabe52c70dfae66ccdc7ab1283962aecb58481b42afbc5244d3abef56846bfabd9ed5229debe55d9f96cd88d16623)
+qt_modular_library(qtquickcontrols 23410fb82088591a8bed7e8e4127d13929a03adc0dfd18f7e2f906acdac21f7dcbb15cb2257272b893d937bbb54860992667c11aa0c6157d4a3b871616c4641c)
diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL
index 027cb6e71..01f94c4c0 100644
--- a/ports/qt5-quickcontrols2/CONTROL
+++ b/ports/qt5-quickcontrols2/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols2
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 QuickControls2 Module.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-quickcontrols2/portfile.cmake b/ports/qt5-quickcontrols2/portfile.cmake
index 845a4c852..6b65b022f 100644
--- a/ports/qt5-quickcontrols2/portfile.cmake
+++ b/ports/qt5-quickcontrols2/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtquickcontrols2 fecbde2d38e7b9d18c0cfba8a724bba43d92702b8fb7c15b589a47e584f6023e498b1fb81a864835dbfdf38af6ee20ce9965f233df497a0639aceb87e8c1b123)
+qt_modular_library(qtquickcontrols2 afc1ae9a5a046845b085d5cf0019b79d99914a2d285676bd4d8966f1302513078c8279b71134281c03b2c1209295bca438b9e255774574520498b0b5385bad27)
diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL
index bea95b4ae..e1e9df450 100644
--- a/ports/qt5-remoteobjects/CONTROL
+++ b/ports/qt5-remoteobjects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-remoteobjects
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-remoteobjects/portfile.cmake b/ports/qt5-remoteobjects/portfile.cmake
index 7a238ebcf..8d2d45a6e 100644
--- a/ports/qt5-remoteobjects/portfile.cmake
+++ b/ports/qt5-remoteobjects/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtremoteobjects 9b4222c6336374387aa5c5021833b4b12d4ab76f4af3a5f843ce2abca090a6af299b37d34b86bfc46e5ed8e54e50d8abc6804f88c8843327f90795c06a37ca0d)
+qt_modular_library(qtremoteobjects f01b9497dab7e5db24f090d227fca5703a50b5065ad6c0798b78e83b41c374a04eb2857ffaf0225071791c9bb6b8703e37e47d31bf905fa819395b4d69819178)
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL
index b47aa9798..e27e24b57 100755
--- a/ports/qt5-script/CONTROL
+++ b/ports/qt5-script/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-script
-Version: 5.12.1
+Version: 5.12.3
 Build-Depends: qt5-base, qt5-modularscripts
 Description:Qt5 Script Module.
diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake
index b4e40355b..0d2a8418d 100755
--- a/ports/qt5-script/portfile.cmake
+++ b/ports/qt5-script/portfile.cmake
@@ -2,4 +2,4 @@
 include(vcpkg_common_functions)
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtscript 1fe7d0582e6c61fd146d66080bc91b40a6a2bda9b6bdb983339276b1aebb6f3c24070fc5acb2fd90556c11d51708c7bc75542532097b7f4f381b13dadaec5c9e)
+qt_modular_library(qtscript 4c4498acb39536bdc03643fb1717c7a47c82b1734cf67d17d40bc216084f01e837648d261f7f69e317387f9c6efa9aaa6b0df8f5532f55615252c95b1089ca1a)
diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL
index 216fd3fd1..b61ed5922 100644
--- a/ports/qt5-scxml/CONTROL
+++ b/ports/qt5-scxml/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-scxml
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-scxml/portfile.cmake b/ports/qt5-scxml/portfile.cmake
index 51c855271..860e25246 100644
--- a/ports/qt5-scxml/portfile.cmake
+++ b/ports/qt5-scxml/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtscxml 3bfb08eb8506ca1076a594fb48b09360d258ecf26596045d2bff8702ad1ac0d0cc16dbc5e4528bf2a0fc1fad93c44f5cf34dc86e4d1243764a49a56f99985501)
+qt_modular_library(qtscxml d515506d90ace5eedfe8bf3439dad0853dbbdbd36dfb509dfa13e3358838353de66d5f6245afe4eeebd19dd3f0ab0ce5e4c3e6fe5d40e5ab46763c453a562a49)
diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL
index 55d620ee1..f0bceb31c 100644
--- a/ports/qt5-sensors/CONTROL
+++ b/ports/qt5-sensors/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-sensors
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-sensors/portfile.cmake b/ports/qt5-sensors/portfile.cmake
index 1a90f5486..3af798117 100644
--- a/ports/qt5-sensors/portfile.cmake
+++ b/ports/qt5-sensors/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtsensors 437c8fce62b4fde138a7927ae494526852a63c2c9a392aaa5f79da6b9ec134e54b17dcd908e5cd7d12474dd112672e0a6a478a307cf716cce9fed67937da3fdc)
+qt_modular_library(qtsensors cf0c8c58bbb84debd6b464bd9b91af7e79a301031613b8a2d0715fa276573dafea0a1c8e472fa2a2d4debd9b26f86a5e6efa9a8d57f7ab9102b1314d609579e5)
diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL
index 7f725ffab..8e2572300 100644
--- a/ports/qt5-serialport/CONTROL
+++ b/ports/qt5-serialport/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-serialport
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-serialport/portfile.cmake b/ports/qt5-serialport/portfile.cmake
index 019ed1b17..0c2a0f116 100644
--- a/ports/qt5-serialport/portfile.cmake
+++ b/ports/qt5-serialport/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtserialport c917e08f417677fb16058c4be95c20dcd5881f41daf6033b864f725b259bfa38ab07a993a6a19f26574f1b662116aaceea26965cd1d2a5df7465e2bda495e7ff)
+qt_modular_library(qtserialport 42551b74abe1fcaa1972fb1134215987d7c1d0fe73874a4c6ad5b9aadad71a2066a1846c297569bb1562f94e54a406e8074d444deca510a566e27cd386b47ecf)
diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL
index 336601da2..cbc841086 100644
--- a/ports/qt5-speech/CONTROL
+++ b/ports/qt5-speech/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-speech
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Speech Module
 Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows)
diff --git a/ports/qt5-speech/portfile.cmake b/ports/qt5-speech/portfile.cmake
index 61dfc802a..f4402508d 100644
--- a/ports/qt5-speech/portfile.cmake
+++ b/ports/qt5-speech/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtspeech 321f6dafe0751af1e9cb5bd32f340ae445d2d148a8d2060bd5bd65d034f242547a79667253a4d1e220ccd4f59ea36a7fbe1b50093f36e2017b872f2b858050d2)
+qt_modular_library(qtspeech 9623a83cdfbed07dffcd8f0808c2a514c97fda72b68827d917f1a8ee3072286ef8bce06b114db94d7a0c3fc79425c2540fa5cadc6551367fd4431e5396395932)
diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL
index 8a199f1c7..9970a6fc0 100644
--- a/ports/qt5-svg/CONTROL
+++ b/ports/qt5-svg/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-svg
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake
index 091afa59b..a8379b131 100644
--- a/ports/qt5-svg/portfile.cmake
+++ b/ports/qt5-svg/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtsvg c09da58bb901546fa8f408528ed25c9cc57d2bda35e56112eab08a08bf8fdb06cdaed1995d46d6baa08cab8660a3661be3dfa51754cc55e4fab96f7c90533ea3)
+qt_modular_library(qtsvg 23517dbdc30d7128fcbeb12a301eeeb300424bb17bc0d156d5e9298c092d3d3afd2cba45768f2512e58977ee2408450f50c385e03a47ccaf3ff6bc7e4fddf61a)
diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL
index 492bf89fc..502635783 100644
--- a/ports/qt5-tools/CONTROL
+++ b/ports/qt5-tools/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-tools
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake
index e430e4e95..a563767da 100644
--- a/ports/qt5-tools/portfile.cmake
+++ b/ports/qt5-tools/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qttools e3ae1974f0b20bad1b86d038c3585753183b8c24c133393e3ecf65a0487402ad8dcf8147bf263e9a4c2d3abef1b706981943fcf5268726e424f1b61f69ce4f2e)
+qt_modular_library(qttools d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/plugins/platforminputcontexts)
 \ No newline at end of file
diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL
index 3b21a1c6d..20b745844 100644
--- a/ports/qt5-virtualkeyboard/CONTROL
+++ b/ports/qt5-virtualkeyboard/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-virtualkeyboard
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-virtualkeyboard/portfile.cmake b/ports/qt5-virtualkeyboard/portfile.cmake
index 342fd6a5a..4d8310f7a 100644
--- a/ports/qt5-virtualkeyboard/portfile.cmake
+++ b/ports/qt5-virtualkeyboard/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtvirtualkeyboard 17f85982bb7d39784b5a85fba7758d3c032c158ca453c30255ec03e5e61dc8bbcbcbc58afe8f43bcf0297bb00d4e8606f553501bde68252d097d7bb32af9d24f)
+qt_modular_library(qtvirtualkeyboard 1aa00fec7e333e4fd52891b82c239b532cf41657d9c3f44c6cc1c211a1412dbf5584823511e54f3feb33b3fed9c6e0171b55afde2df9f0a358e2e4885e1b2686)
 
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL
index 85edc4b81..64945edba 100644
--- a/ports/qt5-webchannel/CONTROL
+++ b/ports/qt5-webchannel/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-webchannel
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-webchannel/portfile.cmake b/ports/qt5-webchannel/portfile.cmake
index f1b5ccd16..a453326c5 100644
--- a/ports/qt5-webchannel/portfile.cmake
+++ b/ports/qt5-webchannel/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwebchannel 71f2eb4b808e5892d246bafa289f7a4464e9705d568ceb01443b787d2eade8ee9bd20eef46900ba6fa2b251e7e15aebb7564e854360a3ad70992ad17cc1f9751)
+qt_modular_library(qtwebchannel 2dda4351f5f3a5895a955d0ee77e55f758233672005a068d3e840a01d379727f99287fc6c8fb96516f23a5a8c4ebcb61098690fd3351e79be608e28657534006)
diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL
index f3ed649a9..e2cae414c 100644
--- a/ports/qt5-websockets/CONTROL
+++ b/ports/qt5-websockets/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-websockets
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-websockets/portfile.cmake b/ports/qt5-websockets/portfile.cmake
index 8aa9cc9ed..88cc1fd9a 100644
--- a/ports/qt5-websockets/portfile.cmake
+++ b/ports/qt5-websockets/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwebsockets 4239563f05d65e85d2c46f24b3757e7fcfb119a2c9af0b221b321702f7849a4af05da1fdc1e77c0098df40af231ed781be5ead9361bae3dbf2c7808043601577)
+qt_modular_library(qtwebsockets 212a98d987b4fd16216ac9a1c98e061be6a5bd2e2c4ec8be80424d6f23afeace790fe666abe8a11e2116dc20f17a41ad0c817fceacdfa5f766b93068ac614817)
diff --git a/ports/qt5-webview/CONTROL b/ports/qt5-webview/CONTROL
index fda869331..e0816259a 100644
--- a/ports/qt5-webview/CONTROL
+++ b/ports/qt5-webview/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-webview
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.
 Build-Depends: qt5-base, qt5-modularscripts, qt5-declarative
diff --git a/ports/qt5-webview/portfile.cmake b/ports/qt5-webview/portfile.cmake
index df9f90c0a..813c5601b 100644
--- a/ports/qt5-webview/portfile.cmake
+++ b/ports/qt5-webview/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwebview 27e1904570678691e26831e87953e47d6b707bfe0504cde112ad6c8c18ea163eb83d90f8d4dbbf73873caee827e486691bb73e16a4c8b9e522bbeffbb68e9973)
+qt_modular_library(qtwebview 426227b9b4cb61c0e88958dbaab21e842a25989098a0e94a06fe3efc8a2b9d4a5d3216296c8228da977ef52cd5844b66048bcb84019da4f06de1b1009dfdffa5)
diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL
index 0ed5317d2..97c443d8c 100644
--- a/ports/qt5-winextras/CONTROL
+++ b/ports/qt5-winextras/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-winextras
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.
 Build-Depends: qt5-modularscripts, qt5-base, atlmfc
diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake
index 64f112bbd..f0890bfaf 100644
--- a/ports/qt5-winextras/portfile.cmake
+++ b/ports/qt5-winextras/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwinextras 2adf2849359ed97724256ba2ce7492f6820c92e898142683b696be0af5393d8af26b5af3d827c25e9027e77f95eb7f12ebb2be22a5d4c99e645c65a7fd7fe0e6)
+qt_modular_library(qtwinextras e50cb237359ce7a3bde6989ec4349fe67be3b4999092516e891bba12f0fb4acb9954de8e2f0171db0e849b7d3ef94bd80f77f81162afb239e49c6e2e0760343b)
diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL
index 04b00a415..917615922 100644
--- a/ports/qt5-xmlpatterns/CONTROL
+++ b/ports/qt5-xmlpatterns/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-xmlpatterns
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake
index bd39b03f8..c92a6057b 100644
--- a/ports/qt5-xmlpatterns/portfile.cmake
+++ b/ports/qt5-xmlpatterns/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtxmlpatterns 2a75b6fdbe07317ce91b69e0fc9abe39899b5c48885033f734c0d018115762e7558723ae0fcb5ad5a2266a52471f139236778be8191c61abec9bf0b07a0f01f7)
+qt_modular_library(qtxmlpatterns 4e421f0c78ca74f726f758bd95b33915297922f3b5a4fff84dde2600969f54f3914828fdb7903c7171e192f81966680b6c6bb4750de0be72728124470e7c798d)
+\ No newline at end of file
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index fe0698293..e22f4609b 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5
-Version: 5.12.1-2
+Version: 5.12.3
 Description: Qt5 Application Framework
 Build-Depends: qt5-3d, qt5-activeqt, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-location, qt5-multimedia, qt5-mqtt, qt5-networkauth, qt5-purchasing, qt5-quickcontrols, qt5-quickcontrols2, qt5-script, qt5-scxml, qt5-sensors, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-webchannel, qt5-websockets, qt5-winextras (windows), qt5-macextras (osx), qt5-xmlpatterns
diff --git a/ports/quirc/CMakeLists.txt b/ports/quirc/CMakeLists.txt
index 8af398bb8..a3400c70b 100644
--- a/ports/quirc/CMakeLists.txt
+++ b/ports/quirc/CMakeLists.txt
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 project(quirc C)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
 add_library(quirc
 	lib/decode.c
 	lib/identify.c
diff --git a/ports/quirc/CONTROL b/ports/quirc/CONTROL
index d86ea00ae..0fedf24c2 100644
--- a/ports/quirc/CONTROL
+++ b/ports/quirc/CONTROL
@@ -1,3 +1,3 @@
 Source: quirc
-Version: 1.0-2
+Version: 1.0-3
 Description: quirc is one of the C library available for scanning QR Codes
diff --git a/ports/quirc/portfile.cmake b/ports/quirc/portfile.cmake
index fd05c3db4..d45b283b4 100644
--- a/ports/quirc/portfile.cmake
+++ b/ports/quirc/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dlbeer/quirc
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL
index 7dce06170..ec7d32cf8 100644
--- a/ports/range-v3/CONTROL
+++ b/ports/range-v3/CONTROL
@@ -1,3 +1,3 @@
 Source: range-v3
-Version: 0.4.0-20190212
+Version: 0.5.0
 Description: Range library for C++11/14/17.
diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake
index ed54a04cf..625d6dd48 100644
--- a/ports/range-v3/portfile.cmake
+++ b/ports/range-v3/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ericniebler/range-v3
-    REF c0a1924a3f30bff8c86086849245b6e7ba79b4dd
-    SHA512 ce7ee4b268db98a21fc1210deb2bb79c6b18b1fc5ce7300d64c8b72b97979c9fb8137af910fe42711e3dc9c1405bbc1bc8a15f3223f9ef5ad8416950f4f1576e
+    REF 0.5.0
+    SHA512 076be03b0f4113acb5fb4db83ed5e755bed60ff8df9a7b982b144949cce40f0bb0579ecca38c1f33643b63037b8d311afa6d613b50811e1191b63e2c42a0d4bf
     HEAD_REF master
 )
 
diff --git a/ports/rapidxml-ns/CONTROL b/ports/rapidxml-ns/CONTROL
index 1dd1ed546..f932481e1 100644
--- a/ports/rapidxml-ns/CONTROL
+++ b/ports/rapidxml-ns/CONTROL
@@ -1,3 +1,3 @@
 Source: rapidxml-ns
-Version: 1.13-04674e3
+Version: 1.13.2
 Description: RapidXML with added XML namespaces support.
diff --git a/ports/rapidxml-ns/portfile.cmake b/ports/rapidxml-ns/portfile.cmake
index c38d6c4ec..d51fa0312 100644
--- a/ports/rapidxml-ns/portfile.cmake
+++ b/ports/rapidxml-ns/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO svgpp/rapidxml_ns
-  REF 04674e33e3bbfeee05875a29a36734667c0f3cfd
-  SHA512 c82d55ca7ec358427f811689604ba02582de9d7f57d0caa3a96e2c36b9f3751e9acefc6f84348e6c619dacca31880f279bf9d9959f8eff251f3d3276c836bcd2
+  REF v1.13.2
+  SHA512 72cdd7e728471e8903ce64470f5172abe7f2300d4d115b3a27b4d4ffb3c20e59aefb9b23c535e37baa3f53c9125aa2932d6fa9ba24e658151e1c9b12f959523a
   HEAD_REF master
 )
 
diff --git a/ports/raylib/CONTROL b/ports/raylib/CONTROL
new file mode 100644
index 000000000..3be7c5eac
--- /dev/null
+++ b/ports/raylib/CONTROL
@@ -0,0 +1,7 @@
+Source: raylib
+Version: 2019-04-27-2
+Description: A simple and easy-to-use library to enjoy videogames programming
+#Build-Depends: glfw3
+
+Feature: non-audio
+Description: Build raylib without audio module
diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake
new file mode 100644
index 000000000..82c79a44c
--- /dev/null
+++ b/ports/raylib/portfile.cmake
@@ -0,0 +1,89 @@
+# https://github.com/raysan5/raylib/issues/388
+if(TARGET_TRIPLET MATCHES "^arm" OR TARGET_TRIPLET MATCHES "uwp$")
+    message(FATAL_ERROR "raylib doesn't support ARM or UWP.")
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    message(
+    "raylib currently requires the following libraries from the system package manager:
+    libgl1-mesa-dev
+    libx11-dev
+    libxcursor-dev
+    libxinerama-dev
+    libxrandr-dev
+These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev libx11-dev libxcursor-dev libxinerama-dev libxrandr-dev"
+    )
+endif()
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO raysan5/raylib
+    REF f37e55a77bd6177dbaea4d7f484961c09104e104
+    SHA512 57146ebc7ab22a4e60c1d9eecd4c7a8f1930d6709f45761af809da9ea4f161e9fd450fa1042252a80bd7952ed9571a5d8dee4d454c8903a778e3e1328300b2bd
+    HEAD_REF master
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC)
+
+if("non-audio" IN_LIST FEATURES)
+    set(USE_AUDIO OFF)
+else()
+    set(USE_AUDIO ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_GAMES=OFF
+        -DSHARED=${SHARED}
+        -DSTATIC=${STATIC}
+        -DUSE_AUDIO=${USE_AUDIO}
+        -DUSE_EXTERNAL_GLFW=OFF # externl glfw3 causes build errors on Windows
+    OPTIONS_DEBUG
+        -DENABLE_ASAN=ON
+        -DENABLE_UBSAN=ON
+        -DENABLE_MSAN=OFF
+    OPTIONS_RELEASE
+        -DENABLE_ASAN=OFF
+        -DENABLE_UBSAN=OFF
+        -DENABLE_MSAN=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
+    ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake
+    @ONLY
+)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string(
+        ${CURRENT_PACKAGES_DIR}/include/raylib.h
+        "defined(USE_LIBTYPE_SHARED)"
+        "1 // defined(USE_LIBTYPE_SHARED)"
+    )
+endif()
+
+# Install usage
+configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/raylib/usage b/ports/raylib/usage
new file mode 100644
index 000000000..936b74f50
--- /dev/null
+++ b/ports/raylib/usage
@@ -0,0 +1,5 @@
+The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
+
+    find_package(@PORT@ CONFIG REQUIRED)
+    target_include_directories(main PRIVATE ${raylib_INCLUDE_DIRS})
+    target_link_libraries(main PRIVATE ${raylib_LIBRARIES})
diff --git a/ports/raylib/vcpkg-cmake-wrapper.cmake b/ports/raylib/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..1efda7c9e
--- /dev/null
+++ b/ports/raylib/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,14 @@
+set(raylib_USE_STATIC_LIBS @STATIC@)
+
+_find_package(${ARGS})
+
+if(raylib_FOUND)
+    get_filename_component(_raylib_lib_name ${raylib_LIBRARY} NAME)
+
+    set(raylib_LIBRARY
+        debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/${_raylib_lib_name}
+        optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/${_raylib_lib_name}
+    )
+
+    set(raylib_LIBRARIES ${raylib_LIBRARY})
+endif()
diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL
index b83dc9cba..bcfa9c724 100644
--- a/ports/re2/CONTROL
+++ b/ports/re2/CONTROL
@@ -1,3 +1,3 @@
 Source: re2
-Version: 2019-01-30
+Version: 2019-05-07
 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 e2c284be9..3cb43876a 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 98ad734aae9996a6dd1aa1fec72e800d621acd51
-    SHA512 e28a6b3428ca2714a48194f82f9d6ea4c56b3d4bc776bf3b9402bc081ca8d667f37f4ce98cd89ed1077998f945f1eebee1f501a1acdcb1fb16e741643bc8d8ab
+    REF cd23be77c716bf75ebb3ddc07fa3ef0c943da6d2
+    SHA512 c307fc9294497dc3b4ae95db117f310e0db8f91a90c32bb316fe7e32414b2ade48264471e7a7bb0860aa9b0afe7dd460dadc552b1173ac35235ad3624c6f2ed5
     HEAD_REF master
 )
 
@@ -14,6 +14,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/re2 TARGET_PATH share/re2)
 
 vcpkg_copy_pdbs()
 
diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL
index 435f49cd0..2802c0f9d 100644
--- a/ports/realsense2/CONTROL
+++ b/ports/realsense2/CONTROL
@@ -1,7 +1,7 @@
-Source: realsense2
-Version: 2.16.1-1
-Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).
-
-Feature: tools
-Build-Depends: opengl
-Description: Build Intel® RealSense™ examples and tools
+Source: realsense2
+Version: 2.16.1-2
+Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).
+
+Feature: tools
+Build-Depends: opengl
+Description: Build Intel® RealSense™ examples and tools
diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake
index 8db63f04d..0d8ae7cdc 100644
--- a/ports/realsense2/portfile.cmake
+++ b/ports/realsense2/portfile.cmake
@@ -8,7 +8,6 @@ vcpkg_from_github(
     HEAD_REF development
 )
 
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LIBRARY_LINKAGE)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE)
 
 set(BUILD_EXAMPLES OFF)
@@ -26,7 +25,6 @@ vcpkg_configure_cmake(
         # BUILD
         -DBUILD_EXAMPLES=${BUILD_EXAMPLES}
         -DBUILD_GRAPHICAL_EXAMPLES=${BUILD_GRAPHICAL_EXAMPLES}
-        -DBUILD_SHARED_LIBS=${BUILD_LIBRARY_LINKAGE}
         -DBUILD_UNIT_TESTS=OFF
         -DBUILD_WITH_OPENMP=OFF
         -DBUILD_WITH_STATIC_CRT=${BUILD_CRT_LINKAGE}
diff --git a/ports/recast/CONTROL b/ports/recast/CONTROL
index 4cc61e30d..969b9d172 100644
--- a/ports/recast/CONTROL
+++ b/ports/recast/CONTROL
@@ -1,3 +1,3 @@
-Source: recast
-Version: 1.5.1-1
-Description: Navigation-mesh Toolset for Games
+Source: recast
+Version: 1.5.1-2
+Description: Navigation-mesh Toolset for Games
diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake
index 7d9f08f93..a544971d8 100644
--- a/ports/recast/portfile.cmake
+++ b/ports/recast/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
diff --git a/ports/reproc/CONTROL b/ports/reproc/CONTROL
index 14b08a416..825ba92f9 100644
--- a/ports/reproc/CONTROL
+++ b/ports/reproc/CONTROL
@@ -1,3 +1,3 @@
 Source: reproc
-Version: v1.0.0
+Version: 6.0.0
 Description: Cross-platform library that simplifies working with external CLI applications from C and C++ 
diff --git a/ports/reproc/portfile.cmake b/ports/reproc/portfile.cmake
index 54c0cc70c..89cf5f491 100644
--- a/ports/reproc/portfile.cmake
+++ b/ports/reproc/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DaanDeMeyer/reproc
-    REF v1.0.0
-    SHA512 f567de9d6cd8bca0b34f1f48231a59c6698730c5b63f1d733de14fecf09991de74e4b3a99cc98ae7f62dcba8b2b7831d5e617fd32ca38b296b9073bc07fb2d92
+    REF v6.0.0
+    SHA512 482eb7b52961878877d1e4a4f1e1a5a867ff5b83f0df3ce47c0eb68f43eabcde720ea7ccb2eeb960dbc29fc61c888db62751984425e9b27c7498dfa4441aa801
     HEAD_REF master
 )
 
diff --git a/ports/restinio/CONTROL b/ports/restinio/CONTROL
index 311b9d581..db9057456 100644
--- a/ports/restinio/CONTROL
+++ b/ports/restinio/CONTROL
@@ -1,4 +1,4 @@
 Source: restinio
-Version: 0.4.8.6
+Version: 0.4.9.1
 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 5e151cb9f..cbb9315fb 100644
--- a/ports/restinio/portfile.cmake
+++ b/ports/restinio/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sobjectizerteam/restinio-0.4
-    REF v.0.4.8.6
-    SHA512 9b2e7af3e00a27a32605c27b45c1015468ae3ad5810b51b194eef0038d530c819bf6b91ff166852637dc0f141476f4d58876e4370929e2f091c7d5c1b3c9c72a
+    REF v.0.4.9.1
+    SHA512 e1bd27c08331b2994ce1be140502c9d7166cc997fd79f4380ea3400106f11a2cad25c72b9d0a0b2bf11c15ce9f895522e7aea41a5f2620e30752eded78869a62
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/rhash/CONTROL b/ports/rhash/CONTROL
index 14b8768d4..a25c1190b 100644
--- a/ports/rhash/CONTROL
+++ b/ports/rhash/CONTROL
@@ -1,3 +1,3 @@
 Source: rhash
-Version: 1.3.6
+Version: 1.3.8
 Description: C library for computing a wide variety of hash sums
diff --git a/ports/rhash/portfile.cmake b/ports/rhash/portfile.cmake
index cc1188c38..6eace63e4 100644
--- a/ports/rhash/portfile.cmake
+++ b/ports/rhash/portfile.cmake
@@ -6,8 +6,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rhash/RHash
-    REF v1.3.6
-    SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
+    REF v1.3.8
+    SHA512 9dba4fa4dd49d323f2e440c5b93eac1ef62eb4046ec4ef611f0978c12c1739002f1ac1f1ec5e61bd359dc89e9ed612db71be91a795184ac5d5433280d27fa4c1
     HEAD_REF master)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/librhash)
diff --git a/ports/ring-span-lite/CONTROL b/ports/ring-span-lite/CONTROL
new file mode 100644
index 000000000..9d620b709
--- /dev/null
+++ b/ports/ring-span-lite/CONTROL
@@ -0,0 +1,3 @@
+Source: ring-span-lite
+Version: 0.3.0
+Description: A C++yy-like ring_span type for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/ring-span-lite/portfile.cmake b/ports/ring-span-lite/portfile.cmake
new file mode 100644
index 000000000..b9b993054
--- /dev/null
+++ b/ports/ring-span-lite/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinmoene/ring-span-lite
+    REF v0.3.0
+    SHA512 5ecbfc63b4a09cc382edc2acae41a45946c9c6a18aa48e855201366b7696df7cbf46c2de1b5aa5296ae2dde4360d5abd8efdc3e3a1c3d427fbbddadab7dcfe79
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DRING_SPAN_LITE_OPT_BUILD_TESTS=OFF
+        -DRING_SPAN_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/robin-hood-hashing/CONTROL b/ports/robin-hood-hashing/CONTROL
new file mode 100644
index 000000000..d30871519
--- /dev/null
+++ b/ports/robin-hood-hashing/CONTROL
@@ -0,0 +1,3 @@
+Source: robin-hood-hashing
+Version: 3.2.13
+Description: Fast & memory efficient hashtable based on robin hood hashing for C++14
diff --git a/ports/robin-hood-hashing/portfile.cmake b/ports/robin-hood-hashing/portfile.cmake
new file mode 100644
index 000000000..890d6f86a
--- /dev/null
+++ b/ports/robin-hood-hashing/portfile.cmake
@@ -0,0 +1,16 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinus/robin-hood-hashing
+    REF 3.2.13
+    SHA512 5c508a1f43d2ca86c89b9aac3b17493a23b8ee3c7485438afc8e5eb4e697d663588e1945001ba3ba95dd1480b3c1b846079fadec5972e5ac4462117379052433
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/src/include/robin_hood.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/rocksdb/0002-only-build-one-flavor.patch b/ports/rocksdb/0002-only-build-one-flavor.patch
index 2d6b3aa07..00e46377d 100644
--- a/ports/rocksdb/0002-only-build-one-flavor.patch
+++ b/ports/rocksdb/0002-only-build-one-flavor.patch
@@ -1,36 +1,53 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ab8954b6..5b0405f4a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -793,6 +793,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
- 
-   install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
- 
-+  if(NOT ROCKSDB_DISABLE_INSTALL_STATIC_LIB)
-   install(
-     TARGETS ${ROCKSDB_STATIC_LIB}
-     EXPORT RocksDBTargets
-@@ -800,15 +801,23 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
-     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-   )
-+  else()
-+    set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE)
-+  endif()
- 
-+  if(NOT ROCKSDB_DISABLE_INSTALL_SHARED_LIB)
-   install(
-     TARGETS ${ROCKSDB_SHARED_LIB}
-     EXPORT RocksDBTargets
-     COMPONENT runtime
-     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-   )
-+  else()
-+    set_target_properties(${ROCKSDB_SHARED_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE)
-+  endif()
- 
-   install(
-     EXPORT RocksDBTargets
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ff370fb..6916fcd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -810,24 +810,30 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
+   )
+ 
+   install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+-
+-  install(
+-    TARGETS ${ROCKSDB_STATIC_LIB}
+-    EXPORT RocksDBTargets
+-    COMPONENT devel
+-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-  )
+-
+-  install(
+-    TARGETS ${ROCKSDB_SHARED_LIB}
+-    EXPORT RocksDBTargets
+-    COMPONENT runtime
+-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-  )
++  if(NOT ROCKSDB_DISABLE_INSTALL_STATIC_LIB)
++    install(
++      TARGETS ${ROCKSDB_STATIC_LIB}
++      EXPORT RocksDBTargets
++      COMPONENT devel
++      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++      INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++    )
++  else()
++    set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE)
++  endif()
++  if(NOT ROCKSDB_DISABLE_INSTALL_SHARED_LIB)
++    install(
++      TARGETS ${ROCKSDB_SHARED_LIB}
++      EXPORT RocksDBTargets
++      COMPONENT runtime
++      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++      INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++    )
++  else()
++    set_target_properties(${ROCKSDB_SHARED_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE)
++  endif()
+ 
+   install(
+     EXPORT RocksDBTargets
diff --git a/ports/rocksdb/0003-zlib-findpackage.patch b/ports/rocksdb/0003-zlib-findpackage.patch
index c2d71dc00..e66f8f17f 100644
--- a/ports/rocksdb/0003-zlib-findpackage.patch
+++ b/ports/rocksdb/0003-zlib-findpackage.patch
@@ -1,13 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b0405f4a..43256fc04 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -88,7 +88,7 @@ else()
-   endif()
- 
-   if(WITH_ZLIB)
--    find_package(zlib REQUIRED)
-+    find_package(ZLIB REQUIRED)
-     add_definitions(-DZLIB)
-     include_directories(${ZLIB_INCLUDE_DIR})
-     list(APPEND THIRDPARTY_LIBS ${ZLIB_LIBRARIES})
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6916fcd..a52c53f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,7 +92,7 @@ else()
+   endif()
+ 
+   if(WITH_ZLIB)
+-    find_package(zlib REQUIRED)
++    find_package(ZLIB REQUIRED)
+     add_definitions(-DZLIB)
+     if(ZLIB_INCLUDE_DIRS)
+       # CMake 3
diff --git a/ports/rocksdb/0005-static-linking-in-linux.patch b/ports/rocksdb/0005-static-linking-in-linux.patch
new file mode 100644
index 000000000..89defde68
--- /dev/null
+++ b/ports/rocksdb/0005-static-linking-in-linux.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0303186..2b09591 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -741,7 +741,12 @@ if(WIN32)
+   set(LIBS ${ROCKSDB_STATIC_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
+ else()
+   set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT})
+-  set(LIBS ${ROCKSDB_SHARED_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++  
++  if(ROCKSDB_DISABLE_INSTALL_SHARED_LIB)
++    set(LIBS ${ROCKSDB_STATIC_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++  else()
++    set(LIBS ${ROCKSDB_SHARED_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++  endif()
+ 
+   add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES})
+   target_link_libraries(${ROCKSDB_SHARED_LIB}
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL
index 1f47bcca8..10562f779 100644
--- a/ports/rocksdb/CONTROL
+++ b/ports/rocksdb/CONTROL
@@ -1,5 +1,5 @@
 Source: rocksdb
-Version: 5.18.3
+Version: 6.0.2
 Description: A library that provides an embeddable, persistent key-value store for fast storage
 Default-Features: zlib
 
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake
index 7d96d55c2..27a9d70d5 100644
--- a/ports/rocksdb/portfile.cmake
+++ b/ports/rocksdb/portfile.cmake
@@ -3,14 +3,15 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO facebook/rocksdb
-  REF v5.18.3
-  SHA512 5f8c9e66dd7d7f1071dbbdd0442519df403f92876f9ed120b6a89788446cabf86275866a8ea273ab6fcb9d62cc7f3dc4d5b1684aa39c3956eea47b5b93938d54
+  REF v6.0.2
+  SHA512 6659f04c9823750b9b635e2a247b59dbda4975458615392df82bdbeb4ac7ac783e6de86a32fcc318aae1bb27880557390c544c99caa3db3885f9c3d836cc1df8
   HEAD_REF master
   PATCHES
     0001-disable-gtest.patch
     0002-only-build-one-flavor.patch
     0003-zlib-findpackage.patch
     0004-use-find-package.patch
+    0005-static-linking-in-linux.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzlib.cmake")
diff --git a/ports/rpclib/CONTROL b/ports/rpclib/CONTROL
index 2123f29c4..d3531e9b5 100644
--- a/ports/rpclib/CONTROL
+++ b/ports/rpclib/CONTROL
@@ -1,3 +1,3 @@
-Source: rpclib
-Version: 2.2.1
-Description: a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.
+Source: rpclib
+Version: 2.2.1-1
+Description: a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.
diff --git a/ports/rpclib/portfile.cmake b/ports/rpclib/portfile.cmake
index 40aea10bb..9865a2afe 100644
--- a/ports/rpclib/portfile.cmake
+++ b/ports/rpclib/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL
index ca587479a..0350e206f 100644
--- a/ports/rs-core-lib/CONTROL
+++ b/ports/rs-core-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: rs-core-lib
-Version: 2019-01-30
+Version: 2019-05-07
 Description: Minimal common utilities by Ross Smith
 
diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake
index eb7e36a9c..1f0713a02 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 0d70c5fcce34b05aa871bd77241315ff3cbed19f
-    SHA512 58753805178ea92c8863636df88c2b25f1eaadcd5f5a626a589141ac1a429208322c9d965577c6d1035ebd881b0c105c9f75e74636a509e60f9e833cc518b5ca
+    REF 4828e0dc8b7e7ed76935865cfe99181da0da211b
+    SHA512 97298d94c1cc4cd4cb580bde6c1413a2f429544dc80cae58bc436aad25e385d9ced611a2512a45f1e3d10fd613f26958fc5d3a03ea9bfaefd5170a4b2d1ac124
     HEAD_REF master
 )
 
diff --git a/ports/rtmidi/CONTROL b/ports/rtmidi/CONTROL
index 9eaad9735..2c3d38dd4 100644
--- a/ports/rtmidi/CONTROL
+++ b/ports/rtmidi/CONTROL
@@ -1,3 +1,3 @@
 Source: rtmidi
-Version: 2.1.1-2
+Version: 4.0.0
 Description: A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)
diff --git a/ports/rtmidi/fix-POSIXname.patch b/ports/rtmidi/fix-POSIXname.patch
new file mode 100644
index 000000000..a2a5b0ee1
--- /dev/null
+++ b/ports/rtmidi/fix-POSIXname.patch
@@ -0,0 +1,17 @@
+diff --git a/rtmidi_c.cpp b/rtmidi_c.cpp
+index 248c9e5..ec1dd38 100644
+--- a/rtmidi_c.cpp
++++ b/rtmidi_c.cpp
+@@ -136,7 +136,11 @@ const char* rtmidi_get_port_name (RtMidiPtr device, unsigned int portNumber)
+ {
+     try {
+         std::string name = ((RtMidi*) device->ptr)->getPortName (portNumber);
+-        return strdup (name.c_str ());
++#if defined(_WIN) || defined(WINAPI_FAMILY) //Windows platform
++			return _strdup (name.c_str ());
++#else // Unix platform
++			return strdup (name.c_str ());
++#endif
+     
+     } catch (const RtMidiError & err) {
+         device->ok  = false;
diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake
index cee6e1a73..8aa949b5a 100644
--- a/ports/rtmidi/portfile.cmake
+++ b/ports/rtmidi/portfile.cmake
@@ -3,9 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO thestk/rtmidi
-    REF  2.1.1
-    SHA512 4d378720dd0f7c0e1a87741c088756839878ed56465b053040f70a1e039828fe221a6b1669b77b2fdd146cb192934c5719cc934c2c6a6304f44dbee2972c68e8
+    REF  4.0.0
+    SHA512 39383f121320c9471b31f8b9d283167bfadf4c7328b6664d1d54a4c52e3dd9b76362875258d90363c6044e87fcee31ccce80e19435dc620c88e6d60fc82d0f9d
     HEAD_REF master
+	PATCHES
+		fix-POSIXname.patch
 )
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
@@ -17,4 +19,4 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-file(INSTALL ${SOURCE_PATH}/readme DESTINATION ${CURRENT_PACKAGES_DIR}/share/rtmidi RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/rtmidi RENAME copyright)
diff --git a/ports/rttr/CONTROL b/ports/rttr/CONTROL
index cb4eb9557..55e6e6b67 100644
--- a/ports/rttr/CONTROL
+++ b/ports/rttr/CONTROL
@@ -1,3 +1,3 @@
-Source: rttr
-Version: 0.9.6-0
-Description: an easy and intuitive way to use reflection in C++
+Source: rttr
+Version: 0.9.6-1
+Description: an easy and intuitive way to use reflection in C++
diff --git a/ports/rttr/fix-directory-output.patch b/ports/rttr/fix-directory-output.patch
index 8fd8ed0c7..97e47f371 100644
--- a/ports/rttr/fix-directory-output.patch
+++ b/ports/rttr/fix-directory-output.patch
@@ -1,4 +1,4 @@
-diff --git a/CMake/config.cmake b/CMake/config.cmake
+diff --git a/CMake/config.cmake b/CMake/config.cmake
 index a718199..eab64c2 100644
 --- a/CMake/config.cmake
 +++ b/CMake/config.cmake
diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake
index ceef04449..2c2c7e863 100644
--- a/ports/rttr/portfile.cmake
+++ b/ports/rttr/portfile.cmake
@@ -1,12 +1,7 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message("Rttr only supports dynamic library linkage")
-    set(VCPKG_LIBRARY_LINKAGE "dynamic")
-endif()
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "Rttr only supports dynamic library linkage, so cannot be built with static CRT")
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rttrorg/rttr
diff --git a/ports/rxcpp/CONTROL b/ports/rxcpp/CONTROL
index 7bf2aca17..c94e71b76 100644
--- a/ports/rxcpp/CONTROL
+++ b/ports/rxcpp/CONTROL
@@ -1,3 +1,3 @@
 Source: rxcpp
-Version: 4.0.0-1
+Version: 4.1.0
 Description: Reactive Extensions for C++
 \ No newline at end of file
diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake
index 00b154989..5844f469b 100644
--- a/ports/rxcpp/portfile.cmake
+++ b/ports/rxcpp/portfile.cmake
@@ -5,8 +5,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-4.0.0)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Reactive-Extensions/RxCpp
-    REF v4.0.0
-    SHA512 df7582925e749fb7f9fbc085566d57a46571e18202aacaa7d35cf9da8152b29dd2886b2d07dae93e538f2a0f7b91d93fb3da23c34c7ea4467772515c794a25b7
+    REF v4.1.0
+    SHA512 a92e817ecbdf6f235cae724ada2615af9fa0c243249625d0f2c2f09ff5dd7f53fdabd03a0278fe2995fe27528c5511d71f87b7a6b3d54f73b49b65aef56e32fd
     HEAD_REF master
 )
 
diff --git a/ports/safeint/CONTROL b/ports/safeint/CONTROL
index 726ebdc6b..6ac85d36b 100644
--- a/ports/safeint/CONTROL
+++ b/ports/safeint/CONTROL
@@ -1,3 +1,3 @@
 Source: safeint
-Version: 3.19.2
+Version: 3.20.0
 Description: SafeInt is a class library for C++ that manages integer overflows
diff --git a/ports/safeint/portfile.cmake b/ports/safeint/portfile.cmake
index dd8e41aca..bacd54541 100644
--- a/ports/safeint/portfile.cmake
+++ b/ports/safeint/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dcleblanc/SafeInt
-    REF b1c48bd32b5e748ed57c153c418a5ed67538045a
-    SHA512 d0b59430da353e0af55a9ab83964e35bfb61edff00f8a2aef6df139720f271aae851ea9de54ca4280e220eff9946590a7b5c85c102f3c2e5f051a6cb7d7a3e5e
+    REF 3.20.0
+    SHA512 ebd10ac2578b4ab7968b2f89b7c8114a55bfd1967d625498a555b5354acf5a8c6b145b38429eb0dc853e7a0a33728a2a5acb505888bc983e7b0de81d09f50918
     HEAD_REF master
 )
 
diff --git a/ports/sciter/CONTROL b/ports/sciter/CONTROL
index c82708a73..69f2d68a0 100644
--- a/ports/sciter/CONTROL
+++ b/ports/sciter/CONTROL
@@ -1,4 +1,4 @@
-Source: sciter
-Version: 4.2.6.9
-Description: Sciter is an embeddable HTML/CSS/scripting engine.
-Maintainer: andrew.fedoniouk@gmail.com, ehysta@gmail.com
+Source: sciter
+Version: 4.2.6.9-1
+Description: Sciter is an embeddable HTML/CSS/scripting engine.
+Maintainer: andrew.fedoniouk@gmail.com, ehysta@gmail.com
diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake
index 8ae54344e..d94cc5469 100644
--- a/ports/sciter/portfile.cmake
+++ b/ports/sciter/portfile.cmake
@@ -1,13 +1,11 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Sciter is only available under a free license as DLLs.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "Sciter only supports Windows Desktop")
 endif()
 
-include(vcpkg_common_functions)
 
 # header-only library
 set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
diff --git a/ports/sdl2-gfx/CMakeLists.txt b/ports/sdl2-gfx/CMakeLists.txt
index 6a0ecf24e..1a63d7f8b 100644
--- a/ports/sdl2-gfx/CMakeLists.txt
+++ b/ports/sdl2-gfx/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 project(SDL2_GFX C)
 
 find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY NAMES SDL2d SDL2)
+find_package(SDL2 CONFIG REQUIRED)
 
 # builtin formats
 set(SDL_GFX_DEFINES WIN32)
@@ -18,7 +18,7 @@ add_library(SDL2_gfx
 
 target_compile_definitions(SDL2_gfx PRIVATE ${SDL_GFX_DEFINES})
 target_include_directories(SDL2_gfx PRIVATE ${SDL_INCLUDE_DIR}/SDL2)
-target_link_libraries(SDL2_gfx PRIVATE ${SDL_LIBRARY})
+target_link_libraries(SDL2_gfx PRIVATE SDL2::SDL2)
 
 install(TARGETS SDL2_gfx
     RUNTIME DESTINATION bin
diff --git a/ports/sdl2-gfx/CONTROL b/ports/sdl2-gfx/CONTROL
index 950afc00f..96a4d2776 100644
--- a/ports/sdl2-gfx/CONTROL
+++ b/ports/sdl2-gfx/CONTROL
@@ -1,4 +1,4 @@
 Source: sdl2-gfx
-Version: 1.0.4
+Version: 1.0.4-1
 Build-Depends: sdl2
 Description: Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.
diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt
index 1c1d27ce8..9cc82de7a 100644
--- a/ports/sdl2-image/CMakeLists.txt
+++ b/ports/sdl2-image/CMakeLists.txt
@@ -65,13 +65,13 @@ endforeach(FORMAT)
 
 # SDL
 find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY NAMES SDL2d SDL2)
+find_package(SDL2 CONFIG REQUIRED)
 
 include_directories(${SDL_INCLUDE_DIR})
 include_directories(${SDL_INCLUDE_DIR}/SDL2)
 include_directories(${CMAKE_SOURCE_DIR})
 
-target_link_libraries(SDL2_image ${SDL_LIBRARY})
+target_link_libraries(SDL2_image SDL2::SDL2)
 
 # external dependencies
 foreach(DEPENDENCY IN LISTS DEPENDENCIES)
@@ -118,7 +118,7 @@ install(EXPORT SDL2_image
 
 
 message(STATUS "Link-time dependencies:")
-message(STATUS "  " ${SDL_LIBRARY})
+message(STATUS "  " SDL2::SDL2)
 foreach(DEPENDENCY ${DEPENDENCIES})
     if(${DEPENDENCY}_FOUND)
         message(STATUS "  " ${DEPENDENCY})
diff --git a/ports/sdl2-image/CONTROL b/ports/sdl2-image/CONTROL
index 189470e6d..2788f032a 100644
--- a/ports/sdl2-image/CONTROL
+++ b/ports/sdl2-image/CONTROL
@@ -1,5 +1,5 @@
 Source: sdl2-image
-Version: 2.0.4-1
+Version: 2.0.4-2
 Build-Depends: sdl2, libpng
 Description: SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV
 
diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt
index b38847fbb..f9912346c 100644
--- a/ports/sdl2-mixer/CMakeLists.txt
+++ b/ports/sdl2-mixer/CMakeLists.txt
@@ -2,9 +2,10 @@ cmake_minimum_required(VERSION 3.1)
 project(SDL2_MIXER C)
 
 find_path(SDL_INCLUDE_DIR SDL.h PATH_SUFFIXES SDL2)
-find_library(SDL_LIBRARY NAMES SDL2d SDL2)
+find_package(SDL2 CONFIG REQUIRED)
 set(SDL_MIXER_INCLUDES ${SDL_INCLUDE_DIR})
-set(SDL_MIXER_LIBRARIES ${SDL_LIBRARY})
+
+set(SDL_MIXER_LIBRARIES SDL2::SDL2)
 
 # builtin formats
 set(SDL_MIXER_DEFINES MUSIC_WAV)
diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL
index 206e922a6..4c55575f4 100644
--- a/ports/sdl2-mixer/CONTROL
+++ b/ports/sdl2-mixer/CONTROL
@@ -1,5 +1,5 @@
 Source: sdl2-mixer
-Version: 2.0.4-1
+Version: 2.0.4-2
 Description: Multi-channel audio mixer library for SDL.
 Build-Depends: sdl2
 
diff --git a/ports/sdl2-net/CMakeLists.txt b/ports/sdl2-net/CMakeLists.txt
index bb697bb46..053093643 100644
--- a/ports/sdl2-net/CMakeLists.txt
+++ b/ports/sdl2-net/CMakeLists.txt
@@ -6,7 +6,7 @@ if (MSVC)
 endif()
 
 find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY NAMES SDL2d SDL2)
+find_package(SDL2 CONFIG REQUIRED)
 
 add_library(SDL2_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc)
 
@@ -15,7 +15,7 @@ target_compile_definitions(SDL2_net PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS)
 target_include_directories(SDL2_net PRIVATE ${SDL_INCLUDE_DIR}/SDL2)
 
 if (WIN32)
-    target_link_libraries(SDL2_net ${SDL_LIBRARY} ws2_32 iphlpapi)
+    target_link_libraries(SDL2_net SDL2::SDL2 ws2_32 iphlpapi)
 endif()
 
 install(TARGETS SDL2_net
@@ -35,4 +35,4 @@ if(NOT DEFINED SDL_NET_SKIP_HEADERS)
 endif()
 
 message(STATUS "Link-time dependencies:")
-message(STATUS "  " ${SDL_LIBRARY})
+message(STATUS "  " SDL2::SDL2)
diff --git a/ports/sdl2-net/CONTROL b/ports/sdl2-net/CONTROL
index 56ee980be..e855e2656 100644
--- a/ports/sdl2-net/CONTROL
+++ b/ports/sdl2-net/CONTROL
@@ -1,4 +1,4 @@
 Source: sdl2-net
-Version: 2.0.1-5
+Version: 2.0.1-6
 Description: Networking library for SDL
 Build-Depends: sdl2
diff --git a/ports/sdl2-ttf/CMakeLists.txt b/ports/sdl2-ttf/CMakeLists.txt
index 94e14e391..8d34a413a 100644
--- a/ports/sdl2-ttf/CMakeLists.txt
+++ b/ports/sdl2-ttf/CMakeLists.txt
@@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.0)
 project(SDL2_TTF C)
 
 find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY NAMES SDL2d SDL2)
+find_package(SDL2 CONFIG REQUIRED)
 find_package(Freetype REQUIRED)
 
 add_library(SDL2_ttf SDL_ttf.c version.rc)
 
 set_target_properties(SDL2_ttf PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS)
 target_include_directories(SDL2_ttf PRIVATE ${SDL_INCLUDE_DIR}/SDL2 ${FREETYPE_INCLUDE_DIRS})
-target_link_libraries(SDL2_ttf ${SDL_LIBRARY} ${FREETYPE_LIBRARIES})
+target_link_libraries(SDL2_ttf SDL2::SDL2 ${FREETYPE_LIBRARIES})
 
 install(TARGETS SDL2_ttf
     EXPORT SDL2_ttf
@@ -28,5 +28,5 @@ if(NOT DEFINED SDL_TTF_SKIP_HEADERS)
 endif()
 
 message(STATUS "Link-time dependencies:")
-message(STATUS "  " ${SDL_LIBRARY})
+message(STATUS "  " SDL2::SDL2)
 message(STATUS "  " ${FREETYPE_LIBRARIES})
diff --git a/ports/sdl2-ttf/CONTROL b/ports/sdl2-ttf/CONTROL
index d2c77ea42..22598164e 100644
--- a/ports/sdl2-ttf/CONTROL
+++ b/ports/sdl2-ttf/CONTROL
@@ -1,4 +1,4 @@
 Source: sdl2-ttf
-Version: 2.0.15-1
+Version: 2.0.15-2
 Description: A library for rendering TrueType fonts with SDL
 Build-Depends: sdl2, freetype
diff --git a/ports/sdl2/CONTROL b/ports/sdl2/CONTROL
index 1bd6ec930..b03d96e81 100644
--- a/ports/sdl2/CONTROL
+++ b/ports/sdl2/CONTROL
@@ -1,5 +1,5 @@
 Source: sdl2
-Version: 2.0.9-2
+Version: 2.0.9-3
 Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.
 
 Feature: vulkan
diff --git a/ports/sdl2/enable-winrt-cmake.patch b/ports/sdl2/enable-winrt-cmake.patch
index 858c7d460..1d1356fba 100644
--- a/ports/sdl2/enable-winrt-cmake.patch
+++ b/ports/sdl2/enable-winrt-cmake.patch
@@ -37,7 +37,7 @@ index 0128c7a..bd534e4 100644
      check_include_file(ddraw.h HAVE_DDRAW_H)
      check_include_file(dsound.h HAVE_DSOUND_H)
      check_include_file(dinput.h HAVE_DINPUT_H)
-+    if(WINDOWS_STORE)
++    if(WINDOWS_STORE OR VCPKG_TARGET_TRIPLET MATCHES "arm-windows")
 +      set(HAVE_DINPUT_H 0)
 +    endif()
      check_include_file(dxgi.h HAVE_DXGI_H)
diff --git a/ports/secp256k1/CONTROL b/ports/secp256k1/CONTROL
index be37f1693..16761cc4d 100644
--- a/ports/secp256k1/CONTROL
+++ b/ports/secp256k1/CONTROL
@@ -1,3 +1,3 @@
-Source: secp256k1
-Version: 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-1
-Description: Optimized C library for EC operations on curve
+Source: secp256k1
+Version: 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-2
+Description: Optimized C library for EC operations on curve
diff --git a/ports/secp256k1/portfile.cmake b/ports/secp256k1/portfile.cmake
index 2012c4827..28291c7ec 100644
--- a/ports/secp256k1/portfile.cmake
+++ b/ports/secp256k1/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/selene/disable_x86_intrinsics_on_arm.patch b/ports/selene/disable_x86_intrinsics_on_arm.patch
new file mode 100644
index 000000000..79e38c57c
--- /dev/null
+++ b/ports/selene/disable_x86_intrinsics_on_arm.patch
@@ -0,0 +1,13 @@
+diff --git a/selene/base/Bitcount.hpp b/selene/base/Bitcount.hpp
+index a4d69e4..709f650 100755
+--- a/selene/base/Bitcount.hpp
++++ b/selene/base/Bitcount.hpp
+@@ -69,7 +69,7 @@ inline std::size_t bit_count(unsigned long long x)
+   return static_cast<std::size_t>(__builtin_popcountll(x));
+ }
+ 
+-#elif defined(_MSC_VER)
++#elif defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
+ 
+ /** \brief Performs a bit count on the supplied value.
+  *
diff --git a/ports/selene/portfile.cmake b/ports/selene/portfile.cmake
index 97f05a38b..f45c84460 100644
--- a/ports/selene/portfile.cmake
+++ b/ports/selene/portfile.cmake
@@ -8,6 +8,8 @@ vcpkg_from_github(
     REF v0.3.1
     SHA512 7bc57ebe9e2442da2716eb5c1af11f8d610b0b09fe96e3122d1028575732b6045a987c499bbf7de53003edd627b8809d86c80ea4975fc2264a1c61d5891a46c3
     HEAD_REF master
+    PATCHES
+        disable_x86_intrinsics_on_arm.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/sentencepiece/CONTROL b/ports/sentencepiece/CONTROL
new file mode 100644
index 000000000..41db3d5ff
--- /dev/null
+++ b/ports/sentencepiece/CONTROL
@@ -0,0 +1,3 @@
+Source: sentencepiece
+Version: v0.1.82
+Description: SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training
+\ No newline at end of file
diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake
new file mode 100644
index 000000000..2623acac1
--- /dev/null
+++ b/ports/sentencepiece/portfile.cmake
@@ -0,0 +1,34 @@
+include(vcpkg_common_functions)
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_STATIC_CRT)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/sentencepiece
+    REF v0.1.82
+    SHA512   669d6a1e86c44587d725b1e93f11b707e510a180dec08afb79268158f5de009cb20ffccc72c501c84f032360e52e53ae227504f3538f59978629433e0d6fcf65
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DSPM_ENABLE_SHARED=OFF
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+   file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece.lib ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepieced.lib)
+   file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_train.lib ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_traind.lib)
+endif()
+
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
+\ No newline at end of file
diff --git a/ports/shiva/CONTROL b/ports/shiva/CONTROL
index ef9154a29..0ce81203d 100644
--- a/ports/shiva/CONTROL
+++ b/ports/shiva/CONTROL
@@ -1,4 +1,4 @@
 Source: shiva
-Version: 1.0
+Version: 1.0-2
 Description: Modern C++ Game Engine
-Build-Depends: boost-stacktrace, boost-filesystem, boost-dll, entt, lua (windows), luafilesystem (windows), sol2, pybind11, spdlog, nlohmann-json
+Build-Depends: boost-stacktrace, boost-filesystem, boost-dll, entt, lua, luafilesystem (windows), sol2, pybind11, spdlog, nlohmann-json
diff --git a/ports/shiva/portfile.cmake b/ports/shiva/portfile.cmake
index 1f64fa220..372c318e0 100644
--- a/ports/shiva/portfile.cmake
+++ b/ports/shiva/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_find_acquire_program(PYTHON2)
+
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Milerius/shiva
@@ -11,7 +13,9 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DSHIVA_BUILD_TESTS=OFF
+    OPTIONS
+		-DSHIVA_BUILD_TESTS=OFF
+		-DPYTHON_EXECUTABLE=${PYTHON2}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/shogun/CONTROL b/ports/shogun/CONTROL
index 56b6250d6..5188892da 100644
--- a/ports/shogun/CONTROL
+++ b/ports/shogun/CONTROL
@@ -1,4 +1,4 @@
-Source: shogun
-Version: 6.1.3
-Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas (x64), nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
-Description: Unified and efficient Machine Learning
+Source: shogun
+Version: 6.1.3-1
+Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas (x64), nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
+Description: Unified and efficient Machine Learning
diff --git a/ports/shogun/portfile.cmake b/ports/shogun/portfile.cmake
index e002ead4a..b207116c8 100644
--- a/ports/shogun/portfile.cmake
+++ b/ports/shogun/portfile.cmake
@@ -1,10 +1,7 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("shogun only supports static library linkage")
-    set(VCPKG_LIBRARY_LINKAGE "static")
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO shogun-toolbox/shogun
diff --git a/ports/signalrclient/0002_fix-compile-error.patch b/ports/signalrclient/0002_fix-compile-error.patch
index bcda3646b..e3631379b 100644
--- a/ports/signalrclient/0002_fix-compile-error.patch
+++ b/ports/signalrclient/0002_fix-compile-error.patch
@@ -11,14 +11,19 @@ index 91c2300..2439fec 100644
  set(CPPREST_INCLUDE_DIR "" CACHE FILEPATH "Path to casablanca include dir")
  
  include_directories (
-@@ -22,6 +24,7 @@ if(NOT DISABLE_TESTS)
- 	add_subdirectory(test)
- endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 506680d04..d8bd404a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,7 +13,7 @@ include_directories (
+ include
+ "${CPPREST_INCLUDE_DIR}")
  
-+
- if(BUILD_SHARED_LIBS)
- 	install(FILES include/signalrclient/_exports.h DESTINATION include/signalrclient)
- else()
+-find_library(CPPREST_SO NAMES "cpprest" PATHS ${CPPREST_LIB_DIR} REQUIRED)
++find_package(cpprestsdk REQUIRED)
+ 
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt
 index db141eb..c4306d8 100644
 --- a/src/signalrclient/CMakeLists.txt
@@ -28,7 +33,7 @@ index db141eb..c4306d8 100644
  add_library (signalrclient ${SOURCES})
  
 -target_link_libraries(signalrclient ${CPPREST_SO})
-+target_link_libraries(signalrclient ${CPPREST_SO} OpenSSL::SSL OpenSSL::Crypto)
++target_link_libraries(signalrclient cpprestsdk::cpprest OpenSSL::SSL OpenSSL::Crypto)
  
  install(
    TARGETS signalrclient
diff --git a/ports/signalrclient/CONTROL b/ports/signalrclient/CONTROL
index c7bb1ea4a..12f9dcfe2 100644
--- a/ports/signalrclient/CONTROL
+++ b/ports/signalrclient/CONTROL
@@ -1,4 +1,4 @@
 Source: signalrclient
-Version: 1.0.0-beta1-5
+Version: 1.0.0-beta1-6
 Build-Depends: cpprestsdk, openssl
 Description: C++ client for SignalR.
diff --git a/ports/smpeg2/CMakeLists.txt b/ports/smpeg2/CMakeLists.txt
index 87a3586be..b0e284b05 100644
--- a/ports/smpeg2/CMakeLists.txt
+++ b/ports/smpeg2/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 project(SMPEG2 CXX)
 
 find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY NAMES SDL2d SDL2)
+find_package(SDL2 CONFIG REQUIRED)
 
 include_directories(${SDL_INCLUDE_DIR})
 include_directories(${SDL_INCLUDE_DIR}/SDL2)
@@ -46,7 +46,11 @@ add_library(smpeg2
     smpeg.cpp)
 
 set_target_properties(smpeg2 PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS)
-target_link_libraries(smpeg2 ${SDL_LIBRARY})
+if(BUILD_SHARED_LIBS)
+    target_link_libraries(smpeg2 SDL2::SDL2)
+else()
+    target_link_libraries(smpeg2 SDL2::SDL2-static)
+endif()
 
 install(TARGETS smpeg2
     RUNTIME DESTINATION bin
diff --git a/ports/smpeg2/CONTROL b/ports/smpeg2/CONTROL
index 0de1c4700..fc1e1604c 100644
--- a/ports/smpeg2/CONTROL
+++ b/ports/smpeg2/CONTROL
@@ -1,4 +1,4 @@
 Source: smpeg2
-Version: 2.0.0-5
+Version: 2.0.0-6
 Description: SDL MPEG Player Library
 Build-Depends: sdl2
diff --git a/ports/sndfile/CONTROL b/ports/sndfile/CONTROL
new file mode 100644
index 000000000..eeee6d909
--- /dev/null
+++ b/ports/sndfile/CONTROL
@@ -0,0 +1,8 @@
+Source: sndfile
+Version: 1.0.29-cebfdf2-1
+Description: Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo
+Default-Features: external-libs
+
+Feature: external-libs
+Description: Support Ogg Vorbis and FLAC audio files
+Build-Depends: libogg, libflac, libvorbis
diff --git a/ports/sndfile/portfile.cmake b/ports/sndfile/portfile.cmake
new file mode 100644
index 000000000..22f1579e8
--- /dev/null
+++ b/ports/sndfile/portfile.cmake
@@ -0,0 +1,62 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO erikd/libsndfile
+    REF cebfdf275e6173259bee6bfd40de22c8c102cf23
+    SHA512  b981b9a5a457b73f444f4b134a76d9d7ab328369171a0043f89cfcf4567ca29a91ff75abfb362c4bc76c5fb0d25cb88cc397c37dd8f9d98b8892999c2e4e4123
+    HEAD_REF master
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize-addendum.patch"
+)
+
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" CRT_LIB_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
+
+option(BUILD_EXECUTABLES "Build sndfile tools and install to folder tools" OFF)
+
+if("external-libs" IN_LIST FEATURES)
+    set(SNDFILE_WITH_EXTERNAL_LIBS ON)
+else()
+    set(SNDFILE_WITH_EXTERNAL_LIBS OFF)
+endif()
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
+vcpkg_add_to_path(${PYTHON3_EXE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DBUILD_EXAMPLES=0 -DBUILD_REGTEST=0 -DBUILD_TESTING=0 -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC} -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DENABLE_EXTERNAL_LIBS=${SNDFILE_WITH_EXTERNAL_LIBS}
+    OPTIONS_RELEASE -DBUILD_PROGRAMS=${BUILD_EXECUTABLES}
+    # Setting ENABLE_PACKAGE_CONFIG=0 has no effect
+    OPTIONS_DEBUG -DBUILD_PROGRAMS=0
+)
+
+vcpkg_install_cmake()
+
+if(WIN32)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+else()
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SndFile)
+endif()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc/libsndfile ${CURRENT_PACKAGES_DIR}/share/${PORT}/doc)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
+
+if(BUILD_EXECUTABLES)
+    file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+    file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+    file(REMOVE ${TOOLS})
+    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+endif(BUILD_EXECUTABLES)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/sndfile/uwp-createfile-getfilesize-addendum.patch b/ports/sndfile/uwp-createfile-getfilesize-addendum.patch
new file mode 100644
index 000000000..62e6b1131
--- /dev/null
+++ b/ports/sndfile/uwp-createfile-getfilesize-addendum.patch
@@ -0,0 +1,13 @@
+diff --git a/src/file_io.c b/src/file_io.c
+index 47351bc..54741c9 100644
+--- a/src/file_io.c
++++ b/src/file_io.c
+@@ -799,6 +799,8 @@ psf_open_handle (PSF_FILE * pfile)
+ 
+ 	if (handle == INVALID_HANDLE_VALUE)
+ 		return NULL;
++
++	return handle;
+ #else
+ 	if (pfile->use_wchar)
+ 		handle = CreateFileW (
diff --git a/ports/sndfile/uwp-createfile-getfilesize.patch b/ports/sndfile/uwp-createfile-getfilesize.patch
new file mode 100644
index 000000000..0e60cde54
--- /dev/null
+++ b/ports/sndfile/uwp-createfile-getfilesize.patch
@@ -0,0 +1,58 @@
+diff --git a/src/file_io.c b/src/file_io.c
+index 7cf8f0c..47351bc 100644
+--- a/src/file_io.c
++++ b/src/file_io.c
+@@ -787,6 +787,19 @@ psf_open_handle (PSF_FILE * pfile)
+ 				return NULL ;
+ 		} ;
+ 
++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
++	if (!pfile->use_wchar)
++		return NULL;
++
++	CREATEFILE2_EXTENDED_PARAMETERS cfParams = {0};
++	cfParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
++	cfParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
++
++	handle = CreateFile2(pfile->path.wc, dwDesiredAccess, dwShareMode, dwCreationDistribution, &cfParams);
++
++	if (handle == INVALID_HANDLE_VALUE)
++		return NULL;
++#else
+ 	if (pfile->use_wchar)
+ 		handle = CreateFileW (
+ 					pfile->path.wc,				/* pointer to name of the file */
+@@ -812,6 +825,7 @@ psf_open_handle (PSF_FILE * pfile)
+ 		return NULL ;
+ 
+ 	return handle ;
++#endif
+ } /* psf_open_handle */
+ 
+ /* USE_WINDOWS_API */ static void
+@@ -1104,7 +1118,16 @@ psf_is_pipe (SF_PRIVATE *psf)
+ 
+ /* USE_WINDOWS_API */ sf_count_t
+ psf_get_filelen_handle (HANDLE handle)
+-{	sf_count_t filelen ;
++{
++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
++	LARGE_INTEGER size;
++
++	if (!GetFileSizeEx(handle, &size) && GetLastError() != NO_ERROR)
++		return (sf_count_t) -1 ;
++
++	return size.QuadPart;
++#else
++	sf_count_t filelen ;
+ 	DWORD dwFileSizeLow, dwFileSizeHigh, dwError = NO_ERROR ;
+ 
+ 	dwFileSizeLow = GetFileSize (handle, &dwFileSizeHigh) ;
+@@ -1118,6 +1141,7 @@ psf_get_filelen_handle (HANDLE handle)
+ 	filelen = dwFileSizeLow + ((__int64) dwFileSizeHigh << 32) ;
+ 
+ 	return filelen ;
++#endif
+ } /* psf_get_filelen_handle */
+ 
+ /* USE_WINDOWS_API */ void
diff --git a/ports/so5extra/CONTROL b/ports/so5extra/CONTROL
index e40d92945..af3be50a0 100644
--- a/ports/so5extra/CONTROL
+++ b/ports/so5extra/CONTROL
@@ -1,4 +1,4 @@
 Source: so5extra
-Version: 1.2.2
+Version: 1.2.3
 Description: A set of additional tools for SObjectizer framework.
 Build-Depends: sobjectizer
diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake
index 6fdc213d7..4bd7e0787 100644
--- a/ports/so5extra/portfile.cmake
+++ b/ports/so5extra/portfile.cmake
@@ -1,12 +1,12 @@
 include(vcpkg_common_functions)
 
-set(VERSION 1.2.2)
+set(VERSION 1.2.3)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so_5_extra-${VERSION}/dev/so_5_extra)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/so_5_extra/so_5_extra-${VERSION}.zip/download"
     FILENAME "so_5_extra-${VERSION}.zip"
-    SHA512 957b8953f172cc2ea996fe1bd4e4979b0e3fd5fe8d2abff810ff3800c061e4bf5e2935e6bf190d0385621a182a7a623598959716451d9ad5a8f0f14faed725e2
+    SHA512 ed12cdae9d23d652cbedd12e37b7faa935ace4c951eb5cb3881306c1384973ac0a90bd59244471a671ec734f6319f0a3144f7a727342c94cec6330eb4195bae9
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL
index bf9868021..27cb2971f 100644
--- a/ports/sobjectizer/CONTROL
+++ b/ports/sobjectizer/CONTROL
@@ -1,3 +1,3 @@
 Source: sobjectizer
-Version: 5.5.24.3
+Version: 5.5.24.4
 Description: SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.
diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake
index 8b1e53be9..659e1192a 100644
--- a/ports/sobjectizer/portfile.cmake
+++ b/ports/sobjectizer/portfile.cmake
@@ -1,12 +1,12 @@
 include(vcpkg_common_functions)
 
-set(VERSION 5.5.24.3)
+set(VERSION 5.5.24.4)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip"
     FILENAME "so-${VERSION}.zip"
-    SHA512 b3421dd2c84d9143a425f2144ce8810a75a55182316107f72513ee931d737e7f86867640010cab0e67ff6d3ea79ebe9eda22b7f1876b632b1575dfc52de3eeef
+    SHA512 83f20091b9aa9ecec08b72a97c9190da7bfbe7cc69076dd70074f814208a2712ec722a8c9e7367ab8a416a5c0d488edebb6066371f7cec5dd566f51ef297b382
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/soci/0001-Deduce-reference-in-boost-fusion-for_each.patch b/ports/soci/0001-Deduce-reference-in-boost-fusion-for_each.patch
new file mode 100644
index 000000000..cab358512
--- /dev/null
+++ b/ports/soci/0001-Deduce-reference-in-boost-fusion-for_each.patch
@@ -0,0 +1,75 @@
+From 5c3b1e0a61d83d7a3c70fb882c7e0918777f0e00 Mon Sep 17 00:00:00 2001
+From: Andrei Lebedev <lebdron@gmail.com>
+Date: Sun, 5 May 2019 19:52:01 +0300
+Subject: [PATCH] Deduce reference in boost::fusion::for_each
+
+Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
+---
+ include/soci/bind-values.h | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/include/soci/bind-values.h b/include/soci/bind-values.h
+index eee416e..e84fb0e 100644
+--- a/include/soci/bind-values.h
++++ b/include/soci/bind-values.h
+@@ -13,6 +13,13 @@
+ #ifdef SOCI_HAVE_BOOST
+ #       include <boost/fusion/algorithm/iteration/for_each.hpp>
+ #       include <boost/mpl/bool.hpp>
++#       include <boost/version.hpp>
++
++#       if BOOST_VERSION >= 106800
++#       define SOCI_BOOST_FUSION_FOREACH_REFERENCE &
++#       else
++#       define SOCI_BOOST_FUSION_FOREACH_REFERENCE
++#       endif
+ #endif // SOCI_HAVE_BOOST
+ #include <vector>
+ 
+@@ -83,13 +90,19 @@ private:
+     template <typename T, typename Indicator>
+     void exchange_(use_container<T, Indicator> const &uc, boost::mpl::true_ * /* fusion sequence */)
+     {
+-        boost::fusion::for_each(uc.t, use_sequence<T, Indicator>(*this, uc.ind));
++        use_sequence<T, Indicator> f(*this, uc.ind);
++        boost::fusion::for_each<T,
++                                use_sequence<T, Indicator>
++                                    SOCI_BOOST_FUSION_FOREACH_REFERENCE>(uc.t, f);
+     }
+ 
+     template <typename T>
+     void exchange_(use_container<T, details::no_indicator> const &uc, boost::mpl::true_ * /* fusion sequence */)
+     {
+-        boost::fusion::for_each(uc.t, use_sequence<T, details::no_indicator>(*this));
++        use_sequence<T, details::no_indicator> f(*this);
++        boost::fusion::for_each<T,
++                                use_sequence<T, details::no_indicator>
++                                    SOCI_BOOST_FUSION_FOREACH_REFERENCE>(uc.t, f);
+     }
+ 
+ #endif // SOCI_HAVE_BOOST
+@@ -173,13 +186,19 @@ private:
+     template <typename T, typename Indicator>
+     void exchange_(into_container<T, Indicator> const &ic, boost::mpl::true_ * /* fusion sequence */)
+     {
+-        boost::fusion::for_each(ic.t, into_sequence<T, Indicator>(*this, ic.ind));
++        into_sequence<T, Indicator> f(*this, ic.ind);
++        boost::fusion::for_each<T,
++                                into_sequence<T, Indicator>
++                                    SOCI_BOOST_FUSION_FOREACH_REFERENCE>(ic.t, f);
+     }
+ 
+     template <typename T>
+     void exchange_(into_container<T, details::no_indicator> const &ic, boost::mpl::true_ * /* fusion sequence */)
+     {
+-        boost::fusion::for_each(ic.t, into_sequence<T, details::no_indicator>(*this));
++        into_sequence<T, details::no_indicator> f(*this);
++        boost::fusion::for_each<T,
++                                into_sequence<T, details::no_indicator>
++                                    SOCI_BOOST_FUSION_FOREACH_REFERENCE>(ic.t, f);
+     }
+ #endif // SOCI_HAVE_BOOST
+ 
+-- 
+2.20.1.windows.1
+
diff --git a/ports/soci/0002-Find-PostgreSQL-debug-library.patch b/ports/soci/0002-Find-PostgreSQL-debug-library.patch
new file mode 100644
index 000000000..fef23b751
--- /dev/null
+++ b/ports/soci/0002-Find-PostgreSQL-debug-library.patch
@@ -0,0 +1,62 @@
+From f1fa9cc84e67c9f28f651b926f55f93d60bbb963 Mon Sep 17 00:00:00 2001
+From: Andrei Lebedev <lebdron@gmail.com>
+Date: Sun, 5 May 2019 21:22:49 +0300
+Subject: [PATCH] Find PostgreSQL debug library
+
+Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
+---
+ cmake/modules/FindPostgreSQL.cmake | 31 +++++++++++++++++++-----------
+ 1 file changed, 20 insertions(+), 11 deletions(-)
+
+diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
+index 48937e2..e2e557b 100644
+--- a/cmake/modules/FindPostgreSQL.cmake
++++ b/cmake/modules/FindPostgreSQL.cmake
+@@ -124,16 +124,21 @@ if ( WIN32 )
+   set (POSTGRESQL_LIBRARY_TO_FIND ${POSTGRESQL_LIB_PREFIX}${POSTGRESQL_LIBRARY_TO_FIND})
+ endif()
+ 
+-find_library(POSTGRESQL_LIBRARY
+- NAMES ${POSTGRESQL_LIBRARY_TO_FIND}
+- PATHS
+-   ${POSTGRESQL_ROOT_DIRECTORIES}
+- PATH_SUFFIXES
+-   lib
+-   ${POSTGRESQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
+- # Help the user find it if we cannot.
+- DOC "The ${POSTGRESQL_LIBRARY_DIR_MESSAGE}"
+-)
++function(__postgresql_find_library _name)
++  find_library(${_name}
++   NAMES ${ARGN}
++   PATHS
++     ${POSTGRESQL_ROOT_DIRECTORIES}
++   PATH_SUFFIXES
++     lib
++     ${POSTGRESQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
++   # Help the user find it if we cannot.
++   DOC "The ${POSTGRESQL_LIBRARY_DIR_MESSAGE}"
++  )
++endfunction()
++
++__postgresql_find_library(POSTGRESQL_LIBRARY ${POSTGRESQL_LIBRARY_TO_FIND})
++__postgresql_find_library(POSTGRESQL_LIBRARY_DEBUG ${POSTGRESQL_LIBRARY_TO_FIND}d)
+ get_filename_component(POSTGRESQL_LIBRARY_DIR ${POSTGRESQL_LIBRARY} PATH)
+ 
+ if (POSTGRESQL_INCLUDE_DIR)
+@@ -169,7 +174,11 @@ set(POSTGRESQL_FOUND  ${POSTGRESQL_FOUND})
+ if(POSTGRESQL_FOUND)
+   set(POSTGRESQL_INCLUDE_DIRS ${POSTGRESQL_INCLUDE_DIR})
+   set(POSTGRESQL_LIBRARY_DIRS ${POSTGRESQL_LIBRARY_DIR})
+-  set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY})
++  if(POSTGRESQL_LIBRARY AND POSTGRESQL_LIBRARY_DEBUG)
++    set(POSTGRESQL_LIBRARIES optimized ${POSTGRESQL_LIBRARY} debug ${POSTGRESQL_LIBRARY_DEBUG})
++  else()
++    set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY})
++  endif()
+   set(POSTGRESQL_VERSION ${POSTGRESQL_VERSION_STRING})
+ endif()
+ 
+-- 
+2.20.1.windows.1
+
diff --git a/ports/soci/CONTROL b/ports/soci/CONTROL
index aaab2490e..33de13eb7 100644
--- a/ports/soci/CONTROL
+++ b/ports/soci/CONTROL
@@ -1,5 +1,5 @@
 Source: soci
-Version: 3.2.3-3
+Version: 3.2.3-4
 Description: SOCI database access library
 
 Feature: boost
diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake
index 1ba4115ae..b70e43d3c 100644
--- a/ports/soci/portfile.cmake
+++ b/ports/soci/portfile.cmake
@@ -5,6 +5,8 @@ vcpkg_from_github(
     REF c15b178a44b99ed3ff7fd953837fb97f6314abb7
     SHA512 037c44f29e80b5ec57046606b4672088917d469e9d2254e3e15253e170026cf0fe17e4f79a4b01df22fe7032708ca87354b1560d9880d4d165cdef869c3c6081
     HEAD_REF master
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Deduce-reference-in-boost-fusion-for_each.patch"
+            "${CMAKE_CURRENT_LIST_DIR}/0002-Find-PostgreSQL-debug-library.patch"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC)
diff --git a/ports/sol2/CONTROL b/ports/sol2/CONTROL
index 9534432da..eaf829c81 100644
--- a/ports/sol2/CONTROL
+++ b/ports/sol2/CONTROL
@@ -1,4 +1,4 @@
 Source: sol2
-Version: 2.20.4
+Version: 2.20.6
 Description: Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great
 Build-Depends: lua (windows)
 \ No newline at end of file
diff --git a/ports/sol2/portfile.cmake b/ports/sol2/portfile.cmake
index 403e9e646..86e653ac6 100644
--- a/ports/sol2/portfile.cmake
+++ b/ports/sol2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ThePhD/sol2
-    REF 7f1c2e3ecfc2b78e396c60e067f6486ae1df66c5
-    SHA512 a7e84d3eca26fb3cd4eb73ce0daa2f6f41136e9e919f27713d2d903ec7793017dfd87e7c4fdf54b9ee9b601da1412dad02a191dd614661dfa96da521dfc58a65
+    REF v2.20.6
+    SHA512 293df11ca2e375e60dfa7fd890b3e06aa58c0fd2f45a5a032515a2251b21e9501a2578bada446dd49b35933b69e52db8dfe8498c011e0fde7ecc0655f63ed4ed
     HEAD_REF develop
 )
 
diff --git a/ports/soundtouch/CONTROL b/ports/soundtouch/CONTROL
index 7ae158b88..012b7c9df 100644
--- a/ports/soundtouch/CONTROL
+++ b/ports/soundtouch/CONTROL
@@ -1,4 +1,4 @@
-Source: soundtouch
-Version: 2.0.0-1
-Description: SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.
-Build-Depends: atlmfc
+Source: soundtouch
+Version: 2.0.0-2
+Description: SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.
+Build-Depends: atlmfc
diff --git a/ports/soundtouch/portfile.cmake b/ports/soundtouch/portfile.cmake
index b7fb1fb45..c9fbd3623 100644
--- a/ports/soundtouch/portfile.cmake
+++ b/ports/soundtouch/portfile.cmake
@@ -1,14 +1,6 @@
 include(vcpkg_common_functions)
 
-# NOTE: SoundTouch has a static c++ version too, but entirely different headers, api, etc
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message(STATUS "Warning: Static building not supported. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "Refusing to build DLL with static CRT linkage.")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "WindowsStore not supported")
diff --git a/ports/spaceland/CONTROL b/ports/spaceland/CONTROL
index 4319a9797..4f885e6eb 100644
--- a/ports/spaceland/CONTROL
+++ b/ports/spaceland/CONTROL
@@ -1,4 +1,4 @@
 Source: spaceland
-Version: 7.8.2-1
+Version: 7.8.2-2
 Description: Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL.
 Build-Depends: zlib
diff --git a/ports/spaceland/portfile.cmake b/ports/spaceland/portfile.cmake
index 5e84296cd..d90ceafd7 100644
--- a/ports/spaceland/portfile.cmake
+++ b/ports/spaceland/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message(STATUS "WARNING: Dynamic building not supported. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sl-7.8.2-Source)
 
@@ -18,10 +15,10 @@ vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     DISABLE_PARALLEL_CONFIGURE
-     OPTIONS
-        -DSL_TEST=OFF
-        -DSL_INSTALL_SLFIND_MODULE=OFF
-    OPTIONS_DEBUG
+	OPTIONS
+		-DSL_TEST=OFF
+		-DSL_INSTALL_SLFIND_MODULE=OFF
+	OPTIONS_DEBUG
         -DSL_TEST=OFF
         -DSL_INSTALL_SLFIND_MODULE=OFF
 )
diff --git a/ports/span-lite/CONTROL b/ports/span-lite/CONTROL
new file mode 100644
index 000000000..e7001a83a
--- /dev/null
+++ b/ports/span-lite/CONTROL
@@ -0,0 +1,3 @@
+Source: span-lite
+Version: 0.5.0
+Description: A C++20-like span for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/span-lite/portfile.cmake b/ports/span-lite/portfile.cmake
new file mode 100644
index 000000000..ad53591bd
--- /dev/null
+++ b/ports/span-lite/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinmoene/span-lite
+    REF v0.5.0
+    SHA512 4221d9897736257077b8ff6a5246d70315bebb975a30a119778f22c1859d14cca5e3035447561ca9684bef6dbca5a00b3b5ca208dada4fcf1f3b31df2aa0cb1f
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DSPAN_LITE_OPT_BUILD_TESTS=OFF
+        -DSPAN_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/sparsepp/CONTROL b/ports/sparsepp/CONTROL
index 6606595e8..86550179a 100644
--- a/ports/sparsepp/CONTROL
+++ b/ports/sparsepp/CONTROL
@@ -1,3 +1,3 @@
 Source: sparsepp
-Version: 1.22
+Version: 1.22-1
 Description: A fast, memory efficient hash map for C++
diff --git a/ports/sparsepp/portfile.cmake b/ports/sparsepp/portfile.cmake
index 01822ea16..a98e1a6e6 100644
--- a/ports/sparsepp/portfile.cmake
+++ b/ports/sparsepp/portfile.cmake
@@ -1,6 +1,8 @@
 
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO greg7mdp/sparsepp
@@ -15,8 +17,6 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
         PREFER_NINJA
-        OPTIONS
-            -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 # Note: we could add: OPTIONS_DEBUG  -DDISABLE_INSTALL_HEADERS=ON
diff --git a/ports/spdk-dpdk/CMakeLists.txt b/ports/spdk-dpdk/CMakeLists.txt
new file mode 100644
index 000000000..1952227ae
--- /dev/null
+++ b/ports/spdk-dpdk/CMakeLists.txt
@@ -0,0 +1,63 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
+PROJECT(dpdk C)
+
+LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}")
+
+INCLUDE(ProcessorCount)
+PROCESSORCOUNT(PROCS)
+
+#ARCH can be: i686, x86_64, ppc_64, arm64
+#MACHINE can be: native, power8, armv8a
+#EXECENV can be: linuxapp, bsdapp
+#TOOLCHAIN can be: gcc, icc
+
+SET(ARCH x86_64)
+SET(MACHINE native)
+SET(EXECENV linuxapp)
+SET(TOOLCHAIN gcc)
+
+IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
+    SET(ARCH "i686")
+ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+    SET(MACHINE arm8a)
+ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
+    SET(MACHINE power8)
+    SET(ARCH ppc_64)
+ENDIF ()
+
+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    SET(EXECENV bsdapp)
+ENDIF ()
+
+FIND_PACKAGE(Numa REQUIRED)
+FIND_PROGRAM(MAKE make)
+
+SET(DPDK_CFLAGS "-fPIC")
+IF (CMAKE_BUILD_TYPE STREQUAL Debug)
+    STRING(APPEND ${DPDK_CFLAGS} "-O0 -g")
+ENDIF ()
+
+SET(DPDK_TARGET ${ARCH}-${MACHINE}-${EXECENV}-${TOOLCHAIN})
+#SET(DPDK_CONFIG O=${CMAKE_BUILD_TYPE}/build T=${DPDK_TARGET})
+SET(DPDK_CONFIG "T=${DPDK_TARGET}")
+
+IF (SOURCE_PATH)
+    SET(CMAKE_SOURCE_DIR ${SOURCE_PATH})
+ENDIF ()
+
+ADD_CUSTOM_TARGET(dpdk-configure
+                  COMMAND ${MAKE} config ${DPDK_CONFIG}
+                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/
+                  VERBATIM
+                  )
+
+ADD_CUSTOM_TARGET(dpdk ALL
+                  COMMAND ${MAKE} EXTRA_CFLAGS=\"${DPDK_CFLAGS}\" MAKEFLAGS=\"${DPDK_CONFIG} -j ${PROCS}\"
+                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/
+                  )
+
+ADD_DEPENDENCIES(dpdk dpdk-configure)
+
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/build/lib
+        DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/)
diff --git a/ports/spdk-dpdk/CONTROL b/ports/spdk-dpdk/CONTROL
new file mode 100644
index 000000000..02647149a
--- /dev/null
+++ b/ports/spdk-dpdk/CONTROL
@@ -0,0 +1,4 @@
+Source: spdk-dpdk
+Version: 20181124
+Description: SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing
+
diff --git a/ports/spdk-dpdk/FindNuma.cmake b/ports/spdk-dpdk/FindNuma.cmake
new file mode 100644
index 000000000..d5bb61435
--- /dev/null
+++ b/ports/spdk-dpdk/FindNuma.cmake
@@ -0,0 +1,26 @@
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PATH(NUMA_ROOT_DIR
+          NAMES include/numa.h
+          PATHS ENV NUMA_ROOT
+          DOC "NUMA library root directory")
+
+FIND_PATH(NUMA_INCLUDE_DIR
+          NAMES numa.h
+          HINTS ${NUMA_ROOT_DIR}
+          PATH_SUFFIXES include
+          DOC "NUMA include directory")
+
+FIND_LIBRARY(NUMA_LIBRARY
+             NAMES numa
+             HINTS ${NUMA_ROOT_DIR}
+             DOC "NUMA library file")
+
+IF (NUMA_LIBRARY)
+    GET_FILENAME_COMPONENT(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH)
+    MARK_AS_ADVANCED(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY)
+ELSE ()
+    SET(NUMA_FOUND FALSE)
+    MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)")
+ENDIF ()
diff --git a/ports/spdk-dpdk/portfile.cmake b/ports/spdk-dpdk/portfile.cmake
new file mode 100644
index 000000000..0a120e4e5
--- /dev/null
+++ b/ports/spdk-dpdk/portfile.cmake
@@ -0,0 +1,47 @@
+INCLUDE(vcpkg_common_functions)
+
+IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    MESSAGE(FATAL_ERROR "Intel dpdk currently only supports Linux/BSD platforms")
+ENDIF ()
+
+VCPKG_FROM_GITHUB(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO spdk/dpdk
+        REF spdk-18.11
+        SHA512 9c069bb0e445f8287ee056452fa32263746f78e27377e8fd75809b9ebf7f25c2395ee13ae4804d8c464e5bc7db7335692759ab3202748dd0c82243aad35e5e7c
+        HEAD_REF master
+)
+
+FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h
+          PATHS ENV NUMA_ROOT
+          HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include
+          )
+IF (NOT NUMA_INCLUDE_DIR)
+    MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)")
+ENDIF ()
+
+VCPKG_CONFIGURE_CMAKE(
+        SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
+        PREFER_NINJA
+        OPTIONS
+        -DSOURCE_PATH=${SOURCE_PATH}
+)
+
+VCPKG_INSTALL_CMAKE()
+
+# Headers are symbolic links here, gather all, resolve and copy real files
+FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*")
+SET(REAL_FILES "")
+FOREACH (HEADER ${HEADERS})
+    GET_FILENAME_COMPONENT(REAL_FILE "${HEADER}" REALPATH)
+    LIST(APPEND REAL_FILES "${REAL_FILE}")
+ENDFOREACH ()
+
+FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk)
+FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk)
+FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
+FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT})
diff --git a/ports/spdk-dpdk/spdk-dpdkConfig.cmake b/ports/spdk-dpdk/spdk-dpdkConfig.cmake
new file mode 100644
index 000000000..85b850812
--- /dev/null
+++ b/ports/spdk-dpdk/spdk-dpdkConfig.cmake
@@ -0,0 +1,31 @@
+
+FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR)
+    ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED)
+    SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES
+                          IMPORTED_CONFIGURATIONS "RELEASE;DEBUG"
+                          IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}"
+                          IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}"
+                          INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}"
+                          )
+    SET(${NAMESPACE}_${LIB_NAME}_FOUND 1)
+ENDFUNCTION()
+
+GET_FILENAME_COMPONENT(DPDK_ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH)
+GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH)
+GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH)
+
+SET_LIBRARY_TARGET("SPDK" "dpdk" "${DPDK_ROOT}/debug/lib/spdk/libdpdk.a" "${DPDK_ROOT}/lib/spdk/libdpdk.a" "${DPDK_ROOT}/include/spdk-dpdk")
+
+IF (CMAKE_BUILD_TYPE STREQUAL Debug)
+    LINK_DIRECTORIES(${DPDK_ROOT}/debug/lib/spdk)
+ELSE ()
+    LINK_DIRECTORIES(${DPDK_ROOT}/lib/spdk)
+ENDIF ()
+
+FILE(GLOB DPDK_LIBS ${DPDK_ROOT}/lib/spdk/librte*.*)
+FOREACH (LIB_FILE_NAME ${DPDK_LIBS})
+    GET_FILENAME_COMPONENT(LIB_NAME ${LIB_FILE_NAME} NAME_WE)
+    GET_FILENAME_COMPONENT(FULL_LIB_NAME ${LIB_FILE_NAME} NAME)
+    STRING(REPLACE "lib" "" LIB_NAME "${LIB_NAME}")
+    SET_LIBRARY_TARGET("SPDK" "${LIB_NAME}" "${DPDK_ROOT}/debug/lib/spdk/${FULL_LIB_NAME}" "${DPDK_ROOT}/lib/spdk/${FULL_LIB_NAME}" "${DPDK_ROOT}/include/spdk-dpdk")
+ENDFOREACH ()
diff --git a/ports/spdk-dpdk/usage b/ports/spdk-dpdk/usage
new file mode 100644
index 000000000..4fc9ddf25
--- /dev/null
+++ b/ports/spdk-dpdk/usage
@@ -0,0 +1 @@
+This package is a dependency of SPDK port. It is not intended for direct consumption by end-user.
+\ No newline at end of file
diff --git a/ports/spdk-ipsec/CMakeLists.txt b/ports/spdk-ipsec/CMakeLists.txt
new file mode 100644
index 000000000..4d778eb30
--- /dev/null
+++ b/ports/spdk-ipsec/CMakeLists.txt
@@ -0,0 +1,59 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
+PROJECT(ipsec C)
+
+IF (SOURCE_PATH)
+    SET(CMAKE_SOURCE_DIR ${SOURCE_PATH})
+ENDIF ()
+
+INCLUDE(ProcessorCount)
+PROCESSORCOUNT(PROCS)
+
+FIND_PROGRAM(NASM nasm)
+IF (NOT NASM)
+    MESSAGE(FATAL_ERROR "NASM not found")
+ENDIF ()
+
+FIND_PROGRAM(MAKE make)
+IF (NOT MAKE)
+    MESSAGE(FATAL_ERROR "MAKE not found")
+ENDIF ()
+
+IF (EXEC_ENV STREQUAL "Windows")
+    FIND_PROGRAM(MAKE nmake)
+    IF (NOT MAKE)
+        MESSAGE(FATAL_ERROR "nmake not found")
+    ENDIF ()
+ENDIF ()
+
+SET(MAKE_FLAGS)
+
+IF (EXEC_ENV STREQUAL Windows)
+    LIST(APPEND MAKE_FLAGS /f win_x64.mak)
+ENDIF ()
+
+IF (CMAKE_BUILD_TYPE STREQUAL Debug)
+    LIST(APPEND MAKE_FLAGS DEBUG=y)
+ENDIF ()
+
+IF (LIBRARY_LINKAGE STREQUAL "static")
+    LIST(APPEND MAKE_FLAGS SHARED=n)
+ENDIF ()
+
+MESSAGE(STATUS "${MAKE_FLAGS}")
+ADD_CUSTOM_TARGET(ipsec-mb ALL
+                  COMMAND ${MAKE} -j ${MAKE_FLAGS}
+                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/
+#                  VERBATIM
+                  )
+
+SET(LIB_PATH ${CMAKE_SOURCE_DIR}/)
+IF (LIBRARY_LINKAGE STREQUAL "dynamic")
+    STRING(APPEND LIB_PATH libIPSec_MB.so)
+ELSEIF (LIBRARY_LINKAGE STREQUAL "static")
+    STRING(APPEND LIB_PATH libIPSec_MB.a)
+ELSE ()
+    MESSAGE(FATAL_ERROR "Unknown linkage type ${LIBRARY_LINKAGE}")
+ENDIF ()
+INSTALL(FILES ${LIB_PATH}
+        DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/)
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/)
diff --git a/ports/spdk-ipsec/CONTROL b/ports/spdk-ipsec/CONTROL
new file mode 100644
index 000000000..3f8e1a034
--- /dev/null
+++ b/ports/spdk-ipsec/CONTROL
@@ -0,0 +1,4 @@
+Source: spdk-ipsec
+Version: 20180711
+Description: SPDK mirror of ipsec. Intel(R) Multi-Buffer Crypto for IPsec Library
+
diff --git a/ports/spdk-ipsec/portfile.cmake b/ports/spdk-ipsec/portfile.cmake
new file mode 100644
index 000000000..d91b6d0e7
--- /dev/null
+++ b/ports/spdk-ipsec/portfile.cmake
@@ -0,0 +1,62 @@
+INCLUDE(vcpkg_common_functions)
+
+IF (NOT VCPKG_CMAKE_SYSTEM_NAME)
+    SET(EXEC_ENV "Windows")
+ELSE ()
+    SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}")
+ENDIF ()
+
+IF (NOT EXEC_ENV STREQUAL "Linux")
+    MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports Linux/Windows platforms")
+    MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows")
+ENDIF ()
+
+IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+    MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports x64 architecture")
+ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+ENDIF ()
+
+VCPKG_FROM_GITHUB(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO spdk/intel-ipsec-mb
+        REF spdk
+        SHA512 037fc382d9aa87b6645309f29cb761a584ed855c583638c9e27b5b7200ceb2ae21ad5adcc7c92b2b1d1387186a7fd2b5ae22f337a8f52dea3f6c35d8f90b42bd
+        HEAD_REF master
+)
+
+VCPKG_FIND_ACQUIRE_PROGRAM(NASM)
+
+EXEC_PROGRAM(${NASM}
+             ARGS -v
+             OUTPUT_VARIABLE NASM_OUTPUT
+             )
+STRING(REGEX REPLACE "NASM version ([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1"
+       NASM_VERSION
+       ${NASM_OUTPUT})
+IF (NASM_VERSION VERSION_LESS 2.13.03)
+    MESSAGE(FATAL_ERROR "NASM version 2.13.03 (or newer) is required to build this package")
+ENDIF ()
+
+GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY)
+SET(ENV{PATH} " $ENV{PATH};${NASM_PATH} ")
+
+VCPKG_CONFIGURE_CMAKE(
+        SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
+        PREFER_NINJA
+        OPTIONS
+        -DSOURCE_PATH=${SOURCE_PATH}
+        -DEXEC_ENV=${VCPKG_CMAKE_SYSTEM_NAME}
+        -DLIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE}
+)
+
+VCPKG_INSTALL_CMAKE()
+
+FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk)
+FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk)
+FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
+FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-ipsecConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT})
diff --git a/ports/spdk-ipsec/spdk-ipsecConfig.cmake b/ports/spdk-ipsec/spdk-ipsecConfig.cmake
new file mode 100644
index 000000000..60777b959
--- /dev/null
+++ b/ports/spdk-ipsec/spdk-ipsecConfig.cmake
@@ -0,0 +1,17 @@
+
+FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR)
+    ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED)
+    SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES
+                          IMPORTED_CONFIGURATIONS "RELEASE;DEBUG"
+                          IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}"
+                          IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}"
+                          INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}"
+                          )
+    SET(${NAMESPACE}_${LIB_NAME}_FOUND 1)
+ENDFUNCTION()
+
+GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH)
+GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH)
+GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH)
+
+SET_LIBRARY_TARGET("SPDK" "ipsec" "${ROOT}/debug/lib/spdk/libIPSec_MB.a" "${ROOT}/lib/spdk/libIPSec_MB.a" "${ROOT}/include/spdk-ipsec")
diff --git a/ports/spdk-ipsec/usage b/ports/spdk-ipsec/usage
new file mode 100644
index 000000000..4fc9ddf25
--- /dev/null
+++ b/ports/spdk-ipsec/usage
@@ -0,0 +1 @@
+This package is a dependency of SPDK port. It is not intended for direct consumption by end-user.
+\ No newline at end of file
diff --git a/ports/spdk-isal/CMakeLists.txt b/ports/spdk-isal/CMakeLists.txt
new file mode 100644
index 000000000..c2623d387
--- /dev/null
+++ b/ports/spdk-isal/CMakeLists.txt
@@ -0,0 +1,56 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
+PROJECT(isal C)
+
+IF (SOURCE_PATH)
+    SET(CMAKE_SOURCE_DIR ${SOURCE_PATH})
+ENDIF ()
+
+INCLUDE(ProcessorCount)
+PROCESSORCOUNT(PROCS)
+
+FIND_PROGRAM(NASM nasm)
+IF (NOT NASM)
+    MESSAGE(FATAL_ERROR "NASM not found")
+ENDIF ()
+
+FIND_PROGRAM(YASM yasm)
+IF (NOT YASM)
+    MESSAGE(FATAL_ERROR "YASM not found")
+ENDIF ()
+
+IF (EXEC_ENV STREQUAL "Windows")
+    FIND_PROGRAM(MAKE nmake)
+    IF (NOT MAKE)
+        MESSAGE(FATAL_ERROR "nmake not found")
+    ENDIF ()
+ELSEIF(EXEC_ENV STREQUAL "Linux")
+	FIND_PROGRAM(MAKE make)
+	IF (NOT MAKE)
+		MESSAGE(FATAL_ERROR "MAKE not found")
+	ENDIF ()
+ENDIF()
+
+SET(MAKE_FLAGS "-f")
+
+IF (EXEC_ENV STREQUAL Windows)
+    STRING(APPEND MAKE_FLAGS " Makefile.nmake /E CC=cl AS=nasm")
+ELSEIF (EXEC_ENV STREQUAL Linux)
+    STRING(APPEND MAKE_FLAGS "Makefile.unx")
+ENDIF ()
+
+ADD_CUSTOM_TARGET(isal ALL
+                  COMMAND ${MAKE} ${MAKE_FLAGS}
+                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/
+                  )
+
+SET(LIB_PATH ${CMAKE_SOURCE_DIR}/bin/)
+IF (LIBRARY_LINKAGE STREQUAL "dynamic")
+    STRING(APPEND LIB_PATH isal.so)
+ELSEIF (LIBRARY_LINKAGE STREQUAL "static")
+    STRING(APPEND LIB_PATH isa-l.a)
+ELSE ()
+    MESSAGE(FATAL_ERROR "Unknown linkage type ${LIBRARY_LINKAGE}")
+ENDIF ()
+INSTALL(FILES ${LIB_PATH}
+        DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/)
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/)
+\ No newline at end of file
diff --git a/ports/spdk-isal/CONTROL b/ports/spdk-isal/CONTROL
new file mode 100644
index 000000000..abfbe3de0
--- /dev/null
+++ b/ports/spdk-isal/CONTROL
@@ -0,0 +1,4 @@
+Source: spdk-isal
+Version: 20181006
+Description: SPDK mirror of isa-l. Intel(R) Intelligent Storage Acceleration Library
+
diff --git a/ports/spdk-isal/portfile.cmake b/ports/spdk-isal/portfile.cmake
new file mode 100644
index 000000000..530d8da83
--- /dev/null
+++ b/ports/spdk-isal/portfile.cmake
@@ -0,0 +1,52 @@
+INCLUDE(vcpkg_common_functions)
+
+IF (NOT VCPKG_CMAKE_SYSTEM_NAME)
+    SET(EXEC_ENV "Windows")
+ELSE ()
+    SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}")
+ENDIF ()
+
+IF (NOT EXEC_ENV STREQUAL "Linux")
+    MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports Linux platforms")
+    MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows")
+ENDIF ()
+
+IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+    MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports x64 architecture")
+ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+ENDIF ()
+
+VCPKG_FROM_GITHUB(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO spdk/isa-l
+        REF spdk
+        SHA512 1d170ed050fb612816c77b3586f1cdce9129eedc559e3fcefc983ede05b6c8e13a52e400ee6935f5da6ab045a899c97f6ed6be3a79691284e211ea8a6d697f7c
+        HEAD_REF master
+)
+
+VCPKG_FIND_ACQUIRE_PROGRAM(NASM)
+GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY)
+SET(ENV{PATH} "$ENV{PATH};${NASM_PATH}")
+
+VCPKG_FIND_ACQUIRE_PROGRAM(YASM)
+
+VCPKG_CONFIGURE_CMAKE(
+        SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
+        PREFER_NINJA
+        OPTIONS
+        -DSOURCE_PATH=${SOURCE_PATH}
+        -DEXEC_ENV:STRING=${EXEC_ENV}
+        -DLIBRARY_LINKAGE:STRING=${VCPKG_LIBRARY_LINKAGE}
+)
+
+VCPKG_INSTALL_CMAKE()
+
+FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk)
+FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk)
+FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
+FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-isalConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT})
diff --git a/ports/spdk-isal/spdk-isalConfig.cmake b/ports/spdk-isal/spdk-isalConfig.cmake
new file mode 100644
index 000000000..f14282ff1
--- /dev/null
+++ b/ports/spdk-isal/spdk-isalConfig.cmake
@@ -0,0 +1,17 @@
+
+FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR)
+    ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED)
+    SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES
+                          IMPORTED_CONFIGURATIONS "RELEASE;DEBUG"
+                          IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}"
+                          IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}"
+                          INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}"
+                          )
+    SET(${NAMESPACE}_${LIB_NAME}_FOUND 1)
+ENDFUNCTION()
+
+GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH)
+GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH)
+GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH)
+
+SET_LIBRARY_TARGET("SPDK" "isal" "${ROOT}/debug/lib/spdk/isa-l.a" "${ROOT}/lib/spdk/isa-l.a" "${ROOT}/include/spdk-isal")
diff --git a/ports/spdk-isal/usage b/ports/spdk-isal/usage
new file mode 100644
index 000000000..4fc9ddf25
--- /dev/null
+++ b/ports/spdk-isal/usage
@@ -0,0 +1 @@
+This package is a dependency of SPDK port. It is not intended for direct consumption by end-user.
+\ No newline at end of file
diff --git a/ports/spdk/CMakeLists.txt b/ports/spdk/CMakeLists.txt
new file mode 100644
index 000000000..dabc61c5a
--- /dev/null
+++ b/ports/spdk/CMakeLists.txt
@@ -0,0 +1,45 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
+PROJECT(spdk C)
+
+LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}")
+
+FIND_PACKAGE(Numa REQUIRED)
+FIND_PACKAGE(uuid REQUIRED)
+FIND_PACKAGE(ibverbs REQUIRED)
+FIND_PACKAGE(RDMA REQUIRED)
+FIND_PACKAGE(OpenSSL REQUIRED)
+FIND_PACKAGE(Python COMPONENTS Interpreter REQUIRED)
+
+FIND_PROGRAM(MAKE make)
+
+IF (SOURCE_PATH)
+    SET(CMAKE_SOURCE_DIR ${SOURCE_PATH})
+ENDIF ()
+
+SET(SPDK_CONFIG --disable-tests --with-rdma --without-isal --with-dpdk=${CMAKE_SOURCE_DIR}/../../../spdk-dpdk/src/spdk-18.11-411c51fb97/build)
+# No option to define path for isa-l (--with-isal=${CMAKE_SOURCE_DIR}/../../../spdk-isal/src/spdk-d34ebb51cd)
+IF (CMAKE_BUILD_TYPE STREQUAL Debug)
+    LIST(APPEND ${SPDK_CONFIG} --enable-debug)
+ENDIF ()
+
+SET(DPDK_CONFIG "-fPIC")
+IF (CMAKE_BUILD_TYPE STREQUAL Debug)
+    STRING(APPEND ${DPDK_CONFIG} "-O0 -g")
+ENDIF ()
+
+ADD_CUSTOM_TARGET(spdk-configure
+                  COMMAND ./configure ${SPDK_CONFIG}
+                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/
+                  VERBATIM
+                  )
+
+ADD_CUSTOM_TARGET(spdk ALL
+                  COMMAND ${MAKE} -j DPDK_CFLAGS=${DPDK_CONFIG}
+                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/
+                  )
+
+ADD_DEPENDENCIES(spdk spdk-configure)
+
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/build/lib
+        DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/)
diff --git a/ports/spdk/CONTROL b/ports/spdk/CONTROL
new file mode 100644
index 000000000..5e2cf3ca2
--- /dev/null
+++ b/ports/spdk/CONTROL
@@ -0,0 +1,4 @@
+Source: spdk
+Version: 19.01.1
+Description: Storage Performance Development Kit
+Build-Depends: spdk-dpdk, spdk-ipsec, spdk-isal
+\ No newline at end of file
diff --git a/ports/spdk/FindNuma.cmake b/ports/spdk/FindNuma.cmake
new file mode 100644
index 000000000..d5bb61435
--- /dev/null
+++ b/ports/spdk/FindNuma.cmake
@@ -0,0 +1,26 @@
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PATH(NUMA_ROOT_DIR
+          NAMES include/numa.h
+          PATHS ENV NUMA_ROOT
+          DOC "NUMA library root directory")
+
+FIND_PATH(NUMA_INCLUDE_DIR
+          NAMES numa.h
+          HINTS ${NUMA_ROOT_DIR}
+          PATH_SUFFIXES include
+          DOC "NUMA include directory")
+
+FIND_LIBRARY(NUMA_LIBRARY
+             NAMES numa
+             HINTS ${NUMA_ROOT_DIR}
+             DOC "NUMA library file")
+
+IF (NUMA_LIBRARY)
+    GET_FILENAME_COMPONENT(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH)
+    MARK_AS_ADVANCED(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY)
+ELSE ()
+    SET(NUMA_FOUND FALSE)
+    MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)")
+ENDIF ()
diff --git a/ports/spdk/FindRDMA.cmake b/ports/spdk/FindRDMA.cmake
new file mode 100644
index 000000000..b84ec123e
--- /dev/null
+++ b/ports/spdk/FindRDMA.cmake
@@ -0,0 +1,32 @@
+FIND_PATH(RDMA_INCLUDE_DIR rdma/rdma_cma.h
+          /usr/include
+          /usr/include/linux
+          /usr/local/include
+          )
+
+FIND_LIBRARY(RDMA_LIBRARY NAMES rdmacm
+             PATHS
+             /usr/lib
+             /usr/local/lib
+             /usr/lib64
+             /usr/local/lib64
+             /lib/i386-linux-gnu
+             /lib/x86_64-linux-gnu
+             /usr/lib/x86_64-linux-gnu
+             )
+
+INCLUDE(FindPackageHandleStandardArgs)
+IF (APPLE)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(RDMA DEFAULT_MSG
+                                      RDMA_INCLUDE_DIR)
+ELSE ()
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(RDMA DEFAULT_MSG
+                                      RDMA_LIBRARY RDMA_INCLUDE_DIR)
+ENDIF ()
+
+MARK_AS_ADVANCED(RDMA_INCLUDE_DIR RDMA_LIBRARY)
+
+IF (NOT RDMA_LIBRARY)
+    SET(RDMA_FOUND FALSE)
+    MESSAGE(FATAL_ERROR "RDMA library not found.\nTry: 'sudo yum install librdmacm-devel librdmacm' (or sudo apt-get install librdmacm-dev librdmacm1)")
+ENDIF ()
diff --git a/ports/spdk/Findibverbs.cmake b/ports/spdk/Findibverbs.cmake
new file mode 100644
index 000000000..c018df19d
--- /dev/null
+++ b/ports/spdk/Findibverbs.cmake
@@ -0,0 +1,34 @@
+# Find the ibverbs libraries
+#
+# The following variables are optionally searched for defaults
+#  IBVERBS_ROOT_DIR: Base directory where all ibverbs components are found
+#  IBVERBS_INCLUDE_DIR: Directory where ibverbs headers are found
+#  IBVERBS_LIB_DIR: Directory where ibverbs libraries are found
+
+# The following are set after configuration is done:
+#  IBVERBS_FOUND
+#  IBVERBS_INCLUDE_DIRS
+#  IBVERBS_LIBRARIES
+
+FIND_PATH(IBVERBS_INCLUDE_DIRS
+          NAMES infiniband/verbs.h
+          HINTS
+          ${IBVERBS_INCLUDE_DIR}
+          ${IBVERBS_ROOT_DIR}
+          ${IBVERBS_ROOT_DIR}/include)
+
+FIND_LIBRARY(IBVERBS_LIBRARIES
+             NAMES ibverbs
+             HINTS
+             ${IBVERBS_LIB_DIR}
+             ${IBVERBS_ROOT_DIR}
+             ${IBVERBS_ROOT_DIR}/lib)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ibverbs DEFAULT_MSG IBVERBS_INCLUDE_DIRS IBVERBS_LIBRARIES)
+MARK_AS_ADVANCED(IBVERBS_INCLUDE_DIR IBVERBS_LIBRARIES)
+
+IF (NOT IBVERBS_LIBRARIES)
+    SET(IBVERBS_FOUND FALSE)
+    MESSAGE(FATAL_ERROR "ibverbs library not found.\nTry: 'sudo yum install libibverbs-devel  libibverbs' (or sudo apt-get install libibverbs-dev  libibverbs1)")
+ENDIF ()
diff --git a/ports/spdk/Finduuid.cmake b/ports/spdk/Finduuid.cmake
new file mode 100644
index 000000000..2bd54af78
--- /dev/null
+++ b/ports/spdk/Finduuid.cmake
@@ -0,0 +1,49 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FIND_PATH(UUID_INCLUDE_DIR uuid/uuid.h
+          /usr/include
+          /usr/include/linux
+          /usr/local/include
+          )
+
+FIND_LIBRARY(UUID_LIBRARY NAMES uuid
+             PATHS
+             /usr/lib
+             /usr/local/lib
+             /usr/lib64
+             /usr/local/lib64
+             /lib/i386-linux-gnu
+             /lib/x86_64-linux-gnu
+             /usr/lib/x86_64-linux-gnu
+             )
+
+INCLUDE(FindPackageHandleStandardArgs)
+IF (APPLE)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(UUID DEFAULT_MSG
+                                      UUID_INCLUDE_DIR)
+ELSE ()
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(UUID DEFAULT_MSG
+                                      UUID_LIBRARY UUID_INCLUDE_DIR)
+ENDIF ()
+
+MARK_AS_ADVANCED(UUID_INCLUDE_DIR UUID_LIBRARY)
+
+IF (NOT UUID_LIBRARY)
+    SET(UUID_FOUND FALSE)
+    MESSAGE(FATAL_ERROR "UUID library not found.\nTry: 'sudo yum install libuuid uuid-devel' (or sudo apt-get install libuuid1 uuid-dev)")
+ENDIF ()
diff --git a/ports/spdk/portfile.cmake b/ports/spdk/portfile.cmake
new file mode 100644
index 000000000..cc5e82989
--- /dev/null
+++ b/ports/spdk/portfile.cmake
@@ -0,0 +1,42 @@
+INCLUDE(vcpkg_common_functions)
+
+IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    MESSAGE(FATAL_ERROR "Intel spdk currently only supports Linux/BSD platforms")
+ENDIF ()
+
+VCPKG_FROM_GITHUB(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO spdk/spdk
+        REF v19.01.1
+        SHA512 cb2c085e1a5d370df60599aaeb6302f8252626342a9e0644018df8c769f406304591680f905572848390c3139e640496f96e3b4fc67469c56eb9a5329aee4b24
+        HEAD_REF master
+)
+
+FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h
+          PATHS ENV NUMA_ROOT
+          HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include
+          )
+IF (NOT NUMA_INCLUDE_DIR)
+    MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)")
+ENDIF ()
+
+VCPKG_CONFIGURE_CMAKE(
+        SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
+        PREFER_NINJA
+        OPTIONS
+        -DSOURCE_PATH=${SOURCE_PATH}
+)
+
+VCPKG_INSTALL_CMAKE()
+
+FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+FILE(INSTALL ${SOURCE_PATH}/include/spdk DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
+FILE(INSTALL ${SOURCE_PATH}/scripts/setup.sh DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts)
+FILE(INSTALL ${SOURCE_PATH}/scripts/common.sh DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts)
+FILE(INSTALL ${SOURCE_PATH}/include/spdk/pci_ids.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/include/spdk)
+FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT})
diff --git a/ports/spdk/spdkConfig.cmake b/ports/spdk/spdkConfig.cmake
new file mode 100644
index 000000000..7db413800
--- /dev/null
+++ b/ports/spdk/spdkConfig.cmake
@@ -0,0 +1,29 @@
+
+FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR)
+    ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED)
+    SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES
+                          IMPORTED_CONFIGURATIONS "RELEASE;DEBUG"
+                          IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}"
+                          IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}"
+                          INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}"
+                          )
+    SET(${NAMESPACE}_${LIB_NAME}_FOUND 1)
+ENDFUNCTION()
+
+GET_FILENAME_COMPONENT(SPDK_ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH)
+GET_FILENAME_COMPONENT(SPDK_ROOT "${SPDK_ROOT}" PATH)
+GET_FILENAME_COMPONENT(SPDK_ROOT "${SPDK_ROOT}" PATH)
+
+IF (CMAKE_BUILD_TYPE STREQUAL Debug)
+    LINK_DIRECTORIES(${SPDK_ROOT}/debug/lib/)
+ELSE ()
+    LINK_DIRECTORIES(${SPDK_ROOT}/lib/)
+ENDIF ()
+
+FILE(GLOB SPDK_LIBS ${SPDK_ROOT}/lib/libspdk*.*)
+FOREACH (LIB_FILE_NAME ${SPDK_LIBS})
+    GET_FILENAME_COMPONENT(LIB_NAME ${LIB_FILE_NAME} NAME_WE)
+    GET_FILENAME_COMPONENT(FULL_LIB_NAME ${LIB_FILE_NAME} NAME)
+    STRING(REPLACE "lib" "" LIB_NAME "${LIB_NAME}")
+    SET_LIBRARY_TARGET("SPDK" "${LIB_NAME}" "${SPDK_ROOT}/debug/lib/${FULL_LIB_NAME}" "${SPDK_ROOT}/lib/${FULL_LIB_NAME}" "${SPDK_ROOT}/include/spdk")
+ENDFOREACH ()
diff --git a/ports/spdk/usage b/ports/spdk/usage
new file mode 100644
index 000000000..6e791c3fe
--- /dev/null
+++ b/ports/spdk/usage
@@ -0,0 +1,44 @@
+The package spdk is compatible with built-in CMake targets:
+
+Add following to build examples/nvme/perf/perf.c
+
+    FIND_PACKAGE(spdk CONFIG REQUIRED)
+    FIND_PACKAGE(spdk-dpdk CONFIG REQUIRED)
+
+    ADD_EXECUTABLE(SPDKTest perf.c)
+
+    TARGET_LINK_DIRECTORIES(SPDKTest PRIVATE ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/spdk)
+    TARGET_LINK_LIBRARIES(SPDKTest PRIVATE
+                          SPDK::spdk_app_rpc
+                          SPDK::spdk_bdev
+                          SPDK::spdk_bdev_null
+                          SPDK::spdk_bdev_rpc
+                          SPDK::spdk_conf
+                          SPDK::spdk_copy
+                          SPDK::spdk_thread
+                          SPDK::spdk_event
+                          SPDK::spdk_event_bdev
+                          SPDK::spdk_event_copy
+                          SPDK::spdk_event_net
+                          SPDK::spdk_net
+                          SPDK::spdk_nvmf
+                          SPDK::spdk_nvme
+                          SPDK::spdk_sock_posix
+                          SPDK::spdk_sock
+                          SPDK::spdk_rpc
+                          SPDK::spdk_jsonrpc
+                          SPDK::spdk_json
+                          SPDK::spdk_trace
+                          SPDK::spdk_util
+                          SPDK::spdk_log
+                          SPDK::spdk_env_dpdk
+                          SPDK::dpdk
+                          numa
+                          rdmacm
+                          uuid
+                          ibverbs
+                          pthread
+                          dl
+                          )
+
+Configuration script can be found at: ${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts
diff --git a/ports/spectra/CONTROL b/ports/spectra/CONTROL
index a53636ce7..b6380bdd9 100644
--- a/ports/spectra/CONTROL
+++ b/ports/spectra/CONTROL
@@ -1,4 +1,4 @@
 Source: spectra
-Version: 0.7.0
+Version: 0.8.0
 Description: A header-only C++ library for large scale eigenvalue problems https://spectralib.org
 Build-Depends: eigen3
diff --git a/ports/spectra/portfile.cmake b/ports/spectra/portfile.cmake
index 66765259a..94ac9b4d7 100644
--- a/ports/spectra/portfile.cmake
+++ b/ports/spectra/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO yixuan/spectra
-    REF v0.7.0
-    SHA512 2a1cd9eed6cebabb551cc2f662d38d75c6b24edc8f19ee4feb122958653ecb4533b936447d36712225b48a4f1aa6590b17ca5076d78d506a515e8701752bf32d
+    REF v0.8.0
+    SHA512 186bcd8efd5dc6cf0aa81b909184e056d1df1e55870c700f0ca060f504fa997e3ce27c3d15d7b4c74422e4d18bcbd471558392a89e307693b89cc1f480fecc71
     HEAD_REF master
 )
 
diff --git a/ports/spirit-po/CONTROL b/ports/spirit-po/CONTROL
index b9857cea0..eb3b319b7 100644
--- a/ports/spirit-po/CONTROL
+++ b/ports/spirit-po/CONTROL
@@ -1,4 +1,4 @@
-Source: spirit-po
-Version: 1.1.2
-Description: A header-only C++ library for localization using GNU gettext po files, based on Boost.Spirit.
-Build-Depends: boost
+Source: spirit-po
+Version: 1.1.2-1
+Description: A header-only C++ library for localization using GNU gettext po files, based on Boost.Spirit.
+Build-Depends: boost
diff --git a/ports/spirit-po/portfile.cmake b/ports/spirit-po/portfile.cmake
index 3fa1cb23b..d961ce256 100644
--- a/ports/spirit-po/portfile.cmake
+++ b/ports/spirit-po/portfile.cmake
@@ -1,11 +1,12 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/spirit-po-1.1.2)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/cbeck88/spirit-po/archive/v1.1.2.zip"
-    FILENAME "spirit-po-1.1.2.zip"
-    SHA512 8a33126c199765b91e832c64e546f240d532858e051b217189778ad01ef584c67f0f4b2f9674cb7b4a877ec2a2b21b5eda35dc24a12da8eb7a7990bf63a4a774
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO cbeck88/spirit-po
+  REF v1.1.2
+  SHA512 990e26e041607fe81cc2df673bd9e5e2647537d7e121b2300e631874dcd4ccdb084159fa4f635b128c39143c9423d67c494af05206b665541124a0447b8f4a3f
+  HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 file(INSTALL ${SOURCE_PATH}/include/spirit_po
   DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/sqlitecpp/CONTROL b/ports/sqlitecpp/CONTROL
index 119c94091..3374074d1 100644
--- a/ports/sqlitecpp/CONTROL
+++ b/ports/sqlitecpp/CONTROL
@@ -1,4 +1,4 @@
-Source: sqlitecpp
-Version: 2.2-1
-Build-Depends: sqlite3
-Description: SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.
+Source: sqlitecpp
+Version: 2.2-2
+Build-Depends: sqlite3
+Description: SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.
diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake
index a7e9a4267..6876bdf8c 100644
--- a/ports/sqlitecpp/portfile.cmake
+++ b/ports/sqlitecpp/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "SRombauts/SQLiteCpp"
     REF "2.2.0"
@@ -10,11 +13,6 @@ vcpkg_apply_patches(
     PATCHES
     ${CMAKE_CURRENT_LIST_DIR}/0001-Find-external-sqlite3.patch)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL
index bd5101f8f..282598dc5 100644
--- a/ports/sqlpp11/CONTROL
+++ b/ports/sqlpp11/CONTROL
@@ -1,4 +1,4 @@
 Source: sqlpp11
-Version: 0.57-1
+Version: 0.58
 Description: A type safe embedded domain specific language for SQL queries and results in C++.
 Build-Depends: date
diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake
index be99572e3..a11d563d9 100644
--- a/ports/sqlpp11/portfile.cmake
+++ b/ports/sqlpp11/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rbock/sqlpp11
-    REF 0.57
-    SHA512 6bf48189f35cf2ff20b09e27ab83b6fb36415bed7e5c818c1ea2c9b30b5fe0a60c0f7e9930e92a0637c7b567ccfead4a9208a3aff99be89fed361778cf8c45f1
+    REF 0.58
+    SHA512 c391e72638a748e0e25b53176dc371ba468bc14bdcb6dda2f2418c4ab4d620ebc5507ee284ff81c3104888d0d959703c6c91b55ccd69a8641b07dcb20cd56209
     HEAD_REF master
     PATCHES FixForMSVC.patch
 )
diff --git a/ports/stb/CONTROL b/ports/stb/CONTROL
index b5e306f27..7ffc04be0 100644
--- a/ports/stb/CONTROL
+++ b/ports/stb/CONTROL
@@ -1,3 +1,3 @@
 Source: stb
-Version: 2018-03-02
+Version: 2019-05-07
 Description: stb single-file public domain libraries for C/C++
diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake
index bd6587328..0a0f2397b 100644
--- a/ports/stb/portfile.cmake
+++ b/ports/stb/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nothings/stb
-    REF e6afb9cbae4064da8c3e69af3ff5c4629579c1d2
-    SHA512 232ef301d4d6c82c7c5f0e4234b9160cc815f3b6bcc35d341cdf8738646f2f0887ee9838680699f4c9f4274b1390036b2c4fb3ebc2d663af8ff888114dc9f04b
+    REF 1034f5e5c4809ea0a7f4387e0cd37c5184de3cdd
+    SHA512 efc3deedd687615a6706b0d315ded8d76edb28fcd6726531956fde9bba81cc62f25df0a1f998b56e16ab0c62989687c7d5b58875789470c2bf7fd457b1ff6535
     HEAD_REF master
 )
 
diff --git a/ports/stlab/CONTROL b/ports/stlab/CONTROL
index c1a752a5e..01651f59b 100644
--- a/ports/stlab/CONTROL
+++ b/ports/stlab/CONTROL
@@ -1,5 +1,6 @@
 Source: stlab
-Version: 1.3.3
+Version: 1.4.1
 Description: 
   stlab is the ongoing work of what was Adobe’s Software Technology Lab.
-  The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures.
-\ No newline at end of file
+  The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures.
+Build-Depends: boost-variant (osx)
+\ No newline at end of file
diff --git a/ports/stlab/dont-require-testing.patch b/ports/stlab/dont-require-testing.patch
new file mode 100644
index 000000000..f5c2106e7
--- /dev/null
+++ b/ports/stlab/dont-require-testing.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d058bbe..260d940 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,8 +123,7 @@ if ( stlab.testing OR stlab.boost_variant OR stlab.boost_optional )
+     endif()
+   endif()
+ 
+-
+-  if(NOT TARGET Boost::unit_test_framework)
++  if (stlab.testing AND NOT TARGET Boost::unit_test_framework)
+     message(FATAL_ERROR "Could not find Boost unit test framework.")
+   endif()
+   
diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake
index a2bd71e56..7c8925d93 100644
--- a/ports/stlab/portfile.cmake
+++ b/ports/stlab/portfile.cmake
@@ -3,9 +3,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stlab/libraries
-    REF v1.3.3
-    SHA512 2c0eec5638b40f8285cc3b0d756df619b53ba44421c47713aaf45196100765a31a6aea3c5bedba4fcc44494b74e3f0a919271601e717e7f274fe15beb93f8889
-    HEAD_REF master
+    REF v1.4.1
+    SHA512 e9da6f2c570397842f5e73a681f49c5a77977fda430ec730eed6f19d04161172829b7f1adcafd416f0a3f35ea8717ca14e9b935b5ec8fa423e4951c3ba961c7a
+    HEAD_REF develop    
+    PATCHES dont-require-testing.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/stxxl/CONTROL b/ports/stxxl/CONTROL
index e8541a27d..847a31067 100644
--- a/ports/stxxl/CONTROL
+++ b/ports/stxxl/CONTROL
@@ -1,3 +1,3 @@
-Source: stxxl
-Version: 2018-11-15
-Description: Standard Template Library for Extra Large Data Sets
+Source: stxxl
+Version: 2018-11-15-1
+Description: Standard Template Library for Extra Large Data Sets
diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake
index 14d39d38e..41665c4cd 100644
--- a/ports/stxxl/portfile.cmake
+++ b/ports/stxxl/portfile.cmake
@@ -1,10 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("stxxl currently only supports static library linkage.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-    set(VCPKG_CRT_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/suitesparse/CONTROL b/ports/suitesparse/CONTROL
index 84263e1e8..43621f9fe 100644
--- a/ports/suitesparse/CONTROL
+++ b/ports/suitesparse/CONTROL
@@ -1,8 +1,8 @@
-Source: suitesparse
-Version: 5.1.2
-Build-Depends: clapack
-Description: algebra library
-
-Feature: metis
-Build-Depends: metis
-Description: Use metis in SuiteSparse
+Source: suitesparse
+Version: 5.1.2-2
+Build-Depends: clapack (!osx)
+Description: algebra library
+
+Feature: metis
+Build-Depends: metis
+Description: Use metis in SuiteSparse
diff --git a/ports/suitesparse/portfile.cmake b/ports/suitesparse/portfile.cmake
index ac479c6cc..45ad7a6e5 100644
--- a/ports/suitesparse/portfile.cmake
+++ b/ports/suitesparse/portfile.cmake
@@ -1,71 +1,84 @@
-include(vcpkg_common_functions)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-set(SUITESPARSE_VER SuiteSparse-5.1.2)  #if you change the version, becarefull of changing the SHA512 checksum accordingly
-set(SUITESPARSEWIN_VER 1.4.0)
-set(SUITESPARSEWIN_PATH ${CURRENT_BUILDTREES_DIR}/src/suitesparse-metis-for-windows-${SUITESPARSEWIN_VER})
-set(SUITESPARSE_PATH ${SUITESPARSEWIN_PATH}/Suitesparse)
-
-#download suitesparse libary
-vcpkg_download_distfile(SUITESPARSE
-    URLS "http://faculty.cse.tamu.edu/davis/SuiteSparse/${SUITESPARSE_VER}.tar.gz"
-    FILENAME "${SUITESPARSE_VER}.tar.gz"
-    SHA512 38c7f9847cf161390f73de39ed3d9fd07f7bcec2d6d4e6f141af6a015826215843db9f2e16ca255eeb233c593ffc19ffa04816aa5b6ba200b55b9472ac33ba85
-)
-
-#download suitesparse-metis-for-windows scripts, suitesparse does not have CMake build system, jlblancoc has made one for it
-vcpkg_download_distfile(SUITESPARSEWIN
-    URLS  "https://github.com/jlblancoc/suitesparse-metis-for-windows/archive/v${SUITESPARSEWIN_VER}.zip"
-    FILENAME "suitesparse-metis-for-windows-${SUITESPARSEWIN_VER}.zip"
-    SHA512 2859d534200ab9b76fca1530eae5de2f9328aa867c727dbc83a96c6f16e1f87e70123fb2decbb84531d75dac58b6f0ce7323e48c57aeede324fd9a1f77ba74c6
-)
-
-#extract suitesparse-metis-for-windows first and merge with suitesparse library
-vcpkg_extract_source_archive(${SUITESPARSEWIN})
-vcpkg_extract_source_archive(${SUITESPARSE} ${SUITESPARSEWIN_PATH})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SUITESPARSEWIN_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install-suitesparse.patch"
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/remove-debug-postfix.patch"
-)
-
-set(USE_VCPKG_METIS OFF)
-if("metis" IN_LIST FEATURES)
-    set(USE_VCPKG_METIS ON)
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SUITESPARSEWIN_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DBUILD_METIS=OFF #Disable the option to build metis from source
-        -DUSE_VCPKG_METIS=${USE_VCPKG_METIS} #Force using vcpckg metis library
-        -DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR}
-        -DLIB_POSTFIX=
-        -DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON
-        -DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/lib/openblas.lib
-        -DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/lib/lapack.lib
-     OPTIONS_DEBUG
-        -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug
-     OPTIONS_RELEASE
-        -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake")
-
-#clean folders
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-# Handle copyright of suitesparse and suitesparse-metis-for-windows
-file(COPY ${SUITESPARSE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright)
-
-file(COPY ${SUITESPARSEWIN_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright_suitesparse-metis-for-windows)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+set(SUITESPARSE_VER SuiteSparse-5.1.2)  #if you change the version, becarefull of changing the SHA512 checksum accordingly
+set(SUITESPARSEWIN_VER 1.4.0)
+set(SUITESPARSEWIN_PATH ${CURRENT_BUILDTREES_DIR}/src/suitesparse-metis-for-windows-${SUITESPARSEWIN_VER})
+set(SUITESPARSE_PATH ${SUITESPARSEWIN_PATH}/SuiteSparse)
+
+#download suitesparse libary
+vcpkg_download_distfile(SUITESPARSE
+    URLS "http://faculty.cse.tamu.edu/davis/SuiteSparse/${SUITESPARSE_VER}.tar.gz"
+    FILENAME "${SUITESPARSE_VER}.tar.gz"
+    SHA512 38c7f9847cf161390f73de39ed3d9fd07f7bcec2d6d4e6f141af6a015826215843db9f2e16ca255eeb233c593ffc19ffa04816aa5b6ba200b55b9472ac33ba85
+)
+
+#download suitesparse-metis-for-windows scripts, suitesparse does not have CMake build system, jlblancoc has made one for it
+vcpkg_download_distfile(SUITESPARSEWIN
+    URLS  "https://github.com/jlblancoc/suitesparse-metis-for-windows/archive/v${SUITESPARSEWIN_VER}.zip"
+    FILENAME "suitesparse-metis-for-windows-${SUITESPARSEWIN_VER}.zip"
+    SHA512 2859d534200ab9b76fca1530eae5de2f9328aa867c727dbc83a96c6f16e1f87e70123fb2decbb84531d75dac58b6f0ce7323e48c57aeede324fd9a1f77ba74c6
+)
+
+#extract suitesparse-metis-for-windows first and merge with suitesparse library
+vcpkg_extract_source_archive(${SUITESPARSEWIN})
+vcpkg_extract_source_archive(${SUITESPARSE} ${SUITESPARSEWIN_PATH})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SUITESPARSEWIN_PATH}
+    PATCHES
+        remove-debug-postfix.patch
+)
+
+set(USE_VCPKG_METIS OFF)
+if("metis" IN_LIST FEATURES)
+    set(USE_VCPKG_METIS ON)
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(LIB_EXT a)
+    set(LIB_PREFIX lib)
+else()
+    set(LIB_EXT lib)
+    set(LIB_PREFIX)
+endif()
+
+if(WIN32)
+  set(ENABLE_CUSTOM_BLAS_LAPACK_PATHS "-DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON")
+  set(SUITESPARSE_CUSTOM_BLAS_PATH "-DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/lib/openblas.lib")
+  set(SUITESPARSE_CUSTOM_LAPACK_PATH "-DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/lib/lapack.lib")
+endif()
+
+message(STATUS "Use CMakeLists.txt in ${SUITESPARSEWIN_PATH}")
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SUITESPARSEWIN_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_METIS=OFF
+        -DUSE_VCPKG_METIS=${USE_VCPKG_METIS}
+        -DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR}
+        -DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON
+     OPTIONS_DEBUG
+        -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug
+        -DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/${LIB_PREFIX}openblas_d.${LIB_EXT}
+        -DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/${LIB_PREFIX}lapack.${LIB_EXT}
+     OPTIONS_RELEASE
+        -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}
+        -DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/lib/${LIB_PREFIX}openblas.${LIB_EXT}
+        -DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/lib/${LIB_PREFIX}lapack.${LIB_EXT}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake")
+
+#clean folders
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright of suitesparse and suitesparse-metis-for-windows
+file(COPY ${SUITESPARSE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright)
+
+file(COPY ${SUITESPARSEWIN_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright_suitesparse-metis-for-windows)
diff --git a/ports/tacopie/CONTROL b/ports/tacopie/CONTROL
index ae46741d5..47493a022 100644
--- a/ports/tacopie/CONTROL
+++ b/ports/tacopie/CONTROL
@@ -1,3 +1,3 @@
-Source: tacopie
-Version: 3.2.0
-Description: Tacopie is a TCP Client & Server C++11 library
+Source: tacopie
+Version: 3.2.0-1
+Description: Tacopie is a TCP Client & Server C++11 library
diff --git a/ports/tacopie/portfile.cmake b/ports/tacopie/portfile.cmake
index a86ca1339..e814418d4 100644
--- a/ports/tacopie/portfile.cmake
+++ b/ports/tacopie/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cylix/tacopie
@@ -28,7 +30,6 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG}
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE
 )
 
 vcpkg_install_cmake()
diff --git a/ports/taocpp-json/CONTROL b/ports/taocpp-json/CONTROL
new file mode 100644
index 000000000..e3f90f461
--- /dev/null
+++ b/ports/taocpp-json/CONTROL
@@ -0,0 +1,3 @@
+Source: taocpp-json
+Version: 2019-05-08
+Description: C++ header-only JSON library
diff --git a/ports/taocpp-json/portfile.cmake b/ports/taocpp-json/portfile.cmake
new file mode 100644
index 000000000..3e6c19f1e
--- /dev/null
+++ b/ports/taocpp-json/portfile.cmake
@@ -0,0 +1,38 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO taocpp/json
+    REF 6adce3b8e55c16e25b22ec0e33348eefa6aa4533
+    SHA512 078af33eed0bae7671f31a010ba19088d07ac4f78b834bc7565562ee75199e90338dfd450a1d592c4f4ae58eddb3a26018b571381099d22dfc7d3c4143911390
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
+    PREFER_NINJA
+    OPTIONS
+        -DTAOCPP_JSON_BUILD_TESTS=OFF
+        -DTAOCPP_JSON_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/taocpp-json/cmake)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/share/doc
+)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+file(COPY ${SOURCE_PATH}/LICENSE.double-conversion DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${SOURCE_PATH}/LICENSE.itoa DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${SOURCE_PATH}/LICENSE.ryu DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index 048f711e0..50bc78830 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
 Source: tbb
-Version: 2019_U5
+Version: 2019_U6
 Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index a0895442d..024dc67a6 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -1,17 +1,14 @@
 include(vcpkg_common_functions)
 
 if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message("tbb only supports dynamic library linkage")
-        set(VCPKG_LIBRARY_LINKAGE "dynamic")
-    endif()
+    vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO 01org/tbb
-    REF 2019_U5
-    SHA512 227b12e3864fbb922ddbc99700bf94d7d8897d62e2056bf3beb608efacf3ca785dd416b94ad65b421b6c9fc11caff688147b5fbe400c51e98678cee5dc04f274
+    REF 2019_U6
+    SHA512 6513d30a498f507cb3e9a06746e430a8bc829de0d204b15d7a79f79c5e7565e59bb0b459c8ca4946293ecb25e2ce11d25cfc7f311e91c7e67342eceb31000d07
     HEAD_REF tbb_2019
 )
 
@@ -81,14 +78,14 @@ string(REPLACE
     "${_contents}"
 )
 string(REPLACE
-    "set(_tbb_release_lib \"/\${_tbb_component}.lib\")"
-    "set(_tbb_release_lib \"\${_tbb_root}/lib/\${_tbb_component}.lib\")"
+    "set(_tbb_release_lib \"/${TBB_LIB_PREFIX}\${_tbb_component}.${TBB_LIB_EXT}\")"
+    "set(_tbb_release_lib \"\${_tbb_root}/lib/${TBB_LIB_PREFIX}\${_tbb_component}.${TBB_LIB_EXT}\")"
     _contents
     "${_contents}"
 )
 string(REPLACE
-    "set(_tbb_debug_lib \"/\${_tbb_component}_debug.lib\")"
-    "set(_tbb_debug_lib \"\${_tbb_root}/debug/lib/\${_tbb_component}_debug.lib\")"
+    "set(_tbb_debug_lib \"/${TBB_LIB_PREFIX}\${_tbb_component}_debug.${TBB_LIB_EXT}\")"
+    "set(_tbb_debug_lib \"\${_tbb_root}/debug/lib/${TBB_LIB_PREFIX}\${_tbb_component}_debug.${TBB_LIB_EXT}\")"
     _contents
     "${_contents}"
 )
diff --git a/ports/telnetpp/CONTROL b/ports/telnetpp/CONTROL
index 595e1cd88..27ebdb31b 100644
--- a/ports/telnetpp/CONTROL
+++ b/ports/telnetpp/CONTROL
@@ -1,4 +1,4 @@
-Source: telnetpp
-Version:  1.2.4
-Description:  Telnet++ is an implementation of the Telnet Session Layer protocol using C++14
-Build-Depends: boost, gtest, zlib
+Source: telnetpp
+Version:  1.2.4-1
+Description:  Telnet++ is an implementation of the Telnet Session Layer protocol using C++14
+Build-Depends: boost, gtest, zlib
diff --git a/ports/telnetpp/portfile.cmake b/ports/telnetpp/portfile.cmake
index 1859ad4a2..7af2342e1 100644
--- a/ports/telnetpp/portfile.cmake
+++ b/ports/telnetpp/portfile.cmake
@@ -1,5 +1,5 @@
 if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
-    message(FATAL_ERROR "Telnetpp does not currently support UWP")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
 
 include(vcpkg_common_functions)
diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL
index 282282214..11ff55640 100644
--- a/ports/tesseract/CONTROL
+++ b/ports/tesseract/CONTROL
@@ -1,4 +1,4 @@
-Source: tesseract
-Version: 4.0.0
-Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
-Build-Depends: leptonica, icu
+Source: tesseract
+Version: 4.0.0-2
+Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
+Build-Depends: leptonica, icu
diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake
index fd66756b1..d21908b19 100644
--- a/ports/tesseract/portfile.cmake
+++ b/ports/tesseract/portfile.cmake
@@ -1,9 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,14 +8,10 @@ vcpkg_from_github(
     REF 4.0.0
     SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/use-vcpkg-icu.patch
-        ${CMAKE_CURRENT_LIST_DIR}/ws2-32.patch
-        ${CMAKE_CURRENT_LIST_DIR}/leptonica.patch
+        use-vcpkg-icu.patch
+        ws2-32.patch
+        leptonica.patch
 )
 
 # The built-in cmake FindICU is better
diff --git a/ports/tgui/CONTROL b/ports/tgui/CONTROL
index b69819c8d..3c1f18e1a 100644
--- a/ports/tgui/CONTROL
+++ b/ports/tgui/CONTROL
@@ -1,5 +1,5 @@
 Source: tgui
-Version: 0.8.4-2
+Version: 0.8.5
 Description: TGUI is an easy to use, cross-platform, C++ GUI for SFML.
 Build-Depends: sfml
 
diff --git a/ports/tgui/portfile.cmake b/ports/tgui/portfile.cmake
index d0f400eca..e87bfaaa9 100644
--- a/ports/tgui/portfile.cmake
+++ b/ports/tgui/portfile.cmake
@@ -1,14 +1,11 @@
 include(vcpkg_common_functions)
 
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/texus/TGUI/archive/v0.8.4.tar.gz"
-    FILENAME "tgui-0.8.4.zip"
-    SHA512 52d38419a1650cbde517a5022e3b719b9fb4c3b336533c35aa839757f929b56e477d397d735170ba8be434afedc4c00bfcd4898d97da66015776b5f22bb04ea0
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    REPO texus/TGUI
+    REF v0.8.5
+    SHA512 36d8c29f246ca4d79d791f0368441762de0609d5cc0e507520ae0648ed3dc0bf47891582f283de241892bf9810f4d5049df46f566916d0bfffc383319d953002
+    HEAD_REF 0.8
 )
 
 set(TGUI_SHARE_PATH ${CURRENT_PACKAGES_DIR}/share/tgui)
@@ -58,6 +55,7 @@ if(BUILD_GUI_BUILDER)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/TGUI/nanosvg")
 
 # Handle copyright
 file(RENAME "${CURRENT_PACKAGES_DIR}/share/tgui/license.txt" "${CURRENT_PACKAGES_DIR}/share/tgui/copyright")
diff --git a/ports/theia/CONTROL b/ports/theia/CONTROL
index 83d6c2c53..070ed0a81 100644
--- a/ports/theia/CONTROL
+++ b/ports/theia/CONTROL
@@ -1,4 +1,4 @@
 Source: theia
-Version: 0.7-d15154a-3
+Version: 0.8
 Build-Depends: flann, cereal, ceres[suitesparse] (!x86&!uwp&!arm&!linux&!osx), openimageio, glew, freeglut
 Description: An open source library for multiview geometry and structure from motion
diff --git a/ports/theia/portfile.cmake b/ports/theia/portfile.cmake
index b2e61fae1..a6dc5d02f 100644
--- a/ports/theia/portfile.cmake
+++ b/ports/theia/portfile.cmake
@@ -1,19 +1,17 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if(VCPKG_TARGET_ARCHIECTURE STREQUAL "x86")
     message(FATAL_ERROR "theia requires ceres[suitesparse] which depends on suitesparse which depends on openblas which is unavailable on x86.")
 endif()
 
-include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sweeneychris/TheiaSfM
-    REF d15154a6c30ea48e7d135be126e2936802e476ad
-    SHA512 aaf6e9737d04499f0ffd453952380f2e1aa3aab2a75487d6806bfab60aa972719d7349730eab3d1b37088e99cf6c9076ae1cdea276f48532698226c69ac48977
+    REF v0.8
+    SHA512 2f620389c415badec36f4b44be0378fc62761dd6b2ee4cd7033b13573c372f098e248553575fb2cceb757b1ca00e86a11c67e03b6077e0a4b0f8797065746312
     HEAD_REF master
 )
 
diff --git a/ports/think-cell-range/CONTROL b/ports/think-cell-range/CONTROL
index b7d53af12..120f2c884 100644
--- a/ports/think-cell-range/CONTROL
+++ b/ports/think-cell-range/CONTROL
@@ -1,5 +1,5 @@
-Source: think-cell-range
-Maintainer: jfrederich@gmail.com
-Version: 498839d
-Description: think-cell's range library <https://think-cell.com>, <https://github.com/think-cell/range>, <https://www.think-cell.com/en/career/talks/ranges/#1>
-Build-Depends: boost
+Source: think-cell-range
+Maintainer: jfrederich@gmail.com
+Version: 498839d-1
+Description: think-cell's range library <https://think-cell.com>, <https://github.com/think-cell/range>, <https://www.think-cell.com/en/career/talks/ranges/#1>
+Build-Depends: boost
diff --git a/ports/think-cell-range/portfile.cmake b/ports/think-cell-range/portfile.cmake
index 56d01a55e..d1acc2c51 100644
--- a/ports/think-cell-range/portfile.cmake
+++ b/ports/think-cell-range/portfile.cmake
@@ -1,11 +1,12 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/range-498839d41519d38bb81089f7d0f517026bd042cc)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/think-cell/range/archive/498839d41519d38bb81089f7d0f517026bd042cc.zip"
-    FILENAME "think-cell_range-498839d.zip"
-    SHA512 801e987c828c954cb50f9a6f9f2feee2ce05f7232d531ecce7394800ecc5a750992795da173fb72b6efcabd6978015a650730682b7db3f874fb8aaac28869711
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO think-cell/range
+    REF 498839d41519d38bb81089f7d0f517026bd042cc
+    SHA512 1292ba4dd994aab2cb620c24ebd03437a47e426368ed803579dad13a3fa52762cefe42c77c9921d5c4bcbd6592775714191de63097c230e50f9b59b9498005e5
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 file(INSTALL ${SOURCE_PATH}/range DESTINATION ${CURRENT_PACKAGES_DIR}/include/think-cell FILES_MATCHING PATTERN "*.h")
 
diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL
index 039218167..b85a03cda 100644
--- a/ports/thrift/CONTROL
+++ b/ports/thrift/CONTROL
@@ -1,4 +1,4 @@
 Source: thrift
-Version: 2019-03-29
+Version: 2019-05-07
 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 284f0b344..da59907cf 100644
--- a/ports/thrift/portfile.cmake
+++ b/ports/thrift/portfile.cmake
@@ -1,13 +1,6 @@
 include(vcpkg_common_functions)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported. Building static.") # See note below
-    set(VCPKG_LIBRARY_LINKAGE static)
-
-    # As per Ben Craig thrift comment see https://issues.apache.org/jira/browse/THRIFT-1834
-    # Currently, Thrift is designed to be packaged as a static library. As a static library, the consuming program / dll will only pull in the object files that it needs, so the per-binary size increase should be pretty small.
-    # Thrift isn't a very good candidate to become a dynamic library. No attempts are made to preserve binary compatibility, or to provide a C / COM-like interface to make binary compatibility easy.
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_find_acquire_program(FLEX)
 vcpkg_find_acquire_program(BISON)
@@ -15,8 +8,8 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/thrift
-    REF 7b94dd422117ffb6c646d1217c643efb80a8cf45
-    SHA512 56b1810031b26ccc921cc39a2511fbee9af165c618b5ecb72d8f3dbdf9ae1d05b8adfe59e6f7ece8be837ca69a58e279997dd76c93e28c96607f18e2badcfbd1
+    REF acdd4226c210336e9e15eb812e5932a645fcd5ce
+    SHA512 53986b1cde7b2bd19974f32b8c31736566061a228dda368d3d850355c566d910499c16519bbff078a6cdab19931cd9833a7d684ac63fb1ec40b2a123ff263aaa
     HEAD_REF master
 )
 
@@ -24,8 +17,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DWITH_SHARED_LIB=OFF
-        -DWITH_STATIC_LIB=ON
+        -DBUILD_SHARED_LIBS=OFF
         -DWITH_STDTHREADS=ON
         -DBUILD_TESTING=off
         -DBUILD_JAVA=off
diff --git a/ports/tidy-html5/CONTROL b/ports/tidy-html5/CONTROL
index 377e47f13..ff74c1973 100644
--- a/ports/tidy-html5/CONTROL
+++ b/ports/tidy-html5/CONTROL
@@ -1,3 +1,3 @@
 Source: tidy-html5
-Version: 5.4.0-1
+Version: 5.6.0
 Description: Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.
diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake
index da0ba45ca..7cb7ca65f 100644
--- a/ports/tidy-html5/portfile.cmake
+++ b/ports/tidy-html5/portfile.cmake
@@ -1,27 +1,23 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO htacg/tidy-html5
-    REF 5.4.0
-    SHA512 d92c89f2ef371499f9c3de6f9389783d2449433b4da1f5a29e2eb81b7a7db8dd9f68e220cdde092d446e9bd779bcbc30f84bda79013526540f29d00f438cb402
-    HEAD_REF master)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
+    REF 5.6.0
+    SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
+    HEAD_REF master
     PATCHES
-    ${CMAKE_CURRENT_LIST_DIR}/remove_execution_character_set.patch
+        remove_execution_character_set.patch
 )
 
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
-        -DBUILD_SHARED_LIB=${BUILD_SHARED_LIB}
-        -DTIDY_CONSOLE_SHARED=${BUILD_SHARED_LIB}
+        -DBUILD_SHARED_LIB=OFF
+        -DTIDY_CONSOLE_SHARED=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL
index 97d25bcdb..d4ad07dc6 100644
--- a/ports/tiff/CONTROL
+++ b/ports/tiff/CONTROL
@@ -1,4 +1,4 @@
 Source: tiff
-Version: 4.0.10-4
-Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp)
+Version: 4.0.10-6
+Build-Depends: zlib, libjpeg-turbo, liblzma
 Description: A library that supports the manipulation of TIFF image files
diff --git a/ports/tiff/add-component-options.patch b/ports/tiff/add-component-options.patch
deleted file mode 100644
index 513d37ad6..000000000
--- a/ports/tiff/add-component-options.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ee6fd4..439e26a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -122,6 +122,11 @@ set(EXTRA_DIST
-   nmake.opt
-   libtiff-4.pc.in)
- 
-+option(BUILD_TOOLS "Build tool executables" ON)
-+option(BUILD_DOCS "Build docs" ON)
-+option(BUILD_CONTRIB "Build contributed executables" ON)
-+option(BUILD_TESTS "Build tests" ON)
-+
- # These are annoyingly verbose, produce false positives or don't work
- # nicely with all supported compiler versions, so are disabled unless
- # explicitly enabled.
-@@ -719,12 +724,20 @@ endif()
- # Process subdirectories
- add_subdirectory(port)
- add_subdirectory(libtiff)
--add_subdirectory(tools)
--add_subdirectory(test)
--add_subdirectory(contrib)
--add_subdirectory(build)
--add_subdirectory(man)
--add_subdirectory(html)
-+if(BUILD_TOOLS)
-+  add_subdirectory(tools)
-+endif()
-+if(BUILD_TESTS)
-+  add_subdirectory(test)
-+endif()
-+if(BUILD_CONTRIB)
-+  add_subdirectory(contrib)
-+endif()
-+if(BUILD_DOCS)
-+  add_subdirectory(build)
-+  add_subdirectory(man)
-+  add_subdirectory(html)
-+endif()
- 
- #message(STATUS "EXTRA_DIST: ${EXTRA_DIST}")
- 
diff --git a/ports/tiff/cmakelists.patch b/ports/tiff/cmakelists.patch
new file mode 100644
index 000000000..597c980c5
--- /dev/null
+++ b/ports/tiff/cmakelists.patch
@@ -0,0 +1,99 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 845ddf0..9ccb9b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,9 +181,7 @@ foreach(flag ${test_flags})
+   endif (${test_c_flag})
+ endforeach(flag ${test_flags})
+ 
+-if(MSVC)
+-    set(CMAKE_DEBUG_POSTFIX "d")
+-endif()
++set(CMAKE_DEBUG_POSTFIX "d")
+ 
+ option(ld-version-script "Enable linker version script" ON)
+ # Check if LD supports linker scripts.
+@@ -601,12 +599,15 @@ check_include_file(OpenGL/gl.h HAVE_OPENGL_GL_H)
+ check_include_file(OpenGL/glu.h HAVE_OPENGL_GLU_H)
+ 
+ # Win32 IO
+-set(win32_io FALSE)
+-if(WIN32)
+-  set(win32_io TRUE)
++set(USE_WIN32_FILEIO FALSE CACHE BOOL "")
++if(MSVC)
++  if (NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")  #on UWP we use the unix I/O api
++    set(USE_WIN32_FILEIO TRUE CACHE BOOL "" FORCE)
++    add_definitions(-DUSE_WIN32_FILEIO)
++  endif()
++  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS /wd4996)
+ endif()
+ 
+-set(USE_WIN32_FILEIO ${win32_io})
+ 
+ # Orthogonal features
+ 
+@@ -708,16 +709,28 @@ endif()
+ 
+ #report_values(TIFF_INCLUDES TIFF_LIBRARY_DEPS)
+ 
++option(BUILD_TOOLS "Build tool executables" ON)
++option(BUILD_DOCS "Build docs" ON)
++option(BUILD_CONTRIB "Build contributed executables" ON)
++option(BUILD_TESTS "Build tests" ON)
++
+ # Process subdirectories
+ add_subdirectory(port)
+ add_subdirectory(libtiff)
+-add_subdirectory(tools)
+-add_subdirectory(test)
+-add_subdirectory(contrib)
+-add_subdirectory(build)
+-add_subdirectory(man)
+-add_subdirectory(html)
+-
++if(BUILD_TOOLS)
++  add_subdirectory(tools)
++endif()
++if(BUILD_TESTS)
++  add_subdirectory(test)
++endif()
++if(BUILD_CONTRIB)
++  add_subdirectory(contrib)
++endif()
++if(BUILD_DOCS)
++  add_subdirectory(build)
++  add_subdirectory(man)
++  add_subdirectory(html)
++endif()
+ #message(STATUS "EXTRA_DIST: ${EXTRA_DIST}")
+ 
+ message(STATUS "")
+diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
+index 1cf1b75..4ee29f6 100644
+--- a/libtiff/CMakeLists.txt
++++ b/libtiff/CMakeLists.txt
+@@ -104,11 +104,11 @@ set(tiffxx_HEADERS
+ set(tiffxx_SOURCES
+   tif_stream.cxx)
+ 
+-if(WIN32_IO)
+-  extra_dist(tif_unix.c)
++if(USE_WIN32_FILEIO)
++  extra_dist(tif_win32.c)
+   list(APPEND tiff_SOURCES tif_win32.c)
+ else()
+-  extra_dist(tif_win32.c)
++  extra_dist(tif_unix.c)
+   list(APPEND tiff_SOURCES tif_unix.c)
+ endif()
+ 
+@@ -143,7 +143,7 @@ install(FILES ${tiff_HEADERS} ${nodist_tiff_HEADERS}
+         DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+ 
+ if(CXX_SUPPORT)
+-  add_library(tiffxx ${tiffxx_SOURCES} ${tiffxx_HEADERS})
++	add_library(tiffxx STATIC ${tiffxx_SOURCES} ${tiffxx_HEADERS})
+   target_link_libraries(tiffxx tiff)
+   set_target_properties(tiffxx PROPERTIES SOVERSION ${SO_COMPATVERSION})
+   if(NOT CYGWIN)
diff --git a/ports/tiff/crt-secure-no-deprecate.patch b/ports/tiff/crt-secure-no-deprecate.patch
deleted file mode 100644
index 476a931a9..000000000
--- a/ports/tiff/crt-secure-no-deprecate.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 439e26a..05416d8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -187,6 +187,7 @@ endforeach(flag ${test_flags})
- 
- if(MSVC)
-     set(CMAKE_DEBUG_POSTFIX "d")
-+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS /wd4996)
- endif()
- 
- option(ld-version-script "Enable linker version script" ON)
diff --git a/ports/tiff/fix-cxx-shared-libs.patch b/ports/tiff/fix-cxx-shared-libs.patch
deleted file mode 100644
index 37389ca81..000000000
--- a/ports/tiff/fix-cxx-shared-libs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4370dea04189fb9d9a94e1f4ee96ef2d24937fc9 Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Thu, 23 Mar 2017 17:55:14 +0300
-Subject: [PATCH] fix shared libs building
-
----
- libtiff/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
-index 087dfa9..20fa8b4 100644
---- a/libtiff/CMakeLists.txt
-+++ b/libtiff/CMakeLists.txt
-@@ -142,6 +142,7 @@ if(cxx)
-   add_library(tiffxx ${tiffxx_SOURCES} ${tiffxx_HEADERS})
-   target_link_libraries(tiffxx tiff)
-   set_target_properties(tiffxx PROPERTIES SOVERSION ${SO_COMPATVERSION})
-+  set_target_properties(tiffxx PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
-   if(NOT CYGWIN)
-     # This property causes shared libraries on Linux to have the full version
-     # encoded into their final filename.  We disable this on Cygwin because
--- 
-2.11.0.windows.1
diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake
index 3a0ee0b8a..d36dce238 100644
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@@ -2,22 +2,19 @@ include(vcpkg_common_functions)
 
 set(LIBTIFF_VERSION 4.0.10)
 
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz"
     FILENAME "tiff-${LIBTIFF_VERSION}.tar.gz"
     SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
 )
+
 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
         fix-stddef.patch
+        cmakelists.patch
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
@@ -46,19 +43,9 @@ file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/share
     ${CURRENT_PACKAGES_DIR}/share
 )
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/tiff)
-configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
-    ${CURRENT_PACKAGES_DIR}/share/tiff
-    @ONLY
-)
-file(INSTALL
-    ${SOURCE_PATH}/COPYRIGHT
-    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)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff)
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/tiff/usage b/ports/tiff/usage
deleted file mode 100644
index 6b2f0f89e..000000000
--- a/ports/tiff/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-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 c950b512b..a35deceee 100644
--- a/ports/tiff/vcpkg-cmake-wrapper.cmake
+++ b/ports/tiff/vcpkg-cmake-wrapper.cmake
@@ -1,17 +1,23 @@
 _find_package(${ARGS})
 
-find_package(LibLZMA)
+find_package(LibLZMA CONFIG)
 find_package(JPEG)
 find_package(ZLIB)
 if(TARGET TIFF::TIFF)
-  set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${LIBLZMA_LIBRARIES} JPEG::JPEG ZLIB::ZLIB)
+  set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA 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 ${LIBLZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
+  list(APPEND TIFF_LIBRARIES ${LZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
   if(UNIX)
     list(APPEND TIFF_LIBRARIES m)
   endif()
 endif()
+if(TIFF_LIBRARY)
+  list(APPEND TIFF_LIBRARY ${LZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
+  if(UNIX)
+    list(APPEND TIFF_LIBRARY m)
+  endif()
+endif()
diff --git a/ports/tinydir/CONTROL b/ports/tinydir/CONTROL
index 5f4f52d9a..8ee419763 100644
--- a/ports/tinydir/CONTROL
+++ b/ports/tinydir/CONTROL
@@ -1,3 +1,3 @@
 Source: tinydir
-Version: 1.2.3
+Version: 1.2.4
 Description: Lightweight, portable and easy to integrate C directory and file reader
diff --git a/ports/tinydir/portfile.cmake b/ports/tinydir/portfile.cmake
index 19e9a7f48..223b7d763 100644
--- a/ports/tinydir/portfile.cmake
+++ b/ports/tinydir/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cxong/tinydir
-    REF 1.2.3
-    SHA512 fa366525558b0932994f93bab7a9edafdc7fe297fc65c2ce8af5b4b05c33c4af4b1fdf72292a7a89dcea4276cf419e3569e41ff1122e0048ad467ed6e33836a2
+    REF 1.2.4
+    SHA512 476b81a089d378152c2ab644b88fe860f4a6dba9594ef5c2ae138487cb54b8f6da5538c114463619043f694b992e2de5fec925bd746f8e7fd341ebcdcaac98c0
     HEAD_REF master
 )
 file(INSTALL ${SOURCE_PATH}/tinydir.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/tinyexr/CONTROL b/ports/tinyexr/CONTROL
index 54b459b49..3dbc26101 100644
--- a/ports/tinyexr/CONTROL
+++ b/ports/tinyexr/CONTROL
@@ -1,3 +1,3 @@
-Source: tinyexr
-Version: 0.9.5-d16ea6
-Description: Library to load and save OpenEXR(.exr) images
+Source: tinyexr
+Version: 0.9.5-d16ea6-1
+Description: Library to load and save OpenEXR(.exr) images
diff --git a/ports/tinyexr/portfile.cmake b/ports/tinyexr/portfile.cmake
index 6ef6439d5..bc3effdc3 100644
--- a/ports/tinyexr/portfile.cmake
+++ b/ports/tinyexr/portfile.cmake
@@ -1,12 +1,13 @@
 # header-only
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyexr-d16ea6347ae78bcee984fb57cab1f023aeda4fb0)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/syoyo/tinyexr/archive/d16ea6347ae78bcee984fb57cab1f023aeda4fb0.tar.gz"
-    FILENAME "tinyexr-v0.9.5-d16ea6.tar.gz"
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO syoyo/tinyexr
+    REF d16ea6347ae78bcee984fb57cab1f023aeda4fb0
     SHA512 63399688d7894f9ac4b893b2142202b36108b5029b11c40c3f9ad0f0135625fb0c8e0d54cec88d92c016774648dc829a946d9575c5f19afea56542c00759546e
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 file(COPY ${SOURCE_PATH}/tinyexr.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
diff --git a/ports/tinygltf/CONTROL b/ports/tinygltf/CONTROL
new file mode 100644
index 000000000..4baf2cf21
--- /dev/null
+++ b/ports/tinygltf/CONTROL
@@ -0,0 +1,4 @@
+Source: tinygltf
+Version: 2.2.0
+Description: A header only C++11 glTF 2.0 library.
+Build-Depends: stb, nlohmann-json
+\ No newline at end of file
diff --git a/ports/tinygltf/portfile.cmake b/ports/tinygltf/portfile.cmake
new file mode 100644
index 000000000..f78f2b017
--- /dev/null
+++ b/ports/tinygltf/portfile.cmake
@@ -0,0 +1,17 @@
+# Header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO syoyo/tinygltf
+    REF v2.2.0
+    SHA512 5a63fab31dd49e25fe2a32f66bbcae5a6340ced403dc51de65ee7363bb9b358e546bbecd116a53062099f90a2579a5178dcc5c4268d4b99c0afe30fac20ad7cf
+    HEAD_REF master
+)
+
+# Put the licence file where vcpkg expects it
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinygltf/LICENSE)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinygltf/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinygltf/copyright)
+
+# Copy the tinygltf header files
+file(COPY ${SOURCE_PATH}/tiny_gltf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/tinyobjloader/CONTROL b/ports/tinyobjloader/CONTROL
index 7967039a7..8ec7ef7a7 100644
--- a/ports/tinyobjloader/CONTROL
+++ b/ports/tinyobjloader/CONTROL
@@ -1,3 +1,3 @@
 Source: tinyobjloader
-Version: 1.4.1
+Version: 1.4.1-1
 Description: Tiny but powerful single file wavefront obj loader
diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake
index fd2dbf8a4..ee6d64dc7 100644
--- a/ports/tinyobjloader/portfile.cmake
+++ b/ports/tinyobjloader/portfile.cmake
@@ -1,38 +1,35 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
-    message("tinyobjloader doesn't support dynamic linkage on Windows. Building static instead.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO syoyo/tinyobjloader
-    REF v1.4.1
-    SHA512 5b18fed89435a95fb3fc89829ea6904b4cc4508b0907642b39194e3e3c55678ddc1c07687e4b7ea171f270f7188ca593ed53b828c022667e54a889c36c60373e
-    HEAD_REF master
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
-    OPTIONS
-        -DCMAKE_INSTALL_DOCDIR:STRING=share/tinyobjloader
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/tinyobjloader/cmake")
-
-file(
-    REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
-    ${CURRENT_PACKAGES_DIR}/lib/tinyobjloader
-    ${CURRENT_PACKAGES_DIR}/debug/lib/tinyobjloader
-)
-
-vcpkg_copy_pdbs()
-
-# Put the licence file where vcpkg expects it
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/copyright)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO syoyo/tinyobjloader
+    REF v1.4.1
+    SHA512 5b18fed89435a95fb3fc89829ea6904b4cc4508b0907642b39194e3e3c55678ddc1c07687e4b7ea171f270f7188ca593ed53b828c022667e54a889c36c60373e
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PREFER_NINJA
+    OPTIONS
+        -DCMAKE_INSTALL_DOCDIR:STRING=share/tinyobjloader
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/tinyobjloader/cmake")
+
+file(
+    REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+    ${CURRENT_PACKAGES_DIR}/lib/tinyobjloader
+    ${CURRENT_PACKAGES_DIR}/debug/lib/tinyobjloader
+)
+
+vcpkg_copy_pdbs()
+
+# Put the licence file where vcpkg expects it
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/copyright)
diff --git a/ports/tinythread/CMakeLists.txt b/ports/tinythread/CMakeLists.txt
index ec8b3634c..57e972132 100644
--- a/ports/tinythread/CMakeLists.txt
+++ b/ports/tinythread/CMakeLists.txt
@@ -6,10 +6,6 @@ if(MSVC)
   add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
 endif()
 
-if(BUILD_SHARED_LIBS)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
 include_directories(source)
 
 add_library(tinythread source/tinythread.cpp)
diff --git a/ports/tinythread/CONTROL b/ports/tinythread/CONTROL
index d438e8721..6b5de12e1 100644
--- a/ports/tinythread/CONTROL
+++ b/ports/tinythread/CONTROL
@@ -1,3 +1,3 @@
-Source: tinythread
-Version: 1.1-1
-Description: Implements a fairly compatible subset of the C++11 thread management classes
+Source: tinythread
+Version: 1.1-2
+Description: Implements a fairly compatible subset of the C++11 thread management classes
diff --git a/ports/tinythread/portfile.cmake b/ports/tinythread/portfile.cmake
index 23903e30e..550a192bc 100644
--- a/ports/tinythread/portfile.cmake
+++ b/ports/tinythread/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/TinyThread++-1.1")
 vcpkg_download_distfile(ARCHIVE
     URLS "http://tinythreadpp.bitsnbites.eu/files/TinyThread%2B%2B-1.1-src.tar.bz2"
diff --git a/ports/tinyutf8/CONTROL b/ports/tinyutf8/CONTROL
index e67cee3fc..107d4bd66 100644
--- a/ports/tinyutf8/CONTROL
+++ b/ports/tinyutf8/CONTROL
@@ -1,3 +1,3 @@
 Source: tinyutf8
-Version: 2.1.1-1
+Version: 3
 Description: TINYUTF8 is a library for extremely easy integration of Unicode into an arbitrary C++11 project.
diff --git a/ports/tinyutf8/portfile.cmake b/ports/tinyutf8/portfile.cmake
index c768260c9..5444310ce 100644
--- a/ports/tinyutf8/portfile.cmake
+++ b/ports/tinyutf8/portfile.cmake
@@ -1,29 +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)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DuffsDevice/tinyutf8
+    REF v3
+    SHA512 a11e7e7728afec7b2d9b6ed58ca20f29ca71823854a42b99b622e42b42389290f49ce7dd3bb6c5596e15fa369266a47364887bb253643440882d31f7689affec
+    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/tinyxml/CMakeLists.txt b/ports/tinyxml/CMakeLists.txt
index 21776c156..b849c07f9 100644
--- a/ports/tinyxml/CMakeLists.txt
+++ b/ports/tinyxml/CMakeLists.txt
@@ -10,8 +10,6 @@ set(SOURCES "tinyxml.cpp"
 
 option(BUILD_SHARED_LIBS "Build shared libs" OFF)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
 add_library(tinyxml ${SOURCES})
 target_compile_definitions(tinyxml PRIVATE "-DTIXML_USE_STL")
 
@@ -27,5 +25,5 @@ install(
     RUNTIME DESTINATION bin
 )
 
-install(FILES ${HEADERS} 
+install(FILES ${HEADERS}
 	${CMAKE_CURRENT_BINARY_DIR}/tinyxml_export.h DESTINATION include)
diff --git a/ports/tinyxml/CONTROL b/ports/tinyxml/CONTROL
index f1075e38e..4eacee3b2 100644
--- a/ports/tinyxml/CONTROL
+++ b/ports/tinyxml/CONTROL
@@ -1,3 +1,3 @@
-Source: tinyxml
-Version: 2.6.2-3
-Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.
+Source: tinyxml
+Version: 2.6.2-4
+Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.
diff --git a/ports/tinyxml/portfile.cmake b/ports/tinyxml/portfile.cmake
index 2936a4d57..b43526efa 100644
--- a/ports/tinyxml/portfile.cmake
+++ b/ports/tinyxml/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz"
     FILENAME "tinyxml_2_6_2.tar.gz"
diff --git a/ports/tmxlite/CONTROL b/ports/tmxlite/CONTROL
new file mode 100644
index 000000000..eb3cfdd55
--- /dev/null
+++ b/ports/tmxlite/CONTROL
@@ -0,0 +1,3 @@
+Source: tmxlite
+Version: 2019-03-05
+Description: A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.
+\ No newline at end of file
diff --git a/ports/tmxlite/portfile.cmake b/ports/tmxlite/portfile.cmake
new file mode 100644
index 000000000..14f1234f4
--- /dev/null
+++ b/ports/tmxlite/portfile.cmake
@@ -0,0 +1,24 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO fallahn/tmxlite
+    REF 591dd0371dceb2c43abeceac11cd9e8077880cca
+    HEAD_REF master
+    SHA512 a857aea3ec99c686e97d25ecb2bdd8d2f2f14dcb8419e14535ace8794bfbc21fe825cffc60e589df7291ae35076fb6734f7047c985a6ea6d0c55c861c07ba784
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}/tmxlite
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+\ No newline at end of file
diff --git a/ports/torch-th/CONTROL b/ports/torch-th/CONTROL
index 9505e6659..edaaef3d4 100644
--- a/ports/torch-th/CONTROL
+++ b/ports/torch-th/CONTROL
@@ -1,3 +1,3 @@
 Source: torch-th
-Version: 2018-07-03
+Version: 2019-04-19-1
 Description: Torch's TH library
diff --git a/ports/torch-th/portfile.cmake b/ports/torch-th/portfile.cmake
index 69ecd1c00..2b653da22 100644
--- a/ports/torch-th/portfile.cmake
+++ b/ports/torch-th/portfile.cmake
@@ -1,17 +1,12 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-  message(FATAL_ERROR "scintilla only supports dynamic linkage")
-endif()
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-  message(FATAL_ERROR "scintilla only supports dynamic crt")
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO torch/torch7
-    REF fd0ee3bbf7bfdd21ab10c5ee70b74afaef9409e1
-    SHA512 3a7a006ec624f25216e2b433380ccaf04710fd452f28ce853d3018e4ced6b6e066e61ff9165b8c0526825748a335c976cfb7accff4d1a16ae1be0db94b2c8a22
+    REF dde9e56fb61eee040d7f3dba2331c6d6c095aee8
+    SHA512 ef813e6f583f26019da362be1e5d9886ecf3306a2b41e5f7a73d432872eacd2745e0cf26bfcc691452f87611e02e302c54f07b2f3a3288744535e57d154a73db
     HEAD_REF master
 )
 
diff --git a/ports/treehopper/CONTROL b/ports/treehopper/CONTROL
index 336a42250..4435c6cce 100644
--- a/ports/treehopper/CONTROL
+++ b/ports/treehopper/CONTROL
@@ -1,3 +1,3 @@
-Source: treehopper
-Version: 1.11.3-1
-Description: Treehopper connects the physical world to your computer, tablet, or smartphone. For more information, visit https://treehopper.io.
+Source: treehopper
+Version: 1.11.3-2
+Description: Treehopper connects the physical world to your computer, tablet, or smartphone. For more information, visit https://treehopper.io.
diff --git a/ports/treehopper/portfile.cmake b/ports/treehopper/portfile.cmake
index fd90f0392..68cf07bb9 100644
--- a/ports/treehopper/portfile.cmake
+++ b/ports/treehopper/portfile.cmake
@@ -1,12 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message("treehopper only supports dynamic library linkage")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "treehopper does not support static crt linkage")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -29,4 +23,4 @@ file(INSTALL ${SOURCE_PATH}/C++/API/inc/ DESTINATION ${CURRENT_PACKAGES_DIR}/inc
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/treehopper RENAME copyright)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-\ No newline at end of file
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
diff --git a/ports/trompeloeil/CONTROL b/ports/trompeloeil/CONTROL
index d719459fa..ee0305d51 100644
--- a/ports/trompeloeil/CONTROL
+++ b/ports/trompeloeil/CONTROL
@@ -1,4 +1,4 @@
 Source: trompeloeil
-Version: 33
+Version: 34
 Description: A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0
     For issues/pull requests/questions visit https://github.com/rollbear/trompeloeil
diff --git a/ports/trompeloeil/portfile.cmake b/ports/trompeloeil/portfile.cmake
index ded47bf85..db8367d22 100644
--- a/ports/trompeloeil/portfile.cmake
+++ b/ports/trompeloeil/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rollbear/trompeloeil
-    REF v33
-    SHA512 944f8ee3d2c11877e56cfef7cbcf217ce88dbf8e426a39bba4c74c00057647503394ee9736ce19b0653cd8bba83ac717ea251155e665d3810bd5aba5133ac1b3
+    REF v34
+    SHA512 0fffdb38287699c413e35d541e14ddf2e355a0a3df3b3f7be3a56d02f012571af1f4cad3de0a23863ab9b70aa75d2a7ef0227f3896195a51c04ccf817fe1c9dc
     HEAD_REF master
     PATCHES disable_master_project.patch
 )
diff --git a/ports/tsl-hopscotch-map/CONTROL b/ports/tsl-hopscotch-map/CONTROL
index 91f048054..5fe5d726a 100644
--- a/ports/tsl-hopscotch-map/CONTROL
+++ b/ports/tsl-hopscotch-map/CONTROL
@@ -1,3 +1,3 @@
 Source: tsl-hopscotch-map
-Version: 2.2.0
+Version: 2.2.1
 Description: C++ implementation of a fast hash map and hash set using hopscotch hashing 
diff --git a/ports/tsl-hopscotch-map/portfile.cmake b/ports/tsl-hopscotch-map/portfile.cmake
index 2542360a3..c96df35c6 100644
--- a/ports/tsl-hopscotch-map/portfile.cmake
+++ b/ports/tsl-hopscotch-map/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tessil/hopscotch-map
-    REF v2.2.0
-    SHA512 a3cd0fe47ff16de6d556c24e0bd96e420c1f06f2e44388e4f223fd8cf30a6cf0af20ade46af46f8cb5bbfd86a0fce2ca65658999cc2c14f4998d949f12afff2f
+    REF v2.2.1
+    SHA512 389fb09b6e47d8005d4a1b6c0db0c5f03de67686e9d4b97e473bf88f0c398d3118be0dcfdc5d509c082fd53f52f5d779d04c3d9bafe65c5eba11d03c62b60ddc
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/tsl-ordered-map/CONTROL b/ports/tsl-ordered-map/CONTROL
index 7595c53fc..bb2b75a9d 100644
--- a/ports/tsl-ordered-map/CONTROL
+++ b/ports/tsl-ordered-map/CONTROL
@@ -1,3 +1,3 @@
 Source: tsl-ordered-map
-Version: 0.8.0
+Version: 0.8.1
 Description: C++ hash map and hash set which preserve the order of insertion
diff --git a/ports/tsl-ordered-map/portfile.cmake b/ports/tsl-ordered-map/portfile.cmake
index bfa4f0625..19940d270 100644
--- a/ports/tsl-ordered-map/portfile.cmake
+++ b/ports/tsl-ordered-map/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tessil/ordered-map
-    REF v0.8.0
-    SHA512 9e0cc8ea4d5731e89cb6d58a54394b4ab0378cb2488d9e462ad80facd8aa06e21aaa0f9b969fbd7ac22c99bae09ab7c6e7980857784aa0b1a3a2b0c216ffa79a
+    REF v0.8.1
+    SHA512 c776fc82c971ec507f12fa071c5831bbbf94a0351f7ae936f60b73b91be2a264737b606a6be7bae0cc6b971f01c619a78dad3072ac603b26a2a13836184a8f3a
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/tsl-sparse-map/CONTROL b/ports/tsl-sparse-map/CONTROL
index 31e08231c..627d5bea1 100644
--- a/ports/tsl-sparse-map/CONTROL
+++ b/ports/tsl-sparse-map/CONTROL
@@ -1,3 +1,3 @@
 Source: tsl-sparse-map
-Version: 0.6.0
+Version: 0.6.1
 Description: C++ implementation of a memory efficient hash map and hash set
diff --git a/ports/tsl-sparse-map/portfile.cmake b/ports/tsl-sparse-map/portfile.cmake
index 6895d7c67..07d1f3048 100644
--- a/ports/tsl-sparse-map/portfile.cmake
+++ b/ports/tsl-sparse-map/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tessil/sparse-map
-    REF v0.6.0
-    SHA512 6a21ebbd3505a0b4bf199f24ae9262395392964457eb26edb39fd7aa82aec7fc74468f7615977c74a2f36332850a68e1d6a6e86d487c3dff7efa2b081fa2c8c5
+    REF v0.6.1
+    SHA512 c77e7625a0ff13a538f1a8c96d3f70a178e9bedfb22592d6ca848e6d1e6b1566c9a216b2df68592c27308156b776677d52e0d75cf09254acb62f60a00a4bc054
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/umock-c/CONTROL b/ports/umock-c/CONTROL
new file mode 100644
index 000000000..a04bdc73b
--- /dev/null
+++ b/ports/umock-c/CONTROL
@@ -0,0 +1,5 @@
+Source: umock-c
+Version: 2019-05-16
+Description: A pure C mocking library
+Build-Depends: azure-macro-utils-c
+
diff --git a/ports/umock-c/portfile.cmake b/ports/umock-c/portfile.cmake
new file mode 100644
index 000000000..0b30e8942
--- /dev/null
+++ b/ports/umock-c/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 Azure/umock-c
+    REF 92772d9d8317a37dd0b656e95877ffb03bc67e92
+    SHA512 4dd738c7b2c7e1237ad874a7ad90bf81b864aa242af335dcc82d0cfea51bc33fe84de4eebedb6e00944c70d01d1ade4827716dbcf95754165b35981bde4147e7
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -Drun_unittests=OFF
+        -Drun_int_tests=OFF
+        -Duse_installed_dependencies=ON
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umock_c)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/umock-c/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
+
+
diff --git a/ports/unicorn-lib/CMakeLists.txt b/ports/unicorn-lib/CMakeLists.txt
index b34e04f23..9a9c5825e 100644
--- a/ports/unicorn-lib/CMakeLists.txt
+++ b/ports/unicorn-lib/CMakeLists.txt
@@ -6,6 +6,10 @@ option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not."
 
 find_path(RS_CORE_LIB_INCLUDE_DIR rs-core/common.hpp)
 #find_library(RW_UTILITIES_LIBRARY NAMES rw_utilities)
+find_package(ZLIB REQUIRED)
+find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d HINTS ${INSTALLED_LIB_PATH})
+find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 HINTS ${INSTALLED_LIB_PATH})
+select_library_configurations(PCRE2)
 
 file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp)
 foreach(ITR ${UNICORN_LIB_SOURCES})
@@ -24,7 +28,14 @@ target_compile_definitions(
 	PRIVATE -DUNICODE -D_UNICODE _CRT_SECURE_NO_WARNINGS
 )
 
+target_link_libraries(unicorn-lib PUBLIC ${PCRE2_LIBRARY})
+target_link_libraries(unicorn-lib PUBLIC ZLIB::ZLIB)
+
 if(NOT UNICORN_LIB_SKIP_HEADERS)
 	install(DIRECTORY ${PROJECT_SOURCE_DIR}/unicorn DESTINATION include FILES_MATCHING PATTERN "*.hpp")
 endif()
-install(TARGETS unicorn-lib DESTINATION lib)
-\ No newline at end of file
+install(TARGETS unicorn-lib
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+       )
+\ No newline at end of file
diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL
index 6deb2ea41..655dd26d7 100644
--- a/ports/unicorn-lib/CONTROL
+++ b/ports/unicorn-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: unicorn-lib
-Version: 2019-01-30
+Version: 2019-05-07-1
 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 68f14fef2..dff094ef8 100644
--- a/ports/unicorn-lib/portfile.cmake
+++ b/ports/unicorn-lib/portfile.cmake
@@ -1,10 +1,15 @@
 include(vcpkg_common_functions)
 
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+  message("unicorn-lib is a static library, now build with static.")
+  set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CaptainCrowbar/unicorn-lib
-    REF e5e6615ce4297a8b385884c21c1b78a6515cb766
-    SHA512 bdffd177d106882f1dcb59ac9dcecb985a8b6f9cec8dc44ff1eea3201bed1258e760a964163fed3514aa661a4be4bd92a0c437d769dbdffa04693a870ecf355c
+    REF 3e4e014bbf6fe24721a14c63f2a4f7ebfa401e7c
+    SHA512 f73f288fb50f9f727edfc84810a15f1fdde76df9030c4b0d5292351e84ec8cd6c8a7e670b2a62301a77521bf60ebcf1bf7c8c9d97ddb77385ed945b55075c927
     HEAD_REF master
 )
 
@@ -20,5 +25,7 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/unicorn-lib RENAME copyright)
 \ No newline at end of file
diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL
index ea9008367..0753670c2 100644
--- a/ports/unicorn/CONTROL
+++ b/ports/unicorn/CONTROL
@@ -1,3 +1,3 @@
 Source: unicorn
-Version: 2019-01-30
+Version: 2019-04-19
 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 4eabb25be..37120935c 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 3df5ef8ab1cffc43fab461bfd24e42ae6c5919cf
-    SHA512 0b3037138075ad1bdc3be38295308dc15b5930b3c5de10cd0ac203e159b2dd0423ab74fe1a53e1922a5c809b2862e17b8a8d8d921335687755c1d210e21e4d0e
+    REF 778171fc9546c1fc3d1341ff1151eab379848ea0
+    SHA512 cad25326259d054718c8e338278374ba6b5dffbc84598023c14b64218139b106e8004dc9f6e2cd679638258da3de2f3cc5974e07639eda346d7e4ebcf44bd00e
     HEAD_REF master
 )
 
diff --git a/ports/unittest-cpp/CONTROL b/ports/unittest-cpp/CONTROL
index e24b8b774..9279cd127 100644
--- a/ports/unittest-cpp/CONTROL
+++ b/ports/unittest-cpp/CONTROL
@@ -1,3 +1,3 @@
 Source: unittest-cpp
-Version: 2.0.0
+Version: 2.0.0-1
 Description: A lightweight unit testing framework for C++
diff --git a/ports/unittest-cpp/portfile.cmake b/ports/unittest-cpp/portfile.cmake
index 2a31852a9..597444d3b 100644
--- a/ports/unittest-cpp/portfile.cmake
+++ b/ports/unittest-cpp/portfile.cmake
@@ -1,9 +1,7 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported by unittest-cpp yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO unittest-cpp/unittest-cpp
diff --git a/ports/unrar/CONTROL b/ports/unrar/CONTROL
index d9c586c6a..5e54ed37f 100644
--- a/ports/unrar/CONTROL
+++ b/ports/unrar/CONTROL
@@ -1,3 +1,3 @@
-Source: unrar
-Version: 5.5.8-1
-Description: rarlab's unrar libary
+Source: unrar
+Version: 5.5.8-2
+Description: rarlab's unrar libary
diff --git a/ports/unrar/portfile.cmake b/ports/unrar/portfile.cmake
index 4ad834d15..458d51783 100644
--- a/ports/unrar/portfile.cmake
+++ b/ports/unrar/portfile.cmake
@@ -5,10 +5,7 @@ set(UNRAR_FILENAME unrarsrc-${UNRAR_VERSION}.tar.gz)
 set(UNRAR_URL http://www.rarlab.com/rar/${UNRAR_FILENAME})
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/unrar)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message(STATUS "Unrar buildsystem doesn't support static building. Building dynamic instead.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 #SRC
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL
index 9e53e9b2f..1f16764c1 100644
--- a/ports/urdfdom-headers/CONTROL
+++ b/ports/urdfdom-headers/CONTROL
@@ -1,3 +1,3 @@
 Source: urdfdom-headers
-Version: 1.0.2
+Version: 1.0.3
 Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF.
diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake
index 4a9d3d8c1..404498b1c 100644
--- a/ports/urdfdom-headers/portfile.cmake
+++ b/ports/urdfdom-headers/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ros/urdfdom_headers
-    REF 1.0.2
-    SHA512 902cf18b3ccc62dd5d732707e9ca2b8698f3307b8005d3858fcdd0e9585d580bbe5d2ec77c8c8bfa7b8776b870844368a8ec93b0f8a8d71420cf5015a99b8867
+    REF 1.0.3
+    SHA512 44b1ca9724a9ccd5d2ad51f61d36de19b9a893955ad5c3ecfa2356f6468a0ac140b8cd6fa2aa18c163b0fa8ba87e834358369d2470cd3dee474408113a30b7a0
     HEAD_REF master
   )
 
diff --git a/ports/urdfdom/CONTROL b/ports/urdfdom/CONTROL
index 71e036251..c2a76b5c8 100644
--- a/ports/urdfdom/CONTROL
+++ b/ports/urdfdom/CONTROL
@@ -1,4 +1,4 @@
-Source: urdfdom
-Version: 1.0.0-2
-Description: Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.
-Build-Depends: console-bridge, tinyxml, urdfdom-headers
+Source: urdfdom
+Version: 1.0.3
+Description: Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.
+Build-Depends: console-bridge, tinyxml, urdfdom-headers
diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake
index 530b586e5..f10c6cc47 100644
--- a/ports/urdfdom/portfile.cmake
+++ b/ports/urdfdom/portfile.cmake
@@ -1,15 +1,12 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-  message(STATUS "urdfdom does not support static linkage. Building dynamically.")
-  set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO ros/urdfdom
-  REF 1.0.0
-  SHA512 50a218e596bcc0cecff904db2fa626bebc3902c4fe1f5ff8e08195e462b4d9a8c416a41f4773cabbcc71490060d3feff7e8528a76b824569dc7fdb0bda01ec3f
+  REF 1.0.3
+  SHA512 240181d9c61dd7544f16a79a400d9a2c4dc0a682bef165b46529efcb4b31e2a34e27896933b60b9ddbaa5c4a8d575ebda42752599ff3b0a98d1eeef8f9b0b7a7
   HEAD_REF master
 )
 
diff --git a/ports/uriparser/CMakeLists.txt b/ports/uriparser/CMakeLists.txt
deleted file mode 100644
index 47a6fbac1..000000000
--- a/ports/uriparser/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-project(uriparser C)
-
-if(MSVC)
-  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
-endif()
-
-include_directories(include)
-
-file(GLOB SRC src/*.c)
-
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
-add_library(uriparser ${SRC})
-
-install(
-  TARGETS uriparser
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
-
-if(NOT DISABLE_INSTALL_HEADERS)
-  install(DIRECTORY include/ DESTINATION include)
-endif()
diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL
index d14b93ded..a0e37aeba 100644
--- a/ports/uriparser/CONTROL
+++ b/ports/uriparser/CONTROL
@@ -1,3 +1,6 @@
 Source: uriparser
-Version: 0.9.1
-Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode
+Version: 0.9.3-4
+Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C89 ("ANSI C"). uriparser is cross-platform, fast, supports Unicode, and is licensed under the New BSD license.
+
+Feature: tool
+Description: Builds tools (e.g. CLI "uriparse")
diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake
index 342269c78..aafd0ae6a 100644
--- a/ports/uriparser/portfile.cmake
+++ b/ports/uriparser/portfile.cmake
@@ -3,20 +3,73 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uriparser/uriparser
-    REF uriparser-0.9.1
-    SHA512 5a553bc503b345bd81ad8bcfa25ab1e0f0ea0a0446a0c4beba9129d128d24de418efd10f04f8814b4f8864f6e219b5b9b938934edea76e78c0235428e5062636
+    REF uriparser-0.9.3
+    SHA512 5740e2405566c17c4467a677d83596d86398b64778ad2b5234e9390d8ab817d1b5231988d120b1d19b099788e38814825a438beed991e49b242b8a5de8c51d03
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+if("tool" IN_LIST FEATURES)
+    set(URIPARSER_BUILD_TOOLS ON)
+else()
+    set(URIPARSER_BUILD_TOOLS OFF)
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+    OPTIONS
+        -DURIPARSER_BUILD_DOCS=OFF
+        -DURIPARSER_BUILD_TESTS=OFF
+    OPTIONS_DEBUG
+        -DURIPARSER_BUILD_TOOLS=OFF
+    OPTIONS_RELEASE
+        -DURIPARSER_BUILD_TOOLS=${URIPARSER_BUILD_TOOLS}
 )
 
 vcpkg_install_cmake()
+
 vcpkg_copy_pdbs()
 
+if(URIPARSER_BUILD_TOOLS)
+    if(CMAKE_HOST_WIN32)
+        set(EXECUTABLE_SUFFIX ".exe")
+    else()
+        set(EXECUTABLE_SUFFIX "")
+    endif()
+
+    file(COPY ${CURRENT_PACKAGES_DIR}/bin/uriparse${EXECUTABLE_SUFFIX}
+        DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+    else()
+        file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/uriparse${EXECUTABLE_SUFFIX})
+    endif()
+endif()
+
+set(_package_version_re "#define[ ]+PACKAGE_VERSION[ ]+\"([0-9]+.[0-9]+.[0-9]+)\"")
+file(STRINGS
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h"
+    _package_version_define REGEX "${_package_version_re}"
+)
+string(REGEX REPLACE "${_package_version_re}" "\\1" _package_version ${_package_version_define})
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}-${_package_version})
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    vcpkg_replace_string(
+        ${CURRENT_PACKAGES_DIR}/include/uriparser/UriBase.h
+        "defined(URI_STATIC_BUILD)"
+        "1 // defined(URI_STATIC_BUILD)"
+    )
+endif()
+
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/uriparser RENAME copyright)
+
+# Remove duplicate info
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/usbmuxd/CONTROL b/ports/usbmuxd/CONTROL
index 38e2b4b5b..a583aad3c 100644
--- a/ports/usbmuxd/CONTROL
+++ b/ports/usbmuxd/CONTROL
@@ -1,4 +1,4 @@
 Source: usbmuxd
-Version: 1.1.1.133-2
+Version: 1.2.76
 Description: A socket daemon to multiplex connections from and to iOS devices
-Build-Depends: libimobiledevice, libusb, libusb-win32, pthreads
-\ No newline at end of file
+Build-Depends: libimobiledevice, libusb, libusb-win32, pthreads
diff --git a/ports/usbmuxd/fix-dependence-pthreads.patch b/ports/usbmuxd/fix-dependence-pthreads.patch
index 9a6187148..5ff4d8472 100644
--- a/ports/usbmuxd/fix-dependence-pthreads.patch
+++ b/ports/usbmuxd/fix-dependence-pthreads.patch
@@ -7,7 +7,7 @@ index d1d8a4d..086e8a4 100644
        <SubSystem>Console</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
 -      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -16,7 +16,7 @@ index d1d8a4d..086e8a4 100644
        <SubSystem>Console</SubSystem>
        <GenerateDebugInformation>true</GenerateDebugInformation>
 -      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -25,7 +25,7 @@ index d1d8a4d..086e8a4 100644
        <OptimizeReferences>true</OptimizeReferences>
        <GenerateDebugInformation>true</GenerateDebugInformation>
 -      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -34,7 +34,7 @@ index d1d8a4d..086e8a4 100644
        <OptimizeReferences>true</OptimizeReferences>
        <GenerateDebugInformation>true</GenerateDebugInformation>
 -      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/ports/usbmuxd/portfile.cmake b/ports/usbmuxd/portfile.cmake
index 2ea2d568f..6f952633a 100644
--- a/ports/usbmuxd/portfile.cmake
+++ b/ports/usbmuxd/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libimobiledevice-win32/usbmuxd
-    REF 1.1.1.133
-    SHA512 1a5f9abc239deeb15e2aab419ba9e88ef41ffa80396546fb65bc06b0f419cbabc80cdf95995caf71d5628d1537fb0329a73d923202e91ea43fcc7c32b840d047
+    REF v1.2.76
+    SHA512 b1bb479bf4ba0a71d7b70f55db4d01b68e024fe559265947e096d85cd736e4cc23c9ddbe07360641b63a5e1276c243e7fe2aa557323d1f5d22058c9a45de4f1a
     HEAD_REF master-msvc
     PATCHES
         fix-dependence-pthreads.patch
diff --git a/ports/usd/CONTROL b/ports/usd/CONTROL
new file mode 100644
index 000000000..58a564ad7
--- /dev/null
+++ b/ports/usd/CONTROL
@@ -0,0 +1,4 @@
+Source: usd
+Version: 0.8.4
+Build-Depends: boost-assign, boost-crc, boost-date-time, boost-filesystem, boost-format, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-vmd, tbb, zlib
+Description: Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.
diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake
new file mode 100644
index 000000000..a648e334a
--- /dev/null
+++ b/ports/usd/portfile.cmake
@@ -0,0 +1,56 @@
+# Don't file if the bin folder exists. We need exe and custom files.
+SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO PixarAnimationStudios/USD
+    REF v19.05
+    SHA512 4d708835f6efd539d5fff5cbaf0ec4d68c6d0c4d813ee531c4b9589ee585b720c34e993ef0a7ad0104a921ebd7ab8dec46d0c9284ec7f11993057fe81d3729e0
+    HEAD_REF master
+)
+
+vcpkg_find_acquire_program(PYTHON2)
+get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON2_DIR}")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DPXR_BUILD_ALEMBIC_PLUGIN:BOOL=OFF
+        -DPXR_BUILD_EMBREE_PLUGIN:BOOL=OFF
+        -DPXR_BUILD_IMAGING:BOOL=OFF
+        -DPXR_BUILD_MAYA_PLUGIN:BOOL=OFF
+        -DPXR_BUILD_MONOLITHIC:BOOL=OFF
+        -DPXR_BUILD_TESTS:BOOL=OFF
+        -DPXR_BUILD_USD_IMAGING:BOOL=OFF
+        -DPXR_ENABLE_PYTHON_SUPPORT:BOOL=OFF
+)
+
+vcpkg_install_cmake()
+
+file(
+    RENAME
+        "${CURRENT_PACKAGES_DIR}/pxrConfig.cmake"
+        "${CURRENT_PACKAGES_DIR}/cmake/pxrConfig.cmake")
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake")
+
+vcpkg_copy_pdbs()
+
+# Remove duplicates in debug folder
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(
+    COPY ${SOURCE_PATH}/LICENSE.txt
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/usd/copyright)
+
+# Move all dlls to bin
+file(GLOB RELEASE_DLL ${CURRENT_PACKAGES_DIR}/lib/*.dll)
+file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
+foreach(CURRENT_FROM ${RELEASE_DLL} ${DEBUG_DLL})
+    string(REPLACE "/lib/" "/bin/" CURRENT_TO ${CURRENT_FROM})
+    file(RENAME ${CURRENT_FROM} ${CURRENT_TO})
+endforeach()
diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt
new file mode 100644
index 000000000..21f6294e8
--- /dev/null
+++ b/ports/usockets/CMakeLists.txt
@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.13)
+project(uSockets C CXX)
+
+option(INSTALL_HEADERS "Install header files" ON)
+
+# To enable this feature, OpenSSL 1.1+ is required and is currently disabled due to issue 4267
+if (CMAKE_USE_OPENSSL)
+    find_package(OpenSSL REQUIRED)
+    set(USE_OPENSSL "-DUSE_OPENSSL -DLIBUS_USE_OPENSSL")
+    #set(OPENSSL_LIB "OpenSSL::SSL OpenSSL::Crypto")
+    list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+else()
+    set(NOT_USE_OPENSSL "-DLIBUS_NO_SSL")
+endif()
+
+find_package(unofficial-libuv CONFIG REQUIRED)
+find_path(LIBUV_INCLUDE_DIR uv.h)
+find_library(LIBUV_LIBRARY NAMES libuv)
+include_directories(APPEND "${CMAKE_CURRENT_LIST_DIR}/src")
+
+file(GLOB SOURCES src/*.c src/eventing/*.c)
+
+add_library(uSockets ${SOURCES})
+
+if (${LIBUS_USE_LIBUV})
+  target_compile_definitions(uSockets PRIVATE -DLIBUS_USE_LIBUV)
+endif()
+
+target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL})
+target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${LIBUV_INCLUDE_DIR} )
+target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY})
+
+install(TARGETS uSockets
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+)
+
+if(INSTALL_HEADERS)
+    file(GLOB HEADERS src/*.h)
+    install(FILES ${HEADERS} DESTINATION include)
+    file(GLOB HEADERS src/interfaces/*.h)
+    install(FILES ${HEADERS} DESTINATION include/interfaces)
+endif()
diff --git a/ports/usockets/CONTROL b/ports/usockets/CONTROL
new file mode 100644
index 000000000..107ed27ac
--- /dev/null
+++ b/ports/usockets/CONTROL
@@ -0,0 +1,4 @@
+Source: usockets
+Version: 0.1.2
+Build-Depends:libuv
+Description: Miniscule cross-platform eventing, networking & crypto for async applications
+\ No newline at end of file
diff --git a/ports/usockets/portfile.cmake b/ports/usockets/portfile.cmake
new file mode 100644
index 000000000..55e35e12b
--- /dev/null
+++ b/ports/usockets/portfile.cmake
@@ -0,0 +1,34 @@
+include(vcpkg_common_functions)
+
+IF (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+   set(USE_LIBUV ON)
+EndIF ()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO uNetworking/uSockets
+    REF v0.1.2
+    SHA512 fedfc50e3498320600247920360db38977f5be4aa9067146a5a0db13dc789b8fa39fa9315b19f56555915bcb818cd0f77ccf0b8cb40ed48e2b193b083d16b242
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+set(USE_OPENSSL OFF)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS 
+        -DCMAKE_USE_OPENSSL=${USE_OPENSSL}
+        -DLIBUS_USE_LIBUV=${USE_LIBUV}
+    OPTIONS_DEBUG
+        -DINSTALL_HEADERS=OFF
+)
+
+vcpkg_install_cmake()
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/usockets)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/usockets/LICENSE ${CURRENT_PACKAGES_DIR}/share/usockets/copyright)
+
+vcpkg_copy_pdbs()
+\ No newline at end of file
diff --git a/ports/utf8proc/CONTROL b/ports/utf8proc/CONTROL
index 84acd8986..183f1bb39 100644
--- a/ports/utf8proc/CONTROL
+++ b/ports/utf8proc/CONTROL
@@ -1,3 +1,3 @@
 Source: utf8proc
-Version: 2.1.0-1
+Version: 2.4.0
 Description: Clean C library for processing UTF-8 Unicode data.
diff --git a/ports/utf8proc/portfile.cmake b/ports/utf8proc/portfile.cmake
index 64244ec03..113f4d6d8 100644
--- a/ports/utf8proc/portfile.cmake
+++ b/ports/utf8proc/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO JuliaLang/utf8proc
-    REF v2.1.0
-    SHA512 72b7f377fa6a62018d3eeab8723a27e25db3d1f794ae0bf21fff62ec1a7439bec52e7c93d2a00c218de6ff518097fb4a7a87c56e61ba8c98e689aa8f7171c812)
+    REF v2.4.0
+    SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a)
 
 vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch)
diff --git a/ports/utfcpp/CONTROL b/ports/utfcpp/CONTROL
index e98dd9ee4..f3800dd21 100644
--- a/ports/utfcpp/CONTROL
+++ b/ports/utfcpp/CONTROL
@@ -1,3 +1,3 @@
-Source: utfcpp
-Version: 2.3.5
-Description: UTF-8 with C++ in a Portable Way
+Source: utfcpp
+Version: 3.1
+Description: UTF-8 with C++ in a Portable Way
diff --git a/ports/utfcpp/portfile.cmake b/ports/utfcpp/portfile.cmake
index 19c062f36..bbbfe663f 100644
--- a/ports/utfcpp/portfile.cmake
+++ b/ports/utfcpp/portfile.cmake
@@ -1,12 +1,13 @@
 #header-only library
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/utfcpp-2.3.5)
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://github.com/nemtrif/utfcpp/archive/v2.3.5.tar.gz"
-    FILENAME "utfcpp-2.3.5.tar.gz"
-    SHA512 d5e672de952b78a78a8af0c81664f15667b30558fd406a9abc72c14dc444e0869e7c02cb66fa017ec0e760c0fb23c3e923a4b171c2acb3ed7b71612783e789ee
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nemtrif/utfcpp
+    REF v3.1
+    SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
 # Put the licence file where vcpkg expects it
 file(INSTALL ${SOURCE_PATH}/source/utf8.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/utfcpp RENAME copyright)
diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL
index 7fad35659..605f15071 100644
--- a/ports/uvatlas/CONTROL
+++ b/ports/uvatlas/CONTROL
@@ -1,3 +1,3 @@
 Source: uvatlas
-Version: sept2016
+Version: sept2016-1
 Description: UVAtlas isochart texture atlas
 \ No newline at end of file
diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake
index ae7e9f285..e1a1a189f 100644
--- a/ports/uvatlas/portfile.cmake
+++ b/ports/uvatlas/portfile.cmake
@@ -1,47 +1,52 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-if (VCPKG_CRT_LINKAGE STREQUAL static)
-    message(FATAL_ERROR "UVAtlas does not currently support static crt linkage")
-endif()
-if(VCPKG_CMAKE_SYSTEM_NAME)
-    message(FATAL_ERROR "UVAtlas only supports Windows Desktop")
-endif()
-
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/UVAtlas-sept2016)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/UVAtlas/archive/sept2016.tar.gz"
-    FILENAME "UVAtlas-sept2016.tar.gz"
-    SHA512 326af26c151620cd5082daf3913cf3fbe7bca7d1aaf5cc44cacff54319ffe79b728c24519187c3f9393a846430d0fb9493ffe9473f87d220f5c9ae7dab73f69f
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-IF(TRIPLET_SYSTEM_ARCH MATCHES "x86")
-	SET(BUILD_ARCH "Win32")
-ELSE()
-	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
-ENDIF()
-
-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/UVAtlas/UVAtlas_2015.sln
-	PLATFORM ${BUILD_ARCH}
-)
-
-file(INSTALL
-	${SOURCE_PATH}/UVAtlas/Inc/
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(INSTALL
-	${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Release/UVAtlas.lib
-	DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL
-	${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Debug/UVAtlas.lib
-	DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-
-# Handle copyright
-file(COPY ${SOURCE_PATH}/MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/MIT.txt ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright)
-
-message(STATUS "Installing done, uvatlastool.exe can be downloaded at: ")
-message(STATUS " https://github.com/Microsoft/UVAtlas/releases/download/sept2016/uvatlastool.exe")
-\ No newline at end of file
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
+
+if(VCPKG_CMAKE_SYSTEM_NAME)
+    message(FATAL_ERROR "UVAtlas only supports Windows Desktop")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/UVAtlas
+    REF sept2016
+    SHA512 326af26c151620cd5082daf3913cf3fbe7bca7d1aaf5cc44cacff54319ffe79b728c24519187c3f9393a846430d0fb9493ffe9473f87d220f5c9ae7dab73f69f
+    HEAD_REF master
+)
+
+IF(TRIPLET_SYSTEM_ARCH MATCHES "x86")
+	SET(BUILD_ARCH "Win32")
+ELSE()
+	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+ENDIF()
+
+vcpkg_build_msbuild(
+    PROJECT_PATH ${SOURCE_PATH}/UVAtlas/UVAtlas_2015.sln
+	PLATFORM ${BUILD_ARCH}
+)
+
+file(INSTALL
+	${SOURCE_PATH}/UVAtlas/Inc/
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(INSTALL
+	${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Release/UVAtlas.lib
+	DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL
+	${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Debug/UVAtlas.lib
+	DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+
+vcpkg_download_distfile(uvatlastool
+    URLS "https://github.com/Microsoft/UVAtlas/releases/download/sept2016/uvatlastool.exe"
+    FILENAME "uvatlastool.exe"
+    SHA512 2583ba8179d0a58fb85d871368b17571e36242436b5a5dbaf6f99ec2f2ee09f4e11e8f922b29563da3cb3b5bacdb771036c84d5b94f405c7988bfe5f2881c3df
+)
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/")
+
+file(INSTALL
+	${DOWNLOADS}/uvatlastool.exe
+	DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/)
+
+	# Handle copyright
+file(COPY ${SOURCE_PATH}/MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/MIT.txt ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright)
diff --git a/ports/uvw/CONTROL b/ports/uvw/CONTROL
index 59926f1a9..7c705cb5e 100644
--- a/ports/uvw/CONTROL
+++ b/ports/uvw/CONTROL
@@ -1,4 +1,4 @@
 Source: uvw
-Version: 1.15.0
+Version: 1.17.0_libuv-v1.29
 Description: Header-only, event based, tiny and easy to use libuv wrapper in modern C++. <https://github.com/skypjack/uvw>
 Build-Depends: libuv
diff --git a/ports/uvw/portfile.cmake b/ports/uvw/portfile.cmake
index 0fca53590..27fcea15a 100644
--- a/ports/uvw/portfile.cmake
+++ b/ports/uvw/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO skypjack/uvw
-    REF v1.15.0_libuv-v1.27
-    SHA512 acf1f1bdbc34ec5d040514ca08c99ee05b5bbb112828a4acf5f4c50e1910d2c74864a0793d4087b7a4a0704dd2ba1a973f65cee032fffea9247009be9cd0243c
+    REF v1.17.0_libuv-v1.29
+    SHA512 2e3ee6e55950185e1889c99b07d63d811d89ad20705253ad699a828073f5ea7860616e0ae980232c7819d3fd21a4cb7a2e9d084fd8c4f40b19951106f08b9ad0
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/uwebsockets/CMakeLists.txt b/ports/uwebsockets/CMakeLists.txt
deleted file mode 100644
index c3c4f97d8..000000000
--- a/ports/uwebsockets/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-project(uwebsockets CXX)
-
-option(INSTALL_HEADERS "Install header files" ON)
-
-find_package(ZLIB REQUIRED)
-find_package(OpenSSL REQUIRED)
-find_path(LIBUV_INCLUDE_DIR uv.h)
-find_library(LIBUV_LIBRARY NAMES libuv)
-
-file(GLOB SOURCES src/*.cpp)
-add_library(uWS ${SOURCES})
-target_include_directories(uWS PUBLIC ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
-target_link_libraries(uWS PUBLIC ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBUV_LIBRARY})
-target_compile_features(uWS PRIVATE cxx_range_for)
-
-install(TARGETS uWS
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-)
-
-if(INSTALL_HEADERS)
-    file(GLOB HEADERS src/*.h)
-    install(FILES ${HEADERS} DESTINATION include/uWS)
-endif()
diff --git a/ports/uwebsockets/CONTROL b/ports/uwebsockets/CONTROL
index c212611de..daf53b28b 100644
--- a/ports/uwebsockets/CONTROL
+++ b/ports/uwebsockets/CONTROL
@@ -1,4 +1,4 @@
 Source: uwebsockets
-Version: 0.14.8-2
-Build-Depends: libuv, openssl, zlib
-Description: Highly scalable cross-platform WebSocket & HTTP library for C++11 and Node.js
+Version: 0.15.6
+Build-Depends: zlib, usockets
+Description: Simple, secure & standards compliant web I/O for the most demanding of applications
diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake
index f9d6c43a1..dc8f5255e 100644
--- a/ports/uwebsockets/portfile.cmake
+++ b/ports/uwebsockets/portfile.cmake
@@ -2,24 +2,15 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO uWebSockets/uWebSockets
-    REF v0.14.8
-    SHA512 5e78e2f10e95648ad1e7f26612f69da3bbdcdb3f17c99e3bb9775e3eb440a2741f05375dcc043b43f0f2d4de6da54e7534431c5c10c1350103a4379b55cf9081
+    REPO uNetworking/uWebSockets
+    REF v0.15.6
+    SHA512 ba5dc18412ecceadb48e3c0f9b6f6d9ea920b76c36b12456bc96198346149010257c0f7807a1e1cc262ae0eca07e1994d3f1e3be0b3c815ce455d778c5375311
     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
-        -DINSTALL_HEADERS=OFF
-)
-
-vcpkg_install_cmake()
+file(COPY ${SOURCE_PATH}/src  DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(RENAME ${CURRENT_PACKAGES_DIR}/include/src ${CURRENT_PACKAGES_DIR}/include/uwebsockets/)
 
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uwebsockets)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/uwebsockets/LICENSE ${CURRENT_PACKAGES_DIR}/share/uwebsockets/copyright)
 
-vcpkg_copy_pdbs()
diff --git a/ports/valijson/CONTROL b/ports/valijson/CONTROL
new file mode 100644
index 000000000..4ea2b5d1e
--- /dev/null
+++ b/ports/valijson/CONTROL
@@ -0,0 +1,3 @@
+Source: valijson
+Version: 2018-11-17
+Description: Header-only C++ library for JSON Schema validation
+\ No newline at end of file
diff --git a/ports/valijson/fix-nlohmann-json.patch b/ports/valijson/fix-nlohmann-json.patch
new file mode 100644
index 000000000..7465837d5
--- /dev/null
+++ b/ports/valijson/fix-nlohmann-json.patch
@@ -0,0 +1,26 @@
+diff --git a/include/valijson/adapters/nlohmann_json_adapter.hpp b/include/valijson/adapters/nlohmann_json_adapter.hpp
+index f77a2bf..3f6fb5f 100644
+--- a/include/valijson/adapters/nlohmann_json_adapter.hpp
++++ b/include/valijson/adapters/nlohmann_json_adapter.hpp
+@@ -28,7 +28,7 @@
+ #define __VALIJSON_ADAPTERS_NLOHMANN_JSON_ADAPTER_HPP
+ 
+ #include <string>
+-#include <json.hpp>
++#include <nlohmann/json.hpp>
+ 
+ #include <valijson/adapters/adapter.hpp>
+ #include <valijson/adapters/basic_adapter.hpp>
+diff --git a/include/valijson/utils/nlohmann_json_utils.hpp b/include/valijson/utils/nlohmann_json_utils.hpp
+index 01838d8..4a5b5e4 100644
+--- a/include/valijson/utils/nlohmann_json_utils.hpp
++++ b/include/valijson/utils/nlohmann_json_utils.hpp
+@@ -4,7 +4,7 @@
+ 
+ #include <iostream>
+ 
+-#include <json.hpp>
++#include <nlohmann/json.hpp>
+ #include <valijson/utils/file_utils.hpp>
+ 
+ namespace valijson {
diff --git a/ports/valijson/fix-optional.patch b/ports/valijson/fix-optional.patch
new file mode 100644
index 000000000..5ce75843c
--- /dev/null
+++ b/ports/valijson/fix-optional.patch
@@ -0,0 +1,13 @@
+diff --git a/include/valijson/internal/optional.hpp b/include/valijson/internal/optional.hpp
+index 8ff285c..84e9fd6 100644
+--- a/include/valijson/internal/optional.hpp
++++ b/include/valijson/internal/optional.hpp
+@@ -11,7 +11,7 @@ namespace opt = std;
+ #    endif
+ #  endif
+ #else
+-#  include <compat/optional.hpp>
++#  include <valijson/compat/optional.hpp>
+ namespace opt = std::experimental;
+ #endif
+ 
diff --git a/ports/valijson/fix-picojson.patch b/ports/valijson/fix-picojson.patch
new file mode 100644
index 000000000..bb1b4d51b
--- /dev/null
+++ b/ports/valijson/fix-picojson.patch
@@ -0,0 +1,26 @@
+diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp
+index b6d17c9..6d04c52 100644
+--- a/include/valijson/adapters/picojson_adapter.hpp
++++ b/include/valijson/adapters/picojson_adapter.hpp
+@@ -29,7 +29,7 @@
+ 
+ #include <string>
+ 
+-#include <picojson.h>
++#include <picojson/picojson.h>
+ 
+ #include <valijson/adapters/adapter.hpp>
+ #include <valijson/adapters/basic_adapter.hpp>
+diff --git a/include/valijson/utils/picojson_utils.hpp b/include/valijson/utils/picojson_utils.hpp
+index 2ca4d46..b983648 100644
+--- a/include/valijson/utils/picojson_utils.hpp
++++ b/include/valijson/utils/picojson_utils.hpp
+@@ -4,7 +4,7 @@
+ 
+ #include <iostream>
+ 
+-#include <picojson.h>
++#include <picojson/picojson.h>
+ 
+ #include <valijson/utils/file_utils.hpp>
+ 
diff --git a/ports/valijson/portfile.cmake b/ports/valijson/portfile.cmake
new file mode 100644
index 000000000..6c0b84530
--- /dev/null
+++ b/ports/valijson/portfile.cmake
@@ -0,0 +1,28 @@
+#header-only library
+include(vcpkg_common_functions)
+
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/valijson)
+
+vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
+    REPO tristanpenman/valijson
+    REF dd084d747448bb56ddfeab5946b4f2f4617b99c4
+    SHA512 ee241eefc816360608f86792a4c25abadea79cbffc94d7e31a2dbd0a483ed4d7a303b6d2410b99ab7694e58a3d299f0df0baa52fa16f89e9233d90b190a4d799
+    HEAD_REF master
+    PATCHES fix-nlohmann-json.patch
+            fix-picojson.patch
+            fix-optional.patch
+)
+
+# Copy the header files
+file(GLOB HEADER_FILES ${SOURCE_PATH}/include/valijson/*)
+file(COPY ${HEADER_FILES}
+     DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson
+     REGEX "\.(gitattributes|gitignore)$" EXCLUDE)
+
+file(COPY ${SOURCE_PATH}/include/compat/optional.hpp
+     DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson/compat)
+
+# Put the licence file where vcpkg expects it
+file(COPY ${SOURCE_PATH}/LICENSE
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/valijson)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/valijson/LICENSE ${CURRENT_PACKAGES_DIR}/share/valijson/copyright)
+\ No newline at end of file
diff --git a/ports/visit-struct/CMakeLists.txt b/ports/visit-struct/CMakeLists.txt
new file mode 100644
index 000000000..df4fa2890
--- /dev/null
+++ b/ports/visit-struct/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.11)
+project(visit_struct)
+
+add_library(visit_struct INTERFACE)
+
+install(TARGETS visit_struct
+    EXPORT visit_struct-targets
+    INCLUDES DESTINATION include)
+
+install(EXPORT visit_struct-targets
+    FILE visit_struct-config.cmake
+    NAMESPACE visit_struct::
+    DESTINATION share/visit_struct)
+
+install(DIRECTORY
+    include/visit_struct
+    DESTINATION include)
diff --git a/ports/visit-struct/CONTROL b/ports/visit-struct/CONTROL
new file mode 100644
index 000000000..98ad6e2e9
--- /dev/null
+++ b/ports/visit-struct/CONTROL
@@ -0,0 +1,3 @@
+Source: visit-struct
+Version: 1.0
+Description: A header-only library providing structure visitors for C++11 and C++14
diff --git a/ports/visit-struct/portfile.cmake b/ports/visit-struct/portfile.cmake
new file mode 100644
index 000000000..e3daf0c47
--- /dev/null
+++ b/ports/visit-struct/portfile.cmake
@@ -0,0 +1,30 @@
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cbeck88/visit_struct
+    REF v1.0
+    SHA512 1396d0d4c4d37f48434361d1e0ab4cb02c397aff1134678b26de713a27a4fcfa1c352890845502be645ba01e20314bf67731893fc6410b93e4521c1261d63c06
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH share/visit_struct
+    TARGET_PATH TARGET_PATH share/visit_struct
+)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+     RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README.md
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/vlpp/CONTROL b/ports/vlpp/CONTROL
index 392beec5e..680cd2b28 100644
--- a/ports/vlpp/CONTROL
+++ b/ports/vlpp/CONTROL
@@ -1,3 +1,3 @@
 Source: vlpp
-Version: 0.9.3.1-1
+Version: 0.9.3.1-2
 Description: Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc
diff --git a/ports/vlpp/portfile.cmake b/ports/vlpp/portfile.cmake
index 1ee003ffb..a54bdfe04 100644
--- a/ports/vlpp/portfile.cmake
+++ b/ports/vlpp/portfile.cmake
@@ -1,31 +1,29 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Release-0.9.3.1)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/vczh-libraries/Release/archive/0.9.3.1.tar.gz"
-    FILENAME "GacUI-0.9.3.1.tar.gz"
-    SHA512 f284d3c78f8ae54102457b2cdc4fcee4b8da9a72d13bb325c7c7269261c5b0789eeb7340b0409b2b37294d68edb558503be131948aea3cb53582900339d26b54
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS_DEBUG -DSKIP_HEADERS=1
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-# Tools
-file(INSTALL ${SOURCE_PATH}/Tools/CppMerge.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/vlpp RENAME copyright)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vczh-libraries/Release
+    REF 0.9.3.1
+    SHA512 f284d3c78f8ae54102457b2cdc4fcee4b8da9a72d13bb325c7c7269261c5b0789eeb7340b0409b2b37294d68edb558503be131948aea3cb53582900339d26b54
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Tools
+file(INSTALL ${SOURCE_PATH}/Tools/CppMerge.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/vlpp RENAME copyright)
diff --git a/ports/vtk-dicom/CONTROL b/ports/vtk-dicom/CONTROL
index fdd8e04d3..4d6a1df30 100644
--- a/ports/vtk-dicom/CONTROL
+++ b/ports/vtk-dicom/CONTROL
@@ -1,8 +1,8 @@
 Source: vtk-dicom
-Version: 0.8.8-alpha-1
+Version: 0.8.9
 Description: DICOM for VTK
 Build-Depends: vtk, zlib
 
 Feature: gdcm
 Description: Use gdcm for decompressing DICOM files.
-Build-Depends: gdcm2
+Build-Depends: gdcm
diff --git a/ports/vtk-dicom/portfile.cmake b/ports/vtk-dicom/portfile.cmake
index e7f5c65aa..dd890ec26 100644
--- a/ports/vtk-dicom/portfile.cmake
+++ b/ports/vtk-dicom/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dgobbi/vtk-dicom
-    REF ca27801fad6356c98ba19e760b9b4b8e9128f60e
-    SHA512 d4916fa385e6f26da0a5d7eb981497c9121ff4f67b4b03e518aa4974d2b0ef207168e939e5063e705c15f627ace56e39aca5f5891d333924cbc80c9277aa7dd2
+    REF v0.8.9
+    SHA512 f75295a25896b4d571e9d9bb04fbedbd8bcf5e12637d17b6eadceda296fc105decb44c6cb09f1d69daf17093bb61cdb8909fcde347137f30eb6b8b2b298ff065
     HEAD_REF master
 )
 
diff --git a/ports/vulkan-hpp/CONTROL b/ports/vulkan-hpp/CONTROL
new file mode 100644
index 000000000..95b59f3f8
--- /dev/null
+++ b/ports/vulkan-hpp/CONTROL
@@ -0,0 +1,4 @@
+Source: vulkan-hpp
+Version: 2019-05-11
+Description: Header only C++ bindings for the Vulkan C API
+Build-Depends: vulkan
diff --git a/ports/vulkan-hpp/portfile.cmake b/ports/vulkan-hpp/portfile.cmake
new file mode 100644
index 000000000..809b8149c
--- /dev/null
+++ b/ports/vulkan-hpp/portfile.cmake
@@ -0,0 +1,16 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KhronosGroup/Vulkan-Hpp
+    REF 5ce8ae7fd0d9c0543d02f33cfa8a66e6a43e2150
+    SHA512 dc58332f5075f0b4d001abd4e78664be099509b8cee525a211aa33599f2351bf5e200fef37dccc84895d8f7a056f075ae3cf404f9aac7281970ff903e4a67a96
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/vulkan/vulkan.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/vulkan)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/vulkan-memory-allocator/CONTROL b/ports/vulkan-memory-allocator/CONTROL
index ec6c0757a..ac18202c2 100644
--- a/ports/vulkan-memory-allocator/CONTROL
+++ b/ports/vulkan-memory-allocator/CONTROL
@@ -1,3 +1,3 @@
 Source: vulkan-memory-allocator
-Version: 2.1.0-1
+Version: 2.2.0
 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
index c72af8935..5bbdeda15 100644
--- a/ports/vulkan-memory-allocator/portfile.cmake
+++ b/ports/vulkan-memory-allocator/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
-    REF v2.1.0
-    SHA512 4d7d431d52503d4d448a8b571935678a8a04d8f4a7eceb6ad49cde4f78954e7a2a0a91e48c75382699a62d81cf00601aaa0a358d979ed8e14741a9956484b51e
+    REF v2.2.0
+    SHA512 85b49a1c55f469fd7340075809b045507db162b7dc663b885d963e3b3fd17759608401d353d3460f2ebf771e97f89af46e409cf9f5186325c3ce2c68d9b7e08f
     HEAD_REF master
 )
 
diff --git a/ports/vxl/CONTROL b/ports/vxl/CONTROL
index 84fcd2bd1..a24672f83 100644
--- a/ports/vxl/CONTROL
+++ b/ports/vxl/CONTROL
@@ -1,5 +1,8 @@
 Source: vxl
-Version: v1.18.0-3
-Build-Depends: bzip2, libgeotiff, libjpeg-turbo, libpng, tiff, zlib, expat, shapelib
-# Build-Depends: bzip2, dcmtk, libgeotiff, libjpeg-turbo, openjpeg, libpng, tiff, zlib
+Version: v1.18.0-4
+Build-Depends: bzip2, expat, libgeotiff, libjpeg-turbo, libpng, shapelib, tiff, zlib
+# Build-Depends: bzip2, dcmtk, expat, libgeotiff, libjpeg-turbo, openjpeg, libpng, shapelib, tiff, zlib
 Description: A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.
+
+Feature: core_imaging
+Description: core_imaging support for vxl
diff --git a/ports/vxl/fix_dependency.patch b/ports/vxl/fix_dependency.patch
new file mode 100644
index 000000000..1c8e2ad54
--- /dev/null
+++ b/ports/vxl/fix_dependency.patch
@@ -0,0 +1,13 @@
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index b6af7c2..7ca75d3 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -100,7 +100,7 @@ endif()
+ 
+ 
+ # coordinate systems
+-if(BUILD_CORE_GEOMETRY AND BUILD_CORE_NUMERICS)
++if(BUILD_CORE_GEOMETRY AND BUILD_CORE_NUMERICS AND BUILD_CORE_IMAGING)
+   add_subdirectory(vcsl)
+   add_subdirectory(vpgl)
+ endif()
diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake
index 9735f144b..ea61e081e 100644
--- a/ports/vxl/portfile.cmake
+++ b/ports/vxl/portfile.cmake
@@ -1,7 +1,12 @@
 include(vcpkg_common_functions)
 
-if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openjpeg.h")
-    message(FATAL_ERROR "Can't build VXL with non built-in OpenJpeg in current version. Please remove OpenJpeg, and try install VXL again.")
+set(BUILD_CORE_IMAGING OFF)
+if("core_imaging" IN_LIST FEATURES)
+  set(BUILD_CORE_IMAGING ON)
+  if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openjpeg.h")
+    set(BUILD_CORE_IMAGING OFF)
+    message(WARNING "Can't build VXL CORE_IMAGING features with non built-in OpenJpeg. Please remove OpenJpeg, and try install VXL again if you need them.")
+  endif()
 endif()
 
 vcpkg_from_github(
@@ -10,6 +15,8 @@ vcpkg_from_github(
     REF v1.18.0
     SHA512 6666d647b2e7010b91cb0b05016b5f49ae46d198f6bd160fe13fc09bc674eff5b937331fa11d81a8496473968b63452d950eee4fc2512152af57304a14bed63f
     HEAD_REF master
+    PATCHES
+        fix_dependency.patch
 )
 
 set(USE_WIN_WCHAR_T OFF)
@@ -23,6 +30,7 @@ vcpkg_configure_cmake(
     OPTIONS
         -DBUILD_EXAMPLES=OFF
         -DBUILD_TESTING=OFF
+        -DBUILD_CORE_IMAGING=${BUILD_CORE_IMAGING}
         -DVXL_FORCE_V3P_BZLIB2=OFF
         -DVXL_USING_NATIVE_BZLIB2=TRUE # for disable build built-in bzip2 (v3p/bzlib/CMakeLists.txt#L10-L26)
         -DVXL_FORCE_V3P_CLIPPER=ON # TODO : need add clipper port to turn off
@@ -48,4 +56,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 file(INSTALL ${SOURCE_PATH}/core/vxl_copyright.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-#
-\ No newline at end of file
+#
diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
index 77df9ccf0..f4a10f007 100644
--- a/ports/wangle/CONTROL
+++ b/ports/wangle/CONTROL
@@ -1,4 +1,4 @@
 Source: wangle
-Version: 2019.01.07.00-1
-Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion
+Version: 2019.05.13.00
+Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context
 Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.
diff --git a/ports/wangle/build.patch b/ports/wangle/build.patch
index d695f5b18..13b85b037 100644
--- a/ports/wangle/build.patch
+++ b/ports/wangle/build.patch
@@ -1,25 +1,12 @@
-diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
-index 15dc8b6..ed8c79b 100644
---- a/wangle/CMakeLists.txt
-+++ b/wangle/CMakeLists.txt
-@@ -39,9 +39,9 @@ endif()
- find_package(fizz CONFIG REQUIRED)
- 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)
-@@ -123,6 +123,7 @@ target_include_directories(
-   PUBLIC
-     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>
-     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
-+  PRIVATE
-     ${FIZZ_INCLUDE_DIR}
-     ${FOLLY_INCLUDE_DIR}
-     ${Boost_INCLUDE_DIR}
+diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
+index 15dc8b6..ed8c79b 100644
+--- a/wangle/CMakeLists.txt
++++ b/wangle/CMakeLists.txt
+@@ -123,6 +123,7 @@ target_include_directories(
+   PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>
+     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
++  PRIVATE
+     ${FIZZ_INCLUDE_DIR}
+     ${FOLLY_INCLUDE_DIR}
+     ${Boost_INCLUDE_DIR}
diff --git a/ports/wangle/gflags.patch b/ports/wangle/gflags.patch
deleted file mode 100644
index 20921c72c..000000000
--- a/ports/wangle/gflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
index ce1672eb7..443cdbce9 100644
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@@ -5,25 +5,32 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/wangle
-    REF v2019.01.07.00
-    SHA512 1b4771d92b45fd5e9622985321cfd608510ea13d2f4cb03a4842c52d7253a1b460f825746a315ef0df3b2e37e56abddb5b493b80d383ba327fdbf7294bae193e
+    REF v2019.05.13.00
+    SHA512 17cc164634d3bec5059abed8f28a8d5e76b6bf3475ee848c0fc0e88c59ce82d1257555a86c638484d81795b2e8f582a8559e13a195c38bdd88ae73e3a5684ffc
     HEAD_REF master
     PATCHES
         build.patch
-        gflags.patch
         fix-config-cmake.patch
 )
+# message(FATAL_ERROR "patch")
 
 vcpkg_configure_cmake(
     SOURCE_PATH "${SOURCE_PATH}/wangle"
     PREFER_NINJA
     OPTIONS
         -DBUILD_TESTS=OFF
+        -DBUILD_EXAMPLES=OFF
         -DINCLUDE_INSTALL_DIR:STRING=include
 )
 
 vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/wangle")
+
+file(READ ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake _contents)
+STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
+STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake "${_contents}")
+
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE 
diff --git a/ports/wangle/usage b/ports/wangle/usage
index 768ff2d64..50903e726 100644
--- a/ports/wangle/usage
+++ b/ports/wangle/usage
@@ -2,4 +2,3 @@ The package wangle is compatible with built-in CMake targets:
 
     find_package(wangle REQUIRED)
     target_link_libraries(main PRIVATE wangle::wangle)
-    target_include_directories(main PRIVATE ${WANGLE_INCLUDE_DIR})
diff --git a/ports/wavpack/CONTROL b/ports/wavpack/CONTROL
index 80fb66b96..7b169e060 100644
--- a/ports/wavpack/CONTROL
+++ b/ports/wavpack/CONTROL
@@ -1,3 +1,3 @@
 Source: wavpack
-Version: 5.1.0-00d9a4a
+Version: 5.1.0-00d9a4a-1
 Description: WavPack encode/decode library, command-line programs, and several plugins
diff --git a/ports/wavpack/OpenSSL.patch b/ports/wavpack/OpenSSL.patch
new file mode 100644
index 000000000..6d8e956ad
--- /dev/null
+++ b/ports/wavpack/OpenSSL.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 70e1043f..d8cb8b10 100644
+--- a/CMakeLists.txt	
++++ b/CMakeLists.txt
+@@ -208,7 +208,7 @@ target_include_directories(wavpack
+ target_link_libraries(wavpack
+     PRIVATE
+         $<$<BOOL:${HAVE_LIBM}>:m>
+-        $<$<BOOL:${WAVPACK_ENABLE_LIBCRYPTO}>:${OPENSSL_CRYPTO_LIBRARY}>
++        $<$<BOOL:${WAVPACK_ENABLE_LIBCRYPTO}>:OpenSSL::Crypto>
+ )
+ target_compile_definitions(wavpack
+     PRIVATE
diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake
index 1594f7249..db2df1cde 100644
--- a/ports/wavpack/portfile.cmake
+++ b/ports/wavpack/portfile.cmake
@@ -19,6 +19,8 @@ vcpkg_from_github(
     REF 00d9a4ac58a52b52495736be614cb06ba102663c
     SHA512 a0d08ac2ff46bd4cc606626c8e0da18a83392722a2e40df18f9e40710e5e147c0a24800174bfdf42ed7a12be4d9679f6302c51d8409724d31ca2a29ab4972481
     HEAD_REF master
+    PATCHES
+        OpenSSL.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/websocketpp/CONTROL b/ports/websocketpp/CONTROL
index 5c7457a2a..206b0d4dd 100644
--- a/ports/websocketpp/CONTROL
+++ b/ports/websocketpp/CONTROL
@@ -1,4 +1,4 @@
 Source: websocketpp
-Version: 0.8.1
+Version: 0.8.1-1
 Build-Depends: zlib, openssl, boost-asio
 Description: Library that implements RFC6455 The WebSocket Protocol
 \ No newline at end of file
diff --git a/ports/websocketpp/openssl_110.patch b/ports/websocketpp/openssl_110.patch
deleted file mode 100644
index 93f4302e0..000000000
--- a/ports/websocketpp/openssl_110.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp
-index 7b32db8..37173b7 100644
---- a/websocketpp/transport/asio/security/tls.hpp
-+++ b/websocketpp/transport/asio/security/tls.hpp
-@@ -355,7 +355,13 @@ protected:
-     template <typename ErrorCodeType>
-     lib::error_code translate_ec(ErrorCodeType ec) {
-         if (ec.category() == lib::asio::error::get_ssl_category()) {
--            if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) {
-+            if (
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+                ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ
-+#else
-+                false
-+#endif
-+            ) {
-                 return make_error_code(transport::error::tls_short_read);
-             } else {
-                 // We know it is a TLS related error, but otherwise don't know
diff --git a/ports/websocketpp/portfile.cmake b/ports/websocketpp/portfile.cmake
index 35514259c..2da84ba26 100644
--- a/ports/websocketpp/portfile.cmake
+++ b/ports/websocketpp/portfile.cmake
@@ -4,11 +4,9 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zaphoyd/websocketpp
-    REF 0.8.1
-    SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c
+    REF 1c699ce46843a787482a703fdeff9271fbb7bb5d
+    SHA512 9de30e02e09b066dca8d840963e78673ef118e5183f9638b8a5c941116422916fe9fe02bb5271843aeb292a460f159b5957887594c0824a88600e6c4a5620dbd
     HEAD_REF master
-    PATCHES
-        openssl_110.patch
 )
 
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/websocketpp)
diff --git a/ports/wil/CONTROL b/ports/wil/CONTROL
new file mode 100644
index 000000000..3db06e5b9
--- /dev/null
+++ b/ports/wil/CONTROL
@@ -0,0 +1,3 @@
+Source: wil
+Version: 2019-05-08
+Description: The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.
+\ No newline at end of file
diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake
new file mode 100644
index 000000000..369280920
--- /dev/null
+++ b/ports/wil/portfile.cmake
@@ -0,0 +1,13 @@
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/wil
+    REF 43613517258fbd94182e195b1a4887420ed74b31
+    SHA512 cf15c8571d81b837b2ce4083d7e70d738698ff5ef99a7e99daa96618463281fc8e6642f1703d3b96de7208f7720ecf4108f6ed09b33d2980c2b609dc70fd4653
+    HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wil RENAME copyright)
+\ No newline at end of file
diff --git a/ports/wildmidi/CONTROL b/ports/wildmidi/CONTROL
index 116333ec1..33e9cde1f 100644
--- a/ports/wildmidi/CONTROL
+++ b/ports/wildmidi/CONTROL
@@ -1,3 +1,3 @@
-Source: wildmidi
-Version: 0.4.1
-Description: MIDI software synthesizer library.
+Source: wildmidi
+Version: 0.4.3
+Description: MIDI software synthesizer library.
diff --git a/ports/wildmidi/portfile.cmake b/ports/wildmidi/portfile.cmake
index d82895de4..d3765f790 100644
--- a/ports/wildmidi/portfile.cmake
+++ b/ports/wildmidi/portfile.cmake
@@ -1,23 +1,19 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/wildmidi-wildmidi-0.4.1)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.4.1.zip"
-    FILENAME "wildmidi-0.4.1.zip"
-    SHA512 ebfbb16b57c0d39f1402f91df4dd205d80f5632f6afbe5fa99af6f06279582f0676bb247cd64ec472cdf272f6a1a2917827ed98f9cc24166aa41f050b9f7d396
-)
-vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Mindwerks/wildmidi
+    REF wildmidi-0.4.3
+    SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f
+    HEAD_REF master
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001-add-install-target.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0002-use-ansi.patch
+        0001-add-install-target.patch
+        0002-use-ansi.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(BUILD_SHARED_LIBS "ON")
 	set(WANT_STATIC "OFF")
 else()
-    set(BUILD_SHARED_LIBS "OFF")
 	set(WANT_STATIC "ON")
 endif()
 
@@ -25,27 +21,29 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DMSVC=ON
         -DWANT_PLAYER=OFF
         -DWANT_STATIC=${WANT_STATIC}
-        -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
 # Rename library to get rid of _dynamic and _static suffix
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/wildmidi_dynamic.lib ${CURRENT_PACKAGES_DIR}/lib/wildmidi.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi_dynamic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/wildmidi_dynamic.dll ${CURRENT_PACKAGES_DIR}/bin/wildmidi.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/wildmidi_dynamic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/wildmidi.dll)
-else()
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/wildmidi_static.lib ${CURRENT_PACKAGES_DIR}/lib/wildmidi.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi.lib)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/wildmidi_dynamic.lib ${CURRENT_PACKAGES_DIR}/lib/wildmidi.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi_dynamic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/bin/wildmidi_dynamic.dll ${CURRENT_PACKAGES_DIR}/bin/wildmidi.dll)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/wildmidi_dynamic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/wildmidi.dll)
+    else()
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/wildmidi_static.lib ${CURRENT_PACKAGES_DIR}/lib/wildmidi.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi.lib)
+    endif()
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/docs/license/LGPLv3.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wildmidi RENAME copyright)
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL
index 66fda9bee..0d6d6a56d 100644
--- a/ports/x264/CONTROL
+++ b/ports/x264/CONTROL
@@ -1,3 +1,3 @@
 Source: x264
-Version: 157-303c484ec828ed0-1
+Version: 157-303c484ec828ed0-2
 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 67d7ab087..4dfb43683 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -8,17 +8,19 @@ vcpkg_from_github(
     REF 303c484ec828ed0d8bfe743500e70314d026c3bd
     SHA512 faf210a3f9543028ed882c8348b243dd7ae6638e7b3ef43bec1326b717f23370f57c13d0ddb5e1ae94411088a2e33031a137b68ae9f64c18f8f33f601a0da54d
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/uwp-cflags.patch
+    PATCHES 
+        "uwp-cflags.patch"
 )
 
 # Acquire tools
 vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)
 
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
+    vcpkg_find_acquire_program(NASM)
+    get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
+    set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}")
+endif()
+
 # 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}")
 set(ENV{PATH} "${NEWPATH}")
@@ -27,7 +29,11 @@ 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)
 
-set(CONFIGURE_OPTIONS "--host=i686-pc-mingw32 --enable-strip --disable-lavf --disable-swscale --disable-asm --disable-avs --disable-ffms --disable-gpac --disable-lsmash")
+set(CONFIGURE_OPTIONS "--host=i686-pc-mingw32 --enable-strip --disable-lavf --disable-swscale --disable-avs --disable-ffms --disable-gpac --disable-lsmash")
+
+if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86 AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
+    set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --disable-asm")
+endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --enable-shared")
diff --git a/ports/x264/uwp-cflags.patch b/ports/x264/uwp-cflags.patch
index fd04755bc..792e99927 100644
--- a/ports/x264/uwp-cflags.patch
+++ b/ports/x264/uwp-cflags.patch
@@ -1,12 +1,12 @@
-diff --git a/configure b/configure
-index f7b14d9..2c92b2a 100644
---- a/configure
-+++ b/configure
-@@ -821,7 +821,6 @@ if [ $SYS = WINDOWS ]; then
-     if cpp_check "winapifamily.h" "" "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" ; then
-         [ $compiler = CL ] || die "WinRT requires MSVC"
-         define HAVE_WINRT
--        CFLAGS="$CFLAGS -MD"
-         LDFLAGS="$LDFLAGS -appcontainer"
-         if ! cpp_check "" "" "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603" ; then
-             die "_WIN32_WINNT must be defined to at least 0x0603 (Windows 8.1) for WinRT"
+diff --git a/configure b/configure
+index f7b14d9..2c92b2a 100644
+--- a/configure
++++ b/configure
+@@ -821,7 +821,6 @@ if [ $SYS = WINDOWS ]; then
+     if cpp_check "winapifamily.h" "" "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" ; then
+         [ $compiler = CL ] || die "WinRT requires MSVC"
+         define HAVE_WINRT
+-        CFLAGS="$CFLAGS -MD"
+         LDFLAGS="$LDFLAGS -appcontainer"
+         if ! cpp_check "" "" "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603" ; then
+             die "_WIN32_WINNT must be defined to at least 0x0603 (Windows 8.1) for WinRT"
diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL
index dc204b51b..7d0881a81 100644
--- a/ports/xerces-c/CONTROL
+++ b/ports/xerces-c/CONTROL
@@ -1,5 +1,5 @@
 Source: xerces-c
-Version: 3.2.2-8
+Version: 3.2.2-9
 Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.
 
 Feature: icu
diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake
index 017cb7cab..ad3c6d79e 100644
--- a/ports/xerces-c/portfile.cmake
+++ b/ports/xerces-c/portfile.cmake
@@ -38,13 +38,16 @@ endif()
 
 file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake _contents)
 string(REPLACE
-    "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
+    "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
     "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
     _contents
     "${_contents}"
 )
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake "${_contents}")
 
+file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake _contents)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake "include(CMakeFindDependencyMacro)\nfind_dependency(Threads)\n${_contents}")
+
 configure_file(
     ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
     ${CURRENT_PACKAGES_DIR}/share/xercesc
diff --git a/ports/xerces-c/vcpkg-cmake-wrapper.cmake b/ports/xerces-c/vcpkg-cmake-wrapper.cmake
index c6cfff8a4..6704b83d5 100644
--- a/ports/xerces-c/vcpkg-cmake-wrapper.cmake
+++ b/ports/xerces-c/vcpkg-cmake-wrapper.cmake
@@ -6,4 +6,3 @@ if (APPLE)
       list(APPEND XercesC_LIBRARIES "-framework CoreServices" "-framework CoreFoundation" curl)
    endif()
 endif()
-
diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL
index f0581395c..3deb2ca48 100644
--- a/ports/xeus/CONTROL
+++ b/ports/xeus/CONTROL
@@ -1,4 +1,4 @@
 Source: xeus
-Version: 2019-02-13-1
+Version: 0.19.1-1
 Description: C++ implementation of the Jupyter kernel protocol
-Build-Depends: cppzmq, cryptopp, libuuid (linux), nlohmann-json, xtl, zeromq
+Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake
index 1ba0df8f7..ac1dcff01 100644
--- a/ports/xeus/portfile.cmake
+++ b/ports/xeus/portfile.cmake
@@ -3,28 +3,35 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xeus
-    REF f78c60c7ce28baecb2479f2b82e4e8d1a6c35188
-    SHA512 9d83f32f641bcad4ac96e263c465d46bdfa7d18d41f1e201309244c95587ce08ff2426f7cdd3a4399563d46064ed9bedd4d0babf4840f65e95c6a2c6f23ac9bb
+    REF 0.19.1
+    SHA512 1f42cf3b5007fef957c259eee58bdc5d6b812dd32ca316823e33837d3802df0675f778a9c8f2fb97e9ff982c584229d3733e5894684e75498cc244e9c29df209
     HEAD_REF master
-    PATCHES
-        static-lib.patch
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         -DBUILD_EXAMPLES=OFF
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
         -DBUILD_TESTS=OFF
         -DDOWNLOAD_GTEST=OFF
-        -DXEUS_USE_SHARED_CRYPTOPP=OFF # `cryptopp` port currently only supports static linkage.
         -DDISABLE_ARCH_NATIVE=OFF
 )
 
 vcpkg_install_cmake()
 
+vcpkg_copy_pdbs()
+
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 
+file(COPY
+    ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+)
+
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
     ${CURRENT_PACKAGES_DIR}/debug/share
@@ -44,4 +51,4 @@ configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copy
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 
 # CMake integration test
-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/xeus/static-lib.patch b/ports/xeus/static-lib.patch
deleted file mode 100644
index e9ab41f01..000000000
--- a/ports/xeus/static-lib.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 26118eb..ccda00b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,7 +141,12 @@ set(XEUS_SOURCES
- # Output
- # ======
- 
--add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS})
-+option(BUILD_SHARED_LIBS "Build shared instead of static libraries." ON)
-+if (BUILD_SHARED_LIBS)
-+    add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS})
-+else ()
-+    add_library(xeus STATIC ${XEUS_SOURCES} ${XEUS_HEADERS})
-+endif ()
- 
- if (APPLE)
-     set_target_properties(xeus PROPERTIES
-@@ -166,9 +171,9 @@ target_link_libraries(xeus
- 
- OPTION(XEUS_USE_SHARED_CRYPTOPP "Used shared library for cryptopp" OFF)
- if (XEUS_USE_SHARED_CRYPTOPP)
--    target_link_libraries(xeus PRIVATE cryptopp-shared)
-+    target_link_libraries(xeus PUBLIC cryptopp-shared)
- else ()
--    target_link_libraries(xeus PRIVATE cryptopp-static)
-+    target_link_libraries(xeus PUBLIC cryptopp-static)
- endif ()
- 
- if(NOT MSVC)
-@@ -226,6 +231,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
-     message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
- endif()
- 
-+if (NOT BUILD_SHARED_LIBS)
-+    target_compile_definitions(xeus PUBLIC XEUS_STATIC_LIB)
-+endif ()
-+
- if(MSVC)
-     target_compile_definitions(xeus PUBLIC -DNOMINMAX)
-     target_compile_options(xeus PUBLIC /DGUID_WINDOWS /MP /bigobj)
-diff --git a/include/xeus/xeus.hpp b/include/xeus/xeus.hpp
-index 99e1d79..522bb78 100644
---- a/include/xeus/xeus.hpp
-+++ b/include/xeus/xeus.hpp
-@@ -10,10 +10,14 @@
- #define XEUS_EXPORT_HPP
- 
- #ifdef _WIN32
--    #ifdef XEUS_EXPORTS
--        #define XEUS_API __declspec(dllexport)
-+    #ifdef XEUS_STATIC_LIB
-+        #define XEUS_API
-     #else
--        #define XEUS_API __declspec(dllimport)
-+        #ifdef XEUS_EXPORTS
-+            #define XEUS_API __declspec(dllexport)
-+        #else
-+            #define XEUS_API __declspec(dllimport)
-+        #endif
-     #endif
- #else
-     #define XEUS_API
diff --git a/ports/xeus/usage b/ports/xeus/usage
index bac932eb9..1f959804e 100644
--- a/ports/xeus/usage
+++ b/ports/xeus/usage
@@ -1,4 +1,4 @@
 The package xeus provides CMake targets:
 
     find_package(xeus CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE xeus)
+    target_link_libraries(main PRIVATE xeus xeus_static)
diff --git a/ports/xeus/vcpkg-cmake-wrapper.cmake b/ports/xeus/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..62a3cc765
--- /dev/null
+++ b/ports/xeus/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,9 @@
+_find_package(${ARGS})
+
+if(TARGET xeus AND NOT TARGET xeus_static)
+    add_library(xeus_static INTERFACE IMPORTED)
+    set_target_properties(xeus_static PROPERTIES INTERFACE_LINK_LIBRARIES xeus)
+elseif(TARGET xeus_static AND NOT TARGET xeus)
+    add_library(xeus INTERFACE IMPORTED)
+    set_target_properties(xeus PROPERTIES INTERFACE_LINK_LIBRARIES xeus_static)
+endif()
diff --git a/ports/xproperty/CONTROL b/ports/xproperty/CONTROL
new file mode 100644
index 000000000..ba2ed12ab
--- /dev/null
+++ b/ports/xproperty/CONTROL
@@ -0,0 +1,4 @@
+Source: xproperty
+Version: 0.8.1
+Build-Depends: xtl
+Description: Traitlets-like C++ properties and implementation of the observer pattern
diff --git a/ports/xproperty/fix-target.patch b/ports/xproperty/fix-target.patch
new file mode 100644
index 000000000..a838b29c8
--- /dev/null
+++ b/ports/xproperty/fix-target.patch
@@ -0,0 +1,44 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5dcddc2..9d99227 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ ############################################################################
+ 
+ cmake_minimum_required(VERSION 3.1)
+-project(xproperty)
++project(xproperty CXX)
+ 
+ set(XPROPERTY_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
+ 
+@@ -28,7 +28,8 @@ message(STATUS "xproperty v${${PROJECT_NAME}_VERSION}")
+ # Dependencies
+ # ============
+ 
+-find_package(xtl 0.5.3 REQUIRED)
++set(xtl_REQUIRED_VERSION 0.5.3)
++find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED)
+ message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl")
+ 
+ # Build
+diff --git a/xpropertyConfig.cmake.in b/xpropertyConfig.cmake.in
+index 192c04f..38b305a 100644
+--- a/xpropertyConfig.cmake.in
++++ b/xpropertyConfig.cmake.in
+@@ -15,7 +15,12 @@
+ 
+ @PACKAGE_INIT@
+ 
+-set(PN xproperty)
+-set_and_check(${PN}_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
+-set(${PN}_LIBRARY "")
+-check_required_components(${PN})
++include(CMakeFindDependencyMacro)
++find_dependency(xtl @xtl_REQUIRED_VERSION@)
++
++if(NOT TARGET @PROJECT_NAME@)
++    include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
++    get_target_property(@PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
++endif()
++
++set(@PROJECT_NAME@_LIBRARY "")
diff --git a/ports/xproperty/portfile.cmake b/ports/xproperty/portfile.cmake
new file mode 100644
index 000000000..8a415f2a1
--- /dev/null
+++ b/ports/xproperty/portfile.cmake
@@ -0,0 +1,30 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO QuantStack/xproperty
+    REF 0.8.1
+    SHA512 70fcce3a3cc84be98d844aa59c14686945907db3c8fa1c9a916f0bab811ef96512464031e53f00d29cba7db750a0032f4b59d6ca524f52bc7cfe8de5cebad5e5
+    HEAD_REF master
+    PATCHES
+        fix-target.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTS=OFF
+        -DDOWNLOAD_GTEST=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL
index e5f8d0f14..05241ac5e 100644
--- a/ports/xsimd/CONTROL
+++ b/ports/xsimd/CONTROL
@@ -1,5 +1,5 @@
 Source: xsimd
-Version: 7.1.3
+Version: 7.2.3
 Description: Modern, portable C++ wrappers for SIMD intrinsics
 
 Feature: xcomplex
diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake
index 3b51bd9a8..a25bcb532 100644
--- a/ports/xsimd/portfile.cmake
+++ b/ports/xsimd/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xsimd
-    REF 7.1.3
-    SHA512 9f0e2babee9a3a80e16440466277bd635a26197f80cdf806312f7e1cc616db59062887566d50b4cdebe3c3ba4d60155b477684177607428aee53e1d5a95de926
+    REF 7.2.3
+    SHA512 fb34eeb585f6820499734f10f03a4efd0d9a9b4be56f9bee21f3564eb92be56e7abe7682e476fafaff4733939f33f91cb4ab9209140b19f7b740538853433532
     HEAD_REF master
 )
 
diff --git a/ports/xtensor-blas/CONTROL b/ports/xtensor-blas/CONTROL
index 578687b8e..1779f1760 100644
--- a/ports/xtensor-blas/CONTROL
+++ b/ports/xtensor-blas/CONTROL
@@ -1,4 +1,4 @@
 Source: xtensor-blas
-Version: 0.15.1
+Version: 0.16.1
 Description: BLAS extension to xtensor
 Build-Depends: xtensor
diff --git a/ports/xtensor-blas/portfile.cmake b/ports/xtensor-blas/portfile.cmake
index e9023ea15..000a567a3 100644
--- a/ports/xtensor-blas/portfile.cmake
+++ b/ports/xtensor-blas/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtensor-blas
-    REF 0.15.1
-    SHA512 c80def1cc106efec1ee4c33f3724b6b63af4c826e45e2a5a8dc066d368867b3a1d909ae490e09c615c2119b3aad3ef5b739fe86925d0229a69329ddee09c3d66
+    REF 0.16.1
+    SHA512 3bdbd48b74d7be0b9f4ad2d435789e266b3cc1e043bbe73739978678bd1ca81504a688cdd80c03667305d210d299127be9939333c9bd0ac27dff0423ccb4861d
     HEAD_REF master
 )
 
diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL
index 9b84a6ff3..3e5e33013 100644
--- a/ports/xtensor/CONTROL
+++ b/ports/xtensor/CONTROL
@@ -1,5 +1,5 @@
 Source: xtensor
-Version: 0.19.3
+Version: 0.20.7
 Description: C++ tensors with broadcasting and lazy computing
 Build-Depends: nlohmann-json, xtl
 
diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake
index 99f52d195..51e24c6e9 100644
--- a/ports/xtensor/portfile.cmake
+++ b/ports/xtensor/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtensor
-    REF 0.19.3
-    SHA512 e3b0085115252441ef4ddf21ef48ca18c3872c24d7f94d2f7533fa8f4b00dff0b5613946296f9dd4d7db3381ff43b41dd2f1ae3857a409fabd439eade431aba2
+    REF 0.20.7
+    SHA512 de09900d0934f9b10453f16e43d1c3af28503f365224f9c6789b88a0cf00db820ca31e12099df1a2e3aafa73d7d83223df82f01b7611c1addb48367f936e5122
     HEAD_REF master
 )
 
diff --git a/ports/xtl/CONTROL b/ports/xtl/CONTROL
index 1ee82f60a..423ee09dc 100644
--- a/ports/xtl/CONTROL
+++ b/ports/xtl/CONTROL
@@ -1,4 +1,4 @@
 Source: xtl
-Version: 0.5.4
+Version: 0.6.4
 Build-Depends: nlohmann-json
 Description: The x template library.
diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake
index 66e504b73..0b3b5dad1 100644
--- a/ports/xtl/portfile.cmake
+++ b/ports/xtl/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtl
-    REF 0.5.4
-    SHA512 6181334dda9a2afce4ce2809572605c2f911770f7805a8328e14fa94d4572475c7725f2ead54daec00e62933df6a4c22616a247798c5b7f1f3bd4290945776c8
+    REF 0.6.4
+    SHA512 92ff932634a88fee9bfd27d092ebdf91752d90be8a4f3fc41aef90c195718c989082e53f1fcfae9d67b153ecd29d3dde6f8e2b540eeec0db1d0d229a9b0d2fe8
     HEAD_REF master
 )
 
@@ -14,10 +14,8 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
+        -DBUILD_TESTS=OFF
         -DDOWNLOAD_GTEST=OFF
-        -DTF_BUILD_EXAMPLES=OFF
-        -DTF_BUILD_TESTS=OFF
-        -DTF_BUILD_BENCHMARKS=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/xxhash/CONTROL b/ports/xxhash/CONTROL
index 2501630a0..4cdbf5435 100644
--- a/ports/xxhash/CONTROL
+++ b/ports/xxhash/CONTROL
@@ -1,3 +1,3 @@
-Source: xxhash
-Version: 0.6.4
-Description: Extremely fast hash algorithm
+Source: xxhash
+Version: 0.6.4-1
+Description: Extremely fast hash algorithm
diff --git a/ports/xxhash/portfile.cmake b/ports/xxhash/portfile.cmake
index c23f24623..91f713578 100644
--- a/ports/xxhash/portfile.cmake
+++ b/ports/xxhash/portfile.cmake
@@ -1,4 +1,7 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cyan4973/xxHash
@@ -9,21 +12,12 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/cmake_unofficial
     PREFER_NINJA
-    OPTIONS
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON)
+)
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(READ ${CURRENT_PACKAGES_DIR}/include/xxhash.h XXHASH_H)
-    string(REPLACE "#  define XXH_PUBLIC_API   /* do nothing */" "#  define XXH_PUBLIC_API __declspec(dllimport)" XXHASH_H "${XXHASH_H}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/xxhash.h "${XXHASH_H}")
-
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/xxhsum.exe ${CURRENT_PACKAGES_DIR}/debug/bin/xxhsum.exe)
-else()
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)  
-endif()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/xxhash)
diff --git a/ports/yara/CONTROL b/ports/yara/CONTROL
index fb29eaad0..5e2832bb5 100644
--- a/ports/yara/CONTROL
+++ b/ports/yara/CONTROL
@@ -1,4 +1,4 @@
-Source: yara
-Version: e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-1
-Description: The pattern matching swiss knife
-Build-Depends: openssl, jansson
+Source: yara
+Version: e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-2
+Description: The pattern matching swiss knife
+Build-Depends: openssl, jansson
diff --git a/ports/yara/portfile.cmake b/ports/yara/portfile.cmake
index 8e70a0d7f..d4869df63 100644
--- a/ports/yara/portfile.cmake
+++ b/ports/yara/portfile.cmake
@@ -1,9 +1,7 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-  message(WARNING "Building static")
-  set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO VirusTotal/yara
diff --git a/ports/yoga/CONTROL b/ports/yoga/CONTROL
index 805d688d5..650808140 100644
--- a/ports/yoga/CONTROL
+++ b/ports/yoga/CONTROL
@@ -1,3 +1,3 @@
 Source: yoga
-Version: 1.13.0
+Version: 1.14.0
 Description: Yoga is a cross-platform layout engine which implements Flexbox
diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake
index 6aa6a1fb3..a98b92c7a 100644
--- a/ports/yoga/portfile.cmake
+++ b/ports/yoga/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/yoga
-    REF v1.13.0
-    SHA512 ca87c4526956ccb0693c4e1cdf825b2d9cfd97b20f6c11a06b3966c99903e06c0ca1013f9c72546bbf1d0f56b501f422dfb18dbcfee82ba340e18dcea80b3caf
+    REF 1.14.0
+    SHA512 c634cb9be08a4f4f478c50de9f26a2e1a18b9c6313b78665cd3a28047bd04e14aac2f06702c3bc9f55dba605177b787424a405c4043f052a94d311c76e38bef1
     HEAD_REF master
 )
 
diff --git a/ports/z3/CONTROL b/ports/z3/CONTROL
index f06d776bb..9a64766a9 100644
--- a/ports/z3/CONTROL
+++ b/ports/z3/CONTROL
@@ -1,3 +1,3 @@
 Source: z3
-Version: 4.8.4
+Version: 4.8.4-1
 Description: An SMT solver
diff --git a/ports/z3/fix-install-path.patch b/ports/z3/fix-install-path.patch
new file mode 100644
index 000000000..76912da62
--- /dev/null
+++ b/ports/z3/fix-install-path.patch
@@ -0,0 +1,116 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9877af8..10ef458 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -675,7 +675,7 @@ install(EXPORT
+   Z3_EXPORTED_TARGETS
+   FILE "Z3Targets.cmake"
+   NAMESPACE z3::
+-  DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}"
++  DESTINATION share/z3
+ )
+ set(Z3_INSTALL_TREE_CMAKE_CONFIG_FILE "${CMAKE_BINARY_DIR}/cmake/Z3Config.cmake")
+ set(Z3_FIRST_PACKAGE_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
+@@ -700,7 +700,7 @@ unset(CONFIG_FILE_TYPE)
+ # Add install rule to install ${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE}
+ install(
+   FILES "${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE}"
+-  DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}"
++  DESTINATION share/z3
+ )
+ 
+ # TODO: Provide a `Z3Version.cmake` file so that clients can specify the version
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index b097126..e127bef 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -88,6 +88,6 @@ set(CMAKE_INSTALL_API_BINDINGS_DOC
+ if (INSTALL_API_BINDINGS_DOCUMENTATION)
+   install(
+     DIRECTORY "${DOC_DEST_DIR}"
+-    DESTINATION "${CMAKE_INSTALL_API_BINDINGS_DOC}"
++    DESTINATION share/z3
+   )
+ endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c497c19..0b0e081 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -173,7 +173,8 @@ install(TARGETS libz3
+   EXPORT Z3_EXPORTED_TARGETS
+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" # On Windows this installs ``libz3.lib`` which CMake calls the "corresponding import library". Do we want this installed?
+-  RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" # For Windows. DLLs are runtime targets for CMake
++  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # For Windows. DLLs are runtime targets for CMake
++  BUNDLE  DESTINATION "${CMAKE_INSTALL_BINDIR}" # For MACOSX.
+   PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ 
+diff --git a/src/api/dotnet/CMakeLists.txt b/src/api/dotnet/CMakeLists.txt
+index 20621e4..57bb3f0 100644
+--- a/src/api/dotnet/CMakeLists.txt
++++ b/src/api/dotnet/CMakeLists.txt
+@@ -257,7 +257,7 @@ if (DOTNET_TOOLCHAIN_IS_MONO)
+   message(STATUS "Emitting install rules for .NET bindings")
+   # Install pkgconfig file for the assembly. This is needed by Monodevelop
+   # to find the assembly
+-  install(FILES "${Z3_DOTNET_PKGCONFIG_FILE}" DESTINATION "${CMAKE_INSTALL_PKGCONFIGDIR}")
++  install(FILES "${Z3_DOTNET_PKGCONFIG_FILE}" DESTINATION share/z3/pkgconfig)
+ 
+   # Configure the install and uninstall scripts.
+   # Note: If multi-configuration generator support is ever fixed then these
+@@ -266,7 +266,7 @@ if (DOTNET_TOOLCHAIN_IS_MONO)
+   configure_file(cmake_uninstall_gac.cmake.in cmake_uninstall_gac.cmake @ONLY)
+ 
+   # Tell CMake to Invoke a script to install assembly to the GAC during install
+-  install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/cmake_install_gac.cmake")
++  install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/cmake_install_gac.cmake" DESTINATION share/z3)
+ 
+   # Add custom target to uninstall the assembly from the GAC
+   add_custom_target(remove_dotnet_dll_from_gac
+@@ -280,7 +280,7 @@ elseif(DOTNET_TOOLCHAIN_IS_WINDOWS)
+   # Don't install Z3_DOTNET_ASSEMBLY_DLL into the gac. Instead just copy into
+   # installation directory.
+   install(FILES "${Z3_DOTNET_ASSEMBLY_DLL}" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-  install(FILES "${Z3_DOTNET_ASSEMBLY_DLL_DOC}" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++  install(FILES "${Z3_DOTNET_ASSEMBLY_DLL_DOC}" DESTINATION share/z3)
+ else()
+   message(FATAL_ERROR "Unknown .NET toolchain")
+ endif()
+diff --git a/src/api/java/CMakeLists.txt b/src/api/java/CMakeLists.txt
+index c2d73ff..506142c 100644
+--- a/src/api/java/CMakeLists.txt
++++ b/src/api/java/CMakeLists.txt
+@@ -228,7 +228,7 @@ if (INSTALL_JAVA_BINDINGS)
+     PATH
+     "Directory to install Z3 Java JNI bridge library relative to install prefix"
+   )
+-  install(TARGETS z3java DESTINATION "${Z3_JAVA_JNI_LIB_INSTALLDIR}")
++  install(TARGETS z3java DESTINATION share/z3)
+   # Note: Don't use ``DESTINATION`` here as the version of ``UseJava.cmake`` shipped
+   # with CMake 2.8.12.2 handles that incorrectly.
+   install_jar(z3JavaJar "${Z3_JAVA_JAR_INSTALLDIR}")
+diff --git a/src/api/python/CMakeLists.txt b/src/api/python/CMakeLists.txt
+index 6efdc15..e4d5be0 100644
+--- a/src/api/python/CMakeLists.txt
++++ b/src/api/python/CMakeLists.txt
+@@ -136,7 +136,7 @@ if (INSTALL_PYTHON_BINDINGS)
+   # Using DESTDIR still seems to work even if we use an absolute path
+   message(STATUS "Python bindings will be installed to \"${CMAKE_INSTALL_PYTHON_PKG_DIR}\"")
+   install(FILES ${build_z3_python_bindings_target_depends}
+-    DESTINATION "${CMAKE_INSTALL_PYTHON_PKG_DIR}/z3"
++    DESTINATION share/z3
+   )
+ else()
+   message(STATUS "Not emitting rules to install Z3 python bindings")
+diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
+index 2782463..b6cd2f1 100644
+--- a/src/shell/CMakeLists.txt
++++ b/src/shell/CMakeLists.txt
+@@ -44,5 +44,5 @@ target_link_libraries(shell PRIVATE ${Z3_DEPENDENT_LIBS})
+ z3_add_component_dependencies_to_target(shell ${shell_expanded_deps})
+ z3_append_linker_flag_list_to_target(shell ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS})
+ install(TARGETS shell
+-  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++  RUNTIME DESTINATION tools/z3
+ )
diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake
index 46182793d..ea27a5bd9 100644
--- a/ports/z3/portfile.cmake
+++ b/ports/z3/portfile.cmake
@@ -18,7 +18,9 @@ vcpkg_from_github(
   REF z3-4.8.4
   SHA512 4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4
   HEAD_REF master
-  PATCHES fix_cmake_long_dir.patch
+  PATCHES
+         fix_cmake_long_dir.patch
+         fix-install-path.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -32,32 +34,10 @@ vcpkg_configure_cmake(
     ${BUILD_STATIC}
 )
 
-vcpkg_build_cmake()
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/z3 TARGET_PATH share/z3)
+vcpkg_copy_pdbs()
 
-
-function(install_z3 SHORT_BUILDTYPE DEBUG_DIR)
-  set(LIBS ".so" ".lib" ".dylib" ".a")
-  set(DLLS ".dll" ".pdb")
-  file(GLOB FILES ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}/libz3.*)
-
-  foreach (FILE in ${FILES})
-    get_filename_component(FILEXT ${FILE} EXT)
-    if ("${FILEXT}" IN_LIST LIBS)
-      file(INSTALL ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}${DEBUG_DIR}/lib)
-    elseif ("${FILEXT}" IN_LIST DLLS)
-      file(INSTALL ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}${DEBUG_DIR}/bin)
-    endif()
-  endforeach()
-endfunction()
-
-if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-  install_z3("dbg" "/debug")
-endif()
-if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-  install_z3("rel" "")
-endif()
-
-file(GLOB HEADERS ${SOURCE_PATH}/src/api/z3*.h)
-file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/z3 RENAME copyright)
diff --git a/ports/z85/CONTROL b/ports/z85/CONTROL
new file mode 100644
index 000000000..24fc16050
--- /dev/null
+++ b/ports/z85/CONTROL
@@ -0,0 +1,3 @@
+Source: z85
+Version: 1.0
+Description: Z85 is a binary-to-text encoding library. It implements ZeroMQ Base-85 Encoding Algorithm and provides custom padding.
+\ No newline at end of file
diff --git a/ports/z85/portfile.cmake b/ports/z85/portfile.cmake
new file mode 100644
index 000000000..578b46ba3
--- /dev/null
+++ b/ports/z85/portfile.cmake
@@ -0,0 +1,19 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO artemkin/z85
+  REF v1.0
+  SHA512 6b205524b8388c5709ca664a595a4db8fdd24148c5f87ef7ef16d6d6eb60d2c51db0b4ab768fe9ac3e5acf5e3fe1b46ef5b9f5e7f69a53fe40a7e8d25b098479
+  HEAD_REF master
+)
+
+# Install source files
+file(INSTALL ${SOURCE_PATH}/src/z85.h
+     ${SOURCE_PATH}/src/z85.c
+     ${SOURCE_PATH}/src/z85.hpp
+     ${SOURCE_PATH}/src/z85_impl.cpp
+     DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
+
+# Install license
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL
index 9d1570874..a73b94fc3 100644
--- a/ports/zeromq/CONTROL
+++ b/ports/zeromq/CONTROL
@@ -1,5 +1,5 @@
 Source: zeromq
-Version: 2019-01-30
+Version: 2019-05-07
 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products
 
 Feature: sodium
diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake
index 35875540b..06b5d3aee 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 19b64709bbf9f119d66cdacb9c0e89e4becd9775
-    SHA512 7743097d6251764b911e586a9f857331b834b7223d6c3f2630fec71c310ba2927118410ab6c270c07d87329c15dd00fd89c843f20eb22d6c042d83b740c5e34e
+    REF f41f51461fd86f2272209a3175d1df0e655883ef
+    SHA512 ee37cda1e86063fc4f9edfc2ae27246d7919f59efe90532944f299b03478d53d8708eb18be824d3885c96ca38917e1f6f72a941845c9b376ddda7ee1fd42cfac
     HEAD_REF master
 )
 
diff --git a/ports/zopfli/CONTROL b/ports/zopfli/CONTROL
new file mode 100644
index 000000000..8b7a02399
--- /dev/null
+++ b/ports/zopfli/CONTROL
@@ -0,0 +1,3 @@
+Source: zopfli
+Version: 2019-01-19
+Description: Zopfli Compression Algorithm compression library programmed in C
diff --git a/ports/zopfli/portfile.cmake b/ports/zopfli/portfile.cmake
new file mode 100644
index 000000000..d19902027
--- /dev/null
+++ b/ports/zopfli/portfile.cmake
@@ -0,0 +1,75 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/zopfli
+    REF ef109ddf164911cf1e5612e90b4a619839a1e3ca
+    SHA512 9067d14c3ca7f5f07a0c4913ae1804128cf928770359618eab3c655ccbfa7260a11ec1db871a7e5be7d92098c2dda5a55b948eb779c9c64647bddfd1e9ace1f5
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DZOPFLI_BUILD_INSTALL=ON
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+if (WIN32)
+    set(EXECUTABLE_SUFFIX ".exe")
+else()
+    set(EXECUTABLE_SUFFIX "")
+endif()
+
+# Install tools
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX}
+    DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX}
+    DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+
+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/zopfli${EXECUTABLE_SUFFIX}
+        ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX}
+        ${CURRENT_PACKAGES_DIR}/debug/bin/zopfli${EXECUTABLE_SUFFIX}
+        ${CURRENT_PACKAGES_DIR}/debug/bin/zopflipng${EXECUTABLE_SUFFIX}
+    )
+endif()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Zopfli)
+
+# vcpkg_fixup_cmake_targets can not handles this on UNIX currently.
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR
+   VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake
+        "\"\${_IMPORT_PREFIX}/debug/bin/zopfli\""
+        "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\""
+    )
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake
+        "\"\${_IMPORT_PREFIX}/debug/bin/zopflipng\""
+        "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\""
+    )
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake
+        "\"\${_IMPORT_PREFIX}/bin/zopfli\""
+        "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\""
+    )
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake
+        "\"\${_IMPORT_PREFIX}/bin/zopflipng\""
+        "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\""
+    )
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/zserge-webview/CONTROL b/ports/zserge-webview/CONTROL
new file mode 100644
index 000000000..558f47bd7
--- /dev/null
+++ b/ports/zserge-webview/CONTROL
@@ -0,0 +1,3 @@
+Source: zserge-webview
+Version: 2019-04-27-1
+Description: Tiny cross-platform webview library for C/C++/Golang.
diff --git a/ports/zserge-webview/portfile.cmake b/ports/zserge-webview/portfile.cmake
new file mode 100644
index 000000000..d6707ee8b
--- /dev/null
+++ b/ports/zserge-webview/portfile.cmake
@@ -0,0 +1,58 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO zserge/webview
+    REF 16c93bcaeaeb6aa7bb5a1432de3bef0b9ecc44f3
+    SHA512 153824bd444eafe6cc5ae00800422b41d4047dc85a164c465990c3be06d82003b532e1e869bb40e3a77cbe4789ff970fcda50ef00ac7b3e2f22ef3f566340026
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/webview.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+set(WEBVIEW_GTK "0")
+set(WEBVIEW_WINAPI "0")
+set(WEBVIEW_COCOA "0")
+
+if(WIN32)
+    set(WEBVIEW_WINAPI "1")
+elseif(UNIX)
+    if(APPLE)
+        set(WEBVIEW_COCOA "1")
+    else()
+        set(WEBVIEW_GTK "1")
+    endif()
+endif()
+
+file(READ ${CURRENT_PACKAGES_DIR}/include/webview.h _contents)
+string(REPLACE
+    "#ifdef WEBVIEW_STATIC"
+    "#if 1 // #ifdef WEBVIEW_STATIC"
+    _contents "${_contents}"
+)
+string(REPLACE
+    "#ifdef WEBVIEW_IMPLEMENTATION"
+    "#if 1 // #ifdef WEBVIEW_IMPLEMENTATION"
+    _contents "${_contents}"
+)
+string(REPLACE
+    "defined(WEBVIEW_GTK)"
+    "${WEBVIEW_GTK} // defined(WEBVIEW_GTK)"
+    _contents "${_contents}"
+)
+string(REPLACE
+    "defined(WEBVIEW_WINAPI)"
+    "${WEBVIEW_WINAPI} // defined(WEBVIEW_WINAPI)"
+    _contents "${_contents}"
+)
+string(REPLACE
+    "defined(WEBVIEW_COCOA)"
+    "${WEBVIEW_COCOA} // defined(WEBVIEW_COCOA)"
+    _contents "${_contents}"
+)
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/webview.h "${_contents}")
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL
index 985c24b0c..4f0e0b7ab 100644
--- a/ports/zstd/CONTROL
+++ b/ports/zstd/CONTROL
@@ -1,3 +1,3 @@
 Source: zstd
-Version: 1.3.7-1
+Version: 1.4.0
 Description: Zstandard - Fast real-time compression algorithm http://www.zstd.net
diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake
index dfbb2e3f2..4b7522c76 100644
--- a/ports/zstd/portfile.cmake
+++ b/ports/zstd/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/zstd
-    REF v1.3.7
-    SHA512 b7a432b13e237ac1490cd82b87727f6a4385d5ea7b89f566dea61a3993e17909c03288f727326ada326e36eb47ea5f9eab67c097808ee42f52cc800a7f7e1738
+    REF v1.4.0
+    SHA512 8614934e25eb1e82b554c483bc9d2d055f51344697295e83b22a8d726321b12068cfa7f7d2a9fe28a2de7c9edda59733826277efc7046e13674d6f7f02af5671
     HEAD_REF dev
     PATCHES enable-debug-mode.patch
 )
@@ -40,7 +40,7 @@ vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+if((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     foreach(HEADER zdict.h zstd.h zstd_errors.h)
         file(READ ${CURRENT_PACKAGES_DIR}/include/${HEADER} HEADER_CONTENTS)
         string(REPLACE "defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}")
diff --git a/ports/zxing-cpp/0001-opencv4-compat.patch b/ports/zxing-cpp/0001-opencv4-compat.patch
new file mode 100644
index 000000000..51cec5387
--- /dev/null
+++ b/ports/zxing-cpp/0001-opencv4-compat.patch
@@ -0,0 +1,30 @@
+diff --git a/opencv-cli/src/main.cpp b/opencv-cli/src/main.cpp
+index 63b6fd3..430dda6 100755
+--- a/opencv-cli/src/main.cpp
++++ b/opencv-cli/src/main.cpp
+@@ -135,14 +135,14 @@ int main(int argc, char** argv) {
+ 
+     }
+ 
+-    if (!videoCapture.set(CV_CAP_PROP_FRAME_WIDTH, captureWidth)) {
++    if (!videoCapture.set(cv::CAP_PROP_FRAME_WIDTH, captureWidth)) {
+ 
+         // Log
+         cerr << "Failed to set frame width: " << captureWidth << " (ignoring)" << endl;
+ 
+     }
+ 
+-    if (!videoCapture.set(CV_CAP_PROP_FRAME_HEIGHT, captureHeight)) {
++    if (!videoCapture.set(cv::CAP_PROP_FRAME_HEIGHT, captureHeight)) {
+ 
+         // Log
+         cerr << "Failed to set frame height: " << captureHeight << " (ignoring)" << endl;
+@@ -166,7 +166,7 @@ int main(int argc, char** argv) {
+         if (result) {
+ 
+             // Convert to grayscale
+-            cvtColor(image, grey, CV_BGR2GRAY);
++            cvtColor(image, grey, cv::COLOR_BGR2GRAY);
+ 
+             try {
+ 
diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL
index 52dfd95b2..fec8e63e5 100644
--- a/ports/zxing-cpp/CONTROL
+++ b/ports/zxing-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: zxing-cpp
-Version: 3.3.3-2
+Version: 3.3.3-3
 Build-Depends: opencv[core]
 Description: Barcode detection and decoding library.
diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake
index 405210d9c..06a2e6b49 100644
--- a/ports/zxing-cpp/portfile.cmake
+++ b/ports/zxing-cpp/portfile.cmake
@@ -8,6 +8,8 @@ vcpkg_from_github(
     REF 5aad4744a3763d814df98a18886979893e638274
     SHA512 a079ad47171224de4469e76bf0779b6ebc9c6dfb3604bd5dbf5e6e5f321d9e6255f689daa749855f8400023602f1773214013c006442e9b32dd4b8146c888c02
     HEAD_REF master
+    PATCHES
+      0001-opencv4-compat.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/zziplib/CMakeLists.txt b/ports/zziplib/CMakeLists.txt
index e56df5da9..634bc5edb 100644
--- a/ports/zziplib/CMakeLists.txt
+++ b/ports/zziplib/CMakeLists.txt
@@ -10,19 +10,33 @@ include_directories(${ZLIB_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 if(MSVC)
-    set(CMAKE_DEBUG_POSTFIX "d")
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+  set(CMAKE_DEBUG_POSTFIX "d")
+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+  add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
 endif()
 
-option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+if(UNIX)
+  # Find autotools output
+  set(ZZLIB_AUTOOLS_INCLUDE_DIRS)
+  file(GLOB CHILDREN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*")
+  foreach(CHILD ${CHILDREN})
+    string(REGEX MATCH "x86_64*" ZZLIB_AUTOOLS_OUTPUT_FOLDER "${CHILD}")
+    if (ZZLIB_AUTOOLS_OUTPUT_FOLDER)
+      set(ZZLIB_AUTOOLS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/${CHILD})
+      include_directories(${ZZLIB_AUTOOLS_INCLUDE_DIRS})
+      include_directories(${ZZLIB_AUTOOLS_INCLUDE_DIRS}/zzip)
+    endif()
+  endforeach()
+endif()
 
+configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h.in" "${CMAKE_CURRENT_LIST_DIR}/zzip/config.h")
 # List the header files
 set(HEADERS zzip/__debug.h
             zzip/__dirent.h
             zzip/__fnmatch.h
             zzip/__hints.h
             zzip/__mmap.h
+            zzip/config.h
             zzip/_msvc.h
             zzip/autoconf.h
             zzip/conf.h
@@ -40,6 +54,12 @@ set(HEADERS zzip/__debug.h
             zzip/write.h
             zzip/zzip.h
 )
+if(UNIX)
+  file(GLOB OTHER_HEADERS ${ZZLIB_AUTOOLS_INCLUDE_DIRS}/zzip/*.h)
+  list(APPEND HEADERS ${OTHER_HEADERS})
+else()
+  list(APPEND HEADERS zzip/_msvc.h)
+endif()
 
 # List the source files
 set(SRCS zzip/dir.c
@@ -55,7 +75,7 @@ set(SRCS zzip/dir.c
 add_library(zziplib ${SRCS} ${HEADERS})
 
 if(BUILD_SHARED_LIBS)
-    target_compile_definitions(zziplib PRIVATE -DZZIPLIB_EXPORTS)
+  target_compile_definitions(zziplib PRIVATE -DZZIPLIB_EXPORTS)
 endif()
 
 target_link_libraries(zziplib ${ZLIB_LIBRARIES})
@@ -66,4 +86,4 @@ install(TARGETS zziplib
         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
         ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
 
-install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip)
-\ No newline at end of file
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip)
diff --git a/ports/zziplib/CONTROL b/ports/zziplib/CONTROL
index 4d4f7ea58..362fdee03 100644
--- a/ports/zziplib/CONTROL
+++ b/ports/zziplib/CONTROL
@@ -1,4 +1,4 @@
 Source: zziplib
-Version: 0.13.69
+Version: 0.13.69-3
 Build-Depends: zlib
-Description: library providing read access on ZIP-archives
+Description: library providing read access on ZIP-archives
+\ No newline at end of file
diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake
index 2ff90af94..534744714 100644
--- a/ports/zziplib/portfile.cmake
+++ b/ports/zziplib/portfile.cmake
@@ -1,4 +1,5 @@
 include(vcpkg_common_functions)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gdraheim/zziplib
@@ -6,10 +7,22 @@ vcpkg_from_github(
     SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
 )
 
+# Run configure
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    message(STATUS "Configuring zziplib")
+    vcpkg_execute_required_process(
+        COMMAND "./configure" --prefix=${CURRENT_INSTALLED_DIR} --with-zlib
+        WORKING_DIRECTORY "${SOURCE_PATH}"
+        LOGNAME "autotools-config-${TARGET_TRIPLET}"
+    )
+endif()
+
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DZLIB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include
 )
 
 vcpkg_install_cmake()
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 07a9fcbaa..b195cc605 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -339,10 +339,9 @@ if ($disableMetrics)
 
 $platform = "x86"
 $vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release"
-
+$architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture
 if ($win64)
 {
-    $architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture
     if (-not $architecture -like "*64*")
     {
         throw "Cannot build 64-bit on non-64-bit system"
@@ -352,6 +351,15 @@ if ($win64)
     $vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x64.release"
 }
 
+if ($architecture -like "*64*")
+{
+    $PreferredToolArchitecture = "x64"
+}
+else
+{
+    $PreferredToolArchitecture = "x86"
+}
+
 $arguments = (
 "`"/p:VCPKG_VERSION=-nohash`"",
 "`"/p:DISABLE_METRICS=$disableMetricsValue`"",
@@ -359,7 +367,7 @@ $arguments = (
 "/p:Platform=$platform",
 "/p:PlatformToolset=$platformToolset",
 "/p:TargetPlatformVersion=$windowsSDK",
-"/p:PreferredToolArchitecture=x64",
+"/p:PreferredToolArchitecture=$PreferredToolArchitecture",
 "/verbosity:minimal",
 "/m",
 "/nologo",
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index f0bfb9839..00d31760a 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,5 +1,20 @@
 #!/bin/sh
 
+# Find .vcpkg-root, which indicates the root of this repo
+vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
+while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do
+    vcpkgRootDir="$(dirname "$vcpkgRootDir")"
+done
+
+# Enable using this entry point on windows from git bash by redirecting to the .bat file.
+unixName=$(uname -s | sed 's/MINGW.*_NT.*/MINGW_NT/')
+if [ "$unixName" = "MINGW_NT" ]; then
+  vcpkgRootDir=$(cygpath -aw "$vcpkgRootDir")
+  cmd "/C $vcpkgRootDir\\bootstrap-vcpkg.bat" || exit 1
+  exit 0
+fi
+
+# Argument parsing
 vcpkgDisableMetrics="OFF"
 vcpkgUseSystem=false
 vcpkgAllowAppleClang=OFF
@@ -26,12 +41,6 @@ do
     fi
 done
 
-# Find vcpkg-root
-vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
-while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do
-    vcpkgRootDir="$(dirname "$vcpkgRootDir")"
-done
-
 if [ -z ${VCPKG_DOWNLOADS+x} ]; then
     downloadsDir="$vcpkgRootDir/downloads"
 else
@@ -194,7 +203,9 @@ selectCXX()
 
     if [ "x$CXX" = "x" ]; then
         CXX=g++
-        if which g++-8 >/dev/null 2>&1; then
+        if which g++-9 >/dev/null 2>&1; then
+            CXX=g++-9
+        elif which g++-8 >/dev/null 2>&1; then
             CXX=g++-8
         elif which g++-7 >/dev/null 2>&1; then
             CXX=g++-7
diff --git a/scripts/buildsystems/osx/applocal.py b/scripts/buildsystems/osx/applocal.py
new file mode 100644
index 000000000..b3f8f138e
--- /dev/null
+++ b/scripts/buildsystems/osx/applocal.py
@@ -0,0 +1,420 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+"""
+finish the job started by macdeployqtfix
+from: https://github.com/arl/macdeployqtfix
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Aurelien Rainone
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+"""
+
+from subprocess import Popen, PIPE
+from string import Template
+import os
+import sys
+import logging
+import argparse
+import re
+from collections import namedtuple
+
+
+QTLIB_NAME_REGEX = r'^(?:@executable_path)?/.*/(Qt[a-zA-Z]*).framework/(?:Versions/\d/)?\1$'
+QTLIB_NORMALIZED = r'$prefix/Frameworks/$qtlib.framework/Versions/$qtversion/$qtlib'
+
+QTPLUGIN_NAME_REGEX = r'^(?:@executable_path)?/.*/[pP]lug[iI]ns/(.*)/(.*).dylib$'
+QTPLUGIN_NORMALIZED = r'$prefix/PlugIns/$plugintype/$pluginname.dylib'
+
+LOADERPATH_REGEX = r'^@[a-z_]+path/(.*)'
+LOADERPATH_NORMALIZED = r'$prefix/Frameworks/$loaderpathlib'
+
+
+class GlobalConfig(object):
+    logger = None
+    qtpath = None
+    exepath = None
+
+
+def run_and_get_output(popen_args):
+    """Run process and get all output"""
+    process_output = namedtuple('ProcessOutput', ['stdout', 'stderr', 'retcode'])
+    try:
+        GlobalConfig.logger.debug('run_and_get_output({0})'.format(repr(popen_args)))
+
+        proc = Popen(popen_args, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+        stdout, stderr = proc.communicate(b'')
+        proc_out = process_output(stdout, stderr, proc.returncode)
+
+        GlobalConfig.logger.debug('\tprocess_output: {0}'.format(proc_out))
+        return proc_out
+    except Exception as exc:
+        GlobalConfig.logger.error('\texception: {0}'.format(exc))
+        return process_output('', exc.message, -1)
+
+
+def get_dependencies(filename):
+    """
+    input: filename must be an absolute path
+    Should call `otool` and returns the list of dependencies, unsorted,
+    unmodified, just the raw list so then we could eventually re-use in other
+    more specialized functions
+    """
+    GlobalConfig.logger.debug('get_dependencies({0})'.format(filename))
+    popen_args = ['otool', '-L', filename]
+    proc_out = run_and_get_output(popen_args)
+    deps = []
+    if proc_out.retcode == 0:
+        # some string splitting
+        deps = [s.strip().split(' ')[0] for s in proc_out.stdout.splitlines()[1:] if s]
+        # prevent infinite recursion when a binary depends on itself (seen with QtWidgets)...
+        deps = [s for s in deps if os.path.basename(filename) not in s]
+    return deps
+
+
+def is_qt_plugin(filename):
+    """
+    Checks if a given file is a qt plugin.
+    Accepts absolute path as well as path containing @executable_path
+    """
+    qtlib_name_rgx = re.compile(QTPLUGIN_NAME_REGEX)
+    return qtlib_name_rgx.match(filename) is not None
+
+
+def is_qt_lib(filename):
+    """
+    Checks if a given file is a qt library.
+    Accepts absolute path as well as path containing @executable_path
+    """
+    qtlib_name_rgx = re.compile(QTLIB_NAME_REGEX)
+    return qtlib_name_rgx.match(filename) is not None
+
+
+def is_loader_path_lib(filename):
+    """
+    Checks if a given file is loaded via @loader_path or @rpath
+    """
+    qtlib_name_rgx = re.compile(LOADERPATH_REGEX)
+    return qtlib_name_rgx.match(filename) is not None
+
+
+def normalize_qtplugin_name(filename):
+    """
+    input: a path to a qt plugin, as returned by otool, that can have this form :
+            - an absolute path /../plugins/PLUGINTYPE/PLUGINNAME.dylib
+            - @executable_path/../plugins/PLUGINTYPE/PLUGINNAME.dylib
+    output:
+        a tuple (qtlib, abspath, rpath) where:
+            - qtname is the name of the plugin (libqcocoa.dylib, etc.)
+            - abspath is the absolute path of the qt lib inside the app bundle of exepath
+            - relpath is the correct rpath to a qt lib inside the app bundle
+    """
+
+    GlobalConfig.logger.debug('normalize_plugin_name({0})'.format(filename))
+
+    qtplugin_name_rgx = re.compile(QTPLUGIN_NAME_REGEX)
+    rgxret = qtplugin_name_rgx.match(filename)
+    if not rgxret:
+        msg = 'couldn\'t normalize a non-qt plugin filename: {0}'.format(filename)
+        GlobalConfig.logger.critical(msg)
+        raise Exception(msg)
+
+    # qtplugin normalization settings
+    qtplugintype = rgxret.groups()[0]
+    qtpluginname = rgxret.groups()[1]
+
+    templ = Template(QTPLUGIN_NORMALIZED)
+
+    # from qtlib, forge 2 path :
+    #  - absolute path of qt lib in bundle,
+    abspath = os.path.normpath(templ.safe_substitute(
+        prefix=os.path.dirname(GlobalConfig.exepath) + '/..',
+        plugintype=qtplugintype,
+        pluginname=qtpluginname))
+
+    #  - and rpath containing @executable_path, relative to exepath
+    rpath = templ.safe_substitute(
+        prefix='@executable_path/..',
+        plugintype=qtplugintype,
+        pluginname=qtpluginname)
+
+    GlobalConfig.logger.debug('\treturns({0})'.format((qtpluginname, abspath, rpath)))
+    return qtpluginname, abspath, rpath
+
+
+def normalize_qtlib_name(filename):
+    """
+    input: a path to a qt library, as returned by otool, that can have this form :
+            - an absolute path /lib/xxx/yyy
+            - @executable_path/../Frameworks/QtSerialPort.framework/Versions/5/QtSerialPort
+    output:
+        a tuple (qtlib, abspath, rpath) where:
+            - qtlib is the name of the qtlib (QtCore, QtWidgets, etc.)
+            - abspath is the absolute path of the qt lib inside the app bundle of exepath
+            - relpath is the correct rpath to a qt lib inside the app bundle
+    """
+    GlobalConfig.logger.debug('normalize_qtlib_name({0})'.format(filename))
+
+    qtlib_name_rgx = re.compile(QTLIB_NAME_REGEX)
+    rgxret = qtlib_name_rgx.match(filename)
+    if not rgxret:
+        msg = 'couldn\'t normalize a non-qt lib filename: {0}'.format(filename)
+        GlobalConfig.logger.critical(msg)
+        raise Exception(msg)
+
+    # qtlib normalization settings
+    qtlib = rgxret.groups()[0]
+    qtversion = 5
+
+    templ = Template(QTLIB_NORMALIZED)
+
+    # from qtlib, forge 2 path :
+    #  - absolute path of qt lib in bundle,
+    abspath = os.path.normpath(templ.safe_substitute(
+        prefix=os.path.dirname(GlobalConfig.exepath) + '/..',
+        qtlib=qtlib,
+        qtversion=qtversion))
+
+    #  - and rpath containing @executable_path, relative to exepath
+    rpath = templ.safe_substitute(
+        prefix='@executable_path/..',
+        qtlib=qtlib,
+        qtversion=qtversion)
+
+    GlobalConfig.logger.debug('\treturns({0})'.format((qtlib, abspath, rpath)))
+    return qtlib, abspath, rpath
+
+
+def normalize_loaderpath_name(filename):
+    """
+    input: a path to a loaderpath library, as returned by otool, that can have this form :
+            - an relative path @loaderpath/yyy
+    output:
+        a tuple (loaderpathlib, abspath, rpath) where:
+            - loaderpathlib is the name of the loaderpath lib
+            - abspath is the absolute path of the qt lib inside the app bundle of exepath
+            - relpath is the correct rpath to a qt lib inside the app bundle
+    """
+    GlobalConfig.logger.debug('normalize_loaderpath_name({0})'.format(filename))
+
+    loaderpath_name_rgx = re.compile(LOADERPATH_REGEX)
+    rgxret = loaderpath_name_rgx.match(filename)
+    if not rgxret:
+        msg = 'couldn\'t normalize a loaderpath lib filename: {0}'.format(filename)
+        GlobalConfig.logger.critical(msg)
+        raise Exception(msg)
+
+    # loaderpath normalization settings
+    loaderpathlib = rgxret.groups()[0]
+    templ = Template(LOADERPATH_NORMALIZED)
+
+    # from loaderpath, forge 2 path :
+    #  - absolute path of qt lib in bundle,
+    abspath = os.path.normpath(templ.safe_substitute(
+        prefix=os.path.dirname(GlobalConfig.exepath) + '/..',
+        loaderpathlib=loaderpathlib))
+
+    #  - and rpath containing @executable_path, relative to exepath
+    rpath = templ.safe_substitute(
+        prefix='@executable_path/..',
+        loaderpathlib=loaderpathlib)
+
+    GlobalConfig.logger.debug('\treturns({0})'.format((loaderpathlib, abspath, rpath)))
+    return loaderpathlib, abspath, rpath
+
+
+def fix_dependency(binary, dep):
+    """
+    fix 'dep' dependency of 'binary'. 'dep' is a qt library
+    """
+    if is_qt_lib(dep):
+        qtname, dep_abspath, dep_rpath = normalize_qtlib_name(dep)
+        qtnamesrc = os.path.join(GlobalConfig.qtpath, 'lib', '{0}.framework'.
+                                 format(qtname), qtname)
+    elif is_qt_plugin(dep):
+        qtname, dep_abspath, dep_rpath = normalize_qtplugin_name(dep)
+        qtnamesrc = os.path.join(GlobalConfig.qtpath, 'lib', '{0}.framework'.
+                                 format(qtname), qtname)
+    elif is_loader_path_lib(dep):
+        qtname, dep_abspath, dep_rpath = normalize_loaderpath_name(dep)
+        qtnamesrc = os.path.join(GlobalConfig.qtpath + '/lib', qtname)
+    else:
+        return True
+
+    dep_ok = True
+    # check that rpath of 'dep' inside binary has been correctly set
+    # (ie: relative to exepath using '@executable_path' syntax)
+    if dep != dep_rpath:
+        # dep rpath is not ok
+        GlobalConfig.logger.info('changing rpath \'{0}\' in binary {1}'.format(dep, binary))
+
+        # call install_name_tool -change on binary
+        popen_args = ['install_name_tool', '-change', dep, dep_rpath, binary]
+        proc_out = run_and_get_output(popen_args)
+        if proc_out.retcode != 0:
+            GlobalConfig.logger.error(proc_out.stderr)
+            dep_ok = False
+        else:
+            # call install_name_tool -id on binary
+            popen_args = ['install_name_tool', '-id', dep_rpath, binary]
+            proc_out = run_and_get_output(popen_args)
+            if proc_out.retcode != 0:
+                GlobalConfig.logger.error(proc_out.stderr)
+                dep_ok = False
+
+    # now ensure that 'dep' exists at the specified path, relative to bundle
+    if dep_ok and not os.path.exists(dep_abspath):
+
+        # ensure destination directory exists
+        GlobalConfig.logger.info('ensuring directory \'{0}\' exists: {0}'.
+                                 format(os.path.dirname(dep_abspath)))
+        popen_args = ['mkdir', '-p', os.path.dirname(dep_abspath)]
+        proc_out = run_and_get_output(popen_args)
+        if proc_out.retcode != 0:
+            GlobalConfig.logger.info(proc_out.stderr)
+            dep_ok = False
+        else:
+            # copy missing dependency into bundle
+            GlobalConfig.logger.info('copying missing dependency in bundle: {0}'.
+                                     format(qtname))
+            popen_args = ['cp', qtnamesrc, dep_abspath]
+            proc_out = run_and_get_output(popen_args)
+            if proc_out.retcode != 0:
+                GlobalConfig.logger.info(proc_out.stderr)
+                dep_ok = False
+            else:
+                # ensure permissions are correct if we ever have to change its rpath
+                GlobalConfig.logger.info('ensuring 755 perm to {0}'.format(dep_abspath))
+                popen_args = ['chmod', '755', dep_abspath]
+                proc_out = run_and_get_output(popen_args)
+                if proc_out.retcode != 0:
+                    GlobalConfig.logger.info(proc_out.stderr)
+                    dep_ok = False
+    else:
+        GlobalConfig.logger.debug('{0} is at correct location in bundle'.format(qtname))
+
+    if dep_ok:
+        return fix_binary(dep_abspath)
+    return False
+
+
+def fix_binary(binary):
+    """
+        input:
+          binary: relative or absolute path (no @executable_path syntax)
+        process:
+        - first fix the rpath for the qt libs on which 'binary' depend
+        - copy into the bundle of exepath the eventual libraries that are missing
+        - (create the soft links) needed ?
+        - do the same for all qt dependencies of binary (recursive)
+    """
+    GlobalConfig.logger.debug('fix_binary({0})'.format(binary))
+
+    # loop on 'binary' dependencies
+    for dep in get_dependencies(binary):
+        if not fix_dependency(binary, dep):
+            GlobalConfig.logger.error('quitting early: couldn\'t fix dependency {0} of {1}'.format(dep, binary))
+            return False
+    return True
+
+
+def fix_main_binaries():
+    """
+        list the main binaries of the app bundle and fix them
+    """
+    # deduce bundle path
+    bundlepath = os.path.sep.join(GlobalConfig.exepath.split(os.path.sep)[0:-3])
+
+    # fix main binary
+    GlobalConfig.logger.info('fixing executable \'{0}\''.format(GlobalConfig.exepath))
+    if fix_binary(GlobalConfig.exepath):
+        GlobalConfig.logger.info('fixing plugins')
+        for root, dummy, files in os.walk(bundlepath):
+            for name in [f for f in files if os.path.splitext(f)[1] == '.dylib']:
+                GlobalConfig.logger.info('fixing plugin {0}'.format(name))
+                if not fix_binary(os.path.join(root, name)):
+                    return False
+    return True
+
+
+def main():
+    descr = """finish the job started by macdeployqt!
+ - find dependencies/rpaths with otool
+ - copy missed dependencies with cp and mkdir
+ - fix missed rpaths        with install_name_tool
+
+ exit codes:
+ - 0 : success
+ - 1 : error
+ """
+
+    parser = argparse.ArgumentParser(description=descr,
+                                     formatter_class=argparse.RawTextHelpFormatter)
+    parser.add_argument('exepath',
+                        help='path to the binary depending on Qt')
+    parser.add_argument('qtpath',
+                        help='path of Qt libraries used to build the Qt application')
+    parser.add_argument('-q', '--quiet', action='store_true', default=False,
+                        help='do not create log on standard output')
+    parser.add_argument('-nl', '--no-log-file', action='store_true', default=False,
+                        help='do not create log file \'./macdeployqtfix.log\'')
+    parser.add_argument('-v', '--verbose', action='store_true', default=False,
+                        help='produce more log messages(debug log)')
+    args = parser.parse_args()
+
+    # globals
+    GlobalConfig.qtpath = os.path.normpath(args.qtpath)
+    GlobalConfig.exepath = args.exepath
+    GlobalConfig.logger = logging.getLogger()
+
+    # configure logging
+    ###################
+
+    # create formatter
+    formatter = logging.Formatter('%(levelname)s | %(message)s')
+    # create console GlobalConfig.logger
+    if not args.quiet:
+        chdlr = logging.StreamHandler(sys.stdout)
+        chdlr.setFormatter(formatter)
+        GlobalConfig.logger.addHandler(chdlr)
+
+    # create file GlobalConfig.logger
+    if not args.no_log_file:
+        fhdlr = logging.FileHandler('./macdeployqtfix.log', mode='w')
+        fhdlr.setFormatter(formatter)
+        GlobalConfig.logger.addHandler(fhdlr)
+
+    if args.no_log_file and args.quiet:
+        GlobalConfig.logger.addHandler(logging.NullHandler())
+    else:
+        GlobalConfig.logger.setLevel(logging.DEBUG if args.verbose else logging.INFO)
+
+    if fix_main_binaries():
+        GlobalConfig.logger.info('macdeployqtfix terminated with success')
+        ret = 0
+    else:
+        GlobalConfig.logger.error('macdeployqtfix terminated with error')
+        ret = 1
+    sys.exit(ret)
+
+
+if __name__ == "__main__":
+    main()
+\ No newline at end of file
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 1a6345563..b83fcb1ca 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -37,14 +37,18 @@ else()
         set(_VCPKG_TARGET_TRIPLET_ARCH arm)
     elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017$")
         set(_VCPKG_TARGET_TRIPLET_ARCH x86)
-    elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019 Win64$")
-        set(_VCPKG_TARGET_TRIPLET_ARCH x64)
-    elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019 Win32$")
-        set(_VCPKG_TARGET_TRIPLET_ARCH x86)
-    elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019 ARM$")
-        set(_VCPKG_TARGET_TRIPLET_ARCH arm)
     elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019$")
-        set(_VCPKG_TARGET_TRIPLET_ARCH x64)
+        if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^[Xx]86$")
+            set(_VCPKG_TARGET_TRIPLET_ARCH x86)
+        elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^[Aa][Mm][Dd]64$")
+            set(_VCPKG_TARGET_TRIPLET_ARCH x64)
+        elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^[Aa][Rr][Mm]$")
+            set(_VCPKG_TARGET_TRIPLET_ARCH arm)
+        elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^[Aa][Rr][Mm]64$")
+            set(_VCPKG_TARGET_TRIPLET_ARCH arm64)
+        else()
+
+        endif()
     else()
         find_program(_VCPKG_CL cl)
         if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$")
@@ -103,7 +107,11 @@ if(NOT EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" AND NOT _CMAKE_I
     message(WARNING "There are no libraries installed for the Vcpkg triplet ${VCPKG_TARGET_TRIPLET}.")
 endif()
 
+<<<<<<< HEAD
 if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths.
+=======
+if(CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths.
+>>>>>>> upstream/master
     list(APPEND CMAKE_PREFIX_PATH
         ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}
     )
@@ -126,6 +134,8 @@ else() #Release build: Put Release paths before Debug paths. Debug Paths are req
 endif()
 
 file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+set(_PROGRAMFILESX86 "PROGRAMFILES(x86)")
+file(TO_CMAKE_PATH "$ENV{${_PROGRAMFILESX86}}" _programfiles_x86)
 set(CMAKE_SYSTEM_IGNORE_PATH
     "${_programfiles}/OpenSSL"
     "${_programfiles}/OpenSSL-Win32"
@@ -134,6 +144,13 @@ set(CMAKE_SYSTEM_IGNORE_PATH
     "${_programfiles}/OpenSSL-Win64/lib/VC"
     "${_programfiles}/OpenSSL-Win32/lib/VC/static"
     "${_programfiles}/OpenSSL-Win64/lib/VC/static"
+    "${_programfiles_x86}/OpenSSL"
+    "${_programfiles_x86}/OpenSSL-Win32"
+    "${_programfiles_x86}/OpenSSL-Win64"
+    "${_programfiles_x86}/OpenSSL-Win32/lib/VC"
+    "${_programfiles_x86}/OpenSSL-Win64/lib/VC"
+    "${_programfiles_x86}/OpenSSL-Win32/lib/VC/static"
+    "${_programfiles_x86}/OpenSSL-Win64/lib/VC/static"
     "C:/OpenSSL/"
     "C:/OpenSSL-Win32/"
     "C:/OpenSSL-Win64/"
@@ -156,14 +173,25 @@ function(add_executable name)
     _add_executable(${ARGV})
     list(FIND ARGV "IMPORTED" IMPORTED_IDX)
     list(FIND ARGV "ALIAS" ALIAS_IDX)
+    list(FIND ARGV "MACOSX_BUNDLE" MACOSX_BUNDLE_IDX)
     if(IMPORTED_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1)
-        if(VCPKG_APPLOCAL_DEPS AND _VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp")
-            add_custom_command(TARGET ${name} POST_BUILD
-                COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
-                    -targetBinary $<TARGET_FILE:${name}>
-                    -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
-                    -OutVariable out
-            )
+        if(VCPKG_APPLOCAL_DEPS)
+            if(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp")
+                add_custom_command(TARGET ${name} POST_BUILD
+                    COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
+                        -targetBinary $<TARGET_FILE:${name}>
+                        -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
+                        -OutVariable out
+                )
+            elseif(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx")
+                if (NOT MACOSX_BUNDLE_IDX EQUAL -1)
+                    add_custom_command(TARGET ${name} POST_BUILD
+                    COMMAND python ${_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py
+                        $<TARGET_FILE:${name}>
+                        "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>"
+                    )
+                endif()
+            endif()
         endif()
         set_target_properties(${name} PROPERTIES VS_USER_PROPS do_not_import_user.props)
         set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false)
diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index e86632c7e..3db6597b4 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -162,14 +162,14 @@ function(vcpkg_build_cmake)
                             endif()
                         endwhile()
                     endif()
-                elseif(out_contents MATCHES "mt : general error c101008d: ")
+                elseif(out_contents MATCHES "mt : general error c101008d: " OR out_contents MATCHES "mt.exe : general error c101008d: ")
                     # Antivirus workaround - occasionally files are locked and cause mt.exe to fail
                     set(ITERATION 0)
-                    while (ITERATION LESS 3 AND out_contents MATCHES "mt : general error c101008d: ")
+                    while (ITERATION LESS 3 AND (out_contents MATCHES "mt : general error c101008d: " OR out_contents MATCHES "mt.exe : general error c101008d: "))
                         MATH(EXPR ITERATION "${ITERATION}+1")
                         message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of mt.exe file locking issue. Iteration: ${ITERATION}")
                         execute_process(
-                            COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS}
+                            COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG}
                             OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log"
                             ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log"
                             RESULT_VARIABLE error_code
diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake
index 5b686527d..80a0aef0d 100644
--- a/scripts/cmake/vcpkg_build_qmake.cmake
+++ b/scripts/cmake/vcpkg_build_qmake.cmake
@@ -21,13 +21,21 @@ function(vcpkg_build_qmake)
     # Make sure that the linker finds the libraries used 
     set(ENV_PATH_BACKUP "$ENV{PATH}")
     
-    set(DEBUG_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-    set(RELEASE_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        set(DEBUG_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        set(RELEASE_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+    endif()
 
     file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR)
 
-    list(APPEND _csc_RELEASE_TARGETS ${_csc_TARGETS})
-    list(APPEND _csc_DEBUG_TARGETS ${_csc_TARGETS})
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        list(APPEND _csc_RELEASE_TARGETS ${_csc_TARGETS})
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        list(APPEND _csc_DEBUG_TARGETS ${_csc_TARGETS})
+    endif()
 
     if(NOT _csc_BUILD_LOGNAME)
         set(_csc_BUILD_LOGNAME build)
@@ -47,49 +55,53 @@ function(vcpkg_build_qmake)
     set(ENV{_CL_} "/utf-8")
 
     #First generate the makefiles so we can modify them
-    set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/debug/lib;${CURRENT_INSTALLED_DIR}/debug/bin;${CURRENT_INSTALLED_DIR}/tools/qt5;${ENV_PATH_BACKUP}")
-    if(NOT _csc_SKIP_MAKEFILES)
-        run_jom(qmake_all makefiles dbg)
-
-        #Store debug makefiles path
-        file(GLOB_RECURSE DEBUG_MAKEFILES ${DEBUG_DIR}/*Makefile*)
-
-        foreach(DEBUG_MAKEFILE ${DEBUG_MAKEFILES})
-            file(READ "${DEBUG_MAKEFILE}" _contents)
-            string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}")
-            string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}")
-            string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib shell32.lib" _contents "${_contents}")
-            string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
-            string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
-            string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
-            string(REPLACE "lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
-            string(REPLACE " Qt5Bootstrap.lib " " ${NATIVE_INSTALLED_DIR}\\tools\\qt5\\Qt5Bootstrap.lib Ole32.lib Netapi32.lib Advapi32.lib ${NATIVE_INSTALLED_DIR}\\lib\\zlib.lib Shell32.lib " _contents "${_contents}")
-            file(WRITE "${DEBUG_MAKEFILE}" "${_contents}")
-        endforeach()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/debug/lib;${CURRENT_INSTALLED_DIR}/debug/bin;${CURRENT_INSTALLED_DIR}/tools/qt5;${ENV_PATH_BACKUP}")
+        if(NOT _csc_SKIP_MAKEFILES)
+            run_jom(qmake_all makefiles dbg)
+
+            #Store debug makefiles path
+            file(GLOB_RECURSE DEBUG_MAKEFILES ${DEBUG_DIR}/*Makefile*)
+
+            foreach(DEBUG_MAKEFILE ${DEBUG_MAKEFILES})
+                file(READ "${DEBUG_MAKEFILE}" _contents)
+                string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}")
+                string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}")
+                string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib shell32.lib" _contents "${_contents}")
+                string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
+                string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
+                string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
+                string(REPLACE "lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
+                string(REPLACE " Qt5Bootstrap.lib " " ${NATIVE_INSTALLED_DIR}\\tools\\qt5\\Qt5Bootstrap.lib Ole32.lib Netapi32.lib Advapi32.lib ${NATIVE_INSTALLED_DIR}\\lib\\zlib.lib Shell32.lib " _contents "${_contents}")
+                file(WRITE "${DEBUG_MAKEFILE}" "${_contents}")
+            endforeach()
+        endif()
+
+        run_jom("${_csc_DEBUG_TARGETS}" ${_csc_BUILD_LOGNAME} dbg)
     endif()
 
-    run_jom("${_csc_DEBUG_TARGETS}" ${_csc_BUILD_LOGNAME} dbg)
-
-    set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/lib;${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/tools/qt5;${ENV_PATH_BACKUP}")
-    if(NOT _csc_SKIP_MAKEFILES)
-        run_jom(qmake_all makefiles rel)
-
-        #Store release makefile path
-        file(GLOB_RECURSE RELEASE_MAKEFILES ${RELEASE_DIR}/*Makefile*)
-
-        foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES})
-            file(READ "${RELEASE_MAKEFILE}" _contents)
-            string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib shell32.lib" _contents "${_contents}")
-            string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
-            string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
-            string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
-            string(REPLACE "lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
-            string(REPLACE " Qt5Bootstrap.lib " " ${NATIVE_INSTALLED_DIR}\\tools\\qt5\\Qt5Bootstrap.lib Ole32.lib Netapi32.lib Advapi32.lib ${NATIVE_INSTALLED_DIR}\\lib\\zlib.lib Shell32.lib " _contents "${_contents}")
-            file(WRITE "${RELEASE_MAKEFILE}" "${_contents}")
-        endforeach()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/lib;${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/tools/qt5;${ENV_PATH_BACKUP}")
+        if(NOT _csc_SKIP_MAKEFILES)
+            run_jom(qmake_all makefiles rel)
+
+            #Store release makefile path
+            file(GLOB_RECURSE RELEASE_MAKEFILES ${RELEASE_DIR}/*Makefile*)
+
+            foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES})
+                file(READ "${RELEASE_MAKEFILE}" _contents)
+                string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib shell32.lib" _contents "${_contents}")
+                string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
+                string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
+                string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
+                string(REPLACE "lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
+                string(REPLACE " Qt5Bootstrap.lib " " ${NATIVE_INSTALLED_DIR}\\tools\\qt5\\Qt5Bootstrap.lib Ole32.lib Netapi32.lib Advapi32.lib ${NATIVE_INSTALLED_DIR}\\lib\\zlib.lib Shell32.lib " _contents "${_contents}")
+                file(WRITE "${RELEASE_MAKEFILE}" "${_contents}")
+            endforeach()
+        endif()
+
+        run_jom("${_csc_RELEASE_TARGETS}" ${_csc_BUILD_LOGNAME} rel)
     endif()
-
-    run_jom("${_csc_RELEASE_TARGETS}" ${_csc_BUILD_LOGNAME} rel)
     
     # Restore the original value of ENV{PATH}
     set(ENV{PATH} "${ENV_PATH_BACKUP}")
diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake
index 3c6903c9d..f1ae0e65f 100644
--- a/scripts/cmake/vcpkg_configure_meson.cmake
+++ b/scripts/cmake/vcpkg_configure_meson.cmake
@@ -26,7 +26,7 @@ function(vcpkg_configure_meson)
     set(MESON_RELEASE_LDFLAGS "${MESON_RELEASE_LDFLAGS} /INCREMENTAL:NO /OPT:REF /OPT:ICF")
     
     # select meson cmd-line options
-    list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja)
+    list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload)
     if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         list(APPEND _vcm_OPTIONS --default-library shared)
     else()
diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake
index 11178174e..d660fedd7 100644
--- a/scripts/cmake/vcpkg_configure_qmake.cmake
+++ b/scripts/cmake/vcpkg_configure_qmake.cmake
@@ -30,26 +30,30 @@ function(vcpkg_configure_qmake)
     # Cleanup build directories
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
 
-    configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf)
-
-    message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
-    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-    vcpkg_execute_required_process(
-        COMMAND ${QMAKE_COMMAND} CONFIG-=debug CONFIG+=release ${_csc_OPTIONS} ${_csc_SOURCE_PATH} -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf"
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME config-${TARGET_TRIPLET}-rel
-    )
-    message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
-
-    configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_debug.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf)
-
-    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-    vcpkg_execute_required_process(
-        COMMAND ${QMAKE_COMMAND} CONFIG-=release CONFIG+=debug ${_csc_OPTIONS} ${_csc_SOURCE_PATH} -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf"
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        LOGNAME config-${TARGET_TRIPLET}-dbg
-    )
-    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf)
+    
+        message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+        vcpkg_execute_required_process(
+            COMMAND ${QMAKE_COMMAND} CONFIG-=debug CONFIG+=release ${_csc_OPTIONS} ${_csc_SOURCE_PATH} -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf"
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+            LOGNAME config-${TARGET_TRIPLET}-rel
+        )
+        message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_debug.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf)
+
+        message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+        vcpkg_execute_required_process(
+            COMMAND ${QMAKE_COMMAND} CONFIG-=release CONFIG+=debug ${_csc_OPTIONS} ${_csc_SOURCE_PATH} -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf"
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+            LOGNAME config-${TARGET_TRIPLET}-dbg
+        )
+        message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
+    endif()
 
 endfunction()
 \ No newline at end of file
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 1642bf3b4..d5e95eb4b 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -88,13 +88,18 @@ function(vcpkg_find_acquire_program VAR)
       set(APT_PACKAGE_NAME "python3")
     endif()
   elseif(VAR MATCHES "PYTHON2")
-    set(PROGNAME python)
-    set(SUBDIR "python2")
-    set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
-    file(TO_NATIVE_PATH "${PATHS}" DESTINATION_NATIVE_PATH)
-    set(URL "https://www.python.org/ftp/python/2.7.14/python-2.7.14.msi")
-    set(ARCHIVE "python2.msi")
-    set(HASH 8c3ad6e527742d99ba96dcfd1098861b14e7207b80d51a54e9b410ab2f36e44e05561ea1527d8e92b3e10808311536260bd9e82db0da3b513fb1be18e108510e)
+    if(CMAKE_HOST_WIN32)
+      set(PROGNAME python)
+      set(SUBDIR "python2")
+      set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
+      set(URL "https://www.python.org/ftp/python/2.7.14/python-2.7.14.msi")
+      set(ARCHIVE "python2.msi")
+      set(HASH 8c3ad6e527742d99ba96dcfd1098861b14e7207b80d51a54e9b410ab2f36e44e05561ea1527d8e92b3e10808311536260bd9e82db0da3b513fb1be18e108510e)
+    else()
+      set(PROGNAME python2)
+      set(BREW_PACKAGE_NAME "python2")
+      set(APT_PACKAGE_NAME "python")
+    endif()
   elseif(VAR MATCHES "RUBY")
     set(PROGNAME "ruby")
     set(PATHS ${DOWNLOADS}/tools/ruby/rubyinstaller-2.4.1-1-x86/bin)
@@ -103,11 +108,11 @@ function(vcpkg_find_acquire_program VAR)
     set(HASH b51112e9b58cfcbe8cec0607e8a16fff6a943d9b4e31b2a7fbf5df5f83f050bf0a4812d3dd6000ff21a3d5fd219cd0a309c58ac1c1db950a9b0072405e4b70f5)
   elseif(VAR MATCHES "JOM")
     set(PROGNAME jom)
-    set(SUBDIR "jom-1.1.2")
+    set(SUBDIR "jom-1.1.3")
     set(PATHS ${DOWNLOADS}/tools/jom/${SUBDIR})
-    set(URL "http://download.qt.io/official_releases/jom/jom_1_1_2.zip")
-    set(ARCHIVE "jom_1_1_2.zip")
-    set(HASH 830cd94ed6518fbe4604a0f5a3322671b4674b87d25a71349c745500d38e85c0fac4f6995242fc5521eb048e3966bb5ec2a96a06b041343ed8da9bba78124f34)
+    set(URL "http://download.qt.io/official_releases/jom/jom_1_1_3.zip")
+    set(ARCHIVE "jom_1_1_3.zip")
+    set(HASH 5b158ead86be4eb3a6780928d9163f8562372f30bde051d8c281d81027b766119a6e9241166b91de0aa6146836cea77e5121290e62e31b7a959407840fc57b33)
   elseif(VAR MATCHES "7Z")
     set(PROGNAME 7z)
     set(PATHS "${PROGRAM_FILES_PLATFORM_BITNESS}/7-Zip" "${PROGRAM_FILES_32_BIT}/7-Zip" "${DOWNLOADS}/tools/7z/Files/7-Zip")
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 15f891979..c7d5c218a 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -29,11 +29,11 @@
         <archiveName>cmake-3.12.4-FreeBSD-x86_64.tar.gz</archiveName>
     </tool>
     <tool name="git" os="windows">
-        <version>2.20.0</version>
+        <version>2.21.0-1</version>
         <exeRelativePath>mingw32\bin\git.exe</exeRelativePath>
-        <url>https://github.com/git-for-windows/git/releases/download/v2.20.0.windows.1/PortableGit-2.20.0-32-bit.7z.exe</url>
-        <sha512>81647a87df9fde0945ef597cb1cafd8f5f42859da89e9b1db55222a261407bc16bdcc0cf1e86e315697f0981832fe10fc02845cad4b4c82ea64bbd218aec6a49</sha512>
-        <archiveName>PortableGit-2.20.0-32-bit.7z.exe</archiveName>
+        <url>https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-32-bit.7z.exe</url>
+        <sha512>d5600fc35e91cfa84e3547e38a9da9798cf0a53810cc35ac9a0dee671c4ef0e9fbcbe3eda9c790f8db4eafce7ce58d7a168d28938a66cdcca000bf5a7f5267c1</sha512>
+        <archiveName>PortableGit-2.21.0-32-bit.7z.exe</archiveName>
     </tool>
     <tool name="git" os="linux">
         <version>2.7.4</version>
diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt
index e0c4cdd86..b3ec4d15d 100644
--- a/toolsrc/CMakeLists.txt
+++ b/toolsrc/CMakeLists.txt
@@ -11,7 +11,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
     if(NOT VCPKG_ALLOW_APPLE_CLANG)
         message(FATAL_ERROR
 "Building the vcpkg tool requires support for the C++ Filesystem TS.
-Apple clang versions 9 and below do not have support for it.
+Apple clang versions 10.01 and below do not have support for it.
 Please install gcc6 or newer from homebrew (brew install gcc6).
 If you would like to try anyway, pass --allowAppleClang to bootstrap.sh.")
     else()
@@ -58,7 +58,7 @@ endif()
 if(GCC OR (CLANG AND USES_LIBSTDCXX))
     target_link_libraries(vcpkg PRIVATE stdc++fs)
 elseif(CLANG)
-    target_link_libraries(vcpkg PRIVATE c++experimental)
+    target_link_libraries(vcpkg PRIVATE c++fs)
 endif()
 
 if(MSVC)
diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index f27e9d67b..9044cb556 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -51,6 +51,12 @@ namespace vcpkg::Build
         YES
     };
 
+    enum class CleanDownloads
+    {
+        NO = 0,
+        YES
+    };
+
     enum class ConfigurationType
     {
         DEBUG,
@@ -82,6 +88,7 @@ namespace vcpkg::Build
         AllowDownloads allow_downloads;
         CleanBuildtrees clean_buildtrees;
         CleanPackages clean_packages;
+        CleanDownloads clean_downloads;
         DownloadTool download_tool;
         BinaryCaching binary_caching;
         FailOnTombstone fail_on_tombstone;
diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h
index 2026ea369..263b5f80c 100644
--- a/toolsrc/include/vcpkg/globalstate.h
+++ b/toolsrc/include/vcpkg/globalstate.h
@@ -13,8 +13,6 @@ namespace vcpkg
         static Util::LockGuarded<Chrono::ElapsedTimer> timer;
         static Util::LockGuarded<std::string> g_surveydate;
 
-        static std::atomic<bool> debugging;
-        static std::atomic<bool> feature_packages;
         static std::atomic<bool> g_binary_caching;
 
         static std::atomic<int> g_init_console_cp;
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index f8b883e97..9102205d8 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -294,11 +294,11 @@ int main(const int argc, const char* const* const argv)
     Checks::register_global_shutdown_handler([]() {
         const auto elapsed_us_inner = GlobalState::timer.lock()->microseconds();
 
-        bool debugging = GlobalState::debugging;
+        bool debugging = Debug::g_debugging;
 
         auto metrics = Metrics::g_metrics.lock();
         metrics->track_metric("elapsed_us", elapsed_us_inner);
-        GlobalState::debugging = false;
+        Debug::g_debugging = false;
         metrics->flush();
 
 #if defined(_WIN32)
@@ -337,14 +337,13 @@ int main(const int argc, const char* const* const argv)
 
     const VcpkgCmdArguments args = VcpkgCmdArguments::create_from_command_line(argc, argv);
 
-    if (const auto p = args.featurepackages.get()) GlobalState::feature_packages = *p;
     if (const auto p = args.binarycaching.get()) GlobalState::g_binary_caching = *p;
 
     if (const auto p = args.printmetrics.get()) Metrics::g_metrics.lock()->set_print_metrics(*p);
     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;
+    if (const auto p = args.debug.get()) Debug::g_debugging = *p;
 
-    if (GlobalState::debugging)
+    if (Debug::g_debugging)
     {
         inner(args);
         Checks::exit_fail(VCPKG_LINE_INFO);
@@ -388,4 +387,7 @@ int main(const int argc, const char* const* const argv)
 #endif
     }
     fflush(stdout);
+
+    //It is expected that one of the sub-commands will exit cleanly before we get here.
+    Checks::exit_fail(VCPKG_LINE_INFO);
 }
diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp
index 164394100..431491314 100644
--- a/toolsrc/src/vcpkg/base/files.cpp
+++ b/toolsrc/src/vcpkg/base/files.cpp
@@ -7,12 +7,17 @@
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__APPLE__)
 #include <fcntl.h>
-#include <sys/sendfile.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <string.h>
+#endif
+#if defined(__linux__)
+#include <sys/sendfile.h>
+#elif defined(__APPLE__)
+#include <copyfile.h>
 #endif
 
 namespace vcpkg::Files
@@ -166,7 +171,7 @@ namespace vcpkg::Files
                                     std::error_code& ec) override
         {
             this->rename(oldpath, newpath, ec);
-#if defined(__linux__)
+#if defined(__linux__) || defined(__APPLE__)
             if (ec)
             {
                 auto dst = newpath;
@@ -182,13 +187,25 @@ namespace vcpkg::Files
                     return;
                 }
 
+#if defined(__linux__)
                 off_t bytes = 0;
                 struct stat info = {0};
                 fstat(i_fd, &info);
                 auto written_bytes = sendfile(o_fd, i_fd, &bytes, info.st_size);
+#elif defined(__APPLE__)
+                auto written_bytes = fcopyfile(i_fd, o_fd, 0, COPYFILE_ALL);
+#endif
+                if (written_bytes == -1)
+                {
+                    ec.assign(errno, std::generic_category());
+                    close(i_fd);
+                    close(o_fd);
+
+                    return;
+                }
+
                 close(i_fd);
                 close(o_fd);
-                if (written_bytes == -1) return;
 
                 this->rename(dst, newpath, ec);
                 if (ec) return;
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index 43f1a6288..1f28e9f30 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -8,6 +8,7 @@
 #include <vcpkg/base/stringliteral.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
+#include <vcpkg/base/system.debug.h>
 
 #include <vcpkg/build.h>
 #include <vcpkg/commands.h>
@@ -69,6 +70,7 @@ namespace vcpkg::Build::Command
             Build::AllowDownloads::YES,
             Build::CleanBuildtrees::NO,
             Build::CleanPackages::NO,
+            Build::CleanDownloads::NO,
             Build::DownloadTool::BUILT_IN,
             GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO,
             Build::FailOnTombstone::NO,
@@ -129,11 +131,6 @@ namespace vcpkg::Build::Command
         const FullPackageSpec spec = Input::check_and_get_full_package_spec(
             std::move(first_arg), default_triplet, COMMAND_STRUCTURE.example_text);
         Input::check_triplet(spec.package_spec.triplet(), paths);
-        if (!spec.features.empty() && !GlobalState::feature_packages)
-        {
-            Checks::exit_with_message(
-                VCPKG_LINE_INFO, "Feature packages are experimentally available under the --featurepackages flag.");
-        }
         perform_and_exit_ex(spec, paths.port_dir(spec.package_spec), options, paths);
     }
 }
@@ -237,7 +234,7 @@ namespace vcpkg::Build
         if (!pre_build_info.cmake_system_name.empty() && pre_build_info.cmake_system_name != "WindowsStore") return "";
 
         const char* tonull = " >nul";
-        if (GlobalState::debugging)
+        if (Debug::g_debugging)
         {
             tonull = "";
         }
@@ -362,24 +359,31 @@ namespace vcpkg::Build
         }
 
         const Toolset& toolset = paths.get_toolset(pre_build_info);
+
+        std::vector<System::CMakeVariable> variables {
+            {"CMD", "BUILD"},
+            {"PORT", config.scf.core_paragraph->name},
+            {"CURRENT_PORT_DIR", config.port_dir},
+            {"TARGET_TRIPLET", spec.triplet().canonical_name()},
+            {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},
+            {"VCPKG_USE_HEAD_VERSION",
+            Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},
+            {"DOWNLOADS", paths.downloads},
+            {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"},
+            {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)},
+            {"FEATURES", Strings::join(";", config.feature_list)},
+            {"ALL_FEATURES", all_features},
+        };
+
+        if (!System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value())
+        {
+            variables.push_back({"GIT", git_exe_path});
+        }
+
         const std::string cmd_launch_cmake = System::make_cmake_cmd(
             cmake_exe_path,
             paths.ports_cmake,
-            {
-                {"CMD", "BUILD"},
-                {"PORT", config.scf.core_paragraph->name},
-                {"CURRENT_PORT_DIR", config.port_dir},
-                {"TARGET_TRIPLET", spec.triplet().canonical_name()},
-                {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},
-                {"VCPKG_USE_HEAD_VERSION",
-                Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},
-                {"DOWNLOADS", paths.downloads},
-                {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"},
-                {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)},
-                {"GIT", git_exe_path},
-                {"FEATURES", Strings::join(";", config.feature_list)},
-                {"ALL_FEATURES", all_features},
-            });
+            variables);
 
         auto command = make_build_env_cmd(pre_build_info, toolset);
         if (!command.empty())
@@ -504,7 +508,7 @@ namespace vcpkg::Build
                 // which will give a stable ordering and better names in the key entry.
                 // this is not available in the filesystem TS so instead number the files for the key.
                 std::string key = Strings::format("file_%03d", counter++);
-                if (GlobalState::debugging)
+                if (Debug::g_debugging)
                 {
                     System::print2("[DEBUG] mapping ", key, " from ", port_file.u8string(), "\n");
                 }
@@ -529,7 +533,7 @@ namespace vcpkg::Build
         const std::string full_abi_info =
             Strings::join("", abi_tag_entries, [](const AbiEntry& p) { return p.key + " " + p.value + "\n"; });
 
-        if (GlobalState::debugging)
+        if (Debug::g_debugging)
         {
             System::print2("[DEBUG] <abientries>\n");
             for (auto&& entry : abi_tag_entries)
diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp
index 10cb7d9fe..4d31c4fbe 100644
--- a/toolsrc/src/vcpkg/commands.ci.cpp
+++ b/toolsrc/src/vcpkg/commands.ci.cpp
@@ -229,6 +229,7 @@ namespace vcpkg::Commands::CI
             Build::AllowDownloads::YES,
             Build::CleanBuildtrees::YES,
             Build::CleanPackages::YES,
+            Build::CleanDownloads::NO,
             Build::DownloadTool::BUILT_IN,
             GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO,
             Build::FailOnTombstone::YES,
@@ -372,6 +373,7 @@ namespace vcpkg::Commands::CI
             Build::AllowDownloads::YES,
             Build::CleanBuildtrees::YES,
             Build::CleanPackages::YES,
+            Build::CleanDownloads::NO,
             Build::DownloadTool::BUILT_IN,
             GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO,
             Build::FailOnTombstone::YES,
diff --git a/toolsrc/src/vcpkg/commands.upgrade.cpp b/toolsrc/src/vcpkg/commands.upgrade.cpp
index 29627db3d..29815ca94 100644
--- a/toolsrc/src/vcpkg/commands.upgrade.cpp
+++ b/toolsrc/src/vcpkg/commands.upgrade.cpp
@@ -155,6 +155,7 @@ namespace vcpkg::Commands::Upgrade
             Build::AllowDownloads::YES,
             Build::CleanBuildtrees::NO,
             Build::CleanPackages::NO,
+            Build::CleanDownloads::NO,
             Build::DownloadTool::BUILT_IN,
             GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO,
             Build::FailOnTombstone::NO,
diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp
index 870d2c49e..f6a95b61f 100644
--- a/toolsrc/src/vcpkg/export.cpp
+++ b/toolsrc/src/vcpkg/export.cpp
@@ -75,6 +75,7 @@ namespace vcpkg::Export
             Build::AllowDownloads::YES,
             Build::CleanBuildtrees::NO,
             Build::CleanPackages::NO,
+            Build::CleanDownloads::NO,
             Build::DownloadTool::BUILT_IN,
             Build::BinaryCaching::NO,
             Build::FailOnTombstone::NO,
diff --git a/toolsrc/src/vcpkg/globalstate.cpp b/toolsrc/src/vcpkg/globalstate.cpp
index 1a2c08474..aac5148fa 100644
--- a/toolsrc/src/vcpkg/globalstate.cpp
+++ b/toolsrc/src/vcpkg/globalstate.cpp
@@ -7,8 +7,6 @@ namespace vcpkg
     Util::LockGuarded<Chrono::ElapsedTimer> GlobalState::timer;
     Util::LockGuarded<std::string> GlobalState::g_surveydate;
 
-    std::atomic<bool> GlobalState::debugging(false);
-    std::atomic<bool> GlobalState::feature_packages(true);
     std::atomic<bool> GlobalState::g_binary_caching(false);
 
     std::atomic<int> GlobalState::g_init_console_cp(0);
diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp
index 14dfb6fa3..7fb304c17 100644
--- a/toolsrc/src/vcpkg/install.cpp
+++ b/toolsrc/src/vcpkg/install.cpp
@@ -302,8 +302,7 @@ namespace vcpkg::Install
     {
         const InstallPlanType& plan_type = action.plan_type;
         const std::string display_name = action.spec.to_string();
-        const std::string display_name_with_features =
-            GlobalState::feature_packages ? action.displayname() : display_name;
+        const std::string display_name_with_features = action.displayname();
 
         const bool is_user_requested = action.request_type == RequestType::USER_REQUESTED;
         const bool use_head_version = Util::Enum::to_bool(action.build_options.use_head_version);
@@ -368,6 +367,16 @@ namespace vcpkg::Install
                 fs.remove_all(package_dir, ec);
             }
 
+            if (action.build_options.clean_downloads == Build::CleanDownloads::YES)
+            {
+                auto& fs = paths.get_filesystem();
+                const fs::path download_dir = paths.downloads;
+                std::error_code ec;
+                for(auto& p: fs.get_files_non_recursive(download_dir))
+                    if (!fs.is_directory(p))
+                        fs.remove(p);
+            }
+
             return {code, std::move(bcf)};
         }
 
@@ -464,14 +473,16 @@ namespace vcpkg::Install
     static constexpr StringLiteral OPTION_KEEP_GOING = "--keep-going";
     static constexpr StringLiteral OPTION_XUNIT = "--x-xunit";
     static constexpr StringLiteral OPTION_USE_ARIA2 = "--x-use-aria2";
+    static constexpr StringLiteral OPTION_CLEAN_AFTER_BUILD = "--clean-after-build";
 
-    static constexpr std::array<CommandSwitch, 6> INSTALL_SWITCHES = {{
+    static constexpr std::array<CommandSwitch, 7> INSTALL_SWITCHES = {{
         {OPTION_DRY_RUN, "Do not actually build or install"},
         {OPTION_USE_HEAD_VERSION, "Install the libraries on the command line using the latest upstream sources"},
         {OPTION_NO_DOWNLOADS, "Do not download new sources"},
         {OPTION_RECURSE, "Allow removal of packages as part of installation"},
         {OPTION_KEEP_GOING, "Continue installing packages on failure"},
         {OPTION_USE_ARIA2, "Use aria2 to perform download tasks"},
+        {OPTION_CLEAN_AFTER_BUILD, "Clean buildtrees, packages and downloads after building each package"},
     }};
     static constexpr std::array<CommandSetting, 1> INSTALL_SETTINGS = {{
         {OPTION_XUNIT, "File to output results in XUnit format (Internal use)"},
@@ -532,7 +543,9 @@ namespace vcpkg::Install
                         while (next != last)
                         {
                             auto match = *next;
-                            library_targets[find_package_name].push_back(match[1]);
+                            auto& targets = library_targets[find_package_name];
+                            if (std::find(targets.cbegin(), targets.cend(), match[1]) == targets.cend())
+                                targets.push_back(match[1]);
                             ++next;
                         }
                     }
@@ -615,11 +628,6 @@ namespace vcpkg::Install
         for (auto&& spec : specs)
         {
             Input::check_triplet(spec.package_spec.triplet(), paths);
-            if (!spec.features.empty() && !GlobalState::feature_packages)
-            {
-                Checks::exit_with_message(
-                    VCPKG_LINE_INFO, "Feature packages are experimentally available under the --featurepackages flag.");
-            }
         }
 
         const bool dry_run = Util::Sets::contains(options.switches, OPTION_DRY_RUN);
@@ -627,6 +635,7 @@ namespace vcpkg::Install
         const bool no_downloads = Util::Sets::contains(options.switches, (OPTION_NO_DOWNLOADS));
         const bool is_recursive = Util::Sets::contains(options.switches, (OPTION_RECURSE));
         const bool use_aria2 = Util::Sets::contains(options.switches, (OPTION_USE_ARIA2));
+        const bool clean_after_build = Util::Sets::contains(options.switches, (OPTION_CLEAN_AFTER_BUILD));
         const KeepGoing keep_going = to_keep_going(Util::Sets::contains(options.switches, OPTION_KEEP_GOING));
 
         // create the plan
@@ -638,8 +647,9 @@ namespace vcpkg::Install
         const Build::BuildPackageOptions install_plan_options = {
             Util::Enum::to_enum<Build::UseHeadVersion>(use_head_version),
             Util::Enum::to_enum<Build::AllowDownloads>(!no_downloads),
-            Build::CleanBuildtrees::NO,
-            Build::CleanPackages::NO,
+            clean_after_build ? Build::CleanBuildtrees::YES : Build::CleanBuildtrees::NO,
+            clean_after_build ? Build::CleanPackages::YES : Build::CleanPackages::NO,
+            clean_after_build ? Build::CleanDownloads::YES : Build::CleanDownloads::NO,
             download_tool,
             GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO,
             Build::FailOnTombstone::NO,
@@ -655,20 +665,6 @@ namespace vcpkg::Install
         std::vector<AnyAction> action_plan =
             create_feature_install_plan(provider, FullPackageSpec::to_feature_specs(specs), status_db);
 
-        if (!GlobalState::feature_packages)
-        {
-            for (auto&& action : action_plan)
-            {
-                if (action.remove_action.has_value())
-                {
-                    Checks::exit_with_message(
-                        VCPKG_LINE_INFO,
-                        "The installation plan requires feature packages support. Please re-run the "
-                        "command with --featurepackages.");
-                }
-            }
-        }
-
         for (auto&& action : action_plan)
         {
             if (auto p_install = action.install_action.get())
diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp
index 45f939afd..431fad5ca 100644
--- a/toolsrc/src/vcpkg/paragraphs.cpp
+++ b/toolsrc/src/vcpkg/paragraphs.cpp
@@ -3,7 +3,7 @@
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/util.h>
-#include <vcpkg/globalstate.h>
+#include <vcpkg/base/system.debug.h>
 #include <vcpkg/paragraphparseresult.h>
 #include <vcpkg/paragraphs.h>
 
@@ -211,17 +211,7 @@ namespace vcpkg::Paragraphs
         Expected<std::vector<std::unordered_map<std::string, std::string>>> pghs = get_paragraphs(fs, path / "CONTROL");
         if (auto vector_pghs = pghs.get())
         {
-            auto csf = SourceControlFile::parse_control_file(std::move(*vector_pghs));
-            if (!GlobalState::feature_packages)
-            {
-                if (auto ptr = csf.get())
-                {
-                    Checks::check_exit(VCPKG_LINE_INFO, ptr->get() != nullptr);
-                    ptr->get()->core_paragraph->default_features.clear();
-                    ptr->get()->feature_paragraphs.clear();
-                }
-            }
-            return csf;
+            return SourceControlFile::parse_control_file(std::move(*vector_pghs));
         }
         auto error_info = std::make_unique<ParseControlErrorInfo>();
         error_info->name = path.filename().generic_u8string();
@@ -279,7 +269,7 @@ namespace vcpkg::Paragraphs
         auto results = try_load_all_ports(fs, ports_dir);
         if (!results.errors.empty())
         {
-            if (GlobalState::debugging)
+            if (Debug::g_debugging)
             {
                 print_error_message(results.errors);
             }
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp
index 0f99e01d3..512bcfc35 100644
--- a/toolsrc/src/vcpkg/vcpkgpaths.cpp
+++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp
@@ -192,26 +192,6 @@ namespace vcpkg
                                vs_root_path.generic_string());
         }
 
-        if (prebuildinfo.cmake_system_name == "WindowsStore")
-        {
-            // For now, cmake does not support VS 2019 when using the MSBuild generator.
-            Util::erase_remove_if(candidates, [&](const Toolset* t) { return t->version == "v142"; });
-            Checks::check_exit(VCPKG_LINE_INFO,
-                               !candidates.empty(),
-                               "With the current CMake version, UWP binaries can only be built with toolset version "
-                               "v141 or below. Please install the v141 toolset in VS 2019.");
-        }
-
-        if (System::get_host_processor() == System::CPUArchitecture::X86)
-        {
-            // For now, cmake does not support VS 2019 when using the MSBuild generator.
-            Util::erase_remove_if(candidates, [&](const Toolset* t) { return t->version == "v142"; });
-            Checks::check_exit(VCPKG_LINE_INFO,
-                               !candidates.empty(),
-                               "With the current CMake version, 32-bit machines can build with toolset version "
-                               "v141 or below. Please install the v141 toolset in VS 2019.");
-        }
-
         Checks::check_exit(VCPKG_LINE_INFO, !candidates.empty(), "No suitable Visual Studio instances were found");
         return *candidates.front();
author	Thad House <thadhouse1@gmail.com>	2019-05-31 13:49:13 -0700
committer	Thad House <thadhouse1@gmail.com>	2019-05-31 13:49:13 -0700
commit	788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch)
tree	173ade0e6960917458afe9dd9fb0c3c2b7f32051
parent	f483ae4c7fd04eed671a1de595374f84175311e9 (diff)
parent	26a9338c5055193915290527eacb37f2ac7fdcb8 (diff)
download	vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip