From nobody Tue Apr 7 00:06:44 2026 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 4fqRM84m8Hz6YHYQ for ; Tue, 07 Apr 2026 00:06:44 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqRM825Qsz454l for ; Tue, 07 Apr 2026 00:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775520404; 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=tI+YwGmWLbyfFoAiWhAztNyLe4Hpd8LgXt8/vzOdwY0=; b=qIiUEu1erGpDG6xCkH7SN8eTH3lssMkQTU14ZSlwR5Wz8dBEAKzK+7KE8U4X2cLLTQ8n1e ACU3ufbO2aj4iyZq1JjlN6jPRiytlPILOe9of6VjnA6oDWv0Lj8ujkEeAgxAuzNfmIV9/I dFWxx+rreCWz4Z0JoZZi0ROuYmv6OqerdaR5tml+3K8oCGmY9hMHlV5SKye+jKKJAQvYBQ qYU9gxFJFPAgZ1m3eNjruCg5XG5DgABYETh7XJpOO/QHQA0hUcfROHmgu9JWYbypq2Lwnk e63M8BH568H4P8tSyJGQPwVd4qpi77Eairx3O6SsjmnwZLtgTGW2tPbkXO5A5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775520404; a=rsa-sha256; cv=none; b=G6pMJEu+KgQqWOEV8+MZoL5l6I494KOisWg64ZQBDlpisNltJVr+qZDP9whT6Kx6xHFT2F Xr1Xg8C1FMIGnt+gR4G6w6Vrt1AYxcxos9tBxV2hsyi/riuycCgiXzph/f1UE9kRJBRzsa ULyUM/5KO5qV7XRV882bABcXlTZQiipwtQ/mRujF/5TU5wy7Q4VtALLd7WhYCKSWt8kiSA ur9LQw5RJe+hD35xHw2gv2XvqicssOaW9gb02lNA4xhf535Y1ebV5jJWwZCR3yGzbDCTEv 6iBVv6t1uou5wirrWWv9m+m3DK7c60ruZJzWeRelV2DV9Xz1Tp0CuNPxizdaPg== 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=1775520404; 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=tI+YwGmWLbyfFoAiWhAztNyLe4Hpd8LgXt8/vzOdwY0=; b=tmoZBIRguwBrwBFbvGP9fFXDsmmfxOhc2YhVKjB9+O3/GtdvPW5pU0ZlzKPzs9mxeXLLhB oHudzAuHbnSa0e6mdnoIYwgjy0lyyntRgf5gOXWwlAJ6dk5d+fwB2/qOlMycZXxKqja/YB 0wqeaYnfaqnxb6f8KDyWI3rPLhpHYFi0qgi57lphYQb6jRgoEtY5IwCl0N25whAJ8zbwwL Xf8pG2dpo5Hr4p5cNekAQ10RIXbO9eDb1n+wD1nPgB2n2w4zxHUaCggT6OtpbBsMy0F/i5 COnhLYctvYfFrxAunx6dl5tbOy9do5gFZeiZZI1IjbNb4TvceOX5thMdBOFT7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqRM81fPpz134 for ; Tue, 07 Apr 2026 00:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fd76 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 00:06:44 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 238f7a8c944f - main - news/nzbhydra2: Update 7.9.0 => 8.5.3 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 238f7a8c944f5984ac31f66846a534e6bc706641 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 00:06:44 +0000 Message-Id: <69d44a94.1fd76.1b502781@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=238f7a8c944f5984ac31f66846a534e6bc706641 commit 238f7a8c944f5984ac31f66846a534e6bc706641 Author: Vladimir Druzenko AuthorDate: 2026-04-06 23:46:02 +0000 Commit: Vladimir Druzenko 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 (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 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}