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.

9 files changed, 24 insertions, 24 deletions

diff --git a/security/courier-authlib/options.mk b/security/courier-authlib/options.mk
index f162ec662f3..a7743bc0e25 100644
--- a/security/courier-authlib/options.mk
+++ b/security/courier-authlib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2006/04/13 18:27:24 jlam Exp $
+# $NetBSD: options.mk,v 1.10 2006/05/31 18:22:25 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-authlib
 PKG_SUPPORTED_OPTIONS=	pam bdb ldap mysql pgsql
@@ -62,7 +62,7 @@ PLIST_SUBST+=		BDB="@comment "
 ### LDAP authentication
 ###
 .if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
+.  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-authldap
 AUTHLIB_PLIST+=		${AUTHLIBDIR}/libauthldap.la
 AUTHLIB_PLIST+=		${AUTHEXAMPLEDIR}/authldaprc.dist
diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk
index 78caccd0be6..e03d0db01ba 100644
--- a/security/cyrus-saslauthd/options.mk
+++ b/security/cyrus-saslauthd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2006/04/19 17:50:52 tv Exp $
+# $NetBSD: options.mk,v 1.10 2006/05/31 18:22:25 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-saslauthd
 PKG_SUPPORTED_OPTIONS=	pam kerberos ldap gssapi
@@ -19,10 +19,10 @@ CONFIGURE_ARGS+=	--without-pam
 ### Authentication against information stored in an LDAP directory
 ###
 .if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
+.  include "../../databases/openldap-client/buildlink3.mk"
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 BUILDLINK_INCDIRS.cyrus-sasl=	include/sasl
-CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap}
+CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
 PLIST_SUBST+=		LDAP=
 .else
 CONFIGURE_ARGS+=	--without-ldap
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 44084ea6bf4..d4baa83d918 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/05/25 22:49:23 seb Exp $
+# $NetBSD: Makefile,v 1.23 2006/05/31 18:22:25 ghen Exp $
 #
 
 DISTNAME=		dirmngr-0.9.3
@@ -29,7 +29,7 @@ INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
-CONFIGURE_ENV+=		BUILDLINK_PREFIX_openldap=${BUILDLINK_PREFIX.openldap}
+CONFIGURE_ENV+=		BUILDLINK_PREFIX_openldap-client=${BUILDLINK_PREFIX.openldap-client}
 CONFIGURE_ARGS+=	--with-pth-prefix=${WRKDIR}/pth
 
 SUBST_FILES+=		VARBASE=${VARBASE}
@@ -62,7 +62,7 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/runDirmngr ${PREFIX}/sbin
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../security/libassuan/buildlink3.mk"
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index add8c84b36a..c908b3aead0 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:38 reed Exp $
+# $NetBSD: Makefile,v 1.16 2006/05/31 18:22:25 ghen Exp $
 #
 
 DISTNAME=		gnupg-1.9.20
@@ -56,7 +56,7 @@ pre-configure:
 
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk
index 8b16ccca849..29171f1d66b 100644
--- a/security/gnupg/options.mk
+++ b/security/gnupg/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2006/04/05 10:04:12 drochner Exp $
+# $NetBSD: options.mk,v 1.8 2006/05/31 18:22:25 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg
 PKG_SUPPORTED_OPTIONS=	curl idea ldap
@@ -40,7 +40,7 @@ pre-configure:
 .endif
 
 .if !empty(PKG_OPTIONS:Mldap)
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 PLIST_SUBST+=	OPENLDAP=""
 .else
 CONFIGURE_ARGS+=--disable-ldap
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 3e942a36702..a0566f88283 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/05/15 09:17:14 minskim Exp $
+# $NetBSD: Makefile,v 1.59 2006/05/31 18:22:26 ghen Exp $
 
 DISTNAME=	heimdal-0.7.2
 PKGREVISION=	1
@@ -60,8 +60,8 @@ PKG_SUPPORTED_OPTIONS=	kerberos-prefix-cmds ldap
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-openldap=${BUILDLINK_PREFIX.openldap}
+.  include "../../databases/openldap-client/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-openldap=${BUILDLINK_PREFIX.openldap-client}
 PLIST_SUBST+=		LDAP=""
 
 post-install: heimdal-ldap-schema
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 8b0b01bbb8e..dc3b60e1f37 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2006/04/06 06:22:40 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2006/05/31 18:22:26 ghen Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -28,7 +28,7 @@ MAKEFLAGS+=	PKG_BUILD_OPTIONS.heimdal=${PKG_BUILD_OPTIONS.heimdal:Q}
 MAKEVARS+=	PKG_BUILD_OPTIONS.heimdal
 
 .if !empty(PKG_BUILD_OPTIONS.heimdal:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
+.  include "../../databases/openldap-client/buildlink3.mk"
 .endif
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index c5653fcb6b2..9990c70da12 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/05/31 18:22:26 ghen Exp $
 #
 
 DISTNAME=	pam_ldap-180
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.padl.com/pub/
 MASTER_SITES+=	http://www.padl.com/download/
@@ -16,7 +16,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ldap-lib=openldap
-CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap}
+CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
 CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/pam_ldap.conf
 CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/pam_ldap.secret
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -31,7 +31,7 @@ EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
 CONF_FILES=	${EGDIR}/pam_ldap.conf ${PKG_SYSCONFDIR}/pam_ldap.conf
 
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 
 post-install:
diff --git a/security/sudo/options.mk b/security/sudo/options.mk
index 11d24ef1750..95ccc9373b9 100644
--- a/security/sudo/options.mk
+++ b/security/sudo/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2005/08/22 10:20:33 abs Exp $
+# $NetBSD: options.mk,v 1.11 2006/05/31 18:22:26 ghen Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sudo
@@ -25,9 +25,9 @@ CONFIGURE_ARGS+=	--without-kerb5
 .endif
 
 .if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
+.  include "../../databases/openldap-client/buildlink3.mk"
 DL_AUTO_VARS=		yes
-CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap}
+CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
 CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf
 .endif