From nobody Sun Feb 02 18:48:06 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YmJY25S9Zz5mhZF; Sun, 02 Feb 2025 18:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YmJY24J8Zz3Cqy; Sun, 02 Feb 2025 18:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738522086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PIVwSsu7y01iLMF/AT2Lk3hRgNoXm8TVCfr4qp3YQsE=; b=j/z2V6yrlR3nvZc1YvlF1xBVDtM1GMiYbLFhp6w5fRYPFjFsU92A6HZHDWNUHqySk2PhVG 3BRV5mSJMY4T3at4Y5O8+wOmhlRK1fFYIxEL93+8l6zAPDcPOjguczDHjMZ1BA/lCp5Sb8 eTR/shJi8HlB4hfXWre9o+vyEp7J5xafeHgmII9p2nrU6RU2tMQQyCgAZ/MXe+Xx53aK2l TN4NzHqy8J4j6Ll9IoXJyXDZSQw4+kbVYZZhAzB2WBjJZeFm+/aHrGuPhCYhgENtuudc5W MJu0p6EDHIWNscakilcxu10mOvuuvPYkjDn3oIpUKGUJ38LcREmMUYgPe/SGuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738522086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PIVwSsu7y01iLMF/AT2Lk3hRgNoXm8TVCfr4qp3YQsE=; b=Xmu8PbKgODESyqIVd5dfoiZNZnh9cbVNGj9NFciaDNNkE9kWYpgAPsyIPne+A4CTZz8tgX 3H7aqEcu9OU9jaMLwu12PsIL1l7LECeEnLyvhe8/myVc0TfQIfYG3FAlHrlUHJfniiWl/W MFUyOWjoQYr4fc+yKSbh8XToaeW53i6yVAUZH50N9Z3ofoVJD8AkGmyg3Atn0OU+mJ6UmP aqYovuhp+Q7E6c+zbdze0KMxHUHwWbnLkOzFoo/MAjV7z9pfR0xrfBAMdH08fUzf9o9pKA Ivl87aaIOlQsYx5wkPH3L/4MbHJjFIu3L4LQQ6v+wY/UtLn3GfYWh+Qikbuv7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738522086; a=rsa-sha256; cv=none; b=lyd+SRydlX3gnhCZqdiVhZ4wcJwRMocXKKePGWsNP60Aqey4kbtGlpZvyBOo13lDURPScv Xz6+P8+zRnca7DFZweIxCZ9SDp7aXqYhPsLCnCjIKhwiAFbFBMxycPVCl3MIMD/HCG2NYC Uu2hZdiVo+z7T81z2H2UaW/YK5dIclLtBUCgXUgj5Pm0CXgnLna12SLLj8hUC/lir/K175 hD/ePWnJArXS2ecPz/KTXW0c38kOH++g5/4CY0bT0XMzWb9F+num2uJI9hwWolb6JYQzcO TnR5x2b+KeGvpb55EhVADSHLg6UWSybMpjw+Y8PrDpl8ipuKfJCZAmBK6VgmtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YmJY23lTjz126s; Sun, 02 Feb 2025 18:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 512Im6CZ019240; Sun, 2 Feb 2025 18:48:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 512Im6kq019237; Sun, 2 Feb 2025 18:48:06 GMT (envelope-from git) Date: Sun, 2 Feb 2025 18:48:06 GMT Message-Id: <202502021848.512Im6kq019237@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 2b3af2667f78 - main - net-im/tox: Improve port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b3af2667f78cc3d500d64d5309b4a1334793fcb Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b3af2667f78cc3d500d64d5309b4a1334793fcb commit 2b3af2667f78cc3d500d64d5309b4a1334793fcb Author: Daniel Engberg AuthorDate: 2025-02-02 18:08:21 +0000 Commit: Daniel Engberg CommitDate: 2025-02-02 18:47:26 +0000 net-im/tox: Improve port * Use upstream release archive * Fix various dependency related issues * Add USES= compiler:c++17-lang * Utilize USES= cmake:testing * Fix plist-issue, bash-completion * Rework and modernize Makefile layout to closer follow Porters Handbook PR: 284134 Approved by: portmgr (maintainer timeout, 2+ weeks) --- net-im/tox/Makefile | 51 ++++++++++++++++++++++++--------------------------- net-im/tox/distinfo | 8 +++----- net-im/tox/pkg-plist | 2 +- 3 files changed, 28 insertions(+), 33 deletions(-) diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile index 54e5c4679685..153041b83df4 100644 --- a/net-im/tox/Makefile +++ b/net-im/tox/Makefile @@ -1,47 +1,44 @@ PORTNAME= toxcore -DISTVERSIONPREFIX= v DISTVERSION= 0.2.20 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-im net-p2p +MASTER_SITES= https://github.com/TokTok/c-${PORTNAME}/releases/download/v${DISTVERSION}/ +DISTNAME= c-${PORTNAME}-${DISTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= ProjectTox-Core library, a decentralized and secure messenger WWW= https://tox.chat/ LICENSE= GPLv3 +LICENSE_FILES= ${WRKSRC}/LICENSE -BUILD_DEPENDS= checkmk:devel/check \ - gtest:sysutils/coreutils -LIB_DEPENDS= libvpx.so:multimedia/libvpx \ - libsndfile.so:audio/libsndfile \ - libportaudio.so:audio/portaudio \ - libsodium.so:security/libsodium \ - libopus.so:audio/opus \ - libconfig.so:devel/libconfig -TEST_DEPENDS= opencv_visualisation:graphics/opencv -#TEST_DEPENDS= libopencv_core.so:graphics/opencv - -USE_GITHUB= yes -GH_ACCOUNT= TokTok camgunz:cmp -GH_PROJECT= c-toxcore cmp:cmp -GH_TAGNAME= 2ac6bca152987c805c04423ebbba4b750585337f:cmp -GH_SUBDIR= third_party/cmp:cmp +LIB_DEPENDS= libopus.so:audio/opus \ + libsodium.so:security/libsodium \ + libvpx.so:multimedia/libvpx +TEST_DEPENDS= googletest>0:devel/googletest +USES= cmake:testing compiler:c++17-lang cpe pathfix pkgconfig CPE_VENDOR= toktok - -USES= cmake cpe pathfix pkgconfig +PATHFIX_CMAKELISTSTXT= ModulePackage.cmake USE_LDCONFIG= yes -PLIST_SUB= VER=${PORTVERSION:C/0.//}.0 SO=2 -OPTIONS_DEFINE= DAEMON TEST -OPTIONS_SUB= yes +PLIST_SUB= VER=${DISTVERSION:C/0.//}.0 SO=2 -DAEMON_DESC= Bootstrap daemon -DAEMON_CMAKE_ON= -DBOOTSTRAP_DAEMON=on -DAEMON_LIB_DEPENDS= libconfig.so:devel/libconfig +CMAKE_TESTING_OFF= CMAKE_DISABLE_FIND_PACKAGE_GTest +CMAKE_TESTING_ON= UNITTEST +# AUTOTEST(s) are broken... + +CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_GTest \ + UNITTEST -TEST_CMAKE_ON= -DAUTOTEST=on -TEST_TARGET= test +OPTIONS_DEFINE= DAEMON +OPTIONS_SUB= yes + +DAEMON_DESC= Bootstrap daemon + +DAEMON_LIB_DEPENDS= libconfig.so:devel/libconfig +DAEMON_CMAKE_BOOL= BOOTSTRAP_DAEMON .include diff --git a/net-im/tox/distinfo b/net-im/tox/distinfo index 37d3a1b0aa62..febef1b55966 100644 --- a/net-im/tox/distinfo +++ b/net-im/tox/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1736010194 -SHA256 (TokTok-c-toxcore-v0.2.20_GH0.tar.gz) = 5c1bc37d24a1e37fc6c03580e2602019a09393cd2e8ae1f58e338438f14d5871 -SIZE (TokTok-c-toxcore-v0.2.20_GH0.tar.gz) = 823028 -SHA256 (camgunz-cmp-2ac6bca152987c805c04423ebbba4b750585337f_GH0.tar.gz) = 65a22f44baf630630210c22a2188bea2e46e43afae0be61aced47b8eccc4b281 -SIZE (camgunz-cmp-2ac6bca152987c805c04423ebbba4b750585337f_GH0.tar.gz) = 40172 +TIMESTAMP = 1737201354 +SHA256 (c-toxcore-0.2.20.tar.gz) = a9c89a8daea745d53e5d78e7aacb99c7b4792c4400a5a69c71238f45d6164f4c +SIZE (c-toxcore-0.2.20.tar.gz) = 862660 diff --git a/net-im/tox/pkg-plist b/net-im/tox/pkg-plist index 552794118a42..faafb5ee44a4 100644 --- a/net-im/tox/pkg-plist +++ b/net-im/tox/pkg-plist @@ -11,7 +11,7 @@ lib/libtoxcore.so lib/libtoxcore.so.%%SO%% lib/libtoxcore.so.%%VER%% libdata/pkgconfig/toxcore.pc -share/bash-completion/completions/tox-bootstrapd +%%DAEMON%%share/bash-completion/completions/tox-bootstrapd %%DAEMON%%@dir(%%TOXDHT%%,nobody,755) /var/run/tox-bootstrapd %%DAEMON%%@dir(%%TOXDHT%%,nobody,700) /var/lib/tox-bootstrapd %%DAEMON%%@dir /var/lib