3 files changed, 71 insertions, 59 deletions

diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index 94f5befeb17e..7744fe14fd14 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ldap2
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.3
 CATEGORIES=	net python
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	python-ldap
@@ -16,9 +16,10 @@ MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	An LDAP module for python, for OpenLDAP2
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 USE_OPENLDAP=	yes
 PYDISTUTILS_PKGNAME=	python-ldap
+PYEASYINSTALL_ARCHDEP=	yes
 
 REPLACE_ARGS=	-e 's,/usr/local/openldap-2.3/lib,${LOCALBASE}/lib,' \
 		-e 's,/usr/local/openldap-2.3/include,${LOCALBASE}/include,'
diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo
index 8a14bfc4b22e..0435a01fc3c0 100644
--- a/net/py-ldap2/distinfo
+++ b/net/py-ldap2/distinfo
@@ -1,3 +1,3 @@
-MD5 (python-ldap-2.3.1.tar.gz) = 1a97e0fef2567e30d75ed137a8914559
-SHA256 (python-ldap-2.3.1.tar.gz) = 2986addbb15bbc285d71be1fb6098c6fa0511003afe761902f1741bdee4f29db
-SIZE (python-ldap-2.3.1.tar.gz) = 76522
+MD5 (python-ldap-2.3.3.tar.gz) = 06724087ae3ce80e0829d107538fc153
+SHA256 (python-ldap-2.3.3.tar.gz) = 947a0676dd007d00d1ceffd0e49bb6196e4e912241dbc1db9149996392cebe1c
+SIZE (python-ldap-2.3.3.tar.gz) = 76857
diff --git a/net/py-ldap2/pkg-plist b/net/py-ldap2/pkg-plist
index d37571eea2c1..dd5eb22fbf2b 100644
--- a/net/py-ldap2/pkg-plist
+++ b/net/py-ldap2/pkg-plist
@@ -1,54 +1,65 @@
-%%PYTHON_SITELIBDIR%%/dsml.py
-%%PYTHON_SITELIBDIR%%/dsml.pyc
-%%PYTHON_SITELIBDIR%%/dsml.pyo
-%%PYTHON_SITELIBDIR%%/ldap/__init__.py
-%%PYTHON_SITELIBDIR%%/ldap/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ldap/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ldap/async.py
-%%PYTHON_SITELIBDIR%%/ldap/async.pyc
-%%PYTHON_SITELIBDIR%%/ldap/async.pyo
-%%PYTHON_SITELIBDIR%%/ldap/cidict.py
-%%PYTHON_SITELIBDIR%%/ldap/cidict.pyc
-%%PYTHON_SITELIBDIR%%/ldap/cidict.pyo
-%%PYTHON_SITELIBDIR%%/ldap/controls.py
-%%PYTHON_SITELIBDIR%%/ldap/controls.pyc
-%%PYTHON_SITELIBDIR%%/ldap/controls.pyo
-%%PYTHON_SITELIBDIR%%/ldap/dn.py
-%%PYTHON_SITELIBDIR%%/ldap/dn.pyc
-%%PYTHON_SITELIBDIR%%/ldap/dn.pyo
-%%PYTHON_SITELIBDIR%%/ldap/filter.py
-%%PYTHON_SITELIBDIR%%/ldap/filter.pyc
-%%PYTHON_SITELIBDIR%%/ldap/filter.pyo
-%%PYTHON_SITELIBDIR%%/ldap/functions.py
-%%PYTHON_SITELIBDIR%%/ldap/functions.pyc
-%%PYTHON_SITELIBDIR%%/ldap/functions.pyo
-%%PYTHON_SITELIBDIR%%/ldap/ldapobject.py
-%%PYTHON_SITELIBDIR%%/ldap/ldapobject.pyc
-%%PYTHON_SITELIBDIR%%/ldap/ldapobject.pyo
-%%PYTHON_SITELIBDIR%%/ldap/modlist.py
-%%PYTHON_SITELIBDIR%%/ldap/modlist.pyc
-%%PYTHON_SITELIBDIR%%/ldap/modlist.pyo
-%%PYTHON_SITELIBDIR%%/ldap/sasl.py
-%%PYTHON_SITELIBDIR%%/ldap/sasl.pyc
-%%PYTHON_SITELIBDIR%%/ldap/sasl.pyo
-%%PYTHON_SITELIBDIR%%/ldap/schema/__init__.py
-%%PYTHON_SITELIBDIR%%/ldap/schema/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ldap/schema/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ldap/schema/models.py
-%%PYTHON_SITELIBDIR%%/ldap/schema/models.pyc
-%%PYTHON_SITELIBDIR%%/ldap/schema/models.pyo
-%%PYTHON_SITELIBDIR%%/ldap/schema/subentry.py
-%%PYTHON_SITELIBDIR%%/ldap/schema/subentry.pyc
-%%PYTHON_SITELIBDIR%%/ldap/schema/subentry.pyo
-%%PYTHON_SITELIBDIR%%/ldap/schema/tokenizer.py
-%%PYTHON_SITELIBDIR%%/ldap/schema/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/ldap/schema/tokenizer.pyo
-%%PYTHON_SITELIBDIR%%/ldapurl.py
-%%PYTHON_SITELIBDIR%%/ldapurl.pyc
-%%PYTHON_SITELIBDIR%%/ldapurl.pyo
-%%PYTHON_SITELIBDIR%%/ldif.py
-%%PYTHON_SITELIBDIR%%/ldif.pyc
-%%PYTHON_SITELIBDIR%%/ldif.pyo
-%%PYTHON_SITELIBDIR%%/_ldap.so
-@dirrm %%PYTHON_SITELIBDIR%%/ldap/schema
-@dirrm %%PYTHON_SITELIBDIR%%/ldap
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldapurl.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/async.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/dn.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/ldapobject.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/sasl.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/functions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/functions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/dn.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/modlist.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/modlist.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/cidict.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/sasl.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/tokenizer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/models.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/subentry.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/tokenizer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/tokenizer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/models.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/models.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/subentry.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/subentry.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/filter.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/filter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/dn.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/async.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/async.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/cidict.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/functions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/ldapobject.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/modlist.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/ldapobject.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/sasl.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/cidict.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/filter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dsml.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldapurl.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldif.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dsml.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldapurl.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldif.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldif.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dsml.py
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%