mongo and bson 1.9.2 to 1.9.5 (#4722)

* mongo and bson 1.9.2 to 1.9.5

* [libbson][mongo-c-driver] Modernize

4 files changed, 21 insertions, 28 deletions

diff --git a/ports/libbson/CONTROL b/ports/libbson/CONTROL
index 8ba25697f..2d64c4c1c 100644
--- a/ports/libbson/CONTROL
+++ b/ports/libbson/CONTROL
@@ -1,3 +1,3 @@
 Source: libbson
-Version: 1.9.2
+Version: 1.9.5-1
 Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.
diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake
index 45bc06170..50b6da175 100644
--- a/ports/libbson/portfile.cmake
+++ b/ports/libbson/portfile.cmake
@@ -1,15 +1,11 @@
 include(vcpkg_common_functions)

 

-set(LIBBSON_VERSION 1.9.2)

-vcpkg_download_distfile(ARCHIVE

-    URLS "https://github.com/mongodb/libbson/archive/${LIBBSON_VERSION}.tar.gz"

-    FILENAME "libbson-${LIBBSON_VERSION}.tar.gz"

-    SHA512 a05f1e8fbabb34e847692397e2e41fc5923ddd18dba861e5ab8a31acdf6738e13ab719eae8f9f8563f08fc43aab5c8d1f53cb6a47c38c96e132fa4a62a48d2bf

-)

-vcpkg_extract_source_archive_ex(

+vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

-    ARCHIVE ${ARCHIVE}

-    REF ${LIBBSON_VERSION}

+    REPO mongodb/libbson

+    REF 1.9.5

+    SHA512 14bc75989baac550f42939ea161fa7872b950e5b669dc8f19e897f0783b04e0212e5e722b3fcdf946308b9a68bc066502ed8238dad92e342e5f49b8b2cc8f484

+    HEAD_REF master

     PATCHES fix-uwp.patch

 )

 

@@ -70,7 +66,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)

 endif()

 

-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson RENAME copyright)

+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libbson/copyright COPYONLY)

 file(COPY ${SOURCE_PATH}/THIRD_PARTY_NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson)

 

 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)

@@ -79,6 +75,7 @@ else()
     set(PORT_POSTFIX "1.0")

 endif()

 

+# Create cmake files for _both_ find_package(libbson) and find_package(libbson-static-1.0)/find_package(libbson-1.0)

 file(READ ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config.cmake LIBBSON_CONFIG_CMAKE)

 string(REPLACE "/include/libbson-1.0" "/include" LIBBSON_CONFIG_CMAKE "${LIBBSON_CONFIG_CMAKE}")

 string(REPLACE "bson-static-1.0" "bson-1.0" LIBBSON_CONFIG_CMAKE "${LIBBSON_CONFIG_CMAKE}")

@@ -88,4 +85,4 @@ file(COPY ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config-v
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config.cmake ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-config.cmake)

 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config-version.cmake ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-config-version.cmake)

 

-vcpkg_copy_pdbs()
\ No newline at end of file
+vcpkg_copy_pdbs()

diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL
index 9a367df3a..700f65d1a 100644
--- a/ports/mongo-c-driver/CONTROL
+++ b/ports/mongo-c-driver/CONTROL
@@ -1,4 +1,4 @@
 Source: mongo-c-driver
-Version: 1.9.2
+Version: 1.9.5-1
 Build-Depends: libbson, openssl (uwp)
 Description: Client library written in C for MongoDB.
diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
index 74f4bd66b..54d70aaf8 100644
--- a/ports/mongo-c-driver/portfile.cmake
+++ b/ports/mongo-c-driver/portfile.cmake
@@ -1,16 +1,11 @@
 include(vcpkg_common_functions)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.9.2)

-

-vcpkg_download_distfile(ARCHIVE

-    URLS "https://github.com/mongodb/mongo-c-driver/archive/1.9.2.tar.gz"

-    FILENAME "mongo-c-driver-1.9.2.tar.gz"

-    SHA512 a2c819da77aef93ce261093e98e8e8c41c449af56bd03d875e2838a067ae71b5ceb16fed2fb8df9458c84310451b813464377592806fc9ac39d9df2f4ddba83b

-)

-vcpkg_extract_source_archive(${ARCHIVE})

-

-vcpkg_apply_patches(

-    SOURCE_PATH ${SOURCE_PATH}

-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO mongodb/mongo-c-driver

+    REF 1.9.5

+    SHA512 bee584c83bb317802eb855fececc98f2013d7c3134f063c3146521ab535c8a89c2dfe89ccfa6ebbe2d7c64edec0e53105ead361da83b885c7778b40e4801de62

+    HEAD_REF master

+    PATCHES fix-uwp.patch

 )

 

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

@@ -36,7 +31,7 @@ vcpkg_configure_cmake(
 )

 

 vcpkg_install_cmake()

-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)

+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")

     vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libmongoc-static-1.0")

 else()

     vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libmongoc-1.0")

@@ -64,13 +59,13 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     vcpkg_apply_patches(

         SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include

         PATCHES

-            ${CMAKE_CURRENT_LIST_DIR}/static.patch

+            static.patch

     )

 

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

 endif()

 

-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver RENAME copyright)

+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver/copyright COPYONLY)

 file(COPY ${SOURCE_PATH}/THIRD_PARTY_NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver)

 

 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)

@@ -79,6 +74,7 @@ else()
     set(PORT_POSTFIX "1.0")

 endif()

 

+# Create cmake files for _both_ find_package(mongo-c-driver) and find_package(libmongoc-static-1.0)/find_package(libmongoc-1.0)

 file(READ ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver/libmongoc-${PORT_POSTFIX}-config.cmake LIBMONGOC_CONFIG_CMAKE)

 string(REPLACE "/include/libmongoc-1.0" "/include" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}")

 string(REPLACE "mongoc-static-1.0" "mongoc-1.0" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}")