- Enable stagedir support

- Remove easy_install dependency
- Convert to PYDISTUTILS_AUTOPLIST
- Bump PORTREVISION to enforce a cleanup for the easy_install references

With hat:	python@
Approved by:	portmgr (implicit)

2 files changed, 4 insertions, 98 deletions

diff --git a/net/py-txamqp/Makefile b/net/py-txamqp/Makefile
index 3dd4949669e1..72bdcde65089 100644
--- a/net/py-txamqp/Makefile
+++ b/net/py-txamqp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	txamqp
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net python
 MASTER_SITES=	http://launchpadlibrarian.net/30388120/ \
 		# http://launchpad.net/txamqp/trunk/${PORTVERSION}/+download/
@@ -15,20 +15,18 @@ COMMENT=	Twisted Python library for the AMQP messaging protocol
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=easy_install
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 USES=		twisted
 
 WRKSRC=		${WRKDIR}/python-${PORTNAME}-${PORTVERSION}
 
-PYDISTUTILS_PKGNAME=	txAMQP
-PYDISTUTILS_PKGVERSION=	0.3
 PLIST_SUB=		PORTNAME="${PORTNAME}"
 
 # TODO: Install txAMQP examples.
 
 # Don't try to install Twisted yourself, txAMQP. thx!
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e '/install_requires/s/^/#/' ${WRKSRC}/setup.py
 
diff --git a/net/py-txamqp/pkg-plist b/net/py-txamqp/pkg-plist
deleted file mode 100644
index 34240a567965..000000000000
--- a/net/py-txamqp/pkg-plist
+++ /dev/null
@@ -1,92 +0,0 @@
-%%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%%/txamqp/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/codec.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/codec.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/codec.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/connection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/connection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/connection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/content.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/content.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/content.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/protocol.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/protocol.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/protocol.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/service.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/service.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/service.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/transport.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/transport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift/transport.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/delegate.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/delegate.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/delegate.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/message.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/message.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/message.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/protocol.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/protocol.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/protocol.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/queue.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/queue.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/queue.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/spec.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/spec.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/spec.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_basic.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_basic.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_basic.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_broker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_broker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_broker.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_example.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_example.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_example.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_exchange.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_exchange.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_exchange.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_heartbeat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_heartbeat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_heartbeat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_queue.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_queue.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_queue.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_testlib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_testlib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_testlib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_tx.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_tx.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test/test_tx.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/testlib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/testlib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/testlib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/xmlutil.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/xmlutil.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/xmlutil.pyo
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/test
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib/thrift
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp/contrib
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/txamqp
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%