diff --git a/ports/zyre/Findczmq.cmake b/ports/zyre/Findczmq.cmake index 8f6d37b163..c85b6252ae 100644 --- a/ports/zyre/Findczmq.cmake +++ b/ports/zyre/Findczmq.cmake @@ -1,10 +1,11 @@ -find_path(CZMQ_INCLUDE_DIRS NAMES czmq.h) +find_path(czmq_INCLUDE_DIRS NAMES czmq.h) find_package(czmq CONFIG REQUIRED) -set(CZMQ_LIBRARIES czmq czmq-static) +set(czmq_LIBRARIES czmq czmq-static) +set(czmq_FOUND TRUE) include(FindPackageHandleStandardArgs) find_package_handle_standard_args( - CZMQ - REQUIRED_VARS CZMQ_INCLUDE_DIRS CZMQ_LIBRARIES + czmq + REQUIRED_VARS czmq_INCLUDE_DIRS czmq_LIBRARIES czmq_FOUND ) diff --git a/ports/zyre/Findlibzmq.cmake b/ports/zyre/Findlibzmq.cmake index 706f063c38..8dfa4b501e 100644 --- a/ports/zyre/Findlibzmq.cmake +++ b/ports/zyre/Findlibzmq.cmake @@ -1,10 +1,11 @@ find_package(ZeroMQ CONFIG REQUIRED) -set(LIBZMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR}) -set(LIBZMQ_LIBRARIES libzmq libzmq-static) +set(libzmq_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR}) +set(libzmq_LIBRARIES libzmq libzmq-static) +set(libzmq_FOUND TRUE) include(FindPackageHandleStandardArgs) find_package_handle_standard_args( LIBZMQ - REQUIRED_VARS LIBZMQ_LIBRARIES LIBZMQ_INCLUDE_DIRS + REQUIRED_VARS libzmq_LIBRARIES libzmq_INCLUDE_DIRS libzmq_FOUND ) diff --git a/ports/zyre/portfile.cmake b/ports/zyre/portfile.cmake index 0559e71553..f0949f1b8d 100644 --- a/ports/zyre/portfile.cmake +++ b/ports/zyre/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/zyre - REF 2648b7eb806a2494d6eb4177f0941232d83c5294 - SHA512 8940e82ccdc427734711d63dc01c81fe86c4ca6b7e97a69df979f4d48a4711df1ccaee6a3b6aa394f9ef91d719cb95851c4eb87dfa9ed6426e2577b95e0fb464 + REF f2fd7252322b1b52be248b9ef96f8981de3b86ff + SHA512 64502b4d1ca4296eb979a67f6058a80e931bb6db0cb29b94f6cb3285efe9a216e0014ea379a4018004f9354369bb98e5160474263568a825842e1e4d83a74225 HEAD_REF master ) @@ -60,6 +60,6 @@ if(ZYRE_BUILD_STATIC) endif() # Handle copyright -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_fixup_pkgconfig() diff --git a/ports/zyre/vcpkg.json b/ports/zyre/vcpkg.json index 0e5cb090e5..9a2709a7d0 100644 --- a/ports/zyre/vcpkg.json +++ b/ports/zyre/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zyre", - "version-date": "2019-07-07", - "port-version": 5, + "version-date": "2024-04-10", "description": "An open-source framework for proximity-based peer-to-peer applications", "homepage": "https://github.com/zeromq/zyre", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a43c9c96d7..875e5a8add 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9901,8 +9901,8 @@ "port-version": 0 }, "zyre": { - "baseline": "2019-07-07", - "port-version": 5 + "baseline": "2024-04-10", + "port-version": 0 }, "zziplib": { "baseline": "0.13.78", diff --git a/versions/z-/zyre.json b/versions/z-/zyre.json index 9f1bbeb1e7..1d505a3326 100644 --- a/versions/z-/zyre.json +++ b/versions/z-/zyre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "554cb1f667d38a75ddc7ce3e88f17ed0cace0805", + "version-date": "2024-04-10", + "port-version": 0 + }, { "git-tree": "f1d72fc5e7b5c99dcc352a92aa5850fe28a6ac44", "version-date": "2019-07-07",