From 84722676a31c0a0ff4ceb01d197431868c3e96a5 Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Fri, 3 Jul 2020 09:46:34 -0700
Subject: [PATCH 1/2] [pcre] Use vcpkg_from_sourceforge as a fallback

---
 ports/pcre/CONTROL        |  2 +-
 ports/pcre/portfile.cmake | 35 ++++++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/ports/pcre/CONTROL b/ports/pcre/CONTROL
index 97dd54c343df81..2337069bcf31c2 100644
--- a/ports/pcre/CONTROL
+++ b/ports/pcre/CONTROL
@@ -1,4 +1,4 @@
 Source: pcre
-Version: 8.44-4
+Version: 8.44-5
 Homepage: https://www.pcre.org/
 Description: Perl Compatible Regular Expressions
diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake
index 903d82a763a37b..fe989d66013df8 100644
--- a/ports/pcre/portfile.cmake
+++ b/ports/pcre/portfile.cmake
@@ -1,21 +1,34 @@
 set(PCRE_VERSION 8.44)
+set(EXPECTED_SHA adddec1236b25ff1c90e73835c2ba25d60a5839cbde2d6be7838a8ec099f7443dede931dc39002943243e21afea572eda71ee8739058e72235a192e4324398f0)
+set(PATCHES
+        # Fix CMake Deprecation Warning concerning OLD behavior for policy CMP0026
+        # Suppress MSVC compiler warnings C4703, C4146, C4308, which fixes errors
+        # under x64-uwp and arm-uwp
+        pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.pcre.org/pub/pcre/pcre-${PCRE_VERSION}.zip"
-         "https://downloads.sourceforge.net/project/pcre/pcre/${PCRE_VERSION}/pcre-${PCRE_VERSION}.zip"
     FILENAME "pcre-${PCRE_VERSION}.zip"
-    SHA512 adddec1236b25ff1c90e73835c2ba25d60a5839cbde2d6be7838a8ec099f7443dede931dc39002943243e21afea572eda71ee8739058e72235a192e4324398f0
+    SHA512 ${EXPECTED_SHA}
+    SILENT_EXIT
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    PATCHES
-        # Fix CMake Deprecation Warning concerning OLD behavior for policy CMP0026
-        # Suppress MSVC compiler warnings C4703, C4146, C4308, which fixes errors
-        # under x64-uwp and arm-uwp
-        pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch
-)
+if (EXISTS "${ARCHIVE}")
+    vcpkg_extract_source_archive_ex(
+        OUT_SOURCE_PATH SOURCE_PATH
+        ARCHIVE ${ARCHIVE}
+        PATCHES ${PATCHES}
+    )
+else()
+    vcpkg_from_sourceforge(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO pcre/pcre
+        REF ${PCRE_VERSION}
+        FILENAME "pcre-${PCRE_VERSION}.zip"
+        SHA512 ${EXPECTED_SHA}
+        PATCHES ${PATCHES}
+    )
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}

From 019b32baad8d5bca08f33e8eea64a315bedb09b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sun, 5 Jul 2020 20:06:28 -0700
Subject: [PATCH 2/2] Update ports/pcre/CONTROL

---
 ports/pcre/CONTROL | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/pcre/CONTROL b/ports/pcre/CONTROL
index 2337069bcf31c2..a36dec4e8298a5 100644
--- a/ports/pcre/CONTROL
+++ b/ports/pcre/CONTROL
@@ -1,4 +1,5 @@
 Source: pcre
-Version: 8.44-5
+Version: 8.44
+Port-Version: 5
 Homepage: https://www.pcre.org/
 Description: Perl Compatible Regular Expressions