3 files changed, 100 insertions, 46 deletions
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)"
+    }
+  }
+}