devel/py-cachecontrol: Remove duplicate in favor of www/py-cachecontrol

6 files changed, 3 insertions, 42 deletions

diff --git a/MOVED b/MOVED
index 812cf82d52d3..1e2122287d2c 100644
--- a/MOVED
+++ b/MOVED
@@ -17759,3 +17759,4 @@ sysutils/ior|benchmarks/ior|2023-01-20|Moved to a better fit category
 emulators/qemu-guest-agent|emulators/qemu@guestagent|2023-01-20|Seperate port merged with main port as a flavor
 devel/rust-bindgen|devel/rust-bindgen-cli|2023-01-22|Renamed upstream
 graphics/darktable42||2023-01-27|Removed as part of the update of graphics/darktable to 4.2.0
+devel/py-cachecontrol|www/py-cachecontrol|2023-01-29|Remove duplicate added later
diff --git a/devel/Makefile b/devel/Makefile
index 95a43452d3cf..ce5ad290a4f5 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4349,7 +4349,6 @@
     SUBDIR += py-bullet3
     SUBDIR += py-bytecode
     SUBDIR += py-cabby
-    SUBDIR += py-cachecontrol
     SUBDIR += py-cached-property
     SUBDIR += py-cachetools
     SUBDIR += py-cachetools3
diff --git a/devel/py-cachecontrol/Makefile b/devel/py-cachecontrol/Makefile
deleted file mode 100644
index 1da207042e9d..000000000000
--- a/devel/py-cachecontrol/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-PORTNAME=	cachecontrol
-PORTVERSION=	0.12.12
-CATEGORIES=	devel python
-MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	CacheControl-${PORTVERSION}
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	httplib2 caching for requests
-WWW=		https://github.com/ionrock/cachecontrol
-
-LICENSE=	APACHE20
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
-
-CONFLICTS_INSTALL=	py*-CacheControl
-
-NO_ARCH=	yes
-
-OPTIONS_DEFINE=	FILECACHE REDIS
-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}
-
-.include <bsd.port.mk>
diff --git a/devel/py-cachecontrol/distinfo b/devel/py-cachecontrol/distinfo
deleted file mode 100644
index fae9968d0775..000000000000
--- a/devel/py-cachecontrol/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1663672808
-SHA256 (CacheControl-0.12.12.tar.gz) = 9c2e5208ea76ebd9921176569743ddf6d7f3bb4188dbf61806f0f8fc48ecad38
-SIZE (CacheControl-0.12.12.tar.gz) = 29181
diff --git a/devel/py-cachecontrol/pkg-descr b/devel/py-cachecontrol/pkg-descr
deleted file mode 100644
index d7fd5c9e1907..000000000000
--- a/devel/py-cachecontrol/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-CacheControl is a port of the caching algorithms in httplib2 for use with
-requests session object.
-
-It was written because httplib2's better support for caching is often mitigated
-by its lack of thread safety. The same is true of requests in terms of caching.
diff --git a/devel/py-orange-canvas-core/Makefile b/devel/py-orange-canvas-core/Makefile
index 64a10e90a5c9..8132b5f908d5 100644
--- a/devel/py-orange-canvas-core/Makefile
+++ b/devel/py-orange-canvas-core/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	orange-canvas-core
 DISTVERSION=	0.1.20
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,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:devel/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} \