[openssl] Merge openssl-microsoft and openssl

ports/openssl-microsoft/CONTROL

@@ -1,3 +0,0 @@
-Source: openssl-microsoft
-Version: 1.0.2-winrt-stable
-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. This is Microsofts fork of openssl that supports Windows Phone and Store apps.

ports/openssl/portfile-uwp.cmake

@@ -6,20 +6,22 @@
 #   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
 #
 
-include(${CMAKE_TRIPLET_FILE})
-
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     message(FATAL_ERROR "Static building not supported yet")
 endif()
 
-if (TARGET_TRIPLET MATCHES "arm-uwp")
+if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "This portfile only supports UWP")
+endif()
+
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
     set(UWP_PLATFORM  "arm")
-elseif (TARGET_TRIPLET MATCHES "x64-uwp")
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     set(UWP_PLATFORM  "x64")
-elseif (TARGET_TRIPLET MATCHES "x86-uwp")
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(UWP_PLATFORM  "Win32")
 else ()
-    message(FATAL_ERROR "Only UWP DLL builds are supported at the moment")
+    message(FATAL_ERROR "Unsupported architecture")
 endif()
 
 include(vcpkg_common_functions)
@@ -108,4 +110,4 @@ file(INSTALL ${SOURCE_PATH}/out32dll/ssleay32.lib
 
 
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl-microsoft RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl RENAME copyright)

ports/openssl/portfile.cmake

@@ -1,4 +1,10 @@
 include(${CMAKE_TRIPLET_FILE})
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    include(${CMAKE_CURRENT_LIST_DIR}/portfile-uwp.cmake)
+    return()
+endif()
+
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-1.0.2h)
 vcpkg_find_acquire_program(PERL)