Haojia521 · Haojia521 · May 10, 2019 · May 6, 2019 · May 6, 2019 · May 6, 2019
diff --git a/docs/about/faq.md b/docs/about/faq.md
@@ -1,7 +1,7 @@
 # Frequently Asked Questions
 
 ## Can I contribute a new library?
-Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md).
+Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md).  If you want to contribute but don't have a particular library in mind then take a look at the list of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+port+request+-+consider+making+a+PR%21%22).
 
 ## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg?
 Yes! See [the `export` command](../users/integration.md#export).

diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md
@@ -1,81 +1,126 @@
 # CONTROL files
 
-Each port has some static metadata in the form of a `CONTROL` file. This file uses the same syntax and a subset of the fields from [the Debian `control` format][debian].
+The `CONTROL` file contains metadata about the port.  The syntax is based on [the Debian `control` format][debian] although we only support the subset of fields documented here.
 
-Field names are case-sensitive.
+Field names are case-sensitive and start the line without leading whitespace.  Paragraphs are separated by one or more empty lines.
 
 [debian]: https://www.debian.org/doc/debian-policy/ch-controlfields.html
 
 ## Source Paragraph
 
-The first paragraph appearing in a `CONTROL` file is the Source paragraph, which defines the core attributes of the package (name, version, and so on).
+The first paragraph in a `CONTROL` file is the Source paragraph.  It must have a `Source`, `Version`, and `Description` field.  It can optionally have a `Build-Depends` and `Default-Features` field.
+
+### Examples:
+```no-highlight
+Source: ace
+Version: 6.5.5-1
+Description: The ADAPTIVE Communication Environment
+```
 
-### Example:
 ```no-highlight
 Source: vtk
-Version: 8.1.0-1
+Version: 8.2.0-2
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
 ```
 
+
 ### Recognized fields
 
 #### Source
 The name of the port.
 
+When adding new ports be aware that the name may conflict with other projects that are not a part of vcpkg.  To avoid conflicts verify the name on a service like [Repology][repology].  For example `json` conflicts with too many other projects so you should add a scope to the name such as `taocpp-json` to make it unique.
+
+[repology]: https://repology.org/projects/
+
 #### Version
 The port version.
 
-This field should be an alphanumeric string which may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bitstrings and are only evaluated for equality.
+This field is an alphanumeric string that may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bit strings and are only evaluated for equality.
 
 By convention, if a portfile is modified without incrementing the "upstream" version, a `-#` is appended to create a unique version string.
 
+Some projects do not have named releases.  In these cases use the date of the version   do not have labeled releases, in these cases use the date of the last commit in `YYYY-MM-DD` format.  See the `abseil` port as an example.
+
 Example:
 ```no-highlight
 Version: 1.0.5-2
 ```
+```no-highlight
+Version: 2019-3-21
+```
 
 #### Description
 A description of the library
 
-The first sentence of the description should concisely describe the purpose and contents of the library. Then, a larger description including the library's "proper name" should follow.
+By convention the first line of the description is a summary of the library.  An optional detailed description follows.  The detailed description can be multiple lines, all starting with whitespace.
 
-#### Maintainer
-Reserved for future use.
+Example:
+```no-highlight
+Description: C++ header-only JSON library
+```
+```no-highlight
+Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.
+  MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine 
+  to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
+````
 
 #### Build-Depends
-The list of dependencies required to build and use this library.
+Comma separated list of vcpkg ports the library has a dependency on.
+
+Vcpkg does not distinguish between build-only dependencies and runtime dependencies. The complete list of dependencies needed to successfully use the library should be specified.
+
+*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*
 
 Example:
 ```no-highlight
 Build-Depends: zlib, libpng, libjpeg-turbo, tiff
 ```
+If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax.
 
-Unlike dpkg, Vcpkg does not distinguish between build-only dependencies and runtime dependencies. The complete list of dependencies needed to successfully use the library should be specified.
+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.  There must be a space between the name of the port and the filter. __This will change in a future version to not depend on the triplet name.__
 
-*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*
+Example:
+```no-highlight
+Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[darwinssl] (osx)
+```
 
-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.__
+#### Default-Feature
+Comma separated list of optional port features to install by default.
+
+This field is optional.
 
-Example:
 ```no-highlight
-Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (windows)
+Default-Features: dynamodb, s3, kinesis
 ```
 
 ## Feature Paragraphs
 
-After the Source Paragraph, `CONTROL` files can list zero or more Feature Paragraphs which declare features.
+Multiple optional features can be specified in the `CONTROL` files.  It must have a `Feature` and `Description` field.  It can optionally have a `Build-Depends` field.  It must be separated from other paragraphs by one or more empty lines.
 
 ### Example:
 ```no-highlight
 Source: vtk
-Version: 8.1.0-1
+Version: 8.2.0-2
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
+
+Feature: openvr
+Description: OpenVR functionality for VTK
+Build-Depends: sdl2, openvr
+
+Feature: qt
+Description: Qt functionality for VTK
+Build-Depends: qt5
 
 Feature: mpi
 Description: MPI functionality for VTK
 Build-Depends: msmpi, hdf5[parallel]
+
+Feature: python
+Description: Python functionality for VTK
+Build-Depends: python3
 ```
 
 ### Recognized fields
@@ -84,9 +129,9 @@ Build-Depends: msmpi, hdf5[parallel]
 The name of the feature.
 
 #### Description
-A description of the feature
+A description of the feature using the same syntax as the port  `Description` field.
 
 #### Build-Depends
 The list of dependencies required to build and use this feature.
 
-All dependencies from selected features are unioned together to produce the final dependency set for the build. This field follows the same syntax as `Build-Depends` in the Source Paragraph.
+On installation the dependencies from all selected features are combined to produce the full dependency list for the build. This field follows the same syntax as `Build-Depends` in the Source Paragraph.
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
@@ -1,5 +1,5 @@
 Source: abseil
-Version: 2019-04-19-1
+Version: 2019-05-08
 Description: an open-source collection designed to augment the C++ standard library.
   Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
   In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.

diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
@@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
-    REF d902eb869bcfacc1bad14933ed9af4bed006d481
-    SHA512 660a6cc6250460b6d76e0fd3a0193bf41e69bf6a95361d2f0562b00cf4cb4a36fe0b07e1172faba190743d1b3a3dc96b834a080cdaded3cbdea2fc0392094cde
+    REF aa468ad75539619b47979911297efbb629c52e44
+    SHA512 4254d8599103d8f06b03f60a0386eba07f314184217d0bca404d41fc0bd0a8df287fe6d07158d10cde096af3097aff2ecc1a5e8f7c3046ecf956b5fde709ad1d
     HEAD_REF master
     PATCHES fix-usage-lnk-error.patch
 )

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
@@ -1,3 +1,13 @@
 Source: ace
 Version: 6.5.5-1
 Description: The ADAPTIVE Communication Environment
+
+Feature: wchar
+Description: Enable extra wide char functions in ACE
+
+Feature: ssl
+Description: Enable SSL/TLS features in ACE
+Build-Depends: openssl
+
+Feature: xml
+Description: Enable XML features in ACE
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
@@ -2,6 +2,21 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
 
+if("wchar" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "uses_wchar=1")
+endif()
+if("zlib" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "zlib=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "zlib=0")
+endif()
+if("ssl" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "ssl=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "ssl=0")
+endif()
+list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
   if(NOT VCPKG_CMAKE_SYSTEM_NAME)
     set(DLL_DECORATOR s)
@@ -58,7 +73,7 @@ endif()
 
 # Invoke mwc.pl to generate the necessary solution and project files
 vcpkg_execute_required_process(
-    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} ace ${MPC_STATIC_FLAG}
+    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG}
     WORKING_DIRECTORY ${ACE_ROOT}
     LOGNAME mwc-${TARGET_TRIPLET}
 )
@@ -67,6 +82,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   vcpkg_build_msbuild(
     PROJECT_PATH ${SOURCE_PATH}/ace.sln
     PLATFORM ${MSBUILD_PLATFORM}
+    USE_VCPKG_INTEGRATION
   )
 endif()
 
@@ -106,6 +122,9 @@ install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/arpa")
 install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/net")
 install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/netinet")
 install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/sys")
+if("ssl" IN_LIST FEATURES)
+    install_ace_headers_subdirectory(${SOURCE_PATH} "SSL")
+endif()
 
 # Install the libraries
 function(install_ace_library SOURCE_PATH ACE_LIBRARY)
@@ -143,6 +162,9 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   install_ace_library(${ACE_ROOT} "ACE_QoS")
 endif()
 install_ace_library(${ACE_ROOT} "ACE_RLECompression")
+if("ssl" IN_LIST FEATURES)
+    install_ace_library(${ACE_ROOT} "ACE_SSL")
+endif()
 
 # Handle copyright
 file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)

diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL
@@ -1,4 +1,4 @@
 Source: assimp
-Version: 4.1.0-4
+Version: 4.1.0-4
 Description: The Open Asset import library
 Build-Depends: zlib, rapidjson
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.7.89
+Version: 1.7.100
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
 Default-Features: dynamodb, s3, kinesis

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
@@ -10,8 +10,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
-    REF 1.7.89
-    SHA512 2f3702f193f7816615d08d55adfffaf93ec8119a0af32db4afbf6ba591500d24fdd334566cebae0586d8bd3bd27950e71fd257fc5cc3012f74ed58d464fd733d
+    REF 1.7.100
+    SHA512 543eee9c0367131756b274ab9f8f42e3c889f3f54c5f0b7cd6fa68cab5fd009ba9cb87f8029a81d260b1ea2adfb7c3b3ab07a989054e2480e47b41c15887f0f8
     HEAD_REF master
 )
 

diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL
@@ -1,4 +1,4 @@
 Source: breakpad
-Version: 2018-09-18
+Version: 2019-05-08
 Build-Depends: libdisasm
 Description: a set of client and server components which implement a crash-reporting system.
diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/breakpad
-    REF 54fa71efbe50fb2b58096d871575b59e12edba6d
-    SHA512 ecd1c6c5cc0e3984d05fe86ec11172e93b0e31c39ce0af9d0de08b8d03083686e2288e0cd787180c599446c277e58f48550ce4ab718019576c64fc403a592745
+    REF 21b48a72aa50dde84149267f6b7402522b846b24
+    SHA512 4ca2f877871c0a79c24ce4cc592dddb3ac4c2eac2a5962dad6d3d94edc91ac82afec3d7e4e7f81e7d9916eb83f8708e66759c38a6ef0e1b2c19691dd1518558a
     HEAD_REF master
 )
 

diff --git a/ports/butteraugli/CONTROL b/ports/butteraugli/CONTROL
@@ -1,4 +1,4 @@
 Source: butteraugli
-Version: 2018-02-25-1
+Version: 2019-05-08
 Description: butteraugli estimates the psychovisual difference between two images
 Build-Depends: libpng, libjpeg-turbo
diff --git a/ports/butteraugli/portfile.cmake b/ports/butteraugli/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/butteraugli
-    REF 856a4da68d02d30e3bf843e33536f2b3a698b249
-    SHA512 f02ee97f186b59cc685a63095e5618aedbfebf08ab2cf438189fc4214c7d562506368ec210c08df236132dc2f855b6b0a6226bd6dc27c1c04e9c1b0b0ac4f1df
+    REF 71b18b636b9c7d1ae0c1d3730b85b3c127eb4511
+    SHA512 2e73f8ad8953307eea956ed8bd828e110419d6d9f8a42685d225953d3a8017a79d0701bde0282459dc51198e75a99dcd99dd3c4e7ef065736c512a7b11ea0fdf
     HEAD_REF master
 )
 

diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL
@@ -1,4 +1,4 @@
 Source: caf
-Version: 0.16.2-1
+Version: 0.16.3
 Build-Depends: openssl
 Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO actor-framework/actor-framework
-    REF 2cc4377715afc3d3c35848f9d59b9e6876afd875
-    SHA512 7e7962bf5a30122bde8be63f6de0058f865bd890e2d10f4d90f4885b7953467fb6532f69c1a77a35802de7c531f6aac192a2993b53a8dc0b05f503c3f4083a31
+    REF 0.16.3
+    SHA512 f7e567264ea1686a431eacbf2a62f49c0f4467df073ec983ae622d9417c28124eb456eb40d6a70dbe062ad58333944924f04f7e3fee5a7b76917890d98bedce1
     HEAD_REF master
 	PATCHES
 		openssl-version-override.patch

diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL
@@ -1,4 +1,4 @@
 Source: cartographer
-Version: 0.3.0-6
+Version: 0.3.0-6
 Build-Depends: ceres[eigensparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
 Description: Google 2D & 3D SLAM package
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
 Source: catch2
-Version: 2.7.1
+Version: 2.7.2
 Description: A modern, header-only test framework for unit testing.
   Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
-    REF v2.7.1
-    SHA512 1566f63122984a8f29645db8e76028ba2559bb4b812f1e15081f79725530effe2ff432b6f61f404dc2b386829004d126b9511053d25a811c017f3102a01608a1
+    REF v2.7.2
+    SHA512 ac58cb3b676c73a361a494492e7b1f1b85cba7d08feb2d09b2269109a89b66aa37efead6b0a9fca64678f42a3395a3b02b6d461b4cb35310451ce849a79d04ae
     HEAD_REF master
 )
 

diff --git a/ports/cgltf/CONTROL b/ports/cgltf/CONTROL
@@ -0,0 +1,3 @@
+Source: cgltf
+Version: 2019-04-30
+Description: Single-file glTF 2.0 parser written in C99
diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake
@@ -0,0 +1,16 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jkuhlmann/cgltf
+    REF 093ef81bf63ec18ba6d9f61073da8881fb7619b3
+    SHA512 8801c13ee98780e845c7d28b27d523af86ab2a49499bbb235ee67a91dfacda3c7fddc9503d91918001a432267f890e82c2204a9c1462c64467034d334b0eadf2
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/cgltf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL
@@ -1,3 +1,3 @@
 Source: cimg
-Version: 2.5.7
+Version: 2.6.1
 Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing
diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake
@@ -2,9 +2,9 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "dtschump/CImg"
-    REF v.2.5.7
+    REF v.2.6.1
     HEAD_REF master
-    SHA512 d74dd4d8996ab11a6c872450b2c3f37d3d6699d06c77894c8943829c305678e459a740688d9fae251b23e34fc264fea3948b77d5c7a6ff1d0e908003bc963b90)
+    SHA512 06efe9e2f79a6564f5161da73c3b42ed456a503fd18aa1b9803a9093807656a0095e4020d032d9390718cf97e260beafb5ff82d1dba8a1c3b7bb1e2992273c88)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 

diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL
@@ -1,4 +1,4 @@
 Source: cppgraphqlgen
-Version: 3.0.0-pre
+Version: 3.0.0
 Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson
 Description: C++ GraphQL schema service generator