Merge pull request #1873 from microsoft/master

Merge from microsoft-master

ports/abseil/portfile.cmake

@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
     REF "${VERSION}"
-    SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31
+    SHA512 2a021faad807ee3e23548716ffa4785dc2409edbb4be676cc4bc01d47885760de340f0a4afdcbf0aaa835affd6d78f7bc319bbf7d337dbc30e7a559d0088e4bd
     HEAD_REF master
 )
 

ports/abseil/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "abseil",
-  "version": "20240722.0",
+  "version": "20250127.0",
   "description": [
     "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
     "In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.",

ports/bgfx/portfile.cmake

@@ -6,7 +6,7 @@ vcpkg_download_distfile(
   ARCHIVE_FILE
   URLS https://github.com/bkaradzic/bgfx.cmake/releases/download/v${VERSION}/bgfx.cmake.v${VERSION}.tar.gz
   FILENAME bgfx.cmake.v${VERSION}.tar.gz
-  SHA512 879ffef9623238b5e4ff88ac1bd655203adf76f4232f8e36f9a7ba5d0baab11ef80fdc7b3fea110e54d22f284106d51e12bf468459d82dc50a177555b4e4ada9
+  SHA512 503f31965f7be5631f0952a1e1bcc6484cb8b1a28261ae949f367317cf7432950c52f4363f4ad55d3ae0bc73302edafe2ca8ac5e817b6e09d886c7760ff8ce60
 )
 
 vcpkg_extract_source_archive(

ports/bgfx/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "bgfx",
-  "version": "1.128.8808-482",
+  "version": "1.129.8866-491",
   "maintainers": "Sandy Carter <[email protected]>",
   "description": "Cross-platform, graphics API agnostic, Bring Your Own Engine/Framework style rendering library.",
   "homepage": "https://bkaradzic.github.io/bgfx/overview.html",

ports/curl/dependencies.patch

@@ -1,8 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cba6f626..8398477da 100644
+index d55cef4..cb97dd5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -660,7 +660,7 @@ if(CURL_USE_MBEDTLS)
+@@ -345,7 +345,7 @@ set(LIBCURL_PC_REQUIRES_PRIVATE "")
+ if(ENABLE_ARES)
+   set(USE_ARES 1)
+   find_package(Cares REQUIRED)
+-  list(APPEND CURL_LIBS ${CARES_LIBRARIES})
++  list(APPEND CURL_LIBS ${CARES_LINK_LIBRARIES})
+   list(APPEND CURL_LIBDIRS ${CARES_LIBRARY_DIRS})
+   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${CARES_PC_REQUIRES})
+   link_directories(${CARES_LIBRARY_DIRS})
+@@ -787,7 +787,7 @@ if(CURL_USE_MBEDTLS)
    find_package(MbedTLS REQUIRED)
    set(_ssl_enabled ON)
    set(USE_MBEDTLS ON)
@@ -11,142 +20,129 @@ index 0cba6f626..8398477da 100644
    list(APPEND CURL_LIBDIRS ${MBEDTLS_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${MBEDTLS_PC_REQUIRES})
    include_directories(SYSTEM ${MBEDTLS_INCLUDE_DIRS})
-@@ -694,7 +694,7 @@ if(CURL_USE_WOLFSSL)
+@@ -821,7 +821,7 @@ if(CURL_USE_WOLFSSL)
    find_package(WolfSSL REQUIRED)
    set(_ssl_enabled ON)
    set(USE_WOLFSSL ON)
 -  list(APPEND CURL_LIBS ${WOLFSSL_LIBRARIES})
 +  list(APPEND CURL_LIBS ${WOLFSSL_LINK_LIBRARIES})
    list(APPEND CURL_LIBDIRS ${WOLFSSL_LIBRARY_DIRS})
-   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "wolfssl")
+   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${WOLFSSL_PC_REQUIRES})
    include_directories(SYSTEM ${WOLFSSL_INCLUDE_DIRS})
-@@ -723,8 +723,8 @@ if(CURL_USE_GNUTLS)
+@@ -850,7 +850,7 @@ if(CURL_USE_GNUTLS)
    find_package(Nettle REQUIRED)
    set(_ssl_enabled ON)
    set(USE_GNUTLS ON)
 -  list(APPEND CURL_LIBS ${GNUTLS_LIBRARIES} ${NETTLE_LIBRARIES})
--  list(APPEND CURL_LIBDIRS ${NETTLE_LIBRARY_DIRS})
 +  list(APPEND CURL_LIBS ${GNUTLS_LINK_LIBRARIES} ${NETTLE_LINK_LIBRARIES})
-+  list(APPEND CURL_LIBDIRS ${GNUTLS_LIBRARY_DIRS} ${NETTLE_LIBRARY_DIRS})
-   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "gnutls" "nettle")
+   list(APPEND CURL_LIBDIRS ${NETTLE_LIBRARY_DIRS})
+   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "gnutls" ${NETTLE_PC_REQUIRES})
    include_directories(SYSTEM ${GNUTLS_INCLUDE_DIRS} ${NETTLE_INCLUDE_DIRS})
-   link_directories(${NETTLE_LIBRARY_DIRS})
-@@ -789,7 +789,7 @@ if(CURL_BROTLI)
-   find_package(Brotli REQUIRED)
-   if(BROTLI_FOUND)
-     set(HAVE_BROTLI ON)
--    list(APPEND CURL_LIBS ${BROTLI_LIBRARIES})
-+    list(APPEND CURL_LIBS ${PC_BROTLI_LINK_LIBRARIES})
-     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libbrotlidec")
-     include_directories(SYSTEM ${BROTLI_INCLUDE_DIRS})
-   endif()
-@@ -801,7 +801,7 @@ if(CURL_ZSTD)
-   find_package(Zstd REQUIRED)
-   if(ZSTD_FOUND AND NOT ZSTD_VERSION VERSION_LESS 1.0.0)
+@@ -913,7 +913,7 @@ set(HAVE_BROTLI OFF)
+ curl_dependency_option(CURL_BROTLI Brotli "brotli")
+ if(BROTLI_FOUND)
+   set(HAVE_BROTLI ON)
+-  list(APPEND CURL_LIBS ${BROTLI_LIBRARIES})
++  list(APPEND CURL_LIBS ${BROTLIDEC_LINK_LIBRARIES})
+   list(APPEND CURL_LIBDIRS ${BROTLI_LIBRARY_DIRS})
+   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${BROTLI_PC_REQUIRES})
+   include_directories(SYSTEM ${BROTLI_INCLUDE_DIRS})
+@@ -928,7 +928,7 @@ curl_dependency_option(CURL_ZSTD Zstd "zstd")
+ if(ZSTD_FOUND)
+   if(NOT ZSTD_VERSION VERSION_LESS 1.0.0)
      set(HAVE_ZSTD ON)
 -    list(APPEND CURL_LIBS ${ZSTD_LIBRARIES})
-+    list(APPEND CURL_LIBS ${PC_ZSTD_LINK_LIBRARIES})
-     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libzstd")
++    list(APPEND CURL_LIBS ${ZSTD_LINK_LIBRARIES})
+     list(APPEND CURL_LIBDIRS ${ZSTD_LIBRARY_DIRS})
+     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${ZSTD_PC_REQUIRES})
      include_directories(SYSTEM ${ZSTD_INCLUDE_DIRS})
-   else()
-@@ -899,7 +899,7 @@ if(USE_NGHTTP2)
+@@ -1047,7 +1047,7 @@ option(USE_NGHTTP2 "Use nghttp2 library" ON)
+ if(USE_NGHTTP2)
    find_package(NGHTTP2)
    if(NGHTTP2_FOUND)
-     include_directories(SYSTEM ${NGHTTP2_INCLUDE_DIRS})
 -    list(APPEND CURL_LIBS ${NGHTTP2_LIBRARIES})
-+    list(APPEND CURL_LIBS ${PC_NGHTTP2_LINK_LIBRARIES})
-     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libnghttp2")
++    list(APPEND CURL_LIBS ${NGHTTP2_LINK_LIBRARIES})
+     list(APPEND CURL_LIBDIRS ${NGHTTP2_LIBRARY_DIRS})
+     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${NGHTTP2_PC_REQUIRES})
+     include_directories(SYSTEM ${NGHTTP2_INCLUDE_DIRS})
+@@ -1079,7 +1079,7 @@ if(USE_NGTCP2)
    else()
-     set(USE_NGHTTP2 OFF)
-@@ -927,13 +927,13 @@ if(USE_NGTCP2)
      message(FATAL_ERROR "ngtcp2 requires OpenSSL, wolfSSL or GnuTLS")
    endif()
-   include_directories(SYSTEM ${NGTCP2_INCLUDE_DIRS})
 -  list(APPEND CURL_LIBS ${NGTCP2_LIBRARIES})
-+  list(APPEND CURL_LIBS ${PC_NGTCP2_LINK_LIBRARIES})
-   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2")
++  list(APPEND CURL_LIBS ${NGTCP2_LINK_LIBRARIES})
+   list(APPEND CURL_LIBDIRS ${NGTCP2_LIBRARY_DIRS})
+   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${NGTCP2_PC_REQUIRES})
+   include_directories(SYSTEM ${NGTCP2_INCLUDE_DIRS})
+@@ -1090,7 +1090,7 @@ if(USE_NGTCP2)
 
    find_package(NGHTTP3 REQUIRED)
    set(USE_NGHTTP3 ON)
-   include_directories(SYSTEM ${NGHTTP3_INCLUDE_DIRS})
 -  list(APPEND CURL_LIBS ${NGHTTP3_LIBRARIES})
-+  list(APPEND CURL_LIBS ${PC_NGHTTP3_LINK_LIBRARIES})
-   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libnghttp3")
- endif()
-
-@@ -1020,6 +1020,15 @@ if(NOT CURL_DISABLE_LDAP)
-
-   # Now that we know, we are not using Windows LDAP...
-   if(NOT USE_WIN32_LDAP)
-+    find_package(PkgConfig REQUIRED)
-+    pkg_check_modules(LDAP REQUIRED ldap)
-+    set(LDAP_INCLUDE_DIR "${LDAP_INCLUDE_DIRS}")
-+    set(LDAP_LIBRARY "${LDAP_LINK_LIBRARIES}" CACHE STRING "")
-+    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ldap)
-+    pkg_check_modules(LBER REQUIRED lber)
-+    set(HAVE_LIBLBER 1)
-+    set(LDAP_LBER_LIBRARY "${LBER_LINK_LIBRARIES}" CACHE STRING "")
-+    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE lber)
-     if(NOT DEFINED LDAP_LIBRARY)
-       set(LDAP_LIBRARY "ldap" CACHE STRING "Name or full path to ldap library")
-     endif()
-@@ -1132,7 +1141,7 @@ set(HAVE_LIBIDN2 OFF)
++  list(APPEND CURL_LIBS ${NGHTTP3_LINK_LIBRARIES})
+   list(APPEND CURL_LIBDIRS ${NGHTTP3_LIBRARY_DIRS})
+   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${NGHTTP3_PC_REQUIRES})
+   include_directories(SYSTEM ${NGHTTP3_INCLUDE_DIRS})
+@@ -1191,7 +1191,7 @@ if(NOT CURL_DISABLE_LDAP)
+     find_package(LDAP)
+     if(LDAP_FOUND)
+       set(HAVE_LBER_H 1)
+-      set(CURL_LIBS "${LDAP_LIBRARIES};${CURL_LIBS}")
++      set(CURL_LIBS "${LDAP_LINK_LIBRARIES};${CURL_LIBS}")
+       list(APPEND CURL_LIBDIRS ${LDAP_LIBRARY_DIRS})
+       if(LDAP_PC_REQUIRES)
+         set(LIBCURL_PC_REQUIRES_PRIVATE "${LDAP_PC_REQUIRES};${LIBCURL_PC_REQUIRES_PRIVATE}")
+@@ -1269,7 +1269,7 @@ set(HAVE_LIBIDN2 OFF)
  if(USE_LIBIDN2 AND NOT USE_APPLE_IDN AND NOT USE_WIN32_IDN)
    find_package(Libidn2)
    if(LIBIDN2_FOUND)
 -    set(CURL_LIBS "${LIBIDN2_LIBRARIES};${CURL_LIBS}")
 +    set(CURL_LIBS "${LIBIDN2_LINK_LIBRARIES};${CURL_LIBS}")
      list(APPEND CURL_LIBDIRS ${LIBIDN2_LIBRARY_DIRS})
-     set(LIBCURL_PC_REQUIRES_PRIVATE "libidn2;${LIBCURL_PC_REQUIRES_PRIVATE}")
+     set(LIBCURL_PC_REQUIRES_PRIVATE "${LIBIDN2_PC_REQUIRES};${LIBCURL_PC_REQUIRES_PRIVATE}")
      include_directories(SYSTEM ${LIBIDN2_INCLUDE_DIRS})
-@@ -1153,7 +1162,7 @@ set(USE_LIBPSL OFF)
+@@ -1289,7 +1289,7 @@ set(USE_LIBPSL OFF)
+
  if(CURL_USE_LIBPSL)
-   find_package(Libpsl)  # TODO: add REQUIRED to match autotools
-   if(LIBPSL_FOUND)
--    list(APPEND CURL_LIBS ${LIBPSL_LIBRARIES})
-+    list(APPEND CURL_LIBS ${PC_LIBPSL_LINK_LIBRARIES})
-     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libpsl")
-     include_directories(SYSTEM ${LIBPSL_INCLUDE_DIRS})
-     set(USE_LIBPSL ON)
-@@ -1170,7 +1179,7 @@ set(USE_LIBSSH2 OFF)
+   find_package(Libpsl REQUIRED)
+-  list(APPEND CURL_LIBS ${LIBPSL_LIBRARIES})
++  list(APPEND CURL_LIBS ${LIBPSL_LINK_LIBRARIES})
+   list(APPEND CURL_LIBDIRS ${LIBPSL_LIBRARY_DIRS})
+   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${LIBPSL_PC_REQUIRES})
+   include_directories(SYSTEM ${LIBPSL_INCLUDE_DIRS})
+@@ -1308,7 +1308,7 @@ set(USE_LIBSSH2 OFF)
  if(CURL_USE_LIBSSH2)
    find_package(Libssh2)
    if(LIBSSH2_FOUND)
 -    list(APPEND CURL_LIBS ${LIBSSH2_LIBRARIES})
-+    list(APPEND CURL_LIBS ${PC_LIBSSH2_LINK_LIBRARIES})
-     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libssh2")
++    list(APPEND CURL_LIBS ${LIBSSH2_LINK_LIBRARIES})
+     list(APPEND CURL_LIBDIRS ${LIBSSH2_LIBRARY_DIRS})
+     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${LIBSSH2_PC_REQUIRES})
      include_directories(SYSTEM ${LIBSSH2_INCLUDE_DIRS})
-     set(USE_LIBSSH2 ON)
-@@ -1217,7 +1226,7 @@ mark_as_advanced(CURL_USE_GSASL)
+@@ -1357,7 +1357,7 @@ option(CURL_USE_GSASL "Use libgsasl" OFF)
+ mark_as_advanced(CURL_USE_GSASL)
  if(CURL_USE_GSASL)
    find_package(Libgsasl REQUIRED)
-   if(LIBGSASL_FOUND)
--    list(APPEND CURL_LIBS ${LIBGSASL_LIBRARIES})
-+    list(APPEND CURL_LIBS ${LIBGSASL_LINK_LIBRARIES})
-     list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS})
-     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libgsasl")
-     include_directories(SYSTEM ${LIBGSASL_INCLUDE_DIRS})
-@@ -1234,6 +1243,10 @@ mark_as_advanced(CURL_USE_GSSAPI)
-
- if(CURL_USE_GSSAPI)
-   find_package(GSS)
-+  if(GSS_FLAVOUR STREQUAL "MIT")
-+    pkg_check_modules(GSS REQUIRED mit-krb5-gssapi)
-+    set(GSS_LIBRARIES "${GSS_LINK_LIBRARIES}")
-+  endif()
+-  list(APPEND CURL_LIBS ${LIBGSASL_LIBRARIES})
++  list(APPEND CURL_LIBS ${LIBGSASL_LINK_LIBRARIES})
+   list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS})
+   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${LIBGSASL_PC_REQUIRES})
+   include_directories(SYSTEM ${LIBGSASL_INCLUDE_DIRS})
+@@ -1376,7 +1376,7 @@ if(CURL_USE_GSSAPI)
 
    set(HAVE_GSSAPI ${GSS_FOUND})
    if(GSS_FOUND)
-@@ -1309,6 +1322,12 @@ endif()
-
+-    list(APPEND CURL_LIBS ${GSS_LIBRARIES})
++    list(APPEND CURL_LIBS ${_GSS_LINK_LIBRARIES})
+     list(APPEND CURL_LIBDIRS ${GSS_LIBRARY_DIRS})
+     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${GSS_PC_REQUIRES})
+     include_directories(SYSTEM ${GSS_INCLUDE_DIRS})
+@@ -1447,7 +1447,7 @@ endif()
  option(USE_LIBRTMP "Enable librtmp from rtmpdump" OFF)
  if(USE_LIBRTMP)
-+  find_package(PkgConfig REQUIRED)
-+  pkg_check_modules(LIBRTMP REQUIRED librtmp)
-+  include_directories(SYSTEM ${LIBRTMP_INCLUDE_DIRECTORIES})
+   find_package(Librtmp REQUIRED)
+-  list(APPEND CURL_LIBS ${LIBRTMP_LIBRARIES})
 +  list(APPEND CURL_LIBS ${LIBRTMP_LINK_LIBRARIES})
-+  list(APPEND LIBCURL_PC_REQUIRES_PRIVATE librtmp)
-+elseif(0)
-   set(_extra_libs "rtmp")
-   if(WIN32)
-     list(APPEND _extra_libs "winmm")
+   list(APPEND CURL_LIBDIRS ${LIBRTMP_LIBRARY_DIRS})
+   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${LIBRTMP_PC_REQUIRES})
+   include_directories(SYSTEM ${LIBRTMP_INCLUDE_DIRS})

ports/curl/export-components.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbb33a1..db3a5ee 100644
+index 30c0154..d55cef4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2254,7 +2254,17 @@ if(NOT CURL_DISABLE_INSTALL)
+@@ -2437,7 +2437,17 @@ if(NOT CURL_DISABLE_INSTALL)
        DESTINATION ${_install_cmake_dir})
    endif()
 
@@ -19,4 +19,5 @@ index fbb33a1..db3a5ee 100644
 +                ${components_file}
      DESTINATION ${_install_cmake_dir})
 
-   # Workaround for MSVS10 to avoid the Dialog Hell
+   if(NOT TARGET curl_uninstall)
+

ports/curl/pkgconfig-curl-config.patch

@@ -1,16 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cba6f626..02ead7e23 100644
+index b6b74c1..d01a127 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2118,6 +2118,7 @@ if(NOT CURL_DISABLE_INSTALL)
+@@ -2260,6 +2260,7 @@ if(NOT CURL_DISABLE_INSTALL)
    endforeach()
 
    foreach(_libdir IN LISTS _custom_libdirs CURL_LIBDIRS)
 +    cmake_path(SET _libdir NORMALIZE "${_libdir}")
      list(FIND _sys_libdirs "${_libdir}" _libdir_index)
      if(_libdir_index LESS 0)
        list(APPEND _ldflags "-L${_libdir}")
-@@ -2129,7 +2130,30 @@ if(NOT CURL_DISABLE_INSTALL)
+@@ -2271,7 +2272,30 @@ if(NOT CURL_DISABLE_INSTALL)
      set(_implicit_libs ${CMAKE_C_IMPLICIT_LINK_LIBRARIES})
    endif()
 
@@ -42,7 +42,7 @@ index 0cba6f626..02ead7e23 100644
      if(TARGET "${_lib}")
        set(_libname "${_lib}")
        get_target_property(_imported "${_libname}" IMPORTED)
-@@ -2144,6 +2168,10 @@ if(NOT CURL_DISABLE_INSTALL)
+@@ -2286,6 +2310,10 @@ if(NOT CURL_DISABLE_INSTALL)
          continue()
        endif()
      endif()
@@ -52,8 +52,8 @@ index 0cba6f626..02ead7e23 100644
 +    endif()
      if(_lib MATCHES "^-")  # '-framework <name>'
        list(APPEND _ldflags "${_lib}")
-     elseif(_lib MATCHES ".*/.*")
-@@ -2152,17 +2180,24 @@ if(NOT CURL_DISABLE_INSTALL)
+     elseif(_lib MATCHES "/")
+@@ -2294,17 +2322,24 @@ if(NOT CURL_DISABLE_INSTALL)
        get_filename_component(_libdir ${_lib} DIRECTORY)
        get_filename_component(_libname ${_lib} NAME_WE)
        if(_libname MATCHES "^lib")
@@ -81,7 +81,7 @@ index 0cba6f626..02ead7e23 100644
      endif()
    endforeach()
 
-@@ -2188,11 +2223,11 @@ if(NOT CURL_DISABLE_INSTALL)
+@@ -2330,11 +2365,11 @@ if(NOT CURL_DISABLE_INSTALL)
      set(LIBCURL_PC_REQUIRES "")
      set(LIBCURL_PC_LIBS     "")
      set(LIBCURL_PC_CFLAGS   "")
@@ -97,19 +97,18 @@ index 0cba6f626..02ead7e23 100644
    if(BUILD_STATIC_LIBS)
      set(ENABLE_STATIC       "yes")
 diff --git a/curl-config.in b/curl-config.in
-index e89c25639..e389f0d52 100644
+index 5518416..e418afc 100644
 --- a/curl-config.in
 +++ b/curl-config.in
-@@ -161,7 +161,7 @@ while test "$#" -gt 0; do
-       CURLLIBDIR=''
+@@ -156,6 +156,7 @@ while test "$#" -gt 0; do
      fi
      if test 'X@ENABLE_SHARED@' = 'Xno'; then
--      echo "${CURLLIBDIR}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
+       echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
 +      echo "@libdir@/libcurl.@libext@ @LIBCURL_PC_LDFLAGS_PRIVATE@ @CURL_CONFIG_LIBS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@"
      else
-       echo "${CURLLIBDIR}-lcurl"
+       echo "${curllibdir}-lcurl"
      fi
-@@ -173,7 +173,7 @@ while test "$#" -gt 0; do
+@@ -167,7 +168,7 @@ while test "$#" -gt 0; do
 
    --static-libs)
      if test 'X@ENABLE_STATIC@' != 'Xno'; then

ports/curl/portfile.cmake

@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
     REF ${curl_version}
-    SHA512 ab54562a70209da20fa3d797029dc7022a37b7c501e50250503721251cbf209938fb37ffc1dc9d82c451b1da1b76c79f35c53953b029b5b000903db98aee5840
+    SHA512 e7fabe3403096fdab7e9a817499c541a965c456ab07ffe981b58bed11bad62f9efa201d93d92e5f35503a5a30b25fc430ca7d7a5556eaffffd9bf98c163b667f
     HEAD_REF master
     PATCHES
         0005_remove_imp_suffix.patch

ports/curl/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "curl",
-  "version": "8.11.1",
-  "port-version": 2,
+  "version": "8.12.0",
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
   "license": "curl AND ISC AND BSD-3-Clause",