From 2f7b16265c2072940bfde49849db32f6782b3af1 Mon Sep 17 00:00:00 2001
From: Kubilay Kocak <koobs@FreeBSD.org>
Date: Thu, 25 Jun 2015 07:16:39 +0000
Subject: [PATCH] www/py-django-dpaste: Update to 2.8

- Update to 2.8
- Switch to CHEESESHOP for MASTER_SITES
- Match COMMENT with upstream
- Add LICENSE_FILE
- Sort USE_PYTHON values
- Tweak RUN_DEPENDS to limit to Django 1.6 and switch to file-based
  django detection (instead of package).

This ensures that if a port that depends on this one, also depends on a
different django version, it will see and use the installed version,
rather than attempting to install another one, which results in a
conflict as all django ports conflict with each other.

See r390184 [1] and 390535 [2] for other instances of this issue.

- Remove TESTS option and tox as a TEST_DEPENDS

[1] https://svnweb.freebsd.org/changeset/ports/390184
[2] https://svnweb.freebsd.org/changeset/ports/390535
---
 www/py-django-dpaste/Makefile | 20 ++++++++------------
 www/py-django-dpaste/distinfo |  4 ++--
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile
index 7a2314d6bdeb..8094f37ca6ff 100644
--- a/www/py-django-dpaste/Makefile
+++ b/www/py-django-dpaste/Makefile
@@ -2,36 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	dpaste
-PORTVERSION=	2.5
+PORTVERSION=	2.8
 CATEGORIES=	www python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Pastebin Django application that powers dpaste.de
+COMMENT=	Django based pastebin
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django16 \
 		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.6.0:${PORTSDIR}/www/py-django-mptt \
 		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:${PORTSDIR}/textproc/py-pygments \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:${PORTSDIR}/www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>=1.6.1:${PORTSDIR}/devel/py-tox
 
-OPTIONS_DEFINE=	MIGRATIONS TESTS
+OPTIONS_DEFINE=		MIGRATIONS
 
 MIGRATIONS_DESC=	Schema and data migration support (via south)
-TESTS_DESC=		Include tox for test suite
 
 MIGRATIONS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.8.2:${PORTSDIR}/databases/py-south
-TESTS_BUILD_DEPENDS=	${TEST_DEPENDS}
 
-USE_GITHUB=	yes
 USES=		python
-USE_PYTHON=	distutils autoplist
-
-GH_ACCOUNT=	bartTC
+USE_PYTHON=	autoplist distutils
 
 regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+	@cd ${WRKSRC} && ${PYTHON_CMD} runtests.py
 
 .include <bsd.port.mk>
diff --git a/www/py-django-dpaste/distinfo b/www/py-django-dpaste/distinfo
index 85d668f40f64..a74c6effc8d1 100644
--- a/www/py-django-dpaste/distinfo
+++ b/www/py-django-dpaste/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bartTC-dpaste-2.5_GH0.tar.gz) = e0691c8b65c950f7f3439cc6633e5c7d0eb276488971ec35ba15bb7208660a27
-SIZE (bartTC-dpaste-2.5_GH0.tar.gz) = 124574
+SHA256 (dpaste-2.8.tar.gz) = caaaa9440cf756b6ff51209138c6e473cf7330a7b62066eb5eb94e39e6369ab6
+SIZE (dpaste-2.8.tar.gz) = 125829