From 494e84e74de4abcd6d0ce00a7094dcb660adeff6 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Wed, 10 Nov 2021 19:51:16 +0100
Subject: [PATCH] [gperftools] no absolute paths (#21270)

---
 ports/gperftools/portfile.cmake | 21 +++++++++++----------
 ports/gperftools/vcpkg.json     | 11 +++++++++--
 versions/baseline.json          |  2 +-
 versions/g-/gperftools.json     |  5 +++++
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/ports/gperftools/portfile.cmake b/ports/gperftools/portfile.cmake
index 01ee219ff6..00b72fefc6 100644
--- a/ports/gperftools/portfile.cmake
+++ b/ports/gperftools/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_from_github(
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+    file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
     if(override IN_LIST FEATURES)
         if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -24,22 +24,21 @@ if(VCPKG_TARGET_IS_WINDOWS)
         tools GPERFTOOLS_BUILD_TOOLS
     )
 
-    vcpkg_configure_cmake(
-        SOURCE_PATH ${SOURCE_PATH}
-        PREFER_NINJA
+    vcpkg_cmake_configure(
+        SOURCE_PATH "${SOURCE_PATH}"
         DISABLE_PARALLEL_CONFIGURE
         OPTIONS
             ${FEATURE_OPTIONS}
     )
 
-    vcpkg_install_cmake()
+    vcpkg_cmake_install()
 
     vcpkg_copy_pdbs()
 
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-        file(GLOB gperf_public_headers ${CURRENT_PACKAGES_DIR}/include/gperftools/*.h)
+        file(GLOB gperf_public_headers "${CURRENT_PACKAGES_DIR}/include/gperftools/*.h")
 
         foreach(gperf_header ${gperf_public_headers})
             vcpkg_replace_string(${gperf_header} "__declspec(dllimport)" "")
@@ -70,14 +69,16 @@ else()
     endif()
 
     file(REMOVE_RECURSE
-        ${CURRENT_PACKAGES_DIR}/debug/include
-        ${CURRENT_PACKAGES_DIR}/debug/share
+        "${CURRENT_PACKAGES_DIR}/debug/include"
+        "${CURRENT_PACKAGES_DIR}/debug/share"
     )
 
     # https://github.com/microsoft/vcpkg/pull/8750#issuecomment-625590773
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
     endif()
+
+    vcpkg_fixup_pkgconfig()
 endif()
 
-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/gperftools/vcpkg.json b/ports/gperftools/vcpkg.json
index 8d12a9b734..6aeb5dd81d 100644
--- a/ports/gperftools/vcpkg.json
+++ b/ports/gperftools/vcpkg.json
@@ -1,10 +1,17 @@
 {
   "name": "gperftools",
-  "version-string": "2019-09-02",
-  "port-version": 1,
+  "version-date": "2019-09-02",
+  "port-version": 2,
   "description": "A set of tools for performance profiling and memory checking",
   "homepage": "https://github.com/gperftools/gperftools",
   "supports": "!(arm | arm64 | uwp)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true,
+      "platform": "windows"
+    }
+  ],
   "features": {
     "override": {
       "description": "Override allocators"
diff --git a/versions/baseline.json b/versions/baseline.json
index 1687b9e533..a2a77e9f06 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2526,7 +2526,7 @@
     },
     "gperftools": {
       "baseline": "2019-09-02",
-      "port-version": 1
+      "port-version": 2
     },
     "gpgme": {
       "baseline": "1.14.0",
diff --git a/versions/g-/gperftools.json b/versions/g-/gperftools.json
index 1c0987e38a..1f2a5a9325 100644
--- a/versions/g-/gperftools.json
+++ b/versions/g-/gperftools.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7bf526ef5e6a6a1dfb5fa4cb6941e415b64b94b3",
+      "version-date": "2019-09-02",
+      "port-version": 2
+    },
     {
       "git-tree": "e9062481bd1f6c7f7cac6bfabe0252f862730efc",
       "version-string": "2019-09-02",