Update to version 2.0.0pre15, provided by David Ferlier in PR 24138 and

slightly reworked by myself.  David will now maintain it.

The 2.x series support OpenLDAP 2.x.  From then an incomplete list of
changes is available in the CHANGES file of the distfile.

5 files changed, 70 insertions, 73 deletions

diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 0438b05c194..3cc1aa5a941 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,31 +1,30 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:28:51 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 05:16:58 cube Exp $
 
-DISTNAME=	python-ldap-1.10alpha3-src
-PKGNAME=	${PYPKGPREFIX}-ldap-1.10a3
-WRKSRC=		${WRKDIR}/python-ldap-1.10alpha3
+DISTNAME=	python-ldap-2.0.0pre15
+PKGNAME=	${PYPKGPREFIX}-ldap-2.0.0pre15
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-ldap/}
 
-MAINTAINER=	tsarna@NetBSD.org
+MAINTAINER=	david@netbsd-fr.org
 HOMEPAGE=	http://sourceforge.net/projects/python-ldap/
 COMMENT=	LDAP client API for Python
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-CONFIGURE_ARGS+=--with-python=${PYTHONBIN}
-USE_BUILDLINK2=	yes
+PYTHON_VERSIONS_ACCEPTED=	21pth 22pth 23pth
+PYDISTUTILSPKG=			yes
+USE_BUILDLINK2=			yes
 
-PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
+SUBST_CLASSES+=			setup
+SUBST_STAGE.setup=		pre-configure
+SUBST_FILES.setup=		${WRKSRC}/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/include/sasl|${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl|"
 
-PY_PATCHPLIST=	yes
+.include "../../databases/openldap/buildlink2.mk"
+.include "../../security/cyrus-sasl2/buildlink2.mk"
+.include "../../lang/python/extension.mk"
 
-post-install:
-	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${PREFIX}; ${FIND} ${PYSITELIB}/python-ldap \
-	 -type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/python-ldap \
-	 -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
+SUBST_SED.setup+=		-e "s|crypto|& pthread|"
+.endif
 
-.include "../../databases/openldap1/buildlink2.mk"
-.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-ldap/PLIST b/databases/py-ldap/PLIST
new file mode 100644
index 00000000000..c1cf67acd77
--- /dev/null
+++ b/databases/py-ldap/PLIST
@@ -0,0 +1,49 @@
+@comment $NetBSD: PLIST,v 1.1 2004/01/20 05:16:58 cube Exp $
+${PYSITELIB}/_ldap.so
+${PYSITELIB}/dsml.py
+${PYSITELIB}/dsml.pyc
+${PYSITELIB}/dsml.pyo
+${PYSITELIB}/ldap/__init__.py
+${PYSITELIB}/ldap/__init__.pyc
+${PYSITELIB}/ldap/__init__.pyo
+${PYSITELIB}/ldap/async.py
+${PYSITELIB}/ldap/async.pyc
+${PYSITELIB}/ldap/async.pyo
+${PYSITELIB}/ldap/cidict.py
+${PYSITELIB}/ldap/cidict.pyc
+${PYSITELIB}/ldap/cidict.pyo
+${PYSITELIB}/ldap/filter.py
+${PYSITELIB}/ldap/filter.pyc
+${PYSITELIB}/ldap/filter.pyo
+${PYSITELIB}/ldap/functions.py
+${PYSITELIB}/ldap/functions.pyc
+${PYSITELIB}/ldap/functions.pyo
+${PYSITELIB}/ldap/ldapobject.py
+${PYSITELIB}/ldap/ldapobject.pyc
+${PYSITELIB}/ldap/ldapobject.pyo
+${PYSITELIB}/ldap/modlist.py
+${PYSITELIB}/ldap/modlist.pyc
+${PYSITELIB}/ldap/modlist.pyo
+${PYSITELIB}/ldap/sasl.py
+${PYSITELIB}/ldap/sasl.pyc
+${PYSITELIB}/ldap/sasl.pyo
+${PYSITELIB}/ldap/schema/__init__.py
+${PYSITELIB}/ldap/schema/__init__.pyc
+${PYSITELIB}/ldap/schema/__init__.pyo
+${PYSITELIB}/ldap/schema/models.py
+${PYSITELIB}/ldap/schema/models.pyc
+${PYSITELIB}/ldap/schema/models.pyo
+${PYSITELIB}/ldap/schema/subentry.py
+${PYSITELIB}/ldap/schema/subentry.pyc
+${PYSITELIB}/ldap/schema/subentry.pyo
+${PYSITELIB}/ldap/schema/tokenizer.py
+${PYSITELIB}/ldap/schema/tokenizer.pyc
+${PYSITELIB}/ldap/schema/tokenizer.pyo
+${PYSITELIB}/ldapurl.py
+${PYSITELIB}/ldapurl.pyc
+${PYSITELIB}/ldapurl.pyo
+${PYSITELIB}/ldif.py
+${PYSITELIB}/ldif.pyc
+${PYSITELIB}/ldif.pyo
+@dirrm ${PYSITELIB}/ldap/schema
+@dirrm ${PYSITELIB}/ldap
diff --git a/databases/py-ldap/PLIST.pre b/databases/py-ldap/PLIST.pre
deleted file mode 100644
index c60270410ae..00000000000
--- a/databases/py-ldap/PLIST.pre
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.2 2002/01/19 17:14:55 drochner Exp $
-${PYSITELIB}/ldap.pth
diff --git a/databases/py-ldap/distinfo b/databases/py-ldap/distinfo
index 5ca2224963f..ebce30f6a66 100644
--- a/databases/py-ldap/distinfo
+++ b/databases/py-ldap/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/01/04 18:16:22 cjep Exp $
+$NetBSD: distinfo,v 1.4 2004/01/20 05:16:58 cube Exp $
 
-SHA1 (python-ldap-1.10alpha3-src.tar.gz) = feca8c817bd2c08d771ea4d6299b6e512801b491
-Size (python-ldap-1.10alpha3-src.tar.gz) = 87188 bytes
-SHA1 (patch-aa) = 56f2577c16c1c48f671f9b5534d849ef2d588334
+SHA1 (python-ldap-2.0.0pre15.tar.gz) = 9308ede823d1818b28461a997769c6234e3dd6c5
+Size (python-ldap-2.0.0pre15.tar.gz) = 73156 bytes
diff --git a/databases/py-ldap/patches/patch-aa b/databases/py-ldap/patches/patch-aa
deleted file mode 100644
index b782367d76c..00000000000
--- a/databases/py-ldap/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/01/04 18:16:22 cjep Exp $
-
---- Misc/Makefile.python-1.4.orig	Mon Aug 14 23:37:41 2000
-+++ Misc/Makefile.python-1.4
-@@ -141,6 +141,7 @@ BINLIBDEST=	$(LIBDIR)/python$(VERSION)
- LIBDEST=	$(SCRIPTDIR)/python$(VERSION)
- INCLUDEPY=	$(INCLUDEDIR)/python$(VERSION)
- LIBP=		$(exec_installdir)/lib/python$(VERSION)
-+DESTSHARED=	$(BINLIBDEST)/site-packages
- 
- LIBPL=		$(LIBP)/config
- 
-@@ -159,6 +160,9 @@ SYSLIBS=	$(LIBM) $(LIBC)
- 
- ADDOBJS=	$(LIBPL)/main.o getpath.o config.o
- 
-+INSTALL=	$(LIBPL)/install-sh -c
-+INSTALL_SHARED=	${INSTALL} -m 555
-+
- # === Fixed rules ===
- 
- # Default target.  This builds shared libraries only
-@@ -249,9 +253,9 @@ sedscript:	$(MAKEFILE)
- 
- # Bootstrap target
- boot:	clobber
--	VERSION=`python -c "import sys; print sys.version[:3]"`; \
--	installdir=`python -c "import sys; print sys.prefix"`; \
--	exec_installdir=`python -c "import sys; print sys.exec_prefix"`; \
-+	VERSION=`$(PYTHON) -c "import sys; print sys.version[:3]"`; \
-+	installdir=`$(PYTHON) -c "import sys; print sys.prefix"`; \
-+	exec_installdir=`$(PYTHON) -c "import sys; print sys.exec_prefix"`; \
- 	$(MAKE) -f $(srcdir)/Makefile.pre.in VPATH=$(VPATH) srcdir=$(srcdir) \
- 		VERSION=$$VERSION \
- 		installdir=$$installdir \
-@@ -271,3 +275,12 @@ clobber:	clean
- # Handy target to remove everything you don't want to distribute
- distclean:	clobber
- 		-rm -f Makefile Setup
-+
-+install:	sharedmods
-+		if test ! -d $(DESTSHARED) ; then \
-+			mkdir $(DESTSHARED) ; else true ; fi
-+		-for i in X $(SHAREDMODS); do \
-+			if test $$i != X; \
-+			then $(INSTALL_SHARED) $$i $(DESTSHARED)/$$i; \
-+			fi; \
-+		done