From 6c416319470524f0d3755f08551ce91b6fbdf778 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:08:08 +0100
Subject: [PATCH 01/11] Fix comment

---
 ports/vcpkg-make/vcpkg_make_common.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/vcpkg-make/vcpkg_make_common.cmake b/ports/vcpkg-make/vcpkg_make_common.cmake
index fe65a1dcc89fa4..265e1df15a4eb4 100644
--- a/ports/vcpkg-make/vcpkg_make_common.cmake
+++ b/ports/vcpkg-make/vcpkg_make_common.cmake
@@ -52,7 +52,7 @@ function(z_vcpkg_make_determine_arch out_var value)
     elseif(${value} MATCHES "^(ARM|arm)$")
         set(${out_var} arm PARENT_SCOPE)
     elseif(${value} MATCHES "^(x86_64|i686|aarch64)$" OR NOT VCPKG_TARGET_IS_WINDOWS)
-        # Do nothing an assume valid architectures
+        # Do nothing and assume valid architecture
         set("${out_var}" "${value}" PARENT_SCOPE)
     else()
         message(FATAL_ERROR "Unsupported architecture '${value}' in '${CMAKE_CURRENT_FUNCTION}'!" )

From 3d0fd7468d93103d0071e7d41563b69bef3356bc Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:08:50 +0100
Subject: [PATCH 02/11] Fix non-windows host processor detection

---
 ports/vcpkg-make/vcpkg_make_common.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/vcpkg-make/vcpkg_make_common.cmake b/ports/vcpkg-make/vcpkg_make_common.cmake
index 265e1df15a4eb4..da3d67b4ee8d89 100644
--- a/ports/vcpkg-make/vcpkg_make_common.cmake
+++ b/ports/vcpkg-make/vcpkg_make_common.cmake
@@ -65,6 +65,7 @@ function(z_vcpkg_make_determine_host_arch out_var)
     elseif(DEFINED ENV{PROCESSOR_ARCHITECTURE})
         set(arch $ENV{PROCESSOR_ARCHITECTURE})
     else()
+        z_vcpkg_make_get_cmake_vars(#[[ LANGUAGES .... ]])
         set(arch "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}")
     endif()
     z_vcpkg_make_determine_arch("${out_var}" "${arch}")

From 9876e647a6c5b15f9dea9f210ea4bf6fcb788c35 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:09:06 +0100
Subject: [PATCH 03/11] Fix mingw

---
 ports/vcpkg-make/vcpkg_make_common.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/vcpkg-make/vcpkg_make_common.cmake b/ports/vcpkg-make/vcpkg_make_common.cmake
index da3d67b4ee8d89..575f3b81f8089d 100644
--- a/ports/vcpkg-make/vcpkg_make_common.cmake
+++ b/ports/vcpkg-make/vcpkg_make_common.cmake
@@ -281,7 +281,7 @@ function(z_vcpkg_make_prepare_programs out_env)
             endif()
         endforeach()
 
-        if (NOT arg_DISABLE_MSVC_WRAPPERS)
+        if (NOT arg_DISABLE_MSVC_WRAPPERS AND NOT VCPKG_TARGET_IS_MINGW)
             z_vcpkg_append_to_configure_environment(configure_env CPP "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E")
             z_vcpkg_append_to_configure_environment(configure_env CC "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}")
             z_vcpkg_append_to_configure_environment(configure_env CXX "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}")

From a9de0d7ebdd7828620f85f348d00326f4b9f0ae3 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:10:42 +0100
Subject: [PATCH 04/11] Manifest

---
 ports/vcpkg-make/vcpkg.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json
index d926b0946aae69..70c85d0aad1de3 100644
--- a/ports/vcpkg-make/vcpkg.json
+++ b/ports/vcpkg-make/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vcpkg-make",
-  "version-date": "2023-05-15",
-  "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-make.html",
+  "version-date": "2024-12-27",
+  "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure",
   "license": "MIT",
   "supports": "native",
   "dependencies": [
@@ -10,6 +10,9 @@
       "host": true,
       "platform": "windows"
     },
-    "vcpkg-cmake-get-vars"
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    }
   ]
 }

From 5321019a428dcfb65a012932bd993fd98f2d92f2 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:27:22 +0100
Subject: [PATCH 05/11] Fix PKG_CONFIG_PATH order

---
 ports/vcpkg-make/vcpkg_scripts.cmake | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/vcpkg-make/vcpkg_scripts.cmake b/ports/vcpkg-make/vcpkg_scripts.cmake
index c05ac855ac571e..fd8786fc360acb 100644
--- a/ports/vcpkg-make/vcpkg_scripts.cmake
+++ b/ports/vcpkg-make/vcpkg_scripts.cmake
@@ -158,10 +158,11 @@ function(vcpkg_prepare_pkgconfig config)
     set(ENV{PKG_CONFIG} "${PKGCONFIG}")
 
     vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} 
-                            "${CURRENT_INSTALLED_DIR}/share/pkgconfig/"
-                            "${CURRENT_INSTALLED_DIR}${subdir}/lib/pkgconfig/"
-                            "${CURRENT_PACKAGES_DIR}/share/pkgconfig/"
-                            "${CURRENT_PACKAGES_DIR}${subdir}/lib/pkgconfig/"
+                            # After installation, (merged) 'lib' is always searched before 'share'.
+                            "${CURRENT_PACKAGES_DIR}${subdir}/lib/pkgconfig"
+                            "${CURRENT_INSTALLED_DIR}${subdir}/lib/pkgconfig"
+                            "${CURRENT_PACKAGES_DIR}/share/pkgconfig"
+                            "${CURRENT_INSTALLED_DIR}/share/pkgconfig"
                         )
 endfunction()
 

From 686afe71ebd70c1b4e16458c50c77989ee580026 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:27:49 +0100
Subject: [PATCH 06/11] Remove stray command

---
 ports/vcpkg-make/vcpkg_scripts.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/vcpkg-make/vcpkg_scripts.cmake b/ports/vcpkg-make/vcpkg_scripts.cmake
index fd8786fc360acb..49756d7922dd6c 100644
--- a/ports/vcpkg-make/vcpkg_scripts.cmake
+++ b/ports/vcpkg-make/vcpkg_scripts.cmake
@@ -154,7 +154,6 @@ function(vcpkg_prepare_pkgconfig config)
     endforeach()
 
     vcpkg_find_acquire_program(PKGCONFIG)
-    get_filename_component(pkgconfig_path "${PKGCONFIG}" DIRECTORY)
     set(ENV{PKG_CONFIG} "${PKGCONFIG}")
 
     vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} 

From 24ca529384ae2c7bbb42cda4efdf4b9d79d0005e Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:28:31 +0100
Subject: [PATCH 07/11] Drop unneeded pkgconf dependency

---
 ports/vcpkg-make/vcpkg.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json
index 70c85d0aad1de3..c3b968268c61c5 100644
--- a/ports/vcpkg-make/vcpkg.json
+++ b/ports/vcpkg-make/vcpkg.json
@@ -5,11 +5,6 @@
   "license": "MIT",
   "supports": "native",
   "dependencies": [
-    {
-      "name": "pkgconf",
-      "host": true,
-      "platform": "windows"
-    },
     {
       "name": "vcpkg-cmake-get-vars",
       "host": true

From 097e3d40c3f18db5636192e23c522c012a7ec76c Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:29:11 +0100
Subject: [PATCH 08/11] Versions

---
 versions/baseline.json      | 2 +-
 versions/v-/vcpkg-make.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index fd13fea6c4b5a1..30d09035ada0c2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9389,7 +9389,7 @@
       "port-version": 0
     },
     "vcpkg-make": {
-      "baseline": "2023-05-15",
+      "baseline": "2024-12-27",
       "port-version": 0
     },
     "vcpkg-msbuild": {
diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json
index 7d050a9664124e..2f0085f64ea112 100644
--- a/versions/v-/vcpkg-make.json
+++ b/versions/v-/vcpkg-make.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c734474c336542e652a89ed868c95cdd3e5893c",
+      "version-date": "2024-12-27",
+      "port-version": 0
+    },
     {
       "git-tree": "50a2b6aaf3c272b1eff8ce757e14091c374d9855",
       "version-date": "2023-05-15",

From e412619aa71f573c360de47159713fd850c5746f Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:56:25 +0100
Subject: [PATCH 09/11] Add mirror for automake

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

diff --git a/ports/vcpkg-make/portfile.cmake b/ports/vcpkg-make/portfile.cmake
index 6d1cea7624c3a1..217ea0ccdec02d 100644
--- a/ports/vcpkg-make/portfile.cmake
+++ b/ports/vcpkg-make/portfile.cmake
@@ -1,8 +1,10 @@
 set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
 
+set(automake_version 1.17)
 vcpkg_download_distfile(ARCHIVE
-    URLS https://ftp.gnu.org/gnu/automake/automake-1.17.tar.gz
-    FILENAME automake.tar.gz
+    URLS https://ftp.gnu.org/gnu/automake/automake-${automake_version}.tar.gz
+         https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/automake/automake-${automake_version}.tar.gz
+    FILENAME automake-${automake_version}.tar.gz
     SHA512 11357dfab8cbf4b5d94d9d06e475732ca01df82bef1284888a34bd558afc37b1a239bed1b5eb18a9dbcc326344fb7b1b301f77bb8385131eb8e1e118b677883a
 )
 

From 43e09a0ee28ac5cd41f022dc6e1ebf1056e8d51e Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 27 Dec 2024 00:57:07 +0100
Subject: [PATCH 10/11] Update license/copyright

---
 ports/vcpkg-make/portfile.cmake | 11 ++++++++++-
 ports/vcpkg-make/vcpkg.json     |  2 +-
 versions/v-/vcpkg-make.json     |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ports/vcpkg-make/portfile.cmake b/ports/vcpkg-make/portfile.cmake
index 217ea0ccdec02d..1b1d146f31faf4 100644
--- a/ports/vcpkg-make/portfile.cmake
+++ b/ports/vcpkg-make/portfile.cmake
@@ -31,4 +31,13 @@ file(INSTALL
         "${CURRENT_PACKAGES_DIR}/share/${PORT}/wrappers"
 )
 
-vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt")
+vcpkg_install_copyright(
+    COMMENT [[
+The cmake scripts are under vcpkg's MIT license terms, see LICENSE.txt below.
+The port also installs shell scripts from GNU Automake.
+These scripts are under GPL-2.0-or-later, see COPYING below.
+]]
+    FILE_LIST
+        "${VCPKG_ROOT_DIR}/LICENSE.txt"
+        "${automake_source}/COPYING"
+)
diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json
index c3b968268c61c5..59046f78a10ecc 100644
--- a/ports/vcpkg-make/vcpkg.json
+++ b/ports/vcpkg-make/vcpkg.json
@@ -2,7 +2,7 @@
   "name": "vcpkg-make",
   "version-date": "2024-12-27",
   "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure",
-  "license": "MIT",
+  "license": null,
   "supports": "native",
   "dependencies": [
     {
diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json
index 2f0085f64ea112..8bf49db8e72ace 100644
--- a/versions/v-/vcpkg-make.json
+++ b/versions/v-/vcpkg-make.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "8c734474c336542e652a89ed868c95cdd3e5893c",
+      "git-tree": "b9226c29f2dd322952dd1bae717690c0fd8ad22e",
       "version-date": "2024-12-27",
       "port-version": 0
     },

From 682fb1751c74418be11d07a42bf1d0b362fadbe8 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sun, 29 Dec 2024 18:05:10 +0100
Subject: [PATCH 11/11] Create cached cmake vars for desired languages

---
 ports/vcpkg-make/vcpkg_make_configure.cmake | 3 +++
 versions/v-/vcpkg-make.json                 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/vcpkg-make/vcpkg_make_configure.cmake b/ports/vcpkg-make/vcpkg_make_configure.cmake
index d4c3bb964c991b..d58200fdc1dd0f 100644
--- a/ports/vcpkg-make/vcpkg_make_configure.cmake
+++ b/ports/vcpkg-make/vcpkg_make_configure.cmake
@@ -36,6 +36,9 @@ function(vcpkg_make_configure)
         list(APPEND prepare_flags_opts "LANGUAGES" ${arg_LANGUAGES})
     endif()
 
+    # Create cached cmake vars for this invocation's languages
+    z_vcpkg_make_get_cmake_vars(LANGUAGES ${arg_LANGUAGES})
+
     set(escaping "")
     if(arg_DISABLE_MSVC_TRANSFORMATIONS)
       set(escaping NO_FLAG_ESCAPING)
diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json
index 8bf49db8e72ace..960c6a0c986d65 100644
--- a/versions/v-/vcpkg-make.json
+++ b/versions/v-/vcpkg-make.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b9226c29f2dd322952dd1bae717690c0fd8ad22e",
+      "git-tree": "ac1381c26cff8ab8365670f4fb00395e86c58dfa",
       "version-date": "2024-12-27",
       "port-version": 0
     },