Hello ports,
The following updates net/toxcore to its latest release. Upstream switched tests to gtest, but in their CMake machinery they search for the sources of gtest in /usr/... -- sources that our package does not install, so I've left the NO_TESTS and dropped the patch. I've bumped the so version to 1.0. I don't know if there is a "proper" way to do this, but I've dumped the symbols (the T column in nm(1) output), sorted it and compared with the one I get with the new version. This update added symbols (like dht_addfriend), removed symbols (like do_DHT) and renamed a bunch of functions (DHT_* -> dht_* for instance.) I have a question regarding the SHARED_LIBS: what's the meaning of the comment? I've seen something like that in various ports, but neither bsd.port.mk nor Makefile.template mention it. net/toxic still builds (but I'm gonna update that port too) Index: Makefile =================================================================== RCS file: /cvs/ports/net/toxcore/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 24 Nov 2019 23:05:10 -0000 1.7 +++ Makefile 21 Jul 2020 11:50:30 -0000 @@ -2,15 +2,14 @@ COMMENT = Tox client library -V = 0.2.3 -REVISION = 3 +V = 0.2.12 DISTNAME = toxcore-$V GH_ACCOUNT = TokTok GH_PROJECT = c-toxcore GH_TAGNAME = v$V -SHARED_LIBS += toxcore 0.1 # 0.1 +SHARED_LIBS += toxcore 1.0 # 1.0 CATEGORIES = net telephony HOMEPAGE = https://tox.chat/ Index: distinfo =================================================================== RCS file: /cvs/ports/net/toxcore/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 26 Jun 2018 20:34:04 -0000 1.2 +++ distinfo 21 Jul 2020 11:50:30 -0000 @@ -1,2 +1,2 @@ -SHA256 (toxcore-0.2.3.tar.gz) = IsUvKGxG0/gC7baXi88qU/gwE2Pit0V4RhNCejO6OjQ= -SIZE (toxcore-0.2.3.tar.gz) = 471336 +SHA256 (toxcore-0.2.12.tar.gz) = MK4yY8m2jTvvBveZup16Z+P61EcDBiXw/6S7ImhCKLA= +SIZE (toxcore-0.2.12.tar.gz) = 504832 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: patches/patch-CMakeLists_txt diff -N patches/patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 24 Nov 2019 23:05:10 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,59 +0,0 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.4 2019/11/24 23:05:10 cwen Exp $ - -* remove unknown option for base-gcc -* NO_TEST is set but tests are built, and they break the build with base-gcc - -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -171,7 +171,7 @@ if(NOT MSVC) - # Comma at end of enum is supported everywhere we run. - add_cxxflag("-Wno-c++98-compat-pedantic") - # TODO(iphydf): Stop using flexible array members. -- add_cxxflag("-Wno-c99-extensions") -+ #add_cxxflag("-Wno-c99-extensions") - # We're C-compatible, so use C style casts. - add_cxxflag("-Wno-old-style-cast") - -@@ -463,24 +463,11 @@ if(ANDROID_CPU_FEATURES) - endif() - - function(auto_test target) -- if(NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) -- add_executable(auto_${target}_test ${CPUFEATURES} -- auto_tests/${target}_test.c) -- target_link_modules(auto_${target}_test toxcore) -- if(NOT ARGV1 STREQUAL "DONT_RUN") -- add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test) -- set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}") -- set_property(TEST ${target} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${target}.profraw") -- endif() -- endif() -+ message (WARNING "Test ${target} not built because it breaks the build with base-gcc and NO_TEST is set") - endfunction() - - if(BUILD_TOXAV) - add_definitions(-D__STDC_LIMIT_MACROS=1) -- add_executable(auto_monolith_test ${CPUFEATURES} -- auto_tests/monolith_test.cc) -- target_link_libraries(auto_monolith_test ${toxcore_LINK_MODULES}) -- add_test(NAME monolith COMMAND ${CROSSCOMPILING_EMULATOR} auto_monolith_test) - endif() - - auto_test(TCP) -@@ -593,15 +580,3 @@ if(NOT WIN32 - set_source_files_properties(testing/av_test.c PROPERTIES LANGUAGE CXX) - endif() - endif() -- --add_executable(DHT_test ${CPUFEATURES} -- testing/DHT_test.c) --target_link_modules(DHT_test toxcore) -- --add_executable(Messenger_test ${CPUFEATURES} -- testing/Messenger_test.c) --target_link_modules(Messenger_test toxcore) -- --add_executable(random_testing ${CPUFEATURES} -- testing/random_testing.cc) --target_link_modules(random_testing toxcore) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/toxcore/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 29 Apr 2018 11:14:09 -0000 1.1.1.1 +++ pkg/PLIST 21 Jul 2020 11:50:30 -0000 @@ -1,9 +1,10 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/29 11:14:09 landry Exp $ +@bin bin/DHT_bootstrap @bin bin/tox-bootstrapd include/tox/ include/tox/tox.h include/tox/toxav.h include/tox/toxencryptsave.h -lib/libtoxcore.a +@static-lib lib/libtoxcore.a @lib lib/libtoxcore.so.${LIBtoxcore_VERSION} lib/pkgconfig/toxcore.pc
