2 files changed, 2 insertions, 135 deletions

diff --git a/databases/pymongo/Makefile b/databases/pymongo/Makefile
index a3ecbe66584b..c1c1a3512b09 100644
--- a/databases/pymongo/Makefile
+++ b/databases/pymongo/Makefile
@@ -12,11 +12,8 @@ COMMENT=	Python driver for MongoDB
 LICENSE=	AL2
 
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
-PYEASYINSTALL_ARCHDEP=	yes
-PYDISTUTILS_NOEGGINFO=	yes
-PYTHON_PY3K_PLIST_HACK=	yes
-NO_STAGE=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/pymongo/pkg-plist b/databases/pymongo/pkg-plist
deleted file mode 100644
index d8edd18ef918..000000000000
--- a/databases/pymongo/pkg-plist
+++ /dev/null
@@ -1,130 +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/native_libs.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/binary.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/binary.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/binary.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/_cbson.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/_cbson.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/_cbson.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/_cbson.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/code.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/code.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/code.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/dbref.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/dbref.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/dbref.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/errors.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/errors.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/errors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/json_util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/json_util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/json_util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/max_key.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/max_key.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/max_key.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/min_key.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/min_key.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/min_key.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/objectid.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/objectid.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/objectid.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/py3compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/py3compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/py3compat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/son.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/son.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/son.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/timestamp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/timestamp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/timestamp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/tz_util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/tz_util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson/tz_util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs/errors.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs/errors.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs/errors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs/grid_file.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs/grid_file.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs/grid_file.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/auth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/auth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/auth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/_cmessage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/_cmessage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/_cmessage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/_cmessage.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/collection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/collection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/collection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/common.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/common.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/common.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/connection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/connection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/connection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/cursor_manager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/cursor_manager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/cursor_manager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/cursor.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/cursor.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/cursor.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/database.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/database.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/database.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/errors.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/errors.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/errors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/helpers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/helpers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/helpers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/master_slave_connection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/master_slave_connection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/master_slave_connection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/message.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/message.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/message.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/mongo_client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/mongo_client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/mongo_client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/mongo_replica_set_client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/mongo_replica_set_client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/mongo_replica_set_client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/pool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/pool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/pool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/read_preferences.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/read_preferences.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/read_preferences.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/replica_set_connection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/replica_set_connection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/replica_set_connection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/son_manipulator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/son_manipulator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/son_manipulator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/ssl_match_hostname.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/ssl_match_hostname.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/ssl_match_hostname.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/thread_util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/thread_util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/thread_util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/uri_parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/uri_parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo/uri_parser.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pymongo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gridfs
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bson
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%