diff --git a/ports/sais/portfile.cmake b/ports/sais/portfile.cmake deleted file mode 100644 index 2a170918aa..0000000000 --- a/ports/sais/portfile.cmake +++ /dev/null @@ -1,26 +0,0 @@ - -vcpkg_download_distfile(ARCHIVE - URLS "https://sites.google.com/site/yuta256/sais-2.4.1.zip" - FILENAME "sais-2.4.1.zip" - SHA512 6f6dd11f842f680bebc1d9b7f6b75752c9589c600fdd5e6373bb7290a686f1de35d4cc3226347e717f89a295363f7fee0ae8b1aa05ad341f4c2ea056fb5b1425 -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE "${ARCHIVE}" -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_SAIS64=ON -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/ports/sais/vcpkg.json b/ports/sais/vcpkg.json deleted file mode 100644 index 35161b92c9..0000000000 --- a/ports/sais/vcpkg.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "sais", - "version": "2.4.1", - "port-version": 5, - "description": "An implementation of the induced sorting algorithm", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/stdexec/portfile.cmake b/ports/stdexec/portfile.cmake index 208a3e422b..ee4764fda9 100644 --- a/ports/stdexec/portfile.cmake +++ b/ports/stdexec/portfile.cmake @@ -25,9 +25,9 @@ vcpkg_download_distfile(RAPIDS_cmake file(COPY "${RAPIDS_cmake}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") vcpkg_download_distfile(execution_bs - URLS "https://raw.githubusercontent.com/brycelelbach/wg21_p2300_execution/main/execution.bs" + URLS "https://raw.githubusercontent.com/brycelelbach/wg21_p2300_execution/R7/execution.bs" FILENAME "execution.bs" - SHA512 22493329bcc26d4c30950df632349daf632adee87bdc904167afcdbb1f9398da2ca3ce9aad1d1c9dab961a2946b0fb9e5b66619b8a529f7cf04fe6aec01c5bb8 + SHA512 90f2a1d150b03c29bb05a5420e091c2371cb973335a089916716d778bc1081764436dc1ff0fec60f642ddb0ca5492c8b0c3a6d5451c2d60a42911f918fe980fa ) file(COPY "${execution_bs}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") @@ -47,4 +47,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/stdexec) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -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/stdexec/vcpkg.json b/ports/stdexec/vcpkg.json index 04d05f51be..0ae84d6f02 100644 --- a/ports/stdexec/vcpkg.json +++ b/ports/stdexec/vcpkg.json @@ -1,7 +1,7 @@ { "name": "stdexec", "version-date": "2023-03-05", - "port-version": 1, + "port-version": 2, "description": "stdexec is an experimental reference implementation of the Senders model of asynchronous programming proposed by P2300 - std::execution for adoption into the C++ Standard.", "homepage": "https://github.com/NVIDIA/stdexec", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7b2fac7425..524e372f8b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7248,10 +7248,6 @@ "baseline": "0.9.0-rc3", "port-version": 2 }, - "sais": { - "baseline": "2.4.1", - "port-version": 5 - }, "sajson": { "baseline": "2018-09-21", "port-version": 3 @@ -7786,7 +7782,7 @@ }, "stdexec": { "baseline": "2023-03-05", - "port-version": 1 + "port-version": 2 }, "stduuid": { "baseline": "1.2.2", diff --git a/versions/s-/stdexec.json b/versions/s-/stdexec.json index 1f35eea46a..eda5d41d75 100644 --- a/versions/s-/stdexec.json +++ b/versions/s-/stdexec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "945f9fceea838cc9f1c251a801a39244785cb08e", + "version-date": "2023-03-05", + "port-version": 2 + }, { "git-tree": "3435db06cfe7eb2aa08dd32988c2360017bb66f1", "version-date": "2023-03-05",