[vcpkg] fatal_error when patch fails to apply (#8087)

vcpkg will now fail on failure to apply patches except when using `--head`.

ports/ace/portfile.cmake

@@ -1,3 +1,21 @@
+include(vcpkg_common_functions)
+
+# Don't change to vcpkg_from_github! This points to a release and not an archive
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_6/ACE-src-6.5.6.zip"
+    FILENAME ACE-src-6.5.6.zip
+    SHA512 4ee42aafc86af159ab20dbb14c7c2a49bed733645f5cc3afa8cef3e9688ff929002f3420eb33e859afe10a534afc276340faa21d029fa56bd07bd9aed3403ab4
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
+
+set(ACE_ROOT ${SOURCE_PATH})
+set(ENV{ACE_ROOT} ${ACE_ROOT})
+set(ACE_SOURCE_PATH ${ACE_ROOT}/ace)
+
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
@@ -23,16 +41,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
   endif()
   set(MPC_STATIC_FLAG -static)
 endif()
-include(vcpkg_common_functions)
-set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
-set(ENV{ACE_ROOT} ${ACE_ROOT})
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_6/ACE-src-6.5.6.zip"
-    FILENAME ACE-src-6.5.6.zip
-    SHA512 4ee42aafc86af159ab20dbb14c7c2a49bed733645f5cc3afa8cef3e9688ff929002f3420eb33e859afe10a534afc276340faa21d029fa56bd07bd9aed3403ab4
-)
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_PATH ${PERL} DIRECTORY)
@@ -58,7 +66,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   else()
     set(SOLUTION_TYPE vc14)
   endif()
-  file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
+  file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
 endif()
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -67,8 +75,8 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
   set(LIB_DEBUG_SUFFIX .a)
   set(LIB_PREFIX lib)
   set(SOLUTION_TYPE gnuace)
-  file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"")
+  file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"")
-  file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)include/makeinclude/platform_linux.GNU")
+  file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU")
 endif()
 
 # Invoke mwc.pl to generate the necessary solution and project files
@@ -80,7 +88,7 @@ vcpkg_execute_required_process(
 
 if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/ace.sln
+    PROJECT_PATH ${ACE_SOURCE_PATH}/ace.sln
     PLATFORM ${MSBUILD_PLATFORM}
     USE_VCPKG_INTEGRATION
   )
@@ -101,34 +109,34 @@ endif()
 # ACE itself does not define an install target, so it is not clear which
 # headers are public and which not. For the moment we install everything
 # that is in the source path and ends in .h, .inl
-function(install_ace_headers_subdirectory SOURCE_PATH RELATIVE_PATH)
+function(install_ace_headers_subdirectory ORIGINAL_PATH RELATIVE_PATH)
-    file(GLOB HEADER_FILES ${SOURCE_PATH}/${RELATIVE_PATH}/*.h ${SOURCE_PATH}/${RELATIVE_PATH}/*.inl)
+    file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl)
     file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/${RELATIVE_PATH})
 endfunction()
 
 # We manually install header found in the ace directory because in that case
 # we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file
-file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h ${SOURCE_PATH}/*.inl ${SOURCE_PATH}/*.cpp)
+file(GLOB HEADER_FILES ${ACE_SOURCE_PATH}/*.h ${ACE_SOURCE_PATH}/*.inl ${ACE_SOURCE_PATH}/*.cpp)
 file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/)
 
 # Install headers in subdirectory
-install_ace_headers_subdirectory(${SOURCE_PATH} "Compression")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression")
-install_ace_headers_subdirectory(${SOURCE_PATH} "Compression/rle")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression/rle")
-install_ace_headers_subdirectory(${SOURCE_PATH} "ETCL")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "ETCL")
-install_ace_headers_subdirectory(${SOURCE_PATH} "QoS")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "QoS")
-install_ace_headers_subdirectory(${SOURCE_PATH} "Monitor_Control")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Monitor_Control")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/arpa")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/arpa")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/net")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/net")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/netinet")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/netinet")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/sys")
+install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/sys")
 if("ssl" IN_LIST FEATURES)
-    install_ace_headers_subdirectory(${SOURCE_PATH} "SSL")
+    install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "SSL")
 endif()
 
 # Install the libraries
-function(install_ace_library SOURCE_PATH ACE_LIBRARY)
+function(install_ace_library ORIGINAL_PATH ACE_LIBRARY)
-    set(LIB_PATH ${SOURCE_PATH}/lib/)
+    set(LIB_PATH ${ORIGINAL_PATH}/lib/)
     if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         # Install the DLL files
         file(INSTALL

ports/activemq-cpp/CONTROL

@@ -1,4 +1,4 @@
 Source: activemq-cpp
-Version: 3.9.5
+Version: 3.9.5-1
 Build-Depends: apr
 Description: Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.

ports/activemq-cpp/portfile.cmake

@@ -5,12 +5,11 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 set(VERSION 3.9.5)
-                                              
+
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/activemq-cpp-library-${VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.apache.org/dist/activemq/activemq-cpp/${VERSION}/activemq-cpp-library-${VERSION}-src.tar.bz2"
     FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2"
-    SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2  
+    SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2
 )
 
 vcpkg_extract_source_archive_ex(
@@ -42,12 +41,12 @@ vcpkg_build_msbuild(
 )
 
 vcpkg_copy_pdbs()
- 
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/activemq-cpp)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/copyright)
 
-     
+
 file(
     COPY
     ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.lib

ports/alac-decoder/CONTROL

@@ -1,4 +1,4 @@
-Source: alac-decoder
+Source: alac-decoder
-Version: 0.2-1
+Version: 0.2-3
-Homepage: https://distfiles.macports.org/alac_decoder
+Homepage: https://distfiles.macports.org/alac_decoder
-Description:  ALAC C implementation of a decoder, written from reverse engineering the file format
+Description:  ALAC C implementation of a decoder, written from reverse engineering the file format

ports/alac-decoder/no-pragma-warning.patch

@@ -1,14 +1,14 @@
-diff --git a/alac.c b/alac.c
+diff --git a/alac.c b/alac.c
-index b829e29..8e8805f 100644
+index b829e29..8e8805f 100644
---- a/alac.c
+--- a/alac.c
-+++ b/alac.c
++++ b/alac.c
-@@ -284,7 +284,9 @@ static int count_leading_zeros(int input)
+@@ -284,7 +284,9 @@ static int count_leading_zeros(int input)
-     return output;
+     return output;
- }
+ }
- #else
+ #else
-+#if !defined(_MSC_VER)
++#if !defined(_MSC_VER)
- #warning using generic count leading zeroes. You may wish to write one for your CPU / compiler
+ #warning using generic count leading zeroes. You may wish to write one for your CPU / compiler
-+#endif
++#endif
- static int count_leading_zeros(int input)
+ static int count_leading_zeros(int input)
- {
+ {
-     int output = 0;
+     int output = 0;

ports/alac-decoder/portfile.cmake

@@ -2,33 +2,33 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/alac_decoder)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://distfiles.macports.org/alac_decoder/alac_decoder-0.2.0.tgz"
     FILENAME "alac_decoder-0.2.0.tgz"
     SHA512 4b37d4fe37681bfccaa4a27fbaf11eb2a1fba5f14e77d219a6d9814ff44d1168534d05eb19443dd2fd11e6fcdf4da3a22e3f3c79314cb7a6767c152351b13e29
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES
+        remove_stdint_headers.patch
+        no-pragma-warning.patch
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/decomp.c DESTINATION ${SOURCE_PATH})
 
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/remove_stdint_headers.patch
-        ${CMAKE_CURRENT_LIST_DIR}/no-pragma-warning.patch
-)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
+    OPTIONS_DEBUG
+      -DDISABLE_INSTALL_HEADERS=ON
+      -DDISABLE_INSTALL_TOOLS=ON
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alac-decoder)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/alac-decoder RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/angelscript/CONTROL

@@ -1,6 +1,6 @@
-Source: angelscript
+Source: angelscript
-Version: 2.33.1-1
+Version: 2.33.1-2
-Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
+Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
-
+
-Feature: addons
+Feature: addons
-Description: Installs all addons for use in compiling scripts addons
+Description: Installs all addons for use in compiling scripts addons

ports/angelscript/LICENSE

@@ -1,13 +1,13 @@
-AngelCode Scripting Library
+AngelCode Scripting Library
-
+
-Copyright © 2003-2018 Andreas Jönsson
+Copyright © 2003-2018 Andreas Jönsson
-
+
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
+
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
+
-    The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+    The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-
+
-    Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+    Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-
+
-    This notice may not be removed or altered from any source distribution.
+    This notice may not be removed or altered from any source distribution.

ports/angelscript/mark-threads-private.patch

@@ -1,13 +1,13 @@
-diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt
+diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt
-index 7c800c5..982ad8b 100644
+index 7c800c5..982ad8b 100644
---- a/angelscript/projects/cmake/CMakeLists.txt
+--- a/angelscript/projects/cmake/CMakeLists.txt
-+++ b/angelscript/projects/cmake/CMakeLists.txt
++++ b/angelscript/projects/cmake/CMakeLists.txt
-@@ -145,7 +145,7 @@ endif()
+@@ -145,7 +145,7 @@ endif()
- 
+ 
- # Don't override the default library output path to avoid conflicts when building for multiple target platforms
+ # Don't override the default library output path to avoid conflicts when building for multiple target platforms
- #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
+ #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
--target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads)
+-target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads)
-+target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads)
++target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads)
- 
+ 
- set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+ set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
- 
+ 

ports/angelscript/portfile.cmake

@@ -1,38 +1,31 @@
-include(vcpkg_common_functions)
+include(vcpkg_common_functions)
-
+
-vcpkg_download_distfile(ARCHIVE
+vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip"
+    URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip"
-    FILENAME "angelscript_2.33.0.zip"
+    FILENAME "angelscript_2.33.0.zip"
-    SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0
+    SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0
-)
+)
-
+
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE ${ARCHIVE}
-    PATCHES
+    PATCHES
-       mark-threads-private.patch
+       mark-threads-private.patch
-)
+)
-
+
-vcpkg_configure_cmake(
+vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake
+    SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    PREFER_NINJA
-    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
+)
-    # OPTIONS_RELEASE -DOPTIMIZE=1
+
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
+vcpkg_install_cmake()
-)
+
-
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)
-
+
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+# Copy the addon files
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)
+if("addons" IN_LIST FEATURES)
-
+	file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp")
-# Handle copyright
+endif()
-file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angelscript RENAME copyright)
+
-
+file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-# Copy the addon files
-if("addons" IN_LIST FEATURES)
-	file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp")
-endif()
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME angelscript)

ports/anyrpc/CONTROL

@@ -1,4 +1,4 @@
 Source: anyrpc
-Version: 2017-12-01
+Version: 2017-12-01-1
 Homepage: https://github.com/sgieseking/anyrpc
 Description: A multiprotocol remote procedure call system for C++.

ports/apr-util/CONTROL

@@ -1,5 +1,5 @@
 Source: apr-util
-Version: 1.6.0-3
+Version: 1.6.0-5
 Homepage: https://apr.apache.org/
 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

ports/apr-util/apr.patch

@@ -3,11 +3,11 @@ index 69e45541..19b86129 100644
 --- a/CMakeLists.txt	
 +++ b/CMakeLists.txt
 @@ -35,7 +35,7 @@ IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
-   MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
+   MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
- ENDIF()
+ ENDIF()
- FOREACH(onelib ${APR_LIBRARIES})
+ FOREACH(onelib ${APR_LIBRARIES})
--  IF(NOT EXISTS ${onelib})
+-  IF(NOT EXISTS ${onelib})
-+  IF(${onelib} MATCHES "NOTFOUND")
++  IF(${onelib} MATCHES "NOTFOUND")
-     MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
+     MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
-   ENDIF()
+   ENDIF()
- ENDFOREACH()
+ ENDFOREACH()

ports/apr-util/portfile.cmake

@@ -1,37 +1,39 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-util-1.6.0)
+
 vcpkg_download_distfile(ARCHIVE
   URLS "https://archive.apache.org/dist/apr/apr-util-1.6.0-win32-src.zip"
   FILENAME "apr-util-1.6.0-win32-src.zip"
   SHA512 98679ea181d3132020713481703bbefa0c174e0b2a0df65dfdd176e9771935e1f9455c4242bac19dded9414abe2b9d293fcc674ab16f96d8987bcf26346fce3a
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-
+vcpkg_extract_source_archive_ex(
-vcpkg_apply_patches(
+    OUT_SOURCE_PATH SOURCE_PATH
-  SOURCE_PATH ${SOURCE_PATH}
+    ARCHIVE ${ARCHIVE}
-  PATCHES 
+    PATCHES
         use-vcpkg-expat.patch
         apr.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_configure_cmake(
+  set(APU_DECLARE_EXPORT ON)
-      SOURCE_PATH ${SOURCE_PATH}
+  set(APU_DECLARE_STATIC OFF)
-      PREFER_NINJA
-      OPTIONS -DAPU_DECLARE_EXPORT=ON
-      OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
-    )
 else()
-    vcpkg_configure_cmake(
+  set(APU_DECLARE_EXPORT OFF)
-      SOURCE_PATH ${SOURCE_PATH}
+  set(APU_DECLARE_STATIC ON)
-      PREFER_NINJA
-      OPTIONS -DAPU_DECLARE_STATIC=ON
-      OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
-    )
 endif()
 
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+    -DAPU_DECLARE_EXPORT=${APU_DECLARE_EXPORT}
+    -DAPU_DECLARE_STATIC=${APU_DECLARE_STATIC}
+  OPTIONS_DEBUG
+    -DDISABLE_INSTALL_HEADERS=ON
+)
+
 vcpkg_install_cmake()
+vcpkg_copy_pdbs()
 
 file(READ ${CURRENT_PACKAGES_DIR}/include/apu.h  APU_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -41,7 +43,4 @@ else()
 endif()
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/apu.h "${APU_H}")
 
-
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/apr-util RENAME copyright)
-
-vcpkg_copy_pdbs()

ports/apr/CONTROL

@@ -1,5 +1,5 @@
 Source: apr
-Version: 1.6.5-2
+Version: 1.6.5-3
 Homepage: https://apr.apache.org/
 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
 

ports/apr/portfile.cmake

@@ -6,13 +6,16 @@ include(vcpkg_common_functions)
 
 set(VERSION 1.6.5)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-${VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
     FILENAME "apr-${VERSION}.tar.bz2"
     SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 if("private-headers" IN_LIST FEATURES)
     set(INSTALL_PRIVATE_H ON)

ports/argtable2/CONTROL

@@ -1,3 +1,3 @@
-Source: argtable2
+Source: argtable2
-Version: 2.13-2
+Version: 2.13-4
-Description: Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.
+Description: Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.

ports/argtable2/fix-install-dirs.patch

@@ -1,24 +1,24 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3427487..a9b8be0 100644
+index 3427487..a9b8be0 100644
---- a/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
-@@ -1,5 +1,4 @@
+@@ -1,5 +1,4 @@
--# for now, install in subdirectory of source directory by default
+-# for now, install in subdirectory of source directory by default
--SET( CMAKE_INSTALL_PREFIX .. )
+-SET( CMAKE_INSTALL_PREFIX .. )
-+include(GNUInstallDirs)
++include(GNUInstallDirs)
- 
+ 
- IF( WIN32 )
+ IF( WIN32 )
- 	ADD_LIBRARY( argtable2 arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
+ 	ADD_LIBRARY( argtable2 arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
-@@ -7,5 +6,9 @@ ELSE( WIN32 )
+@@ -7,5 +6,9 @@ ELSE( WIN32 )
- 	ADD_LIBRARY( argtable2 arg_date.c arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_rex.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
+ 	ADD_LIBRARY( argtable2 arg_date.c arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_rex.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
- ENDIF( WIN32 )
+ ENDIF( WIN32 )
- 
+ 
--INSTALL( TARGETS argtable2 ARCHIVE DESTINATION lib)
+-INSTALL( TARGETS argtable2 ARCHIVE DESTINATION lib)
--SET_TARGET_PROPERTIES( argtable2 PROPERTIES DEBUG_POSTFIX d )
+-SET_TARGET_PROPERTIES( argtable2 PROPERTIES DEBUG_POSTFIX d )
-\ No newline at end of file
+\ No newline at end of file
-+INSTALL(TARGETS argtable2 
++INSTALL(TARGETS argtable2 
-+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+)
++)
-+INSTALL(FILES argtable2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++INSTALL(FILES argtable2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

ports/argtable2/portfile.cmake

@@ -1,33 +1,30 @@
-include(vcpkg_common_functions)
+include(vcpkg_common_functions)
-
+
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
+
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/argtable2-13)
+vcpkg_download_distfile(ARCHIVE
-vcpkg_download_distfile(ARCHIVE
+    URLS "http://prdownloads.sourceforge.net/argtable/argtable2-13.tar.gz"
-    URLS "http://prdownloads.sourceforge.net/argtable/argtable2-13.tar.gz"
+    FILENAME "argtable-2.13.zip"
-    FILENAME "argtable-2.13.zip"
+    SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
-    SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
+)
-)
+
-
+vcpkg_extract_source_archive_ex(
-vcpkg_extract_source_archive(${ARCHIVE})
+    OUT_SOURCE_PATH SOURCE_PATH
-
+    ARCHIVE ${ARCHIVE}
-vcpkg_apply_patches(
+    PATCHES
-    SOURCE_PATH ${SOURCE_PATH}
+        fix-install-dirs.patch
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install-dirs.patch"
+)
-)
+
-
+vcpkg_configure_cmake(
-vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
-    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
-    PREFER_NINJA
+    OPTIONS
-    OPTIONS
+        -DCMAKE_DEBUG_POSTFIX=d
-        -DCMAKE_DEBUG_POSTFIX=d
+)
-)
+
-
+vcpkg_install_cmake()
-vcpkg_install_cmake()
+vcpkg_copy_pdbs()
-vcpkg_copy_pdbs()
+
-
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-# Remove duplicate include installs
+
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/argtable2 RENAME copyright)

ports/atk/CONTROL

@@ -1,5 +1,5 @@
-Source: atk
+Source: atk
-Version: 2.24.0-4
+Version: 2.24.0-5
-Homepage: https://developer.gnome.org/atk/
+Homepage: https://developer.gnome.org/atk/
-Description: GNOME Accessibility Toolkit
+Description: GNOME Accessibility Toolkit
-Build-Depends: glib, gettext
+Build-Depends: glib, gettext

ports/atk/fix-encoding.patch

@@ -1,13 +0,0 @@
-diff --git a/atk/atkversion.h b/atk/atkversion.h
-index 2634b0a..7bea2f3 100644
---- a/atk/atkversion.h
-+++ b/atk/atkversion.h
-@@ -3,7 +3,7 @@
-  * Copyright (C) 2012 Igalia, S.L.
-  * Copyright (C) 2014 Chun-wei Fan
-  *
-- * Author: Alejandro Pi?eiro Iglesias <apinheiro@igalia.com>
-+ * Author: Alejandro Pineiro Iglesias <apinheiro@igalia.com>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Library General Public

ports/atk/portfile.cmake

@@ -3,17 +3,17 @@ include(vcpkg_common_functions)
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
 set(ATK_VERSION 2.24.0)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atk-${ATK_VERSION})
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
     FILENAME "atk-${ATK_VERSION}.tar.xz"
-    SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962)
+    SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
+)
 
 vcpkg_extract_source_archive_ex(
-    ARCHIVE ${ARCHIVE}
     OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
     PATCHES
-        fix-encoding.patch
         fix-linux-config.patch
 )
 
@@ -32,5 +32,4 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/atk)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/atk/COPYING ${CURRENT_PACKAGES_DIR}/share/atk/copyright)

ports/atkmm/CONTROL

@@ -1,5 +1,5 @@
 Source: atkmm
-Version: 2.24.2-1
+Version: 2.24.2-2
 Homepage: https://www.gtkmm.org
 Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
 Build-Depends: glib, gettext, atk, glibmm

ports/atkmm/README

@@ -1,2 +0,0 @@
-atkmm is the C++ binding for the ATK library.
-This module is part of the GNOME C++ bindings effort <http://www.gtkmm.org/>.

ports/atkmm/portfile.cmake

@@ -2,17 +2,18 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atkmm-2.24.2)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz"
     FILENAME "atkmm-2.24.2.tar.xz"
     SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
+vcpkg_extract_source_archive_ex(
-    SOURCE_PATH ${SOURCE_PATH}
+    OUT_SOURCE_PATH SOURCE_PATH
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch ${CMAKE_CURRENT_LIST_DIR}/fix_charset.patch
+    ARCHIVE ${ARCHIVE}
+    PATCHES
+        fix_properties.patch
+        fix_charset.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013)
@@ -62,6 +63,4 @@ file(
 
 vcpkg_copy_pdbs()
 
-# Handle copyright and readme
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/atkmm RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/atkmm RENAME readme.txt)

ports/aubio/CONTROL

@@ -1,5 +1,5 @@
 Source: aubio
-Version: 0.4.9
+Version: 0.4.9-1
 Homepage: https://github.com/aubio/aubio
 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, bzip2, liblzma

ports/aubio/portfile.cmake

@@ -2,7 +2,6 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aubio-3c230fae309e9ea3298783368dd71bae6172359a)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aubio/aubio

ports/azure-c-shared-utility/CONTROL

@@ -1,5 +1,5 @@
 Source: azure-c-shared-utility
-Version: 2019-08-20.1
+Version: 2019-08-20.1-1
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c
 

ports/azure-c-shared-utility/no-double-expand-cmake.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 190ea87..a434cee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -264,7 +264,7 @@ if(${use_applessl})
-     include_directories(./pal/ios-osx/)
- endif()
- 
--if (WIN32 AND (${CMAKE_SYSTEM_VERSION} VERSION_EQUAL "10.0.17763.0" OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.0.17763.0"))
-+if (WIN32 AND (CMAKE_SYSTEM_VERSION VERSION_EQUAL "10.0.17763.0" OR CMAKE_SYSTEM_VERSION VERSION_GREATER "10.0.17763.0"))
-     # Windows added support for UNIX domain sockets to the OS and SDK
-     # in the Oct 2018 update (10.0.17763.0, aka RS5)
-     add_definitions(-DAF_UNIX_ON_WINDOWS)

ports/azure-c-shared-utility/portfile.cmake

@@ -9,7 +9,6 @@ if("public-preview" IN_LIST FEATURES)
         REF 1f3fd807c8c47b6607d349469301afb64643aa89
         SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2
         HEAD_REF master
-        PATCHES no-double-expand-cmake.patch
     )
 else()
     vcpkg_from_github(
@@ -18,7 +17,6 @@ else()
         REF 1f3fd807c8c47b6607d349469301afb64643aa89
         SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2
         HEAD_REF master
-        PATCHES no-double-expand-cmake.patch
     )
 endif()
 
@@ -43,4 +41,3 @@ file(COPY ${SOURCE_PATH}/configs/azure_iot_build_rules.cmake DESTINATION ${CURRE
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
-

ports/berkeleydb/CONTROL

@@ -1,4 +1,4 @@
 Source: berkeleydb
-Version: 4.8.30-2
+Version: 4.8.30-3
 Homepage: https://download.oracle.com/
 Description: BDB - A high-performance embedded database for key/value data.

ports/berkeleydb/portfile.cmake

@@ -4,14 +4,16 @@ endif()
 
 include(vcpkg_common_functions)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/db-4.8.30.NC)
-
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.oracle.com/berkeley-db/db-4.8.30.NC.zip"
     FILENAME "db-4.8.30.NC.zip"
     SHA512 59c1d2d5a3551f988ab1dc063900572b67ad087537e0d71760de34601f9ebd4d5c070a49b809bec4a599a62417e9a162683ce0f6442deb1a0dadb80764bf6eab
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 

ports/bigint/CONTROL

@@ -1,4 +1,4 @@
 Source: bigint
-Version: 2010.04.30-3
+Version: 2010.04.30-4
 Homepage: https://mattmccutchen.net/bigint
 Description: C++ Big Integer Library

ports/bigint/portfile.cmake

@@ -2,13 +2,16 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-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})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 

ports/blaze/CONTROL

@@ -1,5 +1,5 @@
 Source: blaze
-Version: 3.6
+Version: 3.6-1
 Build-Depends: clapack (!osx), boost-exception
 Homepage: https://bitbucket.org/blaze-lib/blaze
 Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.

ports/blaze/avoid-src-dir-generation.patch

@@ -1,113 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7ecc993..793ec34 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,8 +63,8 @@ endif()
- #==================================================================================================
- 
- find_package(LAPACK REQUIRED)
--target_link_libraries(blaze INTERFACE ${LAPACK_LIBRARIES})
--target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
-+target_link_libraries(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LIBRARIES}>)
-+target_compile_options(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LINKER_FLAGS}>)
- 
- 
- #==================================================================================================
-@@ -72,7 +72,7 @@ target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
- #==================================================================================================
- 
- find_package(Boost 1.54.0 REQUIRED)
--target_include_directories(blaze INTERFACE ${Boost_INCLUDE_DIRS})
-+target_include_directories(blaze INTERFACE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>)
- 
- 
- #==================================================================================================
-@@ -163,7 +163,7 @@ endif ()
- set(BLAZE_CACHE_SIZE ${BLAZE_CACHE_SIZE} CACHE STRING "Cache size of the CPU in bytes." FORCE)
- 
- configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/CacheSize.h.in"
--                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/CacheSize.h")
-+                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/CacheSize.h")
- 
- 
- #==================================================================================================
-@@ -216,7 +216,7 @@ else ()
- endif ()
- 
- configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/BLAS.h.in"
--                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/BLAS.h")
-+                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/BLAS.h")
- 
- 
- #==================================================================================================
-@@ -227,7 +227,7 @@ set(BLAZE_TRANSPOSE_FLAG "columnVector" CACHE STRING "Specify the default transp
- set_property(CACHE BLAZE_TRANSPOSE_FLAG PROPERTY STRINGS "columnVector;rowVector")
- 
- configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/TransposeFlag.h.in"
--                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/TransposeFlag.h")
-+                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/TransposeFlag.h")
- 
- 
- #==================================================================================================
-@@ -238,7 +238,7 @@ set(BLAZE_STORAGE_ORDER "rowMajor" CACHE STRING "Specify the default storage ord
- set_property(CACHE BLAZE_STORAGE_ORDER PROPERTY STRINGS "rowMajor;columnMajor")
- 
- configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/StorageOrder.h.in"
--                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/StorageOrder.h")
-+                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/StorageOrder.h")
- 
- 
- #==================================================================================================
-@@ -254,7 +254,7 @@ else ()
- endif ()
- 
- configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Vectorization.h.in"
--                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Vectorization.h")
-+                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Vectorization.h")
- 
- 
- #==================================================================================================
-@@ -300,7 +300,7 @@ elseif (BLAZE_SMP_THREADS STREQUAL "HPX")
- endif ()
- 
- configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/SMP.h.in"
--                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/SMP.h")
-+                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/SMP.h")
- 
- 
- #==================================================================================================
-@@ -316,7 +316,7 @@ else ()
- endif ()
- 
- configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Restrict.h.in"
--                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Restrict.h")
-+                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Restrict.h")
- 
- 
- #==================================================================================================
-@@ -346,7 +346,7 @@ else ()
- endif ()
- 
- configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Optimizations.h.in"
--                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Optimizations.h")
-+                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Optimizations.h")
- 
- 
- #==================================================================================================
-@@ -364,7 +364,7 @@ else ()
- endif ()
- 
- configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"
--                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Inline.h")
-+                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Inline.h")
- 
- 
- #==================================================================================================
-@@ -379,6 +379,7 @@ write_basic_package_version_file(
-    COMPATIBILITY SameMajorVersion
-    )
- 
-+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/blaze DESTINATION include)
- install(DIRECTORY blaze DESTINATION include)
- install(TARGETS blaze EXPORT blazeTargets)
- 

ports/blaze/portfile.cmake

@@ -6,8 +6,6 @@ vcpkg_from_bitbucket(
     REF 51fff70fcc70c8bcb167b5daa497babf51b7603e
     SHA512 7048720d1842a0a8e621f6878c43942664523f889f2659f4334c7428d1177a5a226c95bcb5f84b93cae87c61e188bf91dc2429b1ddfc7b6a7b8eb74ab8c0a1ec
     HEAD_REF master
-    PATCHES
-        avoid-src-dir-generation.patch
 )
 
 vcpkg_configure_cmake(

ports/bond/CONTROL

@@ -1,6 +1,5 @@
 Source: bond
-Maintainer: bond@microsoft.com
+Version: 8.1.0-3
-Version: 8.1.0-2
 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.
 Homepage: https://github.com/Microsoft/bond
 Build-Depends: rapidjson, boost-config, boost-utility, boost-assign

ports/bond/portfile.cmake

@@ -2,8 +2,6 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-7.0.2)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/bond
@@ -19,7 +17,7 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR
     FILENAME "gbc-8.1.0-amd64.zip"
     SHA512 896c9a78fc714e0ea44c37ed36400ec8e5f52d495a8d81aa80834ff6cd6303c7c94e06129f7b2269416a9e0ffb61423e87406db798fb5be7ff00f14981530089
     )
-    
+
     # Extract the precompiled gbc
     vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/)
     set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc.exe)
@@ -27,13 +25,13 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR
     if (NOT EXISTS "${FETCHED_GBC_PATH}")
         message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.")
     endif()
-    
+
 else()
     # According to the readme on https://github.com/microsoft/bond/
     # The build needs a version of the Haskel Tool stack that is newer than some distros ship with.
     # For this reason the message is not guarded by checking to see if the tool is installed.
     message("\nA recent version of Haskell Tool Stack is required to build.\n  For information on how to install see https://docs.haskellstack.org/en/stable/README/\n")
-        
+
 endif()
 
 vcpkg_configure_cmake(

ports/boost-di/CONTROL

@@ -1,4 +1,4 @@
 Source: boost-di
-Version: 1.1.0
+Version: 1.1.0-1
 Homepage: https://github.com/boost-experimental/di
-Description: C++14 Dependency Injection Library.
+Description: C++14 Dependency Injection Library.

ports/boost-di/portfile.cmake

@@ -1,19 +1,16 @@
-#header-only library
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/di-1.1.0)
 
-vcpkg_download_distfile(ARCHIVE
+vcpkg_from_github(
-    URLS "https://github.com/boost-experimental/di/archive/v1.1.0.tar.gz"
+    OUT_SOURCE_PATH SOURCE_PATH
-    FILENAME "di-1.1.0.tar.gz"
+    REPO boost-experimental/di
+    REF v1.1.0
     SHA512 69f7b0567cffea9bf983aedd7eabd1a07ae20249cd56a13de98eaa0cc835cbe3b76e790da68489536dd07edeb99271a69111f4d0c6b0aa3721ce9f5ead848fe0
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 file(INSTALL ${SOURCE_PATH}/include/boost
 	DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
-# boost-di license does not exist in source folder.
-# it shares the boost license.
 vcpkg_download_distfile(LICENSE
 	URLS http://www.boost.org/LICENSE_1_0.txt
 	FILENAME "boost-di-copyright"

ports/boost-python/CONTROL

@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-python
 Version: 1.71.0-1
-Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3
+Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 (!osx&!linux)
 Homepage: https://github.com/boostorg/python
 Description: Boost python module

ports/butteraugli/CONTROL

@@ -1,5 +1,5 @@
 Source: butteraugli
-Version: 2019-05-08
+Version: 2019-05-08-1
 Homepage: https://github.com/google/butteraugli
 Description: butteraugli estimates the psychovisual difference between two images
 Build-Depends: libpng, libjpeg-turbo

ports/butteraugli/portfile.cmake

@@ -8,16 +8,12 @@ vcpkg_from_github(
     REF 71b18b636b9c7d1ae0c1d3730b85b3c127eb4511
     SHA512 2e73f8ad8953307eea956ed8bd828e110419d6d9f8a42685d225953d3a8017a79d0701bde0282459dc51198e75a99dcd99dd3c4e7ef065736c512a7b11ea0fdf
     HEAD_REF master
+    PATCHES
+        missing_header.patch
 )
 
 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
@@ -27,6 +23,6 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/butteraugli)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/butteraugli RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/cairomm/CONTROL

@@ -1,5 +1,5 @@
 Source: cairomm
-Version: 1.15.3-3
+Version: 1.15.3-4
 Homepage: https://www.cairographics.org
 Description: A C++ wrapper for the cairo graphics library
 Build-Depends: cairo, libsigcpp

ports/cairomm/portfile.cmake

@@ -4,22 +4,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 set(CAIROMM_VERSION 1.15.3)
 set(CAIROMM_HASH a2c28786dbd167179561d8f580eeb11d10634a36dfdb1adeefc0279acf83ee906f01f264cb924845fc4ab98da1afac71e1ead742f283c1a32368ca9af28e464a)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cairomm-${CAIROMM_VERSION})
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.gz"
     FILENAME "cairomm-${CAIROMM_VERSION}.tar.gz"
     SHA512 ${CAIROMM_HASH}
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES
+        0001-fix-build.patch
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake DESTINATION ${SOURCE_PATH}/build)
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-build.patch")
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -30,5 +31,4 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cairomm)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/cairomm/COPYING ${CURRENT_PACKAGES_DIR}/share/cairomm/copyright)

ports/cartographer/CONTROL

@@ -1,5 +1,5 @@
 Source: cartographer
-Version: 1.0.0-1
+Version: 1.0.0-2
 Build-Depends: ceres[suitesparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
 Homepage: https://github.com/googlecartographer/cartographer
 Description: Google 2D & 3D SLAM package

ports/cartographer/disable-C2338-cartographer.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95bb132..fbd624d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -237,7 +237,7 @@ if(${BUILD_PROMETHEUS})
-   target_compile_definitions(${PROJECT_NAME} PUBLIC USE_PROMETHEUS=1)
- endif()
- 
--set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
-+set(TARGET_COMPILE_FLAGS "-D_DISABLE_EXTENDED_ALIGNED_STORAGE ${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
- set_target_properties(${PROJECT_NAME} PROPERTIES
-   COMPILE_FLAGS ${TARGET_COMPILE_FLAGS})
- 

ports/cartographer/portfile.cmake

@@ -10,7 +10,6 @@ vcpkg_from_github(
     HEAD_REF master
 	PATCHES
         fix-find-packages.patch
-        disable-C2338-cartographer.patch
         fix-build-error.patch
 )
 

ports/ccd/0001_fix_symbols_export.patch

@@ -1,39 +0,0 @@
-From 05b5718a364ac525c8766387bd74faf852f98589 Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Sun, 27 Aug 2017 03:39:53 +0300
-Subject: [PATCH] win32: export additional symbols, fixes FCL build on MSVC
-
----
- src/ccd/vec3.h | 2 +-
- src/support.h  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ccd/vec3.h b/src/ccd/vec3.h
-index b0c1b33..014531c 100644
---- a/src/ccd/vec3.h
-+++ b/src/ccd/vec3.h
-@@ -93,7 +93,7 @@ typedef struct _ccd_vec3_t ccd_vec3_t;
- /**
-  * Holds origin (0,0,0) - this variable is meant to be read-only!
-  */
--extern ccd_vec3_t *ccd_vec3_origin;
-+extern _ccd_export ccd_vec3_t *ccd_vec3_origin;
- 
- /**
-  * Array of points uniformly distributed on unit sphere.
-diff --git a/src/support.h b/src/support.h
-index 3372f5e..2e75df7 100644
---- a/src/support.h
-+++ b/src/support.h
-@@ -37,7 +37,7 @@ _ccd_inline void ccdSupportCopy(ccd_support_t *, const ccd_support_t *s);
-  * Computes support point of obj1 and obj2 in direction dir.
-  * Support point is returned via supp.
-  */
--void __ccdSupport(const void *obj1, const void *obj2,
-+_ccd_export void __ccdSupport(const void *obj1, const void *obj2,
-                   const ccd_vec3_t *dir, const ccd_t *ccd,
-                   ccd_support_t *supp);
- 
--- 
-2.12.2.windows.2
-

ports/ccd/CONTROL

@@ -1,4 +1,4 @@
 Source: ccd
-Version: 2.1-1
+Version: 2.1-3
 Homepage: https://github.com/danfis/libccd
 Description: Library for collision detection between two convex shapes

ports/ccd/portfile.cmake

@@ -8,11 +8,6 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001_fix_symbols_export.patch)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -23,8 +18,8 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ccd)
 
-file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ccd RENAME copyright)
-
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
+
+file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/ccfits/CONTROL

@@ -1,5 +1,5 @@
 Source: ccfits
-Version: 2.5-3
+Version: 2.5-4
 Homepage: https://heasarc.gsfc.nasa.gov/fitsio/ccfits
 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

ports/ccfits/portfile.cmake

@@ -1,14 +1,11 @@
 include(vcpkg_common_functions)
-#removes current source to prevent static builds from using patched source code
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
-
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CCfits)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz"
     FILENAME "CCfits-2.5.tar.gz"
     SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
 )
+
 vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
     OUT_SOURCE_PATH SOURCE_PATH

ports/cfitsio/CONTROL

@@ -1,4 +1,4 @@
 Source: cfitsio
-Version: 3.410-2
+Version: 3.410-3
 Homepage: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c
 Description: Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format

ports/cfitsio/portfile.cmake

@@ -1,11 +1,15 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cfitsio)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3410.tar.gz"
     FILENAME "cfitsio3410.tar.gz"
     SHA512 b2ac31ab17e19eeeb4f1601f42f348402c0a4ab03725dbf74fe75eaabbee2f44f64f0c0ee7f0b2688bd93a9cc0dccf29f07e73b9148fff97fc78bebdbb5f6f0f
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -14,7 +18,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-# Remove duplicate include files 
+# Remove duplicate include files
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/unistd.h)
 
 # cfitsio uses very common names for its headers, so they must be moved to a subdirectory

ports/cgicc/portfile.cmake

@@ -3,7 +3,6 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cgicc-3.2.19)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnu.org/gnu/cgicc/cgicc-3.2.19.tar.gz"
     FILENAME "cgicc-3.2.19.tar.gz"
@@ -28,5 +27,5 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-# Handle copyright
+
 file(INSTALL ${SOURCE_PATH}/COPYING.DOC DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/charls/CONTROL

@@ -1,4 +1,4 @@
 Source: charls
-Version: 2.0.0-2
+Version: 2.0.0-3
 Homepage: https://github.com/team-charls/charls
 Description: CharLS, a C++ JPEG-LS library implementation.

ports/charls/portfile.cmake

@@ -1,16 +1,13 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/charls-2.0.0)
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://github.com/team-charls/charls/archive/2.0.0.tar.gz"
-    FILENAME "charls-2.0.0.tar.gz"
-    SHA512 0a2862fad6d65b941c81f5f838db1fdc6a4625887281ddbf27e21be9084f607d27c8a27d246d6252e08358b2ed4aa0c2b7407048ca559fb40e94313ca72487dd
-)
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
-vcpkg_apply_patches(
+vcpkg_from_github(
-    SOURCE_PATH ${SOURCE_PATH}
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO team-charls/charls
+    REF 2.0.0
+    SHA512 0a2862fad6d65b941c81f5f838db1fdc6a4625887281ddbf27e21be9084f607d27c8a27d246d6252e08358b2ed4aa0c2b7407048ca559fb40e94313ca72487dd
+    HEAD_REF master
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
+        0001_cmake.patch
 )
 
 vcpkg_configure_cmake(
@@ -23,6 +20,7 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/charls RENAME copyright)
 
-vcpkg_copy_pdbs()
+file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_copy_pdbs()

ports/chmlib/CONTROL

@@ -1,4 +1,4 @@
 Source: chmlib
-Version: 0.40-3
+Version: 0.40-4
 Homepage: https://www.jedrea.com/chmlib/
 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.

ports/chmlib/portfile.cmake

@@ -5,7 +5,6 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 set(CHMLIB_VERSION chmlib-0.40)
 set(CHMLIB_FILENAME ${CHMLIB_VERSION}.zip)
 set(CHMLIB_URL http://www.jedrea.com/chmlib/${CHMLIB_FILENAME})
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${CHMLIB_VERSION})
 
 vcpkg_download_distfile(
     ARCHIVE
@@ -13,7 +12,11 @@ vcpkg_download_distfile(
     FILENAME ${CHMLIB_FILENAME}
     SHA512 ad3b0d49fcf99e724c0c38b9c842bae9508d0e4ad47122b0f489c113160f5344223d311abb79f25cbb0b662bb00e2925d338d60dd20a0c309bda2822cda4cd24
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 

ports/clblas/CONTROL

@@ -1,4 +1,4 @@
 Source: clblas
-Version: 2.12-2
+Version: 2.12-3
 Build-Depends: opencl
 Description: clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.

ports/clblas/portfile.cmake

@@ -6,18 +6,13 @@ vcpkg_from_github(
     REF v2.12
     SHA512 5d9b0c58adde69e83d95e9c713e0cdc5f64785fe7e05553a14c57fa483c4ef39e9dc780c26880a7f15924967d5ce4ea29035c29d63eac7ee5a2ae5ddacac2b72
     HEAD_REF master
+    PATCHES
+        cmake.patch
 )
 
 # v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names
 # conflicting with the built-in, more modern FindOpenCL.cmake
-file(
+file(REMOVE ${SOURCE_PATH}/src/FindOpenCL.cmake)
-    REMOVE ${SOURCE_PATH}/src/FindOpenCL.cmake
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake.patch
-)
 
 vcpkg_find_acquire_program(PYTHON3)
 
@@ -37,26 +32,23 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(INSTALL
-        "${SOURCE_PATH}/LICENSE"
-    DESTINATION
-        ${CURRENT_PACKAGES_DIR}/share/clblas
-    RENAME copyright
-)
-
 if(VCPKG_TARGET_IS_WINDOWS)
     file(REMOVE
-            ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb
+        ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb
-            ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe
+        ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe
-            ${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe
+        ${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe
-            ${CURRENT_PACKAGES_DIR}/debug/bin/concrt140d.dll
+        ${CURRENT_PACKAGES_DIR}/debug/bin/concrt140d.dll
-            ${CURRENT_PACKAGES_DIR}/debug/bin/msvcp140d.dll
+        ${CURRENT_PACKAGES_DIR}/debug/bin/msvcp140d.dll
-            ${CURRENT_PACKAGES_DIR}/debug/bin/vcruntime140d.dll
+        ${CURRENT_PACKAGES_DIR}/debug/bin/vcruntime140d.dll
     )
+endif()
 
+if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
-elseif(VCPKG_TARGET_IS_LINUX)
+else()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/clBLAS")
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clBLAS)
 endif()
 
 vcpkg_copy_pdbs()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clblas RENAME copyright)

ports/clblast/CONTROL

@@ -1,4 +1,4 @@
 Source: clblast
-Version: 1.5.0
+Version: 1.5.0-1
 Build-Depends: opencl
 Description: A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.

ports/clblast/portfile.cmake

@@ -18,28 +18,29 @@ vcpkg_install_cmake()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-
+if(VCPKG_TARGET_IS_WINDOWS)
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/clblast.dll)
+    if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/clblast.dll)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/clblast.dll ${CURRENT_PACKAGES_DIR}/bin/clblast.dll)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/clblast.dll ${CURRENT_PACKAGES_DIR}/bin/clblast.dll)
-endif()
+    endif()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll)
+    if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll  ${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll  ${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll)
-endif()
+    endif()
-
+    file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
-file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+    file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
-file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+    if(EXE OR DEBUG_EXE)
-if(EXE OR DEBUG_EXE)
+        file(REMOVE ${EXE} ${DEBUG_EXE})
-    file(REMOVE ${EXE} ${DEBUG_EXE})
+    endif()
 endif()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clblast)
 vcpkg_copy_pdbs()
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clblast)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/clblast/LICENSE ${CURRENT_PACKAGES_DIR}/share/clblast/copyright)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/clfft/CONTROL

@@ -1,5 +1,5 @@
 Source: clfft
-Version: 2.12.2-1
+Version: 2.12.2-2
 Build-Depends: opencl
 Homepage: https://github.com/clMathLibraries/clFFT
 Description: clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.

ports/clfft/portfile.cmake

@@ -6,11 +6,8 @@ vcpkg_from_github(
     REF v2.12.2
     SHA512 19e9a4e06f76ae7c7808d1188677d5553c43598886a75328b7801ab2ca68e35206839a58fe2f958a44a6f7c83284dc9461cd0e21c37d1042bf82e24aad066be8
     HEAD_REF master
-)
+    PATCHES
-
+        tweak-install.patch
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/tweak-install.patch
 )
 
 vcpkg_configure_cmake(
@@ -26,16 +23,12 @@ vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(INSTALL
-        "${SOURCE_PATH}/LICENSE"
-    DESTINATION
-        ${CURRENT_PACKAGES_DIR}/share/clfft/copyright
-)
-
 if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+    vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
-elseif(VCPKG_TARGET_IS_LINUX)
+else()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/clFFT")
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clFFT)
 endif()
 
 vcpkg_copy_pdbs()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clfft/copyright)

ports/collada-dom/CONTROL

@@ -1,4 +1,4 @@
 Source: collada-dom
-Version: 2.5.0-2
+Version: 2.5.0-3
 Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.
 Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system

ports/collada-dom/portfile.cmake

@@ -1,5 +1,5 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/collada-dom-2.5.0)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rdiankov/collada-dom

ports/console-bridge/CONTROL

@@ -1,4 +1,4 @@
 Source: console-bridge
-Version: 0.4.3-1
+Version: 0.4.3-2
 Homepage: https://github.com/ros/console_bridge
 Description: a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.

ports/console-bridge/portfile.cmake

@@ -6,7 +6,6 @@ vcpkg_from_github(
     REF f0b423c0c2d02651db1776c96887c0a314908063
     SHA512 f022341f06c4edf564b94305b7ce279a7a2a61d0323a7ccf374598011909d86b0a9c514b4d41fd1d523baecc1c320d16a931a8f0fbb3a3e4950720f84f0472e6
     HEAD_REF master
-    PATCHES static-macro.patch
 )
 
 vcpkg_configure_cmake(

ports/console-bridge/static-macro.patch

@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 604b2ab..e98b51c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,6 +37,10 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
-   option(BUILD_SHARED_LIBS "Build dynamically-linked binaries" ON)
- endif()
- 
-+if(NOT BUILD_SHARED_LIBS)
-+  add_definitions(-DCONSOLE_BRIDGE_STATIC)
-+endif()
-+
- add_library(${PROJECT_NAME} src/console.cpp)
- set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION
-                ${CONSOLE_BRIDGE_MAJOR_VERSION}.${CONSOLE_BRIDGE_MINOR_VERSION})

ports/cppkafka/CONTROL

@@ -1,5 +1,5 @@
 Source: cppkafka
-Version: 0.3.1-1
+Version: 0.3.1-2
 Homepage: https://github.com/mfontanini/cppkafka
 Description: cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum.
-Build-Depends: boost-program-options, librdkafka
+Build-Depends: boost-program-options, librdkafka

ports/cppkafka/fix-dynamic.patch

@@ -1,12 +1,12 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5d31078..b1d3634 100644
+index 5d31078..b1d3634 100644
---- a/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
-@@ -43,6 +43,7 @@ target_include_directories(cppkafka PUBLIC ${PROJECT_SOURCE_DIR}/include)
+@@ -43,6 +43,7 @@ target_include_directories(cppkafka PUBLIC ${PROJECT_SOURCE_DIR}/include)
- 
+ 
- install( 
+ install( 
-     TARGETS cppkafka
+     TARGETS cppkafka
-+    RUNTIME DESTINATION bin
++    RUNTIME DESTINATION bin
-     LIBRARY DESTINATION lib
+     LIBRARY DESTINATION lib
-     ARCHIVE DESTINATION lib
+     ARCHIVE DESTINATION lib
-     COMPONENT dev
+     COMPONENT dev

ports/cppunit/CONTROL

@@ -1,3 +1,3 @@
 Source: cppunit
-Version: 1.14.0
+Version: 1.14.0-1
 Description: CppUnit is the C++ port of the famous JUnit framework for unit testing. Test output is in XML for automatic testing and GUI based for supervised tests.

ports/cppunit/portfile.cmake

@@ -1,24 +1,26 @@
 include(vcpkg_common_functions)
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    message(FATAL_ERROR "\n${PORT} does not support your system, only Windows for now. Please open a ticket issue on github.com/microsoft/vcpkg if necessary\n")
+endif()
+
 set(VERSION 1.14.0)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}/cppunit-${VERSION})
+if (VCPKG_CRT_LINKAGE STREQUAL static)
+    set(STATIC_PATCH "0001-static-crt-linkage.patch")
+endif()
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://dev-www.libreoffice.org/src/cppunit-${VERSION}.tar.gz"
     FILENAME "cppunit-${VERSION}.tar.gz"
     SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
 )
 
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET})
+vcpkg_extract_source_archive_ex(
-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET})
+    OUT_SOURCE_PATH SOURCE_PATH
-vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET})
+    ARCHIVE ${ARCHIVE}
-
+    PATCHES
-if (VCPKG_CRT_LINKAGE STREQUAL static)
+        ${STATIC_PATCH}
-    vcpkg_apply_patches(
+)
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES
-            # Make sure cppunit static lib uses static CRT linkage
-            ${CMAKE_CURRENT_LIST_DIR}/0001-static-crt-linkage.patch
-    )
-endif()
 
 if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
     set(BUILD_ARCH "Win32")
@@ -51,8 +53,6 @@ elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(COPY ${SOURCE_PATH}/lib/cppunit.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 endif()
 
-# Handle copyright
+vcpkg_copy_pdbs()
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppunit)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppunit/COPYING ${CURRENT_PACKAGES_DIR}/share/cppunit/copyright)
 
-vcpkg_copy_pdbs()
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppunit RENAME copyright)

ports/cunit/CONTROL

@@ -1,4 +1,4 @@
 Source: cunit
-Version: 2.1.3-2
+Version: 2.1.3-3
 Homepage: https://sourceforge.net/projects/cunit/
 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

ports/cunit/portfile.cmake

@@ -1,12 +1,15 @@
 include(vcpkg_common_functions)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CUnit-2.1-3)
 vcpkg_download_distfile(ARCHIVE
   URLS "http://downloads.sourceforge.net/project/cunit/CUnit/2.1-3/CUnit-2.1-3.tar.bz2"
   FILENAME "CUnit-2.1-3.tar.bz2"
   SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 

ports/dlfcn-win32/CONTROL

@@ -1,4 +1,4 @@
 Source: dlfcn-win32
-Version: 1.1.1-3
+Version: 1.1.1-4
 Homepage: https://github.com/dlfcn-win32/dlfcn-win32
 Description: dlfcn-win32 is an implementation of dlfcn for Windows.

ports/dlfcn-win32/portfile.cmake

@@ -1,12 +1,13 @@
 include(vcpkg_common_functions)
 set(SOURCE_VERSION 1.1.1)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/dlfcn-win32-${SOURCE_VERSION})
+
-vcpkg_download_distfile(ARCHIVE
+vcpkg_from_github(
-    URLS "https://github.com/dlfcn-win32/dlfcn-win32/archive/v${SOURCE_VERSION}.zip"
+    OUT_SOURCE_PATH SOURCE_PATH
-    FILENAME "dlfcn-win32-v${SOURCE_VERSION}.zip"
+    REPO dlfcn-win32/dlfcn-win32
-    SHA512 581043784d8c1b1b43c88c0da302f79d70e1d33e95977a355d849b8f8c45194b55fdc28e36a3f3ed192eca8fee6b00cb8bf1d1d1fc08b94d53be6f73bea6e09a
+    REF v${SOURCE_VERSION}
+    SHA512 557729511546f574487f8c7de437c53bcf5ae11640349c338ead9965a4ac0f937de647839b63c821003be54dca5bcbf28f2899d2348acf7dfef31e487da1cba1
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}

ports/dmlc/CONTROL

@@ -1,5 +1,5 @@
 Source: dmlc
-Version: 2019-08-12
+Version: 2019-08-12-1
 Homepage: https://github.com/dmlc/dmlc-core
 Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.
 Default-Features: openmp

ports/dmlc/portfile.cmake

@@ -27,9 +27,10 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS 
+    NO_PARALLEL_CONFIGURE
-       -DDMLC_FORCE_SHARED_CRT=${DMLC_FORCE_SHARED_CRT}   
+    OPTIONS
-       -DUSE_OPENMP=${ENABLE_OPENMP}       
+       -DDMLC_FORCE_SHARED_CRT=${DMLC_FORCE_SHARED_CRT}
+       -DUSE_OPENMP=${ENABLE_OPENMP}
 )
 
 vcpkg_install_cmake()

ports/duktape/CMakeLists.txt

@@ -1,23 +1,53 @@
 cmake_minimum_required(VERSION 3.14)
 
-project (duktape)
 
-file(GLOB_RECURSE DUKTAPE_SOURCES "src/*.c")
+set(duktape_MAJOR_VERSION 2)
-file(GLOB_RECURSE DUKTAPE_HEADERS "src/*.h")
+set(duktape_MINOR_VERSION 4)
+set(duktape_PATCH_VERSION 0)
+set(duktape_VERSION ${duktape_MAJOR_VERSION}.${duktape_MINOR_VERSION}.${duktape_PATCH_VERSION})
 
-if (BUILD_SHARED_LIBS)
+option(CMAKE_VERBOSE_MAKEFILE "Create verbose makefile" OFF)
-    add_definitions(-DDUK_F_DLL_BUILD)
+option(BUILD_SHARED_LIBS "Create duktape as a shared library" ON)
-endif ()
 
-include_directories("src/")
+project(duktape VERSION ${duktape_VERSION})
+
+file(GLOB_RECURSE DUKTAPE_SOURCES "${CMAKE_CURRENT_LIST_DIR}/src/*.c")
+file(GLOB_RECURSE DUKTAPE_HEADERS "${CMAKE_CURRENT_LIST_DIR}/src/*.h")
 
 add_library(duktape ${DUKTAPE_SOURCES} ${DUKTAPE_HEADERS})
+target_include_directories(duktape PRIVATE "${CMAKE_CURRENT_LIST_DIR}/src")
+set_target_properties(duktape PROPERTIES PUBLIC_HEADER "${DUKTAPE_HEADERS}")
 
-set_target_properties("duktape" PROPERTIES PUBLIC_HEADER "${DUKTAPE_HEADERS}")
+if (BUILD_SHARED_LIBS)
+  target_compile_definitions(duktape PRIVATE -DDUK_F_DLL_BUILD)
+endif ()
 
 install(TARGETS duktape
-        EXPORT duktape-targets
+        EXPORT duktapeTargets
         ARCHIVE DESTINATION "lib"
+        LIBRARY DESTINATION "lib"
         RUNTIME DESTINATION "bin"
-        PUBLIC_HEADER DESTINATION "include")
+        PUBLIC_HEADER DESTINATION "include"
+        COMPONENT dev
+)
 
+install(EXPORT duktapeTargets
+  FILE duktapeTargets.cmake
+  NAMESPACE duktape::
+  DESTINATION "share/duktape"
+)
+
+export(PACKAGE duktape)
+
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file("${PROJECT_BINARY_DIR}/duktapeConfigVersion.cmake"
+  COMPATIBILITY SameMajorVersion
+)
+
+configure_file(duktapeConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/duktapeConfig.cmake" @ONLY)
+
+install(FILES
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/duktapeConfig.cmake"
+  "${PROJECT_BINARY_DIR}/duktapeConfigVersion.cmake"
+  DESTINATION "share/duktape"
+)

ports/duktape/CONTROL

@@ -1,5 +1,4 @@
 Source: duktape
-Version: 2.4.0-4
+Version: 2.4.0-5
 Homepage: https://github.com/svaarala/duktape
 Description: Embeddable Javascript engine with a focus on portability and compact footprint.
-Build-Depends:

ports/duktape/duk_config.h.patch

@@ -1,13 +0,0 @@
-diff --git a/src/duk_config.h b/src/duk_config.h
-index a942563..8d3d309 100644
---- a/src/duk_config.h
-+++ b/src/duk_config.h
-@@ -64,7 +64,7 @@
-
- /* DLL build detection */
- /* not configured for DLL build */
--#undef DUK_F_DLL_BUILD
-+// #undef DUK_F_DLL_BUILD
-
- /* Apple OSX, iOS */
- #if defined(__APPLE__)

ports/duktape/portfile.cmake

@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
     message("${PORT} currently requires the following tools from the system package manager:\n    python-yaml\n\nThis can be installed on Ubuntu systems via apt-get install python-yaml PYTHON2-yaml (depending on your current python default interpreter)")
-endif() 
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -13,7 +13,7 @@ vcpkg_from_github(
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/duktapeConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/duktapeConfig.cmake.in DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 
 if(CMAKE_HOST_WIN32)
@@ -27,27 +27,33 @@ get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON2_DIR}")
 if(NOT EXISTS ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX})
     if(NOT EXISTS ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX})
-		vcpkg_from_github(
+        vcpkg_from_github(
-			OUT_SOURCE_PATH PYFILE_PATH
+            OUT_SOURCE_PATH PYFILE_PATH
-			REPO pypa/get-pip
+            REPO pypa/get-pip
-			REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25
+            REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25
-			SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a
+            SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a
-			HEAD_REF master
+            HEAD_REF master
-		)
+        )
-		execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYFILE_PATH}/get-pip.py)
+        execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYFILE_PATH}/get-pip.py --user)
     endif()
-    execute_process(COMMAND ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install pyyaml)
+    execute_process(COMMAND ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install pyyaml --user)
 else()
     execute_process(COMMAND ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX} pyyaml)
 endif()
 
 execute_process(COMMAND ${PYTHON2} ${SOURCE_PATH}/tools/configure.py --source-directory ${SOURCE_PATH}/src-input --output-directory ${SOURCE_PATH}/src --config-metadata ${SOURCE_PATH}/config -DDUK_USE_FASTINT)
 
-vcpkg_apply_patches(
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    SOURCE_PATH ${SOURCE_PATH}
+  set(DUK_CONFIG_H_PATH "${SOURCE_PATH}/src/duk_config.h")
-    PATCHES
+  file(READ ${DUK_CONFIG_H_PATH} CONTENT)
-        duk_config.h.patch 
+  string(REPLACE "#undef DUK_F_DLL_BUILD" "#define DUK_F_DLL_BUILD" CONTENT "${CONTENT}")
-)
+  file(WRITE ${DUK_CONFIG_H_PATH} "${CONTENT}")
+else()
+  set(DUK_CONFIG_H_PATH "${SOURCE_PATH}/src/duk_config.h")
+  file(READ ${DUK_CONFIG_H_PATH} CONTENT)
+  string(REPLACE "#define DUK_F_DLL_BUILD" "#undef DUK_F_DLL_BUILD" CONTENT "${CONTENT}")
+  file(WRITE ${DUK_CONFIG_H_PATH} "${CONTENT}")
+endif()
 
 vcpkg_configure_cmake(
     PREFER_NINJA
@@ -56,19 +62,10 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-set(DUK_CONFIG_H_PATH "${CURRENT_PACKAGES_DIR}/include/duk_config.h")
-file(READ ${DUK_CONFIG_H_PATH} CONTENT)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    string(REPLACE "// #undef DUK_F_DLL_BUILD" "#undef DUK_F_DLL_BUILD\n#define DUK_F_DLL_BUILD" CONTENT "${CONTENT}")
-else()
-    string(REPLACE "// #undef DUK_F_DLL_BUILD" "#undef DUK_F_DLL_BUILD" CONTENT "${CONTENT}")
-endif()
-file(WRITE ${DUK_CONFIG_H_PATH} "${CONTENT}")
 
-# Remove debug include
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# Copy copright information
+vcpkg_fixup_cmake_targets()
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/duktape" RENAME "copyright")
-
 vcpkg_copy_pdbs()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/dxut/portfile.cmake

@@ -6,13 +6,16 @@ if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
   message(FATAL_ERROR "DXUT only supports dynamic CRT linkage")
 endif()
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DXUT-sept2016)
+vcpkg_download_distfile(ARCHIVE
-vcpkg_download_distfile(ARCHIVE_FILE
     URLS "https://github.com/Microsoft/DXUT/archive/sept2016.tar.gz"
     FILENAME "DXUT-sept2016.tar.gz"
     SHA512 190006c194284a1f5d614477896b0469a59ece05dff37477dadbe98808a5c33e274c0c1bb1390f22d1b5e06c9f534f4b50d6002157b2a391e01c2192b8e08869
 )
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
 	SET(BUILD_ARCH "Win32")

ports/entityx/CONTROL

@@ -1,4 +1,4 @@
 Source: entityx
-Version: 1.3.0-1
+Version: 1.3.0-2
 Description: EntityX - A fast, type-safe C++ Entity-Component system.
 Homepage: https://github.com/alecthomas/entityx

ports/entityx/enable-std14.patch

@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23f5063..1fa10b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,6 +24,7 @@ set(ENTITYX_BUILD_SHARED true CACHE BOOL "Build shared libraries?")
- include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
- include(CheckCXXSourceCompiles)
- 
-+set(CMAKE_CXX_STANDARD 14)
- # Default compiler args
- if(0)
- if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|.*Clang)")

ports/entityx/portfile.cmake

@@ -8,8 +8,6 @@ vcpkg_from_github(
     REF 1.3.0
     SHA512 724a3f421f802e60a1106ff8a69435c9a9da14e35c3e88565bbc17bff3a17f2d9771818aac83320cc4f14de0ec770a66f1eb7cbf4318f43abd516c63e077c07d
     HEAD_REF master
-    PATCHES
-        enable-std14.patch
 )
 
 vcpkg_configure_cmake(

ports/epsilon/CONTROL

@@ -1,4 +1,4 @@
 Source: epsilon
-Version: 0.9.2
+Version: 0.9.2-1
 Homepage: https://sourceforge.net/projects/epsilon-project/
 Description: EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.

ports/epsilon/portfile.cmake

@@ -9,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE
 # support out of source builds.
 set(SOURCE_PATH_DEBUG   ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-debug/epsilon-0.9.2)
 set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-release/epsilon-0.9.2)
-
+file(REMOVE_RECURSE ${SOURCE_PATH_DEBUG} ${SOURCE_PATH_RELEASE}) # to be sure that the patches can be properly applied, we always clean the buildtrees folder
 foreach(BUILD_TYPE debug release)
     vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
     vcpkg_apply_patches(
@@ -96,4 +96,3 @@ file(INSTALL ${FILTERS}
 vcpkg_copy_pdbs()
 file(INSTALL ${SOURCE_PATH_RELEASE}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/epsilon/ RENAME copyright)
 message(STATUS "Packaging ${TARGET_TRIPLET} done")
-

ports/evpp/portfile.cmake

@@ -22,9 +22,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-# remove duplicated include files
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-

ports/fadbad/portfile.cmake

@@ -1,11 +1,15 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FADBAD++)
+
 vcpkg_download_distfile(ARCHIVE
   URLS "http://www.fadbad.com/download/FADBAD++-2.1.tar.gz"
   FILENAME "FADBAD++-2.1.tar.gz"
   SHA512 7a82c51c03acb0806d673853f391379ea974e304c831ee15ef05a90c30661736ff572481b5b8254b2646c63968043ee90a06cba88261b87fc34d01f92403360a
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 file(INSTALL
   ${SOURCE_PATH}/tadiff.h

ports/fcl/CONTROL

@@ -1,5 +1,5 @@
 Source: fcl
-Version: 0.5.0-6
+Version: 0.5.0-7
 Homepage: https://github.com/flexible-collision-library/fcl
 Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles
 Build-Depends: ccd, octomap

ports/fcl/portfile.cmake

@@ -8,13 +8,10 @@ vcpkg_from_github(
     REF 54e9619bc2b084ee50e986ac3308160d663481c4
     SHA512 11bfa3fdeeda6766769a34d2248ca32b6b13ecb32b412c068aa1c7aa3495d55b3f7a82a93621965904f9813c3fd0f128a84f796ae5731d2ff15b85935a0e1261
     HEAD_REF fcl-0.5
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001_fix_package_detection.patch
+        0001_fix_package_detection.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0002-fix_dependencies.patch)
+        0002-fix_dependencies.patch
+)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(FCL_STATIC_LIBRARY ON)

ports/flint/CONTROL

@@ -1,5 +1,5 @@
 Source: flint
-Version: 2.5.2-3
+Version: 2.5.2-4
 Homepage: https://www.flintlib.org/
 Description: Fast Library for Number Theory
 Build-Depends: mpir, mpfr, pthreads, gettimeofday