Attempt to make this work with python 2.2. Also use buildlink2 for

openldap1.

3 files changed, 53 insertions, 4 deletions

diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index a1c4c4a7658..a61517bb031 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/09/21 23:46:47 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/04 18:16:22 cjep Exp $
 
 DISTNAME=	python-ldap-1.10alpha3-src
 PKGNAME=	${PYPKGPREFIX}-ldap-1.10a3
@@ -9,12 +9,11 @@ MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://sourceforge.net/projects/python-ldap/
 COMMENT=	LDAP client API for Python
 
-DEPENDS+=	openldap>=1.2.11:../../databases/openldap1
-
 WRKSRC=		${WRKDIR}/python-ldap-1.10alpha3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 CONFIGURE_ARGS+=--with-python=${PYTHONBIN}
+USE_BUILDLINK2=	yes
 
 PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
 
@@ -27,5 +26,6 @@ post-install:
 	(cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/python-ldap \
 	 -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
 
+.include "../../databases/openldap1/buildlink2.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-ldap/distinfo b/databases/py-ldap/distinfo
index f03a6bb5f7f..5ca2224963f 100644
--- a/databases/py-ldap/distinfo
+++ b/databases/py-ldap/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:11:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/01/04 18:16:22 cjep Exp $
 
 SHA1 (python-ldap-1.10alpha3-src.tar.gz) = feca8c817bd2c08d771ea4d6299b6e512801b491
 Size (python-ldap-1.10alpha3-src.tar.gz) = 87188 bytes
+SHA1 (patch-aa) = 56f2577c16c1c48f671f9b5534d849ef2d588334
diff --git a/databases/py-ldap/patches/patch-aa b/databases/py-ldap/patches/patch-aa
new file mode 100644
index 00000000000..b782367d76c
--- /dev/null
+++ b/databases/py-ldap/patches/patch-aa
@@ -0,0 +1,48 @@
+$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