Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4831

53 files changed, 400 insertions, 127 deletions

diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt
index b4b8a646d..d98914e60 100644
--- a/ports/abseil/CMakeLists.txt
+++ b/ports/abseil/CMakeLists.txt
@@ -62,6 +62,7 @@ add_sublibrary(algorithm)
 add_sublibrary(base)
 add_sublibrary(container)
 add_sublibrary(debugging)
+add_sublibrary(hash)
 add_sublibrary(memory)
 add_sublibrary(meta)
 add_sublibrary(numeric)
@@ -75,6 +76,7 @@ add_sublibrary(utility)
 target_link_public_libraries(algorithm base meta)
 target_link_public_libraries(container algorithm base memory)
 target_link_public_libraries(debugging base)
+target_link_public_libraries(hash base)
 target_link_public_libraries(memory meta)
 target_link_public_libraries(meta base)
 target_link_public_libraries(numeric base)
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
index f616b8608..95191fcf0 100644
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@@ -1,5 +1,5 @@
 Source: abseil

-Version: 2018-11-08
+Version: 2018-11-08-1
 Description: an open-source collection designed to augment the C++ standard library.

   Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.

   In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 8323188d9..ed08a12c2 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -1,3 +1,3 @@
 Source: ace
-Version: 6.5.2
+Version: 6.5.3
 Description: The ADAPTIVE Communication Environment
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 3f5df8868..e10e82e0e 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -9,9 +9,9 @@ endif()
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_2/ACE.zip"
-    FILENAME "ACE-6.5.2.zip"
-    SHA512 ca8a55942b50628e851cad7074a249c480d82f916979a50bb24174432248037fb7a79ca055c7e6553d96aa58f14b97e8e8bf5dbc8671b72b8712e8a65f63ac98
+    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-6.5.3.zip"
+    FILENAME ACE-6.5.3.zip
+    SHA512 1c24c7a138b6580e0f2a71d3e797ed846a3c046854c19d10175198dc519b610b2ac684d6e0e3999705319304b6eee3f09405cb43ce48a869d2f1446342da469d
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index 7a19242e9..c5e51adaf 100644
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-c-shared-utility
-Version: 1.1.10-1
+Version: 1.1.11-1
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux)
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index 0d2d8a493..838528ce4 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-c-shared-utility
-    REF 68ede5bbc58c7d976f3bd68325edec181c254e5e
-    SHA512 97253c081cab90c7c879da9ecfa076be43d19fd0d442d91fcab8ab3149e792b868c363c56b5afc3e3880a18b400e663661d257237d2f1ef97544522a1cabcd5a
+    REF bcf6393b1ce3cecf0fcdf8988621fd6e4d414df3
+    SHA512 e5ae3c895777df90e725da7686939b46fa4df19ce5626bbe13a5aaf1b844ee56c96ddf2a9ad8426a96cdc34e8be338c95b6759e618143e19445c5180fb0f7ed1
     HEAD_REF master
 )
 
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index 69c813f3c..9c9410bfe 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-iot-sdk-c
-Version: 1.2.10-1
+Version: 1.2.11-1
 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 17893f17e..6ec8ba3eb 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-iot-sdk-c
-    REF 0ca9b92d4ff7f7a44fe1687e81f919bd7dcaa944
-    SHA512 a4d43d5615d3571fda29f3d47467b816745f939941da899df799a0c4cf09c920c20b924aa29e2e2d6f4a19b81ff83969e773b6cf333bec9e2170376fe07b42ec
+    REF acff8b1677150cb165a7b111745144cf8fab76cc
+    SHA512 7e7e0679d48e76539a607a593b1c9ccc57eeb4f8bf33fb49051ad99203d1568f0ac2a38fe32ba0b3670cea32a2318e8c135c709ba5712f95cd8005ff21572e28
     HEAD_REF master
     PATCHES improve-external-deps.patch
 )
diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL
index f56ab20f3..8f5f63c08 100644
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-uamqp-c
-Version: 1.2.10-1
+Version: 1.2.11-1
 Build-Depends: azure-c-shared-utility
 Description: AMQP library for C
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index c2e08baf0..0f7591099 100644
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-uamqp-c
-    REF ec107011716bc797d3d7a4a4a1141df4367038a3
-    SHA512 db25018a6f93a29da4bae8426f6e021a0d823075375f69f617c6aba776f5ac6ed5107e055f0a436f22ede2057045d28fab15607a58703c6c43937abec87ab076
+    REF 075b5a669f49b9d3b68b7bf9b465fe92e1c740aa
+    SHA512 54b7c9ebdaca13d44634e99a064aac54e9eadaedcbed723aabc62c70414ef54d62c5f58ddc836e8020eba4ca0d03d27c2d73391d4071f973fda228866215ec58
     HEAD_REF master
 )
 
diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL
index be45af110..e41543687 100644
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-uhttp-c
-Version: 1.1.10-1
+Version: 1.1.11-2
 Build-Depends: azure-c-shared-utility
 Description: Azure HTTP Library written in C
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index a4bb1c67b..de34ba4dd 100644
--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-uhttp-c
-    REF 8ec55bb8596dae1154ae897b5064b8eba34c136c
-    SHA512 73b861409dede5c1936711ec04e76e8467dadc08acda6ac1b832046a4f9b2f6d35403c01acb818b5655c2c43f700d9f83edf11b8b00f7a565f260700a12c9f7c
+    REF ed7d104c4ab96aaa68e429066953874f12be70eb
+    SHA512 512f8fd46dbc40ff79ffdbc2ea881a29aaa72db4c36f16f96f30a224220183e295d8e39a4965d788f92f4976fa6d37b197c04b32bbd187d456d5c5d516b95c9f
     HEAD_REF master
 )
 
diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL
index 3466cc49d..9a5f5e030 100644
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-umqtt-c
-Version: 1.1.10-1
+Version: 1.1.11-1
 Build-Depends: azure-c-shared-utility
 Description: General purpose library for communication over the mqtt protocol
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index c2825a681..cb14cfaa8 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-umqtt-c
-    REF e5ab6b66ccba5a7ff7ed7421ffe0fa13ecabe000
-    SHA512 19878f798d73f98afdee6ac574e136f1b2f8ddd3a7537ee666a98d04cade6ecd2526714eb74335af2eff05165492933ec90cb79a9cb914093fa96cfe35a84cb4
+    REF ff05514c9b4742ae8d7785719a399a7fe6eac09b
+    SHA512 d750390d38555ab00e5d5cc5aa0b07ae452afd2e2af0dade5fc1c55f63ad367688b5ff7e97e65ab00f0153340b8bcc1e5039e80e5795b9f9c0cd2c48eedad081
     HEAD_REF master
 )
 
diff --git a/ports/bitserializer-cpprestjson/CONTROL b/ports/bitserializer-cpprestjson/CONTROL
new file mode 100644
index 000000000..f75cd41a2
--- /dev/null
+++ b/ports/bitserializer-cpprestjson/CONTROL
@@ -0,0 +1,4 @@
+Source: bitserializer-cpprestjson

+Version: 0.8

+Build-Depends: bitserializer, cpprestsdk

+Description: This is an implementation of the BitSerializer archive for serialization JSON (based on CppRestSDK library).

diff --git a/ports/bitserializer-cpprestjson/portfile.cmake b/ports/bitserializer-cpprestjson/portfile.cmake
new file mode 100644
index 000000000..28430d590
--- /dev/null
+++ b/ports/bitserializer-cpprestjson/portfile.cmake
@@ -0,0 +1,13 @@
+include(vcpkg_common_functions)

+vcpkg_from_bitbucket(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO Pavel_Kisliak/BitSerializer

+	REF 0.8

+	SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093

+    HEAD_REF master

+)

+

+file(INSTALL ${SOURCE_PATH}/archives/bitserializer_cpprest_json DESTINATION ${CURRENT_PACKAGES_DIR}/include)

+

+# Handle copyright

+file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-cpprestjson RENAME copyright)

diff --git a/ports/bitserializer-rapidjson/CONTROL b/ports/bitserializer-rapidjson/CONTROL
new file mode 100644
index 000000000..db65c52ae
--- /dev/null
+++ b/ports/bitserializer-rapidjson/CONTROL
@@ -0,0 +1,4 @@
+Source: bitserializer-rapidjson

+Version: 0.8

+Build-Depends: bitserializer, rapidjson

+Description: This is an implementation of the BitSerializer archive for serialization JSON (based on the RapidJson library).

diff --git a/ports/bitserializer-rapidjson/portfile.cmake b/ports/bitserializer-rapidjson/portfile.cmake
new file mode 100644
index 000000000..4050b73bc
--- /dev/null
+++ b/ports/bitserializer-rapidjson/portfile.cmake
@@ -0,0 +1,13 @@
+include(vcpkg_common_functions)

+vcpkg_from_bitbucket(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO Pavel_Kisliak/BitSerializer

+	REF 0.8

+	SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093

+    HEAD_REF master

+)

+

+file(INSTALL ${SOURCE_PATH}/archives/bitserializer_rapidjson DESTINATION ${CURRENT_PACKAGES_DIR}/include)

+

+# Handle copyright

+file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-rapidjson RENAME copyright)

diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL
index 95e36f5b9..35e02fe03 100644
--- a/ports/bitserializer/CONTROL
+++ b/ports/bitserializer/CONTROL
@@ -1,4 +1,3 @@
 Source: bitserializer

-Version: 0.7

-Build-Depends: cpprestsdk

-Description: The library for simple serialization of arbitrary C++ types to various output formats (currently just supported JSON based on CppRestSDK).

+Version: 0.8

+Description: The core part of library for serialization of arbitrary C++ types to various output formats.

diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake
index 5e59f0c71..50eb93481 100644
--- a/ports/bitserializer/portfile.cmake
+++ b/ports/bitserializer/portfile.cmake
@@ -2,12 +2,12 @@ include(vcpkg_common_functions)
 vcpkg_from_bitbucket(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Pavel_Kisliak/BitSerializer

-	REF 0.7

-	SHA512 3a50b1b3077115f60d298f4257ae6a5a350c1d8b3d575af83b4f0746757ab3393da7c81ac9c7db4e30540fe94f1742b1d39de724b2dec080faf727b885bb19a4

+	REF 0.8

+	SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093

     HEAD_REF master

 )

 

-file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})

+file(INSTALL ${SOURCE_PATH}/core/bitserializer DESTINATION ${CURRENT_PACKAGES_DIR}/include)

 

 # Handle copyright

 file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer RENAME copyright)

diff --git a/ports/cpp-taskflow/CONTROL b/ports/cpp-taskflow/CONTROL
new file mode 100644
index 000000000..4abf5457f
--- /dev/null
+++ b/ports/cpp-taskflow/CONTROL
@@ -0,0 +1,3 @@
+Source: cpp-taskflow

+Version: 2018-11-30

+Description: Fast Parallel Tasking Programming Library using Modern C++.

diff --git a/ports/cpp-taskflow/portfile.cmake b/ports/cpp-taskflow/portfile.cmake
new file mode 100644
index 000000000..1f596f0d4
--- /dev/null
+++ b/ports/cpp-taskflow/portfile.cmake
@@ -0,0 +1,29 @@
+# header-only library

+

+include(vcpkg_common_functions)

+

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO cpp-taskflow/cpp-taskflow

+    REF 97252f7d782c6e896122645175c08131ce10e649

+    SHA512 df8ae9ea449663cb548f3c37346c2e0c785add2d86b9c618aea2741d81fe88c34b0d3d0e610a4b571973f9bc18631becedfe28e029ecf0c0cc87e4c35a280a29

+    HEAD_REF master

+)

+

+vcpkg_configure_cmake(

+    SOURCE_PATH ${SOURCE_PATH}

+    PREFER_NINJA

+    OPTIONS

+        -DTF_BUILD_EXAMPLES=OFF

+        -DTF_BUILD_TESTS=OFF

+        -DTF_BUILD_BENCHMARKS=OFF

+)

+

+vcpkg_install_cmake()

+

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)

+

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)

+

+# Handle copyright

+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpp-taskflow/copyright COPYONLY)

diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index 800d54d42..e5da66ef7 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,10 +1,18 @@
 Source: cpprestsdk
-Version: 2.10.6-3
+Version: 2.10.7
 Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows)
 Description: C++11 JSON, REST, and OAuth library
   The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
-Default-Features: websockets
+Default-Features: default-features
+
+Feature: default-features
+Build-Depends: cpprestsdk[brotli] (windows), cpprestsdk[websockets]
+Description: Features installed by default
 
 Feature: websockets
 Build-Depends: websocketpp (!uwp), openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp)
 Description: Websockets support
+
+Feature: brotli
+Build-Depends: brotli
+Description: Brotli compression support
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index c94b01b80..d6390836c 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cpprestsdk
-    REF v2.10.6
-    SHA512 f0848f329df80ced68132600914f0f4ba1ed42c7c16188e0f2bd41cf0c50173c27ca42c8db72ff239ca881bc8789fa4d1e3189c492832f6c22d36d504b7ce8dd
+    REF v2.10.8
+    SHA512 d80a7db59cfe81d8e0c645acff7bcc2ed9ad04e2f3d14dc4ab2a624290d0ea43a2c7adebb54b52a166fd07375352cfd5f1fe244d7c062ce94ec60b977437b2df
     HEAD_REF master
 )
 
@@ -21,6 +21,11 @@ if("websockets" IN_LIST FEATURES)
     set(CPPREST_EXCLUDE_WEBSOCKETS OFF)
 endif()
 
+set(CPPREST_EXCLUDE_BROTLI ON)
+if ("brotli" IN_LIST FEATURES)
+    set(CPPREST_EXCLUDE_BROTLI OFF)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/Release
     PREFER_NINJA
@@ -37,18 +42,11 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/share") # transition
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share)
-else()
-    vcpkg_fixup_cmake_targets() # v2.10.6 and below
-endif()
-
-
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share)
 
 file(INSTALL
     ${SOURCE_PATH}/license.txt
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpprestsdk RENAME copyright)
 
 vcpkg_copy_pdbs()
-
diff --git a/ports/ctre/CONTROL b/ports/ctre/CONTROL
new file mode 100644
index 000000000..3351ecf25
--- /dev/null
+++ b/ports/ctre/CONTROL
@@ -0,0 +1,3 @@
+Source: ctre
+Version: 2.2-1
+Description: A Compile time PCRE (almost) compatible regular expression matcher 
diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake
new file mode 100644
index 000000000..76a4a7857
--- /dev/null
+++ b/ports/ctre/portfile.cmake
@@ -0,0 +1,15 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO hanickadot/compile-time-regular-expressions
+    REF v2.2
+    SHA512 f6f18e3e5bc654ff94cd540a3b665615151678541575dfc8d4113c317fba5ea83f57694dc330c174110e6263c9b64a128f2a9234cc626a952e7518c423fda703
+    HEAD_REF master
+)
+
+# Install header files
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ctre RENAME copyright)
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL
index 95040eba1..f76c99124 100644
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@@ -1,9 +1,8 @@
 Source: curl
-Version: 7.61.1-1
+Version: 7.61.1-2
 Build-Depends: zlib
 Description: A library for transferring data with URLs
 Default-Features: ssl
-# For WINSSL add set(CURL_USE_WINSSL ON) to your triplet file
 
 Feature: tool
 Description: Builds curl executable
@@ -16,9 +15,21 @@ Build-Depends: nghttp2, curl[ssl]
 Description: HTTP2 support
 
 Feature: ssl
-Build-Depends: openssl
-Description: SSL support
+Build-Depends: curl[openssl] (!windows), curl[winssl] (windows)
+Description: Default SSL backend
 
 Feature: ssh
 Build-Depends: libssh2, curl[non-http]
 Description: SSH support via libssh2
+
+# SSL backends
+Feature: openssl
+Build-Depends: openssl
+Description: SSL support (OpenSSL)
+
+Feature: winssl
+Description: SSL support (Secure Channel / "WinSSL")
+
+Feature: mbedtls
+Build-Depends: mbedtls
+Description: SSL support (mbedTLS)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 0b156c4d0..534a54aea 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -7,15 +7,15 @@ vcpkg_from_github(
     SHA512 09fa3c87f8d516eabe3241247a5094c32ee0481961cf85bf78ecb13acdf23bb2ec82f113d2660271d22742c79e76d73fb122730fa28e34c7f5477c05a4a6534c
     HEAD_REF master
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0003_fix_libraries.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0004_nghttp2_staticlib.patch
+        0001_cmake.patch
+        0002_fix_uwp.patch
+        0003_fix_libraries.patch
+        0004_nghttp2_staticlib.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)
 
-# Support HTTP2 TSL Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location.
+# Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location.
 set(HTTP2_OPTIONS)
 if("http2" IN_LIST FEATURES)
     set(HTTP2_OPTIONS -DUSE_NGHTTP2=ON)
@@ -23,13 +23,21 @@ endif()
 
 # SSL
 set(USE_OPENSSL OFF)
+if("openssl" IN_LIST FEATURES)
+    set(USE_OPENSSL ON)
+endif()
+
 set(USE_WINSSL OFF)
-if("ssl" IN_LIST FEATURES)
-    if(CURL_USE_WINSSL)
-        set(USE_WINSSL ON)
-    else()
-        set(USE_OPENSSL ON)
+if("winssl" IN_LIST FEATURES)
+    if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+        message(FATAL_ERROR "winssl is not supported on non-Windows platforms")
     endif()
+    set(USE_WINSSL ON)
+endif()
+
+set(USE_MBEDTLS OFF)
+if("mbedtls" IN_LIST FEATURES)
+    set(USE_MBEDTLS ON)
 endif()
 
 # SSH
@@ -64,7 +72,7 @@ endif()
 
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_PATH ${PERL} DIRECTORY)
-set(ENV{PATH} "$ENV{PATH};${PERL_PATH}")
+vcpkg_add_to_path(${PERL_PATH})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -78,6 +86,7 @@ vcpkg_configure_cmake(
         -DCURL_STATICLIB=${CURL_STATICLIB}
         -DCMAKE_USE_OPENSSL=${USE_OPENSSL}
         -DCMAKE_USE_WINSSL=${USE_WINSSL}
+        -DCMAKE_USE_MBEDTLS=${USE_MBEDTLS}
         -DCMAKE_USE_LIBSSH2=${USE_LIBSSH2}
         -DHTTP_ONLY=${USE_HTTP_ONLY}
     OPTIONS_RELEASE
diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL
index fada181ac..c96e1b0b8 100644
--- a/ports/ecsutil/CONTROL
+++ b/ports/ecsutil/CONTROL
@@ -1,4 +1,4 @@
 Source: ecsutil

-Version: 1.0.1.2-1

+Version: 1.0.1.4

 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.

 Build-Depends: atlmfc

diff --git a/ports/ecsutil/NoLibSyms.patch b/ports/ecsutil/NoLibSyms.patch
new file mode 100644
index 000000000..e4f7e77bd
--- /dev/null
+++ b/ports/ecsutil/NoLibSyms.patch
@@ -0,0 +1,41 @@
+ ECSUtil/ECSUtil.vcxproj | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj
+index 05c5726..4b5de57 100644
+--- a/ECSUtil/ECSUtil.vcxproj
++++ b/ECSUtil/ECSUtil.vcxproj
+@@ -289,7 +289,7 @@
+       <SDLCheck>true</SDLCheck>
+       <PreprocessToFile>false</PreprocessToFile>
+       <PreprocessKeepComments>false</PreprocessKeepComments>
+-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <DebugInformationFormat>None</DebugInformationFormat>
+     </ClCompile>
+     <Link>
+       <SubSystem>Windows</SubSystem>
+@@ -317,7 +317,7 @@
+       <SDLCheck>true</SDLCheck>
+       <PreprocessToFile>false</PreprocessToFile>
+       <PreprocessKeepComments>false</PreprocessKeepComments>
+-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <DebugInformationFormat>None</DebugInformationFormat>
+     </ClCompile>
+     <Link>
+       <SubSystem>Windows</SubSystem>
+@@ -462,6 +462,7 @@
+       <SDLCheck>true</SDLCheck>
+       <PreprocessToFile>false</PreprocessToFile>
+       <PreprocessKeepComments>false</PreprocessKeepComments>
++      <DebugInformationFormat>None</DebugInformationFormat>
+     </ClCompile>
+     <Link>
+       <SubSystem>Windows</SubSystem>
+@@ -493,6 +494,7 @@
+       <SDLCheck>true</SDLCheck>
+       <PreprocessToFile>false</PreprocessToFile>
+       <PreprocessKeepComments>false</PreprocessKeepComments>
++      <DebugInformationFormat>None</DebugInformationFormat>
+     </ClCompile>
+     <Link>
+       <SubSystem>Windows</SubSystem>
diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake
index 4a8e48b2b..0dc5fa8fa 100644
--- a/ports/ecsutil/portfile.cmake
+++ b/ports/ecsutil/portfile.cmake
@@ -28,10 +28,10 @@ endif()
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO EMCECS/ecs-object-client-windows-cpp

-    REF v1.0.1.2

-    SHA512 ee6c9086111f9cb4a3b9b0645a6a8921bae1d3e8fba0d054d824935b0ff82a57db5c1476183202694afe33f89bfc47db1ef91696a739a1a43a1e2411e4361e6f

+    REF v1.0.1.4

+    SHA512 796ed227268cd92fce3eba2a842260d552222900b1df1261200032a7678a48776388dd566f408df2ee4dbc0cee39b70090d524a99e6741e0c8f92594d207761a

     HEAD_REF master

-    PATCHES disable-setversion.patch

+    PATCHES NoLibSyms.patch

 )

 

 vcpkg_install_msbuild(

@@ -44,6 +44,10 @@ vcpkg_install_msbuild(
     DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG}

 )

 

+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

+endif()

+

 file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools)

 file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll)

diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index f8842fec4..1711bda03 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2018.11.05.00
+Version: 2018.11.26.00
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread
 Default-Features: zlib
diff --git a/ports/folly/find-gflags.patch b/ports/folly/find-gflags.patch
index 986dd6d57..a3e011683 100644
--- a/ports/folly/find-gflags.patch
+++ b/ports/folly/find-gflags.patch
@@ -1,13 +1,13 @@
-diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake

-index 396fa6c..9d80d99 100644

---- a/CMake/folly-deps.cmake

-+++ b/CMake/folly-deps.cmake

-@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})

- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})

- 

- set(FOLLY_HAVE_LIBGFLAGS OFF)

--find_package(GFlags CONFIG QUIET)

-+find_package(gflags CONFIG REQUIRED)

- if (gflags_FOUND)

-   message(STATUS "Found gflags from package config")

-   set(FOLLY_HAVE_LIBGFLAGS ON)

+diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
+index 437c0cd..5530a35 100644
+--- a/CMake/folly-deps.cmake
++++ b/CMake/folly-deps.cmake
+@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
+ 
+ set(FOLLY_HAVE_LIBGFLAGS OFF)
+-find_package(gflags CONFIG QUIET)
++find_package(gflags CONFIG REQUIRED)
+ if (gflags_FOUND)
+   message(STATUS "Found gflags from package config")
+   set(FOLLY_HAVE_LIBGFLAGS ON)
diff --git a/ports/folly/no-werror.patch b/ports/folly/no-werror.patch
index e9ec920dc..32fbc9494 100644
--- a/ports/folly/no-werror.patch
+++ b/ports/folly/no-werror.patch
@@ -1,12 +1,12 @@
-diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake

-index b7d994b..a518cbe 100644

---- a/CMake/FollyCompilerUnix.cmake

-+++ b/CMake/FollyCompilerUnix.cmake

-@@ -16,7 +16,6 @@ function(apply_folly_compile_options_to_target THETARGET)

-       -std=gnu++14

-       -finput-charset=UTF-8

-       -fsigned-char

--      -Werror

-       -Wall

-       -Wno-deprecated

-       -Wdeprecated-declarations

+diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake
+index a9cc2c1..de7d714 100644
+--- a/CMake/FollyCompilerUnix.cmake
++++ b/CMake/FollyCompilerUnix.cmake
+@@ -34,7 +34,6 @@ function(apply_folly_compile_options_to_target THETARGET)
+       -std=${CXX_STD}
+       -finput-charset=UTF-8
+       -fsigned-char
+-      -Werror
+       -Wall
+       -Wno-deprecated
+       -Wno-deprecated-declarations
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index bb15bf859..c66599f7e 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF v2018.11.05.00
-    SHA512 08eee201c2b1179a4e52398cc65964fb299abfb95934687f4ce3d72df1ff70493964835d5e52c8821c63553e0be0d578e1130e50e353a7eab6b0334532e4df2e
+    REF v2018.11.26.00
+    SHA512 7a404df7287c9a3278bc47205023881ade188a1d3ade35748ae9ae4f35485faedc9f8c0264cfd0f3565b2d5891235deda0f515946a2c313570ef41751a3693ac
     HEAD_REF master
     PATCHES
         find-gflags.patch
diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL
index 0a8d83aee..b090f2ba5 100644
--- a/ports/gflags/CONTROL
+++ b/ports/gflags/CONTROL
@@ -1,3 +1,3 @@
 Source: gflags
-Version: 2.2.1-3
+Version: 2.2.2-1
 Description: A C++ library that implements commandline flags processing
diff --git a/ports/gflags/fix_cmake_config.patch b/ports/gflags/fix_cmake_config.patch
new file mode 100644
index 000000000..bea561ecb
--- /dev/null
+++ b/ports/gflags/fix_cmake_config.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
+index a512c2a..e7f50d0 100644
+--- a/cmake/config.cmake.in
++++ b/cmake/config.cmake.in
+@@ -78,7 +78,7 @@ if (NOT DEFINED @PACKAGE_PREFIX@_NOTHREADS)
+     else ()
+       set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
+     endif ()
+-  elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
++  elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
+     set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
+   else ()
+     set (@PACKAGE_PREFIX@_NOTHREADS TRUE)
diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake
index 31ffeafa5..87053f849 100644
--- a/ports/gflags/portfile.cmake
+++ b/ports/gflags/portfile.cmake
@@ -7,15 +7,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gflags/gflags
-    REF v2.2.1
-    SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
+    REF v2.2.2
+    SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root
+        0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root
+        fix_cmake_config.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL
index f8519040f..7b89a8fd9 100644
--- a/ports/graphicsmagick/CONTROL
+++ b/ports/graphicsmagick/CONTROL
@@ -1,5 +1,5 @@
 Source: graphicsmagick
 Maintainer: josuegomes@gmail.com
-Version: 1.3.30-1
+Version: 1.3.31
 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff
 Description: Image processing library
diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake
index b04842eb1..87d03bd1f 100644
--- a/ports/graphicsmagick/portfile.cmake
+++ b/ports/graphicsmagick/portfile.cmake
@@ -1,11 +1,11 @@
 include(vcpkg_common_functions)
 
-set(GM_VERSION 1.3.30)
+set(GM_VERSION 1.3.31)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z"
     FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z"
-    SHA512 9e4cfff57ae547f133e6208033213d3aa790cd8c95a061c101c63b8ae8896e7504d02f302efdd20ff24f72c07760a0a5e2b32e21fe454717ed1deb2edeef159c
+    SHA512 ff67f5e6adf352527264e7a6a76d45ce34470263dc764760d876b9ab5d5078e3a46b9d9cb2e7ab52d53106ffe584d44c66b42f3d4d62c972662d488c86510881
 )
 
 vcpkg_extract_source_archive_ex(
diff --git a/ports/libui/CONTROL b/ports/libui/CONTROL
new file mode 100644
index 000000000..d1a70f0d5
--- /dev/null
+++ b/ports/libui/CONTROL
@@ -0,0 +1,3 @@
+Source: libui
+Version: 2018-11-03
+Description: Simple and portable (but not inflexible) native GUI library in C.
diff --git a/ports/libui/fix-cmake.patch b/ports/libui/fix-cmake.patch
new file mode 100644
index 000000000..3d206584b
--- /dev/null
+++ b/ports/libui/fix-cmake.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c7193fbb..50c997f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,8 +152,7 @@ add_subdirectory("common")
+ add_subdirectory("${_OSNAME}")
+ add_library(libui ${_LIBUI_SOURCES})
+ target_include_directories(libui
+-	PUBLIC .
+-	PRIVATE ${_LIBUI_INCLUEDIRS})
++    PUBLIC $<INSTALL_INTERFACE:include>)
+ target_compile_definitions(libui
+ 	PRIVATE ${_LIBUI_DEFS})
+ # cmake produces this for us by default but only for shared libraries
+@@ -229,10 +228,30 @@ macro(_add_exec _name)
+ 	# TODOfor some reason these don't propagate
+ 	if(NOT WIN32)
+ 		target_include_directories(${_name}
+-			PUBLIC .)
++			PUBLIC $<INSTALL_INTERFACE:include>)
+ 		target_compile_options(${_name}
+ 			PUBLIC ${_COMMON_CFLAGS})
+ 	endif()
+ endmacro()
+ add_subdirectory("test")
+ add_subdirectory("examples")
++
++if(BUILD_SHARED_LIBS)
++    install(TARGETS ${PROJECT_NAME}
++        EXPORT ${PROJECT_NAME}-config
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++else()
++    install(TARGETS ${PROJECT_NAME}
++        EXPORT ${PROJECT_NAME}-config
++        DESTINATION ${CMAKE_INSTALL_LIBDIR})
++endif()
++
++install(EXPORT ${PROJECT_NAME}-config
++    FILE unofficial-${PROJECT_NAME}-config.cmake
++    NAMESPACE unofficial::libui::
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++)
++
++install(FILES ui.h DESTINATION include)
diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake
new file mode 100644
index 000000000..4f543a89b
--- /dev/null
+++ b/ports/libui/portfile.cmake
@@ -0,0 +1,27 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO andlabs/libui
+    REF 7138276ccfbde94873cb6e2db65642adcbd2ee19
+    SHA512 3a9fb27d0c376479f58ba2fc5be3579efa5f462776a7e725313b92413ce78f3ca60897e63b580c419eeaee2cd2101de2be1ee5af80a547ef433c6284a3053d45
+    HEAD_REF master
+    PATCHES
+        fix-cmake.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libui TARGET_PATH share/unofficial-libui)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/libui/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL
index eb070c132..d68720137 100644
--- a/ports/nghttp2/CONTROL
+++ b/ports/nghttp2/CONTROL
@@ -1,3 +1,3 @@
 Source: nghttp2
-Version: 1.34.0
+Version: 1.35.0
 Description: Implementation of the Hypertext Transfer Protocol version 2 in C
diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake
index cf80ecd66..52f754afb 100644
--- a/ports/nghttp2/portfile.cmake
+++ b/ports/nghttp2/portfile.cmake
@@ -1,7 +1,7 @@
 include(vcpkg_common_functions)
 
 set(LIB_NAME nghttp2)
-set(LIB_VERSION 1.34.0)
+set(LIB_VERSION 1.35.0)
 
 set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
@@ -9,7 +9,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/nghttp2/nghttp2/releases/download/v${LIB_VERSION}/${LIB_FILENAME}"
     FILENAME "${LIB_FILENAME}"
-    SHA512 f027f8e043c58710ff34a65c705c0a76d91ffbf20f684606dbbbecc10f0e1fbc98a41047b8df5061af0bda6e8f89a9587e33c6549181f9317c4d3336e4a8b62e
+    SHA512 65889545684e2c8b4aeeb7084ca36e3f78927fa2b6d1df906af3970d8ce6c7c6093b56a5e0713f7bb54a98f06ad52d6e2b323e760297610702afe526b0fdd577
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
index 0a12f78c8..a9f23813d 100644
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@@ -1,5 +1,5 @@
 Source: pcl
-Version: 1.9.0-1
+Version: 1.9.1-1
 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
 Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio
 
diff --git a/ports/pcl/pcl_utils.patch b/ports/pcl/pcl_utils.patch
index 3f266cdfd..9c12e4d05 100644
--- a/ports/pcl/pcl_utils.patch
+++ b/ports/pcl/pcl_utils.patch
@@ -1,22 +1,28 @@
 diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
-index 41a64a269..a12718339 100644
+index f523dbc8c..a171b6d24 100644
 --- a/cmake/pcl_utils.cmake
 +++ b/cmake/pcl_utils.cmake
-@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS)
+@@ -97,21 +97,12 @@ macro(SET_INSTALL_DIRS)
+   if (NOT DEFINED LIB_INSTALL_DIR)
+     set(LIB_INSTALL_DIR "lib")
    endif (NOT DEFINED LIB_INSTALL_DIR)
-     if(NOT ANDROID)
-       set(INCLUDE_INSTALL_ROOT
--          "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
-+          "include")
-     else(NOT ANDROID)
-       set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
-     endif(NOT ANDROID)
-@@ -114,7 +114,7 @@ macro(SET_INSTALL_DIRS)
+-    if(NOT ANDROID)
+-      set(INCLUDE_INSTALL_ROOT
+-          "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+-    else(NOT ANDROID)
+-      set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
+-    endif(NOT ANDROID)
++    set(INCLUDE_INSTALL_ROOT "include") 
+     set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
+     set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
      set(BIN_INSTALL_DIR "bin")
      set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
-     if(WIN32 AND NOT MINGW)
+-    if(WIN32 AND NOT MINGW)
 -        set(PCLCONFIG_INSTALL_DIR "cmake")
-+        set(PCLCONFIG_INSTALL_DIR "share/pcl")
-       else(WIN32 AND NOT MINGW)
-         set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
-       endif(WIN32 AND NOT MINGW)
+-      else(WIN32 AND NOT MINGW)
+-        set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+-      endif(WIN32 AND NOT MINGW)
++    set(PCLCONFIG_INSTALL_DIR "share/pcl")
+ endmacro(SET_INSTALL_DIRS)
+ 
+ 
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 650e6de1a..4036d5346 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PointCloudLibrary/pcl
-    REF pcl-1.9.0
-    SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc
+    REF pcl-1.9.1
+    SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf
     HEAD_REF master
     PATCHES pcl_utils.patch
             pcl_config.patch
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL
index 09afae49c..076c71211 100644
--- a/ports/range-v3/CONTROL
+++ b/ports/range-v3/CONTROL
@@ -1,3 +1,3 @@
 Source: range-v3
-Version: 0.4.0-20181122
+Version: 0.4.0-20181129
 Description: Range library for C++11/14/17.
diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake
index cbdf04227..f7577c9bb 100644
--- a/ports/range-v3/portfile.cmake
+++ b/ports/range-v3/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ericniebler/range-v3
-    REF 00d4676502aa257a3ce934b50555211b4791ae05
-    SHA512 a0067e1b0d1d2261c2f868ebc57278b74a081ccc00dcd65648b5c362317c6cd3321fb3b9936733d839cd9d48cf801d1f23710bce9e33edd9dfa8f32556d90526
+    REF cf8add9f467aac695b9fa38e168b90df36b1a806
+    SHA512 92b1c09a423f6672b710abfde886b28d789a030f0f5db1c340ab75eead4abcf1a8b213adeb197af92747678873b1cae62362ee878c2a6bb38e532b0e83ac7bb2
     HEAD_REF master
 )
 
diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL
index 48ceab120..af985fa67 100644
--- a/ports/wxwidgets/CONTROL
+++ b/ports/wxwidgets/CONTROL
@@ -1,4 +1,4 @@
 Source: wxwidgets
-Version: 3.1.1
+Version: 3.1.1-2
 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.
 Build-Depends: zlib, libpng, tiff, expat
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake
index e18b8a6ba..062238946 100644
--- a/ports/wxwidgets/portfile.cmake
+++ b/ports/wxwidgets/portfile.cmake
@@ -5,11 +5,7 @@ vcpkg_from_github(
     REF v3.1.1
     SHA512 f6d8974e2f48bae7e96a8938df3ad5efc403036c1dcbe2b48edd276ee7923802ba3e95e3f3bd9db17985e427b8e4f78950df0cbba83ae99d508ed04633816c95
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-platform-lib-dir.patch"
+    PATCHES disable-platform-lib-dir.patch
 )
 
 vcpkg_configure_cmake(
@@ -48,4 +44,11 @@ endif()
 # Handle copyright
 file(COPY ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/wxwidgets/licence.txt ${CURRENT_PACKAGES_DIR}/share/wxwidgets/copyright)
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h ${CURRENT_PACKAGES_DIR}/include/wx/setup.h)
+endif()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/mswu)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/mswud)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp
index fad3ff119..571562244 100644
--- a/toolsrc/src/vcpkg/base/downloads.cpp
+++ b/toolsrc/src/vcpkg/base/downloads.cpp
@@ -42,6 +42,28 @@ namespace vcpkg::Downloads
                                     0);
         Checks::check_exit(VCPKG_LINE_INFO, hSession, "WinHttpOpen() failed: %d", GetLastError());
 
+        // Win7 IE Proxy fallback
+        if (IsWindows7OrGreater() && !IsWindows8Point1OrGreater()) {
+            // First check if any proxy has been found automatically
+            WINHTTP_PROXY_INFO proxyInfo;

+            DWORD proxyInfoSize = sizeof(WINHTTP_PROXY_INFO);

+            auto noProxyFound = 

+                !WinHttpQueryOption(hSession, WINHTTP_OPTION_PROXY, &proxyInfo, &proxyInfoSize) 

+                || proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY;

+

+            // If no proxy was found automatically, use IE's proxy settings, if any

+            if (noProxyFound) {
+                WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ieProxy;
+                if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr) {
+                    WINHTTP_PROXY_INFO proxy;
+                    proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
+                    proxy.lpszProxy = ieProxy.lpszProxy;
+                    proxy.lpszProxyBypass = ieProxy.lpszProxyBypass;
+                    WinHttpSetOption(hSession, WINHTTP_OPTION_PROXY, &proxy, sizeof(proxy));
+                }
+            }
+        }
+
         // Use Windows 10 defaults on Windows 7
         DWORD secure_protocols(WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 |
                                WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2);