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.

7 files changed, 16 insertions, 15 deletions

diff --git a/net/freeradius/options.mk b/net/freeradius/options.mk
index 54acd760549..e1d84d3cf3b 100644
--- a/net/freeradius/options.mk
+++ b/net/freeradius/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2006/02/05 15:34:08 adrianp Exp $
+# $NetBSD: options.mk,v 1.8 2006/05/31 18:22:24 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.freeradius
 
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--without-rlm_dbm
 ### Use OpenLDAP for storing user details
 ###
 .if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
+.  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-rlm_ldap
 PLIST_SRC+=		${PKGDIR}/PLIST.ldap
 .else
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index 236de5e80b9..fa3ac88cd30 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/05/31 18:22:24 ghen Exp $
 #
 
 DISTNAME=	hobbit-4.0-beta6
 PKGNAME=	hobbit-4.0b6
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
 
@@ -74,7 +74,7 @@ do-install:
 	fi
 
 .include "../../databases/rrdtool/buildlink3.mk"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/net/ja-samba/options.mk b/net/ja-samba/options.mk
index 518cf3d4879..22edae57e9c 100644
--- a/net/ja-samba/options.mk
+++ b/net/ja-samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2005/12/05 23:55:14 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:24 ghen Exp $
 
 # Global and legacy options
 
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--disable-cups
 ### Support LDAP password and account databases.
 ###
 .if !empty(PKG_OPTIONS:Mldap-compat)
-.  include "../../databases/openldap/buildlink3.mk"
+.  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ldapsam
 PLIST_SUBST+=		SAMBA_LDAP=""
 .else
diff --git a/net/nagios-plugin-ldap/Makefile b/net/nagios-plugin-ldap/Makefile
index e0d768415b2..bf13d0abad9 100644
--- a/net/nagios-plugin-ldap/Makefile
+++ b/net/nagios-plugin-ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:30:20 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/05/31 18:22:25 ghen Exp $
 #
 
 PKGNAME=	nagios-plugin-ldap-${PLUGINSVERSION}
+PKGREVISION=	1
 CATEGORIES=	net sysutils databases
 
 MAINTAINER=     pkgsrc-users@NetBSD.org
@@ -14,7 +15,7 @@ DEPENDS+=	nagios-plugins-${PLUGINSVERSION}:../../net/nagios-plugins
 BINARY_TARGET=	check_ldap
 
 .include "../../net/nagios-plugins/Makefile.plugin"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/proftpd/options.mk b/net/proftpd/options.mk
index 5d15e36118e..9b0b86c4483 100644
--- a/net/proftpd/options.mk
+++ b/net/proftpd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/02/13 09:16:05 martti Exp $
+# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:24 ghen Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.proftpd
@@ -37,7 +37,7 @@ MODULES:=	${MODULES}:mod_quotatab_ldap
 
 .if !empty(PKG_OPTIONS:Mldap)
 MODULES:=	${MODULES}:mod_ldap
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
diff --git a/net/pure-ftpd/options.mk b/net/pure-ftpd/options.mk
index d6b7e7a32c6..da41770d675 100644
--- a/net/pure-ftpd/options.mk
+++ b/net/pure-ftpd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/02/24 14:35:30 ghen Exp $
+# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:25 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pureftpd
 PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql ssl virtualchroot utf8
@@ -11,7 +11,7 @@ PKG_OPTIONS_LEGACY_VARS+=	PURE_FTPD_USE_VIRTUAL_CHROOT:virtualchroot
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
+.  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ldap
 .endif
 
diff --git a/net/samba/options.mk b/net/samba/options.mk
index 954d3d25cd3..0ec883d6132 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2006/04/20 11:44:07 grant Exp $
+# $NetBSD: options.mk,v 1.16 2006/05/31 18:22:25 ghen Exp $
 
 # Recommended package options for various setups:
 #
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--with-ldapsam
 ### Support LDAP authentication and storage of Samba account information.
 ###
 .if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
+.  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ldap
 .else
 CONFIGURE_ARGS+=	--without-ldap