Merge from master

2025-02-23 11:07:10 +01:00 · 2017-10-16 17:17:28 -07:00 · 2017-10-16 17:17:28 -07:00 · ee2831c548
commit ee2831c548
parent d88f53de9c 374253cb1b
694 changed files with 14909 additions and 4597 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,176 @@
+vcpkg (0.0.91)
+--------------
+  * Add ports:
+    - abseil         2017-09-28
+    - enet           1.3.13
+    - exiv2          4f4add2cdcbe73af7098122a509dff0739d15908
+    - freexl         1.0.4
+    - gts            0.7.6
+    - kinectsdk2     2.0
+    - libexif        0.6.21-1
+    - libfreenect2   0.2.0
+    - librtmp        2.3
+    - libspatialite  4.3.0a
+    - libxmp-lite    4.4.1
+    - proj4          4.9.3-1
+    - readosm        1.1.0
+    - spirit-po      1.1.2
+    - telnetpp       1.2.4
+    - wildmidi       0.4.1
+  * Update ports:
+    - anax           2.1.0-2 -> 2.1.0-3
+    - aws-sdk-cpp    1.0.61-1 -> 1.2.4
+    - geos           3.5.0-1 -> 3.6.2-2
+    - kinectsdk1     1.8-1 -> 1.8-2
+    - lua            5.3.4-1 -> 5.3.4-2
+    - openni2        2.2.0.33 -> 2.2.0.33-2
+    - openssl        1.0.2l-2 -> 1.0.2l-3
+    - pangolin       0.5-1 -> 0.5-2
+    - proj           4.9.3-1 -> 0
+    - sdl2           2.0.5-4 -> 2.0.6-1
+    - zlib           1.2.11-2 -> 1.2.11-3
+  * `vcpkg export`: Add new option `--ifw` which creates a standalone GUI installer for the exported packages. More information and screenshots [here](https://github.com/Microsoft/vcpkg/pull/1734)
+  * Complete rework of Visual Studio detection & selection:
+    - Use [`vswhere.exe`](https://github.com/Microsoft/vswhere) to detect Visual Studio installation instances
+    - Add the ability to specify the Visual Studio instance to use in the triplet file with the `VCPKG_VISUAL_STUDIO_PATH` variable
+    - Automatic selection now picks instances in order: stable, prerelease, legacy. Within each group, newer versions are preferred over old versions
+    - Fix issue where v140 toolset would not work if VS2017 (with v140) was installed but VS2015 was not installed
+  * Add message when downloading a `vcpkg` dependency (e.g. `cmake`)
+
+-- vcpkg team <vcpkg@microsoft.com>  THU, 05 Oct 2017 19:00:00 -0800
+
+
+vcpkg (0.0.90)
+--------------
+  * Add ports:
+    - caffe2         0.8.1
+    - date           2.2
+    - jsonnet        2017-09-02-11cf9fa9f2fe8acbb14b096316006082564ca580
+    - kf5plotting    5.37.0
+    - units          2.3.0
+    - winpcap        4.1.3-1
+  * Update ports:
+    - arrow          apache-arrow-0.4.0-2 -> 0.6.0
+    - benchmark      1.1.0-1 -> 1.2.0
+    - cppwinrt       feb2017_refresh-14393 -> spring_2017_creators_update_for_vs_15.3
+    - llvm           4.0.0-1 -> 5.0.0-1
+    - luafilesystem  1.6.3-1 -> 1.7.0.2
+    - opencv         3.2.0-4 -> 3.3.0-4
+    - paho-mqtt      1.2.0-1 -> 1.2.0-2
+    - protobuf       3.4.0-2 -> 3.4.1-1
+    - qt5            5.8-5 -> 5.8-6
+    - sfml           2.4.2-1 -> 2.4.2-2
+    - xlnt           0.9.4-1 -> 1.1.0-1
+    - zlib           1.2.11-1 -> 1.2.11-2
+  * Bump required version & auto-downloaded version of `cmake` to 3.9.3 (was 3.9.1). Noteable changes:
+    - Fix codepage issues
+    - FindBoost: Add support for Boost 1.65.0 and 1.65.1
+  * `vcpkg edit`: Fix inspected locations for VSCode
+
+-- vcpkg team <vcpkg@microsoft.com>  SUN, 24 Sep 2017 03:30:00 -0800
+
+
+vcpkg (0.0.89)
+--------------
+  * Update ports:
+    - boost                1.65-1 -> 1.65.1
+    - chmlib               0.40 -> 0.40-1
+    - pybind11             2.1.0-2 -> 2.2.0
+    - sciter               4.0.2-1 -> 4.0.3
+    - sqlite3              3.19.1-2 -> 3.20.1
+  * `vcpkg` now warns if the built version of the `vcpkg.exe` itself is outdated
+  * Update to latest python 3.5
+  * `vcpkg install` improvements:
+    - Add `--keep-going` option to keep going if a package fails to install
+    - Add elapsed time to each invidial package as well as total time
+    - Add a counter to the install (e.g. Starting package 3/12: <name>)
+  * `vcpkg edit` now checks more location for VSCode Insiders
+
+-- vcpkg team <vcpkg@microsoft.com>  WED, 14 Sep 2017 16:00:00 -0800
+
+
+vcpkg (0.0.88)
+--------------
+   * `vcpkg_configure_cmake` has been modified to embed debug symbols within static libraries (using the /Z7 option). Most of the libraries in `vcpkg` had their versions bumped due to this.
+   * `vcpkg_configure_meson` has been modified in the same manner.
+
+-- vcpkg team <vcpkg@microsoft.com>  SAT, 09 Sep 2017 00:30:00 -0800
+
+
+vcpkg (0.0.87)
+--------------
+  * Add ports:
+    - console-bridge       0.3.2-1
+    - leptonica            1.74.4
+    - tesseract            3.05.01
+    - urdfdom              1.0.0-1
+    - urdfdom-headers      1.0.0-1
+  * Update ports:
+    - ace                  6.4.4 -> 6.4.5
+    - c-ares               1.12.1-dev-40eb41f-1 -> 1.13.0
+    - glslang              1c573fbcfba6b3d631008b1babc838501ca925d3-2 -> 3a21c880500eac21cdf79bef5b80f970a55ac6af
+    - grpc                 1.4.1 -> 1.6.0
+    - libuv                1.14.0 -> 1.14.1
+    - meschach              -> 1.2b
+    - openblas             v0.2.20 -> v0.2.20-1
+    - openssl              1.0.2l-1 -> 1.0.2l-2
+    - protobuf             3.3.0-3 -> 3.4.0-1
+    - qt5                  5.8-4 -> 5.8-5
+    - shaderc              2df47b51d83ad83cbc2e7f8ff2b56776293e8958-1 -> 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da
+    - spirv-tools          1.1-f72189c249ba143c6a89a4cf1e7d53337b2ddd40 -> v2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23
+    - xxhash               0.6.2 -> 0.6.3
+    - zeromq               4.2.2 -> 20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2
+  * Add new function `vcpkg_from_bitbucket` which the Bitbucket equivalent of `vcpkg_from_github`
+
+-- vcpkg team <vcpkg@microsoft.com>  FRI, 08 Sep 2017 22:00:00 -0800
+
+
+vcpkg (0.0.86)
+--------------
+  * Add ports:
+    - bigint               2010.04.30
+    - butteraugli          2017-09-02-8c60a2aefa19adb
+    - ccd                  2.0.0-1 (Renamed from libccd)
+    - fadbad               2.1.0
+    - fcl                  0.5.0-1
+    - guetzli              2017-09-02-cb5e4a86f69628
+    - gumbo                0.10.1
+    - libmicrohttpd        0.9.55
+    - libstemmer           2017-9-02
+    - libunibreak          4.0
+    - lodepng              2017-09-01-8a0f16afe74a6a
+    - meschach
+    - nlopt                2.4.2-c43afa08d~vcpkg1
+    - picosha2             2017-09-01-c5ff159b6
+    - piex                 2017-09-01-473434f2dd974978b
+    - pthreads             2.9.1
+    - tinythread           1.1
+    - tinyxml              2.6.2-1
+  * Removed ports:
+    - libccd               2.0.0 (Renamed to ccd)
+  * Update ports:
+    - ace                  6.4.3 -> 6.4.4
+    - boost                1.65 -> 1.65-1
+    - cairo                1.15.6 -> 1.15.8
+    - gdk-pixbuf           2.36.6 -> 2.36.9
+    - glib                 2.52.2 -> 2.52.3
+    - gtk                  3.22.15 -> 3.22.19
+    - jxrlib               1.1-2 -> 1.1-3
+    - paho-mqtt            Version 1.1.0 (Paho 1.2) -> 1.2.0
+    - pango                1.40.6 -> 1.40.11
+    - shaderc              2df47b51d83ad83cbc2e7f8ff2b56776293e8958 -> 2df47b51d83ad83cbc2e7f8ff2b56776293e8958-1
+  * Fix warnings in bootstrap-vcpkg.ps1
+  * Fix codepage related issues with ninja/cmake
+  * Improve handling for non-ascii environments
+  * Configurations names are now more tolerant:
+    - If a configuration name is prefixed with "Release", then it is compatible with "Release"
+    - If a configuration name is prefixed with "Debug", then it is compatible with "Debug"
+  * `vcpkg edit`: Improve detection of VSCode and add better messages when no path is found
+  * Fixes and improvements in the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  MON, 04 Sep 2017 02:00:00 -0800
+
+
 vcpkg (0.0.85)
 --------------
  * Add ports:
--- a/docs/about/faq.md
+++ b/docs/about/faq.md
@ -50,7 +50,9 @@ By saving the changes to the portfile (and checking them in), you'll get the sam

 Yes. While Vcpkg will only produce the standard "Release" and "Debug" configurations when building a library, you can get integration support for your projects' custom configurations, in addition to your project's standard configurations.

-The MSBuild $(VcpkgConfiguration) macro, if not set in your project, will identify either the "Release" or the "Debug" configuration. You only need to override this macro in your project file (.vcxproj) to declare the compatibility between your configuration, and the target standard configuration.
+First of all, Vcpkg will automatically assume any custom configuration starting with "Release" (resp. "Debug") as a configuration that is compatible with the standard "Release" (resp. "Debug") configuration and will act accordingly.
+
+For other configurations, you only need to override the MSBuild `$(VcpkgConfiguration)` macro in your project file (.vcxproj) to declare the compatibility between your configuration, and the target standard configuration.

 For example, you can add support for your "MyRelease" configuration by adding in your project file:
 ```
--- a/docs/maintainers/control-files.md
+++ b/docs/maintainers/control-files.md
@ -42,10 +42,10 @@ Unlike dpkg, Vcpkg does not distinguish between build-only dependencies and runt

 *For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies*

-Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside brackets is substring-compared against the triplet name. __This will change in a future version to not depend on the triplet name.__
+Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name. __This will change in a future version to not depend on the triplet name.__

 Example:
 ```no-highlight
-Build-Depends: zlib [windows], openssl [windows], boost [windows], websocketpp [windows]
+Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (windows)
 ```

--- a/docs/maintainers/portfile-functions.md
+++ b/docs/maintainers/portfile-functions.md
@ -3,6 +3,7 @@
 # Portfile helper functions
 - [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md)
 - [vcpkg\_apply\_patches](vcpkg_apply_patches.md)
+- [vcpkg\_build\_cmake](vcpkg_build_cmake.md)
 - [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md)
 - [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md)
 - [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md)
@ -11,5 +12,6 @@
 - [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md)
 - [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md)
 - [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md)
+- [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md)
 - [vcpkg\_from\_github](vcpkg_from_github.md)
 - [vcpkg\_install\_cmake](vcpkg_install_cmake.md)
--- a/docs/maintainers/vcpkg_acquire_msys.md
+++ b/docs/maintainers/vcpkg_acquire_msys.md
@ -32,7 +32,7 @@ message(STATUS "Installing MSYS Packages")
 vcpkg_execute_required_process(
    COMMAND
        ${BASH} --noprofile --norc -c
-            "pacman -Sy --noconfirm --needed make"
+            'PATH=/usr/bin:\$PATH pacman -Sy --noconfirm --needed make'
    WORKING_DIRECTORY ${MSYS_ROOT}
    LOGNAME pacman-${TARGET_TRIPLET})
 ```
--- a/docs/maintainers/vcpkg_build_cmake.md
+++ b/docs/maintainers/vcpkg_build_cmake.md
@ -0,0 +1,31 @@
+# vcpkg_build_cmake
+
+Build a cmake project.
+
+## Usage:
+```cmake
+vcpkg_build_cmake([DISABLE_PARALLEL] [TARGET <target>])
+```
+
+## Parameters:
+### DISABLE_PARALLEL
+The underlying buildsystem will be instructed to not parallelize
+
+### TARGET
+The target passed to the cmake build command (`cmake --build . --target <target>`). If not specified, no target will
+be passed.
+
+## 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
+"install" target
+
+## Examples:
+
+* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake)
+* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake)
+* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
+* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
+
+## Source
+[scripts/cmake/vcpkg_build_cmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_cmake.cmake)
--- a/docs/maintainers/vcpkg_find_acquire_program.md
+++ b/docs/maintainers/vcpkg_find_acquire_program.md
@ -16,6 +16,7 @@ The current list of programs includes:
 - 7Z
 - BISON
 - FLEX
+- GASPREPROCESSOR
 - PERL
 - PYTHON2
 - PYTHON3
@ -24,7 +25,6 @@ The current list of programs includes:
 - NASM
 - NINJA
 - YASM
- GASPREPROCESSOR

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

--- a/docs/maintainers/vcpkg_from_bitbucket.md
+++ b/docs/maintainers/vcpkg_from_bitbucket.md
@ -0,0 +1,53 @@
+# vcpkg_from_bitbucket
+
+Download and extract a project from Bitbucket.
+Enables support for installing HEAD `vcpkg.exe install --head <port>`.
+
+## Usage:
+```cmake
+vcpkg_from_bitbucket(
+    OUT_SOURCE_PATH <SOURCE_PATH>
+    REPO <Microsoft/cpprestsdk>
+    [REF <v2.0.0>]
+    [SHA512 <45d0d7f8cc350...>]
+    [HEAD_REF <master>]
+)
+```
+
+## Parameters:
+### OUT_SOURCE_PATH
+Specifies the out-variable that will contain the extracted location.
+
+This should be set to `SOURCE_PATH` by convention.
+
+### REPO
+The organization or user and repository on GitHub.
+
+### REF
+A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.**
+
+For repositories without official releases, this can be set to the full commit id of the current latest master.
+
+If `REF` is specified, `SHA512` must also be specified.
+
+### SHA512
+The SHA512 hash that should match the archive (https://bitbucket.com/${REPO}/get/${REF}.tar.gz).
+
+This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile.
+
+### HEAD_REF
+The unstable git commit-ish (ideally a branch) to pull for `--head` builds.
+
+For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.
+
+## Notes:
+At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
+
+This exports the `VCPKG_HEAD_VERSION` variable during head builds.
+
+## Examples:
+
+* [blaze](https://github.com/Microsoft/vcpkg/blob/master/ports/blaze/portfile.cmake)
+
+## Source
+[scripts/cmake/vcpkg_from_bitbucket.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_bitbucket.cmake)
--- a/docs/maintainers/vcpkg_from_github.md
+++ b/docs/maintainers/vcpkg_from_github.md
@ -23,7 +23,9 @@ This should be set to `SOURCE_PATH` by convention.
 The organization or user and repository on GitHub.

 ### REF
-A stable git commit-ish (ideally a tag) that will not change contents.
+A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.**
+
+For repositories without official releases, this can be set to the full commit id of the current latest master.

 If `REF` is specified, `SHA512` must also be specified.

@ -38,7 +40,7 @@ The unstable git commit-ish (ideally a branch) to pull for `--head` builds.
 For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.

 ## Notes:
-At least one of `REF` and `HEAD_REF` must be specified.
+At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.

 This exports the `VCPKG_HEAD_VERSION` variable during head builds.

--- a/docs/maintainers/vcpkg_install_cmake.md
+++ b/docs/maintainers/vcpkg_install_cmake.md
@ -4,15 +4,15 @@ Build and install a cmake project.

 ## Usage:
 ```cmake
-vcpkg_install_cmake([MSVC_64_TOOLSET])
+vcpkg_install_cmake(...)
 ```

 ## Parameters:
-### MSVC_64_TOOLSET
-This adds the `/p:PreferredToolArchitecture=x64` switch if the underlying buildsystem is MSBuild. Some large projects can run out of memory when linking if they use the 32-bit hosted tools.
+See [`vcpkg_build_cmake()`](vcpkg_build_cmake.md).

 ## Notes:
-This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
+This command transparently forwards to [`vcpkg_build_cmake()`](vcpkg_build_cmake.md), adding a `TARGET install`
+parameter.

 ## Examples:

--- a/ports/abseil/CMakeLists.txt
+++ b/ports/abseil/CMakeLists.txt
@ -0,0 +1,93 @@
+cmake_minimum_required(VERSION 3.8)
+project(abseil CXX)
+
+add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
+
+set(CMAKE_DEBUG_POSTFIX d)
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    option(INSTALL_HEADERS "Install header files" ON)
+else()
+    option(INSTALL_HEADERS "Install header files" OFF)
+endif()
+
+function(add_sublibrary LIB)
+    file(GLOB_RECURSE SOURCES "absl/${LIB}/*.cc")
+    list(FILTER SOURCES EXCLUDE REGEX "_test(_.+)?.cc$|_nonprod.cc$")
+    file(GLOB HEADERS "absl/${LIB}/*.h")
+    file(GLOB INTERNAL_HEADERS "absl/${LIB}/internal/*.h")
+
+    if(SOURCES)
+        if("STATIC" IN_LIST ARGN)
+            add_library(${LIB} STATIC ${SOURCES})
+        else()
+            add_library(${LIB} ${SOURCES})
+        endif()
+        set_target_properties(${LIB} PROPERTIES OUTPUT_NAME "absl_${LIB}")
+        target_include_directories(${LIB} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
+    else()
+        add_library(${LIB} INTERFACE)
+        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
+        ARCHIVE DESTINATION 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")
+        endif()
+    endif()
+endfunction()
+
+function(target_link_public_libraries A)
+    get_target_property(A_TYPE ${A} TYPE)
+    if(A_TYPE STREQUAL INTERFACE_LIBRARY)
+        target_link_libraries(${A} INTERFACE ${ARGN})
+    else()
+        target_link_libraries(${A} PUBLIC ${ARGN})
+    endif()
+endfunction()
+
+add_sublibrary(algorithm)
+add_sublibrary(base)
+add_sublibrary(container)
+add_sublibrary(debugging)
+add_sublibrary(memory)
+add_sublibrary(meta)
+add_sublibrary(numeric)
+add_sublibrary(strings)
+add_sublibrary(synchronization STATIC)
+# Time must be static because there are global variables intended for export
+add_sublibrary(time STATIC)
+add_sublibrary(types)
+add_sublibrary(utility)
+
+target_link_public_libraries(algorithm base meta)
+target_link_public_libraries(container algorithm base memory)
+target_link_public_libraries(memory meta)
+target_link_public_libraries(meta base)
+target_link_public_libraries(numeric base)
+target_link_public_libraries(strings base memory meta numeric)
+target_link_public_libraries(types base utility meta algorithm strings)
+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
+    NAMESPACE unofficial::abseil::
+    DESTINATION share/unofficial-abseil
+)
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@ -0,0 +1,7 @@
+Source: abseil
+Version: 2017-10-14
+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
@ -0,0 +1,32 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "Abseil currently only supports being built for desktop")
+endif()
+
+message("NOTE: THIS PORT IS USING AN UNOFFICIAL BUILDSYSTEM. THE BINARY LAYOUT AND CMAKE INTEGRATION WILL CHANGE IN THE FUTURE.")
+message("To use from cmake:\n  find_package(unofficial-abseil REQUIRED)\n  link_libraries(unofficial::abseil::strings)")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO abseil/abseil-cpp
+    REF 1a9ba5e2e5a14413704f0c913fac53359576d3b6
+    SHA512 756e494c30324c937ca655d91afdee9acb923c7ee837a7c685441305bea2d54a75b3b21be7355abe416660984ba51ace9d234d70168fb029c601b7442397e8ff
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-abseil)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/abseil ${CURRENT_PACKAGES_DIR}/share/unofficial-abseil)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/abseil RENAME copyright)
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@ -1,3 +1,3 @@
 Source: ace
-Version: 6.4.3
+Version: 6.4.5
 Description: The ADAPTIVE Communication Environment
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@ -5,9 +5,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.4.zip"
-    FILENAME "ACE-6.4.4.zip"
-    SHA512 82628a73b736a14b3ee33fb859e26370ffd7df88bda4890fe490736160d3ce393f7e61183cd8cd7a91a83bc31c4bd263aa887168543f9f89fde080dc3650a4ed
+    URLS "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.5.zip"
+    FILENAME "ACE-6.4.5.zip"
+    SHA512 cce1681fc35efdefb8b88a49b743ffcaecfe8f146dcf6c78393aed29c8853e77b062bced4a2fb457eba74bf5834511611cc40da2320c6094793cb8c2b6df3d2a
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@ -1,4 +1,4 @@
 Source: alembic
-Version: 1.7.1-3
+Version: 1.7.1-4
 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/allegro5/CONTROL
+++ b/ports/allegro5/CONTROL
@ -1,4 +1,4 @@
 Source: allegro5
-Version: 5.2.2.0
+Version: 5.2.2.0-1
 Description: Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.
-Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora, opus, opusfile
+Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora, opus, opusfile
--- a/ports/anax/CONTROL
+++ b/ports/anax/CONTROL
@ -1,3 +1,3 @@
 Source: anax
-Version: 2.1.0-1
+Version: 2.1.0-3
 Description: An open source C++ entity system. <https://github.com/miguelmartin75/anax>
--- a/ports/anax/portfile.cmake
+++ b/ports/anax/portfile.cmake
@ -8,13 +8,13 @@

 include(vcpkg_common_functions)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/anax-2.1.0)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/miguelmartin75/anax/archive/v2.1.0.zip"
-    FILENAME "anax-2.1.0.zip"
-    SHA512 89f2df64add676ab48a19953b95d8eae1da9c8c5f3c0f6bc757a3bc99af6e4360c56c12d27d12c672ccd754b1f53a5e271533b381641f20e8cf3ca8ddda6cd1a
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO miguelmartin75/anax
+    REF v2.1.0
+    SHA512 b573733b5f9634bf8cfc5b0715074f9a8ee29ecb48dc981d9371254a1f6ff8afbbb9ba6aa0877d53e518e5486ecc398a6d331fb9b5dbfd17d8707679216e11a3
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})

 vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
@ -23,8 +23,8 @@ vcpkg_apply_patches(

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
-	OPTIONS
-	-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON 
+    OPTIONS
+    -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )

 vcpkg_install_cmake()
@ -34,3 +34,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/anax)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/anax/LICENSE ${CURRENT_PACKAGES_DIR}/share/anax/copyright)
+
+vcpkg_copy_pdbs()
--- a/ports/angle/CONTROL
+++ b/ports/angle/CONTROL
@ -1,4 +1,4 @@
 Source: angle
-Version: 2017-06-14-8d471f-1
+Version: 2017-06-14-8d471f-2
 Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
  The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
--- a/ports/angle/portfile.cmake
+++ b/ports/angle/portfile.cmake
@ -13,7 +13,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/angle
    REF 8d471f907d8d4ec1d46bc9366493bd76c11c1870 
-    SHA512 b9235d2a98330bc8533c3fe871129e7235c680420eac16610eae4ca7224c5284313ab6377f30ddfb8a2da39b69f3ef0d16023fe1e7cec3fc2198f4eb4bdccb26
+    SHA512 b4670caeeaa5d662bc82702eb5f620123812ea6b5d82f57a65df54ae25cdaa5c9ff0fdb592448b07569d9c09af3d3c51b0b2f135c5800d1845b425009656bf18
    HEAD_REF master
 )
 vcpkg_apply_patches(
--- a/ports/antlr4/portfile.cmake
+++ b/ports/antlr4/portfile.cmake
@ -24,7 +24,7 @@ vcpkg_apply_patches(
                ${CMAKE_CURRENT_LIST_DIR}/Fix-building-in-Visual-Studio-2017.patch
 )

-if (${VCPKG_LIBRARY_LINKAGE} STREQUAL static)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    set(DEBUG_CONFIG   "Debug Static")
    set(RELEASE_CONFIG "Release Static")
 else()
@ -53,7 +53,7 @@ file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG
 file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib
    DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

-if (${VCPKG_LIBRARY_LINKAGE} STREQUAL static)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    vcpkg_apply_patches(
        SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
        PATCHES     ${CMAKE_CURRENT_LIST_DIR}/static.patch
--- a/ports/apr-util/CONTROL
+++ b/ports/apr-util/CONTROL
@ -1,4 +1,4 @@
 Source: apr-util
-Version: 1.6.0
+Version: 1.6.0-1
 Description: Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation
 Build-Depends: expat, apr, openssl
--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@ -1,3 +1,3 @@
 Source: apr
-Version: 1.6.2
+Version: 1.6.2-1
 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
--- a/ports/arrow/CONTROL
+++ b/ports/arrow/CONTROL
@ -1,4 +1,4 @@
 Source: arrow
-Version: apache-arrow-0.4.0-1
-Build-Depends: boost
+Version: 0.6.0
+Build-Depends: boost, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags
 Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
--- a/ports/arrow/all.patch
+++ b/ports/arrow/all.patch
@ -0,0 +1,130 @@
+diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake
+index f2e714c..2e475dc 100644
+--- a/cmake_modules/FindBrotli.cmake
+++ b/cmake_modules/FindBrotli.cmake
+@@ -65,16 +65,13 @@ if (BROTLI_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR BROTLI_LIBRARIES))
+   set(BROTLI_FOUND TRUE)
+   get_filename_component( BROTLI_LIBS ${BROTLI_LIBRARY_ENC} PATH )
+   set(BROTLI_LIB_NAME brotli)
+-  if (MSVC AND NOT BROTLI_MSVC_STATIC_LIB_SUFFIX)
+-    set(BROTLI_MSVC_STATIC_LIB_SUFFIX _static)
+-  endif()
+   set(BROTLI_STATIC_LIB
+-      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+-      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+-      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_STATIC_LIBRARY_SUFFIX}
+      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_STATIC_LIBRARY_SUFFIX}
+      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_STATIC_LIBRARY_SUFFIX})
+   set(BROTLI_SHARED_LIB
+       ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_SHARED_LIBRARY_SUFFIX}
+       ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_SHARED_LIBRARY_SUFFIX}
+diff --git a/cmake_modules/FindFlatbuffers.cmake b/cmake_modules/FindFlatbuffers.cmake
+index 804f479..ff9bde1 100644
+--- a/cmake_modules/FindFlatbuffers.cmake
+++ b/cmake_modules/FindFlatbuffers.cmake
+@@ -53,6 +53,7 @@ endif ()
+ 
+ find_program(FLATBUFFERS_COMPILER flatc
+   "${FLATBUFFERS_HOME}/bin"
+  "${FLATBUFFERS_HOME}/tools"
+   /usr/local/bin
+   /usr/bin
+   NO_DEFAULT_PATH
+diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake
+index 07707cf..9cbf67d 100644
+--- a/cmake_modules/FindLz4.cmake
+++ b/cmake_modules/FindLz4.cmake
+@@ -29,15 +29,7 @@ elseif ( Lz4_HOME )
+     list( APPEND _lz4_roots ${Lz4_HOME} )
+ endif()
+ 
+-if (MSVC AND NOT LZ4_MSVC_STATIC_LIB_SUFFIX)
+-  set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static")
+-endif()
+-
+-set(LZ4_STATIC_LIB_SUFFIX
+-  "${LZ4_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+-
+-set(LZ4_STATIC_LIB_NAME
+-  ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX})
+set(LZ4_STATIC_LIB_NAME lz4)
+ 
+ find_path(LZ4_INCLUDE_DIR NAMES lz4.h
+   PATHS ${_lz4_roots}
+diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake
+index 867963c..8a432db 100644
+--- a/cmake_modules/FindSnappy.cmake
+++ b/cmake_modules/FindSnappy.cmake
+@@ -55,7 +55,7 @@ if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES))
+   set(SNAPPY_HEADER_NAME snappy.h)
+   set(SNAPPY_HEADER ${SNAPPY_INCLUDE_DIR}/${SNAPPY_HEADER_NAME})
+   set(SNAPPY_LIB_NAME snappy)
+-  set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
+   set(SNAPPY_SHARED_LIB ${SNAPPY_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else ()
+   set(SNAPPY_FOUND FALSE)
+diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake
+index 78b84f2..eb09001 100644
+--- a/cmake_modules/FindZLIB.cmake
+++ b/cmake_modules/FindZLIB.cmake
+@@ -62,11 +62,11 @@ if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES))
+   set(ZLIB_LIB_NAME z)
+   if (MSVC)
+     if (NOT ZLIB_MSVC_STATIC_LIB_SUFFIX)
+-      set(ZLIB_MSVC_STATIC_LIB_SUFFIX libstatic)
+      set(ZLIB_MSVC_STATIC_LIB_SUFFIX lib)
+     endif()
+     set(ZLIB_MSVC_SHARED_LIB_SUFFIX lib)
+   endif()
+-  set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+   set(ZLIB_SHARED_LIB ${ZLIB_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else ()
+   set(ZLIB_FOUND FALSE)
+diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake
+index 02a0c39..73c61b5 100644
+--- a/cmake_modules/FindZSTD.cmake
+++ b/cmake_modules/FindZSTD.cmake
+@@ -29,21 +29,11 @@ elseif ( ZStd_HOME )
+     list( APPEND _zstd_roots ${ZStd_HOME} )
+ endif()
+ 
+-if (MSVC AND NOT ZSTD_MSVC_STATIC_LIB_SUFFIX)
+-  set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
+-endif()
+-
+-set(ZSTD_STATIC_LIB_SUFFIX
+-  "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+-
+-set(ZSTD_STATIC_LIB_NAME
+-  ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
+-
+ find_path(ZSTD_INCLUDE_DIR NAMES zstd.h
+   PATHS ${_zstd_roots}
+   NO_DEFAULT_PATH
+   PATH_SUFFIXES "include" )
+-find_library(ZSTD_STATIC_LIB NAMES ${ZSTD_STATIC_LIB_NAME} lib${ZSTD_STATIC_LIB_NAME}
+find_library(ZSTD_STATIC_LIB NAMES libzstd libzstd_static zstd zstd_static
+   PATHS ${_zstd_roots}
+   NO_DEFAULT_PATH
+   PATH_SUFFIXES "lib" )
+diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
+index a888e92..0fe3629 100644
+--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
+@@ -119,6 +119,7 @@ endif()
+ set(Boost_DEBUG TRUE)
+ set(Boost_USE_MULTITHREADED ON)
+ set(Boost_ADDITIONAL_VERSIONS
+  "1.65.0" "1.65"  
+   "1.64.0" "1.64"
+   "1.63.0" "1.63"
+   "1.62.0" "1.61"
--- a/ports/arrow/portfile.cmake
+++ b/ports/arrow/portfile.cmake
@ -7,17 +7,39 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO apache/arrow
-    REF apache-arrow-0.4.0
-    SHA512 cdd67a884528b088688d88c0627b9c13077215e234dd0772797f0bf63319ffc18533276d52110a37a0938d32f006023b74dce93e71d34b1e0003a86761cea6ee
+    REF apache-arrow-0.6.0
+    SHA512  c0e89b959dfe75e895a3427edd4eee663be5ee542e9ea13f7311d0775fe7a00188eafa07ba524e3d3c0a71fc8e11213f10fe4ebfdf451754816062249ffa7f3d
    HEAD_REF master
 )


 set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp")

+vcpkg_apply_patches(
+    SOURCE_PATH ${CPP_SOURCE_PATH}
+    PATCHES
+    "${CMAKE_CURRENT_LIST_DIR}/all.patch"
+)
+
+
+string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED)
+string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC)
+
 vcpkg_configure_cmake(
    SOURCE_PATH ${CPP_SOURCE_PATH}
    OPTIONS -DARROW_BUILD_TESTS=off
+    -DRAPIDJSON_HOME=${CURRENT_INSTALLED_DIR}
+    -DFLATBUFFERS_HOME=${CURRENT_INSTALLED_DIR}
+    -DARROW_ZLIB_VENDORED=ON
+    -DBROTLI_HOME=${CURRENT_INSTALLED_DIR}
+    -DLZ4_HOME=${CURRENT_INSTALLED_DIR}
+    -DZSTD_HOME=${CURRENT_INSTALLED_DIR}
+    -DSNAPPY_HOME=${CURRENT_INSTALLED_DIR}
+    -DBOOST_ROOT=${CURRENT_INSTALLED_DIR}
+    -DGFLAGS_HOME=${CURRENT_INSTALLED_DIR}
+    -DZLIB_HOME=${CURRENT_INSTALLED_DIR}
+    -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
+    -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
 )

 vcpkg_install_cmake()
--- a/ports/assimp/CONTROL
+++ b/ports/assimp/CONTROL
@ -1,4 +1,4 @@
 Source: assimp
-Version: 4.0.0-1
+Version: 4.0.0-2
 Description: The Open Asset import library
 Build-Depends: zlib
--- a/ports/atk/CONTROL
+++ b/ports/atk/CONTROL
@ -1,4 +1,4 @@
 Source: atk
-Version: 2.24.0
+Version: 2.24.0-1
 Description: GNOME Accessibility Toolkit
 Build-Depends: glib, gettext
--- a/ports/aubio/CONTROL
+++ b/ports/aubio/CONTROL
@ -1,4 +1,4 @@
 Source: aubio
-Version: 0.46~alpha-2
+Version: 0.46~alpha-3
 Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.
 Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@ -1,3 +1,3 @@
 Source: aws-sdk-cpp
-Version: 1.0.61
+Version: 1.2.4
 Description: AWS SDK for C++
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@ -1,11 +1,12 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aws-sdk-cpp-1.0.61)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/aws/aws-sdk-cpp/archive/1.0.61.tar.gz"
-    FILENAME "aws-sdk-cpp-1.0.61.tar.gz"
-    SHA512 aef0a85a32db24dc4fba0fc49c2533074580f3df628e787ff0808f03deea5dac42e19b1edc966706784e98cfed17a350c3eff4f222df7cc756065be56d1fc6a6
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO aws/aws-sdk-cpp
+    REF 1.2.4
+    SHA512 dc96e40fe72e4b115607245f536cd13414e33a8f754153fd137f1391af14b9793fc8a07f9f984490e0783e385c2c7b9a421878b63ea793012f53fefe7ec4d368
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})

 vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
@ -30,6 +31,34 @@ vcpkg_configure_cmake(

 vcpkg_install_cmake()

+file(GLOB CMAKE_FILES ${CURRENT_PACKAGES_DIR}/lib/cmake/*)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
+
+file(COPY ${CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share)
+
+vcpkg_copy_pdbs()
+
+file(GLOB AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/aws-cpp-sdk-*/aws-cpp-sdk-*targets.cmake")
+foreach(AWS_TARGETS ${AWS_TARGETS})
+    file(READ ${AWS_TARGETS} _contents)
+    string(REGEX REPLACE
+        "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*"
+        "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
+        _contents "${_contents}")
+    file(WRITE ${AWS_TARGETS} "${_contents}")
+endforeach()
+
+file(GLOB AWS_TARGETS_RELEASE "${CURRENT_PACKAGES_DIR}/share/aws-cpp-sdk-*/aws-cpp-sdk-*targets-release.cmake")
+foreach(AWS_TARGETS_RELEASE ${AWS_TARGETS_RELEASE})
+    file(READ ${AWS_TARGETS_RELEASE} _contents)
+    string(REGEX REPLACE
+        "bin\\/([A-Za-z0-9_.-]+lib)"
+        "lib/\\1"
+        _contents "${_contents}")
+    file(WRITE ${AWS_TARGETS_RELEASE} "${_contents}")
+endforeach()
+
 file(REMOVE_RECURSE 
 	${CURRENT_PACKAGES_DIR}/debug/include
 	${CURRENT_PACKAGES_DIR}/lib/cmake
@ -50,4 +79,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 endif()

 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright)
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 3.0.0-2
+Version: 3.0.0-3
 Build-Depends: cpprestsdk, atlmfc
 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 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/benchmark/CONTROL
+++ b/ports/benchmark/CONTROL
@ -1,3 +1,3 @@
 Source: benchmark
-Version: 1.1.0
-Description: A library to support the benchmarking of functions, similar to unit-tests.
+Version: 1.2.0
+Description: A library to support the benchmarking of functions, similar to unit-tests.
--- a/ports/benchmark/fix-cmakelists.patch
+++ b/ports/benchmark/fix-cmakelists.patch
@ -1,27 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4038875..94d2aea 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -28,17 +28,20 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- endif()
- 
- # Expose public API
-target_include_directories(benchmark PUBLIC ${PROJECT_SOURCE_DIR}/include)
-+target_include_directories(benchmark PRIVATE ${PROJECT_SOURCE_DIR}/include)
- 
- # Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)
- install(
-   TARGETS benchmark
-+  EXPORT benchmarkTargets
-   ARCHIVE DESTINATION lib
-   LIBRARY DESTINATION lib
-   RUNTIME DESTINATION bin
-  COMPONENT library)
-+  INCLUDES DESTINATION include)
- 
- install(
-   DIRECTORY "${PROJECT_SOURCE_DIR}/include/benchmark"
-   DESTINATION include
-   FILES_MATCHING PATTERN "*.*h")
-+
-+install(EXPORT benchmarkTargets NAMESPACE benchmark:: DESTINATION share/benchmark)
--- a/ports/benchmark/portfile.cmake
+++ b/ports/benchmark/portfile.cmake
@ -12,30 +12,38 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/benchmark
-    REF v1.1.0
-    SHA512 533061531e6a37723a626addc9e779018c4c2cfc8634ae45860eec0d3800103b5b562f865ac1dc0c8dbe045579b81e59de887e1c48318cebf160f03c18321831
+    REF v1.2.0
+    SHA512 859063669fd84e847f04624013f0b2b734d75d90cada247682eaf345b86c88a9bc2320250e128f2361e37f402b3fb56a18c493ec6038973744a005a452d693ba
    HEAD_REF master
 )

+vcpkg_download_distfile(PATCH
+    URLS "https://github.com/efcs/benchmark/commit/536b0b82b8ec12fc7e17e6d243633618f294a739.diff"
+    FILENAME google-benchmark-1.2.0-536b0b82.patch
+    SHA512 ed42cc0014741c8039c0fca5b4317b2ed09d06a25c91f49a48be6dce921e39469b002c088794c1ea73dc759166e20cb685b47f809ba28dddd95b5f3263be03cd
+)
+
 vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch"
+    PATCHES
+        "${PATCH}"
 )

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
    OPTIONS
-    	-DBENCHMARK_ENABLE_TESTING=OFF
+        -DBENCHMARK_ENABLE_TESTING=OFF
 )

 vcpkg_install_cmake()

 vcpkg_copy_pdbs()

-vcpkg_fixup_cmake_targets()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark)

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

 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/benchmark)
--- a/ports/bigint/CMakeLists.txt
+++ b/ports/bigint/CMakeLists.txt
@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.8.0)
+project(bigint)
+
+if(MSVC)
+  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+include_directories(".")
+
+set(
+  bigint_srcs
+	BigUnsigned.cc
+	BigInteger.cc
+	BigIntegerAlgorithms.cc
+	BigUnsignedInABase.cc
+  BigIntegerUtils.cc
+)
+
+set(
+  bigint_hh
+	NumberlikeArray.hh
+	BigUnsigned.hh
+	BigInteger.hh
+	BigIntegerAlgorithms.hh
+	BigUnsignedInABase.hh
+	BigIntegerLibrary.hh
+)
+
+add_library(bigint ${bigint_srcs})
+
+install(
+  TARGETS bigint
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(FILES ${bigint_hh}  DESTINATION include/bigint)
+endif()
--- a/ports/bigint/CONTROL
+++ b/ports/bigint/CONTROL
@ -0,0 +1,3 @@
+Source: bigint
+Version: 2010.04.30-1
+Description: C++ Big Integer Library
--- a/ports/bigint/portfile.cmake
+++ b/ports/bigint/portfile.cmake
@ -0,0 +1,27 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+  message(WARNING "Dynamic not supported building static")
+  set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bigint-2010.04.30)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://mattmccutchen.net/bigint/bigint-2010.04.30.tar.bz2"
+    FILENAME "bigint-2010.04.30.tar.bz2"
+    SHA512 bb64380e51991f97a2489c04801ab4372f795b5e23870ad12d71087f1a2afba9b32f74dcdbdcb5228ebf0dd74a37185285bac7653dd3c62d6118d63c298689af
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+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()
+
+file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/bigint RENAME copyright)
--- a/ports/blaze/portfile.cmake
+++ b/ports/blaze/portfile.cmake
@ -1,13 +1,13 @@
 #header-only library
 include(vcpkg_common_functions)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/blaze-3.2)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://bitbucket.org/blaze-lib/blaze/downloads/blaze-3.2.tar.gz"
-    FILENAME "blaze-3.2.tar.gz"
-    SHA512 33d2bb0a49a33e71c88a45ab9e8418160c09b877b3ebe5ff7aa48ec0973e28e8a282374604d56f1b5cf2722946e4ca84aa2b401a341240a2ab9debd72505148e
+vcpkg_from_bitbucket(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO blaze-lib/blaze
+    REF v3.2
+    SHA512 f9a50c454125fe194f0d1fb259c5440c82068d41880a228fbd15fe383b6ef4198557daa406a08809065eedf223fc0c55d2309cc00ef549a3fc1a2a89e6d4b445
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})

 # Copy the blaze header files
 file(COPY "${SOURCE_PATH}/blaze"
--- a/ports/bond/CONTROL
+++ b/ports/bond/CONTROL
@ -1,5 +1,5 @@
 Source: bond
 Maintainer: bond@microsoft.com
-Version: 6.0.0
+Version: 6.0.0-1
 Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. <https://github.com/Microsoft/bond>
 Build-Depends: boost, rapidjson
--- a/ports/bond/portfile.cmake
+++ b/ports/bond/portfile.cmake
@ -1,4 +1,4 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
    set(VCPKG_LIBRARY_LINKAGE static)
 endif()
@ -23,7 +23,7 @@ vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/)
 set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-6.0.0-amd64.exe)

-if (NOT EXISTS ${FETCHED_GBC_PATH})
+if (NOT EXISTS "${FETCHED_GBC_PATH}")
    message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.")
 endif()

--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@ -1,4 +1,8 @@
 Source: boost
+<<<<<<< HEAD
 Version: 1.65-2
+=======
+Version: 1.65.1
+>>>>>>> master
 Description: Peer-reviewed portable C++ source libraries
 Build-Depends: zlib, bzip2, icu [windows], python3 [windows]
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@ -1,26 +1,19 @@
 include(vcpkg_common_functions)
 set(VERSION 1_65)
-set(VERSION2 1.65.0)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_${VERSION}_0)
+set(VERSION_FULL 1_65_1)
+set(VERSION2 1.65.1)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_${VERSION_FULL})

 ######################
 # Acquire and arrange sources
 ######################
 vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://sourceforge.net/projects/boost/files/boost/${VERSION2}/boost_${VERSION}_0.7z" "http://dl.bintray.com/boostorg/release/${VERSION2}/source/boost_${VERSION}_0.7z"
-    FILENAME "boost_${VERSION}_0.7z"
-    SHA512 41909136371b3aac53fc06ae92404bd52adde4cbda9337886433d197059105208b67331abf6ca8dc45e4d28679733b5c01fc701cba17516c7134c97785cc5f7e
+    URLS "https://sourceforge.net/projects/boost/files/boost/${VERSION2}/boost_${VERSION_FULL}.7z" "http://dl.bintray.com/boostorg/release/${VERSION2}/source/boost_${VERSION_FULL}.7z"
+    FILENAME "boost_${VERSION_FULL}.7z"
+    SHA512 b1d9264ec74dd75c68176f5a2d2da33a2c1e3162842cc61a07ac8ed1ebb953855cece4faf72ce99b490b665e813b839e35c7fc8026f2f9cb31b106fb8bab2a9c
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})

-# apply boost combined hotfix
-vcpkg_download_distfile(HOTFIX_PATCH
-    URLS "https://raw.githubusercontent.com/boostorg/website/6c3b630f2c621b78d983e882cefae7ffdf8383b8/patches/1_65_0/boost_1_65_0.patch"
-    FILENAME "boost_1_65_0.patch"
-    SHA512 8f9e654d0ee4d30b38b62b99ebfbbdeccd156c168656e1256b846bd21a3cb36d675396bd48d3f7a18d6cffba80932d40590d12e7ca1a4b51db343b3a0a39a3fd
-)
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${HOTFIX_PATCH})
-
 # apply boost range hotfix
 vcpkg_download_distfile(DIFF
    URLS "https://github.com/boostorg/range/commit/e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff"
--- a/ports/box2d/portfile.cmake
+++ b/ports/box2d/portfile.cmake
@ -21,7 +21,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO erincatto/Box2D
    REF 374664b2a4ce2e7c24fbad6e1ed34bebcc9ab6bc
-    SHA512 ae2bbee66644eea91d0e92156a4bece44053dfa8fd6b8630712a73b92210d4c75153df94e3386c64c49796b001af1ad7dee44868c16368b114567e1f6931d242
+    SHA512 39074bab01b36104aa685bfe39b40eb903d9dfb54cc3ba8098125db5291f55a8a9e578fc59563b2e8743abbbb26f419be7ae1524e235e7bd759257f99ff96bda
    HEAD_REF master
 )

--- a/ports/brotli/CONTROL
+++ b/ports/brotli/CONTROL
@ -1,3 +1,3 @@
 Source: brotli
-Version: 0.6.0
+Version: 0.6.0-1
 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/bullet3/CONTROL
+++ b/ports/bullet3/CONTROL
@ -1,3 +1,3 @@
 Source: bullet3
-Version: 2.86.1
+Version: 2.86.1-1
 Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
--- a/ports/butteraugli/CMakeLists.txt
+++ b/ports/butteraugli/CMakeLists.txt
@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 3.8.0)
+project(butteraugli CXX)
+
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+add_compile_options(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
+if(MSVC)
+  add_compile_options(/W3 /wd4005 /wd4996 /wd4018)
+endif()
+
+find_package(JPEG REQUIRED)
+find_package(PNG REQUIRED)
+
+include_directories(".")
+
+add_library(butteraugli_lib butteraugli/butteraugli.cc)
+
+install(
+  TARGETS butteraugli_lib
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_TOOLS)
+  add_executable(butteraugli butteraugli/butteraugli_main.cc)
+  target_include_directories(butteraugli PRIVATE ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS})
+  target_link_libraries(butteraugli PRIVATE butteraugli_lib ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
+
+  install (
+    TARGETS butteraugli
+    RUNTIME DESTINATION tools/butteraugli
+  )
+endif()
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(FILES butteraugli/butteraugli.h  DESTINATION include/butteraugli)
+endif()
--- a/ports/butteraugli/CONTROL
+++ b/ports/butteraugli/CONTROL
@ -0,0 +1,4 @@
+Source: butteraugli
+Version: 2017-09-02-8c60a2aefa19adb-1
+Description: butteraugli estimates the psychovisual difference between two images
+Build-Depends: libpng, libjpeg-turbo
--- a/ports/butteraugli/missing_header.patch
+++ b/ports/butteraugli/missing_header.patch
@ -0,0 +1,12 @@
+diff --git "a/butteraugli/butteraugli_main.cc" "b/butteraugli/butteraugli_main.cc"
+index f38af1d..ebf3197 100644
+--- "a/butteraugli/butteraugli_main.cc"
+++ "b/butteraugli/butteraugli_main.cc"
+@@ -2,6 +2,7 @@
+ #include <cstdint>
+ #include <cstdio>
+ #include <vector>
+#include <algorithm>
+ #include "butteraugli/butteraugli.h"
+ 
+ extern "C" {
--- a/ports/butteraugli/portfile.cmake
+++ b/ports/butteraugli/portfile.cmake
@ -0,0 +1,30 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/butteraugli
+    REF 8c60a2aefa19adb40e457be5358d7cc93205c72f
+    SHA512 ff3d8fd952d291b51dab60cef6fa46b723c4a7b649c3df70f89c63febce865dc6a2e5f95ca165ea4424fed52a57c2d76c918eb31646c44ba34a0fa51a003c9dd
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+    "${CMAKE_CURRENT_LIST_DIR}/missing_header.patch"
+  )
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/butteraugli)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/butteraugli RENAME copyright)
--- a/ports/bzip2/CONTROL
+++ b/ports/bzip2/CONTROL
@ -1,3 +1,3 @@
 Source: bzip2
-Version: 1.0.6-1
+Version: 1.0.6-2
 Description: High-quality data compressor.
--- a/ports/c-ares/CONTROL
+++ b/ports/c-ares/CONTROL
@ -1,4 +1,4 @@
 Source: c-ares
-Version: 1.12.1-dev-40eb41f-1
+Version: 1.13.0-1
 Description: A C library for asynchronous DNS requests
-Build-Depends:
+Build-Depends:
--- a/ports/c-ares/portfile.cmake
+++ b/ports/c-ares/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO c-ares/c-ares
-    REF 40eb41f522eb9a86f9397352f10d1e63c89f2c54
-    SHA512 901d7da97098f79d13ae8d72c85936bd15fbd6b65399c247462ad5367ac85ff32c90325998c21364f959e1bde2c8b7dbc9d9d7524ea34e6bc48dfb3854c199e1
+    REF cares-1_13_0
+    SHA512 0ee8a45772c64701d0e860cd84925cef8938a319b3004e02e86af900cbd9e07609940bc474a46bf4252b9b7e3815e1951de8f0eb16718074ec1d39c2105a2abe
    HEAD_REF master
 )

--- a/ports/caffe2/CONTROL
+++ b/ports/caffe2/CONTROL
@ -0,0 +1,4 @@
+Source: caffe2
+Version: 0.8.1
+Build-Depends: lmdb, gflags, glog, eigen3, protobuf
+Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.
--- a/ports/caffe2/msvc-fixes.patch
+++ b/ports/caffe2/msvc-fixes.patch
@ -0,0 +1,396 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8054d98..35934f5 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -56,6 +56,14 @@ option(USE_ROCKSDB "Use RocksDB" ON)
+ option(USE_SNPE "Use Qualcomm's SNPE library" OFF)
+ option(USE_THREADS "Use Threads" ON)
+ option(USE_ZMQ "Use ZMQ" OFF)
+if(MSVC)
+  if(BUILD_BUILD_SHARED_LIBS)
+    set(USE_STATIC_RUNTIME_DEFAULT OFF)
+  else()
+    set(USE_STATIC_RUNTIME_DEFAULT ON)
+  endif()
+  option(USE_STATIC_RUNTIME "Link to the static runtime (/MT) instead of dynamic (/MD)" ${USE_STATIC_RUNTIME_DEFAULT})
+endif()
+ 
+ # External projects
+ include(ExternalProject)
+@@ -99,7 +107,7 @@ else()
+   foreach(flag_var
+       CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+       CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+-    if (NOT ${BUILD_SHARED_LIBS})
+    if (USE_STATIC_RUNTIME)
+       if(${flag_var} MATCHES "/MD")
+         string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+       endif(${flag_var} MATCHES "/MD")
+diff --git a/caffe2/core/logging.cc b/caffe2/core/logging.cc
+index 1b4468e..1379f3a 100644
+--- a/caffe2/core/logging.cc
+++ b/caffe2/core/logging.cc
+@@ -117,7 +117,7 @@ using fLB::FLAGS_logtostderr;
+ 
+ #endif // CAFFE2_USE_GFLAGS
+ 
+-CAFFE2_DEFINE_int(caffe2_log_level, google::ERROR,
+CAFFE2_DEFINE_int(caffe2_log_level, google::GLOG_ERROR,
+                   "The minimum log level that caffe2 will output.");
+ 
+ // Google glog's api does not have an external function that allows one to check
+@@ -134,15 +134,23 @@ bool IsGoogleLoggingInitialized();
+ namespace caffe2 {
+ bool InitCaffeLogging(int* argc, char** argv) {
+   if (*argc == 0) return true;
+-  if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) {
+#if !(defined(_MSC_VER) && defined(GLOG_IS_A_DLL))
+  // IsGoogleLoggingInitialized is not exported from the glog DLL
+  // so we can't call it. If our program calls InitGoogleLogging twice glog will
+  // abort it.
+  if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized())
+#endif
+  {
+     ::google::InitGoogleLogging(argv[0]);
+#if !defined(_MSC_VER)
+     ::google::InstallFailureSignalHandler();
+#endif
+   }
+   // If caffe2_log_level is set and is lower than the min log level by glog,
+   // we will transfer the caffe2_log_level setting to glog to override that.
+   FLAGS_minloglevel = std::min(FLAGS_caffe2_log_level, FLAGS_minloglevel);
+   // If caffe2_log_level is explicitly set, let's also turn on logtostderr.
+-  if (FLAGS_caffe2_log_level < google::ERROR) {
+  if (FLAGS_caffe2_log_level < google::GLOG_ERROR) {
+     FLAGS_logtostderr = 1;
+   }
+   // Also, transfer the caffe2_log_level verbose setting to glog.
+@@ -154,7 +162,7 @@ bool InitCaffeLogging(int* argc, char** argv) {
+ 
+ void ShowLogInfoToStderr() {
+   FLAGS_logtostderr = 1;
+-  FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::INFO);
+  FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::GLOG_INFO);
+ }
+ }  // namespace caffe2
+ 
+diff --git a/caffe2/core/logging_is_google_glog.h b/caffe2/core/logging_is_google_glog.h
+index 7dd2b4f..2df4435 100644
+--- a/caffe2/core/logging_is_google_glog.h
+++ b/caffe2/core/logging_is_google_glog.h
+@@ -8,7 +8,7 @@
+ // it. Some mobile platforms do not like stl_logging, so we add an
+ // overload in that case as well.
+ 
+-#if !defined(__CUDACC__) && !defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG)
+#if !defined(__CUDARCH__) && !defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG)
+ #include <glog/stl_logging.h>
+ #else // !defined(__CUDACC__) && !!defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG)
+ 
+diff --git a/caffe2/image/image_input_op.h b/caffe2/image/image_input_op.h
+index 9604e98..7d90014 100644
+--- a/caffe2/image/image_input_op.h
+++ b/caffe2/image/image_input_op.h
+@@ -214,13 +214,13 @@ ImageInputOp<Context>::ImageInputOp(
+ 
+   // hard-coded PCA eigenvectors and eigenvalues, based on RBG channel order
+   color_lighting_eigvecs_.push_back(
+-    std::vector<float>{-144.7125, 183.396, 102.2295});
+    std::vector<float>{-144.7125f, 183.396f, 102.2295f});
+   color_lighting_eigvecs_.push_back(
+-    std::vector<float>{-148.104, -1.1475, -207.57});
+    std::vector<float>{-148.104f, -1.1475f, -207.57f});
+   color_lighting_eigvecs_.push_back(
+-    std::vector<float>{-148.818, -177.174, 107.1765});
+    std::vector<float>{-148.818f, -177.174f, 107.1765f});
+ 
+-  color_lighting_eigvals_ = std::vector<float>{0.2175, 0.0188, 0.0045};
+  color_lighting_eigvals_ = std::vector<float>{0.2175f, 0.0188f, 0.0045f};
+ 
+   CAFFE_ENFORCE_GT(batch_size_, 0, "Batch size should be nonnegative.");
+   if (use_caffe_datum_) {
+diff --git a/caffe2/operators/batch_matmul_op.cc b/caffe2/operators/batch_matmul_op.cc
+index c2e578d..28cf030 100644
+--- a/caffe2/operators/batch_matmul_op.cc
+++ b/caffe2/operators/batch_matmul_op.cc
+@@ -34,7 +34,7 @@ size (C x K x N) where C is the batch size and i ranges from 0 to C-1.
+         b_dim1 = in[1].dims(2);
+       }
+       return vector<TensorShape> {
+-          CreateTensorShape(vector<int> {
+          CreateTensorShape(vector<TIndex> {
+               in[0].dims(0), a_dim0, b_dim1},
+               in[0].data_type())
+       };
+diff --git a/caffe2/operators/layer_norm_op.cu b/caffe2/operators/layer_norm_op.cu
+index df13fc3..68bbc97 100644
+--- a/caffe2/operators/layer_norm_op.cu
+++ b/caffe2/operators/layer_norm_op.cu
+@@ -252,8 +252,8 @@ bool LayerNormGradientOp<CUDAContext>::DoRunWithType<float>() {
+   auto* ginput = Output(0);
+ 
+   const auto canonical_axis = norm_inputs.canonical_axis_index(axis_);
+-  const int left = norm_inputs.size_to_dim(canonical_axis);
+-  const int right = norm_inputs.size_from_dim(canonical_axis);
+  const TIndex left = norm_inputs.size_to_dim(canonical_axis);
+  const TIndex right = norm_inputs.size_from_dim(canonical_axis);
+ 
+   ginput->ResizeLike(norm_inputs);
+   std::vector<TIndex> stats_dims(
+@@ -261,7 +261,7 @@ bool LayerNormGradientOp<CUDAContext>::DoRunWithType<float>() {
+   stats_dims.push_back(1);
+   dmean_.Resize(stats_dims);
+   dstdev_.Resize(stats_dims);
+-  gscratch_.Resize(std::vector<size_t>{left, right});
+  gscratch_.Resize(std::vector<TIndex>{left, right});
+ 
+   std::vector<int> segs(left + 1);
+   std::iota(segs.begin(), segs.end(), 0);
+@@ -291,7 +291,7 @@ bool LayerNormGradientOp<CUDAContext>::DoRunWithType<float>() {
+       dout.data<float>(),
+       gscratch_.mutable_data<float>());
+ 
+-  dstdev_.Resize(vector<size_t>{left, 1});
+  dstdev_.Resize(vector<TIndex>{left, 1});
+   // dstdev = reduce(temp1)
+   allocScratchAndReduce(
+       gscratch_.data<float>(),
+diff --git a/caffe2/operators/lengths_top_k_op.cc b/caffe2/operators/lengths_top_k_op.cc
+index c871d53..bad741a 100644
+--- a/caffe2/operators/lengths_top_k_op.cc
+++ b/caffe2/operators/lengths_top_k_op.cc
+@@ -14,7 +14,7 @@ bool LengthsTopKOp<T, Context>::RunOnDevice() {
+ 
+   output_topk_values->Resize(N * k_);
+   output_topk_indices->Resize(N * k_);
+-  std::vector<int> output_dims = std::vector<int>({N, k_});
+  std::vector<TIndex> output_dims = std::vector<TIndex>({N, k_});
+   output_topk_values->Reshape(output_dims);
+   output_topk_indices->Reshape(output_dims);
+   T* output_topk_values_data = output_topk_values->template mutable_data<T>();
+diff --git a/caffe2/operators/pool_op_cudnn.cu b/caffe2/operators/pool_op_cudnn.cu
+index a380d8d..b0cd326 100644
+--- a/caffe2/operators/pool_op_cudnn.cu
+++ b/caffe2/operators/pool_op_cudnn.cu
+@@ -467,6 +467,15 @@ class CuDNNPoolGradientOp : public ConvPoolOpBase<CUDAContext> {
+   cudnnPoolingDescriptor_t pooling_desc_;
+   cudnnPoolingMode_t mode_;
+ 
+// MSVC defines IN and OUT in minwindef.h
+#ifdef IN
+#undef IN
+#endif
+
+#ifdef OUT
+#undef OUT
+#endif
+
+   // Input: X, Y, dY
+   // Output: dX
+   INPUT_TAGS(IN, OUT, OUT_GRAD);
+diff --git a/caffe2/operators/recurrent_op_cudnn.cc b/caffe2/operators/recurrent_op_cudnn.cc
+index 7777813..58bc8c3 100644
+--- a/caffe2/operators/recurrent_op_cudnn.cc
+++ b/caffe2/operators/recurrent_op_cudnn.cc
+@@ -115,10 +115,11 @@ void RecurrentBaseOp<T>::initialize(
+ 
+   // RNN setup
+   {
+-    CUDNN_ENFORCE(cudnnSetRNNDescriptor(
+// Do not use #if condition inside CUDNN_ENFORCE
+// to avoid macro expansion errors.
+ #if CUDNN_MAJOR >= 7
+CUDNN_ENFORCE(cudnnSetRNNDescriptor(
+         cudnn_wrapper_.inline_cudnn_handle(),
+-#endif
+         rnnDesc_,
+         hiddenSize,
+         numLayers,
+@@ -126,10 +127,19 @@ void RecurrentBaseOp<T>::initialize(
+         rnnInput,
+         rnnDirection,
+         rnnMode,
+-#if CUDNN_MAJOR >= 7
+         CUDNN_RNN_ALGO_STANDARD, // TODO: verify correctness / efficiency.
+-#endif
+         cudnnTypeWrapper<T>::type));
+#else
+    CUDNN_ENFORCE(cudnnSetRNNDescriptor(
+        rnnDesc_,
+        hiddenSize,
+        numLayers,
+        dropoutDesc_,
+        rnnInput,
+        rnnDirection,
+        rnnMode,
+        cudnnTypeWrapper<T>::type));
+#endif  // CUDNN_MAJOR >= 7
+   }
+   // X setup
+   {
+diff --git a/caffe2/utils/CMakeLists.txt b/caffe2/utils/CMakeLists.txt
+index f90af5a..919a638 100644
+--- a/caffe2/utils/CMakeLists.txt
+++ b/caffe2/utils/CMakeLists.txt
+@@ -27,6 +27,10 @@ exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${Caffe2_GPU_SRCS})
+ # will directly link nnpack pthreadpool.
+ file(GLOB_RECURSE tmp pthreadpool*)
+ exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${tmp})
+if(MSVC)
+  file(GLOB_RECURSE tmp *ThreadPool.cc)
+  exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${tmp})
+endif()
+ 
+ # ---[ GPU test files
+ file(GLOB_RECURSE tmp *_gpu_test.cc)
+diff --git a/caffe2/utils/GpuBitonicSort.cuh b/caffe2/utils/GpuBitonicSort.cuh
+index f52bb50..a199bcb 100644
+--- a/caffe2/utils/GpuBitonicSort.cuh
+++ b/caffe2/utils/GpuBitonicSort.cuh
+@@ -39,9 +39,11 @@ __device__ inline void bitonicSort(K* keys,
+   // Assume the sort is taking place in shared memory
+   // static_assert(Power2SortSize * (sizeof(K) + sizeof(V)) < 32768,
+   //               "sort data too large (>32768 bytes)");
+-  static_assert(math::integerIsPowerOf2(Power2SortSize),
+  static_assert(math::integerIsPowerOf2(
+                std::integral_constant<int, Power2SortSize>::value),
+                 "sort size must be power of 2");
+-  static_assert(math::integerIsPowerOf2(ThreadsPerBlock),
+  static_assert(math::integerIsPowerOf2(
+                std::integral_constant<int, ThreadsPerBlock>::value),
+                 "threads in block must be power of 2");
+ 
+   // If what we are sorting is too small, then not all threads
+@@ -107,7 +109,8 @@ __device__ inline void warpBitonicSort(K* keys,
+   // Smaller sorts should use a warp shuffle sort
+   static_assert(Power2SortSize > kWarpSize,
+                 "sort not large enough");
+-  static_assert(math::integerIsPowerOf2(Power2SortSize),
+  static_assert(math::integerIsPowerOf2(
+                std::integral_constant<int, Power2SortSize>::value),
+                 "sort size must be power of 2");
+   static_assert(Power2SortSize <= kMaxBitonicSortSize,
+                 "sort size <= 4096 only supported");
+diff --git a/caffe2/utils/math.h b/caffe2/utils/math.h
+index 6c352dc..a1eda9d 100644
+--- a/caffe2/utils/math.h
+++ b/caffe2/utils/math.h
+@@ -426,18 +426,10 @@ constexpr T roundUp(T a, T b) {
+   return divUp<T>(a, b) * b;
+ }
+ 
+-// Returns true if the given integer type is a power-of-2 (positive only)
+-// Note(jiayq): windows reported an error per
+-//     https://github.com/caffe2/caffe2/issues/997
+-// and as a result will make it a macro.
+-#ifdef _MSC_VER
+-#define integerIsPowerOf2(v) ((v) && !((v) & ((v) - 1)))
+-#else // _MSC_VER
+ template <typename T>
+ constexpr bool integerIsPowerOf2(T v) {
+   return (v && !(v & (v - 1)));
+ }
+-#endif // _MSC_VER
+ 
+ // Returns log2(n) for a positive integer type
+ template <typename T>
+diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake
+index df70e2f..ca1b123 100644
+--- a/cmake/Cuda.cmake
+++ b/cmake/Cuda.cmake
+@@ -37,6 +37,10 @@ function(caffe2_detect_installed_gpus out_variable)
+                     ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
+     if(__nvcc_res EQUAL 0)
+      # nvcc outputs text containing line breaks when building with MSVC.
+      # The line below prevents CMake from inserting a variable with line
+      # breaks in the cache
+      string(REGEX MATCH "([1-9].[0-9])" __nvcc_out "${__nvcc_out}")
+       string(REPLACE "2.1" "2.1(2.0)" __nvcc_out "${__nvcc_out}")
+       set(CUDA_gpu_detect_output ${__nvcc_out} CACHE INTERNAL "Returned GPU architetures from caffe_detect_gpus tool" FORCE)
+     endif()
+@@ -249,7 +253,7 @@ endif()
+ # Debug and Release symbol support
+ if (MSVC)
+   if (${CMAKE_BUILD_TYPE} MATCHES "Release")
+-    if (${BUILD_SHARED_LIBS})
+    if (NOT USE_STATIC_RUNTIME)
+       list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MD")
+     else()
+       list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MT")
+@@ -259,7 +263,7 @@ if (MSVC)
+             "Caffe2 currently does not support the combination of MSVC, Cuda "
+             "and Debug mode. Either set USE_CUDA=OFF or set the build type "
+             "to Release")
+-    if (${BUILD_SHARED_LIBS})
+    if (NOT USE_STATIC_RUNTIME)
+       list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MDd")
+     else()
+       list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MTd")
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index afb6b68..bdad8b6 100644
+--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
+@@ -182,6 +182,15 @@ if(USE_OPENCV)
+     message(WARNING "Not compiling with OpenCV. Suppress this warning with -DUSE_OPENCV=OFF")
+     set(USE_OPENCV OFF)
+   endif()
+  if(USE_OPENCV AND VCPKG_TARGET_TRIPLET MATCHES static)
+    find_package(LibLZMA QUIET)
+    if(LIBLZMA_FOUND)
+      list(APPEND Caffe2_DEPENDENCY_LIBS ${LIBLZMA_LIBRARIES})
+    else()
+      message(WARNING "Not compiling with OpenCV. Could not find liblzma. Suppress this warning with -DUSE_OPENCV=OFF")
+      set(USE_OPENCV OFF)
+    endif()
+  endif()
+ endif()
+ 
+ # ---[ FFMPEG
+diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmake
+index 1167532..9780ba5 100644
+--- a/cmake/Modules/FindGlog.cmake
+++ b/cmake/Modules/FindGlog.cmake
+@@ -27,6 +27,10 @@ if(MSVC)
+     endif()
+     if(TARGET ${GLOG_LIBRARY})
+       get_target_property(GLOG_INCLUDE_DIR ${GLOG_LIBRARY} INTERFACE_INCLUDE_DIRECTORIES)
+      get_target_property(GLOG_TYPE ${GLOG_LIBRARY} TYPE)
+      if("${GLOG_TYPE}" STREQUAL "SHARED_LIBRARY")
+        add_definitions(-DGLOG_IS_A_DLL=1)
+      endif()
+     endif()
+ else()
+     find_library(GLOG_LIBRARY glog
+diff --git a/cmake/ProtoBuf.cmake b/cmake/ProtoBuf.cmake
+index 89975c8..e37d6da 100644
+--- a/cmake/ProtoBuf.cmake
+++ b/cmake/ProtoBuf.cmake
+@@ -13,6 +13,9 @@ function(custom_protobuf_find)
+     # so we turn it off here.
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations" PARENT_SCOPE)
+   endif()
+  if(MSVC)
+    set(protobuf_MSVC_STATIC_RUNTIME ${USE_STATIC_RUNTIME})
+  endif()
+   add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/protobuf/cmake)
+   caffe2_include_directories(${PROJECT_SOURCE_DIR}/third_party/protobuf/src)
+   list(APPEND Caffe2_DEPENDENCY_LIBS libprotobuf)
+diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake
+index b7423a6..2996484 100644
+--- a/cmake/Summary.cmake
+++ b/cmake/Summary.cmake
+@@ -19,6 +19,13 @@ function (Caffe2_print_configuration_summary)
+   message(STATUS "  System                : ${CMAKE_SYSTEM_NAME}")
+   message(STATUS "  C++ compiler          : ${CMAKE_CXX_COMPILER}")
+   message(STATUS "  C++ compiler version  : ${CMAKE_CXX_COMPILER_VERSION}")
+  if(MSVC)
+    if(USE_STATIC_RUNTIME)
+      message(STATUS "  Runtime               : static (/MT)")
+    else()
+      message(STATUS "  Runtime               : dynamic (/MD)")
+    endif()
+  endif()
+   message(STATUS "  Protobuf compiler     : ${PROTOBUF_PROTOC_EXECUTABLE}")
+   message(STATUS "  CXX flags             : ${CMAKE_CXX_FLAGS}")
+   message(STATUS "  Build type            : ${CMAKE_BUILD_TYPE}")
--- a/ports/caffe2/portfile.cmake
+++ b/ports/caffe2/portfile.cmake
@ -0,0 +1,118 @@
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+    message(FATAL_ERROR "Caffe2 cannot be built for the x86 architecture")
+endif()
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO caffe2/caffe2
+    REF eab13a2d5c807bf5d49efd4584787b639a981b79
+    SHA512 505a8540b0c28329c4e2ce443ac8e198c1ee613eb6b932927ee9d04c8afdc95081f3c4581408b7097d567840427b31f6d7626ea80f27e56532f2f2e6acd87023
+    HEAD_REF master
+)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+    ${CMAKE_CURRENT_LIST_DIR}/msvc-fixes.patch
+)
+
+if(VCPKG_CRT_LINKAGE STREQUAL static)
+    set(USE_STATIC_RUNTIME ON)
+else()
+    set(USE_STATIC_RUNTIME OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+    -DBUILD_SHARED_LIBS=OFF
+    # Set to ON to use python
+    -DBUILD_PYTHON=OFF
+    -DUSE_STATIC_RUNTIME=${USE_STATIC_RUNTIME}
+    -DUSE_GFLAGS=ON
+    -DUSE_GLOG=ON
+    # Cannot use OpenCV without USE_CUDA=ON right now
+    -DUSE_OPENCV=OFF
+    -DUSE_THREADS=ON
+    # Uncomment to use MKL
+    # -DBLAS=MKL
+    -DUSE_CUDA=OFF
+    -DUSE_FFMPEG=OFF
+    -DUSE_GLOO=OFF
+    -DUSE_LEVELDB=OFF
+    -DUSE_LITE_PROTO=OFF
+    -DUSE_METAL=OFF
+    -DUSE_MOBILE_OPENGL=OFF
+    -DUSE_MPI=OFF
+    -DUSE_NCCL=OFF
+    -DUSE_NERVANA_GPU=OFF
+    -DUSE_NNPACK=OFF
+    -DUSE_OBSERVERS=OFF
+    -DUSE_OPENMP=ON
+    -DUSE_REDIS=OFF
+    -DUSE_ROCKSDB=OFF
+    -DUSE_SNPE=OFF
+    -DUSE_ZMQ=OFF
+    -DBUILD_TEST=OFF
+    -DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protoc.exe
+)
+
+vcpkg_install_cmake()
+
+# Remove folders from install
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/caffe)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/caffe2)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/caffe)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/caffe2)
+
+# Remove empty directories from include (should probably fix or
+# patch caffe2 install script)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/test)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/python)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/opengl)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/nnpack)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/libopencl-stub)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/docker-ubuntu-14.04)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/binaries)
+
+# Move bin to tools
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+foreach(binary ${BINARIES})
+    get_filename_component(binary_name ${binary} NAME)
+    file(RENAME ${binary} ${CURRENT_PACKAGES_DIR}/tools/${binary_name})
+endforeach()
+
+# Remove bin directory
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+endif()
+
+# Remove headers and tools from debug build
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+foreach(binary ${BINARIES})
+    get_filename_component(binary_name ${binary} NAME)
+    file(REMOVE ${binary})
+endforeach()
+
+# Remove bin directory
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+# install license
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/caffe2)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/caffe2 RENAME copyright)
+
+vcpkg_copy_pdbs()
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@ -1,4 +1,4 @@
 Source: cairo
-Version: 1.15.6
+Version: 1.15.8-1
 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/Initialize-mutexes-for-static-builds-for-win32.patch
+++ b/ports/cairo/Initialize-mutexes-for-static-builds-for-win32.patch
@ -1,16 +0,0 @@
- src/win32/cairo-win32-device.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/win32/cairo-win32-device.c b/src/win32/cairo-win32-device.c
-index 741e49e..c60c494 100644
--- a/src/win32/cairo-win32-device.c
-+++ b/src/win32/cairo-win32-device.c
-@@ -131,6 +131,8 @@ _cairo_win32_device_get (void)
- {
-     cairo_win32_device_t *device;
- 
-+    CAIRO_MUTEX_INITIALIZE ();
-+
-     if (__cairo_win32_device)
- 	return cairo_device_reference (__cairo_win32_device);
- 
--- a/ports/cairo/portfile.cmake
+++ b/ports/cairo/portfile.cmake
@ -7,19 +7,18 @@
 #

 include(vcpkg_common_functions)
-set(CAIRO_VERSION 1.15.6)
+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 e4eccba745a03545001ebd6f1a7b87bee4b932f80a2d877a764500ad5c18011a5bac585f31eec6d0b65ccaa818de0df2b3b99f0792111363bd3554cfa7f688b6
+    SHA512 5af1eebf432201dae0efaa5b6766b151d8273ea00dae48e104d56477005b4d423d64b5d11c512736a4cb076632fb2a572ec35becd922825a68d933bb5ff96ca1
 )
 vcpkg_extract_source_archive(${ARCHIVE})

 vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/Initialize-mutexes-for-static-builds-for-win32.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/export-only-in-shared-build.patch"
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/export-only-in-shared-build.patch"
 )

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src)
--- a/ports/cairomm/CONTROL
+++ b/ports/cairomm/CONTROL
@ -1,4 +1,4 @@
 Source: cairomm
-Version: 1.15.3-1
+Version: 1.15.3-2
 Description: A C++ wrapper for the cairo graphics library
-Build-Depends: cairo, libsigcpp
+Build-Depends: cairo, libsigcpp
--- a/ports/ccd/CONTROL
+++ b/ports/ccd/CONTROL
@ -1,3 +1,3 @@
 Source: ccd
-Version: 2.0.0-1
+Version: 2.0.0-2
 Description: Library for collision detection between two convex shapes
--- a/ports/ccfits/CONTROL
+++ b/ports/ccfits/CONTROL
@ -1,4 +1,4 @@
 Source: ccfits
-Version: 2.5
+Version: 2.5-1
 Description: CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.
-Build-Depends: cfitsio
+Build-Depends: cfitsio
--- a/ports/cctz/CMakeLists.txt
+++ b/ports/cctz/CMakeLists.txt
@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.8)
+project(cctz CXX)
+
+set(CMAKE_DEBUG_POSTFIX d)
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    option(INSTALL_HEADERS "Install header files" ON)
+else()
+    option(INSTALL_HEADERS "Install header files" OFF)
+endif()
+
+file(GLOB SOURCES src/*.cc)
+list(FILTER SOURCES EXCLUDE REGEX "_test.cc$|benchmarks|_tool.cc$")
+
+file(GLOB HEADERS include/cctz/*.h)
+
+add_library(cctz ${SOURCES})
+target_include_directories(cctz PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
+
+if(INSTALL_HEADERS)
+    install(FILES ${HEADERS} DESTINATION "include/cctz")
+endif()
+
+install(TARGETS cctz EXPORT unofficial-cctz-targets
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
+
+install(
+    EXPORT unofficial-cctz-targets
+    FILE unofficial-cctz-config.cmake
+    NAMESPACE unofficial::
+    DESTINATION share/unofficial-cctz
+)
--- a/ports/cctz/CONTROL
+++ b/ports/cctz/CONTROL
@ -0,0 +1,3 @@
+Source: cctz
+Version: v2.1
+Description: two libraries that cooperate with <chrono> to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.
--- a/ports/cctz/portfile.cmake
+++ b/ports/cctz/portfile.cmake
@ -0,0 +1,24 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/cctz
+    REF v2.1
+    SHA512 b6531ce64fdd8581944457cdeff7f9ff9c00958af51ddb262c74e08fcc076466c59c7bef1ce7edccc9512a7f4cb204e04581d287c4a9a684057fe39421c3fbc6
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cctz ${CURRENT_PACKAGES_DIR}/share/unofficial-cctz)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctz RENAME copyright)
--- a/ports/celero/CONTROL
+++ b/ports/celero/CONTROL
@ -0,0 +1,3 @@
+Source: celero
+Version: 2.1.0-1
+Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.
--- a/ports/celero/portfile.cmake
+++ b/ports/celero/portfile.cmake
@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    message(STATUS "Celero currently can only be built statically")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DigitalInBlue/Celero
+    REF v2.1.0
+    SHA512 30563567255b09a2c810d97896839589ed99d45b6c8d075fd16d1a0068457d70195a199f5c982c84784c2e03284c1eaac565253fa72b81d9e2d4102721b80221
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS
+        -DCELERO_ENABLE_EXPERIMENTS=OFF
+        -DCELERO_ENABLE_TESTS=OFF
+        -DCELERO_RUN_EXAMPLE_ON_BUILD=OFF
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/celero RENAME copyright)
--- a/ports/cereal/CONTROL
+++ b/ports/cereal/CONTROL
@ -1,3 +1,3 @@
 Source: cereal
-Version: 1.2.2
+Version: 1.2.2-1
 Description: a header-only C++11 serialization library (built in support for binary, XML and JSon)
--- a/ports/ceres/CONTROL
+++ b/ports/ceres/CONTROL
@ -1,4 +1,4 @@
 Source: ceres
-Version: 1.13.0
+Version: 1.13.0-1
 Build-Depends:suitesparse, eigen3, clapack, gflags, glog
-Description: non-linear optimization package
+Description: non-linear optimization package
--- a/ports/cfitsio/CONTROL
+++ b/ports/cfitsio/CONTROL
@ -1,3 +1,3 @@
 Source: cfitsio
-Version: 3.410
+Version: 3.410-1
 Description: Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format
--- a/ports/charls/CONTROL
+++ b/ports/charls/CONTROL
@ -1,3 +1,3 @@
 Source: charls
-Version: 2.0.0
-Description: CharLS, a C++ JPEG-LS library implementation.
+Version: 2.0.0-1
+Description: CharLS, a C++ JPEG-LS library implementation.
--- a/ports/chmlib/CONTROL
+++ b/ports/chmlib/CONTROL
@ -1,3 +1,3 @@
 Source: chmlib
-Version: 0.40
+Version: 0.40-1
 Description: CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.
--- a/ports/chmlib/chm.vcxproj
+++ b/ports/chmlib/chm.vcxproj
@ -69,22 +69,22 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <!--Overriden at build time.-->
    <OutDir>..\..\..\x86-windows-static-dbg\</OutDir>
-    <IntDir>..\..\..\x86-windows-static-dbg\</IntDir>
+    <IntDir>..\..\..\x86-windows-static-dbg\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <!--Overriden at build time.-->
    <OutDir>..\..\..\x86-windows-static-rel\</OutDir>
-    <IntDir>..\..\..\x86-windows-static-rel\</IntDir>
+    <IntDir>..\..\..\x86-windows-static-rel\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <!--Overriden at build time.-->
    <OutDir>..\..\..\x64-windows-static-dbg\</OutDir>
-    <IntDir>..\..\..\x64-windows-static-dbg\</IntDir>
+    <IntDir>..\..\..\x64-windows-static-dbg\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <!--Overriden at build time.-->
    <OutDir>..\..\..\x64-windows-static-rel\</OutDir>
-    <IntDir>..\..\..\x64-windows-static-rel\</IntDir>
+    <IntDir>..\..\..\x64-windows-static-rel\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@ -98,6 +98,7 @@
      <CompileAs>CompileAsC</CompileAs>
      <DebugInformationFormat>OldStyle</DebugInformationFormat>
      <MinimalRebuild>false</MinimalRebuild>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
    </ClCompile>
    <Link>
      <AdditionalDependencies>
@ -112,6 +113,7 @@
      <SubSystem>Windows</SubSystem>
      <Verbose>true</Verbose>
      <IgnoreSpecificDefaultLibraries>libc.lib, libcmt.lib, msvcrt.lib, libcd.lib, msvcrtd.lib</IgnoreSpecificDefaultLibraries>
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -126,6 +128,7 @@
      <CompileAs>CompileAsC</CompileAs>
      <DebugInformationFormat>OldStyle</DebugInformationFormat>
      <MinimalRebuild>false</MinimalRebuild>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
    </ClCompile>
    <Link>
      <AdditionalDependencies>
@ -138,6 +141,7 @@
      <SubSystem>Windows</SubSystem>
      <Verbose>true</Verbose>
      <IgnoreSpecificDefaultLibraries>libc.lib, libcmt.lib, msvcrt.lib, libcd.lib, msvcrtd.lib</IgnoreSpecificDefaultLibraries>
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -150,6 +154,7 @@
      <DisableSpecificWarnings>4018;4057;4127;4189;4244;4267;4295;4324;4458;4477;4701;4706;4800;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <CompileAs>CompileAsC</CompileAs>
+      <Optimization>Full</Optimization>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -176,6 +181,7 @@
      <DisableSpecificWarnings>4018;4057;4127;4189;4244;4267;4295;4324;4458;4477;4701;4706;4800;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <CompileAs>CompileAsC</CompileAs>
+      <Optimization>Full</Optimization>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
--- a/ports/chmlib/enum_chmLib.vcxproj
+++ b/ports/chmlib/enum_chmLib.vcxproj
@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="enum_chmLib.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{2c833145-059b-47d5-b0fe-b3ac6ff1ccb0}</ProjectGuid>
+    <RootNamespace>enum_chmLib</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>..\..\..\x86-windows-static-rel\</OutDir>
+    <IntDir>..\..\..\x86-windows-static-rel\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>..\..\..\x64-windows-static-rel\</OutDir>
+    <IntDir>..\..\..\x64-windows-static-rel\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <PreprocessorDefinitions>WIN32;_UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <ShowIncludes>true</ShowIncludes>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(OutputPath)chm.lib</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>LinkVerbose</ShowProgress>
+      <IgnoreSpecificDefaultLibraries>libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <PreprocessorDefinitions>WIN32;_UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <ShowIncludes>true</ShowIncludes>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(OutputPath)chm.lib</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>LinkVerbose</ShowProgress>
+      <IgnoreSpecificDefaultLibraries>libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/ports/chmlib/enumdir_chmLib.vcxproj
+++ b/ports/chmlib/enumdir_chmLib.vcxproj
@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="enumdir_chmLib.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{bb0bfe9a-7d13-44a0-b2b5-3b69a07a77e8}</ProjectGuid>
+    <RootNamespace>enumdir_chmLib</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>..\..\..\x86-windows-static-rel\</OutDir>
+    <IntDir>..\..\..\x86-windows-static-rel\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>..\..\..\x64-windows-static-rel\</OutDir>
+    <IntDir>..\..\..\x64-windows-static-rel\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(OutputPath)chm.lib</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>LinkVerbose</ShowProgress>
+      <IgnoreSpecificDefaultLibraries>libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(OutputPath)chm.lib</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>LinkVerbose</ShowProgress>
+      <IgnoreSpecificDefaultLibraries>libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/ports/chmlib/extract_chmLib.vcxproj
+++ b/ports/chmlib/extract_chmLib.vcxproj
@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{8F41248C-8E62-4822-9A85-4CAF00AACEEE}</ProjectGuid>
+    <RootNamespace>extract_chmLib</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>..\..\..\x86-windows-static-rel\</OutDir>
+    <IntDir>..\..\..\x86-windows-static-rel\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>..\..\..\x64-windows-static-rel\</OutDir>
+    <IntDir>..\..\..\x64-windows-static-rel\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(OutputPath)chm.lib</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>LinkVerbose</ShowProgress>
+      <IgnoreSpecificDefaultLibraries>libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(OutputPath)chm.lib</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>LinkVerbose</ShowProgress>
+      <IgnoreSpecificDefaultLibraries>libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="extract_chmLib.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/ports/chmlib/portfile.cmake
+++ b/ports/chmlib/portfile.cmake
@ -1,26 +1,6 @@
-# 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)
-#
-
-#message("VCPKG_TARGET_ARCHITECTURE" ${VCPKG_TARGET_ARCHITECTURE})
-#if(NOT ${VCPKG_TARGET_ARCHITECTURE} STREQUAL "x86")
-#    message(FATAL_ERROR "chmlib only supports x86")
-#endif()
-
-if(${VCPKG_CRT_LINKAGE} STREQUAL "dynamic")
-    message(FATAL_ERROR "chmlib supports static linking only.")
-endif()
-
-if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic")
-    message(FATAL_ERROR "chmlib supports static linking only.")
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "Warning: Dynamic building not supported. Building static.")
+    set(VCPKG_LIBRARY_LINKAGE static)
 endif()

 set(CHMLIB_VERSION chmlib-0.40)
@ -37,21 +17,50 @@ vcpkg_download_distfile(
 )   
 vcpkg_extract_source_archive(${ARCHIVE})

-file(COPY "${VCPKG_ROOT_DIR}/ports/${PORT}/chm.vcxproj"
-    DESTINATION ${CHMLIB_SRC})
+file(GLOB VCXPROJS "${VCPKG_ROOT_DIR}/ports/${PORT}/*.vcxproj")
+file(COPY ${VCXPROJS} DESTINATION ${CHMLIB_SRC})

 vcpkg_build_msbuild(
    PROJECT_PATH ${CHMLIB_SRC}/chm.vcxproj
    RELEASE_CONFIGURATION Release
    DEBUG_CONFIGURATION Debug
-    OPTIONS_DEBUG /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
-    OPTIONS_RELEASE /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
-    OPTIONS /v:diagnostic /p:SkipInvalidConfigurations=true
+    TARGET Build
+    OPTIONS /v:diagnostic
+)
+
+#enum_chmLib RELEASE only
+vcpkg_build_msbuild(
+    PROJECT_PATH ${CHMLIB_SRC}/enum_chmLib.vcxproj
+    RELEASE_CONFIGURATION Release
+    DEBUG_CONFIGURATION Release
+    TARGET Build
+    OPTIONS /v:diagnostic
+)
+
+#enumdir_chmLib RELEASE only
+vcpkg_build_msbuild(
+    PROJECT_PATH ${CHMLIB_SRC}/enumdir_chmLib.vcxproj
+    RELEASE_CONFIGURATION Release
+    DEBUG_CONFIGURATION Release
+    TARGET Build
+    OPTIONS /v:diagnostic
+)
+
+#extract_chmLib RELEASE only
+vcpkg_build_msbuild(
+    PROJECT_PATH ${CHMLIB_SRC}/extract_chmLib.vcxproj
+    RELEASE_CONFIGURATION Release
+    DEBUG_CONFIGURATION Release
+    TARGET Build
+    OPTIONS /v:diagnostic
 )

 file(INSTALL ${CHMLIB_SRC}/chm_lib.h  DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/chm.lib  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/chm.lib  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-rel/chm.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-dbg/chm.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-rel/enum_chmLib.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-rel/enumdir_chmLib.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-rel/extract_chmLib.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)

 file(COPY ${CURRENT_BUILDTREES_DIR}/src/chmlib-0.40/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/chmlib)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/chmlib/COPYING ${CURRENT_PACKAGES_DIR}/share/chmlib/copyright)
--- a/ports/clapack/CONTROL
+++ b/ports/clapack/CONTROL
@ -1,4 +1,4 @@
 Source: clapack
-Version: 3.2.1
+Version: 3.2.1-1
 Description: CLAPACK (f2c'ed version of LAPACK)
 Build-Depends: openblas
--- a/ports/clockutils/CONTROL
+++ b/ports/clockutils/CONTROL
@ -1,3 +1,3 @@
 Source: clockutils
-Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5
+Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-1
 Description: A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.
--- a/ports/console-bridge/CONTROL
+++ b/ports/console-bridge/CONTROL
@ -0,0 +1,3 @@
+Source: console-bridge
+Version: 0.3.2-2
+Description: a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.
--- a/ports/console-bridge/License.txt
+++ b/ports/console-bridge/License.txt
@ -0,0 +1,31 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2008, Willow Garage, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+* Neither the name of the Willow Garage nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
--- a/ports/console-bridge/portfile.cmake
+++ b/ports/console-bridge/portfile.cmake
@ -0,0 +1,24 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ros/console_bridge
+    REF 0.3.2
+    SHA512 41fa5340d7ba79c887ef73eb4fda7b438ed91febd224934ae4658697e4c9e43357207e1b3e191ecce3c97cb9a87b0556372832735a268261bc798cc7683aa207
+    HEAD_REF master
+  )
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/console-bridge ${CURRENT_PACKAGES_DIR}/share/console_bridge)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/console-bridge RENAME copyright)
--- a/ports/corrade/CONTROL
+++ b/ports/corrade/CONTROL
@ -1,3 +1,3 @@
 Source: corrade
-Version: jun2017-2
+Version: jun2017-3
 Description: C++11/C++14 multiplatform utility library http://mosra.cz/blog/corrade.php
--- a/ports/corrade/portfile.cmake
+++ b/ports/corrade/portfile.cmake
@ -3,7 +3,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO mosra/corrade
    REF c182fe636894a998f241212d0205d0c126b7926f
-    SHA512 e62486368eab9c5f90ef9f4af91500f465d9e3baa6e5f6e9f2a49844d09676faefcb965a9d5b27a54eda19436af6b23dcda19504be6cd0dcd52dfad2ad4bfa21
+    SHA512 d664c7884c0c6c7977261a851948b2b591ac0fbdbcfddab1d8e578e629a252f48fa786cf9f96525e10aa76c95919dfc3452ccbe5e930aa4a69e61269e4ee07ee
    HEAD_REF master
 )

@ -44,4 +44,4 @@ endif()
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/corrade)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/corrade/COPYING ${CURRENT_PACKAGES_DIR}/share/corrade/copyright)

-vcpkg_copy_pdbs()
+vcpkg_copy_pdbs()
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@ -1,4 +1,4 @@
 Source: cpp-redis
-Version: 3.5.2-1
+Version: 3.5.2-2
 Build-Depends: tacopie
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
--- a/ports/cppcms/CONTROL
+++ b/ports/cppcms/CONTROL
@ -1,4 +1,4 @@
 Source: cppcms
-Version: 1.1.0
+Version: 1.1.0-1
 Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development
 Build-Depends: icu, pcre, openssl, zlib
--- a/ports/cpprestsdk/0003_openssl_110.patch
+++ b/ports/cpprestsdk/0003_openssl_110.patch
@ -0,0 +1,14 @@
+diff --git a/Release/src/websockets/client/ws_client_wspp.cpp b/Release/src/websockets/client/ws_client_wspp.cpp
+index 9f91d68..4b5d506 100644
+--- a/Release/src/websockets/client/ws_client_wspp.cpp
+++ b/Release/src/websockets/client/ws_client_wspp.cpp
+@@ -76,7 +76,9 @@ static struct ASIO_SSL_memory_leak_suppress
+ {
+     ~ASIO_SSL_memory_leak_suppress()
+     {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         ::SSL_COMP_free_compression_methods();
+#endif
+     }
+ } ASIO_SSL_memory_leak_suppressor;
+ 
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.9.0-2
+Version: 2.9.0-4
 Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (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.
+  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
@ -4,7 +4,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/cpprestsdk
    REF v2.9.0
-    SHA512 c75de6ad33b3e8d2c6ba7c0955ed851d557f78652fb38a565de0cfbc99e7db89cb6fa405857512e5149df80356c51ae9335abd914c3c593fa6658ac50adf4e29
+    SHA512 7f6af05e2aaf49fb5ba24f4fac43b7787345d46913831504925cefc60d1b62e38457e1d628d5de8b0db891b59716d2bfe63a494ca0b337d67fc9ca5447a5ba9b
    HEAD_REF master
 )
 if(NOT VCPKG_USE_HEAD_VERSION)
@ -13,6 +13,7 @@ if(NOT VCPKG_USE_HEAD_VERSION)
        PATCHES
            ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
            ${CMAKE_CURRENT_LIST_DIR}/0002_no_websocketpp_in_uwp.patch
+            ${CMAKE_CURRENT_LIST_DIR}/0003_openssl_110.patch
    )
 endif()

--- a/ports/cppwinrt/CONTROL
+++ b/ports/cppwinrt/CONTROL
@ -1,3 +1,3 @@
 Source: cppwinrt
-Version: feb2017_refresh-14393
+Version: spring_2017_creators_update_for_vs_15.3
 Description: C++/WinRT is a standard C++ language projection for the Windows Runtime.
--- a/ports/cppwinrt/portfile.cmake
+++ b/ports/cppwinrt/portfile.cmake
@ -1,18 +1,18 @@
 include(vcpkg_common_functions)
 find_program(GIT git)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cppwinrt-february_2017_refresh)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cppwinrt-spring_2017_creators_update_for_vs_15.3)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/cppwinrt/archive/february_2017_refresh.tar.gz"
-    FILENAME "cppwinrt-february_2017_refresh.tar.gz"
-    SHA512 0e2ed94d65ae4c7297ae4d82d64a43fa59fac7b35fbe42ea939f135f0f6eb867f57fac70b6a9cc9a78912de75aa4482d48007f83a3781b147d237ae637fdaa0e
+    URLS "https://github.com/Microsoft/cppwinrt/archive/spring_2017_creators_update_for_vs_15.3.tar.gz"
+    FILENAME "cppwinrt-spring_2017_creators_update_for_vs_15.3.tar.gz"
+    SHA512  779586122552e49a79aff08f4476905e00c3b4ad3dbc502240e9a7cc59ec0e4ab6304149a66505923ab84d2b334059de9e18c84a5b0ed6bde106d19119ef911f
 )
 vcpkg_extract_source_archive(${ARCHIVE})

 # Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppwinrt/license.txt)
+file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppwinrt/license.txt)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppwinrt/license.txt ${CURRENT_PACKAGES_DIR}/share/cppwinrt/copyright)

 # Copy the cppwinrt header files
-file(GLOB HEADER_FILES ${SOURCE_PATH}/10.0.14393.0/winrt/*)
+file(GLOB HEADER_FILES ${SOURCE_PATH}/10.0.15063.0/winrt/*)
 file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/winrt)
--- a/ports/cpr/CONTROL
+++ b/ports/cpr/CONTROL
@ -1,4 +1,4 @@
 Source: cpr
-Version: 1.3.0
+Version: 1.3.0-1
 Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.
 Build-Depends: curl
--- a/ports/cryptopp/CONTROL
+++ b/ports/cryptopp/CONTROL
@ -1,3 +1,3 @@
 Source: cryptopp
-Version: 5.6.5
+Version: 5.6.5-1
 Description: Crypto++ is a free C++ class library of cryptographic schemes.
--- a/ports/ctemplate/CONTROL
+++ b/ports/ctemplate/CONTROL
@ -1,3 +1,3 @@
 Source: ctemplate
-Version:  2017-06-23-44b7c5-2
+Version:  2017-06-23-44b7c5-3
 Description: C++ CTemplate system
--- a/ports/ctemplate/portfile.cmake
+++ b/ports/ctemplate/portfile.cmake
@ -1,27 +1,20 @@
 include(vcpkg_common_functions)

-set(GIT_REF 44b7c5b918a08ad561c63e9d28beecb40c10ebca)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO OlafvdSpek/ctemplate
-  REF 44b7c5b918a08ad561c63e9d28beecb40c10ebca
-  SHA512 b572f6d0d182e977d3a459e68bde6244dad7196c44c16407990dc1fb6a7a93bcd8d6851e515d50b6051c1d011f71695f895f6ab233664baadae0bf6a3d464305
+  REF 4b7e6c52dc7cbb4d51c9abcebcbac91ec256a62b
+  SHA512 9317fb26f22892b0bc2ca17cbccb5b084091050aa88766b4ed673a690bc4cdb9cd882134fbcd7ed3ee156f6a6937218717765143796d7e98b532355867ed042b
  HEAD_REF master
 )

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

-vcpkg_find_acquire_program(PYTHON2)
-
-vcpkg_apply_patches(
-  SOURCE_PATH ${SOURCE_PATH}
-  PATCHES
-  ${CMAKE_CURRENT_LIST_DIR}/fix-msvc.patch
-)
+vcpkg_find_acquire_program(PYTHON3)

 vcpkg_configure_cmake(
  SOURCE_PATH ${SOURCE_PATH}
-  OPTIONS -DPYTHON_EXECUTABLE=${PYTHON2}
+  OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3}
  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
 )

--- a/ports/cunit/CONTROL
+++ b/ports/cunit/CONTROL
@ -1,3 +1,3 @@
 Source: cunit
-Version: 2.1.3-1
+Version: 2.1.3-2
 Description: CUnit is a lightweight system for writing, administering, and running unit tests in C.  It provides C programmers a basic testing functionality with a flexible variety of user interfaces
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@ -1,4 +1,4 @@
 Source: curl
-Version: 7.55.1
+Version: 7.55.1-1
 Build-Depends: zlib, openssl, libssh2
 Description: A library for transferring data with URLs
--- a/ports/date/CMakeLists.txt
+++ b/ports/date/CMakeLists.txt
@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.5.1)
+project(tz CXX)
+
+if(MSVC)
+  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+add_definitions(-DNOMINMAX)
+
+
+include_directories(".")
+
+add_library(tz tz.cpp)
+
+if(BUILD_SHARED_LIBS)
+  target_compile_definitions(tz PRIVATE -DDATE_BUILD_DLL)
+else()
+  target_compile_definitions(tz PRIVATE -DDATE_BUILD_LIB)
+endif()
+
+install(
+  TARGETS tz
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(FILES date.h tz.h julian.h iso_week.h islamic.h  DESTINATION include)
+endif()
--- a/ports/date/CONTROL
+++ b/ports/date/CONTROL
@ -0,0 +1,3 @@
+Source: date
+Version: 2.2
+Description: A date and time library based on the C++11/14/17 <chrono> header
--- a/Show More
+++ b/Show More