git: 135ab0adbaa4 - main - www/py-wagtail: Update to 2.16.1

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Wed, 30 Mar 2022 22:24:31 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=135ab0adbaa4903256aa0e46d1be3d13ce8cb98b

commit 135ab0adbaa4903256aa0e46d1be3d13ce8cb98b
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-03-30 22:07:25 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-03-30 22:21:21 +0000

    www/py-wagtail: Update to 2.16.1
    
    - Allow build with py-dj32-django-modelcluster 6.0
    
    Changes:        https://github.com/wagtail/wagtail/releases
                    https://docs.wagtail.org/en/latest/releases/index.html
---
 www/py-wagtail/Makefile             |  8 ++++----
 www/py-wagtail/distinfo             |  6 +++---
 www/py-wagtail/files/patch-setup.py | 13 +++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/www/py-wagtail/Makefile b/www/py-wagtail/Makefile
index 13ac43d7a856..2abe060d8137 100644
--- a/www/py-wagtail/Makefile
+++ b/www/py-wagtail/Makefile
@@ -1,7 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	wagtail
-PORTVERSION=	2.15.4
+PORTVERSION=	2.16.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,10 +14,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anyascii>=0.1.5:textproc/py-anyascii@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.8<4.11:www/py-beautifulsoup@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django32>=3.0<3.3:www/py-django32@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django32>=3.2<4.1:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj32-django-filter>=2.2<22:www/py-dj32-django-filter@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj32-django-modelcluster>=5.2<6.0:www/py-dj32-django-modelcluster@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj32-django-taggit>=1.0:www/py-dj32-django-taggit@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj32-django-modelcluster>=5.2<6.1:www/py-dj32-django-modelcluster@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj32-django-taggit>=2.0<3.0:www/py-dj32-django-taggit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj32-django-treebeard>=4.2.0<5.0:www/py-dj32-django-treebeard@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj32-djangorestframework>=3.11.1<4.0:www/py-dj32-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}draftjs-exporter>=2.1.5:www/py-draftjs-exporter@${PY_FLAVOR} \
diff --git a/www/py-wagtail/distinfo b/www/py-wagtail/distinfo
index 5589c87217ed..4ae120ac75ec 100644
--- a/www/py-wagtail/distinfo
+++ b/www/py-wagtail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646058174
-SHA256 (wagtail-2.15.4.tar.gz) = a8b9efe12140972b0c7cad29905505adf42a48094016171c03fdaef90af2639d
-SIZE (wagtail-2.15.4.tar.gz) = 10748155
+TIMESTAMP = 1648249004
+SHA256 (wagtail-2.16.1.tar.gz) = 53dbd62a93da97c4ef6982652a103ab9be5bfe03f34cf5bc796c5d716b9020e8
+SIZE (wagtail-2.16.1.tar.gz) = 8501228
diff --git a/www/py-wagtail/files/patch-setup.py b/www/py-wagtail/files/patch-setup.py
index 776cb2bb7f27..aa8ef39db8eb 100644
--- a/www/py-wagtail/files/patch-setup.py
+++ b/www/py-wagtail/files/patch-setup.py
@@ -1,11 +1,12 @@
---- setup.py.orig	2021-11-11 13:51:05 UTC
+--- setup.py.orig	2022-02-11 13:47:04 UTC
 +++ setup.py
-@@ -22,13 +22,13 @@ except ImportError:
+@@ -21,14 +21,14 @@ except ImportError:
+ 
  install_requires = [
-     "Django>=3.0,<3.3",
-     "django-modelcluster>=5.2,<6.0",
--    "django-taggit>=1.0,<2.0",
-+    "django-taggit>=1.0",
+     "Django>=3.2,<4.1",
+-    "django-modelcluster>=5.2,<6.0",
++    "django-modelcluster>=5.2,<6.1",
+     "django-taggit>=2.0,<3.0",
      "django-treebeard>=4.2.0,<5.0,!=4.5",
      "djangorestframework>=3.11.1,<4.0",
      "django-filter>=2.2,<22",