[libfort/libgit2/cli11] update to the latest version (#20024)

* [libfort/libgit2/cli11] update to the latest version

* update version

* delete useless dependencies

* update version

12 files changed, 163 insertions, 74 deletions

diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL
deleted file mode 100644
index e9e64abc6..000000000
--- a/ports/cli11/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: cli11
-Version: 1.9.1
-Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.
-Homepage: https://github.com/CLIUtils/CLI11
diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake
index 69f0a26fe..78776fdbe 100644
--- a/ports/cli11/portfile.cmake
+++ b/ports/cli11/portfile.cmake
@@ -1,25 +1,24 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CLIUtils/CLI11
-    REF 2b059cbdbe844450e1675a5dda3cb8acb1147631 #version 1.9.1
-    SHA512 8b7999ae3692ccb7b324bef033ad4cedccbf720b904aa3aa8d07d1cbc8f09f4ecbd9701d2a50a6266f81fe877e30a63a3b6e07d746fa738291b07476405e866d
+    REF 0d06d21b56eadef9dcb24907ee2866b2b6f0babe #version 2.0.0
+    SHA512 1952ce0e9fd3bc6646f00abdd7f0f7bae541c383b691a985b0f70ca53fe80a9acbcf68c07c59e021c92aae7b1e062fd7ffe4c9f9b198b95525dde3a1ce83c2f5
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCLI11_BUILD_EXAMPLES=OFF
         -DCLI11_BUILD_DOCS=OFF
         -DCLI11_BUILD_TESTS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CLI11)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLI11)
+vcpkg_fixup_pkgconfig()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # 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)
diff --git a/ports/cli11/vcpkg.json b/ports/cli11/vcpkg.json
new file mode 100644
index 000000000..93f45475d
--- /dev/null
+++ b/ports/cli11/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "cli11",
+  "version-semver": "2.0.0",
+  "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.",
+  "homepage": "https://github.com/CLIUtils/CLI11",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/libfort/portfile.cmake b/ports/libfort/portfile.cmake
index 1ff014765..969af67eb 100644
--- a/ports/libfort/portfile.cmake
+++ b/ports/libfort/portfile.cmake
@@ -3,23 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO seleznevae/libfort

-    REF ccb892f77dc30c2ebc42916a3f862a965e8c097f # v0.4.1

-    SHA512 0397e52985b56b6740d22533c48039bf1d61fb90795e97a6153e9360702d1e89b5353ba74de92005bbc874822766d157de21d175387ffd00d0a5294e531d2d8b

+    REF b1c32b67511f4612996b287a1ef4a9df012521d2 # v0.4.2

+    SHA512 56d3bd00b8a72a5f9deb9bca9a325e100319aed55e10321d04243d8a2a94c0fa513ada1b13bc59957af01b1f2c5f1655304a4a608e118cbeb65d2b4527f102d0

     HEAD_REF main

 )

 

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

     OPTIONS

         -DFORT_ENABLE_TESTING=OFF

         -DFORT_ENABLE_ASTYLE=OFF

 )

 

-vcpkg_install_cmake()

+vcpkg_cmake_install()

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})

+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libfort)

 

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 

-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)

diff --git a/ports/libfort/vcpkg.json b/ports/libfort/vcpkg.json
index 613042cb6..7a13edcc5 100644
--- a/ports/libfort/vcpkg.json
+++ b/ports/libfort/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "libfort",
-  "version-string": "0.4.1",
+  "version-semver": "0.4.2",
   "description": "A simple crossplatform library to create formatted text tables",
   "homepage": "https://github.com/seleznevae/libfort",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL
deleted file mode 100644
index 4435d83cf..000000000
--- a/ports/libgit2/CONTROL
+++ /dev/null
@@ -1,38 +0,0 @@
-Source: libgit2

-Version: 1.1.0

-Homepage: https://github.com/libgit2/libgit2

-Build-Depends: zlib, http-parser

-Description: Git linkable library

-Default-Features: pcre, ssl

-Supports: !uwp

-

-Feature: pcre

-Description: Build against external libpcre

-Build-Depends: pcre

-

-Feature: pcre2

-Description: Build against external libpcre2

-Build-Depends: pcre2

-

-Feature: ssh

-Build-Depends: libgit2[core,openssl], libssh2

-Description: SSH support via libssh2

-

-Feature: ssl

-Build-Depends: libgit2[core,openssl] (!windows&!osx), libgit2[core,winhttp] (windows), libgit2[core,sectransp] (osx)

-Description: Default SSL backend

-

-# SSL backends

-Feature: openssl

-Build-Depends: openssl

-Description: SSL support (OpenSSL)

-

-Feature: winhttp

-Description: SSL support (WinHTTP)

-

-Feature: sectransp

-Description: SSL support (sectransp)

-

-Feature: mbedtls

-Build-Depends: mbedtls

-Description: SSL support (mbedTLS)

diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake
index 82ed07e90..c8b1dec1a 100644
--- a/ports/libgit2/portfile.cmake
+++ b/ports/libgit2/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_fail_port_install(ON_TARGET "uwp")
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libgit2/libgit2

-    REF 7f4fa178629d559c037a1f72f79f79af9c1ef8ce#version 1.1.0

-    SHA512 2fdbbb263fe71dc6d04b64c2967e7acff1a5b6102e62d69c9a7ea1b6777ab74a1625e798438ea239d8b489648a9335833f937f893f73a66e16c658eae453ab62

+    REF 4fd32be01c79a5c003bb47674ac1d76d948518b7#version 1.2.0

+    SHA512 f9defe0dd51537ae374fe25ef3ccea74d8d05588f26b1865275067e63ad65a7cd283ee83099b97cea50ef5c367036734ba34be73a06b030be2903344b2778fff

     HEAD_REF master

 )

 

@@ -63,9 +63,8 @@ vcpkg_check_features(
         ssh USE_SSH

 )

 

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

     OPTIONS

         -DBUILD_CLAR=OFF

         -DUSE_HTTP_PARSER=system

@@ -75,8 +74,8 @@ vcpkg_configure_cmake(
         ${GIT2_FEATURES}

 )

 

-vcpkg_install_cmake()

+vcpkg_cmake_install()

 

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 

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

+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json
new file mode 100644
index 000000000..c82e70249
--- /dev/null
+++ b/ports/libgit2/vcpkg.json
@@ -0,0 +1,93 @@
+{
+  "name": "libgit2",
+  "version-semver": "1.2.0",
+  "description": "Git linkable library",
+  "homepage": "https://github.com/libgit2/libgit2",
+  "supports": "!uwp",
+  "dependencies": [
+    "http-parser",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    "zlib"
+  ],
+  "default-features": [
+    "pcre",
+    "ssl"
+  ],
+  "features": {
+    "mbedtls": {
+      "description": "SSL support (mbedTLS)",
+      "dependencies": [
+        "mbedtls"
+      ]
+    },
+    "openssl": {
+      "description": "SSL support (OpenSSL)",
+      "dependencies": [
+        "openssl"
+      ]
+    },
+    "pcre": {
+      "description": "Build against external libpcre",
+      "dependencies": [
+        "pcre"
+      ]
+    },
+    "pcre2": {
+      "description": "Build against external libpcre2",
+      "dependencies": [
+        "pcre2"
+      ]
+    },
+    "sectransp": {
+      "description": "SSL support (sectransp)"
+    },
+    "ssh": {
+      "description": "SSH support via libssh2",
+      "dependencies": [
+        {
+          "name": "libgit2",
+          "default-features": false,
+          "features": [
+            "openssl"
+          ]
+        },
+        "libssh2"
+      ]
+    },
+    "ssl": {
+      "description": "Default SSL backend",
+      "dependencies": [
+        {
+          "name": "libgit2",
+          "default-features": false,
+          "features": [
+            "sectransp"
+          ],
+          "platform": "osx"
+        },
+        {
+          "name": "libgit2",
+          "default-features": false,
+          "features": [
+            "winhttp"
+          ],
+          "platform": "windows"
+        },
+        {
+          "name": "libgit2",
+          "default-features": false,
+          "features": [
+            "openssl"
+          ],
+          "platform": "!windows & !osx"
+        }
+      ]
+    },
+    "winhttp": {
+      "description": "SSL support (WinHTTP)"
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 04b482790..efe5970ac 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1313,7 +1313,7 @@
       "port-version": 0
     },
     "cli11": {
-      "baseline": "1.9.1",
+      "baseline": "2.0.0",
       "port-version": 0
     },
     "clickhouse-cpp": {
@@ -3245,7 +3245,7 @@
       "port-version": 5
     },
     "libfort": {
-      "baseline": "0.4.1",
+      "baseline": "0.4.2",
       "port-version": 0
     },
     "libfreenect2": {
@@ -3273,7 +3273,7 @@
       "port-version": 3
     },
     "libgit2": {
-      "baseline": "1.1.0",
+      "baseline": "1.2.0",
       "port-version": 0
     },
     "libgnutls": {
diff --git a/versions/c-/cli11.json b/versions/c-/cli11.json
index ce5f0cd51..019131c10 100644
--- a/versions/c-/cli11.json
+++ b/versions/c-/cli11.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "1430611e0538943498bb96f67ab5de443c76cad2",
+      "version-semver": "2.0.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "47d52d6f0f742e0c0799cd5de355c81732d82d5b",
       "version-string": "1.9.1",
       "port-version": 0
diff --git a/versions/l-/libfort.json b/versions/l-/libfort.json
index 7ebfdf38b..319568ce4 100644
--- a/versions/l-/libfort.json
+++ b/versions/l-/libfort.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "3323e3e7b75556050db8a8ff3adeb38c3b7bfb98",
+      "version-semver": "0.4.2",
+      "port-version": 0
+    },
+    {
       "git-tree": "0c816bc07eb1bf136201ff9dfeddbb6bc921ff50",
       "version-string": "0.4.1",
       "port-version": 0
diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json
index 444934169..cdfb07850 100644
--- a/versions/l-/libgit2.json
+++ b/versions/l-/libgit2.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "daddb751c1ff040d820dd32d62f08c94482b49ae",
+      "version-semver": "1.2.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "23d98ed81409eaac3ae1abc9ddbc175564533d65",
       "version-string": "1.1.0",
       "port-version": 0