diff --git a/docs/about/faq.md b/docs/about/faq.md
index b83674d057b682..504738479defb9 100644
--- a/docs/about/faq.md
+++ b/docs/about/faq.md
@@ -1,7 +1,7 @@
 # Frequently Asked Questions
 
 ## Can I contribute a new library?
-Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md).
+Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md).  If you want to contribute but don't have a particular library in mind then take a look at the list of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+port+request+-+consider+making+a+PR%21%22).
 
 ## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg?
 Yes! See [the `export` command](../users/integration.md#export).
diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md
index eb03f1d9419fc3..dc2a255f8868fc 100644
--- a/docs/maintainers/control-files.md
+++ b/docs/maintainers/control-files.md
@@ -1,81 +1,126 @@
 # CONTROL files
 
-Each port has some static metadata in the form of a `CONTROL` file. This file uses the same syntax and a subset of the fields from [the Debian `control` format][debian].
+The `CONTROL` file contains metadata about the port.  The syntax is based on [the Debian `control` format][debian] although we only support the subset of fields documented here.
 
-Field names are case-sensitive.
+Field names are case-sensitive and start the line without leading whitespace.  Paragraphs are separated by one or more empty lines.
 
 [debian]: https://www.debian.org/doc/debian-policy/ch-controlfields.html
 
 ## Source Paragraph
 
-The first paragraph appearing in a `CONTROL` file is the Source paragraph, which defines the core attributes of the package (name, version, and so on).
+The first paragraph in a `CONTROL` file is the Source paragraph.  It must have a `Source`, `Version`, and `Description` field.  It can optionally have a `Build-Depends` and `Default-Features` field.
+
+### Examples:
+```no-highlight
+Source: ace
+Version: 6.5.5-1
+Description: The ADAPTIVE Communication Environment
+```
 
-### Example:
 ```no-highlight
 Source: vtk
-Version: 8.1.0-1
+Version: 8.2.0-2
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
 ```
 
+
 ### Recognized fields
 
 #### Source
 The name of the port.
 
+When adding new ports be aware that the name may conflict with other projects that are not a part of vcpkg.  To avoid conflicts verify the name on a service like [Repology][repology].  For example `json` conflicts with too many other projects so you should add a scope to the name such as `taocpp-json` to make it unique.
+
+[repology]: https://repology.org/projects/
+
 #### Version
 The port version.
 
-This field should be an alphanumeric string which may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bitstrings and are only evaluated for equality.
+This field is an alphanumeric string that may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bit strings and are only evaluated for equality.
 
 By convention, if a portfile is modified without incrementing the "upstream" version, a `-#` is appended to create a unique version string.
 
+Some projects do not have named releases.  In these cases use the date of the version   do not have labeled releases, in these cases use the date of the last commit in `YYYY-MM-DD` format.  See the `abseil` port as an example.
+
 Example:
 ```no-highlight
 Version: 1.0.5-2
 ```
+```no-highlight
+Version: 2019-3-21
+```
 
 #### Description
 A description of the library
 
-The first sentence of the description should concisely describe the purpose and contents of the library. Then, a larger description including the library's "proper name" should follow.
+By convention the first line of the description is a summary of the library.  An optional detailed description follows.  The detailed description can be multiple lines, all starting with whitespace.
 
-#### Maintainer
-Reserved for future use.
+Example:
+```no-highlight
+Description: C++ header-only JSON library
+```
+```no-highlight
+Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.
+  MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine 
+  to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
+````
 
 #### Build-Depends
-The list of dependencies required to build and use this library.
+Comma separated list of vcpkg ports the library has a dependency on.
+
+Vcpkg does not distinguish between build-only dependencies and runtime dependencies. The complete list of dependencies needed to successfully use the library should be specified.
+
+*For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies*
 
 Example:
 ```no-highlight
 Build-Depends: zlib, libpng, libjpeg-turbo, tiff
 ```
+If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax.
 
-Unlike dpkg, Vcpkg does not distinguish between build-only dependencies and runtime dependencies. The complete list of dependencies needed to successfully use the library should be specified.
+Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name.  There must be a space between the name of the port and the filter. __This will change in a future version to not depend on the triplet name.__
 
-*For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies*
+Example:
+```no-highlight
+Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[darwinssl] (osx)
+```
 
-Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name. __This will change in a future version to not depend on the triplet name.__
+#### Default-Feature
+Comma separated list of optional port features to install by default.
+
+This field is optional.
 
-Example:
 ```no-highlight
-Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (windows)
+Default-Features: dynamodb, s3, kinesis
 ```
 
 ## Feature Paragraphs
 
-After the Source Paragraph, `CONTROL` files can list zero or more Feature Paragraphs which declare features.
+Multiple optional features can be specified in the `CONTROL` files.  It must have a `Feature` and `Description` field.  It can optionally have a `Build-Depends` field.  It must be separated from other paragraphs by one or more empty lines.
 
 ### Example:
 ```no-highlight
 Source: vtk
-Version: 8.1.0-1
+Version: 8.2.0-2
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
+
+Feature: openvr
+Description: OpenVR functionality for VTK
+Build-Depends: sdl2, openvr
+
+Feature: qt
+Description: Qt functionality for VTK
+Build-Depends: qt5
 
 Feature: mpi
 Description: MPI functionality for VTK
 Build-Depends: msmpi, hdf5[parallel]
+
+Feature: python
+Description: Python functionality for VTK
+Build-Depends: python3
 ```
 
 ### Recognized fields
@@ -84,9 +129,9 @@ Build-Depends: msmpi, hdf5[parallel]
 The name of the feature.
 
 #### Description
-A description of the feature
+A description of the feature using the same syntax as the port  `Description` field.
 
 #### Build-Depends
 The list of dependencies required to build and use this feature.
 
-All dependencies from selected features are unioned together to produce the final dependency set for the build. This field follows the same syntax as `Build-Depends` in the Source Paragraph.
+On installation the dependencies from all selected features are combined to produce the full dependency list for the build. This field follows the same syntax as `Build-Depends` in the Source Paragraph.
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
index 99581e89f104fb..65c35d7ecade54 100644
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@@ -1,5 +1,5 @@
 Source: abseil
-Version: 2019-04-19-1
+Version: 2019-05-08
 Description: an open-source collection designed to augment the C++ standard library.
   Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
   In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index 37f3ae22d6bcac..b1461822990bb9 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
-    REF d902eb869bcfacc1bad14933ed9af4bed006d481
-    SHA512 660a6cc6250460b6d76e0fd3a0193bf41e69bf6a95361d2f0562b00cf4cb4a36fe0b07e1172faba190743d1b3a3dc96b834a080cdaded3cbdea2fc0392094cde
+    REF aa468ad75539619b47979911297efbb629c52e44
+    SHA512 4254d8599103d8f06b03f60a0386eba07f314184217d0bca404d41fc0bd0a8df287fe6d07158d10cde096af3097aff2ecc1a5e8f7c3046ecf956b5fde709ad1d
     HEAD_REF master
     PATCHES fix-usage-lnk-error.patch
 )
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 9d4d36cd55da24..8b76f644a2af8c 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -1,3 +1,13 @@
 Source: ace
 Version: 6.5.5-1
 Description: The ADAPTIVE Communication Environment
+
+Feature: wchar
+Description: Enable extra wide char functions in ACE
+
+Feature: ssl
+Description: Enable SSL/TLS features in ACE
+Build-Depends: openssl
+
+Feature: xml
+Description: Enable XML features in ACE
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index d33028c9a52c28..264829dfb2b348 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -2,6 +2,21 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
 
+if("wchar" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "uses_wchar=1")
+endif()
+if("zlib" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "zlib=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "zlib=0")
+endif()
+if("ssl" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "ssl=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "ssl=0")
+endif()
+list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
   if(NOT VCPKG_CMAKE_SYSTEM_NAME)
     set(DLL_DECORATOR s)
@@ -58,7 +73,7 @@ endif()
 
 # Invoke mwc.pl to generate the necessary solution and project files
 vcpkg_execute_required_process(
-    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} ace ${MPC_STATIC_FLAG}
+    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG}
     WORKING_DIRECTORY ${ACE_ROOT}
     LOGNAME mwc-${TARGET_TRIPLET}
 )
@@ -67,6 +82,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   vcpkg_build_msbuild(
     PROJECT_PATH ${SOURCE_PATH}/ace.sln
     PLATFORM ${MSBUILD_PLATFORM}
+    USE_VCPKG_INTEGRATION
   )
 endif()
 
@@ -106,6 +122,9 @@ install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/arpa")
 install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/net")
 install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/netinet")
 install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/sys")
+if("ssl" IN_LIST FEATURES)
+    install_ace_headers_subdirectory(${SOURCE_PATH} "SSL")
+endif()
 
 # Install the libraries
 function(install_ace_library SOURCE_PATH ACE_LIBRARY)
@@ -143,6 +162,9 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   install_ace_library(${ACE_ROOT} "ACE_QoS")
 endif()
 install_ace_library(${ACE_ROOT} "ACE_RLECompression")
+if("ssl" IN_LIST FEATURES)
+    install_ace_library(${ACE_ROOT} "ACE_SSL")
+endif()
 
 # Handle copyright
 file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL
index bea89f8ec578db..504cae2340c2d5 100644
--- a/ports/assimp/CONTROL
+++ b/ports/assimp/CONTROL
@@ -1,4 +1,4 @@
 Source: assimp
-Version: 4.1.0-4
+Version: 4.1.0-4
 Description: The Open Asset import library
 Build-Depends: zlib, rapidjson
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index db5f3a01fec329..c0fa9d672a2276 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.7.89
+Version: 1.7.100
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
 Default-Features: dynamodb, s3, kinesis
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 39d8b73b961544..8dbadf10d1831a 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -10,8 +10,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
-    REF 1.7.89
-    SHA512 2f3702f193f7816615d08d55adfffaf93ec8119a0af32db4afbf6ba591500d24fdd334566cebae0586d8bd3bd27950e71fd257fc5cc3012f74ed58d464fd733d
+    REF 1.7.100
+    SHA512 543eee9c0367131756b274ab9f8f42e3c889f3f54c5f0b7cd6fa68cab5fd009ba9cb87f8029a81d260b1ea2adfb7c3b3ab07a989054e2480e47b41c15887f0f8
     HEAD_REF master
 )
 
diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL
index 55ca2a8c384a91..b9efe8ee6dad70 100644
--- a/ports/breakpad/CONTROL
+++ b/ports/breakpad/CONTROL
@@ -1,4 +1,4 @@
 Source: breakpad
-Version: 2018-09-18
+Version: 2019-05-08
 Build-Depends: libdisasm
 Description: a set of client and server components which implement a crash-reporting system.
diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake
index 18b1b8152efacd..9bab01f233ea46 100644
--- a/ports/breakpad/portfile.cmake
+++ b/ports/breakpad/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/breakpad
-    REF 54fa71efbe50fb2b58096d871575b59e12edba6d
-    SHA512 ecd1c6c5cc0e3984d05fe86ec11172e93b0e31c39ce0af9d0de08b8d03083686e2288e0cd787180c599446c277e58f48550ce4ab718019576c64fc403a592745
+    REF 21b48a72aa50dde84149267f6b7402522b846b24
+    SHA512 4ca2f877871c0a79c24ce4cc592dddb3ac4c2eac2a5962dad6d3d94edc91ac82afec3d7e4e7f81e7d9916eb83f8708e66759c38a6ef0e1b2c19691dd1518558a
     HEAD_REF master
 )
 
diff --git a/ports/butteraugli/CONTROL b/ports/butteraugli/CONTROL
index 848b5eb827d82b..621e42a8afbaa1 100644
--- a/ports/butteraugli/CONTROL
+++ b/ports/butteraugli/CONTROL
@@ -1,4 +1,4 @@
 Source: butteraugli
-Version: 2018-02-25-1
+Version: 2019-05-08
 Description: butteraugli estimates the psychovisual difference between two images
 Build-Depends: libpng, libjpeg-turbo
diff --git a/ports/butteraugli/portfile.cmake b/ports/butteraugli/portfile.cmake
index b044b1694600e9..a3fb2a19d84315 100644
--- a/ports/butteraugli/portfile.cmake
+++ b/ports/butteraugli/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/butteraugli
-    REF 856a4da68d02d30e3bf843e33536f2b3a698b249
-    SHA512 f02ee97f186b59cc685a63095e5618aedbfebf08ab2cf438189fc4214c7d562506368ec210c08df236132dc2f855b6b0a6226bd6dc27c1c04e9c1b0b0ac4f1df
+    REF 71b18b636b9c7d1ae0c1d3730b85b3c127eb4511
+    SHA512 2e73f8ad8953307eea956ed8bd828e110419d6d9f8a42685d225953d3a8017a79d0701bde0282459dc51198e75a99dcd99dd3c4e7ef065736c512a7b11ea0fdf
     HEAD_REF master
 )
 
diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL
index 64d42a4da4ba98..f4a4383571e471 100644
--- a/ports/caf/CONTROL
+++ b/ports/caf/CONTROL
@@ -1,4 +1,4 @@
 Source: caf
-Version: 0.16.2-1
+Version: 0.16.3
 Build-Depends: openssl
 Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake
index 3ee26634c01335..2e34e888e9ec58 100644
--- a/ports/caf/portfile.cmake
+++ b/ports/caf/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO actor-framework/actor-framework
-    REF 2cc4377715afc3d3c35848f9d59b9e6876afd875
-    SHA512 7e7962bf5a30122bde8be63f6de0058f865bd890e2d10f4d90f4885b7953467fb6532f69c1a77a35802de7c531f6aac192a2993b53a8dc0b05f503c3f4083a31
+    REF 0.16.3
+    SHA512 f7e567264ea1686a431eacbf2a62f49c0f4467df073ec983ae622d9417c28124eb456eb40d6a70dbe062ad58333944924f04f7e3fee5a7b76917890d98bedce1
     HEAD_REF master
 	PATCHES
 		openssl-version-override.patch
diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL
index 9e22c33b6af458..0ee85a8b1abbf5 100644
--- a/ports/cartographer/CONTROL
+++ b/ports/cartographer/CONTROL
@@ -1,4 +1,4 @@
 Source: cartographer
-Version: 0.3.0-6
+Version: 0.3.0-6
 Build-Depends: ceres[eigensparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
 Description: Google 2D & 3D SLAM package
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
index c65c514085a3b9..7f78259dbb00b8 100644
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
 Source: catch2
-Version: 2.7.1
+Version: 2.7.2
 Description: A modern, header-only test framework for unit testing.
   Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index 32121c9885a4a9..372b627aca5d2a 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
-    REF v2.7.1
-    SHA512 1566f63122984a8f29645db8e76028ba2559bb4b812f1e15081f79725530effe2ff432b6f61f404dc2b386829004d126b9511053d25a811c017f3102a01608a1
+    REF v2.7.2
+    SHA512 ac58cb3b676c73a361a494492e7b1f1b85cba7d08feb2d09b2269109a89b66aa37efead6b0a9fca64678f42a3395a3b02b6d461b4cb35310451ce849a79d04ae
     HEAD_REF master
 )
 
diff --git a/ports/cgltf/CONTROL b/ports/cgltf/CONTROL
new file mode 100644
index 00000000000000..4967e5715c5a24
--- /dev/null
+++ b/ports/cgltf/CONTROL
@@ -0,0 +1,3 @@
+Source: cgltf
+Version: 2019-04-30
+Description: Single-file glTF 2.0 parser written in C99
diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake
new file mode 100644
index 00000000000000..2d1569196dff35
--- /dev/null
+++ b/ports/cgltf/portfile.cmake
@@ -0,0 +1,16 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jkuhlmann/cgltf
+    REF 093ef81bf63ec18ba6d9f61073da8881fb7619b3
+    SHA512 8801c13ee98780e845c7d28b27d523af86ab2a49499bbb235ee67a91dfacda3c7fddc9503d91918001a432267f890e82c2204a9c1462c64467034d334b0eadf2
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/cgltf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL
index 26237ad3d1222f..f084a526e82976 100644
--- a/ports/cimg/CONTROL
+++ b/ports/cimg/CONTROL
@@ -1,3 +1,3 @@
 Source: cimg
-Version: 2.5.7
+Version: 2.6.1
 Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing
diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake
index c0e5a81fcf2a50..2a2786986f2afe 100644
--- a/ports/cimg/portfile.cmake
+++ b/ports/cimg/portfile.cmake
@@ -2,9 +2,9 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "dtschump/CImg"
-    REF v.2.5.7
+    REF v.2.6.1
     HEAD_REF master
-    SHA512 d74dd4d8996ab11a6c872450b2c3f37d3d6699d06c77894c8943829c305678e459a740688d9fae251b23e34fc264fea3948b77d5c7a6ff1d0e908003bc963b90)
+    SHA512 06efe9e2f79a6564f5161da73c3b42ed456a503fd18aa1b9803a9093807656a0095e4020d032d9390718cf97e260beafb5ff82d1dba8a1c3b7bb1e2992273c88)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL
index c354edbab15e42..d3f13de82ad50c 100644
--- a/ports/cppgraphqlgen/CONTROL
+++ b/ports/cppgraphqlgen/CONTROL
@@ -1,4 +1,4 @@
 Source: cppgraphqlgen
-Version: 3.0.0-pre
+Version: 3.0.0
 Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson
 Description: C++ GraphQL schema service generator
diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake
index 3cd60f9a21b6e2..5c92e1a60b4a74 100644
--- a/ports/cppgraphqlgen/portfile.cmake
+++ b/ports/cppgraphqlgen/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cppgraphqlgen
-    REF 692dcca912ec7383f80bfd2d922ff4e7c1a754b7
-    SHA512 8134fba7296a3c1af14fd35bf119e7706498941bf91554bc8c832bdc806b2770759eb20af79f165ebbeb3b4bd4642e74c30ec10f23c1ccd2cb759a0ffc7646bb
+    REF v3.0.0
+    SHA512 26da9b559b7220f44bc1aabd68250a4cf869329a5496ac439f9bc7cea5137e0ef9068dc6e868adf441cd5c212f21dd08f0a21db393eb4c237525961eefd49389
     HEAD_REF master
 )
 
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index 02fe11dcba5d72..e5331ab1489ed0 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,6 +1,6 @@
 Source: cpprestsdk
-Version: 2.10.13
-Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows)
+Version: 2.10.13-1
+Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows), boost-asio (!uwp&!windows)
 Description: C++11 JSON, REST, and OAuth library
   The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
 Default-Features: default-features
diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch
new file mode 100644
index 00000000000000..9b9b11352d5372
--- /dev/null
+++ b/ports/cpr/001-cpr-config.patch
@@ -0,0 +1,94 @@
+diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt
+index a6db5bd..90bec48 100644
+--- a/cpr/CMakeLists.txt
++++ b/cpr/CMakeLists.txt
+@@ -1,47 +1,46 @@
+-message(STATUS "Using CURL_INCLUDE_DIRS: ${CURL_INCLUDE_DIRS}.")
+-include_directories(
+-    ${CPR_INCLUDE_DIRS}
+-    ${CURL_INCLUDE_DIRS})
+-
+ add_library(${CPR_LIBRARIES}
++  auth.cpp
++  cookies.cpp
++  cprtypes.cpp
++  digest.cpp
++  error.cpp
++  multipart.cpp
++  parameters.cpp
++  payload.cpp
++  proxies.cpp
++  session.cpp
++  timeout.cpp
++  util.cpp
++  ssl_options.cpp
++)
++
++target_link_libraries( ${CPR_LIBRARIES}
++  PUBLIC ${CURL_LIBRARIES}
++)
++
++target_include_directories(${CPR_LIBRARIES}
++  PUBLIC 
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
++    $<INSTALL_INTERFACE:include>
++  PRIVATE
++    $<BUILD_INTERFACE:${CURL_INCLUDE_DIRS}>
++)
++
+ 
+-    # Source files
+-    auth.cpp
+-    cookies.cpp
+-    cprtypes.cpp
+-    digest.cpp
+-    error.cpp
+-    multipart.cpp
+-    parameters.cpp
+-    payload.cpp
+-    proxies.cpp
+-    session.cpp
+-    timeout.cpp
+-    util.cpp
+-    ssl_options.cpp
++set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
++install(
++  TARGETS ${CPR_LIBRARIES}
++  EXPORT ${TARGETS_EXPORT_NAME}
++  RUNTIME DESTINATION bin
++  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib
++)
+ 
+-    # Header files (useful in IDEs)
+-    "${CPR_INCLUDE_DIRS}/cpr/api.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/auth.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/body.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/cookies.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/cpr.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/cprtypes.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/curlholder.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/defines.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/digest.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/error.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/max_redirects.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/multipart.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/parameters.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/payload.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/proxies.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/response.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/session.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/timeout.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/util.h"
+-    "${CPR_INCLUDE_DIRS}/cpr/ssl_options.h")
++install(
++  EXPORT ${TARGETS_EXPORT_NAME} 
++  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
++)
+ 
+-message(STATUS "Using CURL_LIBRARIES: ${CURL_LIBRARIES}.")
+-target_link_libraries(${CPR_LIBRARIES}
+-    ${CURL_LIBRARIES})
++if (NOT DISABLE_INSTALL_HEADERS)
++  install(DIRECTORY ${CPR_INCLUDE_DIRS}/cpr DESTINATION include)
++endif()
diff --git a/ports/cpr/CONTROL b/ports/cpr/CONTROL
index a8cdbf052d2936..2bf591cc25e62a 100644
--- a/ports/cpr/CONTROL
+++ b/ports/cpr/CONTROL
@@ -1,4 +1,4 @@
 Source: cpr
-Version: 1.3.0-4
+Version: 1.3.0-6
 Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.
 Build-Depends: curl[core]
diff --git a/ports/cpr/cprConfig.cmake b/ports/cpr/cprConfig.cmake
new file mode 100644
index 00000000000000..501fcd96a82b1d
--- /dev/null
+++ b/ports/cpr/cprConfig.cmake
@@ -0,0 +1,27 @@
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was Config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+include("${CMAKE_CURRENT_LIST_DIR}/cprTargets.cmake")
+check_required_components("cpr")
diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake
index 56e9c6cf49c710..f6ea8e9af508c2 100644
--- a/ports/cpr/portfile.cmake
+++ b/ports/cpr/portfile.cmake
@@ -8,7 +8,8 @@ vcpkg_from_github(
     REF 1.3.0
     SHA512 fd08f8a592a5e1fb8dc93158a4850b81575983c08527fb415f65bd9284f93c804c8680d16c548744583cd26b9353a7d4838269cfc59ccb6003da8941f620c273
     HEAD_REF master
-    PATCHES enable-install.patch
+    PATCHES
+        001-cpr-config.patch
 )
 
 vcpkg_configure_cmake(
@@ -23,8 +24,13 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/cprConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/lib/cmake/cpr)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cpr)
+
 vcpkg_copy_pdbs()
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpr)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/cpr/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpr/copyright)
diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index 9c4de67c2e233d..a9f4aa9b78692f 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,3 +1,3 @@
 Source: directxmesh
-Version: feb2019-1
+Version: apr2019
 Description: DirectXMesh geometry processing library
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 0ec9d2b001c6b9..53cd44b0c69e3f 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXMesh
-    REF feb2019
-    SHA512 341870f6a66626ec78ac283434e568fd664d3331468ac06554d6403c9b1a34a737895ca3bc8c073a01b983db31cc1e398ef4828a0e794a7382cba04a6cf28f05
+    REF apr2019
+    SHA512 a9e0dbf6483633a1727592de7e2fa733de993daff848d9ec2241ce54b67c7d24ed0419058f2f6ce256021dcf7e16d178b62ed9b8c7a1756504ab044f8740be1d
     HEAD_REF master
 )
 
diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index 383057056c6b5c..6ca6a224bac261 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtex
-Version: feb2019-1
+Version: apr2019
 Description: DirectXTex texture processing library
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 74e3caf476eb20..94f9b69cbff4ab 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTex
-    REF feb2019
-    SHA512 4eea6fadbcaf1332565034a061c0688fc8ac1c3a25df22b7602f52c0558974e5aaa6aa3104dcfbd2a1718df35272e33a3302f49c0f79f6bee14233bca2532893
+    REF apr2019
+    SHA512 3e50c5beb25416a0720614321bb2b712b5677b50989909ca703801080023f8f8ad168bbe4e5dc522500325989a8f6982026d7dc5029ee28d9dcfe35efdd002de
     HEAD_REF master
 )
 
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index 81f29bd66228aa..035c5d3a45fb86 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtk
-Version: feb2019-1
+Version: apr2019
 Description: A collection of helper classes for writing DirectX 11.x code in C++.
diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index bfa7384fbf103a..245c8a4af0f33a 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK
-    REF feb2019
-    SHA512 f9b02eb8288d16eef9ab1fb81edb0c0fa9ee5a3eb4b990fe904306147f28a0bdb0ea8513d628806635b77bbfffd885ffd959efb95598584d9467742b6d31c0b3
+    REF apr2019
+    SHA512 811ed222c1650d34a8475e44719cca8972a85d96f9ccb10548e1501eb9d28fd8685de90832b517cdcbf21ae8c9160dea69000e8dca06fab745a15a7acc14ba98
     HEAD_REF master
 )
 
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL
index 638391c613dfaa..02560b26da7fd6 100644
--- a/ports/dlib/CONTROL
+++ b/ports/dlib/CONTROL
@@ -1,5 +1,5 @@
 Source: dlib
-Version: 19.16-2
+Version: 19.16-3
 Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas (!osx), clapack
 Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++
 
diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake
index be4a877cf88244..4c8b1ca915875a 100644
--- a/ports/dlib/portfile.cmake
+++ b/ports/dlib/portfile.cmake
@@ -76,5 +76,5 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/dlib/config.h "${_contents}")
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/dlib/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dlib)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/dlib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/dlib/COPYRIGHT)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/dlib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/dlib/copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL
index 2291f055693640..bf125349995f35 100644
--- a/ports/doctest/CONTROL
+++ b/ports/doctest/CONTROL
@@ -1,3 +1,3 @@
 Source: doctest
-Version: 2.3.1
+Version: 2.3.2
 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD
diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake
index 859e2be99f7277..dbb94990ea1f4e 100644
--- a/ports/doctest/portfile.cmake
+++ b/ports/doctest/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onqtam/doctest
-    REF 2.3.1
-    SHA512 b8cb502054e05d6e348fa008b44eb49e7932e0ee15e413953ecfd3092ebc490e5924ee669f22abb85e349033e307e7e19ad44b0c6a98973a8ffe4c7aef9017b2
+    REF 2.3.2
+    SHA512 316c804d04c51e38ee54edb321c3f6c11e8b45d542add865e930a36430bb2b768c4302ec85a7470d2df7952981432ec4c1da662be46021eff0fa377f5cea85ba
     HEAD_REF master
 )
 
diff --git a/ports/duktape/CONTROL b/ports/duktape/CONTROL
index 3d70426b9899d6..6619904f05d1e8 100644
--- a/ports/duktape/CONTROL
+++ b/ports/duktape/CONTROL
@@ -1,4 +1,4 @@
 Source: duktape
-Version: 2.0.3-5
+Version: 2.0.3-6
 Description: Embeddable Javascript engine with a focus on portability and compact footprint.
 Build-Depends:
diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake
index 2c28d3a59abc8f..c062dd9343ed50 100644
--- a/ports/duktape/portfile.cmake
+++ b/ports/duktape/portfile.cmake
@@ -28,7 +28,7 @@ if(NOT EXISTS ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX})
         vcpkg_download_distfile(GET_PIP
             URLS "https://bootstrap.pypa.io/get-pip.py"
             FILENAME "tools/python/python2/get-pip.py"
-            SHA512 fdbcef1037dca7cc914e2304af657ebd08239cd18c3e79786dc25c8ea39957674e012d7ea8ae2c99006e4b61d3a5e24669ac5771dc186697fd9fdb40b6cc07ae
+            SHA512 99520d223819708b8f6e4b839d1fa215e4e8adc7fcd0db6c25a0399cf2fa10034b35673cf450609303646d12497f301ef53b7e7cc65c78e7bce4af0c673555ad
         )
         execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYTHON2_DIR}/get-pip.py)
     endif()
diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL
index 1f8e01e57dea6f..2b6f5984ea1bae 100644
--- a/ports/eastl/CONTROL
+++ b/ports/eastl/CONTROL
@@ -1,4 +1,4 @@
 Source: eastl
-Version: 3.13.04-1
+Version: 3.13.05-1
 Description: Electronic Arts Standard Template Library.
   It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.
diff --git a/ports/eastl/fixchar8_t.patch b/ports/eastl/fixchar8_t.patch
new file mode 100644
index 00000000000000..51fcfe69a564e5
--- /dev/null
+++ b/ports/eastl/fixchar8_t.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake
+index 566fbee..4fcca61 100644
+--- a/scripts/CMake/CommonCppFlags.cmake
++++ b/scripts/CMake/CommonCppFlags.cmake
+@@ -54,7 +54,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+         message(FATAL_ERROR "Building with a gcc version less than 4.7.3 is not supported.")
+     endif()
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive- /Zc:char8_t-")
+ endif()
+ 
+ 
diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake
index 0b33ded5bf178a..13cf14a2108765 100644
--- a/ports/eastl/portfile.cmake
+++ b/ports/eastl/portfile.cmake
@@ -6,9 +6,10 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO electronicarts/EASTL
-    REF 3.13.04
-    SHA512 4baa3dcf9fceac44f0c515db8bf50b7040afd5091162199c78bf9a1ab13ae19b4e55bb0bafe56da83a7b375ca0c15ba9c19d003de321ec6e40b489b2fe2561d5
+    REF 3.13.05
+    SHA512 2364554339203c972f10d58ebe8f14fb221a40451f4cd2c3c5acd6891e8580c1a0a5d4ba592c91349d3feca50d9880648bb37358820a1c9552dde3f7af400a82
     HEAD_REF master
+    PATCHES fixchar8_t.patch # can be removed after electronicarts/EASTL#274 is resolved
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL
index a82e3ba451d17a..3d6136ddaf86a8 100644
--- a/ports/ecsutil/CONTROL
+++ b/ports/ecsutil/CONTROL
@@ -1,4 +1,4 @@
 Source: ecsutil
-Version: 1.0.3.1
+Version: 1.0.6.1
 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.
 Build-Depends: atlmfc
diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake
index cc5a7085440b07..966281a4f1996c 100644
--- a/ports/ecsutil/portfile.cmake
+++ b/ports/ecsutil/portfile.cmake
@@ -28,8 +28,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO EMCECS/ecs-object-client-windows-cpp
-    REF v1.0.3.1
-    SHA512 0bed2a0296dcb0ea952734feb44a9f35b01d1c6e08dc132cc2d006003df21e5e1a3070ab44f5c9e6986b230c292d62f695f7a06700e7ef8d50efc87f92d5814f
+    REF v1.0.6.1
+    SHA512 4b16b9ce1dbc9f541fe95a40c10678cd2b0192acc94bc3d57e58fbdf37964af84cdc901686555aad1f58d133632b1ad6f57976a5ac71aed1fce2fb44a2d0f8d3
     HEAD_REF master
     PATCHES NoLibSyms.patch
 )
diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL
index 69c61a22c66af5..e2ed02e4ac2eec 100644
--- a/ports/ensmallen/CONTROL
+++ b/ports/ensmallen/CONTROL
@@ -1,5 +1,5 @@
 Source: ensmallen
-Version: 1.14.2
+Version: 1.14.3
 Description: A header-only C++ library for mathematical optimization.
 Build-Depends: openblas, clapack, armadillo
 
diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake
index 9fe88613ce4f30..5941702db6e603 100644
--- a/ports/ensmallen/portfile.cmake
+++ b/ports/ensmallen/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mlpack/ensmallen
-    REF ensmallen-1.14.2
-    SHA512 8aa8d00d80579c619e417d8fbc17c78c867f916161e3c412c3af24c1b7b9816c9e6faee981931e1591a45db0c797a081d45f1dfc3ea396a610ee2da55232b265
+    REF ensmallen-1.14.3
+    SHA512 138713849e9cd55517893c9b0c21afa751bff157c968fbdfa0fbefd10439006c27af023c13f5ffbc349b417b6539ce5fa67652f0a15d53f8204511f1c0d81adb
     HEAD_REF master
 	PATCHES
 		disable_tests.patch
diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL
index adac34a800a225..32981a12fe6d28 100644
--- a/ports/forest/CONTROL
+++ b/ports/forest/CONTROL
@@ -1,3 +1,3 @@
 Source: forest
-Version: 11.0.0
+Version: 11.0.1
 Description: Template library of tree data structures
diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake
index fb04e62f6cbe10..7dcccb979b1d8d 100644
--- a/ports/forest/portfile.cmake
+++ b/ports/forest/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xorz57/forest
-    REF 11.0.0
-    SHA512 0af86e19f24297d8397a7981e9a7f4a00c10a08ca18998b2534bdeb37d258d973b56053d8a9cf4b4831099928b1b15af1402ce00930b21727bc25c22715b2adf
+    REF 11.0.1
+    SHA512 cb9245445c52c9e2e544c556cd87ecfd1e598bf0ed71a20368b32bd47b611f9696a8e50e06ecb98814af8e6e254bde9e7f98ca0d28c62f86ce9ff45805c2a1e5
     HEAD_REF master
 )
 
diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL
index c6f595c2f277f3..15b0ac2e37826b 100644
--- a/ports/freeglut/CONTROL
+++ b/ports/freeglut/CONTROL
@@ -1,3 +1,3 @@
 Source: freeglut
-Version: 3.0.0-5
+Version: 3.0.0-6
 Description: Open source implementation of GLUT with source and binary backwards compatibility.
diff --git a/ports/freeglut/macOS_Xquartz.patch b/ports/freeglut/macOS_Xquartz.patch
new file mode 100644
index 00000000000000..423b3b90180719
--- /dev/null
+++ b/ports/freeglut/macOS_Xquartz.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f68b27f..4339858 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -220,6 +220,16 @@ ENDIF()
+ IF(FREEGLUT_GLES)
+   ADD_DEFINITIONS(-DFREEGLUT_GLES)
+   LIST(APPEND LIBS GLESv2 GLESv1_CM EGL)
++ELSEIF(APPLE)
++  # on OSX FindOpenGL uses framework version of OpenGL, but we need X11 version
++  FIND_PATH(GLX_INCLUDE_DIR GL/glx.h
++            PATHS /opt/X11/include /usr/X11/include /usr/X11R6/include)
++  FIND_LIBRARY(OPENGL_gl_LIBRARY GL
++               PATHS /opt/X11/lib /usr/X11/lib /usr/X11R6/lib)
++  FIND_LIBRARY(OPENGL_glu_LIBRARY GLU
++               PATHS /opt/X11/lib /usr/X11/lib /usr/X11R6/lib)
++  LIST(APPEND LIBS ${OPENGL_gl_LIBRARY})
++  INCLUDE_DIRECTORIES(${GLX_INCLUDE_DIR})
+ ELSE()
+   FIND_PACKAGE(OpenGL REQUIRED)
+   LIST(APPEND LIBS ${OPENGL_gl_LIBRARY})
diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake
index 24d022b1779e90..86d6915939dd1e 100644
--- a/ports/freeglut/portfile.cmake
+++ b/ports/freeglut/portfile.cmake
@@ -1,22 +1,23 @@
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freeglut-3.0.0)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://sourceforge.net/projects/freeglut/files/freeglut/3.0.0/freeglut-3.0.0.tar.gz/download"
+    URLS "http://downloads.sourceforge.net/project/freeglut/freeglut/3.0.0/freeglut-3.0.0.tar.gz"
     FILENAME "freeglut-3.0.0.tar.gz"
     SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+  OUT_SOURCE_PATH SOURCE_PATH
+  ARCHIVE ${ARCHIVE}
+  PATCHES
+    use_targets_to_export_x11_dependency.patch
+    macOS_Xquartz.patch
+)
 
 if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev")
+    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n    xrandr\n    xi\n    xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.")
 endif()
 
-# disable debug suffix, because FindGLUT.cmake from CMake 3.8 doesn't support it
-file(READ ${SOURCE_PATH}/CMakeLists.txt FREEGLUT_CMAKELISTS)
-string(REPLACE "SET( CMAKE_DEBUG_POSTFIX \"d\" )"
-               "\#SET( CMAKE_DEBUG_POSTFIX \"d\" )" FREEGLUT_CMAKELISTS "${FREEGLUT_CMAKELISTS}")
-file(WRITE ${SOURCE_PATH}/CMakeLists.txt "${FREEGLUT_CMAKELISTS}")
-
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(FREEGLUT_STATIC OFF)
     set(FREEGLUT_DYNAMIC ON)
@@ -27,8 +28,10 @@ endif()
 
 # Patch header
 file(READ ${SOURCE_PATH}/include/GL/freeglut_std.h FREEGLUT_STDH)
-string(REGEX REPLACE "\"freeglut[_a-z]+.lib\""
+string(REGEX REPLACE "\"freeglut_static.lib\""
                      "\"freeglut.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}")
+string(REGEX REPLACE "\"freeglut_staticd.lib\""
+                     "\"freeglutd.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}")
 file(WRITE ${SOURCE_PATH}/include/GL/freeglut_std.h "${FREEGLUT_STDH}")
 
 vcpkg_configure_cmake(
@@ -46,7 +49,7 @@ vcpkg_install_cmake()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
         file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglutd.lib)
     endif()
 endif()
 
@@ -59,3 +62,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/freeglut/COPYING ${CURRENT_PACKAGES_DI
 
 vcpkg_copy_pdbs()
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/glut)
+endif()
diff --git a/ports/freeglut/use_targets_to_export_x11_dependency.patch b/ports/freeglut/use_targets_to_export_x11_dependency.patch
new file mode 100644
index 00000000000000..9933efd44e4305
--- /dev/null
+++ b/ports/freeglut/use_targets_to_export_x11_dependency.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d3260b..edf034a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -257,8 +257,6 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ INCLUDE(CheckIncludeFiles)
+ IF(UNIX AND NOT(ANDROID OR BLACKBERRY))
+     FIND_PACKAGE(X11 REQUIRED)
+-    INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
+-    LIST(APPEND LIBS ${X11_LIBRARIES})
+     IF(X11_Xrandr_FOUND)
+         SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE)
+         LIST(APPEND LIBS ${X11_Xrandr_LIB})
+@@ -339,9 +337,15 @@ ENDIF()
+ 
+ IF(FREEGLUT_BUILD_SHARED_LIBS)
+     ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS})
++    IF(UNIX AND NOT(ANDROID OR BLACKBERRY))
++        TARGET_LINK_LIBRARIES(freeglut PRIVATE X11::X11)
++    ENDIF()
+ ENDIF()
+ IF(FREEGLUT_BUILD_STATIC_LIBS)
+     ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS})
++    IF(UNIX AND NOT(ANDROID OR BLACKBERRY))
++        TARGET_LINK_LIBRARIES(freeglut_static PRIVATE X11::X11)
++    ENDIF()
+ ENDIF()
+ 
+ 
diff --git a/ports/freeglut/vcpkg-cmake-wrapper.cmake b/ports/freeglut/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 00000000000000..5d57ad49020929
--- /dev/null
+++ b/ports/freeglut/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,10 @@
+_find_package(${ARGS})
+if(GLUT_FOUND)
+    find_library(XRANDR_LIBRARY NAMES xrandr Xrandr)
+    if(XRANDR_LIBRARY)
+        list(APPEND GLUT_LIBRARIES ${XRANDR_LIBRARY})
+        if(TARGET GLUT::GLUT)
+            set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${XRANDR_LIBRARY})
+        endif()
+    endif()
+endif()
diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake
index f3d9279c3b079e..dc57a5691e3eac 100644
--- a/ports/freeimage/portfile.cmake
+++ b/ports/freeimage/portfile.cmake
@@ -2,12 +2,28 @@ include(${CMAKE_TRIPLET_FILE})
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FreeImage)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://sourceforge.net/projects/freeimage/files/Source%20Distribution/3.18.0/FreeImage3180.zip/download"
+    URLS "http://downloads.sourceforge.net/freeimage/FreeImage3180.zip"
     FILENAME "FreeImage3180.zip"
     SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
+vcpkg_extract_source_archive_ex(
+  OUT_SOURCE_PATH SOURCE_PATH
+  ARCHIVE ${ARCHIVE}
+  PATCHES
+    "${CMAKE_CURRENT_LIST_DIR}/disable-plugins-depending-on-internal-third-party-libraries.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-jpeg.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-jxrlib.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-libtiff.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-openjpeg.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-png-zlib.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-rawlib.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-webp.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-external-openexr.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-freeimage-config-include.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/fix-function-overload.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-typedef-as-already-declared.patch"
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/FreeImageConfig-static.h DESTINATION ${SOURCE_PATH})
@@ -25,21 +41,6 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibWebP)
 file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibRawLite)
 file(REMOVE_RECURSE ${SOURCE_PATH}/Source/OpenEXR)
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-plugins-depending-on-internal-third-party-libraries.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-jpeg.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-jxrlib.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-libtiff.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-openjpeg.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-png-zlib.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-rawlib.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-webp.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-external-openexr.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/use-freeimage-config-include.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/fix-function-overload.patch"
-)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/freeimage/use-typedef-as-already-declared.patch b/ports/freeimage/use-typedef-as-already-declared.patch
new file mode 100644
index 00000000000000..80d367bcb5feb1
--- /dev/null
+++ b/ports/freeimage/use-typedef-as-already-declared.patch
@@ -0,0 +1,15 @@
+diff --git a/Source/FreeImage.h b/Source/FreeImage.h
+index 1fd9c2f..59de277 100644
+--- a/Source/FreeImage.h
++++ b/Source/FreeImage.h
+@@ -160,8 +160,8 @@ typedef uint8_t BYTE;
+ typedef uint16_t WORD;
+ typedef uint32_t DWORD;
+ typedef int32_t LONG;
+-typedef int64_t INT64;
+-typedef uint64_t UINT64;
++typedef long long int INT64;
++typedef long long unsigned int UINT64;
+ #else
+ // MS is not C99 ISO compliant
+ typedef long BOOL;
diff --git a/ports/gdal/0003-Fix-std-fabs.patch b/ports/gdal/0003-Fix-std-fabs.patch
new file mode 100644
index 00000000000000..4a6ba7cb343139
--- /dev/null
+++ b/ports/gdal/0003-Fix-std-fabs.patch
@@ -0,0 +1,10 @@
+--- a/ogrlinestring.cpp	Fri Dec 14 22:34:20 2018
++++ b/ogrlinestring.cpp	Wed Mar 27 11:00:00 2019
+@@ -34,6 +34,7 @@
+ #include <cstdlib>
+ #include <algorithm>
+ #include <limits>
++#include <cmath>
+
+ CPL_CVSID("$Id: ogrlinestring.cpp 61153d33d7f055c3442ff728adbfa8e09582464b 2019-03-10 14:23:51 +0100 Even Rouault $")
+
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
index 9169b8344b456d..155851ad8d77c2 100644
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@@ -1,7 +1,7 @@
 Source: gdal
-Version: 2.4.1-1
+Version: 2.4.1-4
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
-Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5
+Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib
 
 Feature: mysql-libmariadb
 Build-Depends: libmariadb
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index b62faf149fd1be..35bf5e4b2a78d8 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -47,6 +47,11 @@ foreach(BUILD_TYPE IN LISTS BUILD_TYPES)
           ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
       )
     endif()
+    vcpkg_apply_patches(
+        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}/ogr
+        PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-std-fabs.patch
+    )
 endforeach()
 
 
@@ -66,6 +71,11 @@ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PNG_INCLUDE_DIR)
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" PNG_LIBRARY_REL)
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRARY_DBG)
 
+# Setup zlib libraries + include path
+file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" ZLIB_INCLUDE_DIR)
+file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" ZLIB_LIBRARY_REL)
+file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib" ZLIB_LIBRARY_DBG)
+
 # Setup geos libraries + include path
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -163,6 +173,8 @@ list(APPEND NMAKE_OPTIONS
     LIBXML2_INC=-I${XML2_INCLUDE_DIR}
     PNG_EXTERNAL_LIB=1
     PNGDIR=${PNG_INCLUDE_DIR}
+    ZLIB_INC=-I${ZLIB_INCLUDE_DIR}
+    ZLIB_EXTERNAL_LIB=1
     MSVC_VER=1900
 )
 
@@ -196,6 +208,7 @@ list(APPEND NMAKE_OPTIONS_REL
     OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}
     WEBP_LIBS=${WEBP_LIBRARY_REL}
     LIBXML2_LIB=${XML2_LIBRARY_REL}
+    ZLIB_LIB=${ZLIB_LIBRARY_REL}
 )
 if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     # Static Build does not like PG_LIB
@@ -214,6 +227,7 @@ list(APPEND NMAKE_OPTIONS_DBG
     OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}
     WEBP_LIBS=${WEBP_LIBRARY_DBG}
     LIBXML2_LIB=${XML2_LIBRARY_DBG}
+    ZLIB_LIB=${ZLIB_LIBRARY_DBG}
     DEBUG=1
 )
 if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/ports/gdcm/CONTROL b/ports/gdcm/CONTROL
new file mode 100644
index 00000000000000..127a89c67870ac
--- /dev/null
+++ b/ports/gdcm/CONTROL
@@ -0,0 +1,4 @@
+Source: gdcm
+Version: 3.0.0
+Description: Grassroots DICOM library
+Build-Depends: zlib, expat, openjpeg
diff --git a/ports/gdcm2/find-openjpeg.patch b/ports/gdcm/find-openjpeg.patch
similarity index 100%
rename from ports/gdcm2/find-openjpeg.patch
rename to ports/gdcm/find-openjpeg.patch
diff --git a/ports/gdcm/fix-share-path.patch b/ports/gdcm/fix-share-path.patch
new file mode 100644
index 00000000000000..9310946814efd0
--- /dev/null
+++ b/ports/gdcm/fix-share-path.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6ac16ab..842d833 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -246,15 +246,15 @@ if(NOT GDCM_INSTALL_LIB_DIR)
+ endif()
+ 
+ if(NOT GDCM_INSTALL_DATA_DIR)
+-  set(GDCM_INSTALL_DATA_DIR "share/${subdir}")
++  set(GDCM_INSTALL_DATA_DIR "share/${projectname}")
+ endif()
+ 
+ if(NOT GDCM_INSTALL_INCLUDE_DIR)
+-  set(GDCM_INSTALL_INCLUDE_DIR "include/${subdir}")
++  set(GDCM_INSTALL_INCLUDE_DIR "include/${projectname}")
+ endif()
+ 
+ if(NOT GDCM_INSTALL_DOC_DIR)
+-  set(GDCM_INSTALL_DOC_DIR "share/doc/${subdir}")
++  set(GDCM_INSTALL_DOC_DIR "share/doc/${projectname}")
+ endif()
+ 
+ if(NOT GDCM_INSTALL_MAN_DIR)
+@@ -262,7 +262,7 @@ if(NOT GDCM_INSTALL_MAN_DIR)
+ endif()
+ 
+ if(NOT GDCM_INSTALL_PACKAGE_DIR)
+-  set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${subdir}
++  set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${projectname}
+     CACHE INTERNAL "")
+ endif()
+ 
diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake
new file mode 100644
index 00000000000000..80b0ab6d862b5c
--- /dev/null
+++ b/ports/gdcm/portfile.cmake
@@ -0,0 +1,49 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO malaterre/GDCM
+    REF v3.0.0
+    SHA512 2ac076dd49011234f4431ffe67fcba84a1ca9042ec5fc4dfc8aed2ed16bec5f499fa7aa666e5630796afc266ce76741d931cca333534b55fdc477e25a9189d33
+    HEAD_REF master
+    PATCHES
+        find-openjpeg.patch
+        fix-share-path.patch
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(GDCM_BUILD_SHARED_LIBS ON)
+else()
+    set(GDCM_BUILD_SHARED_LIBS OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS
+        -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF
+        -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS}
+        -DGDCM_INSTALL_INCLUDE_DIR=include
+        -DGDCM_USE_SYSTEM_EXPAT=ON
+        -DGDCM_USE_SYSTEM_ZLIB=ON
+        -DGDCM_USE_SYSTEM_OPENJPEG=ON
+        -DGDCM_BUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm TARGET_PATH share/gdcm)
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdcm RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/gdcm2/CONTROL b/ports/gdcm2/CONTROL
index baabd1df1970e5..88d473b65d88db 100644
--- a/ports/gdcm2/CONTROL
+++ b/ports/gdcm2/CONTROL
@@ -1,4 +1,4 @@
 Source: gdcm2
-Version: 2.8.9
-Description: Grassroots DICOM library
-Build-Depends: zlib, expat, openjpeg
+Version: deprecated
+Description: This port was renamed to gdcm.  The gdcm2 name is deprecated.
+Build-Depends: gdcm
\ No newline at end of file
diff --git a/ports/gdcm2/portfile.cmake b/ports/gdcm2/portfile.cmake
index bc44a0a97dad73..0015715fb66c72 100644
--- a/ports/gdcm2/portfile.cmake
+++ b/ports/gdcm2/portfile.cmake
@@ -1,46 +1 @@
-include(vcpkg_common_functions)
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO malaterre/GDCM
-    REF v2.8.9
-    SHA512 3c80503de6df8fe2589849ae9334d11e3cb033701450e1d7ea2781d122d1c8c1fc205fefc358d0ad1b9c5199c838e1c7c1bb34949da1c73cc8ae174b72e7e70c
-    HEAD_REF master
-    PATCHES find-openjpeg.patch
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(GDCM_BUILD_SHARED_LIBS ON)
-else()
-    set(GDCM_BUILD_SHARED_LIBS OFF)
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    OPTIONS
-        -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF
-        -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS}
-        -DGDCM_INSTALL_INCLUDE_DIR=include
-        -DGDCM_USE_SYSTEM_EXPAT=ON
-        -DGDCM_USE_SYSTEM_ZLIB=ON
-        -DGDCM_USE_SYSTEM_OPENJPEG=ON
-        -DGDCM_BUILD_TESTING=OFF
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm-2.8 TARGET_PATH share/gdcm)
-
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdcm2 RENAME copyright)
-
-vcpkg_copy_pdbs()
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file
diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL
index 7b19ca9cfc06cc..87688018b90ae0 100644
--- a/ports/geogram/CONTROL
+++ b/ports/geogram/CONTROL
@@ -1,7 +1,7 @@
 Source: geogram
-Version: 1.6.9-2
+Version: 1.6.9-3
 Description: Geogram is a programming library of geometric algorithms.
-Build-Depends: openblas, clapack
+Build-Depends: openblas (!osx), clapack
 
 Feature: graphics
 Description: Build viewers and geogram_gfx library.
diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake
index 46709f6c313dc5..44f74f107a4f67 100644
--- a/ports/geogram/portfile.cmake
+++ b/ports/geogram/portfile.cmake
@@ -24,10 +24,30 @@ endif()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(VORPALINE_BUILD_DYNAMIC FALSE)
-    set(VORPALINE_PLATFORM Win-vs-generic)
+    if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+        set(VORPALINE_PLATFORM Win-vs-generic)
+    endif()
+    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux")
+        message("geogram on Linux only supports dynamic library linkage. Building dynamic.")
+        set(VCPKG_LIBRARY_LINKAGE dynamic)
+        set(VORPALINE_PLATFORM Linux64-gcc-dynamic )
+    endif()
+    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin")
+        message("geogram on Darwin only supports dynamic library linkage. Building dynamic.")
+        set(VCPKG_LIBRARY_LINKAGE dynamic)
+        set(VORPALINE_PLATFORM Darwin-clang-dynamic)
+    endif()
 else()
     set(VORPALINE_BUILD_DYNAMIC TRUE)
-    set(VORPALINE_PLATFORM Win-vs-dynamic-generic)
+    if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+        set(VORPALINE_PLATFORM Win-vs-generic)
+    endif()
+    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux")
+        set(VORPALINE_PLATFORM Linux64-gcc-dynamic )
+    endif()
+    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin")
+        set(VORPALINE_PLATFORM Darwin-clang-dynamic)
+    endif()
 endif()
 
 vcpkg_configure_cmake(
diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake
index ed68c11b88d87f..7ca1478f7f9207 100644
--- a/ports/giflib/portfile.cmake
+++ b/ports/giflib/portfile.cmake
@@ -4,18 +4,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 set(GIFLIB_VERSION 5.1.4)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://nchc.dl.sourceforge.net/project/giflib/giflib-${GIFLIB_VERSION}.tar.bz2"	
+    URLS "https://nchc.dl.sourceforge.net/project/giflib/giflib-${GIFLIB_VERSION}.tar.bz2"
     FILENAME "giflib-${GIFLIB_VERSION}.tar.bz2"
     SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 )
 
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+    set(ADDITIONAL_PATCH "fix-compile-error.patch")
+endif()
+
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${GIFLIB_VERSION}
     PATCHES
         msvc-guard-unistd-h.patch
-        fix-compile-error.patch
+        ${ADDITIONAL_PATCH}
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL
index 0f689c9e08cab7..ca4078bf2a0002 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: google-cloud-cpp
-Version: 0.8.1-1
+Version: 0.9.0
 Build-Depends: grpc, curl[ssl], crc32c
 Description: C++ Client Libraries for Google Cloud Platform APIs.
diff --git a/ports/google-cloud-cpp/cmake-libcurl-target.patch b/ports/google-cloud-cpp/cmake-libcurl-target.patch
deleted file mode 100644
index 97e66e69f72f51..00000000000000
--- a/ports/google-cloud-cpp/cmake-libcurl-target.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/cmake/IncludeCurl.cmake b/cmake/IncludeCurl.cmake
-index d3323e3b8..6ea7ca3e6 100644
---- a/cmake/IncludeCurl.cmake
-+++ b/cmake/IncludeCurl.cmake
-@@ -39,13 +39,13 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-     # stage/module/FindCURL.html for details).  Until then, define the target
-     # ourselves if it is missing.
-     find_package(CURL REQUIRED)
--    if (NOT TARGET CURL::CURL)
--        add_library(CURL::CURL UNKNOWN IMPORTED)
--        set_property(TARGET CURL::CURL
-+    if (NOT TARGET CURL::libcurl)
-+        add_library(CURL::libcurl UNKNOWN IMPORTED)
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-                               "${CURL_INCLUDE_DIR}")
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
-     endif ()
-@@ -56,7 +56,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-     if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
-         find_package(OpenSSL REQUIRED)
-         find_package(ZLIB REQUIRED)
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_LINK_LIBRARIES
-                               OpenSSL::SSL
-@@ -64,7 +64,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-                               ZLIB::ZLIB)
-         message(STATUS "CURL linkage will be static")
-         if (WIN32)
--            set_property(TARGET CURL::CURL
-+            set_property(TARGET CURL::libcurl
-                          APPEND
-                          PROPERTY INTERFACE_LINK_LIBRARIES
-                                   crypt32
-@@ -72,7 +72,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
-                                   ws2_32)
-         endif ()
-         if (APPLE)
--            set_property(TARGET CURL::CURL
-+            set_property(TARGET CURL::libcurl
-                          APPEND
-                          PROPERTY INTERFACE_LINK_LIBRARIES ldap)
-         endif ()
-diff --git a/cmake/external/curl.cmake b/cmake/external/curl.cmake
-index 54753ada9..2a83e19df 100644
---- a/cmake/external/curl.cmake
-+++ b/cmake/external/curl.cmake
-@@ -88,10 +88,10 @@ if (NOT TARGET curl_project)
-     endif ()
- 
-     include(ExternalProjectHelper)
--    add_library(CURL::CURL INTERFACE IMPORTED)
--    add_dependencies(CURL::CURL curl_project)
--    set_library_properties_for_external_project(CURL::CURL curl)
--    set_property(TARGET CURL::CURL
-+    add_library(CURL::libcurl INTERFACE IMPORTED)
-+    add_dependencies(CURL::libcurl curl_project)
-+    set_library_properties_for_external_project(CURL::libcurl curl)
-+    set_property(TARGET CURL::libcurl
-                  APPEND
-                  PROPERTY INTERFACE_LINK_LIBRARIES
-                           c-ares::cares
-@@ -99,7 +99,7 @@ if (NOT TARGET curl_project)
-                           OpenSSL::Crypto
-                           ZLIB::ZLIB)
-     if (WIN32)
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_LINK_LIBRARIES
-                               crypt32
-@@ -107,7 +107,7 @@ if (NOT TARGET curl_project)
-                               ws2_32)
-     endif ()
-     if (APPLE)
--        set_property(TARGET CURL::CURL
-+        set_property(TARGET CURL::libcurl
-                      APPEND
-                      PROPERTY INTERFACE_LINK_LIBRARIES ldap)
-     endif ()
-diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt
-index 1e750af8a..a0a04caab 100644
---- a/google/cloud/storage/CMakeLists.txt
-+++ b/google/cloud/storage/CMakeLists.txt
-@@ -226,7 +226,7 @@ target_link_libraries(storage_client
-                       PUBLIC google_cloud_cpp_common
-                              nlohmann_json
-                              Crc32c::crc32c
--                             CURL::CURL
-+                             CURL::libcurl
-                              Threads::Threads
-                              OpenSSL::SSL
-                              OpenSSL::Crypto
-@@ -396,7 +396,7 @@ if (BUILD_TESTING)
-                                           GTest::gmock_main
-                                           GTest::gmock
-                                           GTest::gtest
--                                          CURL::CURL
-+                                          CURL::libcurl
-                                           storage_common_options
-                                           nlohmann_json)
-             if (MSVC)
-diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in
-index 660829ae4..a4d261815 100644
---- a/google/cloud/storage/config.cmake.in
-+++ b/google/cloud/storage/config.cmake.in
-@@ -19,13 +19,13 @@ find_dependency(google_cloud_cpp_common)
- find_dependency(OpenSSL)
- find_dependency(ZLIB)
- 
--# Some versions of FindCURL do not define CURL::CURL, so we define it ourselves.
--if (NOT TARGET CURL::CURL)
--    add_library(CURL::CURL UNKNOWN IMPORTED)
--    set_property(TARGET CURL::CURL
-+# Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves.
-+if (NOT TARGET CURL::libcurl)
-+    add_library(CURL::libcurl UNKNOWN IMPORTED)
-+    set_property(TARGET CURL::libcurl
-                  APPEND
-                  PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
--    set_property(TARGET CURL::CURL
-+    set_property(TARGET CURL::libcurl
-                  APPEND
-                  PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
- endif ()
-diff --git a/google/cloud/storage/tests/CMakeLists.txt b/google/cloud/storage/tests/CMakeLists.txt
-index 9e5fb663d..987958396 100644
---- a/google/cloud/storage/tests/CMakeLists.txt
-+++ b/google/cloud/storage/tests/CMakeLists.txt
-@@ -50,7 +50,7 @@ foreach (fname ${storage_client_integration_tests})
-                                   GTest::gmock_main
-                                   GTest::gmock
-                                   GTest::gtest
--                                  CURL::CURL
-+                                  CURL::libcurl
-                                   Threads::Threads
-                                   nlohmann_json
-                                   storage_common_options)
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 91dd7b83cbfdf1..289c51a01beee6 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -5,11 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GoogleCloudPlatform/google-cloud-cpp
-    REF v0.8.1
-    SHA512 d81e05703b77109cace4460f8053cf4524d8372ee9185b3ba7d8713ca40e9fd16735b4e46cd8526bf61b8af9a4bdf9eb854505a25d02289227cf216660b12713
+    REF v0.9.0
+    SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b
     HEAD_REF master
 	PATCHES
-		cmake-libcurl-target.patch # Should not be needed for v0.9.0+ / once googleapis/google-cloud-cpp@3284e34 is included
 		cmake-libcurl-find-config.patch
 )
 
diff --git a/ports/graphqlparser/CONTROL b/ports/graphqlparser/CONTROL
index 0f6ed481e77d74..128c494989cbe3 100644
--- a/ports/graphqlparser/CONTROL
+++ b/ports/graphqlparser/CONTROL
@@ -1,3 +1,3 @@
 Source: graphqlparser
-Version: 0.7.0
+Version: 0.7.0-1
 Description: A GraphQL query parser in C++ with C and C++ APIs
diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake
index 6e175fe6b95e2d..bab77a0c72ab2d 100644
--- a/ports/graphqlparser/portfile.cmake
+++ b/ports/graphqlparser/portfile.cmake
@@ -6,7 +6,9 @@ vcpkg_from_github(
     REF v0.7.0
     SHA512 973292b164d0d2cfe453a2f01559dbdb1b9d22b6304f6a3aabf71e2c0a3e24ab69dfd72a086764ad5befecf0005620f8e86f552dacc324f9615a05f31de7cede
     HEAD_REF master
-    PATCHES win-cmake.patch
+    PATCHES
+        win-cmake.patch
+        static-compile-fix.patch
 )
 
 if(UNIX)
diff --git a/ports/graphqlparser/static-compile-fix.patch b/ports/graphqlparser/static-compile-fix.patch
new file mode 100644
index 00000000000000..3f2756d71b32b9
--- /dev/null
+++ b/ports/graphqlparser/static-compile-fix.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 56741c2..313308a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,8 +142,11 @@ if (UNIX)
+ elseif(WIN32)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.lib
+ 	DESTINATION lib)
++  # do not install pdb when static compilation.
++  if (BUILD_SHARED_LIBS)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.pdb
+ 	DESTINATION bin)
++  endif()
+ endif()
+ 
+ IF (test)
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index e115862587c464..0547d88eb69a3b 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -12,7 +12,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
     REF v1.19.1
-    SHA512  4bb127d946fc16887fd4cf75215f0bc9f6d17dbd36fc4f1b191a64914f96c49dddb41f1b6c72fd24ea0a40f242b4398248f32fcb1fe9a764367be1c2edda9142
+    SHA512 4bb127d946fc16887fd4cf75215f0bc9f6d17dbd36fc4f1b191a64914f96c49dddb41f1b6c72fd24ea0a40f242b4398248f32fcb1fe9a764367be1c2edda9142
     HEAD_REF master
     PATCHES 
         00001-fix-uwp.patch
diff --git a/ports/guetzli/CONTROL b/ports/guetzli/CONTROL
index b68d013208aa1d..dd8e765752ebe1 100644
--- a/ports/guetzli/CONTROL
+++ b/ports/guetzli/CONTROL
@@ -1,4 +1,4 @@
 Source: guetzli
-Version: 2018-07-30-1
+Version: 2018-07-30-2
 Description: Perceptual JPEG encoder
 Build-Depends: libpng, butteraugli
diff --git a/ports/guetzli/butteraugli.patch b/ports/guetzli/butteraugli.patch
new file mode 100644
index 00000000000000..ac124ca54fe725
--- /dev/null
+++ b/ports/guetzli/butteraugli.patch
@@ -0,0 +1,13 @@
+diff --git a/guetzli/butteraugli_comparator.cc b/guetzli/butteraugli_comparator.cc
+index 142c203..f4e710d 100644
+--- a/guetzli/butteraugli_comparator.cc
++++ b/guetzli/butteraugli_comparator.cc
+@@ -56,7 +56,7 @@ ButteraugliComparator::ButteraugliComparator(const int width, const int height,
+       height_(height),
+       target_distance_(target_distance),
+       rgb_orig_(*rgb),
+-      comparator_(LinearRgb(width_, height_, *rgb)),
++      comparator_(LinearRgb(width_, height_, *rgb), 1.0f),
+       distance_(0.0),
+       stats_(stats) {}
+ 
diff --git a/ports/guetzli/portfile.cmake b/ports/guetzli/portfile.cmake
index 248433e56a0b5a..5e104146100f03 100644
--- a/ports/guetzli/portfile.cmake
+++ b/ports/guetzli/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     REF 0b78c7cc8b1b6cbaaf3d08b1facb599bcec1d101
     SHA512 54c5198c4c066858dd1377a32e765f46a589f3444bea303b54326453d0e8e71f959d3aaf2c72f4714fd27891f4d93288e7fa96baf1fd10f127929c1fcfa5ae1c
     HEAD_REF master
+    PATCHES butteraugli.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 399f13111ead9d..a0fdfdd9512b82 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,5 +1,5 @@
 Source: harfbuzz
-Version: 2.3.1-3
+Version: 2.4.0
 Description: HarfBuzz OpenType text shaping engine
 Build-Depends: freetype, ragel, gettext (osx)
 Default-Features: ucdn
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index e1a8199c099bcd..bfcd3cea00ac00 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO harfbuzz/harfbuzz
-    REF 2.3.1
-    SHA512 c90f8a530bf49e91f5297f6a3c2f4be65f8907e3b41892cd5fbc1353ce7036aae7e182bfd0ea8cb32b0310cbe7284a3de8b6622e08db9736c3f0bba6cb1f9f01
+    REF 2.4.0
+    SHA512 dd3a5caec689cffdd887bd3ca646ceaee804a0501d1d4ad1e9d9d48d9e4a87a02b76a9aa354dc69528b7d2a17c2431fce67c1681c72ad8246c2f5a1be498d52a
     HEAD_REF master
     PATCHES
         0001-fix-cmake-export.patch
diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL
index 6d143cb48d04e5..e0843acd76aafe 100644
--- a/ports/imgui/CONTROL
+++ b/ports/imgui/CONTROL
@@ -1,3 +1,3 @@
 Source: imgui
-Version: 1.69-1
+Version: 1.70
 Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.
diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake
index 8365f1902ed7c7..3fa3638869d277 100644
--- a/ports/imgui/portfile.cmake
+++ b/ports/imgui/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ocornut/imgui
-    REF v1.69
-    SHA512 6d65bc513ce30c77f7714c852cc1fd56295d212a7adc61cd81f48551bb5b88000dbc193fb9a167fb9819ed99a6b05a7001f82dbc727fdb438ca82dafc1c688d9
+    REF v1.70
+    SHA512 b1a0fba339a9b19a49316494e58eabacd250e85e8ee17552c03ed99f50886072c882979039f18139e504c4406cf31aea3e9ce391d4641318f0022fa9b51bb9c4
     HEAD_REF master
 )
 
diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL
index 5c9d2588191c5d..3feedf4964549d 100644
--- a/ports/itk/CONTROL
+++ b/ports/itk/CONTROL
@@ -1,7 +1,7 @@
 Source: itk
-Version: 4.13.0-906736bd-1
+Version: 4.13.0-906736bd-3
 Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.
-Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp]
+Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp], openjpeg
 
 Feature: vtk
 Description: Build ITKVtkGlue module.
diff --git a/ports/itk/fix_conflict_with_openjp2_pc.patch b/ports/itk/fix_conflict_with_openjp2_pc.patch
new file mode 100644
index 00000000000000..fc2ad11328c2bb
--- /dev/null
+++ b/ports/itk/fix_conflict_with_openjp2_pc.patch
@@ -0,0 +1,33 @@
+diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+index 6e3504d..1d641c2 100644
+--- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
++++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+@@ -375,7 +375,8 @@ else()
+ endif()
+ 
+ if(GDCM_USE_SYSTEM_OPENJPEG)
+-  find_package(OpenJPEG 2.0.0 REQUIRED)
++  # openjpeg version in vcpkg is already greater than 2.0.0 and openjpeg has no version.cmake file
++  find_package(OpenJPEG REQUIRED)
+   set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
+ else()
+   set(GDCM_OPENJPEG_LIBRARIES itkgdcmopenjp2)
+diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
+index 4ffe98e..a269690 100644
+--- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
++++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
+@@ -347,12 +347,8 @@ endif()
+ 
+ #-----------------------------------------------------------------------------
+ # pkgconfig support
+-# enabled by default on Unix, disabled by default on other platforms
+-if(UNIX)
+-  option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" ON)
+-else()
+-  option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
+-endif()
++# Cannot use the built-in openjp2 because the configuration path is under buildtrees
++option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
+ if(BUILD_PKGCONFIG_FILES)
+   # install in lib and not share (see multi-arch note above)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
diff --git a/ports/itk/hdf5_config_mode_find_package.patch b/ports/itk/hdf5_config_mode_find_package.patch
deleted file mode 100644
index f106d715182097..00000000000000
--- a/ports/itk/hdf5_config_mode_find_package.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/Modules/ThirdParty/HDF5/CMakeLists.txt b/Modules/ThirdParty/HDF5/CMakeLists.txt
-index 6caa63b..f118c73 100644
---- a/Modules/ThirdParty/HDF5/CMakeLists.txt
-+++ b/Modules/ThirdParty/HDF5/CMakeLists.txt
-@@ -1,7 +1,7 @@
- project(ITKHDF5)
- set(ITKHDF5_THIRD_PARTY 1)
- 
--if (BUILD_SHARED_LIBS)
-+if (ITK_BUILD_SHARED_LIBS)
-    add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB=1)
- endif()
- if(ITK_USE_SYSTEM_HDF5)
-@@ -20,11 +20,10 @@ endif()
- ")
-   endif()
- 
--  set(ITKHDF5_LIBRARIES )
--  if(BUILD_SHARED_LIBS)
--    list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_SHARED_LIBRARY} ${HDF5_CXX_SHARED_LIBRARY})
-+  if(ITK_BUILD_SHARED_LIBS)
-+    set(ITKHDF5_LIBRARIES hdf5::hdf5-shared hdf5::hdf5_cpp-shared)
-   else()
--    list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_STATIC_LIBRARY} ${HDF5_CXX_STATIC_LIBRARY})
-+    set(ITKHDF5_LIBRARIES hdf5::hdf5-static hdf5::hdf5_cpp-static)
-   endif()
- 
-   set(ITKHDF5_INCLUDE_DIRS
-@@ -33,11 +32,6 @@ endif()
-   set(ITKHDF5_SYSTEM_INCLUDE_DIRS
-     ${HDF5_INCLUDE_DIR}
-     ${HDF5_INCLUDE_DIR_CPP}
--    ${HDF5_INCLUDE_DIRS}
--    ${HDF5_INCLUDE_DIR_CPP}
--    )
--  list(APPEND ITKHDF5_LIBRARIES
--    ${HDF5_LIBRARIES}
-     )
-   set(ITKHDF5_NO_SRC 1)
- else()
-@@ -45,7 +39,7 @@ else()
-     ${ITKHDF5_SOURCE_DIR}/src
-     ${ITKHDF5_BINARY_DIR}/src
-     )
--  if(BUILD_SHARED_LIBS)
-+  if(ITK_BUILD_SHARED_LIBS)
-     set(ITKHDF5_LIBRARIES hdf5_cpp-shared hdf5-shared)
-   else()
-     set(ITKHDF5_LIBRARIES hdf5_cpp-static hdf5-static)
-diff --git a/Modules/ThirdParty/HDF5/itk-module-init.cmake b/Modules/ThirdParty/HDF5/itk-module-init.cmake
-index a9207a8..e36c2d9 100644
---- a/Modules/ThirdParty/HDF5/itk-module-init.cmake
-+++ b/Modules/ThirdParty/HDF5/itk-module-init.cmake
-@@ -2,12 +2,8 @@ option(ITK_USE_SYSTEM_HDF5 "Use an outside build of HDF5." ${ITK_USE_SYSTEM_LIBR
- mark_as_advanced(ITK_USE_SYSTEM_HDF5)
- if(ITK_USE_SYSTEM_HDF5)
-   if(BUILD_SHARED_LIBS)
--    find_package(HDF5 QUIET NO_MODULE COMPONENTS CXX C shared)
-+    find_package(HDF5 REQUIRED NO_MODULE COMPONENTS CXX C shared)
-   else()
--    find_package(HDF5 QUIET NO_MODULE COMPONENTS CXX C static)
--  endif()
--
--  if(NOT HDF5_FOUND)
--    find_package(HDF5 REQUIRED COMPONENTS CXX C)
-+    find_package(HDF5 REQUIRED NO_MODULE COMPONENTS CXX C static)
-   endif()
- endif()
diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake
index 7339de39dd9354..e4f415a1a1330d 100644
--- a/ports/itk/portfile.cmake
+++ b/ports/itk/portfile.cmake
@@ -1,11 +1,19 @@
 include(vcpkg_common_functions)
 
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 50 AND CMAKE_HOST_WIN32)
+    message(WARNING "ITKs buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO InsightSoftwareConsortium/ITK
     REF 906736bd453e95ccf03b318d3d07cb7884285161
     SHA512 8ac62262d46e7acbb0e5b2e964292ec17e1687bb162b8cec666e5b67acbe3449f093a0b1c03737e9951cb88248ed890805ffd57df6eae21220488620da833c57
     HEAD_REF master
+    PATCHES fix_conflict_with_openjp2_pc.patch
 )
 
 if ("vtk" IN_LIST FEATURES)
@@ -14,14 +22,6 @@ else()
     set(ITKVtkGlue OFF)
 endif()
 
-# directory path length needs to be shorter than 50 characters
-set(ITK_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/ITK)
-if(EXISTS ${ITK_BUILD_DIR})
-  file(REMOVE_RECURSE ${ITK_BUILD_DIR})
-endif()
-file(RENAME ${SOURCE_PATH} ${ITK_BUILD_DIR})
-set(SOURCE_PATH "${ITK_BUILD_DIR}")
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -60,6 +60,7 @@ vcpkg_configure_cmake(
         -DModule_IOSTL=ON # example how to turn on a non-default module
         -DModule_MorphologicalContourInterpolation=ON # example how to turn on a remote module
         -DModule_RLEImage=ON # example how to turn on a remote module
+        -DGDCM_USE_SYSTEM_OPENJPEG=ON #Use port openjpeg instead of own third-party
         ${ADDITIONAL_OPTIONS}
 )
 
diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch
new file mode 100644
index 00000000000000..3a666ee4b85488
--- /dev/null
+++ b/ports/jsonnet/001-enable-msvc.patch
@@ -0,0 +1,78 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8682cc8..88b95c1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,8 @@ set(GLOBAL_OUTPUT_PATH_SUFFIX "" CACHE STRING
+ 
+ project(jsonnet C CXX)
+ 
++add_definitions(-D_CRT_SECURE_NO_WARNINGS)
++
+ # Discourage in-source builds because they overwrite the hand-written Makefile.
+ # Use `cmake . -B<dir>` or the CMake GUI to do an out-of-source build.
+ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} AND
+@@ -73,17 +75,6 @@ elseif (BUILD_TESTS AND USE_SYSTEM_GTEST)
+ 	add_subdirectory(/usr/src/googletest ${GLOBAL_OUTPUT_PATH}/googletest-build)
+ endif()
+ 
+-# Compiler flags.
+-if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR
+-        ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+-    set(OPT "-O3")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Wextra -pedantic -std=c99 -O3 ${OPT}")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC ${OPT}")
+-else()
+-    # TODO: Windows support.
+-    message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported")
+-endif()
+-
+ # Look for libraries in global output path.
+ link_directories(${GLOBAL_OUTPUT_PATH})
+ 
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index f1c32b8..1a45a51 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE
+     string_utils.cpp
+     vm.cpp)
+ 
+-add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
++add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
+ add_dependencies(libjsonnet md5 stdlib)
+ target_link_libraries(libjsonnet md5)
+ 
+@@ -36,13 +36,12 @@ target_link_libraries(libjsonnet md5)
+ # this step the output would be |liblibjsonnet|.
+ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet
+ 	VERSION 0.12.1 SOVERSION 0)
+-install(TARGETS libjsonnet DESTINATION lib)
++install(TARGETS libjsonnet DESTINATION lib RUNTIME DESTINATION bin)
+ 
+ # Static library for jsonnet command-line tool.
+ add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE})
+ add_dependencies(libjsonnet_static md5 stdlib)
+ target_link_libraries(libjsonnet_static md5)
+-set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet)
+ 
+ # Tests
+ 
+diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
+index a481d9f..9fe768e 100644
+--- a/stdlib/CMakeLists.txt
++++ b/stdlib/CMakeLists.txt
+@@ -2,14 +2,6 @@
+ 
+ add_executable(to_c_array to_c_array.cpp)
+ 
+-# Custom command that will only build stdlib when it changes.
+-add_custom_command(
+-	OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h
+-	COMMAND ${GLOBAL_OUTPUT_PATH}/to_c_array
+-			    ${PROJECT_SOURCE_DIR}/stdlib/std.jsonnet
+-					${PROJECT_SOURCE_DIR}/core/std.jsonnet.h
+-	DEPENDS to_c_array std.jsonnet)
+-
+ # Standard library build target that libjsonnet can depend on.
+ add_custom_target(stdlib ALL
+ 	DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h)
diff --git a/ports/jsonnet/CMakeLists.txt b/ports/jsonnet/CMakeLists.txt
deleted file mode 100644
index 5056191c1eca4b..00000000000000
--- a/ports/jsonnet/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(jsonnet)
-
-if(MSVC)
-  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
-endif()
-
-set( jsonnet_sources
-  core/desugarer.cpp
-  core/formatter.cpp
-  core/lexer.cpp
-  core/libjsonnet.cpp
-  core/parser.cpp
-  core/pass.cpp
-  core/static_analysis.cpp
-  core/string_utils.cpp
-  core/vm.cpp
-)
-
-include_directories(third_party/md5 include cpp core stdlib)
-
-add_library(md5 STATIC third_party/md5/md5.cpp)
-
-add_library(libjsonnet ${jsonnet_sources})
-target_link_libraries(libjsonnet md5)
-
-add_library(libjsonnet++ cpp/libjsonnet++.cpp)
-target_link_libraries(libjsonnet++ libjsonnet)
-
-add_executable(jsonnet cmd/jsonnet.cpp)
-target_link_libraries(jsonnet libjsonnet)
-
-
-install(
-  TARGETS libjsonnet libjsonnet++
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
-if(NOT DISABLE_INSTALL_TOOLS)
-  install (
-    TARGETS jsonnet
-    RUNTIME DESTINATION tools/jsonnet
-  )
-endif()
-
-if(NOT DISABLE_INSTALL_HEADERS)
-  install(FILES include/libjsonnet++.h include/libjsonnet.h DESTINATION include)
-endif()
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index 22906cdfb6f7be..c478c789c24692 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,3 +1,3 @@
-Source: jsonnet
-Version: 2018-11-01-3
-Description: Jsonnet - The data templating language
+Source: jsonnet
+Version: 2019-05-08
+Description: Jsonnet - The data templating language
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index 4ae28a70df1c3d..d1f9ca15337bf4 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -1,13 +1,17 @@
 include(vcpkg_common_functions)
 
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+  vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
 vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/jsonnet
-    REF a0876b301daf8f45e16ac5f7bb814d0617772bb0
-    SHA512 a57380ecc578b11f3a763202abb7ab703f2cc3c098ca7602d0bd199594a9e8d1cebc6d51332658edb08bf088e565d6afae0cb2faaf127fa33542a406de1ac055
-    HEAD_REF master
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO google/jsonnet
+  REF c323f5ce5b8aa663585d23dc0fb94d4b166c6f16
+  SHA512 d9f84c39929e9e80272e2b834f68a13b48c1cb4d64b70f5b6fa16e677555d947f7cf57372453e23066a330faa6a429b9aa750271b46f763581977a223d238785
+  HEAD_REF master
+  PATCHES
+	001-enable-msvc.patch
 )
 
 if (WIN32)
@@ -24,11 +28,10 @@ else()
   )
 endif()
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
-  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
+  PREFER_NINJA
+  OPTIONS -DBUILD_JSONNET=OFF -DBUILD_TESTS=OFF
 )
 
 vcpkg_install_cmake()
@@ -36,3 +39,4 @@ vcpkg_copy_pdbs()
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/jsonnet)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jsonnet RENAME copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL
index 35bf69bf871dc7..55ab7ccdc40086 100644
--- a/ports/libgd/CONTROL
+++ b/ports/libgd/CONTROL
@@ -1,5 +1,5 @@
 Source: libgd
-Version: 2.2.5-1
+Version: 2.2.5-2
 Description: Open source code library for the dynamic creation of images by programmers.
 Default-Features: fontconfig, freetype, jpeg, png, tiff, webp
 
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake
index 346f009777cd22..06529f4a2465da 100644
--- a/ports/libgd/portfile.cmake
+++ b/ports/libgd/portfile.cmake
@@ -65,6 +65,7 @@ vcpkg_configure_cmake(
             -DENABLE_FREETYPE=${ENABLE_FREETYPE}
             -DENABLE_WEBP=${ENABLE_WEBP}
             -DENABLE_FONTCONFIG=${ENABLE_FONTCONFIG}
+            -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS}
 )
 
 vcpkg_build_cmake()
diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL
index 88f6e689ae8ffb..a3ee5e4bbd3ab2 100644
--- a/ports/libjpeg-turbo/CONTROL
+++ b/ports/libjpeg-turbo/CONTROL
@@ -1,3 +1,3 @@
 Source: libjpeg-turbo
-Version: 1.5.3-2
+Version: 2.0.1-1
 Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.
diff --git a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
index bd10a21bbf2347..af82c77b8cb925 100644
--- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
+++ b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
@@ -1,66 +1,74 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 131b437..c29e604 100644
+index efeb51a..5c7d829 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -62,6 +62,9 @@ option(WITH_JAVA "Build Java wrapper for the TurboJPEG library" FALSE)
- option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_SIMD=0 WITH_TURBOJPEG=0 WITH_ARITH_ENC=0 WITH_ARITH_DEC=0)" FALSE)
+@@ -147,6 +147,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
+ boolean_number(ENABLE_SHARED)
  option(ENABLE_STATIC "Build static libraries" TRUE)
- option(ENABLE_SHARED "Build shared libraries" TRUE)
+ boolean_number(ENABLE_STATIC)
 +option(ENABLE_EXECUTABLES "Build executables" TRUE)
++boolean_number(ENABLE_EXECUTABLES)
 +option(INSTALL_DOCS "Install doc files" TRUE)
++boolean_number(INSTALL_DOCS)
 +option(INSTALL_HEADERS "Install header files" TRUE)
++boolean_number(INSTALL_HEADERS)
+ option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE)
+ boolean_number(REQUIRE_SIMD)
+ option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_ARITH_DEC=0 WITH_ARITH_ENC=0 WITH_JAVA=0 WITH_SIMD=0 WITH_TURBOJPEG=0 )" FALSE)
+@@ -593,17 +599,19 @@ if(WITH_TURBOJPEG)
+         LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
+     endif()
  
- if(WITH_12BIT)
-   set(WITH_SIMD FALSE)
-@@ -279,14 +282,16 @@ if(WITH_TURBOJPEG)
-     target_link_libraries(turbojpeg jpeg-static)
-     set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "")
- 
--    add_executable(tjunittest tjunittest.c tjutil.c)
+-    add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
 -    target_link_libraries(tjunittest turbojpeg)
 +    if(ENABLE_EXECUTABLES)
-+      add_executable(tjunittest tjunittest.c tjutil.c)
++      add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
 +      target_link_libraries(tjunittest turbojpeg)
  
--    add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c
--      wrppm.c)
--    target_link_libraries(tjbench turbojpeg jpeg-static)
--    set_property(TARGET tjbench PROPERTY COMPILE_FLAGS
--      "-DBMP_SUPPORTED -DPPM_SUPPORTED")
-+      add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c
-+        wrppm.c)
-+      target_link_libraries(tjbench turbojpeg jpeg-static)
-+      set_property(TARGET tjbench PROPERTY COMPILE_FLAGS
-+        "-DBMP_SUPPORTED -DPPM_SUPPORTED")
+-    add_executable(tjbench tjbench.c tjutil.c)
+-    target_link_libraries(tjbench turbojpeg)
+-    if(UNIX)
+-      target_link_libraries(tjbench m)
+-    endif()
++      add_executable(tjbench tjbench.c tjutil.c)
++      target_link_libraries(tjbench turbojpeg)
++      if(UNIX)
++        target_link_libraries(tjbench m)
++      endif()
+ 
+-    add_executable(tjexample tjexample.c)
+-    target_link_libraries(tjexample turbojpeg)
++      add_executable(tjexample tjexample.c)
++      target_link_libraries(tjexample turbojpeg)
 +    endif()
    endif()
  
    if(ENABLE_STATIC)
-@@ -299,14 +304,16 @@ if(WITH_TURBOJPEG)
-       add_dependencies(turbojpeg-static simd)
+@@ -616,14 +624,16 @@ if(WITH_TURBOJPEG)
+       set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
      endif()
  
--    add_executable(tjunittest-static tjunittest.c tjutil.c)
+-    add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
+-      md5/md5hl.c)
 -    target_link_libraries(tjunittest-static turbojpeg-static)
 +    if(ENABLE_EXECUTABLES)
-+      add_executable(tjunittest-static tjunittest.c tjutil.c)
++      add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
++        md5/md5hl.c)
 +      target_link_libraries(tjunittest-static turbojpeg-static)
  
--    add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c
--      wrbmp.c wrppm.c)
--    target_link_libraries(tjbench-static turbojpeg-static jpeg-static)
--    set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS
--      "-DBMP_SUPPORTED -DPPM_SUPPORTED")
-+      add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c
-+        wrbmp.c wrppm.c)
-+      target_link_libraries(tjbench-static turbojpeg-static jpeg-static)
-+      set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS
-+        "-DBMP_SUPPORTED -DPPM_SUPPORTED")
-+    endif()
+-    add_executable(tjbench-static tjbench.c tjutil.c)
+-    target_link_libraries(tjbench-static turbojpeg-static)
+-    if(UNIX)
+-      target_link_libraries(tjbench-static m)
++      add_executable(tjbench-static tjbench.c tjutil.c)
++      target_link_libraries(tjbench-static turbojpeg-static)
++      if(UNIX)
++        target_link_libraries(tjbench-static m)
++      endif()
+     endif()
    endif()
  endif()
- 
-@@ -318,7 +325,7 @@ else()
+@@ -639,7 +649,7 @@ else()
    set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
  endif()
  
@@ -69,96 +77,119 @@ index 131b437..c29e604 100644
    add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c
      ${CJPEG_BMP_SOURCES})
    set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-@@ -334,10 +341,11 @@ if(ENABLE_STATIC)
-   set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "-DUSE_SETMODE")
+@@ -655,9 +665,11 @@ if(ENABLE_STATIC)
+   set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
  endif()
  
 -add_executable(rdjpgcom rdjpgcom.c)
--
--add_executable(wrjpgcom wrjpgcom.c)
 +if(ENABLE_EXECUTABLES)
 +  add_executable(rdjpgcom rdjpgcom.c)
  
+-add_executable(wrjpgcom wrjpgcom.c)
 +  add_executable(wrjpgcom wrjpgcom.c)
 +endif()
  
- #
- # Tests
-@@ -917,24 +925,30 @@ add_custom_target(installer
+ 
+ ###############################################################################
+@@ -1326,26 +1338,32 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
  
  if(WITH_TURBOJPEG)
    if(ENABLE_SHARED)
 -    install(TARGETS turbojpeg tjbench
 +    install(TARGETS turbojpeg
-       ARCHIVE DESTINATION lib
-       LIBRARY DESTINATION lib
-       RUNTIME DESTINATION bin)
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +    if(ENABLE_EXECUTABLES)
 +      install(TARGETS tjbench
-+        RUNTIME DESTINATION bin)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +    endif()
    endif()
    if(ENABLE_STATIC)
-     install(TARGETS turbojpeg-static ARCHIVE DESTINATION lib)
+     install(TARGETS turbojpeg-static ARCHIVE
+       DESTINATION ${CMAKE_INSTALL_LIBDIR})
 -    if(NOT ENABLE_SHARED)
 +    if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
-       install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static.exe
-         DESTINATION bin RENAME tjbench.exe)
+       install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static${EXE}
+         DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
      endif()
    endif()
--  install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include)
+-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
+-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +  if(INSTALL_HEADERS)
-+    install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include)
++    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
++      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +  endif()
  endif()
  
  if(ENABLE_STATIC)
-   install(TARGETS jpeg-static ARCHIVE DESTINATION lib)
+   install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 -  if(NOT ENABLE_SHARED)
 +  if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
-     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static.exe
-       DESTINATION bin RENAME cjpeg.exe)
-     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static.exe
-@@ -944,17 +958,23 @@ if(ENABLE_STATIC)
+     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static${EXE}
+       DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME cjpeg${EXE})
+     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static${EXE}
+@@ -1355,21 +1373,25 @@ if(ENABLE_STATIC)
    endif()
  endif()
  
--install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin)
+-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +if(ENABLE_EXECUTABLES)
-+  install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin)
++  install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +endif()
  
--install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md
--  ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt
--  ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt
--  ${CMAKE_SOURCE_DIR}/wizard.txt
--  DESTINATION doc)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
+-  ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
+-  ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-if(WITH_JAVA)
+-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
+-    DESTINATION ${CMAKE_INSTALL_DOCDIR})
 +if(INSTALL_DOCS)
-+  install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md
-+    ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt
-+    ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt
-+    ${CMAKE_SOURCE_DIR}/wizard.txt
-+    DESTINATION doc)
-+endif()
++  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
++    ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
++    ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
++    ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
++    ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
++    ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
++    ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
++  if(WITH_JAVA)
++    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
++      DESTINATION ${CMAKE_INSTALL_DOCDIR})
++  endif()
+ endif()
  
--install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h
--  ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h
--  DESTINATION include)
+-if(UNIX OR MINGW)
++if((UNIX OR MINGW) AND INSTALL_DOCS)
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
+     ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
+     ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
+@@ -1380,10 +1402,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
+   ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
+-  ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
+-  ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
+-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +if(INSTALL_HEADERS)
-+  install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h
-+    ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h
-+    DESTINATION include)
++  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
++    ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
++    ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +endif()
  
- configure_file("${CMAKE_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in"
-   "cmake_uninstall.cmake" IMMEDIATE @ONLY)
-
+ include(cmakescripts/BuildPackages.cmake)
+ 
 diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
-index d423cce..9da7c6e 100644
+index 2bab832..afbb56a 100755
 --- a/sharedlib/CMakeLists.txt
 +++ b/sharedlib/CMakeLists.txt
-@@ -50,24 +50,31 @@ else()
- 	set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
+@@ -70,24 +70,33 @@ else()
+   set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
  endif()
  
 -add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
@@ -182,24 +213,26 @@ index d423cce..9da7c6e 100644
  
 -add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
 -target_link_libraries(jpegtran jpeg)
--set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "-DUSE_SETMODE")
+-set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
 +  add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
 +  target_link_libraries(jpegtran jpeg)
-+  set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "-DUSE_SETMODE")
++  set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
  
 -add_executable(jcstest ../jcstest.c)
 -target_link_libraries(jcstest jpeg)
 +  add_executable(jcstest ../jcstest.c)
 +  target_link_libraries(jcstest jpeg)
++endif()
  
 -install(TARGETS jpeg cjpeg djpeg jpegtran
++install(TARGETS jpeg
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++
++if(ENABLE_EXECUTABLES)
 +  install(TARGETS cjpeg djpeg jpegtran
-+    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION lib
-+    RUNTIME DESTINATION bin)
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +endif()
-+
-+install(TARGETS jpeg
-   ARCHIVE DESTINATION lib
-   LIBRARY DESTINATION lib
-   RUNTIME DESTINATION bin)
diff --git a/ports/libjpeg-turbo/linux-cmake.patch b/ports/libjpeg-turbo/linux-cmake.patch
deleted file mode 100644
index 48a04279fd2d5a..00000000000000
--- a/ports/libjpeg-turbo/linux-cmake.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c29e604..6e467be 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,10 +29,6 @@ pad_number(VERSION_MINOR 3)
- pad_number(VERSION_REVISION 3)
- set(LIBJPEG_TURBO_VERSION_NUMBER ${VERSION_MAJOR}${VERSION_MINOR}${VERSION_REVISION})
- 
--if(NOT WIN32)
--  message(FATAL_ERROR "Platform not supported by this build system.  Use autotools instead.")
--endif()
--
- string(TIMESTAMP BUILD "%Y%m%d")
- 
- # This does nothing except when using MinGW.  CMAKE_BUILD_TYPE has no meaning
-@@ -166,8 +162,10 @@ endif()
- 
- if(64BIT)
-   message(STATUS "64-bit build")
-+  add_compile_options(-DSIZEOF_SIZE_T=8)
- else()
-   message(STATUS "32-bit build")
-+  add_compile_options(-DSIZEOF_SIZE_T=4)
- endif()
- 
- if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake
index 002818c4752c57..1e1f6ca42fb61c 100644
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@@ -1,21 +1,16 @@
 include(vcpkg_common_functions)
 
-vcpkg_download_distfile(GETENV_PATCH
-    URLS "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff"
-    FILENAME "libjpeg-turbo-bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff"
-    SHA512 4cd064521b5e4baba4adf972f9f574f6dd43a2cd3e3ad143ca2cdf0f165024406d4fd2ed094124d0c17c5370394140e82fdd892d3cdc49609acdf8f79db1758c
-)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libjpeg-turbo/libjpeg-turbo
-    REF 1.5.3
-    SHA512 0e7a2cd9943b610f49b562c20a5c350a50326a87bce1d39f14fe45760ed2f89a0d2d3e3f0de9f6a7714f566aabadec6b2422b592591ebb98bbad600ea411fea7
+    REF 2.0.1
+    SHA512 d456515dcda7c5e2e257c9fd1441f3a5cff0d33281237fb9e3584bbec08a181c4b037947a6f87d805977ec7528df39b12a5d32f6e8db878a62bcc90482f86e0e
     HEAD_REF master
     PATCHES
         add-options-for-exes-docs-headers.patch
-        linux-cmake.patch
-        "${GETENV_PATCH}"
+		
+        #workaround for vcpkg bug see #5697 on github for more information
+        workaround_cmake_system_processor.patch
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
@@ -51,14 +46,20 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 # Rename libraries for static builds
-if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
-elseif(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib")
+    endif()
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
+    endif()
+else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
+    endif()
 endif()
 
 file(COPY
@@ -70,4 +71,7 @@ vcpkg_copy_pdbs()
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jpeg)
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
+
 vcpkg_test_cmake(PACKAGE_NAME JPEG MODULE)
diff --git a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch
new file mode 100644
index 00000000000000..613504dfac9f9d
--- /dev/null
+++ b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2f137a..3754095 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,7 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}")
+ 
+ # Detect CPU type and whether we're building 64-bit or 32-bit code
+ math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8")
+-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC)
++string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" CMAKE_SYSTEM_PROCESSOR_LC)
+ if(CMAKE_SYSTEM_PROCESSOR_LC MATCHES "x86_64" OR
+   CMAKE_SYSTEM_PROCESSOR_LC MATCHES "amd64" OR
+   CMAKE_SYSTEM_PROCESSOR_LC MATCHES "i[0-9]86" OR
diff --git a/ports/libnoise/CONTROL b/ports/libnoise/CONTROL
new file mode 100644
index 00000000000000..53009a4506157e
--- /dev/null
+++ b/ports/libnoise/CONTROL
@@ -0,0 +1,3 @@
+Source: libnoise
+Version: 1.0.0
+Description: A general-purpose library that generates three-dimensional coherent noise. Useful for terrain generation and procedural texture generation. Uses a broad number of techniques (Perlin noise, ridged multifractal, etc.) and combinations of those techniques.
diff --git a/ports/libnoise/portfile.cmake b/ports/libnoise/portfile.cmake
new file mode 100644
index 00000000000000..28465f585d1388
--- /dev/null
+++ b/ports/libnoise/portfile.cmake
@@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+
+set( LIBNOISE_VERSION "1.0.0" )
+set( LIBNOISE_COMMIT "d7e68784a2b24c632868506780eba336ede74ecd" )
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO RobertHue/libnoise
+    REF ${LIBNOISE_COMMIT}
+    SHA512 8c4d654acb4ae3d90ee62ebdf0447f876022dcb887ebfad88f39b09d29183a58e6fc1b1f1d03edff804975c8befcc6eda33c44797495285aae338c2e869a14d7
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+# Include files should not be duplicated into the /debug/include directory.
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/libnoise)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libnoise/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libnoise/copyright)
+
+# Post-build test for cmake libraries
+vcpkg_test_cmake(PACKAGE_NAME libnoise)
\ No newline at end of file
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL
index d5a6b559cd84fd..1baecccf3b183e 100644
--- a/ports/libpng/CONTROL
+++ b/ports/libpng/CONTROL
@@ -1,4 +1,4 @@
 Source: libpng
-Version: 1.6.37
+Version: 1.6.37-1
 Build-Depends: zlib
 Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index d6b35bf235ad4b..ab552b8e696bb3 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -7,8 +7,7 @@ vcpkg_from_github(
     SHA512 ccb3705c23b2724e86d072e2ac8cfc380f41fadfd6977a248d588a8ad57b6abe0e4155e525243011f245e98d9b7afbe2e8cc7fd4ff7d82fcefb40c0f48f88918
     HEAD_REF master
     PATCHES
-        "use-abort-on-all-platforms.patch"
-        "skip-install-symlink.patch"
+        use-abort-on-all-platforms.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -45,15 +44,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     endif()
 endif()
 
-# Remove CMake config files as they are incorrectly generated and everyone uses built-in FindPNG anyway.
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/libpng ${CURRENT_PACKAGES_DIR}/debug/lib/libpng)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng TARGET_PATH share/libpng)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/)
+
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpng)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libpng/LICENSE ${CURRENT_PACKAGES_DIR}/share/libpng/copyright)
 
 vcpkg_copy_pdbs()
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
 if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/png)
 endif()
diff --git a/ports/libpng/skip-install-symlink.patch b/ports/libpng/skip-install-symlink.patch
deleted file mode 100644
index c31177d7ecb7f8..00000000000000
--- a/ports/libpng/skip-install-symlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48c6fa2..589e5f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -868,7 +868,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
--  if(PNG_SHARED)
-+  if(PNG_SHARED AND NOT SKIP_INSTALL_SYMLINK)
-     # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
-     if(CYGWIN OR MINGW)
-       CREATE_SYMLINK(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
-@@ -881,7 +881,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-     endif(NOT WIN32)
-   endif(PNG_SHARED)
- 
--  if(PNG_STATIC)
-+  if(PNG_STATIC AND NOT SKIP_INSTALL_SYMLINK)
-     if(NOT WIN32 OR CYGWIN OR MINGW)
-       CREATE_SYMLINK( libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-       install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/ports/libpng/usage b/ports/libpng/usage
deleted file mode 100644
index 19203399c64140..00000000000000
--- a/ports/libpng/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-The package libpng is compatible with built-in CMake targets:
-
-    find_package(PNG REQUIRED)
-    target_link_libraries(main PRIVATE PNG::PNG)
diff --git a/ports/libpq/CMakeLists.txt b/ports/libpq/CMakeLists.txt
index 13c129317042a5..3d5d6e5087a382 100644
--- a/ports/libpq/CMakeLists.txt
+++ b/ports/libpq/CMakeLists.txt
@@ -141,7 +141,7 @@ endif()
 
 target_link_libraries(libpq PRIVATE OpenSSL::SSL)
 if(WIN32)
-    target_link_libraries(libpq PRIVATE ws2_32 secur32 advapi32 shell32)
+    target_link_libraries(libpq PRIVATE ws2_32 secur32 advapi32 shell32 crypt32)
 endif()
 target_include_directories(libpq PRIVATE src/include src/port ${CMAKE_CURRENT_BINARY_DIR}/include)
 set_target_properties(libpq PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL
index ac0793b13a440a..54b2259e881d26 100644
--- a/ports/libpq/CONTROL
+++ b/ports/libpq/CONTROL
@@ -1,4 +1,4 @@
 Source: libpq
-Version: 9.6.1-6
+Version: 9.6.1-7
 Description: The official database access API of postgresql
 Build-Depends: openssl, zlib (linux)
diff --git a/ports/libwebp/0001-build-fixes.patch b/ports/libwebp/0001-build-fixes.patch
index c25ecbfee0b40c..49097872799f7d 100644
--- a/ports/libwebp/0001-build-fixes.patch
+++ b/ports/libwebp/0001-build-fixes.patch
@@ -2,13 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 499ddce..895fda9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -159,6 +159,10 @@ add_definitions(-DHAVE_CONFIG_H)
+@@ -159,6 +159,12 @@ add_definitions(-DHAVE_CONFIG_H)
  if(MSVC)
    # avoid security warnings for e.g., fopen() used in the examples.
    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 +  add_definitions(-DWEBP_HAVE_JUST_SDL_H)
 +  if(BUILD_SHARED_LIBS)
 +    add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\))
++  else()
++    add_definitions(-DFREEGLUT_STATIC)
 +  endif()
  else()
    add_definitions(-Wall)
diff --git a/ports/libwebp/0003-remove-missing-symbol.patch b/ports/libwebp/0003-remove-missing-symbol.patch
new file mode 100644
index 00000000000000..218481bbc1565c
--- /dev/null
+++ b/ports/libwebp/0003-remove-missing-symbol.patch
@@ -0,0 +1,13 @@
+diff --git a/examples/gifdec.c b/examples/gifdec.c
+index 4219352..ab0592a 100644
+--- a/examples/gifdec.c
++++ b/examples/gifdec.c
+@@ -310,7 +310,7 @@ void GIFDisplayError(const GifFileType* const gif, int gif_error) {
+ #else
+   (void)gif;
+   fprintf(stderr, "GIFLib Error %d: ", gif_error);
+-  PrintGifError();
++  //PrintGifError();
+   fprintf(stderr, "\n");
+ #endif
+ }
diff --git a/ports/libwebp/0004-add-missing-linked-library.patch b/ports/libwebp/0004-add-missing-linked-library.patch
new file mode 100644
index 00000000000000..49a34ef4d244f3
--- /dev/null
+++ b/ports/libwebp/0004-add-missing-linked-library.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a98540c..a3697cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -479,6 +479,10 @@ if(WEBP_BUILD_VWEBP)
+                                        ${CMAKE_CURRENT_SOURCE_DIR}/src
+                                        ${CMAKE_CURRENT_BINARY_DIR}/src
+                                        ${OPENGL_INCLUDE_DIR})
++    if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE))
++      find_package(X11 REQUIRED)
++      target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB})
++    endif()
+     install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+     if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+       check_c_compiler_flag("-Wno-deprecated-declarations" HAS_NO_DEPRECATED)
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL
index ed3ff55ca957e6..11647702d760bc 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,8 +1,8 @@
 Source: libwebp
-Version: 1.0.2-2
+Version: 1.0.2-3
 Description: Lossy compression of digital photographic images.
 Build-Depends: opengl
 
 Feature: all
 Description: enable all webp features
-Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut, sdl1
+Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows)
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index bae24ddff04928..f0bd669ee952f6 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -9,6 +9,8 @@ vcpkg_from_github(
   PATCHES
     0001-build-fixes.patch
     0002-cmake-config-add-backwards-compatibility.patch
+    0003-remove-missing-symbol.patch
+    0004-add-missing-linked-library.patch
 )
 
 set(WEBP_BUILD_ANIM_UTILS OFF)
@@ -30,6 +32,10 @@ if("all" IN_LIST FEATURES)
   set(WEBP_BUILD_EXTRAS ON)
 endif()
 
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    message("WebP currently requires the following library from the system package manager:\n    Xxf86vm\n\nThis can be installed on Ubuntu systems via apt-get install libxxf86vm-dev")
+endif()
+
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
@@ -59,26 +65,53 @@ vcpkg_copy_pdbs()
 vcpkg_fixup_cmake_targets(CONFIG_PATH "share/WebP/cmake/" TARGET_PATH "share/WebP/")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
+#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it
+if(CMAKE_HOST_WIN32)
+set(EXECUTABLE_SUFFIX ".exe")
+else()
+set(EXECUTABLE_SUFFIX "")
+endif()
+
 if("all" IN_LIST FEATURES)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2webp.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/img2webp.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp_sdl.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpinfo.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpmux.exe)
-  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webp_quality.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2webp${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/img2webp${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp_sdl${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpinfo${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpmux${EXECUTABLE_SUFFIX})
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webp_quality${EXECUTABLE_SUFFIX})
   file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libwebp/)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/get_disto.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/get_disto.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gif2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/gif2webp.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/img2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/img2webp.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp_sdl.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpinfo.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpinfo.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpmux.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpmux.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webp_quality.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webp_quality.exe)
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/get_disto${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/get_disto${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/get_disto${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/gif2webp${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gif2webp${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/gif2webp${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/img2webp${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/img2webp${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/img2webp${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/vwebp${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp_sdl${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/webpinfo${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpinfo${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpinfo${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/webpmux${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpmux${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpmux${EXECUTABLE_SUFFIX})
+  endif()
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/webp_quality${EXECUTABLE_SUFFIX}")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webp_quality${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/webp_quality${EXECUTABLE_SUFFIX})
+  endif()
   vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libwebp)
 endif()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebp/COPYING ${CURRENT_PACKAGES_DIR}/share/libwebp/copyright)
diff --git a/ports/loguru/CONTROL b/ports/loguru/CONTROL
new file mode 100644
index 00000000000000..baa9503b09fc11
--- /dev/null
+++ b/ports/loguru/CONTROL
@@ -0,0 +1,4 @@
+Source: loguru
+Version: v2.0.0
+Description: A lightweight and flexible C++ logging library
+Build-Depends:
\ No newline at end of file
diff --git a/ports/loguru/copyright b/ports/loguru/copyright
new file mode 100644
index 00000000000000..334edabf89e237
--- /dev/null
+++ b/ports/loguru/copyright
@@ -0,0 +1,3 @@
+This software is in the public domain. Where that dedication is not recognized, you are granted a perpetual, irrevocable license to copy, modify and distribute it as you see fit.
+
+That being said, I would appreciate credit! If you find Loguru useful, tweet me at @ernerfeldt mail me at emil.ernerfeldt@gmail.com.
\ No newline at end of file
diff --git a/ports/loguru/portfile.cmake b/ports/loguru/portfile.cmake
new file mode 100644
index 00000000000000..80efb0eead1da4
--- /dev/null
+++ b/ports/loguru/portfile.cmake
@@ -0,0 +1,12 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO emilk/loguru
+    REF v2.0.0
+    SHA512 d6358f843689d10a44dc7bf590305cbfb89727e26d971ca4fe439e5468cdb7bcee2aa858368250e9654fb5ecebf63bca9742451881dae78068fecb18f279d988
+    HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/loguru.hpp  DESTINATION ${CURRENT_PACKAGES_DIR}/include/loguru)
+file(COPY ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/loguru)
\ No newline at end of file
diff --git a/ports/luasocket/CONTROL b/ports/luasocket/CONTROL
index 30a45083f673ea..609af7ae5be1fc 100644
--- a/ports/luasocket/CONTROL
+++ b/ports/luasocket/CONTROL
@@ -1,4 +1,4 @@
 Source: luasocket
-Version: 2019-03-29
+Version: 2019-05-07
 Description: LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.
 Build-Depends: lua
diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake
index a7ed86cf82c041..0f4bfbf6d4bea4 100644
--- a/ports/luasocket/portfile.cmake
+++ b/ports/luasocket/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO diegonehab/luasocket
-    REF c89a931cc31f219d51dd32a8a253d5ee3fbd31be
-    SHA512 1769bc6aed41f129a7e7f8c64497476fc89dc69a227a4610c6330c3138b9cdc3c2fc87a925efc13ba840153b681cc4d66001faddb5b3085f430050c52bd5e564
+    REF 733af884f1aa18ff469bf3c4d18810e815853211
+    SHA512 632d66a9460636758428261b5b0d8669a90492de716915c07d1d1bf66c795bc9599f9edcd4345bbc3ef06830d670303b6cfb56c206e022b4bc5307fec2a20395
     HEAD_REF master)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/lz4/CONTROL b/ports/lz4/CONTROL
index 68fe1eff24b9c6..c2db311f7dfdab 100644
--- a/ports/lz4/CONTROL
+++ b/ports/lz4/CONTROL
@@ -1,3 +1,3 @@
 Source: lz4
-Version: 1.9.0
+Version: 1.9.1
 Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
diff --git a/ports/lz4/portfile.cmake b/ports/lz4/portfile.cmake
index b28d3b93974d81..e839e3958df93b 100644
--- a/ports/lz4/portfile.cmake
+++ b/ports/lz4/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lz4/lz4
-    REF v1.9.0
-    SHA512 f9e78df262818192800157d6ed64d42c06e918062afc93e3098d00f5f49fd3279b5709486a7d8841708a4ce1c539381225f0813e6a342f49d13b576eb61eb444
+    REF v1.9.1
+    SHA512 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e
     HEAD_REF dev)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/minhook/CONTROL b/ports/minhook/CONTROL
new file mode 100644
index 00000000000000..95209891ba88ec
--- /dev/null
+++ b/ports/minhook/CONTROL
@@ -0,0 +1,3 @@
+Source: minhook
+Version: 1.3.3
+Description: The Minimalistic x86/x64 API Hooking Library for Windows.
\ No newline at end of file
diff --git a/ports/minhook/install-destination.patch b/ports/minhook/install-destination.patch
new file mode 100644
index 00000000000000..13f3dc3799634c
--- /dev/null
+++ b/ports/minhook/install-destination.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df947af..6a894d8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,7 +113,7 @@ install(
+     "${CMAKE_CURRENT_BINARY_DIR}/minhook-config.cmake"
+     "${CMAKE_CURRENT_BINARY_DIR}/minhook-config-version.cmake"
+   DESTINATION 
+-    "lib/minhook"
++    share/minhook
+ )
+ 
+ ###################
+@@ -133,7 +133,7 @@ install(
+   NAMESPACE 
+     minhook::
+   DESTINATION 
+-    "lib/minhook"
++    share/minhook
+ )
+ 
+ install(
diff --git a/ports/minhook/portfile.cmake b/ports/minhook/portfile.cmake
new file mode 100644
index 00000000000000..13779a3388ced2
--- /dev/null
+++ b/ports/minhook/portfile.cmake
@@ -0,0 +1,49 @@
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
+include(vcpkg_common_functions)
+
+if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+    set(BUILD_ARCH "Win32")
+    set(OUTPUT_DIR "Win32")
+elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
+    set(BUILD_ARCH "x64")
+    set(OUTPUT_DIR "Win64")
+else()
+    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+# Download files to enable CMake support for minhook - Adds CMakeLists.txt and minhook-config.cmake.in
+vcpkg_download_distfile(
+    CMAKE_SUPPORT_PATCH
+    URLS https://github.com/TsudaKageyu/minhook/commit/3f2e34976c1685ee372a09f54c0c8c8f4240ef90.patch
+    FILENAME minhook-cmake-support.patch
+    SHA512 5f353b167e2c31e5e06258420c78fbae0095368cf687ff06a350d6b69b30476824785dde5dbcea3e30ff827e7cdb293727a73e6b1e6875f00aa891b2980c3877
+)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO TsudaKageyu/minhook
+    REF v1.3.3
+    SHA512 9f10c92a926a06cde1e4092b664a3aab00477e8b9f20cee54e1d2b3747fad91043d199a2753f7e083497816bbefc5d75d9162d2098dd044420dbca555e80b060
+    HEAD_REF master
+    PATCHES
+        "${CMAKE_SUPPORT_PATCH}"
+        install-destination.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(COPY ${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/minhook-targets-debug.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/moos-core/CONTROL b/ports/moos-core/CONTROL
index 2195fd5bda349a..64f94d6dbbc6b0 100644
--- a/ports/moos-core/CONTROL
+++ b/ports/moos-core/CONTROL
@@ -1,4 +1,3 @@
-Source: moos-core
-Version: 10.4.0-1
-Description: A very light weight, easy to use middleware. See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
-Build-Depends:
+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
diff --git a/ports/moos-core/portfile.cmake b/ports/moos-core/portfile.cmake
index 60eb5d9a582dcc..196b3e6480e75e 100644
--- a/ports/moos-core/portfile.cmake
+++ b/ports/moos-core/portfile.cmake
@@ -1,16 +1,15 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO themoos/core-moos
     REF v10.4.0
     SHA512 8a82074bd219bbedbe56c2187afe74a55a252b0654a675c64d1f75e62353b0874e7b405d9f677fadb297e955d11aea50a07e8f5f3546be3c4ddab76fe356a51e
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake_fix.patch
+    PATCHES
+        cmake_fix.patch
 )
 
 message(STATUS "MOOS VCPKG SOURCE_PATH ${SOURCE_PATH}")
@@ -20,6 +19,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
+        -DBUILD_SHARED_LIBS=OFF
         -DCMAKE_ENABLE_EXPORT=OFF
 )
 
@@ -27,28 +27,15 @@ vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/MOOS")
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/MOOS)
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/MOOSDB")
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/MOOSDB ${CURRENT_PACKAGES_DIR}/tools/MOOS/MOOSDB)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/atm ${CURRENT_PACKAGES_DIR}/tools/MOOS/atm)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gtm ${CURRENT_PACKAGES_DIR}/tools/MOOS/gtm)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ktm ${CURRENT_PACKAGES_DIR}/tools/MOOS/ktm)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mqos ${CURRENT_PACKAGES_DIR}/tools/MOOS/mqos)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mtm ${CURRENT_PACKAGES_DIR}/tools/MOOS/mtm)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/umm ${CURRENT_PACKAGES_DIR}/tools/MOOS/umm)
-endif()
-
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+set(MOOS_EXEC_SUFFIX "")
+if (WIN32)
+    set(MOOS_EXEC_SUFFIX ".exe")
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+# Stage tools
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Put the licence file where vcpkg expects it
-file(COPY
-    ${SOURCE_PATH}/Core/GPLCore.txt
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME
-    ${CURRENT_PACKAGES_DIR}/share/${PORT}/GPLCore.txt
-    ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+file(COPY ${SOURCE_PATH}/Core/GPLCore.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL
index 7224378f36a6d2..fdf241afbe27ed 100644
--- a/ports/nana/CONTROL
+++ b/ports/nana/CONTROL
@@ -1,4 +1,4 @@
 Source: nana
-Version: 1.6.2-1
+Version: 1.7.1
 Description: Cross-platform library for GUI programming in modern C++ style.
 Build-Depends: libpng, libjpeg-turbo, freetype (!uwp&&!windows), fontconfig (!uwp&&!windows)
diff --git a/ports/nana/portfile.cmake b/ports/nana/portfile.cmake
index 16790055084a21..981bc424425e2c 100644
--- a/ports/nana/portfile.cmake
+++ b/ports/nana/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cnjinhao/nana
-    REF v1.6.2
-    SHA512 95271764813e64126abf2941bfc13b399ffe093c570891f65f331505066ce0dcad7df4170b2616951b7e0234ea2d6d21219cdfd15b112ecf598a3afa992cceb4
+    REF v1.7.1
+    SHA512 43bd6f6321557184431935b4fdd636427458e79333879f6310685a70ee25f4344851910e67c52145382c38a3cea9d1761b40c8edbc072a7cc9c62406ed402549
     HEAD_REF develop
 )
 
diff --git a/ports/open62541/CONTROL b/ports/open62541/CONTROL
index abf413d79423dd..ed2224f0fdbbed 100644
--- a/ports/open62541/CONTROL
+++ b/ports/open62541/CONTROL
@@ -1,3 +1,3 @@
 Source: open62541
-Version: 0.3.0
+Version: 0.3.0-1
 Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.
diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake
index 951ad9b48db7ff..a8c345eb8f1c7d 100644
--- a/ports/open62541/portfile.cmake
+++ b/ports/open62541/portfile.cmake
@@ -37,7 +37,7 @@ if(NOT EXISTS ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX})
         vcpkg_download_distfile(GET_PIP
             URLS "https://bootstrap.pypa.io/get-pip.py"
             FILENAME "tools/python/python3/get-pip.py"
-            SHA512 fdbcef1037dca7cc914e2304af657ebd08239cd18c3e79786dc25c8ea39957674e012d7ea8ae2c99006e4b61d3a5e24669ac5771dc186697fd9fdb40b6cc07ae
+            SHA512 99520d223819708b8f6e4b839d1fa215e4e8adc7fcd0db6c25a0399cf2fa10034b35673cf450609303646d12497f301ef53b7e7cc65c78e7bce4af0c673555ad
         )
         execute_process(COMMAND ${PYTHON3_DIR}/python${EXECUTABLE_SUFFIX} ${PYTHON3_DIR}/get-pip.py)
     endif()
diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL
index b3ff85c81caff3..d485b4126ecd7c 100644
--- a/ports/openblas/CONTROL
+++ b/ports/openblas/CONTROL
@@ -1,3 +1,3 @@
 Source: openblas
-Version: 0.3.5-4
+Version: 0.3.6
 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake
index 7f4c0adb42fe71..caf901ccfac9f6 100644
--- a/ports/openblas/portfile.cmake
+++ b/ports/openblas/portfile.cmake
@@ -24,8 +24,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xianyi/OpenBLAS
-    REF v0.3.5
-    SHA512 91b3074eb922453bf843158b4281cde65db9e8bbdd7590e75e9e6cdcb486157f7973f2936f327bb3eb4f1702ce0ba51ae6729d8d4baf2d986c50771e8f696df0
+    REF v0.3.6
+    SHA512 1ad980176a51f70d8b0b2d158da8c01f30f77b7cf385b24a6340d3c5feb1513bd04b9390487d05cc9557db7dc5f7c135b1688dec9f17ebef35dba884ef7ddee9
     HEAD_REF develop
     PATCHES
         uwp.patch
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 88ade6e289f81e..6106a274e91137 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -50,7 +50,7 @@ Build-Depends: vtk
 Description: vtk support for opencv
 
 Feature: gdcm
-Build-Depends: gdcm2
+Build-Depends: gdcm
 Description: GDCM support for opencv
 
 Feature: webp
diff --git a/ports/openjpeg/CONTROL b/ports/openjpeg/CONTROL
index 7a8721b8d056e6..110bae11a945cb 100644
--- a/ports/openjpeg/CONTROL
+++ b/ports/openjpeg/CONTROL
@@ -1,3 +1,3 @@
 Source: openjpeg
-Version: 2.3.0-1
+Version: 2.3.1-1
 Description: JPEG 2000 image library
diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake
index f0f293ac16e877..2296734ad1c872 100644
--- a/ports/openjpeg/portfile.cmake
+++ b/ports/openjpeg/portfile.cmake
@@ -1,12 +1,10 @@
 include(vcpkg_common_functions)
 
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uclouvain/openjpeg
-    REF v2.3.0
-    SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
+    REF v2.3.1
+    SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
     HEAD_REF master
 )
 
diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL
index fedcd7bd8b3309..515dd5513f8879 100644
--- a/ports/qt5-3d/CONTROL
+++ b/ports/qt5-3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-3d
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake
index 96df50dd7f17e8..444fbbcf2a0b53 100644
--- a/ports/qt5-3d/portfile.cmake
+++ b/ports/qt5-3d/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qt3d 4c054b1075e976043fca5033a27be8a3f0d2df5dde5da4a536a9e7d61cdfd91007a2bf687bc19ad59724a2d53a9730b5d2446238bb7c6289d6a5dd3bf220a409)
+qt_modular_library(qt3d 679c2dbc60fc53c1c5469369f25244bd844c2e6e723a1b451f7cbb50bfa018e6fb715214e5a5df6fb32d7c7936bb6c99d85e299fe2b76344bcf774c93ed0acd0)
diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
index 486dbf51868a04..60ca3837058fd2 100644
--- a/ports/qt5-activeqt/CONTROL
+++ b/ports/qt5-activeqt/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-activeqt
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 ActiveQt Module - ActiveX components
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake
index 9914ef6fdc5871..1e63132d89ea6b 100644
--- a/ports/qt5-activeqt/portfile.cmake
+++ b/ports/qt5-activeqt/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtactiveqt ff2871a7c0fa2674354f8bbd32196d8b2af34212e09e0f8c1df23182353959464dfb8c96800e45dae380f239082f62ed6f1904e72dc93e43141edb4f2606edd9)
+qt_modular_library(qtactiveqt 477c42653a59739aeeb17ab54bdd5cc50bc72a117250926e940c34d3f81d1b92356074056fb49f3cd811a88840377836b2d97cea8cbc62ae1d895168e7860753)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/plugins/platforminputcontexts)
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index a580047569ad34..2d8f1d10586e0a 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,4 +1,4 @@
-Source: qt5-base
-Version: 5.12.1-6
-Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
-Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
+Source: qt5-base
+Version: 5.12.3
+Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
+Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
diff --git a/ports/qt5-base/fix-gui-configure-json.patch b/ports/qt5-base/fix-gui-configure-json.patch
deleted file mode 100644
index 060fd0b3c7fa66..00000000000000
--- a/ports/qt5-base/fix-gui-configure-json.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 89934c8f..70d08177 100644
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -239,7 +239,8 @@
-             "sources": [
-                 { "type": "pkgConfig", "args": "freetype2" },
-                 { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
--                { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
-+                { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
-+                { "libs": "-lfreetype" }
-             ],
-             "use": [
-                 { "lib": "zlib", "condition": "features.system-zlib" }
-@@ -250,7 +251,7 @@
-             "test": {
-                 "tail": [
-                     "#ifndef FC_RGBA_UNKNOWN",
--                    "#  error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define",
-+                    "#  error This version of fontconfig is too old, it is missing the FC_RGBA_UNKNOWN define",
-                     "#endif"
-                 ],
-                 "main": [
-@@ -1436,7 +1437,7 @@
-         },
-         "eglfs_x11": {
-             "label": "EGLFS X11",
--            "condition": "features.eglfs && features.xcb && features.xcb-xlib && features.egl_x11",
-+            "condition": "features.eglfs && features.xcb-xlib && features.egl_x11",
-             "output": [ "privateFeature" ]
-         },
-         "gif": {
-@@ -1569,7 +1570,6 @@
-         },
-         "xcb-xlib": {
-             "label": "XCB Xlib",
--            "emitIf": "features.xcb",
-             "condition": "features.xlib && libs.xcb_xlib",
-             "output": [ "privateFeature" ]
-         },
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 3e6c5ae46d7923..c6dc55e43f7490 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -12,20 +12,18 @@ include(configure_qt)
 include(install_qt)
 
 set(MAJOR_MINOR 5.12)
-set(FULL_VERSION ${MAJOR_MINOR}.1)
+set(FULL_VERSION ${MAJOR_MINOR}.3)
 set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz")
 
 vcpkg_download_distfile(ARCHIVE_FILE
     URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
     FILENAME ${ARCHIVE_NAME}
-    SHA512 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25
+    SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 )
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE "${ARCHIVE_FILE}"
     REF ${FULL_VERSION}
-    PATCHES
-        fix-gui-configure-json.patch
 )
 
 # Remove vendored dependencies to ensure they are not picked up by the build
@@ -171,7 +169,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
 endif()
 
-vcpkg_execute_required_process( 
+vcpkg_execute_required_process(
     COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py
     WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake
     LOGNAME fix-cmake
@@ -251,4 +249,4 @@ endif()
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5core)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION  ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-# 
\ No newline at end of file
+#
diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake
index 7f3e7df2f89d0e..8e00aaca7f994a 100644
--- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake
+++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake
@@ -2,9 +2,9 @@ _find_package(${ARGS})
 
 function(add_qt_library _target)
     foreach(_lib IN LISTS ARGN)
-        find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES plugins/platforms)
+        find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES debug/plugins/platforms)
         find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} PATH_SUFFIXES plugins/platforms)
-        set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
+        set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
         \$<\$<NOT:\$<CONFIG:DEBUG>>:${${_lib}_LIBRARY_RELEASE}>\$<\$<CONFIG:DEBUG>:${${_lib}_LIBRARY_DEBUG}>)
     endforeach()
 endfunction()
@@ -21,28 +21,28 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY")
     find_package(OpenSSL)
     find_package(harfbuzz CONFIG)
 
-    set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
+    set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
         ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz
-        ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto  
+        ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto
     )
 
-    add_qt_library(Qt5::Core 
-        pcre2-16 
+    add_qt_library(Qt5::Core
+        pcre2-16
         Qt5ThemeSupport
         Qt5EventDispatcherSupport
-        Qt5PlatformCompositorSupport 
+        Qt5PlatformCompositorSupport
         Qt5FontDatabaseSupport)
 
     if(MSVC)
-       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
+       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
            Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib)
 
       add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d)
 
     elseif(APPLE)
-       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES           
-            "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" 
-            "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" 
+       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+            "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices"
+            "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices"
             "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration"
             "-weak_framework Carbon"
             "-weak_framework QuartzCore"
@@ -53,10 +53,10 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY")
             "-weak_framework CoreGraphics"
             "-weak_framework OpenGL"
             "-weak_framework AGL"
-            "-weak_framework ImageIO" 
+            "-weak_framework ImageIO"
             "z" "m"
             cups)
-        add_qt_library(Qt5::Core 
+        add_qt_library(Qt5::Core
             Qt5GraphicsSupport
             Qt5ClipboardSupport
             Qt5AccessibilitySupport
diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL
index 0b5964bb355f82..672aaf2d1b88c6 100644
--- a/ports/qt5-charts/CONTROL
+++ b/ports/qt5-charts/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-charts
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-charts/portfile.cmake b/ports/qt5-charts/portfile.cmake
index cb3c99d2a97697..0d7b7f17096f76 100644
--- a/ports/qt5-charts/portfile.cmake
+++ b/ports/qt5-charts/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtcharts 1915581f9cd644e0c6d9d38f5881ce388437ab1fa45554c01625ffd5c51067188450ff9329ccfcab17222389876658bd1e4595a426e75ef637311888451cfcd2)
+qt_modular_library(qtcharts f5940589c7a2dc5fcd3484397613f13ab41311c8ffb70a3484e64dc5bad24e18c94c9ebbe6716c1ec7c81b7863113ebfdb593f2d194608b2e3fb0b0b5c9c9102)
diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL
index 45319857c93e1d..741af67673125a 100644
--- a/ports/qt5-connectivity/CONTROL
+++ b/ports/qt5-connectivity/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-connectivity
-Version: 5.12.0
+Version: 5.12.3
 Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-connectivity/portfile.cmake b/ports/qt5-connectivity/portfile.cmake
index 91e15366aa73fd..5cc8777e514644 100644
--- a/ports/qt5-connectivity/portfile.cmake
+++ b/ports/qt5-connectivity/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtconnectivity 89a16da0bb958da3123a2cebec45b954b034b2a586490c8217769e2e0f22080676e57f847c9a6622ea2129f539ac8732e0968f38517236c9880ff9b715492ede)
+qt_modular_library(qtconnectivity 4da406d88c3cf216d53c524d3896f50b19dae124baec904233dbb67163a30a955dee29148b5f5b71c35cb28638912423bb1cf4d38c62aeefa7353bd29e97a269)
diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL
index 2b6627465bce83..5ef4728dfaa4a9 100644
--- a/ports/qt5-datavis3d/CONTROL
+++ b/ports/qt5-datavis3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-datavis3d
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-datavis3d/portfile.cmake b/ports/qt5-datavis3d/portfile.cmake
index 4927f7007af2bc..cc9df8c4ac2af3 100644
--- a/ports/qt5-datavis3d/portfile.cmake
+++ b/ports/qt5-datavis3d/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtdatavis3d a0eff0f58515720d9c8e37bce16a3f6f719ca748c6228f183eb7e2fe2cc024195e5122cc29b9d0dba3319a9d6147105c0b253fb5e633e16db1fb20cca563d956)
+qt_modular_library(qtdatavis3d cb295deb9aa33132294d7d7f4daaa53dd9ab4815e2d3a2c916d88e1882e018a49d8d66db9088f69375d8da759a3f3566f251802aaba82d74cad2eb45d9bbbcff)
diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL
index 87b5a8da002857..1ef033d17ce662 100644
--- a/ports/qt5-declarative/CONTROL
+++ b/ports/qt5-declarative/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-declarative
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake
index adda51330bb50b..badeab8825705e 100644
--- a/ports/qt5-declarative/portfile.cmake
+++ b/ports/qt5-declarative/portfile.cmake
@@ -2,6 +2,11 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtdeclarative e06032da5c1c151200215f55728b9ce0fac299076f0ca3150143525a56bcce15eb72f6aa982b439e3920d1cd7a30468b3f0913f135d644ecda277d763fb5e1b5)
+qt_modular_library(qtdeclarative 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts)
\ No newline at end of file
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts)
+
+set(qt5decpath ${CURRENT_PACKAGES_DIR}/share/qt5/debug/mkspecs/modules/qt_lib_qmldevtools_private.pri)
+file(READ "${qt5decpath}" _contents)
+string(REPLACE [[QT.qmldevtools_private.libs = $$QT_MODULE_HOST_LIB_BASE]] [[QT.qmldevtools_private.libs = $$QT_MODULE_LIB_BASE]]  _contents "${_contents}")
+file(WRITE "${qt5decpath}" "${_contents}")
\ No newline at end of file
diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL
index 323bf6747bf2a9..741c249cd06e00 100644
--- a/ports/qt5-gamepad/CONTROL
+++ b/ports/qt5-gamepad/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-gamepad
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-gamepad/portfile.cmake b/ports/qt5-gamepad/portfile.cmake
index 7967f7f41bd307..71bc355174cf1d 100644
--- a/ports/qt5-gamepad/portfile.cmake
+++ b/ports/qt5-gamepad/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtgamepad 5e5f2c06103493880793f94aa062b1eccccbe0f53ded457969a0d77e864cee31759267a19edc68f3a015e261b84727f34b991b4a6b3c838600a68b030e77fa1e)
+qt_modular_library(qtgamepad fd4902b11021eb6b28b5d6e31e9857ddaace6de05106c665fa429223033e28f187ede5deaec6a7e27588c5db4fb1cc250a936f2ee2cadb24f1df31ddfc4b3123)
diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL
index 3e4fadbe86cc11..71250701befc11 100644
--- a/ports/qt5-graphicaleffects/CONTROL
+++ b/ports/qt5-graphicaleffects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-graphicaleffects
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 GraphicalEffects Module.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-graphicaleffects/portfile.cmake b/ports/qt5-graphicaleffects/portfile.cmake
index 2ea1319397e8ff..c639e46685ee48 100644
--- a/ports/qt5-graphicaleffects/portfile.cmake
+++ b/ports/qt5-graphicaleffects/portfile.cmake
@@ -4,4 +4,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtgraphicaleffects f7c93fa9b33a4096d5a150a6db984400daecc0ee16203402f1d465fddd288a9ea55625fcbd4ccd4c0b8addaa458d7955244b076a9c6c13a83d7c61c6029ddd81)
+qt_modular_library(qtgraphicaleffects 3c5e6d7dc51a92d48cce8424ab1fe60ee75b71ebe2e6bb22e719a35bdaf2210b03f90ac066569f5c086ed67ed1463510625307328299310fad7c587e9fd8b385)
diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL
index bfb362834e4937..7033b42c5aac43 100644
--- a/ports/qt5-imageformats/CONTROL
+++ b/ports/qt5-imageformats/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-imageformats
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake
index 00166111127308..1d66c9a2356637 100644
--- a/ports/qt5-imageformats/portfile.cmake
+++ b/ports/qt5-imageformats/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtimageformats 1514c5d7a285d718fdf1f3ba11f00029551af70e8b7bd927e061c55a35fca6978164da2846f26b6d57a4c81af2a75eb3f8358f46fa74bd70ba3407aa3bbcb0e5)
+qt_modular_library(qtimageformats 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc)
 
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL
index fd647d83bb741f..b881c1fae7c522 100644
--- a/ports/qt5-location/CONTROL
+++ b/ports/qt5-location/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-location
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake
index 1fde2fa48863c0..55e7b23ce53312 100644
--- a/ports/qt5-location/portfile.cmake
+++ b/ports/qt5-location/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtlocation 08dceeef8681b1266763197d8d4cab1d2ae8e8d0b62ae50ab44c64698588652d6ecf976b8f0095fa33b3a93b66b43fd4acbde4ebc47af8bdd79ce708c4237ed2)
+qt_modular_library(qtlocation 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082)
diff --git a/ports/qt5-macextras/CONTROL b/ports/qt5-macextras/CONTROL
index 8344c9240550a0..e0c68641404505 100644
--- a/ports/qt5-macextras/CONTROL
+++ b/ports/qt5-macextras/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-macextras
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-macextras/portfile.cmake b/ports/qt5-macextras/portfile.cmake
index ed8e2bb5bb6e7a..a833541d951cf4 100644
--- a/ports/qt5-macextras/portfile.cmake
+++ b/ports/qt5-macextras/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtmacextras 0d307b85e09fd97f36c5ee333297ceda4c709f6dc995dba4e8b8c1a85bd95c83ed80ee641e13e05fe3b965060c7847ba1835b7e6d9099a03c8bf9f2c4bae1ded)
+qt_modular_library(qtmacextras 56887c2a2d20c41a133af87aec8975e17c6335ffc51093f23a904e02a78f59a8117c7932827ca5dd33f538360e6fd9cfc9d0091c6f4c1e0b96528b5324c74033)
diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL
index 2b5a0a465c163c..4dc0032f91b36b 100644
--- a/ports/qt5-modularscripts/CONTROL
+++ b/ports/qt5-modularscripts/CONTROL
@@ -1,3 +1,3 @@
-Source: qt5-modularscripts
-Version: 2019-04-30
-Description: Vcpkg helpers to package qt5 modules
+Source: qt5-modularscripts
+Version: 2019-04-30
+Description: Vcpkg helpers to package qt5 modules
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake
index b3cf05b7b107ce..dd3abb94f6caab 100644
--- a/ports/qt5-modularscripts/qt_modular_library.cmake
+++ b/ports/qt5-modularscripts/qt_modular_library.cmake
@@ -9,7 +9,7 @@ function(qt_modular_fetch_library NAME HASH TARGET_SOURCE_PATH)
     endif()
 
     set(MAJOR_MINOR 5.12)
-    set(FULL_VERSION ${MAJOR_MINOR}.1)
+    set(FULL_VERSION ${MAJOR_MINOR}.3)
     set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz")
 
     vcpkg_download_distfile(ARCHIVE_FILE
diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL
index 0b99078fb1890a..87da5cd9230e19 100644
--- a/ports/qt5-mqtt/CONTROL
+++ b/ports/qt5-mqtt/CONTROL
@@ -1,5 +1,4 @@
 Source: qt5-mqtt
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 MQTT module.
 Build-Depends: qt5-modularscripts, qt5-base
-
diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake
index 8c797abb07b7f8..e9b8c3c75a70be 100644
--- a/ports/qt5-mqtt/portfile.cmake
+++ b/ports/qt5-mqtt/portfile.cmake
@@ -5,8 +5,8 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmak
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO qt/qtmqtt
-    REF v5.12.1
-    SHA512 c6f4000a032caaf5224ca6fe2442f22eddc26e3e53cc101885c717b706156cada716e45ff92d267928b87e1e5ceae5e81694f4b7c289d9836e75f27fd012de42
+    REF cf41d84738f0ed0c779f75db94d413ad938fb901
+    SHA512 e9a818999e4befb0b945d609a1ee28a3e2d7e3b6d8c12ab82ae827fdb8f6bf5e8b82114c1850438d634fa24c9ac608ebae1d461385bd4e088f8cabf7eec0182c
     HEAD_REF dev
 )
 
diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL
index 25f96138b77ff1..cdc7e20c788431 100644
--- a/ports/qt5-multimedia/CONTROL
+++ b/ports/qt5-multimedia/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-multimedia
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake
index 77aee6d109df30..d6292a1bad4f23 100644
--- a/ports/qt5-multimedia/portfile.cmake
+++ b/ports/qt5-multimedia/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtmultimedia cdf9161648abd9f6c6d20171a75e9edefd77a46e946263f7e22e9f2ae69a55132688c31e46378cdc74c3bdf528fd94383b7e3b20bd8befa485a02cabb398dea0)
+qt_modular_library(qtmultimedia 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963)
diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL
index b4653798fe987d..241e52cdc26fdb 100644
--- a/ports/qt5-networkauth/CONTROL
+++ b/ports/qt5-networkauth/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-networkauth
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Network Authorization Module
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake
index 40fda857c1a428..ef4e63989d8188 100644
--- a/ports/qt5-networkauth/portfile.cmake
+++ b/ports/qt5-networkauth/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtnetworkauth 219117019cb98b87a84d351aa6b5479f3fa220c82fd4ff7409d2003c79402ead21454dcd1280be4db78b77045707dfa0fbbdefc738b9ac1142bf338a67447c60)
+qt_modular_library(qtnetworkauth 07bf159360fe126c23387c6ed5b955218771ac37848ddb83542733c786b415f9aa5c22fd4a965fff591869d2d819bba420b69718e487df3cce382f411f493142)
diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL
index 0c2df22e973479..14a21138a7a762 100644
--- a/ports/qt5-purchasing/CONTROL
+++ b/ports/qt5-purchasing/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-purchasing
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-purchasing/portfile.cmake b/ports/qt5-purchasing/portfile.cmake
index 3ea4b192c64f36..c172817df283d3 100644
--- a/ports/qt5-purchasing/portfile.cmake
+++ b/ports/qt5-purchasing/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtpurchasing 655283a32f02a4a5bb8b890081fa1276e1a0c1396f50bb5c8ea849b55a60d8dde368f05072ab786fb8bb14cc41be8394d635bf4af791f2ef289796e04395dbb6)
+qt_modular_library(qtpurchasing 3069ece2083d0661a3599c631cf0832a80e01262b5858ffd407bc0d80e35711f2f973b2c085b6dd5539f3ec26004c684df99d477e58ab62da63d705a8a5616c9)
diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL
index 8b055233750b42..287daebe147861 100644
--- a/ports/qt5-quickcontrols/CONTROL
+++ b/ports/qt5-quickcontrols/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 QuickControls Module.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-quickcontrols/portfile.cmake b/ports/qt5-quickcontrols/portfile.cmake
index ac74db9d578e7e..bb4aa8a6615b7f 100644
--- a/ports/qt5-quickcontrols/portfile.cmake
+++ b/ports/qt5-quickcontrols/portfile.cmake
@@ -4,4 +4,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtquickcontrols 2275a9f0e3ddf7a4f42de5608b01686bf7faabe52c70dfae66ccdc7ab1283962aecb58481b42afbc5244d3abef56846bfabd9ed5229debe55d9f96cd88d16623)
+qt_modular_library(qtquickcontrols 23410fb82088591a8bed7e8e4127d13929a03adc0dfd18f7e2f906acdac21f7dcbb15cb2257272b893d937bbb54860992667c11aa0c6157d4a3b871616c4641c)
diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL
index 027cb6e71509da..01f94c4c07b900 100644
--- a/ports/qt5-quickcontrols2/CONTROL
+++ b/ports/qt5-quickcontrols2/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols2
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 QuickControls2 Module.
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-quickcontrols2/portfile.cmake b/ports/qt5-quickcontrols2/portfile.cmake
index 845a4c85293c24..6b65b022f804b8 100644
--- a/ports/qt5-quickcontrols2/portfile.cmake
+++ b/ports/qt5-quickcontrols2/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtquickcontrols2 fecbde2d38e7b9d18c0cfba8a724bba43d92702b8fb7c15b589a47e584f6023e498b1fb81a864835dbfdf38af6ee20ce9965f233df497a0639aceb87e8c1b123)
+qt_modular_library(qtquickcontrols2 afc1ae9a5a046845b085d5cf0019b79d99914a2d285676bd4d8966f1302513078c8279b71134281c03b2c1209295bca438b9e255774574520498b0b5385bad27)
diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL
index bea95b4aeb010f..e1e9df4508091f 100644
--- a/ports/qt5-remoteobjects/CONTROL
+++ b/ports/qt5-remoteobjects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-remoteobjects
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-remoteobjects/portfile.cmake b/ports/qt5-remoteobjects/portfile.cmake
index 7a238ebcf133bc..8d2d45a6e7b639 100644
--- a/ports/qt5-remoteobjects/portfile.cmake
+++ b/ports/qt5-remoteobjects/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtremoteobjects 9b4222c6336374387aa5c5021833b4b12d4ab76f4af3a5f843ce2abca090a6af299b37d34b86bfc46e5ed8e54e50d8abc6804f88c8843327f90795c06a37ca0d)
+qt_modular_library(qtremoteobjects f01b9497dab7e5db24f090d227fca5703a50b5065ad6c0798b78e83b41c374a04eb2857ffaf0225071791c9bb6b8703e37e47d31bf905fa819395b4d69819178)
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL
index b47aa9798bb026..e27e24b5742acd 100755
--- a/ports/qt5-script/CONTROL
+++ b/ports/qt5-script/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-script
-Version: 5.12.1
+Version: 5.12.3
 Build-Depends: qt5-base, qt5-modularscripts
 Description:Qt5 Script Module.
diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake
index b4e40355b9096b..0d2a8418d511a2 100755
--- a/ports/qt5-script/portfile.cmake
+++ b/ports/qt5-script/portfile.cmake
@@ -2,4 +2,4 @@
 include(vcpkg_common_functions)
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtscript 1fe7d0582e6c61fd146d66080bc91b40a6a2bda9b6bdb983339276b1aebb6f3c24070fc5acb2fd90556c11d51708c7bc75542532097b7f4f381b13dadaec5c9e)
+qt_modular_library(qtscript 4c4498acb39536bdc03643fb1717c7a47c82b1734cf67d17d40bc216084f01e837648d261f7f69e317387f9c6efa9aaa6b0df8f5532f55615252c95b1089ca1a)
diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL
index 216fd3fd1f09e3..b61ed5922e5568 100644
--- a/ports/qt5-scxml/CONTROL
+++ b/ports/qt5-scxml/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-scxml
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-scxml/portfile.cmake b/ports/qt5-scxml/portfile.cmake
index 51c85527197658..860e25246c1bf2 100644
--- a/ports/qt5-scxml/portfile.cmake
+++ b/ports/qt5-scxml/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtscxml 3bfb08eb8506ca1076a594fb48b09360d258ecf26596045d2bff8702ad1ac0d0cc16dbc5e4528bf2a0fc1fad93c44f5cf34dc86e4d1243764a49a56f99985501)
+qt_modular_library(qtscxml d515506d90ace5eedfe8bf3439dad0853dbbdbd36dfb509dfa13e3358838353de66d5f6245afe4eeebd19dd3f0ab0ce5e4c3e6fe5d40e5ab46763c453a562a49)
diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL
index 55d620ee16885d..f0bceb31ca8f74 100644
--- a/ports/qt5-sensors/CONTROL
+++ b/ports/qt5-sensors/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-sensors
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-sensors/portfile.cmake b/ports/qt5-sensors/portfile.cmake
index 1a90f5486d2abd..3af79811730705 100644
--- a/ports/qt5-sensors/portfile.cmake
+++ b/ports/qt5-sensors/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtsensors 437c8fce62b4fde138a7927ae494526852a63c2c9a392aaa5f79da6b9ec134e54b17dcd908e5cd7d12474dd112672e0a6a478a307cf716cce9fed67937da3fdc)
+qt_modular_library(qtsensors cf0c8c58bbb84debd6b464bd9b91af7e79a301031613b8a2d0715fa276573dafea0a1c8e472fa2a2d4debd9b26f86a5e6efa9a8d57f7ab9102b1314d609579e5)
diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL
index 7f725ffabb146a..8e2572300d001b 100644
--- a/ports/qt5-serialport/CONTROL
+++ b/ports/qt5-serialport/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-serialport
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-serialport/portfile.cmake b/ports/qt5-serialport/portfile.cmake
index 019ed1b17b5759..0c2a0f116c473e 100644
--- a/ports/qt5-serialport/portfile.cmake
+++ b/ports/qt5-serialport/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtserialport c917e08f417677fb16058c4be95c20dcd5881f41daf6033b864f725b259bfa38ab07a993a6a19f26574f1b662116aaceea26965cd1d2a5df7465e2bda495e7ff)
+qt_modular_library(qtserialport 42551b74abe1fcaa1972fb1134215987d7c1d0fe73874a4c6ad5b9aadad71a2066a1846c297569bb1562f94e54a406e8074d444deca510a566e27cd386b47ecf)
diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL
index 336601da20a78a..cbc841086d0556 100644
--- a/ports/qt5-speech/CONTROL
+++ b/ports/qt5-speech/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-speech
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Speech Module
 Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows)
diff --git a/ports/qt5-speech/portfile.cmake b/ports/qt5-speech/portfile.cmake
index 61dfc802a60b3b..f4402508daf4c5 100644
--- a/ports/qt5-speech/portfile.cmake
+++ b/ports/qt5-speech/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtspeech 321f6dafe0751af1e9cb5bd32f340ae445d2d148a8d2060bd5bd65d034f242547a79667253a4d1e220ccd4f59ea36a7fbe1b50093f36e2017b872f2b858050d2)
+qt_modular_library(qtspeech 9623a83cdfbed07dffcd8f0808c2a514c97fda72b68827d917f1a8ee3072286ef8bce06b114db94d7a0c3fc79425c2540fa5cadc6551367fd4431e5396395932)
diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL
index 8a199f1c7f55eb..9970a6fc081484 100644
--- a/ports/qt5-svg/CONTROL
+++ b/ports/qt5-svg/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-svg
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake
index 091afa59b2e4bd..a8379b1310534c 100644
--- a/ports/qt5-svg/portfile.cmake
+++ b/ports/qt5-svg/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtsvg c09da58bb901546fa8f408528ed25c9cc57d2bda35e56112eab08a08bf8fdb06cdaed1995d46d6baa08cab8660a3661be3dfa51754cc55e4fab96f7c90533ea3)
+qt_modular_library(qtsvg 23517dbdc30d7128fcbeb12a301eeeb300424bb17bc0d156d5e9298c092d3d3afd2cba45768f2512e58977ee2408450f50c385e03a47ccaf3ff6bc7e4fddf61a)
diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL
index 492bf89fc0063a..502635783df7be 100644
--- a/ports/qt5-tools/CONTROL
+++ b/ports/qt5-tools/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-tools
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
 Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake
index e430e4e9518937..a563767da8c46a 100644
--- a/ports/qt5-tools/portfile.cmake
+++ b/ports/qt5-tools/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qttools e3ae1974f0b20bad1b86d038c3585753183b8c24c133393e3ecf65a0487402ad8dcf8147bf263e9a4c2d3abef1b706981943fcf5268726e424f1b61f69ce4f2e)
+qt_modular_library(qttools d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/plugins/platforminputcontexts)
\ No newline at end of file
diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL
index 3b21a1c6d86846..20b745844b4aaa 100644
--- a/ports/qt5-virtualkeyboard/CONTROL
+++ b/ports/qt5-virtualkeyboard/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-virtualkeyboard
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-virtualkeyboard/portfile.cmake b/ports/qt5-virtualkeyboard/portfile.cmake
index 342fd6a5aaf606..4d8310f7a1abca 100644
--- a/ports/qt5-virtualkeyboard/portfile.cmake
+++ b/ports/qt5-virtualkeyboard/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtvirtualkeyboard 17f85982bb7d39784b5a85fba7758d3c032c158ca453c30255ec03e5e61dc8bbcbcbc58afe8f43bcf0297bb00d4e8606f553501bde68252d097d7bb32af9d24f)
+qt_modular_library(qtvirtualkeyboard 1aa00fec7e333e4fd52891b82c239b532cf41657d9c3f44c6cc1c211a1412dbf5584823511e54f3feb33b3fed9c6e0171b55afde2df9f0a358e2e4885e1b2686)
 
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL
index 85edc4b81b42bb..64945edbad8808 100644
--- a/ports/qt5-webchannel/CONTROL
+++ b/ports/qt5-webchannel/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-webchannel
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-webchannel/portfile.cmake b/ports/qt5-webchannel/portfile.cmake
index f1b5ccd161d795..a453326c5f1673 100644
--- a/ports/qt5-webchannel/portfile.cmake
+++ b/ports/qt5-webchannel/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwebchannel 71f2eb4b808e5892d246bafa289f7a4464e9705d568ceb01443b787d2eade8ee9bd20eef46900ba6fa2b251e7e15aebb7564e854360a3ad70992ad17cc1f9751)
+qt_modular_library(qtwebchannel 2dda4351f5f3a5895a955d0ee77e55f758233672005a068d3e840a01d379727f99287fc6c8fb96516f23a5a8c4ebcb61098690fd3351e79be608e28657534006)
diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL
index f3ed649a970f81..e2cae414c84ad9 100644
--- a/ports/qt5-websockets/CONTROL
+++ b/ports/qt5-websockets/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-websockets
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-websockets/portfile.cmake b/ports/qt5-websockets/portfile.cmake
index 8aa9cc9ed63384..88cc1fd9ab9078 100644
--- a/ports/qt5-websockets/portfile.cmake
+++ b/ports/qt5-websockets/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwebsockets 4239563f05d65e85d2c46f24b3757e7fcfb119a2c9af0b221b321702f7849a4af05da1fdc1e77c0098df40af231ed781be5ead9361bae3dbf2c7808043601577)
+qt_modular_library(qtwebsockets 212a98d987b4fd16216ac9a1c98e061be6a5bd2e2c4ec8be80424d6f23afeace790fe666abe8a11e2116dc20f17a41ad0c817fceacdfa5f766b93068ac614817)
diff --git a/ports/qt5-webview/CONTROL b/ports/qt5-webview/CONTROL
index fda869331eb561..e0816259a13dfb 100644
--- a/ports/qt5-webview/CONTROL
+++ b/ports/qt5-webview/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-webview
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.
 Build-Depends: qt5-base, qt5-modularscripts, qt5-declarative
diff --git a/ports/qt5-webview/portfile.cmake b/ports/qt5-webview/portfile.cmake
index df9f90c0a5f767..813c5601bd0ab7 100644
--- a/ports/qt5-webview/portfile.cmake
+++ b/ports/qt5-webview/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwebview 27e1904570678691e26831e87953e47d6b707bfe0504cde112ad6c8c18ea163eb83d90f8d4dbbf73873caee827e486691bb73e16a4c8b9e522bbeffbb68e9973)
+qt_modular_library(qtwebview 426227b9b4cb61c0e88958dbaab21e842a25989098a0e94a06fe3efc8a2b9d4a5d3216296c8228da977ef52cd5844b66048bcb84019da4f06de1b1009dfdffa5)
diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL
index 0ed5317d2cb694..97c443d8c7026c 100644
--- a/ports/qt5-winextras/CONTROL
+++ b/ports/qt5-winextras/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-winextras
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.
 Build-Depends: qt5-modularscripts, qt5-base, atlmfc
diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake
index 64f112bbd89752..f0890bfafcb0c4 100644
--- a/ports/qt5-winextras/portfile.cmake
+++ b/ports/qt5-winextras/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtwinextras 2adf2849359ed97724256ba2ce7492f6820c92e898142683b696be0af5393d8af26b5af3d827c25e9027e77f95eb7f12ebb2be22a5d4c99e645c65a7fd7fe0e6)
+qt_modular_library(qtwinextras e50cb237359ce7a3bde6989ec4349fe67be3b4999092516e891bba12f0fb4acb9954de8e2f0171db0e849b7d3ef94bd80f77f81162afb239e49c6e2e0760343b)
diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL
index 04b00a41597ae3..9176159221db6b 100644
--- a/ports/qt5-xmlpatterns/CONTROL
+++ b/ports/qt5-xmlpatterns/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-xmlpatterns
-Version: 5.12.1
+Version: 5.12.3
 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation
 Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake
index bd39b03f8f1c42..c92a6057b5d581 100644
--- a/ports/qt5-xmlpatterns/portfile.cmake
+++ b/ports/qt5-xmlpatterns/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
 
 include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
 
-qt_modular_library(qtxmlpatterns 2a75b6fdbe07317ce91b69e0fc9abe39899b5c48885033f734c0d018115762e7558723ae0fcb5ad5a2266a52471f139236778be8191c61abec9bf0b07a0f01f7)
+qt_modular_library(qtxmlpatterns 4e421f0c78ca74f726f758bd95b33915297922f3b5a4fff84dde2600969f54f3914828fdb7903c7171e192f81966680b6c6bb4750de0be72728124470e7c798d)
\ No newline at end of file
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index fe0698293aa3c2..e22f4609b6a6fc 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5
-Version: 5.12.1-2
+Version: 5.12.3
 Description: Qt5 Application Framework
 Build-Depends: qt5-3d, qt5-activeqt, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-location, qt5-multimedia, qt5-mqtt, qt5-networkauth, qt5-purchasing, qt5-quickcontrols, qt5-quickcontrols2, qt5-script, qt5-scxml, qt5-sensors, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-webchannel, qt5-websockets, qt5-winextras (windows), qt5-macextras (osx), qt5-xmlpatterns
diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL
index 4661cd9bfd5e8e..bcfa9c7242055d 100644
--- a/ports/re2/CONTROL
+++ b/ports/re2/CONTROL
@@ -1,3 +1,3 @@
 Source: re2
-Version: 2019-04-19
+Version: 2019-05-07
 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.
\ No newline at end of file
diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake
index 901ed32c148b4f..3cb43876a8183c 100644
--- a/ports/re2/portfile.cmake
+++ b/ports/re2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/re2
-    REF 653f9e2a6a17bcdf8dba2b3f8671aa8880efca29
-    SHA512 2411904082662c60e05c97d3a0de6e5d9f9654a8703e4e520eba1018a3542670db81f2b78ff9ee3267bb9c1b24e4c6a9b5b35b0f62836198ac152acb4b37c744
+    REF cd23be77c716bf75ebb3ddc07fa3ef0c943da6d2
+    SHA512 c307fc9294497dc3b4ae95db117f310e0db8f91a90c32bb316fe7e32414b2ade48264471e7a7bb0860aa9b0afe7dd460dadc552b1173ac35235ad3624c6f2ed5
     HEAD_REF master
 )
 
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL
index 6588f527cda7e4..10562f779f0a2d 100644
--- a/ports/rocksdb/CONTROL
+++ b/ports/rocksdb/CONTROL
@@ -1,5 +1,5 @@
 Source: rocksdb
-Version: 6.0.1
+Version: 6.0.2
 Description: A library that provides an embeddable, persistent key-value store for fast storage
 Default-Features: zlib
 
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake
index b5356c31e91201..27a9d70d53801b 100644
--- a/ports/rocksdb/portfile.cmake
+++ b/ports/rocksdb/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO facebook/rocksdb
-  REF v6.0.1
-  SHA512 ce44baa407ea692b1e4c6ca76578d14f7f15df81e7687f17d6ac19e1f9bcb81fa1d0cc921fe0b137f960d95c85aba219c2a981365635531206d0cf1cf1cfe473
+  REF v6.0.2
+  SHA512 6659f04c9823750b9b635e2a247b59dbda4975458615392df82bdbeb4ac7ac783e6de86a32fcc318aae1bb27880557390c544c99caa3db3885f9c3d836cc1df8
   HEAD_REF master
   PATCHES
     0001-disable-gtest.patch
diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL
index 6b48e9cc0dfc91..0350e206f3cb50 100644
--- a/ports/rs-core-lib/CONTROL
+++ b/ports/rs-core-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: rs-core-lib
-Version: 2019-04-19
+Version: 2019-05-07
 Description: Minimal common utilities by Ross Smith
 
diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake
index d3e8e7a7590ec6..1f0713a02a82aa 100644
--- a/ports/rs-core-lib/portfile.cmake
+++ b/ports/rs-core-lib/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CaptainCrowbar/rs-core-lib
-    REF 65235aec3b72ac622d1c9cf146dbf78aa3dfab0d
-    SHA512 6cae59bf4d254a4fe968d51ecab2910a7fedabed0eaaa549bc05df4b2960cbe1c7206e1408b3c7afeee3c9aa3ef1883f3cdc15dde35a3c39e50ba99a0115dc5e
+    REF 4828e0dc8b7e7ed76935865cfe99181da0da211b
+    SHA512 97298d94c1cc4cd4cb580bde6c1413a2f429544dc80cae58bc436aad25e385d9ced611a2512a45f1e3d10fd613f26958fc5d3a03ea9bfaefd5170a4b2d1ac124
     HEAD_REF master
 )
 
diff --git a/ports/soci/0001-Deduce-reference-in-boost-fusion-for_each.patch b/ports/soci/0001-Deduce-reference-in-boost-fusion-for_each.patch
new file mode 100644
index 00000000000000..cab3585120fb2a
--- /dev/null
+++ b/ports/soci/0001-Deduce-reference-in-boost-fusion-for_each.patch
@@ -0,0 +1,75 @@
+From 5c3b1e0a61d83d7a3c70fb882c7e0918777f0e00 Mon Sep 17 00:00:00 2001
+From: Andrei Lebedev <lebdron@gmail.com>
+Date: Sun, 5 May 2019 19:52:01 +0300
+Subject: [PATCH] Deduce reference in boost::fusion::for_each
+
+Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
+---
+ include/soci/bind-values.h | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/include/soci/bind-values.h b/include/soci/bind-values.h
+index eee416e..e84fb0e 100644
+--- a/include/soci/bind-values.h
++++ b/include/soci/bind-values.h
+@@ -13,6 +13,13 @@
+ #ifdef SOCI_HAVE_BOOST
+ #       include <boost/fusion/algorithm/iteration/for_each.hpp>
+ #       include <boost/mpl/bool.hpp>
++#       include <boost/version.hpp>
++
++#       if BOOST_VERSION >= 106800
++#       define SOCI_BOOST_FUSION_FOREACH_REFERENCE &
++#       else
++#       define SOCI_BOOST_FUSION_FOREACH_REFERENCE
++#       endif
+ #endif // SOCI_HAVE_BOOST
+ #include <vector>
+ 
+@@ -83,13 +90,19 @@ private:
+     template <typename T, typename Indicator>
+     void exchange_(use_container<T, Indicator> const &uc, boost::mpl::true_ * /* fusion sequence */)
+     {
+-        boost::fusion::for_each(uc.t, use_sequence<T, Indicator>(*this, uc.ind));
++        use_sequence<T, Indicator> f(*this, uc.ind);
++        boost::fusion::for_each<T,
++                                use_sequence<T, Indicator>
++                                    SOCI_BOOST_FUSION_FOREACH_REFERENCE>(uc.t, f);
+     }
+ 
+     template <typename T>
+     void exchange_(use_container<T, details::no_indicator> const &uc, boost::mpl::true_ * /* fusion sequence */)
+     {
+-        boost::fusion::for_each(uc.t, use_sequence<T, details::no_indicator>(*this));
++        use_sequence<T, details::no_indicator> f(*this);
++        boost::fusion::for_each<T,
++                                use_sequence<T, details::no_indicator>
++                                    SOCI_BOOST_FUSION_FOREACH_REFERENCE>(uc.t, f);
+     }
+ 
+ #endif // SOCI_HAVE_BOOST
+@@ -173,13 +186,19 @@ private:
+     template <typename T, typename Indicator>
+     void exchange_(into_container<T, Indicator> const &ic, boost::mpl::true_ * /* fusion sequence */)
+     {
+-        boost::fusion::for_each(ic.t, into_sequence<T, Indicator>(*this, ic.ind));
++        into_sequence<T, Indicator> f(*this, ic.ind);
++        boost::fusion::for_each<T,
++                                into_sequence<T, Indicator>
++                                    SOCI_BOOST_FUSION_FOREACH_REFERENCE>(ic.t, f);
+     }
+ 
+     template <typename T>
+     void exchange_(into_container<T, details::no_indicator> const &ic, boost::mpl::true_ * /* fusion sequence */)
+     {
+-        boost::fusion::for_each(ic.t, into_sequence<T, details::no_indicator>(*this));
++        into_sequence<T, details::no_indicator> f(*this);
++        boost::fusion::for_each<T,
++                                into_sequence<T, details::no_indicator>
++                                    SOCI_BOOST_FUSION_FOREACH_REFERENCE>(ic.t, f);
+     }
+ #endif // SOCI_HAVE_BOOST
+ 
+-- 
+2.20.1.windows.1
+
diff --git a/ports/soci/0002-Find-PostgreSQL-debug-library.patch b/ports/soci/0002-Find-PostgreSQL-debug-library.patch
new file mode 100644
index 00000000000000..fef23b751fc49d
--- /dev/null
+++ b/ports/soci/0002-Find-PostgreSQL-debug-library.patch
@@ -0,0 +1,62 @@
+From f1fa9cc84e67c9f28f651b926f55f93d60bbb963 Mon Sep 17 00:00:00 2001
+From: Andrei Lebedev <lebdron@gmail.com>
+Date: Sun, 5 May 2019 21:22:49 +0300
+Subject: [PATCH] Find PostgreSQL debug library
+
+Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
+---
+ cmake/modules/FindPostgreSQL.cmake | 31 +++++++++++++++++++-----------
+ 1 file changed, 20 insertions(+), 11 deletions(-)
+
+diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
+index 48937e2..e2e557b 100644
+--- a/cmake/modules/FindPostgreSQL.cmake
++++ b/cmake/modules/FindPostgreSQL.cmake
+@@ -124,16 +124,21 @@ if ( WIN32 )
+   set (POSTGRESQL_LIBRARY_TO_FIND ${POSTGRESQL_LIB_PREFIX}${POSTGRESQL_LIBRARY_TO_FIND})
+ endif()
+ 
+-find_library(POSTGRESQL_LIBRARY
+- NAMES ${POSTGRESQL_LIBRARY_TO_FIND}
+- PATHS
+-   ${POSTGRESQL_ROOT_DIRECTORIES}
+- PATH_SUFFIXES
+-   lib
+-   ${POSTGRESQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
+- # Help the user find it if we cannot.
+- DOC "The ${POSTGRESQL_LIBRARY_DIR_MESSAGE}"
+-)
++function(__postgresql_find_library _name)
++  find_library(${_name}
++   NAMES ${ARGN}
++   PATHS
++     ${POSTGRESQL_ROOT_DIRECTORIES}
++   PATH_SUFFIXES
++     lib
++     ${POSTGRESQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
++   # Help the user find it if we cannot.
++   DOC "The ${POSTGRESQL_LIBRARY_DIR_MESSAGE}"
++  )
++endfunction()
++
++__postgresql_find_library(POSTGRESQL_LIBRARY ${POSTGRESQL_LIBRARY_TO_FIND})
++__postgresql_find_library(POSTGRESQL_LIBRARY_DEBUG ${POSTGRESQL_LIBRARY_TO_FIND}d)
+ get_filename_component(POSTGRESQL_LIBRARY_DIR ${POSTGRESQL_LIBRARY} PATH)
+ 
+ if (POSTGRESQL_INCLUDE_DIR)
+@@ -169,7 +174,11 @@ set(POSTGRESQL_FOUND  ${POSTGRESQL_FOUND})
+ if(POSTGRESQL_FOUND)
+   set(POSTGRESQL_INCLUDE_DIRS ${POSTGRESQL_INCLUDE_DIR})
+   set(POSTGRESQL_LIBRARY_DIRS ${POSTGRESQL_LIBRARY_DIR})
+-  set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY})
++  if(POSTGRESQL_LIBRARY AND POSTGRESQL_LIBRARY_DEBUG)
++    set(POSTGRESQL_LIBRARIES optimized ${POSTGRESQL_LIBRARY} debug ${POSTGRESQL_LIBRARY_DEBUG})
++  else()
++    set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY})
++  endif()
+   set(POSTGRESQL_VERSION ${POSTGRESQL_VERSION_STRING})
+ endif()
+ 
+-- 
+2.20.1.windows.1
+
diff --git a/ports/soci/CONTROL b/ports/soci/CONTROL
index aaab2490e25acc..33de13eb78ef7c 100644
--- a/ports/soci/CONTROL
+++ b/ports/soci/CONTROL
@@ -1,5 +1,5 @@
 Source: soci
-Version: 3.2.3-3
+Version: 3.2.3-4
 Description: SOCI database access library
 
 Feature: boost
diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake
index 1ba4115ae6c754..b70e43d3c8c4a4 100644
--- a/ports/soci/portfile.cmake
+++ b/ports/soci/portfile.cmake
@@ -5,6 +5,8 @@ vcpkg_from_github(
     REF c15b178a44b99ed3ff7fd953837fb97f6314abb7
     SHA512 037c44f29e80b5ec57046606b4672088917d469e9d2254e3e15253e170026cf0fe17e4f79a4b01df22fe7032708ca87354b1560d9880d4d165cdef869c3c6081
     HEAD_REF master
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Deduce-reference-in-boost-fusion-for_each.patch"
+            "${CMAKE_CURRENT_LIST_DIR}/0002-Find-PostgreSQL-debug-library.patch"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC)
diff --git a/ports/stb/CONTROL b/ports/stb/CONTROL
index e052f09c47f21b..7ffc04be05a45e 100644
--- a/ports/stb/CONTROL
+++ b/ports/stb/CONTROL
@@ -1,3 +1,3 @@
 Source: stb
-Version: 2019-04-19
+Version: 2019-05-07
 Description: stb single-file public domain libraries for C/C++
diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake
index 8369bbb1ff6c39..0a0f2397b9c303 100644
--- a/ports/stb/portfile.cmake
+++ b/ports/stb/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nothings/stb
-    REF 2c2908f50515dcd939f24be261c3ccbcd277bb49
-    SHA512 d039346a4117f230eba344e8fd45b55290026c6611ef9aab1a6f504d7207ae724c978062e85613dda05f96d3e1eb8ee04c78a289c142cad34bc7ef24e2cf8689
+    REF 1034f5e5c4809ea0a7f4387e0cd37c5184de3cdd
+    SHA512 efc3deedd687615a6706b0d315ded8d76edb28fcd6726531956fde9bba81cc62f25df0a1f998b56e16ab0c62989687c7d5b58875789470c2bf7fd457b1ff6535
     HEAD_REF master
 )
 
diff --git a/ports/taocpp-json/CONTROL b/ports/taocpp-json/CONTROL
index a2fe6d08e156e3..e3f90f4619a6bb 100644
--- a/ports/taocpp-json/CONTROL
+++ b/ports/taocpp-json/CONTROL
@@ -1,3 +1,3 @@
 Source: taocpp-json
-Version: 2019-04-29-1
+Version: 2019-05-08
 Description: C++ header-only JSON library
diff --git a/ports/taocpp-json/portfile.cmake b/ports/taocpp-json/portfile.cmake
index 165bbff31f9e1a..3e6c19f1eaf9f2 100644
--- a/ports/taocpp-json/portfile.cmake
+++ b/ports/taocpp-json/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO taocpp/json
-    REF 8520fca2a054be775e406eaec66f33f02a7076e3
-    SHA512 44bfd0252ed42d2619ca65e92d0f483895fd735b98a81e7f844526f78893a8624133ba356ad41f8c691571bf9f56823f62bfc0f294394e6e0f780b44a0b085fd
+    REF 6adce3b8e55c16e25b22ec0e33348eefa6aa4533
+    SHA512 078af33eed0bae7671f31a010ba19088d07ac4f78b834bc7565562ee75199e90338dfd450a1d592c4f4ae58eddb3a26018b571381099d22dfc7d3c4143911390
     HEAD_REF master
 )
 
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index 4c47458bc1583b..50bc7883001ef3 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
 Source: tbb
-Version: 2019_U5-1
+Version: 2019_U6
 Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index 201b6f53da9925..024dc67a6fdd25 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO 01org/tbb
-    REF 2019_U5
-    SHA512 227b12e3864fbb922ddbc99700bf94d7d8897d62e2056bf3beb608efacf3ca785dd416b94ad65b421b6c9fc11caff688147b5fbe400c51e98678cee5dc04f274
+    REF 2019_U6
+    SHA512 6513d30a498f507cb3e9a06746e430a8bc829de0d204b15d7a79f79c5e7565e59bb0b459c8ca4946293ecb25e2ce11d25cfc7f311e91c7e67342eceb31000d07
     HEAD_REF tbb_2019
 )
 
diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL
index f0ac0b5fd5fddf..b85a03cda3ee8a 100644
--- a/ports/thrift/CONTROL
+++ b/ports/thrift/CONTROL
@@ -1,4 +1,4 @@
 Source: thrift
-Version: 2019-04-19-1
+Version: 2019-05-07
 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit
 Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010.
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
index 7ed3946a7d366b..da59907cfbe996 100644
--- a/ports/thrift/portfile.cmake
+++ b/ports/thrift/portfile.cmake
@@ -8,8 +8,8 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/thrift
-    REF 2ff952b0af4035bcb71d8d73d9eb75df31983544
-    SHA512 58d08a6258b3c64f6fe1f2e4200b6cac61b19ac66113782e4eacf058d15c451de741bff137b32261fc816074ef111627f27cc50ad366eb73395dcc631c2ca66f
+    REF acdd4226c210336e9e15eb812e5932a645fcd5ce
+    SHA512 53986b1cde7b2bd19974f32b8c31736566061a228dda368d3d850355c566d910499c16519bbff078a6cdab19931cd9833a7d684ac63fb1ec40b2a123ff263aaa
     HEAD_REF master
 )
 
diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL
index a233474de0ddfd..aa03f5148302da 100644
--- a/ports/unicorn-lib/CONTROL
+++ b/ports/unicorn-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: unicorn-lib
-Version: 2019-04-19
+Version: 2019-05-07
 Description: Unicode library for C++ by Ross Smith
 Build-Depends: rs-core-lib, pcre2, zlib, libiconv
diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake
index fb301af4cb2dce..8c298ca7f1dbdc 100644
--- a/ports/unicorn-lib/portfile.cmake
+++ b/ports/unicorn-lib/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CaptainCrowbar/unicorn-lib
-    REF c87e6b4394e543cf7fb45b0f8cdb289982bc180a
-    SHA512 3df368439b8c09c69fde78999d6b1b98675bc8488a78d7fea3f68e7ad61f6afb3cfca47cdc3b96ffd4b2e6f2cda11ca03a745c2129a5f9a5d58d9c46b0292c4a
+    REF 3e4e014bbf6fe24721a14c63f2a4f7ebfa401e7c
+    SHA512 f73f288fb50f9f727edfc84810a15f1fdde76df9030c4b0d5292351e84ec8cd6c8a7e670b2a62301a77521bf60ebcf1bf7c8c9d97ddb77385ed945b55075c927
     HEAD_REF master
 )
 
diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL
index b6a8cc5feac83a..a0e37aebab5105 100644
--- a/ports/uriparser/CONTROL
+++ b/ports/uriparser/CONTROL
@@ -1,3 +1,6 @@
 Source: uriparser
-Version: 0.9.2-1
+Version: 0.9.3-4
 Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C89 ("ANSI C"). uriparser is cross-platform, fast, supports Unicode, and is licensed under the New BSD license.
+
+Feature: tool
+Description: Builds tools (e.g. CLI "uriparse")
diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake
index b18492ff9c272a..aafd0ae6a4d0c7 100644
--- a/ports/uriparser/portfile.cmake
+++ b/ports/uriparser/portfile.cmake
@@ -3,25 +3,73 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uriparser/uriparser
-    REF uriparser-0.9.2
-    SHA512 58c1c473b33a2a5ffa2b3eb02f527de0efea228d84e2189b764515c3b884b73f36bb8baf143b719cd43006ef23f116cd7b2368bf828fe3e5b839c674daf5ea3f
+    REF uriparser-0.9.3
+    SHA512 5740e2405566c17c4467a677d83596d86398b64778ad2b5234e9390d8ab817d1b5231988d120b1d19b099788e38814825a438beed991e49b242b8a5de8c51d03
+    HEAD_REF master
 )
 
+if("tool" IN_LIST FEATURES)
+    set(URIPARSER_BUILD_TOOLS ON)
+else()
+    set(URIPARSER_BUILD_TOOLS OFF)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-	OPTIONS
-		-DURIPARSER_BUILD_DOCS=OFF
-		-DURIPARSER_BUILD_TESTS=OFF
-		-DURIPARSER_BUILD_TOOLS=OFF
+    OPTIONS
+        -DURIPARSER_BUILD_DOCS=OFF
+        -DURIPARSER_BUILD_TESTS=OFF
+    OPTIONS_DEBUG
+        -DURIPARSER_BUILD_TOOLS=OFF
+    OPTIONS_RELEASE
+        -DURIPARSER_BUILD_TOOLS=${URIPARSER_BUILD_TOOLS}
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/uriparser-0.9.2")
+
 vcpkg_copy_pdbs()
 
+if(URIPARSER_BUILD_TOOLS)
+    if(CMAKE_HOST_WIN32)
+        set(EXECUTABLE_SUFFIX ".exe")
+    else()
+        set(EXECUTABLE_SUFFIX "")
+    endif()
+
+    file(COPY ${CURRENT_PACKAGES_DIR}/bin/uriparse${EXECUTABLE_SUFFIX}
+        DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+    else()
+        file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/uriparse${EXECUTABLE_SUFFIX})
+    endif()
+endif()
+
+set(_package_version_re "#define[ ]+PACKAGE_VERSION[ ]+\"([0-9]+.[0-9]+.[0-9]+)\"")
+file(STRINGS
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h"
+    _package_version_define REGEX "${_package_version_re}"
+)
+string(REGEX REPLACE "${_package_version_re}" "\\1" _package_version ${_package_version_define})
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}-${_package_version})
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    vcpkg_replace_string(
+        ${CURRENT_PACKAGES_DIR}/include/uriparser/UriBase.h
+        "defined(URI_STATIC_BUILD)"
+        "1 // defined(URI_STATIC_BUILD)"
+    )
+endif()
+
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/uriparser RENAME copyright)
 
 # Remove duplicate info
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/valijson/CONTROL b/ports/valijson/CONTROL
new file mode 100644
index 00000000000000..4ea2b5d1ebb770
--- /dev/null
+++ b/ports/valijson/CONTROL
@@ -0,0 +1,3 @@
+Source: valijson
+Version: 2018-11-17
+Description: Header-only C++ library for JSON Schema validation
\ No newline at end of file
diff --git a/ports/valijson/fix-nlohmann-json.patch b/ports/valijson/fix-nlohmann-json.patch
new file mode 100644
index 00000000000000..7465837d523c71
--- /dev/null
+++ b/ports/valijson/fix-nlohmann-json.patch
@@ -0,0 +1,26 @@
+diff --git a/include/valijson/adapters/nlohmann_json_adapter.hpp b/include/valijson/adapters/nlohmann_json_adapter.hpp
+index f77a2bf..3f6fb5f 100644
+--- a/include/valijson/adapters/nlohmann_json_adapter.hpp
++++ b/include/valijson/adapters/nlohmann_json_adapter.hpp
+@@ -28,7 +28,7 @@
+ #define __VALIJSON_ADAPTERS_NLOHMANN_JSON_ADAPTER_HPP
+ 
+ #include <string>
+-#include <json.hpp>
++#include <nlohmann/json.hpp>
+ 
+ #include <valijson/adapters/adapter.hpp>
+ #include <valijson/adapters/basic_adapter.hpp>
+diff --git a/include/valijson/utils/nlohmann_json_utils.hpp b/include/valijson/utils/nlohmann_json_utils.hpp
+index 01838d8..4a5b5e4 100644
+--- a/include/valijson/utils/nlohmann_json_utils.hpp
++++ b/include/valijson/utils/nlohmann_json_utils.hpp
+@@ -4,7 +4,7 @@
+ 
+ #include <iostream>
+ 
+-#include <json.hpp>
++#include <nlohmann/json.hpp>
+ #include <valijson/utils/file_utils.hpp>
+ 
+ namespace valijson {
diff --git a/ports/valijson/fix-optional.patch b/ports/valijson/fix-optional.patch
new file mode 100644
index 00000000000000..5ce75843cc1960
--- /dev/null
+++ b/ports/valijson/fix-optional.patch
@@ -0,0 +1,13 @@
+diff --git a/include/valijson/internal/optional.hpp b/include/valijson/internal/optional.hpp
+index 8ff285c..84e9fd6 100644
+--- a/include/valijson/internal/optional.hpp
++++ b/include/valijson/internal/optional.hpp
+@@ -11,7 +11,7 @@ namespace opt = std;
+ #    endif
+ #  endif
+ #else
+-#  include <compat/optional.hpp>
++#  include <valijson/compat/optional.hpp>
+ namespace opt = std::experimental;
+ #endif
+ 
diff --git a/ports/valijson/fix-picojson.patch b/ports/valijson/fix-picojson.patch
new file mode 100644
index 00000000000000..bb1b4d51b907d6
--- /dev/null
+++ b/ports/valijson/fix-picojson.patch
@@ -0,0 +1,26 @@
+diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp
+index b6d17c9..6d04c52 100644
+--- a/include/valijson/adapters/picojson_adapter.hpp
++++ b/include/valijson/adapters/picojson_adapter.hpp
+@@ -29,7 +29,7 @@
+ 
+ #include <string>
+ 
+-#include <picojson.h>
++#include <picojson/picojson.h>
+ 
+ #include <valijson/adapters/adapter.hpp>
+ #include <valijson/adapters/basic_adapter.hpp>
+diff --git a/include/valijson/utils/picojson_utils.hpp b/include/valijson/utils/picojson_utils.hpp
+index 2ca4d46..b983648 100644
+--- a/include/valijson/utils/picojson_utils.hpp
++++ b/include/valijson/utils/picojson_utils.hpp
+@@ -4,7 +4,7 @@
+ 
+ #include <iostream>
+ 
+-#include <picojson.h>
++#include <picojson/picojson.h>
+ 
+ #include <valijson/utils/file_utils.hpp>
+ 
diff --git a/ports/valijson/portfile.cmake b/ports/valijson/portfile.cmake
new file mode 100644
index 00000000000000..6c0b8453052ac7
--- /dev/null
+++ b/ports/valijson/portfile.cmake
@@ -0,0 +1,28 @@
+#header-only library
+include(vcpkg_common_functions)
+
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/valijson)
+
+vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
+    REPO tristanpenman/valijson
+    REF dd084d747448bb56ddfeab5946b4f2f4617b99c4
+    SHA512 ee241eefc816360608f86792a4c25abadea79cbffc94d7e31a2dbd0a483ed4d7a303b6d2410b99ab7694e58a3d299f0df0baa52fa16f89e9233d90b190a4d799
+    HEAD_REF master
+    PATCHES fix-nlohmann-json.patch
+            fix-picojson.patch
+            fix-optional.patch
+)
+
+# Copy the header files
+file(GLOB HEADER_FILES ${SOURCE_PATH}/include/valijson/*)
+file(COPY ${HEADER_FILES}
+     DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson
+     REGEX "\.(gitattributes|gitignore)$" EXCLUDE)
+
+file(COPY ${SOURCE_PATH}/include/compat/optional.hpp
+     DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson/compat)
+
+# Put the licence file where vcpkg expects it
+file(COPY ${SOURCE_PATH}/LICENSE
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/valijson)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/valijson/LICENSE ${CURRENT_PACKAGES_DIR}/share/valijson/copyright)
\ No newline at end of file
diff --git a/ports/visit-struct/CMakeLists.txt b/ports/visit-struct/CMakeLists.txt
new file mode 100644
index 00000000000000..df4fa2890b76b8
--- /dev/null
+++ b/ports/visit-struct/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.11)
+project(visit_struct)
+
+add_library(visit_struct INTERFACE)
+
+install(TARGETS visit_struct
+    EXPORT visit_struct-targets
+    INCLUDES DESTINATION include)
+
+install(EXPORT visit_struct-targets
+    FILE visit_struct-config.cmake
+    NAMESPACE visit_struct::
+    DESTINATION share/visit_struct)
+
+install(DIRECTORY
+    include/visit_struct
+    DESTINATION include)
diff --git a/ports/visit-struct/CONTROL b/ports/visit-struct/CONTROL
new file mode 100644
index 00000000000000..98ad6e2e994f25
--- /dev/null
+++ b/ports/visit-struct/CONTROL
@@ -0,0 +1,3 @@
+Source: visit-struct
+Version: 1.0
+Description: A header-only library providing structure visitors for C++11 and C++14
diff --git a/ports/visit-struct/portfile.cmake b/ports/visit-struct/portfile.cmake
new file mode 100644
index 00000000000000..e3daf0c47487d8
--- /dev/null
+++ b/ports/visit-struct/portfile.cmake
@@ -0,0 +1,30 @@
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cbeck88/visit_struct
+    REF v1.0
+    SHA512 1396d0d4c4d37f48434361d1e0ab4cb02c397aff1134678b26de713a27a4fcfa1c352890845502be645ba01e20314bf67731893fc6410b93e4521c1261d63c06
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH share/visit_struct
+    TARGET_PATH TARGET_PATH share/visit_struct
+)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+     RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README.md
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/vtk-dicom/CONTROL b/ports/vtk-dicom/CONTROL
index fdd8e04d3cd25f..9abef4ca1d9fb2 100644
--- a/ports/vtk-dicom/CONTROL
+++ b/ports/vtk-dicom/CONTROL
@@ -5,4 +5,4 @@ Build-Depends: vtk, zlib
 
 Feature: gdcm
 Description: Use gdcm for decompressing DICOM files.
-Build-Depends: gdcm2
+Build-Depends: gdcm
diff --git a/ports/wil/CONTROL b/ports/wil/CONTROL
new file mode 100644
index 00000000000000..3db06e5b9ab21c
--- /dev/null
+++ b/ports/wil/CONTROL
@@ -0,0 +1,3 @@
+Source: wil
+Version: 2019-05-08
+Description: The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.
\ No newline at end of file
diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake
new file mode 100644
index 00000000000000..3692809204564d
--- /dev/null
+++ b/ports/wil/portfile.cmake
@@ -0,0 +1,13 @@
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/wil
+    REF 43613517258fbd94182e195b1a4887420ed74b31
+    SHA512 cf15c8571d81b837b2ce4083d7e70d738698ff5ef99a7e99daa96618463281fc8e6642f1703d3b96de7208f7720ecf4108f6ed09b33d2980c2b609dc70fd4653
+    HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wil RENAME copyright)
\ No newline at end of file
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL
index 66fda9beefb49b..0d6d6a56de0bcf 100644
--- a/ports/x264/CONTROL
+++ b/ports/x264/CONTROL
@@ -1,3 +1,3 @@
 Source: x264
-Version: 157-303c484ec828ed0-1
+Version: 157-303c484ec828ed0-2
 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format
diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake
index 67d7ab0875fc06..4dfb4368359d00 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -8,17 +8,19 @@ vcpkg_from_github(
     REF 303c484ec828ed0d8bfe743500e70314d026c3bd
     SHA512 faf210a3f9543028ed882c8348b243dd7ae6638e7b3ef43bec1326b717f23370f57c13d0ddb5e1ae94411088a2e33031a137b68ae9f64c18f8f33f601a0da54d
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/uwp-cflags.patch
+    PATCHES 
+        "uwp-cflags.patch"
 )
 
 # Acquire tools
 vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)
 
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
+    vcpkg_find_acquire_program(NASM)
+    get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
+    set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}")
+endif()
+
 # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".
 string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")
 set(ENV{PATH} "${NEWPATH}")
@@ -27,7 +29,11 @@ set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
 set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)
 #file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)
 
-set(CONFIGURE_OPTIONS "--host=i686-pc-mingw32 --enable-strip --disable-lavf --disable-swscale --disable-asm --disable-avs --disable-ffms --disable-gpac --disable-lsmash")
+set(CONFIGURE_OPTIONS "--host=i686-pc-mingw32 --enable-strip --disable-lavf --disable-swscale --disable-avs --disable-ffms --disable-gpac --disable-lsmash")
+
+if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86 AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
+    set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --disable-asm")
+endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --enable-shared")
diff --git a/ports/x264/uwp-cflags.patch b/ports/x264/uwp-cflags.patch
index fd04755bc5a4db..792e9992755e30 100644
--- a/ports/x264/uwp-cflags.patch
+++ b/ports/x264/uwp-cflags.patch
@@ -1,12 +1,12 @@
-diff --git a/configure b/configure
-index f7b14d9..2c92b2a 100644
---- a/configure
-+++ b/configure
-@@ -821,7 +821,6 @@ if [ $SYS = WINDOWS ]; then
-     if cpp_check "winapifamily.h" "" "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" ; then
-         [ $compiler = CL ] || die "WinRT requires MSVC"
-         define HAVE_WINRT
--        CFLAGS="$CFLAGS -MD"
-         LDFLAGS="$LDFLAGS -appcontainer"
-         if ! cpp_check "" "" "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603" ; then
-             die "_WIN32_WINNT must be defined to at least 0x0603 (Windows 8.1) for WinRT"
+diff --git a/configure b/configure
+index f7b14d9..2c92b2a 100644
+--- a/configure
++++ b/configure
+@@ -821,7 +821,6 @@ if [ $SYS = WINDOWS ]; then
+     if cpp_check "winapifamily.h" "" "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" ; then
+         [ $compiler = CL ] || die "WinRT requires MSVC"
+         define HAVE_WINRT
+-        CFLAGS="$CFLAGS -MD"
+         LDFLAGS="$LDFLAGS -appcontainer"
+         if ! cpp_check "" "" "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603" ; then
+             die "_WIN32_WINNT must be defined to at least 0x0603 (Windows 8.1) for WinRT"
diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL
index f0581395ca5415..3deb2ca48ea0ff 100644
--- a/ports/xeus/CONTROL
+++ b/ports/xeus/CONTROL
@@ -1,4 +1,4 @@
 Source: xeus
-Version: 2019-02-13-1
+Version: 0.19.1-1
 Description: C++ implementation of the Jupyter kernel protocol
-Build-Depends: cppzmq, cryptopp, libuuid (linux), nlohmann-json, xtl, zeromq
+Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake
index 1ba0df8f75a336..ac1dcff01bf946 100644
--- a/ports/xeus/portfile.cmake
+++ b/ports/xeus/portfile.cmake
@@ -3,28 +3,35 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xeus
-    REF f78c60c7ce28baecb2479f2b82e4e8d1a6c35188
-    SHA512 9d83f32f641bcad4ac96e263c465d46bdfa7d18d41f1e201309244c95587ce08ff2426f7cdd3a4399563d46064ed9bedd4d0babf4840f65e95c6a2c6f23ac9bb
+    REF 0.19.1
+    SHA512 1f42cf3b5007fef957c259eee58bdc5d6b812dd32ca316823e33837d3802df0675f778a9c8f2fb97e9ff982c584229d3733e5894684e75498cc244e9c29df209
     HEAD_REF master
-    PATCHES
-        static-lib.patch
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         -DBUILD_EXAMPLES=OFF
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
         -DBUILD_TESTS=OFF
         -DDOWNLOAD_GTEST=OFF
-        -DXEUS_USE_SHARED_CRYPTOPP=OFF # `cryptopp` port currently only supports static linkage.
         -DDISABLE_ARCH_NATIVE=OFF
 )
 
 vcpkg_install_cmake()
 
+vcpkg_copy_pdbs()
+
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 
+file(COPY
+    ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+)
+
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
     ${CURRENT_PACKAGES_DIR}/debug/share
@@ -44,4 +51,4 @@ configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copy
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 
 # CMake integration test
-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/xeus/static-lib.patch b/ports/xeus/static-lib.patch
deleted file mode 100644
index e9ab41f01f970f..00000000000000
--- a/ports/xeus/static-lib.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 26118eb..ccda00b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,7 +141,12 @@ set(XEUS_SOURCES
- # Output
- # ======
- 
--add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS})
-+option(BUILD_SHARED_LIBS "Build shared instead of static libraries." ON)
-+if (BUILD_SHARED_LIBS)
-+    add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS})
-+else ()
-+    add_library(xeus STATIC ${XEUS_SOURCES} ${XEUS_HEADERS})
-+endif ()
- 
- if (APPLE)
-     set_target_properties(xeus PROPERTIES
-@@ -166,9 +171,9 @@ target_link_libraries(xeus
- 
- OPTION(XEUS_USE_SHARED_CRYPTOPP "Used shared library for cryptopp" OFF)
- if (XEUS_USE_SHARED_CRYPTOPP)
--    target_link_libraries(xeus PRIVATE cryptopp-shared)
-+    target_link_libraries(xeus PUBLIC cryptopp-shared)
- else ()
--    target_link_libraries(xeus PRIVATE cryptopp-static)
-+    target_link_libraries(xeus PUBLIC cryptopp-static)
- endif ()
- 
- if(NOT MSVC)
-@@ -226,6 +231,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
-     message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
- endif()
- 
-+if (NOT BUILD_SHARED_LIBS)
-+    target_compile_definitions(xeus PUBLIC XEUS_STATIC_LIB)
-+endif ()
-+
- if(MSVC)
-     target_compile_definitions(xeus PUBLIC -DNOMINMAX)
-     target_compile_options(xeus PUBLIC /DGUID_WINDOWS /MP /bigobj)
-diff --git a/include/xeus/xeus.hpp b/include/xeus/xeus.hpp
-index 99e1d79..522bb78 100644
---- a/include/xeus/xeus.hpp
-+++ b/include/xeus/xeus.hpp
-@@ -10,10 +10,14 @@
- #define XEUS_EXPORT_HPP
- 
- #ifdef _WIN32
--    #ifdef XEUS_EXPORTS
--        #define XEUS_API __declspec(dllexport)
-+    #ifdef XEUS_STATIC_LIB
-+        #define XEUS_API
-     #else
--        #define XEUS_API __declspec(dllimport)
-+        #ifdef XEUS_EXPORTS
-+            #define XEUS_API __declspec(dllexport)
-+        #else
-+            #define XEUS_API __declspec(dllimport)
-+        #endif
-     #endif
- #else
-     #define XEUS_API
diff --git a/ports/xeus/usage b/ports/xeus/usage
index bac932eb9a04ce..1f959804e597a2 100644
--- a/ports/xeus/usage
+++ b/ports/xeus/usage
@@ -1,4 +1,4 @@
 The package xeus provides CMake targets:
 
     find_package(xeus CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE xeus)
+    target_link_libraries(main PRIVATE xeus xeus_static)
diff --git a/ports/xeus/vcpkg-cmake-wrapper.cmake b/ports/xeus/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 00000000000000..62a3cc76583eb8
--- /dev/null
+++ b/ports/xeus/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,9 @@
+_find_package(${ARGS})
+
+if(TARGET xeus AND NOT TARGET xeus_static)
+    add_library(xeus_static INTERFACE IMPORTED)
+    set_target_properties(xeus_static PROPERTIES INTERFACE_LINK_LIBRARIES xeus)
+elseif(TARGET xeus_static AND NOT TARGET xeus)
+    add_library(xeus INTERFACE IMPORTED)
+    set_target_properties(xeus PROPERTIES INTERFACE_LINK_LIBRARIES xeus_static)
+endif()
diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL
index e5f8d0f1437d5a..9c03b6339c5f27 100644
--- a/ports/xsimd/CONTROL
+++ b/ports/xsimd/CONTROL
@@ -1,5 +1,5 @@
 Source: xsimd
-Version: 7.1.3
+Version: 7.2.2
 Description: Modern, portable C++ wrappers for SIMD intrinsics
 
 Feature: xcomplex
diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake
index 3b51bd9a8241c5..50c9776b30e3d5 100644
--- a/ports/xsimd/portfile.cmake
+++ b/ports/xsimd/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xsimd
-    REF 7.1.3
-    SHA512 9f0e2babee9a3a80e16440466277bd635a26197f80cdf806312f7e1cc616db59062887566d50b4cdebe3c3ba4d60155b477684177607428aee53e1d5a95de926
+    REF 7.2.2
+    SHA512 76e98b8f12e5e388108858e5aef687a976a4c4614de9d9d6c854a6edb2ddda92c6b941a466a0b4d933c6d049c89937edfc23bbd8850b81c6293f40f8dc5bbe87
     HEAD_REF master
 )
 
diff --git a/ports/xtensor-blas/CONTROL b/ports/xtensor-blas/CONTROL
index 578687b8e7528e..1779f176019797 100644
--- a/ports/xtensor-blas/CONTROL
+++ b/ports/xtensor-blas/CONTROL
@@ -1,4 +1,4 @@
 Source: xtensor-blas
-Version: 0.15.1
+Version: 0.16.1
 Description: BLAS extension to xtensor
 Build-Depends: xtensor
diff --git a/ports/xtensor-blas/portfile.cmake b/ports/xtensor-blas/portfile.cmake
index e9023ea157e09f..000a567a3f37c1 100644
--- a/ports/xtensor-blas/portfile.cmake
+++ b/ports/xtensor-blas/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtensor-blas
-    REF 0.15.1
-    SHA512 c80def1cc106efec1ee4c33f3724b6b63af4c826e45e2a5a8dc066d368867b3a1d909ae490e09c615c2119b3aad3ef5b739fe86925d0229a69329ddee09c3d66
+    REF 0.16.1
+    SHA512 3bdbd48b74d7be0b9f4ad2d435789e266b3cc1e043bbe73739978678bd1ca81504a688cdd80c03667305d210d299127be9939333c9bd0ac27dff0423ccb4861d
     HEAD_REF master
 )
 
diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL
index 9b84a6ff34fdbe..ba5ff340231cf7 100644
--- a/ports/xtensor/CONTROL
+++ b/ports/xtensor/CONTROL
@@ -1,5 +1,5 @@
 Source: xtensor
-Version: 0.19.3
+Version: 0.20.5
 Description: C++ tensors with broadcasting and lazy computing
 Build-Depends: nlohmann-json, xtl
 
diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake
index 99f52d19596a39..f7c8c2339821ed 100644
--- a/ports/xtensor/portfile.cmake
+++ b/ports/xtensor/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtensor
-    REF 0.19.3
-    SHA512 e3b0085115252441ef4ddf21ef48ca18c3872c24d7f94d2f7533fa8f4b00dff0b5613946296f9dd4d7db3381ff43b41dd2f1ae3857a409fabd439eade431aba2
+    REF 0.20.5
+    SHA512 038f6858bea33a0b6e3b6622c9bbb316864335f7190ef64455ec0a062c13bcafcf215c089bbdf1f72acca63c50ceb2f1d11eb4874d82a5bfff3eead10cbfc00c
     HEAD_REF master
 )
 
diff --git a/ports/xtl/CONTROL b/ports/xtl/CONTROL
index 1ee82f60a71f1e..423ee09dc4577d 100644
--- a/ports/xtl/CONTROL
+++ b/ports/xtl/CONTROL
@@ -1,4 +1,4 @@
 Source: xtl
-Version: 0.5.4
+Version: 0.6.4
 Build-Depends: nlohmann-json
 Description: The x template library.
diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake
index 66e504b732c3aa..0b3b5dad1ccc15 100644
--- a/ports/xtl/portfile.cmake
+++ b/ports/xtl/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xtl
-    REF 0.5.4
-    SHA512 6181334dda9a2afce4ce2809572605c2f911770f7805a8328e14fa94d4572475c7725f2ead54daec00e62933df6a4c22616a247798c5b7f1f3bd4290945776c8
+    REF 0.6.4
+    SHA512 92ff932634a88fee9bfd27d092ebdf91752d90be8a4f3fc41aef90c195718c989082e53f1fcfae9d67b153ecd29d3dde6f8e2b540eeec0db1d0d229a9b0d2fe8
     HEAD_REF master
 )
 
@@ -14,10 +14,8 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
+        -DBUILD_TESTS=OFF
         -DDOWNLOAD_GTEST=OFF
-        -DTF_BUILD_EXAMPLES=OFF
-        -DTF_BUILD_TESTS=OFF
-        -DTF_BUILD_BENCHMARKS=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/z85/CONTROL b/ports/z85/CONTROL
new file mode 100644
index 00000000000000..24fc16050ced41
--- /dev/null
+++ b/ports/z85/CONTROL
@@ -0,0 +1,3 @@
+Source: z85
+Version: 1.0
+Description: Z85 is a binary-to-text encoding library. It implements ZeroMQ Base-85 Encoding Algorithm and provides custom padding.
\ No newline at end of file
diff --git a/ports/z85/portfile.cmake b/ports/z85/portfile.cmake
new file mode 100644
index 00000000000000..578b46ba3c08df
--- /dev/null
+++ b/ports/z85/portfile.cmake
@@ -0,0 +1,19 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO artemkin/z85
+  REF v1.0
+  SHA512 6b205524b8388c5709ca664a595a4db8fdd24148c5f87ef7ef16d6d6eb60d2c51db0b4ab768fe9ac3e5acf5e3fe1b46ef5b9f5e7f69a53fe40a7e8d25b098479
+  HEAD_REF master
+)
+
+# Install source files
+file(INSTALL ${SOURCE_PATH}/src/z85.h
+     ${SOURCE_PATH}/src/z85.c
+     ${SOURCE_PATH}/src/z85.hpp
+     ${SOURCE_PATH}/src/z85_impl.cpp
+     DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
+
+# Install license
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL
index 6a7af61f56ce03..a73b94fc3964e6 100644
--- a/ports/zeromq/CONTROL
+++ b/ports/zeromq/CONTROL
@@ -1,5 +1,5 @@
 Source: zeromq
-Version: 2019-04-19
+Version: 2019-05-07
 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products
 
 Feature: sodium
diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake
index 42632bab0ef607..06b5d3aeefc9ee 100644
--- a/ports/zeromq/portfile.cmake
+++ b/ports/zeromq/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeromq/libzmq
-    REF e3a96778b6fae8a80eb22d5a4f411c1cfb2666de
-    SHA512 a79d74e8e17aafd7487815358663c85a81103d20682052db7b4b16fe3013603f40fde3b1413650d96066b958d3e740a34a3f13c15305b4b335ce24f034c8b740
+    REF f41f51461fd86f2272209a3175d1df0e655883ef
+    SHA512 ee37cda1e86063fc4f9edfc2ae27246d7919f59efe90532944f299b03478d53d8708eb18be824d3885c96ca38917e1f6f72a941845c9b376ddda7ee1fd42cfac
     HEAD_REF master
 )
 
diff --git a/ports/zxing-cpp/0001-opencv4-compat.patch b/ports/zxing-cpp/0001-opencv4-compat.patch
new file mode 100644
index 00000000000000..51cec5387125be
--- /dev/null
+++ b/ports/zxing-cpp/0001-opencv4-compat.patch
@@ -0,0 +1,30 @@
+diff --git a/opencv-cli/src/main.cpp b/opencv-cli/src/main.cpp
+index 63b6fd3..430dda6 100755
+--- a/opencv-cli/src/main.cpp
++++ b/opencv-cli/src/main.cpp
+@@ -135,14 +135,14 @@ int main(int argc, char** argv) {
+ 
+     }
+ 
+-    if (!videoCapture.set(CV_CAP_PROP_FRAME_WIDTH, captureWidth)) {
++    if (!videoCapture.set(cv::CAP_PROP_FRAME_WIDTH, captureWidth)) {
+ 
+         // Log
+         cerr << "Failed to set frame width: " << captureWidth << " (ignoring)" << endl;
+ 
+     }
+ 
+-    if (!videoCapture.set(CV_CAP_PROP_FRAME_HEIGHT, captureHeight)) {
++    if (!videoCapture.set(cv::CAP_PROP_FRAME_HEIGHT, captureHeight)) {
+ 
+         // Log
+         cerr << "Failed to set frame height: " << captureHeight << " (ignoring)" << endl;
+@@ -166,7 +166,7 @@ int main(int argc, char** argv) {
+         if (result) {
+ 
+             // Convert to grayscale
+-            cvtColor(image, grey, CV_BGR2GRAY);
++            cvtColor(image, grey, cv::COLOR_BGR2GRAY);
+ 
+             try {
+ 
diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL
index 52dfd95b27c5de..fec8e63e537aa1 100644
--- a/ports/zxing-cpp/CONTROL
+++ b/ports/zxing-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: zxing-cpp
-Version: 3.3.3-2
+Version: 3.3.3-3
 Build-Depends: opencv[core]
 Description: Barcode detection and decoding library.
diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake
index 405210d9cece32..06a2e6b49aa446 100644
--- a/ports/zxing-cpp/portfile.cmake
+++ b/ports/zxing-cpp/portfile.cmake
@@ -8,6 +8,8 @@ vcpkg_from_github(
     REF 5aad4744a3763d814df98a18886979893e638274
     SHA512 a079ad47171224de4469e76bf0779b6ebc9c6dfb3604bd5dbf5e6e5f321d9e6255f689daa749855f8400023602f1773214013c006442e9b32dd4b8146c888c02
     HEAD_REF master
+    PATCHES
+      0001-opencv4-compat.patch
 )
 
 vcpkg_configure_cmake(