[spdlog] Update to 1.8.5 (#16870)

* remove featurebuild patch

see:
https://github.com/gabime/spdlog/commit/3d8f71c4d23fd2df08e4f6284155958b0df47b33
https://github.com/gabime/spdlog/commit/42c36f48ed8d5d64bd244b1097257f575569d472

* remove external fmt patch

see:
https://github.com/gabime/spdlog/blob/53e1c9ab112aa97062ba3df8fede91c3acd248d5/CMakeLists.txt#L183-L184

* remove target fixup branching

see:
https://github.com/gabime/spdlog/commit/4858d7e454e66d347024a074749535b91ccbeed9

* convert control file to manifest file

* remove android build patch

see:
https://github.com/gabime/spdlog/commit/e86f450428fd5373ea72606b21a4055fb411abfd

* update to 1.8.3

* remove redundant cleanup

these folders don't exist in the build tree, and so they don't need to be cleaned up

* update deprecated functions

* remove empty folder

* add version

* report version using semantic versioning

* correct version comment

* update version file

* fixup pkgconfig

* update version file again

* accomodate non-cmake users

* update to 1.8.5

* update version files

* remove 1.8.3 from version file

7 files changed, 40 insertions, 84 deletions

diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL
deleted file mode 100644
index 6110199ff..000000000
--- a/ports/spdlog/CONTROL
+++ /dev/null
@@ -1,10 +0,0 @@
-Source: spdlog
-Version: 1.8.0
-Port-Version: 3
-Homepage: https://github.com/gabime/spdlog
-Description: Very fast, header only, C++ logging library
-Build-Depends: fmt
-
-Feature: benchmark
-Description: Use google benchmark
-Build-Depends: benchmark
diff --git a/ports/spdlog/fix-androidbuild.patch b/ports/spdlog/fix-androidbuild.patch
deleted file mode 100644
index bd1648e90..000000000
--- a/ports/spdlog/fix-androidbuild.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	(revision 4a9ccf7e38e257feecce0c579a782741254eaeef)
-+++ b/CMakeLists.txt	(date 1616381634500)
-@@ -188,6 +188,11 @@
-     set(PKG_CONFIG_REQUIRES fmt) # add dependency to pkg-config
- endif ()
- 
-+if (ANDROID)
-+    target_link_libraries(spdlog PUBLIC log)
-+    target_link_libraries(spdlog_header_only INTERFACE log)
-+endif ()
-+
- # ---------------------------------------------------------------------------------------
- # Misc definitions according to tweak options
- # ---------------------------------------------------------------------------------------
diff --git a/ports/spdlog/fix-featurebuild.patch b/ports/spdlog/fix-featurebuild.patch
deleted file mode 100644
index 1b90c5a99..000000000
--- a/ports/spdlog/fix-featurebuild.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3a7663b..3e554d6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -171,7 +171,7 @@ target_link_libraries(spdlog_header_only INTERFACE Threads::Threads)
- # ---------------------------------------------------------------------------------------
- if (SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO)
-     if (NOT TARGET fmt::fmt)
--        find_package(fmt 5.3.0 REQUIRED)
-+        find_package(fmt CONFIG REQUIRED)
-     endif ()
-     target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
-     target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
-diff --git a/bench/async_bench.cpp b/bench/async_bench.cpp
-index d4167a4..ccb5406 100644
---- a/bench/async_bench.cpp
-+++ b/bench/async_bench.cpp
-@@ -9,7 +9,7 @@
- #include "spdlog/spdlog.h"
- #include "spdlog/async.h"
- #include "spdlog/sinks/basic_file_sink.h"
--#include "spdlog/fmt/bundled/locale.h"
-+#include <fmt/locale.h>
- 
- #include "utils.h"
- #include <atomic>
-diff --git a/bench/bench.cpp b/bench/bench.cpp
-index b7d2fc7..e2f8109 100644
---- a/bench/bench.cpp
-+++ b/bench/bench.cpp
-@@ -11,7 +11,7 @@
- #include "spdlog/sinks/daily_file_sink.h"
- #include "spdlog/sinks/null_sink.h"
- #include "spdlog/sinks/rotating_file_sink.h"
--#include "spdlog/fmt/bundled/locale.h"
-+#include <fmt/locale.h>
- 
- #include "utils.h"
- #include <atomic>
diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake
index f62514007..b08d34c43 100644
--- a/ports/spdlog/portfile.cmake
+++ b/ports/spdlog/portfile.cmake
@@ -1,12 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gabime/spdlog
-    REF 4a9ccf7e38e257feecce0c579a782741254eaeef # v1.8.0
-    SHA512 333f14704e0d0aa88abbe4ddd29aeb009de2f845440559d463f1b7f9c7da32b2fbdba0f2abf97ec2a5c479d2d62bb2220b21a1bc423d62fbbb93952cf829d532
+    REF v1.8.5
+    SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
     HEAD_REF v1.x
-    PATCHES 
-        fix-featurebuild.patch 
-        fix-androidbuild.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -16,9 +13,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED)
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
         ${FEATURE_OPTIONS}
         -DSPDLOG_FMT_EXTERNAL=ON
@@ -26,14 +22,9 @@ vcpkg_configure_cmake(
         -DSPDLOG_BUILD_SHARED=${SPDLOG_BUILD_SHARED}
 )
 
-vcpkg_install_cmake()
-
-if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}")
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
-elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/${PORT}/cmake")
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/${PORT}/cmake)
-endif()
-
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/spdlog)
+vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 # use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above)
@@ -49,9 +40,8 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/ostr.h
     "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)"
 )
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/spdlog
-                    ${CURRENT_PACKAGES_DIR}/debug/lib/spdlog
-                    ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
+                    ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json
new file mode 100644
index 000000000..dcd47b7fb
--- /dev/null
+++ b/ports/spdlog/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "spdlog",
+  "version-semver": "1.8.5",
+  "description": "Very fast, header only, C++ logging library",
+  "homepage": "https://github.com/gabime/spdlog",
+  "dependencies": [
+    "fmt",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "benchmark": {
+      "description": "Use google benchmark",
+      "dependencies": [
+        "benchmark"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 8a0d94c7b..a4d3b16e6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5649,8 +5649,8 @@
       "port-version": 0
     },
     "spdlog": {
-      "baseline": "1.8.0",
-      "port-version": 3
+      "baseline": "1.8.5",
+      "port-version": 0
     },
     "spectra": {
       "baseline": "0.9.0",
diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json
index c161c6f01..7177a8418 100644
--- a/versions/s-/spdlog.json
+++ b/versions/s-/spdlog.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "a2f8d7856c8821fb685f99873f5e058dc6136c2b",
+      "version-semver": "1.8.5",
+      "port-version": 0
+    },
+    {
       "git-tree": "aa6f400b5acd74dd5071a1419d4fce8ccaa3981c",
       "version-string": "1.8.0",
       "port-version": 3