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.

5 files changed, 14 insertions, 14 deletions

diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 42c0399218f..120302a592d 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/05/31 18:22:26 ghen Exp $
 
 DISTNAME=	auth_ldap-1.6.1
 PKGNAME=	ap-auth-ldap-1.6.1
-PKGREVISION=	2
+PKGREVISION=	3
 SVR4_PKGNAME=	apldap
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.rudedog.org/auth_ldap/
@@ -27,6 +27,6 @@ post-install:
 
 .include "../../www/apache/module.mk"
 
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index a0036f1ed1a..c72e404ae71 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/04/22 09:22:16 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/05/31 18:22:26 ghen Exp $
 
 DISTNAME=	mod_auth_ldap3.05
 PKGNAME=	ap2-auth-ldap-3.05
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.muquit.com/muquit/software/mod_auth_ldap/
 
@@ -19,7 +19,7 @@ CPPFLAGS+=		-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber
 BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.47
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
-CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap}
+CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
 CONFIGURE_ARGS+=	--with-apache-dir=${PREFIX:Q}
 CONFIGURE_ARGS+=	--with-apache-ver=2
 
@@ -33,7 +33,7 @@ SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 do-install:
 	cd ${WRKSRC} && ${APXS} -i -n ${APACHE_MODULE_NAME} mod_auth_ldap.la
 
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/apache2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/www/horde3/options.mk b/www/horde3/options.mk
index 6801655e8f8..785e00df23e 100644
--- a/www/horde3/options.mk
+++ b/www/horde3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/08/29 13:36:06 tv Exp $
+# $NetBSD: options.mk,v 1.5 2006/05/31 18:22:26 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.horde
 PKG_SUPPORTED_OPTIONS=	ldap pgsql mysql
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=	mysql
 ### Use OpenLDAP for storing user details
 ###
 .if !empty(PKG_OPTIONS:Mldap)
-.	include "../../databases/openldap/buildlink3.mk"
+.	include "../../databases/openldap-client/buildlink3.mk"
 DEPENDS+=	php-ldap>=4.3.3:../../databases/php-ldap
 .endif
 
diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk
index 66f4011b0dc..8661d539eed 100644
--- a/www/lighttpd/options.mk
+++ b/www/lighttpd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/12/05 23:55:23 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2006/05/31 18:22:26 ghen Exp $
 
 PKG_OPTIONS_VAR =       PKG_OPTIONS.lighttpd
 PKG_SUPPORTED_OPTIONS=  bzip fam gdbm inet6 ldap lua mysql ssl memcache
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 ### Allow using LDAP for "basic" authentication.
 ###
 .if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
+.  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ldap
 .endif
 
diff --git a/www/sope/Makefile b/www/sope/Makefile
index de4cfb11718..04dbb1929a2 100644
--- a/www/sope/Makefile
+++ b/www/sope/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/05/28 00:26:27 rh Exp $
+# $NetBSD: Makefile,v 1.10 2006/05/31 18:22:26 ghen Exp $
 #
 
 DISTNAME=		sope-4.5.4-nevermind-r878
 PKGNAME=		sope-4.5.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		www gnustep
 MASTER_SITES=		ftp://ftp.opengroupware.org/nightly/sources/releases/ \
 			http://download.opengroupware.org/nightly/sources/releases/
@@ -45,7 +45,7 @@ post-configure:
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libFoundation/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"