Merge branch 'master' into path_separator

86 files changed, 1138 insertions, 298 deletions

diff --git a/ports/argagg/CONTROL b/ports/argagg/CONTROL
index d4265021d..d317cbe27 100644
--- a/ports/argagg/CONTROL
+++ b/ports/argagg/CONTROL
@@ -1,3 +1,3 @@
 Source: argagg

-Version: 2019-01-25

+Version: 0.4.6

 Description: A simple C++11 command line argument parser

diff --git a/ports/argagg/portfile.cmake b/ports/argagg/portfile.cmake
index 1f7ed54de..f32855eae 100644
--- a/ports/argagg/portfile.cmake
+++ b/ports/argagg/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO vietjtnguyen/argagg

-    REF e678cebf90d8f132f5e54f19c6b95b75e655226c

-    SHA512 10085caaf9bfb507ae7117b61bfe6174dc2af91c347393c3cbb994fe5b824d4b439e1e0d2e2580dc34568d8046529acc211f76863be047d05d3845e9ff19ccbf

+    REF 0.4.6

+    SHA512 7d8cf04a7c679518f01120830637c68719dd67a765457789eb4afedbead7be9efadc6bcdf640999329aaaf8659a5e5d1896f66587068cc668a7c49703aca3070

     HEAD_REF master

 )

 

diff --git a/ports/argparse/CONTROL b/ports/argparse/CONTROL
index c7c33adac..58aee48ef 100644
--- a/ports/argparse/CONTROL
+++ b/ports/argparse/CONTROL
@@ -1,4 +1,4 @@
 Source: argparse

-Version: 2019-06-10

+Version: 1.9

 Description: Argument parser for modern C++

 Homepage: https://github.com/p-ranav/argparse

diff --git a/ports/argparse/portfile.cmake b/ports/argparse/portfile.cmake
index 0ad21e10a..a3d38d4b4 100644
--- a/ports/argparse/portfile.cmake
+++ b/ports/argparse/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO p-ranav/argparse

-    REF 2c71311b5fa49b7d65e6628375f2748d58830856

-    SHA512 08a28a3fb424befe7df9a428fbad8e2687a1b331d7099bfaca2c3e04d8d4b4888e99d481226407bf90bfce282388545b09e4125128215cc95dc56fb313641bf6

+    REF v1.9

+    SHA512 6cfc7fc274a11093fe5254f244adaacdcc81123b1d7e9b51110ffdfe9a344fb59044ec9d98017f25aa8ea417d57cfca330fdea7161226da26f1b4fc199fdc4fb

     HEAD_REF master

 )

 

diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index 08223a62c..40cf38523 100644
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-c-shared-utility
-Version: 2019-05-16.1
+Version: 2019-08-20.1
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c
 
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index c43bf4451..3b95bd6dd 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF f0642196af85aeb4f2717d9cc11176290f321fb8
-        SHA512 fd8ee6e2be11c13f7388e57eb9c98397b6cb026ca370131db55b6118908701cdff2a1eaabb89bfe84591d6ee17163d06b7b86ad615216203bcbf0c8595d45452
+        REF 1f3fd807c8c47b6607d349469301afb64643aa89
+        SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2
         HEAD_REF master
         PATCHES no-double-expand-cmake.patch
     )
@@ -15,8 +15,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF f0642196af85aeb4f2717d9cc11176290f321fb8
-        SHA512 fd8ee6e2be11c13f7388e57eb9c98397b6cb026ca370131db55b6118908701cdff2a1eaabb89bfe84591d6ee17163d06b7b86ad615216203bcbf0c8595d45452
+        REF 1f3fd807c8c47b6607d349469301afb64643aa89
+        SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2
         HEAD_REF master
         PATCHES no-double-expand-cmake.patch
     )
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index 8cebc0601..33349bef1 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-iot-sdk-c
-Version: 2019-07-01.1
+Version: 2019-08-20.1
 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
 
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 290dc304b..318856a30 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF f3f9538960d9b29033e52522dd63e985ba970504
-        SHA512 f8ce98d62425da4bec1c9e99b7b662a615d90a9407e03f7ce31a56fb8848f6bda1a39156bbabf351383e490dc3438d842136220dcf08efb1560e21d9ac76a0ba
+        REF 8b7cc18456f377b7f0df42dcdefb24ae81d9e7fc
+        SHA512 0386889fc3d32a795998a35a382cce6d11f6712416f3a1a49de6ea7d9c0c973ca05989353ee9a3ec5ca02dc55c2b59dc803cbf4866b918274667e52d03d1490f
         HEAD_REF public-preview
         PATCHES improve-external-deps.patch
     )
diff --git a/ports/azure-macro-utils-c/CONTROL b/ports/azure-macro-utils-c/CONTROL
index 40aaa75fe..8e75a6088 100644
--- a/ports/azure-macro-utils-c/CONTROL
+++ b/ports/azure-macro-utils-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-macro-utils-c
-Version: 2019-05-16.1
+Version: 2019-08-20.1
 Description: A library of macros for the Azure IoT SDK Suite
 Build-Depends: 
 
diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake
index d516e59e9..6f4713e74 100644
--- a/ports/azure-macro-utils-c/portfile.cmake
+++ b/ports/azure-macro-utils-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-macro-utils-c
-    REF 38729b4b7ac3ea8b7d71e394782b861ecb25193e
-    SHA512 c9c820e74aee403d45f257359318d3435e5d6534afe821da5679bc462e26ad256dd01ed253a80ba1c58343f850ef1026280533a152c4b0465527f6537b3092d3
+    REF 17a6ad1df91e57d6981366710096798bcb5991a6
+    SHA512 8f5b9561ff303832834113098a3c9eeace1f1fbbc55e508c50d0f75bfe08ee05b54a8d6a0786148c5e7861a0149317a2cc113022626f8ac72df732bda9162855
     HEAD_REF master
 )
 
diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL
index db9200f4c..c9625f49a 100644
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-uamqp-c
-Version: 2019-05-16.1
+Version: 2019-08-20.1
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: AMQP library for C
 
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index 517eca19a..1b3d71cda 100644
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF 5ceebf6ec8d1973cfa80804077c7cef23d3b36af
-        SHA512 6dc7ffc386339db54ff387760119ae5ffd564642cd18d0dc177e6302167cc3b40bdd0f4d9e50478db8d2760166b15058b53b9eb2d1c160f234693a59ac762a75
+        REF 6922680bda8581e8c8df34a764d32e62a8498943
+        SHA512 1ba060efc2330967aae53b43879c7566f90ec539f28cc6e7054852235c916ad9254628415b79ff25e4191302911673ec501d97c6707e8f65a5583f687a64b2aa
         HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF 5ceebf6ec8d1973cfa80804077c7cef23d3b36af
-        SHA512 6dc7ffc386339db54ff387760119ae5ffd564642cd18d0dc177e6302167cc3b40bdd0f4d9e50478db8d2760166b15058b53b9eb2d1c160f234693a59ac762a75
+        REF 6922680bda8581e8c8df34a764d32e62a8498943
+        SHA512 1ba060efc2330967aae53b43879c7566f90ec539f28cc6e7054852235c916ad9254628415b79ff25e4191302911673ec501d97c6707e8f65a5583f687a64b2aa
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL
index f282a27f2..de229540e 100644
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-uhttp-c
-Version: 2019-05-16.1
+Version: 2019-08-20.1
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: Azure HTTP Library written in C
 
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index af5afc875..491309455 100644
--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF b8976adff02e543fc00e7db59eae9ce78dd014fe
-        SHA512 65ddccc07831309c4f3f8546bb1a45a6eff84674013311a15c99389d4fc33eaf2ef3da6c7c8e4bb03d32955d12c978190e7badb597379a9fefda4ebcf18827ec
+        REF 15fba15a8247746d6131aeefbcd394bdea202fc0
+        SHA512 f7f93d2041407b353cd407d8487469a2e7131911b826b7fd4598025432cc0625124a935ca6346d6db2fe2149747cdb3a8b19040dc7f90e1a196c020a85f454f4
         HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF b8976adff02e543fc00e7db59eae9ce78dd014fe
-        SHA512 65ddccc07831309c4f3f8546bb1a45a6eff84674013311a15c99389d4fc33eaf2ef3da6c7c8e4bb03d32955d12c978190e7badb597379a9fefda4ebcf18827ec
+        REF 15fba15a8247746d6131aeefbcd394bdea202fc0
+        SHA512 f7f93d2041407b353cd407d8487469a2e7131911b826b7fd4598025432cc0625124a935ca6346d6db2fe2149747cdb3a8b19040dc7f90e1a196c020a85f454f4
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL
index 2138a45b1..4d098b391 100644
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-umqtt-c
-Version: 2019-05-16.1
+Version: 2019-08-20.1
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: General purpose library for communication over the mqtt protocol
 
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index d64dd01d4..83bf227ab 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF c37883fbb05218fd940b87899a116af240f90c40
-        SHA512 21bbe6dfafcc96d35775ab83a75334fbfd41a55a82a7da483d5ff179aa3792424851f250007c9603ef17c789d8b23b1a8b81580fc2cf793fd00b487c321fdba3
+        REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8
+        SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64
         HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF c37883fbb05218fd940b87899a116af240f90c40
-        SHA512 21bbe6dfafcc96d35775ab83a75334fbfd41a55a82a7da483d5ff179aa3792424851f250007c9603ef17c789d8b23b1a8b81580fc2cf793fd00b487c321fdba3
+        REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8
+        SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64
         HEAD_REF master
     )
 endif()
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index 93e4b457f..600062e26 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -149,8 +149,8 @@ function(boost_modular_build)
         --ignore-site-config

         --hash

         -q

-        -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include"

-        -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}/include"

+        "-sZLIB_INCLUDE=${CURRENT_INSTALLED_DIR}/include"

+        "-sBZIP2_INCLUDE=${CURRENT_INSTALLED_DIR}/include"

         threading=multi

     )

     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

@@ -160,55 +160,55 @@ function(boost_modular_build)
     endif()

     set(_bm_OPTIONS_DBG

          -sZLIB_BINARY=zlibd

-         -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}/debug/lib"

+         "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"

          -sBZIP2_BINARY=bz2d

-         -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}/debug/lib"

+         "-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"

     )

  

     set(_bm_OPTIONS_REL

          -sZLIB_BINARY=zlib

-         -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}/lib"

+         "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"

          -sBZIP2_BINARY=bz2

-         -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}/lib"

+         "-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"

     )

 

     # Properly handle compiler and linker flags passed by VCPKG

     if(VCPKG_CXX_FLAGS)

-        list(APPEND _bm_OPTIONS cxxflags="${VCPKG_CXX_FLAGS}")

+        list(APPEND _bm_OPTIONS "cxxflags=${VCPKG_CXX_FLAGS}")

     endif()

 

     if(VCPKG_CXX_FLAGS_RELEASE)

-        list(APPEND _bm_OPTIONS_REL cxxflags="${VCPKG_CXX_FLAGS_RELEASE}")

+        list(APPEND _bm_OPTIONS_REL "cxxflags=${VCPKG_CXX_FLAGS_RELEASE}")

     endif()

 

     if(VCPKG_CXX_FLAGS_DEBUG)

-        list(APPEND _bm_OPTIONS_DBG cxxflags="${VCPKG_CXX_FLAGS_DEBUG}")

+        list(APPEND _bm_OPTIONS_DBG "cxxflags=${VCPKG_CXX_FLAGS_DEBUG}")

     endif()

 

 

     if(VCPKG_C_FLAGS)

-        list(APPEND _bm_OPTIONS cflags="${VCPKG_C_FLAGS}")

+        list(APPEND _bm_OPTIONS "cflags=${VCPKG_C_FLAGS}")

     endif()

 

     if(VCPKG_C_FLAGS_RELEASE)

-        list(APPEND _bm_OPTIONS_REL cflags="${VCPKG_C_FLAGS_RELEASE}")

+        list(APPEND _bm_OPTIONS_REL "cflags=${VCPKG_C_FLAGS_RELEASE}")

     endif()

 

     if(VCPKG_C_FLAGS_DEBUG)

-        list(APPEND _bm_OPTIONS_DBG cflags="${VCPKG_C_FLAGS_DEBUG}")

+        list(APPEND _bm_OPTIONS_DBG "cflags=${VCPKG_C_FLAGS_DEBUG}")

     endif()

 

 

     if(VCPKG_LINKER_FLAGS)

-        list(APPEND _bm_OPTIONS linkflags="${VCPKG_LINKER_FLAGS}")

+        list(APPEND _bm_OPTIONS "linkflags=${VCPKG_LINKER_FLAGS}")

     endif()

 

     if(VCPKG_LINKER_FLAGS_RELEASE)

-        list(APPEND _bm_OPTIONS_REL linkflags="${VCPKG_LINKER_FLAGS_RELEASE}")

+        list(APPEND _bm_OPTIONS_REL "linkflags=${VCPKG_LINKER_FLAGS_RELEASE}")

     endif()

 

     if(VCPKG_LINKER_FLAGS_DEBUG)

-        list(APPEND _bm_OPTIONS_DBG linkflags="${VCPKG_LINKER_FLAGS_DEBUG}")

+        list(APPEND _bm_OPTIONS_DBG "linkflags=${VCPKG_LINKER_FLAGS_DEBUG}")

     endif()

 

 

@@ -251,9 +251,9 @@ function(boost_modular_build)
             endif()

         endif()

         file(TO_NATIVE_PATH "${PLATFORM_WINMD_DIR}" PLATFORM_WINMD_DIR)

-        string(REPLACE "\\" "\\\\" PLATFORM_WINMD_DIR ${PLATFORM_WINMD_DIR}) # escape backslashes

+        string(REPLACE "\\" "/" PLATFORM_WINMD_DIR ${PLATFORM_WINMD_DIR}) # escape backslashes

 

-        set(TOOLSET_OPTIONS "${TOOLSET_OPTIONS} <cflags>-Zl <compileflags>\"/AI\"${PLATFORM_WINMD_DIR}\"\" <linkflags>WindowsApp.lib <cxxflags>/ZW <compileflags>-DVirtualAlloc=VirtualAllocFromApp <compileflags>-D_WIN32_WINNT=0x0A00")

+        set(TOOLSET_OPTIONS "${TOOLSET_OPTIONS} <cflags>-Zl <compileflags>\"/AI${PLATFORM_WINMD_DIR}\" <linkflags>WindowsApp.lib <cxxflags>/ZW <compileflags>-DVirtualAlloc=VirtualAllocFromApp <compileflags>-D_WIN32_WINNT=0x0A00")

     else()

         set(TOOLSET_OPTIONS "${TOOLSET_OPTIONS} <compileflags>-D_WIN32_WINNT=0x0602")

     endif()

diff --git a/ports/cgltf/CONTROL b/ports/cgltf/CONTROL
index 948fde883..1de82b271 100644
--- a/ports/cgltf/CONTROL
+++ b/ports/cgltf/CONTROL
@@ -1,3 +1,3 @@
 Source: cgltf
-Version: 1.2
+Version: 1.3
 Description: Single-file glTF 2.0 parser written in C99
diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake
index 75b5ce191..6754e969a 100644
--- a/ports/cgltf/portfile.cmake
+++ b/ports/cgltf/portfile.cmake
@@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jkuhlmann/cgltf
-    REF v1.2
-    SHA512 3a678023ffd25416a1454da5e67bdf303d08dcd5a46e19a912dc2dfc549a6cd5800024649757c19653f9b2763fc6342d8dd398e940b2df6c3e1b222a4fd2e0e1
+    REF v1.3
+    SHA512 4fc68654b7903a21156d900184626d1325421092f0dd060b9f20cff1dec29d0a057fc1f3b4e79e36a0cfc6bc7447f7c2ac8a0ecb78c85a337356908a9c69478e
     HEAD_REF master
 )
 
diff --git a/ports/clara/CONTROL b/ports/clara/CONTROL
index cb0c84df3..bb0af5dfb 100644
--- a/ports/clara/CONTROL
+++ b/ports/clara/CONTROL
@@ -1,4 +1,4 @@
 Source: clara
-Version: 2019-03-29
+Version: 1.1.5
 Homepage: https://github.com/philsquared/Clara
 Description: A simple to use command line parser for C++
\ No newline at end of file
diff --git a/ports/clara/portfile.cmake b/ports/clara/portfile.cmake
index 583a07b53..e0f82af5a 100644
--- a/ports/clara/portfile.cmake
+++ b/ports/clara/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO philsquared/Clara
-    REF e3061072fd5a3739fbd11e56ecb7fef5fbd33e04
-    SHA512 5ad4b4842153e11b3e82579858c159a85c9ef76e8278ef97befecaedcd79508e89a3fcb5f5b5c3f0ac48064d5627e08cdd2a1db046a95f5b2d55d7b8a4437a92
+    REF v1.1.5
+    SHA512 10aed7452eaf95c785899086118181615d29496d9f6e5b7054005b565afb642fcdf18b87ebb2dae4e9e365c434be9463c1a5d1a4c4ab17b95a87b89a7f7e3b08
     HEAD_REF master
 )
 file(INSTALL ${SOURCE_PATH}/single_include/clara.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/clp/CONTROL b/ports/clp/CONTROL
index adf2036bf..5e83cb98e 100644
--- a/ports/clp/CONTROL
+++ b/ports/clp/CONTROL
@@ -1,4 +1,4 @@
 Source: clp
-Version: 1.17.2-2
+Version: 1.17.3
 Description: Clp (Coin-or linear programming) is an open-source linear programming solver written in C++. It is primarily meant to be used as a callable library, but a basic, stand-alone executable version is also available.
 Build-Depends: coinutils, osi
diff --git a/ports/clp/portfile.cmake b/ports/clp/portfile.cmake
index 945a38199..993e7472e 100644
--- a/ports/clp/portfile.cmake
+++ b/ports/clp/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO coin-or/Clp
-    REF releases/1.17.2
-    SHA512 70c44f19fca58c64a745c22b6687f7885dfc88196e1dcb0c3be5b7187ccb541a7e85513eb448dd26a163dd78596c57762f4b103d4027056cf53c5c5a994dc35f
+    REF releases/1.17.3
+    SHA512 aa2ed96e01d7cf31ba85756001f430296b1983c6b16a814d845e63bbaca5331cfc71c5ef55e94200da389f138e9766cc745b21e5649f09cb9da473d454c5e062
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL
index 12078257a..a477eb38b 100644
--- a/ports/dimcli/CONTROL
+++ b/ports/dimcli/CONTROL
@@ -1,4 +1,4 @@
 Source: dimcli
-Version: 4.1.0-1
+Version: 5.0.0
 Homepage: https://github.com/gknowles/dimcli
 Description: C++ command line parser toolkit
diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake
index 2d231117c..2c8049a43 100644
--- a/ports/dimcli/portfile.cmake
+++ b/ports/dimcli/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gknowles/dimcli
-    REF v4.1.0
-    SHA512 5de010b5abfda9e6996bba8c621e03ae0cf81dbc2f69cd859e2ebf7b1706c451f7f8e142299784646d89ca3c3e5803e8711215680b8bdb8eb663158bff3b4f3d
+    REF v5.0.0
+    SHA512 504e6f53e83ce17e8e4b59ecf1a610c2249c2bf48a308b1ee5db0e0e85d3cb08178d24534b5dee8bfaac83fd44c68cbbe8d300283d0023467b724a9340b56e4c
     HEAD_REF master
 	PATCHES
 		fix-NameBoolean.patch
diff --git a/ports/distorm/CONTROL b/ports/distorm/CONTROL
index 21dc43923..620dfa981 100644
--- a/ports/distorm/CONTROL
+++ b/ports/distorm/CONTROL
@@ -1,3 +1,3 @@
 Source: distorm

-Version: 2018-08-26-16e6f435-1

+Version: 3.4.1

 Description: Powerful Disassembler Library For x86/AMD64
\ No newline at end of file
diff --git a/ports/distorm/portfile.cmake b/ports/distorm/portfile.cmake
index 9afec4e49..b1066ccd8 100644
--- a/ports/distorm/portfile.cmake
+++ b/ports/distorm/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO gdabah/distorm

-    REF 16e6f43509616234b8478187c00569a65f15287c

-    SHA512 2ecbacaaf07a07cf725adf25732807476fdaa1d3a44994a90c70ddbd2ec3db4c75c88b28188f8a48a0fb7b4fe79ae4f7b717cf72b3a0154232310ed56677a9a3

+    REF v3.4.1

+    SHA512 0e9f8b62bc190ef7d516f1902b6003adef9c7d5d4a5f985fb0bdfc5d4838b2805e2b8836b02d5eccdb3401e814417de615dec675aed9e606c93122ca8a0d2083

     HEAD_REF master

 )

 

diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL
index 5e0c40bf7..9a0c698db 100644
--- a/ports/eastl/CONTROL
+++ b/ports/eastl/CONTROL
@@ -1,5 +1,5 @@
 Source: eastl

-Version: 3.14.00
+Version: 3.14.01

 Homepage: https://github.com/electronicarts/EASTL

 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
deleted file mode 100644
index 51fcfe69a..000000000
--- a/ports/eastl/fixchar8_t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 e1c1a0d44..fcbe02f7e 100644
--- a/ports/eastl/portfile.cmake
+++ b/ports/eastl/portfile.cmake
@@ -17,11 +17,10 @@ set(EABASE_PATH  ${SOURCE_PATH})
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO electronicarts/EASTL

-    REF dcd2b838d52de13691999aff8faeaa8f284928ac
-    SHA512 9756ee47a30447f17ceb45fb5143d6e80905636cf709c171059a83f74094fb25391c896de0ea5e063cdad4e7334c5f963c75b1c34ad539fd24175983a2054159

+    REF 3.14.01

+    SHA512 efc03bdd4b6371b3fb4b75cac31ce3081290e9177453914a4fbb601d1ba44d65a86f2e98b7b27efbd985f37bd59a80169cf58beb3a32e5b3672ea2a2d6dd78d1

     HEAD_REF master

     PATCHES 

-    fixchar8_t.patch # can be removed after electronicarts/EASTL#274 is resolved

     fix_cmake_install.patch

 )

 

diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL
index 77d06de9b..431f60704 100644
--- a/ports/embree3/CONTROL
+++ b/ports/embree3/CONTROL
@@ -1,4 +1,5 @@
 Source: embree3
-Version: 3.5.2
+Version: 3.5.2-1
+Homepage: https://github.com/embree/embree
 Description: High Performance Ray Tracing Kernels.
 Build-Depends: tbb
diff --git a/ports/embree3/fix-InstallPath.patch b/ports/embree3/fix-InstallPath.patch
new file mode 100644
index 000000000..316fa594d
--- /dev/null
+++ b/ports/embree3/fix-InstallPath.patch
@@ -0,0 +1,15 @@
+diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
+index 3c3980d..0c365ac 100644
+--- a/common/cmake/package.cmake
++++ b/common/cmake/package.cmake
+@@ -124,8 +124,8 @@ CONFIGURE_FILE(common/cmake/embree-config-version.cmake embree-config-version.cm
+ # create a config file for the build directory
+ CONFIGURE_FILE(common/cmake/embree-config-builddir.cmake embree-config.cmake @ONLY)
+ 
+-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR} RENAME "embree-config.cmake" COMPONENT devel)
+-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)
++INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR}/share/embree3 RENAME "embree-config.cmake" COMPONENT devel)
++INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR}/share/embree3 COMPONENT devel)
+ 
+ ##############################################################
+ # CPack specific stuff
diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake
index 142be6cd6..4abc91470 100644
--- a/ports/embree3/portfile.cmake
+++ b/ports/embree3/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
     REF v3.5.2
     SHA512 f00403c8bc76428088a38990117245b5b11ac90a2df21fa12c2d5c2e8af45fb3708abb705c612e0d9d7b0cfe4edb51c8b9630b60081b39fcb4370f31ee37acc7
     HEAD_REF master
+	PATCHES
+		fix-InstallPath.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake)
@@ -33,18 +35,13 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-# these cmake files do not seem to contain helpful configuration for find libs, just remove them
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config.cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config-version.cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+	vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/models)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/models)
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree3)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree3/doc)
 
 # Handle copyright
diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL
index 098748ee8..e493429d4 100644
--- a/ports/fribidi/CONTROL
+++ b/ports/fribidi/CONTROL
@@ -1,3 +1,3 @@
 Source: fribidi

-Version: 58c6cb3

+Version: 2019-02-04-1

 Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)

diff --git a/ports/fribidi/fix-win-static-suffix.patch b/ports/fribidi/fix-win-static-suffix.patch
new file mode 100644
index 000000000..87f288e93
--- /dev/null
+++ b/ports/fribidi/fix-win-static-suffix.patch
@@ -0,0 +1,39 @@
+diff --git a/lib/meson.build b/lib/meson.build
+index 573d47f..c9b249e 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -71,14 +71,26 @@ fribidi_sources = [
+   'fribidi-shape.c',
+ ]
+ 
+-libfribidi = library('fribidi',
+-  fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
+-  generated_tab_include_files, config_h,
+-  include_directories: incs,
+-  c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+-  version: libversion,
+-  soversion: soversion,
+-  install: true)
++if host_machine.system() == 'windows' and get_option('default_library') == 'static'
++    libfribidi = library('fribidi',
++    fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
++    generated_tab_include_files, config_h,
++    include_directories: incs,
++    c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
++    version: libversion,
++    soversion: soversion,
++    install: true,
++    name_suffix: 'lib')
++else
++    libfribidi = library('fribidi',
++    fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
++    generated_tab_include_files, config_h,
++    include_directories: incs,
++    c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
++    version: libversion,
++    soversion: soversion,
++    install: true)
++endif
+ 
+ libfribidi_dep = declare_dependency(link_with: libfribidi,
+   include_directories: incs,
diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake
index 5b45a17b1..843964500 100644
--- a/ports/fribidi/portfile.cmake
+++ b/ports/fribidi/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF 58c6cb390a9a18c98b2cbaac555d8ea9352a9e4f

     SHA512 1ec9c19faa87886786ce1589e2c66cab173b48e34d0e43487becc8606001f21f6ed17d0abd1c322fbbcaeb96a47ed882cad228be2e9beb019020ca2a475fc298

     HEAD_REF master

+    PATCHES fix-win-static-suffix.patch

 )

 

 vcpkg_configure_meson(

diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
index bf5acc08d..9977d738e 100644
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@@ -1,5 +1,5 @@
 Source: gdal
-Version: 2.4.1-7
+Version: 2.4.1-8
 Homepage: https://gdal.org/
 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, zlib
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index e212a42ed..a336e1f1e 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -80,8 +80,8 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
   # Setup geos libraries + include path
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR)
   if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-      file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL)
-      file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG)
+      file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos_c.lib ${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL)
+      file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG)
   else()
       file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL)
       file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG)
@@ -133,7 +133,15 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
   # Setup liblzma libraries + include path
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LZMA_INCLUDE_DIR)
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/lzma.lib" LZMA_LIBRARY_REL)
-  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/lzma.lib" LZMA_LIBRARY_DBG)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib" LZMA_LIBRARY_DBG)
+
+  # Setup openssl libraries path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libeay32.lib ${CURRENT_INSTALLED_DIR}/lib/ssleay32.lib" OPENSSL_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libeay32.lib ${CURRENT_INSTALLED_DIR}/debug/lib/ssleay32.lib" OPENSSL_LIBRARY_DBG)
+
+  # Setup libiconv libraries path
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib" ICONV_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib" ICONV_LIBRARY_DBG)
 
   if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES)
       # Setup MySQL libraries + include path
@@ -210,39 +218,34 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
       CXX_CRT_FLAGS=${LINKAGE_FLAGS}
       PROJ_LIBRARY=${PROJ_LIBRARY_REL}
       PNG_LIB=${PNG_LIBRARY_REL}
-      GEOS_LIB=${GEOS_LIBRARY_REL}
+      "GEOS_LIB=${GEOS_LIBRARY_REL}"
       EXPAT_LIB=${EXPAT_LIBRARY_REL}
       "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib"
       "SQLITE_LIB=${SQLITE_LIBRARY_REL} ${SPATIALITE_LIBRARY_REL}"
       OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}
       WEBP_LIBS=${WEBP_LIBRARY_REL}
-      LIBXML2_LIB=${XML2_LIBRARY_REL}
+      "LIBXML2_LIB=${XML2_LIBRARY_REL} ${ICONV_LIBRARY_REL} ${LZMA_LIBRARY_REL}"
       ZLIB_LIB=${ZLIB_LIBRARY_REL}
+      "PG_LIB=${PGSQL_LIBRARY_REL} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_REL}"
   )
-  if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-      # Static Build does not like PG_LIB
-      list(APPEND NMAKE_OPTIONS_REL PG_LIB=${PGSQL_LIBRARY_REL})
-  endif()
 
   list(APPEND NMAKE_OPTIONS_DBG
       ${NMAKE_OPTIONS}
       CXX_CRT_FLAGS="${LINKAGE_FLAGS}d"
       PROJ_LIBRARY=${PROJ_LIBRARY_DBG}
       PNG_LIB=${PNG_LIBRARY_DBG}
-      GEOS_LIB=${GEOS_LIBRARY_DBG}
+      "GEOS_LIB=${GEOS_LIBRARY_DBG}"
       EXPAT_LIB=${EXPAT_LIBRARY_DBG}
       "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib"
       "SQLITE_LIB=${SQLITE_LIBRARY_DBG} ${SPATIALITE_LIBRARY_DBG}"
       OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}
       WEBP_LIBS=${WEBP_LIBRARY_DBG}
-      LIBXML2_LIB=${XML2_LIBRARY_DBG}
+      "LIBXML2_LIB=${XML2_LIBRARY_DBG} ${ICONV_LIBRARY_DBG} ${LZMA_LIBRARY_DBG}"
       ZLIB_LIB=${ZLIB_LIBRARY_DBG}
+      "PG_LIB=${PGSQL_LIBRARY_DBG} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_DBG}"
       DEBUG=1
   )
-  if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-      # Static Build does not like PG_LIB
-      list(APPEND NMAKE_OPTIONS_DBG PG_LIB=${PGSQL_LIBRARY_DBG})
-  endif()
+  
   # Begin build process
   if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
     ################
@@ -290,15 +293,14 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
 
   if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib)
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-      file(COPY ${SOURCE_PATH_RELEASE}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+      file(COPY ${SOURCE_PATH_RELEASE}/gdal_i.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
     endif()
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-      file(COPY ${SOURCE_PATH_DEBUG}/gdal.lib   DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-      file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib)
+      file(COPY ${SOURCE_PATH_DEBUG}/gdal_i.lib   DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+      file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdal_id.lib)
     endif()
 
   else()
diff --git a/ports/inih/CONTROL b/ports/inih/CONTROL
index 22c519e21..1b933c675 100644
--- a/ports/inih/CONTROL
+++ b/ports/inih/CONTROL
@@ -1,3 +1,3 @@
 Source: inih

-Version: 44
+Version: 45

 Description: Simple .INI file parser

diff --git a/ports/inih/portfile.cmake b/ports/inih/portfile.cmake
index a0a34d77f..369791bb6 100644
--- a/ports/inih/portfile.cmake
+++ b/ports/inih/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO benhoyt/inih
-    REF b1dbff4b0bd1e1f40d237e21011f6dee0ec2fa69
-    SHA512 b250a7d2a9a1a18793a5f7421d444cbf92c21f1aca5f767781221e2e64b0ba5e0804e82c3f8e4f2c0e08516f4ddbf1533e4d254c557bfb38d9a0da879b98cffb
+    REF r45
+    SHA512 bbec8b798b2ca32741e58467bcb843f991eaa6d687e7ed14dfaf412a9ddea8086b3088267bd30ef6c775d7a81593e181c561f320f8466e38f4ecbbdce9ce26df
     HEAD_REF master
 )
 
diff --git a/ports/ixwebsocket/CONTROL b/ports/ixwebsocket/CONTROL
index 98b64cd28..1da0010bc 100644
--- a/ports/ixwebsocket/CONTROL
+++ b/ports/ixwebsocket/CONTROL
@@ -1,7 +1,7 @@
 Source: ixwebsocket
-Version: 4.0.3
+Version: 5.0.4
 Build-Depends: zlib
-Description: Lightweight WebSocket Client and Server + HTTP Client
+Description: Lightweight WebSocket Client and Server + HTTP Client and Server
 Default-Features: ssl
 
 Feature: ssl
diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake
index b4beeed9b..af3ee420d 100644
--- a/ports/ixwebsocket/portfile.cmake
+++ b/ports/ixwebsocket/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO machinezone/IXWebSocket
-    REF v4.0.3
-    SHA512 41cda81ef28ae2a51d77bf09158f4c07350f22b17ed4b6645a87c7defd2a901b7656de260bc785c42990ddbea0ab23ad6e099694d2712537de0ca328aee8e229
+    REF v5.0.4
+    SHA512 8e8f0050251ba71fa3bba01adbf6fd1a797518115ac8207481b89aebcadc310b98451cc141f3c8f69a0b8397f35b6e0fe51c65fbdc3d7d5e2a4271472f422b13
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/leaf/CONTROL b/ports/leaf/CONTROL
index d85d93d9a..e7a7c9480 100644
--- a/ports/leaf/CONTROL
+++ b/ports/leaf/CONTROL
@@ -1,3 +1,3 @@
 Source: leaf

-Version: 0.2.1-2

+Version: 0.2.2

 Description: Lightweight error augmentation framework 
\ No newline at end of file
diff --git a/ports/leaf/portfile.cmake b/ports/leaf/portfile.cmake
index 1ff5e1e53..4d5c129bf 100644
--- a/ports/leaf/portfile.cmake
+++ b/ports/leaf/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO zajo/leaf

-    REF 5fd08ee095c92b2bf4623b7237393e81f995ca7a

-    SHA512 92b86dbba55d31808f442d27dd873dce1162b28213533e124df448ae4f7b4442733501b6539ab15f67a85e184e458a66df4e4e020a3a213b44578ebbde281a42

+    REF 0.2.2

+    SHA512 200a78e33fa919fbf996cfa5715f166e194b87776de79dec4c23d7a60b1f1e1c9db699f3d94d17b52c655e802ea63e1e6539538b180ecaafbfcf106b280b5c1f

     HEAD_REF master

 )

 

diff --git a/ports/libcopp/CONTROL b/ports/libcopp/CONTROL
index 68115219f..6722fb6ac 100644
--- a/ports/libcopp/CONTROL
+++ b/ports/libcopp/CONTROL
@@ -1,3 +1,3 @@
 Source: libcopp
-Version: 1.1.0-2
+Version: 1.2.0
 Description: A cross-platfrom coroutine library for C++
diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake
index 026e4a14c..5df6cf737 100644
--- a/ports/libcopp/portfile.cmake
+++ b/ports/libcopp/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO owt5008137/libcopp
-    REF 1.1.0
-    SHA512 27b444d158281786154830c6e216e701ba0301af1d7a08873b33e27ce3d2db6ddb4753239878633f4c2aed9f759b46f961408a2eb7b50b5d445c3531c1fa9546
+    REF 1.2.0
+    SHA512 7e98380cb6a8d7ae9b458fe609e2ebce15da4b1ee6cc5570112685f484ef42466f4974aa14fce90715ef175125acef47097b36bb7707abd6950581b8ec03c541
     HEAD_REF v2
 )
 
diff --git a/ports/libfabric/CONTROL b/ports/libfabric/CONTROL
index 9666bc228..83ee15df5 100644
--- a/ports/libfabric/CONTROL
+++ b/ports/libfabric/CONTROL
@@ -1,5 +1,5 @@
 Source: libfabric

-Version: 1.7.1-1

+Version: 1.8.0

 Description: The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.

 Homepage: https://github.com/ofiwg/libfabric

 Build-Depends: networkdirect-sdk (windows)

diff --git a/ports/libfabric/portfile.cmake b/ports/libfabric/portfile.cmake
index f7dc21226..a0bb5f839 100644
--- a/ports/libfabric/portfile.cmake
+++ b/ports/libfabric/portfile.cmake
@@ -8,9 +8,9 @@ endif()
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO ofiwg/libfabric

-    REF v1.7.1

+    REF v1.8.0

     HEAD_REF master

-    SHA512 3ae06839295a5b581a5d9936ee991bb597672a4981cc7fa385f4db7645d5328156d758848827ec186c0056cf3abd97f8f3859ec16a8b5bbd0d1f979143ee7bb1

+    SHA512 1101b0967fcd5ac527f94a1e4dd72a58a007e348971eb01b57425a812e1ea8320e1cbcfba7dea35520dab2c47753d91495c6b360438ca0be98ce6ee6568e2e08

     PATCHES

       add_additional_includes.patch

 )

diff --git a/ports/libspatialindex/CONTROL b/ports/libspatialindex/CONTROL
new file mode 100644
index 000000000..aa1da63c1
--- /dev/null
+++ b/ports/libspatialindex/CONTROL
@@ -0,0 +1,6 @@
+Source: libspatialindex
+Version: 1.9.0
+Homepage: http://libspatialindex.github.com
+Description: C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.
+Build-Depends: zlib
+
diff --git a/ports/libspatialindex/portfile.cmake b/ports/libspatialindex/portfile.cmake
new file mode 100644
index 000000000..f71182d62
--- /dev/null
+++ b/ports/libspatialindex/portfile.cmake
@@ -0,0 +1,27 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libspatialindex/libspatialindex
+    REF 1.9.0
+    SHA512   368537e9bfe52db96486a1febfabe035f9f7714fd1cb50450e3ab89d51c5ffffb0e2ea219e08bee34f772ba9813a3a7f9e63d8b8946887ce83811ef68d17d1cc
+    HEAD_REF master
+	PATCHES
+        static.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+	OPTIONS -DCMAKE_DEBUG_POSTFIX=d -DSIDX_BUILD_TESTS:BOOL=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+#Debug
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libspatialindex)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libspatialindex/COPYING ${CURRENT_PACKAGES_DIR}/share/libspatialindex/copyright)
\ No newline at end of file
diff --git a/ports/libspatialindex/static.patch b/ports/libspatialindex/static.patch
new file mode 100644
index 000000000..bf783bcca
--- /dev/null
+++ b/ports/libspatialindex/static.patch
@@ -0,0 +1,21 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e6b733bd..8f227ab0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -194,9 +194,13 @@ if (NOT WITH_STATIC_LASZIP)
+ endif()
+ endif()
+ 
+-add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES})
+-
+-add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP})
++if(BUILD_SHARED_LIBS)
++	add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES})
++	add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP})
++else(BUILD_SHARED_LIBS)
++	add_library(${SIDX_LIB_NAME} STATIC ${SIDX_SOURCES})
++	add_library(${SIDX_C_LIB_NAME} STATIC ${SIDX_CAPI_CPP})
++endif(BUILD_SHARED_LIBS)
+ 
+ target_link_libraries(${SIDX_C_LIB_NAME}
+   ${SIDX_LIB_NAME}
diff --git a/ports/luajit/002-fix-build-path.patch b/ports/luajit/002-fix-build-path.patch
new file mode 100644
index 000000000..b97bf689f
--- /dev/null
+++ b/ports/luajit/002-fix-build-path.patch
@@ -0,0 +1,124 @@
+diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
+index 6f64a49..ba77cd5 100644
+--- a/src/msvcbuild.bat
++++ b/src/msvcbuild.bat
+@@ -14,17 +14,18 @@
+ @if not defined INCLUDE goto :FAIL
+ 
+ @setlocal
+-@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
++@set SOURCEDIR=%1
++@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR%
+ @set LJLINK=link /nologo
+ @set LJMT=mt /nologo
+ @set LJLIB=lib /nologo /nodefaultlib
+-@set DASMDIR=..\dynasm
++@set DASMDIR=%SOURCEDIR%\..\dynasm
+ @set DASM=%DASMDIR%\dynasm.lua
+ @set LJDLLNAME=lua51.dll
+ @set LJLIBNAME=lua51.lib
+-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
++@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c
+ 
+-%LJCOMPILE% host\minilua.c
++%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /out:minilua.exe minilua.obj
+ @if errorlevel 1 goto :BAD
+@@ -38,10 +39,10 @@ if exist minilua.exe.manifest^
+ @set DASMFLAGS=-D WIN -D JIT -D FFI
+ @set LJARCH=x86
+ :X64
+-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc
++minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %SOURCEDIR%\vm_x86.dasc
+ @if errorlevel 1 goto :BAD
+ 
+-%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c
++%LJCOMPILE% /I "." /I %DASMDIR% %SOURCEDIR%\host\buildvm*.c /Fdbuildvm.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /out:buildvm.exe buildvm*.obj
+ @if errorlevel 1 goto :BAD
+@@ -50,30 +51,30 @@ if exist buildvm.exe.manifest^
+ 
+ buildvm -m peobj -o lj_vm.obj
+ @if errorlevel 1 goto :BAD
+-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
++buildvm -m bcdef -o %SOURCEDIR%\lj_bcdef.h %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
++buildvm -m ffdef -o %SOURCEDIR%\lj_ffdef.h %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
++buildvm -m libdef -o %SOURCEDIR%\lj_libdef.h %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
++buildvm -m recdef -o %SOURCEDIR%\lj_recdef.h %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
++buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
++buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c
+ @if errorlevel 1 goto :BAD
+ 
+-@if "%1" neq "debug" goto :NODEBUG
++@set LJLINK=%LJLINK% /debug
++@if "%2" neq "debug" goto :NODEBUG
+ @shift
+ @set LJCOMPILE=%LJCOMPILE% /Zi
+-@set LJLINK=%LJLINK% /debug
+ @set DEBUG=1
+ :NODEBUG
+-@if "%1"=="amalg" goto :AMALGDLL
+-@if "%1"=="static" goto :STATIC
++@if "%2"=="amalg" goto :AMALGDLL
++@if "%2"=="static" goto :STATIC
+ @if "%DEBUG%"=="1" set LJCOMPILE=%LJCOMPILE% /MDd
+ @if "%DEBUG%"=="" set LJCOMPILE=%LJCOMPILE% /MD
+-%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
++%LJCOMPILE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
+ @if errorlevel 1 goto :BAD
+@@ -81,13 +82,13 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ :STATIC
+ @if "%DEBUG%"=="1" set LJCOMPILE=%LJCOMPILE% /MTd
+ @if "%DEBUG%"=="" set LJCOMPILE=%LJCOMPILE% /MT
+-%LJCOMPILE% lj_*.c lib_*.c
++%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c  /Fdlua51.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
+ @if errorlevel 1 goto :BAD
+ @goto :MTDLL
+ :AMALGDLL
+-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
++%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\ljamalg.c
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
+ @if errorlevel 1 goto :BAD
+@@ -95,7 +96,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ if exist %LJDLLNAME%.manifest^
+   %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
+ 
+-%LJCOMPILE% luajit.c
++%LJCOMPILE% %SOURCEDIR%\luajit.c  /Fdluajit.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
+ @if errorlevel 1 goto :BAD
+@@ -103,8 +104,8 @@ if exist luajit.exe.manifest^
+   %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
+ 
+ @del *.obj *.manifest minilua.exe buildvm.exe
+-@del host\buildvm_arch.h
+-@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
++@del %SOURCEDIR%\host\buildvm_arch.h
++@del %SOURCEDIR%\lj_bcdef.h %SOURCEDIR%\lj_ffdef.h %SOURCEDIR%\lj_libdef.h %SOURCEDIR%\lj_recdef.h %SOURCEDIR%\lj_folddef.h
+ @echo.
+ @echo === Successfully built LuaJIT for Windows/%LJARCH% ===
+ 
+@@ -117,4 +118,5 @@ if exist luajit.exe.manifest^
+ @goto :END
+ :FAIL
+ @echo You must open a "Visual Studio .NET Command Prompt" to run this script
++exit 1
+ :END
diff --git a/ports/luajit/CONTROL b/ports/luajit/CONTROL
index fb9c9d646..9b02c5b2b 100644
--- a/ports/luajit/CONTROL
+++ b/ports/luajit/CONTROL
@@ -1,4 +1,4 @@
 Source: luajit

-Version: 2.0.5-1

+Version: 2.0.5-2

 Homepage: https://github.com/LuaJIT/LuaJIT

 Description: LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.

diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake
index 326929d17..dff84bfcb 100644
--- a/ports/luajit/portfile.cmake
+++ b/ports/luajit/portfile.cmake
@@ -4,82 +4,72 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "LuaJIT currently only supports being built for desktop")

 endif()

 

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/LuaJIT-2.0.5)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO LuaJIT/LuaJIT

     REF v2.0.5

     SHA512 65d982d7fe532a61335613f414f3b8fa5333747bdf7aefc2c2d52022d227594ade827639049b97e3c4ffae9f38f32cb15f1a17b1780fb0a943e1a3af05e2b576

     HEAD_REF master

+    PATCHES

+        001-fixStaticBuild.patch

+        002-fix-build-path.patch

 )

 

-# Handle copyright

-file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/luajit)

-

-set (SRC ${SOURCE_PATH}/src)

-

 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

 	set (LJIT_STATIC "")

 else()

 	set (LJIT_STATIC "static")

 endif()

 

-vcpkg_apply_patches(

-    SOURCE_PATH ${SOURCE_PATH}

-    PATCHES 

-        ${CMAKE_CURRENT_LIST_DIR}/001-fixStaticBuild.patch

-)

-

-message(STATUS "Building ${TARGET_TRIPLET}-dbg")

-

-file(REMOVE "${SRC}/*.dll")

-file(REMOVE "${SRC}/*.exe")

-file(REMOVE "${SRC}/*.lib")

-

-vcpkg_execute_required_process_repeat(

-    COUNT 1

-    COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" debug ${LJIT_STATIC}

-    WORKING_DIRECTORY "${SOURCE_PATH}/src/"

-    LOGNAME build-${TARGET_TRIPLET}-dbg

-)

-

-file(INSTALL ${SRC}/luajit.exe 			DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools)

-file(INSTALL ${SRC}/lua51.lib 		    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

-

-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

-	file(INSTALL ${SRC}/lua51.dll 		DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)

+if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL debug)

+    message(STATUS "Building ${TARGET_TRIPLET}-dbg")

+    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")

+    file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")

+    

+    vcpkg_execute_required_process_repeat(

+        COUNT 1

+        COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src debug ${LJIT_STATIC}

+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"

+        LOGNAME build-${TARGET_TRIPLET}-dbg

+    )

+    

+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools)

+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

+    

+    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

+        file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)

+    endif()

+    vcpkg_copy_pdbs()

 endif()

-vcpkg_copy_pdbs()

 

-file(REMOVE "${SRC}/*.dll")

-file(REMOVE "${SRC}/*.exe")

-file(REMOVE "${SRC}/*.lib")

 

-message(STATUS "Building ${TARGET_TRIPLET}-rel")

-

-vcpkg_execute_required_process_repeat(d8un

-    COUNT 1

-    COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${LJIT_STATIC}

-    WORKING_DIRECTORY "${SOURCE_PATH}/src/"

-    LOGNAME build-${TARGET_TRIPLET}-rel

-)

-

-file(INSTALL ${SRC}/luajit.exe 		    DESTINATION ${CURRENT_PACKAGES_DIR}/tools)

-file(INSTALL ${SRC}/lua51.lib 		    DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

-

-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

-	file(INSTALL ${SRC}/lua51.dll   	DESTINATION ${CURRENT_PACKAGES_DIR}/bin)

+if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL release)

+    message(STATUS "Building ${TARGET_TRIPLET}-rel")

+    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")

+    file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")

+    

+    vcpkg_execute_required_process_repeat(d8un

+        COUNT 1

+        COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${LJIT_STATIC}

+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"

+        LOGNAME build-${TARGET_TRIPLET}-rel

+    )

+    

+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)

+    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

+    

+    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

+        file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)

+    endif()

+    vcpkg_copy_pdbs()

 endif()

-vcpkg_copy_pdbs()

 

-file(INSTALL ${SRC}/lua.h 			    DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit)

-file(INSTALL ${SRC}/luajit.h 	    	DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit)

-file(INSTALL ${SRC}/luaconf.h 		    DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit)

-file(INSTALL ${SRC}/lualib.h 		    DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit)

-file(INSTALL ${SRC}/lauxlib.h 		    DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit)

-file(INSTALL ${SRC}/lua.hpp 		    DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit)

+file(INSTALL ${SOURCE_PATH}/src/lua.h 			    DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})

+file(INSTALL ${SOURCE_PATH}/src/luajit.h 	    	DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})

+file(INSTALL ${SOURCE_PATH}/src/luaconf.h 		    DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})

+file(INSTALL ${SOURCE_PATH}/src/lualib.h 		    DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})

+file(INSTALL ${SOURCE_PATH}/src/lauxlib.h 		    DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})

+file(INSTALL ${SOURCE_PATH}/src/lua.hpp 		    DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})

 

-file(REMOVE "${SRC}/*.dll")

-file(REMOVE "${SRC}/*.exe")

-file(REMOVE "${SRC}/*.lib")

+# Handle copyright

+file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
\ No newline at end of file
diff --git a/ports/nanort/CONTROL b/ports/nanort/CONTROL
new file mode 100644
index 000000000..a9938434f
--- /dev/null
+++ b/ports/nanort/CONTROL
@@ -0,0 +1,4 @@
+Source: nanort
+Version: 2019-08-20
+Description: Single header only modern ray tracing kernel
+Homepage: https://github.com/lighttransport/nanort
diff --git a/ports/nanort/portfile.cmake b/ports/nanort/portfile.cmake
new file mode 100644
index 000000000..49197523e
--- /dev/null
+++ b/ports/nanort/portfile.cmake
@@ -0,0 +1,47 @@
+# Single header only library
+
+include(vcpkg_common_functions)
+
+function(shorten_ref REF SHORTENED_REF)
+    set(REF_MAX_LENGTH 10)
+    string(LENGTH ${REF} REF_LENGTH)
+    math(EXPR FROM_REF ${REF_LENGTH}-${REF_MAX_LENGTH})
+    if(FROM_REF LESS 0)
+        set(FROM_REF 0)
+    endif()
+    string(SUBSTRING ${REF} ${FROM_REF} ${REF_LENGTH} SUB_REF)
+    set(${SHORTENED_REF} ${SUB_REF} PARENT_SCOPE)
+endfunction()
+
+set(SOURCE_VERSION c85fe7a10be5baf8242c81288718c244f25d0183)
+shorten_ref(${SOURCE_VERSION} SHORTED_VERSION)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lighttransport-nanort-${SHORTED_VERSION})
+
+file(MAKE_DIRECTORY ${SOURCE_PATH})
+
+# See ports/nlohmann-json/portfile.cmake
+function(download_src SUBPATH SHA512)
+    vcpkg_download_distfile(
+        FILE
+        URLS "https://raw.githubusercontent.com/lighttransport/nanort/master/${SUBPATH}"
+        FILENAME "lighttransport-nanort-${SHORTED_VERSION}/${SUBPATH}"
+        SHA512 ${SHA512}
+    )
+    get_filename_component(SUBPATH_DIR "${SOURCE_PATH}/${SUBPATH}" DIRECTORY)
+    file(COPY ${FILE} DESTINATION ${SUBPATH_DIR})
+endfunction()
+
+download_src(
+    nanort.h
+    3e1f6f5fa295ebc472e37daf106c3871873f0bea4e3175cd4042b5649f581a90bfb9f2db989fa1994c82a2de78e40ecbcafd188b68bf10b5983a41b48e53dcbc
+)
+
+download_src(
+    LICENSE
+    454b304dcfae816d7a569ccbe29cc9c4bd68aa7ac41467bfa33b39aaf5be4620df5aeb6989319aaa04f305c053c068559b39c7a38c0bee1d4f194b2bc1aac240
+)
+
+file(COPY ${SOURCE_PATH}/nanort.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
index 94ae8654e..30d1fae48 100644
--- a/ports/openimageio/CONTROL
+++ b/ports/openimageio/CONTROL
@@ -1,5 +1,5 @@
 Source: openimageio
-Version: 2019-08-08-1
+Version: 2019-08-08-2
 Homepage: https://github.com/OpenImageIO/oiio
 Description: A library for reading and writing images, and a bunch of related classes, utilities, and application
 Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace
diff --git a/ports/openimageio/fix_find_openexr.patch b/ports/openimageio/fix_find_openexr.patch
new file mode 100644
index 000000000..a2014f3d8
--- /dev/null
+++ b/ports/openimageio/fix_find_openexr.patch
@@ -0,0 +1,48 @@
+diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake
+index babfffd..8e79925 100644
+--- a/src/cmake/modules/FindOpenEXR.cmake
++++ b/src/cmake/modules/FindOpenEXR.cmake
+@@ -118,24 +118,25 @@ endif ()
+ # headers, we do two finds -- first for custom locations, then for default.
+ # This is complicated because the OpenEXR libraries may or may not be
+ # built with version numbers embedded.
+-set (_openexr_components IlmThread IlmImf Imath Iex Half)
+-foreach (COMPONENT ${_openexr_components})
+-    string (TOUPPER ${COMPONENT} UPPERCOMPONENT)
+-    # First try with the version embedded
+-    set (FULL_COMPONENT_NAME ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
+-    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
+-                  PATHS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
+-                        ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
+-    # Again, with no directory restrictions
+-    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
+-    # Try again without the version
+-    set (FULL_COMPONENT_NAME ${COMPONENT})
+-    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
+-                  PATHS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
+-                        ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
+-    # One more time, with no restrictions
+-    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
+-endforeach ()
++find_library(ILMTHREAD_LIBRARY_RELEASE NAMES IlmThread-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
++find_library(ILMTHREAD_LIBRARY_DEBUG NAMES IlmThread-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d)
++select_library_configurations(ILMTHREAD)
++
++find_library(OPENEXR_ILMIMF_LIBRARY_RELEASE NAMES IlmImf-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
++find_library(OPENEXR_ILMIMF_LIBRARY_DEBUG NAMES IlmImf-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d)
++select_library_configurations(OPENEXR_ILMIMF)
++
++find_library(OPENEXR_IMATH_LIBRARY_RELEASE NAMES Imath-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
++find_library(OPENEXR_IMATH_LIBRARY_DEBUG NAMES Imath-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d)
++select_library_configurations(OPENEXR_IMATH)
++
++find_library(OPENEXR_IEX_LIBRARY_RELEASE NAMES Iex-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
++find_library(OPENEXR_IEX_LIBRARY_DEBUG NAMES Iex-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d)
++select_library_configurations(OPENEXR_IEX)
++
++find_library(OPENEXR_HALF_LIBRARY_RELEASE NAMES Half-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
++find_library(OPENEXR_HALF_LIBRARY_DEBUG NAMES Half-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d)
++select_library_configurations(OPENEXR_HALF)
+ 
+ # Set the FOUND, INCLUDE_DIR, and LIBRARIES variables.
+ if (ILMBASE_INCLUDE_PATH AND OPENEXR_INCLUDE_PATH AND
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index 7284d58b8..09ac52960 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
         fix_libraw.patch
         use-webp.patch
         remove_wrong_dependency.patch
+        fix_find_openexr.patch
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
diff --git a/ports/paho-mqttpp3/CONTROL b/ports/paho-mqttpp3/CONTROL
index 7e3391668..1656c094d 100644
--- a/ports/paho-mqttpp3/CONTROL
+++ b/ports/paho-mqttpp3/CONTROL
@@ -1,5 +1,5 @@
 Source: paho-mqttpp3
-Version: 1.0.1-1
+Version: 1.0.1-2
 Description: Paho project provides open-source C++ wrapper for Paho C library
 Build-Depends: paho-mqtt
 Default-Features: ssl
diff --git a/ports/paho-mqttpp3/fix-include-path.patch b/ports/paho-mqttpp3/fix-include-path.patch
new file mode 100644
index 000000000..5b7297dd2
--- /dev/null
+++ b/ports/paho-mqttpp3/fix-include-path.patch
@@ -0,0 +1,182 @@
+diff --git a/src/mqtt/async_client.h b/src/mqtt/async_client.h

+index 2754690..019c81b 100644

+--- a/src/mqtt/async_client.h

++++ b/src/mqtt/async_client.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_async_client_h

+ #define __mqtt_async_client_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/types.h"

+ #include "mqtt/token.h"

+ #include "mqtt/string_collection.h"

+diff --git a/src/mqtt/callback.h b/src/mqtt/callback.h

+index 6cac442..13585de 100644

+--- a/src/mqtt/callback.h

++++ b/src/mqtt/callback.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_callback_h

+ #define __mqtt_callback_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/delivery_token.h"

+ #include "mqtt/types.h"

+ #include <vector>

+diff --git a/src/mqtt/connect_options.h b/src/mqtt/connect_options.h

+index a7cdf56..adb52fb 100644

+--- a/src/mqtt/connect_options.h

++++ b/src/mqtt/connect_options.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_connect_options_h

+ #define __mqtt_connect_options_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/types.h"

+ #include "mqtt/message.h"

+ #include "mqtt/topic.h"

+diff --git a/src/mqtt/delivery_token.h b/src/mqtt/delivery_token.h

+index 3ecf70b..16c47bb 100644

+--- a/src/mqtt/delivery_token.h

++++ b/src/mqtt/delivery_token.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_delivery_token_h

+ #define __mqtt_delivery_token_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/token.h"

+ #include "mqtt/message.h"

+ #include <memory>

+diff --git a/src/mqtt/disconnect_options.h b/src/mqtt/disconnect_options.h

+index 81b74ad..2f8c824 100644

+--- a/src/mqtt/disconnect_options.h

++++ b/src/mqtt/disconnect_options.h

+@@ -23,7 +23,7 @@

+ #ifndef __mqtt_disconnect_options_h

+ #define __mqtt_disconnect_options_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/token.h"

+ #include <chrono>

+ 

+diff --git a/src/mqtt/exception.h b/src/mqtt/exception.h

+index 775589f..77f4821 100644

+--- a/src/mqtt/exception.h

++++ b/src/mqtt/exception.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_exception_h

+ #define __mqtt_exception_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/types.h"

+ #include <vector>

+ #include <memory>

+diff --git a/src/mqtt/iaction_listener.h b/src/mqtt/iaction_listener.h

+index 1e34577..2af8c1b 100644

+--- a/src/mqtt/iaction_listener.h

++++ b/src/mqtt/iaction_listener.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_iaction_listener_h

+ #define __mqtt_iaction_listener_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/types.h"

+ #include <vector>

+ 

+diff --git a/src/mqtt/iclient_persistence.h b/src/mqtt/iclient_persistence.h

+index 852ec8e..aa721bc 100644

+--- a/src/mqtt/iclient_persistence.h

++++ b/src/mqtt/iclient_persistence.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_iclient_persistence_h

+ #define __mqtt_iclient_persistence_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/types.h"

+ #include "mqtt/buffer_view.h"

+ #include "mqtt/string_collection.h"

+diff --git a/src/mqtt/message.h b/src/mqtt/message.h

+index feb3b97..bdab5d8 100644

+--- a/src/mqtt/message.h

++++ b/src/mqtt/message.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_message_h

+ #define __mqtt_message_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/buffer_ref.h"

+ #include "mqtt/exception.h"

+ #include <memory>

+diff --git a/src/mqtt/response_options.h b/src/mqtt/response_options.h

+index 6fc727f..dca2013 100644

+--- a/src/mqtt/response_options.h

++++ b/src/mqtt/response_options.h

+@@ -7,7 +7,7 @@

+ #ifndef __mqtt_response_options_h

+ #define __mqtt_response_options_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/token.h"

+ #include "mqtt/delivery_token.h"

+ 

+diff --git a/src/mqtt/ssl_options.h b/src/mqtt/ssl_options.h

+index ca2f847..64a3afc 100644

+--- a/src/mqtt/ssl_options.h

++++ b/src/mqtt/ssl_options.h

+@@ -25,7 +25,7 @@

+ #ifndef __mqtt_ssl_options_h

+ #define __mqtt_ssl_options_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/message.h"

+ #include "mqtt/topic.h"

+ #include "mqtt/types.h"

+diff --git a/src/mqtt/token.h b/src/mqtt/token.h

+index 0db8196..e4fe10e 100644

+--- a/src/mqtt/token.h

++++ b/src/mqtt/token.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_token_h

+ #define __mqtt_token_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/iaction_listener.h"

+ #include "mqtt/exception.h"

+ #include "mqtt/types.h"

+diff --git a/src/mqtt/topic.h b/src/mqtt/topic.h

+index f68005a..61e53f0 100644

+--- a/src/mqtt/topic.h

++++ b/src/mqtt/topic.h

+@@ -24,7 +24,7 @@

+ #ifndef __mqtt_topic_h

+ #define __mqtt_topic_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/delivery_token.h"

+ #include "mqtt/message.h"

+ #include "mqtt/types.h"

+diff --git a/src/mqtt/will_options.h b/src/mqtt/will_options.h

+index bffb9e0..d7eca10 100644

+--- a/src/mqtt/will_options.h

++++ b/src/mqtt/will_options.h

+@@ -25,7 +25,7 @@

+ #ifndef __mqtt_will_options_h

+ #define __mqtt_will_options_h

+ 

+-#include "MQTTAsync.h"

++#include "paho-mqtt/MQTTAsync.h"

+ #include "mqtt/types.h"

+ #include "mqtt/message.h"

+ #include "mqtt/topic.h"

diff --git a/ports/paho-mqttpp3/portfile.cmake b/ports/paho-mqttpp3/portfile.cmake
index f91177ac0..97633e0ea 100644
--- a/ports/paho-mqttpp3/portfile.cmake
+++ b/ports/paho-mqttpp3/portfile.cmake
@@ -7,6 +7,8 @@ vcpkg_from_github(
   REF v1.0.1
   SHA512 be612197fae387b9f1d8f10944d451ec9e7ebec6045beed365e642089c0a5fde882ed5c734f2b46a5008f98b8445a51114492f0f36fdc684b8a8fe4b71fe31a4
   HEAD_REF master
+  PATCHES
+    fix-include-path.patch  
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS 
@@ -24,7 +26,7 @@ else()
 endif()
 
 # Setting the include path where MqttClient.h is present
-set(PAHO_C_INC "${CURRENT_INSTALLED_DIR}/include/paho-mqtt")
+set(PAHO_C_INC "${CURRENT_INSTALLED_DIR}/include")
 
 # Set the generator to Ninja
 set(PAHO_CMAKE_GENERATOR "Ninja")
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index 0f6bdeafd..03fcaa8b0 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5
-Version: 5.12.3
+Version: 5.12.3-1
 Homepage: https://www.qt.io/
 Description: Qt5 Application Framework
 Build-Depends: qt5-3d, qt5-activeqt (windows), 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/qtkeychain/CONTROL b/ports/qtkeychain/CONTROL
new file mode 100644
index 000000000..d054322cf
--- /dev/null
+++ b/ports/qtkeychain/CONTROL
@@ -0,0 +1,4 @@
+Source: qtkeychain

+Version: v0.9.1
+Description:  qtkeychain - Platform-independent Qt API for storing passwords securely

+Build-Depends: qt5-base, qt5-tools
\ No newline at end of file
diff --git a/ports/qtkeychain/portfile.cmake b/ports/qtkeychain/portfile.cmake
new file mode 100644
index 000000000..5bbe14d89
--- /dev/null
+++ b/ports/qtkeychain/portfile.cmake
@@ -0,0 +1,43 @@
+include(vcpkg_common_functions)

+

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO frankosterfeld/qtkeychain

+    REF v0.9.1

+    SHA512    c80bd25a5b72c175d0d4a985b952924c807bf67be33eeb89e2b83757727e642c10d8d737cea9744d2faad74c50c1b55d82b306135559c35c91a088c3b198b33a

+    HEAD_REF master

+)

+

+list(APPEND QTKEYCHAIN_OPTIONS -DCMAKE_DEBUG_POSTFIX=d)

+list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TEST_APPLICATION:BOOL=OFF)

+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

+    list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=ON)

+else()

+    list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=OFF)

+endif()

+

+if (CMAKE_HOST_WIN32)

+    list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=ON)

+else()

+    list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=OFF)

+endif()

+

+vcpkg_configure_cmake(

+    SOURCE_PATH ${SOURCE_PATH}

+	OPTIONS ${QTKEYCHAIN_OPTIONS}

+)

+

+vcpkg_install_cmake()

+

+vcpkg_copy_pdbs()

+

+# Remove unneeded dirs

+file(REMOVE_RECURSE 

+	${CURRENT_PACKAGES_DIR}/debug/include

+	${CURRENT_PACKAGES_DIR}/debug/lib/cmake

+	${CURRENT_PACKAGES_DIR}/lib/cmake

+)

+

+# Handle copyright

+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/qtkeychain)

+file(RENAME ${CURRENT_PACKAGES_DIR}/share/qtkeychain/COPYING ${CURRENT_PACKAGES_DIR}/share/qtkeychain/copyright)

diff --git a/ports/sparsehash/00001-windows-use-std.patch b/ports/sparsehash/00001-windows-use-std.patch
new file mode 100644
index 000000000..69d1966f8
--- /dev/null
+++ b/ports/sparsehash/00001-windows-use-std.patch
@@ -0,0 +1,17 @@
+diff --git a/src/windows/sparsehash/internal/sparseconfig.h b/src/windows/sparsehash/internal/sparseconfig.h
+index 3091559..f96e08c 100644
+--- a/src/windows/sparsehash/internal/sparseconfig.h
++++ b/src/windows/sparsehash/internal/sparseconfig.h
+@@ -7,10 +7,10 @@
+ #define GOOGLE_NAMESPACE  ::google
+ 
+ /* the location of the header defining hash functions */
+-#define HASH_FUN_H  <hash_map>
++#define HASH_FUN_H  <unordered_map>
+ 
+ /* the namespace of the hash<> function */
+-#define HASH_NAMESPACE  stdext
++#define HASH_NAMESPACE  std
+ 
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
diff --git a/ports/sparsehash/CONTROL b/ports/sparsehash/CONTROL
new file mode 100644
index 000000000..04c1d756b
--- /dev/null
+++ b/ports/sparsehash/CONTROL
@@ -0,0 +1,4 @@
+Source: sparsehash
+Version: 2.0.3
+Homepage: https://github.com/sparsehash/sparsehash
+Description: The sparsehash package consists of two hashtable implementations: sparse, which is designed to be very space efficient, and dense, which is designed to be very time efficient.
diff --git a/ports/sparsehash/Config.cmake.in b/ports/sparsehash/Config.cmake.in
new file mode 100644
index 000000000..07739ddb6
--- /dev/null
+++ b/ports/sparsehash/Config.cmake.in
@@ -0,0 +1,10 @@
+
+get_filename_component(_sparsehash_root "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_sparsehash_root "${_sparsehash_root}" PATH)
+get_filename_component(_sparsehash_root "${_sparsehash_root}" PATH)
+
+add_library(sparsehash::sparsehash INTERFACE IMPORTED)
+set_target_properties(sparsehash::sparsehash 
+	PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_sparsehash_root}/include")
+
+unset(_sparsehash_root)
diff --git a/ports/sparsehash/portfile.cmake b/ports/sparsehash/portfile.cmake
new file mode 100644
index 000000000..1dcccda82
--- /dev/null
+++ b/ports/sparsehash/portfile.cmake
@@ -0,0 +1,41 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO sparsehash/sparsehash
+    REF sparsehash-2.0.3
+    SHA512 bb00d0acb8eba65f7da8015ea4f6bebf8bba36ed6777881960ee215f22b7be17b069c59838d210551ce67a34baccfc7b2fed603677ec53c0c32714d8e76f5d6c
+    HEAD_REF master
+    PATCHES 00001-windows-use-std.patch
+)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+
+	file(COPY ${SOURCE_PATH}/src/google DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+	file(COPY ${SOURCE_PATH}/src/sparsehash DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+	file(COPY ${SOURCE_PATH}/src/windows/sparsehash/internal/sparseconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/sparsehash/internal)
+
+else()
+
+	vcpkg_execute_required_process(
+		COMMAND ${SOURCE_PATH}/configure ${OPTIONS} --prefix=${CURRENT_PACKAGES_DIR}
+		WORKING_DIRECTORY ${SOURCE_PATH}
+		LOGNAME configure-${TARGET_TRIPLET}
+	)
+
+	vcpkg_execute_required_process(
+		COMMAND make -j ${VCPKG_CONCURRENCY} install
+		WORKING_DIRECTORY ${SOURCE_PATH}
+		LOGNAME install-${TARGET_TRIPLET}
+	)
+
+endif()
+
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in 
+    ${CURRENT_PACKAGES_DIR}/share/sparsehash/sparsehash-config.cmake 
+    @ONLY
+)
+
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/sparsehash/copyright COPYONLY)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/sparsehash)
diff --git a/ports/sparsehash/usage b/ports/sparsehash/usage
new file mode 100644
index 000000000..5222b2402
--- /dev/null
+++ b/ports/sparsehash/usage
@@ -0,0 +1,4 @@
+The package sparsehash provides CMake targets:
+
+    find_package(sparsehash CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE sparsehash::sparsehash)
diff --git a/ports/tensorflow-cc/CONTROL b/ports/tensorflow-cc/CONTROL
new file mode 100644
index 000000000..05e336e53
--- /dev/null
+++ b/ports/tensorflow-cc/CONTROL
@@ -0,0 +1,4 @@
+Source: tensorflow-cc
+Version: 1.14
+Description: Library for computation using data flow graphs for scalable machine learning
+Build-Depends: c-ares
diff --git a/ports/tensorflow-cc/TensorflowCCConfig.cmake b/ports/tensorflow-cc/TensorflowCCConfig.cmake
new file mode 100644
index 000000000..db12811d5
--- /dev/null
+++ b/ports/tensorflow-cc/TensorflowCCConfig.cmake
@@ -0,0 +1,28 @@
+set(tensorflow_cc_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../include")
+
+message(WARNING "Tensorflow has vendored dependencies. You may need to manually include files from tensorflow-external")
+set(tensorflow_cc_INCLUDE_DIRS
+	${tensorflow_cc_INCLUDE_DIR}
+	${tensorflow_cc_INCLUDE_DIR}/tensorflow-external/
+	${tensorflow_cc_INCLUDE_DIR}/tensorflow-external/tensorflow/
+	${tensorflow_cc_INCLUDE_DIR}/tensorflow-external/external/com_google_absl
+	${tensorflow_cc_INCLUDE_DIR}/tensorflow-external/bazel-out/k8-opt/bin/
+	${tensorflow_cc_INCLUDE_DIR}/tensorflow-external/external/protobuf_archive/src/
+)
+
+add_library(tensorflow_cc::tensorflow_framework SHARED IMPORTED)
+set_target_properties(tensorflow_cc::tensorflow_framework 
+	PROPERTIES
+	IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/../../lib/libtensorflow_framework.so.1.14.0
+	INTERFACE_INCLUDE_DIRECTORIES "${tensorflow_cc_INCLUDE_DIRS}"
+)
+
+add_library(tensorflow_cc::tensorflow_cc SHARED IMPORTED)
+set_target_properties(tensorflow_cc::tensorflow_cc
+	PROPERTIES 
+	IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/../../lib/libtensorflow_cc.so.1.14.0
+	INTERFACE_INCLUDE_DIRECTORIES "${tensorflow_cc_INCLUDE_DIRS}"
+)
+
+set(tensorflow_cc_FOUND TRUE)
+set(tensorflow_framework_FOUND TRUE)
\ No newline at end of file
diff --git a/ports/tensorflow-cc/file-exists.patch b/ports/tensorflow-cc/file-exists.patch
new file mode 100644
index 000000000..8cefb4828
--- /dev/null
+++ b/ports/tensorflow-cc/file-exists.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.py b/configure.py

+index 43af22d..7989b1f 100644

+--- a/configure.py

++++ b/configure.py

+@@ -183,7 +183,7 @@ def get_python_path(environ_cp, python_bin_path):

+ 

+   paths = []

+   for path in all_paths:

+-    if os.path.isdir(path):

++    if os.path.isdir(path) or True:

+       paths.append(path)

+   return paths

+ 

diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake
new file mode 100644
index 000000000..0e40f859b
--- /dev/null
+++ b/ports/tensorflow-cc/portfile.cmake
@@ -0,0 +1,116 @@
+include(vcpkg_common_functions)
+
+message(WARNING "This tensorflow port currently is experimental on Windows and Linux platforms.")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO tensorflow/tensorflow
+    REF v1.14.0
+    SHA512 ac9ea5a2d1c761aaafbdc335259e29c128127b8d069ec5b206067935180490aa95e93c7e13de57f7f54ce4ba4f34a822face22b4a028f60185edb380e5cd4787
+    HEAD_REF master
+    PATCHES
+        file-exists.patch # required or otherwise it cant find python lib path on windows
+)
+
+# due to https://github.com/bazelbuild/bazel/issues/8028, bazel must be version 25.0 or higher
+vcpkg_find_acquire_program(BAZEL)
+get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY)
+vcpkg_add_to_path(PREPEND ${BAZEL_DIR})
+set(ENV{BAZEL_BIN_PATH} "${BAZEL}")
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path(PREPEND ${PYTHON3_DIR})
+set(ENV{PYTHON_BIN_PATH} "${PYTHON3}")
+
+function(tensorflow_try_remove_recurse_wait PATH_TO_REMOVE)
+    file(REMOVE_RECURSE ${PATH_TO_REMOVE})
+    if (EXISTS "${PATH_TO_REMOVE}")
+        execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5)
+        file(REMOVE_RECURSE ${PATH_TO_REMOVE})
+    endif()
+endfunction()
+
+# we currently only support the release version
+tensorflow_try_remove_recurse_wait(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+file(GLOB SOURCES ${SOURCE_PATH}/*)
+file(COPY ${SOURCES} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+
+if(CMAKE_HOST_WIN32)
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES unzip patch diffutils git)
+    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+    set(ENV{BAZEL_SH} ${MSYS_ROOT}/usr/bin/bash.exe)
+
+    set(ENV{BAZEL_VS} $ENV{VSInstallDir})
+    set(ENV{BAZEL_VC} $ENV{VCInstallDir})
+endif()
+
+# tensorflow has long file names, which will not work on windows
+set(ENV{TEST_TMPDIR} ${CURRENT_BUILDTREES_DIR}/../.bzl)
+
+set(ENV{USE_DEFAULT_PYTHON_LIB_PATH} 1)
+set(ENV{TF_NEED_KAFKA} 0)
+set(ENV{TF_NEED_OPENCL_SYCL} 0)
+set(ENV{TF_NEED_AWS} 0)
+set(ENV{TF_NEED_GCP} 0)
+set(ENV{TF_NEED_HDFS} 0)
+set(ENV{TF_NEED_S3} 0)
+set(ENV{TF_ENABLE_XLA} 0)
+set(ENV{TF_NEED_GDR} 0)
+set(ENV{TF_NEED_VERBS} 0)
+set(ENV{TF_NEED_OPENCL} 0)
+set(ENV{TF_NEED_MPI} 0)
+set(ENV{TF_NEED_TENSORRT} 0)
+set(ENV{TF_NEED_NGRAPH} 0)
+set(ENV{TF_NEED_IGNITE} 0)
+set(ENV{TF_NEED_ROCM} 0)
+set(ENV{TF_SET_ANDROID_WORKSPACE} 0)
+set(ENV{TF_DOWNLOAD_CLANG} 0)
+set(ENV{TF_NCCL_VERSION} 2.3)
+set(ENV{NCCL_INSTALL_PATH} "")
+set(ENV{CC_OPT_FLAGS} "/arch:AVX")
+set(ENV{TF_NEED_CUDA} 0)
+
+message(STATUS "Configuring TensorFlow")
+
+vcpkg_execute_required_process(
+    COMMAND ${PYTHON3} ${SOURCE_PATH}/configure.py
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+    LOGNAME config-${TARGET_TRIPLET}-rel
+)
+message(STATUS "Warning: Building TensorFlow can take an hour or more.")
+
+if(CMAKE_HOST_WIN32)
+    vcpkg_execute_build_process(
+        COMMAND ${BASH} --noprofile --norc -c "${BAZEL} build --verbose_failures -c opt --python_path=${PYTHON3} --incompatible_disable_deprecated_attr_params=false --define=no_tensorflow_py_deps=true ///tensorflow:libtensorflow_cc.so ///tensorflow:install_headers"
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+        LOGNAME build-${TARGET_TRIPLET}-rel
+    )
+else()
+    vcpkg_execute_build_process(
+        COMMAND ${BAZEL} build --verbose_failures -c opt --python_path=${PYTHON3} --incompatible_disable_deprecated_attr_params=false --define=no_tensorflow_py_deps=true //tensorflow:libtensorflow_cc.so //tensorflow:install_headers
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+        LOGNAME build-${TARGET_TRIPLET}-rel
+    )
+endif()
+
+file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-genfiles/tensorflow/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/tensorflow-external)
+
+if(CMAKE_HOST_WIN32)
+    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0.if.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0.if.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+else()
+    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/libtensorflow_framework.so.1.14.0 DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/libtensorflow_cc.so.1.14.0 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/libtensorflow_framework.so.1.14.0 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+endif()
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/LICENSE ${CURRENT_PACKAGES_DIR}/share/tensorflow-cc/copyright)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/TensorflowCCConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-tensorflow-cc)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/unofficial-tensorflow-cc/TensorflowCCConfig.cmake ${CURRENT_PACKAGES_DIR}/share/unofficial-tensorflow-cc/unofficial-tensorflow-cc-config.cmake)
\ No newline at end of file
diff --git a/ports/umock-c/CONTROL b/ports/umock-c/CONTROL
index 108a1dfd1..a757dfc84 100644
--- a/ports/umock-c/CONTROL
+++ b/ports/umock-c/CONTROL
@@ -1,5 +1,5 @@
 Source: umock-c
-Version: 2019-05-16.1
+Version: 2019-08-20.1
 Description: A pure C mocking library
 Build-Depends: azure-macro-utils-c
 
diff --git a/ports/umock-c/portfile.cmake b/ports/umock-c/portfile.cmake
index 0b30e8942..84cd91332 100644
--- a/ports/umock-c/portfile.cmake
+++ b/ports/umock-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/umock-c
-    REF 92772d9d8317a37dd0b656e95877ffb03bc67e92
-    SHA512 4dd738c7b2c7e1237ad874a7ad90bf81b864aa242af335dcc82d0cfea51bc33fe84de4eebedb6e00944c70d01d1ade4827716dbcf95754165b35981bde4147e7
+    REF 1b2b14e9f45536894fe516b6dbb380b0507d779a
+    SHA512 4933408296a1e1095be967a434bc9572411e38b78592606c40f51a2e651ee105f4761f888e8db36dd579539c4ebc07c9ae28cd1ff8ef0b720ce9b01a23e8861d
     HEAD_REF master
 )
 
diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake
index ec444c858..108ceaac6 100644
--- a/scripts/cmake/vcpkg_common_definitions.cmake
+++ b/scripts/cmake/vcpkg_common_definitions.cmake
@@ -1,62 +1,66 @@
-## # vcpkg_common_definitions

-##

-## File contains helpful variabls for portfiles which are commonly needed or used.

-##

-## ## The following variables are available:

-## ```cmake

-## VCPKG_TARGET_IS_<target>                 with <target> being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD. only defined if <target>

-## VCPKG_HOST_PATH_SEPARATOR                Host specific path separator

-## VCPKG_HOST_PATH_SEPARATOR_ESCAPED        Escaped version of VCPKG_HOST_PATH_SEPARATOR if necessary (e.g. symbol with special meaning in cmake like ";")

-## VCPKG_TARGET_STATIC_LIBRARY_PREFIX       static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX)

-## VCPKG_TARGET_STATIC_LIBRARY_SUFFIX       static library suffix for target (same as CMAKE_STATIC_LIBRARY_SUFFIX)

-## VCPKG_TARGET_SHARED_LIBRARY_PREFIX       shared library prefix for target (same as CMAKE_SHARED_LIBRARY_PREFIX)

-## VCPKG_TARGET_SHARED_LIBRARY_SUFFIX       shared library suffix for target (same as CMAKE_SHARED_LIBRARY_SUFFIX)

-## ```

-## 

-## CMAKE_STATIC_LIBRARY_PREFIX, CMAKE_STATIC_LIBRARY_SUFFIX, CMAKE_SHARED_LIBRARY_PREFIX, CMAKE_SHARED_LIBRARY_SUFFIX are defined for the target so that 

-## portfiles are able to use find_library calls to discover dependent libraries within the current triplet for ports. 

-##

-

-#Helper variable to identify the Target system. VCPKG_TARGET_IS_<targetname>

-if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

-    set(VCPKG_TARGET_IS_WINDOWS 1)

-    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

-        set(VCPKG_TARGET_IS_UWP 1)

-    endif()

-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")

-    set(VCPKG_TARGET_IS_OSX 1)

-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")

-    set(VCPKG_TARGET_IS_LINUX 1)

-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android")

-    set(VCPKG_TARGET_IS_ANDROID 1)

-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")

-    set(VCPKG_TARGET_IS_FREEBSD 1)

-endif()

-

-#Helper variable to identify the host path separator. 

-if(CMAKE_HOST_WIN32)

-    set(VCPKG_HOST_PATH_SEPARATOR ";")

-    set(VCPKG_HOST_PATH_SEPARATOR_ESCAPED "\\;") #sometimes needed to differentiate between the cmake list separator

-elseif(CMAKE_HOST_UNIX)

-    set(VCPKG_HOST_PATH_SEPARATOR ":")

-    set(VCPKG_HOST_PATH_SEPARATOR_ESCAPED ":")

-endif()

-

-#Helper variables for libraries 

-if(VCPKG_TARGET_IS_WINDOWS)

-    set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".lib")

-    set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dll")

-    set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "")

-    set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "")

-else()

-    set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a")

-    set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".so")

-    set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "lib")

-    set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "lib")

-endif()

-#Setting these variables allows find_library to work in script mode and thus in portfiles!

-#This allows us scale down on hardcoded target dependent paths in portfiles

-set(CMAKE_STATIC_LIBRARY_SUFFIX ${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX})

-set(CMAKE_SHARED_LIBRARY_SUFFIX ${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX})

-set(CMAKE_STATIC_LIBRARY_PREFIX ${VCPKG_TARGET_STATIC_LIBRARY_PREFIX})

-set(CMAKE_SHARED_LIBRARY_PREFIX ${VCPKG_TARGET_SHARED_LIBRARY_PREFIX})

+## # vcpkg_common_definitions
+##
+## File contains helpful variabls for portfiles which are commonly needed or used.
+##
+## ## The following variables are available:
+## ```cmake
+## VCPKG_TARGET_IS_<target>                 with <target> being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD. only defined if <target>
+## VCPKG_HOST_PATH_SEPARATOR                Host specific path separator
+## VCPKG_HOST_PATH_SEPARATOR_ESCAPED        Escaped version of VCPKG_HOST_PATH_SEPARATOR if necessary (e.g. symbol with special meaning in cmake like ";")
+## VCPKG_TARGET_STATIC_LIBRARY_PREFIX       static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX)
+## VCPKG_TARGET_STATIC_LIBRARY_SUFFIX       static library suffix for target (same as CMAKE_STATIC_LIBRARY_SUFFIX)
+## VCPKG_TARGET_SHARED_LIBRARY_PREFIX       shared library prefix for target (same as CMAKE_SHARED_LIBRARY_PREFIX)
+## VCPKG_TARGET_SHARED_LIBRARY_SUFFIX       shared library suffix for target (same as CMAKE_SHARED_LIBRARY_SUFFIX)
+## ```
+## 
+## CMAKE_STATIC_LIBRARY_PREFIX, CMAKE_STATIC_LIBRARY_SUFFIX, CMAKE_SHARED_LIBRARY_PREFIX, CMAKE_SHARED_LIBRARY_SUFFIX are defined for the target so that 
+## portfiles are able to use find_library calls to discover dependent libraries within the current triplet for ports. 
+##
+
+#Helper variable to identify the Target system. VCPKG_TARGET_IS_<targetname>
+if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(VCPKG_TARGET_IS_WINDOWS 1)
+    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+        set(VCPKG_TARGET_IS_UWP 1)
+    endif()
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(VCPKG_TARGET_IS_OSX 1)
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(VCPKG_TARGET_IS_LINUX 1)
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android")
+    set(VCPKG_TARGET_IS_ANDROID 1)
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    set(VCPKG_TARGET_IS_FREEBSD 1)
+endif()
+
+#Helper variable to identify the host path separator. 
+if(CMAKE_HOST_WIN32)
+    set(VCPKG_HOST_PATH_SEPARATOR ";")
+    set(VCPKG_HOST_PATH_SEPARATOR_ESCAPED "\\;") #sometimes needed to differentiate between the cmake list separator
+elseif(CMAKE_HOST_UNIX)
+    set(VCPKG_HOST_PATH_SEPARATOR ":")
+    set(VCPKG_HOST_PATH_SEPARATOR_ESCAPED ":")
+endif()
+
+#Helper variables for libraries 
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".lib")
+    set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dll")
+    set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "")
+    set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "")
+else()
+    set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a")
+    set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".so")
+    set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "lib")
+    set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "lib")
+endif()
+#Setting these variables allows find_library to work in script mode and thus in portfiles!
+#This allows us scale down on hardcoded target dependent paths in portfiles
+set(CMAKE_STATIC_LIBRARY_SUFFIX ${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX})
+set(CMAKE_SHARED_LIBRARY_SUFFIX ${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX})
+set(CMAKE_STATIC_LIBRARY_PREFIX ${VCPKG_TARGET_STATIC_LIBRARY_PREFIX})
+set(CMAKE_SHARED_LIBRARY_PREFIX ${VCPKG_TARGET_SHARED_LIBRARY_PREFIX})
+set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_STATIC_LIBRARY_SUFFIX};${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") # Required by find_library
+set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_STATIC_LIBRARY_PREFIX};${CMAKE_SHARED_LIBRARY_PREFIX}" CACHE INTERNAL "") # Required by find_library
+
+
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 84ebdbfa8..fed016c7b 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -45,6 +45,7 @@ function(vcpkg_find_acquire_program VAR)
   unset(_vfa_RENAME)
   unset(SUBDIR)
   unset(REQUIRED_INTERPRETER)
+  unset(_vfa_SUPPORTED)
   unset(POST_INSTALL_COMMAND)
 
   vcpkg_get_program_files_platform_bitness(PROGRAM_FILES_PLATFORM_BITNESS)
@@ -231,6 +232,23 @@ function(vcpkg_find_acquire_program VAR)
     set(URL "http://doxygen.nl/files/doxygen-1.8.15.windows.bin.zip")
     set(ARCHIVE "doxygen-1.8.15.windows.bin.zip")
     set(HASH 89482dcb1863d381d47812c985593e736d703931d49994e09c7c03ef67e064115d0222b8de1563a7930404c9bc2d3be323f3d13a01ef18861be584db3d5a953c)
+  elseif(VAR MATCHES "BAZEL")
+    set(PROGNAME bazel)
+    set(BAZEL_VERSION 0.25.2)
+    set(SUBDIR ${BAZEL_VERSION})
+    set(PATHS ${DOWNLOADS}/tools/bazel/${SUBDIR})
+    set(_vfa_RENAME "bazel")
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+      set(_vfa_SUPPORTED ON)
+      set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-x86_64")
+      set(ARCHIVE "bazel-${BAZEL_VERSION}-linux-x86_64")
+      set(NOEXTRACT ON)
+      set(HASH db4a583cf2996aeb29fd008261b12fe39a4a5faf0fbf96f7124e6d3ffeccf6d9655d391378e68dd0915bc91c9e146a51fd9661963743857ca25179547feceab1)
+    else()
+      set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.zip") 
+      set(ARCHIVE "bazel-${BAZEL_VERSION}-windows-x86_64.zip")
+      set(HASH 6482f99a0896f55ef65739e7b53452fd9c0adf597b599d0022a5e0c5fa4374f4a958d46f98e8ba25af4b065adacc578bfedced483d8c169ea5cb1777a99eea53)
+    endif()
   # Download Tools
   elseif(VAR MATCHES "ARIA2")
     set(PROGNAME aria2c)
@@ -254,7 +272,7 @@ function(vcpkg_find_acquire_program VAR)
 
   do_find()
   if("${${VAR}}" MATCHES "-NOTFOUND")
-    if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" AND NOT _vfa_SUPPORTED)
       set(EXAMPLE ".")
       if(DEFINED BREW_PACKAGE_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
         set(EXAMPLE ":\n    brew install ${BREW_PACKAGE_NAME}")
@@ -274,9 +292,9 @@ function(vcpkg_find_acquire_program VAR)
     file(MAKE_DIRECTORY ${PROG_PATH_SUBDIR})
     if(DEFINED NOEXTRACT)
       if(DEFINED _vfa_RENAME)
-        file(INSTALL ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} RENAME ${_vfa_RENAME})
+        file(INSTALL ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} RENAME ${_vfa_RENAME} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
       else()
-        file(COPY ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR})
+        file(COPY ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
       endif()
     else()
       get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} EXT)
diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake
index 0457cee9b..3b0b9fbef 100644
--- a/scripts/get_triplet_environment.cmake
+++ b/scripts/get_triplet_environment.cmake
@@ -1,6 +1,6 @@
 include(${CMAKE_TRIPLET_FILE})
-if (DEFINED CMAKE_ENV_OVERRIDES_FILE)
-    include(${CMAKE_ENV_OVERRIDES_FILE} OPTIONAL)
+if (DEFINED VCPKG_ENV_OVERRIDES_FILE)
+    include(${VCPKG_ENV_OVERRIDES_FILE})
 endif()
 
 # GUID used as a flag - "cut here line"
diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index 86b2719d5..7130825e2 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -67,7 +67,16 @@ if(CMD MATCHES "^BUILD$")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR})
 
     include(${CMAKE_TRIPLET_FILE})
-    include(${ENV_OVERRIDES_FILE} OPTIONAL)
+
+    if (DEFINED VCPKG_ENV_OVERRIDES_FILE)
+        include(${VCPKG_ENV_OVERRIDES_FILE})
+    endif()
+
+    if (DEFINED VCPKG_PORT_TOOLCHAINS)
+        foreach(VCPKG_PORT_TOOLCHAIN ${VCPKG_PORT_TOOLCHAINS})
+            include(${VCPKG_PORT_TOOLCHAIN})
+        endforeach()
+    endif()
 
     set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE})
     include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_definitions.cmake)
diff --git a/toolsrc/VERSION.txt b/toolsrc/VERSION.txt
index 0342c24ab..43464a247 100644
--- a/toolsrc/VERSION.txt
+++ b/toolsrc/VERSION.txt
@@ -1 +1 @@
-"2019.07.19"
+"2019.08.16"
diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h
index 40022a012..3d32e3aa8 100644
--- a/toolsrc/include/vcpkg/base/util.h
+++ b/toolsrc/include/vcpkg/base/util.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <algorithm>
+#include <functional>
 #include <map>
 #include <mutex>
 #include <type_traits>
@@ -121,21 +122,23 @@ namespace vcpkg::Util
         }
     }
 
-    template<class Range>
-    void sort(Range& cont)
+    template<class Range, class Comp = std::less<typename Range::value_type>>
+    void sort(Range& cont, Comp comp = Comp())
     {
         using std::begin;
         using std::end;
-        std::sort(begin(cont), end(cont));
+        std::sort(begin(cont), end(cont), comp);
     }
 
     template<class Range>
-    void sort_unique_erase(Range& cont)
+    Range&& sort_unique_erase(Range&& cont)
     {
         using std::begin;
         using std::end;
         std::sort(begin(cont), end(cont));
         cont.erase(std::unique(begin(cont), end(cont)), end(cont));
+
+        return std::forward<Range>(cont);
     }
 
     template<class Range1, class Range2>
diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index cd1821b32..4f6397662 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -270,6 +270,9 @@ namespace vcpkg::Build
         std::string key;
         std::string value;
 
+        AbiEntry() = default;
+        AbiEntry(const std::string& key, const std::string& value) : key(key), value(value) {}
+
         bool operator<(const AbiEntry& other) const
         {
             return key < other.key || (key == other.key && value < other.value);
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index 2114b7415..aeb01b27d 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -311,8 +311,8 @@ namespace vcpkg::Build
                                                          const std::set<std::string>& feature_list,

                                                          const Triplet& triplet)

     {

-        return Util::fmap(get_dependencies(scf, feature_list, triplet),

-                          [&](const Features& feat) { return feat.name; });

+        return Util::sort_unique_erase(

+            Util::fmap(get_dependencies(scf, feature_list, triplet), [&](const Features& feat) { return feat.name; }));

     }

 

     static std::vector<FeatureSpec> compute_required_feature_specs(const BuildPackageConfig& config,

@@ -397,7 +397,6 @@ namespace vcpkg::Build
             {"CURRENT_PORT_DIR", config.port_dir},

             {"TARGET_TRIPLET", triplet.canonical_name()},

             {"TARGET_TRIPLET_FILE", paths.get_triplet_file_path(triplet).u8string()},

-            {"ENV_OVERRIDES_FILE", config.port_dir / "environment-overrides.cmake"},

             {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},

             {"VCPKG_USE_HEAD_VERSION", Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},

             {"DOWNLOADS", paths.downloads},

@@ -413,6 +412,33 @@ namespace vcpkg::Build
             variables.push_back({"GIT", git_exe_path});

         }

 

+        const Files::Filesystem& fs = paths.get_filesystem();

+        if (fs.is_regular_file(config.port_dir / "environment-overrides.cmake"))

+        {

+            variables.emplace_back("VCPKG_ENV_OVERRIDES_FILE", config.port_dir / "environment-overrides.cmake");

+        }

+

+        std::vector<FeatureSpec> dependencies =

+            filter_dependencies_to_specs(config.scfl.source_control_file->core_paragraph->depends, triplet);

+

+        std::vector<std::string> port_toolchains;

+        for (const FeatureSpec& dependency : dependencies)

+        {

+            const fs::path port_toolchain_path = paths.installed / dependency.triplet().canonical_name() / "share" /

+                                                 dependency.spec().name() / "port-toolchain.cmake";

+

+            if (fs.is_regular_file(port_toolchain_path))

+            {

+                System::print2(port_toolchain_path.u8string());

+                port_toolchains.emplace_back(port_toolchain_path.u8string());

+            }

+        }

+

+        if (!port_toolchains.empty())

+        {

+            variables.emplace_back("VCPKG_PORT_TOOLCHAINS", Strings::join(";", port_toolchains));

+        }

+

         return variables;

     }

 

@@ -620,58 +646,53 @@ namespace vcpkg::Build
         const int max_port_file_count = 100;

 

         // the order of recursive_directory_iterator is undefined so save the names to sort

-        std::vector<std::pair<std::string, std::string>> hashes_files;

+        std::vector<AbiEntry> port_files;

         for (auto& port_file : fs::stdfs::recursive_directory_iterator(config.port_dir))

         {

             if (fs::is_regular_file(fs.status(VCPKG_LINE_INFO, port_file)))

             {

-                hashes_files.emplace_back(vcpkg::Hash::get_file_hash(fs, port_file, "SHA1"),

-                                          port_file.path().filename().u8string());

+                port_files.emplace_back(port_file.path().filename().u8string(),

+                                        vcpkg::Hash::get_file_hash(fs, port_file, "SHA1"));

 

-                if (hashes_files.size() > max_port_file_count)

+                if (port_files.size() > max_port_file_count)

                 {

-                    abi_tag_entries.emplace_back(AbiEntry{"no_hash_max_portfile", ""});

+                    abi_tag_entries.emplace_back("no_hash_max_portfile", "");

                     break;

                 }

             }

         }

 

-        if (hashes_files.size() <= max_port_file_count)

+        if (port_files.size() <= max_port_file_count)

         {

-            Util::sort(hashes_files);

+            Util::sort(port_files, [](const AbiEntry& l, const AbiEntry& r) {

+                return l.value < r.value || (l.value == r.value && l.key < r.key);

+            });

 

-            for (auto& hash_file : hashes_files)

-            {

-                // We've already sorted by hash so it's safe to write down the

-                // filename, which will be consistent across machines.

-                abi_tag_entries.emplace_back(AbiEntry{std::move(hash_file.second), std::move(hash_file.first)});

-            }

+            std::move(port_files.begin(), port_files.end(), std::back_inserter(abi_tag_entries));

         }

 

-        abi_tag_entries.emplace_back(AbiEntry{"cmake", paths.get_tool_version(Tools::CMAKE)});

+        abi_tag_entries.emplace_back("cmake", paths.get_tool_version(Tools::CMAKE));

 

 #if defined(_WIN32)

-        abi_tag_entries.emplace_back(AbiEntry{"powershell", paths.get_tool_version("powershell-core")});

+        abi_tag_entries.emplace_back("powershell", paths.get_tool_version("powershell-core"));

 #endif

 

-        abi_tag_entries.emplace_back(AbiEntry{

+        abi_tag_entries.emplace_back(

             "vcpkg_fixup_cmake_targets",

-            vcpkg::Hash::get_file_hash(fs, paths.scripts / "cmake" / "vcpkg_fixup_cmake_targets.cmake", "SHA1")});

-

-        abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag});

+            vcpkg::Hash::get_file_hash(fs, paths.scripts / "cmake" / "vcpkg_fixup_cmake_targets.cmake", "SHA1"));

 

-        const std::string features = Strings::join(";", config.feature_list);

-        abi_tag_entries.emplace_back(AbiEntry{"features", features});

+        abi_tag_entries.emplace_back("triplet", pre_build_info.triplet_abi_tag);

+        abi_tag_entries.emplace_back("features", Strings::join(";", config.feature_list));

 

         if (pre_build_info.public_abi_override)

         {

-            abi_tag_entries.emplace_back(AbiEntry{

+            abi_tag_entries.emplace_back(

                 "public_abi_override",

-                Hash::get_string_hash(pre_build_info.public_abi_override.value_or_exit(VCPKG_LINE_INFO), "SHA1")});

+                Hash::get_string_hash(pre_build_info.public_abi_override.value_or_exit(VCPKG_LINE_INFO), "SHA1"));

         }

 

         if (config.build_package_options.use_head_version == UseHeadVersion::YES)

-            abi_tag_entries.emplace_back(AbiEntry{"head", ""});

+            abi_tag_entries.emplace_back("head", "");

 

         const std::string full_abi_info =

             Strings::join("", abi_tag_entries, [](const AbiEntry& p) { return p.key + " " + p.value + "\n"; });

@@ -765,6 +786,7 @@ namespace vcpkg::Build
         const std::string& name = config.scf.core_paragraph->name;

 

         std::vector<FeatureSpec> required_fspecs = compute_required_feature_specs(config, status_db);

+        std::vector<FeatureSpec> required_fspecs_copy = required_fspecs;

 

         // extract out the actual package ids

         auto dep_pspecs = Util::fmap(required_fspecs, [](FeatureSpec const& fspec) { return fspec.spec(); });

@@ -1027,8 +1049,12 @@ namespace vcpkg::Build
 

         if (port)

         {

-            args.emplace_back("CMAKE_ENV_OVERRIDES_FILE",

-                              port.value_or_exit(VCPKG_LINE_INFO).source_location / "environment-overrides.cmake");

+            const SourceControlFileLocation& scfl = port.value_or_exit(VCPKG_LINE_INFO);

+

+            if (paths.get_filesystem().is_regular_file(scfl.source_location / "environment-overrides.cmake"))

+            {

+                args.emplace_back("VCPKG_ENV_OVERRIDES_FILE", scfl.source_location / "environment-overrides.cmake");

+            }

         }

 

         const auto cmd_launch_cmake = System::make_cmake_cmd(cmake_exe_path, ports_cmake_script_path, args);

diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp
index ab14934a2..7c3f2df4c 100644
--- a/toolsrc/src/vcpkg/dependencies.cpp
+++ b/toolsrc/src/vcpkg/dependencies.cpp
@@ -674,7 +674,7 @@ namespace vcpkg::Dependencies
         }
 
         // The feature was not previously installed. Mark the cluster
-        //(aka the entire port) to be removed before re-adding it.
+        // (aka the entire port) to be removed before re-adding it.
         mark_minus(cluster, graph, graph_plan, prevent_default_features);
 
         return follow_plus_dependencies(feature, cluster, graph, graph_plan, prevent_default_features);
diff --git a/toolsrc/src/vcpkg/parse.cpp b/toolsrc/src/vcpkg/parse.cpp
index 9c9968249..0509339c5 100644
--- a/toolsrc/src/vcpkg/parse.cpp
+++ b/toolsrc/src/vcpkg/parse.cpp
@@ -66,7 +66,7 @@ namespace vcpkg::Parse
 
             // skip comma and space
             ++pos;
-            if (str[pos] == ' ')
+            while (str[pos] == ' ')
             {
                 ++pos;
             }