Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2013 06:57:15 -0700 (PDT)
From:      William Grzybowski <william88@gmail.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/177021: [PATCH] net/py-kombu: update to 2.5.7 and fix for py26
Message-ID:  <51447a3b.0647310a.2f1f.ffffe499@mx.google.com>
Resent-Message-ID: <201303161400.r2GE01HJ028381@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         177021
>Category:       ports
>Synopsis:       [PATCH] net/py-kombu: update to 2.5.7 and fix for py26
>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:   Sat Mar 16 14:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     William Grzybowski
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
>Description:

	Update to 2.5.7
	Fix for py26 and new amqp version in ports
	Changes: https://github.com/celery/kombu/blob/master/Changelog
	Redports: https://redports.org/buildarchive/20130316135400-194/


>How-To-Repeat:
>Fix:

	See attached patch


--- py-kombu.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 314354)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kombu
-PORTVERSION=	2.5.6
+PORTVERSION=	2.5.7
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -27,8 +27,11 @@
 # Ports infrastructure bug
 OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-.include <bsd.port.options.mk>
+USE_PYTHON=	2.5+
+USE_PYDISTUTILS=	easy_install
 
+.include <bsd.port.pre.mk>
+
 .if ${PORT_OPTIONS:MBEANSTALK}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}beanstalkc>0:${PORTSDIR}/net/py-beanstalkc
 .endif
@@ -53,7 +56,9 @@
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyzmq=>2.2.0:${PORTSDIR}/devel/py-pyzmq
 .endif
 
-USE_PYTHON=	2.5+
-USE_PYDISTUTILS=	easy_install
+.if ${PYTHON_REL} < 270
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ordereddict>=0:${PORTSDIR}/devel/py-ordereddict \
+		${PYTHON_PKGNAMEPREFIX}importlib>=0:${PORTSDIR}/devel/py-importlib
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 314354)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (kombu-2.5.6.tar.gz) = 01c0ba72782535df913b519d6509835f8210b4dbfde652d3a1c6f545d737beb9
-SIZE (kombu-2.5.6.tar.gz) = 301670
+SHA256 (kombu-2.5.7.tar.gz) = 32bcfabc02366738101861f06e737106dea8d2ea784a588d7a9e1fbd940b7a78
+SIZE (kombu-2.5.7.tar.gz) = 301904
Index: files/patch-setup.py
===================================================================
--- files/patch-setup.py	(revision 0)
+++ files/patch-setup.py	(working copy)
@@ -0,0 +1,8 @@
+diff --git requirements/default.txt requirements/default.txt
+index e0c2232..5c48b92 100644
+--- requirements/default.txt
++++ requirements/default.txt
+@@ -1,2 +1,2 @@
+ anyjson>=0.3.3
+-amqp>=1.0.9,<1.1.0
++amqp>=1.0.9
--- py-kombu.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51447a3b.0647310a.2f1f.ffffe499>