From nobody Sun Dec 17 19:05:33 2023 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 4StXTq52lgz543jp; Sun, 17 Dec 2023 19:05:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4StXTp03vZz4V9r; Sun, 17 Dec 2023 19:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702839934; 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=hd3+sYRmNO0pYDJIhHpxg2DZJiUppNlULeTI4ACN3Gk=; b=ihIfqTdF+YOGCXwPGNtSfWutAGtgg0GHXEAH28WBEWWZmaV4Qwc0cGIu+S0j0rsYbJtTxO oGnWBBpkjuvkNG2yXhBD9E46S2XmUjMnjlc7QeAD5NUGiqt0uRyvYrSLItj1mcJyoUtqRn 6gsJLHkvfhnW5uMZCG+o3ESj5IQ4IF3V2QHusLm3GzFdauYy3Dj5CplFiOB1MnjPBcCTD3 vCA+kI2brNSCAhzQ3IRhFVQjFX2j2iZmtmiCdgRAlPc3bxOvsRAeHFEQRF5Pd0aAw1eIkN U4VJiKbNTkxwaDX/dBjJeE3wtxbXoy8QDIaqeSXHJx27H/VClAVxyknk4cWZlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702839934; a=rsa-sha256; cv=none; b=qaw2xQDWqM03XCwMJsZujzxNBoW53hagKvyG7BfOT8SvqfokhP9cEgK6sDOgVgk47UBLHY bno1c2Xe/FS27L06gcD96tqfHZonWyBkpz7YYSgxZKkPbOl25vVA+HytJMJHra/f/dnvXg CMTkXbG+vB0FYtr0b0eUUxBmARcwmTc6Mp0WL3A/YmKmSYMfDGRy0oI7uvWZR+hPDuhpTB XNyoXd5/UMGHnGWxYeNkN0Qe9FXrWNSvQq/yHwFZ/aVT6bQFdZeUdCzFGHW6rIqbVLJ35e LYw6xXULeo9prBp+vP+ZGpBGmJXQKYkrnQ6day2oGj37sQOS60iAFO/YPkixFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702839934; 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=hd3+sYRmNO0pYDJIhHpxg2DZJiUppNlULeTI4ACN3Gk=; b=ma2q3tvsgmNuuq6rcSirbcX5Kzf0HdTH9wsnvgJhZh5kQNh0Dwmfxej1NpxvTxbY1RTrk/ Iw7jiP3gWwWTEVD84Ej+ziDBdm+dci2igZa6rv2RoTxqhb6fsjL9pnVvzFVfF/dHjUnbR8 c0/kTl5K5jEWIrAz7p9DG2C9LGeJkrFIg5lEC2IXAUSSiiNqJXngmtgOO9+qo0kiNiFvHv kRqmgDumjSK6Ro/LXFlrHaoxFtJ1TxuE8b2y70G6aAvzKf+IczKKtuaeoZRNiDXFjFLQ7f rTt+WOWDvtsOtrsPFmOTz9PNqRNH5lqr59vZ0nB1n78Th15lrKVEvJjVg/hUhg== 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 4StXTn5l71zppj; Sun, 17 Dec 2023 19:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BHJ5Xsj058169; Sun, 17 Dec 2023 19:05:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BHJ5X3e058166; Sun, 17 Dec 2023 19:05:33 GMT (envelope-from git) Date: Sun, 17 Dec 2023 19:05:33 GMT Message-Id: <202312171905.3BHJ5X3e058166@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: d6b1eec0f0d5 - main - net-p2p/transmission*: Update to 4.0.5 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: d6b1eec0f0d51e4ef3e420cd091505c9beb00e2a Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6b1eec0f0d51e4ef3e420cd091505c9beb00e2a commit d6b1eec0f0d51e4ef3e420cd091505c9beb00e2a Author: Daniel Engberg AuthorDate: 2023-12-17 08:21:54 +0000 Commit: Daniel Engberg CommitDate: 2023-12-17 19:04:30 +0000 net-p2p/transmission*: Update to 4.0.5 * Use upstream release archive * Unbundle more 3rd party code and reduce i/o during extraction Changelog: https://github.com/transmission/transmission/releases/tag/4.0.5 PR: 275613 Reviewed by: Rafe (maintainer) --- net-p2p/transmission-components/Makefile | 38 ++++++++++++---------- net-p2p/transmission-components/distinfo | 14 ++------ .../files/patch-cmake_FindFastFloat.cmake | 8 +++++ .../files/patch-cmake_FindFmt.cmake | 11 +++++++ .../files/patch-cmake_FindUtfCpp.cmake | 8 +++++ net-p2p/transmission-components/pkg-plist.daemon | 3 +- net-p2p/transmission-components/pkg-plist.docs | 1 + net-p2p/transmission/Makefile | 3 +- 8 files changed, 54 insertions(+), 32 deletions(-) diff --git a/net-p2p/transmission-components/Makefile b/net-p2p/transmission-components/Makefile index 2c443ef5626d..aa24837771e1 100644 --- a/net-p2p/transmission-components/Makefile +++ b/net-p2p/transmission-components/Makefile @@ -1,7 +1,7 @@ PORTNAME= transmission -DISTVERSION= 4.0.4 -PORTREVISION= 5 +DISTVERSION= 4.0.5 CATEGORIES= net-p2p +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= mondo.debater_0q@icloud.com COMMENT= Transmission BitTorrent client @@ -10,12 +10,15 @@ WWW= https://www.transmissionbt.com LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/include/fast_float/fast_float.h:math/fast_float \ + ${LOCALBASE}/include/fmt/format.h:devel/libfmt \ + ${LOCALBASE}/include/utf8cpp/utf8.h:devel/utf8cpp + LIB_DEPENDS= libb64.so:converters/libb64 \ libcurl.so:ftp/curl \ libdeflate.so:archivers/libdeflate \ libdht.so:devel/jech-dht \ libevent.so:devel/libevent \ - libfmt.so:devel/libfmt \ libminiupnpc.so:net/miniupnpc \ libnatpmp.so:net/libnatpmp \ libpsl.so:dns/libpsl \ @@ -37,16 +40,22 @@ LIB_DEPENDS= gtk_LIB_DEPENDS= libayatana-appindicator3.so:devel/libayatana-appindicator \ libharfbuzz.so:print/harfbuzz -USES= cmake cpe iconv libtool localbase pkgconfig ssl +USES= cmake cpe iconv libtool localbase pkgconfig ssl tar:xz CPE_VENDOR= transmissionbt CPE_PRODUCT= transmission -USE_GITHUB= YES -GH_TUPLE= google:googletest:af29db7:googletest/third-party/googletest \ - transmission:fast_float:6624977:fast_float/third-party/fast_float \ - transmission:utfcpp:b85efd6:utfcpp/third-party/utfcpp \ - transmission:wide-integer:4de0b52:wideinteger/third-party/wide-integer +EXTRACT_AFTER_ARGS= --exclude third-party/dht \ + --exclude third-party/fast_float \ + --exclude third-party/fmt \ + --exclude third-party/libb64 \ + --exclude third-party/libdeflate \ + --exclude third-party/libevent \ + --exclude third-party/libnatpmp \ + --exclude third-party/libpsl \ + --exclude third-party/libutp \ + --exclude third-party/miniupnpc \ + --exclude third-party/utfcpp .if ${FLAVOR} == gtk USES+= desktop-file-utils gettext-runtime gettext-tools gnome @@ -64,12 +73,10 @@ USE_RC_SUBR= transmission .endif .if ${FLAVOR} == docs -USES= cpe +USES= cpe tar:xz .endif -CMAKE_ARGS= -DCMAKE_C_STANDARD_INCLUDE_DIRECTORIES=${LOCALBASE}/include \ - -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=${LOCALBASE}/include \ - -DCMAKE_INSTALL_MANDIR="${PREFIX}/man" +CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR="${PREFIX}/man" CMAKE_ON= USE_SYSTEM_B64 USE_SYSTEM_DEFLATE USE_SYSTEM_DHT \ USE_SYSTEM_EVENT2 USE_SYSTEM_MINIUPNPC USE_SYSTEM_NATPMP \ USE_SYSTEM_PSL USE_SYSTEM_UTP @@ -146,11 +153,6 @@ UTILS_CMAKE_BOOL= ENABLE_UTILS WEB_CMAKE_BOOL= INSTALL_WEB -post-extract: - @${ECHO_MSG} "Cludging use of devel/libfmt as Transmission's CMakeLists.txt does not properly search for it." - @${MKDIR} ${WRKSRC}/third-party/fmt/include/fmt - @${LN} -Fs ${PREFIX}/include/fmt ${WRKSRC}/third-party/fmt/include/fmt - .if ${FLAVOR} == docs pre-install: @${ECHO_MSG} "Removing outdated release notes" diff --git a/net-p2p/transmission-components/distinfo b/net-p2p/transmission-components/distinfo index d06368cb4126..12fb1ccced6b 100644 --- a/net-p2p/transmission-components/distinfo +++ b/net-p2p/transmission-components/distinfo @@ -1,11 +1,3 @@ -TIMESTAMP = 1693298946 -SHA256 (transmission-transmission-4.0.4_GH0.tar.gz) = 767b4796a43c8bd3fc9d6c64d32dd49dedce3ad14909d6773ce2694e02b22a9d -SIZE (transmission-transmission-4.0.4_GH0.tar.gz) = 8750421 -SHA256 (google-googletest-af29db7_GH0.tar.gz) = cebd59f4dd7380870c4cbc57f75bd4453d84c68847fee020c95019b2841ae7a2 -SIZE (google-googletest-af29db7_GH0.tar.gz) = 841006 -SHA256 (transmission-fast_float-6624977_GH0.tar.gz) = a7fed3253e8604ad0b3c0649f7b99e004f61bf0b82096f43edbb597f9a9b4dc3 -SIZE (transmission-fast_float-6624977_GH0.tar.gz) = 76763 -SHA256 (transmission-utfcpp-b85efd6_GH0.tar.gz) = 98c7f02180c92a6b5fa90bbf157c3f441fcf47565c10948d221de3097893507a -SIZE (transmission-utfcpp-b85efd6_GH0.tar.gz) = 27376 -SHA256 (transmission-wide-integer-4de0b52_GH0.tar.gz) = 8754e29f002ba78228675ad95b7eb4d828e23c7a4ec227815fe8a2238c8111eb -SIZE (transmission-wide-integer-4de0b52_GH0.tar.gz) = 124910 +TIMESTAMP = 1701995252 +SHA256 (transmission-4.0.5.tar.xz) = fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357 +SIZE (transmission-4.0.5.tar.xz) = 9745756 diff --git a/net-p2p/transmission-components/files/patch-cmake_FindFastFloat.cmake b/net-p2p/transmission-components/files/patch-cmake_FindFastFloat.cmake new file mode 100644 index 000000000000..3d82cd8e3b48 --- /dev/null +++ b/net-p2p/transmission-components/files/patch-cmake_FindFastFloat.cmake @@ -0,0 +1,8 @@ +--- cmake/FindFastFloat.cmake.orig 2023-12-08 18:49:17 UTC ++++ cmake/FindFastFloat.cmake +@@ -2,4 +2,4 @@ target_include_directories(FastFloat::fast_float + + target_include_directories(FastFloat::fast_float + INTERFACE +- ${CMAKE_CURRENT_LIST_DIR}/../third-party/fast_float/include) ++ ${CMAKE_INSTALL_PREFIX}/include) diff --git a/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake b/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake new file mode 100644 index 000000000000..57b5ec9d2040 --- /dev/null +++ b/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake @@ -0,0 +1,11 @@ +--- cmake/FindFmt.cmake.orig 2023-12-16 08:06:18 UTC ++++ cmake/FindFmt.cmake +@@ -2,7 +2,7 @@ target_include_directories(fmt::fmt-header-only + + target_include_directories(fmt::fmt-header-only + INTERFACE +- ${CMAKE_CURRENT_LIST_DIR}/../third-party/fmt/include) ++ ${CMAKE_INSTALL_PREFIX}/include) + + target_compile_definitions(fmt::fmt-header-only + INTERFACE diff --git a/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake b/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake new file mode 100644 index 000000000000..86b4caa30e3c --- /dev/null +++ b/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake @@ -0,0 +1,8 @@ +--- cmake/FindUtfCpp.cmake.orig 2023-12-16 08:24:21 UTC ++++ cmake/FindUtfCpp.cmake +@@ -2,4 +2,4 @@ target_include_directories(utf8::cpp + + target_include_directories(utf8::cpp + INTERFACE +- ${CMAKE_CURRENT_LIST_DIR}/../third-party/utfcpp/source) ++ ${CMAKE_INSTALL_PREFIX}/include/utf8cpp) diff --git a/net-p2p/transmission-components/pkg-plist.daemon b/net-p2p/transmission-components/pkg-plist.daemon index 984ef7e445cd..b57c7e1545a9 100644 --- a/net-p2p/transmission-components/pkg-plist.daemon +++ b/net-p2p/transmission-components/pkg-plist.daemon @@ -5,5 +5,6 @@ man/man1/transmission-daemon.1.gz %%WEB%%%%DATADIR%%/public_html/images/favicon.png %%WEB%%%%DATADIR%%/public_html/images/webclip-icon.png %%WEB%%%%DATADIR%%/public_html/index.html +%%WEB%%%%DATADIR%%/public_html/transmission-app.css %%WEB%%%%DATADIR%%/public_html/transmission-app.js -%%WEB%%%%DATADIR%%/public_html/transmission-app.js.LICENSE.txt +%%WEB%%%%DATADIR%%/public_html/transmission-app.js.LEGAL.txt diff --git a/net-p2p/transmission-components/pkg-plist.docs b/net-p2p/transmission-components/pkg-plist.docs index ca868f754924..360c15830414 100644 --- a/net-p2p/transmission-components/pkg-plist.docs +++ b/net-p2p/transmission-components/pkg-plist.docs @@ -5,6 +5,7 @@ %%DOCSDIR%%/news/news-4.0.2.md %%DOCSDIR%%/news/news-4.0.3.md %%DOCSDIR%%/news/news-4.0.4.md +%%DOCSDIR%%/news/news-4.0.5.md %%DOCSDIR%%/README.md %%DOCSDIR%%/rpc-spec.md %%DOCSDIR%%/send-email-when-torrent-done.sh diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile index 02f1cd97bb18..7009258d55d3 100644 --- a/net-p2p/transmission/Makefile +++ b/net-p2p/transmission/Makefile @@ -1,6 +1,5 @@ PORTNAME= transmission -DISTVERSION= 4.0.4 -PORTREVISION= 4 +DISTVERSION= 4.0.5 CATEGORIES= net-p2p MAINTAINER= mondo.debater_0q@icloud.com