From ef2eef17340f3fbd679327d286fad06dd6e838ed Mon Sep 17 00:00:00 2001
From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com>
Date: Mon, 9 Oct 2023 15:39:24 -0700
Subject: [PATCH] [asiosdk] Fix old hash and usage (#34326)

---
 ports/asiosdk/portfile.cmake | 41 +++++++++++++++++++-----------------
 ports/asiosdk/usage          |  2 +-
 ports/asiosdk/vcpkg.json     |  2 +-
 versions/a-/asiosdk.json     |  5 +++++
 versions/baseline.json       |  2 +-
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/ports/asiosdk/portfile.cmake b/ports/asiosdk/portfile.cmake
index 9807a4c269..3d3c2415a3 100644
--- a/ports/asiosdk/portfile.cmake
+++ b/ports/asiosdk/portfile.cmake
@@ -1,29 +1,32 @@
-set(VERSION 2.3.3)
-
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip"
-    FILENAME "asiosdk_2.3.3_2019-06-14-eac6c1a57829.zip"
-	SHA512 eac6c1a57829b7f722a681c54b2f6469d54695523f08f727d0dd6744dcd7fce4f3249c57689bb15ed7a8bcb912833b226439d800913e122e0ef9ab73672f6542
+    FILENAME "asiosdk_2.3.3_2019-06-14-d74c0bc09162.zip"
+    SHA512 d74c0bc09162640a377aaab2f2ce716f9ee7a6ef8d1aa1aa6bc223a4748c60fa900cc77b1cf6db66f8a4064a074b31a71d75cccc7de3634347865238d9c039af
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    SOURCE_BASE ${VERSION}
+    ARCHIVE "${ARCHIVE}"
+    SOURCE_BASE "${VERSION}"
 )
 
-file(INSTALL ${SOURCE_PATH}/asio/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/asio)
-file(INSTALL ${SOURCE_PATH}/common/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/common)
-file(INSTALL ${SOURCE_PATH}/driver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/driver)
-file(INSTALL ${SOURCE_PATH}/host/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/host)
-file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/changes.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement 2.0.1 - 2019.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${SOURCE_PATH}/ASIO SDK 2.3.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${SOURCE_PATH}/asio/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/asio")
+file(INSTALL "${SOURCE_PATH}/common/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/common")
+file(INSTALL "${SOURCE_PATH}/driver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/driver")
+file(INSTALL "${SOURCE_PATH}/host/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/host")
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/readme.txt")
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(
+    INSTALL
+        "${SOURCE_PATH}/changes.txt"
+        "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip"
+        "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement V2.0.3 - 2023.pdf"
+        "${SOURCE_PATH}/ASIO SDK 2.3.pdf"
+        "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake"
+        "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
+    DESTINATION
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/asiosdk/usage b/ports/asiosdk/usage
index 1afa2ae84d..3827cfa3df 100644
--- a/ports/asiosdk/usage
+++ b/ports/asiosdk/usage
@@ -1,4 +1,4 @@
 The package asiosdk provides CMake integration:
 
     find_package(asiosdk REQUIRED)
-    target_include_directories(<my_target> PRIVATE ${ASIOSDK_INCLUDE_DIRS})
+    target_include_directories(main PRIVATE ${ASIOSDK_INCLUDE_DIR})
diff --git a/ports/asiosdk/vcpkg.json b/ports/asiosdk/vcpkg.json
index 0d85c574fe..dc44bde07c 100644
--- a/ports/asiosdk/vcpkg.json
+++ b/ports/asiosdk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "asiosdk",
   "version": "2.3.3",
-  "port-version": 6,
+  "port-version": 7,
   "description": "ASIO is a low latency audio API from Steinberg.",
   "homepage": "https://www.steinberg.net/en/company/developers.html",
   "supports": "windows & !(arm | uwp)"
diff --git a/versions/a-/asiosdk.json b/versions/a-/asiosdk.json
index 6c75ac7290..eb27899041 100644
--- a/versions/a-/asiosdk.json
+++ b/versions/a-/asiosdk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "798527dff966ba5c7ef8aab89eb941791d682090",
+      "version": "2.3.3",
+      "port-version": 7
+    },
     {
       "git-tree": "a58f240a86a38690339c96b11db0a62fd2388e4f",
       "version": "2.3.3",
diff --git a/versions/baseline.json b/versions/baseline.json
index 8b6eb6a266..ac757d1cfc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -254,7 +254,7 @@
     },
     "asiosdk": {
       "baseline": "2.3.3",
-      "port-version": 6
+      "port-version": 7
     },
     "asmjit": {
       "baseline": "2023-03-25",