diff --git a/www/py-wagtail/Makefile b/www/py-wagtail/Makefile index 7d6f7d07b35e..5b6cf1b70644 100644 --- a/www/py-wagtail/Makefile +++ b/www/py-wagtail/Makefile @@ -1,40 +1,41 @@ # Created by: Po-Chuan Hsieh PORTNAME= wagtail PORTVERSION= 2.14.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Django content management system LICENSE= BSD3CLAUSE 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}dj32-django-modelcluster>=5.2<6.0:www/py-dj32-django-modelcluster@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-taggit>=1.0<2.0:www/py-dj32-django-taggit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj32-django-taggit>=1.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} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999<2:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}l18n>=2018.5:devel/py-l18n@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=4.0.0<9.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1<3.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}telepath>=0.1.1<1:devel/py-telepath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}willow>=1.4<1.5:graphics/py-willow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}XlsxWriter>=1.2.8<2.0:textproc/py-xlsxwriter@${PY_FLAVOR} USES= cpe python:3.6+ shebangfix USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes CPE_VENDOR= torchbox SHEBANG_FILES= wagtail/project_template/manage.py .include diff --git a/www/py-wagtail/files/patch-setup.py b/www/py-wagtail/files/patch-setup.py index 9e8a5aac9159..6515d40591b7 100644 --- a/www/py-wagtail/files/patch-setup.py +++ b/www/py-wagtail/files/patch-setup.py @@ -1,14 +1,19 @@ ---- setup.py.orig 2021-07-13 11:20:32 UTC +--- setup.py.orig 2021-10-14 16:25:39 UTC +++ setup.py -@@ -26,9 +26,9 @@ install_requires = [ +@@ -22,13 +22,13 @@ 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-treebeard>=4.2.0,<5.0,!=4.5", "djangorestframework>=3.11.1,<4.0", "django-filter>=2.2,<3.0", - "draftjs_exporter>=2.1.5,<3.0", + "draftjs_exporter>=2.1.5", "Pillow>=4.0.0,<9.0.0", - "beautifulsoup4>=4.8,<4.10", + "beautifulsoup4>=4.8,<4.11", "html5lib>=0.999,<2", "Willow>=1.4,<1.5", "requests>=2.11.1,<3.0",