Upgrades 2018.10.11

54 files changed, 141 insertions, 123 deletions

diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
index 61eb0e906..5ecd6e13c 100644
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@@ -1,5 +1,5 @@
 Source: abseil

-Version: 2018-09-18-3

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

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

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

diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index 7894b5654..475a222c3 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO abseil/abseil-cpp

-    REF 8ff1374008259719b54a8cb128ef951c02da164c
-    SHA512 c8eaef8d3a829152bbe1a9adf60fad74858d10e78d2fd1ad8409a027add2f9e24df9994e4981960550b04845838ec6f5ac83b09d6a8850d129fb078d15c4b94f

+    REF f340f773edab951656b19b6f1a77c964a78ec4c2
+    SHA512 48f7de32255313292f0a86113149180d299902a1ced9cdf9dc5e6beefbd75eb0522ff4ab61e216474e64dd38aebc7c544a6cf7a3fea5836c82f28f19a582965a

     HEAD_REF master

 )

 

diff --git a/ports/args/CONTROL b/ports/args/CONTROL
index 39b10c0b3..2fc33be71 100644
--- a/ports/args/CONTROL
+++ b/ports/args/CONTROL
@@ -1,3 +1,3 @@
 Source: args
-Version: 2018-06-28
+Version: 2018-10-11
 Description: A simple header-only C++ argument parser library.
diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake
index 6d404b334..37ec56a1b 100644
--- a/ports/args/portfile.cmake
+++ b/ports/args/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Taywee/args
-    REF 3de44ec671db452cc0c4ef86399b108939768abb
-    SHA512 ba0f6d3f35ffd49a1c96bdd7f614dd1aea5644c1350d17986021fee92a6075e12fdb5711d098087475231cec90ccd7c2dcabf42ab8880b6645dac27d391275fc
+    REF 24868affc8f7f88ce8781bc6a21c5c7d5067c508
+    SHA512 123e72a0f1d275de565443f818f37d3cf38ca43056802395aecf89d3cd913f628675c742cd136bf5cd25347ce783a34d938e2d97b6acf52e7479737dd0b8da33
     HEAD_REF master
 )
 
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index 7402c2e35..19a0ae5fb 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.6.12-1
+Version: 1.6.29
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
 Default-Features: dynamodb, s3, kinesis
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 854e24fcb..a2892e5ac 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
-    REF 1.6.12
-    SHA512 37cd573ea354394c170a081572f63dfe604bf631d0129a53f066f121680b92c8f64b343a4d841de9a178679a322755a858a1148fbfc99c3f525a1f025fdfbd84
+    REF 1.6.29
+    SHA512 54fd4ed4ddcc1c88e7efc951de2f13bc4b95cd08adf3b5dc74cdea68908accdc6dbf2f00bdc6f5aef1b8bf4c74023f6c22410a18766cb283e9cee03c3fd27d5b
     HEAD_REF master
 )
 
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
index 10c288d42..a120bc416 100644
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
 Source: catch2
-Version: 2.4.0
+Version: 2.4.1
 Description: A modern, header-only test framework for unit testing.
   Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index 81a0f6d0d..202ac8701 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
-    REF v2.4.0
-    SHA512 7bd148271520dfce24f64bab084226387a6adc9f0a5439b6cb2fa6b4e44b495475ecd9bc5936c6fa4f17e45132e826d8d47410b33d6c218d7a3202f5bb0ccbf4
+    REF v2.4.1
+    SHA512 054751959b675a4c871538f2e65b50e0efbaee8d0fafb26f0013a2b0da6fab406dbe9493dc4888c5651bce3da32ab7d7a56694dd68427377c6b0b25804657356
     HEAD_REF master
 )
 
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL
index cc29aa2d5..005059909 100644
--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@@ -1,3 +1,3 @@
 Source: chakracore
-Version: 1.11.1-1
+Version: 1.11.2
 Description: Core part of the Chakra Javascript engine
diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake
index 3d7b2630d..43bb1606c 100644
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/ChakraCore
-    REF v1.11.1
-    SHA512 cabec836af505504ffff99050de79320fe32e7311842bc5c715dae18ae7e006b63bb56f4d071016708ddec05a2a07143677371a76a57def68fb7f428012452d3
+    REF v1.11.2
+    SHA512 6261a7028bf398703a610d9ad42b6bde7c6309d2997c7cfaa785c1fbcf582adbbbe60756bbe411af1d6e1d26ac9acca5cbe734608885d8b5f2881819477292b7
     HEAD_REF master
 )
 
diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL
index ecb4df9f9..6170fb678 100644
--- a/ports/cimg/CONTROL
+++ b/ports/cimg/CONTROL
@@ -1,3 +1,3 @@
 Source: cimg
-Version: 2.3.6
+Version: 2.4.0
 Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing
diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake
index edf4839d3..8dd1626f6 100644
--- a/ports/cimg/portfile.cmake
+++ b/ports/cimg/portfile.cmake
@@ -2,9 +2,9 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "dtschump/CImg"
-    REF v.2.3.6
+    REF v.2.4.0
     HEAD_REF master
-    SHA512 b2214e6f72eee0dd4fd20739030c4082bfe67923a7f2efe74709b42e07d58552a6b7d1306f0fddf9478294e822313fe3bae0bff5c141e7dbb4453d08b3d9b05d)
+    SHA512 5aae75afcccc965e11eae6f322a15d245d2f75b7ad4914c61add3638c1bfaf5d9cf8cc52b52743cd21b149e0397ce180ab5e5f29dc09d37b443c3f3550c8a5a5)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL
index a89b87f8e..461d3036c 100644
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@@ -1,4 +1,4 @@
 Source: exiv2
-Version: 2018-09-18
+Version: 2018-10-11
 Build-Depends: zlib, expat, libiconv
 Description: Image metadata library and tools http://www.exiv2.org
diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake
index 4af8fb986..30d5805f1 100644
--- a/ports/exiv2/portfile.cmake
+++ b/ports/exiv2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Exiv2/exiv2
-    REF 37b8725565f42c260f9773fe4cfb8fa39f566746
-    SHA512 8be6079546099ac7267978ed3aa1c8e42215baa06b5da30c78918dac8193a725b3c38f6fb47fb50e7724580a964360163e2167b08c7e5929485fd3bd037338b0
+    REF 4c093fece194e55d029e0f6474e00bb38c1d3b46
+    SHA512 33132eeb51dfe4bd22a0b2bd8a66d017c27ecc9c966d72ce0691f5d01d46d1d7881d9a96c35f0e3fd6165cbcc55a6ddb98d45685be9863f41a41e0af053a89a0
     HEAD_REF master
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/iconv.patch"
 )
diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL
index c2e69703e..d00c2aaae 100644
--- a/ports/exprtk/CONTROL
+++ b/ports/exprtk/CONTROL
@@ -1,3 +1,3 @@
 Source: exprtk
-Version: 2018.09.30-9836f21
+Version: 2018-10-11
 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine.
diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL
new file mode 100644
index 000000000..1267b81b9
--- /dev/null
+++ b/ports/fizz/CONTROL
@@ -0,0 +1,4 @@
+Source: fizz

+Version: 2018.10.15.00

+Build-Depends: folly, openssl, libsodium

+Description: a TLS 1.3 implementation by Facebook

diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
new file mode 100644
index 000000000..f1c140afa
--- /dev/null
+++ b/ports/fizz/portfile.cmake
@@ -0,0 +1,41 @@
+include(vcpkg_common_functions)

+

+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO facebookincubator/fizz

+    REF v2018.10.15.00

+    SHA512 bf16050eebb8fa131927064a2467ee8cc20ba9a214cf232f38067afa9cb71414fa19ab1c65d7f2fb3e6dff651065aadeed02724fb4660fedb0c44da9073222c0

+    HEAD_REF master

+)

+

+# Prefer installed config files

+file(REMOVE

+    ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake

+    ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake

+    ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake

+)

+

+vcpkg_configure_cmake(

+    SOURCE_PATH "${SOURCE_PATH}/fizz"

+    PREFER_NINJA

+    OPTIONS

+        -DBUILD_TESTS=OFF

+        -DINCLUDE_INSTALL_DIR:STRING=include

+)

+

+vcpkg_install_cmake()

+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/fizz")

+vcpkg_copy_pdbs()

+

+file(READ ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake _contents)

+string(REPLACE "lib/cmake/fizz" "share/fizz" _contents "${_contents}")

+file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake "${_contents}")

+

+file(REMOVE_RECURSE

+    ${CURRENT_PACKAGES_DIR}/debug/include

+)

+

+# Handle copyright

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fizz RENAME copyright)

diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index 88f41b36e..14306b730 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,3 +1,3 @@
 Source: fmt
-Version: 5.2.0
+Version: 5.2.1
 Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index 9389d2fbf..a12f66c39 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
-    REF 5.2.0
-    SHA512 75d53e6d8087288607f75fb891bb8812c7b9fe65e5ab7a20cdffeb5e56bd1f48e0de24c8cf1c2dd603fe3ed76f9fa067804ec5d3560f177db8f0a747c36f9d1c
+    REF 5.2.1
+    SHA512 2b63a741df4df9c3cbf04098c6548bb3d0f9836fe912325542298df57c888f43e72159469fb87685b423694e43e4418545377d5ee6393f2709955be2c13780a8
     HEAD_REF master
 )
 
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 51a31ef8b..b63075ef9 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2018.09.17.00
+Version: 2018.10.08.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/portfile.cmake b/ports/folly/portfile.cmake
index e1ce597bf..acf535aa8 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.09.17.00
-    SHA512 fe1f5ff2b55262717cb0e923ee3d8b5a82c85432823911afc924c209fc7e97ab776a3820c4b17e003a7a55150c8e0061918eaee33bdf7ca12ec1090ed7537592
+    REF v2018.10.08.00
+    SHA512 934e46104a34c1cf550532c7f47476b339b210059b21813adbe840eab5aa2e8053303607e33ace73ddf18dd750588bc30699f39758d11f6f80a2e0233515f1db
     HEAD_REF master
     PATCHES
         find-gflags.patch
diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL
index e33353ee7..ceae2bbda 100644
--- a/ports/forest/CONTROL
+++ b/ports/forest/CONTROL
@@ -1,3 +1,3 @@
 Source: forest
-Version: 9.0.5
+Version: 9.0.6
 Description: Template library of tree data structures
diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake
index 3b3d5c889..c1f0db881 100644
--- a/ports/forest/portfile.cmake
+++ b/ports/forest/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xorz57/forest
-    REF 9.0.5
-    SHA512 1dd3ae568ea2ce66cab285f392b167a08eef29387fffef3e9283c3ddaf1d461e5f6408cbce17bbaa928ba773a7890ec31f2612e5a2280cc4fe4a02824fbcd4a3
+    REF 9.0.6
+    SHA512 7cb6f25226bbd543332599d5ad2b8e13df6f06342ea12b58ed123ffd81d1362e10c2e01ff95132f7b25431a3ae984bee5cfb86852aa222e1fad1f4e6928f76bc
     HEAD_REF master
 )
 
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index c89a34afc..e6866ac2c 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,3 +1,3 @@
 Source: jsonnet
-Version: 2018-09-18
+Version: 2018-10-11
 Description: Jsonnet - The data templating language
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index 918a4de8d..7603877a5 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/jsonnet
-    REF 48df4a1007a88202495a30bf2fa65528335b35e6
-    SHA512 46734d797499d51a79c1c63d653bc8e6496d385a57c7a83a45c3ab82fa4f106abdb67a57b9641d5c9e1cf286f4f0a66cfdbc5e1987bda234d614c91d7be79c94
+    REF 8b15e8d5c1202dde1be2cd8631025ff7719b688b
+    SHA512 5eb00c7473503ae4bab3aca1fe822bf3df8ae186db4bd46feb26114395690119e1934cbe601f033075d9e2672c80b1441741607e63b0d6b1fab559be6cde84d8
     HEAD_REF master
 )
 
diff --git a/ports/liblinear/CONTROL b/ports/liblinear/CONTROL
index 8a9cbcb9a..e4e855c52 100644
--- a/ports/liblinear/CONTROL
+++ b/ports/liblinear/CONTROL
@@ -1,3 +1,3 @@
 Source: liblinear

-Version: 2.20-1

+Version: 221

 Description: A Library for Large Linear Classification

diff --git a/ports/liblinear/portfile.cmake b/ports/liblinear/portfile.cmake
index 550b5745a..a73fa044b 100644
--- a/ports/liblinear/portfile.cmake
+++ b/ports/liblinear/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO cjlin1/liblinear

-    REF v220

-    SHA512 8e6e0bc87982bf9bb1c8ec206f82042942044fc7f5c28634356c7b926ced4907d46d4e791eaa8bf6b994921c45c7973c1ecb9c4174c18df49ea215c6b17e7c79

+    REF v221

+    SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753

     HEAD_REF master

 )

 

diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL
index 5d9f3607f..a2bee52b5 100644
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@@ -1,3 +1,3 @@
 Source: libuv
-Version: 1.23.0
+Version: 1.23.2
 Description: libuv is a multi-platform support library with a focus on asynchronous I/O.
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 29741433c..c8c7daf88 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuv/libuv
-    REF v1.23.0
-    SHA512 d1622ea9c03661ce2dfa18e1725fc1bfdf3b16d7e40babc552dcc5b2f86d52f4dd81cac9bf89914024b11e4ed3671264dfcfba867cfa3b1a2206b89c59c95851
+    REF v1.23.2
+    SHA512 f91accf4ba9987fad23cc546a9821c3d643f8505cae22e0cbe28c4d5d5cb6b370b3483c6d95195cff3bcddd1e94f1bdab740075c3eaf22f8f673f7a57c1fdfc5
     HEAD_REF v1.x
 )
 
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
index 12bc943d7..8771fe077 100644
--- a/ports/openimageio/CONTROL
+++ b/ports/openimageio/CONTROL
@@ -1,5 +1,5 @@
 Source: openimageio
-Version: Release-1.8.13
+Version: 1.8.15
 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
 
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index c5786db64..80dc8faec 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenImageIO/oiio
-    REF Release-1.8.13
-    SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e
+    REF Release-1.8.15
+    SHA512 e022e5c7e300d3dd952bcf3476e1b676a8931f67ba6b3959b26c75b9709907ac1c1b99de651f5876045f9a333e325a161b0d5159cb5bf385eb4f9f90a04707c7
     HEAD_REF master
     PATCHES
         # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES'
diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL
index e35601ab5..ebfeb05d0 100644
--- a/ports/re2/CONTROL
+++ b/ports/re2/CONTROL
@@ -1,3 +1,3 @@
 Source: re2

-Version: 2018-09-18
+Version: 2018-10-11
 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.
\ No newline at end of file
diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake
index 48aa9e48d..5a038bc5d 100644
--- a/ports/re2/portfile.cmake
+++ b/ports/re2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO google/re2

-    REF 4c916c947ab7f2ba2d280bb8c87540c365d30695
-    SHA512 7f34073415b2afd36469a0ffedb5d6d38b0230a82d633f2b45538e66d00ff0e411ffff1e34f74747c68518b1fdf07f7a601c23d39b001a75bcf9dadfc1350f04

+    REF 6272edcb53d3c8705f57df3b46b1f92e646e30bc
+    SHA512 4a4f1eb44e3d2acce8697405bb27c31953b8d154245a1864376376bcf92e867166a203adb53c3d1f76c0de77ad090992992e54242b18477d9d60fe61ffb7406c

     HEAD_REF master

 )

 

diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL
index 33f0a1f63..022b8ee9e 100644
--- a/ports/rs-core-lib/CONTROL
+++ b/ports/rs-core-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: rs-core-lib
-Version: 2018-09-18
+Version: 2018-10-11
 Description: Minimal common utilities by Ross Smith
 
diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake
index 927f34ea6..a001a06b0 100644
--- a/ports/rs-core-lib/portfile.cmake
+++ b/ports/rs-core-lib/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CaptainCrowbar/rs-core-lib
-    REF 9ffa126a7ca1a717ffd2c055c5049a15e1507d54
-    SHA512 cdb02c546ff4514b63b3467b3296b0e5353ddcce8b774fa8accfbfd6559ab4a258af4822c219a5ce005719216c0c8c8707d377d2ce3ddb7d7a45fd9501787b60
+    REF 4e142e1458f20086b3b4269d0537604117769e25
+    SHA512 789fdeee5da0e9c64236f9bc0be32121c38a6fc3bec6976751a94ea78bd464a7c9389a5fd112d56eb6c10c7c2dc342276305b8e9831fe880c39f4f5017d26ddc
     HEAD_REF master
 )
 
diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL
index 690e8bf4b..e74bed587 100644
--- a/ports/spdlog/CONTROL
+++ b/ports/spdlog/CONTROL
@@ -1,4 +1,4 @@
 Source: spdlog
-Version: 1.0.0
+Version: 1.2.0
 Description: Very fast, header only, C++ logging library
 Build-Depends: fmt
diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake
index 90152bc08..66c727073 100644
--- a/ports/spdlog/portfile.cmake
+++ b/ports/spdlog/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gabime/spdlog
-    REF v1.0.0
-    SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1
+    REF v1.2.0
+    SHA512 f45d682e736106fdf9b96560c06eb8e8cc86d342003f0ef344954bf76aabc68dcdff53a767e4244fc9c48a900ba9fb122bb645962c1666139f860d68a354bfa9
     HEAD_REF v1.x
 )
 
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index e87106dc3..8aa6dee78 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
 Source: tbb
-Version: 2018_U5-4
+Version: 2018_U6
 Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index ac47360f8..a4e912742 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO 01org/tbb
-    REF 2018_U5
-    SHA512 3e8d20276ccb1b50099f96b6cf968e3d0ada53caea1fa836ecb8652f1dca236fbbbf2c783e64ea2f761f7f21725064d19b72d176e35e4dc29706b8a30965153b
+    REF 2018_U6
+    SHA512 efcd020a24fa41e07ff9232098cecce42ceec5882849bc30edc29ead1694fcc8820a0defb307e0a065c1db1d649a731e13d8cb6fd6f927b4bd3bdc46de0d1709
     HEAD_REF tbb_2018
 )
 
diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL
index b654f4816..876e74991 100644
--- a/ports/thrift/CONTROL
+++ b/ports/thrift/CONTROL
@@ -1,4 +1,4 @@
 Source: thrift
-Version: 2018-09-18
+Version: 2018-10-11
 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit
 Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010.
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
index 88c74d6e1..13a2f85bd 100644
--- a/ports/thrift/portfile.cmake
+++ b/ports/thrift/portfile.cmake
@@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/thrift
-    REF 12f8b14fff9888dbfe6f5d6c64dc462254922a31
-    SHA512 e067b1e5533f323c7f3f20365388ab4dfd796bca427ec5e087e5bac2ae74412536eec1dea4f694c58e1b9e91763d16a8a07c25daa03676ec33bf8b1107913e47
+    REF 2a2b72f6c8aef200ecee4984f011e06052288ff2
+    SHA512 459b980af10d7f6eaa10b571d18f0efa668a8fc87d47307534e9043721ed28648deab261575e61727c50bf98788fe1f109265de4f5b87eaf57a444bcc7f5bfdd
     HEAD_REF master
 )
 
diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL
index f6a3bc9c0..808ab41a7 100644
--- a/ports/unicorn-lib/CONTROL
+++ b/ports/unicorn-lib/CONTROL
@@ -1,4 +1,4 @@
 Source: unicorn-lib
-Version: 2018-09-18
+Version: 2018-10-11
 Description: Unicode library for C++ by Ross Smith
 Build-Depends: rs-core-lib, pcre2, zlib, libiconv
diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake
index 3b97d3c01..b2bc2f89b 100644
--- a/ports/unicorn-lib/portfile.cmake
+++ b/ports/unicorn-lib/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CaptainCrowbar/unicorn-lib
-    REF 6456df41b6dfeecd35ec1d50eb86657512c76c40
-    SHA512 04756035039b93905713e7c7f2fac66d545f3792d39b9c2c95946c4423a9e1bdef7fe736488764800f494570a3e9a83adc84b60a750bf62b2af4508671f76afe
+    REF d1c0918397ce2e5b1631686ff85a475eface027a
+    SHA512 1a2d2cf9bf34210068de4dfb70c0511dd661f2dd1ee574ed5d7b9f8f94bb6f0bf455b1a78633ad776357e1d7ef179231089d6936fd00ad11a3b073a5ba1bed2b
     HEAD_REF master
 )
 
diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL
index 80d33202c..f6c176b14 100644
--- a/ports/unicorn/CONTROL
+++ b/ports/unicorn/CONTROL
@@ -1,3 +1,3 @@
 Source: unicorn
-Version: 2018-09-18
+Version: 2018-10-11
 Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework
diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake
index 2a52c6be6..7d49ec05b 100644
--- a/ports/unicorn/portfile.cmake
+++ b/ports/unicorn/portfile.cmake
@@ -14,8 +14,8 @@ set(VCPKG_CRT_LINKAGE "static")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO unicorn-engine/unicorn
-    REF 46999575fb9e82ccd925e835d0d7db47200e010d
-    SHA512 9a93157266f2f6b7f5b6fabefda77b4d617648f0112ff6b575be8c92eea16ea6c96b0575f040fd5a893240907492335c53c03c840fee58ca8808b39762fefc34
+    REF 400a0ab30978ed06525a0ca24437fdadb2b10642
+    SHA512 2bf0d127672e83d5cee08918b43a0edc1b229213b1de5ef2fbe99e79c17f4cb9f02bb34c9c123012ba8fcf5e08990d773ba08053356512749f95146961b7d19a
     HEAD_REF master
 )
 
diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
index 9397b3d61..4bb5a2269 100644
--- a/ports/wangle/CONTROL
+++ b/ports/wangle/CONTROL
@@ -1,4 +1,4 @@
 Source: wangle

-Version: v2018.07.30.00-1

-Build-Depends: folly, openssl, gtest, glog, libevent, double-conversion

-Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.
\ No newline at end of file
+Version: 2018.07.30.00-2

+Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion

+Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.

diff --git a/ports/wangle/build.patch b/ports/wangle/build.patch
index fce998fed..d695f5b18 100644
--- a/ports/wangle/build.patch
+++ b/ports/wangle/build.patch
@@ -1,9 +1,9 @@
 diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt

-index 0302249..3bf1e6c 100644

+index 15dc8b6..ed8c79b 100644

 --- a/wangle/CMakeLists.txt

 +++ b/wangle/CMakeLists.txt

-@@ -38,9 +38,9 @@ endif()

- 

+@@ -39,9 +39,9 @@ endif()

+ find_package(fizz CONFIG REQUIRED)

  find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context)

  find_package(OpenSSL REQUIRED)

 -find_package(Glog REQUIRED)

@@ -15,40 +15,11 @@ index 0302249..3bf1e6c 100644
  find_package(DoubleConversion REQUIRED)

  find_package(Threads REQUIRED)

  if (UNIX AND NOT APPLE)

-@@ -116,11 +116,9 @@ if (BUILD_SHARED_LIBS)

-     PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 1)

- endif()

- 

--target_include_directories(

--  wangle

--  PUBLIC

--    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>

--    $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>

-+include_directories(

-+   "${CMAKE_SOURCE_DIR}/.."

-+   ${INCLUDE_INSTALL_DIR}

+@@ -123,6 +123,7 @@ target_include_directories(

+   PUBLIC

+     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>

+     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>

++  PRIVATE

+     ${FIZZ_INCLUDE_DIR}

      ${FOLLY_INCLUDE_DIR}

      ${Boost_INCLUDE_DIR}

-     ${OPENSSL_INCLUDE_DIR}

-@@ -143,15 +141,19 @@ target_link_libraries(wangle PUBLIC

- install(

-   TARGETS wangle

-   EXPORT wangle-exports

--  DESTINATION ${LIB_INSTALL_DIR}

-+  RUNTIME DESTINATION bin

-+  LIBRARY DESTINATION lib

-+  ARCHIVE DESTINATION lib

- )

- # We unfortunately cannot install wangle's headers with the install()

- # statement above.  install(TARGETS) appears to only support installing

- # PUBLIC_HEADER in a flat include directory, and not a deeper tree.

-+if(NOT DISABLE_INSTALL_HEADERS)

- foreach(dir ${WANGLE_HEADER_DIRS})

--  install(DIRECTORY ${dir} DESTINATION "${INCLUDE_INSTALL_DIR}/wangle"

-+  install(DIRECTORY ${dir} DESTINATION "include/wangle"

-           FILES_MATCHING PATTERN "*.h")

- endforeach()

-+endif()

- 

- # Install CMake package configuration files for wangle

- include(CMakePackageConfigHelpers)

diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
index 8bd8e8c63..4c39b486a 100644
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@@ -1,10 +1,12 @@
 include(vcpkg_common_functions)

 

+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO facebook/wangle

-    REF v2018.07.30.00

-    SHA512 f83378a8751b47fac2c862e07ffeb2750fd681735e66d778657d7624fe3e839b2e2bfcb049ecd3a3516c206d93f9c168144599ded823720967e44037b536ba5d

+    REF v2018.10.15.00

+    SHA512 aa7db7ef8c6332f951342228b6022fc2798e5cc2769ec7377c4f369a0e585832953e4454cef0b7c37ca368dc72f09278f92d5457bf7dffc31663ce7d28ee557d

     HEAD_REF master

     PATCHES

         build.patch

@@ -16,8 +18,7 @@ vcpkg_configure_cmake(
     PREFER_NINJA

     OPTIONS

         -DBUILD_TESTS=OFF

-    OPTIONS_DEBUG

-        -DDISABLE_INSTALL_HEADERS=ON

+        -DINCLUDE_INSTALL_DIR:STRING=include

 )

 

 vcpkg_install_cmake()

@@ -25,6 +26,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/wangle")
 vcpkg_copy_pdbs()

 

 file(REMOVE_RECURSE 

+    ${CURRENT_PACKAGES_DIR}/debug/include

     ${CURRENT_PACKAGES_DIR}/include/wangle/util/test

     ${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs

     ${CURRENT_PACKAGES_DIR}/include/wangle/service/test

diff --git a/ports/yoga/CONTROL b/ports/yoga/CONTROL
index e454a6406..a9fcd9419 100644
--- a/ports/yoga/CONTROL
+++ b/ports/yoga/CONTROL
@@ -1,3 +1,3 @@
 Source: yoga
-Version: 1.9.0
+Version: 1.10.0
 Description: Yoga is a cross-platform layout engine which implements Flexbox
diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake
index 026eac0f4..a8d532474 100644
--- a/ports/yoga/portfile.cmake
+++ b/ports/yoga/portfile.cmake
@@ -21,8 +21,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/yoga
-    REF 1.9.0
-    SHA512 34b8e0f8ee1b5d4bd0113f6d5cb8e218399d65d0b0bf8c50770746275a3076b7bc1af9c3d15aba0a2e858a5696f85bca206c89509625789598defb8e37802243
+    REF 1.10.0
+    SHA512 629d9fbc4e4ad3c495a92896803bf7a0fca8dd986068d9862ba2c9aa0a70f8542a35c0e9ce9974ccdc004827e5e072f45b6eabff1d00462ec437b48de9dfacf4
     HEAD_REF master
 )
 
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL
index ba419fb39..a4a6dd37d 100644
--- a/ports/zeromq/CONTROL
+++ b/ports/zeromq/CONTROL
@@ -1,3 +1,3 @@
 Source: zeromq
-Version: 2018-09-18
+Version: 2018-10-11
 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products
diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake
index 188eb0918..b19d2821a 100644
--- a/ports/zeromq/portfile.cmake
+++ b/ports/zeromq/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeromq/libzmq
-    REF ea517a28ff23cff24a3b2ead42e1f6a44e6fad0e
-    SHA512 11425b151192b39e770ece1df3139b99315a4647ec242e951b736cc232da79a0b80f635b071d87adaa7d3f6d4266ab67d31b8f95f31fe3ab278e53febc5ae796
+    REF cfc9d5f5198e611d8d3ad4482d57cf6bb5b6bf59
+    SHA512 1917bb9838798d6d977171cc03477ac909cbcf999527a0019efac9a31176f5becba5eef269569777121288dbd2d601c0c579e83cfe1cb1aa6eb093f74adcc955
     HEAD_REF master
 )
 
diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
index 47c91f83c..ea9923df3 100644
--- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
+++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
@@ -117,7 +117,7 @@ function(vcpkg_fixup_cmake_targets)
 
             file(READ ${DEBUG_TARGET} _contents)
             string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" _contents "${_contents}")
-            string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+\\.exe)" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" _contents "${_contents}")
+            string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \";]+\\.exe)" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" _contents "${_contents}")
             string(REPLACE "\${_IMPORT_PREFIX}/lib" "\${_IMPORT_PREFIX}/debug/lib" _contents "${_contents}")
             string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/debug/bin" _contents "${_contents}")
             file(WRITE ${RELEASE_SHARE}/${DEBUG_TARGET_REL} "${_contents}")
@@ -134,9 +134,9 @@ function(vcpkg_fixup_cmake_targets)
             "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
             _contents "${_contents}")
         string(REPLACE "${CURRENT_INSTALLED_DIR}" "_INVALID_ROOT_" _contents "${_contents}")
-        string(REGEX REPLACE ";_INVALID_ROOT_/[^\";]*" "" _contents "${_contents}")
-        string(REGEX REPLACE "_INVALID_ROOT_/[^\";]*;" "" _contents "${_contents}")
-        string(REGEX REPLACE "\"_INVALID_ROOT_/[^\";]*\"" "\"\"" _contents "${_contents}")
+        string(REGEX REPLACE "_INVALID_ROOT_/[^\";>]*" "" _contents "${_contents}")
+        string(REGEX REPLACE ";;+" ";" _contents "${_contents}")
+        string(REGEX REPLACE "\";\"" "\"\"" _contents "${_contents}")
         file(WRITE ${MAIN_TARGET} "${_contents}")
     endforeach()
 
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index 7569f340f..9b97701ef 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -468,18 +468,18 @@ namespace vcpkg::Build
         const Triplet& triplet = config.triplet;
         const std::string& name = config.scf.core_paragraph->name;
 
-        std::vector<AbiEntry> abi_tag_entries;
+        std::vector<AbiEntry> abi_tag_entries(dependency_abis.begin(), dependency_abis.end());
 
         abi_tag_entries.emplace_back(AbiEntry {"cmake", paths.get_tool_version(Tools::CMAKE)});
 
-        abi_tag_entries.insert(abi_tag_entries.end(), dependency_abis.begin(), dependency_abis.end());
-
         abi_tag_entries.emplace_back(
             AbiEntry {"portfile", vcpkg::Hash::get_file_hash(fs, config.port_dir / "portfile.cmake", "SHA1")});
         abi_tag_entries.emplace_back(
             AbiEntry {"control", vcpkg::Hash::get_file_hash(fs, config.port_dir / "CONTROL", "SHA1")});
 
-        abi_tag_entries.emplace_back(AbiEntry {"triplet", pre_build_info.triplet_abi_tag});
+        abi_tag_entries.emplace_back(AbiEntry{"vcpkg_fixup_cmake_targets", "1"});
+
+        abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag});
 
         const std::string features = Strings::join(";", config.feature_list);
         abi_tag_entries.emplace_back(AbiEntry {"features", features});