From 805e3090e7a187bda56a56a1826a8ba9b8511e49 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 15 Mar 2022 15:43:52 +0100
Subject: [PATCH 1/5] fix tidy-html5 in CI

---
 ports/tidy-html5/portfile.cmake | 29 +++++++++++------------------
 ports/tidy-html5/vcpkg.json     | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake
index 159ed86aaa7a16..db7a0c7f9524ae 100644
--- a/ports/tidy-html5/portfile.cmake
+++ b/ports/tidy-html5/portfile.cmake
@@ -8,35 +8,28 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     NO_CHARSET_FLAG
     OPTIONS
         -DBUILD_SHARED_LIB=OFF
         -DTIDY_CONSOLE_SHARED=OFF
 )
+vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt/bin")
+vcpkg_cmake_install()
 
-vcpkg_install_cmake()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tidyd)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/tidy-html5)
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd")
 
-if(VCPKG_TARGET_IS_WINDOWS)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tidy.exe ${CURRENT_PACKAGES_DIR}/tools/tidy-html5/tidy.exe)
-else()
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tidy ${CURRENT_PACKAGES_DIR}/tools/tidy-html5/tidy)
-endif()
+vcpkg_copy_tools(TOOL_NAMES tidy AUTO_CLEAN)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
-
-file(INSTALL ${SOURCE_PATH}/README/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tidy-html5 RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL "${SOURCE_PATH}/README/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/tidy-html5" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_fixup_pkgconfig()
diff --git a/ports/tidy-html5/vcpkg.json b/ports/tidy-html5/vcpkg.json
index 7071cab8fae270..792508bbde01c4 100644
--- a/ports/tidy-html5/vcpkg.json
+++ b/ports/tidy-html5/vcpkg.json
@@ -1,7 +1,18 @@
 {
   "name": "tidy-html5",
   "version-string": "5.7.28",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.",
-  "homepage": "https://github.com/htacg/tidy-html5"
+  "homepage": "https://github.com/htacg/tidy-html5",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "libxslt",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }

From 8b0e0d8d4d708fd04069a10386cef54560934a20 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 15 Mar 2022 15:44:20 +0100
Subject: [PATCH 2/5] version stuff

---
 ports/tidy-html5/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/tidy-html5/vcpkg.json b/ports/tidy-html5/vcpkg.json
index 792508bbde01c4..1c16d8657d1192 100644
--- a/ports/tidy-html5/vcpkg.json
+++ b/ports/tidy-html5/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tidy-html5",
-  "version-string": "5.7.28",
+  "version": "5.7.28",
   "port-version": 5,
   "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.",
   "homepage": "https://github.com/htacg/tidy-html5",

From 4f34aaffb91a129e5980ac2aa81ba7eff44dcedd Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 15 Mar 2022 15:44:30 +0100
Subject: [PATCH 3/5] version stuff

---
 versions/baseline.json      | 2 +-
 versions/t-/tidy-html5.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 01e87268226dd7..ff977cc380a0e8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6886,7 +6886,7 @@
     },
     "tidy-html5": {
       "baseline": "5.7.28",
-      "port-version": 4
+      "port-version": 5
     },
     "tiff": {
       "baseline": "4.3.0",
diff --git a/versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json
index 372b548580bc74..495411ed695219 100644
--- a/versions/t-/tidy-html5.json
+++ b/versions/t-/tidy-html5.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "63b9670b22eb5038a2961c1f91ac05052c439b0a",
+      "version": "5.7.28",
+      "port-version": 5
+    },
     {
       "git-tree": "ba5557c5b17df0184bd2ee1eeee06ec1131576f8",
       "version-string": "5.7.28",

From cd5725cf89948d6821d43bbeda03543fea19a4e1 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Tue, 15 Mar 2022 22:00:14 +0100
Subject: [PATCH 4/5] copy to share/${PORT}

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
---
 ports/tidy-html5/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake
index db7a0c7f9524ae..350d9885967159 100644
--- a/ports/tidy-html5/portfile.cmake
+++ b/ports/tidy-html5/portfile.cmake
@@ -29,7 +29,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/README/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/tidy-html5" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/README/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_fixup_pkgconfig()

From dd02f345f3847bd531fd9106095335af366b4652 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <Alexander.Neumann@hamburg.de>
Date: Tue, 15 Mar 2022 22:00:47 +0100
Subject: [PATCH 5/5] version stuff

---
 versions/t-/tidy-html5.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json
index 495411ed695219..8a48d8d4212b4c 100644
--- a/versions/t-/tidy-html5.json
+++ b/versions/t-/tidy-html5.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "63b9670b22eb5038a2961c1f91ac05052c439b0a",
+      "git-tree": "bf333a8afdee1d7e0129928022e228cc092ed5de",
       "version": "5.7.28",
       "port-version": 5
     },