From 8f4ad058be6875ba60bda3e2e5e69a353ed775bd Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Wed, 16 Aug 2023 01:42:00 +0200
Subject: [PATCH] [unrar] msbuild (#33146)

* [unrar] msbuild

* v db
---
 ports/unrar/portfile.cmake | 20 +++++---------------
 ports/unrar/vcpkg.json     | 11 +++++++++--
 versions/baseline.json     |  2 +-
 versions/u-/unrar.json     |  5 +++++
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/ports/unrar/portfile.cmake b/ports/unrar/portfile.cmake
index 8c9f9ac98b..6924fa1fce 100644
--- a/ports/unrar/portfile.cmake
+++ b/ports/unrar/portfile.cmake
@@ -13,30 +13,20 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE "${ARCHIVE}"
     SOURCE_BASE ${UNRAR_VERSION}
     PATCHES msbuild-use-default-sma.patch
 )
 
-vcpkg_build_msbuild(
-    PROJECT_PATH "${SOURCE_PATH}/UnRARDll.vcxproj"
-    OPTIONS_DEBUG /p:OutDir=../../${TARGET_TRIPLET}-dbg/
-    OPTIONS_RELEASE /p:OutDir=../../${TARGET_TRIPLET}-rel/
-    OPTIONS /VERBOSITY:Diagnostic /DETAILEDSUMMARY
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PROJECT_SUBPATH "UnRARDll.vcxproj"
 )
 
 #INCLUDE (named dll.hpp in source, and unrar.h in all rarlabs distributions)
 file(INSTALL "${SOURCE_PATH}/dll.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME unrar.h)
 
-#DLL & LIB
-file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.dll"  DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.lib"  DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.dll"  DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.lib"  DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-
-vcpkg_copy_pdbs()
-
 configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-unrar/unofficial-unrar-config.cmake" @ONLY)
 
 #COPYRIGHT
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/unrar/vcpkg.json b/ports/unrar/vcpkg.json
index 4a85edde59..2331ae20db 100644
--- a/ports/unrar/vcpkg.json
+++ b/ports/unrar/vcpkg.json
@@ -1,9 +1,16 @@
 {
   "name": "unrar",
   "version": "6.1.7",
-  "port-version": 2,
+  "port-version": 3,
   "description": "rarlab's unrar library",
   "homepage": "https://www.rarlab.com",
   "license": null,
-  "supports": "windows & !uwp & !arm & !static"
+  "supports": "windows & !uwp & !arm & !static",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 08484b692d..9ffcd3a0fe 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8390,7 +8390,7 @@
     },
     "unrar": {
       "baseline": "6.1.7",
-      "port-version": 2
+      "port-version": 3
     },
     "upb": {
       "baseline": "2022-06-21",
diff --git a/versions/u-/unrar.json b/versions/u-/unrar.json
index 27da1388c1..d9863e0136 100644
--- a/versions/u-/unrar.json
+++ b/versions/u-/unrar.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6bc071be9e736a08d2826e81e000dbc6aa6d4b2b",
+      "version": "6.1.7",
+      "port-version": 3
+    },
     {
       "git-tree": "6849b794133f944030e40dc8c73b1fa4fc2a4f13",
       "version": "6.1.7",