From owner-svn-ports-all@freebsd.org Fri Mar 29 16:11:54 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 7D8FF156D8CE; Fri, 29 Mar 2019 16:11:54 +0000 (UTC) (envelope-from kai@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 215D76C63B; Fri, 29 Mar 2019 16:11:54 +0000 (UTC) (envelope-from kai@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 EE6451352; Fri, 29 Mar 2019 16:11:53 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2TGBrwR004583; Fri, 29 Mar 2019 16:11:53 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2TGBrI8004580; Fri, 29 Mar 2019 16:11:53 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201903291611.x2TGBrI8004580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Fri, 29 Mar 2019 16:11:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497162 - in head/textproc/scancode-toolkit: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in head/textproc/scancode-toolkit: . files X-SVN-Commit-Revision: 497162 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 215D76C63B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,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, 29 Mar 2019 16:11:54 -0000 Author: kai Date: Fri Mar 29 16:11:53 2019 New Revision: 497162 URL: https://svnweb.freebsd.org/changeset/ports/497162 Log: textproc/scancode-toolkit: Fix runtime errors Relax the version requirements for devel/py-future and textproc/py-pygments. scancode-toolkit is not (yet) compatible with devel/py-click 7.x thus switch back to devel/py-click6 for a while. Also while I'm here: * Pet portlint (whitespace) Approved by: mentors (implicit) Modified: head/textproc/scancode-toolkit/Makefile head/textproc/scancode-toolkit/files/patch-setup.py head/textproc/scancode-toolkit/pkg-descr Modified: head/textproc/scancode-toolkit/Makefile ============================================================================== --- head/textproc/scancode-toolkit/Makefile Fri Mar 29 16:08:54 2019 (r497161) +++ head/textproc/scancode-toolkit/Makefile Fri Mar 29 16:11:53 2019 (r497162) @@ -3,6 +3,7 @@ PORTNAME= scancode-toolkit DISTVERSIONPREFIX= v DISTVERSION= 2.9.7 +PORTREVISION= 1 CATEGORIES= textproc python MAINTAINER= kai@FreeBSD.org @@ -41,7 +42,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>=3.2:textproc ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packageurl-python>=0.5.0:textproc/py-packageurl-python@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.11.0:devel/py-xmltodict@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}click>=6.0.0:devel/py-click@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click6>=6.0.0:devel/py-click6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluggy>=0.4.0:devel/py-pluggy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}attrs>=17.4:devel/py-attrs@${PY_FLAVOR} \ Modified: head/textproc/scancode-toolkit/files/patch-setup.py ============================================================================== --- head/textproc/scancode-toolkit/files/patch-setup.py Fri Mar 29 16:08:54 2019 (r497161) +++ head/textproc/scancode-toolkit/files/patch-setup.py Fri Mar 29 16:11:53 2019 (r497162) @@ -1,4 +1,4 @@ ---- setup.py.orig 2018-10-19 14:31:36 UTC +--- setup.py.orig 2018-10-26 01:55:40 UTC +++ setup.py @@ -125,9 +125,7 @@ setup( # cluecode @@ -11,7 +11,7 @@ 'fingerprints == 0.5.4', # extractcode -@@ -135,8 +133,6 @@ setup( +@@ -135,12 +133,10 @@ setup( # to work around bug http://bugs.python.org/issue19839 # on multistream bzip2 files: this can removed in Python 3. 'bz2file >= 0.98', @@ -20,11 +20,18 @@ # commoncode 'backports.os == 0.1.1', -@@ -166,7 +162,6 @@ setup( +- 'future == 0.16.0', ++ 'future >= 0.16.0', + 'text-unidecode >= 1.0, < 2.0', + + # licensedcode +@@ -165,8 +161,7 @@ setup( + 'binaryornot >= 0.4.0', 'chardet >= 3.0.0, <4.0.0', # note that we use a short version range because we use a simpler lexer list - 'pygments >= 2.2.0, <2.3', +- 'pygments >= 2.2.0, <2.3', - 'typecode-libmagic', ++ 'pygments >= 2.2.0', # packagedcode 'pefile >= 2018.8.8', Modified: head/textproc/scancode-toolkit/pkg-descr ============================================================================== --- head/textproc/scancode-toolkit/pkg-descr Fri Mar 29 16:08:54 2019 (r497161) +++ head/textproc/scancode-toolkit/pkg-descr Fri Mar 29 16:11:53 2019 (r497162) @@ -1,5 +1,5 @@ ScanCode scans code and detects licenses, copyrights, package manifests, dependencies and more. It can be also used to discover and inventory open source -and third-party packages used in your code. +and third-party packages used in your code. WWW: https://github.com/nexB/scancode-toolkit