From owner-svn-ports-all@freebsd.org Fri May 10 04:31:55 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E04981597026; Fri, 10 May 2019 04:31:54 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 81CE68F18A; Fri, 10 May 2019 04:31:54 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5E68E2718A; Fri, 10 May 2019 04:31:54 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4A4Vs7C003395; Fri, 10 May 2019 04:31:54 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4A4VrTg003393; Fri, 10 May 2019 04:31:53 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201905100431.x4A4VrTg003393@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 10 May 2019 04:31:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501152 - in head/news/nzbhydra2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/news/nzbhydra2: . files X-SVN-Commit-Revision: 501152 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 81CE68F18A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.993,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 May 2019 04:31:55 -0000 Author: tcberner Date: Fri May 10 04:31:53 2019 New Revision: 501152 URL: https://svnweb.freebsd.org/changeset/ports/501152 Log: 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 (maintainer) Differential Revision: https://reviews.freebsd.org/D20164 Modified: head/news/nzbhydra2/Makefile head/news/nzbhydra2/distinfo head/news/nzbhydra2/files/nzbhydra2wrapper.py.in Modified: head/news/nzbhydra2/Makefile ============================================================================== --- head/news/nzbhydra2/Makefile Fri May 10 04:20:45 2019 (r501151) +++ head/news/nzbhydra2/Makefile Fri May 10 04:31:53 2019 (r501152) @@ -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 \ Modified: head/news/nzbhydra2/distinfo ============================================================================== --- head/news/nzbhydra2/distinfo Fri May 10 04:20:45 2019 (r501151) +++ head/news/nzbhydra2/distinfo Fri May 10 04:31:53 2019 (r501152) @@ -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 Modified: head/news/nzbhydra2/files/nzbhydra2wrapper.py.in ============================================================================== --- head/news/nzbhydra2/files/nzbhydra2wrapper.py.in Fri May 10 04:20:45 2019 (r501151) +++ head/news/nzbhydra2/files/nzbhydra2wrapper.py.in Fri May 10 04:31:53 2019 (r501152) @@ -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\d+)(\.(?P\d+)\.(?P\d)+[\-_\w]*)?".*', versionLine) + match = re.match('(java|openjdk) version "(?P\d+)((\.(?P\d+)\.(?P\d)+)?[\-_\w]*)?".*', versionLine) if match is None: raise Exception("Unable to determine java version from string " + lines[0]) javaMajor = int(match.group("major"))