Index: www/py-dj22-jsonfield2/Makefile
===================================================================
--- www/py-dj22-jsonfield2/Makefile	(revision 532915)
+++ www/py-dj22-jsonfield2/Makefile	(working copy)
@@ -13,6 +13,8 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Obsolete, please use www/py-jsonfield2 instead
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
 
 USES=		python:3.5+
Index: www/py-jsonfield2/Makefile
===================================================================
--- www/py-jsonfield2/Makefile	(revision 532915)
+++ www/py-jsonfield2/Makefile	(working copy)
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	jsonfield2
-PORTVERSION=	3.0.3
+PORTVERSION=	4.0.0
 CATEGORIES=	www python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -12,7 +13,7 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
@@ -21,10 +22,4 @@
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj22-jsonfield2
 
-# jsonfield2 3.1.0+ requires Django 2.2+
-PORTSCOUT=	limit:^3\.0\.
-
-GH_ACCOUNT=	rpkilby
-USE_GITHUB=	yes
-
 .include <bsd.port.mk>
Index: www/py-jsonfield2/distinfo
===================================================================
--- www/py-jsonfield2/distinfo	(revision 532915)
+++ www/py-jsonfield2/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571923614
-SHA256 (rpkilby-jsonfield2-3.0.3_GH0.tar.gz) = 4b79ac28738671fe27cadbd537d50130c35a286207d31d8320c7b48b6cda36ca
-SIZE (rpkilby-jsonfield2-3.0.3_GH0.tar.gz) = 11068
+TIMESTAMP = 1587802160
+SHA256 (jsonfield2-4.0.0.tar.gz) = 7bd43edd85d203ad6edb0ecb39870a1c7a4fadaf7e807b0feeca3da64b086b5d
+SIZE (jsonfield2-4.0.0.tar.gz) = 12684