5 files changed, 53 insertions, 29 deletions
diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL
deleted file mode 100644
index 19b03e429..000000000
--- a/ports/fizz/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: fizz
-Version: 2020.10.19.00
-Homepage: https://github.com/facebookincubator/fizz
-Build-Depends: folly, openssl, libsodium, zlib, fmt
-Description: a TLS 1.3 implementation by Facebook
-\ No newline at end of file
diff --git a/ports/fizz/find-zlib.patch b/ports/fizz/find-zlib.patch
deleted file mode 100644
index 7222db04e..000000000
--- a/ports/fizz/find-zlib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
-index 7e3347b..76ee974 100644
---- a/fizz/CMakeLists.txt
-+++ b/fizz/CMakeLists.txt
-@@ -89,6 +89,9 @@ else()
-   list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
- endif()
- 
-+find_package(ZLIB REQUIRED)
-+list(APPEND FIZZ_SHINY_DEPENDENCIES ZLIB::ZLIB)
-+
- set(FIZZ_HEADER_DIRS
-   client
-   crypto
diff --git a/ports/fizz/fix-zlib.patch b/ports/fizz/fix-zlib.patch
new file mode 100644
index 000000000..88b6fabe9
--- /dev/null
+++ b/ports/fizz/fix-zlib.patch
@@ -0,0 +1,36 @@
+diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
+index 485e38fc..471d61a5 100644
+--- a/fizz/CMakeLists.txt
++++ b/fizz/CMakeLists.txt
+@@ -87,6 +87,8 @@ else()
+   list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
+ endif()
+ 
++find_package(ZLIB REQUIRED)
++
+ find_package(Libevent CONFIG QUIET)
+ if(TARGET event)
+   message(STATUS "Found libevent from package config")
+@@ -246,6 +248,7 @@ target_link_libraries(fizz
+     ${OPENSSL_LIBRARIES}
+     sodium
+     Threads::Threads
++    ZLIB::ZLIB
+   PRIVATE
+     ${GLOG_LIBRARIES}
+     ${GFLAGS_LIBRARIES}
+diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
+index d9918469..679b0e61 100644
+--- a/fizz/cmake/fizz-config.cmake.in
++++ b/fizz/cmake/fizz-config.cmake.in
+@@ -25,7 +25,10 @@ endif()
+ 
+ set(FIZZ_LIBRARIES fizz::fizz)
+ 
++include(CMakeFindDependencyMacro)
+ find_dependency(Sodium)
++find_dependency(folly CONFIG)
++find_dependency(ZLIB)
+ 
+ if (NOT fizz_FIND_QUIETLY)
+   message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}")
diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
index 459c6a807..8af6d336f 100644
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@@ -3,11 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
-    REF 1c40fde31b5eff8a05f928497429bffe7425b4fd # v2020.10.19.00
-    SHA512 9e0de756855941c377f2a52d9b751e6ae066c8d8ae4e7a06211b2537a039e533cbc782cbce947cb703d7bd4c5cb5fb4420e71eeafdcb5f1264d788ca3eb0b76d
+    REF v2021.06.14.00
+    SHA512 ff55f933d55031128b5355707fd025649ad90d261d91ec5f9d793433a77e63d3c2527a7f0111d6a3151667ab29f4117f96a505bcb80c1a4a99bd60346f05f4de
     HEAD_REF master
     PATCHES
-        find-zlib.patch
+        fix-zlib.patch
 )
 
 # Prefer installed config files
@@ -29,13 +29,7 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fizz)
 vcpkg_copy_pdbs()
 
-file(READ ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake _contents)
-string(REPLACE "lib/cmake/fizz" "share/fizz" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake
-"include(CMakeFindDependencyMacro)
-find_dependency(folly CONFIG)
-find_dependency(ZLIB)
-${_contents}")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake" "lib/cmake/fizz" "share/fizz")
 
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json
new file mode 100644
index 000000000..efc70e897
--- /dev/null
+++ b/ports/fizz/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "fizz",
+  "version-string": "2021.06.14.00",
+  "description": "a TLS 1.3 implementation by Facebook",
+  "homepage": "https://github.com/facebookincubator/fizz",
+  "dependencies": [
+    "fmt",
+    "folly",
+    "libsodium",
+    "openssl",
+    "zstd"
+  ]
+}