- Update to 2.7.0

- Add CHEESESHOP as primary MASTERSITE
- Remove LICENSE_FILE for those in bsd.licenses.db.mk
- Whitespace alignment
- Add HIREDIS OPTIONng
- Use easy_install (make tests easier to run)
- Add zip_safe=False to setup.py
- Update and sort pkg-plist
- Replace dirrmtry with dirrm
- New Makefile header convention
- Give maintainership to submitter

PR:		ports/172481
Submitted by:	Kubilay Kocak <koobs.freebsd@gmail.com>
Approved by:	clsung via IRC
Feature safe:	yes

4 files changed, 62 insertions, 37 deletions

diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile
index 623bf46faa06..998122cda869 100644
--- a/databases/py-redis/Makefile
+++ b/databases/py-redis/Makefile
@@ -1,23 +1,30 @@
-# New ports collection makefile for:   py-redis
-# Date created:                        18 March 2011
-# Whom:                                Cheng-Lung Sung <clsung@FreeBSD.org>
-#
+# Created by:	Cheng-Lung Sung <clsung@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	redis
-PORTVERSION=	2.4.13
+PORTVERSION=	2.7.0
 CATEGORIES=	databases python
-MASTER_SITES=	http://cloud.github.com/downloads/andymccurdy/redis-py/
+MASTER_SITES=	CHEESESHOP \
+		http://cloud.github.com/downloads/andymccurdy/redis-py/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	clsung@FreeBSD.org
+MAINTAINER=	koobs.freebsd@gmail.com
 COMMENT=	Python client for Redis key-value store
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	easy_install
+
+OPTIONS_DEFINE=		HIREDIS
+HIREDIS_DESC=		Add py-hiredis C extension support
+# bypass infrastructure bug
+OPTIONSFILE=		${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MHIREDIS}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}hiredis>0:${PORTSDIR}/databases/py-hiredis
+.endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-redis/distinfo b/databases/py-redis/distinfo
index 14bfe2d605e7..c6f3367ecb91 100644
--- a/databases/py-redis/distinfo
+++ b/databases/py-redis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.4.13.tar.gz) = 365285e161395344edc629a2e108f6bb0983e96d9b5012dab1f76cec2379a09a
-SIZE (redis-2.4.13.tar.gz) = 29329
+SHA256 (redis-2.7.0.tar.gz) = 0a6d3ff3d83ade3fb3f2f7392414e43237af61d92ce783cae05b9d1ac40f0e91
+SIZE (redis-2.7.0.tar.gz) = 39229
diff --git a/databases/py-redis/files/patch-setup.py b/databases/py-redis/files/patch-setup.py
index c989030f3f4a..9d21f02976dc 100644
--- a/databases/py-redis/files/patch-setup.py
+++ b/databases/py-redis/files/patch-setup.py
@@ -1,14 +1,22 @@
---- ./setup.py.orig	2012-05-27 06:05:41.000000000 +1000
-+++ ./setup.py	2012-05-27 06:05:49.000000000 +1000
-@@ -30,10 +30,7 @@
-         'Programming Language :: Python'],
- }
+--- ./setup.py.orig	2012-08-10 08:48:07.000000000 +1000
++++ ./setup.py	2012-08-15 22:27:30.000000000 +1000
+@@ -3,10 +3,7 @@
+ 
+ from redis import __version__
  
 -try:
 -    from setuptools import setup
 -except ImportError:
 -    from distutils.core import setup
-+from distutils.core import setup
- 
- setup(**sdict)
++from setuptools import setup
  
+ f = open(os.path.join(os.path.dirname(__file__), 'README.md'))
+ long_description = f.read()
+@@ -41,5 +38,6 @@
+         'Programming Language :: Python :: 3',
+         'Programming Language :: Python :: 3.2',
+         'Programming Language :: Python :: 3.3',
+-        ]
++        ],
++    zip_safe=False,
+ )
diff --git a/databases/py-redis/pkg-plist b/databases/py-redis/pkg-plist
index e33235d8b2fa..13e10600a9e2 100644
--- a/databases/py-redis/pkg-plist
+++ b/databases/py-redis/pkg-plist
@@ -1,17 +1,27 @@
 @comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/redis/__init__.py
-%%PYTHON_SITELIBDIR%%/redis/__init__.pyc
-%%PYTHON_SITELIBDIR%%/redis/__init__.pyo
-%%PYTHON_SITELIBDIR%%/redis/client.py
-%%PYTHON_SITELIBDIR%%/redis/client.pyc
-%%PYTHON_SITELIBDIR%%/redis/client.pyo
-%%PYTHON_SITELIBDIR%%/redis/connection.py
-%%PYTHON_SITELIBDIR%%/redis/connection.pyc
-%%PYTHON_SITELIBDIR%%/redis/connection.pyo
-%%PYTHON_SITELIBDIR%%/redis/exceptions.py
-%%PYTHON_SITELIBDIR%%/redis/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/redis/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/redis/utils.py
-%%PYTHON_SITELIBDIR%%/redis/utils.pyc
-%%PYTHON_SITELIBDIR%%/redis/utils.pyo
-@dirrmtry %%PYTHON_SITELIBDIR%%/redis
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/_compat.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/_compat.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/_compat.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/client.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/client.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/client.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/connection.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/connection.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/connection.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/exceptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/utils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/utils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis/utils.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%