From 30d29b52f5960e096b87d74267cd8e66bc20f12b Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 21 Dec 2021 18:57:25 -0800
Subject: [PATCH 1/4] [highfive] Fix usage

---
 ports/highfive/portfile.cmake | 3 ---
 ports/highfive/vcpkg.json     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake
index bf8b9ecdd7d024..bdec827481e3a7 100644
--- a/ports/highfive/portfile.cmake
+++ b/ports/highfive/portfile.cmake
@@ -41,9 +41,6 @@ endif()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/HighFive/CMake)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-if(NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_IS_OSX)
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/HighFive")
-endif()
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/highfive/vcpkg.json b/ports/highfive/vcpkg.json
index 4603bcf4b620ba..c30c52860605e2 100644
--- a/ports/highfive/vcpkg.json
+++ b/ports/highfive/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "highfive",
   "version": "2.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5",
   "homepage": "https://github.com/BlueBrain/HighFive",
   "license": "BSL-1.0",

From fe4ad724d563be9050a1c1eba668f5e081f070f4 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 21 Dec 2021 18:59:12 -0800
Subject: [PATCH 2/4] version

---
 versions/baseline.json    | 2 +-
 versions/h-/highfive.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 28547ee8b17ef1..c020b86763087c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2694,7 +2694,7 @@
     },
     "highfive": {
       "baseline": "2.3",
-      "port-version": 1
+      "port-version": 2
     },
     "highway": {
       "baseline": "0.14.2",
diff --git a/versions/h-/highfive.json b/versions/h-/highfive.json
index 024a8af17e700f..3a50074f3d4298 100644
--- a/versions/h-/highfive.json
+++ b/versions/h-/highfive.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4f5ec6de3867a92d3d1be9ecb0eb7919864f0e88",
+      "version": "2.3",
+      "port-version": 2
+    },
     {
       "git-tree": "e2f9f257e00960a16a162c1f279406f48528db5a",
       "version": "2.3",

From c340abae9e2b432198860dc73a2e74e8d5ec1c24 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 21 Dec 2021 21:43:39 -0800
Subject: [PATCH 3/4] Re-fix

---
 ports/highfive/portfile.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake
index bdec827481e3a7..f43ab26b58090b 100644
--- a/ports/highfive/portfile.cmake
+++ b/ports/highfive/portfile.cmake
@@ -38,7 +38,8 @@ if("tests" IN_LIST FEATURES)
     )
 endif()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH share/HighFive/CMake)
+# Use PACKAGE_NAME to avoid folder HighFive and highfive are exist at same time
+vcpkg_cmake_config_fixup(PACKAGE_NAME HighFive CONFIG_PATH share/HighFive/CMake)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 

From 852eaafbb46ca64e340f3a0f78e51f9e1763d7d9 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 21 Dec 2021 21:43:55 -0800
Subject: [PATCH 4/4] version

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

diff --git a/versions/h-/highfive.json b/versions/h-/highfive.json
index 3a50074f3d4298..eaf02f1bab75a4 100644
--- a/versions/h-/highfive.json
+++ b/versions/h-/highfive.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "4f5ec6de3867a92d3d1be9ecb0eb7919864f0e88",
+      "git-tree": "b1ecca066cce62dd0fbdf760151ee0c3ccc70b81",
       "version": "2.3",
       "port-version": 2
     },