Merge branch 'master' into multi_line_depends

2025-06-07 14:22:54 +08:00 · 2019-08-23 11:18:34 -07:00 · 2019-08-23 11:18:34 -07:00 · bd4678610b
commit bd4678610b
parent 1245f1dbfc cf447c050c
141 changed files with 2974 additions and 383 deletions
--- 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
--- 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
 )

--- 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
--- 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
 )

--- 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

--- 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
    )
--- 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 

--- 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
    )
--- 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: 

--- 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
 )

--- 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

--- 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()
--- 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

--- 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()
--- 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

--- 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()
--- a/ports/basisu/CONTROL
+++ b/ports/basisu/CONTROL
@ -1,5 +1,6 @@
 Source: basisu
-Version: 0.0.1-1
+Version: 1.11-1
 Homepage: https://github.com/BinomialLLC/basis_universal
 Description: Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats. 
-Build-Depends: lodepng
+Build-Depends: lodepng
+
--- a/ports/basisu/portfile.cmake
+++ b/ports/basisu/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO jherico/basis_universal
-    REF 11aa181a4bbf051475a01a1e73e39bf388819215
-    SHA512 62d7de6c6ca5e6235c8a377767389a7d5393e05bb5d0c024ce756e77d235132efa48280c9d529b6a91eddf0c906c3c84b6b78fdf339b1a47039b28d04161d2fe
+    REF d303a93f48606829378dd413142d5e1ea744021c
+    SHA512 aeb29f60904eb19840748a1d6b1b11cd61828362df06c8715d59c7c1556bcd5f78b962dd02bf738249277346a357d2d0f53e0432015eee74978416a1e7e68272
    HEAD_REF master
 )

--- 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
--- 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
 )

--- 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++
--- 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)
--- 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
--- 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})
--- a/ports/cryptopp/CONTROL
+++ b/ports/cryptopp/CONTROL
@ -1,4 +1,4 @@
 Source: cryptopp
-Version: 8.1.0-2
+Version: 8.2.0
 Homepage: https://github.com/weidai11/cryptopp
 Description: Crypto++ is a free C++ class library of cryptographic schemes.
--- a/ports/cryptopp/missing-flags.patch
+++ b/ports/cryptopp/missing-flags.patch
@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b49fff6..f753e75 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -639,6 +639,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
-       set_source_files_properties(${SRC_DIR}/simeck_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
-       set_source_files_properties(${SRC_DIR}/simon128_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
-       set_source_files_properties(${SRC_DIR}/speck128_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
-+      set_source_files_properties(${SRC_DIR}/keccak_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
-       if (CRYPTOPP_IA32_SSE41 AND NOT DISABLE_SSE4)
-         set_source_files_properties(${SRC_DIR}/blake2s_simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1")
-         set_source_files_properties(${SRC_DIR}/blake2b_simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1")
-@@ -648,6 +649,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
-       if (CRYPTOPP_IA32_SSE42 AND NOT DISABLE_SSE4)
-         set_source_files_properties(${SRC_DIR}/crc_simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.2")
-         if (CRYPTOPP_IA32_CLMUL AND NOT DISABLE_AES)
-+          set_source_files_properties(${SRC_DIR}/gf2n_simd.cpp PROPERTIES COMPILE_FLAGS "-mpclmul")
-           set_source_files_properties(${SRC_DIR}/gcm_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3 -mpclmul")
-         endif ()
-         if (CRYPTOPP_IA32_AES AND NOT DISABLE_AES)
--- a/ports/cryptopp/portfile.cmake
+++ b/ports/cryptopp/portfile.cmake
@ -5,20 +5,18 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
  OUT_SOURCE_PATH CMAKE_SOURCE_PATH
  REPO noloader/cryptopp-cmake
-  REF b97d72f083fefa249e46ae3c15a2c294e615fca2
-  SHA512 e6c65bb81a47009fa568c957beea65c37f2283bdc5afad6a45983f685c0b9c9c01ac4bb334d45dacbdc74f9d834b316c09cbb16d3ead7fb48737fbad76ff3f8d
+  REF 6d0666c457fbbf6f81819fd2b80f0cb5b6646593
+  SHA512 0341f14ce734afaee8bcc1db1716684f241499c692a5478c83a3df3fd2e5331cd04b2f4f51d43cce231ca1d9fbe76220639573c05ef06be0cf33081a1ef7ab30
  HEAD_REF master
  PATCHES
    cmake.patch
-    simon-speck.patch
-    missing-flags.patch
 )

 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO weidai11/cryptopp
-  REF CRYPTOPP_8_1_0
-  SHA512 2b09b30c53a8f95a9c3204a48867174c70a1e97171854122f4d8454b25d5af9b94cab2c210dd9857c7db66df881849183e82b6155b80bfef6e69dac8efd2ea9a
+  REF CRYPTOPP_8_2_0
+  SHA512 d2dcc107091d00800de243abdce8286ccd7fcc5707eebf88b97675456a021e62002e942b862db0465f72142951f631c0c1f0b2ba56028b96461780a17f2dfdf9
  HEAD_REF master
  PATCHES patch.patch
 )
--- a/ports/cryptopp/simon-speck.patch
+++ b/ports/cryptopp/simon-speck.patch
@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7d64977..4ec3ebd 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -497,6 +497,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
-       set_source_files_properties(${SRC_DIR}/simeck-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
-       set_source_files_properties(${SRC_DIR}/simon128-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
-       set_source_files_properties(${SRC_DIR}/speck128-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
-+      set_source_files_properties(${SRC_DIR}/simon-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
-+      set_source_files_properties(${SRC_DIR}/speck-simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
-       if (CRYPTOPP_IA32_SSE41 AND NOT DISABLE_SSE4)
-         set_source_files_properties(${SRC_DIR}/blake2-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1")
-         set_source_files_properties(${SRC_DIR}/simon64-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1")
--- 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
--- 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
--- 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
--- 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
 )

--- 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.
--- a/ports/eastl/fixchar8_t.patch
+++ b/ports/eastl/fixchar8_t.patch
@ -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()
- 
- 
--- 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
 )

--- 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
--- a/ports/embree3/fix-InstallPath.patch
+++ 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
--- 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
--- 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)
--- a/ports/fribidi/fix-win-static-suffix.patch
+++ 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,
--- 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(
--- a/ports/gtest/CONTROL
+++ b/ports/gtest/CONTROL
@ -1,4 +1,4 @@
 Source: gtest
-Version: 2019-08-14
+Version: 2019-08-14-1
 Homepage: https://github.com/google/googletest
 Description: GoogleTest and GoogleMock testing frameworks.
--- a/ports/gtest/fix-gmock-cmake.patch
+++ b/ports/gtest/fix-gmock-cmake.patch
@ -0,0 +1,30 @@
+diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
+index 9d135ff..0be8a22 100644
+--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
+@@ -66,6 +66,25 @@ endif()
+ # call it again here.
+ config_compiler_and_linker()  # from ${gtest_dir}/cmake/internal_utils.cmake
+ 
+# Create the CMake package file descriptors.
+if (INSTALL_GTEST)
+  include(CMakePackageConfigHelpers)
+  set(cmake_package_name GMock)
+  set(targets_export_name ${cmake_package_name}Targets CACHE INTERNAL "")
+  set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated" CACHE INTERNAL "")
+  set(cmake_files_install_dir "share/${cmake_package_name}")
+  set(version_file "${generated_dir}/${cmake_package_name}ConfigVersion.cmake")
+  write_basic_package_version_file(${version_file} COMPATIBILITY AnyNewerVersion)
+  install(EXPORT ${targets_export_name}
+    NAMESPACE ${cmake_package_name}::
+    DESTINATION ${cmake_files_install_dir})
+  set(config_file "${generated_dir}/${cmake_package_name}Config.cmake")
+  configure_package_config_file("${gtest_SOURCE_DIR}/cmake/Config.cmake.in"
+    "${config_file}" INSTALL_DESTINATION ${cmake_files_install_dir})
+  install(FILES ${version_file} ${config_file}
+    DESTINATION ${cmake_files_install_dir})
+endif()
+
+ # Adds Google Mock's and Google Test's header directories to the search path.
+ set(gmock_build_include_dirs
+   "${gmock_SOURCE_DIR}/include"
--- a/ports/gtest/fix-main-lib-path.patch
+++ b/ports/gtest/fix-main-lib-path.patch
@ -0,0 +1,68 @@
+diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
+index 3e72d75..9d135ff 100644
+--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
+@@ -115,7 +115,8 @@ endif()
+ ########################################################################
+ #
+ # Install rules
+-install_project(gmock gmock_main)
+install_project(gmock)
+install_project(gmock_main)
+ 
+ ########################################################################
+ #
+diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
+index e33718b..a049c2c 100644
+--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
+@@ -136,7 +136,8 @@ target_link_libraries(gtest_main PUBLIC gtest)
+ ########################################################################
+ #
+ # Install rules
+-install_project(gtest gtest_main)
+install_project(gtest)
+install_project(gtest_main)
+ 
+ ########################################################################
+ #
+diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
+index 69defc8..cf7295a 100644
+--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
+@@ -317,11 +317,15 @@ function(install_project)
+     install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
+       DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+     # Install the project targets.
+    set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR})
+    if (${ARGN} MATCHES "_main")
+      set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}/manual-link)
+    endif()
+     install(TARGETS ${ARGN}
+       EXPORT ${targets_export_name}
+       RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+-      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+      ARCHIVE DESTINATION "${LIB_INSTALL_DST}"
+      LIBRARY DESTINATION "${LIB_INSTALL_DST}")
+     if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+       # Install PDBs
+       foreach(t ${ARGN})
+@@ -330,7 +334,7 @@ function(install_project)
+         get_target_property(t_pdb_output_directory ${t} PDB_OUTPUT_DIRECTORY)
+         install(FILES
+           "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$<CONFIG:Debug>:${t_pdb_name_debug}>$<$<NOT:$<CONFIG:Debug>>:${t_pdb_name}>.pdb"
+-          DESTINATION ${CMAKE_INSTALL_LIBDIR}
+          DESTINATION ${LIB_INSTALL_DST}
+           OPTIONAL)
+       endforeach()
+     endif()
+@@ -340,7 +344,7 @@ function(install_project)
+       configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
+         "${configured_pc}" @ONLY)
+       install(FILES "${configured_pc}"
+-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+        DESTINATION "${LIB_INSTALL_DST}/pkgconfig")
+     endforeach()
+   endif()
+ endfunction()
--- a/ports/gtest/portfile.cmake
+++ b/ports/gtest/portfile.cmake
@ -11,7 +11,9 @@ vcpkg_from_github(
    SHA512 fc874a7977f11be58dc63993b520b4ae6ca43654fb5250c8b56df62a21f4dca8fcbdc81dfa106374b2bb7c59bc88952fbfc0e3ae4c7d63fdb502afbaeb39c822
    HEAD_REF master
    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-z7-override.patch
+        0002-Fix-z7-override.patch
+        fix-main-lib-path.patch
+        fix-gmock-cmake.patch
 )

 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT)
@ -28,6 +30,7 @@ vcpkg_configure_cmake(

 vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/GTest)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/GMock)

 file(
    INSTALL
@ -49,6 +52,12 @@ file(
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(INSTALL ${SOURCE_PATH}/googletest/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtest RENAME copyright)

+# Install gmock cmake files.
+file(GLOB GMOCK_CMAKE_FILES ${CURRENT_PACKAGES_DIR}/share/gtest/GMock*.cmake)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gmock)
+file(COPY ${GMOCK_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/gmock)
+file(REMOVE ${GMOCK_CMAKE_FILES})
+
 if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib)
    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib)
--- a/ports/gtest/usage
+++ b/ports/gtest/usage
@ -1,6 +1,11 @@
 The package gtest is compatible with built-in CMake targets:

    enable_testing()
+    
    find_package(GTest MODULE REQUIRED)
    target_link_libraries(main PRIVATE GTest::GTest GTest::Main)
+    
+    find_package(GMock CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE GMock::gmock GMock::gmock_main)
+    
    add_test(AllTestsInMain main)
--- a/ports/inih/CONTROL
+++ b/ports/inih/CONTROL
@ -1,3 +1,3 @@
 Source: inih
-Version: 44
+Version: 45
 Description: Simple .INI file parser
--- 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
 )

--- 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
--- 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(
--- 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 
--- 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
 )

--- a/ports/leptonica/CONTROL
+++ b/ports/leptonica/CONTROL
@ -1,5 +1,5 @@
 Source: leptonica
-Version: 1.78.0
+Version: 1.78.0-1
 Homepage: https://github.com/DanBloomberg/leptonica
 Description: An open source library containing software that is broadly useful for image processing and image analysis applications
-Build-Depends: libjpeg-turbo, zlib, libpng, tiff, giflib
+Build-Depends: libjpeg-turbo, zlib, libpng, tiff, giflib, libwebp
--- a/ports/leptonica/find-dependency.patch
+++ b/ports/leptonica/find-dependency.patch
@ -1,18 +1,19 @@
-diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in
-index d53904a..2aa2fea 100644
--- a/cmake/templates/LeptonicaConfig.cmake.in
-+++ b/cmake/templates/LeptonicaConfig.cmake.in
-@@ -20,6 +20,13 @@
- #
- # ===================================================================================
- 
-+include(CMakeFindDependencyMacro)
-+find_dependency(TIFF)
-+find_dependency(ZLIB)
-+find_dependency(PNG)
-+find_dependency(JPEG)
-+find_dependency(GIF)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake)
- 
- # ======================================================
+diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in
+index 4f7527a..c6759d1 100644
+--- a/cmake/templates/LeptonicaConfig.cmake.in
+++ b/cmake/templates/LeptonicaConfig.cmake.in
+@@ -20,6 +20,14 @@
+ #
+ # ===================================================================================
+ 
+include(CMakeFindDependencyMacro)
+find_dependency(TIFF)
+find_dependency(ZLIB)
+find_dependency(PNG)
+find_dependency(JPEG)
+find_dependency(GIF)
+find_dependency(WebP)
+
+ include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake)
+ 
+ # ======================================================
--- a/ports/leptonica/fix-find-libwebp.patch
+++ b/ports/leptonica/fix-find-libwebp.patch
@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index debc232..2aa2d3a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -60,8 +60,7 @@ if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.cppan)
+     endif()
+     if(NOT WEBP)
+         message(STATUS "Looking for WEBP")
+-        find_path(WEBP_INCLUDE_DIR /webp/decode.h)
+-        find_library(WEBP_LIBRARY NAMES webp)
+        find_package(WebP CONFIG REQUIRED)
+         if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY)
+             set(WEBP 1)
+             set(WEBP_FOUND TRUE)
--- a/ports/leptonica/portfile.cmake
+++ b/ports/leptonica/portfile.cmake
@ -3,13 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO DanBloomberg/leptonica
-    REF 87b8219360bca3c9929a5705c3d9c50c42c34bca
+    REF 87b8219360bca3c9929a5705c3d9c50c42c34bca #1.78.0
    SHA512 b7bfa9437be7e3d9276acacf8f62ccda1cd8f88741ada5106ef0232d4965617be2c5d0b8a6b4462896a1a0b6b44d9ecefd6e6b8d0e50d4fb881bdf5e821703a4
    HEAD_REF master
    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch
-        ${CMAKE_CURRENT_LIST_DIR}/use-tiff-libraries.patch
-        ${CMAKE_CURRENT_LIST_DIR}/find-dependency.patch
+        fix-cmakelists.patch
+        use-tiff-libraries.patch
+        find-dependency.patch
+        fix-find-libwebp.patch
 )

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC)
@ -29,9 +30,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 vcpkg_copy_pdbs()

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)

 # Handle copyright
-file(COPY ${SOURCE_PATH}/leptonica-license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/leptonica)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/leptonica/leptonica-license.txt ${CURRENT_PACKAGES_DIR}/share/leptonica/copyright)
+file(COPY ${SOURCE_PATH}/leptonica-license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/leptonica-license.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
--- 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++
--- 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
 )

--- 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)
--- 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
 )
--- a/ports/libmodbus/CMakeLists.txt
+++ b/ports/libmodbus/CMakeLists.txt
@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(libmodbus VERSION 3.1.4)
+project(libmodbus VERSION 3.1.6)

 set(LIBMODBUS_VERSION ${PROJECT_VERSION})
 set(LIBMODBUS_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
--- a/ports/libmodbus/CONTROL
+++ b/ports/libmodbus/CONTROL
@ -1,3 +1,3 @@
 Source: libmodbus
-Version: 3.1.4-3
+Version: 3.1.6
 Description: libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol
--- a/ports/libmodbus/portfile.cmake
+++ b/ports/libmodbus/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO stephane/libmodbus
-  REF v3.1.4
-  SHA512 dc13b680a13ae2c952fe23cfe257a92a2be4823005b71b87e9520a3676df220b749d04c0825b1d1da02ac8b6995315e5cda2c8fd68e4672dd60e0b3fe739728b
+  REF v3.1.6
+  SHA512 9eaa395c75e1170e703e01f8c52c6e6e87efe4eaa22adfc3b51153fd5535d545aea35cf68e1aba29720a6c1dd13d9c60b6b08a5c8098dccd13ccfdc6944420a9
  HEAD_REF master
 )

--- a/ports/libspatialindex/CONTROL
+++ 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
+
--- a/ports/libspatialindex/portfile.cmake
+++ 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)
--- a/ports/libspatialindex/static.patch
+++ 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}
--- a/ports/luajit/002-fix-build-path.patch
+++ 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
--- 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.
--- 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})
--- a/ports/lz4/CONTROL
+++ b/ports/lz4/CONTROL
@ -1,5 +1,5 @@
 Source: lz4
-Version: 1.9.1-2
+Version: 1.9.2
 Homepage: https://github.com/lz4/lz4
 Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
 Build-Depends: xxhash
--- a/ports/lz4/portfile.cmake
+++ b/ports/lz4/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO lz4/lz4
-    REF v1.9.1
-    SHA512 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e
+    REF v1.9.2
+    SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
    HEAD_REF dev
 )

--- a/ports/mp3lame/00001-msvc-upgrade-solution-up-to-vc11.patch
+++ b/ports/mp3lame/00001-msvc-upgrade-solution-up-to-vc11.patch
--- a/ports/mp3lame/CONTROL
+++ b/ports/mp3lame/CONTROL
@ -0,0 +1,4 @@
+Source: mp3lame
+Version: 3.100
+Homepage: http://lame.sourceforge.net/
+Description: LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.
--- a/ports/mp3lame/Config.cmake.in
+++ b/ports/mp3lame/Config.cmake.in
@ -0,0 +1,60 @@
+
+get_filename_component(_mp3lame_root "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_mp3lame_root "${_mp3lame_root}" PATH)
+get_filename_component(_mp3lame_root "${_mp3lame_root}" PATH)
+
+set(_mp3lame_rel_lib "${_mp3lame_root}/lib/@MP3LAME_LIB@")
+set(_mp3lame_dbg_lib "${_mp3lame_root}/debug/lib/@MP3LAME_LIB@")
+
+if (EXISTS "${_mp3lame_rel_lib}" OR EXISTS "${_mp3lame_dbg_lib}")
+
+    add_library(mp3lame::mp3lame UNKNOWN IMPORTED)
+    set_target_properties(mp3lame::mp3lame 
+        PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_mp3lame_root}/include")
+
+    if (EXISTS "${_mp3lame_rel_lib}")
+        set_target_properties(mp3lame::mp3lame 
+            PROPERTIES IMPORTED_LOCATION_RELEASE "${_mp3lame_rel_lib}")
+        set_property(TARGET mp3lame::mp3lame APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+    endif()
+    if (EXISTS "${_mp3lame_dbg_lib}")
+        set_target_properties(mp3lame::mp3lame 
+            PROPERTIES IMPORTED_LOCATION_DEBUG "${_mp3lame_dbg_lib}")
+        set_property(TARGET mp3lame::mp3lame APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+    endif()
+
+    set(_mp3lame_mpghip_rel_lib "${_mp3lame_root}/lib/libmpghip-static.lib")
+    set(_mp3lame_mpghip_dbg_lib "${_mp3lame_root}/debug/lib/libmpghip-static.lib")
+
+    if (EXISTS "${_mp3lame_mpghip_rel_lib}" OR EXISTS "${_mp3lame_mpghip_dbg_lib}")
+
+        add_library(mp3lame::mpghip UNKNOWN IMPORTED)
+
+        if (EXISTS "${_mp3lame_rel_lib}")
+            set_target_properties(mp3lame::mpghip 
+                PROPERTIES IMPORTED_LOCATION_RELEASE "${_mp3lame_mpghip_rel_lib}")
+            set_property(TARGET mp3lame::mpghip APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+        endif()
+        if (EXISTS "${_mp3lame_dbg_lib}")
+            set_target_properties(mp3lame::mpghip 
+                PROPERTIES IMPORTED_LOCATION_DEBUG "${_mp3lame_mpghip_dbg_lib}")
+            set_property(TARGET mp3lame::mpghip APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+        endif()
+
+        set_target_properties(mp3lame::mp3lame PROPERTIES INTERFACE_LINK_LIBRARIES mp3lame::mpghip)
+        
+    endif()
+
+    unset(_mp3lame_mpghip_rel_lib)
+    unset(_mp3lame_mpghip_dbg_lib)
+
+else()
+
+    set(mp3lame_FOUND FALSE)
+
+endif()
+
+unset(_mp3lame_rel_lib)
+unset(_mp3lame_dbg_lib)
+
+unset(_mp3lame_root)
--- a/ports/mp3lame/portfile.cmake
+++ b/ports/mp3lame/portfile.cmake
@ -0,0 +1,152 @@
+include(vcpkg_common_functions)
+
+set(VERSION 3.100)
+
+vcpkg_download_distfile(ARCHIVE_FILE
+    URLS "https://downloads.sourceforge.net/project/lame/lame/${VERSION}/lame-${VERSION}.tar.gz"
+    FILENAME "lame-3.100.tar.gz"
+    SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE_FILE}
+    REF ${VERSION}
+    PATCHES 00001-msvc-upgrade-solution-up-to-vc11.patch
+)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+
+	if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+		set(platform "ARM64")
+		set(machine "ARM64")
+	elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+		set(platform "ARM")
+		set(machine "ARM")
+	elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+		set(platform "x64")
+		set(machine "x64")
+	else()
+		set(platform "Win32")
+		set(machine "x86")
+	endif()
+
+	file(READ "${SOURCE_PATH}/vc_solution/vc11_lame.sln" sln_con)
+	string(REPLACE "|Win32" "|${platform}" sln_con "${sln_con}")
+	string(REPLACE "\"vc11_" "\"${machine}_vc11_" sln_con "${sln_con}")
+	file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_vc11_lame.sln" "${sln_con}")
+
+    
+    file(GLOB vcxprojs RELATIVE "${SOURCE_PATH}/vc_solution" "${SOURCE_PATH}/vc_solution/vc11_*.vcxproj")
+    foreach(vcxproj ${vcxprojs})
+        file(READ "${SOURCE_PATH}/vc_solution/${vcxproj}" vcxproj_con)
+        
+        if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+            string(REPLACE "DLL</RuntimeLibrary>" "</RuntimeLibrary>" vcxproj_con "${vcxproj_con}")
+        endif()
+
+		string(REPLACE "/machine:x86" "/machine:${machine}" vcxproj_con "${vcxproj_con}")
+		string(REPLACE "<Platform>Win32</Platform>" "<Platform>${platform}</Platform>" vcxproj_con "${vcxproj_con}")
+		string(REPLACE "|Win32" "|${platform}" vcxproj_con "${vcxproj_con}")
+		string(REPLACE "Include=\"vc11_" "Include=\"${machine}_vc11_" vcxproj_con "${vcxproj_con}")
+ 
+        if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+            string(REPLACE "/APPCONTAINER" "" vcxproj_con "${vcxproj_con}")
+        endif()
+        
+        file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_${vcxproj}" "${vcxproj_con}")
+    endforeach()
+
+    vcpkg_install_msbuild(
+        SOURCE_PATH ${SOURCE_PATH}
+        PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln"
+        TARGET "lame"
+        PLATFORM "${platform}"
+    )
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+            file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+            file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmp3lame.lib)
+        endif()
+        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+            file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+            file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame.lib)
+        endif()
+        set(MP3LAME_LIB "libmp3lame-static.lib")
+    else()
+        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+            file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmp3lame-static.lib)
+            file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmpghip-static.lib)
+        endif()
+        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+            file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame-static.lib)
+            file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmpghip-static.lib)
+        endif()
+        set(MP3LAME_LIB "libmp3lame.lib")
+    endif()
+
+else()
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        set(OPTIONS --enable-static=yes --enable-shared=no)
+        set(MP3LAME_LIB "libmp3lame.a")
+    else()
+        set(OPTIONS --enable-shared=yes --enable-static=no)
+        set(MP3LAME_LIB "libmp3lame.so")
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+
+        message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+        vcpkg_execute_required_process(
+            COMMAND ${SOURCE_PATH}/configure ${OPTIONS} --with-pic=yes --prefix=${CURRENT_PACKAGES_DIR}/debug
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+            LOGNAME configure-${TARGET_TRIPLET}-dbg
+        )
+        message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+        vcpkg_execute_required_process(
+            COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+            LOGNAME install-${TARGET_TRIPLET}-dbg
+        )
+
+        file(REMOVE_RECURSE 
+            ${CURRENT_PACKAGES_DIR}/debug/bin
+            ${CURRENT_PACKAGES_DIR}/debug/include 
+            ${CURRENT_PACKAGES_DIR}/debug/share
+        )
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+
+        message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+        vcpkg_execute_required_process(
+            COMMAND ${SOURCE_PATH}/configure ${OPTIONS} --with-pic=yes --prefix=${CURRENT_PACKAGES_DIR}
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+            LOGNAME configure-${TARGET_TRIPLET}-rel
+        )
+
+        message(STATUS "Building ${TARGET_TRIPLET}-rel")
+        vcpkg_execute_required_process(
+            COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+            LOGNAME install-${TARGET_TRIPLET}-rel
+        )
+
+        if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+            file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+        endif()
+
+    endif()
+
+endif()
+
+file(COPY ${SOURCE_PATH}/include/lame.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/lame)
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/mp3lame/copyright COPYONLY)
+configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/mp3lame/mp3lame-config.cmake @ONLY)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/mp3lame)
--- a/ports/mp3lame/usage
+++ b/ports/mp3lame/usage
@ -0,0 +1,4 @@
+The package mp3lame provides CMake targets:
+
+    find_package(mp3lame CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE mp3lame::mp3lame)
--- a/ports/nanort/CONTROL
+++ 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
--- a/ports/nanort/portfile.cmake
+++ 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)
--- 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
--- a/ports/openimageio/fix_find_openexr.patch
+++ 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
--- 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")
--- 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
--- a/ports/paho-mqttpp3/fix-include-path.patch
+++ 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"
--- 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")
--- a/ports/qt-advanced-docking-system/CONTROL
+++ b/ports/qt-advanced-docking-system/CONTROL
@ -0,0 +1,4 @@
+Source: qt-advanced-docking-system
+Version: 2019-08-14
+Build-Depends: qt5-base, zlib, bzip2
+Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio
--- a/ports/qt-advanced-docking-system/config_changes.patch
+++ b/ports/qt-advanced-docking-system/config_changes.patch
@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a9f919..9c2b8ad 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -62,7 +62,7 @@ if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
+ else()
+     set(ads_PlatformDir "x64")
+ endif()
+-if(BUILD_STATIC)
+if(NOT BUILD_SHARED_LIBS)
+     add_library(qtadvanceddocking STATIC ${ads_SRCS})
+     set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_STATIC)
+ else()
+@@ -80,7 +80,7 @@ install(FILES
+     COMPONENT license
+ )
+ install(TARGETS qtadvanceddocking
+-    EXPORT adsBinary
+    EXPORT qt-advanced-docking-systemConfig
+     RUNTIME DESTINATION bin COMPONENT library
+     LIBRARY DESTINATION lib COMPONENT library
+     ARCHIVE DESTINATION lib COMPONENT library
+@@ -93,7 +93,6 @@ target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS})
+ target_compile_definitions(qtadvanceddocking PRIVATE ${ads_COMPILE_DEFINE})
+ set_target_properties(qtadvanceddocking PROPERTIES 
+     VERSION ${ads_VERSION}
+-    EXPORT_NAME "Qt Advanced Docking System"
+     ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
+@@ -103,3 +102,4 @@ if(BUILD_EXAMPLES)
+     add_subdirectory(demo)
+ endif()
+ 
+install(EXPORT qt-advanced-docking-systemConfig NAMESPACE qt-advanced-docking-system:: DESTINATION share/qt-advanced-docking-system)
+\ No newline at end of file
--- a/ports/qt-advanced-docking-system/portfile.cmake
+++ b/ports/qt-advanced-docking-system/portfile.cmake
@ -0,0 +1,25 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO githubuser0xFFFF/Qt-Advanced-Docking-System
+    REF a2b07fd97f0fac63fd7a0ed7b1eb0692b3efab71
+    SHA512 a44babd6100f299aea7fcf2d730874e204151ce363e1f58a2be938f70d28b07f3cb39adfbf46527fdacc3b12a630e7d97851e4a6fcd04e750a007ee06d06d3b5
+    HEAD_REF master
+    PATCHES
+        config_changes.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DBUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt-advanced-docking-system RENAME copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license)
+vcpkg_fixup_cmake_targets()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
--- 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
--- a/ports/qtkeychain/CONTROL
+++ 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
--- a/ports/qtkeychain/portfile.cmake
+++ 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)
--- a/ports/quickfast/00001-fix-boost-asio.patch
+++ b/ports/quickfast/00001-fix-boost-asio.patch
@ -0,0 +1,39 @@
+diff --git a/src/Common/QuickFASTPch.h b/src/Common/QuickFASTPch.h
+index 3574df8..c4ef4e1 100644
+--- a/src/Common/QuickFASTPch.h
+++ b/src/Common/QuickFASTPch.h
+@@ -32,7 +32,7 @@
+ #include <string.h>
+ 
+ // If building for .NET, must link boost threads dynamically
+-#define BOOST_THREAD_USE_DLL
+// #define BOOST_THREAD_USE_DLL
+ // This reports at compile time which boost libraries will be used
+ // #define BOOST_LIB_DIAGNOSTIC
+ 
+diff --git a/src/Communication/AsioService.h b/src/Communication/AsioService.h
+index 4f61915..96f2198 100644
+--- a/src/Communication/AsioService.h
+++ b/src/Communication/AsioService.h
+@@ -99,6 +99,7 @@ namespace QuickFAST
+       {
+         return ioService_;
+       }
+      boost::asio::io_service::executor_type get_executor() BOOST_ASIO_NOEXCEPT { return ioService_.get_executor();}
+ 
+       ///@brief Post a completion handler for later processing (usually in a different thread)
+       /// @param handler is the handler to be posted
+diff --git a/src/Communication/AsioService_fwd.h b/src/Communication/AsioService_fwd.h
+index dc2f235..6ad5e68 100644
+--- a/src/Communication/AsioService_fwd.h
+++ b/src/Communication/AsioService_fwd.h
+@@ -17,7 +17,8 @@ namespace boost
+ {
+   namespace asio
+   {
+-    class io_service;
+    class io_context;
+    typedef io_context io_service;
+   }
+ }
+ 
--- a/ports/quickfast/CMakeLists.txt
+++ b/ports/quickfast/CMakeLists.txt
@ -0,0 +1,54 @@
+cmake_minimum_required(VERSION 3.13)
+project(quickfast CXX)
+
+option(BUILD_SHARED_LIBS "Build shared instead of static library" ON)
+
+find_package(Boost REQUIRED COMPONENTS thread)
+find_package(XercesC REQUIRED)
+
+file(GLOB SOURCES 
+	quickfast/Application/*.cpp
+	quickfast/Common/*.cpp
+	quickfast/Codecs/*.cpp
+	quickfast/Communication/*.cpp
+	quickfast/Messages/*.cpp
+)
+
+file(GLOB HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+	quickfast/Application/*.h
+	quickfast/Common/*.h
+	quickfast/Codecs/*.h
+	quickfast/Communication/*.h
+	quickfast/Messages/*.h
+)
+
+if(BUILD_SHARED_LIBS)
+	add_library(quickfast SHARED ${HEADERS} ${SOURCES})
+	target_compile_definitions(quickfast PRIVATE -DQUICKFAST_BUILD_DLL)
+else()
+	add_library(quickfast STATIC ${HEADERS} ${SOURCES})
+	target_compile_definitions(quickfast PUBLIC -DQUICKFAST_HAS_DLL=0)
+endif()
+
+target_include_directories(quickfast PUBLIC
+	$<INSTALL_INTERFACE:include>
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+	$<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
+)
+
+target_link_libraries(quickfast PRIVATE
+	${Boost_LIBRARIES} 
+	XercesC::XercesC
+)
+
+install(TARGETS quickfast EXPORT quickfast-config 
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+)
+install(EXPORT quickfast-config DESTINATION share/cmake/quickfast)
+
+foreach (HEADER ${HEADERS} )
+    get_filename_component(HEADER_DIR ${HEADER} DIRECTORY)
+    install(FILES ${HEADER} DESTINATION include/${HEADER_DIR})
+endforeach()
--- a/ports/quickfast/CONTROL
+++ b/ports/quickfast/CONTROL
@ -0,0 +1,5 @@
+Source: quickfast
+Version: 1.5
+Build-Depends: boost-asio, xerces-c
+Homepage: https://github.com/objectcomputing/quickfast
+Description: QuickFAST is an Open Source native C++ implementation of the FAST Protocol [SM].
--- a/ports/quickfast/portfile.cmake
+++ b/ports/quickfast/portfile.cmake
@ -0,0 +1,50 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO objectcomputing/quickfast
+    REF V1_5
+    SHA512 f224ffbe0ee1b84616b46d536d27da01346103cf9ed135a87543da51e8e979ec3735e08ece8525ee1316ea323d41dcacc4d44eabe2e033d68f93432ea43d1ce9
+    HEAD_REF master
+    PATCHES 00001-fix-boost-asio.patch
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+if(NOT EXISTS "${SOURCE_PATH}/quickfast")
+	file(RENAME ${SOURCE_PATH}/src ${SOURCE_PATH}/quickfast)
+endif()
+
+file(GLOB_RECURSE SRC_FILES  "${SOURCE_PATH}/quickfast/*.cpp" "${SOURCE_PATH}/quickfast/*.h")
+foreach(SRC_FILE IN LISTS SRC_FILES)
+    file(READ "${SRC_FILE}" _contents)
+	string(REPLACE "#include <Common/"        "#include <quickfast/Common/"        _contents "${_contents}")
+	string(REPLACE "#include <Application/"   "#include <quickfast/Application/"   _contents "${_contents}")
+	string(REPLACE "#include <Communication/" "#include <quickfast/Communication/" _contents "${_contents}")
+	string(REPLACE "#include <Codecs/"        "#include <quickfast/Codecs/"        _contents "${_contents}")
+	string(REPLACE "#include <Messages/"      "#include <quickfast/Messages/"      _contents "${_contents}")
+    file(WRITE "${SRC_FILE}" "${_contents}")
+endforeach()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+  set(BUILD_SHARED_LIBS ON)
+else()
+  set(BUILD_SHARED_LIBS OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/quickfast)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+configure_file(${SOURCE_PATH}/license.txt ${CURRENT_PACKAGES_DIR}/share/quickfast/copyright COPYONLY)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/quickfast)
--- a/ports/quickfast/usage
+++ b/ports/quickfast/usage
@ -0,0 +1,4 @@
+The package quickfast provides CMake targets:
+
+    find_package(quickfast CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE quickfast)
--- a/ports/quickfix/00001-fix-build.patch
+++ b/ports/quickfix/00001-fix-build.patch
@ -0,0 +1,98 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48908ead..5022a019 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -96,9 +96,12 @@ add_subdirectory(UnitTest++)
+ endif()
+ 
+ add_subdirectory(src)
+-add_subdirectory(examples)
+#add_subdirectory(examples)
+ if( WIN32)
+-add_subdirectory(test)
+#add_subdirectory(test)
+target_compile_definitions(TestUnitTest++ PRIVATE _CRT_SECURE_NO_WARNINGS)
+target_compile_definitions(UnitTest++ PRIVATE _CRT_SECURE_NO_WARNINGS)
+target_compile_definitions(ut PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS)
+ endif()
+ 
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/spec/ DESTINATION share/quickfix
+diff --git a/src/C++/CMakeLists.txt b/src/C++/CMakeLists.txt
+index 07774c97..27692631 100644
+--- a/src/C++/CMakeLists.txt
+++ b/src/C++/CMakeLists.txt
+@@ -1,3 +1,4 @@
+project(quickfix)
+ set(quickfix_VERSION_MAJOR 16)
+ set(quickfix_VERSION_MINOR 0)
+ set(quickfix_VERSION_PATCH 1)
+@@ -64,19 +65,22 @@ endif()
+ 
+ if (WIN32)
+   add_library(${PROJECT_NAME} STATIC  ${quickfix_SOURCES})
+-  set_target_properties (${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX d)
+   target_link_libraries(${PROJECT_NAME} ${OPENSSL_LIBRARIES} ${MYSQL_CLIENT_LIBS} ${PostgreSQL_LIBRARIES} ws2_32)
+  target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
+ else()
+-  add_library(${PROJECT_NAME} SHARED  ${quickfix_SOURCES})
+  add_library(${PROJECT_NAME} STATIC  ${quickfix_SOURCES})
+   target_link_libraries(${PROJECT_NAME} ${OPENSSL_LIBRARIES} ${MYSQL_CLIENT_LIBS} ${PostgreSQL_LIBRARIES} pthread)
+ endif()
+ 
+ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/C++)
+target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
+ 
+ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${quickfix_VERSION} SOVERSION ${quickfix_VERSION_MAJOR} )
+target_compile_definitions(${PROJECT_NAME} PUBLIC HAVE_STD_UNIQUE_PTR HAVE_STD_SHARED_PTR HAVE_SSL=1)
+ 
+-install(TARGETS ${PROJECT_NAME} DESTINATION lib)
+install(TARGETS ${PROJECT_NAME} EXPORT quickfix-config DESTINATION lib)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/C++/ DESTINATION include/quickfix
+         FILES_MATCHING PATTERN "*.h"
+         PATTERN double-conversion EXCLUDE
+         PATTERN test EXCLUDE)
+install(EXPORT quickfix-config DESTINATION share/cmake/quickfix)
+diff --git a/src/C++/Utility.h b/src/C++/Utility.h
+index 0aa2cd3e..2829e110 100644
+--- a/src/C++/Utility.h
+++ b/src/C++/Utility.h
+@@ -242,4 +242,10 @@ using std::strtol;
+ using std::strerror;
+ #endif
+ 
+#ifdef __cpp_noexcept_function_type
+#define QUICKFIX_THROW(...) noexcept(false)
+#else
+#define QUICKFIX_THROW(...) throw(__VA_ARGS__)
+#endif
+
+ #endif
+diff --git a/src/C++/UtilitySSL.cpp b/src/C++/UtilitySSL.cpp
+index a01606ac..aee41bbf 100644
+--- a/src/C++/UtilitySSL.cpp
+++ b/src/C++/UtilitySSL.cpp
+@@ -498,7 +498,11 @@ static void ssl_rand_seed(void)
+   /*
+   * seed in the current process id (usually just 4 bytes)
+   */
+#ifdef _MSC_VER
+  pid = GetCurrentProcessId();
+#else
+   pid = getpid();
+#endif
+   l = sizeof(pid);
+   RAND_seed((unsigned char *)&pid, l);
+   /*
+diff --git a/src/C++/double-conversion/utils.h b/src/C++/double-conversion/utils.h
+index aef2f166..779b8ab7 100644
+--- a/src/C++/double-conversion/utils.h
+++ b/src/C++/double-conversion/utils.h
+@@ -61,7 +61,7 @@
+ // disabled.)
+ // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
+ #if defined(_M_X64) || defined(__x86_64__) || \
+-    defined(__ARMEL__) || defined(__avr32__) || \
+    defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
+     defined(__hppa__) || defined(__ia64__) || \
+     defined(__mips__) || \
+     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
--- a/ports/quickfix/CONTROL
+++ b/ports/quickfix/CONTROL
@ -0,0 +1,5 @@
+Source: quickfix
+Version: 1.15.1
+Build-Depends: openssl
+Homepage: https://github.com/quickfix/quickfix
+Description: QuickFIX is a free and open source implementation of the FIX protocol.
--- a/ports/quickfix/portfile.cmake
+++ b/ports/quickfix/portfile.cmake
@ -0,0 +1,50 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO quickfix/quickfix
+    REF v1.15.1
+    SHA512 6c3dc53f25932c9b7516ab9228f634511ae0f399719f87f0ec2b38c380c0a7d1c808f0f9a14a70a063e1956118550d1121222283a9139f23cd4f8f038f595f70
+    HEAD_REF master
+    PATCHES 00001-fix-build.patch
+)
+
+file(GLOB_RECURSE SRC_FILES RELATIVE ${SOURCE_PATH} 
+	"${SOURCE_PATH}/src/*.cpp" 
+	"${SOURCE_PATH}/src/*.h"
+)
+
+list(REMOVE_ITEM SRC_FILES "src/C++/Utility.h")
+list(REMOVE_ITEM SRC_FILES "src/C++/pugixml.cpp")
+
+foreach(SRC_FILE IN LISTS SRC_FILES)
+    file(READ "${SOURCE_PATH}/${SRC_FILE}" _contents)
+	string(REPLACE "throw("  "QUICKFIX_THROW(" _contents "${_contents}")
+	string(REPLACE "throw (" "QUICKFIX_THROW(" _contents "${_contents}")
+    file(WRITE "${SOURCE_PATH}/${SRC_FILE}" "${_contents}")
+endforeach()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DHAVE_EMX=OFF
+        -DHAVE_MYSQL=OFF
+        -DHAVE_POSTGRESQL=OFF
+        -DHAVE_PYTHON=OFF
+        -DHAVE_PYTHON2=OFF
+        -DHAVE_PYTHON3=OFF
+        -DHAVE_SSL=ON
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/quickfix)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/quickfix/copyright COPYONLY)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/quickfix)
--- a/ports/quickfix/usage
+++ b/ports/quickfix/usage
@ -0,0 +1,4 @@
+The package quickfix provides CMake targets:
+
+    find_package(quickfix CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE quickfix)
--- a/ports/range-v3/CONTROL
+++ b/ports/range-v3/CONTROL
@ -1,4 +1,4 @@
 Source: range-v3
-Version: 0.5.0
+Version: 0.9.0-20190822
 Homepage: https://github.com/ericniebler/range-v3
 Description: Range library for C++11/14/17.
--- a/Show More
+++ b/Show More