- Update to 2.5.4

- combine option_ng from ports/170046

Submitted by:	vanilla

3 files changed, 65 insertions, 16 deletions

diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index 0f696ac3d53c..7f2877a7404a 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	kombu
-# Date created:				18 March 2011
-# Whom:					Cheng-Lung Sung <clsung@FreeBSD.org>
-#
+# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	kombu
-PORTVERSION=	2.2.1
+PORTVERSION=	2.5.4
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,8 +12,46 @@ COMMENT=	An AMQP messaging framework for Python
 
 LICENSE=	BSD
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqplib>=1.0:${PORTSDIR}/net/py-amqplib \
-		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.1:${PORTSDIR}/devel/py-anyjson
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=1.0.6:${PORTSDIR}/net/py-amqp \
+		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:${PORTSDIR}/devel/py-anyjson
+
+OPTIONS_DEFINE=	BEANSTALK BOTO MONGODB REDIS SQLALCHEMY ZMQ
+
+BEANSTALK_DESC=	Include beanstalkd transport support
+BOTO_DESC=	Include AWS transport support
+MONGODB_DESC=	Include MongoDB transport support
+REDIS_DESC=	Include Redis transport support
+SQLALCHEMY_DESC=	Include SQLAlchemy transport support
+ZMQ_DESC=	Include ZMQ transport support
+
+# Ports infrastructure bug
+OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MBEANSTALK}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}beanstalkc>0:${PORTSDIR}/net/py-beanstalkc
+.endif
+
+.if ${PORT_OPTIONS:MBOTO}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}boto=>2.6.0:${PORTSDIR}/devel/py-boto
+.endif
+
+.if ${PORT_OPTIONS:MMONGODB}
+RUN_DEPENDS+=	pymongo>0:${PORTSDIR}/databases/pymongo
+.endif
+
+.if ${PORT_OPTIONS:MREDIS}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}redis>0:${PORTSDIR}/databases/py-redis
+.endif
+
+.if ${PORT_OPTIONS:MSQLALCHEMY}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>0:${PORTSDIR}/databases/py-sqlalchemy
+.endif
+
+.if ${PORT_OPTIONS:MZMQ}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyzmq=>2.2.0:${PORTSDIR}/devel/py-pyzmq
+.endif
 
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
diff --git a/net/py-kombu/distinfo b/net/py-kombu/distinfo
index 7dc93ddf8fe7..188bc2f81256 100644
--- a/net/py-kombu/distinfo
+++ b/net/py-kombu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kombu-2.2.1.tar.gz) = 265b8868165f4b9efcd27b2f1e3bad06b76e14e8737340fd85e6b436899863ff
-SIZE (kombu-2.2.1.tar.gz) = 281747
+SHA256 (kombu-2.5.4.tar.gz) = 92cfb82af1d3e8753258d660003769461b75abe0f1a03d720709a211042f358b
+SIZE (kombu-2.5.4.tar.gz) = 300506
diff --git a/net/py-kombu/pkg-plist b/net/py-kombu/pkg-plist
index fba2edc573af..af62010d20a7 100644
--- a/net/py-kombu/pkg-plist
+++ b/net/py-kombu/pkg-plist
@@ -112,12 +112,18 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_base.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_filesystem.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_filesystem.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_filesystem.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_memory.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_memory.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_memory.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_mongodb.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_mongodb.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_mongodb.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_pyamqp.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_pyamqp.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_pyamqp.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_redis.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_redis.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/transport/test_redis.pyo
@@ -142,6 +148,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/test_amq_manager.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/test_amq_manager.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/test_amq_manager.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/test_debug.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/test_debug.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/test_debug.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/test_encoding.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/test_encoding.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/tests/utilities/test_encoding.pyo
@@ -193,6 +205,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/django/models.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/django/models.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/django/models.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/filesystem.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/filesystem.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/filesystem.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/librabbitmq.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/librabbitmq.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/librabbitmq.pyo
@@ -202,12 +217,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/mongodb.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/mongodb.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/mongodb.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/pika.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/pika.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/pika.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/pika2.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/pika2.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/pika2.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/pyamqp.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/pyamqp.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/pyamqp.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/redis.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/redis.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/redis.pyo
@@ -226,6 +238,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/virtual/scheduling.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/virtual/scheduling.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/virtual/scheduling.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/zmq.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/zmq.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/zmq.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/zookeeper.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/zookeeper.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/kombu/transport/zookeeper.pyo