The databases/openldap package has been split in -client and -server component

packages.  Convert LDAP-based applications to depend on openldap-client, and
bump PKGREVISION for those that depend on it by default.

4 files changed, 15 insertions, 14 deletions

diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index a031efbb4e1..0dcdb5f2488 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/04/17 13:46:19 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/05/31 18:22:23 ghen Exp $
 #
 
 DISTNAME=	gq-1.0beta1
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	databases net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gqclient/}
 
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	--with-ssl-prefix=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--enable-cache
 
 .include "../../security/openssl/buildlink3.mk"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/nss_ldap/Makefile b/databases/nss_ldap/Makefile
index 7836d92d1d9..a0369bd8b9a 100644
--- a/databases/nss_ldap/Makefile
+++ b/databases/nss_ldap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/03/15 19:23:47 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/31 18:22:23 ghen Exp $
 #
 
 DISTNAME=		nss_ldap-240
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		databases
 MASTER_SITES=		http://www.padl.com/download/
 
@@ -29,5 +29,5 @@ pre-build:
 	${CP} ${FILESDIR}/netbsd.c  ${FILESDIR}/netbsd.h ${WRKSRC}
 	${LN} -fs /usr/include/nsswitch.h ${BUILDLINK_DIR}/include/nss.h
 
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-ldap/Makefile b/databases/php-ldap/Makefile
index eec0f536db9..d9a8cdaf778 100644
--- a/databases/php-ldap/Makefile
+++ b/databases/php-ldap/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/05/31 18:22:23 ghen Exp $
 
 MODNAME=		ldap
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES+=		databases
 COMMENT=		PHP extension for LDAP database access
 
 USE_PHP_EXT_PATCHES=	yes
 
-CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.openldap}
+CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.openldap-client}
 
 .include "../../lang/php/ext.mk"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 3960988755f..13b9d4c7fc7 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/05/15 06:23:26 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/05/31 18:22:23 ghen Exp $
 
 DISTNAME=	python-ldap-2.2.0
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
+PKGREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-ldap/}
 
@@ -12,8 +13,8 @@ COMMENT=	LDAP client API for Python
 PYTHON_VERSIONS_ACCEPTED=	23 24
 PYDISTUTILSPKG=			yes
 
-PY_LDAP_LIBRARY_DIRS=		${BUILDLINK_PREFIX.openldap}/lib
-PY_LDAP_INCLUDE_DIRS=		${BUILDLINK_PREFIX.openldap}/include
+PY_LDAP_LIBRARY_DIRS=		${BUILDLINK_PREFIX.openldap-client}/lib
+PY_LDAP_INCLUDE_DIRS=		${BUILDLINK_PREFIX.openldap-client}/include
 PY_LDAP_LIBS=			ldap_r lber ssl crypto
 
 .include "options.mk"
@@ -32,7 +33,7 @@ post-install:
 	cd ${WRKSRC} && ${PAX} -rw CHANGES README INSTALL TODO Demo \
 		${PY_LDAP_DOCDIR}
 
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../lang/python/extension.mk"