Merge https://github.com/Microsoft/vcpkg

2024-11-30 16:49:00 +08:00 · 2018-05-30 19:25:16 +03:00 · 2018-05-30 19:25:16 +03:00 · 99eb78cf2d
commit 99eb78cf2d
parent 34257a50ce 8422523739
352 changed files with 4267 additions and 2367 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,6 +25,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+vcpkg

 # Visual Studio 2015 cache/options directory
 .vs/
@ -273,6 +274,7 @@ __pycache__/
 ############################################################

 .vscode/
+*.code-workspace
 buildtrees/
 build*/
 downloads/
@ -299,4 +301,4 @@ triplets/*

 ############################################################
 # vcpkg - End
-############################################################
+############################################################
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,173 @@
+vcpkg (0.0.113)
+--------------
+  * Add ports:
+    - json-dto       0.2.5
+    - keystone       0.9.1
+    - osgearth       2.9
+    - pdal           1.7.1-2
+    - sdl2pp         0.16.0-1
+  * Update ports:
+    - args           2018-02-23 -> 2018-05-17
+    - aws-sdk-cpp    1.4.40 -> 1.4.52
+    - chakracore     1.8.3 -> 1.8.4
+    - cimg           2.2.2 -> 2.2.3
+    - curl           7_59_0-2 -> 7.60.0
+    - directxmesh    apr2018 -> may2018
+    - directxtex     apr2018 -> may2018
+    - directxtk      apr2018 -> may2018
+    - doctest        1.2.8 -> 1.2.9
+    - entt           2.4.2-1 -> 2.5.0
+    - exiv2          2018-04-25 -> 2018-05-17
+    - fdk-aac        2018-03-07 -> 2018-05-17
+    - forest         7.0.6 -> 7.0.7
+    - gdal           2.2.2-1 -> 2.3.0-1
+    - grpc           1.10.1-1 -> 1.10.1-2
+    - jsonnet        2018-05-01 -> 2018-05-17
+    - libuv          1.20.2 -> 1.20.3-2
+    - libwebsockets  2.4.2 -> 3.0.0
+    - lodepng        2018-02-25 -> 2018-05-17
+    - mpg123         1.25.8-4 -> 1.25.8-5
+    - ms-gsl         2018-05-01 -> 2018-05-17
+    - mujs           2018-05-01 -> 2018-05-17
+    - nuklear        2018-04-25 -> 2018-05-17
+    - opus           1.2.1 -> 1.2.1-1
+    - parson         2018-04-17 -> 2018-05-17
+    - pmdk           1.4-1 -> 1.4-2
+    - podofo         0.9.5-1 -> 0.9.5-2
+    - re2            2018-05-01 -> 2018-05-17
+    - rocksdb        5.12.4 -> 5.13.1
+    - rs-core-lib    2018-05-01 -> 2018-05-17
+    - sdl2-mixer     2.0.2-2 -> 2.0.2-4
+    - thrift         2018-05-01 -> 2018-05-17
+    - unicorn        2018-04-25 -> 2018-05-17
+    - unicorn-lib    2018-05-01 -> 2018-05-17
+    - uwebsockets    0.14.8-1 -> 0.14.8-2
+    - wtl            10.0 -> 10.0-1
+    - zeromq         2018-05-01 -> 2018-05-17
+  * `vcpkg` no longer calls `powershell` from `cmake`.
+    - This completes the fix for the issue where `vcpkg.exe` would change the console's font when invoking `powershell`.
+    - `Powershell` is no longer called other than for bootstrap and powershell integration for tab-completion.
+
+-- vcpkg team <vcpkg@microsoft.com>  SAT, 16 May 2018 19:30:00 -0800
+
+
+vcpkg (0.0.112)
+--------------
+  * Add ports:
+    - robin-map      0.2.0
+  * Update ports:
+    - abseil         2018-04-25-1 -> 2018-05-01-1
+    - ace            6.4.7 -> 6.4.8
+    - aws-sdk-cpp    1.4.38 -> 1.4.40
+    - azure-storage-cpp 3.2.1 -> 4.0.0
+    - blosc          1.13.5 -> 1.13.5-1
+    - boost-modular-build-helper 2018-04-16-4 -> 2018-05-14
+    - brotli         1.0.2-2 -> 1.0.2-3
+    - catch-classic  1.12.1 -> 1.12.2
+    - folly          2018.04.23.00 -> 2018.05.14.00
+    - jsonnet        2018-04-25 -> 2018-05-01
+    - ms-gsl         2018-04-25 -> 2018-05-01
+    - mujs           25821e6d74fab5fcc200fe5e818362e03e114428 -> 2018-05-01
+    - openimageio    1.8.10 -> Release-1.9.2dev
+    - openvr         1.0.14 -> 1.0.15
+    - protobuf       3.5.1-3 -> 3.5.1-4
+    - re2            2018-03-17 -> 2018-05-01
+    - rs-core-lib    2018-04-25 -> 2018-05-01
+    - sol            2.20.0 -> 2.20.0-1
+    - thrift         2018-04-25 -> 2018-05-01
+    - unicorn-lib    2018-04-09 -> 2018-05-01
+    - zeromq         2018-04-25 -> 2018-05-01
+  * `vcpkg` no longer calls powershell for downloading/extracting and detecting Visual Studio.
+    - This also fixes an issue where `vcpkg.exe` would change the console's font when invoking `powershell`.
+
+-- vcpkg team <vcpkg@microsoft.com>  WED, 16 May 2018 19:00:00 -0800
+
+
+vcpkg (0.0.111)
+--------------
+  * Add ports:
+    - cmark          0.28.3-1
+    - inja           1.0.0
+    - libgo          2.7
+    - range-v3-vs2015 20151130-vcpkg5
+    - restinio       0.4.5.1
+    - treehopper     1.11.3-1
+    - yajl           2.1.0-1
+    - yato           1.0-1
+  * Update ports:
+    - abseil         2018-04-12 -> 2018-04-25-1
+    - alembic        1.7.7 -> 1.7.8
+    - aws-sdk-cpp    1.4.33 -> 1.4.38
+    - bigint         2010.04.30-1 -> 2010.04.30-2
+    - box2d          2.3.1-374664b -> 2.3.1-374664b-1
+    - brotli         1.0.2-1 -> 1.0.2-2
+    - cgal           4.11.1 -> 4.12
+    - corrade        2018.02-1 -> 2018.04-1
+    - directxmesh    feb2018-eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9 -> apr2018
+    - directxtex     feb2018b -> apr2018
+    - directxtk      feb2018 -> apr2018
+    - discord-rpc    3.2.0 -> 3.3.0
+    - exiv2          2018-04-12 -> 2018-04-25
+    - exprtk         2018.01.01-f32d2b4 -> 2018.04.30-46877b6
+    - folly          2018.04.16.00 -> 2018.04.23.00
+    - freeglut       3.0.0-3 -> 3.0.0-4
+    - gainput        1.0.0 -> 1.0.0-1
+    - geos           3.6.2-2 -> 3.6.2-3
+    - http-parser    2.7.1-2 -> 2.7.1-3
+    - imgui          1.53 -> 1.60
+    - ismrmrd        1.3.2-1 -> 1.3.2-2
+    - jsonnet        2018-04-17 -> 2018-04-25
+    - leveldb        2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-1 -> 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-2
+    - libflac        1.3.2-4 -> 1.3.2-5
+    - libqrencode    4.0.0-1 -> 4.0.0-2
+    - libuv          1.20.0 -> 1.20.2
+    - libxmlpp       2.40.1-1 -> 2.40.1-2
+    - llvm           6.0.0 -> 6.0.0-1
+    - magnum         2018.02-2 -> 2018.04-1
+    - magnum-extras  2018.02-2 -> 2018.04-1
+    - magnum-integration 2018.02-1 -> 2018.04-1
+    - magnum-plugins 2018.02-2 -> 2018.04-1
+    - ms-gsl         2018-03-17 -> 2018-04-25
+    - nuklear        2018-04-17 -> 2018-04-25
+    - openal-soft    1.18.2-1 -> 1.18.2-2
+    - physfs         2.0.3-2 -> 3.0.1
+    - poco           1.8.1-1 -> 1.9.0
+    - python3        3.6.4 -> 3.6.4-1
+    - quirc          1.0-1 -> 1.0-2
+    - range-v3       20151130-vcpkg5 -> 0.3.5
+    - rapidjson      1.1.0 -> 1.1.0-1
+    - realsense2     2.10.1-1 -> 2.10.4
+    - rhash          1.3.5-1 -> 1.3.6
+    - rocksdb        5.12.2 -> 5.12.4
+    - rs-core-lib    2018-04-12 -> 2018-04-25
+    - sciter         4.1.5 -> 4.1.7
+    - sfml           2.4.2-2 -> 2.4.2-3
+    - sobjectizer    5.5.21 -> 5.5.22
+    - sol            2.19.5 -> 2.20.0
+    - sqlite3        3.23.0 -> 3.23.1-1
+    - strtk          2018.01.01-5579ed1 -> 2018.05.07-48c9554
+    - thrift         2018-04-17 -> 2018-04-25
+    - unicorn        2018-03-20 -> 2018-04-25
+    - uwebsockets    0.14.7-1 -> 0.14.8-1
+    - vlpp           0.9.3.1 -> 0.9.3.1-1
+    - zeromq         2018-04-17 -> 2018-04-25
+    - zstd           1.3.3 -> 1.3.4
+  * Add clean patching for vcpkg_from_github()
+    - `vcpkg_from_github()` now takes a PATCHES argument (see the azure-storage-cpp [portfile](ports\azure-storage-cpp\portfile.cmake) as an example)
+    - A unique directory name is derived from the source hash and the patch hashes
+    - Modifying the patches would previously cause the new patches to fail to apply if sources with a previous version of the patches were present in the buildtrees. This is no longer the case.
+  * Fix various cross-platform issues
+
+-- vcpkg team <vcpkg@microsoft.com>  FRI, 11 May 2018 21:45:00 -0800
+
+
+vcpkg (0.0.110)
+--------------
+  * `vcpkg` is now available for Linux and MacOS. More information [here](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/).
+
+-- vcpkg team <vcpkg@microsoft.com>  TUE, 24 Apr 2018 10:30:00 -0800
+
+
 vcpkg (0.0.109)
 --------------
  * Add ports:
--- a/README.md
+++ b/README.md
@ -1,35 +1,48 @@
 # Vcpkg <a href="#">![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/8476/badge)</a>

 ## Overview
-Vcpkg helps you get C and C++ libraries on Windows. This tool and ecosystem are currently in a preview state; your involvement is vital to its success.
+Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This tool and ecosystem are currently in a preview state; your involvement is vital to its success!

 For short description of available commands, run `vcpkg help`.

 ## Quick Start
 Prerequisites:
- Windows 10, 8.1, or 7
- Visual Studio 2017 or Visual Studio 2015 Update 3
+- 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*

-Clone this repository, then run
+To get started:
 ```
-C:\src\vcpkg> .\bootstrap-vcpkg.bat
+> git clone https://github.com/Microsoft/vcpkg
+> cd vcpkg
+
+PS> .\bootstrap-vcpkg.bat
+Ubuntu:~/$ ./bootstrap-vcpkg.sh
 ```
+
 Then, to hook up user-wide integration, run (note: requires admin on first use)
 ```
-C:\src\vcpkg> .\vcpkg integrate install
+PS> .\vcpkg integrate install
+Ubuntu:~/$ ./vcpkg integrate install
 ```
+
 Install any packages with
 ```
-C:\src\vcpkg> .\vcpkg install sdl2 curl
+PS> .\vcpkg install sdl2 curl
+Ubuntu:~/$ ./vcpkg install sdl2 curl
 ```
-Finally, create a New Project (or open an existing one) in Visual Studio 2017 or 2015. All installed libraries are immediately ready to be `#include`'d and used in your project.

-For CMake projects, simply include our toolchain file. See our [using a package](docs/examples/using-sqlite.md) example for the specifics.
+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`.
+
+In Visual Studio, you can create a New Project (or open an existing one). All installed libraries are immediately ready to be `#include`'d and used in your project without additional configuration.
+
+For more information, see our [using a package](docs/examples/using-sqlite.md) example for the specifics. 
+
+Additional notes on macOS and Linux support can be found in the [official announcement](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/).

 ## Tab-Completion / Auto-Completion
-`Vcpkg` supports auto-completion of commands, package names, options etc. To enable tab-completion in Powershell, use
+`vcpkg` supports auto-completion of commands, package names, options etc. To enable tab-completion in Powershell, use
 ```
 .\vcpkg integrate powershell
 ```
--- a/bootstrap-vcpkg.sh
+++ b/bootstrap-vcpkg.sh
@ -1,2 +1,4 @@
+#!/bin/sh
+
 vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
-$vcpkgRootDir/scripts/bootstrap.sh
+. "$vcpkgRootDir/scripts/bootstrap.sh"
--- a/docs/about/faq.md
+++ b/docs/about/faq.md
@ -26,7 +26,7 @@ To see an example of this, look at [`ports\opengl\portfile.cmake`](https://githu
 We currently target Windows Desktop (x86 and x64) as well as the Universal Windows Platform (x86, x64, and ARM). See `vcpkg help triplet` for the current list.

 ## Does Vcpkg run on Linux/OSX?
-No, for this preview we are focusing on Windows as a host platform. If you'd be interested in having Vcpkg run on Linux or OSX, please let us know in [this issue](https://github.com/microsoft/vcpkg/issues/57)!
+Yes! We continously test on OSX and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help!

 ## How do I use different versions of a library on one machine?
 Within a single instance of Vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in Vcpkg correspond to the `X-dev` or `X-devel` packages.
--- a/docs/examples/using-sqlite.md
+++ b/docs/examples/using-sqlite.md
@ -71,7 +71,7 @@ See `.\vcpkg help triplet` for all supported targets.
 <a name="msbuild"></a>
 #### VS/MSBuild Project (User-wide integration)

-The recommended and most productive way to use vcpkg is via user-wide integration, making the system available for all projects you build. The user-wide integration will prompt for administrator access the first time it is used on a given machine, but afterwords is no longer required and the integration is configured on a per-user basis.
+The recommended and most productive way to use vcpkg is via user-wide integration, making the system available for all projects you build. The user-wide integration will prompt for administrator access the first time it is used on a given machine, but afterwards is no longer required and the integration is configured on a per-user basis.
 ```no-highlight
 PS D:\src\vcpkg> .\vcpkg integrate install
 Applied user-wide integration for this vcpkg root.
--- a/docs/index.md
+++ b/docs/index.md
@ -25,7 +25,8 @@ Vcpkg helps you get C and C++ libraries on Windows. This tool and ecosystem are
 - [Export](specifications/export-command.md)

 ### Blog posts
-
+- [Announcing a single C++ library manager for Linux, macOS and Windows: Vcpkg](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/)
+- [Vcpkg: Using multiple enlistments to handle multiple versions of a library](https://blogs.msdn.microsoft.com/vcblog/2017/10/23/vcpkg-using-multiple-enlistments/)
 - [Vcpkg: introducing the export command](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/)
 - [Binary Compatibility and Pain-free Upgrade Why Moving to Visual Studio 2017 is almost "too easy"](https://blogs.msdn.microsoft.com/vcblog/2017/03/07/binary-compatibility-and-pain-free-upgrade-why-moving-to-visual-studio-2017-is-almost-too-easy/)
 - [Vcpkg recent enhancements](https://blogs.msdn.microsoft.com/vcblog/2017/02/14/vcpkg-recent-enhancements/)
--- a/docs/maintainers/vcpkg_build_cmake.md
+++ b/docs/maintainers/vcpkg_build_cmake.md
@ -15,6 +15,9 @@ The underlying buildsystem will be instructed to not parallelize
 The target passed to the cmake build command (`cmake --build . --target <target>`). If not specified, no target will
 be passed.

+### ADD_BIN_TO_PATH
+Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs.
+
 ## Notes:
 This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
 You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the
--- a/docs/maintainers/vcpkg_find_acquire_program.md
+++ b/docs/maintainers/vcpkg_find_acquire_program.md
@ -25,6 +25,7 @@ The current list of programs includes:
 - NASM
 - NINJA
 - YASM
+- ARIA2 (Downloader)

 Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md).

--- a/docs/users/triplets.md
+++ b/docs/users/triplets.md
@ -35,6 +35,9 @@ Specifies the C/C++ compiler toolchain to use.

 This can be set to `v141`, `v140`, or left blank. If left blank, we select the latest compiler toolset available on your machine.

+Visual Studio 2015 platform toolset is `v140`  
+Visual Studio 2017 platform toolset is `v141`
+
 ## Per-port customization
 The CMake Macro `PORT` will be set when interpreting the triplet file and can be used to change settings (such as `VCPKG_LIBRARY_LINKAGE`) on a per-port basis.

--- a/ports/abseil/CMakeLists.txt
+++ b/ports/abseil/CMakeLists.txt
@ -16,7 +16,7 @@ endif()

 function(add_sublibrary LIB)
    file(GLOB_RECURSE SOURCES "absl/${LIB}/*.cc")
-    list(FILTER SOURCES EXCLUDE REGEX "_test(ing)?(_.+)?.cc$|_nonprod.cc$")
+    list(FILTER SOURCES EXCLUDE REGEX "_test(ing)?(_.+)?.cc$|_nonprod.cc$|test_util.cc$")
    file(GLOB HEADERS "absl/${LIB}/*.h" "absl/${LIB}/*.inc")
    file(GLOB INTERNAL_HEADERS "absl/${LIB}/internal/*.h")

@ -75,6 +75,7 @@ add_sublibrary(utility)

 target_link_public_libraries(algorithm base meta)
 target_link_public_libraries(container algorithm base memory)
+target_link_public_libraries(debugging base)
 target_link_public_libraries(memory meta)
 target_link_public_libraries(meta base)
 target_link_public_libraries(numeric base)
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@ -1,5 +1,5 @@
 Source: abseil
-Version: 2018-04-12
+Version: 2018-05-01-1
 Description: an open-source collection designed to augment the C++ standard library.
  Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
  In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
--- 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 a7e522daf1ec9cda69b356472f662142dd0c1215
-    SHA512 250b602fc3f5a4c3b6522ef0f49bdf63db0070289cb415cb31bb672b95b35dc9494f881adeb1b090927b1cd942c3674b6142747f601c8f7233bd12d4078583f3
+    REF 9613678332c976568272c8f4a78631a29159271d
+    SHA512 a3694d4c74f542f7a55872707548469e1bdc6dcd05d40ffd62de41d7440dc1fb98d260f690a6799ad39142e35226b04aacc6122aa1edf104fc9d396997995a8c
    HEAD_REF master
 )

--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@ -1,3 +1,3 @@
 Source: ace
-Version: 6.4.7
+Version: 6.4.8
 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.4.7.zip"
-    FILENAME "ACE-6.4.7.zip"
-    SHA512 931c7e5902f3999ed05c13f9d2c53a605e9b59b4ce78f33b42238ac25286aa13fb510e2f780b6aea9505d03edf834109ab4481870327fec1b5bb11d29cfbafdc
+    URLS "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.8.zip"
+    FILENAME "ACE-6.4.8.zip"
+    SHA512 a46e7d03bf9d8a76905c91e416749b092016210bd93308bdee0ca8740f7f3ac7c4b4d5688929729fa277c02019710c7e288f5f5f9ee187a0ec176d9ebbb90f96
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@ -1,4 +1,4 @@
 Source: alembic
-Version: 1.7.7
+Version: 1.7.8
 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.7
-    SHA512 0ebcf6b9304e84bc60f1c146d0b5e5c5b1de43974ec0725293c444b48b22640945f5883eb9afd46c1ac9f0c260d6f22ff29b4866d6525c416339877be984b149
+    REF 1.7.8
+    SHA512 bc36e30d1aecd67da16247365a973c462e9716309d090fefe36f625c8d2ab2d517fe8ac694a9188cd6eeb623a3217f59f461c82fcfec43d0a60a07381526983a
    HEAD_REF master
 )

--- a/ports/args/CONTROL
+++ b/ports/args/CONTROL
@ -1,3 +1,3 @@
 Source: args
-Version: 2018-02-23
+Version: 2018-05-17
 Description: A simple header-only C++ argument parser library.
--- 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 7bf17000aa0969b8ca3178c72ec834b105944a41
-    SHA512 38f038f2ea3cdbf62678112a28f6b9a2b46b7b291ec9a7c78393c28b1169dc393a086393f24534804188d434583896d9eaedca964c00a2db032fb337ebc9c214
+    REF bd0429e91f5bb140271870d5421e412bf78b9f31
+    SHA512 585314e572b97d9b1689f71617f33562da46652141f094a3845eeace7acedc8560e010e5b7fb7afa4ff2dc37a62724445f5c8650c0c6270d42c4b5fd271a5e76
    HEAD_REF master
 )

--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.4.33
+Version: 1.4.52
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
 Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
--- 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.4.33
-    SHA512 ebe8e402107b7b70a9b397c94ad981ff02d97e10e6fd8337f19b732185ecbb79e132eecd513300ce733a765fd780dd765c1d2b34479e5e1d891fa771722bad81
+    REF 1.4.52
+    SHA512 ef10a2d9d491ae28179ec7622b34470153cf3a6fdf50ca8f942c098d74a12a9e555c314537c91e06285990fe942bee9e4ff21396752153d482e9db1776981d6b
    HEAD_REF master
 )

--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 3.2.1
-Build-Depends: cpprestsdk, atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), glibmm (!windows&!uwp), libxmlpp (!windows&!uwp), libuuid (!windows&!uwp)
+Version: 4.0.0
+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/cmake.patch
+++ b/ports/azure-storage-cpp/cmake.patch
@ -1,8 +1,32 @@
 diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-index 07878c2..8d1c47e 100644
+index a23b93f..e471b86 100644
 --- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
 +++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-@@ -51,20 +51,25 @@ if(UNIX)
+@@ -1,5 +1,5 @@
+ set(CMAKE_LEGACY_CYGWIN_WIN32 0)
+-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.8)
+ project(azurestorage)
+ 
+ enable_testing()
+@@ -21,8 +21,6 @@ if(UNIX)
+ 
+ 	# Prefer the latest (make the latest one first)
+     list(REVERSE OPENSSL_ROOT_DIR)
+-
+-
+ 	if(NOT GETTEXT_LIB_DIR)
+ 		message(WARNING "No GETTEXT_LIB_DIR specified, assuming: /usr/local/opt/gettext/lib")
+ 		set(GETTEXT_LIB_DIR "/usr/local/opt/gettext/lib")
+@@ -40,6 +38,7 @@ if(UNIX)
+   find_package(OpenSSL 1.0.0 REQUIRED)
+ 
+ 
+
+   find_package(UUID REQUIRED)
+   find_package(Casablanca REQUIRED)
+   find_package(LibXML2 REQUIRED)
+@@ -48,20 +47,25 @@ if(UNIX)
     find_package(UnitTest++ REQUIRED)
   endif()
 
@ -36,7 +60,7 @@ index 07878c2..8d1c47e 100644
   message("-- Setting gcc options")
 
   set(WARNINGS "-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code")
-@@ -81,22 +86,29 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+@@ -78,22 +82,31 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
     add_definitions(-DBOOST_LOG_DYN_LINK)
   endif()
   add_definitions(-D_TURN_OFF_PLATFORM_STRING)
@ -75,23 +99,39 @@ index 07878c2..8d1c47e 100644
 +  add_compile_options(/MP)
 +  if(BUILD_SHARED_LIBS)
 +    add_definitions(-DWASTORAGE_DLL -D_USRDLL)
+  else()
+    add_definitions(-D_NO_WASTORAGE_API)
 +  endif()
 else()
   message("-- Unknown compiler, success is doubtful.")
 endif()
-@@ -109,7 +121,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
+@@ -106,7 +119,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 set(AZURESTORAGE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/includes)
- set(AZURESTORAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes ${CASABLANCA_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ${LibXML++_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${Glibmm_INCLUDE_DIRS})
+ set(AZURESTORAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes ${CASABLANCA_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${LibXML2_INCLUDE_DIR})
 
 -
 set(AZURESTORAGE_LIBRARY azurestorage)
- set(AZURESTORAGE_LIBRARIES ${AZURESTORAGE_LIBRARY} ${CASABLANCA_LIBRARIES} ${Boost_LIBRARIES} ${Boost_FRAMEWORK} ${OPENSSL_LIBRARIES} ${LibXML++_LIBRARIES} ${UUID_LIBRARIES} ${Glibmm_LIBRARIES})
+ set(AZURESTORAGE_LIBRARIES ${AZURESTORAGE_LIBRARY} ${CASABLANCA_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK} ${OPENSSL_LIBRARIES} ${UUID_LIBRARIES} ${LibXML2_LIBRARIES})
 
 diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-index 5c1df3c..da66eb4 100644
+index 5c1df3c..40e1767 100644
 --- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
 +++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-@@ -27,6 +27,7 @@ find_path(CASABLANCA_INCLUDE_DIR
+@@ -23,10 +23,21 @@ find_path(CASABLANCA_INCLUDE_DIR
+     include
+ )
+ 
+find_package(cpprestsdk)
+
+if(cpprestsdk_FOUND)
+  set(CASABLANCA_LIBRARY cpprestsdk::cpprest)
+  set(CASABLANCA_PROCESS_LIBS CASABLANCA_LIBRARY)
+  set(CASABLANCA_PROCESS_INCLUDES CASABLANCA_INCLUDE_DIR)
+  libfind_process(CASABLANCA)
+  return()
+endif()
+
+ # Library
 find_library(CASABLANCA_LIBRARY
   NAMES 
     cpprest
@ -100,7 +140,7 @@ index 5c1df3c..da66eb4 100644
     ${CASABLANCA_PKGCONF_LIBRARY_DIRS}
     ${CASABLANCA_DIR}
 diff --git a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
-index b08111f..74ba2fb 100644
+index 59fedac..3737eeb 100644
 --- a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
 +++ b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
@ -110,9 +150,9 @@ index b08111f..74ba2fb 100644
 -if(UNIX)
 +if(UNIX OR WIN32)
   set(SOURCES
+      xml_wrapper.cpp
      xmlhelpers.cpp
-      response_parsers.cpp
-@@ -64,24 +64,46 @@ if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
+@@ -65,24 +65,46 @@ if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
 endif()
 if (APPLE)
@ -139,7 +179,7 @@ index b08111f..74ba2fb 100644
 
 target_link_libraries(${AZURESTORAGE_LIBRARIES})
 +if(WIN32)
-+  target_link_libraries(${AZURESTORAGE_LIBRARY} Ws2_32.lib rpcrt4.lib xmllite.lib bcrypt.lib) 
+  target_link_libraries(${AZURESTORAGE_LIBRARY} Ws2_32.lib rpcrt4.lib xmllite.lib bcrypt.lib)
 +endif()
 
 # Portions specific to azure storage binary versioning and installation.
--- a/ports/azure-storage-cpp/glibmm-cmake.patch
+++ b/ports/azure-storage-cpp/glibmm-cmake.patch
@ -1,13 +0,0 @@
-diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake
-index 79a4bcb..fe130bd 100644
--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake
-+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake
-@@ -36,7 +36,7 @@ find_path(GlibmmConfig_INCLUDE_DIR
- )
- 
- find_library(Glibmm_LIBRARY
-  NAMES glibmm-2.4
-+  NAMES glibmm glibmm-2.4
-   PATHS 
-     ${Glibmm_PKGCONF_LIBRARY_DIRS} 
-     /usr
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@ -7,18 +7,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Azure/azure-storage-cpp
-    REF v3.2.1
-    SHA512 8d1e8de439e52f53eb28b77e8adf394468f4861c2c4c1f79ec1437c72e3fc0bc871e4e2662ee58090748915b0f12ce6736a7cc6ede619d332686b9fb6a026c9f
+    REF v4.0.0
+    SHA512 5ca264e014685852eb52b5b732d352e3eaaca3358d4bdf78ac2a571fd3b18f2d967583ce4ec64105fb87f0ef182a84671248f3f6a62c4886ff05dfa10c773605
    HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
    PATCHES
        ${CMAKE_CURRENT_LIST_DIR}/cmake.patch
-        ${CMAKE_CURRENT_LIST_DIR}/static-builds.patch
-        ${CMAKE_CURRENT_LIST_DIR}/support-cpprest-findpackage.patch
-        ${CMAKE_CURRENT_LIST_DIR}/glibmm-cmake.patch
        ${CMAKE_CURRENT_LIST_DIR}/pplx-do-while.patch
 )

@ -35,7 +28,7 @@ vcpkg_install_cmake()
 file(INSTALL
    ${SOURCE_PATH}/LICENSE.txt
    DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-storage-cpp RENAME copyright)
-file(REMOVE_RECURSE 
+file(REMOVE_RECURSE
    ${CURRENT_PACKAGES_DIR}/debug/include)

 vcpkg_copy_pdbs()
--- a/ports/azure-storage-cpp/static-builds.patch
+++ b/ports/azure-storage-cpp/static-builds.patch
@ -1,13 +0,0 @@
-diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-index 8d1c47e..3b4d1c0 100644
--- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-@@ -108,6 +108,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-   add_compile_options(/MP)
-   if(BUILD_SHARED_LIBS)
-     add_definitions(-DWASTORAGE_DLL -D_USRDLL)
-+  else()
-+    add_definitions(-D_NO_WASTORAGE_API)
-   endif()
- else()
-   message("-- Unknown compiler, success is doubtful.")
--- a/ports/azure-storage-cpp/support-cpprest-findpackage.patch
+++ b/ports/azure-storage-cpp/support-cpprest-findpackage.patch
@ -1,32 +0,0 @@
-diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-index 3b4d1c0..d8818ac 100644
--- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
-@@ -1,5 +1,5 @@
- set(CMAKE_LEGACY_CYGWIN_WIN32 0)
-cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.8)
- project(azurestorage)
- 
- enable_testing()
-diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-index da66eb4..40e1767 100644
--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
-@@ -23,6 +23,16 @@ find_path(CASABLANCA_INCLUDE_DIR
-     include
- )
- 
-+find_package(cpprestsdk)
-+
-+if(cpprestsdk_FOUND)
-+  set(CASABLANCA_LIBRARY cpprestsdk::cpprest)
-+  set(CASABLANCA_PROCESS_LIBS CASABLANCA_LIBRARY)
-+  set(CASABLANCA_PROCESS_INCLUDES CASABLANCA_INCLUDE_DIR)
-+  libfind_process(CASABLANCA)
-+  return()
-+endif()
-+
- # Library
- find_library(CASABLANCA_LIBRARY
-   NAMES 
--- a/ports/bigint/CMakeLists.txt
+++ b/ports/bigint/CMakeLists.txt
@ -13,7 +13,7 @@ set(
 	BigInteger.cc
 	BigIntegerAlgorithms.cc
 	BigUnsignedInABase.cc
-  BigIntegerUtils.cc
+	BigIntegerUtils.cc
 )

 set(
@ -24,6 +24,7 @@ set(
 	BigIntegerAlgorithms.hh
 	BigUnsignedInABase.hh
 	BigIntegerLibrary.hh
+	BigIntegerUtils.hh
 )

 add_library(bigint ${bigint_srcs})
--- a/ports/bigint/CONTROL
+++ b/ports/bigint/CONTROL
@ -1,3 +1,3 @@
 Source: bigint
-Version: 2010.04.30-1
+Version: 2010.04.30-2
 Description: C++ Big Integer Library
--- a/ports/blosc/CONTROL
+++ b/ports/blosc/CONTROL
@ -1,4 +1,4 @@
 Source: blosc
-Version: 1.13.5
+Version: 1.13.5-1
 Build-Depends: lz4, snappy, zlib, zstd
 Description: A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`
--- a/ports/blosc/portfile.cmake
+++ b/ports/blosc/portfile.cmake
@ -16,6 +16,8 @@ else()
    set(BLOSC_SHARED ON)
 endif()

+file(REMOVE_RECURSE ${SOURCE_PATH}/internal-complibs)
+
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    OPTIONS -DPREFER_EXTERNAL_LZ4=ON
--- a/ports/boost-hana-msvc/CONTROL
+++ b/ports/boost-hana-msvc/CONTROL
@ -0,0 +1,4 @@
+Source: boost-hana-msvc
+Version: 1.67.0-1
+Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers
+Description: Boost hana module
--- a/ports/boost-hana-msvc/portfile.cmake
+++ b/ports/boost-hana-msvc/portfile.cmake
@ -0,0 +1,12 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO xiangfan-ms/hana
+    REF caa985795ab6c4b2c7bcf1458ccbb6ded65c15cb
+    SHA512 7ed65bda17042c42f7a76d88e66df61155800066119f6b256e20cf04dcd18d46584d3e44ad6555e9a17d9c0bf85fbf173ae6079f5a4a878341f959c855ebee6b
+    HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
--- a/ports/boost-hana/CONTROL
+++ b/ports/boost-hana/CONTROL
@ -1,5 +1,5 @@
-# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 but has edits
 Source: boost-hana
-Version: 1.67.0
-Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers
+Version: 1.67.0-1
+Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers, boost-hana-msvc (windows), boost-hana-msvc (uwp)
 Description: Boost hana module
--- a/ports/boost-hana/portfile.cmake
+++ b/ports/boost-hana/portfile.cmake
@ -1,7 +1,12 @@
-# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 but has edits

 include(vcpkg_common_functions)

+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+    message("The current MSVC releases can't compile boost hana yet.")
+    message("Use a fork from boost 1.67 which has source workarounds instead.")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+else()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/hana
@ -12,3 +17,4 @@ vcpkg_from_github(

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+endif()
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@ -28,8 +28,10 @@ else()
    list(APPEND B2_OPTIONS link=static)
 endif()

-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
    list(APPEND B2_OPTIONS address-model=64)
+else()
+    list(APPEND B2_OPTIONS address-model=32)
 endif()

 if(APPLE)
--- a/ports/boost-modular-build-helper/CONTROL
+++ b/ports/boost-modular-build-helper/CONTROL
@ -1,2 +1,2 @@
 Source: boost-modular-build-helper
-Version: 2018-04-16-4
+Version: 2018-05-14
--- a/ports/box2d/CMakeLists.txt
+++ b/ports/box2d/CMakeLists.txt
@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.9)
+project(Box2d CXX)
+
+file(GLOB_RECURSE SOURCES Box2D/Box2D/*.cpp)
+
+add_library(Box2D ${SOURCES})
+target_include_directories(Box2D PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Box2D> $<INSTALL_INTERFACE:include>)
+
+install(TARGETS Box2D
+    EXPORT unofficial-box2d-targets
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+)
+
+install(
+    EXPORT unofficial-box2d-targets
+    FILE unofficial-box2d-config.cmake
+    NAMESPACE unofficial::box2d::
+    DESTINATION share/unofficial-box2d
+)
--- a/ports/box2d/CONTROL
+++ b/ports/box2d/CONTROL
@ -1,3 +1,3 @@
 Source: box2d
-Version: 2.3.1-374664b
+Version: 2.3.1-374664b-1
 Description: Box2D (http://box2d.org) is an open source C++ engine for simulating rigid bodies in 2D.
--- a/ports/box2d/portfile.cmake
+++ b/ports/box2d/portfile.cmake
@ -1,17 +1,8 @@
-
-# Get output directory
-set(PROJECT_ARCH_BITS "x64")
-if(TRIPLET_SYSTEM_ARCH MATCHES "x86")
-    set(PROJECT_ARCH_BITS "x32")
-elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm")
-    message(FATAL_ERROR "ARM not supported")
-endif(TRIPLET_SYSTEM_ARCH MATCHES "x86")
-
-
 include(vcpkg_common_functions)

-if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
-    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    message("Box2D only supports building as a static library")
+    set(VCPKG_LIBRARY_LINKAGE "static")
 endif()

 vcpkg_from_github(
@ -22,54 +13,23 @@ vcpkg_from_github(
    HEAD_REF master
 )

-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES
-            ${CMAKE_CURRENT_LIST_DIR}/use-static-linkage.patch
-    )
-endif()
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

-# Put the licence and readme files where vcpkg expects it
-message(STATUS "Packaging license")
-file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/box2d)
-file(COPY ${SOURCE_PATH}/Box2D/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/box2d)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/box2d/License.txt ${CURRENT_PACKAGES_DIR}/share/box2d/copyright)
-message(STATUS "Packaging license done")
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+vcpkg_install_cmake()

-# Building:
-set(OUTPUTS_PATH "${SOURCE_PATH}/Box2D/Build/vs2015/bin/${PROJECT_ARCH_BITS}")
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-box2d TARGET_PATH share/unofficial-box2d)

-vcpkg_build_msbuild(PROJECT_PATH ${SOURCE_PATH}/Box2D/Build/vs2015/Box2D.vcxproj)
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    message(STATUS "Packaging ${TARGET_TRIPLET}-Release lib")
-    file(
-        INSTALL ${OUTPUTS_PATH}/Release/
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-        FILES_MATCHING PATTERN "*.lib"
-    )
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Box2D.lib ${CURRENT_PACKAGES_DIR}/lib/box2d.lib)
-    message(STATUS "Packaging ${TARGET_TRIPLET}-Release lib done")
-endif()
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    message(STATUS "Packaging ${TARGET_TRIPLET}-Debug lib")
-    file(
-        INSTALL ${OUTPUTS_PATH}/Debug/
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-        FILES_MATCHING PATTERN "*.lib"
-    )
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Box2D.lib ${CURRENT_PACKAGES_DIR}/debug/lib/box2d.lib)
-    message(STATUS "Packaging ${TARGET_TRIPLET}-Debug lib done")
-endif()
-
-message(STATUS "Packaging headers")
 file(
    COPY ${SOURCE_PATH}/Box2D/Box2D
    DESTINATION ${CURRENT_PACKAGES_DIR}/include
-    PATTERN "*.h"
+    FILES_MATCHING PATTERN "*.h"
 )
-message(STATUS "Packaging headers done")

 vcpkg_copy_pdbs()
+
+file(COPY ${SOURCE_PATH}/Box2D/License.txt ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/box2d)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/box2d/License.txt ${CURRENT_PACKAGES_DIR}/share/box2d/copyright)
--- a/ports/box2d/use-static-linkage.patch
+++ b/ports/box2d/use-static-linkage.patch
@ -1,40 +0,0 @@
-diff --git a/Box2D/Build/vs2015/Box2D.vcxproj b/Box2D/Build/vs2015/Box2D.vcxproj
-index 830803c..5dda519 100644
--- a/Box2D/Build/vs2015/Box2D.vcxproj
-+++ b/Box2D/Build/vs2015/Box2D.vcxproj
-@@ -86,7 +86,7 @@
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
-@@ -115,7 +115,7 @@
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
-@@ -145,7 +145,7 @@
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>false</MinimalRebuild>
-       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
-@@ -176,7 +176,7 @@
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>false</MinimalRebuild>
-       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
--- a/ports/brotli/CONTROL
+++ b/ports/brotli/CONTROL
@ -1,3 +1,3 @@
 Source: brotli
-Version: 1.0.2-1
+Version: 1.0.2-3
 Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.
--- a/ports/brotli/portfile.cmake
+++ b/ports/brotli/portfile.cmake
@ -17,8 +17,10 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()

 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/brotli)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/brotli.exe ${CURRENT_PACKAGES_DIR}/tools/brotli/brotli.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/brotli.exe)
+file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/brotli ${CURRENT_PACKAGES_DIR}/bin/brotli.exe)
+file(GLOB DEBUG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/brotli ${CURRENT_PACKAGES_DIR}/debug/bin/brotli.exe)
+file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/brotli)
+file(REMOVE ${EXES} ${DEBUG_EXES})

 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli)

@ -26,8 +28,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
    file(GLOB STATIC_LIBS "${CURRENT_PACKAGES_DIR}/lib/*-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/*-static.lib")
    file(REMOVE ${STATIC_LIBS})
 else()
-    file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/*.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib")
+    file(GLOB LIBS
+        "${CURRENT_PACKAGES_DIR}/lib/*.lib"
+        "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib"
+        "${CURRENT_PACKAGES_DIR}/lib/*.a"
+        "${CURRENT_PACKAGES_DIR}/debug/lib/*.a"
+    )
    list(FILTER LIBS EXCLUDE REGEX "-static\\.lib\$")
+    list(FILTER LIBS EXCLUDE REGEX "-static\\.a\$")
    file(REMOVE_RECURSE ${LIBS} ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()

--- a/ports/catch-classic/CONTROL
+++ b/ports/catch-classic/CONTROL
@ -1,5 +1,5 @@
 Source: catch-classic
-Version: 1.12.1
+Version: 1.12.2
 Description: A modern, header-only test framework for unit tests
 This is specifically the legacy 1.x branch provided for compatibility
 with older compilers.
--- a/ports/catch-classic/portfile.cmake
+++ b/ports/catch-classic/portfile.cmake
@ -1,11 +1,11 @@
 include(vcpkg_common_functions)

-set(CATCH_VERSION v1.12.1)
+set(CATCH_VERSION v1.12.2)

 vcpkg_download_distfile(HEADER
    URLS "https://github.com/catchorg/Catch2/releases/download/${CATCH_VERSION}/catch.hpp"
    FILENAME "catch-classic-${CATCH_VERSION}.hpp"
-    SHA512 2029065d979690a6b76318e1527fc770e062a3d3411f9354f03063263f01bd3a249c8e86a57eb0e07d66cd068f7cded7d369a53997c2b762eb5fdc2668e30152
+    SHA512 d2cf8b2fe95aae061a7771a0e1b7135583595d1f36dfc8d5e4d10e101ab58f6fac9d260f77c5760906c24aa402d7433aa82b5d6a0ca6b3ad91092dc5cc2d9c22
 )

 vcpkg_download_distfile(LICENSE
--- a/ports/ceres/portfile.cmake
+++ b/ports/ceres/portfile.cmake
@ -1,9 +1,9 @@
 set(MSVC_USE_STATIC_CRT_VALUE OFF)
 if(VCPKG_CRT_LINKAGE STREQUAL "static")
-	if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-	    message(FATAL_ERROR "Ceres does not currently support mixing static CRT and dynamic library linkage")
-	endif()
-	set(MSVC_USE_STATIC_CRT_VALUE ON)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        message(FATAL_ERROR "Ceres does not currently support mixing static CRT and dynamic library linkage")
+    endif()
+    set(MSVC_USE_STATIC_CRT_VALUE ON)
 endif()

 include(vcpkg_common_functions)
@ -16,9 +16,6 @@ vcpkg_from_github(
    HEAD_REF master
 )

-# Ninja crash compiler with error:
-# "fatal error C1001: An internal error has occurred in the compiler. (compiler file 'f:\dd\vctools\compiler\utc\src\p2\main.c', line 255)"
-
 set(SUITESPARSE OFF)
 if("suitesparse" IN_LIST FEATURES)
    set(SUITESPARSE ON)
@ -62,7 +59,13 @@ vcpkg_configure_cmake(
 )

 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+
+if(WIN32)
+  vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+else()
+  vcpkg_fixup_cmake_targets(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres")
+endif()
+
 vcpkg_copy_pdbs()

 # Changes target search path
--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@ -1,4 +1,4 @@
 Source: cgal
-Version: 4.11.1
+Version: 4.12
 Build-Depends: mpfr, mpir, zlib, qt5, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random
 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.
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO CGAL/cgal
-    REF 27859944b4d96797030fc018892d5123b7cba0b2
-    SHA512 020d4398fcae0607cd3fe1bd22a190fbe1d45cba0c7e3c95d6d3dfb6d23c43949a1608069972e511f5d47fc787c350c0a0a0085faa2f4b9fd26ce101376752c6 
+    REF f7c3c8212b56c0d6dae63787efc99093f4383415
+    SHA512 fc40483b5f0e2071c3458cbd67ee7e503f68b7f6a1bbb525b6003d1a440e662cb85c257167ce6d55a73e0cc49b27a7d2b56dcf6b5eeddc78772567fdc48ba160
    HEAD_REF master
 )

--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@ -1,3 +1,3 @@
 Source: chakracore
-Version: 1.8.3
+Version: 1.8.4
 Description: Core part of the Chakra Javascript engine
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@ -15,8 +15,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/ChakraCore
-    REF v1.8.3
-    SHA512 4a5d6372cab51bb70911519fb9639d0cb6c456a966e2c90992f924ba36dcf741e32dbf18aea4419dc855f286da7e3edbfcc796bc90347858192c976298315785
+    REF v1.8.4
+    SHA512 54f0ec00656d26c3cb3c034c0d1f0c927b67ce083cca6d2ced1f936e31a0987d0e4000dfb2419ffa6a21a15fa87b03a9214e92e8694158fc1e3715a095f08e19
    HEAD_REF master
 )

--- a/ports/cimg/CONTROL
+++ b/ports/cimg/CONTROL
@ -1,3 +1,3 @@
 Source: cimg
-Version: 2.2.2
+Version: 2.2.3
 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.2.2
+    REF v.2.2.3
    HEAD_REF master
-    SHA512 b3090e594accc31222e24e787381af315b5168dad4ea9669cc543ad6807c175dd60b9eddceda1c74a7bb716912650219763077b3eaee6fae79cfec1099c65836)
+    SHA512 0c92b4162e9259e447f9d1e777cc18b9df57cde77159681cdc8e15843f3c149fbf9ac7a420d63642d2a3aefb36bdb1740ef53d587a0983c32748f317605c16e0)

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

--- a/ports/clblas/portfile.cmake
+++ b/ports/clblas/portfile.cmake
@ -9,7 +9,7 @@ vcpkg_from_github(
 )

 # v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names
-# conflicting with the built-in, more modern FindOpenCL.cmake 
+# conflicting with the built-in, more modern FindOpenCL.cmake
 file(
    REMOVE ${SOURCE_PATH}/src/FindOpenCL.cmake
 )
@ -32,7 +32,9 @@ vcpkg_configure_cmake(
 )

 vcpkg_install_cmake()
-
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 file(INSTALL
@ -43,6 +45,7 @@ file(INSTALL
 )

 file(REMOVE
+        ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb
        ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe
        ${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe
        ${CURRENT_PACKAGES_DIR}/debug/bin/concrt140d.dll
--- a/ports/cmark/CONTROL
+++ b/ports/cmark/CONTROL
@ -0,0 +1,3 @@
+Source: cmark
+Version: 0.28.3-1
+Description: CommonMark parsing and rendering library
--- a/ports/cmark/portfile.cmake
+++ b/ports/cmark/portfile.cmake
@ -0,0 +1,40 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    # Note: fails due to missing cmark_export.h -- fix should be to always generate the correct export header.
+    message(FATAL_ERROR "cmark does not currently support static library linkage")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO commonmark/cmark
+    REF 0.28.3
+    SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29
+    HEAD_REF master
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CMARK_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CMARK_SHARED)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DCMARK_TESTS=OFF
+        -DCMARK_SHARED=${CMARK_SHARED}
+        -DCMARK_STATIC=${CMARK_STATIC}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmark RENAME copyright)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+else()
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/cmark.exe ${CURRENT_PACKAGES_DIR}/debug/bin/cmark.exe)
+endif()
--- a/ports/coolprop/CONTROL
+++ b/ports/coolprop/CONTROL
@ -1,4 +1,4 @@
 Source: coolprop
-Version: 6.1.0-3
+Version: 6.1.0-4
 Description: Thermophysical properties for the masses
 Build-Depends: catch, eigen3, pybind11, if97, fmt, rapidjson, msgpack, refprop-headers
--- a/ports/coolprop/fmt-fix.patch
+++ b/ports/coolprop/fmt-fix.patch
@ -0,0 +1,39 @@
+diff --git a/include/CPstrings.h b/include/CPstrings.h
+index 2e5a5af..87f6b7c 100644
+--- a/include/CPstrings.h
+++ b/include/CPstrings.h
+@@ -5,6 +5,8 @@
+     #include <iterator>
+     #include <algorithm>
+     #include <functional>
+    #include <vector>
+    #include <string>
+ 
+ #if !defined(NO_CPPFORMAT)
+     #ifndef FMT_HEADER_ONLY
+@@ -13,9 +15,6 @@
+     #include "fmt/format.h" // For addition of the string formatting functions and macros from cppformat
+     #include "fmt/printf.h" // For sprintf
+     #undef FMT_HEADER_ONLY
+-#else
+-    #include <vector>
+-    #include <string>
+ #endif
+ 
+     #include "Exceptions.h"
+@@ -57,11 +56,11 @@
+     // Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks
+     inline std::string format(const char* fmt, ...);
+ #else
+-    // Missing std::string formatting function - provided by the cppformat library
+-    inline std::string format(const char *format, fmt::ArgList args) {
+-      return fmt::sprintf(format, args);
+    template<class...Args>
+    std::string format(const Args & ... args)
+    {
+        return fmt::sprintf(args...);
+     }
+-    FMT_VARIADIC(std::string, format, const char *)
+ #endif
+ 
+     // Missing string split - like in Python
--- a/ports/coolprop/portfile.cmake
+++ b/ports/coolprop/portfile.cmake
@ -7,6 +7,8 @@ vcpkg_from_github(
    REF 0e934e842e9ce83eea64fda1d4ab8e59adf9d8cd
    SHA512 a44eafc84f2b88259d7bcf6cfa81daeb81ea9d55bd356e59b3ef77b6f68ea405961c7cb54ba899e3896bb2a02d3e01119a4a51f72899126c8da6081fa2ece948
    HEAD_REF master
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/fmt-fix.patch
 )

 vcpkg_find_acquire_program(PYTHON2)
@ -16,8 +18,8 @@ set(ENV{PATH} "$ENV{PATH};${PYTHON2_DIR}")
 file(REMOVE_RECURSE ${SOURCE_PATH}/externals)

 # Patch up the file locations
-file(COPY 
-    ${CURRENT_INSTALLED_DIR}/include/catch.hpp 
+file(COPY
+    ${CURRENT_INSTALLED_DIR}/include/catch.hpp
    DESTINATION ${SOURCE_PATH}/externals/Catch/single_include
 )

@ -30,12 +32,12 @@ file(COPY
    DESTINATION ${SOURCE_PATH}/externals/Eigen/unsupported
 )

-file(COPY 
+file(COPY
    ${CURRENT_INSTALLED_DIR}/include/rapidjson
    DESTINATION ${SOURCE_PATH}/externals/rapidjson/include
 )

-file(COPY 
+file(COPY
    ${CURRENT_INSTALLED_DIR}/include/IF97.h
    DESTINATION ${SOURCE_PATH}/externals/IF97
 )
--- a/ports/corrade/CONTROL
+++ b/ports/corrade/CONTROL
@ -1,5 +1,5 @@
 Source: corrade
-Version: 2018.02-1
+Version: 2018.04-1
 Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/
 Default-Features: interconnect, pluginmanager, testsuite, utility

--- a/ports/corrade/portfile.cmake
+++ b/ports/corrade/portfile.cmake
@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO mosra/corrade
-    REF v2018.02
-    SHA512 8fe4998dc32586386b8fa2030941f3ace6d5e76aadcf7e20a620d276cc9247324e10eb58f2c2c9e84a1a9d9b336e6bdc788f9947c9e507a053d6fd2ffcd3d58e
+    REF v2018.04
+    SHA512 be14f0cb76c904a37f962af16b331407ec6a1f7a31245c7221f41fcbce2749a1ad67057d451736814e357eaa59e015f16996bdba819f69a1dd0f3d5a3cad34a4
    HEAD_REF master
 )

--- a/ports/curl/0004_nghttp2_staticlib.patch
+++ b/ports/curl/0004_nghttp2_staticlib.patch
@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 490cc19..51c0a92 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -388,6 +388,9 @@ if(USE_NGHTTP2)
+   find_package(NGHTTP2 REQUIRED)
+   include_directories(${NGHTTP2_INCLUDE_DIRS})
+   list(APPEND CURL_LIBS ${NGHTTP2_LIBRARIES})
+  if(CURL_STATICLIB)
+    add_definitions(-DNGHTTP2_STATICLIB)
+  endif()
+ endif()
+
+ if(NOT CURL_DISABLE_LDAP)
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@ -1,5 +1,5 @@
 Source: curl
-Version: 7_59_0-2
+Version: 7.60.0-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
@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO curl/curl
-    REF curl-7_59_0
-    SHA512 eac51b986db7eafb836bc4fa00def88054304110990bf99a4387a5ff85a8375616c2ee5bee91bf608737faffe9f228dfd62be69a4b0622a4afe3deb1098b6bd3
+    REF curl-7_60_0
+    SHA512 876ca211d40887f36f77661235d3875bdd3fe210f131c8bd1025bd8c9ca3144a9ac23247067675a3e30385427748c51d0d54250cc2bb4a2ae0c3a9b9428b0e66
    HEAD_REF master
 )

@ -13,6 +13,7 @@ vcpkg_apply_patches(
        ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
        ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch
        ${CMAKE_CURRENT_LIST_DIR}/0003_fix_libraries.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0004_nghttp2_staticlib.patch
 )

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@ -1,3 +1,3 @@
 Source: directxmesh
-Version: feb2018-eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9
+Version: may2018
 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 eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9
-    SHA512 35a6be07fbdf5d9a39e7f5a3716057d09643d0c4bb43d39beae4233ca6941d2e2318b826dcc4a385dfa512675c7e28f320067b88bb325943b6532c8e65ebcd1b
+    REF may2018
+    SHA512 33fe4a680f274b1e7a643cc1a49762d7c9528e1fefab8ec41010c8b3b094cad56731c23e4d098b0684689050a62a89186557cf448075e73b9f592bad22cb0ca0
    HEAD_REF master
 )

--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@ -1,3 +1,3 @@
 Source: directxtex
-Version: feb2018b
+Version: may2018
 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 feb2018b
-    SHA512 7ab88ea863947ec279c9c83bd6dd48e15345430c750c7215c22998661fad1a711f207c57227bc5cc3cddfb5e0a89a8971d7ef3319057636e2b6f3e2e607ea0cb
+    REF may2018
+    SHA512 208186f9efe045b6219ac19748896e3630494f75bec33030248b0d7b37d6d6c2433d3fce7141157f85ce068a27a170d0af153dfc4465a9d280aef181ebe3a51f
    HEAD_REF master
 )

--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@ -1,3 +1,3 @@
 Source: directxtk
-Version: feb2018
+Version: may2018
 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 feb2018
-    SHA512 0f123f6fa26bf5aebd0d0b3139f655369726581c25eec24d804eebf5dc34b3e45476e8a1679bf1a294b011bf32e19c5e2a63a385ecb8774dfacee3e8833c5b9e
+    REF may2018
+    SHA512 0d492fcd72882aa91270b8fbaf9caa897bf4499931921fdded052129ecbb5476a373fa32ac0870897bc5ead9dae749f9b52e86fc617654f64b263041001cdfb5
    HEAD_REF master
 )

--- a/ports/discord-rpc/CONTROL
+++ b/ports/discord-rpc/CONTROL
@ -1,3 +1,3 @@
 Source: discord-rpc
-Version: 3.2.0
+Version: 3.3.0
 Description: Rich Presence allows you to leverage the totally overhauled "Now Playing" section in a Discord user's profile to help people play your game together.
--- a/ports/discord-rpc/portfile.cmake
+++ b/ports/discord-rpc/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO discordapp/discord-rpc
-    REF v3.2.0
-    SHA512 83a32db240f30f4429c145dd400eba5b9985ea779e492ffa2be2ba2664d97e4dec1f4416ad0f3e6fc908c3c9b30aebe4a8e293e0ef3c60e01fc6f16b5f9a7c16
+    REF v3.3.0
+    SHA512 8bb2674edefabf75670ceca29364d69e2002152bff9fe55757f4cda03544b4d827ff33595d98e6d8acdc73ca61cef8ab8054ad0a1ffc905cb26496068b15025f
    HEAD_REF master
 )

--- a/ports/dlib/CONTROL
+++ b/ports/dlib/CONTROL
@ -1,5 +1,5 @@
 Source: dlib
-Version: 19.10-1
+Version: 19.13
 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.10
-    SHA512 88c5b41c12219e6166c6621b654b3869ca4a2af777a8fa55429b833b90b048e3e74ea7ad752d7440809b8171bbd38090cb24a29770391fc3a9d53f9a5fba3341
+    REF v19.13
+    SHA512 3b6869cb9b08d98152bc0d474714f5d342e3d35e6226e5eeb54216ad64d0d0a48a5bf0e78a7db68540b5f593c74f2b3cefac2f545e4038130283c127a16cd00f
    HEAD_REF master
 )

@ -62,6 +62,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_ne
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cudnn)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cuda)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cpp11)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_avx)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm)

 # Dlib encodes debug/release in its config.h. Patch it to respond to the NDEBUG macro instead.
--- a/ports/doctest/CONTROL
+++ b/ports/doctest/CONTROL
@ -1,3 +1,3 @@
 Source: doctest
-Version: 1.2.8
+Version: 1.2.9
 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.8
-    SHA512 4558909c6a846fa8679539a9d44e442d9ce6aae37c807ef34d95648abfabe0a16e4593aef83293e3d03bcf80e0269742ff0b95d54eb434c7a18be136608cd24d
+    REF 1.2.9
+    SHA512 9500570fb0ef7b06799fbe92b8f96eacf16eba630abe4f67a235901995192e31fafb812704f327f0a2582c8fe61c3bb458d2eaf3c4287f24c1ffbc04c46a2471
    HEAD_REF master
 )

--- a/ports/entt/CONTROL
+++ b/ports/entt/CONTROL
@ -1,3 +1,3 @@
 Source: entt
-Version: 2.4.2-1
+Version: 2.5.0
 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.4.2
-    SHA512 fd532f2c180c328d396f557386b70e961c122af11e379ce57db3709d20345280ada200dadde136ae3557ad25daa944d8a86f7868cd0bedea78427d42c27d6e6d
+    REF v2.5.0
+    SHA512 a56d17c4ac832b50349293eb40c32efb079d90c9a7010589979eac5f13b97e82c032f94b87d0d7885099ee6f1857e68e064e3248c7f4d52ccca02620fd80ea25
 )

 file(INSTALL
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@ -1,4 +1,4 @@
 Source: exiv2
-Version: 2018-04-12
+Version: 2018-05-17
 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 c80b1b9d51689692bc865f1a1d16bf7fd2a532c4
-    SHA512 72c3801678424cd738423ea28e03c44f4d2bfd6a7e3c2cea53806b3705eebc5e86a293d3aa2bea51f6f426b9e280a3f7b8883bb4e4c627cc413159d9565033a0
+    REF 4b24e011dc485102a68a8809621e718fc77830a2
+    SHA512 acd192c585a074fae3308cce9355e735165142dc19c4a1ab6040fe4e686aa199f30d664eb2b450fe297c9ce0b027952bf784e8aea18c893d80b28e331bf48839
    HEAD_REF master
 )

--- a/ports/exprtk/CONTROL
+++ b/ports/exprtk/CONTROL
@ -1,3 +1,3 @@
 Source: exprtk
-Version: 2018.01.01-f32d2b4
+Version: 2018.04.30-46877b6
 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 f32d2b4bbb640ea4732b8a7fce1bd9717e9c998b
-    SHA512 22c977dc2514bd525856ed26b8895687601e79784486efe9d4f27466e1e1932c4a947297d83e9b98a6c82df9eaf5b0f82990741bbb699d565ca11e5755a55dd6
+    REF 46877b604cfcc0a0e592fc7a8a874cf2a9f90cf4
+    SHA512 1043b5b6aa64bc3f8d989d2aac3e3a125188b1526ab92e245ad526ab1fe37e10cb275f2b77d311b4d91bd4ea32e1d81dfcd8abf8373b723a8b664842690ee1ae
 )

 file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
--- a/ports/fdk-aac/CONTROL
+++ b/ports/fdk-aac/CONTROL
@ -1,3 +1,3 @@
 Source: fdk-aac
-Version: 2018-03-07
+Version: 2018-05-17
 Description: A standalone library of the Fraunhofer FDK AAC code
--- a/ports/fdk-aac/portfile.cmake
+++ b/ports/fdk-aac/portfile.cmake
@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO mstorsjo/fdk-aac
-  REF a30bfced6b6d6d976c728552d247cb30dd86e238
-  SHA512 07371b78998b2330022ca5f4b6c605a30d279faef28b3fb53d03bbf7163c87bed9432fcd3efbee70906453e7599bc7191e6aeb0bc88b35dcfb79c2a935eb327d
+  REF a50eecf65b5ce5d4f03768c5c2cb4b492d2badad
+  SHA512 1cb42e99d9d3112a42497f85c8ddbfb919a1c33bc8094408a828468762fe6d07c97940effa69d043c2d9923f3fa1805fd8c723154631609a6b0883eb4d3c6b27
  HEAD_REF master
 )

--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@ -1,3 +1,3 @@
 Source: fmt
-Version: 4.1.0
+Version: 5.0.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 4.1.0
-    SHA512 8daaa4a61bfe63345a12df0a9bca0b1cd6a162d0f4e97d2d2978ae19a1a1357ec4d4cce948ce726cdbe9403e51ad995950a2a99de28f9b9085c02ce845540b22
+    REF 5.0.0
+    SHA512 1ce93648ab7aca6082767ff009d5836e226fa42f183852ca15230f371ef0a34878110ca63d8669a68de7f115c137fdaa11de998986a9440f08d50f0f214ebb90
    HEAD_REF master
 )

@ -22,19 +22,19 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmt.dll)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll)

    # Force FMT_SHARED to 1
-    file(READ ${CURRENT_PACKAGES_DIR}/include/fmt/format.h FMT_FORMAT_H)
-    string(REPLACE "defined(FMT_SHARED)" "1" FMT_FORMAT_H "${FMT_FORMAT_H}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/fmt/format.h "${FMT_FORMAT_H}")
+    file(READ ${CURRENT_PACKAGES_DIR}/include/fmt/core.h FMT_CORE_H)
+    string(REPLACE "defined(FMT_SHARED)" "1" FMT_CORE_H "${FMT_CORE_H}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/fmt/core.h "${FMT_CORE_H}")
 endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 vcpkg_fixup_cmake_targets()

 file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE)
-string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE})
+string(REPLACE "lib/fmtd.dll" "bin/fmtd.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE})
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}")
 file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake FMT_RELEASE_MODULE)
 string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_RELEASE_MODULE ${FMT_RELEASE_MODULE})
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@ -1,5 +1,5 @@
 Source: folly
-Version: 2018.04.16.00
+Version: 2018.05.14.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,13 +17,9 @@ set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/folly
-    REF v2018.04.16.00
-    SHA512 1f14da6eece3a490bd134a40550c2a3f78356789090e19933b8f10bc356837ee774a21e6f0b88c45831a968587049092b9d0d77617f040ab8e177de224400408
+    REF v2018.05.14.00
+    SHA512 ea03bdd239a637729aa863034f2ff679fcb5b982d0ebb015d45b84317afa0faec31595a2069b6553e1cc265272783926e370888f046b8d0bbd7833af2b985cb1
    HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
    PATCHES
        ${CMAKE_CURRENT_LIST_DIR}/find-gflags.patch
 )
--- a/ports/forest/CONTROL
+++ b/ports/forest/CONTROL
@ -1,3 +1,3 @@
 Source: forest
-Version: 7.0.6
+Version: 7.0.7
 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 7.0.6
-    SHA512 a1e5d27f2b8b9e6758a67a9124fc25517074c633644651b26f6683bab09189569e75ccf4ae7d9cfeddae234435b073fc00e0f5385c4e9370062c3e8b222c1c59
+    REF 7.0.7
+    SHA512 23488008d92736b4d1460cca95216918085071bf107356989158752faac14248a81a35e0acfd7e119895006304c0e3dda86174e551e87f588c62c1f264168d63
    HEAD_REF master
 )

--- a/ports/freeglut/CONTROL
+++ b/ports/freeglut/CONTROL
@ -1,3 +1,3 @@
 Source: freeglut
-Version: 3.0.0-3
+Version: 3.0.0-4
 Description: Open source implementation of GLUT with source and binary backwards compatibility.
--- a/ports/freeglut/portfile.cmake
+++ b/ports/freeglut/portfile.cmake
@ -7,6 +7,10 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})

+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev")
+endif()
+
 # disable debug suffix, because FindGLUT.cmake from CMake 3.8 doesn't support it
 file(READ ${SOURCE_PATH}/CMakeLists.txt FREEGLUT_CMAKELISTS)
 string(REPLACE "SET( CMAKE_DEBUG_POSTFIX \"d\" )"
@ -41,9 +45,11 @@ string(REPLACE "pragma comment (lib, \"freeglutd.lib\")"
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h "${FREEGLUT_STDH}")

 # Rename static lib (otherwise it's incompatible with FindGLUT.cmake)
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut.lib)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut.lib)
+    endif()
 endif()

 # Clean
--- a/ports/gainput/CONTROL
+++ b/ports/gainput/CONTROL
@ -1,3 +1,3 @@
 Source: gainput
-Version: 1.0.0
+Version: 1.0.0-1
 Description: Gainput is a multiplatform C++ input library, supporting mouse, keyboard and controllers
--- a/ports/gdal/0001-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch
+++ b/ports/gdal/0001-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch
@ -1,37 +0,0 @@
-diff --git a/nmake.opt b/nmake.opt
-index bd5719c2d1..f6101ccd59 100644
--- a/nmake.opt
-+++ b/nmake.opt
-@@ -127,18 +127,28 @@ CXX_PDB_FLAGS=/Zi /Fd$(GDAL_ROOT)\gdal$(VERSION).pdb
- CXX_PDB_FLAGS=
- !ENDIF
- 
-+# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd)
-+# Ensure MRSID_CONFIG in mrsid/nmake.opt is set appropriately as well
-+!IFNDEF CXX_CRT_FLAGS
-+!IFNDEF DEBUG
-+CXX_CRT_FLAGS=/MD
-+!ELSE
-+CXX_CRT_FLAGS=/MDd
-+!ENDIF
-+!ENDIF
-+
- !IFNDEF OPTFLAGS
- !IF $(MSVC_VER) >= 1400
- !IFNDEF DEBUG
-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
-+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
- !ELSE
-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MD /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
-+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
- !ENDIF
- !ELSE
- !IFNDEF DEBUG
-OPTFLAGS= $(CXX_PDB_FLAGS) /nologo /MD /EHsc /GR /Ox /FC /DNDEBUG
-+OPTFLAGS= $(CXX_PDB_FLAGS) /nologo $(CXX_CRT_FLAGS) /EHsc /GR /Ox /DNDEBUG
- !ELSE
-OPTFLAGS= $(CXX_PDB_FLAGS) /nologo /MD /EHsc /GR /FC /DDEBUG
-+OPTFLAGS= $(CXX_PDB_FLAGS) /nologo $(CXX_CRT_FLAGS) /EHsc /GR /DDEBUG
- !ENDIF
- !ENDIF  #MSVC_VER
- !ENDIF  # OPTFLAGS
--- a/ports/gdal/0001-Fix-debug-crt-flags.patch
+++ b/ports/gdal/0001-Fix-debug-crt-flags.patch
@ -0,0 +1,27 @@
+diff -Nuar a/nmake.opt b/nmake.opt
+--- a/nmake.opt	2018-05-04 09:05:46.000000000 +0200
+++ b/nmake.opt	2018-05-11 22:58:39.387603800 +0200
+@@ -120,11 +120,21 @@
+ CXX_PDB_FLAGS=
+ !ENDIF
+ 
+# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd)
+# Ensure MRSID_CONFIG in mrsid/nmake.opt is set appropriately as well
+!IFNDEF CXX_CRT_FLAGS
+!IFNDEF DEBUG
+CXX_CRT_FLAGS=/MD
+!ELSE
+CXX_CRT_FLAGS=/MDd
+!ENDIF
+!ENDIF
+
+ !IFNDEF OPTFLAGS
+ !IFNDEF DEBUG
+-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
+ !ELSE
+-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
+ !ENDIF
+ !ENDIF  # OPTFLAGS
+ 
--- a/ports/gdal/0002-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
+++ b/ports/gdal/0002-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
@ -1,14 +0,0 @@
-diff --git a/nmake.opt b/nmake.opt
-index bd5719c2d1..c0ca442cbe 100644
--- a/nmake.opt
-+++ b/nmake.opt
-@@ -195,6 +205,9 @@ SOFTWARNFLAGS= /wd4244 /wd4702 /wd4701 /wd4013 /wd4706 /wd4057 /wd4210 /wd4305
- # Linker debug options
- !IFDEF DEBUG
- LDEBUG= /debug
-+!ELSEIFDEF WITH_PDB
-+# Ensures that PDB is included in release DLL if so requested
-+LDEBUG= /debug /opt:ref /opt:icf
- !ENDIF
- 
- # Uncomment the following if you are building for 64-bit windows
--- a/ports/gdal/0003-Fix-openjpeg-include.patch
+++ b/ports/gdal/0003-Fix-openjpeg-include.patch
@ -1,20 +0,0 @@
-diff --git a/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp
-index 5978882bc9..72cc7b9559 100644
--- a/frmts/openjpeg/openjpegdataset.cpp
-+++ b/frmts/openjpeg/openjpegdataset.cpp
-@@ -34,14 +34,8 @@
- #pragma clang diagnostic ignored "-Wdocumentation"
- #endif
- 
-#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200
-#include <openjpeg-2.2/openjpeg.h>
-#elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
-#include <openjpeg-2.1/openjpeg.h>
-#else
- #include <stdio.h> /* openjpeg.h needs FILE* */
-#include <openjpeg-2.0/openjpeg.h>
-#endif
-+#include <openjpeg.h>
- 
- #ifdef __clang__
- #pragma clang diagnostic pop
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@ -1,4 +1,4 @@
 Source: gdal
-Version: 2.2.2-1
+Version: 2.3.0-1
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
-Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, libmysql, openjpeg, libwebp, libxml2, liblzma
+Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, libmysql, openjpeg, libwebp, libxml2, liblzma
--- a/ports/gdal/no-my-bool.patch
+++ b/ports/gdal/no-my-bool.patch
@ -1,13 +1,12 @@
-diff --git a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
-index 8733af9..f49d862 100644
--- a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
-+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
-@@ -259,7 +259,7 @@ int OGRMySQLDataSource::Open( const char * pszNewName, char** papszOpenOptionsIn
-         // Enable automatic reconnection
-         // Must be called after mysql_real_connect() on MySQL < 5.0.19
-         // and at any point on more recent versions.
-        my_bool reconnect = 1;
-+        bool reconnect = 1;
-         mysql_options(hConn, MYSQL_OPT_RECONNECT, &reconnect);
-     }
- 
+diff -Nuar a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
+--- a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp	2018-05-04 09:09:26.000000000 +0200
+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp	2018-05-11 23:07:44.284558300 +0200
+@@ -235,7 +235,7 @@
+         // Enable automatic reconnection
+         // Must be called after mysql_real_connect() on MySQL < 5.0.19
+         // and at any point on more recent versions.
+-        my_bool reconnect = 1;
+        bool reconnect = 1;
+         mysql_options(hConn, MYSQL_OPT_RECONNECT, &reconnect);
+     }
+ 
--- a/ports/gdal/no-mysql-global-h.patch
+++ b/ports/gdal/no-mysql-global-h.patch
@ -1,13 +0,0 @@
-diff --git a/ogr/ogrsf_frmts/mysql/ogr_mysql.h b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
-index 76a6762..b2f0fcb 100644
--- a/ogr/ogrsf_frmts/mysql/ogr_mysql.h
-+++ b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
-@@ -43,7 +43,7 @@
- #pragma warning( disable : 4211 ) /* nonstandard extension used : redefined extern to static */
- #endif
- 
-#include <my_global.h>
-+/* #include <my_global.h> */ /* Mysql 8+ no longer ships with my_global.h */
- #include <mysql.h>
- 
- #ifdef _MSC_VER
--- a/ports/gdal/no-mysql-sys-h.patch
+++ b/ports/gdal/no-mysql-sys-h.patch
@ -1,13 +0,0 @@
-diff --git a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
-index e694bbd..8733af9 100644
--- a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
-+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
-@@ -44,7 +44,7 @@
- #pragma clang diagnostic ignored "-Wunknown-pragmas"
- #pragma clang diagnostic ignored "-Wdocumentation"
- #endif
-#include <my_sys.h>
-+/*#include <my_sys.h> mysql 8.1 no longer ships with my_sys.h*/
- #ifdef __clang__
- #pragma clang diagnostic pop
- #endif
--- a/Show More
+++ b/Show More