From 34d2f421b661fe4bce70dc3659116d7370aadf4b Mon Sep 17 00:00:00 2001
From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
Date: Tue, 26 Jul 2022 19:29:21 +0200
Subject: [PATCH] [brotli] Remove debug tools (#25976)

* [brotli] Remove debug tools

* version
---
 ports/brotli/portfile.cmake | 19 ++++++++++---------
 ports/brotli/vcpkg.json     | 17 ++++++++++++++---
 versions/b-/brotli.json     |  5 +++++
 versions/baseline.json      |  2 +-
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake
index 9c1e3037dc..e578bf3e2f 100644
--- a/ports/brotli/portfile.cmake
+++ b/ports/brotli/portfile.cmake
@@ -11,20 +11,21 @@ vcpkg_from_github(
         fix-ios.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS -DBROTLI_DISABLE_TESTS=ON
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBROTLI_DISABLE_TESTS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli)
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/brotli")
+vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli)
 vcpkg_fixup_pkgconfig()
 
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-brotli")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/brotli/vcpkg.json b/ports/brotli/vcpkg.json
index c5b7fc09df..bfc8a62cc5 100644
--- a/ports/brotli/vcpkg.json
+++ b/ports/brotli/vcpkg.json
@@ -1,7 +1,18 @@
 {
   "name": "brotli",
-  "version-string": "1.0.9",
-  "port-version": 2,
+  "version": "1.0.9",
+  "port-version": 3,
   "description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.",
-  "homepage": "https://github.com/google/brotli"
+  "homepage": "https://github.com/google/brotli",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/b-/brotli.json b/versions/b-/brotli.json
index e00f28e520..fc346bbfa9 100644
--- a/versions/b-/brotli.json
+++ b/versions/b-/brotli.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7b182b3e0615d6f3538b5eeac680f7eb8af5abd0",
+      "version": "1.0.9",
+      "port-version": 3
+    },
     {
       "git-tree": "73d0ed2fd7816c7a4958983b0b027c85b60eac15",
       "version-string": "1.0.9",
diff --git a/versions/baseline.json b/versions/baseline.json
index 017d1a2e21..03323810f6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1166,7 +1166,7 @@
     },
     "brotli": {
       "baseline": "1.0.9",
-      "port-version": 2
+      "port-version": 3
     },
     "brpc": {
       "baseline": "1.2.0",