2 files changed, 4 insertions, 84 deletions

diff --git a/databases/py-riak/Makefile b/databases/py-riak/Makefile
index 36a50d3b137c..792dcb9315e5 100644
--- a/databases/py-riak/Makefile
+++ b/databases/py-riak/Makefile
@@ -7,18 +7,15 @@ CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Python API for Riak, a Dynamo-inspired key/value store
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.0:${PORTSDIR}/devel/py-protobuf
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|zip_safe=True|zip_safe=False|' ${WRKSRC}/${PYSETUP}
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/py-riak/pkg-plist b/databases/py-riak/pkg-plist
deleted file mode 100644
index d863523327f1..000000000000
--- a/databases/py-riak/pkg-plist
+++ /dev/null
@@ -1,77 +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/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/bucket.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/bucket.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/bucket.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/mapreduce.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/mapreduce.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/mapreduce.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/metadata.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/metadata.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/metadata.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/multidict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/multidict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/multidict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/riak_index_entry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/riak_index_entry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/riak_index_entry.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/riak_object.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/riak_object.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/riak_object.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/search.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/search.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/search.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/test_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/test_server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/test_server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/suite.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/suite.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/suite.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/test_all.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/test_all.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/test_all.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/test_server_test.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/test_server_test.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests/test_server_test.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/connection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/connection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/connection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/http.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/http.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/http.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/monitor.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/monitor.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/monitor.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/pbc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/pbc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/pbc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/riakclient_pb2.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/riakclient_pb2.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/riakclient_pb2.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/transport.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/transport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports/transport.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/transports
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/riak
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%