svn commit: r497162 - in head/textproc/scancode-toolkit: . files

[Kai Knoblich]

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 at 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