www/py-cachecontrol: Fix port

- Use lowercase PORTNAME
- Fix WWW
- Fix LICENSE
- Fix FILECACHE and REDIS options: add missing RUN_DEPENDS
- Bump PORTREVISION for package change

PR:		266640
Approved by:	maintainer (timeout, 3+ months)

7 files changed, 14 insertions, 9 deletions

diff --git a/biology/py-scikit-bio/Makefile b/biology/py-scikit-bio/Makefile
index 69d78f73d8b0..7885dd70ec35 100644
--- a/biology/py-scikit-bio/Makefile
+++ b/biology/py-scikit-bio/Makefile
@@ -16,7 +16,7 @@ BROKEN_aarch64=	fails to build: invalid conversion between vector type '__m64' (
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}CacheControl>=0.11.5:www/py-cachecontrol@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.11.5:www/py-cachecontrol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.2:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.9.0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hdmedians>=0.14.1:math/py-hdmedians@${PY_FLAVOR} \
diff --git a/devel/poetry/Makefile b/devel/poetry/Makefile
index 806082d0d190..895aaa1b01ea 100644
--- a/devel/poetry/Makefile
+++ b/devel/poetry/Makefile
@@ -12,7 +12,7 @@ WWW=		https://python-poetry.org/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}CacheControl>=0.12.9:www/py-cachecontrol@${PY_FLAVOR} \
+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.12.9:www/py-cachecontrol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cleo>0:devel/py-cleo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}crashtest>=0.4.1:devel/py-crashtest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dulwich>0:devel/py-dulwich@${PY_FLAVOR} \
diff --git a/devel/py-orange-canvas-core/Makefile b/devel/py-orange-canvas-core/Makefile
index 8132b5f908d5..bc8b7e4ac177 100644
--- a/devel/py-orange-canvas-core/Makefile
+++ b/devel/py-orange-canvas-core/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}AnyQt>=0.0.11:x11-toolkits/py-AnyQt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}CommonMark>=0.8.1:textproc/py-CommonMark@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}CacheControl>0:www/py-cachecontrol@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cachecontrol>0:www/py-cachecontrol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dictdiffer>0:misc/py-dictdiffer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=18.0:devel/py-pip@${PY_FLAVOR} \
diff --git a/devel/py-pdm/Makefile b/devel/py-pdm/Makefile
index f6aa74967a74..8627514606d4 100644
--- a/devel/py-pdm/Makefile
+++ b/devel/py-pdm/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdm-backend>=0:devel/py-pdm-backend@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}CacheControl>=0.12.11:www/py-cachecontrol@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.12.11:www/py-cachecontrol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}findpython>=0.2.2:devel/py-findpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}installer>=0.7<0.8:devel/py-installer@${PY_FLAVOR} \
diff --git a/devel/py-poetry/Makefile b/devel/py-poetry/Makefile
index 8d1c8ac5bdc6..df98fd6197a9 100644
--- a/devel/py-poetry/Makefile
+++ b/devel/py-poetry/Makefile
@@ -14,7 +14,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0:devel/py-poetry-core@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}CacheControl>=0.12.9<0.13.0:www/py-cachecontrol@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.12.9<0.13.0:www/py-cachecontrol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cleo>=2.0.0<3.0.0:devel/py-cleo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}crashtest>=0.4.1<0.5.0:devel/py-crashtest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dulwich020>=0.20.46<0.21.0:devel/py-dulwich020@${PY_FLAVOR} \
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 81029e6cadc2..4fe12fe9d906 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>=3.7.1:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scour>0:textproc/py-scour@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}CacheControl>0:www/py-cachecontrol@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cachecontrol>0:www/py-cachecontrol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		ps2pdf:print/ghostscript9-agpl-base \
diff --git a/www/py-cachecontrol/Makefile b/www/py-cachecontrol/Makefile
index 4d349b570ef2..a2222e3c51b8 100644
--- a/www/py-cachecontrol/Makefile
+++ b/www/py-cachecontrol/Makefile
@@ -1,14 +1,16 @@
-PORTNAME=	CacheControl
+PORTNAME=	cachecontrol
 DISTVERSION=	0.12.12
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	CacheControl-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Caching algorithms in httplib2 for use with requests session object
-WWW=		https://github.com/ionrock/cachecontrol/
+WWW=		https://github.com/ionrock/cachecontrol
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
@@ -25,6 +27,9 @@ OPTIONS_DEFAULT=	FILECACHE
 FILECACHE_DESC=		FileCache support
 REDIS_DESC=		Redis support
 
+FILECACHE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}filelock>=3.7.1:sysutils/py-filelock@${PY_FLAVOR}
+REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.10.5:databases/py-redis@${PY_FLAVOR}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|msgpack-python|msgpack|' ${WRKSRC}/setup.py ${WRKSRC}/CacheControl.egg-info/requires.txt