From a6b092c673c457a59932f6437557c8f0048d965f Mon Sep 17 00:00:00 2001
From: manu <manu>
Date: Sat, 31 Jan 2009 15:59:04 +0000
Subject: - Add optionnal DSO support to slapd. - Bump revision of
 openldap-server because of that - Remove the smbk5pwd option, which will be
 moved to another package as module

---
 databases/openldap-server/Makefile   |  3 ++-
 databases/openldap-server/PLIST      |  2 +-
 databases/openldap-server/options.mk | 22 ++++++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'databases/openldap-server')

diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index 23d38a7f7b5..45f007eb357 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2009/01/24 21:10:48 manu Exp $
+# $NetBSD: Makefile,v 1.19 2009/01/31 15:59:05 manu Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
+PKGREVISION=            1
 COMMENT=		Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=		openldap<2.3.23nb1
diff --git a/databases/openldap-server/PLIST b/databases/openldap-server/PLIST
index 18c85ae7df9..0bad11202ab 100644
--- a/databases/openldap-server/PLIST
+++ b/databases/openldap-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/01/24 21:10:48 manu Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/01/31 15:59:05 manu Exp $
 libexec/slapd
 sbin/slapacl
 sbin/slapadd
diff --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk
index 292dd1aada8..dd1791cafeb 100644
--- a/databases/openldap-server/options.mk
+++ b/databases/openldap-server/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.9 2008/09/22 08:46:32 tron Exp $
+# $NetBSD: options.mk,v 1.10 2009/01/31 15:59:05 manu Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap-server
-PKG_SUPPORTED_OPTIONS=	bdb kerberos sasl slp inet6 smbk5pwd
+PKG_SUPPORTED_OPTIONS=	bdb kerberos sasl slp inet6 smbk5pwd dso
 PKG_OPTIONS_OPTIONAL_GROUPS+=	odbc
 PKG_OPTIONS_GROUP.odbc=	iodbc unixodbc
 PKG_SUGGESTED_OPTIONS=	bdb
@@ -89,12 +89,14 @@ CONFIGURE_ARGS+=	--disable-ipv6
 ###
 
 .if !empty(PKG_OPTIONS:Msmbk5pwd)
-CONFIGURE_ARGS+=	--enable-smbk5pwd
-LDFLAGS+=-ldes
-LDFLAGS+=-lkrb5
-LDFLAGS+=-lkadm5srv
-LDFLAGS+=-lhdb
-. include "../../mk/krb5.buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-smbk5pwd
+PKG_FAIL_REASON+=	"smbk5pwd option to openldap-server is now " \
+			"available through the openldap-smbk5pwd package"
+.endif
+
+###
+### Enable dynamic module support
+###
+.if !empty(PKG_OPTIONS:Mdso)
+CONFIGURE_ARGS+=	--enable-modules
+. include "../../devel/libltdl/buildlink3.mk"
 .endif
-- 
cgit v1.2.3