git: 0cf5531fcd38 - main - www/py-django32: Switch consumers over to Django 3.2

From: Kai Knoblich <kai_at_FreeBSD.org>
Date: Thu, 28 Apr 2022 10:08:14 UTC
The branch main has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0cf5531fcd38982e6667fb2b8561eae80c4902c3

commit 0cf5531fcd38982e6667fb2b8561eae80c4902c3
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2022-04-28 10:02:15 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2022-04-28 10:02:15 +0000

    www/py-django32: Switch consumers over to Django 3.2
    
    Django 2.2 became End-of-Life on 11th April 2022 and Django 3.2 is the
    new LTS (= Long Term Support) release which will be supported until
    April 2024.
    
    * Switch the most ports that use www/py-django22 to www/py-django32
    
    * Switch www/seahub over to www/py-djangorestframework
    
    * Ports that are not yet ready for Django 3.2 (only three so far) or
      those that have already been set with an expiration date were not
      taken into account.
    
    * Bump PORTREVISION due dependency change where necessary.
    
    PR:             261313
    Reviewed by:    bofh, dvl, koobs, ultima
    Approved by:    bofh, dvl, koobs, ultima, sunpoet, Kevin Golding, Ivan Rozhuk,
                    Alexander Sieg (maintainers)
                    maintainer timeout (remaining maintainers)
    Differential Revision:  https://reviews.freebsd.org/D34859
---
 devel/py-django-rq/Makefile                   | 3 ++-
 devel/py-eventlib/Makefile                    | 4 ++--
 devel/py-graphene-django/Makefile             | 3 ++-
 devel/py-hypothesis/Makefile                  | 3 ++-
 devel/py-logan/Makefile                       | 4 ++--
 devel/py-semantic-version/Makefile            | 2 +-
 graphics/py-django-easy-thumbnails/Makefile   | 5 +++--
 graphics/py-sorl-thumbnail/Makefile           | 3 ++-
 mail/py-django-mailman3/Makefile              | 4 ++--
 www/py-django-allauth/Makefile                | 3 ++-
 www/py-django-annoying/Makefile               | 3 ++-
 www/py-django-assets/Makefile                 | 3 ++-
 www/py-django-auth-ldap/Makefile              | 3 ++-
 www/py-django-bitfield/Makefile               | 3 ++-
 www/py-django-bootstrap3/Makefile             | 3 ++-
 www/py-django-braces/Makefile                 | 3 ++-
 www/py-django-cacheops/Makefile               | 3 ++-
 www/py-django-classy-tags/Makefile            | 4 ++--
 www/py-django-cms/Makefile                    | 3 ++-
 www/py-django-configurations/Makefile         | 5 +++--
 www/py-django-contact-form/Makefile           | 3 ++-
 www/py-django-contrib-comments/Makefile       | 3 ++-
 www/py-django-cors-headers/Makefile           | 3 ++-
 www/py-django-crispy-forms/Makefile           | 3 ++-
 www/py-django-csp/Makefile                    | 3 ++-
 www/py-django-debreach/Makefile               | 2 +-
 www/py-django-debug-toolbar/Makefile          | 3 ++-
 www/py-django-dpaste/Makefile                 | 3 ++-
 www/py-django-extensions/Makefile             | 3 ++-
 www/py-django-filer/Makefile                  | 3 ++-
 www/py-django-filter/Makefile                 | 3 ++-
 www/py-django-formset-js-improved/Makefile    | 4 ++--
 www/py-django-graphiql-debug-toolbar/Makefile | 3 ++-
 www/py-django-hashid-field/Makefile           | 3 ++-
 www/py-django-haystack/Makefile               | 3 ++-
 www/py-django-hijack/Makefile                 | 3 ++-
 www/py-django-jquery-js/Makefile              | 3 ++-
 www/py-django-js-asset/Makefile               | 3 ++-
 www/py-django-jsonview/Makefile               | 3 ++-
 www/py-django-markdownx/Makefile              | 3 ++-
 www/py-django-model-utils/Makefile            | 3 ++-
 www/py-django-modelcluster/Makefile           | 3 ++-
 www/py-django-mptt/Makefile                   | 3 ++-
 www/py-django-netfields/Makefile              | 3 ++-
 www/py-django-photologue/Makefile             | 3 ++-
 www/py-django-polymorphic/Makefile            | 3 ++-
 www/py-django-post_office/Makefile            | 3 ++-
 www/py-django-prometheus/Makefile             | 3 ++-
 www/py-django-pyscss/Makefile                 | 4 ++--
 www/py-django-recaptcha/Makefile              | 3 ++-
 www/py-django-redis/Makefile                  | 3 ++-
 www/py-django-registration-redux/Makefile     | 4 ++--
 www/py-django-registration/Makefile           | 3 ++-
 www/py-django-reversion/Makefile              | 3 ++-
 www/py-django-sekizai/Makefile                | 3 ++-
 www/py-django-simple-history/Makefile         | 3 ++-
 www/py-django-smart-selects/Makefile          | 3 ++-
 www/py-django-solo/Makefile                   | 3 ++-
 www/py-django-sortedm2m/Makefile              | 3 ++-
 www/py-django-star-ratings/Makefile           | 4 ++--
 www/py-django-tables2/Makefile                | 3 ++-
 www/py-django-taggit/Makefile                 | 3 ++-
 www/py-django-tastypie/Makefile               | 3 ++-
 www/py-django-templatetag-sugar/Makefile      | 4 ++--
 www/py-django-timezone-field/Makefile         | 3 ++-
 www/py-django-tinymce/Makefile                | 3 ++-
 www/py-django-treebeard/Makefile              | 5 +++--
 www/py-django-widget-tweaks/Makefile          | 3 ++-
 www/py-djangocms-admin-style/Makefile         | 3 ++-
 www/py-djangoql/Makefile                      | 3 ++-
 www/py-djangorestframework/Makefile           | 3 ++-
 www/py-drf-yasg/Makefile                      | 3 ++-
 www/py-enmerkar/Makefile                      | 3 ++-
 www/py-horizon/Makefile                       | 3 ++-
 www/py-jsonfield/Makefile                     | 3 ++-
 www/py-postorius/Makefile                     | 3 ++-
 www/py-social-auth-app-django/Makefile        | 2 +-
 www/py-spyne/Makefile                         | 2 +-
 www/py-swapper/Makefile                       | 3 ++-
 www/py-webargs/Makefile                       | 2 +-
 www/seahub/Makefile                           | 4 ++--
 81 files changed, 160 insertions(+), 94 deletions(-)

diff --git a/devel/py-django-rq/Makefile b/devel/py-django-rq/Makefile
index 99309ea1dc9e..f71b43128b01 100644
--- a/devel/py-django-rq/Makefile
+++ b/devel/py-django-rq/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-rq
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MASTER_SITES=	CHEESESHOP
@@ -12,7 +13,7 @@ COMMENT=	Provides Django integration for RQ (Redis Queue)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.0:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.0:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}redis>=3:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rq>=1.2:devel/py-rq@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
diff --git a/devel/py-eventlib/Makefile b/devel/py-eventlib/Makefile
index b8785fcee1a0..c1ee5d551510 100644
--- a/devel/py-eventlib/Makefile
+++ b/devel/py-eventlib/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	eventlib
 PORTVERSION=	0.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}celery>=3.0.0:devel/py-celery@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django32>=0:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ejson>=0:devel/py-ejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}logan>=0.5.0:devel/py-logan@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}redis2>=2.7.1:databases/py-redis2@${PY_FLAVOR}
diff --git a/devel/py-graphene-django/Makefile b/devel/py-graphene-django/Makefile
index 7f682098d087..4b607a4717d2 100644
--- a/devel/py-graphene-django/Makefile
+++ b/devel/py-graphene-django/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	graphene-django
 PORTVERSION=	2.15.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Graphene Django integration
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.11:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}graphene>=2.1.7<3:devel/py-graphene@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}graphql-core2>=2.1.0<3:devel/py-graphql-core2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}promise>=2.1:devel/py-promise@${PY_FLAVOR} \
diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile
index 195debf20aa3..b1c367661f57 100644
--- a/devel/py-hypothesis/Makefile
+++ b/devel/py-hypothesis/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	hypothesis
 PORTVERSION=	6.45.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -39,7 +40,7 @@ CLI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}black>=19.10b0:devel/py-black@${PY_FLAVO
 			${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR}
 CODEMODS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libcst>=0.3.16:devel/py-libcst@${PY_FLAVOR}
 DATEUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil@${PY_FLAVOR}
-DJANGO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+DJANGO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 DPCONTRACTS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dpcontracts>=0.4:devel/py-dpcontracts@${PY_FLAVOR}
 GHOSTWRITER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}black>=19.10b0:devel/py-black@${PY_FLAVOR}
 LARK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lark-parser>=0.6.5:devel/py-lark-parser@${PY_FLAVOR}
diff --git a/devel/py-logan/Makefile b/devel/py-logan/Makefile
index 103331e3b73b..bee7ba627745 100644
--- a/devel/py-logan/Makefile
+++ b/devel/py-logan/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	logan
 PORTVERSION=	0.7.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ COMMENT=	Toolkit for running standalone Django applications
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.5:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.5:www/py-django32@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0.8.0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${PY_FLAVOR}
 
diff --git a/devel/py-semantic-version/Makefile b/devel/py-semantic-version/Makefile
index 5b347606226a..0a6b99b34a57 100644
--- a/devel/py-semantic-version/Makefile
+++ b/devel/py-semantic-version/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python library provides a few tools to handle SemVer in Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.1:www/py-django22@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.1:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/graphics/py-django-easy-thumbnails/Makefile b/graphics/py-django-easy-thumbnails/Makefile
index 7cc719dcb405..278a6a1e8a9b 100644
--- a/graphics/py-django-easy-thumbnails/Makefile
+++ b/graphics/py-django-easy-thumbnails/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	easy-thumbnails
 PORTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
@@ -12,7 +13,7 @@ COMMENT=	Easy thumbnails for Django
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}svglib>0:converters/py-svglib@${PY_FLAVOR}
@@ -25,7 +26,7 @@ NO_ARCH=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PY_PILLOW}
 DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile
index 9f8f3680bce2..c2851ab317f9 100644
--- a/graphics/py-sorl-thumbnail/Makefile
+++ b/graphics/py-sorl-thumbnail/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sorl-thumbnail
 PORTVERSION=	12.8.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.11:www/py-django32@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/mail/py-django-mailman3/Makefile b/mail/py-django-mailman3/Makefile
index 3bcdae527354..35ed7b6975a2 100644
--- a/mail/py-django-mailman3/Makefile
+++ b/mail/py-django-mailman3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	django-mailman3
 PORTVERSION=	1.3.7
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ COMMENT=	Libraries and templates for Django-based interfaces interacting with Ma
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>0:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mailmanclient>=3.3.3:mail/py-mailmanclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-allauth>0:www/py-django-allauth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-gravatar2>1.0.6:www/py-django-gravatar2@${PY_FLAVOR} \
diff --git a/www/py-django-allauth/Makefile b/www/py-django-allauth/Makefile
index 9d7729fb0cb3..ab96aee76d47 100644
--- a/www/py-django-allauth/Makefile
+++ b/www/py-django-allauth/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-allauth
 PORTVERSION=	0.50.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ COMMENT=	User registration with social account authentication
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.0:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.0:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.7:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.8:security/py-python3-openid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
diff --git a/www/py-django-annoying/Makefile b/www/py-django-annoying/Makefile
index b30e70ba8ee3..d94c301920a6 100644
--- a/www/py-django-annoying/Makefile
+++ b/www/py-django-annoying/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-annoying
 PORTVERSION=	0.10.6
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Eliminate annoying things in the Django framework
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=0:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-assets/Makefile b/www/py-django-assets/Makefile
index c2396db781ad..1b953a4f999f 100644
--- a/www/py-django-assets/Makefile
+++ b/www/py-django-assets/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-assets
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -9,7 +10,7 @@ COMMENT=	Compress and merge CSS and Javascript files
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.7:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.7:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webassets>=2.0:www/py-webassets@${PY_FLAVOR}
 
 USES=		python:3.5+
diff --git a/www/py-django-auth-ldap/Makefile b/www/py-django-auth-ldap/Makefile
index 85b956667648..fa7f36c00adc 100644
--- a/www/py-django-auth-ldap/Makefile
+++ b/www/py-django-auth-ldap/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-auth-ldap
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	www security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ldap>=3.1:net/py-ldap@${PY_FLAVOR}
 
 USES=		python:3.6+
diff --git a/www/py-django-bitfield/Makefile b/www/py-django-bitfield/Makefile
index 9210468dc2b2..62a790ccb6f8 100644
--- a/www/py-django-bitfield/Makefile
+++ b/www/py-django-bitfield/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-bitfield
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ COMMENT=	BitField in Django
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.10.8:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.10.8:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.5+
diff --git a/www/py-django-bootstrap3/Makefile b/www/py-django-bootstrap3/Makefile
index df3d5a3761f9..4b3e7018ee0f 100644
--- a/www/py-django-bootstrap3/Makefile
+++ b/www/py-django-bootstrap3/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-bootstrap3
 PORTVERSION=	15.0.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ COMMENT=	Bootstrap 3 support for Django projects
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-braces/Makefile b/www/py-django-braces/Makefile
index 94ba3177fe2c..eac58182fbe0 100644
--- a/www/py-django-braces/Makefile
+++ b/www/py-django-braces/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-braces
 PORTVERSION=	1.15.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Reusable, generic mixins for Django
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-django-cacheops/Makefile b/www/py-django-cacheops/Makefile
index be39909c9615..3ac834791627 100644
--- a/www/py-django-cacheops/Makefile
+++ b/www/py-django-cacheops/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-cacheops
 PORTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ COMMENT=	Slick ORM cache with automatic granular event-driven invalidation
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.1:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.1:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}redis>=3.0.0:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}funcy>=1.8<2.0:devel/py-funcy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR}
diff --git a/www/py-django-classy-tags/Makefile b/www/py-django-classy-tags/Makefile
index 46c513a0ed36..6438391338fc 100644
--- a/www/py-django-classy-tags/Makefile
+++ b/www/py-django-classy-tags/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	django-classy-tags
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Class based template tags for Django
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.11:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.5+
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index cbe99a9f68d1..e97a6d4d0af3 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-cms
 PORTVERSION=	3.9.0
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -11,7 +12,7 @@ COMMENT=	Content management system built with the Django framework
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}djangocms-admin-style>=1.2:www/py-djangocms-admin-style@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.7.2:www/py-django-classy-tags@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-formtools>=2.1:www/py-django-formtools@${PY_FLAVOR} \
diff --git a/www/py-django-configurations/Makefile b/www/py-django-configurations/Makefile
index 886a25c63dbb..d11f119638cb 100644
--- a/www/py-django-configurations/Makefile
+++ b/www/py-django-configurations/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-configurations
 PORTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,9 +13,9 @@ COMMENT=	Django project configuration using the composability of Python classes
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-django-contact-form/Makefile b/www/py-django-contact-form/Makefile
index c2ef0fee84d1..31d862180a8c 100644
--- a/www/py-django-contact-form/Makefile
+++ b/www/py-django-contact-form/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-contact-form
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Generic contact-form application for Django
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
 
 USES=		python:3.6+
diff --git a/www/py-django-contrib-comments/Makefile b/www/py-django-contrib-comments/Makefile
index c6fc7f5fd6c6..2422e19ec88a 100644
--- a/www/py-django-contrib-comments/Makefile
+++ b/www/py-django-contrib-comments/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-contrib-comments
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 # Supports all Django version. Bump when DEFAULT Django is changed
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-cors-headers/Makefile b/www/py-django-cors-headers/Makefile
index 2c558c164654..3c6e3935a9d4 100644
--- a/www/py-django-cors-headers/Makefile
+++ b/www/py-django-cors-headers/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-cors-headers
 PORTVERSION=	3.11.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ COMMENT=	Handles server headers required for Cross-Origin Resource Sharing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-crispy-forms/Makefile b/www/py-django-crispy-forms/Makefile
index 0b04f4d79616..982b3dbcfef4 100644
--- a/www/py-django-crispy-forms/Makefile
+++ b/www/py-django-crispy-forms/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-crispy-forms
 PORTVERSION=	1.14.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Best way to have Django DRY forms
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=0:www/py-django32@${PY_FLAVOR}
 
 USES=		dos2unix python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-django-csp/Makefile b/www/py-django-csp/Makefile
index fae0cf97dc74..e3f8f8a00609 100644
--- a/www/py-django-csp/Makefile
+++ b/www/py-django-csp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-csp
 PORTVERSION=	3.7
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Adds Content-Security-Policy headers to Django
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.8:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-debreach/Makefile b/www/py-django-debreach/Makefile
index e817f1c0f604..779e8070d41a 100644
--- a/www/py-django-debreach/Makefile
+++ b/www/py-django-debreach/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Adds protection against the BREACH attack in Django
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>0:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-debug-toolbar/Makefile b/www/py-django-debug-toolbar/Makefile
index 0ccfad77f89e..a0640345e5a1 100644
--- a/www/py-django-debug-toolbar/Makefile
+++ b/www/py-django-debug-toolbar/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-debug-toolbar
 PORTVERSION=	3.2.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Configurable set of panels to display debug information
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse@${PY_FLAVOR}
 
 USES=		python:3.6+
diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile
index 452cd1b86760..8567e2668488 100644
--- a/www/py-django-dpaste/Makefile
+++ b/www/py-django-dpaste/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	dpaste
 PORTVERSION=	3.5
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
@@ -12,7 +13,7 @@ COMMENT=	Django based pastebin for text and code
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj-database-url>=0.5.0:www/py-dj-database-url@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-csp>=3.6:www/py-django-csp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-staticinline>=1.0:www/py-django-staticinline@${PY_FLAVOR} \
diff --git a/www/py-django-extensions/Makefile b/www/py-django-extensions/Makefile
index d8cf8550e9d9..f39e6ad201d4 100644
--- a/www/py-django-extensions/Makefile
+++ b/www/py-django-extensions/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-extensions
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Global custom management extensions for the Django Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.5+
diff --git a/www/py-django-filer/Makefile b/www/py-django-filer/Makefile
index f6bc53ddb2f2..70a0d32e348f 100644
--- a/www/py-django-filer/Makefile
+++ b/www/py-django-filer/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-filer
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	File and Image Management Application for django
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2<4.0:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2<4.0:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=2.8.0:graphics/py-django-easy-thumbnails@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.6<1.0:www/py-django-mptt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-polymorphic>=2:www/py-django-polymorphic@${PY_FLAVOR} \
diff --git a/www/py-django-filter/Makefile b/www/py-django-filter/Makefile
index eb5c1ea75823..3dec720e4b24 100644
--- a/www/py-django-filter/Makefile
+++ b/www/py-django-filter/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-filter
 DISTVERSION=	21.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ COMMENT=	Dynamic filtering for querysets with Django
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-formset-js-improved/Makefile b/www/py-django-formset-js-improved/Makefile
index 798bf1a588d8..7a57c102ad14 100644
--- a/www/py-django-formset-js-improved/Makefile
+++ b/www/py-django-formset-js-improved/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	django-formset-js-improved
 PORTVERSION=	0.5.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ COMMENT=	Fork of django-formset-js that adds support for reordering and nested f
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.8:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-jquery-js>=0.:www/py-django-jquery-js@${PY_FLAVOR}
 
 USES=		python:3.5+
diff --git a/www/py-django-graphiql-debug-toolbar/Makefile b/www/py-django-graphiql-debug-toolbar/Makefile
index 922a393f15cd..afa1f43e7799 100644
--- a/www/py-django-graphiql-debug-toolbar/Makefile
+++ b/www/py-django-graphiql-debug-toolbar/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-graphiql-debug-toolbar
 DISTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ COMMENT=	Django Debug Toolbar for GraphiQL IDE
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}graphene-django>=2.0.0:devel/py-graphene-django@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-debug-toolbar>=3.1:www/py-django-debug-toolbar@${PY_FLAVOR}
 
diff --git a/www/py-django-hashid-field/Makefile b/www/py-django-hashid-field/Makefile
index 8b3315619d6a..27b10015b424 100644
--- a/www/py-django-hashid-field/Makefile
+++ b/www/py-django-hashid-field/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-hashid-field
 PORTVERSION=	3.3.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Hashids obfuscated Django Model Field
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.11:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hashids>=1.2.0:textproc/py-hashids@${PY_FLAVOR}
 
 USES=		python:3.6+
diff --git a/www/py-django-haystack/Makefile b/www/py-django-haystack/Makefile
index d8c48fe9af8b..8538d4df68d5 100644
--- a/www/py-django-haystack/Makefile
+++ b/www/py-django-haystack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-haystack
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	www databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.11:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils concurrent autoplist
diff --git a/www/py-django-hijack/Makefile b/www/py-django-hijack/Makefile
index 9bfcd550aae4..ea74328d9fb0 100644
--- a/www/py-django-hijack/Makefile
+++ b/www/py-django-hijack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-hijack
 PORTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP \
 		https://ports.caomhin.org/:npmcache
@@ -18,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
 		npm:www/npm
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-django>0:devel/py-pytest-django@${PY_FLAVOR}
 
diff --git a/www/py-django-jquery-js/Makefile b/www/py-django-jquery-js/Makefile
index 332859c42552..483b2b6be3bc 100644
--- a/www/py-django-jquery-js/Makefile
+++ b/www/py-django-jquery-js/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-jquery-js
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ COMMENT=	jQuery, bundled up so apps can depend upon it
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.4:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.4:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-js-asset/Makefile b/www/py-django-js-asset/Makefile
index e05ee6e97a5b..713a8ec30412 100644
--- a/www/py-django-js-asset/Makefile
+++ b/www/py-django-js-asset/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	django-js-asset
 DISTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Insert script tags with additional attributes for django.forms.Media
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-jsonview/Makefile b/www/py-django-jsonview/Makefile
index b86f0cd0ad15..e74dabda2d3d 100644
--- a/www/py-django-jsonview/Makefile
+++ b/www/py-django-jsonview/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-jsonview
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Always return JSON from your Django view
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=0:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile
index 8baa24801fdb..c043f111399c 100644
--- a/www/py-django-markdownx/Makefile
+++ b/www/py-django-markdownx/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-markdownx
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Django Markdown editor with image uploads and live preview
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>0:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
 		${PY_PILLOW}
 
diff --git a/www/py-django-model-utils/Makefile b/www/py-django-model-utils/Makefile
index d4cc81d3ebfa..4bc53703cab7 100644
--- a/www/py-django-model-utils/Makefile
+++ b/www/py-django-model-utils/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-model-utils
 PORTVERSION=	4.2.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.0.1:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.0.1:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-django-modelcluster/Makefile b/www/py-django-modelcluster/Makefile
index be93dd45ddc4..cf0983f6d3e3 100644
--- a/www/py-django-modelcluster/Makefile
+++ b/www/py-django-modelcluster/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-modelcluster
 PORTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Django extension for working with clusters of models as a single unit
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2015.2,1:devel/py-pytz@${PY_FLAVOR}
 
 USES=		python:3.7+
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
*** 794 LINES SKIPPED ***