deskutils/py-paperless-ngx: Change RUN_DEPENDS

* Switch the port from the repo-copied py-dj42-django* ports to the
  original ones as they're using Django 4.2 now.

* Some ports were also created directly with a "py-dj42-" prefix to
  have a consistent naming scheme of Django 4.2 ports and had no
  Django 3.2 counterpart.

  After all Django consumers have been changed from Django 3.2 to
  Django 4.2 with 680c68fd4d69, these ports are now renamed accordingly.

  - From:       www/py-dj42-channels-redis
    To:         www/py-channels-redis
  - From:       www/py-dj42-django-auditlog
    To:         www/py-django-auditlog
  - From:       www/py-dj42-django-celery-results
    To:         www/py-django-celery-results
  - From:       www/py-dj42-django-compression-middleware
    To:         www/py-django-compression-middleware
  - From:       www/py-dj42-django-multiselectfield
    To:         www/py-django-multiselectfield
  - From:       www/py-dj42-django-restframework-guardian
    To:         www/py-django-restframework-guardian
  - From:       www/py-dj42-drf-writable-nested
    To:         www/py-drf-writable-nested

  Add related entries to MOVED as well.

* Bump PORTREVISION due changed dependencies.

PR:		276319
Approved by:	grembo (via e-mail)

24 files changed, 37 insertions, 30 deletions

diff --git a/MOVED b/MOVED
index 32b3eb6ebae0..9e8c95ac4a3b 100644
--- a/MOVED
+++ b/MOVED
@@ -3234,3 +3234,10 @@ devel/rubygem-paperclip-rails50||2024-05-04|Has expired: Upstream repo archived
 devel/rubygem-paperclip-rails5||2024-05-04|Has expired: Upstream repo archived Jul 13, 2023. Upstream recommends using Rails' own ActiveStorage
 biology/pbseqan|biology/seqan|2024-05-05|Has expired: Upstream merged into SeqAn project: Use biology/seqan
 archivers/xpk||2024-05-07|Has expired: Unmaintained, upstream last release in 2002
+www/py-dj42-channels-redis|www/py-channels-redis|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
+www/py-dj42-django-auditlog|www/py-django-auditlog|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
+www/py-dj42-django-celery-results|www/py-django-celery-results|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
+www/py-dj42-django-compression-middleware|www/py-django-compression-middleware|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
+www/py-dj42-django-multiselectfield|www/py-django-multiselectfield|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
+www/py-dj42-djangorestframework-guardian|www/py-djangorestframework-guardian|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
+www/py-dj42-drf-writable-nested|www/py-drf-writable-nested|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
diff --git a/deskutils/py-paperless-ngx/Makefile b/deskutils/py-paperless-ngx/Makefile
index f8885ccace83..118b08e71ad0 100644
--- a/deskutils/py-paperless-ngx/Makefile
+++ b/deskutils/py-paperless-ngx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	paperless-ngx
 PORTVERSION=	2.7.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/:webui \
 		GH:gh
@@ -18,17 +18,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bleach>=6.1.0:www/py-bleach@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}concurrent-log-handler>=0.9.19:sysutils/py-concurrent-log-handler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateparser>=1.1.4:devel/py-dateparser@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-channels-redis>=4.2.0:www/py-dj42-channels-redis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-django-allauth>=0.59.0:www/py-dj42-django-allauth@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-django-auditlog>=2.3.0:www/py-dj42-django-auditlog@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-django-celery-results>=2.5.1:www/py-dj42-django-celery-results@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-django-compression-middleware>=0.5.0:www/py-dj42-django-compression-middleware@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-django-cors-headers>=4.3.1:www/py-dj42-django-cors-headers@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-django-extensions>=3.2.3:www/py-dj42-django-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-django-filter>=23.5:www/py-dj42-django-filter@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-django-multiselectfield>=0.1.12:www/py-dj42-django-multiselectfield@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-djangorestframework-guardian>=0.3.0:www/py-dj42-djangorestframework-guardian@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-drf-writable-nested>=0.7.0:www/py-dj42-drf-writable-nested@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}channels-redis>=4.2.0:www/py-channels-redis@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-allauth>=0.59.0:www/py-django-allauth@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-auditlog>=2.3.0:www/py-django-auditlog@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-celery-results>=2.5.1:www/py-django-celery-results@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-compression-middleware>=0.5.0:www/py-django-compression-middleware@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-cors-headers>=4.3.1:www/py-django-cors-headers@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-extensions>=3.2.3:www/py-django-extensions@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-filter>=23.5:www/py-django-filter@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-multiselectfield>=0.1.12:www/py-django-multiselectfield@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}djangorestframework-guardian>=0.3.0:www/py-djangorestframework-guardian@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}drf-writable-nested>=0.7.0:www/py-drf-writable-nested@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>=3.13.1:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flower>=2.0.1:www/py-flower@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gotenberg-client>=0.5.0:converters/py-gotenberg-client@${PY_FLAVOR} \
diff --git a/www/Makefile b/www/Makefile
index 730a7d93ffde..5451557526a6 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1473,6 +1473,7 @@
     SUBDIR += py-cachelib
     SUBDIR += py-caldav
     SUBDIR += py-channels
+    SUBDIR += py-channels-redis
     SUBDIR += py-cheroot
     SUBDIR += py-cherrypy
     SUBDIR += py-cinemagoer
@@ -1487,12 +1488,8 @@
     SUBDIR += py-daphne
     SUBDIR += py-dj-database-url
     SUBDIR += py-dj42-channels
-    SUBDIR += py-dj42-channels-redis
     SUBDIR += py-dj42-django-allauth
-    SUBDIR += py-dj42-django-auditlog
     SUBDIR += py-dj42-django-auth-ldap
-    SUBDIR += py-dj42-django-celery-results
-    SUBDIR += py-dj42-django-compression-middleware
     SUBDIR += py-dj42-django-cors-headers
     SUBDIR += py-dj42-django-crispy-forms
     SUBDIR += py-dj42-django-debug-toolbar
@@ -1503,7 +1500,6 @@
     SUBDIR += py-dj42-django-js-asset
     SUBDIR += py-dj42-django-modelcluster
     SUBDIR += py-dj42-django-mptt
-    SUBDIR += py-dj42-django-multiselectfield
     SUBDIR += py-dj42-django-otp
     SUBDIR += py-dj42-django-permissionedforms
     SUBDIR += py-dj42-django-prometheus
@@ -1515,16 +1511,15 @@
     SUBDIR += py-dj42-django-treebeard
     SUBDIR += py-dj42-djangoql
     SUBDIR += py-dj42-djangorestframework
-    SUBDIR += py-dj42-djangorestframework-guardian
     SUBDIR += py-dj42-drf-spectacular
     SUBDIR += py-dj42-drf-spectacular-sidecar
-    SUBDIR += py-dj42-drf-writable-nested
     SUBDIR += py-django-admin-rangefilter
     SUBDIR += py-django-advanced-filters
     SUBDIR += py-django-allauth
     SUBDIR += py-django-annoying
     SUBDIR += py-django-appconf
     SUBDIR += py-django-assets
+    SUBDIR += py-django-auditlog
     SUBDIR += py-django-auth-ldap
     SUBDIR += py-django-autocomplete-light
     SUBDIR += py-django-bakery
@@ -1535,10 +1530,12 @@
     SUBDIR += py-django-bootstrap4
     SUBDIR += py-django-braces
     SUBDIR += py-django-cacheops
+    SUBDIR += py-django-celery-results
     SUBDIR += py-django-choices-field
     SUBDIR += py-django-ckeditor-5
     SUBDIR += py-django-classy-tags
     SUBDIR += py-django-cms
+    SUBDIR += py-django-compression-middleware
     SUBDIR += py-django-configurations
     SUBDIR += py-django-constance
     SUBDIR += py-django-contact-form
@@ -1578,6 +1575,7 @@
     SUBDIR += py-django-model-utils
     SUBDIR += py-django-modelcluster
     SUBDIR += py-django-mptt
+    SUBDIR += py-django-multiselectfield
     SUBDIR += py-django-netfields
     SUBDIR += py-django-object-actions
     SUBDIR += py-django-otp
@@ -1632,11 +1630,13 @@
     SUBDIR += py-djangorestframework
     SUBDIR += py-djangorestframework-csv
     SUBDIR += py-djangorestframework-filters
+    SUBDIR += py-djangorestframework-guardian
     SUBDIR += py-djangorestframework-xml
     SUBDIR += py-djangosaml2
     SUBDIR += py-draftjs-exporter
     SUBDIR += py-drf-spectacular
     SUBDIR += py-drf-spectacular-sidecar
+    SUBDIR += py-drf-writable-nested
     SUBDIR += py-drf-yasg
     SUBDIR += py-dropbox
     SUBDIR += py-dtflickr
diff --git a/www/py-dj42-channels-redis/Makefile b/www/py-channels-redis/Makefile
index b2b4acdae087..a8846f5b752c 100644
--- a/www/py-dj42-channels-redis/Makefile
+++ b/www/py-channels-redis/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	channels-redis
 PORTVERSION=	4.2.0
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj42-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}
 
 MAINTAINER=	grembo@FreeBSD.org
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=5.0.1:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=1:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asgiref>=3.7.2:www/py-asgiref@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-channels>=4:www/py-dj42-channels@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}channels>=4:www/py-channels@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-dj42-channels-redis/distinfo b/www/py-channels-redis/distinfo
index 1512fee23c7a..1512fee23c7a 100644
--- a/www/py-dj42-channels-redis/distinfo
+++ b/www/py-channels-redis/distinfo
diff --git a/www/py-dj42-channels-redis/pkg-descr b/www/py-channels-redis/pkg-descr
index 8cd2d32f3a39..8cd2d32f3a39 100644
--- a/www/py-dj42-channels-redis/pkg-descr
+++ b/www/py-channels-redis/pkg-descr
diff --git a/www/py-dj42-django-auditlog/Makefile b/www/py-django-auditlog/Makefile
index a72e7813178a..6cdaedc753db 100644
--- a/www/py-dj42-django-auditlog/Makefile
+++ b/www/py-django-auditlog/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	2.3.0
 PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj42-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Django app that keeps a log of changes made to an object
diff --git a/www/py-dj42-django-auditlog/distinfo b/www/py-django-auditlog/distinfo
index c4d6ad6233fe..c4d6ad6233fe 100644
--- a/www/py-dj42-django-auditlog/distinfo
+++ b/www/py-django-auditlog/distinfo
diff --git a/www/py-dj42-django-auditlog/pkg-descr b/www/py-django-auditlog/pkg-descr
index 3287e3ab624d..3287e3ab624d 100644
--- a/www/py-dj42-django-auditlog/pkg-descr
+++ b/www/py-django-auditlog/pkg-descr
diff --git a/www/py-dj42-django-celery-results/Makefile b/www/py-django-celery-results/Makefile
index 82f507cf6078..921747930fc0 100644
--- a/www/py-dj42-django-celery-results/Makefile
+++ b/www/py-django-celery-results/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	django-celery-results
 PORTVERSION=	2.5.1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj42-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/g}-${PORTVERSION}
 
 MAINTAINER=	grembo@FreeBSD.org
diff --git a/www/py-dj42-django-celery-results/distinfo b/www/py-django-celery-results/distinfo
index 89582fc7649d..89582fc7649d 100644
--- a/www/py-dj42-django-celery-results/distinfo
+++ b/www/py-django-celery-results/distinfo
diff --git a/www/py-dj42-django-celery-results/pkg-descr b/www/py-django-celery-results/pkg-descr
index da24ab97a379..da24ab97a379 100644
--- a/www/py-dj42-django-celery-results/pkg-descr
+++ b/www/py-django-celery-results/pkg-descr
diff --git a/www/py-dj42-django-compression-middleware/Makefile b/www/py-django-compression-middleware/Makefile
index 755cc50bc83a..8c428c327ca8 100644
--- a/www/py-dj42-django-compression-middleware/Makefile
+++ b/www/py-django-compression-middleware/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	django-compression-middleware
 PORTVERSION=	0.5.0
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj42-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Django middleware to compress responses using several algorithms
diff --git a/www/py-dj42-django-compression-middleware/distinfo b/www/py-django-compression-middleware/distinfo
index 5dd1c04b8ec1..5dd1c04b8ec1 100644
--- a/www/py-dj42-django-compression-middleware/distinfo
+++ b/www/py-django-compression-middleware/distinfo
diff --git a/www/py-dj42-django-compression-middleware/pkg-descr b/www/py-django-compression-middleware/pkg-descr
index fe4861de4bcb..fe4861de4bcb 100644
--- a/www/py-dj42-django-compression-middleware/pkg-descr
+++ b/www/py-django-compression-middleware/pkg-descr
diff --git a/www/py-dj42-django-multiselectfield/Makefile b/www/py-django-multiselectfield/Makefile
index 5af9f71000c5..aef2ee82bc24 100644
--- a/www/py-dj42-django-multiselectfield/Makefile
+++ b/www/py-django-multiselectfield/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	django-multiselectfield
 PORTVERSION=	0.1.12
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj42-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Django multiple select field
diff --git a/www/py-dj42-django-multiselectfield/distinfo b/www/py-django-multiselectfield/distinfo
index 98738aa6c5bf..98738aa6c5bf 100644
--- a/www/py-dj42-django-multiselectfield/distinfo
+++ b/www/py-django-multiselectfield/distinfo
diff --git a/www/py-dj42-django-multiselectfield/pkg-descr b/www/py-django-multiselectfield/pkg-descr
index 7a72b1755b70..7a72b1755b70 100644
--- a/www/py-dj42-django-multiselectfield/pkg-descr
+++ b/www/py-django-multiselectfield/pkg-descr
diff --git a/www/py-dj42-djangorestframework-guardian/Makefile b/www/py-djangorestframework-guardian/Makefile
index 9c4dcbc0b8d3..d09409d5958d 100644
--- a/www/py-dj42-djangorestframework-guardian/Makefile
+++ b/www/py-djangorestframework-guardian/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	djangorestframework-guardian
 PORTVERSION=	0.3.0
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj42-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Django Guardian support for Django REST Framework
@@ -12,8 +12,8 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django42>=2.2:www/py-django42@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-djangorestframework>=3.10.3:www/py-dj42-djangorestframework@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-django-guardian>=2.4.0:www/py-dj42-django-guardian@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.10.3:www/py-djangorestframework@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-guardian>=2.4.0:www/py-django-guardian@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-dj42-djangorestframework-guardian/distinfo b/www/py-djangorestframework-guardian/distinfo
index eb5b72f6c861..eb5b72f6c861 100644
--- a/www/py-dj42-djangorestframework-guardian/distinfo
+++ b/www/py-djangorestframework-guardian/distinfo
diff --git a/www/py-dj42-djangorestframework-guardian/pkg-descr b/www/py-djangorestframework-guardian/pkg-descr
index 4fd5ed7e7602..4fd5ed7e7602 100644
--- a/www/py-dj42-djangorestframework-guardian/pkg-descr
+++ b/www/py-djangorestframework-guardian/pkg-descr
diff --git a/www/py-dj42-drf-writable-nested/Makefile b/www/py-drf-writable-nested/Makefile
index 0c57cfbeb42f..79986ad64489 100644
--- a/www/py-dj42-drf-writable-nested/Makefile
+++ b/www/py-drf-writable-nested/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	drf-writable-nested
 PORTVERSION=	0.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj42-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Writable nested model serializer for Django REST framework
@@ -11,7 +11,7 @@ WWW=		https://github.com/beda-software/drf-writable-nested
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django42>=2.2:www/py-django42@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj42-djangorestframework>0:www/py-dj42-djangorestframework@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}djangorestframework>0:www/py-djangorestframework@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/www/py-dj42-drf-writable-nested/distinfo b/www/py-drf-writable-nested/distinfo
index a7fdff392381..a7fdff392381 100644
--- a/www/py-dj42-drf-writable-nested/distinfo
+++ b/www/py-drf-writable-nested/distinfo
diff --git a/www/py-dj42-drf-writable-nested/pkg-descr b/www/py-drf-writable-nested/pkg-descr
index 36f9ed56df82..36f9ed56df82 100644
--- a/www/py-dj42-drf-writable-nested/pkg-descr
+++ b/www/py-drf-writable-nested/pkg-descr