*/*: rename CHEESESHOP to PYPI in MASTER_SITES

PR:			267994
Differential revision:	D37518
Approved by:		bapt

294 files changed, 294 insertions, 294 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index a83f33f3ac6f..80fb470bb6e7 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	asciidoc
 PORTVERSION=	10.2.0
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP \
+MASTER_SITES=	PYPI \
 		https://github.com/asciidoc-py/asciidoc-py/raw/${PORTVERSION}/doc/:manpage
 DISTFILES=	asciidoc-${PORTVERSION}${EXTRACT_SUFX} \
 		a2x.1.txt:manpage
diff --git a/textproc/codespell/Makefile b/textproc/codespell/Makefile
index 5bec20698bdc..7567fae133fe 100644
--- a/textproc/codespell/Makefile
+++ b/textproc/codespell/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	codespell
 PORTVERSION=	2.2.2
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Source code spelling checker
diff --git a/textproc/json2yaml/Makefile b/textproc/json2yaml/Makefile
index 10a5a651a1f5..cd062c00529e 100644
--- a/textproc/json2yaml/Makefile
+++ b/textproc/json2yaml/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	json2yaml
 PORTVERSION=	1.2.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Convert JSON to YAML or vice versa
diff --git a/textproc/lookatme/Makefile b/textproc/lookatme/Makefile
index 0dbed89d70b2..fd54a2692caa 100644
--- a/textproc/lookatme/Makefile
+++ b/textproc/lookatme/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lookatme
 PORTVERSION=	2.5.5
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Interactive, terminal-based markdown presenter
diff --git a/textproc/py-CommonMark/Makefile b/textproc/py-CommonMark/Makefile
index ed579bc22f02..4387c0820a61 100644
--- a/textproc/py-CommonMark/Makefile
+++ b/textproc/py-CommonMark/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	CommonMark
 PORTVERSION=	0.9.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	commonmark-${PORTVERSION}
 
diff --git a/textproc/py-Morfessor/Makefile b/textproc/py-Morfessor/Makefile
index 078cb5cd63fc..f87cba24ee4c 100644
--- a/textproc/py-Morfessor/Makefile
+++ b/textproc/py-Morfessor/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	Morfessor
 PORTVERSION=	2.0.6
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-QDarkStyle/Makefile b/textproc/py-QDarkStyle/Makefile
index 6d2acb5729d9..6bccd7094776 100644
--- a/textproc/py-QDarkStyle/Makefile
+++ b/textproc/py-QDarkStyle/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	QDarkStyle
 PORTVERSION=	3.1
 CATEGORIES=	textproc devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/textproc/py-RTFDE/Makefile b/textproc/py-RTFDE/Makefile
index 314c22f2e1dc..1668ff3b13df 100644
--- a/textproc/py-RTFDE/Makefile
+++ b/textproc/py-RTFDE/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	RTFDE
 PORTVERSION=	0.0.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	DtxdF@disroot.org
diff --git a/textproc/py-Tempita/Makefile b/textproc/py-Tempita/Makefile
index 258b394cff91..a74b660a714e 100644
--- a/textproc/py-Tempita/Makefile
+++ b/textproc/py-Tempita/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	Tempita
 PORTVERSION=	0.5.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-acora/Makefile b/textproc/py-acora/Makefile
index 8fa710999a78..f474b13ca172 100644
--- a/textproc/py-acora/Makefile
+++ b/textproc/py-acora/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	acora
 PORTVERSION=	2.3
 CATEGORIES=	textproc devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
diff --git a/textproc/py-aeidon/Makefile b/textproc/py-aeidon/Makefile
index 279d000c3e28..beabaaeba7bd 100644
--- a/textproc/py-aeidon/Makefile
+++ b/textproc/py-aeidon/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	aeidon
 PORTVERSION=	1.11
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-agate-dbf/Makefile b/textproc/py-agate-dbf/Makefile
index bf87d68c299d..1aa6fb35d775 100644
--- a/textproc/py-agate-dbf/Makefile
+++ b/textproc/py-agate-dbf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	agate-dbf
 PORTVERSION=	0.2.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-agate-excel/Makefile b/textproc/py-agate-excel/Makefile
index 8c1aa9036ed2..038b6a7d5b2f 100644
--- a/textproc/py-agate-excel/Makefile
+++ b/textproc/py-agate-excel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	agate-excel
 PORTVERSION=	0.2.5
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-agate/Makefile b/textproc/py-agate/Makefile
index b07bf6c9e1f6..77dda0399e4a 100644
--- a/textproc/py-agate/Makefile
+++ b/textproc/py-agate/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	agate
 PORTVERSION=	1.7.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-alabaster/Makefile b/textproc/py-alabaster/Makefile
index 37b1f2775043..4b8addc078c0 100644
--- a/textproc/py-alabaster/Makefile
+++ b/textproc/py-alabaster/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	alabaster
 PORTVERSION=	0.7.12
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-anyascii/Makefile b/textproc/py-anyascii/Makefile
index dd1d1f662248..3a7e56967313 100644
--- a/textproc/py-anyascii/Makefile
+++ b/textproc/py-anyascii/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	anyascii
 PORTVERSION=	0.3.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-arabic-reshaper/Makefile b/textproc/py-arabic-reshaper/Makefile
index 3bdc2749d16e..717fbde65447 100644
--- a/textproc/py-arabic-reshaper/Makefile
+++ b/textproc/py-arabic-reshaper/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	arabic-reshaper
 PORTVERSION=	2.1.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	arabic_reshaper-${PORTVERSION}
 
diff --git a/textproc/py-asciinema/Makefile b/textproc/py-asciinema/Makefile
index 40b8330fae81..bd7976f44d4e 100644
--- a/textproc/py-asciinema/Makefile
+++ b/textproc/py-asciinema/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	asciinema
 PORTVERSION=	2.0.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/textproc/py-asonic/Makefile b/textproc/py-asonic/Makefile
index 70a9bf903957..b943cb8a670d 100644
--- a/textproc/py-asonic/Makefile
+++ b/textproc/py-asonic/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	asonic
 PORTVERSION=	2.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-atoml/Makefile b/textproc/py-atoml/Makefile
index 878ba0e64684..7c60dba53cf8 100644
--- a/textproc/py-atoml/Makefile
+++ b/textproc/py-atoml/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	atoml
 PORTVERSION=	1.1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-autopep8/Makefile b/textproc/py-autopep8/Makefile
index a564f40e034f..ae61f8cde0fb 100644
--- a/textproc/py-autopep8/Makefile
+++ b/textproc/py-autopep8/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	autopep8
 PORTVERSION=	2.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-awesome-slugify/Makefile b/textproc/py-awesome-slugify/Makefile
index c82bfd395ef7..113f432c5c49 100644
--- a/textproc/py-awesome-slugify/Makefile
+++ b/textproc/py-awesome-slugify/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	awesome-slugify
 PORTVERSION=	1.6.5
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-bibtexparser/Makefile b/textproc/py-bibtexparser/Makefile
index 4aedb629bcb3..1faf27e95a28 100644
--- a/textproc/py-bibtexparser/Makefile
+++ b/textproc/py-bibtexparser/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bibtexparser
 DISTVERSION=	1.4.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-bracex/Makefile b/textproc/py-bracex/Makefile
index 85027ef4a928..03a7083564b1 100644
--- a/textproc/py-bracex/Makefile
+++ b/textproc/py-bracex/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bracex
 PORTVERSION=	2.1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-cchardet/Makefile b/textproc/py-cchardet/Makefile
index 6eaf3988dd0e..63c9b705c35d 100644
--- a/textproc/py-cchardet/Makefile
+++ b/textproc/py-cchardet/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	cchardet
 PORTVERSION=	2.1.7
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-chameleon/Makefile b/textproc/py-chameleon/Makefile
index 6c181ca47b71..aa9c028e0fe0 100644
--- a/textproc/py-chameleon/Makefile
+++ b/textproc/py-chameleon/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	chameleon
 PORTVERSION=	3.10.1
 CATEGORIES=	textproc www python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Chameleon-${PORTVERSION}
 
diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile
index 0740e8ed6c19..d32426fe3b81 100644
--- a/textproc/py-chardet/Makefile
+++ b/textproc/py-chardet/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	chardet
 PORTVERSION=	4.0.0
 PORTEPOCH=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-charset-normalizer/Makefile b/textproc/py-charset-normalizer/Makefile
index 5aeceef83bd6..7ec20dd4d5f2 100644
--- a/textproc/py-charset-normalizer/Makefile
+++ b/textproc/py-charset-normalizer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	charset-normalizer
 PORTVERSION=	3.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-chevron/Makefile b/textproc/py-chevron/Makefile
index 4341a0fa618e..bc5923ff9795 100644
--- a/textproc/py-chevron/Makefile
+++ b/textproc/py-chevron/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	chevron
 PORTVERSION=	0.14.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nork@ninth-nine.com
diff --git a/textproc/py-citeproc-py-styles/Makefile b/textproc/py-citeproc-py-styles/Makefile
index d4635f95c6a1..9b3785f81a0b 100644
--- a/textproc/py-citeproc-py-styles/Makefile
+++ b/textproc/py-citeproc-py-styles/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	citeproc-py-styles
 DISTVERSION=	0.1.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-citeproc-py/Makefile b/textproc/py-citeproc-py/Makefile
index e547fa190f9f..6cac67e9d933 100644
--- a/textproc/py-citeproc-py/Makefile
+++ b/textproc/py-citeproc-py/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	citeproc-py
 DISTVERSION=	0.6.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-cjkwrap/Makefile b/textproc/py-cjkwrap/Makefile
index b48233114866..96e67dda7a8a 100644
--- a/textproc/py-cjkwrap/Makefile
+++ b/textproc/py-cjkwrap/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cjkwrap
 DISTVERSION=	2.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	CJKwrap-${DISTVERSION}
 
diff --git a/textproc/py-cloud_sptheme/Makefile b/textproc/py-cloud_sptheme/Makefile
index 3bae67177cf4..1c78ad9c13b2 100644
--- a/textproc/py-cloud_sptheme/Makefile
+++ b/textproc/py-cloud_sptheme/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	cloud_sptheme
 PORTVERSION=	1.10.1
 DISTVERSIONSUFFIX=	.post20200504175005
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-cmarkgfm/Makefile b/textproc/py-cmarkgfm/Makefile
index b5164fdb8e09..2d54a1eda6c9 100644
--- a/textproc/py-cmarkgfm/Makefile
+++ b/textproc/py-cmarkgfm/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cmarkgfm
 PORTVERSION=	0.8.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-collective.checkdocs/Makefile b/textproc/py-collective.checkdocs/Makefile
index ef740a54ef65..0e256d0148c6 100644
--- a/textproc/py-collective.checkdocs/Makefile
+++ b/textproc/py-collective.checkdocs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	collective.checkdocs
 PORTVERSION=	0.2
 CATEGORIES=	textproc devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/textproc/py-colorclass/Makefile b/textproc/py-colorclass/Makefile
index 3ef2ee53af9a..a21efd9f44bd 100644
--- a/textproc/py-colorclass/Makefile
+++ b/textproc/py-colorclass/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	colorclass
 PORTVERSION=	2.2.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index d683c71d596a..340a3bf77e38 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	creole
 DISTVERSION=	1.4.10
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
diff --git a/textproc/py-cssselect2/Makefile b/textproc/py-cssselect2/Makefile
index f19eb2e2f7a9..4899a745c878 100644
--- a/textproc/py-cssselect2/Makefile
+++ b/textproc/py-cssselect2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cssselect2
 PORTVERSION=	0.7.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-csvkit/Makefile b/textproc/py-csvkit/Makefile
index 11ea9a55598d..694af8d91bd7 100644
--- a/textproc/py-csvkit/Makefile
+++ b/textproc/py-csvkit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	csvkit
 PORTVERSION=	1.1.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-custom_inherit/Makefile b/textproc/py-custom_inherit/Makefile
index 2175843634bc..88ffac0a9b09 100644
--- a/textproc/py-custom_inherit/Makefile
+++ b/textproc/py-custom_inherit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	custom_inherit
 PORTVERSION=	2.3.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	skreuzer@FreeBSD.org
diff --git a/textproc/py-dbfread/Makefile b/textproc/py-dbfread/Makefile
index 4f5326cad931..bec076ad2c50 100644
--- a/textproc/py-dbfread/Makefile
+++ b/textproc/py-dbfread/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dbfread
 PORTVERSION=	2.0.7
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-diff-match-patch/Makefile b/textproc/py-diff-match-patch/Makefile
index 56e5091735e7..bd86330ace11 100644
--- a/textproc/py-diff-match-patch/Makefile
+++ b/textproc/py-diff-match-patch/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	diff-match-patch
 PORTVERSION=	20200713
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-docrepr/Makefile b/textproc/py-docrepr/Makefile
index 3522973f5601..47057e5d0f5b 100644
--- a/textproc/py-docrepr/Makefile
+++ b/textproc/py-docrepr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	docrepr
 DISTVERSION=	0.2.0
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/py-docstring-parser/Makefile b/textproc/py-docstring-parser/Makefile
index 4e3e088f42d1..19ad21216696 100644
--- a/textproc/py-docstring-parser/Makefile
+++ b/textproc/py-docstring-parser/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	docstring-parser
 DISTVERSION=	0.13
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	docstring_parser-${DISTVERSION}
 
diff --git a/textproc/py-docstring-to-markdown/Makefile b/textproc/py-docstring-to-markdown/Makefile
index c84a165f46ef..a808869d8c4d 100644
--- a/textproc/py-docstring-to-markdown/Makefile
+++ b/textproc/py-docstring-to-markdown/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	docstring-to-markdown
 PORTVERSION=	0.11
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index fb5d7d1af133..2f1d933d9f32 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	docutils
 PORTVERSION=	0.17.1
 PORTEPOCH=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-docx2txt/Makefile b/textproc/py-docx2txt/Makefile
index 604c80fdcb4c..ca47bcf7b134 100644
--- a/textproc/py-docx2txt/Makefile
+++ b/textproc/py-docx2txt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	docx2txt
 DISTVERSION=	0.8
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-dominate/Makefile b/textproc/py-dominate/Makefile
index b9c53024b954..b02f40b09617 100644
--- a/textproc/py-dominate/Makefile
+++ b/textproc/py-dominate/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dominate
 PORTVERSION=	2.7.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-dparse/Makefile b/textproc/py-dparse/Makefile
index 2b693a0389a1..cbe18f6e80da 100644
--- a/textproc/py-dparse/Makefile
+++ b/textproc/py-dparse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dparse
 DISTVERSION=	0.5.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-duecredit/Makefile b/textproc/py-duecredit/Makefile
index deabd4aac0ce..f8245e51d2c8 100644
--- a/textproc/py-duecredit/Makefile
+++ b/textproc/py-duecredit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	duecredit
 DISTVERSION=	0.9.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-elasticsearch-async/Makefile b/textproc/py-elasticsearch-async/Makefile
index 4069488c7c4c..4e3a19d8eccd 100644
--- a/textproc/py-elasticsearch-async/Makefile
+++ b/textproc/py-elasticsearch-async/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elasticsearch-async
 PORTVERSION=	6.2.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-elasticsearch-dsl/Makefile b/textproc/py-elasticsearch-dsl/Makefile
index bbcc71b9a399..af5ca228ce5d 100644
--- a/textproc/py-elasticsearch-dsl/Makefile
+++ b/textproc/py-elasticsearch-dsl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elasticsearch-dsl
 PORTVERSION=	7.3.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jbaggs2016@gmail.com
diff --git a/textproc/py-elasticsearch-dsl6/Makefile b/textproc/py-elasticsearch-dsl6/Makefile
index 695fff7b3890..ba5709cd8b2b 100644
--- a/textproc/py-elasticsearch-dsl6/Makefile
+++ b/textproc/py-elasticsearch-dsl6/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elasticsearch-dsl
 PORTVERSION=	6.4.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	6
 
diff --git a/textproc/py-elasticsearch/Makefile b/textproc/py-elasticsearch/Makefile
index 85fdd8fcc7bf..c054b85f5669 100644
--- a/textproc/py-elasticsearch/Makefile
+++ b/textproc/py-elasticsearch/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elasticsearch
 PORTVERSION=	7.17.7
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-elasticsearch6/Makefile b/textproc/py-elasticsearch6/Makefile
index f81d63375843..e6c563910268 100644
--- a/textproc/py-elasticsearch6/Makefile
+++ b/textproc/py-elasticsearch6/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elasticsearch
 PORTVERSION=	6.8.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	6
 
diff --git a/textproc/py-elementpath/Makefile b/textproc/py-elementpath/Makefile
index f68212a39559..554f2416b7ec 100644
--- a/textproc/py-elementpath/Makefile
+++ b/textproc/py-elementpath/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elementpath
 DISTVERSION=	3.0.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/textproc/py-empy/Makefile b/textproc/py-empy/Makefile
index d6e201b97c01..5a2990e359ff 100644
--- a/textproc/py-empy/Makefile
+++ b/textproc/py-empy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	empy
 PORTVERSION=	3.3.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index a09ab6890226..503ea87bd655 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	enchant
 PORTVERSION=	3.2.2
 PORTREVISION=	2
 CATEGORIES=	textproc devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
diff --git a/textproc/py-enrich/Makefile b/textproc/py-enrich/Makefile
index 0e21633f88c3..0acbf5a651a9 100644
--- a/textproc/py-enrich/Makefile
+++ b/textproc/py-enrich/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	enrich
 PORTVERSION=	1.2.7
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-et_xmlfile/Makefile b/textproc/py-et_xmlfile/Makefile
index d762fae46437..f6496ddb1911 100644
--- a/textproc/py-et_xmlfile/Makefile
+++ b/textproc/py-et_xmlfile/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	et_xmlfile
 PORTVERSION=	1.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
diff --git a/textproc/py-extract-msg/Makefile b/textproc/py-extract-msg/Makefile
index c367d2bc8cc8..ee03763b7245 100644
--- a/textproc/py-extract-msg/Makefile
+++ b/textproc/py-extract-msg/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	extract-msg
 PORTVERSION=	0.38.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	extract_msg-${PORTVERSION}
 
diff --git a/textproc/py-fastavro/Makefile b/textproc/py-fastavro/Makefile
index cb268d08a111..aff16307a91b 100644
--- a/textproc/py-fastavro/Makefile
+++ b/textproc/py-fastavro/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fastavro
 PORTVERSION=	0.24.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	zi@FreeBSD.org
diff --git a/textproc/py-fluent.syntax/Makefile b/textproc/py-fluent.syntax/Makefile
index 7ebd78a847f6..55c4a477c709 100644
--- a/textproc/py-fluent.syntax/Makefile
+++ b/textproc/py-fluent.syntax/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fluent.syntax
 PORTVERSION=	0.18.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-ftfy/Makefile b/textproc/py-ftfy/Makefile
index 2ecc754705a7..8e09ad5fa945 100644
--- a/textproc/py-ftfy/Makefile
+++ b/textproc/py-ftfy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ftfy
 PORTVERSION=	6.0.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-furo/Makefile b/textproc/py-furo/Makefile
index 962fd1104eaa..4ff634455a02 100644
--- a/textproc/py-furo/Makefile
+++ b/textproc/py-furo/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	furo
 PORTVERSION=	2022.9.29
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP \
+MASTER_SITES=	PYPI \
 		LOCAL/sunpoet:static
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/textproc/py-gambit-elasticsearch/Makefile b/textproc/py-gambit-elasticsearch/Makefile
index c4d93821b9d4..27d34d629f70 100644
--- a/textproc/py-gambit-elasticsearch/Makefile
+++ b/textproc/py-gambit-elasticsearch/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gambit
 DISTVERSION=	0.1.6
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-elasticsearch
 
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index fba3d0399c41..8d6af9b7f29c 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	Genshi
 PORTVERSION=	0.7.7
 CATEGORIES=	textproc www python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/textproc/py-gensim/Makefile b/textproc/py-gensim/Makefile
index 4171ed579be6..b7a14ecf4d67 100644
--- a/textproc/py-gensim/Makefile
+++ b/textproc/py-gensim/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gensim
 DISTVERSION=	4.2.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-googletrans/Makefile b/textproc/py-googletrans/Makefile
index 9de8b23e7d50..0793d3722c24 100644
--- a/textproc/py-googletrans/Makefile
+++ b/textproc/py-googletrans/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	googletrans
 DISTVERSION=	3.0.0
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/py-grako/Makefile b/textproc/py-grako/Makefile
index 0ed3378d279d..f75c88d15292 100644
--- a/textproc/py-grako/Makefile
+++ b/textproc/py-grako/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grako
 DISTVERSION=	3.99.9
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-guess-language/Makefile b/textproc/py-guess-language/Makefile
index 054250f9b11c..cf70b869bd6e 100644
--- a/textproc/py-guess-language/Makefile
+++ b/textproc/py-guess-language/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	guess-language
 PORTVERSION=	0.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/py-hashids/Makefile b/textproc/py-hashids/Makefile
index 165eb1f7ec91..9abb834e15e6 100644
--- a/textproc/py-hashids/Makefile
+++ b/textproc/py-hashids/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hashids
 PORTVERSION=	1.3.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-hexdump/Makefile b/textproc/py-hexdump/Makefile
index 4664703e68b8..4d5108c3ace4 100644
--- a/textproc/py-hexdump/Makefile
+++ b/textproc/py-hexdump/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hexdump
 PORTVERSION=	3.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-hieroglyph/Makefile b/textproc/py-hieroglyph/Makefile
index d41605f8f685..30b11faf6f9b 100644
--- a/textproc/py-hieroglyph/Makefile
+++ b/textproc/py-hieroglyph/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hieroglyph
 PORTVERSION=	2.1.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/py-hjson/Makefile b/textproc/py-hjson/Makefile
index 87af531f3e2d..5d0d556651c9 100644
--- a/textproc/py-hjson/Makefile
+++ b/textproc/py-hjson/Makefile
@@ -12,7 +12,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		python
-# Use GitHub instead of CHEESESHOP to get the test files.
+# Use GitHub instead of PYPI to get the test files.
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}-py
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile
index 533196a67f39..cbf940e524bb 100644
--- a/textproc/py-html2text/Makefile
+++ b/textproc/py-html2text/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	html2text
 PORTVERSION=	2020.1.16
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/py-html2text2018/Makefile b/textproc/py-html2text2018/Makefile
index 2b7d19c8e51f..2e87f01a5ee4 100644
--- a/textproc/py-html2text2018/Makefile
+++ b/textproc/py-html2text2018/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	html2text
 PORTVERSION=	2018.1.9
 PORTREVISION=	2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2018
 
diff --git a/textproc/py-humanfriendly/Makefile b/textproc/py-humanfriendly/Makefile
index 565944e64342..1b073ce2682b 100644
--- a/textproc/py-humanfriendly/Makefile
+++ b/textproc/py-humanfriendly/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	humanfriendly
 PORTVERSION=	10.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-hunspell/Makefile b/textproc/py-hunspell/Makefile
index f0913e26c556..742a21eefd51 100644
--- a/textproc/py-hunspell/Makefile
+++ b/textproc/py-hunspell/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	hunspell
 PORTVERSION=	0.5.5
 PORTREVISION=	1
 CATEGORIES=	textproc devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/textproc/py-ini2toml/Makefile b/textproc/py-ini2toml/Makefile
index 83dcd63a7019..25f44ce20854 100644
--- a/textproc/py-ini2toml/Makefile
+++ b/textproc/py-ini2toml/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ini2toml
 PORTVERSION=	0.11
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-isbnlib/Makefile b/textproc/py-isbnlib/Makefile
index 6fada359a482..9b4d630b5660 100644
--- a/textproc/py-isbnlib/Makefile
+++ b/textproc/py-isbnlib/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	isbnlib
 PORTVERSION=	3.10.12
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-isbntools/Makefile b/textproc/py-isbntools/Makefile
index 747d057cccfe..f7bd4a2e3ded 100644
--- a/textproc/py-isbntools/Makefile
+++ b/textproc/py-isbntools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	isbntools
 PORTVERSION=	4.3.28
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-iso3166/Makefile b/textproc/py-iso3166/Makefile
index dfa87842e9e4..953ac238f757 100644
--- a/textproc/py-iso3166/Makefile
+++ b/textproc/py-iso3166/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	iso3166
 DISTVERSION=	2.1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	takefu@airport.fm
diff --git a/textproc/py-jarowinkler/Makefile b/textproc/py-jarowinkler/Makefile
index 4dc2c8ccd1f4..ecbdbe14d20f 100644
--- a/textproc/py-jarowinkler/Makefile
+++ b/textproc/py-jarowinkler/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jarowinkler
 DISTVERSION=	1.2.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-jc/Makefile b/textproc/py-jc/Makefile
index 3c911b7e0682..6698445627b4 100644
--- a/textproc/py-jc/Makefile
+++ b/textproc/py-jc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jc
 DISTVERSION=	1.22.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/textproc/py-jq/Makefile b/textproc/py-jq/Makefile
index 383b0888bc2b..c5b310cc1288 100644
--- a/textproc/py-jq/Makefile
+++ b/textproc/py-jq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jq
 PORTVERSION=	1.3.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP LOCAL/mandree:mandree
+MASTER_SITES=	PYPI LOCAL/mandree:mandree
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} jq-1.2.1-tests${EXTRACT_SUFX}:mandree
 
diff --git a/textproc/py-jsonslicer/Makefile b/textproc/py-jsonslicer/Makefile
index 66257adb3381..654226e7e931 100644
--- a/textproc/py-jsonslicer/Makefile
+++ b/textproc/py-jsonslicer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jsonslicer
 PORTVERSION=	0.1.8
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/textproc/py-jsx-lexer/Makefile b/textproc/py-jsx-lexer/Makefile
index 97687f208b3a..422ba0467aad 100644
--- a/textproc/py-jsx-lexer/Makefile
+++ b/textproc/py-jsx-lexer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jsx-lexer
 PORTVERSION=	2.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/textproc/py-jtextfsm/Makefile b/textproc/py-jtextfsm/Makefile
index c76dfdf8bfc5..de801465148e 100644
--- a/textproc/py-jtextfsm/Makefile
+++ b/textproc/py-jtextfsm/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jtextfsm
 DISTVERSION=	0.3.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-jupyterlab-pygments/Makefile b/textproc/py-jupyterlab-pygments/Makefile
index 1b6d4e82ba9f..4db4fb5123e7 100644
--- a/textproc/py-jupyterlab-pygments/Makefile
+++ b/textproc/py-jupyterlab-pygments/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jupyterlab-pygments
 PORTVERSION=	0.2.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	jupyterlab_pygments-${PORTVERSION}
 
diff --git a/textproc/py-langdetect/Makefile b/textproc/py-langdetect/Makefile
index 8981235562ab..efb825f9c1c4 100644
--- a/textproc/py-langdetect/Makefile
+++ b/textproc/py-langdetect/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	langdetect
 PORTVERSION=	1.0.9
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
diff --git a/textproc/py-laserhammer/Makefile b/textproc/py-laserhammer/Makefile
index 969571ad1ea5..e76139c40e47 100644
--- a/textproc/py-laserhammer/Makefile
+++ b/textproc/py-laserhammer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	laserhammer
 PORTVERSION=	2.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/py-latexcodec/Makefile b/textproc/py-latexcodec/Makefile
index ef8fe9150d96..b87bc8f193da 100644
--- a/textproc/py-latexcodec/Makefile
+++ b/textproc/py-latexcodec/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	latexcodec
 PORTVERSION=	2.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile
index 9af416fecc6e..4ccd9461e3e4 100644
--- a/textproc/py-m2r/Makefile
+++ b/textproc/py-m2r/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	m2r
 DISTVERSION=	0.3.1
 CATEGORIES=	textproc devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	john@saltant.com
diff --git a/textproc/py-mako/Makefile b/textproc/py-mako/Makefile
index d60b5e69fc65..58d8b38c21c6 100644
--- a/textproc/py-mako/Makefile
+++ b/textproc/py-mako/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	mako
 PORTVERSION=	1.0.14
 PORTREVISION=	1
 CATEGORIES=	textproc www python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Mako-${PORTVERSION}
 
diff --git a/textproc/py-markdown-it-py/Makefile b/textproc/py-markdown-it-py/Makefile
index 08af01857fb1..6cace119ce79 100644
--- a/textproc/py-markdown-it-py/Makefile
+++ b/textproc/py-markdown-it-py/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	markdown-it-py
 PORTVERSION=	2.1.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index 12f7ecf825c2..5d6dbaf250c0 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	markdown
 PORTVERSION=	3.3.7
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Markdown-${PORTVERSION}
 
diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile
index 796b24fd76a5..893c9e3636fc 100644
--- a/textproc/py-markdown2/Makefile
+++ b/textproc/py-markdown2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	markdown2
 PORTVERSION=	2.3.6
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/textproc/py-marko/Makefile b/textproc/py-marko/Makefile
index bed746e932a5..9c9a4d7a8bc2 100644
--- a/textproc/py-marko/Makefile
+++ b/textproc/py-marko/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	marko
 PORTVERSION=	1.2.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-markuppy/Makefile b/textproc/py-markuppy/Makefile
index 29380692aa13..677691256b02 100644
--- a/textproc/py-markuppy/Makefile
+++ b/textproc/py-markuppy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	markuppy
 PORTVERSION=	1.14
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	MarkupPy-${PORTVERSION}
 
diff --git a/textproc/py-markups/Makefile b/textproc/py-markups/Makefile
index a06355d62d57..dabd763e0452 100644
--- a/textproc/py-markups/Makefile
+++ b/textproc/py-markups/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	Markups
 PORTVERSION=	3.1.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-markupsafe/Makefile b/textproc/py-markupsafe/Makefile
index 2ea4bdd02131..497b9c291ad9 100644
--- a/textproc/py-markupsafe/Makefile
+++ b/textproc/py-markupsafe/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	markupsafe
 PORTVERSION=	2.1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	MarkupSafe-${PORTVERSION}
 
diff --git a/textproc/py-mathics-pygments/Makefile b/textproc/py-mathics-pygments/Makefile
index cdd584aca616..1889148fdd71 100644
--- a/textproc/py-mathics-pygments/Makefile
+++ b/textproc/py-mathics-pygments/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mathics_pygments
 PORTVERSION=	1.0.2
 CATEGORIES=	textproc math python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/textproc/py-mdit-py-plugins/Makefile b/textproc/py-mdit-py-plugins/Makefile
index f2606a1caa7b..91724a90dba5 100644
--- a/textproc/py-mdit-py-plugins/Makefile
+++ b/textproc/py-mdit-py-plugins/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mdit-py-plugins
 PORTVERSION=	0.3.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-mdurl/Makefile b/textproc/py-mdurl/Makefile
index f246de522f08..a3168c1a95c9 100644
--- a/textproc/py-mdurl/Makefile
+++ b/textproc/py-mdurl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mdurl
 PORTVERSION=	0.1.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-mike/Makefile b/textproc/py-mike/Makefile
index bcd187a0140d..dc37b78a6753 100644
--- a/textproc/py-mike/Makefile
+++ b/textproc/py-mike/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mike
 PORTVERSION=	1.1.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-misaka/Makefile b/textproc/py-misaka/Makefile
index 63da93fa1c92..21988109e23f 100644
--- a/textproc/py-misaka/Makefile
+++ b/textproc/py-misaka/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	misaka
 PORTVERSION=	2.1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/textproc/py-mistune/Makefile b/textproc/py-mistune/Makefile
index f6c8f43108d0..ca1c6807f220 100644
--- a/textproc/py-mistune/Makefile
+++ b/textproc/py-mistune/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mistune
 PORTVERSION=	2.0.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-mistune0/Makefile b/textproc/py-mistune0/Makefile
index f97f126bec3b..5ebcf7424fbc 100644
--- a/textproc/py-mistune0/Makefile
+++ b/textproc/py-mistune0/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mistune
 PORTVERSION=	0.8.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	0
 
diff --git a/textproc/py-mkdocs-autorefs/Makefile b/textproc/py-mkdocs-autorefs/Makefile
index 6e93436bffdd..fbbfe251b256 100644
--- a/textproc/py-mkdocs-autorefs/Makefile
+++ b/textproc/py-mkdocs-autorefs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mkdocs-autorefs
 DISTVERSION=	0.4.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-mkdocs-material-extensions/Makefile b/textproc/py-mkdocs-material-extensions/Makefile
index ce102519a6f7..05887444fddd 100644
--- a/textproc/py-mkdocs-material-extensions/Makefile
+++ b/textproc/py-mkdocs-material-extensions/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mkdocs-material-extensions
 DISTVERSION=	1.1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	mkdocs_material_extensions-${DISTVERSION}
 
diff --git a/textproc/py-mkdocs-material/Makefile b/textproc/py-mkdocs-material/Makefile
index 7b7123a25c81..aa407f3dccc7 100644
--- a/textproc/py-mkdocs-material/Makefile
+++ b/textproc/py-mkdocs-material/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mkdocs-material
 DISTVERSION=	8.5.11
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	mkdocs_material-${DISTVERSION}
 
diff --git a/textproc/py-mkdocs-mermaid2-plugin/Makefile b/textproc/py-mkdocs-mermaid2-plugin/Makefile
index 164529e13aef..5a59226e6d29 100644
--- a/textproc/py-mkdocs-mermaid2-plugin/Makefile
+++ b/textproc/py-mkdocs-mermaid2-plugin/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mkdocs-mermaid2-plugin
 DISTVERSION=	0.6.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	samir@noir.im
diff --git a/textproc/py-mkdocs-nature/Makefile b/textproc/py-mkdocs-nature/Makefile
index 232c60ecff61..10ab954eb935 100644
--- a/textproc/py-mkdocs-nature/Makefile
+++ b/textproc/py-mkdocs-nature/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mkdocs-nature
 DISTVERSION=	0.2.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-mkdocs/Makefile b/textproc/py-mkdocs/Makefile
index 675ad419ab1c..ffb2ae8b1f3b 100644
--- a/textproc/py-mkdocs/Makefile
+++ b/textproc/py-mkdocs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mkdocs
 DISTVERSION=	1.4.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-morse3/Makefile b/textproc/py-morse3/Makefile
index 83e65390d004..a8651b41d513 100644
--- a/textproc/py-morse3/Makefile
+++ b/textproc/py-morse3/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	morse3
 PORTVERSION=	2.9
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/textproc/py-mwparserfromhell/Makefile b/textproc/py-mwparserfromhell/Makefile
index 8f655dddfae0..6db759ad98ec 100644
--- a/textproc/py-mwparserfromhell/Makefile
+++ b/textproc/py-mwparserfromhell/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mwparserfromhell
 DISTVERSION=	0.6.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-myst-parser/Makefile b/textproc/py-myst-parser/Makefile
index 7fe6d1b4842f..4c61e27ca6cc 100644
--- a/textproc/py-myst-parser/Makefile
+++ b/textproc/py-myst-parser/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	myst-parser
 PORTVERSION=	0.18.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-nbsphinx/Makefile b/textproc/py-nbsphinx/Makefile
index cff71474a61a..b3645854a3ab 100644
--- a/textproc/py-nbsphinx/Makefile
+++ b/textproc/py-nbsphinx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nbsphinx
 PORTVERSION=	0.8.10
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-nltk/Makefile b/textproc/py-nltk/Makefile
index 5ed613ee957b..b85076094257 100644
--- a/textproc/py-nltk/Makefile
+++ b/textproc/py-nltk/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	nltk
 DISTVERSION=	3.7
 PORTEPOCH=	2
 CATEGORIES=	textproc education python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/textproc/py-numpydoc/Makefile b/textproc/py-numpydoc/Makefile
index d2036ba32204..aafac2868469 100644
--- a/textproc/py-numpydoc/Makefile
+++ b/textproc/py-numpydoc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	numpydoc
 PORTVERSION=	1.5.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-ocrmypdf/Makefile b/textproc/py-ocrmypdf/Makefile
index f9a030caa0cd..4e25016d86e9 100644
--- a/textproc/py-ocrmypdf/Makefile
+++ b/textproc/py-ocrmypdf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ocrmypdf
 DISTVERSION=	13.7.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index 188554f52f7a..ef29c27bcec8 100644
--- a/textproc/py-openpyxl/Makefile
+++ b/textproc/py-openpyxl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openpyxl
 PORTVERSION=	2.6.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
diff --git a/textproc/py-openstackdocstheme/Makefile b/textproc/py-openstackdocstheme/Makefile
index 842a8a901566..783b48d9c421 100644
--- a/textproc/py-openstackdocstheme/Makefile
+++ b/textproc/py-openstackdocstheme/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openstackdocstheme
 DISTVERSION=	2.2.7
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-openstep-plist/Makefile b/textproc/py-openstep-plist/Makefile
index a2f926f91435..53f549ee0d37 100644
--- a/textproc/py-openstep-plist/Makefile
+++ b/textproc/py-openstep-plist/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	openstep-plist
 PORTVERSION=	0.3.0
 DISTVERSIONSUFFIX=	.post1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	openstep_plist-${DISTVERSIONFULL}
 
diff --git a/textproc/py-os-api-ref/Makefile b/textproc/py-os-api-ref/Makefile
index bd851c95afc9..fce65daf25ab 100644
--- a/textproc/py-os-api-ref/Makefile
+++ b/textproc/py-os-api-ref/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	os-api-ref
 DISTVERSION=	1.5.0
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-packageurl-python/Makefile b/textproc/py-packageurl-python/Makefile
index a9523c32bc28..1ee098e20c0c 100644
--- a/textproc/py-packageurl-python/Makefile
+++ b/textproc/py-packageurl-python/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	packageurl-python
 DISTVERSION=	0.9.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-pager/Makefile b/textproc/py-pager/Makefile
index a9f0cc416293..b99813e56952 100644
--- a/textproc/py-pager/Makefile
+++ b/textproc/py-pager/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pager
 PORTVERSION=	3.3
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	farrokhi@FreeBSD.org
diff --git a/textproc/py-pallets-sphinx-themes/Makefile b/textproc/py-pallets-sphinx-themes/Makefile
index 6f6066e43588..307fa7f383bc 100644
--- a/textproc/py-pallets-sphinx-themes/Makefile
+++ b/textproc/py-pallets-sphinx-themes/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	Pallets-Sphinx-Themes
 PORTVERSION=	2.0.2
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/textproc/py-pandocfilters/Makefile b/textproc/py-pandocfilters/Makefile
index 844776ccddcf..4c7e8608cd02 100644
--- a/textproc/py-pandocfilters/Makefile
+++ b/textproc/py-pandocfilters/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pandocfilters
 PORTVERSION=	1.5.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-parse-type/Makefile b/textproc/py-parse-type/Makefile
index 511fab09987b..a3acedfc10ff 100644
--- a/textproc/py-parse-type/Makefile
+++ b/textproc/py-parse-type/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	parse-type
 PORTVERSION=	0.6.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	parse_type-${PORTVERSION}
 
diff --git a/textproc/py-parse/Makefile b/textproc/py-parse/Makefile
index b3b044bee14f..cfb8d6c450cd 100644
--- a/textproc/py-parse/Makefile
+++ b/textproc/py-parse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	parse
 PORTVERSION=	1.19.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-parsel/Makefile b/textproc/py-parsel/Makefile
index 9994d6e46bfa..d46f0780410c 100644
--- a/textproc/py-parsel/Makefile
+++ b/textproc/py-parsel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	parsel
 PORTVERSION=	1.5.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	eric@camachat.org
diff --git a/textproc/py-parsimonious/Makefile b/textproc/py-parsimonious/Makefile
index 3356e52a8cbe..8f6f53ff19fd 100644
--- a/textproc/py-parsimonious/Makefile
+++ b/textproc/py-parsimonious/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	parsimonious
 PORTVERSION=	0.10.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-parso/Makefile b/textproc/py-parso/Makefile
index 5240a9138485..877df34d88f2 100644
--- a/textproc/py-parso/Makefile
+++ b/textproc/py-parso/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	parso
 DISTVERSION=	0.8.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ultima@FreeBSD.org
diff --git a/textproc/py-patiencediff/Makefile b/textproc/py-patiencediff/Makefile
index 7e91471f157b..0508f9a8efc5 100644
--- a/textproc/py-patiencediff/Makefile
+++ b/textproc/py-patiencediff/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	patiencediff
 PORTVERSION=	0.2.12
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	fullermd@over-yonder.net
diff --git a/textproc/py-pdfminer.six/Makefile b/textproc/py-pdfminer.six/Makefile
index 916a0d94a016..d18a1eb8e0f2 100644
--- a/textproc/py-pdfminer.six/Makefile
+++ b/textproc/py-pdfminer.six/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pdfminer.six
 PORTVERSION=	20220319
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-pdfminer3k/Makefile b/textproc/py-pdfminer3k/Makefile
index 4ad0dc113d23..efdc0b36aa75 100644
--- a/textproc/py-pdfminer3k/Makefile
+++ b/textproc/py-pdfminer3k/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pdfminer3k
 PORTVERSION=	1.3.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-pdfrw/Makefile b/textproc/py-pdfrw/Makefile
index 48daf2404a0c..7b58606f223d 100644
--- a/textproc/py-pdfrw/Makefile
+++ b/textproc/py-pdfrw/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pdfrw
 PORTVERSION=	0.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/py-pdftotext/Makefile b/textproc/py-pdftotext/Makefile
index 68d76ecad865..75b88ca0e529 100644
--- a/textproc/py-pdftotext/Makefile
+++ b/textproc/py-pdftotext/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pdftotext
 PORTVERSION=	2.2.2
 PORTREVISION=	11
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
diff --git a/textproc/py-petl/Makefile b/textproc/py-petl/Makefile
index 8a339a184e21..69e90e1600ec 100644
--- a/textproc/py-petl/Makefile
+++ b/textproc/py-petl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	petl
 PORTVERSION=	1.7.11
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pikepdf/Makefile b/textproc/py-pikepdf/Makefile
index fecfa662904b..afcbc7feaa46 100644
--- a/textproc/py-pikepdf/Makefile
+++ b/textproc/py-pikepdf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pikepdf
 DISTVERSION=	6.2.6
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/textproc/py-precis_i18n/Makefile b/textproc/py-precis_i18n/Makefile
index 66c5731712c1..13716e499cea 100644
--- a/textproc/py-precis_i18n/Makefile
+++ b/textproc/py-precis_i18n/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	precis_i18n
 DISTVERSION=	1.0.4
 CATEGORIES=	textproc devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	meka@tilda.center
diff --git a/textproc/py-pss/Makefile b/textproc/py-pss/Makefile
index 57d3f253ad45..d03d481e4881 100644
--- a/textproc/py-pss/Makefile
+++ b/textproc/py-pss/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pss
 PORTVERSION=	1.44
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pyPEG2/Makefile b/textproc/py-pyPEG2/Makefile
index c559919824a8..8a37f471f7d4 100644
--- a/textproc/py-pyPEG2/Makefile
+++ b/textproc/py-pyPEG2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyPEG2
 PORTVERSION=	2.15.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ed@FreeBSD.org
diff --git a/textproc/py-pyahocorasick/Makefile b/textproc/py-pyahocorasick/Makefile
index dd22bc4f67c0..edc89a69a030 100644
--- a/textproc/py-pyahocorasick/Makefile
+++ b/textproc/py-pyahocorasick/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyahocorasick
 DISTVERSION=	1.4.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-pyaml/Makefile b/textproc/py-pyaml/Makefile
index c1bbf3864a62..d7ef5a883bbf 100644
--- a/textproc/py-pyaml/Makefile
+++ b/textproc/py-pyaml/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyaml
 PORTVERSION=	21.10.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pybtex-docutils/Makefile b/textproc/py-pybtex-docutils/Makefile
index 49ad56db4a4f..7058918f04d7 100644
--- a/textproc/py-pybtex-docutils/Makefile
+++ b/textproc/py-pybtex-docutils/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pybtex-docutils
 PORTVERSION=	1.0.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pybtex/Makefile b/textproc/py-pybtex/Makefile
index 002edcffacd3..9e48c0b77be2 100644
--- a/textproc/py-pybtex/Makefile
+++ b/textproc/py-pybtex/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pybtex
 PORTVERSION=	0.24.0
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pycountry/Makefile b/textproc/py-pycountry/Makefile
index e751faba5766..073b0ed425d8 100644
--- a/textproc/py-pycountry/Makefile
+++ b/textproc/py-pycountry/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pycountry
 PORTVERSION=	22.3.5
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pydata-sphinx-theme/Makefile b/textproc/py-pydata-sphinx-theme/Makefile
index da190326d1b8..d7d88e3f1007 100644
--- a/textproc/py-pydata-sphinx-theme/Makefile
+++ b/textproc/py-pydata-sphinx-theme/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pydata-sphinx-theme
 PORTVERSION=	0.8.1
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP \
+MASTER_SITES=	PYPI \
 		LOCAL/sunpoet:static
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	pydata_sphinx_theme-${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/textproc/py-pyexcel-ezodf/Makefile b/textproc/py-pyexcel-ezodf/Makefile
index a52a21489473..f18c10f51cd4 100644
--- a/textproc/py-pyexcel-ezodf/Makefile
+++ b/textproc/py-pyexcel-ezodf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyexcel-ezodf
 PORTVERSION=	0.3.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pyexcel-io/Makefile b/textproc/py-pyexcel-io/Makefile
index 85415154bcaf..1b19670244a5 100644
--- a/textproc/py-pyexcel-io/Makefile
+++ b/textproc/py-pyexcel-io/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyexcel-io
 PORTVERSION=	0.6.6
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pyexcel-ods3/Makefile b/textproc/py-pyexcel-ods3/Makefile
index ab6378a1db47..829b646bf29e 100644
--- a/textproc/py-pyexcel-ods3/Makefile
+++ b/textproc/py-pyexcel-ods3/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyexcel-ods3
 PORTVERSION=	0.6.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pyexcel-xls/Makefile b/textproc/py-pyexcel-xls/Makefile
index 2ea4d601b84c..548db73c6eb6 100644
--- a/textproc/py-pyexcel-xls/Makefile
+++ b/textproc/py-pyexcel-xls/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyexcel-xls
 PORTVERSION=	0.7.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pyexcel-xlsx/Makefile b/textproc/py-pyexcel-xlsx/Makefile
index 9071497a1f2f..98f16cfef9a8 100644
--- a/textproc/py-pyexcel-xlsx/Makefile
+++ b/textproc/py-pyexcel-xlsx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyexcel-xlsx
 PORTVERSION=	0.6.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pyexcel/Makefile b/textproc/py-pyexcel/Makefile
index f4e6ac334e8c..5eee5fe4dadf 100644
--- a/textproc/py-pyexcel/Makefile
+++ b/textproc/py-pyexcel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyexcel
 PORTVERSION=	0.7.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pygments-25/Makefile b/textproc/py-pygments-25/Makefile
index 926ea39e1107..1f611e027225 100644
--- a/textproc/py-pygments-25/Makefile
+++ b/textproc/py-pygments-25/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pygments
 PORTVERSION=	2.5.2
 PORTREVISION=	0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-25
 DISTNAME=	Pygments-${PORTVERSION}
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index efbd187baf33..3e0629819c71 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pygments
 DISTVERSION=	2.14.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Pygments-${PORTVERSION}
 
diff --git a/textproc/py-pygtail/Makefile b/textproc/py-pygtail/Makefile
index c501ab6b5c68..04c562db4475 100644
--- a/textproc/py-pygtail/Makefile
+++ b/textproc/py-pygtail/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pygtail
 PORTVERSION=	0.6.1
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/textproc/py-pyjade/Makefile b/textproc/py-pyjade/Makefile
index 1a3f371e870a..8316917fde79 100644
--- a/textproc/py-pyjade/Makefile
+++ b/textproc/py-pyjade/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pyjade
 PORTVERSION=	4.0.0
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pylons-sphinx-themes/Makefile b/textproc/py-pylons-sphinx-themes/Makefile
index 2f17ce65d89a..e50a4a64a02d 100644
--- a/textproc/py-pylons-sphinx-themes/Makefile
+++ b/textproc/py-pylons-sphinx-themes/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pylons-sphinx-themes
 PORTVERSION=	1.0.13
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pyls-spyder/Makefile b/textproc/py-pyls-spyder/Makefile
index edbafac8c9b2..f020710f4d83 100644
--- a/textproc/py-pyls-spyder/Makefile
+++ b/textproc/py-pyls-spyder/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyls-spyder
 PORTVERSION=	0.4.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
diff --git a/textproc/py-pymdown-extensions/Makefile b/textproc/py-pymdown-extensions/Makefile
index 36a82079d752..b315e7613b21 100644
--- a/textproc/py-pymdown-extensions/Makefile
+++ b/textproc/py-pymdown-extensions/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pymdown-extensions
 DISTVERSION=	9.9
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pymdown_extensions-${DISTVERSION}
 
diff --git a/textproc/py-pypandoc/Makefile b/textproc/py-pypandoc/Makefile
index f83cb70fa031..3081bfc77fd6 100644
--- a/textproc/py-pypandoc/Makefile
+++ b/textproc/py-pypandoc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pypandoc
 DISTVERSION=	1.5
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-pyphen/Makefile b/textproc/py-pyphen/Makefile
index 6e691e27786f..cbbcce9cbf32 100644
--- a/textproc/py-pyphen/Makefile
+++ b/textproc/py-pyphen/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyphen
 PORTVERSION=	0.13.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-pysrt/Makefile b/textproc/py-pysrt/Makefile
index 574db11e03dd..fbc33973c75d 100644
--- a/textproc/py-pysrt/Makefile
+++ b/textproc/py-pysrt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pysrt
 PORTVERSION=	1.1.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/textproc/py-pystache/Makefile b/textproc/py-pystache/Makefile
index 92be2eda1ca6..7f95ff16d37e 100644
--- a/textproc/py-pystache/Makefile
+++ b/textproc/py-pystache/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pystache
 PORTVERSION=	0.6.0
 PORTREVISION=	0
 CATEGORIES=	textproc www python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/py-pystemmer/Makefile b/textproc/py-pystemmer/Makefile
index 2020e339a90e..b6ad877a8cf8 100644
--- a/textproc/py-pystemmer/Makefile
+++ b/textproc/py-pystemmer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pystemmer
 PORTVERSION=	2.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP \
+MASTER_SITES=	PYPI \
 		http://snowball.tartarus.org/wrappers/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyStemmer-${PORTVERSION}
diff --git a/textproc/py-python-bidi/Makefile b/textproc/py-python-bidi/Makefile
index 102de96db5e1..e3e905872d69 100644
--- a/textproc/py-python-bidi/Makefile
+++ b/textproc/py-python-bidi/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	python-bidi
 DISTVERSION=	0.4.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-python-docs-theme/Makefile b/textproc/py-python-docs-theme/Makefile
index fb95c8a19fab..23121a9d9d19 100644
--- a/textproc/py-python-docs-theme/Makefile
+++ b/textproc/py-python-docs-theme/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	python-docs-theme
 DISTVERSION=	2018.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-python-docx/Makefile b/textproc/py-python-docx/Makefile
index ea80921795f5..2b42e6ff236a 100644
--- a/textproc/py-python-docx/Makefile
+++ b/textproc/py-python-docx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	python-docx
 PORTVERSION=	0.8.11
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/textproc/py-python-gettext/Makefile b/textproc/py-python-gettext/Makefile
index 4f3221644823..3b8b93bdbde8 100644
--- a/textproc/py-python-gettext/Makefile
+++ b/textproc/py-python-gettext/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	python-gettext
 PORTVERSION=	3.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rm@FreeBSD.org
diff --git a/textproc/py-python-lsp-black/Makefile b/textproc/py-python-lsp-black/Makefile
index 1f352e7416f1..8fbe81350936 100644
--- a/textproc/py-python-lsp-black/Makefile
+++ b/textproc/py-python-lsp-black/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	python-lsp-black
 DISTVERSION=	1.2.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-python-lsp-jsonrpc/Makefile b/textproc/py-python-lsp-jsonrpc/Makefile
index bca80bdbd90b..d683a662967d 100644
--- a/textproc/py-python-lsp-jsonrpc/Makefile
+++ b/textproc/py-python-lsp-jsonrpc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	python-lsp-jsonrpc
 PORTVERSION=	1.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
diff --git a/textproc/py-python-lsp-server/Makefile b/textproc/py-python-lsp-server/Makefile
index 5749ad697e56..cc1d4884f067 100644
--- a/textproc/py-python-lsp-server/Makefile
+++ b/textproc/py-python-lsp-server/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	python-lsp-server
 PORTVERSION=	1.6.0
 PORTREVISION=	2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
diff --git a/textproc/py-python-markdown-math/Makefile b/textproc/py-python-markdown-math/Makefile
index ef46527b8cde..75e84dee7532 100644
--- a/textproc/py-python-markdown-math/Makefile
+++ b/textproc/py-python-markdown-math/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	python-markdown-math
 PORTVERSION=	0.8
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-python-pptx/Makefile b/textproc/py-python-pptx/Makefile
index 5e409936ba76..f2499cbeeb8a 100644
--- a/textproc/py-python-pptx/Makefile
+++ b/textproc/py-python-pptx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	python-pptx
 PORTVERSION=	0.6.21
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	DtxdF@disroot.org
diff --git a/textproc/py-python-slugify/Makefile b/textproc/py-python-slugify/Makefile
index 1a6e9d6fe447..ebf307e9d643 100644
--- a/textproc/py-python-slugify/Makefile
+++ b/textproc/py-python-slugify/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	python-slugify
 PORTVERSION=	7.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-python-xmp-toolkit/Makefile b/textproc/py-python-xmp-toolkit/Makefile
index 453bd03288f5..fd2fd90238a5 100644
--- a/textproc/py-python-xmp-toolkit/Makefile
+++ b/textproc/py-python-xmp-toolkit/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	python-xmp-toolkit
 DISTVERSION=	2.0.1
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-pytidylib/Makefile b/textproc/py-pytidylib/Makefile
index 57bed917eeae..ad81d8a52ae3 100644
--- a/textproc/py-pytidylib/Makefile
+++ b/textproc/py-pytidylib/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pytidylib
 PORTVERSION=	0.3.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/textproc/py-pytkdocs/Makefile b/textproc/py-pytkdocs/Makefile
index 5d970a593ea7..d81df9565809 100644
--- a/textproc/py-pytkdocs/Makefile
+++ b/textproc/py-pytkdocs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pytkdocs
 DISTVERSION=	0.16.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-pytoml/Makefile b/textproc/py-pytoml/Makefile
index 710cfdd537e8..df3d28a174f7 100644
--- a/textproc/py-pytoml/Makefile
+++ b/textproc/py-pytoml/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pytoml
 PORTVERSION=	0.1.21
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-pyx12/Makefile b/textproc/py-pyx12/Makefile
index 37296cabf0ce..c055aef808e9 100644
--- a/textproc/py-pyx12/Makefile
+++ b/textproc/py-pyx12/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyx12
 PORTVERSION=	2.3.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/textproc/py-pyxlsb2/Makefile b/textproc/py-pyxlsb2/Makefile
index 7f85a96bc53e..745a13079696 100644
--- a/textproc/py-pyxlsb2/Makefile
+++ b/textproc/py-pyxlsb2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyxlsb2
 PORTVERSION=	0.0.9
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile
index bf2562e96823..ad0c61eaa854 100644
--- a/textproc/py-qrcode/Makefile
+++ b/textproc/py-qrcode/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	qrcode
 PORTVERSION=	7.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	leres@FreeBSD.org
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index 18c8db6b0d7c..a4501ba515bf 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rdflib
 PORTVERSION=	6.2.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-readchar/Makefile b/textproc/py-readchar/Makefile
index fcfa8bc544f9..0a54b563f9a5 100644
--- a/textproc/py-readchar/Makefile
+++ b/textproc/py-readchar/Makefile
@@ -19,7 +19,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
 
 USES=		dos2unix localbase python:3.6+
 DOS2UNIX_GLOB=	*.py
-# CHEESESHOP does not seem to work so far.
+# PYPI does not seem to work so far.
 USE_GITHUB=	yes
 GH_ACCOUNT=	magmax
 GH_PROJECT=	python-${PORTNAME}
diff --git a/textproc/py-recommonmark/Makefile b/textproc/py-recommonmark/Makefile
index abb3e7201a32..55301a21d4c3 100644
--- a/textproc/py-recommonmark/Makefile
+++ b/textproc/py-recommonmark/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	recommonmark
 PORTVERSION=	0.5.0
 PORTREVISION=	2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	brooks@FreeBSD.org
diff --git a/textproc/py-regex/Makefile b/textproc/py-regex/Makefile
index 8eb7fa42f4b8..44111b040c61 100644
--- a/textproc/py-regex/Makefile
+++ b/textproc/py-regex/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	regex
 DISTVERSION=	2022.9.13
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	fax@nohik.ee
diff --git a/textproc/py-reno/Makefile b/textproc/py-reno/Makefile
index 8f98e60d95e9..471ef01f6338 100644
--- a/textproc/py-reno/Makefile
+++ b/textproc/py-reno/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	reno
 DISTVERSION=	2.9.2
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-rich-cli/Makefile b/textproc/py-rich-cli/Makefile
index 6f49e1831adf..7db9509b6ac4 100644
--- a/textproc/py-rich-cli/Makefile
+++ b/textproc/py-rich-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rich-cli
 PORTVERSION=	1.8.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-rich-rst/Makefile b/textproc/py-rich-rst/Makefile
index e8f22fb6afff..c459036d60f9 100644
--- a/textproc/py-rich-rst/Makefile
+++ b/textproc/py-rich-rst/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rich-rst
 PORTVERSION=	1.1.7
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-rich/Makefile b/textproc/py-rich/Makefile
index d0157728e19f..6a49683d4608 100644
--- a/textproc/py-rich/Makefile
+++ b/textproc/py-rich/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rich
 PORTVERSION=	13.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-rnc2rng/Makefile b/textproc/py-rnc2rng/Makefile
index 8545241a506e..a878e68574d9 100644
--- a/textproc/py-rnc2rng/Makefile
+++ b/textproc/py-rnc2rng/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rnc2rng
 DISTVERSION=	2.6.6
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-rss2gen/Makefile b/textproc/py-rss2gen/Makefile
index a2ff80c5605c..6295db032fd3 100644
--- a/textproc/py-rss2gen/Makefile
+++ b/textproc/py-rss2gen/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rss2gen
 PORTVERSION=	1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyRSS2Gen-${PORTVERSION}
 
diff --git a/textproc/py-rst2ansi/Makefile b/textproc/py-rst2ansi/Makefile
index 1503c16f2800..041e2b7d557f 100644
--- a/textproc/py-rst2ansi/Makefile
+++ b/textproc/py-rst2ansi/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rst2ansi
 PORTVERSION=	0.1.5
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	PopularMoment@protonmail.com
diff --git a/textproc/py-rst2html5/Makefile b/textproc/py-rst2html5/Makefile
index ec1ac2f49469..8e76a451e9b8 100644
--- a/textproc/py-rst2html5/Makefile
+++ b/textproc/py-rst2html5/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rst2html5
 PORTVERSION=	2.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-scour/Makefile b/textproc/py-scour/Makefile
index e24b55eace2a..98fa983145e5 100644
--- a/textproc/py-scour/Makefile
+++ b/textproc/py-scour/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	scour
 PORTVERSION=	0.38.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-simplebayes/Makefile b/textproc/py-simplebayes/Makefile
index 5a8c5d9a1403..f410f860951a 100644
--- a/textproc/py-simplebayes/Makefile
+++ b/textproc/py-simplebayes/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	simplebayes
 PORTVERSION=	1.5.8
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-snowballstemmer/Makefile b/textproc/py-snowballstemmer/Makefile
index 7fe283558e98..709bf9932a03 100644
--- a/textproc/py-snowballstemmer/Makefile
+++ b/textproc/py-snowballstemmer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	snowballstemmer
 PORTVERSION=	2.2.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sparqlwrapper/Makefile b/textproc/py-sparqlwrapper/Makefile
index a7a584205066..328a57fcbe34 100644
--- a/textproc/py-sparqlwrapper/Makefile
+++ b/textproc/py-sparqlwrapper/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sparqlwrapper
 PORTVERSION=	2.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SPARQLWrapper-${PORTVERSION}
 
diff --git a/textproc/py-sphinx-argparse/Makefile b/textproc/py-sphinx-argparse/Makefile
index 27ae3ea3b747..91fda5c56dcf 100644
--- a/textproc/py-sphinx-argparse/Makefile
+++ b/textproc/py-sphinx-argparse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-argparse
 PORTVERSION=	0.2.5
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/textproc/py-sphinx-autoapi/Makefile b/textproc/py-sphinx-autoapi/Makefile
index a406f3a3844f..1f2b5ee3c311 100644
--- a/textproc/py-sphinx-autoapi/Makefile
+++ b/textproc/py-sphinx-autoapi/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-autoapi
 DISTVERSION=	2.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andreas@bilke.org
diff --git a/textproc/py-sphinx-autobuild/Makefile b/textproc/py-sphinx-autobuild/Makefile
index 3fd12bafe8ef..091ea1b0c14b 100644
--- a/textproc/py-sphinx-autobuild/Makefile
+++ b/textproc/py-sphinx-autobuild/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-autobuild
 PORTVERSION=	2021.3.14
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinx-autodoc-typehints/Makefile b/textproc/py-sphinx-autodoc-typehints/Makefile
index fda7bcec7b74..9fc163c583dc 100644
--- a/textproc/py-sphinx-autodoc-typehints/Makefile
+++ b/textproc/py-sphinx-autodoc-typehints/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-autodoc-typehints
 DISTVERSION=	1.19.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	sphinx_autodoc_typehints-${DISTVERSION}
 
diff --git a/textproc/py-sphinx-basic-ng/Makefile b/textproc/py-sphinx-basic-ng/Makefile
index 41e7057e41bf..bb30a750803a 100644
--- a/textproc/py-sphinx-basic-ng/Makefile
+++ b/textproc/py-sphinx-basic-ng/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-basic-ng
 PORTVERSION=	0.0.1a12
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	sphinx_basic_ng-${PORTVERSION}
 
diff --git a/textproc/py-sphinx-book-theme/Makefile b/textproc/py-sphinx-book-theme/Makefile
index b267fb212f02..60cd2094b589 100644
--- a/textproc/py-sphinx-book-theme/Makefile
+++ b/textproc/py-sphinx-book-theme/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	sphinx-book-theme
 PORTVERSION=	0.3.3
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP \
+MASTER_SITES=	PYPI \
 		LOCAL/sunpoet:static
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	sphinx_book_theme-${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/textproc/py-sphinx-copybutton/Makefile b/textproc/py-sphinx-copybutton/Makefile
index cc9e6096c85b..b41658a8080f 100644
--- a/textproc/py-sphinx-copybutton/Makefile
+++ b/textproc/py-sphinx-copybutton/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-copybutton
 PORTVERSION=	0.5.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinx-design/Makefile b/textproc/py-sphinx-design/Makefile
index e4a7ba39fe7a..022167619a9e 100644
--- a/textproc/py-sphinx-design/Makefile
+++ b/textproc/py-sphinx-design/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-design
 PORTVERSION=	0.3.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	sphinx_design-${PORTVERSION}
 
diff --git a/textproc/py-sphinx-examples/Makefile b/textproc/py-sphinx-examples/Makefile
index ac3fdf85cdab..4f5ded8643d6 100644
--- a/textproc/py-sphinx-examples/Makefile
+++ b/textproc/py-sphinx-examples/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-examples
 PORTVERSION=	0.0.5
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinx-inline-tabs/Makefile b/textproc/py-sphinx-inline-tabs/Makefile
index 39310d0f1f38..635061e0c012 100644
--- a/textproc/py-sphinx-inline-tabs/Makefile
+++ b/textproc/py-sphinx-inline-tabs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-inline-tabs
 PORTVERSION=	2022.1.2b11
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	sphinx_inline_tabs-${PORTVERSION}
 
diff --git a/textproc/py-sphinx-intl/Makefile b/textproc/py-sphinx-intl/Makefile
index 65574eac23fa..6b29bd0e8720 100644
--- a/textproc/py-sphinx-intl/Makefile
+++ b/textproc/py-sphinx-intl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-intl
 PORTVERSION=	2.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinx-issues/Makefile b/textproc/py-sphinx-issues/Makefile
index 016226661c02..50782980e59c 100644
--- a/textproc/py-sphinx-issues/Makefile
+++ b/textproc/py-sphinx-issues/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-issues
 PORTVERSION=	3.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/textproc/py-sphinx-markdown-tables/Makefile b/textproc/py-sphinx-markdown-tables/Makefile
index 90c226ce3d71..ac20ec22baa0 100644
--- a/textproc/py-sphinx-markdown-tables/Makefile
+++ b/textproc/py-sphinx-markdown-tables/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	sphinx-markdown-tables
 PORTVERSION=	0.0.15
 PORTEPOCH=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/textproc/py-sphinx-me/Makefile b/textproc/py-sphinx-me/Makefile
index 3a46d1faf7d2..41f627abdc85 100644
--- a/textproc/py-sphinx-me/Makefile
+++ b/textproc/py-sphinx-me/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-me
 PORTVERSION=	0.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/py-sphinx-tabs/Makefile b/textproc/py-sphinx-tabs/Makefile
index c2d0cf9a61bc..665d7940e41f 100644
--- a/textproc/py-sphinx-tabs/Makefile
+++ b/textproc/py-sphinx-tabs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-tabs
 PORTVERSION=	3.4.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinx-theme-builder/Makefile b/textproc/py-sphinx-theme-builder/Makefile
index e9b3537454eb..e5f3931deae7 100644
--- a/textproc/py-sphinx-theme-builder/Makefile
+++ b/textproc/py-sphinx-theme-builder/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx-theme-builder
 PORTVERSION=	0.2.0b1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index 52318ed04723..f7c140586aea 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	sphinx
 PORTVERSION=	4.5.0
 PORTEPOCH=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Sphinx-${PORTVERSION}
 DIST_SUBDIR=	python
diff --git a/textproc/py-sphinx_press_theme/Makefile b/textproc/py-sphinx_press_theme/Makefile
index 284cae0919a8..36965d8ad7b5 100644
--- a/textproc/py-sphinx_press_theme/Makefile
+++ b/textproc/py-sphinx_press_theme/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx_press_theme
 PORTVERSION=	0.5.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/textproc/py-sphinx_rtd_theme/Makefile b/textproc/py-sphinx_rtd_theme/Makefile
index e0ffbc31ebce..e264e3f450cb 100644
--- a/textproc/py-sphinx_rtd_theme/Makefile
+++ b/textproc/py-sphinx_rtd_theme/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinx_rtd_theme
 PORTVERSION=	1.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	robak@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-adadomain/Makefile b/textproc/py-sphinxcontrib-adadomain/Makefile
index d14680149ae8..10f8b5d4ad8c 100644
--- a/textproc/py-sphinxcontrib-adadomain/Makefile
+++ b/textproc/py-sphinxcontrib-adadomain/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	sphinxcontrib-adadomain
 PORTVERSION=	0.2
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-applehelp/Makefile b/textproc/py-sphinxcontrib-applehelp/Makefile
index eea9dae29342..d280832672e7 100644
--- a/textproc/py-sphinxcontrib-applehelp/Makefile
+++ b/textproc/py-sphinxcontrib-applehelp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-applehelp
 PORTVERSION=	1.0.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	python
 
diff --git a/textproc/py-sphinxcontrib-autoprogram/Makefile b/textproc/py-sphinxcontrib-autoprogram/Makefile
index a7f7f72eb73c..0b6bd5fc0d3d 100644
--- a/textproc/py-sphinxcontrib-autoprogram/Makefile
+++ b/textproc/py-sphinxcontrib-autoprogram/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	sphinxcontrib-autoprogram
 PORTVERSION=	0.1.7
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dereks@lifeofadishwasher.com
diff --git a/textproc/py-sphinxcontrib-bibtex/Makefile b/textproc/py-sphinxcontrib-bibtex/Makefile
index e381efbb02fb..0b09ca91b294 100644
--- a/textproc/py-sphinxcontrib-bibtex/Makefile
+++ b/textproc/py-sphinxcontrib-bibtex/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-bibtex
 PORTVERSION=	2.5.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-bitbucket/Makefile b/textproc/py-sphinxcontrib-bitbucket/Makefile
index c734bb0124ad..405c5b6e938d 100644
--- a/textproc/py-sphinxcontrib-bitbucket/Makefile
+++ b/textproc/py-sphinxcontrib-bitbucket/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	sphinxcontrib-bitbucket
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-devhelp/Makefile b/textproc/py-sphinxcontrib-devhelp/Makefile
index b67e67fdf7b5..f29dee25a4df 100644
--- a/textproc/py-sphinxcontrib-devhelp/Makefile
+++ b/textproc/py-sphinxcontrib-devhelp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-devhelp
 PORTVERSION=	1.0.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	python
 
diff --git a/textproc/py-sphinxcontrib-fulltoc/Makefile b/textproc/py-sphinxcontrib-fulltoc/Makefile
index 4ee6309e8d13..a35e8cc7df13 100644
--- a/textproc/py-sphinxcontrib-fulltoc/Makefile
+++ b/textproc/py-sphinxcontrib-fulltoc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-fulltoc
 PORTVERSION=	1.2.0
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	vanilla@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-htmlhelp/Makefile b/textproc/py-sphinxcontrib-htmlhelp/Makefile
index 7956f927f37f..56c0e719cf08 100644
--- a/textproc/py-sphinxcontrib-htmlhelp/Makefile
+++ b/textproc/py-sphinxcontrib-htmlhelp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-htmlhelp
 PORTVERSION=	2.0.0
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-httpdomain/Makefile b/textproc/py-sphinxcontrib-httpdomain/Makefile
index be0512ee0cb4..26774419aedf 100644
--- a/textproc/py-sphinxcontrib-httpdomain/Makefile
+++ b/textproc/py-sphinxcontrib-httpdomain/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-httpdomain
 PORTVERSION=	1.8.1
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-issuetracker/Makefile b/textproc/py-sphinxcontrib-issuetracker/Makefile
index 5cf764997a21..6620adddd571 100644
--- a/textproc/py-sphinxcontrib-issuetracker/Makefile
+++ b/textproc/py-sphinxcontrib-issuetracker/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-issuetracker
 DISTVERSION=	0.11
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-jsmath/Makefile b/textproc/py-sphinxcontrib-jsmath/Makefile
index 8cd516152442..ef8502051707 100644
--- a/textproc/py-sphinxcontrib-jsmath/Makefile
+++ b/textproc/py-sphinxcontrib-jsmath/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-jsmath
 PORTVERSION=	1.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	python
 
diff --git a/textproc/py-sphinxcontrib-log-cabinet/Makefile b/textproc/py-sphinxcontrib-log-cabinet/Makefile
index 49445757e84a..1d20e7ea2ce7 100644
--- a/textproc/py-sphinxcontrib-log-cabinet/Makefile
+++ b/textproc/py-sphinxcontrib-log-cabinet/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-log-cabinet
 PORTVERSION=	1.0.1
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-napoleon/Makefile b/textproc/py-sphinxcontrib-napoleon/Makefile
index 0e7f1720f2d0..7317aa98ea47 100644
--- a/textproc/py-sphinxcontrib-napoleon/Makefile
+++ b/textproc/py-sphinxcontrib-napoleon/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-napoleon
 DISTVERSION=	0.7
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-newsfeed/Makefile b/textproc/py-sphinxcontrib-newsfeed/Makefile
index 874f2709c80a..877e559edc0c 100644
--- a/textproc/py-sphinxcontrib-newsfeed/Makefile
+++ b/textproc/py-sphinxcontrib-newsfeed/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-newsfeed
 PORTVERSION=	0.1.4
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rigoletto@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-programoutput/Makefile b/textproc/py-sphinxcontrib-programoutput/Makefile
index 32c9c028ef3b..08e0a9e40023 100644
--- a/textproc/py-sphinxcontrib-programoutput/Makefile
+++ b/textproc/py-sphinxcontrib-programoutput/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-programoutput
 PORTVERSION=	0.11
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-qthelp/Makefile b/textproc/py-sphinxcontrib-qthelp/Makefile
index 20fd0de92bb8..57381a24fdfe 100644
--- a/textproc/py-sphinxcontrib-qthelp/Makefile
+++ b/textproc/py-sphinxcontrib-qthelp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-qthelp
 PORTVERSION=	1.0.3
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-serializinghtml/Makefile b/textproc/py-sphinxcontrib-serializinghtml/Makefile
index 48d16009740f..36f9b8a488a9 100644
--- a/textproc/py-sphinxcontrib-serializinghtml/Makefile
+++ b/textproc/py-sphinxcontrib-serializinghtml/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-serializinghtml
 PORTVERSION=	1.1.5
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-svg2pdfconverter/Makefile b/textproc/py-sphinxcontrib-svg2pdfconverter/Makefile
index bc7a6aacb349..4e96ce2f215f 100644
--- a/textproc/py-sphinxcontrib-svg2pdfconverter/Makefile
+++ b/textproc/py-sphinxcontrib-svg2pdfconverter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-svg2pdfconverter
 PORTVERSION=	1.2.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	agh@riseup.net
diff --git a/textproc/py-sphinxcontrib-towncrier/Makefile b/textproc/py-sphinxcontrib-towncrier/Makefile
index 94c24509bb1b..7005d24e2439 100644
--- a/textproc/py-sphinxcontrib-towncrier/Makefile
+++ b/textproc/py-sphinxcontrib-towncrier/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-towncrier
 PORTVERSION=	0.3.2a0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinxcontrib-websupport/Makefile b/textproc/py-sphinxcontrib-websupport/Makefile
index e14c98208091..55f06f23b078 100644
--- a/textproc/py-sphinxcontrib-websupport/Makefile
+++ b/textproc/py-sphinxcontrib-websupport/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxcontrib-websupport
 PORTVERSION=	1.2.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-sphinxemoji/Makefile b/textproc/py-sphinxemoji/Makefile
index 010a1696a4e8..968c8b5a6b82 100644
--- a/textproc/py-sphinxemoji/Makefile
+++ b/textproc/py-sphinxemoji/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sphinxemoji
 DISTVERSION=	0.2.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/py-spylls/Makefile b/textproc/py-spylls/Makefile
index 90c6cacafa3c..06f3e5b2b49b 100644
--- a/textproc/py-spylls/Makefile
+++ b/textproc/py-spylls/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	spylls
 DISTVERSION=	0.1.7
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/py-stemming/Makefile b/textproc/py-stemming/Makefile
index 66edbda6b7b4..41aa2b2da6a1 100644
--- a/textproc/py-stemming/Makefile
+++ b/textproc/py-stemming/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	stemming
 PORTVERSION=	1.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/py-tableschema-to-template/Makefile b/textproc/py-tableschema-to-template/Makefile
index fe5f9c1018ef..56323780c819 100644
--- a/textproc/py-tableschema-to-template/Makefile
+++ b/textproc/py-tableschema-to-template/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tableschema-to-template
 PORTVERSION=	0.0.12
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-tabletext/Makefile b/textproc/py-tabletext/Makefile
index fb3b4ed042af..557eeb0bc438 100644
--- a/textproc/py-tabletext/Makefile
+++ b/textproc/py-tabletext/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tabletext
 PORTVERSION=	0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/py-tablib/Makefile b/textproc/py-tablib/Makefile
index 7dcd36bb4e6e..7259f2f3ea63 100644
--- a/textproc/py-tablib/Makefile
+++ b/textproc/py-tablib/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tablib
 PORTVERSION=	3.3.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
diff --git a/textproc/py-terminaltables/Makefile b/textproc/py-terminaltables/Makefile
index 1baadf60abb5..9f5587f9fcf7 100644
--- a/textproc/py-terminaltables/Makefile
+++ b/textproc/py-terminaltables/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	terminaltables
 PORTVERSION=	3.1.10
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-textdistance/Makefile b/textproc/py-textdistance/Makefile
index 6ae999c4da29..7c8446a83633 100644
--- a/textproc/py-textdistance/Makefile
+++ b/textproc/py-textdistance/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	textdistance
 PORTVERSION=	4.5.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
diff --git a/textproc/py-textract/Makefile b/textproc/py-textract/Makefile
index b15ee1f0c81b..34b88b77997e 100644
--- a/textproc/py-textract/Makefile
+++ b/textproc/py-textract/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	textract
 PORTVERSION=	1.6.5
 PORTREVISION=	3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	DtxdF@disroot.org
diff --git a/textproc/py-texttable/Makefile b/textproc/py-texttable/Makefile
index 9f35d3e8826c..c68fb9e8f9da 100644
--- a/textproc/py-texttable/Makefile
+++ b/textproc/py-texttable/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	texttable
 PORTVERSION=	1.6.7
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/py-textual/Makefile b/textproc/py-textual/Makefile
index 9d38f610b740..f8577194718e 100644
--- a/textproc/py-textual/Makefile
+++ b/textproc/py-textual/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	textual
 PORTVERSION=	0.1.18
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-three-merge/Makefile b/textproc/py-three-merge/Makefile
index 9a68811a46d3..47583601fa88 100644
--- a/textproc/py-three-merge/Makefile
+++ b/textproc/py-three-merge/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	three-merge
 PORTVERSION=	0.1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
diff --git a/textproc/py-tinycss/Makefile b/textproc/py-tinycss/Makefile
index 39348b3ab793..f52d8b38b9f0 100644
--- a/textproc/py-tinycss/Makefile
+++ b/textproc/py-tinycss/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tinycss
 PORTVERSION=	0.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/textproc/py-tinycss2/Makefile b/textproc/py-tinycss2/Makefile
index 673310141e1b..38b74cc3c5b1 100644
--- a/textproc/py-tinycss2/Makefile
+++ b/textproc/py-tinycss2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tinycss2
 PORTVERSION=	1.2.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-toml/Makefile b/textproc/py-toml/Makefile
index a0d836369922..1e45b54bef22 100644
--- a/textproc/py-toml/Makefile
+++ b/textproc/py-toml/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	toml
 PORTVERSION=	0.10.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-tomli-w/Makefile b/textproc/py-tomli-w/Makefile
index a02d73f6778d..c289387f7a48 100644
--- a/textproc/py-tomli-w/Makefile
+++ b/textproc/py-tomli-w/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tomli-w
 PORTVERSION=	1.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	tomli_w-${PORTVERSION}
 
diff --git a/textproc/py-tomli/Makefile b/textproc/py-tomli/Makefile
index d2296c45a84e..b440e6a17fc3 100644
--- a/textproc/py-tomli/Makefile
+++ b/textproc/py-tomli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tomli
 PORTVERSION=	2.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-tomlkit/Makefile b/textproc/py-tomlkit/Makefile
index b041b34beec2..8d9391ce2d82 100644
--- a/textproc/py-tomlkit/Makefile
+++ b/textproc/py-tomlkit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tomlkit
 PORTVERSION=	0.11.6
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-toronado/Makefile b/textproc/py-toronado/Makefile
index fee141c94068..60e4666401ec 100644
--- a/textproc/py-toronado/Makefile
+++ b/textproc/py-toronado/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	toronado
 PORTVERSION=	0.1.0
 CATEGORIES=	textproc www python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/textproc/py-towncrier/Makefile b/textproc/py-towncrier/Makefile
index d58688622b4e..f0a2f4c8737d 100644
--- a/textproc/py-towncrier/Makefile
+++ b/textproc/py-towncrier/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	towncrier
 PORTVERSION=	22.12.0
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/textproc/py-trans/Makefile b/textproc/py-trans/Makefile
index ee6ce6b78578..719b66d9ec5e 100644
--- a/textproc/py-trans/Makefile
+++ b/textproc/py-trans/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	trans
 PORTVERSION=	2.1.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-transifex-client/Makefile b/textproc/py-transifex-client/Makefile
index 58356c8e6f25..ff28c5edd455 100644
--- a/textproc/py-transifex-client/Makefile
+++ b/textproc/py-transifex-client/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	transifex-client
 PORTVERSION=	0.14.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/textproc/py-translationstring/Makefile b/textproc/py-translationstring/Makefile
index a3c2abfce002..3965f03b3c0f 100644
--- a/textproc/py-translationstring/Makefile
+++ b/textproc/py-translationstring/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	translationstring
 PORTVERSION=	1.4
 CATEGORIES=	textproc www python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/textproc/py-transpopy/Makefile b/textproc/py-transpopy/Makefile
index 8991cb3e8950..964643f65a32 100644
--- a/textproc/py-transpopy/Makefile
+++ b/textproc/py-transpopy/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	transpopy
 PORTVERSION=	0.2.0
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	contato@kanazuchi.com
diff --git a/textproc/py-ttp-templates/Makefile b/textproc/py-ttp-templates/Makefile
index 1dd12825663a..d1a7c0612d28 100644
--- a/textproc/py-ttp-templates/Makefile
+++ b/textproc/py-ttp-templates/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ttp-templates
 DISTVERSION=	0.3.2
 CATEGORIES=	textproc net-mgmt python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	ttp_templates-${DISTVERSION}
 
diff --git a/textproc/py-ttp/Makefile b/textproc/py-ttp/Makefile
index 984c7559353d..b0961c16b194 100644
--- a/textproc/py-ttp/Makefile
+++ b/textproc/py-ttp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ttp
 PORTVERSION=	0.9.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-typogrify/Makefile b/textproc/py-typogrify/Makefile
index a3dcd6e9e7c8..71ecefabc35f 100644
--- a/textproc/py-typogrify/Makefile
+++ b/textproc/py-typogrify/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	typogrify
 DISTVERSION=	2.0.7
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nc@FreeBSD.org
diff --git a/textproc/py-ufal.udpipe/Makefile b/textproc/py-ufal.udpipe/Makefile
index 6f67330d7af6..edc0009844ca 100644
--- a/textproc/py-ufal.udpipe/Makefile
+++ b/textproc/py-ufal.udpipe/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ufal.udpipe
 PORTVERSION=	1.2.0.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/py-untangle/Makefile b/textproc/py-untangle/Makefile
index 3ee452a55bae..94378bb1f2fa 100644
--- a/textproc/py-untangle/Makefile
+++ b/textproc/py-untangle/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	untangle
 PORTVERSION=	1.2.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-wcmatch/Makefile b/textproc/py-wcmatch/Makefile
index 9df8a0ea6e2b..ffbd228a78b7 100644
--- a/textproc/py-wcmatch/Makefile
+++ b/textproc/py-wcmatch/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wcmatch
 PORTVERSION=	8.4.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
diff --git a/textproc/py-whatthepatch/Makefile b/textproc/py-whatthepatch/Makefile
index fe7c789443df..4494090c65e1 100644
--- a/textproc/py-whatthepatch/Makefile
+++ b/textproc/py-whatthepatch/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	whatthepatch
 PORTVERSION=	1.0.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
diff --git a/textproc/py-whoosh/Makefile b/textproc/py-whoosh/Makefile
index 0e2a9b922a80..37e9980c8be5 100644
--- a/textproc/py-whoosh/Makefile
+++ b/textproc/py-whoosh/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	whoosh
 PORTVERSION=	2.7.4
 CATEGORIES=	textproc www python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Whoosh-${PORTVERSION}
 
diff --git a/textproc/py-wordcloud/Makefile b/textproc/py-wordcloud/Makefile
index 29826da72c1c..8f5b710918db 100644
--- a/textproc/py-wordcloud/Makefile
+++ b/textproc/py-wordcloud/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wordcloud
 DISTVERSION=	1.8.2.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/textproc/py-wstools/Makefile b/textproc/py-wstools/Makefile
index 32fde00657ac..8be09591826d 100644
--- a/textproc/py-wstools/Makefile
+++ b/textproc/py-wstools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wstools
 PORTVERSION=	0.4.8
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rm@FreeBSD.org
diff --git a/textproc/py-wtf-peewee/Makefile b/textproc/py-wtf-peewee/Makefile
index 04bbcbafd044..5b260dca907a 100644
--- a/textproc/py-wtf-peewee/Makefile
+++ b/textproc/py-wtf-peewee/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wtf-peewee
 PORTVERSION=	3.0.4
 CATEGORIES=	textproc devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	meka@tilda.center
diff --git a/textproc/py-wtforms/Makefile b/textproc/py-wtforms/Makefile
index d225cc89c259..4410f4000c16 100644
--- a/textproc/py-wtforms/Makefile
+++ b/textproc/py-wtforms/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	wtforms
 PORTVERSION=	2.1
 PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	WTForms-${DISTVERSION}
 
diff --git a/textproc/py-xhtml2pdf/Makefile b/textproc/py-xhtml2pdf/Makefile
index 6a8ea745c1d2..3bbe3e30a8e3 100644
--- a/textproc/py-xhtml2pdf/Makefile
+++ b/textproc/py-xhtml2pdf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xhtml2pdf
 PORTVERSION=	0.2.6
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-xlmmacrodeobfuscator/Makefile b/textproc/py-xlmmacrodeobfuscator/Makefile
index b657329177ae..fc50f136f911 100644
--- a/textproc/py-xlmmacrodeobfuscator/Makefile
+++ b/textproc/py-xlmmacrodeobfuscator/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xlmmacrodeobfuscator
 PORTVERSION=	0.2.7
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	XLMMacroDeobfuscator-${PORTVERSION}
 
diff --git a/textproc/py-xlrd/Makefile b/textproc/py-xlrd/Makefile
index d4dd7182e11e..19721103497f 100644
--- a/textproc/py-xlrd/Makefile
+++ b/textproc/py-xlrd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xlrd
 PORTVERSION=	2.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-xlrd2/Makefile b/textproc/py-xlrd2/Makefile
index 4ca95748c3cb..acb387134d1d 100644
--- a/textproc/py-xlrd2/Makefile
+++ b/textproc/py-xlrd2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xlrd2
 PORTVERSION=	1.3.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-xlsxwriter/Makefile b/textproc/py-xlsxwriter/Makefile
index cbe8f17425e8..9c90b78275f1 100644
--- a/textproc/py-xlsxwriter/Makefile
+++ b/textproc/py-xlsxwriter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	XlsxWriter
 PORTVERSION=	1.4.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
diff --git a/textproc/py-xlutils/Makefile b/textproc/py-xlutils/Makefile
index 08565bf7f551..e4e4a7f86746 100644
--- a/textproc/py-xlutils/Makefile
+++ b/textproc/py-xlutils/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xlutils
 PORTVERSION=	2.0.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	skreuzer@FreeBSD.org
diff --git a/textproc/py-xlwt/Makefile b/textproc/py-xlwt/Makefile
index 6f3d5497e13b..8f7600882440 100644
--- a/textproc/py-xlwt/Makefile
+++ b/textproc/py-xlwt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xlwt
 PORTVERSION=	1.3.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dikshie@sfc.wide.ad.jp
diff --git a/textproc/py-xml-default-dict/Makefile b/textproc/py-xml-default-dict/Makefile
index 7047c0a2a553..dd2769cc19cf 100644
--- a/textproc/py-xml-default-dict/Makefile
+++ b/textproc/py-xml-default-dict/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xml-default-dict
 PORTVERSION=	0.3
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	contato@kanazuchi.com
diff --git a/textproc/py-xmldiff/Makefile b/textproc/py-xmldiff/Makefile
index a2805386b718..6832ea96d0d3 100644
--- a/textproc/py-xmldiff/Makefile
+++ b/textproc/py-xmldiff/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xmldiff
 PORTVERSION=	2.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-xmlschema/Makefile b/textproc/py-xmlschema/Makefile
index 00b18f24b51f..777771fedc23 100644
--- a/textproc/py-xmlschema/Makefile
+++ b/textproc/py-xmlschema/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xmlschema
 DISTVERSION=	2.1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/textproc/py-yapf/Makefile b/textproc/py-yapf/Makefile
index dc2e018e1a1a..11e4b1810ed0 100644
--- a/textproc/py-yapf/Makefile
+++ b/textproc/py-yapf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	yapf
 PORTVERSION=	0.32.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
diff --git a/textproc/py-youseedee/Makefile b/textproc/py-youseedee/Makefile
index 133586876cfa..039ccb7ebfa2 100644
--- a/textproc/py-youseedee/Makefile
+++ b/textproc/py-youseedee/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	youseedee
 PORTVERSION=	0.3.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/py-zope.i18nmessageid/Makefile b/textproc/py-zope.i18nmessageid/Makefile
index 7f17af0fa402..a65711040414 100644
--- a/textproc/py-zope.i18nmessageid/Makefile
+++ b/textproc/py-zope.i18nmessageid/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zope.i18nmessageid
 PORTVERSION=	5.0.1
 CATEGORIES=	textproc www python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	zope
 
diff --git a/textproc/py-zope.structuredtext/Makefile b/textproc/py-zope.structuredtext/Makefile
index d9b47b88e54a..bd0801d10e16 100644
--- a/textproc/py-zope.structuredtext/Makefile
+++ b/textproc/py-zope.structuredtext/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	zope.structuredtext
 PORTVERSION=	3.5.1
 PORTREVISION=	1
 CATEGORIES=	textproc python zope
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	zope
 
diff --git a/textproc/py-zope.tal/Makefile b/textproc/py-zope.tal/Makefile
index f1cf005ce730..5a8b8ece2f59 100644
--- a/textproc/py-zope.tal/Makefile
+++ b/textproc/py-zope.tal/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	zope.tal
 PORTVERSION=	3.6.1
 PORTREVISION=	1
 CATEGORIES=	textproc python zope
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	zope
 
diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index 024be979afbc..b3d4adca22a1 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	translate-toolkit
 PORTVERSION=	3.7.4
 CATEGORIES=	textproc
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tools and API for translation and localization engineering
diff --git a/textproc/yq/Makefile b/textproc/yq/Makefile
index 2027d03b6969..dd0bf1f77dc9 100644
--- a/textproc/yq/Makefile
+++ b/textproc/yq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	yq
 DISTVERSION=	3.1.0
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Command-line YAML and XML processor, jq wrapper for YAML/XML documents