ports/172481: [PATCH] databases/py-redis: update to 2.7.0, take maintainership, Add OPTIONS + more

Kubilay Kocak koobs.freebsd at gmail.com
Mon Oct 8 10:10:12 UTC 2012 

>Number:         172481
>Category:       ports
>Synopsis:       [PATCH] databases/py-redis: update to 2.7.0, take maintainership, Add OPTIONS + more
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 08 10:10:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Kubilay Kocak
>Release:        FreeBSD 9.0-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD freebsd-9-amd64 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Sat Jul  7 21:26:56 EST
>Description:
- Update to 2.7.0
- Take maintainership (approved: clsung @ IRC w/ sbz)
- 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

Changes: (2.4.13 -> 2.7.0):

https://github.com/andymccurdy/redis-py/blob/2.7.0/CHANGES

====[QA]====

supersedes: ports/170648

portlint: looks fine.
porttest: OK
redports: https://redports.org/buildarchive/20121008082149-16785/
unittest: Ran 157 tests in 7.814s - OK (skipped=12)

Note: tested against databases/redis-devel
============

Port maintainer (clsung at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- py27-redis-2.7.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/py-redis/Makefile ./Makefile
--- /usr/ports/databases/py-redis/Makefile	2012-06-02 10:48:54.000000000 +1000
+++ ./Makefile	2012-10-08 19:19:44.000000000 +1100
@@ -1,23 +1,30 @@
-# New ports collection makefile for:   py-redis
-# Date created:                        18 March 2011
-# Whom:                                Cheng-Lung Sung <clsung at FreeBSD.org>
-#
+# Created by:	Cheng-Lung Sung <clsung at FreeBSD.org>
 # $FreeBSD: ports/databases/py-redis/Makefile,v 1.5 2012/06/02 00:48:54 clsung Exp $
-#
 
 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 at FreeBSD.org
+MAINTAINER=	koobs.freebsd at 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 -ruN --exclude=CVS /usr/ports/databases/py-redis/distinfo ./distinfo
--- /usr/ports/databases/py-redis/distinfo	2012-06-02 10:48:54.000000000 +1000
+++ ./distinfo	2012-10-08 18:14:08.000000000 +1100
@@ -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 -ruN --exclude=CVS /usr/ports/databases/py-redis/files/patch-setup.py ./files/patch-setup.py
--- /usr/ports/databases/py-redis/files/patch-setup.py	2012-06-02 10:48:54.000000000 +1000
+++ ./files/patch-setup.py	2012-08-15 22:27:34.000000000 +1000
@@ -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 -ruN --exclude=CVS /usr/ports/databases/py-redis/pkg-plist ./pkg-plist
--- /usr/ports/databases/py-redis/pkg-plist	2012-06-02 10:48:54.000000000 +1000
+++ ./pkg-plist	2012-08-15 22:29:19.000000000 +1000
@@ -1,17 +1,27 @@
 @comment $FreeBSD: ports/databases/py-redis/pkg-plist,v 1.4 2012/06/02 00:48:54 clsung Exp $
-%%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
- at 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
+ at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/redis
+ at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+ at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
--- py27-redis-2.7.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list