[pkgsrc/trunk]: pkgsrc/databases/openldap This version of openldap no longer ...

[rh <rh%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1fcef136bd3
branches:  trunk
changeset: 481170:e1fcef136bd3
user:      rh <rh%pkgsrc.org@localhost>
date:      Mon Sep 27 04:11:52 2004 +0000

description:
This version of openldap no longer builds against the old version of sasl,
so don't attempt to depend on it (always use cyrus-sasl2 for SASL support).
OK'ed by jlam.

diffstat:

 databases/openldap/options.mk |  17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diffs (33 lines):

diff -r 09d381764f6d -r e1fcef136bd3 databases/openldap/options.mk
--- a/databases/openldap/options.mk     Mon Sep 27 02:16:46 2004 +0000
+++ b/databases/openldap/options.mk     Mon Sep 27 04:11:52 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:51 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2004/09/27 04:11:52 rh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap
 PKG_SUPPORTED_OPTIONS= dynamic kerberos sasl slp
@@ -26,19 +26,12 @@
 .endif
 
 ###
-### SASL authentication
+### SASL authentication (requires SASL2)
 ###
 .if !empty(PKG_OPTIONS:Msasl)
-.  if !defined(USE_SASL2) && !defined(USE_SASL)
-.    include "../../security/cyrus-sasl2/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-cyrus-sasl
-.  elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-.    include "../../security/cyrus-sasl2/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-cyrus-sasl
-.  elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-.    include "../../security/cyrus-sasl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-cyrus-sasl
-.  endif
+CONFIGURE_ARGS+=               --with-cyrus-sasl
+BUILDLINK_DEPENDS.cyrus-sasl+=  cyrus-sasl>=2.1.15
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
 .endif
 
 ###