[mongo-c-driver/libbson] update to 1.25.0

ports/libbson/fix-include-directory.patch

@@ -1,33 +1,13 @@
 diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt
-index 88de79a..c3cfd7e 100644
+index e3eaca4..ef3644b 100644
 --- a/src/libbson/CMakeLists.txt
 +++ b/src/libbson/CMakeLists.txt
-@@ -347,7 +347,7 @@ if (ENABLE_EXAMPLES)
- endif () # ENABLE_EXAMPLES
+@@ -302,7 +302,7 @@ endif () # ENABLE_EXAMPLES
+ # 8888888 888  888  88888P'  "Y888 "Y888888 888 888
 
  set (BSON_HEADER_INSTALL_DIR
 -   "${CMAKE_INSTALL_INCLUDEDIR}/libbson-${BSON_API_VERSION}"
 +   "${CMAKE_INSTALL_INCLUDEDIR}"
  )
-
- if (MONGOC_ENABLE_STATIC_INSTALL)
-diff --git a/src/libbson/src/libbson-1.0.pc.in b/src/libbson/src/libbson-1.0.pc.in
-index b65abbc..33346f3 100644
---- a/src/libbson/src/libbson-1.0.pc.in
-+++ b/src/libbson/src/libbson-1.0.pc.in
-@@ -7,4 +7,4 @@ Name: libbson
- Description: The libbson BSON serialization library.
- Version: @VERSION@
- Libs: -L${libdir} -lbson-@BSON_API_VERSION@
--Cflags: -I${includedir}/libbson-@BSON_API_VERSION@
-+Cflags: -I${includedir}
-diff --git a/src/libbson/src/libbson-static-1.0.pc.in b/src/libbson/src/libbson-static-1.0.pc.in
-index 6ee58d0..e03a95b 100644
---- a/src/libbson/src/libbson-static-1.0.pc.in
-+++ b/src/libbson/src/libbson-static-1.0.pc.in
-@@ -7,4 +7,4 @@ Name: libbson static archive
- Description: The libbson BSON serialization library.
- Version: @VERSION@
- Libs: -L${libdir} -lbson-static-@BSON_API_VERSION@ @LIBBSON_LIBRARIES@
--Cflags: -I${includedir}/libbson-@BSON_API_VERSION@ -DBSON_STATIC
-+Cflags: -I${includedir} -DBSON_STATIC
+ function(install_export_target target)
+    # Tell pkg-config where the headers are going:

ports/libbson/portfile.cmake

@@ -1,17 +1,13 @@
 # This port needs to be updated at the same time as mongo-c-driver
 
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mongodb/mongo-c-driver
     REF "${VERSION}"
-    SHA512 242416638bf6722ccda67ecc15cf78f8531f1a4ae0e89fd66cde74221d7b98b859442f5b70628802972961e69156fd7afcc916d7a83cc134d5723eb0b6e15cc9
+    SHA512 e35878eed6fe56a383eeb07795bcb6bfbaa29cd3d63c0efd67748e10982c9c1294c2de2127471b1f154ea658747c3a98e8d9f9a1cbcf1f5bf4ec6aa6e7b276a6
     HEAD_REF master
     PATCHES
-        disable-dynamic-when-static.patch
         fix-include-directory.patch # vcpkg legacy decision
-        fix-missing-header.patch  # for building mongo-c-driver
 )
 file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}")
 
@@ -26,7 +22,6 @@ vcpkg_cmake_configure(
     OPTIONS
         -DENABLE_BSON=ON
         -DENABLE_EXAMPLES=OFF
-        -DENABLE_ICU=OFF
         -DENABLE_MONGOC=OFF
         -DENABLE_SASL=OFF
         -DENABLE_SNAPPY=OFF
@@ -59,6 +54,10 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/share/mongo-c-driver"
 )
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION  "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 vcpkg_install_copyright(

ports/libbson/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "libbson",
-  "version": "1.24.3",
+  "version": "1.25.0",
   "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.",
   "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson",
   "license": null,

ports/mongo-c-driver/fix-dependencies.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71c13fd..8464824 100644
+index 1fe4c76..96be699 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -205,11 +205,9 @@ if (ENABLE_BSON STREQUAL SYSTEM)
+@@ -347,11 +347,9 @@ if (USE_SYSTEM_LIBBSON)
 
     set (USING_SYSTEM_BSON TRUE)
     if (NOT TARGET mongo::bson_shared)
@@ -14,11 +14,39 @@ index 71c13fd..8464824 100644
     endif ()
     set (BSON_STATIC_LIBRARIES mongo::bson_static)
  endif ()
+diff --git a/build/cmake/libmongoc-1.0-config.cmake.in b/build/cmake/libmongoc-1.0-config.cmake.in
+index a068408..d0aeadd 100644
+--- a/build/cmake/libmongoc-1.0-config.cmake.in
++++ b/build/cmake/libmongoc-1.0-config.cmake.in
+@@ -24,6 +24,9 @@ set (MONGOC_VERSION_FULL @libmongoc_VERSION_FULL@)
+
+ include(CMakeFindDependencyMacro)
+ find_dependency (mongoc-1.0)
++if("@ENABLE_SNAPPY@" STREQUAL "ON")
++    find_dependency(Snappy CONFIG)
++endif()
+
+ set(MONGOC_LIBRARY mongo::mongoc_shared)
+ set(MONGOC_LIBRARIES mongo::mongoc_shared)
+diff --git a/build/cmake/libmongoc-static-1.0-config.cmake.in b/build/cmake/libmongoc-static-1.0-config.cmake.in
+index bec3163..a32d5f3 100644
+--- a/build/cmake/libmongoc-static-1.0-config.cmake.in
++++ b/build/cmake/libmongoc-static-1.0-config.cmake.in
+@@ -24,6 +24,9 @@ set (MONGOC_STATIC_VERSION_FULL @libmongoc_VERSION_FULL@)
+
+ include(CMakeFindDependencyMacro)
+ find_dependency (mongoc-1.0)
++if("@ENABLE_SNAPPY@" STREQUAL "ON")
++    find_dependency(Snappy CONFIG)
++endif()
+
+ set(MONGOC_STATIC_LIBRARY mongo::mongoc_static)
+ set(MONGOC_STATIC_LIBRARIES mongo::mongoc_static)
 diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
-index d108e5d..a097016 100644
+index 8d5e3f6..2fa6799 100644
 --- a/src/libmongoc/CMakeLists.txt
 +++ b/src/libmongoc/CMakeLists.txt
-@@ -51,7 +51,7 @@ configure_file (
+@@ -50,7 +50,7 @@ endif ()
  set (ZLIB_INCLUDE_DIRS "")
  if (ENABLE_ZLIB MATCHES "SYSTEM|AUTO")
     message (STATUS "Searching for zlib CMake packages")
@@ -27,20 +55,10 @@ index d108e5d..a097016 100644
     if (ZLIB_FOUND)
        message (STATUS "   zlib found version \"${ZLIB_VERSION_STRING}\"")
        message (STATUS "   zlib include path \"${ZLIB_INCLUDE_DIRS}\"")
-@@ -146,7 +146,7 @@ if (NOT ENABLE_SSL STREQUAL OFF)
-    if (ENABLE_SSL STREQUAL "OPENSSL"
-        OR (NOT APPLE AND NOT WIN32 AND ENABLE_SSL STREQUAL "AUTO"))
-       # Sets OPENSSL_FOUND on success.
--      include (FindOpenSSL)
-+      find_package(OpenSSL REQUIRED)
-    endif ()
-
-    if (ENABLE_SSL STREQUAL LIBRESSL)
-@@ -364,10 +364,10 @@ else ()
- endif ()
+@@ -469,9 +469,10 @@ endif ()
 
  # Sets SNAPPY_LIBRARIES and SNAPPY_INCLUDE_DIRS.
--include (FindSnappy)
+ include (FindSnappy)
 -if (SNAPPY_INCLUDE_DIRS)
 +if(ENABLE_SNAPPY)
 +   find_package(Snappy CONFIG REQUIRED)
@@ -49,45 +67,17 @@ index d108e5d..a097016 100644
 -   include_directories ("${SNAPPY_INCLUDE_DIRS}")
  endif ()
 
- set (MONGOC_ENABLE_SHM_COUNTERS 0)
-diff --git a/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in
-index feeca02..1ec92ae 100644
---- a/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in
-+++ b/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in
-@@ -19,6 +19,10 @@ set (MONGOC_MINOR_VERSION @MONGOC_MINOR_VERSION@)
- set (MONGOC_MICRO_VERSION @MONGOC_MICRO_VERSION@)
- set (MONGOC_VERSION @MONGOC_VERSION@)
-
-+include(CMakeFindDependencyMacro)
-+if("@ENABLE_SNAPPY@" STREQUAL "ON")
-+    find_dependency(Snappy CONFIG)
-+endif()
- find_package (libbson-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED)
-
- @PACKAGE_INIT@
-diff --git a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in
-index 6f05b0c..0e388e6 100644
---- a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in
-+++ b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in
-@@ -19,6 +19,10 @@ set (MONGOC_STATIC_MINOR_VERSION @MONGOC_MINOR_VERSION@)
- set (MONGOC_STATIC_MICRO_VERSION @MONGOC_MICRO_VERSION@)
- set (MONGOC_STATIC_VERSION @MONGOC_VERSION@)
-
-+include(CMakeFindDependencyMacro)
-+if("@ENABLE_SNAPPY@" STREQUAL "ON")
-+    find_dependency(Snappy CONFIG)
-+endif()
- find_package (libbson-static-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED)
-
- @PACKAGE_INIT@
+ mongo_bool01 (MONGOC_ENABLE_SHM_COUNTERS ENABLE_SHM_COUNTERS)
 diff --git a/src/libmongoc/src/mongoc-config.cmake b/src/libmongoc/src/mongoc-config.cmake
-index 7fe7cf4..12611a3 100644
+index 31e6cbc..365fb5b 100644
 --- a/src/libmongoc/src/mongoc-config.cmake
 +++ b/src/libmongoc/src/mongoc-config.cmake
-@@ -1,3 +1,6 @@
+@@ -1,5 +1,8 @@
  include(CMakeFindDependencyMacro)
+ find_dependency(bson-1.0 @libmongoc_VERSION@)
 +if("@ENABLE_SNAPPY@" STREQUAL "ON")
 +    find_dependency(Snappy CONFIG)
 +endif()
- find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@)
- include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake")
+
+ # If we need to import a TLS package for our imported targets, do that now:
+ set(MONGOC_TLS_BACKEND [[@TLS_BACKEND@]])

ports/mongo-c-driver/fix-include-directory.patch

@@ -1,33 +1,13 @@
-diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
-index 86f59ae..d108e5d 100644
---- a/src/libmongoc/CMakeLists.txt
-+++ b/src/libmongoc/CMakeLists.txt
-@@ -1172,7 +1172,7 @@ else ()
- endif ()
-
- set (MONGOC_HEADER_INSTALL_DIR
--   "${CMAKE_INSTALL_INCLUDEDIR}/libmongoc-${MONGOC_API_VERSION}"
-+   "${CMAKE_INSTALL_INCLUDEDIR}"
- )
-
- install (
-diff --git a/src/libmongoc/src/libmongoc-1.0.pc.in b/src/libmongoc/src/libmongoc-1.0.pc.in
-index 1b489d8..991603e 100644
---- a/src/libmongoc/src/libmongoc-1.0.pc.in
-+++ b/src/libmongoc/src/libmongoc-1.0.pc.in
-@@ -8,4 +8,4 @@ Description: The libmongoc MongoDB client library.
- Version: @VERSION@
- Requires: libbson-1.0
- Libs: -L${libdir} -lmongoc-1.0
--Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@
-+Cflags: -I${includedir}
-diff --git a/src/libmongoc/src/libmongoc-static-1.0.pc.in b/src/libmongoc/src/libmongoc-static-1.0.pc.in
-index d59ee64..c23bb62 100644
---- a/src/libmongoc/src/libmongoc-static-1.0.pc.in
-+++ b/src/libmongoc/src/libmongoc-static-1.0.pc.in
-@@ -8,4 +8,4 @@ Description: The libmongoc MongoDB client library.
- Version: @VERSION@
- Requires: libbson-static-1.0
- Libs: -L${libdir} -lmongoc-static-1.0 @MONGOC_LIBRARIES@
--Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@ -DMONGOC_STATIC
-+Cflags: -I${includedir}/libmongoc -DMONGOC_STATIC
+diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
+index 61cae9c..8d5e3f6 100644
+--- a/src/libmongoc/CMakeLists.txt
++++ b/src/libmongoc/CMakeLists.txt
+@@ -1250,7 +1250,7 @@ else ()
+ endif ()
+
+ set (MONGOC_HEADER_INSTALL_DIR
+-   "${CMAKE_INSTALL_INCLUDEDIR}/libmongoc-${MONGOC_API_VERSION}"
++   "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+
+ install (