Date: Tue, 7 Mar 2023 11:21:17 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 91018f2c4a18 - main - =?utf-8?Q?devel/opendht:=20Update=202.4.10=20=E2=86=92=202.4.12?= Message-ID: <202303071121.327BLHeM077300@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=91018f2c4a183638e47e5223e336400428700e85 commit 91018f2c4a183638e47e5223e336400428700e85 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2023-03-07 11:21:11 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2023-03-07 11:21:11 +0000 devel/opendht: Update 2.4.10 → 2.4.12 --- devel/opendht/Makefile | 7 ++--- devel/opendht/distinfo | 6 ++-- devel/opendht/files/patch-CMakeLists.txt | 51 ++++++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile index 7ab169981e5a..bb42ecbd623b 100644 --- a/devel/opendht/Makefile +++ b/devel/opendht/Makefile @@ -1,7 +1,6 @@ PORTNAME= opendht DISTVERSIONPREFIX= v -DISTVERSION= 2.4.10 -PORTREVISION= 1 +DISTVERSION= 2.4.12 CATEGORIES= devel net MAINTAINER= yuri@FreeBSD.org @@ -24,7 +23,7 @@ LIB_DEPENDS= libargon2.so:security/libargon2 \ RUN_DEPENDS= msgpack-cxx>0:devel/msgpack-cxx TEST_DEPENDS= cppunit>0:devel/cppunit -USES= cmake:testing compiler:c++17-lang pathfix pkgconfig readline +USES= cmake:testing compiler:c++17-lang pathfix pkgconfig readline ssl USE_GITHUB= yes GH_ACCOUNT= savoirfairelinux @@ -33,7 +32,7 @@ USE_LDCONFIG= yes LDFLAGS+= -lcrypto CMAKE_OFF= OPENDHT_STATIC -CMAKE_TESTING_ON= OPENDHT_TESTS # tests fail w/out explanation, see https://github.com/savoirfairelinux/opendht/issues/640 +CMAKE_TESTING_ON= OPENDHT_TESTS # tests fail w/out explanation, see https://github.com/savoirfairelinux/opendht/issues/640, https://github.com/savoirfairelinux/opendht/issues/658 PLIST_SUB= SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} diff --git a/devel/opendht/distinfo b/devel/opendht/distinfo index 0b6b28c7ebab..b1ab4b3dd6f5 100644 --- a/devel/opendht/distinfo +++ b/devel/opendht/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667672703 -SHA256 (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 8077958fb7006612b9b9758095461d8a35316b4224184f10cef785f0ec7031fe -SIZE (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 478467 +TIMESTAMP = 1678187565 +SHA256 (savoirfairelinux-opendht-v2.4.12_GH0.tar.gz) = 5144bc4456d396b527b59065064bbc31fbe0d2af5fd052506219a66895791e64 +SIZE (savoirfairelinux-opendht-v2.4.12_GH0.tar.gz) = 479457 diff --git a/devel/opendht/files/patch-CMakeLists.txt b/devel/opendht/files/patch-CMakeLists.txt index f50759bf427d..4c092de64606 100644 --- a/devel/opendht/files/patch-CMakeLists.txt +++ b/devel/opendht/files/patch-CMakeLists.txt @@ -1,22 +1,49 @@ ---- CMakeLists.txt.orig 2023-01-10 16:45:50 UTC +--- CMakeLists.txt.orig 2023-03-07 11:14:26 UTC +++ CMakeLists.txt -@@ -61,7 +61,7 @@ if (NOT MSVC) - pkg_search_module (Nettle REQUIRED nettle) - check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX) - if (NOT HAVE_MSGPACKCXX) -- find_package (msgpack REQUIRED) -+ find_package (msgpackc-cxx REQUIRED) - endif() +@@ -59,7 +59,7 @@ if (NOT MSVC) + find_package (PkgConfig REQUIRED) + pkg_search_module (GnuTLS REQUIRED IMPORTED_TARGET gnutls) + pkg_search_module (Nettle REQUIRED IMPORTED_TARGET nettle) +- find_package (msgpack REQUIRED NAMES msgpackc-cxx msgpack msgpack-cxx) ++ find_package (msgpackc-cxx REQUIRED NAMES msgpackc-cxx msgpack msgpack-cxx) if (OPENDHT_TOOLS) find_package (Readline 6 REQUIRED) + endif () @@ -91,8 +91,8 @@ if (NOT MSVC) endif() if (OPENDHT_PROXY_OPENSSL) # https://cmake.org/cmake/help/latest/module/FindOpenSSL.html -- pkg_search_module(OPENSSL REQUIRED openssl) +- pkg_search_module(OPENSSL REQUIRED IMPORTED_TARGET openssl) - if (OPENSSL_FOUND) -+ #pkg_search_module(OPENSSL REQUIRED openssl) ++ #pkg_search_module(OPENSSL REQUIRED IMPORTED_TARGET openssl) + if (TRUE OR OPENSSL_FOUND) message(STATUS "Found OpenSSL ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIRS}") - include_directories(SYSTEM ${OPENSSL_INCLUDE_DIRS}) - link_directories (${OPENSSL_LIBRARY_DIRS}) + set(openssl_lib ", openssl") + else () +@@ -309,7 +309,7 @@ if (OPENDHT_STATIC) + target_link_libraries(opendht-static PUBLIC PkgConfig::Jsoncpp) + endif() + if (OPENDHT_PROXY_OPENSSL) +- target_link_libraries(opendht-static PUBLIC PkgConfig::OPENSSL) ++ target_link_libraries(opendht-static ssl) + endif() + if (APPLE) + target_link_libraries(opendht-static PRIVATE SYSTEM "-framework CoreFoundation" "-framework Security") +@@ -381,7 +381,7 @@ if (OPENDHT_SHARED) + target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp) + endif() + if (OPENDHT_PROXY_OPENSSL) +- target_link_libraries(opendht PUBLIC PkgConfig::OPENSSL) ++ target_link_libraries(opendht PUBLIC ssl) + endif() + if (APPLE) + target_link_libraries(opendht PRIVATE SYSTEM "-framework CoreFoundation" "-framework Security") +@@ -498,7 +498,7 @@ if (OPENDHT_TESTS) + ${GNUTLS_LIBRARIES} + ) + if (OPENDHT_PROXY_OPENSSL) +- target_link_libraries(opendht_unit_tests PkgConfig::OPENSSL) ++ target_link_libraries(opendht_unit_tests ssl) + endif() + enable_testing() + add_test(TEST opendht_unit_tests)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303071121.327BLHeM077300>