[trantor] Update to 1.5.1 (#19443)

* [trantor] Update to 1.5.1

* Update ports/trantor/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update ports/trantor/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* update cmake functiom

* update version

* fix ci baseline issue

* update version

* fix ci error

* add port version

* update version

* Repair old drogon sha.

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

9 files changed, 47 insertions, 24 deletions

diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
index 101f143e9..897b79985 100644
--- a/ports/drogon/portfile.cmake
+++ b/ports/drogon/portfile.cmake
@@ -26,6 +26,7 @@ vcpkg_check_features(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBUILD_EXAMPLES=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json
index 3aa7f4da7..55544ebcc 100644
--- a/ports/drogon/vcpkg.json
+++ b/ports/drogon/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "drogon",
   "version-semver": "1.7.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
   "homepage": "https://github.com/an-tao/drogon",
   "documentation": "https://drogon.docsforge.com/master/overview/",
diff --git a/ports/trantor/CONTROL b/ports/trantor/CONTROL
deleted file mode 100644
index 447e609fc..000000000
--- a/ports/trantor/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: trantor
-Version: 1.5.0
-Homepage: https://github.com/an-tao/trantor
-Description: A non-blocking I/O cross-platform TCP network library, using C++14.
-Build-Depends: openssl, c-ares
diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake
index 0017cb46a..95ef049c5 100644
--- a/ports/trantor/portfile.cmake
+++ b/ports/trantor/portfile.cmake
@@ -1,22 +1,21 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/trantor
-    REF v1.5.0
-    SHA512 3e9e0f15aa7e039b70141b1ede16fcfe854af961cc787a0a51d4b020581e2b4ae1b51497e3ca31cfc4b5ed11dd9028a1438339cb726d83588f656c99d9938493
+    REF v1.5.1
+    SHA512 9f6664abc94943598805192ee09a98340e6e20efb15e448aac5e21480f1798b0991782d18766f5ef54399251d4980c2f68aeda3136c7e058e3c31623c8f7ce3f
     HEAD_REF master
     PATCHES
         vcpkg.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Fix CMake files
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Trantor)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Trantor)
 
 vcpkg_fixup_pkgconfig()
 
@@ -24,7 +23,7 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/License DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 # Copy pdb files
 vcpkg_copy_pdbs()
diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json
new file mode 100644
index 000000000..122efa0a7
--- /dev/null
+++ b/ports/trantor/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "trantor",
+  "version-semver": "1.5.1",
+  "description": "A non-blocking I/O cross-platform TCP network library, using C++14",
+  "homepage": "https://github.com/an-tao/trantor",
+  "dependencies": [
+    "c-ares",
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/trantor/vcpkg.patch b/ports/trantor/vcpkg.patch
index f5b23d647..5e484c856 100644
--- a/ports/trantor/vcpkg.patch
+++ b/ports/trantor/vcpkg.patch
@@ -1,14 +1,14 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d164667..e75b869 100755
+index ad5a1b3..7d59844 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -90,6 +90,9 @@ if(c-ares_FOUND)
-   message(STATUS "c-ares found!")
-   target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib)
-   set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc)
+@@ -133,6 +133,9 @@ if(c-ares_FOUND)
+   set(private_headers
+       ${private_headers}
+       trantor/net/inner/AresResolver.h)
 +  if(APPLE)
 +    target_link_libraries(${PROJECT_NAME} PRIVATE resolv)
 +  endif()
- else()
-   set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/NormalResolver.cc)
- endif()
+ else(c-ares_FOUND)
+   set(TRANTOR_SOURCES
+       ${TRANTOR_SOURCES}
diff --git a/versions/baseline.json b/versions/baseline.json
index 48d8f1f10..39630f5d5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1786,7 +1786,7 @@
     },
     "drogon": {
       "baseline": "1.7.1",
-      "port-version": 1
+      "port-version": 2
     },
     "dtl": {
       "baseline": "1.19",
@@ -6457,7 +6457,7 @@
       "port-version": 0
     },
     "trantor": {
-      "baseline": "1.5.0",
+      "baseline": "1.5.1",
       "port-version": 0
     },
     "tre": {
diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json
index 9073dfa7e..7ca60b5b7 100644
--- a/versions/d-/drogon.json
+++ b/versions/d-/drogon.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "34e8225c88ebbf0713112235dddbe6eae11121fb",
+      "version-semver": "1.7.1",
+      "port-version": 2
+    },
+    {
       "git-tree": "6293f8fcc884c9ed56a4a3138722401451ff445d",
       "version-semver": "1.7.1",
       "port-version": 1
diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json
index afcabcd9c..42dbcee11 100644
--- a/versions/t-/trantor.json
+++ b/versions/t-/trantor.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "06881e6b0abf51c4df93d7bdcb5c715adf57809d",
+      "version-semver": "1.5.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "82647f91d6290a85e1b03801e75e17698b3da691",
       "version-string": "1.5.0",
       "port-version": 0