From ddf534cfac137448e695a84ba53d043e92faba95 Mon Sep 17 00:00:00 2001 From: wg Date: Tue, 21 May 2013 12:26:04 +0000 Subject: - Update to 2.5.7 - Fix depends for python 2.6 - Remove article from COMMENT - Replace tab for space in pkg-descr (WWW) Changes: https://github.com/celery/kombu/blob/9c519e8d/Changelog PR: ports/177021 Submitted by: wg (myself) Approved by: culot (mentor), maintainer (timeout, > 60 days) --- net/py-kombu/Makefile | 19 ++++++++++++------- net/py-kombu/distinfo | 4 ++-- net/py-kombu/files/patch-setup.py | 8 ++++++++ net/py-kombu/pkg-descr | 2 +- 4 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 net/py-kombu/files/patch-setup.py (limited to 'net') diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile index 83d55feef15b..90ae1c4dd692 100644 --- a/net/py-kombu/Makefile +++ b/net/py-kombu/Makefile @@ -2,17 +2,17 @@ # $FreeBSD$ PORTNAME= kombu -PORTVERSION= 2.5.6 +PORTVERSION= 2.5.7 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= clsung@FreeBSD.org -COMMENT= An AMQP messaging framework for Python +COMMENT= AMQP messaging framework for Python LICENSE= BSD -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=1.0.6:${PORTSDIR}/net/py-amqp \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=1.0.9:${PORTSDIR}/net/py-amqp \ ${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:${PORTSDIR}/devel/py-anyjson OPTIONS_DEFINE= BEANSTALK BOTO MONGODB REDIS SQLALCHEMY ZMQ @@ -27,7 +27,10 @@ ZMQ_DESC= Include ZMQ transport support # Ports infrastructure bug OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options -.include +USE_PYTHON= 2.5+ +USE_PYDISTUTILS= easy_install + +.include .if ${PORT_OPTIONS:MBEANSTALK} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}beanstalkc>0:${PORTSDIR}/net/py-beanstalkc @@ -53,7 +56,9 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlal 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 +.include diff --git a/net/py-kombu/distinfo b/net/py-kombu/distinfo index ae6b64773b02..a2fa9beb3ab4 100644 --- a/net/py-kombu/distinfo +++ b/net/py-kombu/distinfo @@ -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 diff --git a/net/py-kombu/files/patch-setup.py b/net/py-kombu/files/patch-setup.py new file mode 100644 index 000000000000..d27190a02d30 --- /dev/null +++ b/net/py-kombu/files/patch-setup.py @@ -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 diff --git a/net/py-kombu/pkg-descr b/net/py-kombu/pkg-descr index bcd53779adc5..2269762039e9 100644 --- a/net/py-kombu/pkg-descr +++ b/net/py-kombu/pkg-descr @@ -18,4 +18,4 @@ Features: supporting timeouts and the ability to wait for events on more than one channel. -WWW: http://github.com/ask/kombu +WWW: http://github.com/ask/kombu -- cgit