From 1431a2ab4ee7244fe6169a71ab83205780066566 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Wed, 21 Jul 2021 01:34:10 -0700
Subject: [PATCH 1/4] [libgo] Add DISABLE_PARALLEL_CONFIGURE

---
 ports/libgo/CONTROL        |  5 -----
 ports/libgo/portfile.cmake | 25 +++++++++++++------------
 ports/libgo/vcpkg.json     |  8 ++++++++
 3 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 ports/libgo/CONTROL
 create mode 100644 ports/libgo/vcpkg.json

diff --git a/ports/libgo/CONTROL b/ports/libgo/CONTROL
deleted file mode 100644
index 92d6f9f5a3792b..00000000000000
--- a/ports/libgo/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: libgo
-Version: 3.1-1
-Homepage: https://github.com/yyzybb537/libgo
-Description: The best stackful coroutine by c++11.
-Supports: !(arm|uwp)
diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake
index 26339fc43b9ad2..4f40ea0beeda7f 100644
--- a/ports/libgo/portfile.cmake
+++ b/ports/libgo/portfile.cmake
@@ -18,29 +18,30 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(REMOVE_RECURSE ${SOURCE_PATH}/third_party)
-file(MAKE_DIRECTORY ${SOURCE_PATH}/third_party)
-file(RENAME ${XHOOK_SOURCE_PATH} ${SOURCE_PATH}/third_party/xhook)
+file(REMOVE_RECURSE "${SOURCE_PATH}/third_party")
+file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party")
+file(RENAME "${XHOOK_SOURCE_PATH}" "${SOURCE_PATH}/third_party/xhook")
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
 )
 
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/disable_hook)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/disable_hook")
 
 if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix/static_hook)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/windows)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix/static_hook")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/windows")
 else()
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix")
 endif()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${CURRENT_PORT_DIR}/libgo-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CURRENT_PORT_DIR}/libgo-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/libgo/vcpkg.json b/ports/libgo/vcpkg.json
new file mode 100644
index 00000000000000..5aa2db0cd4f03e
--- /dev/null
+++ b/ports/libgo/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "libgo",
+  "version": "3.1",
+  "port-version": 2,
+  "description": "The best stackful coroutine by c++11.",
+  "homepage": "https://github.com/yyzybb537/libgo",
+  "supports": "!(arm | uwp)"
+}

From 3f5c0d9af2f0c0202a1df962c40c630149c19776 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Wed, 21 Jul 2021 01:35:17 -0700
Subject: [PATCH 2/4] update version files

---
 versions/baseline.json | 4 ++--
 versions/l-/libgo.json | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 4652e933959066..3682cab253889d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3197,8 +3197,8 @@
       "port-version": 2
     },
     "libgo": {
-      "baseline": "3.1-1",
-      "port-version": 0
+      "baseline": "3.1",
+      "port-version": 2
     },
     "libgpg-error": {
       "baseline": "1.42",
diff --git a/versions/l-/libgo.json b/versions/l-/libgo.json
index da7c1405aeb972..1b4e4743d30cfb 100644
--- a/versions/l-/libgo.json
+++ b/versions/l-/libgo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "80a4ca78da86a55b9d14f482dee451d9064fdb91",
+      "version": "3.1",
+      "port-version": 2
+    },
     {
       "git-tree": "0f54bcfa9c4d0b052bddeb9d450564ee109c0e01",
       "version-string": "3.1-1",

From 06c7eb49dc845bab593da59fdcf1e097af690801 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Wed, 21 Jul 2021 02:09:08 -0700
Subject: [PATCH 3/4] Update deprecated functions

---
 ports/libgo/portfile.cmake | 5 ++---
 ports/libgo/vcpkg.json     | 8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake
index 4f40ea0beeda7f..fdb028123f7e10 100644
--- a/ports/libgo/portfile.cmake
+++ b/ports/libgo/portfile.cmake
@@ -22,13 +22,12 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/third_party")
 file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party")
 file(RENAME "${XHOOK_SOURCE_PATH}" "${SOURCE_PATH}/third_party/xhook")
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    PREFER_NINJA
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/disable_hook")
diff --git a/ports/libgo/vcpkg.json b/ports/libgo/vcpkg.json
index 5aa2db0cd4f03e..b9d85cc606a357 100644
--- a/ports/libgo/vcpkg.json
+++ b/ports/libgo/vcpkg.json
@@ -4,5 +4,11 @@
   "port-version": 2,
   "description": "The best stackful coroutine by c++11.",
   "homepage": "https://github.com/yyzybb537/libgo",
-  "supports": "!(arm | uwp)"
+  "supports": "!(arm | uwp)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }

From 36d77d187d3af64d2f6f2d087a793268a6154a93 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Wed, 21 Jul 2021 02:10:08 -0700
Subject: [PATCH 4/4] Update versions/l-/libgo.json

---
 versions/l-/libgo.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/libgo.json b/versions/l-/libgo.json
index 1b4e4743d30cfb..976f87c31ed1eb 100644
--- a/versions/l-/libgo.json
+++ b/versions/l-/libgo.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "80a4ca78da86a55b9d14f482dee451d9064fdb91",
+      "git-tree": "1158e6c06fa6cb413bf12c04065ff58b8930c474",
       "version": "3.1",
       "port-version": 2
     },