--- MOVED (revision 519042) +++ MOVED (working copy) @@ -13514,3 +13514,5 @@ sysutils/fusefs-ext4fuse|sysutils/fusefs-ext2|2019-12-01|Has expired: Please consider using sysutils/fusefs-ext2 as upstream development is stalled. Contrary to what its name suggests it supports ext2, ext3, ext4 in read/write mode. www/grafana3|www/grafana4|2019-12-01|Has expired: Depends on expired lang/phantomjs www/miniminiweb||2019-12-01|Has expired: Upstream no longer available +www/py-dj21-django-extensions|www/py-dj22-django-extensions|2019-12-04|Renamed because Django 2.1 is End-of-Life and the port was assigned to Django 2.2 +www/py-dj21-djangoql|www/py-dj22-djangoql|2019-12-04|Renamed because Django 2.1 is End-of-Life and the port was assigned to Django 2.2 --- deskutils/py-paperless/Makefile (revision 519042) +++ deskutils/py-paperless/Makefile (working copy) @@ -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_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} \ --- deskutils/py-paperless/pkg-plist (revision 519042) +++ deskutils/py-paperless/pkg-plist (working copy) @@ -731,7 +731,7 @@ %%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 --- www/Makefile (revision 519042) +++ www/Makefile (working copy) @@ -1457,7 +1457,6 @@ SUBDIR += py-dj21-django-cors-headers SUBDIR += py-dj21-django-crispy-forms SUBDIR += py-dj21-django-debug-toolbar - SUBDIR += py-dj21-django-extensions SUBDIR += py-dj21-django-filter SUBDIR += py-dj21-django-js-asset SUBDIR += py-dj21-django-mptt @@ -1465,7 +1464,6 @@ SUBDIR += py-dj21-django-taggit SUBDIR += py-dj21-django-taggit-serializer SUBDIR += py-dj21-django-timezone-field - SUBDIR += py-dj21-djangoql SUBDIR += py-dj21-djangorestframework SUBDIR += py-dj21-drf-yasg SUBDIR += py-dj22-django-auth-ldap @@ -1473,6 +1471,7 @@ SUBDIR += py-dj22-django-cors-headers SUBDIR += py-dj22-django-crispy-forms SUBDIR += py-dj22-django-debug-toolbar + SUBDIR += py-dj22-django-extensions SUBDIR += py-dj22-django-filter SUBDIR += py-dj22-django-formset-js-improved SUBDIR += py-dj22-django-jquery-js @@ -1486,6 +1485,7 @@ SUBDIR += py-dj22-django-timezone-field SUBDIR += py-dj22-django-treebeard SUBDIR += py-dj22-django_csp + SUBDIR += py-dj22-djangoql SUBDIR += py-dj22-djangorestframework SUBDIR += py-dj22-drf-yasg SUBDIR += py-dj22-swapper --- www/py-dj22-django-extensions/Makefile (revision 519042) +++ www/py-dj22-django-extensions/Makefile (working copy) @@ -4,7 +4,7 @@ PORTVERSION= 2.1.7 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= ports@caomhin.org COMMENT= Global custom management extensions for the Django Framework @@ -12,10 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -DEPRECATED= Django 2.1 is now End-of-Life (Since December 2 2019) and no longer supported. Switch to Django 2.2+ versions of this port as soon as possible -EXPIRATION_DATE= 2020-01-31 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>0:www/py-django21@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${PY_FLAVOR} USES= python:3.5+ --- www/py-dj22-djangoql/Makefile (revision 519042) +++ www/py-dj22-djangoql/Makefile (working copy) @@ -4,7 +4,7 @@ PORTVERSION= 0.13.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= grembo@FreeBSD.org COMMENT= Advanced search language for Django, with auto-completion @@ -12,10 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -DEPRECATED= Django 2.1 is now End-of-Life (Since December 2 2019) and no longer supported. Switch to Django 2.2+ versions of this port as soon as possible -EXPIRATION_DATE= 2020-01-31 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>0:www/py-django21@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>=3.8:devel/py-ply@${PY_FLAVOR} USES= python:3.5+ --- www/py-django-extensions/Makefile (revision 519042) +++ www/py-django-extensions/Makefile (working copy) @@ -22,6 +22,6 @@ NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-extensions +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-extensions .include