From owner-svn-ports-all@freebsd.org Sat May 25 10:10:08 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8166D15A85EF; Sat, 25 May 2019 10:10:08 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 312576A758; Sat, 25 May 2019 10:10:08 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 259D52A33; Sat, 25 May 2019 10:10:08 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4PAA83G039880; Sat, 25 May 2019 10:10:08 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4PAA1J9039846; Sat, 25 May 2019 10:10:01 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201905251010.x4PAA1J9039846@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Sat, 25 May 2019 10:10:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502550 - in head: net-mgmt/netbox www www/py-dj21-django-cors-headers www/py-dj21-django-debug-toolbar www/py-dj21-django-filter www/py-dj21-django-js-asset www/py-dj21-django-mptt www... X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in head: net-mgmt/netbox www www/py-dj21-django-cors-headers www/py-dj21-django-debug-toolbar www/py-dj21-django-filter www/py-dj21-django-js-asset www/py-dj21-django-mptt www/py-dj21-django-tables2 w... X-SVN-Commit-Revision: 502550 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 312576A758 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 May 2019 10:10:08 -0000 Author: kai Date: Sat May 25 10:10:01 2019 New Revision: 502550 URL: https://svnweb.freebsd.org/changeset/ports/502550 Log: net-mgmt/netbox: Update to 2.5.12 and switch to Django 2.2 Upstream decided to switch from Django 2.1 to the 2.2 LTS release to fix a rather annoying bug that generated intermittent errors when objects were deleted/manipulated. Therefore the same procedure must be done in almost the same way as in r492690 to make NetBox compatible with Django 2.2 in the ports tree. That means to repocopy the required Django 1.11 ports, assign them to Django 2.2, limit them to Python 3.5+ and update all related CONFLICTS_INSTALL entries accordingly: * www/py-dj22-django-cors-headers [1] * www/py-dj22-django-debug-toolbar * www/py-dj22-django-filter * www/py-dj22-django-js-asset * www/py-dj22-django-mptt * www/py-dj22-django-tables2 * www/py-dj22-django-taggit-serializer * www/py-dj22-django-timezone-field * www/py-dj22-drf-yasg [1] www/py-django-cors-headers was repocopied from r500510 to keep on the 2.5.x branch as 3.x introduced some backward incompatibilities that haven't been fully tested, yet. Changelog since 2.5.10: Enhancements: * Improve natural ordering of device components * Add support for filtering cables by connected device * Add decommissioning status for devices Bug Fixes: * Fix natural ordering of device components (after it has been improved before) * Upgrade Django requirement to 2.2 to fix object deletion issue in the changelog middleware * Preserve multiselect filter values when updating per-page count for list views * Fix ordering of interface connections list by termination B name/device * Fix tagged_items count in tags API endpoint * Disable last_login update on login when maintenance mode is enabled Reviewed by: koobs, miwi Differential Revision: https://reviews.freebsd.org/D20103 Added: head/www/py-dj22-django-cors-headers/ - copied from r500510, head/www/py-django-cors-headers/ head/www/py-dj22-django-debug-toolbar/ - copied from r502492, head/www/py-django-debug-toolbar/ head/www/py-dj22-django-filter/ - copied from r502492, head/www/py-django-filter/ head/www/py-dj22-django-js-asset/ - copied from r502492, head/www/py-django-js-asset/ head/www/py-dj22-django-mptt/ - copied from r502492, head/www/py-django-mptt/ head/www/py-dj22-django-tables2/ - copied from r502492, head/www/py-django-tables2/ head/www/py-dj22-django-taggit-serializer/ - copied from r502492, head/www/py-django-taggit-serializer/ head/www/py-dj22-django-timezone-field/ - copied from r502492, head/www/py-django-timezone-field/ head/www/py-dj22-drf-yasg/ - copied from r502492, head/www/py-drf-yasg/ Modified: head/net-mgmt/netbox/Makefile head/net-mgmt/netbox/distinfo head/www/Makefile head/www/py-dj21-django-cors-headers/Makefile head/www/py-dj21-django-debug-toolbar/Makefile head/www/py-dj21-django-filter/Makefile head/www/py-dj21-django-js-asset/Makefile head/www/py-dj21-django-mptt/Makefile head/www/py-dj21-django-tables2/Makefile head/www/py-dj21-django-taggit-serializer/Makefile head/www/py-dj21-django-timezone-field/Makefile head/www/py-dj21-drf-yasg/Makefile head/www/py-dj22-django-cors-headers/Makefile head/www/py-dj22-django-debug-toolbar/Makefile head/www/py-dj22-django-filter/Makefile head/www/py-dj22-django-js-asset/Makefile head/www/py-dj22-django-mptt/Makefile head/www/py-dj22-django-tables2/Makefile head/www/py-dj22-django-taggit-serializer/Makefile head/www/py-dj22-django-timezone-field/Makefile head/www/py-dj22-drf-yasg/Makefile head/www/py-django-cors-headers/Makefile head/www/py-django-debug-toolbar/Makefile head/www/py-django-filter/Makefile head/www/py-django-js-asset/Makefile head/www/py-django-mptt/Makefile head/www/py-django-tables2/Makefile head/www/py-django-taggit-serializer/Makefile head/www/py-django-timezone-field/Makefile head/www/py-drf-yasg/Makefile Modified: head/net-mgmt/netbox/Makefile ============================================================================== --- head/net-mgmt/netbox/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/net-mgmt/netbox/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -2,7 +2,7 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 2.5.10 +DISTVERSION= 2.5.12 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org @@ -11,17 +11,17 @@ COMMENT= IP address management tool LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>=2.1.5:www/py-django21@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers>=2.4.0:www/py-dj21-django-cors-headers@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar>=1.11:www/py-dj21-django-debug-toolbar@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-filter>=2.0.0:www/py-dj21-django-filter@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-mptt>=0.9.1:www/py-dj21-django-mptt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2>=2.0.3:www/py-dj21-django-tables2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit>=0.23.0:www/py-dj21-django-taggit@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer>=0.1.7:www/py-dj21-django-taggit-serializer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field>=3.0:www/py-dj21-django-timezone-field@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-djangorestframework>=3.9.0:www/py-dj21-djangorestframework@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg>=1.14.0:www/py-dj21-drf-yasg@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2,<2.3:www/py-django22@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers>=2.4.0:www/py-dj22-django-cors-headers@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar>=1.11:www/py-dj22-django-debug-toolbar@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-filter>=2.0.0:www/py-dj22-django-filter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-mptt>=0.9.1:www/py-dj22-django-mptt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-tables2>=2.0.3:www/py-dj22-django-tables2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit>=0.24.0:www/py-dj22-django-taggit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit-serializer>=0.1.7:www/py-dj22-django-taggit-serializer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-timezone-field>=3.0:www/py-dj22-django-timezone-field@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework>=3.9.0:www/py-dj22-djangorestframework@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-drf-yasg>=1.14.0:www/py-dj22-drf-yasg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gfm>=0.1.4:textproc/py-gfm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}graphviz>=0.10.1:graphics/py-graphviz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \ Modified: head/net-mgmt/netbox/distinfo ============================================================================== --- head/net-mgmt/netbox/distinfo Sat May 25 10:06:31 2019 (r502549) +++ head/net-mgmt/netbox/distinfo Sat May 25 10:10:01 2019 (r502550) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554758567 -SHA256 (digitalocean-netbox-v2.5.10_GH0.tar.gz) = 1618bd199e0376899a4f5eaa2fa680d0873631dd0af31333ded6d54fb18c502b -SIZE (digitalocean-netbox-v2.5.10_GH0.tar.gz) = 2363340 +TIMESTAMP = 1558093965 +SHA256 (digitalocean-netbox-v2.5.12_GH0.tar.gz) = 21b0d08c73808240a427d4adb5ca861fea6ad18d8c2acf8532db9b356853f419 +SIZE (digitalocean-netbox-v2.5.12_GH0.tar.gz) = 2364874 Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -1483,9 +1483,18 @@ SUBDIR += py-dj21-djangoql SUBDIR += py-dj21-djangorestframework SUBDIR += py-dj21-drf-yasg + SUBDIR += py-dj22-django-cors-headers + SUBDIR += py-dj22-django-debug-toolbar + SUBDIR += py-dj22-django-filter + SUBDIR += py-dj22-django-js-asset + SUBDIR += py-dj22-django-mptt + SUBDIR += py-dj22-django-tables2 SUBDIR += py-dj22-django-taggit + SUBDIR += py-dj22-django-taggit-serializer + SUBDIR += py-dj22-django-timezone-field SUBDIR += py-dj22-django-treebeard SUBDIR += py-dj22-djangorestframework + SUBDIR += py-dj22-drf-yasg SUBDIR += py-django SUBDIR += py-django-allauth SUBDIR += py-django-annotations Modified: head/www/py-dj21-django-cors-headers/Makefile ============================================================================== --- head/www/py-dj21-django-cors-headers/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-dj21-django-cors-headers/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -17,6 +17,7 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-cors-headers +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-cors-headers \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers .include Modified: head/www/py-dj21-django-debug-toolbar/Makefile ============================================================================== --- head/www/py-dj21-django-debug-toolbar/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-dj21-django-debug-toolbar/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -20,6 +20,7 @@ USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar .include Modified: head/www/py-dj21-django-filter/Makefile ============================================================================== --- head/www/py-dj21-django-filter/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-dj21-django-filter/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -18,6 +18,7 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-filter +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-filter \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-filter .include Modified: head/www/py-dj21-django-js-asset/Makefile ============================================================================== --- head/www/py-dj21-django-js-asset/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-dj21-django-js-asset/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -18,6 +18,7 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-js-asset +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-js-asset \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-js-asset .include Modified: head/www/py-dj21-django-mptt/Makefile ============================================================================== --- head/www/py-dj21-django-mptt/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-dj21-django-mptt/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -21,6 +21,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ - ${PYTHON_PKGNAMEPREFIX}django-mptt + ${PYTHON_PKGNAMEPREFIX}django-mptt \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-mptt .include Modified: head/www/py-dj21-django-tables2/Makefile ============================================================================== --- head/www/py-dj21-django-tables2/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-dj21-django-tables2/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -20,6 +20,7 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-tables2 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-tables2 \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-tables2 .include Modified: head/www/py-dj21-django-taggit-serializer/Makefile ============================================================================== --- head/www/py-dj21-django-taggit-serializer/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-dj21-django-taggit-serializer/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -19,6 +19,7 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-taggit-serializer +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-taggit-serializer \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit-serializer .include Modified: head/www/py-dj21-django-timezone-field/Makefile ============================================================================== --- head/www/py-dj21-django-timezone-field/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-dj21-django-timezone-field/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -19,6 +19,7 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-timezone-field +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-timezone-field \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-timezone-field .include Modified: head/www/py-dj21-drf-yasg/Makefile ============================================================================== --- head/www/py-dj21-drf-yasg/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-dj21-drf-yasg/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -27,6 +27,7 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}drf-yasg +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}drf-yasg \ + ${PYTHON_PKGNAMEPREFIX}dj22-drf-yasg .include Modified: head/www/py-dj22-django-cors-headers/Makefile ============================================================================== --- head/www/py-django-cors-headers/Makefile Tue Apr 30 17:14:14 2019 (r500510) +++ head/www/py-dj22-django-cors-headers/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -4,19 +4,20 @@ PORTNAME= django-cors-headers PORTVERSION= 2.5.3 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- -MAINTAINER= swills@FreeBSD.org +MAINTAINER= kai@FreeBSD.org COMMENT= Handles server headers required for Cross-Origin Resource Sharing LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-cors-headers \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers .include Modified: head/www/py-dj22-django-debug-toolbar/Makefile ============================================================================== --- head/www/py-django-debug-toolbar/Makefile Fri May 24 21:13:25 2019 (r502492) +++ head/www/py-dj22-django-debug-toolbar/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -5,21 +5,22 @@ PORTNAME= django-debug-toolbar PORTVERSION= 1.11 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- -MAINTAINER= sunpoet@FreeBSD.org +MAINTAINER= kai@FreeBSD.org COMMENT= Configurable set of panels to display debug information LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar .include Modified: head/www/py-dj22-django-filter/Makefile ============================================================================== --- head/www/py-django-filter/Makefile Fri May 24 21:13:25 2019 (r502492) +++ head/www/py-dj22-django-filter/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -4,7 +4,7 @@ PORTNAME= django-filter DISTVERSION= 2.1.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Dynamic filtering for querysets with Django @@ -12,12 +12,13 @@ COMMENT= Dynamic filtering for querysets with Django LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} -USES= python:3.4+ +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-filter +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-filter \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-filter .include Modified: head/www/py-dj22-django-js-asset/Makefile ============================================================================== --- head/www/py-django-js-asset/Makefile Fri May 24 21:13:25 2019 (r502492) +++ head/www/py-dj22-django-js-asset/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -4,7 +4,7 @@ PORTNAME= django-js-asset DISTVERSION= 1.1.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Insert script tags with additional attributes for django.forms.Media @@ -12,12 +12,13 @@ COMMENT= Insert script tags with additional attributes LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-js-asset \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset .include Modified: head/www/py-dj22-django-mptt/Makefile ============================================================================== --- head/www/py-django-mptt/Makefile Fri May 24 21:13:25 2019 (r502492) +++ head/www/py-dj22-django-mptt/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -5,22 +5,23 @@ PORTNAME= django-mptt PORTVERSION= 0.9.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- -MAINTAINER= cs@FreeBSD.org +MAINTAINER= kai@FreeBSD.org COMMENT= Utilities for implementing Modified Preorder Tree Traversal in Django LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR}\ - ${PYTHON_PKGNAMEPREFIX}django-js-asset>0:www/py-django-js-asset@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}\ + ${PYTHON_PKGNAMEPREFIX}dj22-django-js-asset>0:www/py-dj22-django-js-asset@${PY_FLAVOR} -USES= gettext python +USES= gettext python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ + ${PYTHON_PKGNAMEPREFIX}django-mptt \ ${PYTHON_PKGNAMEPREFIX}dj21-django-mptt .include Modified: head/www/py-dj22-django-tables2/Makefile ============================================================================== --- head/www/py-django-tables2/Makefile Fri May 24 21:13:25 2019 (r502492) +++ head/www/py-dj22-django-tables2/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -5,7 +5,7 @@ PORTNAME= django-tables2 DISTVERSION= 2.0.6 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Table/data-grid framework for Django @@ -13,13 +13,14 @@ COMMENT= Table/data-grid framework for Django LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tablib>=0:textproc/py-tablib@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-tables2 \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2 .include Modified: head/www/py-dj22-django-taggit-serializer/Makefile ============================================================================== --- head/www/py-django-taggit-serializer/Makefile Fri May 24 21:13:25 2019 (r502492) +++ head/www/py-dj22-django-taggit-serializer/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -4,7 +4,7 @@ PORTNAME= django-taggit-serializer DISTVERSION= 0.1.7 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Django Taggit serializer for the Django REST Framework @@ -12,13 +12,14 @@ COMMENT= Django Taggit serializer for the Django REST LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-taggit>=0:www/py-django-taggit@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit>=0:www/py-dj22-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-taggit-serializer \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer .include Modified: head/www/py-dj22-django-timezone-field/Makefile ============================================================================== --- head/www/py-django-timezone-field/Makefile Fri May 24 21:13:25 2019 (r502492) +++ head/www/py-dj22-django-timezone-field/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -4,7 +4,7 @@ PORTNAME= django-timezone-field DISTVERSION= 3.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Provides database and form fields for pytz timezone objects for Django @@ -12,13 +12,14 @@ COMMENT= Provides database and form fields for pytz ti LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-timezone-field \ + ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field .include Modified: head/www/py-dj22-drf-yasg/Makefile ============================================================================== --- head/www/py-drf-yasg/Makefile Fri May 24 21:13:25 2019 (r502492) +++ head/www/py-dj22-drf-yasg/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -4,7 +4,7 @@ PORTNAME= drf-yasg DISTVERSION= 1.15.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- MAINTAINER= kai@FreeBSD.org COMMENT= Yet Another Swagger Generator @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.0.6:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11.7:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.7.7:www/py-djangorestframework@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11.7:www/py-django22@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework>=3.7.7:www/py-dj22-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreapi>=2.3.3:devel/py-coreapi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreschema>=0.0.4:devel/py-coreschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1:devel/py-inflection@${PY_FLAVOR} \ @@ -23,10 +23,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11.7: ${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}drf-yasg \ + ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg .include Modified: head/www/py-django-cors-headers/Makefile ============================================================================== --- head/www/py-django-cors-headers/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-django-cors-headers/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -17,6 +17,7 @@ USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-cors-headers \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers .include Modified: head/www/py-django-debug-toolbar/Makefile ============================================================================== --- head/www/py-django-debug-toolbar/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-django-debug-toolbar/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -20,6 +20,7 @@ USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-debug-toolbar \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar .include Modified: head/www/py-django-filter/Makefile ============================================================================== --- head/www/py-django-filter/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-django-filter/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -18,6 +18,7 @@ USES= python:3.4+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-filter +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-filter \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-filter .include Modified: head/www/py-django-js-asset/Makefile ============================================================================== --- head/www/py-django-js-asset/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-django-js-asset/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -18,6 +18,7 @@ USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-js-asset \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-js-asset .include Modified: head/www/py-django-mptt/Makefile ============================================================================== --- head/www/py-django-mptt/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-django-mptt/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -21,6 +21,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ - ${PYTHON_PKGNAMEPREFIX}dj21-django-mptt + ${PYTHON_PKGNAMEPREFIX}dj21-django-mptt \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-mptt .include Modified: head/www/py-django-tables2/Makefile ============================================================================== --- head/www/py-django-tables2/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-django-tables2/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -20,6 +20,7 @@ USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-tables2 \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-tables2 .include Modified: head/www/py-django-taggit-serializer/Makefile ============================================================================== --- head/www/py-django-taggit-serializer/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-django-taggit-serializer/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -19,6 +19,7 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-taggit-serializer \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit-serializer .include Modified: head/www/py-django-timezone-field/Makefile ============================================================================== --- head/www/py-django-timezone-field/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-django-timezone-field/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -19,6 +19,7 @@ USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-timezone-field \ + ${PYTHON_PKGNAMEPREFIX}dj22-django-timezone-field .include Modified: head/www/py-drf-yasg/Makefile ============================================================================== --- head/www/py-drf-yasg/Makefile Sat May 25 10:06:31 2019 (r502549) +++ head/www/py-drf-yasg/Makefile Sat May 25 10:10:01 2019 (r502550) @@ -27,6 +27,7 @@ USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg \ + ${PYTHON_PKGNAMEPREFIX}dj22-drf-yasg .include