3 files changed, 54 insertions, 51 deletions

diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index b7f850ced7be..63522fc45822 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ldap2
-PORTVERSION=	2.3.9
+PORTVERSION=	2.3.10
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,13 +20,13 @@ USE_OPENLDAP=	yes
 PYDISTUTILS_PKGNAME=	python-ldap
 PYEASYINSTALL_ARCHDEP=	yes
 
-REPLACE_ARGS=	-e 's,/opt/openldap-RE24,${LOCALBASE},'
+REPLACE_ARGS=	-e 's,/usr/local/openldap-2.3,${LOCALBASE},'
 
 .if defined(WITH_SASL)
 WANT_OPENLDAP_SASL=	yes
 REPLACE_ARGS+=	-e 's,${LOCALBASE}/lib,${LOCALBASE}/lib ${LOCALBASE}/lib/sasl2,' \
 		-e 's,/usr/include/sasl,${LOCALBASE}/include/sasl,'
-CONFLICTS+=	openldap2[23]-client-2.*
+CONFLICTS+=	openldap2[34]-client-2.*
 .else
 REPLACE_ARGS+=	-e 's=ldap_r lber sasl2 ssl crypto=ldap_r lber ssl crypto='
 .endif
diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo
index d412ce0a709e..d4b4dfd29a55 100644
--- a/net/py-ldap2/distinfo
+++ b/net/py-ldap2/distinfo
@@ -1,3 +1,3 @@
-MD5 (python-ldap-2.3.9.tar.gz) = a9f9f16338288d118a1ae6266c993247
-SHA256 (python-ldap-2.3.9.tar.gz) = 62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4
-SIZE (python-ldap-2.3.9.tar.gz) = 108209
+MD5 (python-ldap-2.3.10.tar.gz) = 564d741a7c6d5fdcb45322fe9262d1a5
+SHA256 (python-ldap-2.3.10.tar.gz) = 3c3bbf723440f2b8c7102994c9cd4666307df3d3538e110fff2d03681e7f284f
+SIZE (python-ldap-2.3.10.tar.gz) = 112840
diff --git a/net/py-ldap2/pkg-plist b/net/py-ldap2/pkg-plist
index 13d840763de2..6c082feaae84 100644
--- a/net/py-ldap2/pkg-plist
+++ b/net/py-ldap2/pkg-plist
@@ -1,65 +1,68 @@
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldif.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldif.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldif.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldapurl.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldapurl.pyc
 %%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.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/subentry.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/subentry.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/subentry.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/models.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/models.pyc
 %%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__.pyc
 %%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/sasl.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/sasl.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/sasl.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/resiter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/resiter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/resiter.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/modlist.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/modlist.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/modlist.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/ldapobject.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/ldapobject.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/ldapobject.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/functions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/functions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/functions.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/filter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/filter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/filter.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/dn.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/dn.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls.pyc
 %%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.pyo
 %%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%%/ldap/cidict.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/async.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/async.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/async.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dsml.pyo
 %%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%%/dsml.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%%/_ldap.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%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