- Update to latest version - pre18, which works with openldap 2.1

3 files changed, 33 insertions, 14 deletions

diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index 1c41324..af994db 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ldap2
-PORTVERSION=	2.0.0pre04
+PORTVERSION=	2.0.0pre18
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	python-ldap
@@ -15,22 +15,16 @@ DISTNAME=	python-ldap-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An LDAP module for python, for OpenLDAP2
 
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/${LDAP_PORT}
-
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S=-src==}
-LDAP_PORT?=	net/openldap20-client
+USE_OPENLDAP=	yes
+USE_REINPLACE=	yes
 
-#class = OpenLDAP2
-#library_dirs = /usr/local/openldap2/lib
-#include_dirs = /usr/local/openldap2/include
-#libs = lber ldap resolv
 do-configure:
-	@${MV} ${WRKSRC}/setup.cfg ${WRKSRC}/setup.cfg.sed
-	${SED} -e "s=/usr/local/openldap2/lib=${LOCALBASE}/lib=" \
-		-e "s=/usr/local/openldap2/include=${LOCALBASE}/include=" \
-		-e "s=lber ldap resolv=lber ldap=" \
-		${WRKSRC}/setup.cfg.sed > ${WRKSRC}/setup.cfg
+	@${REINPLACE_CMD} -e "s=/usr/local/openldap-REL_ENG_2_1/lib=${LOCALBASE}/lib=" \
+		-e "s=/usr/local/openldap-REL_ENG_2_1/include=${LOCALBASE}/include=" \
+		-e "s=ldap_r lber sasl2 ssl crypto=ldap_r lber ssl crypto=" \
+		${WRKSRC}/setup.cfg
 
 .include <bsd.port.mk>
diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo
index baf01e5..ab8ef8b 100644
--- a/net/py-ldap2/distinfo
+++ b/net/py-ldap2/distinfo
@@ -1 +1 @@
-MD5 (python-ldap-2.0.0pre04.tar.gz) = 4c0f4e6f59b41a02f50493f02012c9ac
+MD5 (python-ldap-2.0.0pre18.tar.gz) = 3df0aa4135417ea71138afd25d0114f9
diff --git a/net/py-ldap2/pkg-plist b/net/py-ldap2/pkg-plist
index 8c0241a..859032a 100644
--- a/net/py-ldap2/pkg-plist
+++ b/net/py-ldap2/pkg-plist
@@ -1,9 +1,18 @@
+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
@@ -13,6 +22,21 @@ 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
@@ -20,4 +44,5 @@ 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