diff --git a/news/nzbhydra2/Makefile b/news/nzbhydra2/Makefile --- a/news/nzbhydra2/Makefile +++ b/news/nzbhydra2/Makefile @@ -1,5 +1,5 @@ PORTNAME= nzbhydra2 -DISTVERSION= 4.3.0 +DISTVERSION= 4.7.3 DISTVERSIONSUFFIX= -linux CATEGORIES= news java MASTER_SITES= https://github.com/theotherp/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -22,9 +22,9 @@ SUB_FILES= nzbhydra2 SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ - JAVA=${JAVA} + JAVA_HOME=${JAVA_HOME} -JAVA_VERSION= 8+ +JAVA_VERSION= 8 11 17 JAVA_VENDOR= openjdk JAVA_RUN= yes diff --git a/news/nzbhydra2/distinfo b/news/nzbhydra2/distinfo --- a/news/nzbhydra2/distinfo +++ b/news/nzbhydra2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649273609 -SHA256 (nzbhydra2-4.3.0-linux.zip) = 6c6af462dc7c3759ff43f650a5c0574d35fa9b6cfbf8a12379c423da788cacce -SIZE (nzbhydra2-4.3.0-linux.zip) = 70405008 +TIMESTAMP = 1670428713 +SHA256 (nzbhydra2-4.7.3-linux.zip) = d55d1d183087d38e1f49bc59ec7fab9809ead1646c1f0a4acb806a4c102ff62f +SIZE (nzbhydra2-4.7.3-linux.zip) = 83400658 diff --git a/news/nzbhydra2/files/nzbhydra2.in b/news/nzbhydra2/files/nzbhydra2.in --- a/news/nzbhydra2/files/nzbhydra2.in +++ b/news/nzbhydra2/files/nzbhydra2.in @@ -21,6 +21,11 @@ # Default: %%PREFIX%%/share/nzbhydra2 # nzbhydra2_data_dir: Data directory for nzbhydra (DB, Logs, config) # Default: %%PREFIX%%/nzbhydra2 +# nzbhydra2_java_home: Home directory for Java. Up to OpenJDK 17 +# can be used. +# Default: %%JAVA_HOME%% +# nzbhydra2_python_cmd: Path to Python3 executable to use. +# Default: %%PYTHON_CMD%% . /etc/rc.subr @@ -34,10 +39,12 @@ : ${nzbhydra2_group:="nzbhydra2"} : ${nzbhydra2_dir:="%%PREFIX%%/share/nzbhydra2"} : ${nzbhydra2_data_dir:="%%PREFIX%%/nzbhydra2"} +: ${nzbhydra2_java_home:="%%JAVA_HOME%%"} +: ${nzbhydra2_python_cmd:="%%PYTHON_CMD%%"} pidfile="/var/run/nzbhydra2/nzbhydra2.pid" -command="%%PYTHON_CMD%%" -command_args="${nzbhydra2_dir}/nzbhydra2wrapperPy3.py --datafolder ${nzbhydra2_data_dir} --pidfile ${pidfile} --daemon --nobrowser --java %%JAVA%%" +command="${nzbhydra2_python_cmd}" +command_args="${nzbhydra2_dir}/nzbhydra2wrapperPy3.py --datafolder ${nzbhydra2_data_dir} --pidfile ${pidfile} --daemon --nobrowser --java ${nzbhydra2_java_home}/bin/java" start_precmd=nzbhydra2_precmd nzbhydra2_precmd()