Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Dec 2019 15:28:54 +0000 (UTC)
From:      Kai Knoblich <kai@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r519149 - in head: . deskutils/py-paperless www www/py-dj21-django-extensions www/py-dj21-djangoql www/py-dj22-django-extensions www/py-dj22-djangoql www/py-django-extensions
Message-ID:  <201912061528.xB6FSsFS000496@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kai
Date: Fri Dec  6 15:28:54 2019
New Revision: 519149
URL: https://svnweb.freebsd.org/changeset/ports/519149

Log:
  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]

Added:
  head/www/py-dj22-django-extensions/
     - copied from r519148, head/www/py-dj21-django-extensions/
  head/www/py-dj22-djangoql/
     - copied from r519148, head/www/py-dj21-djangoql/
Deleted:
  head/www/py-dj21-django-extensions/
  head/www/py-dj21-djangoql/
Modified:
  head/MOVED
  head/deskutils/py-paperless/Makefile
  head/deskutils/py-paperless/pkg-plist
  head/www/Makefile
  head/www/py-dj22-django-extensions/Makefile
  head/www/py-dj22-djangoql/Makefile
  head/www/py-django-extensions/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Dec  6 15:00:54 2019	(r519148)
+++ head/MOVED	Fri Dec  6 15:28:54 2019	(r519149)
@@ -13514,3 +13514,5 @@ net-mgmt/zabbix22-server|net-mgmt/zabbix3-server|2019-
 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-06|Renamed to py-dj22-django-extensions because Django 2.1 has reached its End-of-Life
+www/py-dj21-djangoql|www/py-dj22-djangoql|2019-12-06|Renamed to py-dj22-djangoql because Django 2.1 has reached its End-of-Life

Modified: head/deskutils/py-paperless/Makefile
==============================================================================
--- head/deskutils/py-paperless/Makefile	Fri Dec  6 15:00:54 2019	(r519148)
+++ head/deskutils/py-paperless/Makefile	Fri Dec  6 15:28:54 2019	(r519149)
@@ -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} \

Modified: head/deskutils/py-paperless/pkg-plist
==============================================================================
--- head/deskutils/py-paperless/pkg-plist	Fri Dec  6 15:00:54 2019	(r519148)
+++ head/deskutils/py-paperless/pkg-plist	Fri Dec  6 15:28:54 2019	(r519149)
@@ -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

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Fri Dec  6 15:00:54 2019	(r519148)
+++ head/www/Makefile	Fri Dec  6 15:28:54 2019	(r519149)
@@ -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

Modified: head/www/py-dj22-django-extensions/Makefile
==============================================================================
--- head/www/py-dj21-django-extensions/Makefile	Fri Dec  6 15:00:54 2019	(r519148)
+++ head/www/py-dj22-django-extensions/Makefile	Fri Dec  6 15:28:54 2019	(r519149)
@@ -4,7 +4,7 @@ PORTNAME=	django-extensions
 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 @@ COMMENT=	Global custom management extensions for the D
 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+

Modified: head/www/py-dj22-djangoql/Makefile
==============================================================================
--- head/www/py-dj21-djangoql/Makefile	Fri Dec  6 15:00:54 2019	(r519148)
+++ head/www/py-dj22-djangoql/Makefile	Fri Dec  6 15:28:54 2019	(r519149)
@@ -4,7 +4,7 @@ PORTNAME=	djangoql
 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 @@ COMMENT=	Advanced search language for Django, with aut
 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+

Modified: head/www/py-django-extensions/Makefile
==============================================================================
--- head/www/py-django-extensions/Makefile	Fri Dec  6 15:00:54 2019	(r519148)
+++ head/www/py-django-extensions/Makefile	Fri Dec  6 15:28:54 2019	(r519149)
@@ -22,6 +22,6 @@ USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-extensions
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj22-django-extensions
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912061528.xB6FSsFS000496>