Attachment 192021 Details for Bug 227149 – Proposed patch

[patch] Proposed patch

assign_django18_ports_to_django_metaport.patch (text/plain), 43.48 KB, created by Kai Knoblich on 2018-04-01 00:19:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2018-04-01 00:19:57 UTC

Size: 43.48 KB

patch

obsolete

>Index: devel/py-django-rq/Makefile
>===================================================================
>--- devel/py-django-rq/Makefile	(revision 466103)
>+++ devel/py-django-rq/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	django-rq
> PORTVERSION=	1.0.1
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -14,7 +14,7 @@
> LICENSE=	MIT
> 
> TEST_DEPENDS=	redis-server:databases/redis
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq@${FLAVOR}
> 
> NO_ARCH=	yes
>Index: devel/py-django-tastypie-mongoengine/Makefile
>===================================================================
>--- devel/py-django-tastypie-mongoengine/Makefile	(revision 466103)
>+++ devel/py-django-tastypie-mongoengine/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=		django-tastypie-mongoengine
> PORTVERSION=		0.4.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> DISTVERSIONPREFIX=	v
> CATEGORIES=		devel
> PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
>@@ -16,7 +16,7 @@
> 
> RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:www/py-django-tastypie@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USE_GITHUB=		yes
> GH_ACCOUNT=		wlanslovenija
>Index: devel/py-pytest-django/Makefile
>===================================================================
>--- devel/py-pytest-django/Makefile	(revision 466103)
>+++ devel/py-pytest-django/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	pytest-django
> PORTVERSION=	2.9.1
>+PORTREVISION=	1
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -10,7 +11,7 @@
> MAINTAINER=	tj@FreeBSD.org
> COMMENT=	Django plugin for py.test
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-configurations>=0:www/py-django-configurations@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${FLAVOR} \
>Index: devel/py-semantic_version/Makefile
>===================================================================
>--- devel/py-semantic_version/Makefile	(revision 466103)
>+++ devel/py-semantic_version/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	semantic_version
> PORTVERSION=	2.6.0
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	devel python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	rbarrois
>Index: graphics/py-django-easy-thumbnails/Makefile
>===================================================================
>--- graphics/py-django-easy-thumbnails/Makefile	(revision 466103)
>+++ graphics/py-django-easy-thumbnails/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	easy-thumbnails
> PORTVERSION=	2.3
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -12,7 +13,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: graphics/py-sorl-thumbnail/Makefile
>===================================================================
>--- graphics/py-sorl-thumbnail/Makefile	(revision 466103)
>+++ graphics/py-sorl-thumbnail/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	sorl-thumbnail
> PORTVERSION=	3.2.5
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -30,7 +30,7 @@
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MDJANGO}
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> .endif
> 
> .if ${PORT_OPTIONS:MPDF}
>Index: www/feedjack/Makefile
>===================================================================
>--- www/feedjack/Makefile	(revision 466103)
>+++ www/feedjack/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	feedjack
> PORTVERSION=	0.9.16
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www
> MASTER_SITES=	http://www.feedjack.org/download/
> DISTNAME=	Feedjack-${PORTVERSION}
>@@ -11,7 +11,7 @@
> COMMENT=	Feed aggregator written in Python using the Django framework
> 
> RUN_DEPENDS=	${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${FLAVOR} \
>-		django-admin.py:www/py-django18@${FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> DIST_SUBDIR=	python
> USES=		python:2.7
>Index: www/py-django-annoying/Makefile
>===================================================================
>--- www/py-django-annoying/Makefile	(revision 466103)
>+++ www/py-django-annoying/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-annoying
> PORTVERSION=	0.10.3
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +13,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USE_GITHUB=	yes
> 
>Index: www/py-django-appmedia/Makefile
>===================================================================
>--- www/py-django-appmedia/Makefile	(revision 466103)
>+++ www/py-django-appmedia/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-appmedia
> PORTVERSION=	1.0.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,7 +11,7 @@
> MAINTAINER=	kurt.lidl@cello.com
> COMMENT=	Serve static content from within django app directories
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python:2.7
> USE_PYTHON=	autoplist distutils
>Index: www/py-django-assets/Makefile
>===================================================================
>--- www/py-django-assets/Makefile	(revision 466103)
>+++ www/py-django-assets/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	django-assets
> PORTVERSION=	0.12
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,7 +12,7 @@
> 
> LICENSE=	BSD2CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets@${FLAVOR}
> 
> USES=		python
>Index: www/py-django-auth-ldap/Makefile
>===================================================================
>--- www/py-django-auth-ldap/Makefile	(revision 466103)
>+++ www/py-django-auth-ldap/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-auth-ldap
> PORTVERSION=	1.2.7
>+PORTREVISION=	1
> CATEGORIES=	www security python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3.1:www/py-django@${FLAVOR}
> 
> NO_ARCH=	yes
> USES=		python
>Index: www/py-django-babel/Makefile
>===================================================================
>--- www/py-django-babel/Makefile	(revision 466103)
>+++ www/py-django-babel/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-babel
> PORTVERSION=	0.5.1
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel@${FLAVOR}
> 
> NO_ARCH=	yes
>Index: www/py-django-bitfield/Makefile
>===================================================================
>--- www/py-django-bitfield/Makefile	(revision 466103)
>+++ www/py-django-bitfield/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	django-bitfield
> PORTVERSION=	1.9.3
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +13,7 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
> 
> NO_ARCH=	yes
>Index: www/py-django-bootstrap-form/Makefile
>===================================================================
>--- www/py-django-bootstrap-form/Makefile	(revision 466103)
>+++ www/py-django-bootstrap-form/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-bootstrap-form
> PORTVERSION=	3.3
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -15,6 +16,6 @@
> USES=		python
> USE_PYTHON=	distutils autoplist
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.5:www/py-django@${FLAVOR}
> 
> .include <bsd.port.mk>
>Index: www/py-django-caching-app-plugins/Makefile
>===================================================================
>--- www/py-django-caching-app-plugins/Makefile	(revision 466103)
>+++ www/py-django-caching-app-plugins/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-caching-app-plugins
> PORTVERSION=	0.1.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -15,7 +15,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE.rst
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR}
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-classy-tags/Makefile
>===================================================================
>--- www/py-django-classy-tags/Makefile	(revision 466103)
>+++ www/py-django-classy-tags/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-classy-tags
> PORTVERSION=	0.8.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -10,7 +11,7 @@
> MAINTAINER=	cs@FreeBSD.org
> COMMENT=	Class based template tags for Django
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: www/py-django-cms/Makefile
>===================================================================
>--- www/py-django-cms/Makefile	(revision 466103)
>+++ www/py-django-cms/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-cms
> PORTVERSION=	2.4.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.7.3:databases/py-south@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}django>=1.4:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.4.1:www/py-django-classy-tags@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.5.2:www/py-django-mptt@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.6.1:www/py-django-sekizai@${FLAVOR} \
>Index: www/py-django-configurations/Makefile
>===================================================================
>--- www/py-django-configurations/Makefile	(revision 466103)
>+++ www/py-django-configurations/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	configurations
> PORTVERSION=	1.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	GH
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -10,7 +11,7 @@
> MAINTAINER=	tj@FreeBSD.org
> COMMENT=	Django project configuration using the composability of Python classes
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-constance/Makefile
>===================================================================
>--- www/py-django-constance/Makefile	(revision 466103)
>+++ www/py-django-constance/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-constance
> PORTVERSION=	2.2.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	GH
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -16,7 +17,7 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: www/py-django-cors-headers/Makefile
>===================================================================
>--- www/py-django-cors-headers/Makefile	(revision 466103)
>+++ www/py-django-cors-headers/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	django-cors-headers
> PORTVERSION=	2.2.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,7 +12,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-dpaste/Makefile
>===================================================================
>--- www/py-django-dpaste/Makefile	(revision 466103)
>+++ www/py-django-dpaste/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	dpaste
> PORTVERSION=	2.10
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -13,7 +14,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.8.3:www/py-django-mptt@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR}
>Index: www/py-django-evolution/Makefile
>===================================================================
>--- www/py-django-evolution/Makefile	(revision 466103)
>+++ www/py-django-evolution/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-evolution
> PORTVERSION=	0.7.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> DISTVERSIONPREFIX=	release-
> CATEGORIES=	www python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USE_GITHUB=	yes
> 
>Index: www/py-django-filer/Makefile
>===================================================================
>--- www/py-django-filer/Makefile	(revision 466103)
>+++ www/py-django-filer/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-filer
> PORTVERSION=	0.8.6
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,7 +11,7 @@
> MAINTAINER=	xenophon+fbsdports@irtnog.org
> COMMENT=	File and Image Management Application for django
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=0:graphics/py-django-easy-thumbnails@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR}
> 
>Index: www/py-django-happenings/Makefile
>===================================================================
>--- www/py-django-happenings/Makefile	(revision 466103)
>+++ www/py-django-happenings/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-happenings
> PORTVERSION=	0.3.3
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
> 
> CONFLICTS_INSTALL= py*-django-mptt
>Index: www/py-django-haystack/Makefile
>===================================================================
>--- www/py-django-haystack/Makefile	(revision 466103)
>+++ www/py-django-haystack/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-haystack
> PORTVERSION=	2.5.0
>+PORTREVISION=	1
> CATEGORIES=	www databases python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> NO_ARCH=	yes
> USES=		python
>Index: www/py-django-js-asset/Makefile
>===================================================================
>--- www/py-django-js-asset/Makefile	(revision 466103)
>+++ www/py-django-js-asset/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	django-js-asset
> DISTVERSION=	1.0.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} # >= 1.8
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-json-rpc/Makefile
>===================================================================
>--- www/py-django-json-rpc/Makefile	(revision 466103)
>+++ www/py-django-json-rpc/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-json-rpc
> PORTVERSION=	0.6.2
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www python
> MASTER_SITES=	http://wiki.pcbsd.org/ports/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,7 +11,7 @@
> MAINTAINER=	jhixson@gmail.com
> COMMENT=	Simple JSON-RPC implementation for Django
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> LICENSE=	MIT
> 
>Index: www/py-django-jsonfield/Makefile
>===================================================================
>--- www/py-django-jsonfield/Makefile	(revision 466103)
>+++ www/py-django-jsonfield/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	jsonfield
> PORTVERSION=	1.0.3
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	GH
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -10,7 +11,7 @@
> MAINTAINER=	tj@FreeBSD.org
> COMMENT=	Reusable JSONField model for Django to store ad-hoc data
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-keyedcache/Makefile
>===================================================================
>--- www/py-django-keyedcache/Makefile	(revision 466103)
>+++ www/py-django-keyedcache/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-keyedcache
> PORTVERSION=	1.5.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-ldapdb/Makefile
>===================================================================
>--- www/py-django-ldapdb/Makefile	(revision 466103)
>+++ www/py-django-ldapdb/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-ldapdb
> PORTVERSION=	0.3.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> 
> LICENSE=	BSD2CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6.0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.6.0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}ldap>=2.0:net/py-ldap@${FLAVOR}
> 
> USES=		python:2.7
>Index: www/py-django-livesettings/Makefile
>===================================================================
>--- www/py-django-livesettings/Makefile	(revision 466103)
>+++ www/py-django-livesettings/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-livesettings
> DISTVERSION=	1.4-16
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP/source/d/${PORTNAME}
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR}
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python:2.7
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-markdownx/Makefile
>===================================================================
>--- www/py-django-markdownx/Makefile	(revision 466103)
>+++ www/py-django-markdownx/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-markdownx
> PORTVERSION=	2.0.21
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +13,7 @@
> 
> LICENSE=	GPLv2
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
> 
> USE_GITHUB=	yes
>Index: www/py-django-mptt/Makefile
>===================================================================
>--- www/py-django-mptt/Makefile	(revision 466103)
>+++ www/py-django-mptt/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-mptt
> PORTVERSION=	0.9.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -13,7 +13,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} # >= 1.8
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> CONFLICTS_INSTALL=py*-django-happenings
> 
>Index: www/py-django-netfields/Makefile
>===================================================================
>--- www/py-django-netfields/Makefile	(revision 466103)
>+++ www/py-django-netfields/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	django-netfields
> DISTVERSION=	0.8
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +13,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} \
> 		${PY_IPADDRESS}
> 
>Index: www/py-django-openid-auth/Makefile
>===================================================================
>--- www/py-django-openid-auth/Makefile	(revision 466103)
>+++ www/py-django-openid-auth/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-openid-auth
> PORTVERSION=	0.4
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www security python
> MASTER_SITES=	http://launchpadlibrarian.net/80020365/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,7 +14,7 @@
> 
> LICENSE=	BSD2CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3.1:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:security/py-python-openid@${FLAVOR}
> 
> USES=		python:2.7
>Index: www/py-django-paging/Makefile
>===================================================================
>--- www/py-django-paging/Makefile	(revision 466103)
>+++ www/py-django-paging/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	paging
> PORTVERSION=	0.2.5
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -11,7 +12,7 @@
> MAINTAINER=	tj@FreeBSD.org
> COMMENT=	Paging module for Django
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-picklefield/Makefile
>===================================================================
>--- www/py-django-picklefield/Makefile	(revision 466103)
>+++ www/py-django-picklefield/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-picklefield
> PORTVERSION=	1.0.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist concurrent distutils
>Index: www/py-django-post_office/Makefile
>===================================================================
>--- www/py-django-post_office/Makefile	(revision 466103)
>+++ www/py-django-post_office/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	django-post_office
> DISTVERSIONPREFIX=	v
> DISTVERSION=	3.0.4
>+PORTREVISION=	1
> CATEGORIES=	www python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -14,7 +15,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-jsonfield>=0:www/py-django-jsonfield@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: www/py-django-profiles/Makefile
>===================================================================
>--- www/py-django-profiles/Makefile	(revision 466103)
>+++ www/py-django-profiles/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-profiles
> PORTVERSION=	0.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	http://bitbucket.org/ubernostrum/django-profiles/get/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -15,7 +15,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> WRKSRC=	${WRKDIR}/${PORTNAME}
> USES=		python
>Index: www/py-django-pyscss/Makefile
>===================================================================
>--- www/py-django-pyscss/Makefile	(revision 466103)
>+++ www/py-django-pyscss/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-pyscss
> PORTVERSION=	2.0.2
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${FLAVOR}
> 
> NO_ARCH=	yes
>Index: www/py-django-recaptcha/Makefile
>===================================================================
>--- www/py-django-recaptcha/Makefile	(revision 466103)
>+++ www/py-django-recaptcha/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	recaptcha
> PORTVERSION=	1.1.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -11,7 +12,7 @@
> MAINTAINER=	tj@FreeBSD.org
> COMMENT=	Django reCAPTCHA form field/widget integration app
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-reversion/Makefile
>===================================================================
>--- www/py-django-reversion/Makefile	(revision 466103)
>+++ www/py-django-reversion/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-reversion
> PORTVERSION=	1.6.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python:2.7
> USE_PYTHON=	distutils
>Index: www/py-django-sekizai/Makefile
>===================================================================
>--- www/py-django-sekizai/Makefile	(revision 466103)
>+++ www/py-django-sekizai/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-sekizai
> PORTVERSION=	0.7
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,7 +11,7 @@
> MAINTAINER=	xenophon+fbsdports@irtnog.org
> COMMENT=	Block templating system for Django
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:www/py-django-classy-tags@${FLAVOR}
> 
> USES=		python:2.7
>Index: www/py-django-signals-ahoy/Makefile
>===================================================================
>--- www/py-django-signals-ahoy/Makefile	(revision 466103)
>+++ www/py-django-signals-ahoy/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-signals-ahoy
> PORTVERSION=	0.1.3
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP/source/d/${PORTNAME}
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,7 +14,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> NO_ARCH=	yes
> USES=		python
>Index: www/py-django-simple-captcha/Makefile
>===================================================================
>--- www/py-django-simple-captcha/Makefile	(revision 466103)
>+++ www/py-django-simple-captcha/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-simple-captcha
> PORTVERSION=	0.4.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${FLAVOR}
> 
>Index: www/py-django-simple-history/Makefile
>===================================================================
>--- www/py-django-simple-history/Makefile	(revision 466103)
>+++ www/py-django-simple-history/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-simple-history
> PORTVERSION=	1.8.2
>+PORTREVISION=	1
> CATEGORIES=	www python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -11,7 +12,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} # >= 1.8
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USE_GITHUB=	yes
> 
>Index: www/py-django-social-auth/Makefile
>===================================================================
>--- www/py-django-social-auth/Makefile	(revision 466103)
>+++ www/py-django-social-auth/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	social-auth
> PORTVERSION=	0.7.28
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -11,7 +12,7 @@
> MAINTAINER=	tj@FreeBSD.org
> COMMENT=	Setup social authentication/authorization mechanism for Django
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:security/py-python-social-auth@${FLAVOR}
> 
> USES=		python
>Index: www/py-django-statici18n/Makefile
>===================================================================
>--- www/py-django-statici18n/Makefile	(revision 466103)
>+++ www/py-django-statici18n/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-statici18n
> PORTVERSION=	1.7.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf@${FLAVOR}
> 
> USES=		python
>Index: www/py-django-subdomains/Makefile
>===================================================================
>--- www/py-django-subdomains/Makefile	(revision 466103)
>+++ www/py-django-subdomains/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-subdomains
> PORTVERSION=	2.1.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +13,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-sudo/Makefile
>===================================================================
>--- www/py-django-sudo/Makefile	(revision 466103)
>+++ www/py-django-sudo/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	sudo
> PORTVERSION=	2.1.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -13,7 +14,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-tables2/Makefile
>===================================================================
>--- www/py-django-tables2/Makefile	(revision 466103)
>+++ www/py-django-tables2/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-tables2
> PORTVERSION=	1.2.9
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
> 
> NO_ARCH=	yes
>Index: www/py-django-taggit/Makefile
>===================================================================
>--- www/py-django-taggit/Makefile	(revision 466103)
>+++ www/py-django-taggit/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	django-taggit
> PORTVERSION=	0.15.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +12,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: www/py-django-tastypie/Makefile
>===================================================================
>--- www/py-django-tastypie/Makefile	(revision 466103)
>+++ www/py-django-tastypie/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-tastypie
> PORTVERSION=	0.13.3
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -18,7 +19,7 @@
> BUILD_DEPENDS=	${MY_DEPENDS}
> 
> RUN_DEPENDS?=	${MY_DEPENDS} \
>-		${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18@${FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}django>=1.5:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-templatetag-sugar/Makefile
>===================================================================
>--- www/py-django-templatetag-sugar/Makefile	(revision 466103)
>+++ www/py-django-templatetag-sugar/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	templatetag-sugar
> PORTVERSION=	1.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -11,7 +12,7 @@
> MAINTAINER=	tj@FreeBSD.org
> COMMENT=	Library to make writing templatetags in Django sweet
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-django-threaded-multihost/Makefile
>===================================================================
>--- www/py-django-threaded-multihost/Makefile	(revision 466103)
>+++ www/py-django-threaded-multihost/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-threaded-multihost
> PORTVERSION=	1.4.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www python
> MASTER_SITES=	http://www.caomhin.org/geek/ports/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +12,7 @@
> COMMENT=	Multi-host utilities to Django
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR}
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> LICENSE=	BSD3CLAUSE
> 
>Index: www/py-django-tinymce/Makefile
>===================================================================
>--- www/py-django-tinymce/Makefile	(revision 466103)
>+++ www/py-django-tinymce/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-tinymce
> PORTVERSION=	2.0.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> NO_ARCH=	yes
> 
>Index: www/py-django_openstack_auth/Makefile
>===================================================================
>--- www/py-django_openstack_auth/Makefile	(revision 466103)
>+++ www/py-django_openstack_auth/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django_openstack_auth
> PORTVERSION=	3.1.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -19,7 +20,7 @@
> 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.17.0:devel/py-oslo.policy@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}oslo.config>=0:devel/py-oslo.config@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> NO_ARCH=	yes
> 
>Index: www/py-django_polymorphic/Makefile
>===================================================================
>--- www/py-django_polymorphic/Makefile	(revision 466103)
>+++ www/py-django_polymorphic/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django_polymorphic
> PORTVERSION=	0.9.2
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-djangotoolbox/Makefile
>===================================================================
>--- www/py-djangotoolbox/Makefile	(revision 466103)
>+++ www/py-djangotoolbox/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	djangotoolbox
> PORTVERSION=	1.6.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: www/py-dojango/Makefile
>===================================================================
>--- www/py-dojango/Makefile	(revision 466103)
>+++ www/py-dojango/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	dojango
> PORTVERSION=	0.5.7
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python java
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,7 +14,7 @@
> USES=		python
> USE_PYTHON=	distutils autoplist
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18@${FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.6:www/py-django@${FLAVOR}
> 
> OPTIONS_DEFINE=		JAVA
> 
>Index: www/py-google-api-python-client/Makefile
>===================================================================
>--- www/py-google-api-python-client/Makefile	(revision 466103)
>+++ www/py-google-api-python-client/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	google-api-python-client
> PORTVERSION=	1.6.1
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -18,7 +18,7 @@
> 		${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${FLAVOR}
> 
> DJANGO_DESC=	Use the library with Django
>-DJANGO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18@${FLAVOR}
>+DJANGO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3:www/py-django@${FLAVOR}
> 
> GAE_DESC=	Use the library with Google App Engine
> GAE_RUN_DEPENDS=	google-appengine>=1.4.3:www/google-appengine
>Index: www/py-horizon/Makefile
>===================================================================
>--- www/py-horizon/Makefile	(revision 466103)
>+++ www/py-horizon/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	horizon
> PORTVERSION=	10.0.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	https://fossies.org/linux/misc/openstack/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -16,7 +16,7 @@
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Pint>=0.5:devel/py-Pint@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-babel>=0.5.1:www/py-django-babel@${FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django_compressor>=2.0:www/py-django_compressor@${FLAVOR} \
>Index: www/seahub/Makefile
>===================================================================
>--- www/seahub/Makefile	(revision 466103)
>+++ www/seahub/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> DISTVERSIONPREFIX=	v
> DISTVERSION=	${SEAHUB_VER}
> DISTVERSIONSUFFIX=	-pro
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> 
> MAINTAINER=	ultima@FreeBSD.org
>@@ -15,7 +15,7 @@
> 
> RUN_DEPENDS=	bash:shells/bash \
> 		${LOCALBASE}/www/haiwen/seafile-server/seafile/bin/seaf-server:net-mgmt/seafile-server \
>-		${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}django>=0:www/py-django@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-statici18n>=0:www/py-django-statici18n@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework@${PY_FLAVOR} \

Actions: View | Diff

Attachments on bug 227149: 192021 | 192117 | 196657