From 68e0f19bb3ed9daedac318c5328e634311659a2f Mon Sep 17 00:00:00 2001
From: ryan-rsm-mckenzie <ryan__mckenzie@hotmail.com>
Date: Wed, 4 Aug 2021 21:41:36 -0700
Subject: [PATCH 1/9] update version to 2.13.7

---
 ports/catch2/portfile.cmake | 4 ++--
 ports/catch2/vcpkg.json     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index fcc6ab942273d1..a3a3429689ffd1 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
-    REF 5c88067bd339465513af4aec606bd2292f1b594a # v2.13.6
-    SHA512 62ab120ef9cbbcf7320a96654bda60c766dbbcc0d9cbb2b0b36dd04e828315b627caf51e390dcea915efa266655fe0f28058b972c0d6e0e3e457c565d26e1fd3
+    REF v2.13.7
+    SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
     HEAD_REF master
     PATCHES fix-install-path.patch
 )
diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json
index 0b81964b47a40d..dc2af5075b1af4 100644
--- a/ports/catch2/vcpkg.json
+++ b/ports/catch2/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "catch2",
-  "version-semver": "2.13.6",
-  "port-version": 2,
+  "version-semver": "2.13.7",
   "description": "A modern, header-only test framework for unit testing.",
   "homepage": "https://github.com/catchorg/Catch2",
   "dependencies": [

From 4ab278e38b5b7d3c5f30c532ed9df94ac3d1a397 Mon Sep 17 00:00:00 2001
From: ryan-rsm-mckenzie <ryan__mckenzie@hotmail.com>
Date: Wed, 4 Aug 2021 21:43:40 -0700
Subject: [PATCH 2/9] fixup deprecated functions

---
 ports/catch2/portfile.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index a3a3429689ffd1..36c8b5ea501588 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     PATCHES fix-install-path.patch
 )
 
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
@@ -25,7 +25,6 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR
 file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2")
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2)
-
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

From c5358d3ad83b60fddb9bdba886d23ebde7c0311c Mon Sep 17 00:00:00 2001
From: ryan-rsm-mckenzie <ryan__mckenzie@hotmail.com>
Date: Wed, 4 Aug 2021 21:45:43 -0700
Subject: [PATCH 3/9] apply cmake quoting guidelines

---
 ports/catch2/portfile.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index 36c8b5ea501588..67823b85c340ba 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO catchorg/Catch2
-    REF v2.13.7
+    REPO "catchorg/Catch2"
+    REF "v2.13.7"
     SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
     HEAD_REF master
     PATCHES fix-install-path.patch
@@ -10,7 +10,7 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
         -DCATCH_BUILD_EXAMPLES=OFF
@@ -24,7 +24,7 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/sha
 file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_")
 file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2")
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2)
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Catch2")
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

From 63eb347ba860ce1795c6f20e4e3d7965b38b5f81 Mon Sep 17 00:00:00 2001
From: ryan-rsm-mckenzie <ryan__mckenzie@hotmail.com>
Date: Wed, 4 Aug 2021 21:54:58 -0700
Subject: [PATCH 4/9] update baseline

---
 versions/baseline.json  | 4 ++--
 versions/c-/catch2.json | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index e135641ae6da09..95076c3d761f42 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1157,8 +1157,8 @@
       "port-version": 0
     },
     "catch2": {
-      "baseline": "2.13.6",
-      "port-version": 2
+      "baseline": "2.13.7",
+      "port-version": 0
     },
     "cccapstone": {
       "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1",
diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index 646d520aaf9e84..c7488c11a6577d 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25",
-      "version-semver": "2.13.6",
-      "port-version": 2
+      "git-tree": "8bcf801b4ece2dc5cb1020fd5f5eaababc6128b2",
+      "version-semver": "2.13.7",
+      "port-version": 0
     },
     {
       "git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c",

From 74b587449e4c9c48298737da99bfe3b15388cef5 Mon Sep 17 00:00:00 2001
From: ryan-rsm-mckenzie <ryan__mckenzie@hotmail.com>
Date: Fri, 6 Aug 2021 02:01:47 -0700
Subject: [PATCH 5/9] remove unneeded quotes

---
 ports/catch2/portfile.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index 67823b85c340ba..b157b48cdcf4c4 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO "catchorg/Catch2"
-    REF "v2.13.7"
+    REPO catchorg/Catch2
+    REF v2.13.7
     SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
     HEAD_REF master
     PATCHES fix-install-path.patch

From 07448091de4129594b31468ec59c7da799931282 Mon Sep 17 00:00:00 2001
From: ryan-rsm-mckenzie <ryan__mckenzie@hotmail.com>
Date: Fri, 6 Aug 2021 02:02:08 -0700
Subject: [PATCH 6/9] update baseline

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

diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index c7488c11a6577d..1ac85cd61f276d 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "8bcf801b4ece2dc5cb1020fd5f5eaababc6128b2",
+      "git-tree": "eebc5f1cff726b4d5f4493297c86ed9d23c396d3",
       "version-semver": "2.13.7",
       "port-version": 0
     },

From 19c1ee289a9a78b1329c8a0c55f89ae745571905 Mon Sep 17 00:00:00 2001
From: ryan-rsm-mckenzie <ryan__mckenzie@hotmail.com>
Date: Thu, 12 Aug 2021 21:06:30 -0700
Subject: [PATCH 7/9] update baseline

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

diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index 1ac85cd61f276d..1bda24d4bb9c76 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "eebc5f1cff726b4d5f4493297c86ed9d23c396d3",
+      "git-tree": "900833643e0eb468d957b4c46f46ba6647e283ff",
       "version-semver": "2.13.7",
       "port-version": 0
     },

From 3e911f2e3fa692be9daff1c92c5165a9394ec15e Mon Sep 17 00:00:00 2001
From: ryan-rsm-mckenzie <ryan__mckenzie@hotmail.com>
Date: Thu, 12 Aug 2021 21:16:55 -0700
Subject: [PATCH 8/9] restore versions from master

---
 versions/baseline.json  | 4 ++--
 versions/c-/catch2.json | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 95076c3d761f42..e135641ae6da09 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1157,8 +1157,8 @@
       "port-version": 0
     },
     "catch2": {
-      "baseline": "2.13.7",
-      "port-version": 0
+      "baseline": "2.13.6",
+      "port-version": 2
     },
     "cccapstone": {
       "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1",
diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index 1bda24d4bb9c76..646d520aaf9e84 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "900833643e0eb468d957b4c46f46ba6647e283ff",
-      "version-semver": "2.13.7",
-      "port-version": 0
+      "git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25",
+      "version-semver": "2.13.6",
+      "port-version": 2
     },
     {
       "git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c",

From 8b27e050a029437e6a84480cb36b50040923e4a1 Mon Sep 17 00:00:00 2001
From: ryan-rsm-mckenzie <ryan__mckenzie@hotmail.com>
Date: Thu, 12 Aug 2021 21:17:13 -0700
Subject: [PATCH 9/9] add new versions

---
 versions/baseline.json  | 4 ++--
 versions/c-/catch2.json | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index e135641ae6da09..95076c3d761f42 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1157,8 +1157,8 @@
       "port-version": 0
     },
     "catch2": {
-      "baseline": "2.13.6",
-      "port-version": 2
+      "baseline": "2.13.7",
+      "port-version": 0
     },
     "cccapstone": {
       "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1",
diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index 646d520aaf9e84..5986f9ef0d828f 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "900833643e0eb468d957b4c46f46ba6647e283ff",
+      "version-semver": "2.13.7",
+      "port-version": 0
+    },
     {
       "git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25",
       "version-semver": "2.13.6",