From fb6502b2aa6c7dc974b8fcaf0db65198fb10666c Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Tue, 25 Oct 2005 17:09:33 +0000
Subject: update to 2.0.10 changes: * Switched back to old implementation of  
 ldap.schema.tokenizer.split_tokens() since the new one   had a bug which
 deletes the spaces from DESC * ldap.INSUFFICIENT_ACCESS is now ignored in  
 ldap.ldapobject.LDAPObject.search_subschemasubentry_s()

---
 databases/py-ldap/Makefile         |  8 ++++----
 databases/py-ldap/distinfo         |  9 +++++----
 databases/py-ldap/patches/patch-aa | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 databases/py-ldap/patches/patch-aa

(limited to 'databases/py-ldap')

diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 4db34cec22a..ec5f6dcc5fd 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2005/08/04 11:17:04 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2005/10/25 17:09:33 drochner Exp $
 
-DISTNAME=	python-ldap-2.0.9
+DISTNAME=	python-ldap-2.0.10
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-ldap/}
@@ -15,8 +15,8 @@ PYDISTUTILSPKG=			yes
 SUBST_CLASSES+=			setup
 SUBST_STAGE.setup=		pre-configure
 SUBST_FILES.setup=		setup.cfg
-SUBST_SED.setup=		-e "s|/usr/local/openldap-REL_ENG_2_1|${BUILDLINK_PREFIX.cyrus-sasl}/lib ${BUILDLINK_PREFIX.openldap}|" 	\
-				-e "s|/usr/local/cyrus-sasl/include|${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl|"
+SUBST_SED.setup=		-e "s|@EXTRALIBS@|${BUILDLINK_PREFIX.cyrus-sasl}/lib ${BUILDLINK_PREFIX.openldap}/lib|" 	\
+				-e "s|@EXTRAINCS@|${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl ${BUILDLINK_PREFIX.openldap}/include|"
 
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../security/cyrus-sasl2/buildlink3.mk"
diff --git a/databases/py-ldap/distinfo b/databases/py-ldap/distinfo
index acf7ced5f8d..3ac5e43e301 100644
--- a/databases/py-ldap/distinfo
+++ b/databases/py-ldap/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/08/04 11:17:04 drochner Exp $
+$NetBSD: distinfo,v 1.8 2005/10/25 17:09:33 drochner Exp $
 
-SHA1 (python-ldap-2.0.9.tar.gz) = 94078a17ef1dcd483076db903e29ff332ef3585a
-RMD160 (python-ldap-2.0.9.tar.gz) = 0cb164afc7848ba5894d61c45c66f20118c2514b
-Size (python-ldap-2.0.9.tar.gz) = 72165 bytes
+SHA1 (python-ldap-2.0.10.tar.gz) = 268dd0a8815080a84d4f410577873b4051da2a27
+RMD160 (python-ldap-2.0.10.tar.gz) = 6c6e39c782812bdecf3f7325022f7aa78d9f9ff6
+Size (python-ldap-2.0.10.tar.gz) = 80655 bytes
+SHA1 (patch-aa) = 6285962cf3d0fa7d1a0cd4369c75db1b6d9b9476
diff --git a/databases/py-ldap/patches/patch-aa b/databases/py-ldap/patches/patch-aa
new file mode 100644
index 00000000000..ff488dfc6fd
--- /dev/null
+++ b/databases/py-ldap/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2005/10/25 17:09:33 drochner Exp $
+
+--- setup.cfg.orig	2005-10-25 16:40:19.000000000 +0200
++++ setup.cfg
+@@ -7,8 +7,8 @@
+ # for wrapping OpenLDAP 2 libs
+ [_ldap]
+ 
+-library_dirs = /opt/openldap-OPENLDAP_REL_ENG_2_3/lib /opt/sasl/lib
+-include_dirs = /opt/openldap-OPENLDAP_REL_ENG_2_3/include /opt/sasl/include/sasl /usr/include/sasl
++library_dirs = @EXTRALIBS@
++include_dirs = @EXTRAINCS@
+ #library_dirs = /opt/openldap-HEAD/lib /opt/sasl/lib
+ #include_dirs = /opt/openldap-HEAD/include /opt/sasl/include/sasl /usr/include/sasl
+ 
-- 
cgit v1.2.3