Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2024 00:59:18 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 545eb5d3ac42 - main - news/nzbget: Upgrade to v24.4
Message-ID:  <202412170059.4BH0xIwH095653@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=545eb5d3ac42b28ec59eb579307f8ec414234af4

commit 545eb5d3ac42b28ec59eb579307f8ec414234af4
Author:     Alexandre Levy <a13xlevy@pm.me>
AuthorDate: 2024-12-06 11:11:29 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
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 <bsd.port.options.mk>
 
 .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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412170059.4BH0xIwH095653>