From 27f892aa14c0d5c141dac16b32e957890c732f67 Mon Sep 17 00:00:00 2001
From: AndyBrown91 <andyjtbrown@gmail.com>
Date: Mon, 3 May 2021 18:52:53 +0100
Subject: [ghc-filesystem] Fix port/package name discrepancy (#17589)

---
 ports/ghc-filesystem/portfile.cmake | 5 ++++-
 ports/ghc-filesystem/vcpkg.json     | 1 +
 versions/baseline.json              | 2 +-
 versions/g-/ghc-filesystem.json     | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/ghc-filesystem/portfile.cmake b/ports/ghc-filesystem/portfile.cmake
index 2f580fba2..781933c2c 100644
--- a/ports/ghc-filesystem/portfile.cmake
+++ b/ports/ghc-filesystem/portfile.cmake
@@ -14,7 +14,10 @@ vcpkg_cmake_configure(
         -DGHC_FILESYSTEM_WITH_INSTALL=ON
 )
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ghc_filesystem)
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ghc_filesystem
+    CONFIG_PATH lib/cmake/ghc_filesystem
+)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug
diff --git a/ports/ghc-filesystem/vcpkg.json b/ports/ghc-filesystem/vcpkg.json
index 71aa2b1ae..648a6fdd9 100644
--- a/ports/ghc-filesystem/vcpkg.json
+++ b/ports/ghc-filesystem/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ghc-filesystem",
   "version": "1.5.4",
+  "port-version": 1,
   "description": "An implementation of C++17 std::filesystem for C++11 /C++14/C++17/C++20 on Windows, macOS, Linux and FreeBSD",
   "homepage": "https://github.com/gulrak/filesystem",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 6e65ada88..df1eef888 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2230,7 +2230,7 @@
     },
     "ghc-filesystem": {
       "baseline": "1.5.4",
-      "port-version": 0
+      "port-version": 1
     },
     "gherkin-c": {
       "baseline": "2019-10-07-1",
diff --git a/versions/g-/ghc-filesystem.json b/versions/g-/ghc-filesystem.json
index d4f2e6721..516c9564a 100644
--- a/versions/g-/ghc-filesystem.json
+++ b/versions/g-/ghc-filesystem.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7b793d2816cd9bd4d242e09b3d9638d760216797",
+      "version": "1.5.4",
+      "port-version": 1
+    },
     {
       "git-tree": "bacddfca1f950fd501d4774332039f9be3e4d620",
       "version": "1.5.4",
-- 
cgit v1.2.3