Move www/py-django-jsonfield2 to www/py-jsonfield2

- Add CONFLICTS_INSTALL

www/Makefile

@@ -1517,7 +1517,6 @@
     SUBDIR += py-django-js-asset
     SUBDIR += py-django-json-rpc
     SUBDIR += py-django-jsonfield
-    SUBDIR += py-django-jsonfield2
     SUBDIR += py-django-ldapdb
     SUBDIR += py-django-libsass
     SUBDIR += py-django-markdownx
@@ -1674,6 +1673,7 @@
     SUBDIR += py-internetarchive
     SUBDIR += py-jonpy
     SUBDIR += py-jsonfield
+    SUBDIR += py-jsonfield2
     SUBDIR += py-kallithea
     SUBDIR += py-lektor
     SUBDIR += py-lesscpy

www/py-jsonfield2/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	jsonfield2
 PORTVERSION=	3.0.3
 CATEGORIES=	www python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Reusable Django field to store validated JSON in your model
@@ -19,6 +19,8 @@ USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj22-jsonfield2
+
 # jsonfield2 3.1.0+ requires Django 2.2+
 PORTSCOUT=	limit:^3\.0\.