From e292c0d74119fc24223180773c118a516c436296 Mon Sep 17 00:00:00 2001
From: rpointel <rpointel@openbsd.org>
Date: Sun, 12 Jun 2011 09:02:32 +0000
Subject: [PATCH] Reported and patch from Nigel Taylor (thanks). Modified
 PLIST, removed PFRAG.python2.6-main and added PFRAG.python2.7-main. I added
 MODPY_WANTLIB to WANTLIB.

---
 databases/py-ldap/Makefile                 | 6 +++---
 databases/py-ldap/pkg/PFRAG.python2.6-main | 2 --
 databases/py-ldap/pkg/PFRAG.python2.7-main | 2 ++
 databases/py-ldap/pkg/PLIST-main           | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 databases/py-ldap/pkg/PFRAG.python2.6-main
 create mode 100644 databases/py-ldap/pkg/PFRAG.python2.7-main

diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 0ef3f9227ea..ad371e4a67e 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2011/06/10 05:48:35 rpointel Exp $
+# $OpenBSD: Makefile,v 1.29 2011/06/12 09:02:32 rpointel Exp $
 
 SHARED_ONLY=		Yes
 
@@ -8,7 +8,7 @@ COMMENT-examples=	example programs for the LDAP client API for Python
 V=			2.3.1
 DISTNAME=		python-ldap-${V}
 PKGNAME-main=		py-ldap-${V}
-REVISION-main =		7
+REVISION-main =		8
 FULLPKGNAME-examples=	py-ldap-examples-${V}
 REVISION-examples =	8
 FULLPKGPATH-examples=	databases/py-ldap,-examples
@@ -23,7 +23,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
-WANTLIB-main=		crypto ssl
+WANTLIB-main=		crypto ssl ${MODPY_WANTLIB}
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=python-ldap/}
 
diff --git a/databases/py-ldap/pkg/PFRAG.python2.6-main b/databases/py-ldap/pkg/PFRAG.python2.6-main
deleted file mode 100644
index f20354e8fa5..00000000000
--- a/databases/py-ldap/pkg/PFRAG.python2.6-main
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.python2.6-main,v 1.1 2010/09/03 12:34:55 sthen Exp $
-@pkgpath databases/py-ldap,-main,python2.5
diff --git a/databases/py-ldap/pkg/PFRAG.python2.7-main b/databases/py-ldap/pkg/PFRAG.python2.7-main
new file mode 100644
index 00000000000..8b3141a5099
--- /dev/null
+++ b/databases/py-ldap/pkg/PFRAG.python2.7-main
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.python2.7-main,v 1.1 2011/06/12 09:02:32 rpointel Exp $
+@pkgpath databases/py-ldap,-main[,python2.5][,python2.6]
diff --git a/databases/py-ldap/pkg/PLIST-main b/databases/py-ldap/pkg/PLIST-main
index 6a58b71e3b2..6ef8213f2cf 100644
--- a/databases/py-ldap/pkg/PLIST-main
+++ b/databases/py-ldap/pkg/PLIST-main
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2010/09/03 12:34:55 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2011/06/12 09:02:32 rpointel Exp $
 @option no-default-conflict
 @conflict py-ldap-*-python${MODPY_VERSION}
 @pkgpath databases/py-ldap
-%%python2.6%%
+%%python2.7%%
 lib/python${MODPY_VERSION}/site-packages/_ldap.so
 lib/python${MODPY_VERSION}/site-packages/dsml.py
 lib/python${MODPY_VERSION}/site-packages/dsml.pyc