www/py-dj22-django-jquery-js: Rename to www/py-django-jquery-js

* The port was added with the "dj22-" prefix to use Django 2.2 explicitly.

  In the meantime most Django ports have been switched from Django 1.11
  (End-of-Life) to Django 2.2 (current LTS release).

  Thus rename the port to to be consistent with the names of the other
  Django ports and to retain the history.

* Bump PORTREVISION of www/py-dj22-django-formset-js-improved due changed
  dependencies.

PR:		247032
Approved by:	Alexander Sieg (maintainer)

MOVED

@@ -15080,3 +15080,4 @@ sysutils/beats|sysutils/beats6|2020-06-07|Renamed to match the naming of other E
 security/pam_pseudo||2020-06-07|Has expired: Broken for more than 6 months
 multimedia/din|audio/din|2020-06-09|Moved to a better category
 www/py-dj22-django_csp|www/py-django-csp|2020-06-10|Renamed to match upstream naming and to be in sync with other Django ports since Django 2.2 became default
+www/py-dj22-django-jquery-js|www/py-django-jquery-js|2020-06-11|Renamed to match the naming of other Django ports since Django 2.2 became default

www/Makefile

@@ -1440,7 +1440,6 @@
     SUBDIR += py-dj22-django-extensions
     SUBDIR += py-dj22-django-filter
     SUBDIR += py-dj22-django-formset-js-improved
-    SUBDIR += py-dj22-django-jquery-js
     SUBDIR += py-dj22-django-js-asset
     SUBDIR += py-dj22-django-model-utils
     SUBDIR += py-dj22-django-mptt
@@ -1502,6 +1501,7 @@
     SUBDIR += py-django-hijack
     SUBDIR += py-django-htmlmin
     SUBDIR += py-django-i18nfield
+    SUBDIR += py-django-jquery-js
     SUBDIR += py-django-js-asset
     SUBDIR += py-django-jsonfield
     SUBDIR += py-django-ldapdb

www/py-dj22-django-formset-js-improved/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	django-formset-js-improved
 PORTVERSION=	0.5.0.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj22-
@@ -13,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj22-django-jquery-js>=0.:www/py-dj22-django-jquery-js@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}django-jquery-js>=0.:www/py-django-jquery-js@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils

www/py-django-jquery-js/Makefile

@@ -4,7 +4,7 @@ PORTNAME=	django-jquery-js
 PORTVERSION=	3.1.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj22-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	alex@xanderio.de
 COMMENT=	jQuery, bundled up so apps can depend upon it