Page MenuHomeFreeBSD
Files F145053621

D20164.id57207.diff
No OneTemporary
Actions

D20164.id57207.diff
View Options

Index: news/nzbhydra2/Makefile
===================================================================
--- news/nzbhydra2/Makefile
+++ news/nzbhydra2/Makefile
@@ -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 @@
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 @@
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 \
Index: news/nzbhydra2/distinfo
===================================================================
--- news/nzbhydra2/distinfo
+++ news/nzbhydra2/distinfo
@@ -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
Index: news/nzbhydra2/files/nzbhydra2wrapper.py.in
===================================================================
--- news/nzbhydra2/files/nzbhydra2wrapper.py.in
+++ news/nzbhydra2/files/nzbhydra2wrapper.py.in
@@ -490,7 +490,7 @@
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"))

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 16, 11:14 AM (16 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28776358
Default Alt Text
D20164.id57207.diff (2 KB)

Event Timeline