microsoft · Jack·Boos·Yu (JackBoosY) · Jul 5, 2021 · Jul 5, 2021 · Jul 5, 2021 · Jul 5, 2021
diff --git a/docs/maintainers/vcpkg_copy_tool_dependencies.md b/docs/maintainers/vcpkg_copy_tool_dependencies.md
@@ -6,10 +6,19 @@ Copy all DLL dependencies of built tools into the tool folder.
 
 ## Usage
 ```cmake
-vcpkg_copy_tool_dependencies(<${CURRENT_PACKAGES_DIR}/tools/${PORT}>)
+vcpkg_copy_tool_dependencies(
+    [TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}>]
+    [DEPENDENCIES <dep1>...]
+)
 ```
-## Parameters
-The path to the directory containing the tools.
+## TOOL_DIR
+The path to the directory containing the tools. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted.
+
+## DEPENDENCIES
+A list of dynamic libraries a tool is likely to load at runtime, such as plugins,
+or other Run-Time Dynamic Linking mechanisms like LoadLibrary or dlopen.
+These libraries will be copied into the same directory as the tool
+even if they are not statically determined as dependencies from inspection of their import tables.
 
 ## Notes
 This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools.

diff --git a/docs/maintainers/vcpkg_copy_tools.md b/docs/maintainers/vcpkg_copy_tools.md
@@ -10,6 +10,7 @@ vcpkg_copy_tools(
     TOOL_NAMES <tool1>...
     [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>]
     [DESTINATION <${CURRENT_PACKAGES_DIR}/tools/${PORT}>]
+    [DEPENDENCIES <dep1>...]
     [AUTO_CLEAN]
 )
 ```
@@ -23,6 +24,12 @@ The path to the directory containing the tools. This will be set to `${CURRENT_P
 ### DESTINATION
 Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted.
 
+### DEPENDENCIES
+A list of dynamic libraries a tool is likely to load at runtime, such as plugins,
+or other Run-Time Dynamic Linking mechanisms like LoadLibrary or dlopen.
+These libraries will be copied into the same directory as the tool
+even if they are not statically determined as dependencies from inspection of their import tables.
+
 ### AUTO_CLEAN
 Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`.
 

diff --git a/ports/alac-decoder/CONTROL b/ports/alac-decoder/CONTROL
@@ -1,5 +1,5 @@
 Source: alac-decoder
 Version: 0.2
-Port-Version: 4
+Port-Version: 5
 Homepage: https://distfiles.macports.org/alac_decoder
 Description:  ALAC C implementation of a decoder, written from reverse engineering the file format
diff --git a/ports/alac-decoder/portfile.cmake b/ports/alac-decoder/portfile.cmake
@@ -27,6 +27,6 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
 file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/alac/CONTROL b/ports/alac/CONTROL
@@ -1,5 +1,6 @@
 Source: alac
-Version:  2017-11-03-c38887c5-1
+Version:  2017-11-03-c38887c5
+Port-Version: 2
 Homepage: https://github.com/macosforge/alac
 Description: The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.
 Supports: !uwp
diff --git a/ports/alac/portfile.cmake b/ports/alac/portfile.cmake
@@ -22,5 +22,5 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alac)
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/alac)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/alac RENAME copyright)
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL
@@ -1,5 +1,6 @@
 Source: alembic
 Version: 1.7.16
+Port-Version: 1
 Build-Depends: ilmbase, hdf5
 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
 Homepage: https://alembic.io/

diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake
@@ -67,6 +67,6 @@ else()
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake
@@ -38,5 +38,5 @@ file(COPY
     ${CURRENT_PACKAGES_DIR}/share/${PORT})
 
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(TOOL_DIR  ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aubio",
   "version-semver": "0.4.9",
-  "port-version": 6,
+  "port-version": 7,
   "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.",
   "homepage": "https://github.com/aubio/aubio",
   "default-features": [

diff --git a/ports/basisu/CONTROL b/ports/basisu/CONTROL
@@ -1,5 +1,6 @@
 Source: basisu
-Version: 1.11-4
+Version: 1.11
+Port-Version: 5
 Homepage: https://github.com/BinomialLLC/basis_universal
 Description: Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats. 
 Build-Depends: lodepng

diff --git a/ports/basisu/portfile.cmake b/ports/basisu/portfile.cmake
@@ -26,7 +26,7 @@ endif()
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(COPY ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/basisu)
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/basisu)
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/basisu)
 
 # Remove unnecessary files
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake
@@ -45,7 +45,7 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl)
-  vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl")
+  vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/boringssl")
 endif()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boringssl",
   "version-date": "2021-06-23",
+  "port-version": 1,
   "description": "BoringSSl is a fork of OpenSSL developed by Google",
   "homepage": "https://boringssl.googlesource.com/boringssl",
   "supports": "!uwp",

diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
@@ -146,7 +146,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/botan)
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/botan)
 
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/botan-${BOTAN_VERSION}/ ${CURRENT_PACKAGES_DIR}/share/botan/)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/botan/license.txt ${CURRENT_PACKAGES_DIR}/share/botan/copyright)
diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "botan",
   "version": "2.16.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "supports": "!(windows & arm)",

diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL
@@ -1,5 +1,5 @@
 Source: brotli
 Version: 1.0.9
-Port-Version: 1
+Port-Version: 2
 Homepage: https://github.com/google/brotli
 Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.
diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake
@@ -21,7 +21,7 @@ vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli)
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/brotli)
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli)
 vcpkg_fixup_pkgconfig()
 

diff --git a/ports/butteraugli/CONTROL b/ports/butteraugli/CONTROL
@@ -1,5 +1,6 @@
 Source: butteraugli
-Version: 2019-05-08-1
+Version: 2019-05-08
+Port-Version: 2
 Homepage: https://github.com/google/butteraugli
 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
@@ -21,6 +21,6 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/cgns/CONTROL b/ports/cgns/CONTROL
@@ -1,5 +1,6 @@
 Source: cgns
-Version: 3.4.0-1
+Version: 3.4.0
+Port-Version: 2
 Homepage: http://cgns.org/
 Description: The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations. 
 Default-Features: hdf5, lfsselector

diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake
@@ -61,7 +61,7 @@ foreach(tool ${TOOLS})
     endif()
 endforeach()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
 IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) 
     file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h)
@@ -70,7 +70,7 @@ endif()
 file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h)
 file(GLOB_RECURSE BATCH_FILES ${CURRENT_PACKAGES_DIR}/bin/*.bat)
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake
@@ -63,7 +63,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe
         ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe
         DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore)
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore)
+    vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/chakracore)
 endif()
 
 vcpkg_copy_pdbs()

diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "chakracore",
   "version-string": "1.11.22",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Core part of the Chakra Javascript engine",
   "homepage": "https://github.com/Microsoft/ChakraCore",
   "supports": "windows & !uwp & !static"

diff --git a/ports/cmark/CONTROL b/ports/cmark/CONTROL
@@ -1,3 +1,4 @@
 Source: cmark
-Version: 0.29.0
+Version: 0.29.0
+Port-Version: 1
 Description: CommonMark parsing and rendering library
diff --git a/ports/cmark/portfile.cmake b/ports/cmark/portfile.cmake
@@ -32,7 +32,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
 
 if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark.exe)
     file(COPY ${CURRENT_PACKAGES_DIR}/bin/cmark.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/cmark/)
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cmark)
+    vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/cmark)
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark)

diff --git a/ports/crashrpt/CONTROL b/ports/crashrpt/CONTROL
@@ -1,5 +1,6 @@
 Source: crashrpt
 Version: 1.4.3
+Port-Version: 1
 Description: A crash reporting system for Windows applications
 Homepage: http://crashrpt.sourceforge.net/
 Build-Depends: dbghelp, libjpeg-turbo, libogg, libpng, libtheora, tinyxml, wtl, zlib

diff --git a/ports/crashrpt/portfile.cmake b/ports/crashrpt/portfile.cmake
@@ -46,7 +46,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 

diff --git a/ports/cutelyst2/CONTROL b/ports/cutelyst2/CONTROL
@@ -1,4 +1,5 @@
 Source: cutelyst2
 Version: 2.12.0
+Port-Version: 1
 Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework
 Build-Depends: qt5-base[core]
diff --git a/ports/cutelyst2/portfile.cmake b/ports/cutelyst2/portfile.cmake
@@ -30,7 +30,7 @@ file(GLOB DEBUG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2 ${CURRENT_PACKA
 if(EXES OR DEBUG_EXES)
     file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/cutelyst2)
     file(REMOVE ${EXES} ${DEBUG_EXES})
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cutelyst2)
+    vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/cutelyst2)
 endif()
 
 if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins/ActionREST.dll)

diff --git a/ports/fdk-aac/portfile.cmake b/ports/fdk-aac/portfile.cmake
@@ -18,6 +18,6 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/fdk-aac/vcpkg.json b/ports/fdk-aac/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "fdk-aac",
   "version-semver": "2.0.2",
+  "port-version": 1,
   "description": "A standalone library of the Fraunhofer FDK AAC code",
   "homepage": "https://github.com/mstorsjo/fdk-aac"
 }
diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL
@@ -1,6 +1,6 @@
 Source: flatbuffers
 Version: 1.12.0
-Port-Version: 2
+Port-Version: 3
 Description: Memory Efficient Serialization Library
  FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility.
 Homepage:  https://google.github.io/flatbuffers/
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
@@ -40,7 +40,7 @@ if(flatc_path)
         ${flatc_path}
         ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable}
     )
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
+    vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

diff --git a/ports/foonathan-memory/CONTROL b/ports/foonathan-memory/CONTROL
@@ -1,5 +1,6 @@
 Source: foonathan-memory
-Version: 2019-07-21-1
+Version: 2019-07-21
+Port-Version: 2
 Description: STL compatible C++ memory allocator library
 Homepage: https://foonathan.net/doc/memory/
 Default-Features: tool

diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake
@@ -106,7 +106,7 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX})
         ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}
         DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}
     )
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+    vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
         file(REMOVE_RECURSE

diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake
@@ -55,7 +55,7 @@ if(TOOLS_RELEASE)
     file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG})
 endif()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll")

diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "freerdp",
   "version-semver": "2.2.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A free implementation of the Remote Desktop Protocol (RDP)",
   "homepage": "https://github.com/FreeRDP/FreeRDP",
   "supports": "!(arm | uwp)",

diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake
@@ -39,7 +39,7 @@ vcpkg_fixup_cmake_targets (CONFIG_PATH share/geographiclib)
 vcpkg_copy_pdbs ()
 
 if (tools IN_LIST FEATURES)
-  vcpkg_copy_tool_dependencies (${CURRENT_PACKAGES_DIR}/tools/${PORT})
+  vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT})
 endif ()
 
 file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "geographiclib",
   "version": "1.52",
+  "port-version": 1,
   "description": "GeographicLib, a C++ library for performing geographic conversions",
   "homepage": "https://geographiclib.sourceforge.io",
   "features": {

diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake
@@ -72,8 +72,8 @@ vcpkg_install_make(${ADDITIONAL_INSTALL_OPTIONS})
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gettext)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/gettext/COPYING ${CURRENT_PACKAGES_DIR}/share/gettext/copyright)
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin)
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin)
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin)
+vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 

diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gettext",
   "version": "0.21",
-  "port-version": 3,
+  "port-version": 4,
   "description": "The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl.",
   "homepage": "https://www.gnu.org/software/gettext/",
   "dependencies": [