3 files changed, 59 insertions, 53 deletions

diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index 76dab968fd7f..a53c23bda06e 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ldap2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	python-ldap
@@ -21,8 +21,8 @@ USE_OPENLDAP=	yes
 USE_REINPLACE=	yes
 
 do-configure:
-	@${REINPLACE_CMD} -e "s=/usr/local/openldap-OPENLDAP_REL_ENG_2_2/lib=${LOCALBASE}/lib=" \
-		-e "s=/usr/local/openldap-OPENLDAP_REL_ENG_2_2/include=${LOCALBASE}/include=" \
+	@${REINPLACE_CMD} -e "s=/opt/openldap-OPENLDAP_REL_ENG_2_2/lib=${LOCALBASE}/lib=" \
+		-e "s=/opt/openldap-OPENLDAP_REL_ENG_2_2/include=${LOCALBASE}/include=" \
 		-e "s=ldap_r lber ssl crypto sasl2=ldap_r lber ssl crypto=" \
 		${WRKSRC}/setup.cfg
 
diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo
index c96c0693e966..fc5da79e20d0 100644
--- a/net/py-ldap2/distinfo
+++ b/net/py-ldap2/distinfo
@@ -1,2 +1,2 @@
-MD5 (python-ldap-2.0.6.tar.gz) = 59fd9345a77451b7749a28a458406695
-SIZE (python-ldap-2.0.6.tar.gz) = 66029
+MD5 (python-ldap-2.0.7.tar.gz) = d26798f1224c894b2eb99f4c9babf142
+SIZE (python-ldap-2.0.7.tar.gz) = 70684
diff --git a/net/py-ldap2/pkg-plist b/net/py-ldap2/pkg-plist
index 859032ad5038..d37571eea2c1 100644
--- a/net/py-ldap2/pkg-plist
+++ b/net/py-ldap2/pkg-plist
@@ -1,48 +1,54 @@
-lib/%%PYTHON_VERSION%%/site-packages/dsml.py
-lib/%%PYTHON_VERSION%%/site-packages/dsml.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dsml.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/async.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/async.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/async.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/cidict.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/cidict.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/cidict.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/filter.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/filter.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/filter.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/functions.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/functions.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/functions.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/ldapobject.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/ldapobject.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/ldapobject.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/modlist.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/modlist.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/modlist.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/sasl.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/sasl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/sasl.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/models.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/models.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/models.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/subentry.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/subentry.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/subentry.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/tokenizer.py
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/tokenizer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldap/schema/tokenizer.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldapurl.py
-lib/%%PYTHON_VERSION%%/site-packages/ldapurl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldapurl.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ldif.py
-lib/%%PYTHON_VERSION%%/site-packages/ldif.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ldif.pyo
-lib/%%PYTHON_VERSION%%/site-packages/_ldap.so
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ldap/schema
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ldap
+%%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