Changes 2.3.0:

* Support for setuptools (building .egg, thanks to Torsten)
* Support for matched values control
* Fixed ldif
* ldap.schema.models: SUP now separated by $
* Added constant MOD_INCREMENT to support
  modify+increment extension

Changes 2.2.1:
* OpenLDAP 2.3+ required now to build.
* Added support for Cancel operation ext. op. if supported
  in OpenLDAP API of the libs used for the build.
* Removed deprecated code for setting options by name
* Added l_ldap_cancel()

4 files changed, 29 insertions, 23 deletions

diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index d64e1e6a66c..40dbc02e65b 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2007/02/28 15:49:54 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/12/16 15:34:14 adam Exp $
 
-DISTNAME=	python-ldap-2.2.0
+DISTNAME=	python-ldap-2.3.1
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
-PKGREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-ldap/}
 
@@ -19,22 +18,21 @@ PY_LDAP_LIBS=			ldap_r lber ssl crypto
 
 .include "options.mk"
 
-SUBST_CLASSES+=			setup
-SUBST_STAGE.setup=		pre-configure
-SUBST_FILES.setup=		setup.cfg
-SUBST_SED.setup=		-e "s|@PY_LDAP_LIBRARY_DIRS@|${PY_LDAP_LIBRARY_DIRS}|"
-SUBST_SED.setup+=		-e "s|@PY_LDAP_INCLUDE_DIRS@|${PY_LDAP_INCLUDE_DIRS}|"
-SUBST_SED.setup+=		-e "s|@PY_LDAP_LIBS@|${PY_LDAP_LIBS}|"
+SUBST_CLASSES+=		setup
+SUBST_STAGE.setup=	pre-configure
+SUBST_FILES.setup=	setup.cfg
+SUBST_SED.setup=	-e "s|@PY_LDAP_LIBRARY_DIRS@|${PY_LDAP_LIBRARY_DIRS}|"
+SUBST_SED.setup+=	-e "s|@PY_LDAP_INCLUDE_DIRS@|${PY_LDAP_INCLUDE_DIRS}|"
+SUBST_SED.setup+=	-e "s|@PY_LDAP_LIBS@|${PY_LDAP_LIBS}|"
 
-PY_LDAP_DOCDIR=			${PREFIX}/share/doc/py-ldap
+PY_LDAP_DOCDIR=		${PREFIX}/share/doc/py-ldap
 
 post-install:
 	${INSTALL_DATA_DIR} ${PY_LDAP_DOCDIR}
-	cd ${WRKSRC} && ${PAX} -rw CHANGES README INSTALL TODO Demo \
+	cd ${WRKSRC} && pax -rw CHANGES README INSTALL TODO Demo \
 		${PY_LDAP_DOCDIR}
 
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-ldap/PLIST b/databases/py-ldap/PLIST
index b7b7fa7cc39..1c6f544d933 100644
--- a/databases/py-ldap/PLIST
+++ b/databases/py-ldap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/14 21:09:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/12/16 15:34:14 adam Exp $
 ${PYSITELIB}/_ldap.so
 ${PYSITELIB}/dsml.py
 ${PYSITELIB}/dsml.pyc
@@ -52,15 +52,21 @@ ${PYSITELIB}/ldif.py
 ${PYSITELIB}/ldif.pyc
 ${PYSITELIB}/ldif.pyo
 share/doc/py-ldap/CHANGES
+share/doc/py-ldap/Demo/Lib/ldap/async/deltree.py
+share/doc/py-ldap/Demo/Lib/ldap/async/ldifwriter.py
+share/doc/py-ldap/Demo/Lib/ldap/async/sizelimit.py
 share/doc/py-ldap/Demo/Lib/ldapurl/urlsearch.py
 share/doc/py-ldap/Demo/Lib/ldif/ldifcopy.py
 share/doc/py-ldap/Demo/initialize.py
 share/doc/py-ldap/Demo/ldapcontrols.py
 share/doc/py-ldap/Demo/options.py
+share/doc/py-ldap/Demo/page_control.py
 share/doc/py-ldap/Demo/passwd_ext_op.py
 share/doc/py-ldap/Demo/pickle_ldapobject.py
+share/doc/py-ldap/Demo/pyasn1/prereadcontrol.py
 share/doc/py-ldap/Demo/reconnect.py
 share/doc/py-ldap/Demo/rename.py
+share/doc/py-ldap/Demo/resiter.py
 share/doc/py-ldap/Demo/sasl_bind.py
 share/doc/py-ldap/Demo/schema.py
 share/doc/py-ldap/Demo/schema_tree.py
@@ -69,9 +75,11 @@ share/doc/py-ldap/Demo/simplebrowse.py
 share/doc/py-ldap/INSTALL
 share/doc/py-ldap/README
 share/doc/py-ldap/TODO
+@dirrm share/doc/py-ldap/Demo/pyasn1
 @dirrm share/doc/py-ldap/Demo/Lib/ldif
 @dirrm share/doc/py-ldap/Demo/Lib/ldapurl
 @dirrm share/doc/py-ldap/Demo/Lib/ldap/res
+@dirrm share/doc/py-ldap/Demo/Lib/ldap/async
 @dirrm share/doc/py-ldap/Demo/Lib/ldap
 @dirrm share/doc/py-ldap/Demo/Lib
 @dirrm share/doc/py-ldap/Demo
diff --git a/databases/py-ldap/distinfo b/databases/py-ldap/distinfo
index fd5ce29decd..eefcc10b358 100644
--- a/databases/py-ldap/distinfo
+++ b/databases/py-ldap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2006/05/14 21:09:20 wiz Exp $
+$NetBSD: distinfo,v 1.10 2007/12/16 15:34:14 adam Exp $
 
-SHA1 (python-ldap-2.2.0.tar.gz) = bc25275af4690b7438728787bd429e249e428260
-RMD160 (python-ldap-2.2.0.tar.gz) = d0dc7f3852dc980b032e24bb89b6f7687d562412
-Size (python-ldap-2.2.0.tar.gz) = 70993 bytes
-SHA1 (patch-aa) = 4486e22126fa66be9df0f85f2f8e50303942aded
+SHA1 (python-ldap-2.3.1.tar.gz) = 1ea659a53081ca6356507c74bc445c52ff9a5944
+RMD160 (python-ldap-2.3.1.tar.gz) = 0a2899c8d2574882c655af29ceba0547de73a914
+Size (python-ldap-2.3.1.tar.gz) = 76522 bytes
+SHA1 (patch-aa) = b575ad4adadebf83c927933cdc536508fea72e13
diff --git a/databases/py-ldap/patches/patch-aa b/databases/py-ldap/patches/patch-aa
index 23ae8c8ce39..b6aa6e9d21d 100644
--- a/databases/py-ldap/patches/patch-aa
+++ b/databases/py-ldap/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2006/05/14 21:09:20 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2007/12/16 15:34:14 adam Exp $
 
---- setup.cfg.orig	2005-07-28 21:56:49.000000000 +0900
+--- setup.cfg.orig	2006-11-15 18:26:26.000000000 +0100
 +++ setup.cfg
 @@ -7,8 +7,8 @@
  # for wrapping OpenLDAP 2 libs
  [_ldap]
  
--library_dirs = /usr/local/openldap-REL_ENG_2_1/lib /usr/local/cyrus-sasl/lib
--include_dirs = /usr/local/openldap-REL_ENG_2_1/include /usr/local/cyrus-sasl/include
+-library_dirs = /usr/local/openldap-2.3/lib
+-include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl
 +library_dirs = @PY_LDAP_LIBRARY_DIRS@
 +include_dirs = @PY_LDAP_INCLUDE_DIRS@
  
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.4 2006/05/14 21:09:20 wiz Exp $
  extra_objects = 
 @@ -23,7 +23,7 @@ extra_objects = 
  # Support for StartTLS/LDAPS, SASL bind and reentrant libldap_r.
- # This needs recent OpenLDAP 2.0.26+ or 2.1.3+ built with
+ # This needs recent OpenLDAP built with
  # ./configure --with-cyrus-sasl --with-tls
 -libs = ldap_r lber sasl2 ssl crypto
 +libs = @PY_LDAP_LIBS@