2 files changed, 2 insertions, 105 deletions

diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index de93484a8bd1..4c98dee7679e 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -15,10 +15,9 @@ LICENSE=	PSFL
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1-modules>=0:${PORTSDIR}/devel/py-asn1-modules
 
 USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 USE_OPENLDAP=	yes
-PYDISTUTILS_PKGNAME=	python-ldap
-PYEASYINSTALL_ARCHDEP=	yes
 WANT_OPENLDAP_VER=	24
 
 REPLACE_ARGS=	-e 's,/opt/openldap-RE24/lib,${LOCALBASE}/lib,' \
@@ -28,7 +27,6 @@ REPLACE_ARGS=	-e 's,/opt/openldap-RE24/lib,${LOCALBASE}/lib,' \
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	SASL
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSASL}
diff --git a/net/py-ldap2/pkg-plist b/net/py-ldap2/pkg-plist
deleted file mode 100644
index 033c7af13fb1..000000000000
--- a/net/py-ldap2/pkg-plist
+++ /dev/null
@@ -1,101 +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/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dsml.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dsml.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dsml.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/async.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/async.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/async.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/cidict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/cidict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/cidict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/libldap.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/libldap.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/libldap.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/ppolicy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/ppolicy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/ppolicy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/psearch.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/psearch.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/psearch.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/readentry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/readentry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/readentry.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/sessiontrack.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/sessiontrack.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/sessiontrack.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/simple.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/simple.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls/simple.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/dn.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/dn.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/dn.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/extop/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/extop/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/extop/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/extop/dds.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/extop/dds.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/extop/dds.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/filter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/filter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/filter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/functions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/functions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/functions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/ldapobject.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/ldapobject.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/ldapobject.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/logger.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/logger.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/logger.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/modlist.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/modlist.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/modlist.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/resiter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/resiter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/resiter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/sasl.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/sasl.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/sasl.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/models.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/models.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/models.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/subentry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/subentry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/subentry.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/tokenizer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/tokenizer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/syncrepl.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/syncrepl.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/syncrepl.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldapurl.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldapurl.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldapurl.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldif.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/extop
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%