[vcpkg] Replace uses of msys pacman.exe with direct package downloads (#13019)

* wip

Apply suggestions from code review

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* [vcpkg_acquire_msys] Trim list of packages. Introduce defaults.

* [behaviortree-cpp] Fix dynamic dependency on ZMQ

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

14 files changed, 113 insertions, 96 deletions

diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake
index b689ab480..f67153766 100644
--- a/ports/behaviortree-cpp/portfile.cmake
+++ b/ports/behaviortree-cpp/portfile.cmake
@@ -20,35 +20,23 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

     OPTIONS

+        -DCMAKE_DISABLE_FIND_PACKAGE_ament_cmake=1

+        -DCMAKE_DISABLE_FIND_PACKAGE_Curses=1

         -DBUILD_EXAMPLES=OFF

         -DBUILD_UNIT_TESTS=OFF

         -DBUILD_TOOLS=OFF

 )

 

 vcpkg_install_cmake()

-

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/BehaviorTreeV3/cmake TARGET_PATH share/behaviortreev3)

 vcpkg_copy_pdbs()

 

-set(TOOLS bt3_log_cat bt3_plugin_manifest)

-

-foreach(tool ${TOOLS})

-    set(suffix ${VCPKG_TARGET_EXECUTABLE_SUFFIX})

-    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}")

-        file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}")

-    endif()

-    if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}")

-        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}"

-                     DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")

-        file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}")

-    endif()

-endforeach()

-

-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})

-

-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")

-

 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

 

-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

+file(REMOVE_RECURSE

+    "${CURRENT_PACKAGES_DIR}/debug/include"

+    "${CURRENT_PACKAGES_DIR}/lib/BehaviorTreeV3"

+    "${CURRENT_PACKAGES_DIR}/debug/lib/BehaviorTreeV3"

+)

 

 vcpkg_test_cmake(PACKAGE_NAME BehaviorTreeV3)

diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json
index 97731b09c..783187faa 100644
--- a/ports/behaviortree-cpp/vcpkg.json
+++ b/ports/behaviortree-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "behaviortree-cpp",
   "version-string": "3.5.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Behavior Trees Library in C++.",
   "homepage": "https://www.behaviortree.dev",
   "supports": "!uwp & !osx",
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index c9ea04fa4..be2999788 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,6 +1,6 @@
 Source: ffmpeg
 Version: 4.2
-Port-Version: 21
+Port-Version: 22
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
   FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index b365b1843..49cff1d23 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -18,7 +18,7 @@ vcpkg_from_github(
         0012-Fix-ssl-110-detection.patch
 )
 
-if (${SOURCE_PATH} MATCHES " ")
+if (SOURCE_PATH MATCHES " ")
     message(FATAL_ERROR "Error: ffmpeg will not build with spaces in the path. Please use a directory with no spaces")
 endif()
 
@@ -26,35 +26,46 @@ vcpkg_find_acquire_program(YASM)
 get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    set(SEP ";")
     #We're assuming that if we're building for Windows we're using MSVC
     set(INCLUDE_VAR "INCLUDE")
     set(LIB_PATH_VAR "LIB")
 else()
-    set(SEP ":")
     set(INCLUDE_VAR "CPATH")
     set(LIB_PATH_VAR "LIBRARY_PATH")
 endif()
 
+set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${YASM_EXE_PATH}")
 set(OPTIONS "--enable-asm --enable-yasm --disable-doc --enable-debug --enable-runtime-cpudetect")
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")
-
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-        vcpkg_acquire_msys(MSYS_ROOT PACKAGES perl gcc diffutils make pkg-config)
+        vcpkg_acquire_msys(MSYS_ROOT
+            DIRECT_PACKAGES
+                # Required for "cpp.exe" preprocessor
+                "https://repo.msys2.org/msys/x86_64/gcc-9.3.0-1-x86_64.pkg.tar.xz"
+                76af0192a092278e6b26814b2d92815a2c519902a3fec056b057faec19623b1770ac928a59a39402db23cfc23b0d7601b7f88b367b27269361748c69d08654b2
+                "https://repo.msys2.org/msys/x86_64/isl-0.22.1-1-x86_64.pkg.tar.xz"
+                f4db50d00bad0fa0abc6b9ad965b0262d936d437a9faa35308fa79a7ee500a474178120e487b2db2259caf51524320f619e18d92acf4f0b970b5cbe5cc0f63a2
+                "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz"
+                b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d
+                "https://repo.msys2.org/msys/x86_64/mpc-1.1.0-1-x86_64.pkg.tar.xz"
+                7d0715c41c27fdbf91e6dcc73d6b8c02ee62c252e027f0a17fa4bfb974be8a74d8e3a327ef31c2460721902299ef69a7ef3c7fce52c8f02ce1cb47f0b6e073e9
+                "https://repo.msys2.org/msys/x86_64/mpfr-4.1.0-1-x86_64.pkg.tar.zst"
+                d64fa60e188124591d41fc097d7eb51d7ea4940bac05cdcf5eafde951ed1eaa174468f5ede03e61106e1633e3428964b34c96de76321ed8853b398fbe8c4d072
+                "https://repo.msys2.org/msys/x86_64/gmp-6.2.0-1-x86_64.pkg.tar.xz"
+                1389a443e775bb255d905665dd577bef7ed71d51a8c24d118097f8119c08c4dfe67505e88ddd1e9a3764dd1d50ed8b84fa34abefa797d257e90586f0cbf54de8
+        )
     else()
-        vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils make pkg-config)
+        vcpkg_acquire_msys(MSYS_ROOT)
     endif()
 
     set(SHELL ${MSYS_ROOT}/usr/bin/bash.exe)
     set(OPTIONS "--toolchain=msvc ${OPTIONS}")
 else()
-    set(ENV{PATH} "$ENV{PATH}:${YASM_EXE_PATH}")
     set(SHELL /bin/sh)
 endif()
 
-set(ENV{${INCLUDE_VAR}} "${CURRENT_INSTALLED_DIR}/include${SEP}$ENV{${INCLUDE_VAR}}")
+set(ENV{${INCLUDE_VAR}} "${CURRENT_INSTALLED_DIR}/include${VCPKG_HOST_PATH_SEPARATOR}$ENV{${INCLUDE_VAR}}")
 
 set(_csc_PROJECT_PATH ffmpeg)
 
@@ -333,7 +344,7 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU
     vcpkg_find_acquire_program(GASPREPROCESSOR)
     foreach(GAS_PATH ${GASPREPROCESSOR})
         get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY)
-        set(ENV{PATH} "$ENV{PATH};${GAS_ITEM_PATH}")
+        set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}")
     endforeach(GAS_PATH)
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
@@ -382,7 +393,7 @@ message(STATUS "Building Options: ${OPTIONS}")
 # Release build
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
     message(STATUS "Building Release Options: ${OPTIONS_RELEASE}")
-    set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${SEP}${ENV_LIB_PATH}")
+    set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}")
     set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")
     set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}")
     set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig")
@@ -405,7 +416,7 @@ endif()
 # Debug build
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
     message(STATUS "Building Debug Options: ${OPTIONS_DEBUG}")
-    set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${SEP}${ENV_LIB_PATH}")
+    set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}")
     set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}")
     set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}")
     set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig")
@@ -425,36 +436,36 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
     )
 endif()
 
-file(GLOB DEF_FILES ${CURRENT_PACKAGES_DIR}/lib/*.def ${CURRENT_PACKAGES_DIR}/debug/lib/*.def)
-
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    set(LIB_MACHINE_ARG /machine:ARM)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(LIB_MACHINE_ARG /machine:ARM64)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(LIB_MACHINE_ARG /machine:x86)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(LIB_MACHINE_ARG /machine:x64)
-else()
-    message(FATAL_ERROR "Unsupported target architecture")
-endif()
-
-foreach(DEF_FILE ${DEF_FILES})
-    get_filename_component(DEF_FILE_DIR "${DEF_FILE}" DIRECTORY)
-    get_filename_component(DEF_FILE_NAME "${DEF_FILE}" NAME)
-    string(REGEX REPLACE "-[0-9]*\\.def" "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" OUT_FILE_NAME "${DEF_FILE_NAME}")
-    file(TO_NATIVE_PATH "${DEF_FILE}" DEF_FILE_NATIVE)
-    file(TO_NATIVE_PATH "${DEF_FILE_DIR}/${OUT_FILE_NAME}" OUT_FILE_NATIVE)
-    message(STATUS "Generating ${OUT_FILE_NATIVE}")
-    vcpkg_execute_required_process(
-        COMMAND lib.exe /def:${DEF_FILE_NATIVE} /out:${OUT_FILE_NATIVE} ${LIB_MACHINE_ARG}
-        WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}
-        LOGNAME libconvert-${TARGET_TRIPLET}
-    )
-endforeach()
+if(VCPKG_TARGET_IS_WINDOWS)
+    file(GLOB DEF_FILES ${CURRENT_PACKAGES_DIR}/lib/*.def ${CURRENT_PACKAGES_DIR}/debug/lib/*.def)
+
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+        set(LIB_MACHINE_ARG /machine:ARM)
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+        set(LIB_MACHINE_ARG /machine:ARM64)
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+        set(LIB_MACHINE_ARG /machine:x86)
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+        set(LIB_MACHINE_ARG /machine:x64)
+    else()
+        message(FATAL_ERROR "Unsupported target architecture")
+    endif()
 
-# Handle tools
-if (VCPKG_TARGET_IS_WINDOWS)
+    foreach(DEF_FILE ${DEF_FILES})
+        get_filename_component(DEF_FILE_DIR "${DEF_FILE}" DIRECTORY)
+        get_filename_component(DEF_FILE_NAME "${DEF_FILE}" NAME)
+        string(REGEX REPLACE "-[0-9]*\\.def" "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" OUT_FILE_NAME "${DEF_FILE_NAME}")
+        file(TO_NATIVE_PATH "${DEF_FILE}" DEF_FILE_NATIVE)
+        file(TO_NATIVE_PATH "${DEF_FILE_DIR}/${OUT_FILE_NAME}" OUT_FILE_NATIVE)
+        message(STATUS "Generating ${OUT_FILE_NATIVE}")
+        vcpkg_execute_required_process(
+            COMMAND lib.exe /def:${DEF_FILE_NATIVE} /out:${OUT_FILE_NATIVE} ${LIB_MACHINE_ARG}
+            WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}
+            LOGNAME libconvert-${TARGET_TRIPLET}
+        )
+    endforeach()
+
+    # Handle tools
     file(GLOB EXP_FILES ${CURRENT_PACKAGES_DIR}/lib/*.exp ${CURRENT_PACKAGES_DIR}/debug/lib/*.exp)
     file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX})
     file(GLOB EXE_FILES_REL ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX})
@@ -484,15 +495,15 @@ vcpkg_copy_pdbs()
 
 # Handle copyright
 file(STRINGS ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-out.log LICENSE_STRING REGEX "License: .*" LIMIT_COUNT 1)
-if(${LICENSE_STRING} STREQUAL "License: LGPL version 2.1 or later")
+if(LICENSE_STRING STREQUAL "License: LGPL version 2.1 or later")
     set(LICENSE_FILE "COPYING.LGPLv2.1")
-elseif(${LICENSE_STRING} STREQUAL "License: LGPL version 3 or later")
+elseif(LICENSE_STRING STREQUAL "License: LGPL version 3 or later")
     set(LICENSE_FILE "COPYING.LGPLv3")
-elseif(${LICENSE_STRING} STREQUAL "License: GPL version 2 or later")
+elseif(LICENSE_STRING STREQUAL "License: GPL version 2 or later")
     set(LICENSE_FILE "COPYING.GPLv2")
-elseif(${LICENSE_STRING} STREQUAL "License: GPL version 3 or later")
+elseif(LICENSE_STRING STREQUAL "License: GPL version 3 or later")
     set(LICENSE_FILE "COPYING.GPLv3")
-elseif(${LICENSE_STRING} STREQUAL "License: nonfree and unredistributable")
+elseif(LICENSE_STRING STREQUAL "License: nonfree and unredistributable")
     set(LICENSE_FILE "COPYING.NONFREE")
     file(WRITE ${SOURCE_PATH}/${LICENSE_FILE} ${LICENSE_STRING})
 else()
diff --git a/ports/kf5i18n/CONTROL b/ports/kf5i18n/CONTROL
index 4cb5ce4d5..d963ed008 100644
--- a/ports/kf5i18n/CONTROL
+++ b/ports/kf5i18n/CONTROL
@@ -1,5 +1,6 @@
 Source: kf5i18n

 Version: 5.64.0

+Port-Version: 1

 Homepage: https://api.kde.org/frameworks/ki18n/html/index.html

 Description: Advanced internationalization framework

 Build-Depends: ecm, qt5-declarative, qt5-tools, gettext

diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake
index efa22a577..779fd60e8 100644
--- a/ports/kf5i18n/portfile.cmake
+++ b/ports/kf5i18n/portfile.cmake
@@ -6,7 +6,22 @@ vcpkg_from_github(
 )

 

 if(CMAKE_HOST_WIN32)

-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES mingw-w64-i686-gettext)

+    vcpkg_acquire_msys(MSYS_ROOT NO_DEFAULT_PACKAGES DIRECT_PACKAGES

+        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-9-any.pkg.tar.zst"

+        c632877544183def8b19659421c5511b87f8339596e1606bd47608277a0bf427d370aba1732915c2832c91f6d525261623401f145b951ff3015f79ac54179c19

+        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-1-any.pkg.tar.xz"

+        ba236e1efc990cb91d459f938be6ca6fc2211be95e888d73f8de301bce55d586f9d2b6be55dacb975ec1afa7952b510906284eff70210238919e341dffbdbeb8

+        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-10.2.0-1-any.pkg.tar.zst"

+        113d8b3b155ea537be8b99688d454f781d70c67c810c2643bc02b83b332d99bfbf3a7fcada6b927fda67ef02cf968d4fdf930466c5909c4338bda64f1f3f483e

+        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst"

+        2c3d9e6b2eee6a4c16fd69ddfadb6e2dc7f31156627d85845c523ac85e5c585d4cfa978659b1fe2ec823d44ef57bc2b92a6127618ff1a8d7505458b794f3f01c

+        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.1.0-1-any.pkg.tar.xz"

+        d236b815ec3cf569d24d96a386eca9f69a2b1e8af18e96c3f1e5a4d68a3598d32768c7fb3c92207ecffe531259822c1a421350949f2ffabd8ee813654f1af864

+        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.1.0-2-any.pkg.tar.zst"

+        caac5cb73395082b479597a73c7398bf83009dbc0051755ef15157dc34996e156d4ed7881ef703f9e92861cfcad000888c4c32e4bf38b2596c415a19aafcf893

+        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.0-1-any.pkg.tar.xz"

+        37747f3f373ebff1a493f5dec099f8cd6d5abdc2254d9cd68a103ad7ba44a81a9a97ccaba76eaee427b4d67b2becb655ee2c379c2e563c8051b6708431e3c588

+    )

     set(GETTEXT_PATH ${MSYS_ROOT}/mingw32/bin)

     vcpkg_add_to_path(${GETTEXT_PATH})

 endif()

diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL
index 5bb5ca6f5..d44258412 100644
--- a/ports/lapack-reference/CONTROL
+++ b/ports/lapack-reference/CONTROL
@@ -13,5 +13,5 @@ Build-Depends: openblas
 Description: Use external optimized BLAS

 

 Feature: blas-select

-Build-Depends: lapack-reference[core, noblas](!windows|(windows&!static))

+Build-Depends: lapack-reference[core, noblas](!windows|!static)

 Description: Use external optimized BLAS

diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake
index 39159abf7..11655858c 100644
--- a/ports/lapack-reference/portfile.cmake
+++ b/ports/lapack-reference/portfile.cmake
@@ -113,12 +113,11 @@ if("cblas" IN_LIST FEATURES)
     endif()

 endif()

 vcpkg_fixup_pkgconfig()

-vcpkg_copy_pdbs()

 

 # Handle copyright

 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

 

-# remove debug includs

+# remove debug includes

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

 

 if(VCPKG_TARGET_IS_WINDOWS)

diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL
index 8d578a2a1..a61d534b5 100644
--- a/ports/libvpx/CONTROL
+++ b/ports/libvpx/CONTROL
@@ -1,5 +1,6 @@
 Source: libvpx

 Version: 1.9.0

+Port-Version: 1

 Homepage: https://github.com/webmproject/libvpx

 Description: The reference software implementation for the video coding formats VP8 and VP9.

 Supports: !(uwp&arm)

diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
index 390d059c7..1e4ad6d3c 100644
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@@ -18,7 +18,6 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 
 if(CMAKE_HOST_WIN32)
 	vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)
-	vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils)
 	set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
 	set(ENV{PATH} "${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
 else()
diff --git a/ports/tensorflow-cc/CONTROL b/ports/tensorflow-cc/CONTROL
index 6fa024164..2d0ff5007 100644
--- a/ports/tensorflow-cc/CONTROL
+++ b/ports/tensorflow-cc/CONTROL
@@ -1,6 +1,6 @@
 Source: tensorflow-cc
 Version: 1.14
-Port-Version: 4
+Port-Version: 5
 Description: Library for computation using data flow graphs for scalable machine learning
 Build-Depends: c-ares
 Supports: !x86
diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake
index fdd95307c..0aa53e7ae 100644
--- a/ports/tensorflow-cc/portfile.cmake
+++ b/ports/tensorflow-cc/portfile.cmake
@@ -26,22 +26,21 @@ get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path(PREPEND ${PYTHON3_DIR})
 set(ENV{PYTHON_BIN_PATH} "${PYTHON3}")
 
+vcpkg_find_acquire_program(GIT)
+get_filename_component(GIT_DIR "${GIT}" DIRECTORY)
+vcpkg_add_to_path(PREPEND ${GIT_DIR})
+
 function(tensorflow_try_remove_recurse_wait PATH_TO_REMOVE)
     file(REMOVE_RECURSE ${PATH_TO_REMOVE})
     if (EXISTS "${PATH_TO_REMOVE}")
-        execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5)
+        _execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5)
         file(REMOVE_RECURSE ${PATH_TO_REMOVE})
     endif()
 endfunction()
 
-# we currently only support the release version
-tensorflow_try_remove_recurse_wait(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-file(GLOB SOURCES ${SOURCE_PATH}/*)
-file(COPY ${SOURCES} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-
 if(CMAKE_HOST_WIN32)
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES unzip patch diffutils git)
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES bash unzip patch diffutils libintl gzip coreutils)
+    vcpkg_add_to_path(${MSYS_ROOT}/usr/bin)
     set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
     set(ENV{BAZEL_SH} ${MSYS_ROOT}/usr/bin/bash.exe)
 
@@ -50,6 +49,11 @@ if(CMAKE_HOST_WIN32)
     set(ENV{BAZEL_VC_FULL_VERSION} $ENV{VCToolsVersion})
 endif()
 
+# we currently only support the release version
+tensorflow_try_remove_recurse_wait(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+file(RENAME ${SOURCE_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
+
 # tensorflow has long file names, which will not work on windows
 set(ENV{TEST_TMPDIR} ${CURRENT_BUILDTREES_DIR}/../.bzl)
 
diff --git a/ports/vcpkg-gfortran/CONTROL b/ports/vcpkg-gfortran/CONTROL
index 80484175a..24bf1ce87 100644
--- a/ports/vcpkg-gfortran/CONTROL
+++ b/ports/vcpkg-gfortran/CONTROL
@@ -1,4 +1,4 @@
 Source: vcpkg-gfortran

-Version: 1

+Version: 3

 Description: Metaport to install gfortran dependencies from msys if VCPKG_USE_EXTERNAL_Fortran is false

 Supports: windows & !arm
\ No newline at end of file
diff --git a/ports/vcpkg-gfortran/portfile.cmake b/ports/vcpkg-gfortran/portfile.cmake
index 5dd1965cd..7939c7684 100644
--- a/ports/vcpkg-gfortran/portfile.cmake
+++ b/ports/vcpkg-gfortran/portfile.cmake
@@ -32,22 +32,21 @@ if(VCPKG_USE_INTERNAL_Fortran)
         message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" )

     endif()

 

-

-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES "mingw-w64-${MSYS_TARGET}-gcc-fortran") # TODO: make x86 work

-

-    set(MINGW_BIN "${MSYS_ROOT}/mingw${MINGW_W_TARGET}/bin/")

-    set(MINGW_Fortran_DLLS "${MINGW_BIN}/libgfortran-5.dll"

-                           "${MINGW_BIN}/libquadmath-0.dll"

-                           "${MINGW_BIN}/libwinpthread-1.dll"

-                           "${MINGW_BIN}/libgcc_${GCC_LIB_SUFFIX}.dll")

-    file(INSTALL ${MINGW_Fortran_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")

-    file(INSTALL ${MINGW_Fortran_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")

+    set(MINGW_BIN "${vcpkg_find_fortran_MSYS_ROOT}/mingw${MINGW_W_TARGET}/bin/")

+    set(MINGW_Fortran_DLLS

+        "${MINGW_BIN}/libgfortran-5.dll"

+        "${MINGW_BIN}/libquadmath-0.dll"

+        "${MINGW_BIN}/libwinpthread-1.dll"

+        "${MINGW_BIN}/libgcc_${GCC_LIB_SUFFIX}.dll"

+    )

+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

+    file(COPY ${MINGW_Fortran_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")

+    file(COPY ${MINGW_Fortran_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")

+    file(COPY "${vcpkg_find_fortran_MSYS_ROOT}/mingw${MINGW_W_TARGET}/share/licenses" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

+    file(INSTALL "${vcpkg_find_fortran_MSYS_ROOT}/mingw${MINGW_W_TARGET}/share/licenses/crt/COPYING.MinGW-w64-runtime.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

     set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled) # due to outdated msvcrt

     set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)

     set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

-    file(INSTALL "${MSYS_ROOT}/mingw${MINGW_W_TARGET}/share/licenses/winpthreads" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/license")

-    file(INSTALL "${MSYS_ROOT}/mingw${MINGW_W_TARGET}/share/licenses/gcc-libs" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/license")

-    file(INSTALL "${MSYS_ROOT}/mingw${MINGW_W_TARGET}/share/licenses/crt/COPYING.MinGW-w64-runtime.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

 else()

     set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

 endif()
\ No newline at end of file