4 files changed, 71 insertions, 71 deletions

diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index 5c42e1618289..58db9338475b 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ldap2
-PORTVERSION=	2.3.11
+PORTVERSION=	2.3.12
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,8 @@ 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/lib,${LOCALBASE}/lib,' \
+		-e 's,/usr/local/openldap-2.3/include,${LOCALBASE}/include,'
 
 .if defined(WITH_SASL)
 WANT_OPENLDAP_SASL=	yes
diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo
index f7dcdc60267e..95e394f0a0d7 100644
--- a/net/py-ldap2/distinfo
+++ b/net/py-ldap2/distinfo
@@ -1,3 +1,2 @@
-MD5 (python-ldap-2.3.11.tar.gz) = d23f95d497fe180be4ffc90a7f9b42ed
-SHA256 (python-ldap-2.3.11.tar.gz) = bed37b5663b3f61e238477f261dbf0402e613c1ac0a4828de4e2e886850e60bf
-SIZE (python-ldap-2.3.11.tar.gz) = 119459
+SHA256 (python-ldap-2.3.12.tar.gz) = 3c8524dfaa5909d35af5c927d243c2bd8c8831ec47e58f7a2e3093a3264a42b5
+SIZE (python-ldap-2.3.12.tar.gz) = 112239
diff --git a/net/py-ldap2/pkg-descr b/net/py-ldap2/pkg-descr
index 428d1fed0ed3..27df601d59bc 100644
--- a/net/py-ldap2/pkg-descr
+++ b/net/py-ldap2/pkg-descr
@@ -1,8 +1,8 @@
 
                             LDAP Wrapper for Python
-                                       
+
    This module provides an LDAP API to Python in the spirit of RFC1823.
-   
+
 Some cool things people have done with ldapmodule
 
      * LANL phone book (source)
diff --git a/net/py-ldap2/pkg-plist b/net/py-ldap2/pkg-plist
index 6c082feaae84..d9d94b14f939 100644
--- a/net/py-ldap2/pkg-plist
+++ b/net/py-ldap2/pkg-plist
@@ -1,68 +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/schema/tokenizer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/tokenizer.py
-%%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/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/schema/__init__.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/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/cidict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/cidict.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%%/dsml.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_ldap.pyo
-%%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%%/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.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ldap/controls.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/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/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%%/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
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO