git: 752275596aaa - main - net-im/tox: Update 0.2.21 => 0.2.22

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=752275596aaac169de95e3e4ae7952c76461956d

commit 752275596aaac169de95e3e4ae7952c76461956d
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-02-09 13:27:36 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-02-09 13:27:36 +0000

    net-im/tox: Update 0.2.21 => 0.2.22
    
    Changelog:
    https://github.com/TokTok/c-toxcore/releases/tag/v0.2.22
    
    - make test work without errors.
    - Rework DAEMON option, make it deafult.
    - Remove old patch - disabled functions work without errors in runtime.
    
    PR:     293052
    MFH:    2026Q1
---
 net-im/tox/Makefile                      | 34 +++++++++++++-------------------
 net-im/tox/distinfo                      |  6 +++---
 net-im/tox/files/patch-toxcore_network.c | 18 -----------------
 3 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index 0f844ba1730e..57f63c09bad2 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	toxcore
-DISTVERSION=	0.2.21
-PORTREVISION=	2
+DISTVERSION=	0.2.22
 PORTEPOCH=	1
 CATEGORIES=	net-im net-p2p
 MASTER_SITES=	https://github.com/TokTok/c-${PORTNAME}/releases/download/v${DISTVERSION}/
@@ -27,39 +26,34 @@ USE_LDCONFIG=	yes
 CMAKE_OFF=	CMAKE_DISABLE_FIND_PACKAGE_GTest \
 		UNITTEST
 CMAKE_TESTING_ON=	UNITTEST
-CMAKE_TESTING_OFF=	CMAKE_DISABLE_FIND_PACKAGE_GTest
-# AUTOTEST(s) are broken...
+
+SUB_LIST=	TOXDHT="${USERS}"
 
 NO_WRKSUBDIR=	yes
 
-PLIST_SUB=	VER=${DISTVERSION:C/0.//}.0 SO=2
+PLIST_SUB=	VER=${DISTVERSION:S|^0.||}.0 \
+		SO=2 \
+		TOXDHT="${USERS}"
 
-OPTIONS_DEFINE=	DAEMON
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		DAEMON
+OPTIONS_DEFAULT=	DAEMON
+OPTIONS_SUB=		yes
 
-DAEMON_DESC=	Bootstrap daemon
+DAEMON_DESC=		Bootstrap daemon
 
 DAEMON_LIB_DEPENDS=	libconfig.so:devel/libconfig
 DAEMON_CMAKE_BOOL=	BOOTSTRAP_DAEMON
+DAEMON_VARS=		USE_RC_SUBR=tox-bootstrapd \
+			USERS=toxdht \
+			PKGMESSAGE=${PKGDIR}/pkg-message.daemon
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDAEMON}
-USERS=		toxdht
-USE_RC_SUBR=	tox-bootstrapd
-SUB_LIST=	TOXDHT=${USERS}
-PLIST_SUB+=	TOXDHT=${USERS}
 KEYS_DIR=	/var/lib/tox-bootstrapd
 PID_DIR=	/var/run/tox-bootstrapd
-PKGMESSAGE=	${PKGDIR}/pkg-message.daemon
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MDAEMON}
+post-install-DAEMON-on:
 	${INSTALL_DATA} ${WRKSRC}/other/bootstrap_daemon/tox-bootstrapd.conf \
 		${STAGEDIR}${PREFIX}/etc/tox-bootstrapd.conf.sample
 	${MKDIR} ${STAGEDIR}${KEYS_DIR} \
 		 ${STAGEDIR}${PID_DIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-im/tox/distinfo b/net-im/tox/distinfo
index 9a5c25aa7456..073eb5987a7e 100644
--- a/net-im/tox/distinfo
+++ b/net-im/tox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1762500000
-SHA256 (c-toxcore-v0.2.21.tar.xz) = dde19a5eaa897f3b9ca6212e783a08753ad5c071deb14a73d84161853a067234
-SIZE (c-toxcore-v0.2.21.tar.xz) = 906700
+TIMESTAMP = 1770600000
+SHA256 (c-toxcore-v0.2.22.tar.xz) = b2599d62181d8c0d5f5f86012ed7bc4be9eb540f2d7a399ec96308eb9870f58e
+SIZE (c-toxcore-v0.2.22.tar.xz) = 989696
diff --git a/net-im/tox/files/patch-toxcore_network.c b/net-im/tox/files/patch-toxcore_network.c
deleted file mode 100644
index 4759446df1d7..000000000000
--- a/net-im/tox/files/patch-toxcore_network.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- toxcore/network.c.orig	2025-10-06 10:37:58 UTC
-+++ toxcore/network.c
-@@ -1318,6 +1318,7 @@ Networking_Core *new_networking_ex(
-      */
-     int n = 1024 * 1024 * 2;
- 
-+#if !defined(__FreeBSD__)
-     if (net_setsockopt(ns, temp->sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof(n)) != 0) {
-         LOGGER_WARNING(log, "failed to set socket option %d", SO_RCVBUF);
-     }
-@@ -1325,6 +1326,7 @@ Networking_Core *new_networking_ex(
-     if (net_setsockopt(ns, temp->sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof(n)) != 0) {
-         LOGGER_WARNING(log, "failed to set socket option %d", SO_SNDBUF);
-     }
-+#endif
- 
-     /* Enable broadcast on socket */
-     int broadcast = 1;