Index: www/py-jsonfield/Makefile
===================================================================
--- www/py-jsonfield/Makefile	(revision 535001)
+++ www/py-jsonfield/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jsonfield
-PORTVERSION=	2.1.1
+PORTVERSION=	3.1.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,10 +13,9 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
@@ -23,7 +22,4 @@
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj22-jsonfield
 
-# jsonfield 3.0.0+ requires Django 2.2+
-PORTSCOUT=	limit:^2\.
-
 .include <bsd.port.mk>
Index: www/py-jsonfield/distinfo
===================================================================
--- www/py-jsonfield/distinfo	(revision 535001)
+++ www/py-jsonfield/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581594058
-SHA256 (jsonfield-2.1.1.tar.gz) = ed7c5e1829e9453e24a8bebef1e702ffe402e6def6b326f0e0b88764c59a6dc7
-SIZE (jsonfield-2.1.1.tar.gz) = 9142
+TIMESTAMP = 1589306105
+SHA256 (jsonfield-3.1.0.tar.gz) = 7e4e84597de21eeaeeaaa7cc5da08c61c48a9b64d0c446b2d71255d01812887a
+SIZE (jsonfield-3.1.0.tar.gz) = 14870
Index: www/py-dj22-jsonfield/Makefile
===================================================================
--- www/py-dj22-jsonfield/Makefile	(revision 535001)
+++ www/py-dj22-jsonfield/Makefile	(working copy)
@@ -13,6 +13,8 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Obsolete, please use www/py-jsonfield instead
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
 
 USES=		python:3.6+