Attachment #256466 for bug #283884

View | Details | Raw Unified | Return to bug 283884
Collapse All | Expand All




PORTNAME=	nzbget
DISTVERSIONPREFIX=	v
DISTVERSION=	24.5
PORTREVISION=	0
CATEGORIES=	news



# 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-20241128

USES=		cmake:testing,noninja gnome ssl
USE_GNOME=	libxml2
USE_GITHUB=	yes
GH_ACCOUNT=	nzbgetcom

SUB_FILES=	pkg-message

OPTIONS_DEFINE=		DOCS NCURSES PAR2 PYTHON
OPTIONS_SUB=		yes
OPTIONS_DEFAULT=	NCURSES PAR2

PAR2_DESC=		PAR 2.0 compatible file verification and repair

CMAKE_ARGS+=	-DDISABLE_SIGCHLD_HANDLER=ON
.endif

pre-configure-PAR2-on:
	${MKDIR} ${BUILD_WRKSRC}/par2-turbo/src
	${MV} ${WRKDIR}/par2cmdline-turbo-${PAR2CMDLINE_TURBO_VERSION} ${BUILD_WRKSRC}/par2-turbo/src/par2-turbo
	${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 \

Lines 1-5 Link Here

(-)b/news/nzbget/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1733307178	1	TIMESTAMP = 1733484016
2	SHA256 (nzbgetcom-nzbget-v24.4_GH0.tar.gz) = ea3ebe13f5d48f040f1614b62bff9b51da134f4f689ec918997f5896cf51f337	2	SHA256 (nzbgetcom-nzbget-v24.5_GH0.tar.gz) = d8a26fef9f92d63258251c69af01f39073a479e48c14114dc96d285470312c83
3	SIZE (nzbgetcom-nzbget-v24.4_GH0.tar.gz) = 7279980	3	SIZE (nzbgetcom-nzbget-v24.5_GH0.tar.gz) = 7283271
4	SHA256 (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget_GH0.tar.gz) = b471a76e6ac7384da87af9314826bc6d89ce879afb9485136b949cc5ce019ddf	4	SHA256 (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget-20241128_GH0.tar.gz) = 052c23d061baf12cd866dd115848d3671d20b4b659b67d70df28a200e5e0a8d4
5	SIZE (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget_GH0.tar.gz) = 3959897	5	SIZE (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget-20241128_GH0.tar.gz) = 3960077




--- cmake/par2-turbo.cmake.orig	2024-12-05 05:22:43 UTC
+++ cmake/par2-turbo.cmake
@@ -27,12 +27,6 @@ endif()
 ExternalProject_add(
 	par2-turbo
 	PREFIX			par2-turbo
-	GIT_REPOSITORY	https://github.com/nzbgetcom/par2cmdline-turbo.git
-	GIT_TAG			v1.1.1-nzbget-20241128
-	TLS_VERIFY		TRUE
-	GIT_SHALLOW		TRUE
-	GIT_PROGRESS	TRUE
-	DOWNLOAD_EXTRACT_TIMESTAMP	TRUE
 	CMAKE_ARGS		${CMAKE_ARGS}
 	INSTALL_COMMAND	""
 )

Lines 1-10 Link Here

(-)b/news/nzbget/files/patch-cmake_posix.cmake (-4 / +5 lines)
1	--- cmake/posix.cmake.orig 2024-11-19 07:09:42 UTC	1	--- cmake/posix.cmake.orig 2024-12-05 05:22:43 UTC
2	+++ cmake/posix.cmake	2	+++ cmake/posix.cmake
3	@@ -93,7 +93,6 @@ else()	3	@@ -93,9 +93,6 @@ else()
4		4
5	if(NOT DISABLE_CURSES)	5	if(NOT DISABLE_CURSES)
6	set(CURSES_NEED_NCURSES TRUE)	6	set(CURSES_NEED_NCURSES TRUE)
7	- set(CURSES_NEED_WIDE TRUE)	7	- if(NOT APPLE)
		8	- set(CURSES_NEED_WIDE TRUE)
		9	- endif()
8	find_package(Curses REQUIRED)	10	find_package(Curses REQUIRED)
9	set(INCLUDES ${INCLUDES} ${CURSES_INCLUDE_DIRS})	11	set(INCLUDES ${INCLUDES} ${CURSES_INCLUDE_DIRS})
10	set(LIBS ${LIBS} ${CURSES_LIBRARIES})	12	set(LIBS ${LIBS} ${CURSES_LIBRARIES})
11	-

Return to bug 283884

Lines 1-6 Link Here

(-)b/news/nzbget/Makefile (-13 / +6 lines)
1	PORTNAME= nzbget	1	PORTNAME= nzbget
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 24.4	3	DISTVERSION= 24.5
4	PORTREVISION= 0	4	PORTREVISION= 0
5	CATEGORIES= news	5	CATEGORIES= news
6		6
Lines 16-24 RUN_DEPENDS= 7-zip>0:archivers/7-zip \ Link Here
16		16
17	# Since v24.4 nzbget maintainers switched from libpar2 to a fork of par2cmdline-turbo which is in its own repository.	17	# Since v24.4 nzbget maintainers switched from libpar2 to a fork of par2cmdline-turbo which is in its own repository.
18	# See https://github.com/nzbgetcom/nzbget/blob/v24.4/cmake/par2-turbo.cmake for the version to pull	18	# See https://github.com/nzbgetcom/nzbget/blob/v24.4/cmake/par2-turbo.cmake for the version to pull
19	PAR2CMDLINE_TURBO_VERSION=1.1.1-nzbget	19	PAR2CMDLINE_TURBO_VERSION=1.1.1-nzbget-20241128
20		20
21	USES= cmake:testing gnome ssl	21	USES= cmake:testing,noninja gnome ssl
22	USE_GNOME= libxml2	22	USE_GNOME= libxml2
23	USE_GITHUB= yes	23	USE_GITHUB= yes
24	GH_ACCOUNT= nzbgetcom	24	GH_ACCOUNT= nzbgetcom
Lines 31-37 BINMODE= 0755 Link Here
31	SUB_FILES= pkg-message	31	SUB_FILES= pkg-message
32		32
33	OPTIONS_DEFINE= DOCS NCURSES PAR2 PYTHON	33	OPTIONS_DEFINE= DOCS NCURSES PAR2 PYTHON
34	OPTIONS_SUB= yes
35	OPTIONS_DEFAULT= NCURSES PAR2	34	OPTIONS_DEFAULT= NCURSES PAR2
36		35
37	PAR2_DESC= PAR 2.0 compatible file verification and repair	36	PAR2_DESC= PAR 2.0 compatible file verification and repair
Lines 50-64 PYTHON_USES= python:run,3.8+ Link Here
50	CMAKE_ARGS+= -DDISABLE_SIGCHLD_HANDLER=ON	49	CMAKE_ARGS+= -DDISABLE_SIGCHLD_HANDLER=ON
51	.endif	50	.endif
52		51
53	# We need to manually extract par2cmdline-turbo source repository as the cmake option FETCHCONTENT_FULLY_DISCONNECTED is ON by default for ports	52	pre-configure-PAR2-on:
54	post-extract-PAR2-on:	53	${MKDIR} ${BUILD_WRKSRC}/par2-turbo/src
55	${MKDIR} ${BUILD_WRKSRC}/_deps	54	${MV} ${WRKDIR}/par2cmdline-turbo-${PAR2CMDLINE_TURBO_VERSION} ${BUILD_WRKSRC}/par2-turbo/src/par2-turbo
56	${MV} ${WRKDIR}/par2cmdline-turbo-${PAR2CMDLINE_TURBO_VERSION} ${BUILD_WRKSRC}/_deps/par2-turbo-src
57
58	# Clean up par2 static libraries and delete empty directories
59	post-stage-PAR2-on:
60	${RM} ${STAGEDIR}${BUILD_WRKSRC}/lib/*.a
61	${FIND} ${STAGEDIR} -depth -type d -not -path "${STAGEDIR}${PREFIX}*" -empty -delete
62		55
63	post-install:	56	post-install:
64	${INSTALL_DATA} ${WRKSRC}/nzbget.conf \	57	${INSTALL_DATA} ${WRKSRC}/nzbget.conf \

Added Link Here

(-)b/news/nzbget/files/patch-cmake_par2-turbo.cmake (+15 lines)
1	--- cmake/par2-turbo.cmake.orig 2024-12-05 05:22:43 UTC
2	+++ cmake/par2-turbo.cmake
3	@@ -27,12 +27,6 @@ endif()
4	ExternalProject_add(
5	par2-turbo
6	PREFIX par2-turbo
7	- GIT_REPOSITORY https://github.com/nzbgetcom/par2cmdline-turbo.git
8	- GIT_TAG v1.1.1-nzbget-20241128
9	- TLS_VERIFY TRUE
10	- GIT_SHALLOW TRUE
11	- GIT_PROGRESS TRUE
12	- DOWNLOAD_EXTRACT_TIMESTAMP TRUE
13	CMAKE_ARGS ${CMAKE_ARGS}
14	INSTALL_COMMAND ""
15	)