From 8339efe68f4dd18fb17c45c60075fdaf5e9791a8 Mon Sep 17 00:00:00 2001
From: Kai Knoblich <kai@FreeBSD.org>
Date: Fri, 6 Dec 2019 15:28:54 +0000
Subject: deskutils/py-paperless: Switch to Django 2.2

* Assign the port to Django 2.2 as Django 2.1 has reached its End-of-Life on
  2nd December 2019.

* Also switch www/py-dj21-djangoql to Django 2.2, remove the expiration date
  and rename it to www/py-dj22-djangoql accordingly.

  Do the same for www/py-dj21-django-extensions [1] as both ports are
  required by its only consumer deskutils/py-paperless and were originally
  created for this purpose.

* Bump PORTREVISION due change of the dependencies.

PR:		242438
Approved by:	grembo (maintainer), Kevin Golding (maintainer) [1]
---
 deskutils/py-paperless/Makefile  | 14 +++++++-------
 deskutils/py-paperless/pkg-plist |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'deskutils/py-paperless')

diff --git a/deskutils/py-paperless/Makefile b/deskutils/py-paperless/Makefile
index 0af35814aba7..0b88c2340598 100644
--- a/deskutils/py-paperless/Makefile
+++ b/deskutils/py-paperless/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	paperless
 PORTVERSION=	2.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,12 +13,12 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateparser>=0.7.1:devel/py-dateparser@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers>=2.4.0:www/py-dj21-django-cors-headers@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj21-django-crispy-forms>=1.7.2:www/py-dj21-django-crispy-forms@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj21-django-extensions>=2.1.6:www/py-dj21-django-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj21-django-filter>=2.0.0:www/py-dj21-django-filter@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj21-djangoql>=0.12.4:www/py-dj21-djangoql@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj21-djangorestframework>=3.9.0:www/py-dj21-djangorestframework@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers>=2.4.0:www/py-dj22-django-cors-headers@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj22-django-crispy-forms>=1.7.2:www/py-dj22-django-crispy-forms@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj22-django-extensions>=2.1.6:www/py-dj22-django-extensions@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj22-django-filter>=2.0.0:www/py-dj22-django-filter@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj22-djangoql>=0.12.4:www/py-dj22-djangoql@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework>=3.9.0:www/py-dj22-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fuzzywuzzy>=0.15.1:devel/py-fuzzywuzzy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}langdetect>=1.0.7:textproc/py-langdetect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pdftotext>=2.1.1:textproc/py-pdftotext@${PY_FLAVOR} \
diff --git a/deskutils/py-paperless/pkg-plist b/deskutils/py-paperless/pkg-plist
index 2bb30aa2e9f8..06eb6e5a7c73 100644
--- a/deskutils/py-paperless/pkg-plist
+++ b/deskutils/py-paperless/pkg-plist
@@ -731,7 +731,7 @@ man/man7/paperless.7.gz
 %%WWWDIR%%/static/rest_framework/js/coreapi-0.1.1.js
 %%WWWDIR%%/static/rest_framework/js/csrf.js
 %%WWWDIR%%/static/rest_framework/js/default.js
-%%WWWDIR%%/static/rest_framework/js/jquery-3.3.1.min.js
+%%WWWDIR%%/static/rest_framework/js/jquery-3.4.1.min.js
 %%WWWDIR%%/static/rest_framework/js/prettify-min.js
 @dir(paperless,paperless) %%WWWDIR%%/static
 @dir(paperless,paperless,0700) /var/db/paperless/consume/input
-- 
cgit v1.2.3