From 23fcc57ad188ea9ba94f286bf24d408ccf81fd2f Mon Sep 17 00:00:00 2001
From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Date: Sat, 8 Aug 2020 07:15:20 +0800
Subject: [PATCH] [curl] Fix tools (#12758)

---
 ports/curl/0008_fix_tools_path.patch | 13 -------------
 ports/curl/CONTROL                   |  1 +
 ports/curl/portfile.cmake            |  3 +--
 3 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 ports/curl/0008_fix_tools_path.patch

diff --git a/ports/curl/0008_fix_tools_path.patch b/ports/curl/0008_fix_tools_path.patch
deleted file mode 100644
index 7c411bf800..0000000000
--- a/ports/curl/0008_fix_tools_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5838805..d2ca468 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -103,7 +103,7 @@ target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS} ZLIB::ZLIB)
- 
- #INCLUDE(ModuleInstall OPTIONAL)
- 
--install(TARGETS ${EXE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS ${EXE_NAME} DESTINATION tools)
- #export(TARGETS ${EXE_NAME}
- #       APPEND FILE ${PROJECT_BINARY_DIR}/curl-target.cmake
- #       NAMESPACE ${PROJECT_NAME}::
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL
index 079b75d83f..ef5881da0c 100644
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@@ -1,5 +1,6 @@
 Source: curl
 Version: 7.71.1
+Port-Version: 1
 Build-Depends: zlib
 Homepage: https://github.com/curl/curl
 Description: A library for transferring data with URLs
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index d34441170d..db1367370f 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -10,7 +10,6 @@ vcpkg_from_github(
         0005_remove_imp_suffix.patch
         0006_fix_tool_depends.patch
         0007_disable_tool_export_curl_target.patch
-        0008_fix_tools_path.patch
         0009_fix_openssl_config.patch
         0010_fix_othertests_cmake.patch
 )
@@ -78,7 +77,7 @@ vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
 if ("tool" IN_LIST FEATURES)
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/curl)
+    vcpkg_copy_tools(TOOL_NAMES curl AUTO_CLEAN)
 endif()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CURL)