Merge branch 'master' of https://github.com/EMCECS/vcpkg

# Conflicts: # ports/ecsutil/CONTROL # ports/ecsutil/portfile.cmake
2024-11-30 17:39:11 +08:00 · 2018-11-13 15:48:26 -05:00 · 2018-11-13 15:48:26 -05:00 · d9e39bb405
commit d9e39bb405
parent 1a9dadf855 ffa114aaa4
353 changed files with 3813 additions and 1662 deletions
--- a/.gitignore
+++ b/.gitignore
@ -283,6 +283,7 @@ __pycache__/
 /installed*/
 /packages/
 /scripts/buildsystems/tmp/
+/toolsrc/build.rel/
 #ignore custom triplets
 /triplets/*
 #add vcpkg-designed triplets back in
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ Prerequisites:
 - Windows 10, 8.1, 7, Linux, or MacOS
 - Visual Studio 2017 or Visual Studio 2015 Update 3 (on Windows)
 - Git
- *Optional: CMake 3.10.2*
+- *Optional:* CMake 3.10.2

 To get started:
 ```
@ -18,19 +18,19 @@ To get started:
 > cd vcpkg

 PS> .\bootstrap-vcpkg.bat
-Ubuntu:~/$ ./bootstrap-vcpkg.sh
+Linux:~/$ ./bootstrap-vcpkg.sh
 ```

 Then, to hook up user-wide [integration](docs/users/integration.md), run (note: requires admin on first use)
 ```
 PS> .\vcpkg integrate install
-Ubuntu:~/$ ./vcpkg integrate install
+Linux:~/$ ./vcpkg integrate install
 ```

 Install any packages with
 ```
 PS> .\vcpkg install sdl2 curl
-Ubuntu:~/$ ./vcpkg install sdl2 curl
+Linux:~/$ ./vcpkg install sdl2 curl
 ```

 The best way to use installed libraries with CMake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as `-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake`.
--- a/docs/about/faq.md
+++ b/docs/about/faq.md
@ -35,7 +35,7 @@ To use different versions of a library for different projects, we recommend maki

 If your application is very sensitive to the versions of libraries, we recommend checking in the specific set of portfiles you need into your source control along with your project sources and using the `--vcpkg-root` option to redirect the working directory of `vcpkg.exe`.

-## How does Vcpkg protect my Privacy?
+## How does Vcpkg protect my privacy?
 See the [Privacy document](privacy.md) for all information regarding privacy.

 ## Can I use my own CMake toolchain file with Vcpkg's toolchain file?
@ -108,7 +108,7 @@ Conan.io is a publicly-federated, project-centric, cross-platform, C++ package m

 - **Cross-platform vs single-platform**. While being hosted on many platforms is an excellent north star, we believe the level of system integration and stability provided by apt-get, yum, and homebrew is well worth needing to exchange `apt-get install libboost-all-dev` with `brew install boost` in automated scripts. We chose to make our system as easy as possible to integrate into a world with these very successful system managers -- one more line for `vcpkg install boost` -- instead of attempting to replace them where they are already so successful and well-loved.

- **C++/CMake vs python**. While Python is an excellent language loved by many, we believe that transparency and familiarity are the most important factors when choosing a tool as important to your workflow as a package manager. Consequently, we chose to make the implementation languages be as universally accepted as possible: C++ should be used in a C++ package manager for C++ programmers. You should not be required to learn another language just to understand your package manager.
+- **C++/CMake vs python**. While Python is an excellent language loved by many, we believe that transparency and familiarity are the most important factors when choosing a tool as important to your workflow as a package manager. Consequently, we chose to make the implementation languages be as universally accepted as possible: C++ should be used in a C++ package manager for C++ programmers. You should not be required to learn another programming language just to understand your package manager.

 ## Why not Chocolatey?
 Chocolatey is an excellent system for managing applications. However, it is not currently designed to acquire redistributable developer assets and help you with debugging. Vcpkg, in comparison, is designed to get you the libraries you need to build your application and help you deliver through any platform you'd like (including Chocolatey!).
--- a/docs/examples/packaging-zlib.md
+++ b/docs/examples/packaging-zlib.md
@ -3,7 +3,7 @@
 ### Bootstrap with `create`
 First, locate a globally accessible archive of the library's sources. Zip, gzip, and bzip are all supported. Strongly prefer official sources or mirrors over unofficial mirrors.

-*Looking at zlib's website, the URL http://zlib.net/zlib128.zip looks appropriate.*
+*Looking at zlib's website, the URL http://zlib.net/zlib1211.zip looks appropriate.*

 Second, determine a suitable package name. This should be ASCII, lowercase, and recognizable to someone who knows the library's "human name". If the library is already packaged in another package manager, prefer that name.

@ -11,7 +11,7 @@ Second, determine a suitable package name. This should be ASCII, lowercase, and

 Finally, if the server's name for the archive is not very descriptive (such as downloading a zipped commit or branch from GitHub), choose a nice archive name of the form `<packagename>-<version>.zip`.

-*`zlib128.zip` is a fine name, so no change needed.*
+*`zlib1211.zip` is a fine name, so no change needed.*

 All this information can then be passed into the `create` command, which will download the sources and bootstrap the packaging process inside `ports\<packagename>`.

@ -26,7 +26,7 @@ In addition to the generated `ports\<package>\portfile.cmake`, we also need a `p
 *For zlib2, we'll create the file `ports\zlib2\CONTROL` with the following contents:*
 ```no-highlight
 Source: zlib2
-Version: 1.2.8
+Version: 1.2.11
 Description: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
 ```

--- a/docs/users/triplets.md
+++ b/docs/users/triplets.md
@ -62,6 +62,7 @@ See also the CMake documentation for toolchain files: https://cmake.org/cmake/he
 Sets additional compiler flags to be used when not using `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`.

 This option also has forms for configuration-specific and C flags:
+- `VCPKG_CXX_FLAGS`
 - `VCPKG_CXX_FLAGS_DEBUG`
 - `VCPKG_CXX_FLAGS_RELEASE`
 - `VCPKG_C_FLAGS`
--- a/ports/abseil/CMakeLists.txt
+++ b/ports/abseil/CMakeLists.txt
@ -17,8 +17,7 @@ endif()
 function(add_sublibrary LIB)
    file(GLOB_RECURSE SOURCES "absl/${LIB}/*.cc")
    list(FILTER SOURCES EXCLUDE REGEX "_test(ing)?(_.+)?.cc$|_nonprod.cc$|test_util.cc$|_benchmark.cc$")
-    file(GLOB HEADERS "absl/${LIB}/*.h" "absl/${LIB}/*.inc")
-    file(GLOB INTERNAL_HEADERS "absl/${LIB}/internal/*.h")
+    file(GLOB_RECURSE HEADERS "absl/${LIB}/*.h" "absl/${LIB}/*.inc")

    if(SOURCES)
        if("STATIC" IN_LIST ARGN)
@ -33,7 +32,6 @@ function(add_sublibrary LIB)
        target_include_directories(${LIB} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
    endif()

-
    install(TARGETS ${LIB} EXPORT unofficial-abseil-targets
        RUNTIME DESTINATION bin
        LIBRARY DESTINATION lib
@ -42,10 +40,11 @@ function(add_sublibrary LIB)

    if(INSTALL_HEADERS)
        if(HEADERS)
-            install(FILES ${HEADERS} DESTINATION "include/absl/${LIB}")
-        endif()
-        if(INTERNAL_HEADERS)
-            install(FILES ${INTERNAL_HEADERS} DESTINATION "include/absl/${LIB}/internal")
+            foreach(file IN LISTS HEADERS)
+                get_filename_component(dir ${file} DIRECTORY)
+                file(RELATIVE_PATH rel_dir ${CMAKE_SOURCE_DIR}/absl/${LIB} ${dir})
+                install(FILES ${file} DESTINATION "include/absl/${LIB}/${rel_dir}")
+            endforeach()
        endif()
    endif()
 endfunction()
@ -85,9 +84,6 @@ target_link_public_libraries(utility base meta)
 target_link_public_libraries(time base numeric)
 target_link_public_libraries(synchronization base time)

-find_package(unofficial-cctz REQUIRED)
-target_link_libraries(time PUBLIC unofficial::cctz)
-
 install(
    EXPORT unofficial-abseil-targets
    FILE unofficial-abseil-config.cmake
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@ -1,7 +1,6 @@
 Source: abseil
-Version: 2018-07-30
+Version: 2018-09-18-3
 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.
  Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.
-Build-Depends: cctz
--- 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 c2e00d341913bf03b4597ade5b056042e23e8c58
-    SHA512 60e9f0abc4ebbc356314c144b769a6918d4c5215df9f01aafb234f94756b08b670bdaf4cf88363ea4daf3bd19cb193ba6817aba70b208275d3d5d1ed2926ce9a
+    REF 8ff1374008259719b54a8cb128ef951c02da164c
+    SHA512 c8eaef8d3a829152bbe1a9adf60fad74858d10e78d2fd1ad8409a027add2f9e24df9994e4981960550b04845838ec6f5ac83b09d6a8850d129fb078d15c4b94f
    HEAD_REF master
 )

--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@ -1,3 +1,3 @@
 Source: ace
-Version: 6.5.1
+Version: 6.5.2
 Description: The ADAPTIVE Communication Environment
--- 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 "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.1.zip"
-    FILENAME "ACE-6.5.1.zip"
-    SHA512 b6444b183a356f4a9fc4af57ccc239a400121fbb00547ff9d13c51f0fc20f38b0aa87b9568531472e5f7fde82deea3d4c3d91d7504aca89799a2505ba492c73a
+    URLS "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.2.zip"
+    FILENAME "ACE-6.5.2.zip"
+    SHA512 ca8a55942b50628e851cad7074a249c480d82f916979a50bb24174432248037fb7a79ca055c7e6553d96aa58f14b97e8e8bf5dbc8671b72b8712e8a65f63ac98
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@ -1,4 +1,4 @@
 Source: alembic
-Version: 1.7.8
+Version: 1.7.9
 Build-Depends: ilmbase, hdf5
 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. http://alembic.io/
--- a/ports/alembic/portfile.cmake
+++ b/ports/alembic/portfile.cmake
@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO alembic/alembic
-    REF 1.7.8
-    SHA512 bc36e30d1aecd67da16247365a973c462e9716309d090fefe36f625c8d2ab2d517fe8ac694a9188cd6eeb623a3217f59f461c82fcfec43d0a60a07381526983a
+    REF 1.7.9
+    SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
    HEAD_REF master
 )

--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@ -1,3 +1,3 @@
 Source: apr
-Version: 1.6.3
+Version: 1.6.5
 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@ -4,13 +4,13 @@ endif()

 include(vcpkg_common_functions)

-set(VERSION 1.6.3)
+set(VERSION 1.6.5)

 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-${VERSION})
 vcpkg_download_distfile(ARCHIVE
    URLS "https://www.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
    FILENAME "apr-${VERSION}.tar.bz2"
-    SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
+    SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/asyncplusplus/CONTROL
+++ b/ports/asyncplusplus/CONTROL
@ -0,0 +1,3 @@
+Source: asyncplusplus
+Version: 1.0-1
+Description: Async++ is a lightweight concurrency framework for C++11
--- a/ports/asyncplusplus/portfile.cmake
+++ b/ports/asyncplusplus/portfile.cmake
@ -0,0 +1,34 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Amanieu/asyncplusplus
+    REF v1.0
+    SHA512 bb1fc032d2d8de49b4505e0629d48e5cfa99edfcafbf17848f160ceb320bcd993f1549095248d1a0ef8fc1ec07ecbaad6b634a770ddc1974092d373a508a5fe3
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/Async++.cmake ${CURRENT_PACKAGES_DIR}/cmake/Async++Targets.cmake)
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/async++)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/async++/Async++Targets.cmake ${CURRENT_PACKAGES_DIR}/share/async++/Async++.cmake)
+
+file(READ ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake _contents)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake "include(CMakeFindDependencyMacro)\n${_contents}")
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/asyncplusplus)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/LICENSE ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME Async++)
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@ -1,8 +1,8 @@
 Source: aws-sdk-cpp
-Version: 1.5.2
+Version: 1.6.12-1
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
-Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
+Default-Features: dynamodb, s3, kinesis
 # Automatically generated by generateFeatures.ps1

 Feature: access-management
--- a/ports/aws-sdk-cpp/CONTROL.in
+++ b/ports/aws-sdk-cpp/CONTROL.in
@ -2,4 +2,4 @@ Source: aws-sdk-cpp
 Version: 1.4.30-1
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
-Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
+Default-Features: dynamodb, s3, kinesis
--- 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.5.2
-    SHA512 d157e12ff836ee1ee875755ffd96312bdad7d8ad17d3cf7b5919f01f755ba62e53366eee0d32c1f41e9da7aa678fe3349cc19dd14bbaf5f2908474d6e66d6146
+    REF 1.6.12
+    SHA512 37cd573ea354394c170a081572f63dfe604bf631d0129a53f066f121680b92c8f64b343a4d841de9a178679a322755a858a1148fbfc99c3f525a1f025fdfbd84
    HEAD_REF master
 )

--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 5.0.0
+Version: 5.1.1
 Build-Depends: cpprestsdk, atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp)
 Description: Microsoft Azure Storage Client SDK for C++
  A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@ -7,8 +7,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Azure/azure-storage-cpp
-    REF v5.0.0
-    SHA512 730d082b4bf4ef73ee8aa5f8c87927149e4c2b65fc58dc9609f992ab8fcdd7e9fdbc4b77fbc46378ebd575196477dee7943db5d43724591d505aba511fe3052a
+    REF v5.1.1
+    SHA512 e5983d767681cf82a68af3c983a83515a2a7a3b5bf2ffbadcd2992dbcdf213bb322f8d0c4369a4c729ac7536e3e0f52e44cde012cbe1f9464df3ad901f635b6a
    HEAD_REF master
    PATCHES
        ${CMAKE_CURRENT_LIST_DIR}/pplx-do-while.patch
--- a/ports/blaze/portfile.cmake
+++ b/ports/blaze/portfile.cmake
@ -6,10 +6,6 @@ vcpkg_from_bitbucket(
    REF bbe39c81b68eb0d8647da703899e1ee4a82cdfd3
    SHA512 84eb8226672d9d11d194d165e7aaa333a0d49ca090bb94472f19242e5f2ad0c3e08a30cdafe055cff51b210b603533f879800bd6784f3ffdb0d9eeca65d58b25
    HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
    PATCHES
        avoid-src-dir-generation.patch
 )
--- a/ports/boost-lockfree/CONTROL
+++ b/ports/boost-lockfree/CONTROL
@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-lockfree
-Version: 1.68.0
-Build-Depends: boost-align, boost-array, boost-assert, boost-atomic, boost-config, boost-core, boost-integer, boost-mpl, boost-parameter, boost-predef, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.68.0-1
+Build-Depends: boost-align, boost-array, boost-assert, boost-atomic, boost-config, boost-core, boost-integer, boost-mpl, boost-parameter, boost-predef, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-iterator, boost-vcpkg-helpers
 Description: Boost lockfree module
--- a/ports/breakpad/CONTROL
+++ b/ports/breakpad/CONTROL
@ -1,4 +1,4 @@
 Source: breakpad
-Version: 2018-07-30-2
+Version: 2018-09-18
 Build-Depends: libdisasm
 Description: a set of client and server components which implement a crash-reporting system.
--- a/ports/breakpad/portfile.cmake
+++ b/ports/breakpad/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/breakpad
-    REF 9fecc95c72549452959431ddc0e4ec4e0cda8689
-    SHA512 b579c4f7058cfd86df343e41496c0d4fc0fb1160bf239fab9cfecfd3d60108367f43f1788d744a9d813d585e8a05e06adf90b01d619448a262522a969d8d5054
+    REF 54fa71efbe50fb2b58096d871575b59e12edba6d
+    SHA512 ecd1c6c5cc0e3984d05fe86ec11172e93b0e31c39ce0af9d0de08b8d03083686e2288e0cd787180c599446c277e58f48550ce4ab718019576c64fc403a592745
    HEAD_REF master
 )

--- a/ports/cairo/CMakeLists.txt
+++ b/ports/cairo/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.11)
 project(cairo C)

 # Add include directories
@ -162,14 +162,10 @@ set(CMAKE_DEBUG_POSTFIX "d")

 find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
-
-# Make the pixman library available
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(PIXMAN_SUFFIX "d")
-endif()
-find_library(PIXMAN_LIBRARY NAMES pixman-1${PIXMAN_SUFFIX})
-
-find_package(Freetype CONFIG REQUIRED)
+find_package(Freetype REQUIRED)
+find_package(unofficial-glib CONFIG REQUIRED)
+find_package(unofficial-fontconfig CONFIG REQUIRED)
+find_package(unofficial-pixman CONFIG REQUIRED)

 # Cairo needs to be told which features of FreeType are availible
 add_definitions(
@ -179,9 +175,6 @@ add_definitions(
    -DHAVE_FT_LOAD_SFNT_TABLE=1
    -DHAVE_FT_GET_X11_FONT_FORMAT=1)

-# Find FontConfig
-find_library(FONTCONFIG_LIBRARY fontconfig)
-
 # additional features for macOS
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
  add_definitions(
@ -196,20 +189,7 @@ endif()

 add_library(cairo ${SOURCES})

-if(MSVC)
-  # cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
-  # NOTE: options only available to MSVC, clang in macOS doesn't understand these flags
-  target_compile_options(cairo PUBLIC "/wd4244" PUBLIC "/wd4146" PUBLIC "/wd4312" PUBLIC "/wd4267" 
-                               PUBLIC "/wd4996" PUBLIC "/wd4311" PUBLIC "/wd4334" PUBLIC "/wd4101")
-endif()
-
-target_link_libraries(cairo gdi32 msimg32 user32 ZLIB::ZLIB PNG::PNG freetype ${PIXMAN_LIBRARY} ${FONTCONFIG_LIBRARY})
-
-install(TARGETS cairo
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION bin
-  ARCHIVE DESTINATION lib
-)
+target_link_libraries(cairo PRIVATE gdi32 msimg32 user32 ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 unofficial::fontconfig::fontconfig)

 # GObject support module

@ -225,16 +205,43 @@ if(BUILD_SHARED_LIBS)
        PROPERTIES COMPILE_DEFINITIONS "cairo_public=__declspec(dllexport)")
 endif()

-# Make GLib's GObject available
-find_path(GLIB_INCLUDE_DIR glib.h)
-find_library(GLIB_LIBRARY NAMES glib-2.0)
-find_library(GOBJECT_LIBRARY NAMES gobject-2.0)
-set(GLIB_LIBRARIES ${GLIB_LIBRARY} ${GOBJECT_LIBRARY})
-
 add_library(cairo-gobject ${CAIRO_GOBJECT_SOURCES}) 
-target_link_libraries(cairo-gobject cairo ${GLIB_LIBRARIES})
-target_include_directories(cairo-gobject PRIVATE ${GLIB_INCLUDE_DIR})
-install(TARGETS cairo-gobject
+target_link_libraries(cairo-gobject PRIVATE cairo unofficial::glib::gobject unofficial::glib::glib)
+
+if(MSVC)
+    # cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
+    # NOTE: options only available to MSVC, clang in macOS doesn't understand these flags
+    target_compile_options(cairo PRIVATE
+        "/wd4244" "/wd4146" "/wd4312" "/wd4267" "/wd4996" "/wd4311" "/wd4334" "/wd4101"
+    )
+    target_compile_options(cairo-gobject PRIVATE
+        "/wd4244" "/wd4146" "/wd4312" "/wd4267" "/wd4996" "/wd4311" "/wd4334" "/wd4101"
+    )
+endif()
+
+install(TARGETS cairo cairo-gobject
+    EXPORT cairo-targets
    RUNTIME DESTINATION bin
    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    ARCHIVE DESTINATION lib
+)
+
+install(
+    EXPORT cairo-targets
+    NAMESPACE unofficial::cairo::
+    FILE unofficial-cairo-targets.cmake
+    DESTINATION share/unofficial-cairo
+)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-cairo-config.cmake "
+include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)
+find_dependency(PNG)
+find_dependency(Freetype)
+find_dependency(unofficial-glib CONFIG)
+find_dependency(unofficial-fontconfig CONFIG)
+find_dependency(unofficial-pixman CONFIG)
+
+include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-cairo-targets.cmake)
+")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-cairo-config.cmake DESTINATION share/unofficial-cairo)
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@ -1,4 +1,4 @@
 Source: cairo
-Version: 1.15.8-2
+Version: 1.15.8-3
 Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
 Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig
--- a/ports/cairo/portfile.cmake
+++ b/ports/cairo/portfile.cmake
@ -1,25 +1,18 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
 set(CAIRO_VERSION 1.15.8)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cairo-${CAIRO_VERSION})
+
 vcpkg_download_distfile(ARCHIVE
    URLS "http://cairographics.org/snapshots/cairo-${CAIRO_VERSION}.tar.xz"
    FILENAME "cairo-${CAIRO_VERSION}.tar.xz"
    SHA512 5af1eebf432201dae0efaa5b6766b151d8273ea00dae48e104d56477005b4d423d64b5d11c512736a4cb076632fb2a572ec35becd922825a68d933bb5ff96ca1
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/export-only-in-shared-build.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/0001_fix_osx_defined.patch"
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${CAIRO_VERSION}
+    PATCHES
+        export-only-in-shared-build.patch
+        0001_fix_osx_defined.patch
 )

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src)
@ -32,6 +25,8 @@ vcpkg_configure_cmake(

 vcpkg_install_cmake()

+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cairo TARGET_PATH share/unofficial-cairo)
+
 # Copy the appropriate header files.
 foreach(FILE
 "${SOURCE_PATH}/src/cairo.h"
@ -64,3 +59,5 @@ file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cairo
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/cairo/COPYING ${CURRENT_PACKAGES_DIR}/share/cairo/copyright)

 vcpkg_copy_pdbs()
+
+vcpkg_test_cmake(PACKAGE_NAME unofficial-cairo)
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@ -1,4 +1,4 @@
 Source: catch2
-Version: 2.3.0
+Version: 2.4.0
 Description: A modern, header-only test framework for unit testing.
  Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2
--- 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.3.0
-    SHA512 e9a089b504c339e87bda0fb1a4040d9d19c932a4bc7dca41bdad6edfcf8c428f4152ff1e0c898dfdf6b20bd5d901c343bed00ad89351fa5182f3c106e0fb4b03
+    REF v2.4.0
+    SHA512 7bd148271520dfce24f64bab084226387a6adc9f0a5439b6cb2fa6b4e44b495475ecd9bc5936c6fa4f17e45132e826d8d47410b33d6c218d7a3202f5bb0ccbf4
    HEAD_REF master
 )

--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@ -1,8 +1,8 @@
 Source: cgal
-Version: 4.12
+Version: 4.13-1
 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic
 Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.

 Feature: qt
-Build-Depends: qt5
+Build-Depends: qt5-base, qt5-3d, qt5-svg, qt5-xmlpatterns, qt5-script, eigen3
 Description: Qt GUI support for CGAL
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@ -3,13 +3,13 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO CGAL/cgal
-    REF f7c3c8212b56c0d6dae63787efc99093f4383415
-    SHA512 fc40483b5f0e2071c3458cbd67ee7e503f68b7f6a1bbb525b6003d1a440e662cb85c257167ce6d55a73e0cc49b27a7d2b56dcf6b5eeddc78772567fdc48ba160
+    REF releases/CGAL-4.13
+    SHA512 3a12d7f567487c282928a162a47737c41c22258556ca0083b9cf492fc8f0a7c334b491b14dbfd6a62e71feeeb1b4995769c13a604e0882548f21c41b996d4eaf
    HEAD_REF master
 )

 set(WITH_CGAL_Qt5  OFF)
-if("qt5" IN_LIST FEATURES)
+if("qt" IN_LIST FEATURES)
  set(WITH_CGAL_Qt5 ON)
 endif()

@ -30,11 +30,31 @@ vcpkg_copy_pdbs()
 # Clean
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+else()
+    foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(REMOVE
+            ${ROOT}/cgal_create_CMakeLists
+            ${ROOT}/cgal_create_cmake_script
+            ${ROOT}/cgal_make_macosx_app
+        )
+    endforeach()
+endif()

 file(READ ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake _contents)
 string(REPLACE "CGAL_IGNORE_PRECONFIGURED_GMP" "1" _contents "${_contents}")
 string(REPLACE "CGAL_IGNORE_PRECONFIGURED_MPFR" "1" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake "${_contents}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "${_contents}")

-# Handle copyright of suitesparse and metis
-file(COPY ${SOURCE_PATH}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal)
+file(COPY ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cgal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cgal/copyright)
+
+file(
+    COPY
+        ${SOURCE_PATH}/Installation/LICENSE.BSL
+        ${SOURCE_PATH}/Installation/LICENSE.FREE_USE
+        ${SOURCE_PATH}/Installation/LICENSE.GPL
+        ${SOURCE_PATH}/Installation/LICENSE.LGPL
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal
+)
--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@ -1,3 +1,3 @@
 Source: chakracore
-Version: 1.10.1-1
+Version: 1.11.1-1
 Description: Core part of the Chakra Javascript engine
--- 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.10.1
-    SHA512 e3a9a9e6506b603922e5a5ed1fb900d43dfd6c8e5e091e12bf902dbe58cd12753e6b7f59a895081cea880eb78bcc55571ee561fe03c96d6312608626a5b653f2
+    REF v1.11.1
+    SHA512 cabec836af505504ffff99050de79320fe32e7311842bc5c715dae18ae7e006b63bb56f4d071016708ddec05a2a07143677371a76a57def68fb7f428012452d3
    HEAD_REF master
 )

@ -24,10 +24,7 @@ set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
 file(REMOVE_RECURSE ${BUILDTREE_PATH})
 file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH})

-set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore default is static CRT linkage
-if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-	set(CHAKRA_RUNTIME_LIB "dynamic_library")
-endif()
+set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage

 vcpkg_build_msbuild(
    PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln
--- a/ports/cimg/CONTROL
+++ b/ports/cimg/CONTROL
@ -1,3 +1,3 @@
 Source: cimg
-Version: 2.3.3
+Version: 2.3.6
 Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing
--- 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.3
+    REF v.2.3.6
    HEAD_REF master
-    SHA512 506dd0e55ecab3a1c3b230c97050b302614f187e7ec8634d8499353b278c783cd58408211abd3815d34b4e2b748e4481ccea79d1253d1df511fd3d0723ae4568)
+    SHA512 b2214e6f72eee0dd4fd20739030c4082bfe67923a7f2efe74709b42e07d58552a6b7d1306f0fddf9478294e822313fe3bae0bff5c141e7dbb4453d08b3d9b05d)

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.10.5
+Version: 2.10.6-1
 Build-Depends: zlib, openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp), websocketpp (!uwp), 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.
--- 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.5
-    SHA512 7942185e0e1cd5080b57737887f44c12e706cfb6428e55762dcbad2fd2c557f25bd26abe25b6abd9769ab6c0cea564541e7e95dcaff53e609124dda065fa41be
+    REF v2.10.6
+    SHA512 f0848f329df80ced68132600914f0f4ba1ed42c7c16188e0f2bd41cf0c50173c27ca42c8db72ff239ca881bc8789fa4d1e3189c492832f6c22d36d504b7ce8dd
    HEAD_REF master
 )

@ -32,7 +32,14 @@ vcpkg_configure_cmake(

 vcpkg_install_cmake()

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

 file(INSTALL
    ${SOURCE_PATH}/license.txt
--- a/ports/cryptopp/CONTROL
+++ b/ports/cryptopp/CONTROL
@ -1,3 +1,3 @@
 Source: cryptopp
-Version: 6.1.0-2
+Version: 7.0.0
 Description: Crypto++ is a free C++ class library of cryptographic schemes.
--- a/ports/cryptopp/cmake.patch
+++ b/ports/cryptopp/cmake.patch
@ -1,15 +1,19 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b6e1e6..a0adcf6 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -329,6 +329,10 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
- 	SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FI\"winapifamily.h\"" )
- endif ()
- 
-+if(WINDOWS_STORE)
-+	add_definitions(-DCRYPTOPP_DISABLE_NACL=1)
-+endif()
-+
- # Enable PIC for all target machines except 32-bit i386 due to register pressures.
- if (NOT CRYPTOPP_I386)
- 	SET(CMAKE_POSITION_INDEPENDENT_CODE 1)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8cf9fa2..86a756b 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -336,9 +336,13 @@ if (MSVC)
+   if (CMAKE_SYSTEM_VERSION MATCHES "10\\.0.*")
+     list(APPEND CRYPTOPP_COMPILE_DEFINITIONS "_WIN32_WINNT=0x0A00")
+   endif ()
+-  list(APPEND CRYPTOPP_COMPILE_OPTIONS "/FI\"winapifamily.h\"")
+  list(APPEND CRYPTOPP_COMPILE_OPTIONS "/FIwinapifamily.h")
+ endif ()
+ 
+if(WINDOWS_STORE)
+  add_definitions(-DCRYPTOPP_DISABLE_NACL=1)
+endif()
+
+ # Enable PIC for all target machines except 32-bit i386 due to register pressures.
+ if (NOT CRYPTOPP_I386)
+   SET(CMAKE_POSITION_INDEPENDENT_CODE 1)
--- a/ports/cryptopp/patch.patch
+++ b/ports/cryptopp/patch.patch
@ -1,8 +1,8 @@
-diff --git a/config.h b/config.h
-index b96b7aa..3f004ac 100644
--- a/config.h
-+++ b/config.h
-@@ -795,6 +795,7 @@ NAMESPACE_END
+diff --git a/config.h b/config.h
+index f06992a2..be6eda31 100644
+--- a/config.h
+++ b/config.h
+@@ -814,6 +814,7 @@ NAMESPACE_END
 #endif
 
 #ifdef CRYPTOPP_WIN32_AVAILABLE
--- a/ports/cryptopp/portfile.cmake
+++ b/ports/cryptopp/portfile.cmake
@ -1,35 +1,30 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported. Building static.") # See note below
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
 include(vcpkg_common_functions)

+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
  OUT_SOURCE_PATH CMAKE_SOURCE_PATH
  REPO noloader/cryptopp-cmake
-  REF aab149932675e4bb777a9d3d6b3f8b8182583fd7
-  SHA512 748c77e936888d042bf4a72cc7ee3b7b2ecf16c003cb23296c1af413c9a0cba00cc942ecace26274fc8ac8bd4d848946beb9d7bf2253c5eab3315a4419ef5f1f
+  REF 2729870f277bd568a8e8183b5ba7799e0c2dbf96
+  SHA512 fff9468774f66a895ab44ce76d37b320aeaa9398514b66d5116ffe84705ef7a202586622d598ea03f7c1636587893d46c6eee5e0da965c58fb74131c4b76223c
  HEAD_REF master
+  PATCHES
+    cmake.patch
+    simon-speck.patch
 )

 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO weidai11/cryptopp
-  REF CRYPTOPP_6_1_0
-  SHA512 4bc02fef33f1859a07434a4752c2575afd781056e9a91eed99a13cebe2c91d66cbc7173e34d362da63dad6d38f9594ff291accd27e111232996ccd536bba0f39
+  REF CRYPTOPP_7_0_0
+  SHA512 bc83f6adf0ae627c57ff9172d8cee69e7000d9b414ec903a50f11f9a68da08d1dd4985ddaffada86bf58e8168a2df065185efd932201d2df9db3f73025825e54
  HEAD_REF master
+  PATCHES patch.patch
 )

 file(COPY ${CMAKE_SOURCE_PATH}/cryptopp-config.cmake DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

-vcpkg_apply_patches(
-  SOURCE_PATH "${SOURCE_PATH}"
-  PATCHES
-    "${CMAKE_CURRENT_LIST_DIR}/patch.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/cmake.patch"
-)
-
 # Dynamic linking should be avoided for Crypto++ to reduce the attack surface,
 # so generate a static lib for both dynamic and static vcpkg targets.
 # See also:
--- a/ports/cryptopp/simon-speck.patch
+++ b/ports/cryptopp/simon-speck.patch
@ -0,0 +1,13 @@
+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/curl/0001_cmake.patch
+++ b/ports/curl/0001_cmake.patch
@ -1,28 +1,28 @@
 diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake
-index 12a7c61..9839c67 100644
+index 84822dba7..0d6219425 100644
 --- a/CMake/FindLibSSH2.cmake
 +++ b/CMake/FindLibSSH2.cmake
-@@ -12,7 +12,7 @@ endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)
- FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h
+@@ -12,7 +12,7 @@ endif()
+ find_path(LIBSSH2_INCLUDE_DIR libssh2.h
 )
 
-FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2
-+FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 libssh2
+-find_library(LIBSSH2_LIBRARY NAMES ssh2
+find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2
 )
 
 if(LIBSSH2_INCLUDE_DIR)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7b73b98..6c7c559 100644
+index e6dbb73f1..1e2ff138e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1132,7 +1132,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)
+@@ -1144,7 +1144,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)
 
 endfunction()
 
 -if(WIN32 AND NOT CYGWIN)
 +if(MSVC)
-+    set(CURL_INSTALL_CMAKE_DIR share/curl)
+  set(CURL_INSTALL_CMAKE_DIR share/curl)
 +elseif(WIN32 AND NOT CYGWIN)
-     set(CURL_INSTALL_CMAKE_DIR CMake)
+   set(CURL_INSTALL_CMAKE_DIR CMake)
 else()
-     set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl)
+   set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl)
--- a/ports/curl/0004_nghttp2_staticlib.patch
+++ b/ports/curl/0004_nghttp2_staticlib.patch
@ -6,7 +6,7 @@ index 490cc19..51c0a92 100644
   find_package(NGHTTP2 REQUIRED)
   include_directories(${NGHTTP2_INCLUDE_DIRS})
   list(APPEND CURL_LIBS ${NGHTTP2_LIBRARIES})
-+  if(CURL_STATICLIB)
+  if(NOT BUILD_SHARED_LIBS)
 +    add_definitions(-DNGHTTP2_STATICLIB)
 +  endif()
 endif()
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@ -1,5 +1,5 @@
 Source: curl
-Version: 7.61.0
+Version: 7.61.1-1
 Build-Depends: zlib
 Description: A library for transferring data with URLs
 Default-Features: ssl
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO curl/curl
-    REF curl-7_61_0
-    SHA512 b6d2f57059e72139540cb93b945703857cb447920ed9b283993611453fed623432290adc5a3558181e3decc15c7cf54fff475010d922957807a37d1a1449be6c
+    REF curl-7_61_1
+    SHA512 09fa3c87f8d516eabe3241247a5094c32ee0481961cf85bf78ecb13acdf23bb2ec82f113d2660271d22742c79e76d73fb122730fa28e34c7f5477c05a4a6534c
    HEAD_REF master
    PATCHES
        ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
@ -114,6 +114,8 @@ else()
    file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/curl-config ${CURRENT_PACKAGES_DIR}/debug/bin/curl-config)
    if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib")
        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib ${CURRENT_PACKAGES_DIR}/lib/libcurl.lib)
+    endif()
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib")
        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl.lib)
    endif()
 endif()
--- a/ports/darts-clone/CMakeLists.txt
+++ b/ports/darts-clone/CMakeLists.txt
@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.8)
+project(darts)
+
+if(MSVC)
+  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+add_library(darts src/darts.cc)
+
+target_include_directories(darts
+    PUBLIC
+        $<INSTALL_INTERFACE:include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
+install(
+  TARGETS darts
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(
+    DIRECTORY include/ DESTINATION include/
+  )
+endif()
--- a/ports/darts-clone/CONTROL
+++ b/ports/darts-clone/CONTROL
@ -0,0 +1,3 @@
+Source: darts-clone
+Version:  1767ab87cffe
+Description: A static double-array trie structure
--- a/ports/darts-clone/portfile.cmake
+++ b/ports/darts-clone/portfile.cmake
@ -0,0 +1,26 @@
+include(vcpkg_common_functions)
+vcpkg_check_linkage(
+  ONLY_STATIC_LIBRARY
+)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO s-yata/darts-clone
+    REF 1767ab87cffe7302856d1bb41e1c21b1df93f19e
+    SHA512 63112a4d8d6302d2602a8f161bf5fe5ec1b5b3b3097de9b28331f5261d76c06efb48601c08df26f242ddc881b917928baf54f24ccebac65da29e94380b6db0f5
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG
+        -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright)
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@ -1,3 +1,3 @@
 Source: directxmesh
-Version: jul2018
+Version: aug2018
 Description: DirectXMesh geometry processing library
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@ -12,8 +12,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/DirectXMesh
-    REF jul2018
-    SHA512 080306d23153c5db6d84cf1df7700d89a25405064806ca9b8d07291ebe80d89793dfe540a98313afc137964e2fb900158d40feee6bb2a68ef9af2d872f0ebe3c
+    REF aug2018
+    SHA512 5aaafd434024327b9ab59eab7f0247a5e0d439e5cad22929adc78edd41ac987c5da70e3ae26637beea923333651ceae3127f1ff274aad3497948508a1a8b1912
    HEAD_REF master
 )

--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@ -1,3 +1,3 @@
 Source: directxtex
-Version: jul2018
+Version: aug2018b
 Description: DirectXTex texture processing library
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@ -12,8 +12,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/DirectXTex
-    REF jul2018
-    SHA512 83408840bf1fedef240c808c59b94d9b77133cf6bc1803c49a4faf5a319fa4b16c26c16240748fb4dd29fb907a4366c724171c64deeb71b0a15214ee74859b4d
+    REF aug2018b
+    SHA512 51ccd4855d399db4980a0f859da25e9473cf5b4ae44f2594b13ba7813d4fd3f4c424ce750ca0b096e40999c935269522fb6bfe2b2e1910f0f8a6c6c1ea76c399
    HEAD_REF master
 )

--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@ -1,3 +1,3 @@
 Source: directxtk
-Version: jul2018
+Version: aug2018
 Description: A collection of helper classes for writing DirectX 11.x code in C++.
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@ -12,8 +12,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/DirectXTK
-    REF jul2018
-    SHA512 1e962bc7f3ab730616bb7ec07d54904cbd636033ca0bba722170690dc906524968df66ad440e3423273120b9e4dc53a28ae7edb8a2568c58e5eed816d8e9a619
+    REF aug2018
+    SHA512 9408916864900a098bb77244144c71d1786b3fe76468c50a92fbf21f71407c7f7c6834d9e69a13b4b93161362252599ccb12f6a87b6ca7a8b23d12e6e73dd166
    HEAD_REF master
 )

--- a/ports/dlib/CONTROL
+++ b/ports/dlib/CONTROL
@ -1,5 +1,5 @@
 Source: dlib
-Version: 19.15
+Version: 19.16
 Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas, clapack
 Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++

--- a/ports/dlib/portfile.cmake
+++ b/ports/dlib/portfile.cmake
@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO davisking/dlib
-    REF v19.15
-    SHA512 e815d4cd3cf75de4bf3df25597f1b13e831129b8e780909194be05bde4c811792886e7370980edf0fe294aa1ad7a69ba9b9ca729e05713d3ee4f6aa4236baaf7
+    REF v19.16
+    SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
    HEAD_REF master
 )

--- a/ports/docopt/001-fix-unresolved-symbol.patch
+++ b/ports/docopt/001-fix-unresolved-symbol.patch
@ -0,0 +1,28 @@
+diff --git a/docopt.h b/docopt.h
+index 4c40741..06a04f8 100644
+--- a/docopt.h
+++ b/docopt.h
+@@ -85,6 +85,9 @@ namespace docopt {
+ 					    bool help = true,
+ 					    std::string const& version = {},
+ 					    bool options_first = false) noexcept;
+
+	/// Write out the contents to the ostream
+	std::ostream DOCOPT_API & operator<<(std::ostream&, value const&);
+ }
+ 
+ #ifdef DOCOPT_HEADER_ONLY
+diff --git a/docopt_value.h b/docopt_value.h
+index a923219..7f0d6d6 100644
+--- a/docopt_value.h
+++ b/docopt_value.h
+@@ -102,9 +102,6 @@ namespace docopt {
+ 		Kind kind = Kind::Empty;
+ 		Variant variant {};
+ 	};
+-
+-	/// Write out the contents to the ostream
+-	std::ostream& operator<<(std::ostream&, value const&);
+ }
+ 
+ namespace std {
--- a/ports/docopt/002-fix-install-path.patch
+++ b/ports/docopt/002-fix-install-path.patch
@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1aba5ae..5407e4a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -113,7 +113,10 @@ endif()
+ set(export_name "docopt-targets")
+ 
+ # Runtime package
+-install(TARGETS docopt EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS docopt EXPORT ${export_name}
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # Development package
+ install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/ports/docopt/CONTROL
+++ b/ports/docopt/CONTROL
@ -0,0 +1,3 @@
+Source: docopt
+Version: 2018-04-16-2
+Description: Command line arguments parser that will make you smile (C++11 port).
--- a/ports/docopt/install-one-flavor.patch
+++ b/ports/docopt/install-one-flavor.patch
@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bff867c..cc7d706 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -113,13 +113,15 @@ endif()
+ set(export_name "docopt-targets")
+ 
+ # Runtime package
+if(BUILD_SHARED_LIBS)
+ install(TARGETS docopt EXPORT ${export_name}
+ 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-
+else()
+ # Development package
+ install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif()
+ install(FILES ${docopt_HEADERS} DESTINATION include/docopt)
+ 
+ # CMake Package
--- a/ports/docopt/portfile.cmake
+++ b/ports/docopt/portfile.cmake
@ -0,0 +1,46 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO docopt/docopt.cpp
+    REF 4f491249e6def236937dbfac7602852e7d99aff8
+    SHA512 d3a61f8d8a8c11723064f3405f03eb838a2ac9aa574f86771b1db89a2dd81996b639215fe5d4465343b893bf71502da178c7af8d883c112c1e45f43c17d473b7
+    HEAD_REF master
+    PATCHES
+        001-fix-unresolved-symbol.patch
+        002-fix-install-path.patch
+        install-one-flavor.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DWITH_EXAMPLE=OFF
+        -DWITH_TESTS=OFF
+        -DUSE_BOOST_REGEX=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/docopt)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(READ ${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h _contents)
+    string(REPLACE "#ifdef DOCOPT_DLL" "#if 1" _contents "${_contents}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h "${_contents}")
+endif()
+
+# Header-only style when DOCOPT_HEADER_ONLY is defined
+file(COPY
+    ${SOURCE_PATH}/docopt.cpp
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include/docopt)
+
+# Handle copyright
+file(INSTALL
+    ${SOURCE_PATH}/LICENSE-MIT
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/docopt RENAME copyright)
+
+vcpkg_copy_pdbs()
--- a/ports/doctest/CONTROL
+++ b/ports/doctest/CONTROL
@ -1,3 +1,3 @@
 Source: doctest
-Version: 1.2.9
+Version: 2.0.0
 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD
--- a/ports/doctest/portfile.cmake
+++ b/ports/doctest/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO onqtam/doctest
-    REF 1.2.9
-    SHA512 9500570fb0ef7b06799fbe92b8f96eacf16eba630abe4f67a235901995192e31fafb812704f327f0a2582c8fe61c3bb458d2eaf3c4287f24c1ffbc04c46a2471
+    REF 2.0.0
+    SHA512 ad167201fa10890e868fab628d73588e66470fbf6d5bdf0cd4e4ce13510f0727411fa709eb748eb1b5de19307c75d2efbcd71cb678e3ef1d0632056d7af2f012
    HEAD_REF master
 )

--- a/ports/double-conversion/CONTROL
+++ b/ports/double-conversion/CONTROL
@ -1,3 +1,3 @@
 Source: double-conversion
-Version: 3.0.0-2
+Version: 3.1.0
 Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.
--- a/ports/double-conversion/portfile.cmake
+++ b/ports/double-conversion/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/double-conversion
-    REF v3.0.0
-    SHA512 5057af6e72f2aaace56ebdd9a0ddfa34318cbdfeabec5c361b60e6c92f160c8999c046c50f8c6f8d590eb8e97aa70bb6e97ba8148f0dc95dbc42f204fcdc1abf
+    REF 3.1.0
+    SHA512 ba797a7203bc7eb8ba697dc758a3341578f0405b5ab42fbd5a22d9fac09d11dd8cb5ed9ff9ff369e8ae9397ec74c04c62fca29d1bc469c6d2ea1a84a6dff9188
    HEAD_REF master
 )

@ -26,35 +26,6 @@ vcpkg_install_cmake()
 if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion)
    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/double-conversion)
 endif()
-if(NOT VCPKG_USE_HEAD_VERSION)
-    if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
-        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-            file(RENAME ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake
-                        ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionTargets-debug.cmake)
-        endif()
-        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-            file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends-release.cmake
-                        ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets-release.cmake)
-        endif()
-        file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends.cmake
-                    ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake)
-
-        file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake TARGETS_FILE)
-        string(REPLACE "double-conversionLibraryDepends" "double-conversionTargets" TARGETS_FILE "${TARGETS_FILE}")
-        file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake "${TARGETS_FILE}")
-
-        # Remove hardcoded paths from config file
-        file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake CONFIG_FILE)
-        string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion/double-conversionLibraryDepends.cmake"
-                    "\${double-conversion_CMAKE_DIR}/double-conversionTargets.cmake" CONFIG_FILE "${CONFIG_FILE}")
-        string(REPLACE "${CURRENT_PACKAGES_DIR}"
-                    "\${double-conversion_CMAKE_DIR}/../.." CONFIG_FILE "${CONFIG_FILE}")
-        file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake "${CONFIG_FILE}")
-
-        vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
-    endif()
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-endif()

 vcpkg_copy_pdbs()

--- a/ports/eastl/CONTROL
+++ b/ports/eastl/CONTROL
@ -1,4 +1,4 @@
 Source: eastl
-Version: 3.10.00
+Version: 3.12.01
 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/portfile.cmake
+++ b/ports/eastl/portfile.cmake
@ -8,8 +8,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO electronicarts/EASTL
-    REF 3.10.00
-    SHA512 281a8d79d30a39136d9a9c6fd63ca712b450cd45019aab1ac3a219bb8704e094a5b8f461a7cd7ab8480f41beca94f1589162fe4899406869898a2e1ffc497b78
+    REF 3.12.01
+    SHA512 22053823299386337934abb473be5bad4766db571656ee8f93eb04f6079c1860fd598ae8b7a955ca5dcf26661370d558aaf35037c989ec5a976feae87a445aad
    HEAD_REF master
 )

--- a/ports/ecm/CONTROL
+++ b/ports/ecm/CONTROL
@ -1,3 +1,3 @@
 Source: ecm
-Version: 5.40.0
+Version: 5.50.0
 Description: Extra CMake Modules (ECM), extra modules and scripts for CMake
--- a/ports/ecm/portfile.cmake
+++ b/ports/ecm/portfile.cmake
@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO KDE/extra-cmake-modules
-    REF v5.40.0
-    SHA512 1f79d797770367e79c2c6dd73c125d32fcc5fe404b350d953b69cc6544babc1c73e2986c833635daaac85a5af966977e40fe41c01ac48ccc45d46d2e1636d21f
+    REF v5.50.0
+    SHA512 625f934b97c56cceed44d8fa0e335fb1f593806e52b8bfd2fd467561b4de2528940add756a8e903bd5502e912422cc3835e65e047cc4c205d3b8629452627abd
    HEAD_REF master
 )

--- a/ports/ecsutil/CONTROL
+++ b/ports/ecsutil/CONTROL
@ -1,3 +1,4 @@
 Source: ecsutil
-Version: 1.0.1.2
+Version: 1.0.1.2-1
 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.
+Build-Depends: atlmfc
--- a/ports/ecsutil/disable-setversion.patch
+++ b/ports/ecsutil/disable-setversion.patch
@ -0,0 +1,36 @@
+diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj
+index 05c5726..f8ac64e 100644
+--- a/ECSUtil/ECSUtil.vcxproj
+++ b/ECSUtil/ECSUtil.vcxproj
+@@ -274,7 +274,6 @@
+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+     </ResourceCompile>
+     <PostBuildEvent>
+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>
+     </PostBuildEvent>
+     <PostBuildEvent>
+       <Message>set version resource in DLL from source file</Message>
+@@ -361,7 +360,6 @@
+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+     </ResourceCompile>
+     <PostBuildEvent>
+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>
+     </PostBuildEvent>
+     <PostBuildEvent>
+       <Message>set version resource in DLL from source file</Message>
+@@ -445,7 +443,6 @@
+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+     </ResourceCompile>
+     <PostBuildEvent>
+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>
+     </PostBuildEvent>
+     <PostBuildEvent>
+       <Message>set version resource in DLL from source file</Message>
+@@ -541,7 +538,6 @@
+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+     </ResourceCompile>
+     <PostBuildEvent>
+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>
+     </PostBuildEvent>
+     <PostBuildEvent>
+       <Message>set version resource in DLL from source file</Message>
--- a/ports/ecsutil/portfile.cmake
+++ b/ports/ecsutil/portfile.cmake
@ -1,80 +1,52 @@
-# Common Ambient Variables:
-#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
-#   PORT                      = current port name (zlib, etc)
-#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
-#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
-#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
-#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
-#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
 include(vcpkg_common_functions)

-set(ECSUTIL_VERSION "v1.0.1.2")
-set(ECSUtil_HASH 399aec10a625ee6eb8f7869005b9221a1e4930c7e8774c20467ddc0e86312e7e1224fb29a1b54d3c9669b78708a23db548195f8973a19eb5559338f600688888)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
-
-#architecture detection
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-   set(ECSUtil_ARCH Win32)
+    set(PLATFORM x86)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-   set(ECSUtil_ARCH x64)
+    set(PLATFORM x64)
 else()
-   message(FATAL_ERROR "unsupported architecture")
+    message(FATAL_ERROR "Unsupported architecture")
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME)
+    message(FATAL_ERROR "Unsupported platform. ECSUTIL currently only supports windows desktop.")
 endif()

 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
    set(ECSUtil_CONFIGURATION_RELEASE Release)
    set(ECSUtil_CONFIGURATION_DEBUG Debug)
 else()
-	if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
-	    set(ECSUtil_CONFIGURATION_RELEASE "Release Lib")
-		set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib")
-	else()
-	    set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static")
-		set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static")
-	endif()
+    if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
+        set(ECSUtil_CONFIGURATION_RELEASE "Release Lib")
+        set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib")
+    else()
+        set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static")
+        set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static")
+    endif()
 endif()

-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip"
-    FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip"
-    SHA512 ${ECSUtil_HASH}
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO EMCECS/ecs-object-client-windows-cpp
+    REF v1.0.1.2
+    SHA512 ee6c9086111f9cb4a3b9b0645a6a8921bae1d3e8fba0d054d824935b0ff82a57db5c1476183202694afe33f89bfc47db1ef91696a739a1a43a1e2411e4361e6f
+    HEAD_REF master
+    PATCHES disable-setversion.patch
 )
-vcpkg_extract_source_archive(${ARCHIVE})

-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln
-	TARGET ECSUtil
+vcpkg_install_msbuild(
+    SOURCE_PATH ${SOURCE_PATH}
+    PROJECT_SUBPATH ECSUtil.sln
+    PLATFORM ${PLATFORM}
+    LICENSE_SUBPATH license.txt
+    TARGET ECSUtil
    RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE}
    DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG}
 )

 file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-    file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-	if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
-		file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-		file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-		file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-		file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-	else()
-		file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-		file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-		file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-		file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-	endif()
+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)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
-
-# Handle copyright
-file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright)
-
-vcpkg_copy_pdbs()
--- a/ports/entt/CONTROL
+++ b/ports/entt/CONTROL
@ -1,3 +1,3 @@
 Source: entt
-Version: 2.7.1
+Version: 2.7.2
 Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. <https://github.com/skypjack/entt>
--- a/ports/entt/portfile.cmake
+++ b/ports/entt/portfile.cmake
@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO skypjack/entt
-    REF v2.7.1
-    SHA512 6db7aa43194dd30026f409ee7f1012d48c3812ec99fc525864527142e5b94bef3950759874d7afcafa264af1c7ccfd39979c550c641e942cc6871e537938d508
+    REF v2.7.2
+    SHA512 334b94ef142bb234204315e47c9783f55c7639c59a214b772ce76c6b7cf4008280ab6762a3cf6049f51932773f5ae62e45d9423efe0dd5043b20103b1f857167
 )

 file(INSTALL
--- a/ports/esaxx/CONTROL
+++ b/ports/esaxx/CONTROL
@ -0,0 +1,3 @@
+Source: esaxx
+Version: ca7cb332011ec37
+Description: This library provides the implementation of enhanced suffix array.
--- a/ports/esaxx/portfile.cmake
+++ b/ports/esaxx/portfile.cmake
@ -0,0 +1,17 @@
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO hillbig/esaxx
+    REF ca7cb332011ec37a8436487f210f396b84bd8273
+    SHA512 8346fc93498f7979fd422db527d0e2db73080b2c372263a72a887ddc8328a29391bce6def5845f4500a180f5c2e641105d0ce108092e6eac9020c6bd67fb46df
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/esa.hxx
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+
+# Handle copyright/readme/package files
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/esaxx RENAME copyright)
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@ -1,4 +1,4 @@
 Source: exiv2
-Version: 2018-07-30
+Version: 2018-09-18
 Build-Depends: zlib, expat, libiconv
 Description: Image metadata library and tools http://www.exiv2.org
--- 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 e67910a6691f5238e85d5a43477af7dd13f0574e
-    SHA512 6f7fddf25fd7c557911678f009412986df959dd32594b66d81524ae666fc260f5ba9df461eab3ad8e7f1cad939e355be7e0801f1e6ee275e9eddfc53961ad0ab
+    REF 37b8725565f42c260f9773fe4cfb8fa39f566746
+    SHA512 8be6079546099ac7267978ed3aa1c8e42215baa06b5da30c78918dac8193a725b3c38f6fb47fb50e7724580a964360163e2167b08c7e5929485fd3bd037338b0
    HEAD_REF master
    PATCHES "${CMAKE_CURRENT_LIST_DIR}/iconv.patch"
 )
--- a/ports/expat/CONTROL
+++ b/ports/expat/CONTROL
@ -1,3 +1,3 @@
 Source: expat
-Version: 2.2.5
+Version: 2.2.6
 Description: XML parser library written in C
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@ -6,8 +6,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO libexpat/libexpat
-    REF R_2_2_5
-    SHA512 61ce2a479521412e0c56c352106c4adfb61a6bedb883921aba3ebccc29311ddd192646ac2c51b41572728d4de6ab4cb60a1dbc71515d742a80a8b59d89ca74d6
+    REF R_2_2_6
+    SHA512 727fbd24041c9af71b32353448583a6d8b38ddf93b10c97510e847939c2ad2be9b40ff6e6e27b725bff277982c2fc96c75f19c4a3ac4a246133eb62870c963d8
    HEAD_REF master)

 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@ -43,3 +43,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    string(REPLACE "!defined(XML_STATIC)" "/* vcpkg static build !defined(XML_STATIC) */ 0" EXPAT_EXTERNAL_H "${EXPAT_EXTERNAL_H}")
 endif()
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/expat_external.h "${EXPAT_EXTERNAL_H}")
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/expat)
--- a/ports/expat/usage
+++ b/ports/expat/usage
@ -0,0 +1,4 @@
+The package expat is compatible with built-in CMake targets:
+
+    find_package(EXPAT REQUIRED)
+    target_link_libraries(main PRIVATE EXPAT::EXPAT)
--- a/ports/exprtk/CONTROL
+++ b/ports/exprtk/CONTROL
@ -1,3 +1,3 @@
 Source: exprtk
-Version: 2018.04.30-46877b6
+Version: 2018.09.30-9836f21
 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine.
--- a/ports/exprtk/portfile.cmake
+++ b/ports/exprtk/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ArashPartow/exprtk
-    REF 46877b604cfcc0a0e592fc7a8a874cf2a9f90cf4
-    SHA512 1043b5b6aa64bc3f8d989d2aac3e3a125188b1526ab92e245ad526ab1fe37e10cb275f2b77d311b4d91bd4ea32e1d81dfcd8abf8373b723a8b664842690ee1ae
+    REF 9836f21d07b1bf799e6877324268708f61c01f73
+    SHA512 44acb6e835dc215d4338ff4c2b3444373a93475ece15b3f1bfdc0781f7c28992af7c289644bf9557d041f78c7435f5907e4ba606321aab17faee6f4a70562065
 )

 file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
--- a/ports/fastfeat/CMakeLists.txt
+++ b/ports/fastfeat/CMakeLists.txt
@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.8)
+project(fastfeat)
+
+if(MSVC)
+  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+include_directories(.)
+file( GLOB SRCS *.c *.def)
+add_library(fastfeat ${SRCS})
+
+
+install(
+  TARGETS fastfeat
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(
+    FILES fast.h DESTINATION include
+  )
+endif()
--- a/ports/fastfeat/CONTROL
+++ b/ports/fastfeat/CONTROL
@ -0,0 +1,3 @@
+Source: fastfeat
+Version: 391d5e9
+Description: FAST feature detectors in C
--- a/ports/fastfeat/fastfeat.def
+++ b/ports/fastfeat/fastfeat.def
@ -0,0 +1,19 @@
+LIBRARY   fastfeat
+EXPORTS
+  fast9_detect_nonmax   @1
+  fast10_detect_nonmax   @2
+  fast9_corner_score @3
+  fast10_corner_score @4
+  fast11_corner_score @5
+  fast12_corner_score @6
+  fast9_detect @7
+  fast10_detect @8
+  fast11_detect @9
+  fast12_detect @10
+  fast9_score @11
+  fast10_score @12
+  fast11_score @13
+  fast12_score @14
+  fast11_detect_nonmax @15
+  fast12_detect_nonmax @16
+  nonmax_suppression @17
--- a/ports/fastfeat/portfile.cmake
+++ b/ports/fastfeat/portfile.cmake
@ -0,0 +1,28 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO edrosten/fast-C-src
+    REF 391d5e939eb1545d24c10533d7de424db8d9c191
+    SHA512 d6f401e2f80193c4f1f99e1ef59af7107d674c515574cf513c5977c4c95c49c0520d2a6e6787f617b42d9e3bd93c78b8fa7f1d8dc8901351820590078e62130e
+    HEAD_REF master
+)
+
+
+file(COPY
+${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+ ${CMAKE_CURRENT_LIST_DIR}/fastfeat.def
+DESTINATION ${SOURCE_PATH}
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS_DEBUG
+        -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fastfeat RENAME copyright)
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@ -30,22 +30,22 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/flatbuffers")

-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin AND NOT EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin/flatc)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/flatc.exe)
+file(GLOB flatc_path ${CURRENT_PACKAGES_DIR}/bin/flatc*)
+if(flatc_path)
    make_directory(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
+    get_filename_component(flatc_executable ${flatc_path} NAME)
    file(
        RENAME
-        ${CURRENT_PACKAGES_DIR}/bin/flatc.exe
-        ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/flatc.exe
+        ${flatc_path}
+        ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable}
    )
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
 endif()

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

 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/flatbuffers)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/flatbuffers/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/flatbuffers/copyright)
+
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@ -1,3 +1,3 @@
 Source: fmt
-Version: 5.1.0
+Version: 5.2.0
 Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
--- 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.1.0
-    SHA512 b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6
+    REF 5.2.0
+    SHA512 75d53e6d8087288607f75fb891bb8812c7b9fe65e5ab7a20cdffeb5e56bd1f48e0de24c8cf1c2dd603fe3ed76f9fa067804ec5d3560f177db8f0a747c36f9d1c
    HEAD_REF master
 )

--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@ -1,5 +1,5 @@
 Source: folly
-Version: 2018.07.30.00
+Version: 2018.09.17.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
--- 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.07.30.00
-    SHA512 38e7b713572d4af0a6453d001eddc32c74b4ec100158300c0a3a61a88ec546b449f1973c2b624273da4278173782aa71695d981dba3c8f423f5b76ed1375d286
+    REF v2018.09.17.00
+    SHA512 fe1f5ff2b55262717cb0e923ee3d8b5a82c85432823911afc924c209fc7e97ab776a3820c4b17e003a7a55150c8e0061918eaee33bdf7ca12ec1090ed7537592
    HEAD_REF master
    PATCHES
        find-gflags.patch
--- a/ports/fontconfig/CMakeLists.txt
+++ b/ports/fontconfig/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.11)
 project(fontconfig C)

 add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONFIG_H)
@ -6,8 +6,7 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONF
 # find dependencies
 find_package(unofficial-iconv CONFIG REQUIRED)
 find_package(Freetype REQUIRED)
-find_path(EXPAT_INCLUDE_DIR expat.h)
-find_library(EXPAT_LIBRARY expat)
+find_package(EXPAT REQUIRED)

 add_library(fontconfig
    src/fcatomic.c
@ -49,9 +48,10 @@ else()
    target_include_directories(fontconfig PRIVATE ${FC_INCLUDE_DIR}/unix)
 endif()

-target_link_libraries(fontconfig PRIVATE unofficial::iconv::libiconv Freetype::Freetype ${EXPAT_LIBRARY})
+target_link_libraries(fontconfig PRIVATE unofficial::iconv::libiconv Freetype::Freetype EXPAT::EXPAT)

 install(TARGETS fontconfig
+    EXPORT fontconfig-targets
    RUNTIME DESTINATION bin
    LIBRARY DESTINATION lib
    ARCHIVE DESTINATION lib)
@ -73,3 +73,20 @@ if(NOT FC_SKIP_TOOLS)
    install(FILES fonts.conf DESTINATION tools/fontconfig/fonts)
    install(DIRECTORY conf.d DESTINATION tools/fontconfig/fonts FILES_MATCHING PATTERN "*.conf")
 endif()
+
+install(
+    EXPORT fontconfig-targets
+    NAMESPACE unofficial::fontconfig::
+    FILE unofficial-fontconfig-targets.cmake
+    DESTINATION share/unofficial-fontconfig
+)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake "
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-iconv CONFIG)
+find_dependency(Freetype)
+find_dependency(EXPAT)
+
+include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-fontconfig-targets.cmake)
+")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake DESTINATION share/unofficial-fontconfig)
--- a/ports/fontconfig/CONTROL
+++ b/ports/fontconfig/CONTROL
@ -1,4 +1,4 @@
 Source: fontconfig
-Version: 2.12.4-3
+Version: 2.12.4-7
 Description: Library for configuring and customizing font access.
 Build-Depends: freetype, expat, libiconv, dirent
--- a/ports/fontconfig/portfile.cmake
+++ b/ports/fontconfig/portfile.cmake
@ -1,18 +1,18 @@

 include(vcpkg_common_functions)
+
 set(FONTCONFIG_VERSION 2.12.4)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fontconfig-${FONTCONFIG_VERSION})
 vcpkg_download_distfile(ARCHIVE
    URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz"
    FILENAME "fontconfig-${FONTCONFIG_VERSION}.tar.gz"
-    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d)
+    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d
+)

-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/fcobjtypehash.patch"
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${FONTCONFIG_VERSION}
+    PATCHES fcobjtypehash.patch
 )

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@ -28,6 +28,9 @@ vcpkg_configure_cmake(
 )

 vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-fontconfig TARGET_PATH share/unofficial-fontconfig)
+
 vcpkg_copy_pdbs()

 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@ -40,3 +43,5 @@ endif()

 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fontconfig)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/fontconfig/COPYING ${CURRENT_PACKAGES_DIR}/share/fontconfig/copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME unofficial-fontconfig)
--- a/ports/forest/CONTROL
+++ b/ports/forest/CONTROL
@ -1,3 +1,3 @@
 Source: forest
-Version: 9.0.1
+Version: 9.0.5
 Description: Template library of tree data structures
--- 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 bc6b82ce436dfbf60d6e8882252c55cf923ad99e
-    SHA512 e711148025c40fb73e6ae221fe5a4416bea006994d9ff958d565cd3cefa75c9ee7241087c7470ecb6530be073ac9171fe724351898ecd33db61f5752c3a950bc
+    REF 9.0.5
+    SHA512 1dd3ae568ea2ce66cab285f392b167a08eef29387fffef3e9283c3ddaf1d461e5f6408cbce17bbaa928ba773a7890ec31f2612e5a2280cc4fe4a02824fbcd4a3
    HEAD_REF master
 )

--- a/ports/freeglut/CONTROL
+++ b/ports/freeglut/CONTROL
@ -1,3 +1,3 @@
 Source: freeglut
-Version: 3.0.0-4
+Version: 3.0.0-5
 Description: Open source implementation of GLUT with source and binary backwards compatibility.
--- a/Show More
+++ b/Show More