260 files changed, 1670 insertions, 1455 deletions
diff --git a/README.md b/README.md
index 9d526cdd2..c3f42aa0a 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ The best way to use installed libraries with CMake is via the toolchain file `sc
 
 In Visual Studio, you can create a New Project (or open an existing one). All installed libraries are immediately ready to be `#include`'d and used in your project without additional configuration.
 
-For more information, see our [using a package](docs/examples/installing-and-using-packages.md) example for the specifics.
+For more information, see our [using a package](docs/examples/installing-and-using-packages.md) example for the specifics. If your library is not present in vcpkg catalog, you can open an [issue on the GitHub repo](https://github.com/microsoft/vcpkg/issues) where the dev team and the community can see it and potentially create the port file for this library.
 
 Additional notes on macOS and Linux support can be found in the [official announcement](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/).
 
diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md
index a8f430836..ac4afa265 100644
--- a/docs/maintainers/control-files.md
+++ b/docs/maintainers/control-files.md
@@ -56,7 +56,7 @@ Version: 2019-3-21
 ```
 
 #### Description
-A description of the library
+A description of the library.
 
 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.
 
@@ -70,6 +70,14 @@ Description: Mosquitto is an open source message broker that implements the MQ T
   to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
 ````
 
+#### Homepage
+The URL of the homepage for the library where a user is able to find additional documentation or the original source code.
+
+Example:
+```no-highlight
+Homepage: https://github.com/Microsoft/vcpkg
+```
+
 #### Build-Depends
 Comma separated list of vcpkg ports the library has a dependency on.
 
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL
index f828892df..8b19b03cb 100644
--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@@ -1,4 +1,5 @@
 Source: alembic
 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/
+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.
+Homepage: http://alembic.io/
diff --git a/ports/anax/CONTROL b/ports/anax/CONTROL
index a11803305..14b10c9af 100644
--- a/ports/anax/CONTROL
+++ b/ports/anax/CONTROL
@@ -1,3 +1,4 @@
 Source: anax
 Version: 2.1.0-5
-Description: An open source C++ entity system. <https://github.com/miguelmartin75/anax>
+Description: An open source C++ entity system.
+Homepage: https://github.com/miguelmartin75/anax
diff --git a/ports/autobahn/CONTROL b/ports/autobahn/CONTROL
index 7a08d9f96..94152bb76 100644
--- a/ports/autobahn/CONTROL
+++ b/ports/autobahn/CONTROL
@@ -1,4 +1,5 @@
 Source: autobahn
 Version: 18.4.1
 Build-Depends: websocketpp, msgpack, boost-asio, boost-thread
-Description: WAMP for C++ in Boost/Asio https://crossbar.io/autobahn
+Description: WAMP for C++ in Boost/Asio 
+Homepage: https://crossbar.io/autobahn
diff --git a/ports/avro-c/CONTROL b/ports/avro-c/CONTROL
index 5bcf16fe5..527090f0d 100644
--- a/ports/avro-c/CONTROL
+++ b/ports/avro-c/CONTROL
@@ -1,4 +1,4 @@
 Source: avro-c
-Version: 1.8.2-1
+Version: 1.8.2-2
 Description: Apache Avro is a data serialization system
 Build-Depends: jansson, liblzma, zlib
diff --git a/ports/avro-c/fix-build-error.patch b/ports/avro-c/fix-build-error.patch
new file mode 100644
index 000000000..6e07310fa
--- /dev/null
+++ b/ports/avro-c/fix-build-error.patch
@@ -0,0 +1,20 @@
+diff --git a/lang/c/src/CMakeLists.txt b/lang/c/src/CMakeLists.txt
+index c21f1ce..accb0e3 100644
+--- a/lang/c/src/CMakeLists.txt
++++ b/lang/c/src/CMakeLists.txt
+@@ -85,13 +85,13 @@ source_group(Avro FILES ${AVRO_SRC})
+ string(REPLACE ":" "." LIBAVRO_DOT_VERSION ${LIBAVRO_VERSION})
+ 
+ add_library(avro-static STATIC ${AVRO_SRC})
+-target_link_libraries(avro-static ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
++target_link_libraries(avro-static jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+ set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro)
+ 
+ if (NOT WIN32)
+ # TODO: Create Windows DLLs. See http://www.cmake.org/Wiki/BuildingWinDLL
+ add_library(avro-shared SHARED ${AVRO_SRC})
+-target_link_libraries(avro-shared ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
++target_link_libraries(avro-shared jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+ set_target_properties(avro-shared PROPERTIES
+         OUTPUT_NAME avro
+         SOVERSION ${LIBAVRO_DOT_VERSION})
diff --git a/ports/avro-c/portfile.cmake b/ports/avro-c/portfile.cmake
index d868738df..ee0b6f7ca 100644
--- a/ports/avro-c/portfile.cmake
+++ b/ports/avro-c/portfile.cmake
@@ -13,14 +13,12 @@ vcpkg_from_github(
   REF release-1.8.2
   SHA512 a48cc353aadd45ad2c8593bf89ec3f1ddb0fcd364b79dd002a60a54d49cab714b46eee8bd6dc47b13588b9eead49c754dfe05f6aff735752fca8d2cd35ae8649
   HEAD_REF master
+  PATCHES
+        avro.patch
+        avro-pr-217.patch
+        fix-build-error.patch # Since jansson updated, use jansson::jansson instead of the macro ${JANSSON_LIBRARIES}
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/avro.patch
-        ${CMAKE_CURRENT_LIST_DIR}/avro-pr-217.patch)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/lang/c
     PREFER_NINJA
diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL
index 702ff2aa3..d80e99091 100644
--- a/ports/aws-c-common/CONTROL
+++ b/ports/aws-c-common/CONTROL
@@ -1,3 +1,3 @@
 Source: aws-c-common
-Version: 0.3.0
+Version: 0.3.11
 Description: AWS common library for C
 \ No newline at end of file
diff --git a/ports/aws-c-common/disable-internal-crt-option.patch b/ports/aws-c-common/disable-internal-crt-option.patch
new file mode 100644
index 000000000..d82a00aaa
--- /dev/null
+++ b/ports/aws-c-common/disable-internal-crt-option.patch
@@ -0,0 +1,20 @@
+diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
+index 5ceb11c..9d0aa12 100644
+--- a/cmake/AwsCFlags.cmake
++++ b/cmake/AwsCFlags.cmake
+@@ -38,15 +38,6 @@ function(aws_set_common_properties target)
+         # Disable unknown pragma warnings
+         list(APPEND AWS_C_FLAGS /wd4068)
+ 
+-        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
+-        if(STATIC_CRT)
+-            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        else()
+-            string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        endif()
+-        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
+-        list(APPEND AWS_C_FLAGS "${_FLAGS}")
+-
+     else()
+         list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+ 
diff --git a/ports/aws-c-common/fix-dependencey-build-error.patch b/ports/aws-c-common/fix-dependencey-build-error.patch
new file mode 100644
index 000000000..cfbf2611c
--- /dev/null
+++ b/ports/aws-c-common/fix-dependencey-build-error.patch
@@ -0,0 +1,13 @@
+diff --git a/include/aws/common/byte_buf.h b/include/aws/common/byte_buf.h
+index 545b06d..c579c82 100644
+--- a/include/aws/common/byte_buf.h
++++ b/include/aws/common/byte_buf.h
+@@ -21,6 +21,8 @@
+ 
+ #include <string.h>
+ 
++#pragma warning(disable: 4068)
++
+ /**
+  * Represents a length-delimited binary string or buffer. If byte buffer points
+  * to constant memory or memory that should otherwise not be freed by this
diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
index 681964791..609d7269d 100644
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@@ -3,9 +3,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-common
-    REF v0.3.0
-    SHA512 604b4289f19be662f15dc5ba80c20b78856975332b485796f979580e45f8d778eb8ce0cc2c02dcbaf27bc1159f473e02676cd951b674b7c8478ed26438a04541
+    REF v0.3.11
+    SHA512 da845f748aecfff61209f542f4eac8d46738af52ce980d5c8315397f859429dfd9e4bf989ddf2fbe938d1efb33dce9c531c92cbe53388b1d1082d5caa97e8750
     HEAD_REF master
+    PATCHES
+        fix-dependencey-build-error.patch # This patch fixes dependency port compilation failure
+        disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index f7e0a0fdd..08223a62c 100644
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-c-shared-utility
-Version: 2019-05-16
+Version: 2019-05-16.1
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c
 
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index ee5bebf5c..c43bf4451 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     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 cfca96393..676184078 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-iot-sdk-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 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 
 
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index bfd7703c8..3f3ca4f0c 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF 68d9964daa3e6754f6f8d98bbbd637b0967d4d29
-        SHA512 5492ab06ae3686c7a167d63620d6ca00024dd52d46627d7958569f1ec0cfca1b56151d54b8c7975f127f655018c10e830747ef84a0cdc66a44e903e25b2dc985
+        REF f3f9538960d9b29033e52522dd63e985ba970504
+        SHA512 f8ce98d62425da4bec1c9e99b7b662a615d90a9407e03f7ce31a56fb8848f6bda1a39156bbabf351383e490dc3438d842136220dcf08efb1560e21d9ac76a0ba
         HEAD_REF public-preview
         PATCHES improve-external-deps.patch
     )
diff --git a/ports/azure-macro-utils-c/CONTROL b/ports/azure-macro-utils-c/CONTROL
index 72840172b..40aaa75fe 100644
--- a/ports/azure-macro-utils-c/CONTROL
+++ b/ports/azure-macro-utils-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-macro-utils-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Description: A library of macros for the Azure IoT SDK Suite
 Build-Depends: 
 
diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL
index c3f8babef..d799b4512 100644
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@@ -2,4 +2,5 @@ Source: azure-storage-cpp
 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/
+  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.
+Homepage: http://blogs.msdn.com/b/windowsazurestorage/
+\ No newline at end of file
diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL
index 2576f3e98..db9200f4c 100644
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-uamqp-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: AMQP library for C
 
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index 0bbc68b96..517eca19a 100644
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF 13f009ddd50a2837f651b0237de17db5f24c3af9
-        SHA512 649e1826c02a25c57031e1cf1ae92ff15f7caadd064d1dff4aa4ee579598af58ae03f778138cdf26918c1500ca1b8678a6f88c0ae24fd6fca37dab7b81b34984
+        REF 5ceebf6ec8d1973cfa80804077c7cef23d3b36af
+        SHA512 6dc7ffc386339db54ff387760119ae5ffd564642cd18d0dc177e6302167cc3b40bdd0f4d9e50478db8d2760166b15058b53b9eb2d1c160f234693a59ac762a75
         HEAD_REF master
     )
 else()
diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL
index c5cc71cfd..f282a27f2 100644
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-uhttp-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: Azure HTTP Library written in C
 
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index f14d6dca0..af5afc875 100644
--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF 43dce924b32818f8ab851f972cffebc204edc5c4
-        SHA512 0e5e9e7dac0c8a1a01cea2fd9ef068f988ad3453f978957cbcb009126637fe5810001e273e7b300b4540914705a89250d96df652c4bb2c7f5348cd8ce7240d70
+        REF b8976adff02e543fc00e7db59eae9ce78dd014fe
+        SHA512 65ddccc07831309c4f3f8546bb1a45a6eff84674013311a15c99389d4fc33eaf2ef3da6c7c8e4bb03d32955d12c978190e7badb597379a9fefda4ebcf18827ec
         HEAD_REF master
     )
 else()
diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL
index 98019eb69..2138a45b1 100644
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-umqtt-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: General purpose library for communication over the mqtt protocol
 
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index e7e5a8df3..d64dd01d4 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF ea9f6112d002bdff55c94df327bc7effc8393c78
-        SHA512 68fdc22eb07d32cb9cf489d878db3be8326225e3a067153af7b9e29eabc8ee25162507b7e8921b71b83d42703d5a3d8e040f4a9e61a19540789432e2cecb782f
+        REF c37883fbb05218fd940b87899a116af240f90c40
+        SHA512 21bbe6dfafcc96d35775ab83a75334fbfd41a55a82a7da483d5ff179aa3792424851f250007c9603ef17c789d8b23b1a8b81580fc2cf793fd00b487c321fdba3
         HEAD_REF master
     )
 else()
diff --git a/ports/berkeleydb/CONTROL b/ports/berkeleydb/CONTROL
index e77e5793a..b4fd6dae0 100644
--- a/ports/berkeleydb/CONTROL
+++ b/ports/berkeleydb/CONTROL
@@ -1,3 +1,3 @@
 Source: berkeleydb
 Version: 4.8.30-2
-Description: A high-performance embedded database for key/value data.
+Description: BDB - A high-performance embedded database for key/value data.
diff --git a/ports/bond/CONTROL b/ports/bond/CONTROL
index 62f48bd8a..940b0dc05 100644
--- a/ports/bond/CONTROL
+++ b/ports/bond/CONTROL
@@ -1,5 +1,6 @@
 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>
+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.
+Homepage: https://github.com/Microsoft/bond
 Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL
index a21747a08..41f0d4066 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.70.0
+Version: 1.70.0-1
 Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Description: Boost thread module
diff --git a/ports/boost-thread/avoid-winapi.patch b/ports/boost-thread/avoid-winapi.patch
index ed6a89ee7..2308600ea 100644
--- a/ports/boost-thread/avoid-winapi.patch
+++ b/ports/boost-thread/avoid-winapi.patch
@@ -1,13 +1,13 @@
-diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
-index 5e378f7..6144621 100644
---- a/include/boost/thread/win32/thread_primitives.hpp
-+++ b/include/boost/thread/win32/thread_primitives.hpp
-@@ -70,7 +70,7 @@ namespace boost
-     {
-         namespace win32
-         {
--            namespace detail { typedef ticks_type (WINAPI *gettickcount64_t)(); }
-+            namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); }
-             extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64;
- 
-             enum event_type
+diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
+index e075140..d60ab36 100644
+--- a/include/boost/thread/win32/thread_primitives.hpp
++++ b/include/boost/thread/win32/thread_primitives.hpp
+@@ -70,7 +70,7 @@ namespace boost
+     {
+         namespace win32
+         {
+-            namespace detail { typedef ticks_type (BOOST_WINAPI_WINAPI_CC *gettickcount64_t)(); }
++			namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); }
+             extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64;
+ 
+             enum event_type
diff --git a/ports/box2d/CONTROL b/ports/box2d/CONTROL
index 943b1ec94..e95eea2ba 100644
--- a/ports/box2d/CONTROL
+++ b/ports/box2d/CONTROL
@@ -1,3 +1,4 @@
 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.
+Description: An open source C++ engine for simulating rigid bodies in 2D.
+Homepage: http://box2d.org
diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL
index 3014018b9..2bb136b7a 100644
--- a/ports/capnproto/CONTROL
+++ b/ports/capnproto/CONTROL
@@ -1,4 +1,5 @@
 Source: capnproto
 Version: 0.7.0-1
-Description: Data interchange format and capability-based RPC system https://capnproto.org/
+Description: Data interchange format and capability-based RPC system
+Homepage: https://capnproto.org/
 Build-Depends: zlib
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
index 7f78259db..b3cd3c33d 100644
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
 Source: catch2
 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
+Homepage: https://github.com/catchorg/Catch2
diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL
index aa90dad66..6b762e572 100644
--- a/ports/celero/CONTROL
+++ b/ports/celero/CONTROL
@@ -1,3 +1,3 @@
 Source: celero
-Version: 2.4.0-1
+Version: 2.5.0-1
 Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.
diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake
index 61dbec10e..a3dd2ad93 100644
--- a/ports/celero/portfile.cmake
+++ b/ports/celero/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DigitalInBlue/Celero
-    REF 9f41c21e35b04d7d65dcb0aff4c962f6e5f2cbc3
-    SHA512 62a4803e61cf9e876c09cc68be07d4bfa31f291d3ced23e092347bf43b48086b3ba7862fc454082f42263d9ec0c260e8ba58da5c0c461ebff9c871209784e2a7
+    REF 6f24a1d98db4fee41ddd2f615cf490a5b514795a
+    SHA512 7dc8cecd2aac7bd312bfa01013f290fbfac8a43d07cc0d884e9b446c29a6c233e800f9bd3d03551f6e3b1ee2424cf90571f16590b23fc9333900fcc82143d048
     HEAD_REF master
 )
 
diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL
index 3fe872020..e478049c1 100644
--- a/ports/cli11/CONTROL
+++ b/ports/cli11/CONTROL
@@ -1,3 +1,4 @@
 Source: cli11
 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>
+Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.
+Homepage: https://github.com/CLIUtils/CLI11
diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL
index db1dd82f9..fdce77033 100644
--- a/ports/corrade/CONTROL
+++ b/ports/corrade/CONTROL
@@ -1,6 +1,7 @@
 Source: corrade
 Version: 2019.01-1
-Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/
+Description: C++11/C++14 multiplatform utility library
+Homepage: http://magnum.graphics/corrade/
 Default-Features: interconnect, pluginmanager, testsuite, utility
 
 Feature: interconnect
diff --git a/ports/cppcms/CONTROL b/ports/cppcms/CONTROL
index f33c94ed9..b2db0ffa1 100644
--- a/ports/cppcms/CONTROL
+++ b/ports/cppcms/CONTROL
@@ -1,4 +1,4 @@
 Source: cppcms
-Version: 1.1.0-2
+Version: 1.2.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
diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake
index c9ccca85b..e6c6cfa2a 100644
--- a/ports/cppcms/portfile.cmake
+++ b/ports/cppcms/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO artyom-beilis/cppcms
-    REF v1.1.0
-	SHA512 cfc77f28ddee05b8a350fff1dbd7c09adcf008b8662d4f977b203dee50b5fadae97df499a655ebb48263a7448e0bdca514c8ac52ea805bf33e48612dabaa69f4
+    REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4
+	SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df
 )
 
 vcpkg_find_acquire_program(PYTHON2)
@@ -27,5 +27,5 @@ file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
 file(REMOVE ${EXE_FILES})
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LGPLv3.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppcms)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppcms/LGPLv3.txt ${CURRENT_PACKAGES_DIR}/share/cppcms/copyright)
+file(COPY ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppcms)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppcms/MIT.TXT ${CURRENT_PACKAGES_DIR}/share/cppcms/copyright)
diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL
index e3a5d79de..c65a43c90 100644
--- a/ports/cryptopp/CONTROL
+++ b/ports/cryptopp/CONTROL
@@ -1,3 +1,3 @@
 Source: cryptopp
-Version: 8.1.0
+Version: 8.1.0-1
 Description: Crypto++ is a free C++ class library of cryptographic schemes.
diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake
index b4f35e7e6..ad6557f77 100644
--- a/ports/cryptopp/portfile.cmake
+++ b/ports/cryptopp/portfile.cmake
@@ -26,6 +26,14 @@ vcpkg_from_github(
 file(COPY ${CMAKE_SOURCE_PATH}/cryptopp-config.cmake DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
+# disable assembly on OSX to fix broken build
+if(APPLE)
+    set(CRYPTOPP_DISABLE_ASM "ON")
+else()
+    set(CRYPTOPP_DISABLE_ASM "OFF")
+endif()
+
+
 # Dynamic linking should be avoided for Crypto++ to reduce the attack surface,
 # so generate a static lib for both dynamic and static vcpkg targets.
 # See also:
@@ -40,6 +48,7 @@ vcpkg_configure_cmake(
         -DBUILD_STATIC=ON
         -DBUILD_TESTING=OFF
         -DBUILD_DOCUMENTATION=OFF
+        -DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/dcmtk/CONTROL b/ports/dcmtk/CONTROL
index ab248db1c..ad087563d 100644
--- a/ports/dcmtk/CONTROL
+++ b/ports/dcmtk/CONTROL
@@ -1,3 +1,3 @@
 Source: dcmtk
-Version: 3.6.3-1
+Version: 3.6.4
 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/dcmtk.patch b/ports/dcmtk/dcmtk.patch
index c25a8db7b..cca14e28e 100644
--- a/ports/dcmtk/dcmtk.patch
+++ b/ports/dcmtk/dcmtk.patch
@@ -1,15 +1,16 @@
-diff --git "a/CMake/dcmtkPrepare.cmake" "b/CMake/dcmtkPrepare.cmake"
---- a/CMake/dcmtkPrepare.cmake	2018-02-05 12:58:13.000000000 -0500
-+++ b/CMake/dcmtkPrepare.cmake	2018-04-25 15:07:12.927851000 -0400
-@@ -192,9 +192,9 @@
+diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake
+index e9f77b5..4f7ebe3 100644
+--- a/CMake/dcmtkPrepare.cmake
++++ b/CMake/dcmtkPrepare.cmake
+@@ -192,9 +192,9 @@ include(GNUInstallDirs)
  # CMake's files (DCMTKTarget.cmake, DCMTKConfigVersion.cmake and DCMTKConfig.cmake) are installed
  # to different installation paths under Unix- and Windows-based systems
- IF(UNIX)
--  SET(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk")
+ if(UNIX)
+-  set(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk")
 +  SET(DCMTK_INSTALL_CMKDIR "share/dcmtk")
- ELSEIF(WIN32)
--  SET(DCMTK_INSTALL_CMKDIR "cmake")
+ elseif(WIN32)
+-  set(DCMTK_INSTALL_CMKDIR "cmake")
 +  SET(DCMTK_INSTALL_CMKDIR "share/dcmtk")
- ENDIF(UNIX)
+ endif()
  
  #-----------------------------------------------------------------------------
diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake
index d11878a0e..cdf9b73e6 100644
--- a/ports/dcmtk/portfile.cmake
+++ b/ports/dcmtk/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DCMTK/dcmtk
-    REF DCMTK-3.6.3
-    SHA512 5863d0c05f046075b998bced7c8c71bf8e969dd366f26d48cdf26012ea744ae4a22784a5c3c12e12b0f188e997c93a6890ef0c3c336865ea93f13c45f70b258d
+    REF 1967b13134308f311e6a827e616958c6a4da5bc9
+    SHA512 a63a773e339081720adb0f3260a3b21ee11cde8009b321c3f45eeb40402ff29bd580926fb44f0dd784ba8369e2597933196bdaa324517d91fa5201b11b7504c0
     HEAD_REF master
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch
 )
diff --git a/ports/draco/CONTROL b/ports/draco/CONTROL
index afdeb1e6d..555c66d0a 100644
--- a/ports/draco/CONTROL
+++ b/ports/draco/CONTROL
@@ -1,4 +1,4 @@
 Source: draco
-Version: 1.3.3-2
+Version: 1.3.5
 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/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch
index 874ea7432..df0b1df22 100644
--- a/ports/draco/fix-compile-error-uwp.patch
+++ b/ports/draco/fix-compile-error-uwp.patch
@@ -1,30 +1,15 @@
-diff --git a/src/draco/core/symbol_coding_utils.h b/src/draco/core/symbol_coding_utils.h
-index be2183d..eaaca00 100644
---- a/src/draco/core/symbol_coding_utils.h
-+++ b/src/draco/core/symbol_coding_utils.h
-@@ -41,7 +41,9 @@ typename std::make_unsigned<IntTypeT>::type ConvertSignedIntToSymbol(
-   if (val >= 0) {
-     return static_cast<UnsignedType>(val) << 1;
-   }
--  val = -(val + 1);  // Map -1 to 0, -2 to -1, etc..
-+  // Map -1 to 0, -2 to -1, etc..
-+  val += 1;
-+  val *= -1;
-   UnsignedType ret = static_cast<UnsignedType>(val);
-   ret <<= 1;
-   ret |= 1;
-diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
-index 1aa52cc..cfbbdbd 100644
---- a/src/draco/io/parser_utils.cc
-+++ b/src/draco/io/parser_utils.cc
-@@ -150,7 +150,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
-   uint32_t v;
-   if (!ParseUnsignedInt(buffer, &v))
-     return false;
--  *value = (sign < 0) ? -v : v;
-+  if (sign < 0)
-+    v *= -1;
-+  *value = v;
-   return true;
- }
- 
+diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
+index 0a22ba1..9862949 100644
+--- a/src/draco/io/parser_utils.cc
++++ b/src/draco/io/parser_utils.cc
+@@ -150,7 +150,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
+   uint32_t v;
+   if (!ParseUnsignedInt(buffer, &v))
+     return false;
+-  *value = (sign < 0) ? -v : v;
++  if (sign < 0)
++    v *= -1;
++  *value = v;
+   return true;
+ }
+ 
diff --git a/ports/draco/fix-uwperror.patch b/ports/draco/fix-uwperror.patch
new file mode 100644
index 000000000..ff643103e
--- /dev/null
+++ b/ports/draco/fix-uwperror.patch
@@ -0,0 +1,13 @@
+diff --git a/src/draco/core/bit_utils.h b/src/draco/core/bit_utils.h
+index f63cd07..0f6baaf 100644
+--- a/src/draco/core/bit_utils.h
++++ b/src/draco/core/bit_utils.h
+@@ -26,6 +26,8 @@
+ #include <intrin.h>
+ #endif  // defined(_MSC_VER)
+ 
++#pragma warning(disable:4146)
++
+ namespace draco {
+ 
+ // Returns the number of '1' bits within the input 32 bit integer.
diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake
index 3486134fb..22d332f98 100644
--- a/ports/draco/portfile.cmake
+++ b/ports/draco/portfile.cmake
@@ -5,11 +5,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/draco
-    REF 1.3.3
-    SHA512 80ed5a623046822f5bb26b2454c8ee8cc93ffe9eb3012e8461cefdfc577b26d69a92ea0f0c5e14f5f48c1ef99f9a7263b01710df376792e74358ae14e49c3897
+    REF 1.3.5
+    SHA512 f99fcbec60fbd1683d8aacc35ff8ad9ee1c84374132ad4cc8c0f56662f5d33f940f89028cf3e577cde3314fd0766c124f61798121e4127e888f302e9efe1a004
     HEAD_REF master
     PATCHES
         fix-compile-error-uwp.patch
+		fix-uwperror.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL
index 9e0245aa9..024a7617b 100644
--- a/ports/ensmallen/CONTROL
+++ b/ports/ensmallen/CONTROL
@@ -1,4 +1,5 @@
 Source: ensmallen
-Version: 1.15.0-1
+Version: 1.15.1
 Description: A header-only C++ library for mathematical optimization.
 Build-Depends: openblas (!osx), clapack (!osx), armadillo
+
diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake
index e98be1863..edded904a 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.15.0
-    SHA512 4264bbba856e8fd4fb00d8a4e5f90d93b853d5358cea0ab7231f38d22af3b1e22b238af03edf292086937c16fe7575549d0a1e4fba1d49c85452ec1d3cc9f31a
+    REF 8bea8d214b40be3cb42e817328c0791541fbcd6c
+    SHA512 b075b763c136c1d2d5088c533a8557e3d425da7bcfeb3748063c1e3225e58969eddfc5bd786cb02f29f71ea5e3288327481a0961f64b1d2ff1251a0f59c07779
     HEAD_REF master
 	PATCHES
 		disable_tests.patch
diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL
index b381966b5..9585262b8 100644
--- a/ports/entityx/CONTROL
+++ b/ports/entityx/CONTROL
@@ -1,3 +1,4 @@
 Source: entityx
 Version: 1.3.0-1
-Description: EntityX - A fast, type-safe C++ Entity-Component system. <https://github.com/alecthomas/entityx>
+Description: EntityX - A fast, type-safe C++ Entity-Component system.
+Homepage: https://github.com/alecthomas/entityx
diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL
index 37f95a699..4ce029aef 100644
--- a/ports/entt/CONTROL
+++ b/ports/entt/CONTROL
@@ -1,3 +1,4 @@
 Source: entt
 Version: 3.0.0-1
-Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. <https://github.com/skypjack/entt>
+Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more.
+Homepage: https://github.com/skypjack/entt
diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL
index aa8696107..d51354d43 100644
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@@ -1,7 +1,8 @@
 Source: exiv2
 Version: 0.27
 Build-Depends: zlib, expat, libiconv, gettext
-Description: Image metadata library and tools http://www.exiv2.org
+Description: Image metadata library and tools
+Homepage: http://www.exiv2.org
 
 Feature: unicode
 Description: Compile with unicode support on windows
 \ No newline at end of file
diff --git a/ports/fastcdr/CONTROL b/ports/fastcdr/CONTROL
index 9076962c7..4d3dc062c 100644
--- a/ports/fastcdr/CONTROL
+++ b/ports/fastcdr/CONTROL
@@ -1,3 +1,3 @@
 Source: fastcdr
-Version: 1.0.6-2
+Version: 1.0.9-1
 Description: eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.
diff --git a/ports/fastcdr/install-cmake.patch b/ports/fastcdr/install-cmake.patch
index 0eff05063..04296897b 100644
--- a/ports/fastcdr/install-cmake.patch
+++ b/ports/fastcdr/install-cmake.patch
@@ -1,26 +1,13 @@
 diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 46d6f20..5d73ec5 100644
+index 14747c9..65c3ddb 100644
 --- a/src/cpp/CMakeLists.txt
 +++ b/src/cpp/CMakeLists.txt
-@@ -139,7 +139,12 @@ if(MSVC OR MSVC_IDE)
-             set(DIR_EXTENSION "/${MSVC_ARCH}")
-         endif()
+@@ -155,7 +155,7 @@ elseif(NOT EPROSIMA_INSTALLER)
+         COMPONENT cmake
+         )
  
--        install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static
-+        if(BUILD_SHARED_LIBS)
-+            set(PROJECT_TARGETS ${PROJECT_NAME})
-+        else()
-+            set(PROJECT_TARGETS ${PROJECT_NAME}_static)
-+        endif()
-+        install(TARGETS ${PROJECT_TARGETS}
-             EXPORT ${PROJECT_NAME}Targets
-             RUNTIME DESTINATION ${BIN_INSTALL_DIR}${DIR_EXTENSION}
-             LIBRARY DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}
-@@ -147,7 +152,6 @@ if(MSVC OR MSVC_IDE)
-             COMPONENT libraries_${MSVC_ARCH}
-             )
- 
--        export(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static FILE ${PROJECT_BINARY_DIR}/cmake/config/${PROJECT_NAME}Targets.cmake)
-         install(EXPORT ${PROJECT_NAME}Targets
-             DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}/${PROJECT_NAME}/cmake
-             COMPONENT cmake
+-    if(MSVC OR MSVC_IDE)
++    if(MSVC OR MSVC_IDE AND 0)
+         if(TARGET_TYPE STREQUAL "SHARED_LIBRARY")
+             # Install pdb files
+             install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Debug/
diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake
index c3b6967d9..f4f2f81f0 100644
--- a/ports/fastcdr/portfile.cmake
+++ b/ports/fastcdr/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eProsima/Fast-CDR
-    REF v1.0.6
-    SHA512 80861ff6a0283e1398306e081fe70d7d185f980e5714ae51864cae012b8f79719efa24e7f41025b2bfb2052cb2a3098436c75a38407f8f5a331593cb91868fb2
+    REF v1.0.9
+    SHA512 2825e61fc4736c9364fc3130f649798cec11fcb56dc5e202c17731121ad8a2795f0fbf8acb5d8d662181bc470e7a3e95a5027283872714be505bb2562c2e2312
     HEAD_REF master
     PATCHES install-cmake.patch
 )
@@ -19,17 +19,16 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/fastcdr/cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/fastcdr/cmake)
 
-file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" _contents)
-string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdrTargets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdrTargets.cmake)" _contents "${_contents}")
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" "${_contents}")
+file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" _contents)
+string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdr-targets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdr-targets.cmake)" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" "${_contents}")
 
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/lib/fastcdr ${CURRENT_PACKAGES_DIR}/debug/lib/fastcdr)
 
-# always build static and share library default
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(READ ${CURRENT_PACKAGES_DIR}/include/fastcdr/eProsima_auto_link.h EPROSIMA_AUTO_LINK_H)
     string(REPLACE "#define EPROSIMA_LIB_PREFIX \"lib\"" "#define EPROSIMA_LIB_PREFIX" EPROSIMA_AUTO_LINK_H "${EPROSIMA_AUTO_LINK_H}")
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index 037fcb975..ca28e399e 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.1-5
+Version: 4.1-6
 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.
 
@@ -27,6 +27,10 @@ Feature: bzip2
 Build-Depends: bzip2
 Description: bzip2 support in ffmpeg
 
+Feature: vpx
+Build-Depends: libvpx
+Description: WebM VP8/VP9 support in ffmpeg
+
 Feature: x264
 Build-Depends: x264, ffmpeg[gpl]
 Description: x264 support in ffmpeg
diff --git a/ports/ffmpeg/fix_libvpx_windows_linking.patch b/ports/ffmpeg/fix_libvpx_windows_linking.patch
new file mode 100644
index 000000000..805cd7e78
--- /dev/null
+++ b/ports/ffmpeg/fix_libvpx_windows_linking.patch
@@ -0,0 +1,55 @@
+diff --git "a/configure" "b/configure"
+index c8be177..2fef830 100644
+--- "a/configure"
++++ "b/configure"
+@@ -5098,6 +5098,8 @@ case "$arch" in
+     ;;
+ esac
+ 
++libvpx_name=vpx
++
+ # OS specific
+ case $target_os in
+     aix)
+@@ -5269,6 +5271,15 @@ case $target_os in
+         enabled x86_64 && objformat="win64" || objformat="win32"
+         ranlib=:
+         enable dos_paths
++        if [ -z "${extra_cflags##*-MDd*}" ]; then
++            libvpx_name=vpxmdd
++        elif [ -z "${extra_cflags##*-MD*}" ]; then
++            libvpx_name=vpxmd
++        elif [ -z "${extra_cflags##*-MTd*}" ]; then
++            libvpx_name=vpxmtd
++        elif [ -z "${extra_cflags##*-MT*}" ]; then
++            libvpx_name=vpxmt
++        fi
+         ;;
+     cygwin*)
+         target_os=cygwin
+@@ -6153,21 +6164,21 @@ enabled libvorbis         && require_pkg_config libvorbis vorbis vorbis/codec.h
+ enabled libvpx            && {
+     enabled libvpx_vp8_decoder && {
+         check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
+-            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
++            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -l$libvpx_name ||
+                 die "ERROR: libvpx decoder version must be >=1.4.0";
+     }
+     enabled libvpx_vp8_encoder && {
+         check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx ||
+-            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
++            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -l$libvpx_name ||
+                 die "ERROR: libvpx encoder version must be >=1.4.0";
+     }
+     enabled libvpx_vp9_decoder && {
+         check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx ||
+-            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
++            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs"
+     }
+     enabled libvpx_vp9_encoder && {
+         check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx ||
+-            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
++            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs"
+     }
+     if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
+         die "libvpx enabled but no supported decoders found"
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index c87da38c0..1ce53a996 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_extract_source_archive_ex(
         configure_opencv.patch
         fix_windowsinclude-in-ffmpegexe-1.patch
         fix_windowsinclude-in-ffmpegexe-2.patch
+        fix_libvpx_windows_linking.patch
 )
 
 if (${SOURCE_PATH} MATCHES " ")
@@ -94,6 +95,12 @@ else()
     set(OPTIONS "${OPTIONS} --disable-ffprobe")
 endif()
 
+if("vpx" IN_LIST FEATURES)
+    set(OPTIONS "${OPTIONS} --enable-libvpx")
+else()
+    set(OPTIONS "${OPTIONS} --disable-libvpx")
+endif()
+
 if("x264" IN_LIST FEATURES)
     set(OPTIONS "${OPTIONS} --enable-libx264")
 else()
diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL
index b5c027cda..4f4856c47 100644
--- a/ports/fizz/CONTROL
+++ b/ports/fizz/CONTROL
@@ -1,4 +1,4 @@
 Source: fizz
-Version: 2019.05.13.00
+Version: 2019.05.20.00
 Build-Depends: folly, openssl, libsodium, zlib
 Description: a TLS 1.3 implementation by Facebook
diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
index 3ebe020a9..0eb0f81bf 100644
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
-    REF v2019.05.13.00
-    SHA512 f1ce2a74ad0c06fb29b37bf02dce832ffc6581723e92f11bfde075307cb0d0e2000e686e48f2f77f07a8abc425a61c2621b7d1211551ee93867cb042f1100598
+    REF 6d26a1be8d7a20d8d89c374ee3dc5c452d18c18d
+    SHA512 bc6aa17a97fdfc53d0a247b876cbd1fea8214608b7e463dcf21e34df65015fe77e617c5a6c6bfa84b87e60e56b6aeb89aa2d8d774f97fc1f76f415869948a48a
     HEAD_REF master
     PATCHES find-zlib.patch
 )
diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL
index c0b505eed..432a2f877 100644
--- a/ports/flatbuffers/CONTROL
+++ b/ports/flatbuffers/CONTROL
@@ -1,4 +1,5 @@
 Source: flatbuffers
-Version: 1.10.0-1
-Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/
+Version: 1.11.0
+Description: Memory Efficient Serialization Library
  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.
+Homepage:  http://google.github.io/flatbuffers/
diff --git a/ports/flatbuffers/fix-uwp-build.patch b/ports/flatbuffers/fix-uwp-build.patch
new file mode 100644
index 000000000..7d8fe93a3
--- /dev/null
+++ b/ports/flatbuffers/fix-uwp-build.patch
@@ -0,0 +1,20 @@
+diff --git a/src/util.cpp b/src/util.cpp
+index c1bb197..658e116 100644
+--- a/src/util.cpp
++++ b/src/util.cpp
+@@ -239,9 +239,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) {
+   #ifdef _MSC_VER
+   __pragma(warning(disable : 4996)); // _CRT_SECURE_NO_WARNINGS
+   #endif
++#if _WIN32_WINNT < 0x0A00 
+   auto env_str = std::getenv(var_name);
+   if (!env_str) return false;
+   if (_value) *_value = std::string(env_str);
++#else
++  //There is no support for environment variables in UWP
++  var_name; // Do nothing
++  *_value = std::string("");
++#endif
+   return true;
+ }
+ 
diff --git a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch b/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
index 2205f0b37..38e1f12ec 100644
--- a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
+++ b/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3388dd..699ea3b 100644
+index 119855a..945085a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -104,7 +104,7 @@ set(FlatBuffers_GRPCTest_SRCS
+@@ -155,7 +155,7 @@ set(FlatBuffers_GRPCTest_SRCS
  # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS})
  # source_group(Tests FILES ${FlatBuffers_Tests_SRCS})
  
@@ -10,4 +10,4 @@ index a3388dd..699ea3b 100644
 +if(EXISTS "${CMAKE_TOOLCHAIN_FILE}" AND NOT DEFINED VCPKG_TOOLCHAIN)
    # do not apply any global settings if the toolchain
    # is being configured externally
- elseif(APPLE)
+   message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.")
diff --git a/ports/flatbuffers/no-werror.patch b/ports/flatbuffers/no-werror.patch
index 7c2d548b9..b354e229d 100644
--- a/ports/flatbuffers/no-werror.patch
+++ b/ports/flatbuffers/no-werror.patch
@@ -1,17 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3388dd..f0626e5 100644
+index 119855a..6269362 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -119,12 +119,16 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
+@@ -172,13 +172,17 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
        "${CMAKE_CXX_FLAGS} -std=c++0x")
    endif(CYGWIN)
    set(CMAKE_CXX_FLAGS
 -    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
-+    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
++	"${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
+   set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4)
      if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
        set(CMAKE_CXX_FLAGS
-         "${CMAKE_CXX_FLAGS} -faligned-new")
+         "${CMAKE_CXX_FLAGS} -faligned-new -Werror=implicit-fallthrough=2")
      endif()
 +    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
 +      set(CMAKE_CXX_FLAGS
@@ -20,4 +21,3 @@ index a3388dd..f0626e5 100644
      set(CMAKE_CXX_FLAGS
        "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter")
    endif()
-
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
index e055766b6..b954affe8 100644
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@@ -5,12 +5,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/flatbuffers
-    REF v1.10.0
-    SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2
+    REF v1.11.0
+    SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe
     HEAD_REF master
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/ignore_use_of_cmake_toolchain_file.patch
-        ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch
+        ignore_use_of_cmake_toolchain_file.patch
+        no-werror.patch
+		fix-uwp-build.patch
 )
 
 set(OPTIONS)
diff --git a/ports/fmilib/CONTROL b/ports/fmilib/CONTROL
index aa6b868d5..8d0a51f74 100644
--- a/ports/fmilib/CONTROL
+++ b/ports/fmilib/CONTROL
@@ -1,3 +1,4 @@
 Source: fmilib
 Version: 2.0.3-1
-Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0. See http://www.fmi-standard.org/
+Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.
+Homepage: http://www.fmi-standard.org/
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 1d673877f..c466edebb 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2019.05.13.00
+Version: 2019.05.20.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, boost-smart-ptr
 Default-Features: zlib
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index e77c084f6..7e7f40565 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -14,8 +14,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF v2019.05.13.00
-    SHA512 5dfeef0c2845b15e32a29119921d65e349a7ae9bcfa25c406d42d8df1614d2542153cd0ad8d0cf22592045b24272375a7839af91579d6be685cb8a3512586689
+    REF 354223ec1602913667c52cee1ce0782a82cb0cad
+    SHA512 53dd401e5fe8aebf35bec7c1b49e45a7abf152ad12f7392f31653f9e644207d0926424948ad2d7974bf3e5eabaa97e3e9113f1318883bfc99b968b3700b19023
     HEAD_REF master
     PATCHES
         missing-include-atomic.patch
diff --git a/ports/forge/CONTROL b/ports/forge/CONTROL
index f4317486e..595f6d2a2 100644
--- a/ports/forge/CONTROL
+++ b/ports/forge/CONTROL
@@ -1,4 +1,4 @@
 Source: forge
-Version: 1.0.3-1
+Version: 1.0.4-1
 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/forge/fix-static_build.patch b/ports/forge/fix-static_build.patch
new file mode 100644
index 000000000..67f498cd8
--- /dev/null
+++ b/ports/forge/fix-static_build.patch
@@ -0,0 +1,28 @@
+diff --git a/extern/glad/CMakeLists.txt b/extern/glad/CMakeLists.txt
+index c8c8d86..27adf86 100644
+--- a/extern/glad/CMakeLists.txt
++++ b/extern/glad/CMakeLists.txt
+@@ -2,15 +2,19 @@ add_library(forge_glad_interface INTERFACE)
+ 
+ target_include_directories(forge_glad_interface
+     INTERFACE
+-    ${CMAKE_CURRENT_SOURCE_DIR}/include
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+     )
+ 
+ target_sources(forge_glad_interface
+     INTERFACE
+-    ${CMAKE_CURRENT_SOURCE_DIR}/src/glad.c
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/glad.c>
+     )
+ 
+ target_link_libraries(forge_glad_interface
+     INTERFACE
+-    ${CMAKE_DL_LIBS}
++    $<BUILD_INTERFACE:${CMAKE_DL_LIBS}>
+     )
++
++if (NOT BUILD_SHARED_LIBS)
++    install(TARGETS forge_glad_interface EXPORT ForgeTargets)
++endif ()
+\ No newline at end of file
diff --git a/ports/forge/forge_targets_fix.patch b/ports/forge/forge_targets_fix.patch
deleted file mode 100644
index f2d8371d2..000000000
--- a/ports/forge/forge_targets_fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c7236a6..b4b910a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,64 +110,63 @@ install(DIRECTORY include/
-     PATTERN "*.h"
-     PATTERN "*.hpp"
-     PATTERN ".gitignore" EXCLUDE)
--# The Forge version header is generated and thus need to be
--# included explicitly
-+
- install(FILES ${Forge_BINARY_DIR}/include/fg/version.h
-     DESTINATION "${FG_INSTALL_INC_DIR}/fg/"
-     COMPONENT headers)
- 
--install(EXPORT ForgeTargets
--    NAMESPACE Forge::
--    DESTINATION ${FG_INSTALL_CMAKE_DIR}
--    COMPONENT forge)
--
--export(EXPORT ForgeTargets
--    NAMESPACE Forge::
--    FILE cmake/ForgeTargets.cmake)
-+# install the examples irrespective of the FG_BUILD_EXAMPLES value
-+# only the examples source files are installed, so the installation of these
-+# source files does not depend on FG_BUILD_EXAMPLES
-+# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without
-+# building the example executables
-+install(DIRECTORY examples/ #NOTE The slash at the end is important
-+    DESTINATION ${FG_INSTALL_EXAMPLE_DIR}
-+    COMPONENT examples)
- 
- include(CMakePackageConfigHelpers)
- write_basic_package_version_file(
--    "${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake"
-+    "${Forge_BINARY_DIR}/ForgeConfigVersion.cmake"
-     COMPATIBILITY SameMajorVersion)
- 
--# This config file will be installed so we need to set the install_destination
--# path relative to the install path
-+
-+# export install config file
- set(INCLUDE_DIRS include)
- set(CMAKE_DIR ${FG_INSTALL_CMAKE_DIR})
- configure_package_config_file(
--  "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
--  "cmake/install/ForgeConfig.cmake"
--  INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}"
--  PATH_VARS INCLUDE_DIRS CMAKE_DIR)
--
--install(FILES ${Forge_BINARY_DIR}/cmake/install/ForgeConfig.cmake
--    ${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake
-+    "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
-+    "cmake_install/ForgeConfig.cmake"
-+    INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}"
-+    PATH_VARS INCLUDE_DIRS CMAKE_DIR
-+)
-+install(FILES ${Forge_BINARY_DIR}/cmake_install/ForgeConfig.cmake
-+    ${Forge_BINARY_DIR}/ForgeConfigVersion.cmake
-     DESTINATION ${FG_INSTALL_CMAKE_DIR}
--    COMPONENT cmake)
-+    COMPONENT cmake
-+)
-+install(EXPORT ForgeTargets
-+    NAMESPACE Forge::
-+    DESTINATION ${FG_INSTALL_CMAKE_DIR}
-+    COMPONENT forge
-+)
- 
--# Following file will be used to create the config file for the build directory.
--# These config files will be used by the examples to find the Forge
--# libraries
-+
-+# export build tree targets config file
- set(INCLUDE_DIRS "${Forge_SOURCE_DIR}/include" "${Forge_BINARY_DIR}/include")
--set(CMAKE_DIR "${Forge_BINARY_DIR}/cmake")
-+set(CMAKE_DIR "${Forge_BINARY_DIR}")
- configure_package_config_file(
--  "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
--  "cmake/ForgeConfig.cmake"
--  INSTALL_DESTINATION "${Forge_BINARY_DIR}/cmake"
--  PATH_VARS INCLUDE_DIRS CMAKE_DIR
--  INSTALL_PREFIX "${Forge_BINARY_DIR}")
-+    "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
-+    "ForgeConfig.cmake"
-+    INSTALL_DESTINATION "${Forge_BINARY_DIR}"
-+    PATH_VARS INCLUDE_DIRS CMAKE_DIR
-+    INSTALL_PREFIX "${Forge_BINARY_DIR}"
-+)
-+export(EXPORT ForgeTargets
-+    NAMESPACE Forge::
-+    FILE ForgeTargets.cmake
-+)
-+#export(PACKAGE Forge)
- 
--#--------------------------------------------------------------------
--# Install examples
--#--------------------------------------------------------------------
--# install the examples irrespective of the FG_BUILD_EXAMPLES value
--# only the examples source files are installed, so the installation of these
--# source files does not depend on FG_BUILD_EXAMPLES
--# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without
--# building the example executables
--install(DIRECTORY examples/ #NOTE The slash at the end is important
--    DESTINATION ${FG_INSTALL_EXAMPLE_DIR}
--    COMPONENT examples)
- 
- include(CPackConfig)
- 
-@@ -177,4 +176,4 @@ conditional_directory(FG_BUILD_EXAMPLES examples)
- mark_as_advanced(
-     pkgcfg_lib_FontConfigPkg_freetype
-     pkgcfg_lib_FontConfigPkg_fontconfig
--    )
-+)
diff --git a/ports/forge/portfile.cmake b/ports/forge/portfile.cmake
index cd7c2ca54..24df90dce 100644
--- a/ports/forge/portfile.cmake
+++ b/ports/forge/portfile.cmake
@@ -4,18 +4,13 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     message(FATAL_ERROR "This port currently only supports x64 architecture")
 endif()
 
-set(PATCHES forge_targets_fix.patch)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    list(APPEND PATCHES static_build.patch)
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arrayfire/forge
-    REF v1.0.3
-    SHA512 e1a7688c1c3ab4659401463c5d025917b6e5766129446aefbebe0d580756cd2cc07256ddda9b20899690765220e5467b9209e00476c80ea6a51a1a0c0e9da616
+    REF 650bf611de102a2cc0c32dba7646f8128f0300c8
+    SHA512 2093464db0f3a7f0178f65bed37986a4df1117f1d7ad65157d525584490cdf234475f01ed1a2003a9e54bdc3b9e2e450808044a264c2284d67b8c2a353400027
     HEAD_REF master
-    PATCHES ${PATCHES}
+	PATCHES fix-static_build.patch
 )
 
 vcpkg_configure_cmake(
@@ -41,4 +36,4 @@ file(REMOVE_RECURSE
     ${DLLS}
 )
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forge RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/.github/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forge RENAME copyright)
diff --git a/ports/forge/static_build.patch b/ports/forge/static_build.patch
deleted file mode 100644
index 387811ce1..000000000
--- a/ports/forge/static_build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt
-index 1aeec1e..52eff05 100755
---- a/src/backend/opengl/CMakeLists.txt
-+++ b/src/backend/opengl/CMakeLists.txt
-@@ -142,7 +142,7 @@ install(TARGETS forge
-     INCLUDES DESTINATION ${FG_INSTALL_INC_DIR})
- 
- # install dependencies
--if (WIN32)
-+if (WIN32 AND BUILD_SHARED_LIBS)
-     if (FG_WITH_FREEIMAGE AND NOT FG_USE_STATIC_FREEIMAGE)
-         install(FILES $<TARGET_FILE:FreeImage::FreeImage>
-             DESTINATION ${FG_INSTALL_BIN_DIR}
-diff --git a/src/backend/opengl/glfw/CMakeLists.txt b/src/backend/opengl/glfw/CMakeLists.txt
-index caf4913..3c8d71c 100644
---- a/src/backend/opengl/glfw/CMakeLists.txt
-+++ b/src/backend/opengl/glfw/CMakeLists.txt
-@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS)
-     install(TARGETS forge_wtk_interface EXPORT ForgeTargets)
- endif ()
- 
--if (WIN32)
-+if (WIN32 AND BUILD_SHARED_LIBS)
-     install(FILES $<TARGET_FILE:glfw>
-     DESTINATION ${FG_INSTALL_BIN_DIR}
-     COMPONENT dependencies)
-diff --git a/src/backend/opengl/sdl/CMakeLists.txt b/src/backend/opengl/sdl/CMakeLists.txt
-index d8cd312..d55f27d 100644
---- a/src/backend/opengl/sdl/CMakeLists.txt
-+++ b/src/backend/opengl/sdl/CMakeLists.txt
-@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS)
-     install(TARGETS forge_wtk_interface EXPORT ForgeTargets)
- endif ()
- 
--if (WIN32)
-+if (WIN32 AND BUILD_SHARED_LIBS)
-     install(FILES $<TARGET_FILE:SDL2::SDL2>
-     DESTINATION ${FG_INSTALL_BIN_DIR}
-     COMPONENT dependencies)
diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL
index 7e18d1a7c..15c9caffd 100644
--- a/ports/freetype/CONTROL
+++ b/ports/freetype/CONTROL
@@ -1,4 +1,4 @@
 Source: freetype
-Version: 2.9.1-1
+Version: 2.9.1-2
 Build-Depends: zlib, bzip2, libpng
 Description: A library to render fonts.
diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake
index 73cb6b317..654cff2b9 100644
--- a/ports/freetype/portfile.cmake
+++ b/ports/freetype/portfile.cmake
@@ -70,7 +70,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
 else() #if(VCPKG_BUILD_TYPE STREQUAL "release")
     file(READ ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config.cmake CONFIG_MODULE)
 endif()
-string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include/freetype" CONFIG_MODULE "${CONFIG_MODULE}")
+string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include;\${_IMPORT_PREFIX}/include/freetype" CONFIG_MODULE "${CONFIG_MODULE}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config.cmake "${CONFIG_MODULE}")
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
diff --git a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch b/ports/ftgl/0001-fix-building-DLL-on-Windows.patch
deleted file mode 100644
index e9b8c52a5..000000000
--- a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b56270d28a59297518e91f85333a2e1a7fecdc9e Mon Sep 17 00:00:00 2001
-From: Juha Sointusalo <juha.sointusalo@gmail.com>
-Date: Thu, 13 Dec 2018 21:38:23 +0200
-Subject: [PATCH] fix building DLL on Windows
-
-Without FTGL_LIBRARY all symbols are declared to be imported instead of
-exported and linking the library fails.
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d6c5a57..6b230ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,6 +27,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
- OPTION(BUILD_SHARED_LIBS "Build Shared Libraries" ON)
- IF(BUILD_SHARED_LIBS)
-  	SET(LIB_TYPE SHARED)
-+	ADD_DEFINITIONS(-DFTGL_LIBRARY)
- ELSE(BUILD_SHARED_LIBS)
- 	SET(LIB_TYPE STATIC)
- 	ADD_DEFINITIONS(-D FTGL_LIBRARY_STATIC)
--- 
-2.18.0.windows.1
-
diff --git a/ports/ftgl/CONTROL b/ports/ftgl/CONTROL
index 2abfa8778..b8e652144 100644
--- a/ports/ftgl/CONTROL
+++ b/ports/ftgl/CONTROL
@@ -1,5 +1,5 @@
 Source: ftgl
-Version: 2.3.1
+Version: 2.4.0-1
 Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.
   Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.
   FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering.
diff --git a/ports/ftgl/Fix-headersFilePath.patch b/ports/ftgl/Fix-headersFilePath.patch
new file mode 100644
index 000000000..f3459352a
--- /dev/null
+++ b/ports/ftgl/Fix-headersFilePath.patch
@@ -0,0 +1,23 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 693e49f..c47ff3c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,9 +1,5 @@
+-
+-
+-
+ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cmake)
+ 
+-
+ ADD_DEFINITIONS(-DPACKAGE_VERSION="${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}")
+ 
+ IF(WIN32)
+@@ -26,7 +22,7 @@ SET(libftgl_la_SOURCES
+     FTGlyphContainer.h
+     FTInternals.h
+     FTLibrary.cpp
+-    FTLibrary.h
++    FTGL/FTLibrary.h
+     FTList.h
+     FTPoint.cpp
+     FTSize.cpp
diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake
index a8878af0f..65df89b20 100644
--- a/ports/ftgl/portfile.cmake
+++ b/ports/ftgl/portfile.cmake
@@ -1,12 +1,13 @@
 include(vcpkg_common_functions)
+vcpkg_find_acquire_program(DOXYGEN)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO frankheckenbach/ftgl
-    REF 2.3.1
-    SHA512 4c3c92e79371aa9048a0de6c27bd008036be19fe6179bce472f36ced359026aaeaa5b63c83f90ffc1d425dd2e587479efc700dc1082c2ed0189d16ea87838c9a
+    REF 483639219095ad080538e07ceb5996de901d4e74
+    SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f
     HEAD_REF master
-    PATCHES "0001-fix-building-DLL-on-Windows.patch"
+    PATCHES Fix-headersFilePath.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/g2o/CONTROL b/ports/g2o/CONTROL
index 9bc511479..f27951611 100644
--- a/ports/g2o/CONTROL
+++ b/ports/g2o/CONTROL
@@ -1,4 +1,5 @@
 Source: g2o
 Version: 20170730_git-4
 Build-Depends: suitesparse, eigen3, clapack (!osx), ceres
-Description: g2o: A General Framework for Graph Optimization http://openslam.org/g2o.html
+Description: g2o: A General Framework for Graph Optimization
+Homepage: http://openslam.org/g2o.html
diff --git a/ports/getopt-win32/CONTROL b/ports/getopt-win32/CONTROL
index d80fa0b00..ba14d4909 100644
--- a/ports/getopt-win32/CONTROL
+++ b/ports/getopt-win32/CONTROL
@@ -1,3 +1,4 @@
 Source: getopt-win32
 Version: 0.1
-Description: An implementation of getopt provided by https://github.com/libimobiledevice-win32
+Description: An implementation of getopt.
+Homepage: https://github.com/libimobiledevice-win32
diff --git a/ports/gherkin-c/CONTROL b/ports/gherkin-c/CONTROL
index 171dedae0..b25786ca3 100644
--- a/ports/gherkin-c/CONTROL
+++ b/ports/gherkin-c/CONTROL
@@ -1,3 +1,3 @@
 Source: gherkin-c
-Version: c-libs-e63e83104b
+Version: 4.1.2
 Description: Gherkin parser/compiler in C 
diff --git a/ports/gherkin-c/portfile.cmake b/ports/gherkin-c/portfile.cmake
index f229ba836..453387f5f 100644
--- a/ports/gherkin-c/portfile.cmake
+++ b/ports/gherkin-c/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO c-libs/gherkin-c
-    REF e63e83104b835e217140e9dc77d9ce2bb50f234e
-    SHA512 a99b3f695257b45df8ff7b8ec46bff28991cf2b9bc51a25247550471c724bd14ee64340db684f096131f47d7f4ff278d23dda546e7dfe29134bbc1dbccaf0d1e
+    REF 8f31c2ff6a7b58196a061c8847508563679f67b3
+    SHA512 f78a1f9da7ff38fe2546e0db9ed33a2e25e12aa8a407ce827933a379ce083e6f872b39eb2321ff8c35199015c3c2299e46567171c5edfeff07600765f3f0a6ec
     HEAD_REF master
 )
 
diff --git a/ports/glad/CONTROL b/ports/glad/CONTROL
index 5d041c0a0..98a427195 100644
--- a/ports/glad/CONTROL
+++ b/ports/glad/CONTROL
@@ -1,4 +1,4 @@
 Source: glad
-Version: 0.1.29
+Version: 0.1.30
 Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.
 Build-Depends: egl-registry, opengl-registry
diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake
index 252109b8f..eb1a226e9 100644
--- a/ports/glad/portfile.cmake
+++ b/ports/glad/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Dav1dde/glad
-    REF v0.1.29
-    SHA512 056c0439b673d86bd10fe733873d4b82cf70861818980f08b3ec23f7b478750064a6d53925cc2cf9445e570cece5f21e12d7af6f1927b64af05d8d1f2afdedcb
+    REF v0.1.30
+    SHA512 2db0f75e5859be039bf4dcbea239dd6d35bdc92e69912e807dfacdb01581c73b6a5eb0f0889f2ffcd705415abe5f28cf204b4010d08f5477b51c0ce3ae6a35b5
     HEAD_REF master
 )
 
diff --git a/ports/gli/CONTROL b/ports/gli/CONTROL
index 521a79120..6ba55d18d 100644
--- a/ports/gli/CONTROL
+++ b/ports/gli/CONTROL
@@ -1,4 +1,5 @@
 Source: gli
 Version: dd17acf
 Build-Depends: glm
-Description: OpenGL Image (GLI) https://gli.g-truc.net
+Description: OpenGL Image (GLI)
+Homepage: https://gli.g-truc.net
diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL
index ead483418..f17df43e1 100644
--- a/ports/glibmm/CONTROL
+++ b/ports/glibmm/CONTROL
@@ -1,4 +1,5 @@
 Source: glibmm
 Version: 2.52.1-9
-Description: This is glibmm, a C++ API for parts of glib that are useful for C++. See http://www.gtkmm.org.
+Description: This is glibmm, a C++ API for parts of glib that are useful for C++.
+Homepage: http://www.gtkmm.org.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp
diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL
index 3bea7f0ed..ccf64caa1 100644
--- a/ports/glm/CONTROL
+++ b/ports/glm/CONTROL
@@ -1,3 +1,4 @@
 Source: glm
 Version: 0.9.9.5-3
-Description: OpenGL Mathematics (GLM) https://glm.g-truc.net
+Description: OpenGL Mathematics (GLM)
+Homepage: https://glm.g-truc.net
diff --git a/ports/globjects/CONTROL b/ports/globjects/CONTROL
index e05b2393f..fb9ca9a1f 100644
--- a/ports/globjects/CONTROL
+++ b/ports/globjects/CONTROL
@@ -2,4 +2,5 @@ Source: globjects
 Maintainer: mattias@mattiascibien.net
 Version: 1.1.0-2018-09-19-1
 Build-Depends: glbinding, glm
-Description: C++ library strictly wrapping OpenGL objects. <https://github.com/cginternals/globjects>
+Description: C++ library strictly wrapping OpenGL objects.
+Homepage: https://github.com/cginternals/globjects
diff --git a/ports/grpc/00003-undef-base64-macro.patch b/ports/grpc/00003-undef-base64-macro.patch
index 8417e3eea..193b1fd38 100644
--- a/ports/grpc/00003-undef-base64-macro.patch
+++ b/ports/grpc/00003-undef-base64-macro.patch
@@ -1,13 +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/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
+index 29c1e56..29de9d8 100644
+--- a/src/core/lib/transport/transport.cc
++++ b/src/core/lib/transport/transport.cc
+@@ -96,6 +96,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
+       refcount, &refcount->slice_refcount);
+ }
+ 
++#undef move64
++
+ static void move64(uint64_t* from, uint64_t* to) {
+   *to += *from;
+   *from = 0;
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index c2ce84cc2..4c73364c5 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,4 +1,4 @@
 Source: grpc
-Version: 1.20.1-1
+Version: 1.21.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 e8576d533..e97082ede 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -13,8 +13,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
-    REF v1.20.1
-    SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
+    REF 75475f090875e737ad6909a6057c59577f0c79b1
+    SHA512 db9ff82dee38cb0f4ba10874d10bf6cb20c8a4d49e7dd24bcd9f71388c54c782ee12fda6f1bfedd79ad988b0275d3f96df4686217465acfafcfb5e4c30093a5b
     HEAD_REF master
     PATCHES 
         00001-fix-uwp.patch
diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL
index 6ec2cea9b..19939c95a 100644
--- a/ports/hdf5/CONTROL
+++ b/ports/hdf5/CONTROL
@@ -1,5 +1,5 @@
 Source: hdf5
-Version: 1.10.5-5
+Version: 1.10.5-6
 Description: HDF5 is a data model, library, and file format for storing and managing data
 Build-Depends: zlib, szip
 
diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake
index cb1541fed..593b38abf 100644
--- a/ports/hdf5/portfile.cmake
+++ b/ports/hdf5/portfile.cmake
@@ -33,6 +33,7 @@ endif()
 #Note: HDF5 Builds by default static as well as shared libraries. Set BUILD_SHARED_LIBS to OFF to only get static libraries
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS)
 
+file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     DISABLE_PARALLEL_CONFIGURE
@@ -50,6 +51,7 @@ vcpkg_configure_cmake(
         -DHDF5_INSTALL_CMAKE_DIR=share
 )
 
+
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
diff --git a/ports/hdf5/vcpkg-cmake-wrapper.cmake b/ports/hdf5/vcpkg-cmake-wrapper.cmake
index 96d8a53c9..695befcdc 100644
--- a/ports/hdf5/vcpkg-cmake-wrapper.cmake
+++ b/ports/hdf5/vcpkg-cmake-wrapper.cmake
@@ -6,8 +6,10 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
         # The caller hasn't said "CONFIG", so they want the built-in FindHDF5.cmake behavior. Set configurations macros to ensure the built-in script finds us.
         if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
             set(HDF5_USE_STATIC_LIBRARIES ON)
+            add_compile_definitions(H5_BUILT_AS_STATIC_LIB)
         else()
             set(HDF5_USE_STATIC_LIBRARIES OFF)
+            add_compile_definitions(H5_BUILT_AS_DYNAMIC_LIB)
         endif()
     endif()
     cmake_policy(POP)
diff --git a/ports/hedley/CONTROL b/ports/hedley/CONTROL
new file mode 100644
index 000000000..08b5e02b1
--- /dev/null
+++ b/ports/hedley/CONTROL
@@ -0,0 +1,3 @@
+Source: hedley
+Version: 2019-05-08-1
+Description: A C/C++ header to help move #ifdefs out of your code
diff --git a/ports/hedley/portfile.cmake b/ports/hedley/portfile.cmake
new file mode 100644
index 000000000..e06e9630a
--- /dev/null
+++ b/ports/hedley/portfile.cmake
@@ -0,0 +1,19 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nemequ/hedley
+    REF 1b74d9bc892137b3f006d04ff905098b900116d0
+    SHA512 8f3e4fc081fb33cc3a3d637eb09863e80fa94b5e46ecf6507aabe6a5b0648881a96c8cf2ef01b4146ecd3a14908ef87f3204960514af6c91d00c93bea18eda41
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/hedley.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+file(STRINGS ${SOURCE_PATH}/hedley.h SOURCE_LINES)
+# Capture more lines than required to handle future license file changes
+list(SUBLIST SOURCE_LINES 0 30 SOURCE_LINES)
+list(JOIN SOURCE_LINES "\n" _contents)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}")
diff --git a/ports/immer/CONTROL b/ports/immer/CONTROL
new file mode 100644
index 000000000..f6f736b59
--- /dev/null
+++ b/ports/immer/CONTROL
@@ -0,0 +1,3 @@
+Source: immer
+Version: 2019-06-07
+Description: Postmodern immutable and persistent data structures for C++
diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake
new file mode 100644
index 000000000..da2a40bad
--- /dev/null
+++ b/ports/immer/portfile.cmake
@@ -0,0 +1,29 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO arximboldi/immer
+    REF fe1d5151f8e62a97a953664f8de39b05ac0d2031
+    SHA512 2f78c2d85a24b2bcb69bbbf8b038c8bacb5a841e0f0ce7e4e521d369423c7d44f803a1c766a77d0955246a1b22476de15fa708a3786f05c41a3b705a574bbb71
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DENABLE_PYTHON=OFF
+        -DENABLE_GUILE=OFF
+        -DENABLE_BOOST_COROUTINE=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Immer)
+
+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/inih/CONTROL b/ports/inih/CONTROL
index 22721b8ae..22c519e21 100644
--- a/ports/inih/CONTROL
+++ b/ports/inih/CONTROL
@@ -1,3 +1,3 @@
 Source: inih
-Version: 43
+Version: 44
 Description: Simple .INI file parser
diff --git a/ports/inih/portfile.cmake b/ports/inih/portfile.cmake
index 75e538ae3..a0a34d77f 100644
--- a/ports/inih/portfile.cmake
+++ b/ports/inih/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO benhoyt/inih
-    REF r43
-    SHA512 4ad87d69b033886d170257174f0dd97c475f86e311b875bbaf6835e5c4c5c0d98d788702b3880a0befb304f5440ee61de3ea1948f1432198949265013f4146e4
+    REF b1dbff4b0bd1e1f40d237e21011f6dee0ec2fa69
+    SHA512 b250a7d2a9a1a18793a5f7421d444cbf92c21f1aca5f767781221e2e64b0ba5e0804e82c3f8e4f2c0e08516f4ddbf1533e4d254c557bfb38d9a0da879b98cffb
     HEAD_REF master
 )
 
diff --git a/ports/ismrmrd/CONTROL b/ports/ismrmrd/CONTROL
index 3725293f7..7f7c26ef7 100644
--- a/ports/ismrmrd/CONTROL
+++ b/ports/ismrmrd/CONTROL
@@ -1,4 +1,4 @@
 Source: ismrmrd
-Version: 1.4
+Version: 1.4.0
 Description: ISMRM Raw Data Format
 Build-Depends: pugixml, hdf5
diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake
index 2422752ea..7427cb1b2 100644
--- a/ports/ismrmrd/portfile.cmake
+++ b/ports/ismrmrd/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ismrmrd/ismrmrd
-    REF 0d05ad0cf0b09adb975566ff6a817a01d69f4325 
-    SHA512 7127658c3339ca3022a61093fb037aa02ac0cec4885e03657935dc41bc7266e74b437108cd0a9455c91bc74bdbb6e3a182752effca3564a36d3ddc29d3972496 
+    REF 4d4004d91ccadd41ddb30b019f970a69bb23a1bc
+    SHA512 648901de4629c8b11574894763a5fa61a3cb0420c5aa62cdff02c4641ba702ca73efba12b403076301e44a4f0a7c915da1f2c7a34b24377d0385af92f2eda892 
     HEAD_REF master
     PATCHES
         ${WIN32_INCLUDE_STDDEF}
diff --git a/ports/jansson/CONTROL b/ports/jansson/CONTROL
index 6050b464d..ec808a999 100644
--- a/ports/jansson/CONTROL
+++ b/ports/jansson/CONTROL
@@ -1,3 +1,3 @@
 Source: jansson
-Version: 2.11-2
+Version: 2.12
 Description: Jansson is a C library for encoding, decoding and manipulating JSON data
diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake
index e243422fb..b6f3caef0 100644
--- a/ports/jansson/portfile.cmake
+++ b/ports/jansson/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO akheron/jansson
-  REF v2.11
-  SHA512 5dd94951e1aedd3f3a9ab6a43170d2395ec70c5a00e6da58538816b2dcd98835fc4ca43ab1e9b78864c01e48075505573f4f8d1da5c9d2c094622518d19525e8
+  REF 71c4e8ec215afa225ac20eed269a14963cd37b50
+  SHA512 cdb955996768d6c7ed15b9f1bb7ddf4905f881c4e604d9e7a863f42c513eaaa9fb8799dacfa392424fbf725aac125d4716e10c44c3415449b5c5edd38a87b290
   HEAD_REF master
 )
 
diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL
index 65b8419e6..8c534ca82 100644
--- a/ports/kd-soap/CONTROL
+++ b/ports/kd-soap/CONTROL
@@ -1,4 +1,5 @@
 Source: kd-soap
-Version: 1.7.0
-Description: A Qt-based client-side and server-side SOAP component http://www.kdab.com/products/kd-soap
+Version: 1.8.0
+Description: A Qt-based client-side and server-side SOAP component
+Homepage: http://www.kdab.com/products/kd-soap
 Build-Depends: qt5-base
diff --git a/ports/kd-soap/kd-saop.patch b/ports/kd-soap/kd-soap.patch
index 975a1c9f7..d48050faf 100644
--- a/ports/kd-soap/kd-saop.patch
+++ b/ports/kd-soap/kd-soap.patch
@@ -1,12 +1,12 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c3c824e..d7a1cce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -168,6 +168,6 @@ if(${PROJECT_NAME}_IS_ROOT_PROJECT)
-     enable_testing()
-     add_subdirectory(testtools)
-     add_subdirectory(unittests)
-+    add_subdirectory(examples)
-   endif()
--  add_subdirectory(examples)
- endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c3c824e..d7a1cce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -168,6 +168,6 @@ if(${PROJECT_NAME}_IS_ROOT_PROJECT)
+     enable_testing()
+     add_subdirectory(testtools)
+     add_subdirectory(unittests)
++    add_subdirectory(examples)
+   endif()
+-  add_subdirectory(examples)
+ endif()
diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake
index 2b49d114e..61102836c 100644
--- a/ports/kd-soap/portfile.cmake
+++ b/ports/kd-soap/portfile.cmake
@@ -3,15 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDAB/KDSoap
-    REF 66a7804f157f51bc62c193b63a28918236bd7424
-    SHA512 e9e2ac3ef714ebd5a85972c0eed613f88cc36f213df4fb938d61b58947972524f26f54a226f8e28ce47385cd859030a560781b4aebe3a25e672ac82b5477eeb8
+    REF kdsoap-1.8.0
+    SHA512 e118f2083887d1b5d613d793e87ec23a570a8a749ef7f4de65582998b735979b4c389a939169a893d735bdf110dc84a4cca5ee38146e4009be715902f6323bb9
     HEAD_REF master
+    PATCHES kd-soap.patch
 )
-vcpkg_apply_patches(
-    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/8236bd7424-79789c62ed
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/kd-saop.patch"
-)
-
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/lcm/CONTROL b/ports/lcm/CONTROL
index 0cca68404..2621e23c5 100644
--- a/ports/lcm/CONTROL
+++ b/ports/lcm/CONTROL
@@ -1,5 +1,5 @@
 Source: lcm
-Version: 1.3.95-1
+Version: 1.4.0
 Build-Depends: glib
 Description: Lightweight Communications and Marshalling (LCM)
   LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages.
diff --git a/ports/lcm/fix-build-error.patch b/ports/lcm/fix-build-error.patch
new file mode 100644
index 000000000..ffca33d79
--- /dev/null
+++ b/ports/lcm/fix-build-error.patch
@@ -0,0 +1,32 @@
+diff --git a/lcm/windows/WinPorting.cpp b/lcm/windows/WinPorting.cpp
+index e22acd6..b9c7e69 100644
+--- a/lcm/windows/WinPorting.cpp
++++ b/lcm/windows/WinPorting.cpp
+@@ -1,8 +1,8 @@
+ 
+ #define _WIN32_WINNT 0x0501
+-#include <Mswsock.h>
+ #include <stdio.h>
+ #include <winsock2.h>
++#include <Mswsock.h>
+ 
+ #include "WinPorting.h"
+ 
+diff --git a/lcmgen/emit_go.c b/lcmgen/emit_go.c
+index c520044..b5be56a 100644
+--- a/lcmgen/emit_go.c
++++ b/lcmgen/emit_go.c
+@@ -6,8 +6,13 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef WIN32
++#include <io.h>
++#else
+ #include <unistd.h>
++#endif
+ #ifdef WIN32
++#define F_OK 0
+ #define __STDC_FORMAT_MACROS  // Enable integer types
+ #endif
+ 
diff --git a/ports/lcm/portfile.cmake b/ports/lcm/portfile.cmake
index b50139f62..ef1633d84 100644
--- a/ports/lcm/portfile.cmake
+++ b/ports/lcm/portfile.cmake
@@ -3,14 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lcm-proj/lcm
-    REF 82bd3a223e3227c70832307e53a65c13c1e5f81b
-    SHA512 5d3abf457e18a3bb50489ed17393c5416a459134f73c264e67d174a29411d6deb70c754b5669422a438ea3e5793b9b1b91d67e9d842151c5a910245fede5879f
+    REF v1.4.0
+    SHA512 ca036aa2c31911e0bfaeab9665188c97726201267314693a1c333c4efe13ea598b39a55a19bc1d48e65462ac9d1716adfda5af86c645d59c3247192631247cc6
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/only-install-one-flavor.patch
+    PATCHES only-install-one-flavor.patch
+            fix-build-error.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL
index 55a90bea5..71ba1a4c9 100644
--- a/ports/libgit2/CONTROL
+++ b/ports/libgit2/CONTROL
@@ -1,4 +1,4 @@
 Source: libgit2
-Version: 0.28.1
+Version: 0.28.2
 Build-Depends: openssl (!windows&&!uwp)
 Description: Git linkable library
diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake
index 3516788b7..711da201e 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.28.1
-    SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647
+    REF b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3
+    SHA512 2a992759c0892300eff6d4e823367e2cfc5bcaa6e37a0e87de45a16393c53ccd286f47f37d38c104e79eed8688b9834ada00000b2d6894f89773f75c83e23022
     HEAD_REF master
 )
 
diff --git a/ports/libics/CONTROL b/ports/libics/CONTROL
index 5f98c9614..115540291 100644
--- a/ports/libics/CONTROL
+++ b/ports/libics/CONTROL
@@ -1,3 +1,3 @@
 Source: libics
-Version: 1.6.2
+Version: 1.6.3
 Description: Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject.
 \ No newline at end of file
diff --git a/ports/libics/portfile.cmake b/ports/libics/portfile.cmake
index 9bcf997ed..f0d27363a 100644
--- a/ports/libics/portfile.cmake
+++ b/ports/libics/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO svi-opensource/libics
-    REF 8d8d2dbe72450cbaf88080b6c0e24a7a4a58009e 
-    SHA512 739668b4d51ddb67d50ed1d41bd6965b90b5e4eafc7ec19e2f1d668f48af6e237f6a1872673e3fec5888efe94c2b321295c4de9502aba1f677fc6d0e0399c141
+    REF b9532b738ad7f17569dfcaae74eb53d3c2959394
+    SHA512 a7c0d89125570021494feaf0a187e3a1695e92c85a03d59ac9729618cdddb2ae13af94e4ce93241acbbb9d28465f75297bf03f2c46061bb7a0bba7ec28a23da4
     HEAD_REF master
     PATCHES
         cmakelists.patch
diff --git a/ports/libimobiledevice/CONTROL b/ports/libimobiledevice/CONTROL
index b6d3c2960..0a6a21bf8 100644
--- a/ports/libimobiledevice/CONTROL
+++ b/ports/libimobiledevice/CONTROL
@@ -1,4 +1,4 @@
 Source: libimobiledevice
-Version: 1.2.1.215-1
+Version: 1.2.76
 Description: A cross-platform protocol library to communicate with iOS devices
 Build-Depends: libplist, libusbmuxd, openssl, dirent, getopt
 \ No newline at end of file
diff --git a/ports/libimobiledevice/portfile.cmake b/ports/libimobiledevice/portfile.cmake
index 4bc505163..f91cad8cc 100644
--- a/ports/libimobiledevice/portfile.cmake
+++ b/ports/libimobiledevice/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libimobiledevice-win32/libimobiledevice
-    REF 1.2.1.215
-    SHA512 192ac12eb4fdf518a934cb8061d4a40e48f483e969e34167f2a5346efac1d745e4041eff84d7175d106b1a3b3f806d5e69643daa1459e48e69bc9c38d722be3c
+    REF d6b24aae971b990d2777a88ec3a1e31b40d6152f
+    SHA512 75e45162fecd80464846ff51c9b3e722017f738de8f6b55e9f41f5eadcd93730b12512087d427badbc0c2b54a76a66359a472ab5bc5be5fa02826db1171565d0
     HEAD_REF msvc-master
 )
 
diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL
index a3ee5e4bb..fca490542 100644
--- a/ports/libjpeg-turbo/CONTROL
+++ b/ports/libjpeg-turbo/CONTROL
@@ -1,3 +1,3 @@
 Source: libjpeg-turbo
-Version: 2.0.1-1
+Version: 2.0.2
 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 af82c77b8..ceb90b51d 100644
--- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
+++ b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
@@ -1,238 +1,248 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index efeb51a..5c7d829 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,6 +147,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
- boolean_number(ENABLE_SHARED)
- option(ENABLE_STATIC "Build static 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()
- 
--    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 md5/md5.c md5/md5hl.c)
-+      target_link_libraries(tjunittest turbojpeg)
- 
--    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)
-@@ -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 md5/md5.c
--      md5/md5hl.c)
--    target_link_libraries(tjunittest-static turbojpeg-static)
-+    if(ENABLE_EXECUTABLES)
-+      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 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()
-@@ -639,7 +649,7 @@ else()
-   set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
- endif()
- 
--if(ENABLE_STATIC)
-+if(ENABLE_STATIC AND ENABLE_EXECUTABLES)
-   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})
-@@ -655,9 +665,11 @@ if(ENABLE_STATIC)
-   set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
- endif()
- 
--add_executable(rdjpgcom rdjpgcom.c)
-+if(ENABLE_EXECUTABLES)
-+  add_executable(rdjpgcom rdjpgcom.c)
- 
--add_executable(wrjpgcom wrjpgcom.c)
-+  add_executable(wrjpgcom wrjpgcom.c)
-+endif()
- 
- 
- ###############################################################################
-@@ -1326,26 +1338,32 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
- 
- if(WITH_TURBOJPEG)
-   if(ENABLE_SHARED)
--    install(TARGETS turbojpeg tjbench
-+    install(TARGETS turbojpeg
-       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+    if(ENABLE_EXECUTABLES)
-+      install(TARGETS tjbench
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+    endif()
-   endif()
-   if(ENABLE_STATIC)
-     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 ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
-     endif()
-   endif()
--  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+  if(INSTALL_HEADERS)
-+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
-+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+  endif()
- endif()
- 
- if(ENABLE_STATIC)
-   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 ${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 ${CMAKE_INSTALL_BINDIR})
-+if(ENABLE_EXECUTABLES)
-+  install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+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})
-+if(INSTALL_DOCS)
-+  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()
- 
--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_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()
- 
- include(cmakescripts/BuildPackages.cmake)
- 
-diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
-index 2bab832..afbb56a 100755
---- a/sharedlib/CMakeLists.txt
-+++ b/sharedlib/CMakeLists.txt
-@@ -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
--  ../rdswitch.c ${CJPEG_BMP_SOURCES})
--set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
--target_link_libraries(cjpeg jpeg)
-+if(ENABLE_EXECUTABLES)
-+  add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
-+    ../rdswitch.c ${CJPEG_BMP_SOURCES})
-+  set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-+  target_link_libraries(cjpeg jpeg)
- 
--add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
--  ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES})
--set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
--target_link_libraries(djpeg jpeg)
-+  add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
-+    ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES})
-+  set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-+  target_link_libraries(djpeg jpeg)
- 
--add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
--target_link_libraries(jpegtran jpeg)
--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 "${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 ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b9d2d40..c868862 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -143,6 +143,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
+ boolean_number(ENABLE_SHARED)
+ option(ENABLE_STATIC "Build static 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,18 +599,20 @@ if(WITH_TURBOJPEG)
+         LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
+     endif()
+ 
+-    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 md5/md5.c md5/md5hl.c)
++      target_link_libraries(tjunittest turbojpeg)
+ 
+-    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)
+-  endif()
++      add_executable(tjexample tjexample.c)
++        target_link_libraries(tjexample turbojpeg)
++    endif()
++   endif()
+ 
+   if(ENABLE_STATIC)
+     add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS: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 md5/md5.c
+-      md5/md5hl.c)
+-    target_link_libraries(tjunittest-static turbojpeg-static)
++    if(ENABLE_EXECUTABLES)
++      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 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()
+@@ -639,7 +649,7 @@ else()
+   set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
+ endif()
+ 
+-if(ENABLE_STATIC)
++if(ENABLE_STATIC AND ENABLE_EXECUTABLES)
+   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})
+@@ -655,9 +665,10 @@ 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)
++endif()
+ 
+ 
+ ###############################################################################
+@@ -1328,10 +1339,14 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
+ 
+ if(WITH_TURBOJPEG)
+   if(ENABLE_SHARED)
+-    install(TARGETS turbojpeg tjbench
++    install(TARGETS turbojpeg
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++    if(ENABLE_EXECUTABLES)
++      install(TARGETS tjbench
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++    endif()
+     if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
+       CMAKE_C_LINKER_SUPPORTS_PDB)
+       install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
+@@ -1341,7 +1356,7 @@ if(WITH_TURBOJPEG)
+   if(ENABLE_STATIC)
+     install(TARGETS turbojpeg-static ARCHIVE
+       DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-    if(NOT ENABLE_SHARED)
++    if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
+       if(MSVC_IDE)
+         set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
+       else()
+@@ -1351,13 +1366,15 @@ if(WITH_TURBOJPEG)
+         DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
+     endif()
+   endif()
+-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
+-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++  if(INSTALL_HEADERS)
++    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
++      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++  endif()
+ endif()
+ 
+ if(ENABLE_STATIC)
+   install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-  if(NOT ENABLE_SHARED)
++  if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
+     if(MSVC_IDE)
+       set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
+     else()
+@@ -1372,21 +1389,25 @@ if(ENABLE_STATIC)
+   endif()
+ endif()
+ 
+-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++if(ENABLE_EXECUTABLES)
++  install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++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})
++if(INSTALL_DOCS)
++  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()
+ 
+-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
+@@ -1397,10 +1418,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_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()
+ 
+ include(cmakescripts/BuildPackages.cmake)
+ 
+diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
+index a5c4e39..794c2af 100644
+--- a/sharedlib/CMakeLists.txt
++++ b/sharedlib/CMakeLists.txt
+@@ -71,27 +71,35 @@ else()
+   set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
+ endif()
+ 
+-add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
+-  ../rdswitch.c ${CJPEG_BMP_SOURCES})
+-set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
+-target_link_libraries(cjpeg jpeg)
++if(ENABLE_EXECUTABLES)
++  add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
++    ../rdswitch.c ${CJPEG_BMP_SOURCES})
++  set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
++  target_link_libraries(cjpeg jpeg)
+ 
+-add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
+-  ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES})
+-set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
+-target_link_libraries(djpeg jpeg)
++  add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
++    ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES})
++  set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
++  target_link_libraries(djpeg jpeg)
+ 
+-add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
+-target_link_libraries(jpegtran jpeg)
+-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 "${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 ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++endif()
+ if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
+   CMAKE_C_LINKER_SUPPORTS_PDB)
+   install(FILES "$<TARGET_PDB_FILE:jpeg>"
diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake
index 1e1f6ca42..a4fbb5b66 100644
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libjpeg-turbo/libjpeg-turbo
-    REF 2.0.1
-    SHA512 d456515dcda7c5e2e257c9fd1441f3a5cff0d33281237fb9e3584bbec08a181c4b037947a6f87d805977ec7528df39b12a5d32f6e8db878a62bcc90482f86e0e
+    REF 2.0.2
+    SHA512 4dcde37ba014500cee69f7d49b359112655c177cf2c0003b4693bfe25f8a55147e9a87f58d31b4fc952a7faed6fecd5087220fd879110ade326922991f11c423
     HEAD_REF master
     PATCHES
         add-options-for-exes-docs-headers.patch
@@ -54,6 +54,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     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")
+    
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
     endif()
 else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib")
@@ -66,12 +68,21 @@ file(COPY
     ${SOURCE_PATH}/LICENSE.md
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo
 )
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/copyright)
-vcpkg_copy_pdbs()
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jpeg)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
 
+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()
+
+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(RENAME ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/copyright)
+
+vcpkg_copy_pdbs()
+
 vcpkg_test_cmake(PACKAGE_NAME JPEG MODULE)
diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL
index 007718af7..a6f97e1fe 100644
--- a/ports/libmysql/CONTROL
+++ b/ports/libmysql/CONTROL
@@ -1,4 +1,4 @@
 Source: libmysql
-Version: 8.0.4-3
+Version: 8.0.4-4
 Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
 Description: A MySQL client library for C development.
diff --git a/ports/libmysql/linux_libmysql.patch b/ports/libmysql/linux_libmysql.patch
new file mode 100644
index 000000000..42dfa73d8
--- /dev/null
+++ b/ports/libmysql/linux_libmysql.patch
@@ -0,0 +1,18 @@
+diff --git a/configure.cmake b/configure.cmake
+index 1f3d8e2..9e45f48 100644
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -456,7 +456,11 @@ IF(NOT HAVE_FCNTL_NONBLOCK)
+ ENDIF()
+ 
+ IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)
+-  STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR}  processor)
++  IF(${CMAKE_SYSTEM_PROCESSOR})
++    STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} processor)
++  ELSE()
++    STRING(TOLOWER ${CMAKE_HOST_SYSTEM_PROCESSOR} processor)
++  ENDIF()
+   IF(processor MATCHES "86" OR processor MATCHES "amd64" OR processor MATCHES "x64")
+     IF(NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
+       # The loader in some Solaris versions has a bug due to which it refuses to
+
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
index dfd38c41c..e179ca714 100644
--- a/ports/libmysql/portfile.cmake
+++ b/ports/libmysql/portfile.cmake
@@ -10,6 +10,10 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT CMAKE_SYSTEM_NAME OR CMAKE_S
     message(FATAL_ERROR "Oracle has dropped support in libmysql for 32-bit Windows.")
 endif()
 
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    message(WARNING "libmysql needs ncurses on LINUX, please install ncurses first.\nOn Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates it is ncurses-devel.")
+endif()
+
 include(vcpkg_common_functions)
 
 vcpkg_from_github(
@@ -18,13 +22,10 @@ vcpkg_from_github(
     REF mysql-8.0.4
     SHA512 8d9129e7670e88df14238299052a5fe6d4f3e40bf27ef7a3ca8f4f91fb40507b13463e9bd24435b34e5d06c5d056dfb259fb04e77cc251b188eea734db5642be
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/ignore-boost-version.patch
-        ${CMAKE_CURRENT_LIST_DIR}/system-libs.patch
+        ignore-boost-version.patch
+        system-libs.patch
+        linux_libmysql.patch
 )
 
 file(REMOVE_RECURSE ${SOURCE_PATH}/include/boost_1_65_0)
@@ -100,13 +101,13 @@ else()
         ${CURRENT_PACKAGES_DIR}/lib/mysqlclient.lib
         ${CURRENT_PACKAGES_DIR}/debug/lib/mysqlclient.lib)
 
-    # correct the dll directory
+    # correct the dll directory
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
         file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/bin/libmysql.dll)
         file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/bin/libmysql.pdb)
     endif()
-
+
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
         file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
         file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.dll)
@@ -120,4 +121,4 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h "${_contents}")
 
 # copy license
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmysql)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmysql/copyright)
-\ No newline at end of file
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmysql/copyright)
diff --git a/ports/libplist/CONTROL b/ports/libplist/CONTROL
index bb7db384c..9189b4f48 100644
--- a/ports/libplist/CONTROL
+++ b/ports/libplist/CONTROL
@@ -1,3 +1,3 @@
 Source: libplist
-Version: 2.0.1.197-2
+Version: 1.2.77
 Description: A library to handle Apple Property List format in binary or XML 
diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake
index 51549e4ca..5b6ce749c 100644
--- a/ports/libplist/portfile.cmake
+++ b/ports/libplist/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libimobiledevice-win32/libplist
-    REF 2.0.1.197
-    SHA512 55e1817c61d608b11646eb9c28c445f9ee801c7beb2121bd810235561117262adb73dbecb23b9ef5b0c54b0fc8089e0a46acc0e8f4845329a50a663ab004052c
+    REF f279ef534ab5adeb81f063dee5e8a8fc3ca6d3ab
+    SHA512 52001a46935693e3ac5f0b8c3d13d9bf51c5f34189f6f006bd697d7e965f402460060708c4fb54ed43f49a217ac442fcb8dca252fcbccd3e6a154b6c9a8c2104
     HEAD_REF msvc-master
     PATCHES dllexport.patch
 )
@@ -21,3 +21,7 @@ vcpkg_install_msbuild(
     LICENSE_SUBPATH COPYING.lesser
     REMOVE_ROOT_INCLUDES
 )
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+\ No newline at end of file
diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL
index c9e66ef18..add042b7e 100644
--- a/ports/libqglviewer/CONTROL
+++ b/ports/libqglviewer/CONTROL
@@ -1,4 +1,4 @@
 Source: libqglviewer
-Version: 2.7.1-1
+Version: 2.7.0
 Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.
 Build-Depends: qt5-base
diff --git a/ports/libqglviewer/portfile.cmake b/ports/libqglviewer/portfile.cmake
index f57092521..7a7cc9fdf 100644
--- a/ports/libqglviewer/portfile.cmake
+++ b/ports/libqglviewer/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GillesDebunne/libQGLViewer
-    REF 28a23f14997dc2e08990b884c07075b48979cac7
-    SHA512 58058543e07857f8b1480301b72f789290eee2d65382bee29773bcc1e3f45cedcee33b762bdb870b6cae8a0daab38ebdecde40e2f02720cf0f6fcf10f2007f25
+    REF 781d914c003466b342b45d19266a9613fc0e7e0e
+    SHA512 0586020c159fa4b3acb3ea3fa0a361bcc757d840298d7a436c356d0929b5ace3da4d054e3c0d107a499076413336e3b9a2f35750e6bf0add9320cc52a5c7afd5
     HEAD_REF master
     PATCHES "use-default-config-on-all-platforms.patch"
 )
diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake
index 02ca27c8d..79463c26c 100644
--- a/ports/librabbitmq/portfile.cmake
+++ b/ports/librabbitmq/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO alanxz/rabbitmq-c
-  REF v0.9.0
-  SHA512 a63fe267a3ec112a5e9456a03066132b91f897181947fba18ea3efb14ca0a69996d7dfaecda61a0dd360e03a4e56569e70592e1674b75d20b937a118e1acfc64
+  REF 77e3805d1662034339c3c19bcdaaa62a56c1fa7e
+  SHA512 f20a841d184a2448b12c59b551ac5f1bf70a4cc0e0226fe803bab64bd6e26be5f275fb36717b3abb614e88212668cb87de5f9f749fc17ff565b2fe15f66c090e
   HEAD_REF master
   PATCHES
 	fix-uwpwarning.patch
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL
index 6b27ce223..1a13a37d9 100644
--- a/ports/libraw/CONTROL
+++ b/ports/libraw/CONTROL
@@ -1,4 +1,4 @@
 Source: libraw
-Version: 201903
+Version: 201903-1
 Build-Depends: lcms, jasper
 Description: raw image decoder library
diff --git a/ports/libraw/findlibraw_debug_fix.patch b/ports/libraw/findlibraw_debug_fix.patch
index a09eca537..294963eb6 100644
--- a/ports/libraw/findlibraw_debug_fix.patch
+++ b/ports/libraw/findlibraw_debug_fix.patch
@@ -1,6 +1,6 @@
 --- a/cmake/modules/FindLibRaw.cmake	2016-11-02 07:09:50.000000000 +0100
-+++ b/cmake/modules/FindLibRaw.cmake	2018-06-02 02:50:10.501142400 +0200
-@@ -31,18 +31,34 @@
++++ b/cmake/modules/FindLibRaw.cmake	2019-06-03 22:05:28.759307500 +0200
+@@ -31,18 +31,36 @@
            PATH_SUFFIXES libraw
           )
  
@@ -18,6 +18,8 @@
 +             ${PC_LIBRAW_LIBRARY_DIRS}
 +            )
 +
++INCLUDE(SelectLibraryConfigurations)
++
 +select_library_configurations(LibRaw)
 +
 +FIND_LIBRARY(LibRaw_r_LIBRARY_RELEASE NAMES raw_r
diff --git a/ports/libunibreak/CONTROL b/ports/libunibreak/CONTROL
index 26fc64c37..76f9b3432 100644
--- a/ports/libunibreak/CONTROL
+++ b/ports/libunibreak/CONTROL
@@ -1,3 +1,3 @@
 Source: libunibreak
-Version: 4.1
+Version: 4.2
 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 29e5a4fc0..c054ce685 100644
--- a/ports/libunibreak/portfile.cmake
+++ b/ports/libunibreak/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO adah1972/libunibreak
-  REF libunibreak_4_1
-  SHA512 9dea703a9c969f58944817cf014f27b2e9c373dff1b26cbc7d2539a1797e61480893841cf3c7398870be7ddd974a899c8d60b07a238e343a698c17e9e4ba7a10
+  REF 15b579aac410b7c11ba596f4a9abbf405a187e34
+  SHA512 a46196ad276134dad19fbc4ad49a2f4a4563137e30657b0f06cee9e6b4dab803723ae270f9682c4b8245c9d10297ce44b7bfb08bfa16894552cdb916fc758c02
   HEAD_REF master
 )
 
diff --git a/ports/libusbmuxd/CONTROL b/ports/libusbmuxd/CONTROL
index 3773d17f9..05faa6a1c 100644
--- a/ports/libusbmuxd/CONTROL
+++ b/ports/libusbmuxd/CONTROL
@@ -1,4 +1,4 @@
 Source: libusbmuxd
-Version: 1.0.107-2
+Version: 1.2.77
 Description: A client library to multiplex connections from and to iOS devices
 Build-Depends: libplist
diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake
index c4d338b19..9a03b5e53 100644
--- a/ports/libusbmuxd/portfile.cmake
+++ b/ports/libusbmuxd/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libimobiledevice-win32/libusbmuxd
-    REF 1.0.109
-    SHA512 104205ebcac96765f4bf0b42dbe5df084be4f87fc64454b4e02049fbd18caf9282d070f8949935977eda76fba68b6a909571afea58d4ad4091f02d0e6b7a08e0
+    REF a4422aa65f3635d99c3b80fad18f093ef3c5f653
+    SHA512 9446bbcd6b901e6183f6e86d7fe7301c01182ae5b9330182fbca529bb1db54250cd6012256a420d457a7243388811c94bb2ecf5a0747238714d00b3850e60e8e
     HEAD_REF msvc-master
     PATCHES dllexport.patch
 )
@@ -24,3 +24,6 @@ vcpkg_install_msbuild(
 )
 
 file(REMOVE "${CURRENT_PACKAGES_DIR}/include/Makefile.am")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+\ No newline at end of file
diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL
index 0066853b2..79033b5a0 100644
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@@ -1,3 +1,3 @@
 Source: libuv
-Version: 1.29.0
+Version: 1.29.1
 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 b95d4f295..ba7cdfeb0 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.29.0
-    SHA512 19f1f25ffdb287a755f773488e3da5fd5b5b43c333e3dfb019bbac430ccd77456da96dbf60c38b97c87880f90f08438366e29bbcc8d81a28f777f39fca8af529
+    REF d16e6094e1eb3b0b5981ef1dd7e03ec4d466944d
+    SHA512 338d25fec26ab69d300141086de825edabc5e65c50b6d9cf0e2f8f1937a930e4ecf4460ba2789cef64a85ad4a63c9b5f2a482ee2498c542f73e5915bbff6170f
     HEAD_REF v1.x
 )
 
diff --git a/ports/libyaml/0001-fix-version.patch b/ports/libyaml/0001-fix-version.patch
deleted file mode 100644
index c2a59d30f..000000000
--- a/ports/libyaml/0001-fix-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1abdd77..60a6b44 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.0)
- project (yaml C)
- 
- set (YAML_VERSION_MAJOR 0)
--set (YAML_VERSION_MINOR 1)
--set (YAML_VERSION_PATCH 7)
-+set (YAML_VERSION_MINOR 2)
-+set (YAML_VERSION_PATCH 1)
- set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}")
- 
- option(BUILD_SHARED_LIBS "Build libyaml as a shared library" OFF)
diff --git a/ports/libyaml/CONTROL b/ports/libyaml/CONTROL
index 1c770b2b9..df8b2b1fe 100644
--- a/ports/libyaml/CONTROL
+++ b/ports/libyaml/CONTROL
@@ -1,3 +1,3 @@
 Source: libyaml
-Version: 0.2.1-1
+Version: 0.2.2
 Description: A C library for parsing and emitting YAML.
diff --git a/ports/libyaml/portfile.cmake b/ports/libyaml/portfile.cmake
index 047692719..210fc2d7f 100644
--- a/ports/libyaml/portfile.cmake
+++ b/ports/libyaml/portfile.cmake
@@ -3,15 +3,16 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO yaml/libyaml
-    REF 0.2.1
-    SHA512 8b91738183a6d81c2c0381b4279cff9d8f811dac643ce5e08aa869058f5653ad8a2d9d8f9e563b26ad75b617b80b10ccb32753984a50ed684529a90bdd248bff
+    REF 0.2.2
+    SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
     HEAD_REF master
-    PATCHES 0001-fix-version.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/magic-enum/CONTROL b/ports/magic-enum/CONTROL
new file mode 100644
index 000000000..590b8d758
--- /dev/null
+++ b/ports/magic-enum/CONTROL
@@ -0,0 +1,3 @@
+Source: magic-enum
+Version: 2019-06-07
+Description: Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.
diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake
new file mode 100644
index 000000000..95be6cc27
--- /dev/null
+++ b/ports/magic-enum/portfile.cmake
@@ -0,0 +1,22 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "Neargye/magic_enum"
+    REF 4dfaa4b7b4814c2cf85b08ad3084fc28c8b129c6
+    SHA512 924e5a134f4200652fdc3f3d676b49efa8c30b5577d638f60134ce81092b23f7976a494ce50b58b25ed7bce0653a7e29206acf9e512408c4701ec6822ab2d176
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA 
+    OPTIONS
+      -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF
+      -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/magic_enum)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/magic-enum RENAME copyright)
diff --git a/ports/magnum-extras/CONTROL b/ports/magnum-extras/CONTROL
index 9942c9463..36da8ed0c 100644
--- a/ports/magnum-extras/CONTROL
+++ b/ports/magnum-extras/CONTROL
@@ -1,7 +1,8 @@
 Source: magnum-extras
 Version: 2019.01-1
 Build-Depends: magnum[core]
-Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
+Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization 
+Homepage: http://magnum.graphics/
 Default-Features:
 
 Feature: ui
diff --git a/ports/magnum-integration/CONTROL b/ports/magnum-integration/CONTROL
index da379258c..99fa4779b 100644
--- a/ports/magnum-integration/CONTROL
+++ b/ports/magnum-integration/CONTROL
@@ -1,7 +1,8 @@
 Source: magnum-integration
 Version: 2019.01-1
 Build-Depends: magnum[core]
-Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
+Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization 
+Homepage: http://magnum.graphics/
 Default-Features:
 
 Feature: bullet
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
index c109f7edf..ed3ec4510 100644
--- a/ports/magnum-plugins/CONTROL
+++ b/ports/magnum-plugins/CONTROL
@@ -1,7 +1,8 @@
 Source: magnum-plugins
 Version: 2019.01-1
 Build-Depends: magnum[core]
-Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
+Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization 
+Homepage: http://magnum.graphics/
 Default-Features: ddsimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stbimageconverter, stbimageimporter
 
 Feature: assimpimporter
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index 29db869a3..d1d527786 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,7 +1,8 @@
 Source: magnum
 Version: 2019.01-1
 Build-Depends: corrade[utility]
-Description: C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
+Description: C++11/C++14 graphics middleware for games and data visualization 
+Homepage: http://magnum.graphics/
 Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application
 
 Feature: al-info
diff --git a/ports/mdnsresponder/CONTROL b/ports/mdnsresponder/CONTROL
index f703d5860..f1ee35042 100644
--- a/ports/mdnsresponder/CONTROL
+++ b/ports/mdnsresponder/CONTROL
@@ -1,3 +1,4 @@
 Source: mdnsresponder
 Version: 765.30.11
-Description: The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative: <http://developer.apple.com/bonjour/>
-\ No newline at end of file
+Description: The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.
+Homepage: http://developer.apple.com/bonjour/
+\ No newline at end of file
diff --git a/ports/minisat-master-keying/CONTROL b/ports/minisat-master-keying/CONTROL
index 84021f371..109ba31b5 100644
--- a/ports/minisat-master-keying/CONTROL
+++ b/ports/minisat-master-keying/CONTROL
@@ -2,4 +2,4 @@ Source: minisat-master-keying
 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
+Homepage: https://github.com/master-keying/minisat
diff --git a/ports/miniz/CMakeLists-targets.patch b/ports/miniz/CMakeLists-targets.patch
index 3b4c70468..c9d32e479 100644
--- a/ports/miniz/CMakeLists-targets.patch
+++ b/ports/miniz/CMakeLists-targets.patch
@@ -1,54 +1,55 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7dd6309..eaf160f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,12 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "")
- CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
- endif ()
- 
--set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
--
- set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
- 
--add_library(miniz ${miniz_SOURCE})
-+add_library(miniz STATIC ${miniz_SOURCE})
-+target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS)
- 
-+if(FALSE)
- set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
- set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
- set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
-@@ -41,12 +41,28 @@ if(${UNIX})
-     target_link_libraries(example6 m)
- endif()
- 
-+target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+
- # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
- # target_link_libraries(miniz_tester miniz)
-+endif()
- 
--install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
--    ARCHIVE  DESTINATION lib
--    LIBRARY DESTINATION lib
-+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
-+    ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     )
-+export(TARGETS ${PROJECT_NAME}
-+    NAMESPACE miniz::
-+    FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
-+)
-+install(EXPORT ${PROJECT_NAME}Config
-+    DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz"
-+    NAMESPACE miniz::
-+)
- file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
--install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
-\ No newline at end of file
-+install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f3e453a..094a4e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,13 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "")
+ CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif ()
+ 
+-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+-
+ set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
+ 
+-add_library(miniz ${miniz_SOURCE})
+-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+-
++add_library(miniz STATIC ${miniz_SOURCE})
++target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS)
++ 
++if(FALSE)
+ set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
+ set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
+ set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
+@@ -41,12 +40,28 @@ if(${UNIX})
+     target_link_libraries(example6 m)
+ endif()
+ 
++target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS)
++
+ # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
+ # target_link_libraries(miniz_tester miniz)
++endif()
+ 
+-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
+-    ARCHIVE  DESTINATION lib
+-    LIBRARY DESTINATION lib
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
++    ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     )
++export(TARGETS ${PROJECT_NAME}
++    NAMESPACE miniz::
++    FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
++)
++install(EXPORT ${PROJECT_NAME}Config
++    DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz"
++    NAMESPACE miniz::
++)
+ file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+ install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+\ No newline at end of file
diff --git a/ports/miniz/CONTROL b/ports/miniz/CONTROL
index 51a370a80..88eacdb85 100644
--- a/ports/miniz/CONTROL
+++ b/ports/miniz/CONTROL
@@ -1,3 +1,3 @@
 Source: miniz
-Version: 2.0.8
+Version: 2.1.0
 Description: Single C source file zlib-replacement library
diff --git a/ports/miniz/portfile.cmake b/ports/miniz/portfile.cmake
index 9c67ea8c9..4de2dc3f3 100644
--- a/ports/miniz/portfile.cmake
+++ b/ports/miniz/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO richgel999/miniz
-    REF 2.0.8
-    SHA512 84b480df8bff63422d8c36cef3741f9b9f3dce13babf4de6cb4d575209978ad849357cc72bcf31ee8b6c5da6853ed2e5eddbbe16fecd689afd7028e834abf7e9
+    REF a4264837ae37384b1d7a205a6732db322f0f3769
+    SHA512 88f0e03cccfe66c796db7594b93c667bd52cd7f4d13803181e9d86b4aa26f214fd2907a45a752da603d3e87f8d53c40bfc0956b279c0d49016f7b943aeb9cd33
     HEAD_REF master
     PATCHES
     	CMakeLists-targets.patch
diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL
index 4d89b54c0..f143f422f 100644
--- a/ports/mongo-cxx-driver/CONTROL
+++ b/ports/mongo-cxx-driver/CONTROL
@@ -2,3 +2,15 @@ Source: mongo-cxx-driver
 Version: 3.2.0-2
 Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility
 Description: MongoDB C++ Driver.
+
+Feature: mnmlstc
+Description: Use MNMLSTC/core C++17 polyfill.
+
+Feature: system-mnmlstc
+Description: Use an available version of MNMLSTC on your system as C++17 polyfill.
+
+Feature: boost
+Description: Use Boost C++17 polyfill. The only option under MSVC.
+
+Feature: std-experimental
+Description: Use optional and string_view from std::experimental.
diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake
index 69ac66b04..e94902bcc 100644
--- a/ports/mongo-cxx-driver/portfile.cmake
+++ b/ports/mongo-cxx-driver/portfile.cmake
@@ -17,6 +17,22 @@ vcpkg_from_github(
         disable-c2338-mongo-cxx-driver.patch
 )
 
+if ("mnmlstc" IN_LIST FEATURES)
+    set(BSONCXX_POLY MNMLSTC)
+elseif ("system-mnmlstc" IN_LIST FEATURES)
+    set(BSONCXX_POLY SYSTEM_MNMLSTC)
+elseif ("boost" IN_LIST FEATURES)
+    set(BSONCXX_POLY BOOST)
+elseif("std-experimental" IN_LIST FEATURES)
+    set(BSONCXX_POLY STD_EXPERIMENTAL)
+else()
+  if (WIN32)
+    set(BSONCXX_POLY BOOST)
+  else()
+    set(BSONCXX_POLY MNMLSTC)
+  endif()
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -25,6 +41,7 @@ vcpkg_configure_cmake(
         -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR}
         -DMONGOCXX_HEADER_INSTALL_DIR=include
         -DBSONCXX_HEADER_INSTALL_DIR=include
+        -DBSONCXX_POLY_USE_${BSONCXX_POLY}=1
 )
 
 vcpkg_install_cmake()
diff --git a/ports/moos-core/CONTROL b/ports/moos-core/CONTROL
index 64f94d6db..33e68c93f 100644
--- a/ports/moos-core/CONTROL
+++ b/ports/moos-core/CONTROL
@@ -1,3 +1,4 @@
 Source: moos-core
 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
+Description: A very light weight, easy to use middleware.
+Homepage: https://sites.google.com/site/moossoftware/
+\ No newline at end of file
diff --git a/ports/moos-essential/CONTROL b/ports/moos-essential/CONTROL
index c47dfa433..06cc1c0f0 100644
--- a/ports/moos-essential/CONTROL
+++ b/ports/moos-essential/CONTROL
@@ -1,4 +1,5 @@
 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.
+Description: a set of useful applications that leverage the core-moos communications layer.
+Homepage: https://sites.google.com/site/moossoftware/
 Build-Depends: moos-core
diff --git a/ports/moos-ui/CONTROL b/ports/moos-ui/CONTROL
index 07de10690..08279ce15 100644
--- a/ports/moos-ui/CONTROL
+++ b/ports/moos-ui/CONTROL
@@ -1,6 +1,7 @@
 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.
+Description: set of user interface tools to use and leverage the MOOS project.
+Homepage: https://sites.google.com/site/moossoftware/
 Build-Depends: moos-core
 
 
diff --git a/ports/mosquitto/CONTROL b/ports/mosquitto/CONTROL
index a80d0da7a..1a72c19fc 100644
--- a/ports/mosquitto/CONTROL
+++ b/ports/mosquitto/CONTROL
@@ -1,6 +1,6 @@
 Source: mosquitto
-Version: 1.5.0-3
+Version: 1.6.2-2
 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/
+Homepage: https://mosquitto.org/download/
diff --git a/ports/mosquitto/archive-dest.patch b/ports/mosquitto/archive-dest.patch
new file mode 100644
index 000000000..11a9ccce4
--- /dev/null
+++ b/ports/mosquitto/archive-dest.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 221c230..1bd4e96 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -89,7 +89,7 @@ set_target_properties(libmosquitto PROPERTIES
+ 	SOVERSION 1
+ )
+ 
+-install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ 
+ if (WITH_STATIC_LIBRARIES)
+ 	add_library(libmosquitto_static STATIC ${C_SRC})
diff --git a/ports/mosquitto/output_folders-cmake.patch b/ports/mosquitto/output_folders-cmake.patch
deleted file mode 100644
index 5b1c60eb6..000000000
--- a/ports/mosquitto/output_folders-cmake.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1d631e..e95d7fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,10 +16,10 @@ set (VERSION 1.5.0)
- add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
- 
- if (WIN32)
--	set (BINDIR .)
--	set (SBINDIR .)
-+	set (BINDIR bin)
-+	set (SBINDIR bin)
- 	set (SYSCONFDIR .)
--	set (LIBDIR .)
-+	set (LIBDIR lib)
- 	set (INCLUDEDIR include)
- 	set (DATAROOTDIR share)
- 	set (MANDIR man)
-@@ -90,7 +90,7 @@ endif (${DOCUMENTATION} STREQUAL ON)
- # Install config file
- # ========================================
- 
--install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}")
-+#install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}")
- 
- 
- # ========================================
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 272b60a..c180067 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -104,7 +104,7 @@ set_target_properties(libmosquitto PROPERTIES
- 	SOVERSION 1
- )
- 
--install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
-+install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}" ARCHIVE DESTINATION "${LIBDIR}")
- 
- if (${WITH_STATIC_LIBRARIES} STREQUAL ON)
- 	add_library(libmosquitto_static STATIC ${C_SRC})
-diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
-index 5e4f08e..a8cc6be 100644
---- a/lib/cpp/CMakeLists.txt
-+++ b/lib/cpp/CMakeLists.txt
-@@ -13,7 +13,7 @@ set_target_properties(mosquittopp PROPERTIES
- 	VERSION ${VERSION}
- 	SOVERSION 1
- )
--install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
-+install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}" ARCHIVE DESTINATION "${LIBDIR}")
- 
- if (${WITH_STATIC_LIBRARIES} STREQUAL ON)
- 	add_library(mosquittopp_static STATIC
-
diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake
index 92a8988d4..f3b2f9715 100644
--- a/ports/mosquitto/portfile.cmake
+++ b/ports/mosquitto/portfile.cmake
@@ -5,12 +5,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eclipse/mosquitto
-    REF v1.5
-    SHA512 f6a5c8e71d642ef931176fe428fb79353933facc2db226d9e55b87d4ff9bd6610a1bd05d71159e30c8afb1fda542d233630ae164770e652baa7ea51117211489
+    REF f825d4bb5e9f4fc5dc62ad09f895c87800d0f579
+    SHA512 cd94236d5673f7e5a992d1e866afe2ccb496dfb7cc24e53808caed603bc8e899ca12857a16eac58ac7ab7235a849b6e2528c55e0debf651ef76dcebef75e7df9
     HEAD_REF master
     PATCHES
+        archive-dest.patch
         win64-cmake.patch
-        output_folders-cmake.patch
 )
 
 vcpkg_configure_cmake(
@@ -38,6 +38,7 @@ file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
 file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
 file(REMOVE ${EXE})
 file(REMOVE ${DEBUG_EXE})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mosquitto RENAME copyright)
 
diff --git a/ports/mosquitto/win64-cmake.patch b/ports/mosquitto/win64-cmake.patch
index 360bf006b..9105c403f 100644
--- a/ports/mosquitto/win64-cmake.patch
+++ b/ports/mosquitto/win64-cmake.patch
@@ -1,22 +1,9 @@
-diff --git a/config.h b/config.h
-index 906fad4..d5b2a72 100644
---- a/config.h
-+++ b/config.h
-@@ -15,7 +15,7 @@
- #  define EPROTO ECONNABORTED
- #endif
- 
--#ifdef WIN32
-+#ifdef WIN32 || WIN64
- #  ifndef strcasecmp
- #    define strcasecmp strcmpi
- #  endif
-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,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
- if (${WITH_THREADING} STREQUAL ON)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e58d072..e582a25 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,12 +54,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
+ if (WITH_THREADING)
  	add_definitions("-DWITH_THREADING")
  	if (WIN32)
 -		if (CMAKE_CL_64)
@@ -29,21 +16,30 @@ index d537e77..272b60a 100644
  	else (WIN32)
  		find_library(LIBPTHREAD pthread)
  		if (LIBPTHREAD)
+diff --git a/config.h b/config.h
+index b7a7616..bceb92a 100644
+--- a/config.h
++++ b/config.h
+@@ -27,7 +27,7 @@
+ #  define EPROTO ECONNABORTED
+ #endif
+ 
+-#ifdef WIN32
++#if defined(WIN32) || defined(WIN64)
+ #  ifndef strcasecmp
+ #    define strcasecmp strcmpi
+ #  endif
 diff --git a/lib/net_mosq.h b/lib/net_mosq.h
-index b5d8549..be60659 100644
+index b843ebe..8c077eb 100644
 --- a/lib/net_mosq.h
 +++ b/lib/net_mosq.h
-@@ -20,7 +20,12 @@
+@@ -20,6 +20,9 @@ Contributors:
  #include <unistd.h>
  #else
  #include <winsock2.h>
 +#if defined(_MSC_VER) && _MSC_VER > 1900
 +#undef ssize_t
- typedef int ssize_t;
-+#else
-+typedef int ssize_t;
 +#endif
+ typedef SSIZE_T ssize_t;
  #endif
  
- #include "mosquitto_internal.h"
-
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL
index 902a166eb..e27c923f8 100644
--- a/ports/netcdf-c/CONTROL
+++ b/ports/netcdf-c/CONTROL
@@ -1,4 +1,4 @@
 Source: netcdf-c
-Version: 4.7.0
+Version: 4.7.0-1
 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/fix_curl_linkage.patch b/ports/netcdf-c/fix_curl_linkage.patch
deleted file mode 100644
index 09fead1f0..000000000
--- a/ports/netcdf-c/fix_curl_linkage.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb0bc26b..f1409fc6 100644
---- a/CMakeLists.txt	
-+++ b/CMakeLists.txt
-@@ -783,6 +783,7 @@ IF(ENABLE_DAP)
- 
-   ADD_DEFINITIONS(-DCURL_STATICLIB=1)
-   INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
-+  LINK_LIBRARIES(${CURL_LIBRARIES})
- 
-   # Check to see if CURLOPT_USERNAME is defined.
-   # It is present starting version 7.19.1.
diff --git a/ports/netcdf-c/hdf5.patch b/ports/netcdf-c/hdf5.patch
new file mode 100644
index 000000000..71f4921ed
--- /dev/null
+++ b/ports/netcdf-c/hdf5.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a3874c13..36f15beb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -599,11 +599,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+     IF(NC_FIND_SHARED_LIBS)
+       SET(NC_HDF5_LINK_TYPE "shared")
+       SET(NC_HDF5_LINK_TYPE_UPPER "SHARED")
+-      ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
+     ELSE(NC_FIND_SHARED_LIBS)
+       SET(NC_HDF5_LINK_TYPE "static")
+       SET(NC_HDF5_LINK_TYPE_UPPER "STATIC")
+-      ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)
++      SET(HDF5_USE_STATIC_LIBRARIES ON)
+     ENDIF(NC_FIND_SHARED_LIBS)
+ 
+     #####
+@@ -614,8 +615,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+     # had worked.
+     #####
+     IF(MSVC)
+-      SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
+-      FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL NO_MODULES REQUIRED ${NC_HDF5_LINK_TYPE})
++      FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
+     ELSE(MSVC)
+       FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
+     ENDIF(MSVC)
diff --git a/ports/netcdf-c/hdf5_2.patch b/ports/netcdf-c/hdf5_2.patch
new file mode 100644
index 000000000..a3a3fb751
--- /dev/null
+++ b/ports/netcdf-c/hdf5_2.patch
@@ -0,0 +1,13 @@
+diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt
+index ea9b0294..3c7f427d 100644
+--- a/liblib/CMakeLists.txt	
++++ b/liblib/CMakeLists.txt
+@@ -83,7 +83,7 @@ IF(USE_HDF5 OR USE_NETCDF4)
+     # HDF5_HL_LIBRARY.
+     SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
+   ELSE() # Windows CMake defines HDF5_LIBRARIES.
+-    SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
++    SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
+   ENDIF()
+ ENDIF()
+ 
diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake
index a965ce70e..37ed2f04e 100644
--- a/ports/netcdf-c/portfile.cmake
+++ b/ports/netcdf-c/portfile.cmake
@@ -10,9 +10,20 @@ vcpkg_from_github(
         no-install-deps.patch
         config-pkg-location.patch
         transitive-hdf5.patch
-        fix_curl_linkage.patch
+        hdf5.patch
+        hdf5_2.patch
 )
 
+#Remove outdated find modules
+file(REMOVE "${SOURCE_PATH}/cmake/modules/FindSZIP.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake")
+
+if(VCPKG_CRT_LINKAGE STREQUAL "static")
+    set(NC_USE_STATIC_CRT ON)
+else()
+    set(NC_USE_STATIC_CRT OFF)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     DISABLE_PARALLEL_CONFIGURE
@@ -22,9 +33,11 @@ vcpkg_configure_cmake(
         -DBUILD_TESTING=OFF
         -DENABLE_EXAMPLES=OFF
         -DENABLE_TESTS=OFF
+        -DENABLE_FILTER_TESTING=OFF
         -DUSE_HDF5=ON
         -DENABLE_DAP_REMOTE_TESTS=OFF
         -DDISABLE_INSTALL_DEPENDENCIES=ON
+        -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT}
         -DConfigPackageLocation=share/netcdf
 )
 
diff --git a/ports/netcdf-c/transitive-hdf5.patch b/ports/netcdf-c/transitive-hdf5.patch
index 220640366..89773e6d4 100644
--- a/ports/netcdf-c/transitive-hdf5.patch
+++ b/ports/netcdf-c/transitive-hdf5.patch
@@ -6,7 +6,7 @@ index 6f4ccf8..14a3743 100644
  
  set(netCDF_LIBRARIES netcdf)
  
-+find_package(HDF5 REQUIRED)
++find_package(HDF5 COMPONENTS C HL CONFIG REQUIRED)
 +
  # include target information
  include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake")
diff --git a/ports/nmslib/CONTROL b/ports/nmslib/CONTROL
index 7b65617c3..111bcc858 100644
--- a/ports/nmslib/CONTROL
+++ b/ports/nmslib/CONTROL
@@ -1,5 +1,5 @@
 Source: nmslib
-Version: 1.7.2-1
+Version: 1.7.3.6
 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.
diff --git a/ports/nmslib/fix-headers.patch b/ports/nmslib/fix-headers.patch
index 92a8d6c36..ee6db36df 100644
--- a/ports/nmslib/fix-headers.patch
+++ b/ports/nmslib/fix-headers.patch
@@ -1,5 +1,5 @@
 diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc
-index 30a7c8a..5ca07c5 100644
+index f5c7fca..4780746 100644
 --- a/similarity_search/src/method/hnsw.cc
 +++ b/similarity_search/src/method/hnsw.cc
 @@ -27,7 +27,7 @@
@@ -38,7 +38,7 @@ index b6473bd..6dcb00f 100644
  #include "portable_simd.h"
  #include "space.h"
 diff --git a/similarity_search/src/method/small_world_rand.cc b/similarity_search/src/method/small_world_rand.cc
-index 59e13f7..0f3e0b9 100644
+index e8280cb..6bdb0f7 100644
 --- a/similarity_search/src/method/small_world_rand.cc
 +++ b/similarity_search/src/method/small_world_rand.cc
 @@ -16,7 +16,7 @@
@@ -48,10 +48,10 @@ index 59e13f7..0f3e0b9 100644
 -#include <mmintrin.h>
 +#include <xmmintrin.h>
  
- #include "portable_simd.h"
- #include "space.h"
+ #if defined(_WIN32) || defined(WIN32)
+ #include <intrin.h>
 diff --git a/similarity_search/src/method/vptree.cc b/similarity_search/src/method/vptree.cc
-index d0262ad..0e5befc 100644
+index 04f481e..c71eed5 100644
 --- a/similarity_search/src/method/vptree.cc
 +++ b/similarity_search/src/method/vptree.cc
 @@ -20,7 +20,7 @@
@@ -60,9 +60,9 @@ index d0262ad..0e5befc 100644
  // This is only for _mm_prefetch
 -#include <mmintrin.h>
 +#include <xmmintrin.h>
- 
- #include "portable_simd.h"
- #include "space.h"
+ #if defined(_WIN32) || defined(WIN32)
+ #include <intrin.h>
+ #endif
 diff --git a/similarity_search/test/test_overlap.cc b/similarity_search/test/test_overlap.cc
 index 326b26b..413d66d 100644
 --- a/similarity_search/test/test_overlap.cc
diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake
index 49a194ba1..ffea74d75 100644
--- a/ports/nmslib/portfile.cmake
+++ b/ports/nmslib/portfile.cmake
@@ -4,9 +4,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO searchivarius/nmslib
-    REF v1.7.2
-    SHA512 2f910f752bfb1146aa8d1765fd5faf64d718a92ab7edf9d8ac0a2d9c4359d42b07b3cd553e2aff93da8b009add52ab9cce6b841f5175f57163f73f643ff62c19
+    REPO nmslib/nmslib
+    REF 1eda05dccd5ed34df50a243dfc64c5e9187388f8
+    SHA512 e4518c8dd84867bd0ac5dbc5d3b57d8053d1f73588fc0cf1d7c91cc4819f22dc7888d6be587691ebc1fd12b67de16de63b5e0a24847b6f7b49b57d1e6b457ebd
     HEAD_REF master
 )
 
diff --git a/ports/ogre/001-cmake-install-dir.patch b/ports/ogre/001-cmake-install-dir.patch
index 548f946f7..d0df419eb 100644
--- a/ports/ogre/001-cmake-install-dir.patch
+++ b/ports/ogre/001-cmake-install-dir.patch
@@ -1,3 +1,5 @@
+diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
+index a7a3796..2e21403 100644
 --- a/CMake/CMakeLists.txt
 +++ b/CMake/CMakeLists.txt
 @@ -13,10 +13,12 @@
@@ -17,9 +19,11 @@
  endif()
  
  set(INST_FILES Utils/FindPkgMacros.cmake) 
+diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
+index 783755e..79f7514 100644
 --- a/CMake/InstallResources.cmake
 +++ b/CMake/InstallResources.cmake
-@@ -242,10 +242,12 @@
+@@ -208,10 +208,12 @@ endif ()
  # Create the CMake package files
  include(CMakePackageConfigHelpers)
  
@@ -34,5 +38,5 @@
 +    set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
 +  endif()
  endif()
- configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${OGRE_BINARY_DIR}/cmake/OGREConfig.cmake
+ configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake
      INSTALL_DESTINATION ${OGRE_CMAKE_DIR}
diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL
index d7543d10b..828f2165e 100644
--- a/ports/ogre/CONTROL
+++ b/ports/ogre/CONTROL
@@ -1,5 +1,5 @@
 Source: ogre
-Version: 1.11.3-4
+Version: 1.12.0
 Build-Depends: freeimage, freetype, zlib, zziplib
 Description: 3D Object-Oriented Graphics Rendering Engine
 
diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake
index 74cb8a1c0..1b9087aca 100644
--- a/ports/ogre/portfile.cmake
+++ b/ports/ogre/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OGRECave/ogre
-    REF v1.11.3
-    SHA512 af52821022ab6148e64fdf183b1aa4607b101c7d0edc20d2ccc909f50eed218d7a283fa3b58260fd41cd3f324ecafad8c5137c66e05786580b043240551b2c42 
+    REF c14f8847f743f4dc1b3abc947b1725c87d8b10ce
+    SHA512 a2fd7ffd653c1578bc860b58cf4c899f27cc967f75e2254dc3e372044f118d5951e42b35bfc711aa8996e1885f372d3cfa5a768b8674e0b3d844811990eb87fc 
     HEAD_REF master
     PATCHES
         001-cmake-install-dir.patch
diff --git a/ports/opentracing/CONTROL b/ports/opentracing/CONTROL
index 293dd179c..ac0cbf6f2 100644
--- a/ports/opentracing/CONTROL
+++ b/ports/opentracing/CONTROL
@@ -1,3 +1,4 @@
 Source: opentracing
 Version: 1.5.1
-Description: C++ implementation of the OpenTracing API http://opentracing.io
+Description: C++ implementation of the OpenTracing API 
+Homepage: http://opentracing.io
diff --git a/ports/openvpn3/CMakeLists.txt b/ports/openvpn3/CMakeLists.txt
index fcbe85794..70ec99858 100644
--- a/ports/openvpn3/CMakeLists.txt
+++ b/ports/openvpn3/CMakeLists.txt
@@ -8,6 +8,10 @@ find_library(MBEDX509_LIB mbedx509)
 
 include_directories(. ${ASIO_HPP})
 
+if(WIN32) 
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+endif()
+
 add_definitions(-DNOMINMAX -DUSE_ASIO -DUSE_MBEDTLS)
 
 add_library(ovpncli client/ovpncli.cpp)
diff --git a/ports/openvpn3/CONTROL b/ports/openvpn3/CONTROL
index 09264a192..3b8899f18 100644
--- a/ports/openvpn3/CONTROL
+++ b/ports/openvpn3/CONTROL
@@ -1,4 +1,4 @@
 Source: openvpn3
-Version: 2018-03-21
+Version: 2018-03-21-1
 Build-Depends: asio, tap-windows6 (windows), mbedtls
 Description: a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.
diff --git a/ports/openvr/CONTROL b/ports/openvr/CONTROL
index dbbe6f4c9..dfaf95c1e 100644
--- a/ports/openvr/CONTROL
+++ b/ports/openvr/CONTROL
@@ -1,3 +1,3 @@
 Source: openvr
-Version: 1.1.3b
+Version: 1.4.18
 Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake
index 2bc15f368..ca2902f50 100644
--- a/ports/openvr/portfile.cmake
+++ b/ports/openvr/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ValveSoftware/openvr
-    REF v1.1.3b
-    SHA512 03d9f61e8a2fee6bed02e087b20ccdc281a06dcbb151afe07a072b8758d56d7f4bed7a5dd8eccd43166c8fac6536930c0e4e81a8deaa081e635fd99a304fc565
+    REF 02bc73b9bcfe9cc2d2802bd5fdc91f724de8ef10
+    SHA512 5b0b954b09570dcf72f0340d6bcc0a5ba9e754babf33aaee35c9d45ce08f5256643692705b014b8c94b098b554e7882a837cf6a2c25e946e6bc69ba3b9db0ede
     HEAD_REF master
 )
 
diff --git a/ports/paho-mqtt/CONTROL b/ports/paho-mqtt/CONTROL
index 4d819f5b1..590968f0a 100644
--- a/ports/paho-mqtt/CONTROL
+++ b/ports/paho-mqtt/CONTROL
@@ -1,4 +1,4 @@
 Source: paho-mqtt
-Version: 1.2.1-1
+Version: 1.3.0
 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
index 512052e1a..478141931 100644
--- a/ports/paho-mqtt/fix-install-path.patch
+++ b/ports/paho-mqtt/fix-install-path.patch
@@ -1,48 +1,56 @@
-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/CMakeLists.txt b/CMakeLists.txt
+index 64ae92c..6d552d1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,11 +64,11 @@ ENDIF()
+ IF (PAHO_ENABLE_CPACK)
+        ### packaging settings
+        FILE(GLOB samples "src/samples/*.c")
+-       INSTALL(FILES ${samples} DESTINATION samples)
++	   INSTALL(FILES ${samples} DESTINATION share/paho-mqtt/samples)
+ 
+        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)
+ 
+        IF (WIN32)
+                SET(CPACK_GENERATOR "ZIP")
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index f15f314..54deec5 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -39,7 +39,7 @@ ENDFOREACH(DOXYFILE_SRC)
+ 
+ ADD_CUSTOM_TARGET(doc ALL DEPENDS ${DOXYTARGETS})
+ IF (PAHO_ENABLE_CPACK)
+-    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share)
++	INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share/paho-mqtt)
+ ELSE()
+     INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ ENDIF()
+\ No newline at end of file
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b46eaca..a132062 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -89,7 +89,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)
+@@ -102,8 +102,8 @@ IF (PAHO_BUILD_STATIC)
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF()
+ 
+-INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h
+-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h 
++	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-unresolvedsymbol-arm.patch b/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch
new file mode 100644
index 000000000..165901887
--- /dev/null
+++ b/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch
@@ -0,0 +1,12 @@
+diff --git a/src/SHA1.c b/src/SHA1.c
+index 9bb1175..b2ef930 100644
+--- a/src/SHA1.c
++++ b/src/SHA1.c
+@@ -19,6 +19,7 @@
+ #if !defined(OPENSSL)
+ #if defined(WIN32) || defined(WIN64)
+ #pragma comment(lib, "crypt32.lib")
++#pragma comment(lib, "Advapi32.lib")
+ 
+ int SHA1_Init(SHA_CTX *c)
+ {
diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake
index 5453abf1b..03b6c73bd 100644
--- a/ports/paho-mqtt/portfile.cmake
+++ b/ports/paho-mqtt/portfile.cmake
@@ -3,13 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO eclipse/paho.mqtt.c
-  REF v1.2.1
-  SHA512 98828852ecd127445591df31416adaebebd30848c027361ae62af6b14b84e3cf2a4b90cab692b983148cbf93f710a9e2dd722a3da8c4fd17eb2149e4227a8860
+  REF 9f715d0862a8e16099b5837c4e53a1bf6a6a0675
+  SHA512 3ab5e25bfe303f51485696248e78a8a10f20c0e69b7ea6016165a97d61172336e8fbe5b9d059ae546357bace9f3adb8e2026643b61a6af82fae448a024e51d21
   HEAD_REF master
   PATCHES
          remove_compiler_options.patch
          fix-install-path.patch
          fix-static-build.patch
+         fix-unresolvedsymbol-arm.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC)
diff --git a/ports/pdcurses/CONTROL b/ports/pdcurses/CONTROL
index 29cbff29b..75bce7928 100644
--- a/ports/pdcurses/CONTROL
+++ b/ports/pdcurses/CONTROL
@@ -1,3 +1,3 @@
 Source: pdcurses
-Version: 3.6
+Version: 3.8
 Description: Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.
diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake
index 8581b5583..72c54e403 100644
--- a/ports/pdcurses/portfile.cmake
+++ b/ports/pdcurses/portfile.cmake
@@ -9,8 +9,8 @@ find_program(NMAKE nmake)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wmcbrine/PDCurses
-    REF 3.6
-    SHA512 1ed34e7eb791c9e00aae60878339e79f6b3af086c45d88d2b59d9b2b4020481ff5a5c21e078e59ae24f2de3b4d412f0240f21a50eb743f7e172c832a7e17ed5e
+    REF 2467ab2b6c07163d0171b80ad6c252c29da28173
+    SHA512 4d729a4e0ffa1b5d1fd35ed73329d08886e1e565936a008cd7b45f8e5fbaabcb86c65377fd1e33acef6271f828cd4158e8a56ed15cd664b2a8c8e1d66cf8c00a
     HEAD_REF master
 )
 
@@ -73,7 +73,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
 endif()
 
 file(
-    COPY ${SOURCE_PATH}/curses.h ${SOURCE_PATH}/panel.h ${SOURCE_PATH}/term.h
+    COPY ${SOURCE_PATH}/curses.h ${SOURCE_PATH}/panel.h 
     DESTINATION ${CURRENT_PACKAGES_DIR}/include
 )
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdcurses RENAME copyright)
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL
index 29291a730..4503529c6 100644
--- a/ports/poco/CONTROL
+++ b/ports/poco/CONTROL
@@ -1,7 +1,8 @@
 Source: poco
 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)
+Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.
+Homepage: https://github.com/pocoproject/poco
 
 Feature: mysql
 Build-Depends: libmysql
diff --git a/ports/qca/0002-fix-build-error.patch b/ports/qca/0002-fix-build-error.patch
new file mode 100644
index 000000000..f4ddee3a0
--- /dev/null
+++ b/ports/qca/0002-fix-build-error.patch
@@ -0,0 +1,57 @@
+diff --git a/plugins/qca-gnupg/CMakeLists.txt b/plugins/qca-gnupg/CMakeLists.txt
+index 1ed8e21..20890dd 100644
+--- a/plugins/qca-gnupg/CMakeLists.txt
++++ b/plugins/qca-gnupg/CMakeLists.txt
+@@ -68,6 +68,4 @@ if(NOT DEVELOPER_MODE)
+           LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+           ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+           RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")
+-
+-  install_pdb(qca-gnupg ${QCA_CRYPTO_INSTALL_DIR})
+ endif()
+diff --git a/plugins/qca-logger/CMakeLists.txt b/plugins/qca-logger/CMakeLists.txt
+index ba6926e..45e1986 100644
+--- a/plugins/qca-logger/CMakeLists.txt
++++ b/plugins/qca-logger/CMakeLists.txt
+@@ -20,6 +20,4 @@ if(NOT DEVELOPER_MODE)
+           LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+           ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+           RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")
+-
+-  install_pdb(qca-logger ${QCA_CRYPTO_INSTALL_DIR})
+ endif()
+diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt
+index af3d756..c8480a3 100644
+--- a/plugins/qca-ossl/CMakeLists.txt
++++ b/plugins/qca-ossl/CMakeLists.txt
+@@ -65,8 +65,6 @@ if(OPENSSL_FOUND)
+             LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+             ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+             RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")
+-
+-    install_pdb(qca-ossl ${QCA_CRYPTO_INSTALL_DIR})
+   endif()
+ 
+   else(OPENSSL_FOUND)
+diff --git a/plugins/qca-softstore/CMakeLists.txt b/plugins/qca-softstore/CMakeLists.txt
+index d7af072..3c64870 100644
+--- a/plugins/qca-softstore/CMakeLists.txt
++++ b/plugins/qca-softstore/CMakeLists.txt
+@@ -20,6 +20,4 @@ if(NOT DEVELOPER_MODE)
+           LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+           ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}"
+           RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}")
+-
+-  install_pdb(qca-softstore ${QCA_CRYPTO_INSTALL_DIR})
+ endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2e81974..907049c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -184,6 +184,5 @@ if(NOT DEVELOPER_MODE)
+           FRAMEWORK DESTINATION "${QCA_LIBRARY_INSTALL_DIR}"
+           PUBLIC_HEADER DESTINATION "${QCA_FULL_INCLUDE_INSTALL_DIR}" INCLUDES DESTINATION "${QCA_FULL_INCLUDE_INSTALL_DIR}"
+   )
+-  install_pdb(${QCA_LIB_NAME} ${QCA_BINARY_INSTALL_DIR})
+ endif()
+ 
diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL
index 4c09bf3b1..356dff560 100644
--- a/ports/qca/CONTROL
+++ b/ports/qca/CONTROL
@@ -1,4 +1,5 @@
 Source: qca
-Version: 2.2.0-4
-Description: Qt Cryptographic Architecture (QCA). Sources: https://cgit.kde.org/qca.git/
+Version: 2.2.1
+Description: Qt Cryptographic Architecture (QCA).
+Homepage: https://cgit.kde.org/qca.git/
 Build-Depends: qt5-base
diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake
index 55acdc0b6..9b2b15397 100644
--- a/ports/qca/portfile.cmake
+++ b/ports/qca/portfile.cmake
@@ -20,9 +20,11 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/qca
-    REF 19ec49f89a0a560590ec733c549b92e199792837
-    SHA512 6a83ee6715a9a922f4fde5af571e2aad043ac5cbd522f57365038dd31879b44eb57a099ff797793d7ee19e320e0a151e5beacdff3bed525d39ea0b8e46efca9a
-    PATCHES 0001-fix-path-for-vcpkg.patch
+    REF v2.2.1
+    SHA512 6b10f9bbf9ebf136655d1c6464f3849c8581b3cd5ef07b0697ddd5f32611dce301af5148e8e6fe91e763301e68994957a62a278334ee7a78559101f411f27d49
+    PATCHES
+            0001-fix-path-for-vcpkg.patch
+            0002-fix-build-error.patch
 )
 
 # According to:
diff --git a/ports/rapidjson/CONTROL b/ports/rapidjson/CONTROL
index b5fe3d4c9..02f7b5107 100644
--- a/ports/rapidjson/CONTROL
+++ b/ports/rapidjson/CONTROL
@@ -1,3 +1,4 @@
 Source: rapidjson
 Version: 1.1.0-3
-Description: A fast JSON parser/generator for C++ with both SAX/DOM style API <http://rapidjson.org/>
+Description: A fast JSON parser/generator for C++ with both SAX/DOM style API
+Homepage: http://rapidjson.org/
diff --git a/ports/readline-win32/CONTROL b/ports/readline-win32/CONTROL
index d04614bac..f8beab3d9 100644
--- a/ports/readline-win32/CONTROL
+++ b/ports/readline-win32/CONTROL
@@ -1,3 +1,4 @@
 Source: readline-win32
 Version: 5.0-2
-Description: Implementation of readline for Windows Desktop provided by https://github.com/lltcggie
-\ No newline at end of file
+Description: Implementation of readline for Windows Desktop
+Homepage: https://github.com/lltcggie
+\ No newline at end of file
diff --git a/ports/robin-map/CONTROL b/ports/robin-map/CONTROL
index f24dc8337..c11d67999 100644
--- a/ports/robin-map/CONTROL
+++ b/ports/robin-map/CONTROL
@@ -1,3 +1,3 @@
 Source: robin-map
-Version: 0.2.0
+Version: 0.6.1
 Description: A C++ implementation of a fast hash map and hash set using robin hood hashing
diff --git a/ports/robin-map/portfile.cmake b/ports/robin-map/portfile.cmake
index 6436f6194..73cd9c7d8 100644
--- a/ports/robin-map/portfile.cmake
+++ b/ports/robin-map/portfile.cmake
@@ -3,12 +3,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tessil/robin-map
-    REF v0.2.0
-    SHA512 6d16c612a0d646fd08857f2f6ee2909fb607ff05fa9c7733a2b618d662f63bba2f99677b75a09870a1582b7b37f255c4ff1f9171c897c3cfa73dd8879de1ec18
+    REF 3285ed7615b72020bd68ba6d30f9ec0c0c526098
+    SHA512 3850a0ea06f62ba177a1746a92a3f9c999f6398d4d786dbc63dd276569e77e3d9c15e83c0cb74a1314e3c2b5ff73225675d914cf4ab3f052353b237ab9219bc8
     HEAD_REF master
 )
 
-file(COPY ${SOURCE_PATH}/tsl DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${SOURCE_PATH}/include/tsl DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
 file(INSTALL
     ${SOURCE_PATH}/LICENSE
diff --git a/ports/rxqt/CONTROL b/ports/rxqt/CONTROL
index dc87425aa..eeaab0986 100644
--- a/ports/rxqt/CONTROL
+++ b/ports/rxqt/CONTROL
@@ -1,4 +1,5 @@
 Source: rxqt
 Version: bb2138c
-Description: The Reactive Extensions for Qt. <https://github.com/tetsurom/rxqt>
+Description: The Reactive Extensions for Qt.
+Homepage: https://github.com/tetsurom/rxqt
 Build-Depends: rxcpp
 \ No newline at end of file
diff --git a/ports/sdl2pp/CONTROL b/ports/sdl2pp/CONTROL
index 19fecb092..6a3f7c509 100644
--- a/ports/sdl2pp/CONTROL
+++ b/ports/sdl2pp/CONTROL
@@ -1,4 +1,5 @@
 Source: sdl2pp
 Version: 0.16.0-1
-Description: C++11 bindings/wrapper for SDL2 https://sdl2pp.amdmi3.ru
+Description: C++11 bindings/wrapper for SDL2
+Homepage: https://sdl2pp.amdmi3.ru
 Build-Depends: sdl2, sdl2-mixer, sdl2-image, sdl2-ttf
diff --git a/ports/simde/CONTROL b/ports/simde/CONTROL
new file mode 100644
index 000000000..7f70f4911
--- /dev/null
+++ b/ports/simde/CONTROL
@@ -0,0 +1,3 @@
+Source: simde
+Version: 2019-06-05
+Description: Implementations of SIMD instruction sets for systems which don't natively support them
diff --git a/ports/simde/portfile.cmake b/ports/simde/portfile.cmake
new file mode 100644
index 000000000..e79594ace
--- /dev/null
+++ b/ports/simde/portfile.cmake
@@ -0,0 +1,16 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nemequ/simde
+    REF 6e3ba90605361069cf3422c44242c79171b87275
+    SHA512 d62ff40882c2b3a17c900104b36ae77137cbb77917d409cba1c0693fdcf317a38ff3184deaaecca0ef31d88393bebf0102a8ab57a23ad5d0cee2d3e5fe799f6a
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/simde DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/snowhouse/CONTROL b/ports/snowhouse/CONTROL
index b376f4639..ebd1a6192 100644
--- a/ports/snowhouse/CONTROL
+++ b/ports/snowhouse/CONTROL
@@ -1,3 +1,3 @@
 Source: snowhouse
-Version: 3.0.1
+Version: 3.1.0
 Description: An assertion library for C++
diff --git a/ports/snowhouse/portfile.cmake b/ports/snowhouse/portfile.cmake
index 229a6e5d5..de5fd57e5 100644
--- a/ports/snowhouse/portfile.cmake
+++ b/ports/snowhouse/portfile.cmake
@@ -3,12 +3,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO banditcpp/snowhouse
-  REF v3.0.1
-  SHA512 b20a703e79a2821bdc43b2a235ed7634499f877f9e96bd0d39eb563ce5c94d4577449cc15dc850176a1b44eb55cf3425885cb4d46a92444a7aa3001ce5d0a3eb
+  REF 5a612c248524a3b1bdd388bc0ef5a9ea0d2fa684
+  SHA512 fd737b0f433093246883975ec70a407a62547e768f538e0540ac0634db1578f0ea46979b7055ae428f146499a0df3b1d6292b8d38c22d346476211757a271d21
   HEAD_REF master
 )
 
-file(COPY ${SOURCE_PATH}/snowhouse DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h)
+file(COPY ${SOURCE_PATH}/include/snowhouse DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h)
 
 file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/snowhouse)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/snowhouse/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/snowhouse/copyright)
 \ No newline at end of file
diff --git a/ports/sol2/CONTROL b/ports/sol2/CONTROL
index eaf829c81..5d702333c 100644
--- a/ports/sol2/CONTROL
+++ b/ports/sol2/CONTROL
@@ -1,4 +1,4 @@
 Source: sol2
-Version: 2.20.6
+Version: 3.0.2
 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 86e653ac6..ee89b9f54 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 v2.20.6
-    SHA512 293df11ca2e375e60dfa7fd890b3e06aa58c0fd2f45a5a032515a2251b21e9501a2578bada446dd49b35933b69e52db8dfe8498c011e0fde7ecc0655f63ed4ed
+    REF 5a4d7dca7f77e65aed15c0fb8f8acf1570677335
+    SHA512 5fc88a000d7a8379c3c8d8ee2dc3371514c4a58dcc3340b700565278ec69b7be0f108d599e3fe3b3ca347ef7c5b25ac01d83b1a988ac0189c8517b6ae66e96d6
     HEAD_REF develop
 )
 
diff --git a/ports/spectra/CONTROL b/ports/spectra/CONTROL
index b6380bdd9..6aa712afd 100644
--- a/ports/spectra/CONTROL
+++ b/ports/spectra/CONTROL
@@ -1,4 +1,5 @@
 Source: spectra
 Version: 0.8.0
-Description: A header-only C++ library for large scale eigenvalue problems https://spectralib.org
+Description: A header-only C++ library for large scale eigenvalue problems
+Homepage: https://spectralib.org
 Build-Depends: eigen3
diff --git a/ports/sqlite-modern-cpp/CONTROL b/ports/sqlite-modern-cpp/CONTROL
index fde7c2eb1..c3e3b38be 100644
--- a/ports/sqlite-modern-cpp/CONTROL
+++ b/ports/sqlite-modern-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: sqlite-modern-cpp
-Version: 3.2-e2248fa
+Version: 3.2-936cd0c8
 Build-Depends: sqlite3
 Description: The C++14 wrapper around sqlite library
diff --git a/ports/sqlite-modern-cpp/portfile.cmake b/ports/sqlite-modern-cpp/portfile.cmake
index d51dc0bd2..35b364dde 100644
--- a/ports/sqlite-modern-cpp/portfile.cmake
+++ b/ports/sqlite-modern-cpp/portfile.cmake
@@ -3,9 +3,9 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO aminroosta/sqlite_modern_cpp
-    REF e2248fae15c9e1a240f54d29a148e501f4ea2347
-    SHA512 89f0ff234e5600ff5f51cb75934fa71d86b51f4e06f1cf4b7cffc0498985120877f8d58bbdbe02fc3cae212acc071a74cd5a3e44fdaf95c3aeaf79338f43fe9d
+    REPO SqliteModernCpp/sqlite_modern_cpp
+    REF 936cd0c86aacac87a3dab32906397944ae5f6c3d
+    SHA512 8ce1b7593fe77dcab297ab4cae0158b43d55b33c1823b2dc5bf22e5545d9781d675ba5ac82b81782f502b34d2335eee2c26167726746a61a0ad566b657d2faf0
     HEAD_REF master
 )
 
diff --git a/ports/sqlitecpp/0001-Find-external-sqlite3.patch b/ports/sqlitecpp/0001-Find-external-sqlite3.patch
index f9473ff53..a59df97ae 100644
--- a/ports/sqlitecpp/0001-Find-external-sqlite3.patch
+++ b/ports/sqlitecpp/0001-Find-external-sqlite3.patch
@@ -1,26 +1,14 @@
-From 495f0f8bf2caf158ffed78e479d68359f51289a2 Mon Sep 17 00:00:00 2001
-From: Stanislav Ershov <digital.stream.of.mind@gmail.com>
-Date: Sat, 6 Jan 2018 11:26:55 +0300
-Subject: [PATCH] Find external sqlite3
-
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4a3e492..f7e22a5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -193,7 +193,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME})
- ## Build provided copy of SQLite3 C library ##
-
- # TODO NOCOMMIT
--#find_package(sqlite3)
-+find_package(sqlite3 CONFIG)
-+target_link_libraries(SQLiteCpp PRIVATE sqlite3)
- #if(sqlite3_VERSION VERSION_LESS "3.19")
- #    set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
- #endif()
---
-2.15.0.windows.1
-
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00e058c..489b884 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,7 +199,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME})
+ ## Build provided copy of SQLite3 C library ##
+ 
+ # TODO 
+-#find_package(sqlite3)
++find_package(sqlite3 CONFIG)
++target_link_libraries(SQLiteCpp PRIVATE sqlite3)
+ #if(sqlite3_VERSION VERSION_LESS "3.19")
+ #    set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
+ #endif()
diff --git a/ports/sqlitecpp/CONTROL b/ports/sqlitecpp/CONTROL
index 3374074d1..ecb0f16e5 100644
--- a/ports/sqlitecpp/CONTROL
+++ b/ports/sqlitecpp/CONTROL
@@ -1,4 +1,4 @@
 Source: sqlitecpp
-Version: 2.2-2
+Version: 2.3.0
 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 6876bdf8c..b57573d73 100644
--- a/ports/sqlitecpp/portfile.cmake
+++ b/ports/sqlitecpp/portfile.cmake
@@ -4,9 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "SRombauts/SQLiteCpp"
-    REF "2.2.0"
+    REF 09dd10886c560ab5af41cfe694567f34c88cd101
     HEAD_REF master
-    SHA512 769857c50cc24596cbd7c6f057ca1e158a3bfecf00d7865d6ef0b90a2ff8ecb9ccb9e1d0e660bb9df8ecd50075a94a9bc9e3a71b96f2ef1c30780c6da9446cf0)
+    SHA512 d0a440e2e96fca9aac7fe73d46bb6508825a82547dca1e9c93d8c3ca46878fa137e7a2a7a865bcfa641d0236e26307a3342d55fc83578552a37eec7565642d91
+)
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/strict-variant/CONTROL b/ports/strict-variant/CONTROL
index cc8af9ef0..598dd376c 100644
--- a/ports/strict-variant/CONTROL
+++ b/ports/strict-variant/CONTROL
@@ -1,3 +1,3 @@
 Source: strict-variant
-Version: v0.5
+Version: 0.5
 Description: Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves.
diff --git a/ports/strict-variant/portfile.cmake b/ports/strict-variant/portfile.cmake
index ef0b34361..98108b9b1 100644
--- a/ports/strict-variant/portfile.cmake
+++ b/ports/strict-variant/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cbeck88/strict-variant
-    REF 5ab330edcb5e3eea67fbedf8ac89648e5bc1e9a1
-    SHA512 c80e5cd7cff389174447f5825af57ddea079956b2a4cb89337479e02289e89df19713ff031e914bdff2c823e8d2518311a1118701ae4e173f6557c770e553cd0
+    REF 6378755e3c612cd870c2720232db1e5423dbbe73
+    SHA512 45432caab51d42b86839f5ed194e79630ee5cbedd6e41eaadc10d28788ceb8c4629c0432ce888a5729266585e03cf4e6206c8ec66d1b1bc3d7d60220b3909f1d
     HEAD_REF master
 )
 
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index 50bc78830..70e21589a 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
 Source: tbb
-Version: 2019_U6
+Version: 2019_U7
 Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index 024dc67a6..119916757 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -6,9 +6,9 @@ endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO 01org/tbb
-    REF 2019_U6
-    SHA512 6513d30a498f507cb3e9a06746e430a8bc829de0d204b15d7a79f79c5e7565e59bb0b459c8ca4946293ecb25e2ce11d25cfc7f311e91c7e67342eceb31000d07
+    REPO intel/tbb
+    REF 4233fef583b4f8cbf9f781311717600feaaa0694
+    SHA512 6eb239f16e0ecacb825264869aafad7fb39aa1b1f8a3c03c92344c4255d1c1a34ca0a47a366c471fd2da808f3be14262c7e2305294677f2f490c1a48f6f76ec3
     HEAD_REF tbb_2019
 )
 
diff --git a/ports/think-cell-range/CONTROL b/ports/think-cell-range/CONTROL
index 120f2c884..985f07175 100644
--- a/ports/think-cell-range/CONTROL
+++ b/ports/think-cell-range/CONTROL
@@ -1,5 +1,6 @@
 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>
+Description: think-cell's range library
+Homepage: https://github.com/think-cell/range
 Build-Depends: boost
diff --git a/ports/tinyobjloader/CONTROL b/ports/tinyobjloader/CONTROL
index 8ec7ef7a7..f80f52f96 100644
--- a/ports/tinyobjloader/CONTROL
+++ b/ports/tinyobjloader/CONTROL
@@ -1,3 +1,3 @@
 Source: tinyobjloader
-Version: 1.4.1-1
+Version: 1.0.7
 Description: Tiny but powerful single file wavefront obj loader
diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake
index ee6d64dc7..b33a2dd74 100644
--- a/ports/tinyobjloader/portfile.cmake
+++ b/ports/tinyobjloader/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO syoyo/tinyobjloader
-    REF v1.4.1
-    SHA512 5b18fed89435a95fb3fc89829ea6904b4cc4508b0907642b39194e3e3c55678ddc1c07687e4b7ea171f270f7188ca593ed53b828c022667e54a889c36c60373e
+    REF v1.0.7
+    SHA512 e88554ead20354da443489e1b6576b328e92b2e6665071df9b6473b38c34c036dbffb6655330e970c01ccf7f99bbd4f9f5418ce48a14239576ec5e0513256637
     HEAD_REF master
 )
 
diff --git a/ports/treehopper/CONTROL b/ports/treehopper/CONTROL
index 4435c6cce..673e0cb7c 100644
--- a/ports/treehopper/CONTROL
+++ b/ports/treehopper/CONTROL
@@ -1,3 +1,4 @@
 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.
+Description: Treehopper connects the physical world to your computer, tablet, or smartphone.
+Homepage: https://treehopper.io
diff --git a/ports/trompeloeil/CONTROL b/ports/trompeloeil/CONTROL
index ee0305d51..b00d5f8aa 100644
--- a/ports/trompeloeil/CONTROL
+++ b/ports/trompeloeil/CONTROL
@@ -1,4 +1,4 @@
 Source: trompeloeil
 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
+Homepage: https://github.com/rollbear/trompeloeil
diff --git a/ports/umock-c/CONTROL b/ports/umock-c/CONTROL
index a04bdc73b..108a1dfd1 100644
--- a/ports/umock-c/CONTROL
+++ b/ports/umock-c/CONTROL
@@ -1,5 +1,5 @@
 Source: umock-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Description: A pure C mocking library
 Build-Depends: azure-macro-utils-c
 
diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL
index 1f16764c1..4eb0a976b 100644
--- a/ports/urdfdom-headers/CONTROL
+++ b/ports/urdfdom-headers/CONTROL
@@ -1,3 +1,3 @@
 Source: urdfdom-headers
-Version: 1.0.3
+Version: 1.0.4
 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 404498b1c..8670716f3 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.3
-    SHA512 44b1ca9724a9ccd5d2ad51f61d36de19b9a893955ad5c3ecfa2356f6468a0ac140b8cd6fa2aa18c163b0fa8ba87e834358369d2470cd3dee474408113a30b7a0
+    REF 00c1c9c231e46b2300d04073ad696521758fa45c
+    SHA512 8622cfad074454ae34be3e77c37b201adeb0e348df251e1c2fd57f35ae24817bbd2880a9c465056976eb8815fda041ba2fbd70ccb7cac6efc5ed3d7a082e80ef
     HEAD_REF master
   )
 
diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL
index 605f15071..c028ad14e 100644
--- a/ports/uvatlas/CONTROL
+++ b/ports/uvatlas/CONTROL
@@ -1,3 +1,3 @@
 Source: uvatlas
-Version: sept2016-1
+Version: apr2019
 Description: UVAtlas isochart texture atlas
 \ No newline at end of file
diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake
index e1a1a189f..df0d322b3 100644
--- a/ports/uvatlas/portfile.cmake
+++ b/ports/uvatlas/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/UVAtlas
-    REF sept2016
-    SHA512 326af26c151620cd5082daf3913cf3fbe7bca7d1aaf5cc44cacff54319ffe79b728c24519187c3f9393a846430d0fb9493ffe9473f87d220f5c9ae7dab73f69f
+    REF 8309d95904d3a8f3559d73e07f3a0472f161c28b
+    SHA512 e0031812824f179dffdec487b2e70fc80748a722c4bccf67a7e0bd865700b6e61e1f14160557a1a797a84a9e7cc559f5e66bd8cabd5da4728ee479e4247d9aa2
     HEAD_REF master
 )
 
@@ -48,5 +48,5 @@ file(INSTALL
 	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)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/LICENSE ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright)
diff --git a/ports/uvw/CONTROL b/ports/uvw/CONTROL
index 7c705cb5e..0db70d086 100644
--- a/ports/uvw/CONTROL
+++ b/ports/uvw/CONTROL
@@ -1,4 +1,5 @@
 Source: uvw
 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>
+Description: Header-only, event based, tiny and easy to use libuv wrapper in modern C++.
+Homepage: https://github.com/skypjack/uvw
 Build-Depends: libuv
diff --git a/ports/vlpp/CMakeLists.txt b/ports/vlpp/CMakeLists.txt
index d5fec60c4..f8df1b338 100644
--- a/ports/vlpp/CMakeLists.txt
+++ b/ports/vlpp/CMakeLists.txt
@@ -1,12 +1,13 @@
 cmake_minimum_required(VERSION 3.3.0)
 
-project(Vlpp VERSION 0.9.3.1 LANGUAGES CXX)
+project(Vlpp VERSION 0.10.0.0 LANGUAGES CXX)
 
 # Sources
 set(SRCS
   Import/Vlpp.cpp
-  Import/VlppWorkflow.cpp
-  Import/VlppWorkflowCompiler.cpp)
+  Import/VlppWorkflowLibrary.cpp
+  Import/VlppWorkflowCompiler.cpp
+  Import/VlppWorkflowRuntime.cpp)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
@@ -33,8 +34,9 @@ if (NOT DEFINED SKIP_HEADERS)
   install(
       FILES
         Import/Vlpp.h
-        Import/VlppWorkflow.h
+        Import/VlppWorkflowLibrary.h
         Import/VlppWorkflowCompiler.h
+        Import/VlppWorkflowRuntime.h
       DESTINATION "include"
     )
 endif()
diff --git a/ports/vlpp/CONTROL b/ports/vlpp/CONTROL
index 680cd2b28..13a64dfc8 100644
--- a/ports/vlpp/CONTROL
+++ b/ports/vlpp/CONTROL
@@ -1,3 +1,3 @@
 Source: vlpp
-Version: 0.9.3.1-2
+Version: 0.10.0.0
 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 a54bdfe04..4b44ea53e 100644
--- a/ports/vlpp/portfile.cmake
+++ b/ports/vlpp/portfile.cmake
@@ -5,8 +5,8 @@ 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
+    REF 579f51f5b30197386ccadcf0f3e0a3159ef3602f
+    SHA512 89cd5c86d04bc393180846c10e1122d01cd4d3ad041ca7e9199341bdc758903edf7b892a424a3b90aa2753bfede230ff3434cefd7f2fefefafa7959f5b8660d4
     HEAD_REF master
 )
 
diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
index f4a10f007..6484356ba 100644
--- a/ports/wangle/CONTROL
+++ b/ports/wangle/CONTROL
@@ -1,4 +1,4 @@
 Source: wangle
-Version: 2019.05.13.00
+Version: 2019.05.20.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/portfile.cmake b/ports/wangle/portfile.cmake
index 443cdbce9..44dc8f9f3 100644
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/wangle
-    REF v2019.05.13.00
-    SHA512 17cc164634d3bec5059abed8f28a8d5e76b6bf3475ee848c0fc0e88c59ce82d1257555a86c638484d81795b2e8f582a8559e13a195c38bdd88ae73e3a5684ffc
+    REF 19300a75c27759339c44cf06ecedf7ab00703e8b
+    SHA512 cc9a5a956862e9d4321df7c0394fbb877c5f0b0f8eae1da6aad88239a2cc0b4cd694bd25e0f70f3da8a24c34f4f035bcfb53919fd99634219e0816c78477cee2
     HEAD_REF master
     PATCHES
         build.patch
diff --git a/ports/wil/CONTROL b/ports/wil/CONTROL
index 3db06e5b9..8b589c8af 100644
--- a/ports/wil/CONTROL
+++ b/ports/wil/CONTROL
@@ -1,3 +1,3 @@
 Source: wil
-Version: 2019-05-08
+Version: 2019-06-10
 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
index 369280920..c54e097ca 100644
--- a/ports/wil/portfile.cmake
+++ b/ports/wil/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/wil
-    REF 43613517258fbd94182e195b1a4887420ed74b31
-    SHA512 cf15c8571d81b837b2ce4083d7e70d738698ff5ef99a7e99daa96618463281fc8e6642f1703d3b96de7208f7720ecf4108f6ed09b33d2980c2b609dc70fd4653
+    REF 607e3c44797e18ae050907114601a31883489254
+    SHA512 78d14f48a0d6629d72b6007e20ce4a14855667d0f9f8240b66a8cc135e079fca97926db6fc18852cd932f80b1b5a55c08cb48ca999fa9327f7e9c0586ea3ecc7
     HEAD_REF master
 )
 
diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL
index 3deb2ca48..c85f193c3 100644
--- a/ports/xeus/CONTROL
+++ b/ports/xeus/CONTROL
@@ -1,4 +1,4 @@
 Source: xeus
-Version: 0.19.1-1
+Version: 0.19.2
 Description: C++ implementation of the Jupyter kernel protocol
 Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake
index ac1dcff01..f040af0c7 100644
--- a/ports/xeus/portfile.cmake
+++ b/ports/xeus/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xeus
-    REF 0.19.1
-    SHA512 1f42cf3b5007fef957c259eee58bdc5d6b812dd32ca316823e33837d3802df0675f778a9c8f2fb97e9ff982c584229d3733e5894684e75498cc244e9c29df209
+    REF 4bc3d2017fcf35ee6e69babf9be1e463483cd11c
+    SHA512 6f68f564a3dfaab5fdfbf9778602c75c883d761e8dd00a4b19f3f57c16e87b8252d40479abdd8eedb350799479e3213f16010176da286e5c3e6c9b9e76e6793d
     HEAD_REF master
 )
 
diff --git a/ports/xmsh/portfile.cmake b/ports/xmsh/portfile.cmake
index 51897e6bd..285205b61 100644
--- a/ports/xmsh/portfile.cmake
+++ b/ports/xmsh/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_find_acquire_program(PYTHON3)
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
-  REPO nagzira/xmsh
+  REPO libxmsh/xmsh
   REF v0.4.1
   SHA512 7bd9fe9e565b33722fec37a7e3d9bd8b7b132692add5d26e31954367fb284b49a26a21532ddcb0e425af7f8208e755f21f2d8de81b33ed2a1149724f4ccd2c38
   HEAD_REF master
diff --git a/ports/z3/CONTROL b/ports/z3/CONTROL
index 9a64766a9..861c3eab4 100644
--- a/ports/z3/CONTROL
+++ b/ports/z3/CONTROL
@@ -1,3 +1,3 @@
 Source: z3
-Version: 4.8.4-1
+Version: 4.8.5
 Description: An SMT solver
diff --git a/ports/z3/fix-install-path.patch b/ports/z3/fix-install-path.patch
index 76912da62..170ca085a 100644
--- a/ports/z3/fix-install-path.patch
+++ b/ports/z3/fix-install-path.patch
@@ -1,116 +1,85 @@
-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/CMakeLists.txt b/CMakeLists.txt
+index 6e73daf63..c6bca7918 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -615,7 +615,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 "${PROJECT_BINARY_DIR}/cmake/Z3Config.cmake")
+ set(Z3_FIRST_PACKAGE_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
+@@ -640,7 +640,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 d5778add9..35b7e4c55 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 9b6f00b62..8b47125d3 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/java/CMakeLists.txt b/src/api/java/CMakeLists.txt
+index f593d91a4..70682b721 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 6cabb779a..0b79861bf 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 278246341..b6cd2f1c1 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/fix_cmake_long_dir.patch b/ports/z3/fix_cmake_long_dir.patch
deleted file mode 100644
index f7dc505d6..000000000
--- a/ports/z3/fix_cmake_long_dir.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/cmake/z3_add_component.cmake b/cmake/z3_add_component.cmake
-index 8ab6e045d..ac6d1ec06 100644
---- a/cmake/z3_add_component.cmake
-+++ b/cmake/z3_add_component.cmake
-@@ -262,18 +262,20 @@ macro(z3_add_install_tactic_rule)
-       GLOBAL
-       PROPERTY Z3_${dependency}_TACTIC_HEADERS
-     )
--    list(APPEND _tactic_header_files ${_component_tactic_header_files})
-+    list(APPEND _tactic_header_files "${_component_tactic_header_files}")
-   endforeach()
-   unset(_component_tactic_header_files)
- 
-+  string(REPLACE ";" "\n" _tactic_header_files "${_tactic_header_files}")
-+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps" ${_tactic_header_files})
-   add_custom_command(OUTPUT "install_tactic.cpp"
-     COMMAND "${PYTHON_EXECUTABLE}"
-     "${CMAKE_SOURCE_DIR}/scripts/mk_install_tactic_cpp.py"
-     "${CMAKE_CURRENT_BINARY_DIR}"
--    ${_tactic_header_files}
-+    "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps"
-     DEPENDS "${CMAKE_SOURCE_DIR}/scripts/mk_install_tactic_cpp.py"
-             ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
--            ${_tactic_header_files}
-+            "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps"
-     COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/install_tactic.cpp\""
-     ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG}
-     VERBATIM
-diff --git a/scripts/mk_install_tactic_cpp.py b/scripts/mk_install_tactic_cpp.py
-index a152eff14..b82e71354 100755
---- a/scripts/mk_install_tactic_cpp.py
-+++ b/scripts/mk_install_tactic_cpp.py
-@@ -14,19 +14,22 @@ def main(args):
-     logging.basicConfig(level=logging.INFO)
-     parser = argparse.ArgumentParser(description=__doc__)
-     parser.add_argument("destination_dir", help="destination directory")
--    parser.add_argument("header_files", nargs="+",
--                        help="One or more header files to parse")
-+    parser.add_argument("deps", help="file with header file names to parse")
-     pargs = parser.parse_args(args)
- 
-     if not mk_genfile_common.check_dir_exists(pargs.destination_dir):
-         return 1
- 
--    if not mk_genfile_common.check_files_exist(pargs.header_files):
-+    if not mk_genfile_common.check_files_exist([pargs.deps]):
-         return 1
- 
--    h_files_full_path = []
--    for header_file in pargs.header_files:
--        h_files_full_path.append(os.path.abspath(header_file))
-+    with open(pargs.deps, 'r') as f:
-+        lines = f.read().split('\n')
-+        h_files_full_path = [os.path.abspath(header_file)
-+                                for header_file in lines if header_file]
-+
-+    if not mk_genfile_common.check_files_exist(h_files_full_path):
-+        return 1
- 
-     output = mk_genfile_common.mk_install_tactic_cpp_internal(
-         h_files_full_path,
diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake
index ea27a5bd9..72da20dd9 100644
--- a/ports/z3/portfile.cmake
+++ b/ports/z3/portfile.cmake
@@ -15,11 +15,10 @@ vcpkg_add_to_path("${PYTHON2_DIR}")
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO Z3Prover/z3
-  REF z3-4.8.4
-  SHA512 4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4
+  REF Z3-4.8.5
+  SHA512 ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309
   HEAD_REF master
   PATCHES
-         fix_cmake_long_dir.patch
          fix-install-path.patch
 )
 
diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL
index 4f0e0b7ab..507c23f3a 100644
--- a/ports/zstd/CONTROL
+++ b/ports/zstd/CONTROL
@@ -1,3 +1,4 @@
 Source: zstd
 Version: 1.4.0
-Description: Zstandard - Fast real-time compression algorithm http://www.zstd.net
+Description: Zstandard - Fast real-time compression algorithm
+Homepage: http://www.zstd.net
diff --git a/ports/zstr/CONTROL b/ports/zstr/CONTROL
new file mode 100644
index 000000000..fe7e50c84
--- /dev/null
+++ b/ports/zstr/CONTROL
@@ -0,0 +1,3 @@
+Source: zstr
+Version: 1.0.1
+Description: This C++ header-only library enables the use of C++ standard iostreams to access ZLib-compressed streams.
+\ No newline at end of file
diff --git a/ports/zstr/portfile.cmake b/ports/zstr/portfile.cmake
new file mode 100644
index 000000000..61244eb60
--- /dev/null
+++ b/ports/zstr/portfile.cmake
@@ -0,0 +1,17 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO mateidavid/zstr
+  REF v1.0.1
+  SHA512 616df2394c41038bc8512748a6a699cb45310ff518e75f591c7f957d6ab3da66a384755a6015c3eb588b576940cbff429ff9798985c452b6eda6e22f94dfb264
+  HEAD_REF master
+)
+
+# Install source files
+file(INSTALL ${SOURCE_PATH}/src/strict_fstream.hpp
+     ${SOURCE_PATH}/src/zstr.hpp
+     DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
+
+# Install license
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/toolsrc/include/vcpkg/base/chrono.h b/toolsrc/include/vcpkg/base/chrono.h
index 26294fdf8..89cd15273 100644
--- a/toolsrc/include/vcpkg/base/chrono.h
+++ b/toolsrc/include/vcpkg/base/chrono.h
@@ -56,8 +56,8 @@ namespace vcpkg::Chrono
         static Optional<CTime> get_current_date_time();
         static Optional<CTime> parse(CStringView str);
 
-        constexpr CTime() noexcept : m_tm {0} {}
-        explicit constexpr CTime(tm t) noexcept : m_tm {t} {}
+        constexpr CTime() noexcept : m_tm{0} {}
+        explicit constexpr CTime(tm t) noexcept : m_tm{t} {}
 
         CTime add_hours(const int hours) const;
 
diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h
index 3165dc8ee..3a9de97df 100644
--- a/toolsrc/include/vcpkg/base/strings.h
+++ b/toolsrc/include/vcpkg/base/strings.h
@@ -43,7 +43,7 @@ namespace vcpkg::Strings::details
         t.to_string(into);
     }
 
-    template<class T, class=void, class = decltype(to_string(std::declval<std::string&>(), std::declval<const T&>()))>
+    template<class T, class = void, class = decltype(to_string(std::declval<std::string&>(), std::declval<const T&>()))>
     void append_internal(std::string& into, const T& t)
     {
         to_string(into, t);
@@ -66,7 +66,8 @@ namespace vcpkg::Strings
     }
 
     template<class... Args>
-    [[nodiscard]] std::string concat(const Args&... args) {
+    [[nodiscard]] std::string concat(const Args&... args)
+    {
         std::string ret;
         append(ret, args...);
         return ret;
@@ -113,8 +114,7 @@ namespace vcpkg::Strings
     bool starts_with(StringView s, StringView pattern);
 
     template<class InputIterator, class Transformer>
-    std::string join(const char* delimiter, InputIterator begin, InputIterator end,
-                     Transformer transformer)
+    std::string join(const char* delimiter, InputIterator begin, InputIterator end, Transformer transformer)
     {
         if (begin == end)
         {
@@ -145,8 +145,7 @@ namespace vcpkg::Strings
     std::string join(const char* delimiter, InputIterator begin, InputIterator end)
     {
         using Element = decltype(*begin);
-        return join(delimiter, begin, end,
-                    [](const Element& x) -> const Element& { return x; });
+        return join(delimiter, begin, end, [](const Element& x) -> const Element& { return x; });
     }
 
     template<class Container>
diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h
index ae5812ea7..d70fd4337 100644
--- a/toolsrc/include/vcpkg/sourceparagraph.h
+++ b/toolsrc/include/vcpkg/sourceparagraph.h
@@ -48,6 +48,7 @@ namespace vcpkg
         std::string version;
         std::string description;
         std::string maintainer;
+        std::string homepage;
         std::vector<std::string> supports;
         std::vector<Dependency> depends;
         std::vector<std::string> default_features;
diff --git a/toolsrc/src/tests.arguments.cpp b/toolsrc/src/tests.arguments.cpp
index c87281fa8..72bdbdb65 100644
--- a/toolsrc/src/tests.arguments.cpp
+++ b/toolsrc/src/tests.arguments.cpp
@@ -33,8 +33,8 @@ namespace UnitTest1
 
         TEST_METHOD(create_from_arg_sequence_valued_options)
         {
-            std::array<CommandSetting, 1> settings = { {{"--a", ""}} };
-            CommandStructure cmdstruct = { "", 0, SIZE_MAX, {{}, settings }, nullptr };
+            std::array<CommandSetting, 1> settings = {{{"--a", ""}}};
+            CommandStructure cmdstruct = {"", 0, SIZE_MAX, {{}, settings}, nullptr};
 
             std::vector<std::string> t = {"--a=b", "command", "argument"};
             auto v = VcpkgCmdArguments::create_from_arg_sequence(t.data(), t.data() + t.size());
@@ -47,8 +47,8 @@ namespace UnitTest1
 
         TEST_METHOD(create_from_arg_sequence_valued_options2)
         {
-            std::array<CommandSwitch, 2> switches = { {{"--a", ""}, {"--c", ""}} };
-            std::array<CommandSetting, 2> settings = { { {"--b", ""}, {"--d", ""}} };
+            std::array<CommandSwitch, 2> switches = {{{"--a", ""}, {"--c", ""}}};
+            std::array<CommandSetting, 2> settings = {{{"--b", ""}, {"--d", ""}}};
             CommandStructure cmdstruct = {"", 0, SIZE_MAX, {switches, settings}, nullptr};
 
             std::vector<std::string> t = {"--a", "--b=c"};
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 9102205d8..ab7586eeb 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -388,6 +388,6 @@ int main(const int argc, const char* const* const argv)
     }
     fflush(stdout);
 
-    //It is expected that one of the sub-commands will exit cleanly before we get here.
+    // 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/archives.cpp b/toolsrc/src/vcpkg/archives.cpp
index 037cbdc14..69a916828 100644
--- a/toolsrc/src/vcpkg/archives.cpp
+++ b/toolsrc/src/vcpkg/archives.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 
 #include <vcpkg/archives.h>
-#include <vcpkg/commands.h>
 #include <vcpkg/base/system.process.h>
+#include <vcpkg/commands.h>
 
 namespace vcpkg::Archives
 {
diff --git a/toolsrc/src/vcpkg/base/chrono.cpp b/toolsrc/src/vcpkg/base/chrono.cpp
index 959ff90c8..86dc590f8 100644
--- a/toolsrc/src/vcpkg/base/chrono.cpp
+++ b/toolsrc/src/vcpkg/base/chrono.cpp
@@ -22,7 +22,7 @@ namespace vcpkg::Chrono
 
     static tm to_local_time(const std::time_t& t)
     {
-        tm parts {};
+        tm parts{};
 #if defined(_WIN32)
         localtime_s(&parts, &t);
 #else
@@ -33,7 +33,7 @@ namespace vcpkg::Chrono
 
     static Optional<tm> to_utc_time(const std::time_t& t)
     {
-        tm parts {};
+        tm parts{};
 #if defined(_WIN32)
         const errno_t err = gmtime_s(&parts, &t);
         if (err)
@@ -127,7 +127,7 @@ namespace vcpkg::Chrono
         const Optional<tm> opt = to_utc_time(ct);
         if (auto p_tm = opt.get())
         {
-            return CTime {*p_tm};
+            return CTime{*p_tm};
         }
 
         return nullopt;
@@ -160,11 +160,11 @@ namespace vcpkg::Chrono
         return ret;
     }
 
-    CTime CTime::add_hours(const int hours) const { return CTime {date_plus_hours(&this->m_tm, hours)}; }
+    CTime CTime::add_hours(const int hours) const { return CTime{date_plus_hours(&this->m_tm, hours)}; }
 
     std::string CTime::to_string() const
     {
-        std::array<char, 80> date {};
+        std::array<char, 80> date{};
         strftime(&date[0], date.size(), "%Y-%m-%dT%H:%M:%S.0Z", &m_tm);
         return &date[0];
     }
diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp
index 590c48ff5..218ff86b3 100644
--- a/toolsrc/src/vcpkg/base/downloads.cpp
+++ b/toolsrc/src/vcpkg/base/downloads.cpp
@@ -44,18 +44,20 @@ namespace vcpkg::Downloads
         Checks::check_exit(VCPKG_LINE_INFO, hSession, "WinHttpOpen() failed: %d", GetLastError());
 
         // Win7 IE Proxy fallback
-        if (IsWindows7OrGreater() && !IsWindows8Point1OrGreater()) {
+        if (IsWindows7OrGreater() && !IsWindows8Point1OrGreater())
+        {
             // First check if any proxy has been found automatically
-            WINHTTP_PROXY_INFO proxyInfo;
-            DWORD proxyInfoSize = sizeof(WINHTTP_PROXY_INFO);
-            auto noProxyFound = 
-                !WinHttpQueryOption(hSession, WINHTTP_OPTION_PROXY, &proxyInfo, &proxyInfoSize) 
-                || proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY;
-
-            // If no proxy was found automatically, use IE's proxy settings, if any
-            if (noProxyFound) {
+            WINHTTP_PROXY_INFO proxyInfo;
+            DWORD proxyInfoSize = sizeof(WINHTTP_PROXY_INFO);
+            auto noProxyFound = !WinHttpQueryOption(hSession, WINHTTP_OPTION_PROXY, &proxyInfo, &proxyInfoSize) ||
+                                proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY;
+
+            // If no proxy was found automatically, use IE's proxy settings, if any
+            if (noProxyFound)
+            {
                 WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ieProxy;
-                if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr) {
+                if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr)
+                {
                     WINHTTP_PROXY_INFO proxy;
                     proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
                     proxy.lpszProxy = ieProxy.lpszProxy;
diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp
index 431491314..0396a2415 100644
--- a/toolsrc/src/vcpkg/base/files.cpp
+++ b/toolsrc/src/vcpkg/base/files.cpp
@@ -9,10 +9,10 @@
 
 #if defined(__linux__) || defined(__APPLE__)
 #include <fcntl.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <string.h>
 #endif
 #if defined(__linux__)
 #include <sys/sendfile.h>
diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp
index 132c1f074..48a701bfa 100644
--- a/toolsrc/src/vcpkg/base/system.cpp
+++ b/toolsrc/src/vcpkg/base/system.cpp
@@ -177,8 +177,8 @@ namespace vcpkg
     }
 
     std::string System::make_cmake_cmd(const fs::path& cmake_exe,
-                               const fs::path& cmake_script,
-                               const std::vector<CMakeVariable>& pass_variables)
+                                       const fs::path& cmake_script,
+                                       const std::vector<CMakeVariable>& pass_variables)
     {
         const std::string cmd_cmake_pass_variables = Strings::join(" ", pass_variables, [](auto&& v) { return v.s; });
         return Strings::format(
@@ -345,7 +345,8 @@ namespace vcpkg
     }
 #endif
 
-    int System::cmd_execute_clean(const ZStringView cmd_line, const std::unordered_map<std::string, std::string>& extra_env)
+    int System::cmd_execute_clean(const ZStringView cmd_line,
+                                  const std::unordered_map<std::string, std::string>& extra_env)
     {
         auto timer = Chrono::ElapsedTimer::create_started();
 #if defined(_WIN32)
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index 1f28e9f30..7bd6f467b 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -6,9 +6,9 @@
 #include <vcpkg/base/hash.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/stringliteral.h>
+#include <vcpkg/base/system.debug.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>
@@ -360,14 +360,13 @@ namespace vcpkg::Build
 
         const Toolset& toolset = paths.get_toolset(pre_build_info);
 
-        std::vector<System::CMakeVariable> variables {
+        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"},
+            {"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)},
@@ -380,10 +379,7 @@ namespace vcpkg::Build
             variables.push_back({"GIT", git_exe_path});
         }
 
-        const std::string cmd_launch_cmake = System::make_cmake_cmd(
-            cmake_exe_path,
-            paths.ports_cmake,
-            variables);
+        const std::string cmd_launch_cmake = System::make_cmake_cmd(cmake_exe_path, paths.ports_cmake, variables);
 
         auto command = make_build_env_cmd(pre_build_info, toolset);
         if (!command.empty())
@@ -484,14 +480,14 @@ namespace vcpkg::Build
 
         // the order of recursive_directory_iterator is undefined so save the names to sort
         std::vector<fs::path> port_files;
-        for (auto &port_file : fs::stdfs::recursive_directory_iterator(config.port_dir))
+        for (auto& port_file : fs::stdfs::recursive_directory_iterator(config.port_dir))
         {
             if (fs::is_regular_file(status(port_file)))
             {
                 port_files.push_back(port_file);
                 if (port_files.size() > max_port_file_count)
                 {
-                    abi_tag_entries.emplace_back(AbiEntry{ "no_hash_max_portfile", "" });
+                    abi_tag_entries.emplace_back(AbiEntry{"no_hash_max_portfile", ""});
                     break;
                 }
             }
@@ -502,7 +498,7 @@ namespace vcpkg::Build
             std::sort(port_files.begin(), port_files.end());
 
             int counter = 0;
-            for (auto & port_file : port_files)
+            for (auto& port_file : port_files)
             {
                 // When vcpkg takes a dependency on C++17 it can use fs::relative,
                 // which will give a stable ordering and better names in the key entry.
@@ -512,7 +508,7 @@ namespace vcpkg::Build
                 {
                     System::print2("[DEBUG] mapping ", key, " from ", port_file.u8string(), "\n");
                 }
-                abi_tag_entries.emplace_back(AbiEntry{ key, vcpkg::Hash::get_file_hash(fs, port_file, "SHA1") });
+                abi_tag_entries.emplace_back(AbiEntry{key, vcpkg::Hash::get_file_hash(fs, port_file, "SHA1")});
             }
         }
 
@@ -602,8 +598,8 @@ namespace vcpkg::Build
         System::cmd_execute_clean(Strings::format(
             R"("%s" a "%s" "%s\*" >nul)", seven_zip_exe.u8string(), destination.u8string(), source.u8string()));
 #else
-        System::cmd_execute_clean(Strings::format(
-            R"(cd '%s' && zip --quiet -r '%s' *)", source.u8string(), destination.u8string()));
+        System::cmd_execute_clean(
+            Strings::format(R"(cd '%s' && zip --quiet -r '%s' *)", source.u8string(), destination.u8string()));
 #endif
     }
 
@@ -730,7 +726,7 @@ namespace vcpkg::Build
                     const auto tmp_failure_zip = paths.buildtrees / spec.name() / "failure_logs.zip";
                     fs.create_directories(tmp_log_path_destination, ec);
 
-                    for (auto &log_file : fs::stdfs::directory_iterator(paths.buildtrees / spec.name()))
+                    for (auto& log_file : fs::stdfs::directory_iterator(paths.buildtrees / spec.name()))
                     {
                         if (log_file.path().extension() == ".log")
                         {
diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp
index 4d31c4fbe..ff7e7a134 100644
--- a/toolsrc/src/vcpkg/commands.ci.cpp
+++ b/toolsrc/src/vcpkg/commands.ci.cpp
@@ -55,27 +55,20 @@ namespace vcpkg::Commands::CI
     struct XunitTestResults
     {
     public:
+        XunitTestResults() { m_assembly_run_datetime = Chrono::CTime::get_current_date_time(); }
 
-        XunitTestResults()
+        void add_test_results(const std::string& spec,
+                              const Build::BuildResult& build_result,
+                              const Chrono::ElapsedTime& elapsed_time,
+                              const std::string& abi_tag)
         {
-            m_assembly_run_datetime = Chrono::CTime::get_current_date_time();
-        }
-
-        void add_test_results(const std::string& spec, const Build::BuildResult& build_result, const Chrono::ElapsedTime& elapsed_time, const std::string& abi_tag)
-        {
-            m_collections.back().tests.push_back({ spec, build_result, elapsed_time, abi_tag });
+            m_collections.back().tests.push_back({spec, build_result, elapsed_time, abi_tag});
         }
 
         // Starting a new test collection
-        void push_collection( const std::string& name)
-        {
-            m_collections.push_back({name});
-        }
+        void push_collection(const std::string& name) { m_collections.push_back({name}); }
 
-        void collection_time(const vcpkg::Chrono::ElapsedTime& time)
-        {
-            m_collections.back().time = time;
-        }
+        void collection_time(const vcpkg::Chrono::ElapsedTime& time) { m_collections.back().time = time; }
 
         const std::string& build_xml()
         {
@@ -96,13 +89,9 @@ namespace vcpkg::Commands::CI
             return m_xml;
         }
 
-        void assembly_time(const vcpkg::Chrono::ElapsedTime& assembly_time)
-        {
-            m_assembly_time = assembly_time;
-        }
+        void assembly_time(const vcpkg::Chrono::ElapsedTime& assembly_time) { m_assembly_time = assembly_time; }
 
     private:
-
         struct XunitTest
         {
             std::string name;
@@ -126,34 +115,33 @@ namespace vcpkg::Commands::CI
                 auto rawDateTime = m_assembly_run_datetime.get()->to_string();
                 // The expected format is "yyyy-mm-ddThh:mm:ss.0Z"
                 //                         0123456789012345678901
-                datetime = Strings::format(R"(run-date="%s" run-time="%s")",
-                    rawDateTime.substr(0, 10), rawDateTime.substr(11, 8));
+                datetime = Strings::format(
+                    R"(run-date="%s" run-time="%s")", rawDateTime.substr(0, 10), rawDateTime.substr(11, 8));
             }
 
             std::string time = Strings::format(R"(time="%lld")", m_assembly_time.as<std::chrono::seconds>().count());
 
-            m_xml += Strings::format(
-                R"(<assemblies>)" "\n"
-                R"(  <assembly name="vcpkg" %s %s>)"  "\n"
-                , datetime, time);
+            m_xml += Strings::format(R"(<assemblies>)"
+                                     "\n"
+                                     R"(  <assembly name="vcpkg" %s %s>)"
+                                     "\n",
+                                     datetime,
+                                     time);
         }
         void xml_finish_assembly()
         {
             m_xml += "  </assembly>\n"
-                "</assemblies>\n";
+                     "</assemblies>\n";
         }
 
         void xml_start_collection(const XunitCollection& collection)
         {
             m_xml += Strings::format(R"(    <collection name="%s" time="%lld">)"
-                "\n",
-                collection.name,
-                collection.time.as<std::chrono::seconds>().count());
-        }
-        void xml_finish_collection()
-        {
-            m_xml += "    </collection>\n";
+                                     "\n",
+                                     collection.name,
+                                     collection.time.as<std::chrono::seconds>().count());
         }
+        void xml_finish_collection() { m_xml += "    </collection>\n"; }
 
         void xml_test(const XunitTest& test)
         {
@@ -161,23 +149,20 @@ namespace vcpkg::Commands::CI
             const char* result_string = "";
             switch (test.result)
             {
-            case BuildResult::POST_BUILD_CHECKS_FAILED:
-            case BuildResult::FILE_CONFLICTS:
-            case BuildResult::BUILD_FAILED:
-                result_string = "Fail";
-                message_block = Strings::format("<failure><message><![CDATA[%s]]></message></failure>", to_string(test.result));
-                break;
-            case BuildResult::EXCLUDED:
-            case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES:
-                result_string = "Skip";
-                message_block = Strings::format("<reason><![CDATA[%s]]></reason>", to_string(test.result));
-                break;
-            case BuildResult::SUCCEEDED:
-                result_string = "Pass";
-                break;
-            default:
-                Checks::exit_fail(VCPKG_LINE_INFO);
-                break;
+                case BuildResult::POST_BUILD_CHECKS_FAILED:
+                case BuildResult::FILE_CONFLICTS:
+                case BuildResult::BUILD_FAILED:
+                    result_string = "Fail";
+                    message_block =
+                        Strings::format("<failure><message><![CDATA[%s]]></message></failure>", to_string(test.result));
+                    break;
+                case BuildResult::EXCLUDED:
+                case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES:
+                    result_string = "Skip";
+                    message_block = Strings::format("<reason><![CDATA[%s]]></reason>", to_string(test.result));
+                    break;
+                case BuildResult::SUCCEEDED: result_string = "Pass"; break;
+                default: Checks::exit_fail(VCPKG_LINE_INFO); break;
             }
 
             std::string traits_block;
@@ -187,13 +172,13 @@ namespace vcpkg::Commands::CI
             }
 
             m_xml += Strings::format(R"(      <test name="%s" method="%s" time="%lld" result="%s">%s%s</test>)"
-                "\n",
-                test.name,
-                test.name,
-                test.time.as<std::chrono::seconds>().count(),
-                result_string,
-                traits_block,
-                message_block);
+                                     "\n",
+                                     test.name,
+                                     test.name,
+                                     test.time.as<std::chrono::seconds>().count(),
+                                     result_string,
+                                     traits_block,
+                                     message_block);
         }
 
         Optional<vcpkg::Chrono::CTime> m_assembly_run_datetime;
@@ -203,7 +188,6 @@ namespace vcpkg::Commands::CI
         std::string m_xml;
     };
 
-
     struct UnknownCIPortsResults
     {
         std::vector<FullPackageSpec> unknown;
@@ -212,11 +196,12 @@ namespace vcpkg::Commands::CI
         std::map<PackageSpec, std::string> abi_tag_map;
     };
 
-    static std::unique_ptr<UnknownCIPortsResults> find_unknown_ports_for_ci(const VcpkgPaths& paths,
-                                                           const std::set<std::string>& exclusions,
-                                                           const Dependencies::PortFileProvider& provider,
-                                                           const std::vector<FeatureSpec>& fspecs,
-                                                           const bool purge_tombstones)
+    static std::unique_ptr<UnknownCIPortsResults> find_unknown_ports_for_ci(
+        const VcpkgPaths& paths,
+        const std::set<std::string>& exclusions,
+        const Dependencies::PortFileProvider& provider,
+        const std::vector<FeatureSpec>& fspecs,
+        const bool purge_tombstones)
     {
         auto ret = std::make_unique<UnknownCIPortsResults>();
 
@@ -251,7 +236,7 @@ namespace vcpkg::Commands::CI
                 {
                     auto triplet = p->spec.triplet();
 
-                    const Build::BuildPackageConfig build_config {
+                    const Build::BuildPackageConfig build_config{
                         *scf, triplet, paths.port_dir(p->spec), build_options, p->feature_list};
 
                     auto dependency_abis =
@@ -297,7 +282,7 @@ namespace vcpkg::Commands::CI
                 bool b_will_build = false;
 
                 ret->features.emplace(p->spec,
-                                     std::vector<std::string> {p->feature_list.begin(), p->feature_list.end()});
+                                      std::vector<std::string>{p->feature_list.begin(), p->feature_list.end()});
 
                 if (Util::Sets::contains(exclusions, p->spec.name()))
                 {
@@ -469,21 +454,27 @@ namespace vcpkg::Commands::CI
                 for (auto&& result : summary.results)
                 {
                     split_specs->known.erase(result.spec);
-                    xunitTestResults.add_test_results(result.spec.to_string(), result.build_result.code, result.timing, split_specs->abi_tag_map.at(result.spec));
+                    xunitTestResults.add_test_results(result.spec.to_string(),
+                                                      result.build_result.code,
+                                                      result.timing,
+                                                      split_specs->abi_tag_map.at(result.spec));
                 }
 
                 // Adding results for ports that were not built because they have known states
                 for (auto&& port : split_specs->known)
                 {
-                    xunitTestResults.add_test_results(port.first.to_string(), port.second, Chrono::ElapsedTime{}, split_specs->abi_tag_map.at(port.first));
+                    xunitTestResults.add_test_results(port.first.to_string(),
+                                                      port.second,
+                                                      Chrono::ElapsedTime{},
+                                                      split_specs->abi_tag_map.at(port.first));
                 }
 
                 all_known_results.emplace_back(std::move(split_specs->known));
                 abi_tag_map.insert(split_specs->abi_tag_map.begin(), split_specs->abi_tag_map.end());
 
-                results.push_back({ triplet, std::move(summary)});
+                results.push_back({triplet, std::move(summary)});
 
-                xunitTestResults.collection_time( collection_time_elapsed );
+                xunitTestResults.collection_time(collection_time_elapsed);
             }
         }
         xunitTestResults.assembly_time(timer.elapsed());
diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp
index a6f2c8838..31bf97f30 100644
--- a/toolsrc/src/vcpkg/commands.create.cpp
+++ b/toolsrc/src/vcpkg/commands.create.cpp
@@ -9,8 +9,7 @@
 namespace vcpkg::Commands::Create
 {
     const CommandStructure COMMAND_STRUCTURE = {
-        Help::create_example_string(
-            R"###(create zlib2 http://zlib.net/zlib1211.zip "zlib1211-2.zip")###"),
+        Help::create_example_string(R"###(create zlib2 http://zlib.net/zlib1211.zip "zlib1211-2.zip")###"),
         2,
         3,
         {},
diff --git a/toolsrc/src/vcpkg/commands.dependinfo.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp
index 92ba15c1f..48a289fa5 100644
--- a/toolsrc/src/vcpkg/commands.dependinfo.cpp
+++ b/toolsrc/src/vcpkg/commands.dependinfo.cpp
@@ -16,7 +16,8 @@ namespace vcpkg::Commands::DependInfo
     constexpr std::array<CommandSwitch, 3> DEPEND_SWITCHES = {{
         {OPTION_DOT, "Creates graph on basis of dot"},
         {OPTION_DGML, "Creates graph on basis of dgml"},
-        {OPTION_NO_RECURSE, "Computes only immediate dependencies of packages explicitly specified on the command-line"},
+        {OPTION_NO_RECURSE,
+         "Computes only immediate dependencies of packages explicitly specified on the command-line"},
     }};
 
     const CommandStructure COMMAND_STRUCTURE = {
diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp
index b2309aa41..98176b2b0 100644
--- a/toolsrc/src/vcpkg/commands.edit.cpp
+++ b/toolsrc/src/vcpkg/commands.edit.cpp
@@ -19,26 +19,16 @@ namespace vcpkg::Commands::Edit
             HKEY root;
             StringLiteral subkey;
         } REGKEYS[] = {
-            {
-                HKEY_LOCAL_MACHINE,
-                R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{C26E74D1-022E-4238-8B9D-1E7564A36CC9}_is1)"
-            },
-            {
-                HKEY_LOCAL_MACHINE,
-                R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1287CAD5-7C8D-410D-88B9-0D1EE4A83FF2}_is1)"
-            },
-            {
-                HKEY_LOCAL_MACHINE,
-                R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{F8A2A208-72B3-4D61-95FC-8A65D340689B}_is1)"
-            },
-            {
-                HKEY_CURRENT_USER,
-                R"(Software\Microsoft\Windows\CurrentVersion\Uninstall\{771FD6B0-FA20-440A-A002-3B3BAC16DC50}_is1)"
-            },
-            {
-                HKEY_LOCAL_MACHINE,
-                R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EA457B21-F73E-494C-ACAB-524FDE069978}_is1)"
-            },
+            {HKEY_LOCAL_MACHINE,
+             R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{C26E74D1-022E-4238-8B9D-1E7564A36CC9}_is1)"},
+            {HKEY_LOCAL_MACHINE,
+             R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1287CAD5-7C8D-410D-88B9-0D1EE4A83FF2}_is1)"},
+            {HKEY_LOCAL_MACHINE,
+             R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{F8A2A208-72B3-4D61-95FC-8A65D340689B}_is1)"},
+            {HKEY_CURRENT_USER,
+             R"(Software\Microsoft\Windows\CurrentVersion\Uninstall\{771FD6B0-FA20-440A-A002-3B3BAC16DC50}_is1)"},
+            {HKEY_LOCAL_MACHINE,
+             R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EA457B21-F73E-494C-ACAB-524FDE069978}_is1)"},
         };
 
         for (auto&& keypath : REGKEYS)
@@ -177,7 +167,8 @@ namespace vcpkg::Commands::Edit
         const std::vector<fs::path> from_registry = find_from_registry();
         candidate_paths.insert(candidate_paths.end(), from_registry.cbegin(), from_registry.cend());
 #elif defined(__APPLE__)
-        candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code"});
+        candidate_paths.push_back(
+            fs::path{"/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code"});
         candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"});
 #elif defined(__linux__)
         candidate_paths.push_back(fs::path{"/usr/share/code/bin/code"});
diff --git a/toolsrc/src/vcpkg/commands.import.cpp b/toolsrc/src/vcpkg/commands.import.cpp
index a2fd5d15d..f03140fbd 100644
--- a/toolsrc/src/vcpkg/commands.import.cpp
+++ b/toolsrc/src/vcpkg/commands.import.cpp
@@ -93,8 +93,7 @@ namespace vcpkg::Commands::Import
     }
 
     const CommandStructure COMMAND_STRUCTURE = {
-        Help::create_example_string(
-            R"(import C:\path\to\CONTROLfile C:\path\to\includedir C:\path\to\projectdir)"),
+        Help::create_example_string(R"(import C:\path\to\CONTROLfile C:\path\to\includedir C:\path\to\projectdir)"),
         3,
         3,
         {},
diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp
index 026ab3b77..ef555a844 100644
--- a/toolsrc/src/vcpkg/commands.integrate.cpp
+++ b/toolsrc/src/vcpkg/commands.integrate.cpp
@@ -124,7 +124,7 @@ namespace vcpkg::Commands::Integrate
 
     static ElevationPromptChoice elevated_cmd_execute(const std::string& param)
     {
-        SHELLEXECUTEINFOW sh_ex_info {};
+        SHELLEXECUTEINFOW sh_ex_info{};
         sh_ex_info.cbSize = sizeof(sh_ex_info);
         sh_ex_info.fMask = SEE_MASK_NOCLOSEPROCESS;
         sh_ex_info.hwnd = nullptr;
@@ -415,7 +415,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
     static void integrate_bash(const VcpkgPaths& paths)
     {
         const auto home_path = System::get_environment_variable("HOME").value_or_exit(VCPKG_LINE_INFO);
-        const fs::path bashrc_path = fs::path {home_path} / ".bashrc";
+        const fs::path bashrc_path = fs::path{home_path} / ".bashrc";
 
         auto& fs = paths.get_filesystem();
         const fs::path completion_script_path = paths.scripts / "vcpkg_completion.bash";
@@ -430,7 +430,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
         for (auto&& line : bashrc_content)
         {
             std::smatch match;
-            if (std::regex_match(line, match, std::regex {R"###(^source.*scripts/vcpkg_completion.bash$)###"}))
+            if (std::regex_match(line, match, std::regex{R"###(^source.*scripts/vcpkg_completion.bash$)###"}))
             {
                 matches.push_back(line);
             }
@@ -439,11 +439,11 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
         if (!matches.empty())
         {
             System::printf("vcpkg bash completion is already imported to your %s file.\n"
-                          "The following entries were found:\n"
-                          "    %s\n"
-                          "Please make sure you have started a new bash shell for the changes to take effect.\n",
-                          bashrc_path.u8string(),
-                          Strings::join("\n    ", matches));
+                           "The following entries were found:\n"
+                           "    %s\n"
+                           "Please make sure you have started a new bash shell for the changes to take effect.\n",
+                           bashrc_path.u8string(),
+                           Strings::join("\n    ", matches));
             Checks::exit_success(VCPKG_LINE_INFO);
         }
 
diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp
index f6a95b61f..433d7a1af 100644
--- a/toolsrc/src/vcpkg/export.cpp
+++ b/toolsrc/src/vcpkg/export.cpp
@@ -229,10 +229,10 @@ namespace vcpkg::Export
     {
         const std::vector<fs::path> integration_files_relative_to_root = {
             {".vcpkg-root"},
-            {fs::path {"scripts"} / "buildsystems" / "msbuild" / "applocal.ps1"},
-            {fs::path {"scripts"} / "buildsystems" / "msbuild" / "vcpkg.targets"},
-            {fs::path {"scripts"} / "buildsystems" / "vcpkg.cmake"},
-            {fs::path {"scripts"} / "cmake" / "vcpkg_get_windows_sdk.cmake"},
+            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "applocal.ps1"},
+            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "vcpkg.targets"},
+            {fs::path{"scripts"} / "buildsystems" / "vcpkg.cmake"},
+            {fs::path{"scripts"} / "cmake" / "vcpkg_get_windows_sdk.cmake"},
         };
 
         for (const fs::path& file : integration_files_relative_to_root)
diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp
index 7fb304c17..adab4249f 100644
--- a/toolsrc/src/vcpkg/install.cpp
+++ b/toolsrc/src/vcpkg/install.cpp
@@ -156,14 +156,15 @@ namespace vcpkg::Install
 
             const std::string name = t.pgh.package.displayname();
 
-            for (const std::string &file : t.files)
+            for (const std::string& file : t.files)
             {
                 output.emplace_back(file_pack{std::string(file, remove_chars), name});
             }
         }
 
-        std::sort(output.begin(), output.end(),
-                  [](const file_pack &lhs, const file_pack &rhs) { return lhs.first < rhs.first; });
+        std::sort(output.begin(), output.end(), [](const file_pack& lhs, const file_pack& rhs) {
+            return lhs.first < rhs.first;
+        });
         return output;
     }
 
@@ -180,8 +181,7 @@ namespace vcpkg::Install
     }
 
     static SortedVector<file_pack> build_list_of_installed_files(
-        const std::vector<StatusParagraphAndAssociatedFiles>& pgh_and_files,
-        const Triplet& triplet)
+        const std::vector<StatusParagraphAndAssociatedFiles>& pgh_and_files, const Triplet& triplet)
     {
         const size_t installed_remove_char_count = triplet.canonical_name().size() + 1; // +1 for the slash
         std::vector<file_pack> installed_files =
@@ -198,13 +198,12 @@ namespace vcpkg::Install
 
         const SortedVector<std::string> package_files =
             build_list_of_package_files(paths.get_filesystem(), package_dir);
-        const SortedVector<file_pack> installed_files =
-            build_list_of_installed_files(pgh_and_files, triplet);
+        const SortedVector<file_pack> installed_files = build_list_of_installed_files(pgh_and_files, triplet);
 
         struct intersection_compare
         {
-            bool operator()(const std::string &lhs, const file_pack &rhs) { return lhs < rhs.first; }
-            bool operator()(const file_pack &lhs, const std::string &rhs) { return lhs.first < rhs; }
+            bool operator()(const std::string& lhs, const file_pack& rhs) { return lhs < rhs.first; }
+            bool operator()(const file_pack& lhs, const std::string& rhs) { return lhs.first < rhs; }
         };
 
         std::vector<file_pack> intersection;
@@ -216,11 +215,9 @@ namespace vcpkg::Install
                               std::back_inserter(intersection),
                               intersection_compare());
 
-        std::sort(intersection.begin(), intersection.end(),
-                  [](const file_pack &lhs, const file_pack &rhs)
-                  {
-                      return lhs.second < rhs.second;
-                  });
+        std::sort(intersection.begin(), intersection.end(), [](const file_pack& lhs, const file_pack& rhs) {
+            return lhs.second < rhs.second;
+        });
 
         if (!intersection.empty())
         {
@@ -231,19 +228,13 @@ namespace vcpkg::Install
                            bcf.core_paragraph.spec);
 
             auto i = intersection.begin();
-            while (i != intersection.end()) {
+            while (i != intersection.end())
+            {
                 System::print2("Installed by ", i->second, "\n    ");
-                auto next = std::find_if(i, intersection.end(),
-                                         [i](const auto &val)
-                                         {
-                                             return i->second != val.second;
-                                         });
-
-                System::print2(Strings::join("\n    ", i, next,
-                                             [](const file_pack &file)
-                                             {
-                                                 return file.first;
-                                             }));
+                auto next =
+                    std::find_if(i, intersection.end(), [i](const auto& val) { return i->second != val.second; });
+
+                System::print2(Strings::join("\n    ", i, next, [](const file_pack& file) { return file.first; }));
                 System::print2("\n\n");
 
                 i = next;
@@ -372,9 +363,8 @@ namespace vcpkg::Install
                 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);
+                for (auto& p : fs.get_files_non_recursive(download_dir))
+                    if (!fs.is_directory(p)) fs.remove(p);
             }
 
             return {code, std::move(bcf)};
diff --git a/toolsrc/src/vcpkg/packagespecparseresult.cpp b/toolsrc/src/vcpkg/packagespecparseresult.cpp
index c5254f7be..ef078ea28 100644
--- a/toolsrc/src/vcpkg/packagespecparseresult.cpp
+++ b/toolsrc/src/vcpkg/packagespecparseresult.cpp
@@ -19,8 +19,5 @@ namespace vcpkg
         }
     }
 
-    void to_string(std::string& out, PackageSpecParseResult p)
-    {
-        out.append(vcpkg::to_string(p).c_str());
-    }
+    void to_string(std::string& out, PackageSpecParseResult p) { out.append(vcpkg::to_string(p).c_str()); }
 }
diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp
index 431fad5ca..21ef2c4d9 100644
--- a/toolsrc/src/vcpkg/paragraphs.cpp
+++ b/toolsrc/src/vcpkg/paragraphs.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"
 
 #include <vcpkg/base/files.h>
+#include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/util.h>
-#include <vcpkg/base/system.debug.h>
 #include <vcpkg/paragraphparseresult.h>
 #include <vcpkg/paragraphs.h>
 
diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp
index b495c5f1d..9bc59cbe7 100644
--- a/toolsrc/src/vcpkg/sourceparagraph.cpp
+++ b/toolsrc/src/vcpkg/sourceparagraph.cpp
@@ -24,6 +24,7 @@ namespace vcpkg
         static const std::string SOURCE = "Source";
         static const std::string SUPPORTS = "Supports";
         static const std::string VERSION = "Version";
+        static const std::string HOMEPAGE = "Homepage";
     }
 
     static Span<const std::string> get_list_of_valid_fields()
@@ -34,6 +35,7 @@ namespace vcpkg
             SourceParagraphFields::DESCRIPTION,
             SourceParagraphFields::MAINTAINER,
             SourceParagraphFields::BUILD_DEPENDS,
+            SourceParagraphFields::HOMEPAGE,
         };
 
         return valid_fields;
@@ -107,6 +109,7 @@ namespace vcpkg
 
         spgh->description = parser.optional_field(SourceParagraphFields::DESCRIPTION);
         spgh->maintainer = parser.optional_field(SourceParagraphFields::MAINTAINER);
+        spgh->homepage = parser.optional_field(SourceParagraphFields::HOMEPAGE);
         spgh->depends = expand_qualified_dependencies(
             parse_comma_list(parser.optional_field(SourceParagraphFields::BUILD_DEPENDS)));
         spgh->supports = parse_comma_list(parser.optional_field(SourceParagraphFields::SUPPORTS));
diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp
index 7232971c7..2fdfbe0f2 100644
--- a/toolsrc/src/vcpkg/tools.cpp
+++ b/toolsrc/src/vcpkg/tools.cpp
@@ -62,7 +62,7 @@ namespace vcpkg
 #if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__)
         static const std::string XML_VERSION = "2";
         static const fs::path XML_PATH = paths.scripts / "vcpkgTools.xml";
-        static const std::regex XML_VERSION_REGEX {R"###(<tools[\s]+version="([^"]+)">)###"};
+        static const std::regex XML_VERSION_REGEX{R"###(<tools[\s]+version="([^"]+)">)###"};
         static const std::string XML = paths.get_filesystem().read_contents(XML_PATH).value_or_exit(VCPKG_LINE_INFO);
         std::smatch match_xml_version;
         const bool has_xml_version = std::regex_search(XML.cbegin(), XML.cend(), match_xml_version, XML_VERSION_REGEX);
@@ -78,7 +78,7 @@ namespace vcpkg
                            XML_VERSION,
                            match_xml_version[1]);
 
-        const std::regex tool_regex {Strings::format(R"###(<tool[\s]+name="%s"[\s]+os="%s">)###", tool, OS_STRING)};
+        const std::regex tool_regex{Strings::format(R"###(<tool[\s]+name="%s"[\s]+os="%s">)###", tool, OS_STRING)};
         std::smatch match_tool_entry;
         const bool has_tool_entry = std::regex_search(XML.cbegin(), XML.cend(), match_tool_entry, tool_regex);
         if (!has_tool_entry)
@@ -109,13 +109,13 @@ namespace vcpkg
         const fs::path tool_dir_path = paths.tools / tool_dir_name;
         const fs::path exe_path = tool_dir_path / exe_relative_path;
 
-        return ToolData {*version.get(),
-                         exe_path,
-                         url,
-                         paths.downloads / archive_name.value_or(exe_relative_path).to_string(),
-                         archive_name.has_value(),
-                         tool_dir_path,
-                         sha512};
+        return ToolData{*version.get(),
+                        exe_path,
+                        url,
+                        paths.downloads / archive_name.value_or(exe_relative_path).to_string(),
+                        archive_name.has_value(),
+                        tool_dir_path,
+                        sha512};
 #endif
     }
 
@@ -156,7 +156,7 @@ namespace vcpkg
                  actual_version[2] >= expected_version[2]);
             if (!version_acceptable) continue;
 
-            return PathAndVersion {candidate, *version};
+            return PathAndVersion{candidate, *version};
         }
 
         return nullopt;
diff --git a/toolsrc/src/vcpkg/userconfig.cpp b/toolsrc/src/vcpkg/userconfig.cpp
index 4945fdaaa..a7c4e2765 100644
--- a/toolsrc/src/vcpkg/userconfig.cpp
+++ b/toolsrc/src/vcpkg/userconfig.cpp
@@ -39,10 +39,7 @@ namespace vcpkg
 #endif
     }
 
-    static fs::path get_config_path()
-    {
-        return get_user_dir() / "config";
-    }
+    static fs::path get_config_path() { return get_user_dir() / "config"; }
 
     UserConfig UserConfig::try_read_data(const Files::Filesystem& fs)
     {