git: 5848b33d63a8 - main - www/py-django-cacheops: Update to 6.1

The branch main has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5848b33d63a8245c1bab2fd799468adca6655e33

commit 5848b33d63a8245c1bab2fd799468adca6655e33
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2022-06-18 08:37:47 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2022-06-18 08:37:47 +0000

    www/py-django-cacheops: Update to 6.1
    
    * Simplify the CONFLICTS_INSTALL entry as well.  This also reduces
      editing of the Makefile if another port need to be "repo-copied"
      (e.g. for Django 4.1) based on this port in the future.
    
    Changelog:
    
    https://github.com/Suor/django-cacheops/blob/6.1/CHANGELOG
---
 www/py-django-cacheops/Makefile | 6 ++----
 www/py-django-cacheops/distinfo | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/www/py-django-cacheops/Makefile b/www/py-django-cacheops/Makefile
index 3ac834791627..d20e710fc299 100644
--- a/www/py-django-cacheops/Makefile
+++ b/www/py-django-cacheops/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	django-cacheops
-PORTVERSION=	6.0
-PORTREVISION=	1
+PORTVERSION=	6.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,8 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.1:www/py-django32@${PY_FLAVOR} \
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj31-django-cacheops \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-cacheops
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*${PORTNAME}
 
 NO_ARCH=		yes
 
diff --git a/www/py-django-cacheops/distinfo b/www/py-django-cacheops/distinfo
index 03199b8d7ccb..3cd895fc825e 100644
--- a/www/py-django-cacheops/distinfo
+++ b/www/py-django-cacheops/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626791653
-SHA256 (django-cacheops-6.0.tar.gz) = 78e161ebd96a32e28e19ec7da31f2afed9e62a79726b8b5f0ed12dd16c2e5841
-SIZE (django-cacheops-6.0.tar.gz) = 70280
+TIMESTAMP = 1655031005
+SHA256 (django-cacheops-6.1.tar.gz) = b684ef39fd434189d3cbb7d85417cd972af635289a032447982473b4a89f727d
+SIZE (django-cacheops-6.1.tar.gz) = 65308