Date: Tue, 07 Apr 2026 00:06:44 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 238f7a8c944f - main - news/nzbhydra2: Update 7.9.0 => 8.5.3 Message-ID: <69d44a94.1fd76.1b502781@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=238f7a8c944f5984ac31f66846a534e6bc706641 commit 238f7a8c944f5984ac31f66846a534e6bc706641 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-04-06 23:46:02 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-04-07 00:05:57 +0000 news/nzbhydra2: Update 7.9.0 => 8.5.3 Changelog: https://github.com/theotherp/nzbhydra2/blob/v8.5.3/changelog.md - Use exact Java version 17: "You need to install Java 17 (not lower, not higher)". - Fix warnings from portclippy. - Distfiles is zip: add USES+=zip, remove EXTRACT_SUFFIX=.zip, adjust EXTRACT_*_ARGS. - Add NO_ARCH. - Simplify do-install. - Remove LICENSE from installation - already installed via LICENSE. - Sort plist. - Respect substitutions variables USER, GROUP, DATADIR in rc.d script. PR: 294193 Approved by: Marcel Bischoff <marcel@herrbischoff.com> (maintainer) Sponsored by: UNIS Labs MFH: 2026Q2 --- news/nzbhydra2/Makefile | 43 ++++++++++++++++++--------------------- news/nzbhydra2/distinfo | 6 +++--- news/nzbhydra2/files/nzbhydra2.in | 14 ++++++------- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/news/nzbhydra2/Makefile b/news/nzbhydra2/Makefile index 0fbe00ff205c..5de89b595281 100644 --- a/news/nzbhydra2/Makefile +++ b/news/nzbhydra2/Makefile @@ -1,6 +1,5 @@ PORTNAME= nzbhydra2 -DISTVERSION= 7.9.0 -PORTREVISION= 2 +DISTVERSION= 8.5.3 DISTVERSIONSUFFIX= -generic CATEGORIES= news java MASTER_SITES= https://github.com/theotherp/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -14,40 +13,38 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le -USES= java python +USES= java python zip +JAVA_VERSION= 17 +JAVA_VENDOR= openjdk USE_RC_SUBR= nzbhydra2 -EXTRACT_SUFX= .zip -EXTRACT_AFTER_ARGS= --exclude executables \ - --exclude other \ - --exclude WindowsService \ - --exclude *.exe \ - --exclude nzbhydra2wrapper.py \ - --no-same-owner --no-same-permissions - +EXTRACT_BEFORE_ARGS= -qo \ + -x '*.exe' -x '*.cmd' \ + -x WindowsService \ + -x executables \ + -x nzbhydra2wrapper.py \ + -x other/* -x other +NO_ARCH= yes NO_BUILD= yes -NO_WRKSUBDIR= yes - SUB_FILES= nzbhydra2 SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ JAVA=${JAVA} \ - DISTVERSION=${DISTVERSION} + DISTVERSION=${DISTVERSION} \ + USER=${USERS} \ + GROUP=${GROUPS} -JAVA_VERSION= 17+ -JAVA_VENDOR= openjdk +NO_WRKSUBDIR= yes USERS= nzbhydra2 GROUPS= nzbhydra2 -PLIST_FILES= ${DATADIR}/lib/core-${DISTVERSION}-exec.jar \ +PLIST_FILES= ${DATADIR}/changelog.md \ + ${DATADIR}/lib/core-${DISTVERSION}-exec.jar \ ${DATADIR}/nzbhydra2wrapperPy3.py \ - ${DATADIR}/changelog.md \ - ${DATADIR}/readme.md \ - ${DATADIR}/LICENSE + ${DATADIR}/readme.md do-install: - @${MKDIR} ${STAGEDIR}/${DATADIR} - ${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR} + (cd ${WRKSRC} && \ + ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR} '! -name LICENSE') .include <bsd.port.mk> diff --git a/news/nzbhydra2/distinfo b/news/nzbhydra2/distinfo index 3cda51b8abcc..7cb9d1d6afda 100644 --- a/news/nzbhydra2/distinfo +++ b/news/nzbhydra2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731450205 -SHA256 (nzbhydra2-7.9.0-generic.zip) = 46b2368dc4a05bb2ced33fbd855699f75ab68134e3be589ab14407f9a8ddc389 -SIZE (nzbhydra2-7.9.0-generic.zip) = 189555711 +TIMESTAMP = 1775200000 +SHA256 (nzbhydra2-8.5.3-generic.zip) = c615373924f2702dabab5a4a92e62359fa8f780d8b2e09106f73fdd791420bdf +SIZE (nzbhydra2-8.5.3-generic.zip) = 91877755 diff --git a/news/nzbhydra2/files/nzbhydra2.in b/news/nzbhydra2/files/nzbhydra2.in index c20452637d24..43fb19266b7b 100644 --- a/news/nzbhydra2/files/nzbhydra2.in +++ b/news/nzbhydra2/files/nzbhydra2.in @@ -10,15 +10,15 @@ # nzbhydra2_enable (bool): Set to NO by default. # Set it to YES to enable it. # nzbhydra2_user: The user account nzbhydra daemon runs as what -# you want it to be. It uses '_sabnzbd' user by +# you want it to be. It uses '%%USER%%' user by # default. Do not sets it as empty or it will run # as root. # nzbhydra2_group: The group account nzbhydra daemon runs as what -# you want it to be. It uses 'nzbhydra2' group by +# you want it to be. It uses '%%GROUP%%' group by # default. Do not sets it as empty or it will run # as wheel. # nzbhydra2_dir: Directory where nzbhydra lives. -# Default: %%PREFIX%%/share/nzbhydra2 +# Default: %%DATADIR%% # nzbhydra2_data_dir: Data directory for nzbhydra (DB, Logs, config) # Default: %%PREFIX%%/nzbhydra2 @@ -30,9 +30,9 @@ rcvar=${name}_enable load_rc_config ${name} : ${nzbhydra2_enable:="NO"} -: ${nzbhydra2_user:="nzbhydra2"} -: ${nzbhydra2_group:="nzbhydra2"} -: ${nzbhydra2_dir:="%%PREFIX%%/share/nzbhydra2"} +: ${nzbhydra2_user:="%%USER%%"} +: ${nzbhydra2_group:="%%GROUP%%"} +: ${nzbhydra2_dir:="%%DATADIR%%"} : ${nzbhydra2_data_dir:="%%PREFIX%%/nzbhydra2"} pidfile="/var/run/nzbhydra2/nzbhydra2.pid" @@ -45,7 +45,7 @@ nzbhydra2_precmd() export XDG_CONFIG_HOME=${nzbhydra2_data_dir} export NZBHYDRA_DISABLE_UPDATE=1 - find "%%PREFIX%%/share/nzbhydra2/lib/" ! -name "core-%%DISTVERSION%%-exec.jar" -delete + find "${nzbhydra2_dir}/lib/" ! -name "core-%%DISTVERSION%%-exec.jar" -delete if [ -f ${pidfile} ]; then rm -f ${pidfile}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d44a94.1fd76.1b502781>