From 8d4b8c7c3ffc099c2ff80bb5c47c5a829f4eb97a Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 8 Mar 2022 10:35:38 +0100
Subject: [PATCH 01/32] add vcpkg-tool-lessmsi

---
 ports/vcpkg-tool-lessmsi/portfile.cmake | 17 +++++++++++++++++
 ports/vcpkg-tool-lessmsi/vcpkg.json     |  7 +++++++
 2 files changed, 24 insertions(+)
 create mode 100644 ports/vcpkg-tool-lessmsi/portfile.cmake
 create mode 100644 ports/vcpkg-tool-lessmsi/vcpkg.json

diff --git a/ports/vcpkg-tool-lessmsi/portfile.cmake b/ports/vcpkg-tool-lessmsi/portfile.cmake
new file mode 100644
index 00000000000000..aa5ad14004e2ae
--- /dev/null
+++ b/ports/vcpkg-tool-lessmsi/portfile.cmake
@@ -0,0 +1,17 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+set(version v1.10.0)
+
+vcpkg_download_distfile(archive_path
+    URLS "https://github.com/activescott/lessmsi/releases/download/${version}/lessmsi-${version}.zip"
+    FILENAME "lessmsi-${version}"
+    SHA512 91be9363d75e8ca0129304008ddc26fe575cc4fd76d7f43ef0a6ff414855dc1c6e412f4e694b2950026e02cc3d31b18bd8c2e4c03e1ddce01477f3f2d2197479
+)
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+vcpkg_execute_in_download_mode(
+                    COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}"
+                    WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}"
+                )
+
diff --git a/ports/vcpkg-tool-lessmsi/vcpkg.json b/ports/vcpkg-tool-lessmsi/vcpkg.json
new file mode 100644
index 00000000000000..8a933ec9b8bff7
--- /dev/null
+++ b/ports/vcpkg-tool-lessmsi/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "vcpkg-tool-lessmsi",
+  "version": "1.10.0",
+  "description": "This is a utility with a graphical user interface and a command line interface that can be used to view and extract the contents of an MSI file.",
+  "homepage": "https://github.com/activescott/lessmsi",
+  "supports": "native & windows"
+}

From 96033d19fa0ac8c2cf6f5c133f9b41f6f9dfea4f Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 8 Mar 2022 10:35:52 +0100
Subject: [PATCH 02/32] add vcpkg-tool-python2

---
 ports/vcpkg-tool-python2/portfile.cmake | 49 +++++++++++++++++++++++++
 ports/vcpkg-tool-python2/vcpkg.json     | 14 +++++++
 2 files changed, 63 insertions(+)
 create mode 100644 ports/vcpkg-tool-python2/portfile.cmake
 create mode 100644 ports/vcpkg-tool-python2/vcpkg.json

diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake
new file mode 100644
index 00000000000000..519a916ec13efd
--- /dev/null
+++ b/ports/vcpkg-tool-python2/portfile.cmake
@@ -0,0 +1,49 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(program_name python)
+    set(program_version 2.7.18)
+    if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+        set(tool_subdirectory "python-${program_version}-x86")
+        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi")
+        set(download_filename "python-${program_version}.msi")
+        set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115)
+    else()
+        set(tool_subdirectory "python-${program_version}-x64")
+        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi")
+        set(download_filename "python-${program_version}.amd64.msi")
+        set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
+    endif()
+    set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+    vcpkg_download_distfile(archive_path
+        URLS ${download_urls}
+        SHA512 "${download_sha512}"
+        FILENAME "${download_filename}"
+    )
+    set(output_path "${CURRENT_PACKAGES_DIR}/tools")
+    file(MAKE_DIRECTORY "${output_path}")
+    cmake_path(NATIVE_PATH archive_path archive_path_native) # lessmsi is a bit picky about path formats.
+    message(STATUS "Extracting Python2 ...")
+    vcpkg_execute_in_download_mode(
+                    COMMAND "${CURRENT_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" x "${archive_path_native}" # Using output_path here does not work in bash
+                    WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" 
+                    OUTPUT_FILE "lessmsi-${arg_FILENAME}-out.log"
+                    ERROR_FILE "lessmsi-${arg_FILENAME}-err.log"
+                    RESULT_VARIABLE error_code
+                )
+    if(error_code)
+        message(FATAL_ERROR "Couldn't extract Python2 with lessmsi!")
+    endif()
+    message(STATUS "Extracting Python2 ... finished!")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/python-2.7.18.amd64/SourceDir/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/python-2.7.18.amd64")
+    z_vcpkg_find_acquire_program_find_internal("${program}"
+        INTERPRETER "${interpreter}"
+        PATHS ${paths_to_search}
+        NAMES ${search_names}
+    )
+    message(STATUS "Using python2: ${PYTHON2}")
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/version.txt" "${program_version}") # For vcpkg_find_acquire_program
+endif()
+
diff --git a/ports/vcpkg-tool-python2/vcpkg.json b/ports/vcpkg-tool-python2/vcpkg.json
new file mode 100644
index 00000000000000..68fb1d93c47950
--- /dev/null
+++ b/ports/vcpkg-tool-python2/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "vcpkg-tool-python2",
+  "version": "2.7.18",
+  "description": "Python 2",
+  "homepage": "https://www.python.org/download/releases/2.0/",
+  "supports": "native",
+  "dependencies": [
+    {
+      "name": "vcpkg-tool-lessmsi",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
+}

From 3dd148b39528f4599ba0f502ae47215965137264 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 8 Mar 2022 10:36:18 +0100
Subject: [PATCH 03/32] adjust vcpkg_find_acquire_program

---
 .../cmake/vcpkg_find_acquire_program.cmake    | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 591230cfe3be21..1c5c3ca9a7870d 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -270,18 +270,23 @@ function(vcpkg_find_acquire_program program)
         if(CMAKE_HOST_WIN32)
             set(program_name python)
             set(program_version 2.7.18)
-            if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
-                set(tool_subdirectory "python-${program_version}-x86")
-                set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi")
-                set(download_filename "python-${program_version}.msi")
-                set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115)
-            else()
-                set(tool_subdirectory "python-${program_version}-x64")
-                set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi")
-                set(download_filename "python-${program_version}.amd64.msi")
-                set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
+            if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/version.txt")
+                file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/version.txt" program_version)
+                set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-python2")
+            else() # Old behavior
+                if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+                    set(tool_subdirectory "python-${program_version}-x86")
+                    set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi")
+                    set(download_filename "python-${program_version}.msi")
+                    set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115)
+                else()
+                    set(tool_subdirectory "python-${program_version}-x64")
+                    set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi")
+                    set(download_filename "python-${program_version}.amd64.msi")
+                    set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
+                endif()
+                set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
             endif()
-            set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
         elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
             # macOS includes Python 2.7 built-in as `python`
             set(program_name python)

From fbcf2b5a08e4e2d9fb7784c7286bbbc1dfee504f Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 8 Mar 2022 10:36:44 +0100
Subject: [PATCH 04/32] use python2 dependency in qt5-base

---
 ports/qt5-base/vcpkg.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index 382d75830b2122..1762f1350acd58 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5-base",
   "version": "5.15.3",
+  "port-version": 1,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -35,6 +36,10 @@
       "name": "vcpkg-pkgconfig-get-modules",
       "host": true
     },
+    {
+      "name": "vcpkg-tool-python2",
+      "host": true
+    },
     "zlib",
     "zstd"
   ],

From 3a4868c735d9d17db561aa4af3d4bed7440355ad Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 8 Mar 2022 10:38:20 +0100
Subject: [PATCH 05/32] remove python2 from qt5-base

---
 ports/qt5-base/cmake/qt_build_submodule.cmake | 4 ----
 ports/qt5-base/vcpkg.json                     | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake
index 52f9c6c1ba3f7f..ddbd81d3c5867c 100644
--- a/ports/qt5-base/cmake/qt_build_submodule.cmake
+++ b/ports/qt5-base/cmake/qt_build_submodule.cmake
@@ -3,10 +3,6 @@ function(qt_build_submodule SOURCE_PATH)
     # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
     set(ENV{_CL_} "/utf-8")
 
-    vcpkg_find_acquire_program(PYTHON2)
-    get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
-    vcpkg_add_to_path("${PYTHON2_EXE_PATH}")
-
     vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH} ${ARGV})
 
     vcpkg_build_qmake(SKIP_MAKEFILES)
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index 1762f1350acd58..fc71f36968ad7f 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -36,10 +36,6 @@
       "name": "vcpkg-pkgconfig-get-modules",
       "host": true
     },
-    {
-      "name": "vcpkg-tool-python2",
-      "host": true
-    },
     "zlib",
     "zstd"
   ],

From dfffbf87883500f948fd28fc38f5e7b4fe5189df Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 8 Mar 2022 10:38:33 +0100
Subject: [PATCH 06/32] add python2 to qt5-webengine

---
 ports/qt5-webengine/portfile.cmake | 4 ++++
 ports/qt5-webengine/vcpkg.json     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake
index 60020c83f8a139..368f34a86344bb 100644
--- a/ports/qt5-webengine/portfile.cmake
+++ b/ports/qt5-webengine/portfile.cmake
@@ -15,6 +15,10 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
 endif()
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 
+vcpkg_find_acquire_program(PYTHON2)
+get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
+vcpkg_add_to_path("${PYTHON2_EXE_PATH}")
+
 vcpkg_find_acquire_program(FLEX)
 vcpkg_find_acquire_program(BISON)
 vcpkg_find_acquire_program(GPERF)
diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json
index 3ea9d9a5e071fa..f6349b28bf7832 100644
--- a/ports/qt5-webengine/vcpkg.json
+++ b/ports/qt5-webengine/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5-webengine",
   "version": "5.15.3",
+  "port-version": 1,
   "description": "Qt5 webengine Module;",
   "license": null,
   "supports": "!static",

From 77d263fa8fe492c8e4f3d4e2cd60b800b58a98f9 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 8 Mar 2022 10:42:27 +0100
Subject: [PATCH 07/32] use python3 instead of python2

---
 ports/qt5-base/cmake/qt_build_submodule.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake
index ddbd81d3c5867c..e2e390cec1cf43 100644
--- a/ports/qt5-base/cmake/qt_build_submodule.cmake
+++ b/ports/qt5-base/cmake/qt_build_submodule.cmake
@@ -3,6 +3,12 @@ function(qt_build_submodule SOURCE_PATH)
     # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
     set(ENV{_CL_} "/utf-8")
 
+    if(NOT PORT STREQUAL "qt5-webengine")
+        vcpkg_find_acquire_program(PYTHON3)
+        get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
+        vcpkg_add_to_path("${PYTHON3_EXE_PATH}")
+    endif()
+
     vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH} ${ARGV})
 
     vcpkg_build_qmake(SKIP_MAKEFILES)

From 56b2f32dce669d6b86628fb9adcdf4dcb08d1b48 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 8 Mar 2022 10:46:58 +0100
Subject: [PATCH 08/32] add some deps on the new vcpkg-tool-python2

---
 ports/blitz/vcpkg.json             | 6 +++++-
 ports/qt5-webengine/portfile.cmake | 4 ----
 ports/shiva/vcpkg.json             | 8 ++++++--
 ports/v8/vcpkg.json                | 6 +++++-
 ports/vcpkg-gn/vcpkg.json          | 9 ++++++++-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/ports/blitz/vcpkg.json b/ports/blitz/vcpkg.json
index 9702bfec2ed2b4..ae7a7f58f08f7b 100644
--- a/ports/blitz/vcpkg.json
+++ b/ports/blitz/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "blitz",
   "version-string": "2020-03-25",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.",
   "homepage": "https://github.com/blitzpp/blitz",
   "supports": "!(arm | arm64 | uwp)",
@@ -13,6 +13,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python2",
+      "host": true
     }
   ]
 }
diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake
index 368f34a86344bb..60020c83f8a139 100644
--- a/ports/qt5-webengine/portfile.cmake
+++ b/ports/qt5-webengine/portfile.cmake
@@ -15,10 +15,6 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
 endif()
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 
-vcpkg_find_acquire_program(PYTHON2)
-get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
-vcpkg_add_to_path("${PYTHON2_EXE_PATH}")
-
 vcpkg_find_acquire_program(FLEX)
 vcpkg_find_acquire_program(BISON)
 vcpkg_find_acquire_program(GPERF)
diff --git a/ports/shiva/vcpkg.json b/ports/shiva/vcpkg.json
index d080dd5a026c84..6205db29bbf10d 100644
--- a/ports/shiva/vcpkg.json
+++ b/ports/shiva/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "shiva",
   "version-string": "1.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Modern C++ Game Engine",
   "homepage": "https://github.com/Milerius/shiva",
   "dependencies": [
@@ -17,6 +17,10 @@
     "nlohmann-json",
     "pybind11",
     "sol2",
-    "spdlog"
+    "spdlog",
+    {
+      "name": "vcpkg-tool-python2",
+      "host": true
+    }
   ]
 }
diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json
index fa621d36e3438e..5f82dceb8c4acd 100644
--- a/ports/v8/vcpkg.json
+++ b/ports/v8/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "v8",
   "version": "9.1.269.39",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Google Chrome's JavaScript engine",
   "homepage": "https://v8.dev",
   "supports": "!(arm | arm64 | uwp | osx)",
@@ -15,6 +15,10 @@
       "name": "pthread",
       "platform": "linux"
     },
+    {
+      "name": "vcpkg-tool-python2",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/ports/vcpkg-gn/vcpkg.json b/ports/vcpkg-gn/vcpkg.json
index 64bdccd0e68a1f..26d89e6802de25 100644
--- a/ports/vcpkg-gn/vcpkg.json
+++ b/ports/vcpkg-gn/vcpkg.json
@@ -1,6 +1,13 @@
 {
   "name": "vcpkg-gn",
   "version-date": "2021-11-16",
+  "port-version": 1,
   "description": "https://gn.googlesource.com/gn/+/4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e",
-  "supports": "native & !x86"
+  "supports": "native & !x86",
+  "dependencies": [
+    {
+      "name": "vcpkg-tool-python2",
+      "host": true
+    }
+  ]
 }

From c6ae452205a7b0c287785dd7d7168f591ad4d571 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Tue, 8 Mar 2022 21:16:28 +0100
Subject: [PATCH 09/32] Apply suggestions from code review

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
---
 ports/vcpkg-tool-lessmsi/portfile.cmake | 10 +++++-----
 ports/vcpkg-tool-python2/portfile.cmake |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/vcpkg-tool-lessmsi/portfile.cmake b/ports/vcpkg-tool-lessmsi/portfile.cmake
index aa5ad14004e2ae..cd523cf412cbc3 100644
--- a/ports/vcpkg-tool-lessmsi/portfile.cmake
+++ b/ports/vcpkg-tool-lessmsi/portfile.cmake
@@ -4,14 +4,14 @@ set(version v1.10.0)
 
 vcpkg_download_distfile(archive_path
     URLS "https://github.com/activescott/lessmsi/releases/download/${version}/lessmsi-${version}.zip"
-    FILENAME "lessmsi-${version}"
+    FILENAME "lessmsi-${version}.zip"
     SHA512 91be9363d75e8ca0129304008ddc26fe575cc4fd76d7f43ef0a6ff414855dc1c6e412f4e694b2950026e02cc3d31b18bd8c2e4c03e1ddce01477f3f2d2197479
 )
 
 file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
-vcpkg_execute_in_download_mode(
-                    COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}"
-                    WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}"
-                )
+file(ARCHIVE_EXTRACT
+    INPUT "${archive_path}"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}"
+)
 
diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake
index 519a916ec13efd..553f6d53c9486f 100644
--- a/ports/vcpkg-tool-python2/portfile.cmake
+++ b/ports/vcpkg-tool-python2/portfile.cmake
@@ -38,7 +38,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     message(STATUS "Extracting Python2 ... finished!")
     file(RENAME "${CURRENT_PACKAGES_DIR}/tools/python-2.7.18.amd64/SourceDir/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/python-2.7.18.amd64")
-    z_vcpkg_find_acquire_program_find_internal("${program}"
+    z_vcpkg_find_acquire_program_find_internal("PYTHON2"
         INTERPRETER "${interpreter}"
         PATHS ${paths_to_search}
         NAMES ${search_names}

From 23e9ddf9a08c26b8d9765bf22727b76db8003d4a Mon Sep 17 00:00:00 2001
From: Alexander Neumann <Alexander.Neumann@hamburg.de>
Date: Tue, 8 Mar 2022 21:24:15 +0100
Subject: [PATCH 10/32] add license field

---
 ports/vcpkg-tool-lessmsi/vcpkg.json | 1 +
 ports/vcpkg-tool-python2/vcpkg.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/vcpkg-tool-lessmsi/vcpkg.json b/ports/vcpkg-tool-lessmsi/vcpkg.json
index 8a933ec9b8bff7..df6fc3711bb9c7 100644
--- a/ports/vcpkg-tool-lessmsi/vcpkg.json
+++ b/ports/vcpkg-tool-lessmsi/vcpkg.json
@@ -3,5 +3,6 @@
   "version": "1.10.0",
   "description": "This is a utility with a graphical user interface and a command line interface that can be used to view and extract the contents of an MSI file.",
   "homepage": "https://github.com/activescott/lessmsi",
+  "license": "MIT",
   "supports": "native & windows"
 }
diff --git a/ports/vcpkg-tool-python2/vcpkg.json b/ports/vcpkg-tool-python2/vcpkg.json
index 68fb1d93c47950..ca7da2e86d106c 100644
--- a/ports/vcpkg-tool-python2/vcpkg.json
+++ b/ports/vcpkg-tool-python2/vcpkg.json
@@ -3,6 +3,7 @@
   "version": "2.7.18",
   "description": "Python 2",
   "homepage": "https://www.python.org/download/releases/2.0/",
+  "license": "PSF-2.0",
   "supports": "native",
   "dependencies": [
     {

From aaa4d0d3287467ad84efb50e77646f8e996bd266 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <Alexander.Neumann@hamburg.de>
Date: Tue, 8 Mar 2022 21:24:30 +0100
Subject: [PATCH 11/32] fix test detection

---
 ports/vcpkg-tool-python2/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake
index 553f6d53c9486f..bc02dc749be8c7 100644
--- a/ports/vcpkg-tool-python2/portfile.cmake
+++ b/ports/vcpkg-tool-python2/portfile.cmake
@@ -41,7 +41,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     z_vcpkg_find_acquire_program_find_internal("PYTHON2"
         INTERPRETER "${interpreter}"
         PATHS ${paths_to_search}
-        NAMES ${search_names}
+        NAMES ${program_name}
     )
     message(STATUS "Using python2: ${PYTHON2}")
     file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/version.txt" "${program_version}") # For vcpkg_find_acquire_program

From efc27a94ab17a14700040707cb284a760122d7d8 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <Alexander.Neumann@hamburg.de>
Date: Tue, 8 Mar 2022 21:25:46 +0100
Subject: [PATCH 12/32] error on failure to find python2

---
 ports/vcpkg-tool-python2/portfile.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake
index bc02dc749be8c7..aecbaf518481d4 100644
--- a/ports/vcpkg-tool-python2/portfile.cmake
+++ b/ports/vcpkg-tool-python2/portfile.cmake
@@ -43,6 +43,9 @@ if(VCPKG_TARGET_IS_WINDOWS)
         PATHS ${paths_to_search}
         NAMES ${program_name}
     )
+    if(NOT PYTHON2)
+        message(FATAL_ERROR "Unable to find python2: ${PYTHON2}")
+    endif()
     message(STATUS "Using python2: ${PYTHON2}")
     file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/version.txt" "${program_version}") # For vcpkg_find_acquire_program
 endif()

From f22f03ff7a3fe2540eaa2db3327fe1250378618e Mon Sep 17 00:00:00 2001
From: Alexander Neumann <Alexander.Neumann@hamburg.de>
Date: Tue, 8 Mar 2022 22:06:27 +0100
Subject: [PATCH 13/32] move logs to correct position.

---
 ports/vcpkg-tool-python2/portfile.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake
index aecbaf518481d4..342feee2ee8667 100644
--- a/ports/vcpkg-tool-python2/portfile.cmake
+++ b/ports/vcpkg-tool-python2/portfile.cmake
@@ -28,8 +28,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_execute_in_download_mode(
                     COMMAND "${CURRENT_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" x "${archive_path_native}" # Using output_path here does not work in bash
                     WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" 
-                    OUTPUT_FILE "lessmsi-${arg_FILENAME}-out.log"
-                    ERROR_FILE "lessmsi-${arg_FILENAME}-err.log"
+                    OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-out.log"
+                    ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-err.log"
                     RESULT_VARIABLE error_code
                 )
     if(error_code)

From af078219987156b91c45702128f258460f7796fc Mon Sep 17 00:00:00 2001
From: Alexander Neumann <Alexander.Neumann@hamburg.de>
Date: Tue, 8 Mar 2022 22:07:50 +0100
Subject: [PATCH 14/32] add dep to qtwebengine

---
 ports/qtwebengine/vcpkg.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json
index 64415d8f9fffe5..41109712622a0a 100644
--- a/ports/qtwebengine/vcpkg.json
+++ b/ports/qtwebengine/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "x86-windows is not within the upstream support matrix of Qt6",
   "name": "qtwebengine",
   "version": "6.2.3",
+  "port-version": 1,
   "description": "Qt WebEngine",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -107,6 +108,10 @@
       "name": "vcpkg-tool-nodejs",
       "host": true
     },
+    {
+      "name": "vcpkg-tool-python2",
+      "host": true
+    },
     {
       "name": "zlib",
       "platform": "!windows"

From 090a524c5234a1e1a3a1ef182e394fff82b2514c Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 10:27:56 +0100
Subject: [PATCH 15/32] adjust pybind cmake config.

---
 ports/pybind11/portfile.cmake | 4 ++++
 ports/pybind11/vcpkg.json     | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake
index 9b62eead88e972..b0a329c91d4868 100644
--- a/ports/pybind11/portfile.cmake
+++ b/ports/pybind11/portfile.cmake
@@ -22,5 +22,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/pybind11")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/")
 
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pybind11/pybind11Tools.cmake" 
+                    [=[find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=]
+                    [=[find_package(PythonLibs ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=]) # CMake's PythonLibs works better with vcpkg 
+
 # copy license
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json
index 54b0de0dfe1261..4e51db6aaaf25c 100644
--- a/ports/pybind11/vcpkg.json
+++ b/ports/pybind11/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "pybind11",
-  "version-semver": "2.9.1",
+  "version": "2.9.1",
+  "port-version": 1,
   "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code",
   "homepage": "https://github.com/pybind/pybind11",
   "license": "BSD-3-Clause",

From 3ecdab22a77480dfe5453b57323e5d6ab3b416ce Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 10:28:06 +0100
Subject: [PATCH 16/32] fix shiva

---
 ports/shiva/no_copy_dll.patch | 13 +++++++++++++
 ports/shiva/portfile.cmake    | 30 ++++++++++++++++++------------
 ports/shiva/vcpkg.json        |  7 ++++++-
 3 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 ports/shiva/no_copy_dll.patch

diff --git a/ports/shiva/no_copy_dll.patch b/ports/shiva/no_copy_dll.patch
new file mode 100644
index 00000000000000..add7f22a494d0c
--- /dev/null
+++ b/ports/shiva/no_copy_dll.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt
+index eef14ee87..d52a147d8 100644
+--- a/modules/python/CMakeLists.txt
++++ b/modules/python/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+ find_package(pybind11 CONFIG REQUIRED)
+ 
+ 
+-if (WIN32)
++if (WIN32 AND FALSE)
+     ## We need pyton dll
+     file(GLOB PYTHON_DLL ${PYTHON_LIBRARIES}/../*.dll)
+ 
diff --git a/ports/shiva/portfile.cmake b/ports/shiva/portfile.cmake
index 72beec0e05fd03..884a8de108656c 100644
--- a/ports/shiva/portfile.cmake
+++ b/ports/shiva/portfile.cmake
@@ -1,24 +1,30 @@
-vcpkg_find_acquire_program(PYTHON2)
-
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Milerius/shiva
         REF 1.0
         SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1
         HEAD_REF master
+        PATCHES no_copy_dll.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+find_library(PYTHON_RELEASE NAMES python310 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+find_library(PYTHON_DEBUG NAMES python310_d python310 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+include(SelectLibraryConfigurations)
+select_library_configurations(PYTHON)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
-		-DSHIVA_BUILD_TESTS=OFF
-		-DPYTHON_EXECUTABLE=${PYTHON2}
+        -DSHIVA_BUILD_TESTS=OFF
+        "-DPYTHON_LIBRARY=${PYTHON_LIBRARIES}"
+        "-DPYTHON_LIBRARIES=${PYTHON_LIBRARIES}"
+        "-DPYTHON_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/python3/python${VCPKG_EXECUTABLE_SUFFIX}"
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shiva)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/shiva")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/shiva)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/shiva/LICENSE ${CURRENT_PACKAGES_DIR}/share/shiva/copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
+file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/shiva")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/shiva/LICENSE" "${CURRENT_PACKAGES_DIR}/share/shiva/copyright")
diff --git a/ports/shiva/vcpkg.json b/ports/shiva/vcpkg.json
index 6205db29bbf10d..8eba03d1891c36 100644
--- a/ports/shiva/vcpkg.json
+++ b/ports/shiva/vcpkg.json
@@ -18,9 +18,14 @@
     "pybind11",
     "sol2",
     "spdlog",
+        {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
     {
-      "name": "vcpkg-tool-python2",
+      "name": "vcpkg-cmake-config",
       "host": true
     }
+    
   ]
 }

From b32919d7f86dd3eb7406e230c9fcb053f4f86d3d Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 10:28:44 +0100
Subject: [PATCH 17/32] move python2 to manual-tools adjust search path
 generate a details.cmake for vcpkg_find_acquire_program

---
 ports/vcpkg-tool-python2/portfile.cmake        | 18 ++++++++++++------
 ports/vcpkg-tool-python2/vcpkg.json            |  1 -
 scripts/cmake/vcpkg_find_acquire_program.cmake |  5 ++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake
index 342feee2ee8667..bf636810fe000f 100644
--- a/ports/vcpkg-tool-python2/portfile.cmake
+++ b/ports/vcpkg-tool-python2/portfile.cmake
@@ -14,20 +14,20 @@ if(VCPKG_TARGET_IS_WINDOWS)
         set(download_filename "python-${program_version}.amd64.msi")
         set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
     endif()
-    set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    set(paths_to_search "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
 
     vcpkg_download_distfile(archive_path
         URLS ${download_urls}
         SHA512 "${download_sha512}"
         FILENAME "${download_filename}"
     )
-    set(output_path "${CURRENT_PACKAGES_DIR}/tools")
+    set(output_path "${CURRENT_PACKAGES_DIR}/manual-tools") # vcpkg.cmake adds everything in /tools to CMAKE_PROGRAM_PATH. That is not desired for Python2
     file(MAKE_DIRECTORY "${output_path}")
     cmake_path(NATIVE_PATH archive_path archive_path_native) # lessmsi is a bit picky about path formats.
     message(STATUS "Extracting Python2 ...")
     vcpkg_execute_in_download_mode(
                     COMMAND "${CURRENT_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" x "${archive_path_native}" # Using output_path here does not work in bash
-                    WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" 
+                    WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools" 
                     OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-out.log"
                     ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-err.log"
                     RESULT_VARIABLE error_code
@@ -36,8 +36,12 @@ if(VCPKG_TARGET_IS_WINDOWS)
         message(FATAL_ERROR "Couldn't extract Python2 with lessmsi!")
     endif()
     message(STATUS "Extracting Python2 ... finished!")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/python-2.7.18.amd64/SourceDir/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/python-2.7.18.amd64")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/manual-tools/python-2.7.18.amd64/SourceDir/" "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}/")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/manual-tools/python-2.7.18.amd64"
+                        # Files below are not part of a msiexec installation/extraction. 
+                        "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}/Windows"
+                        "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}/Microsoft.VC90.CRT.manifest"
+                        "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}/msvcr90.dll")
     z_vcpkg_find_acquire_program_find_internal("PYTHON2"
         INTERPRETER "${interpreter}"
         PATHS ${paths_to_search}
@@ -47,6 +51,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
         message(FATAL_ERROR "Unable to find python2: ${PYTHON2}")
     endif()
     message(STATUS "Using python2: ${PYTHON2}")
-    file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/version.txt" "${program_version}") # For vcpkg_find_acquire_program
+    set(details "set(program_version \"${program_version}\")\n")
+    string(APPEND details "set(search_path \"\${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}\")\n")
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/details.cmake" "${details}")
 endif()
 
diff --git a/ports/vcpkg-tool-python2/vcpkg.json b/ports/vcpkg-tool-python2/vcpkg.json
index ca7da2e86d106c..a5714ef109c42f 100644
--- a/ports/vcpkg-tool-python2/vcpkg.json
+++ b/ports/vcpkg-tool-python2/vcpkg.json
@@ -4,7 +4,6 @@
   "description": "Python 2",
   "homepage": "https://www.python.org/download/releases/2.0/",
   "license": "PSF-2.0",
-  "supports": "native",
   "dependencies": [
     {
       "name": "vcpkg-tool-lessmsi",
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 1c5c3ca9a7870d..13ba7c59717916 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -270,9 +270,8 @@ function(vcpkg_find_acquire_program program)
         if(CMAKE_HOST_WIN32)
             set(program_name python)
             set(program_version 2.7.18)
-            if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/version.txt")
-                file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/version.txt" program_version)
-                set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-python2")
+            if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake")
+                include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake")
             else() # Old behavior
                 if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
                     set(tool_subdirectory "python-${program_version}-x86")

From 17495879e7435ff0eebd6588e54ea61c32a73ab5 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 10:30:54 +0100
Subject: [PATCH 18/32] format manifest

---
 ports/shiva/vcpkg.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/shiva/vcpkg.json b/ports/shiva/vcpkg.json
index 8eba03d1891c36..c9c16c091fb79c 100644
--- a/ports/shiva/vcpkg.json
+++ b/ports/shiva/vcpkg.json
@@ -18,7 +18,7 @@
     "pybind11",
     "sol2",
     "spdlog",
-        {
+    {
       "name": "vcpkg-cmake",
       "host": true
     },
@@ -26,6 +26,5 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-    
   ]
 }

From e72457c33f51832e457650f910f19a15e540b964 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 10:31:39 +0100
Subject: [PATCH 19/32] use version-date

---
 ports/blitz/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/blitz/vcpkg.json b/ports/blitz/vcpkg.json
index ae7a7f58f08f7b..93da72b81b94aa 100644
--- a/ports/blitz/vcpkg.json
+++ b/ports/blitz/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version-string": "2020-03-25",
+  "version-date": "2020-03-25",
   "port-version": 5,
   "description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.",
   "homepage": "https://github.com/blitzpp/blitz",

From 4e89c52f08b5974ad6000f92e9693de23e0be8ae Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 10:33:03 +0100
Subject: [PATCH 20/32] version stuff

---
 versions/b-/blitz.json         |  5 +++++
 versions/baseline.json         | 10 +++++-----
 versions/p-/pybind11.json      |  5 +++++
 versions/q-/qt5-base.json      |  5 +++++
 versions/q-/qt5-webengine.json |  5 +++++
 versions/q-/qtwebengine.json   |  5 +++++
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/versions/b-/blitz.json b/versions/b-/blitz.json
index 6e37493626607f..bda1fc086b5dab 100644
--- a/versions/b-/blitz.json
+++ b/versions/b-/blitz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "58bca2588e7ff4935893cfebdf1d9665f95f846e",
+      "version-date": "2020-03-25",
+      "port-version": 5
+    },
     {
       "git-tree": "694507bc15d282e3de5160a0a221abfa381e6327",
       "version-string": "2020-03-25",
diff --git a/versions/baseline.json b/versions/baseline.json
index 86debaebd51c1c..1cb2ba39611423 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -498,7 +498,7 @@
     },
     "blitz": {
       "baseline": "2020-03-25",
-      "port-version": 4
+      "port-version": 5
     },
     "blosc": {
       "baseline": "1.18.1",
@@ -5546,7 +5546,7 @@
     },
     "pybind11": {
       "baseline": "2.9.1",
-      "port-version": 0
+      "port-version": 1
     },
     "pystring": {
       "baseline": "1.1.3",
@@ -5614,7 +5614,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.3",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-canvas3d": {
       "baseline": "0",
@@ -5742,7 +5742,7 @@
     },
     "qt5-webengine": {
       "baseline": "5.15.3",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-webglplugin": {
       "baseline": "5.15.3",
@@ -5922,7 +5922,7 @@
     },
     "qtwebengine": {
       "baseline": "6.2.3",
-      "port-version": 0
+      "port-version": 1
     },
     "qtwebsockets": {
       "baseline": "6.2.3",
diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json
index a5ef5f03f1dd6b..179d5c534a8c99 100644
--- a/versions/p-/pybind11.json
+++ b/versions/p-/pybind11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b1eb3bb762f1ba08ffd2ffb216df9504ed9fda3c",
+      "version": "2.9.1",
+      "port-version": 1
+    },
     {
       "git-tree": "24ea84c002f9cc529a54996dbbf2e9b2cce9cadf",
       "version-semver": "2.9.1",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index fc639f17dda5a1..81218465f2f26e 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0b581b90072df50364b8c863110b2034a6b9f28e",
+      "version": "5.15.3",
+      "port-version": 1
+    },
     {
       "git-tree": "8c2fa92b6281b496e3aead1b02238ab7668c204a",
       "version": "5.15.3",
diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json
index b7b79a2326cb95..118798a7ba46fc 100644
--- a/versions/q-/qt5-webengine.json
+++ b/versions/q-/qt5-webengine.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7fe7896a89e7d25c2ebecd38cbc3697520b323c9",
+      "version": "5.15.3",
+      "port-version": 1
+    },
     {
       "git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad",
       "version": "5.15.3",
diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json
index d6fafe9794c1b5..72b1484513b766 100644
--- a/versions/q-/qtwebengine.json
+++ b/versions/q-/qtwebengine.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c09764532fe7b4367f6438db92b59f41cb3d4e52",
+      "version": "6.2.3",
+      "port-version": 1
+    },
     {
       "git-tree": "97ae42eec1de17a95e9d48132ee94dd80ab4a239",
       "version": "6.2.3",

From 6e2b0bca98505abc21bf7d94ffd83d3caa0291cb Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 11:03:46 +0100
Subject: [PATCH 21/32] replace version-string

---
 ports/shiva/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/shiva/vcpkg.json b/ports/shiva/vcpkg.json
index c9c16c091fb79c..447297bd066507 100644
--- a/ports/shiva/vcpkg.json
+++ b/ports/shiva/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "shiva",
-  "version-string": "1.0",
+  "version": "1.0",
   "port-version": 5,
   "description": "Modern C++ Game Engine",
   "homepage": "https://github.com/Milerius/shiva",

From 709fda6548f13aca843427613ff92c92089f0119 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 11:04:57 +0100
Subject: [PATCH 22/32] more version stuff

---
 versions/baseline.json              | 14 +++++++++++---
 versions/s-/shiva.json              |  5 +++++
 versions/v-/v8.json                 |  5 +++++
 versions/v-/vcpkg-gn.json           |  5 +++++
 versions/v-/vcpkg-tool-lessmsi.json |  9 +++++++++
 versions/v-/vcpkg-tool-python2.json |  9 +++++++++
 6 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 versions/v-/vcpkg-tool-lessmsi.json
 create mode 100644 versions/v-/vcpkg-tool-python2.json

diff --git a/versions/baseline.json b/versions/baseline.json
index 1cb2ba39611423..215e6c0c190ed1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6390,7 +6390,7 @@
     },
     "shiva": {
       "baseline": "1.0",
-      "port-version": 4
+      "port-version": 5
     },
     "shiva-sfml": {
       "baseline": "1.0",
@@ -7194,7 +7194,7 @@
     },
     "v8": {
       "baseline": "9.1.269.39",
-      "port-version": 2
+      "port-version": 3
     },
     "valijson": {
       "baseline": "0.6",
@@ -7234,7 +7234,7 @@
     },
     "vcpkg-gn": {
       "baseline": "2021-11-16",
-      "port-version": 0
+      "port-version": 1
     },
     "vcpkg-pkgconfig-get-modules": {
       "baseline": "2022-02-10",
@@ -7244,6 +7244,10 @@
       "baseline": "2021-10-23",
       "port-version": 0
     },
+    "vcpkg-tool-lessmsi": {
+      "baseline": "1.10.0",
+      "port-version": 0
+    },
     "vcpkg-tool-meson": {
       "baseline": "0.60.2",
       "port-version": 2
@@ -7252,6 +7256,10 @@
       "baseline": "14.17.4",
       "port-version": 0
     },
+    "vcpkg-tool-python2": {
+      "baseline": "2.7.18",
+      "port-version": 0
+    },
     "vectorclass": {
       "baseline": "2.00.01",
       "port-version": 2
diff --git a/versions/s-/shiva.json b/versions/s-/shiva.json
index 67c2c2a131ff78..0807a86815d4c1 100644
--- a/versions/s-/shiva.json
+++ b/versions/s-/shiva.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cf4ed2bf0bf5ca85af67023c9231c36471065d5c",
+      "version": "1.0",
+      "port-version": 5
+    },
     {
       "git-tree": "5ff8f81870f8963dc86da05ce330bbde585e940d",
       "version-string": "1.0",
diff --git a/versions/v-/v8.json b/versions/v-/v8.json
index eb1af154510ec9..9583dc8d42738f 100644
--- a/versions/v-/v8.json
+++ b/versions/v-/v8.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3abf0953ae7dcf4bb4b4ede21adb27ad850b1e1c",
+      "version": "9.1.269.39",
+      "port-version": 3
+    },
     {
       "git-tree": "b245f57cb85bfd7a699e2ceb9628682b39bcc150",
       "version": "9.1.269.39",
diff --git a/versions/v-/vcpkg-gn.json b/versions/v-/vcpkg-gn.json
index 542393a83b802c..b1802e0e8d086b 100644
--- a/versions/v-/vcpkg-gn.json
+++ b/versions/v-/vcpkg-gn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ba02b5d9d66b0e227762e6aeac0851fd8fb4314e",
+      "version-date": "2021-11-16",
+      "port-version": 1
+    },
     {
       "git-tree": "f0ec062fd9ed47e9a00f343e15f185e4201e661b",
       "version-date": "2021-11-16",
diff --git a/versions/v-/vcpkg-tool-lessmsi.json b/versions/v-/vcpkg-tool-lessmsi.json
new file mode 100644
index 00000000000000..f515fe25435502
--- /dev/null
+++ b/versions/v-/vcpkg-tool-lessmsi.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "82ed573f8102d4ac7c15f40c64bba00968085d51",
+      "version": "1.10.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/v-/vcpkg-tool-python2.json b/versions/v-/vcpkg-tool-python2.json
new file mode 100644
index 00000000000000..119416dd555149
--- /dev/null
+++ b/versions/v-/vcpkg-tool-python2.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c3d235e54a9140e4201c40c5e8b0380f494dbb09",
+      "version": "2.7.18",
+      "port-version": 0
+    }
+  ]
+}

From 02756a58e6a0031be395ad37196270486cbadb9c Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 15:05:36 +0100
Subject: [PATCH 23/32] fix search path and add supports expression

---
 ports/vcpkg-tool-python2/portfile.cmake | 2 +-
 ports/vcpkg-tool-python2/vcpkg.json     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake
index bf636810fe000f..92076e1247216c 100644
--- a/ports/vcpkg-tool-python2/portfile.cmake
+++ b/ports/vcpkg-tool-python2/portfile.cmake
@@ -52,7 +52,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endif()
     message(STATUS "Using python2: ${PYTHON2}")
     set(details "set(program_version \"${program_version}\")\n")
-    string(APPEND details "set(search_path \"\${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}\")\n")
+    string(APPEND details "set(paths_to_search \"\${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}\")\n")
     file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/details.cmake" "${details}")
 endif()
 
diff --git a/ports/vcpkg-tool-python2/vcpkg.json b/ports/vcpkg-tool-python2/vcpkg.json
index a5714ef109c42f..bea0659373ed75 100644
--- a/ports/vcpkg-tool-python2/vcpkg.json
+++ b/ports/vcpkg-tool-python2/vcpkg.json
@@ -4,6 +4,7 @@
   "description": "Python 2",
   "homepage": "https://www.python.org/download/releases/2.0/",
   "license": "PSF-2.0",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-tool-lessmsi",

From 7a5129295b55edbe954c0e6636ee3d895710fe49 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 15:06:10 +0100
Subject: [PATCH 24/32] version stuff

---
 versions/v-/vcpkg-tool-python2.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/v-/vcpkg-tool-python2.json b/versions/v-/vcpkg-tool-python2.json
index 119416dd555149..b42f1dda4317ad 100644
--- a/versions/v-/vcpkg-tool-python2.json
+++ b/versions/v-/vcpkg-tool-python2.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "c3d235e54a9140e4201c40c5e8b0380f494dbb09",
+      "git-tree": "9a7d9a6b40efd4b8fd19e79c67b9aa2ec06d6683",
       "version": "2.7.18",
       "port-version": 0
     }

From 6eea6cd59877cdbcb23b5257eb14bb5a00dd6258 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Wed, 9 Mar 2022 15:08:42 +0100
Subject: [PATCH 25/32] shiva version

---
 versions/s-/shiva.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/s-/shiva.json b/versions/s-/shiva.json
index 0807a86815d4c1..81d1b1b42cb50a 100644
--- a/versions/s-/shiva.json
+++ b/versions/s-/shiva.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "cf4ed2bf0bf5ca85af67023c9231c36471065d5c",
+      "git-tree": "821cf61c76079cfd5c7a635dc36e01c0f33c38f5",
       "version": "1.0",
       "port-version": 5
     },

From 2126e0267a20cec1ed338b93f86649e6a72a3682 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Thu, 10 Mar 2022 08:52:09 +0100
Subject: [PATCH 26/32] remove arm windows from support

---
 ports/vcpkg-tool-python2/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/vcpkg-tool-python2/vcpkg.json b/ports/vcpkg-tool-python2/vcpkg.json
index bea0659373ed75..346a8b15c90027 100644
--- a/ports/vcpkg-tool-python2/vcpkg.json
+++ b/ports/vcpkg-tool-python2/vcpkg.json
@@ -4,7 +4,7 @@
   "description": "Python 2",
   "homepage": "https://www.python.org/download/releases/2.0/",
   "license": "PSF-2.0",
-  "supports": "!uwp",
+  "supports": "!uwp & !(arm & windows)",
   "dependencies": [
     {
       "name": "vcpkg-tool-lessmsi",

From c231f4c4ce1708a36aacd1978ce1a4479c78c2e3 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Thu, 10 Mar 2022 08:52:36 +0100
Subject: [PATCH 27/32] reuse output_path use lessmsi is a host dep so use the
 correct path

---
 ports/vcpkg-tool-python2/portfile.cmake | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake
index 92076e1247216c..bbff40405be7ef 100644
--- a/ports/vcpkg-tool-python2/portfile.cmake
+++ b/ports/vcpkg-tool-python2/portfile.cmake
@@ -26,22 +26,22 @@ if(VCPKG_TARGET_IS_WINDOWS)
     cmake_path(NATIVE_PATH archive_path archive_path_native) # lessmsi is a bit picky about path formats.
     message(STATUS "Extracting Python2 ...")
     vcpkg_execute_in_download_mode(
-                    COMMAND "${CURRENT_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" x "${archive_path_native}" # Using output_path here does not work in bash
-                    WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools" 
-                    OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-out.log"
-                    ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-err.log"
+                    COMMAND "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" x "${archive_path_native}" # Using output_path here does not work in bash
+                    WORKING_DIRECTORY "${output_path}" 
+                    OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-out.log"
+                    ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-err.log"
                     RESULT_VARIABLE error_code
                 )
     if(error_code)
         message(FATAL_ERROR "Couldn't extract Python2 with lessmsi!")
     endif()
     message(STATUS "Extracting Python2 ... finished!")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/manual-tools/python-2.7.18.amd64/SourceDir/" "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}/")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/manual-tools/python-2.7.18.amd64"
+    file(RENAME "${output_path}/python-2.7.18.amd64/SourceDir/" "${output_path}/${PORT}/")
+    file(REMOVE_RECURSE "${output_path}/python-2.7.18.amd64"
                         # Files below are not part of a msiexec installation/extraction. 
-                        "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}/Windows"
-                        "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}/Microsoft.VC90.CRT.manifest"
-                        "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}/msvcr90.dll")
+                        "${output_path}/${PORT}/Windows"
+                        "${output_path}/${PORT}/Microsoft.VC90.CRT.manifest"
+                        "${output_path}/${PORT}/msvcr90.dll")
     z_vcpkg_find_acquire_program_find_internal("PYTHON2"
         INTERPRETER "${interpreter}"
         PATHS ${paths_to_search}

From d06764ddc7be538b87c5acad2696d0766e399db8 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Thu, 10 Mar 2022 08:53:11 +0100
Subject: [PATCH 28/32] version stuff

---
 versions/v-/vcpkg-tool-python2.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/v-/vcpkg-tool-python2.json b/versions/v-/vcpkg-tool-python2.json
index b42f1dda4317ad..8b5dc876957e2b 100644
--- a/versions/v-/vcpkg-tool-python2.json
+++ b/versions/v-/vcpkg-tool-python2.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "9a7d9a6b40efd4b8fd19e79c67b9aa2ec06d6683",
+      "git-tree": "183dc1ceb97d6908ab5acc5bbf867802fbc0ee98",
       "version": "2.7.18",
       "port-version": 0
     }

From 6a44c19a30cca68adebcb6efb519ab4938578792 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Thu, 10 Mar 2022 17:30:24 +0100
Subject: [PATCH 29/32] Fix x86 regression

---
 ports/vcpkg-tool-python2/portfile.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/vcpkg-tool-python2/portfile.cmake b/ports/vcpkg-tool-python2/portfile.cmake
index bbff40405be7ef..703173bba9a87a 100644
--- a/ports/vcpkg-tool-python2/portfile.cmake
+++ b/ports/vcpkg-tool-python2/portfile.cmake
@@ -1,6 +1,7 @@
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
 if(VCPKG_TARGET_IS_WINDOWS)
+    set(arch_suffix "")
     set(program_name python)
     set(program_version 2.7.18)
     if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
@@ -10,6 +11,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
         set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115)
     else()
         set(tool_subdirectory "python-${program_version}-x64")
+        set(arch_suffix ".amd64")
         set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi")
         set(download_filename "python-${program_version}.amd64.msi")
         set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
@@ -36,7 +38,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
         message(FATAL_ERROR "Couldn't extract Python2 with lessmsi!")
     endif()
     message(STATUS "Extracting Python2 ... finished!")
-    file(RENAME "${output_path}/python-2.7.18.amd64/SourceDir/" "${output_path}/${PORT}/")
+    file(RENAME "${output_path}/python-2.7.18${arch_suffix}/SourceDir/" "${output_path}/${PORT}/")
     file(REMOVE_RECURSE "${output_path}/python-2.7.18.amd64"
                         # Files below are not part of a msiexec installation/extraction. 
                         "${output_path}/${PORT}/Windows"

From 5a9dcb24b71d6cff8ef49c11c83399f727062a6d Mon Sep 17 00:00:00 2001
From: Alexander Neumann <Alexander.Neumann@hamburg.de>
Date: Thu, 10 Mar 2022 21:13:17 +0100
Subject: [PATCH 30/32] version stuff

---
 versions/v-/vcpkg-tool-python2.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/v-/vcpkg-tool-python2.json b/versions/v-/vcpkg-tool-python2.json
index 8b5dc876957e2b..466cf26f9b8192 100644
--- a/versions/v-/vcpkg-tool-python2.json
+++ b/versions/v-/vcpkg-tool-python2.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "183dc1ceb97d6908ab5acc5bbf867802fbc0ee98",
+      "git-tree": "207c41205cd98688dda41cee13ecec02aae1f5fd",
       "version": "2.7.18",
       "port-version": 0
     }

From a3c76a8cbcae83d51bbeadbbdc3ebc6a77cc85c4 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <Alexander.Neumann@hamburg.de>
Date: Sat, 12 Mar 2022 21:35:30 +0100
Subject: [PATCH 31/32] try fixing qtinterfaceframework

---
 ports/qtinterfaceframework/portfile.cmake | 5 ++++-
 ports/qtinterfaceframework/vcpkg.json     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake
index 9e53e6d8afb4b4..ff9ca6ccbbf032 100644
--- a/ports/qtinterfaceframework/portfile.cmake
+++ b/ports/qtinterfaceframework/portfile.cmake
@@ -75,11 +75,14 @@ vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}")
 vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}/Scripts")
 vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES virtualenv qface)
 
+if(VCPKG_CROSSCOMPILING)
+    list(APPEND FEATURE_OPTIONS "-DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET}")
+endif()
+
 set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
 set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
 qt_cmake_configure(${_opt} 
                    OPTIONS ${FEATURE_OPTIONS}
-                        "-DCMAKE_PROGRAM_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf" # need to overwrite vcpkg.cmake
                         "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. 
                    OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
                    OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})
diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json
index 1b3e9df10423c5..263b26a63b157e 100644
--- a/ports/qtinterfaceframework/vcpkg.json
+++ b/ports/qtinterfaceframework/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtinterfaceframework",
   "version": "6.2.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Interface Framework",
   "homepage": "https://www.qt.io/",
   "license": null,

From 867a22a6ded1673851ae8eac1080b2b4a491cb85 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <Alexander.Neumann@hamburg.de>
Date: Mon, 14 Mar 2022 08:23:52 +0100
Subject: [PATCH 32/32] version stuff

---
 versions/baseline.json                | 2 +-
 versions/q-/qtinterfaceframework.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 19a147972f2e7b..654230962e2de4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5838,7 +5838,7 @@
     },
     "qtinterfaceframework": {
       "baseline": "6.2.3",
-      "port-version": 1
+      "port-version": 2
     },
     "qtkeychain": {
       "baseline": "0.13.2",
diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json
index f1d48112e61e05..3dc3a83a7f5cc0 100644
--- a/versions/q-/qtinterfaceframework.json
+++ b/versions/q-/qtinterfaceframework.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "42968cd54d91bbbf94a3c5aaaf6f1de876b0efac",
+      "version": "6.2.3",
+      "port-version": 2
+    },
     {
       "git-tree": "26fa7610125a5a6b54ced0cda87ab6621a42a1d9",
       "version": "6.2.3",