From nobody Tue Dec 17 00:59:18 2024 X-Original-To: dev-commits-ports-all@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 4YBz3W1XzTz5gpdg; Tue, 17 Dec 2024 00:59:19 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBz3V6hRGz4Pkt; Tue, 17 Dec 2024 00:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734397158; 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=H0fes9dWUKvua4TLBOx4EaGOYvuQPfTy359tkigrL24=; b=MEtIR4GVHw13U3Yov8Ghu08yKEw63KN+aHTKzOqhfaddxBGok/5dTnDAup0WUamWDiobJo 1sI8wpKgpI4aqavcsr5xah2SUbAhGKEBfMIzqlNCkv434O8CTZfp7uaIfdrIYU4gMm/XXV PK6+7mn1TxIPKWOrKKxYxIuZMt4BCG4eyZHSkLXALmQOu1nKub5YLcrRIcqLnjSP0IstKV tWzFIJMI0pNayNkz7THqsgqnExTTa8Ynr36x0h+HJBfjXx4F2+QH8pc4gCicxiY5UFyQ92 rpHyYUwjBRmVOc2FrJjeEEtSwO8BYxsDaBly+jtr0SWPi2iDn9cj/VNTy6H8DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734397158; 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=H0fes9dWUKvua4TLBOx4EaGOYvuQPfTy359tkigrL24=; b=EhMY3ZyK0L0m99onLb6/FpkoJPxc+NrhS2n2tlBlh1vpwwDb/hmH5OhlLUEbdEZuQVCVlT stxbdX7a8w+Iax+stCpcXjLy6Y8eGlpeexBxHIwjUIDn6UuER3UOV59KEj/a8x+unF+t/Q t4OCaufDQ7Iq1KxtYnH0A+3R9r4Vc2dMwbzTKNFFSJC2tegu2vhSawy02XQZufeV/C1CsZ SAhMJ8OeAgAiTcqTZEnJnG4BTZgjuRuFSgCe7xu8O1eYhH9qeTgSudnfXbNLLLfUCqjmyO qkFtNxcNbV8THxnmwMFSA4yCayDtMIOp/aAQr4HUvkXy8XUP3wXrPC4KBZ6xmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734397158; a=rsa-sha256; cv=none; b=tNVzo9OzRyScZoF2xy9X3xFhz0qDBPo4Syiqn5fNzP7xAKfQqRt3q2dWtUEfCfa93Ifjw8 tVXQziM64ifjm6cShYeZEaY0dYLttoaUDA9Mduo/InWOalcN+fbLNGr5/QUOqlJfXDdLT+ bMTMmojPwHHxrnM8nH9KeSodcXaKgLZW+QFB2nQV3N/S7uGBoFUdiHNxrgQAXejq2kTyFt CnFz++gFQrDuem3Df4heUHjVxNW6FDkZUNXtHyyu+d+ggYFcW0MQfY+T7Tb21442CQkzBl QnL4NDYO1SVdYxOQCT5RjIxxdBeHS9AlaS8sYo7K1IARpDaOvGJ45J9oH0we0w== 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 4YBz3V6JsMz1GRL; Tue, 17 Dec 2024 00:59:18 +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 4BH0xIQs095656; Tue, 17 Dec 2024 00:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BH0xIwH095653; Tue, 17 Dec 2024 00:59:18 GMT (envelope-from git) Date: Tue, 17 Dec 2024 00:59:18 GMT Message-Id: <202412170059.4BH0xIwH095653@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 545eb5d3ac42 - main - news/nzbget: Upgrade to v24.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 545eb5d3ac42b28ec59eb579307f8ec414234af4 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=545eb5d3ac42b28ec59eb579307f8ec414234af4 commit 545eb5d3ac42b28ec59eb579307f8ec414234af4 Author: Alexandre Levy AuthorDate: 2024-12-06 11:11:29 +0000 Commit: Robert Clausecker CommitDate: 2024-12-17 00:57:23 +0000 news/nzbget: Upgrade to v24.4 Release notes available at https://github.com/nzbgetcom/nzbget/releases/tag/v24.4 Notable changes that modifies the way to port is built: * Dependency to PAR2 is now coming from another repository that needs to be fetched separately (see comments in Makefile for more details) * Patch cmake/posix.cmake to unset CURSES_NEED_WIDE as it seems not to be exposed as a configure option by ncurses port PR: 283162 --- news/nzbget/Makefile | 40 ++++++++++++++++++++++--------- news/nzbget/distinfo | 8 ++++--- news/nzbget/files/patch-cmake_posix.cmake | 10 ++++++++ news/nzbget/pkg-help | 9 +++++++ news/nzbget/pkg-plist | 3 ++- 5 files changed, 55 insertions(+), 15 deletions(-) diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile index a3259da00e18..84016f5469f7 100644 --- a/news/nzbget/Makefile +++ b/news/nzbget/Makefile @@ -1,7 +1,7 @@ PORTNAME= nzbget DISTVERSIONPREFIX= v -DISTVERSION= 24.3 -PORTREVISION= 1 +DISTVERSION= 24.4 +PORTREVISION= 0 CATEGORIES= news MAINTAINER= a13xlevy@pm.me @@ -15,33 +15,51 @@ LIB_DEPENDS= libboost_json.so:devel/boost-libs \ RUN_DEPENDS= 7-zip>0:archivers/7-zip \ unrar>0:archivers/unrar -USES= cmake:testing python:build ssl +# Since v24.4 nzbget maintainers switched from libpar2 to a fork of par2cmdline-turbo which is in its own repository. +# See https://github.com/nzbgetcom/nzbget/blob/v24.4/cmake/par2-turbo.cmake for the version to pull +PAR2CMDLINE_TURBO_VERSION=1.1.1-nzbget + +USES= cmake:testing ssl USE_GITHUB= yes GH_ACCOUNT= nzbgetcom -GH_PROJECT= nzbget +GH_PROJECT= nzbget par2cmdline-turbo:par2 +GH_TAGNAME= ${DISTVERSIONPREFIX}${PAR2CMDLINE_TURBO_VERSION}:par2 USE_RC_SUBR= nzbget BINMODE= 0755 SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS NCURSES PAR2 -OPTIONS_DEFAULT= NCURSES PAR2 +OPTIONS_DEFINE= DOCS NCURSES PAR2 PYTHON +OPTIONS_SUB= yes +OPTIONS_DEFAULT= NCURSES PAR2 -PAR2_DESC= PAR 2.0 compatible file verification and repair. Disable if you have trouble when compiling par2 module +PAR2_DESC= PAR 2.0 compatible file verification and repair NCURSES_USES= ncurses -NCURSES_CMAKE_BOOL_OFF= DISABLE_CURSES -PAR2_CMAKE_BOOL_OFF= DISABLE_PARCHECK -CMAKE_TESTING_ON= ENABLE_TESTS +NCURSES_CMAKE_BOOL_OFF= DISABLE_CURSES +PAR2_CMAKE_BOOL_OFF= DISABLE_PARCHECK +CMAKE_TESTING_ON= ENABLE_TESTS + +PYTHON_USES= python:run,3.8+ .include .if (${ARCH} == "i386") -CMAKE_ARGS+= -DDISABLE_SIGCHLD_HANDLER=ON +CMAKE_ARGS+= -DDISABLE_SIGCHLD_HANDLER=ON .endif +# We need to manually extract par2cmdline-turbo source repository as the cmake option FETCHCONTENT_FULLY_DISCONNECTED is ON by default for ports +post-extract-PAR2-on: + ${MKDIR} ${BUILD_WRKSRC}/_deps + ${MV} ${WRKDIR}/par2cmdline-turbo-${PAR2CMDLINE_TURBO_VERSION} ${BUILD_WRKSRC}/_deps/par2-turbo-src + +# Clean up par2 static libraries and delete empty directories +post-stage-PAR2-on: + ${RM} ${STAGEDIR}${BUILD_WRKSRC}/lib/*.a + ${FIND} ${STAGEDIR} -depth -type d -not -path "${STAGEDIR}${PREFIX}*" -empty -delete + post-install: ${INSTALL_DATA} ${WRKSRC}/nzbget.conf \ ${STAGEDIR}${PREFIX}/etc/nzbget.conf.sample diff --git a/news/nzbget/distinfo b/news/nzbget/distinfo index 26771fc83a49..0c39f584b88d 100644 --- a/news/nzbget/distinfo +++ b/news/nzbget/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1727776422 -SHA256 (nzbgetcom-nzbget-v24.3_GH0.tar.gz) = b20ff0da1367825fbf00337a48196e81514195748d3d96f620f28ab2cc0b7cc0 -SIZE (nzbgetcom-nzbget-v24.3_GH0.tar.gz) = 5533518 +TIMESTAMP = 1733307178 +SHA256 (nzbgetcom-nzbget-v24.4_GH0.tar.gz) = ea3ebe13f5d48f040f1614b62bff9b51da134f4f689ec918997f5896cf51f337 +SIZE (nzbgetcom-nzbget-v24.4_GH0.tar.gz) = 7279980 +SHA256 (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget_GH0.tar.gz) = b471a76e6ac7384da87af9314826bc6d89ce879afb9485136b949cc5ce019ddf +SIZE (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget_GH0.tar.gz) = 3959897 diff --git a/news/nzbget/files/patch-cmake_posix.cmake b/news/nzbget/files/patch-cmake_posix.cmake new file mode 100644 index 000000000000..05f9b141696a --- /dev/null +++ b/news/nzbget/files/patch-cmake_posix.cmake @@ -0,0 +1,10 @@ +--- cmake/posix.cmake.orig 2024-11-19 07:09:42 UTC ++++ cmake/posix.cmake +@@ -93,7 +93,6 @@ else() + + if(NOT DISABLE_CURSES) + set(CURSES_NEED_NCURSES TRUE) +- set(CURSES_NEED_WIDE TRUE) + find_package(Curses REQUIRED) + set(INCLUDES ${INCLUDES} ${CURSES_INCLUDE_DIRS}) + set(LIBS ${LIBS} ${CURSES_LIBRARIES}) diff --git a/news/nzbget/pkg-help b/news/nzbget/pkg-help new file mode 100644 index 000000000000..c3aad51dc365 --- /dev/null +++ b/news/nzbget/pkg-help @@ -0,0 +1,9 @@ +PAR2 + +Disable if you have trouble compiling the par2 module. + +PYTHON + +This option install python 3.8+ alongside nzbget. Python is only used +when running nzbget extensions. See +https://nzbget.net/extension-scripts for more details. diff --git a/news/nzbget/pkg-plist b/news/nzbget/pkg-plist index d73666ff1b19..9b232be5cb2d 100644 --- a/news/nzbget/pkg-plist +++ b/news/nzbget/pkg-plist @@ -1,7 +1,8 @@ bin/nzbget -%%ETCDIR%%.conf.sample +@sample %%ETCDIR%%.conf.sample %%DATADIR%%/doc/COPYING %%DATADIR%%/doc/ChangeLog.md +%%DATADIR%%/nzbget.conf %%DATADIR%%/webui/config.js %%DATADIR%%/webui/dark-theme.css %%DATADIR%%/webui/downloads.js