From 547af512d0f79864faaed927fa2d2e7c9b89a526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Tue, 18 Aug 2020 16:49:57 -0700
Subject: [PATCH] [openssl] Interrupt the build process when files conflict
 (#12867)

---
 ports/openssl-unix/CONTROL           | 2 +-
 ports/openssl-unix/portfile.cmake    | 4 +---
 ports/openssl-uwp/CONTROL            | 1 +
 ports/openssl-uwp/portfile.cmake     | 4 +---
 ports/openssl-windows/portfile.cmake | 4 +---
 ports/openssl/CONTROL                | 1 +
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL
index 01fa5f3f6e..da781ab02f 100644
--- a/ports/openssl-unix/CONTROL
+++ b/ports/openssl-unix/CONTROL
@@ -1,5 +1,5 @@
 Source: openssl-unix
 Version: 1.1.1g
-Port-Version: 1
+Port-Version: 2
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
 Supports: !(windows|uwp)
diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake
index 5dd28a6f2c..b3bdf72cdd 100644
--- a/ports/openssl-unix/portfile.cmake
+++ b/ports/openssl-unix/portfile.cmake
@@ -3,9 +3,7 @@ if (NOT VCPKG_TARGET_IS_MINGW)
 endif()
 
 if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h")
-  message(WARNING "Can't build openssl if libressl is installed. Please remove libressl, and try install openssl again if you need it. Build will continue but there might be problems since libressl is only a subset of openssl")
-  set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-  return()
+  message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.")
 endif()
 
 
diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL
index ccb3fb1e9d..d82bb64552 100644
--- a/ports/openssl-uwp/CONTROL
+++ b/ports/openssl-uwp/CONTROL
@@ -1,4 +1,5 @@
 Source: openssl-uwp
 Version: 1.1.1g
+Port-Version: 1
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
 Supports: uwp
diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake
index d8e2301de9..e601742aa9 100644
--- a/ports/openssl-uwp/portfile.cmake
+++ b/ports/openssl-uwp/portfile.cmake
@@ -1,9 +1,7 @@
 vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Universal Platform" ON_TARGET "Linux" "OSX")
 
 if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h")
-  message(WARNING "Can't build openssl if libressl is installed. Please remove libressl, and try install openssl again if you need it. Build will continue but there might be problems since libressl is only a subset of openssl")
-  set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-  return()
+  message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.")
 endif()
 
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake
index a4735d1fce..44de515699 100644
--- a/ports/openssl-windows/portfile.cmake
+++ b/ports/openssl-windows/portfile.cmake
@@ -1,9 +1,7 @@
 vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Desktop" ON_TARGET "UWP" "Linux" "OSX")
 
 if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h")
-    message(WARNING "Can't build openssl if libressl is installed. Please remove libressl, and try install openssl again if you need it. Build will continue but there might be problems since libressl is only a subset of openssl")
-    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-    return()
+  message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.")
 endif()
 
 vcpkg_find_acquire_program(PERL)
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index 4591141bf8..d643a3c294 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,5 +1,6 @@
 Source: openssl
 Version: 1.1.1g
+Port-Version: 1
 Homepage: https://www.openssl.org
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
 Build-Depends: openssl-windows (!uwp&windows), openssl-uwp (uwp), openssl-unix (!uwp&!windows)