1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00

news/nzbhydra2: Update to 2.6.2

- USE flag for python changed to python:2.7
  as 3.x is not supported at this time.

Changelog can be viewed at:
	https://github.com/theotherp/nzbhydra2/blob/master/changelog.md

Submitted by:	Daniel Shafer <daniel shafer cc> (maintainer)
Differential Revision:	https://reviews.freebsd.org/D20164
This commit is contained in:
Tobias C. Berner 2019-05-10 04:31:53 +00:00
parent d42e8967eb
commit a9ed30da6c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=501152
3 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= nzbhydra2
DISTVERSION= 2.3.16
DISTVERSION= 2.6.2
DISTVERSIONSUFFIX= -linux
CATEGORIES= news java
MASTER_SITES= https://github.com/theotherp/${PORTNAME}/releases/download/v${DISTVERSION}/
@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= amd64
USES= python shebangfix zip
USES= python:2.7 shebangfix zip
USE_JAVA= yes
USE_RC_SUBR= nzbhydra2
@ -32,7 +32,7 @@ JAVA_RUN= yes
USERS= nzbhydra2
GROUPS= nzbhydra2
PLIST_FILES= ${DATADIR}/lib/core-2.3.16-exec.jar \
PLIST_FILES= ${DATADIR}/lib/core-2.6.2-exec.jar \
${DATADIR}/nzbhydra2 \
${DATADIR}/nzbhydra2wrapper.py \
${DATADIR}/changelog.md \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1552779735
SHA256 (nzbhydra2-2.3.16-linux.zip) = 9cf8fde9f1e40c2894fff6798c8a1dc22be4904c9542e7e9250409f2dbae5e33
SIZE (nzbhydra2-2.3.16-linux.zip) = 70170041
TIMESTAMP = 1557086555
SHA256 (nzbhydra2-2.6.2-linux.zip) = c25c893e064509f74bcb2b4861790773497412b83a7e39794bfdf2f6674d5101
SIZE (nzbhydra2-2.6.2-linux.zip) = 71193980

View File

@ -490,7 +490,7 @@ def getJavaVersion(javaExecutable):
if len(lines) == 0:
raise Exception("Unable to get output from call to java -version")
versionLine = lines[0].replace("\n", "").replace("\r", "")
match = re.match('(java|openjdk) version "(?P<major>\d+)(\.(?P<minor>\d+)\.(?P<patch>\d)+[\-_\w]*)?".*', versionLine)
match = re.match('(java|openjdk) version "(?P<major>\d+)((\.(?P<minor>\d+)\.(?P<patch>\d)+)?[\-_\w]*)?".*', versionLine)
if match is None:
raise Exception("Unable to determine java version from string " + lines[0])
javaMajor = int(match.group("major"))