3 files changed, 38 insertions, 39 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index bfbbceef61e..91cd695ae2a 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2004/07/24 03:32:24 jlam Exp $
+# $NetBSD: Makefile,v 1.80 2004/07/30 21:05:41 jlam Exp $
 
 DISTNAME=		openldap-2.2.13
 SVR4_PKGNAME=		oldap
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--with-tls=openssl
 
 # SLAPD options
 CONFIGURE_ARGS+=	--enable-crypt
-.if !empty(_OPENLDAP_OPTIONS:Msasl)
+.if !empty(PKG_OPTIONS:Msasl)
 CONFIGURE_ARGS+=	--enable-spasswd
 .endif
 CONFIGURE_ARGS+=	--enable-wrappers
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 SLAPD_BACKEND_MODULES=	bdb:static dnnsrv hdb ldap ldbm meta		\
 			monitor:static null passwd shell
 .for _mod_ in ${SLAPD_BACKEND_MODULES}
-.  if !empty(_OPENLDAP_OPTIONS:Mdynamic)
+.  if !empty(PKG_OPTIONS:Mdynamic)
 CONFIGURE_ARGS+=	--enable-${_mod_:C/\:.*//}${_mod_:N*\:static:C/.*/=mod/}
 .  else
 CONFIGURE_ARGS+=	--enable-${_mod_:C/\:.*//}
diff --git a/databases/openldap/Makefile.options b/databases/openldap/Makefile.options
index 5f5c22e01b4..e5f1d5d21a9 100644
--- a/databases/openldap/Makefile.options
+++ b/databases/openldap/Makefile.options
@@ -1,45 +1,29 @@
-# $NetBSD: Makefile.options,v 1.4 2004/07/24 18:37:10 jlam Exp $
-#
-# OPENLDAP_ALL_OPTIONS lists all of the currently-supported optional modules
-# that *may* be built.
-#
-# OPENLDAP_OPTIONS is a list of the modules that *will* be built.
-#
-OPENLDAP_ALL_OPTIONS=	dynamic sasl slp
+# $NetBSD: Makefile.options,v 1.5 2004/07/30 21:05:41 jlam Exp $
 
-.if defined(USE_SASL) || defined(USE_SASL2) || defined(KERBEROS)
-.  if !defined(OPENLDAP_OPTIONS)
-.    if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-OPENLDAP_OPTIONS+=	sasl
+# Global and legacy options
+.if defined(KERBEROS) || defined(USE_SASL) || defined(USE_SASL2)
+.  if !defined(PKG_OPTIONS.openldap)
+.    if defined(KERBEROS)
+PKG_OPTIONS.openldap+=	kerberos
 .    endif
 .    if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-OPENLDAP_OPTIONS+=	sasl
+PKG_OPTIONS.openldap+=	sasl
 .    endif
-.    if defined(KERBEROS)
-OPENLDAP_OPTIONS+=	sasl
+.    if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
+PKG_OPTIONS.openldap+=	sasl
 .    endif
 .  endif
 .endif
 
-OPENLDAP_OPTIONS?=	# empty
-BUILD_DEFS+=		OPENLDAP_OPTIONS
-
-_OPENLDAP_OPTIONS=		# empty
-.for _opt_ in ${OPENLDAP_OPTIONS}
-.  if empty(_OPENLDAP_OPTIONS:M${_opt_})
-.    if !empty(OPENLDAP_ALL_OPTIONS:M${_opt_})
-_OPENLDAP_OPTIONS+=		${_opt_}
-.    else
-PKG_FAIL_REASON+=	"\"${_opt_}\" is not a supported Mutt build option."
-.    endif
-.  endif
-.endfor
+PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap
+PKG_SUPPORTED_OPTIONS=	dynamic kerberos sasl slp
+.include "../../mk/bsd.options.mk"
 
 ###
 ### Whether to build with dynamically-loadable backend modules.  If not
 ### specified, then link the backend modules statically into slapd.
 ###
-.if !empty(_OPENLDAP_OPTIONS:Mdynamic)
+.if !empty(PKG_OPTIONS:Mdynamic)
 CONFIGURE_ARGS+=	--enable-modules
 PLIST_SUBST+=		DYNAMIC_MOD=
 .else
@@ -47,9 +31,18 @@ PLIST_SUBST+=		DYNAMIC_MOD="@comment "
 .endif
 
 ###
+### Kerberos authentication is via SASL.
+###
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  if empty(PKG_OPTIONS:Msasl)
+PKG_OPTIONS+=		sasl
+.  endif
+.endif
+
+###
 ### SASL authentication
 ###
-.if !empty(_OPENLDAP_OPTIONS:Msasl)
+.if !empty(PKG_OPTIONS:Msasl)
 .  if !defined(USE_SASL2) && !defined(USE_SASL)
 .    include "../../security/cyrus-sasl2/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-cyrus-sasl
@@ -65,7 +58,7 @@ CONFIGURE_ARGS+=	--with-cyrus-sasl
 ###
 ### SLP (Service Locator Protocol)
 ###
-.if !empty(_OPENLDAP_OPTIONS:Mslp)
+.if !empty(PKG_OPTIONS:Mslp)
 .  include "../../net/openslp/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-slp
 .endif
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index dcab5e17c6a..7712e2e8e70 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/07/24 17:24:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/07/30 21:05:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
@@ -18,10 +18,16 @@ BUILDLINK_RECOMMENDED.openldap?=	openldap>=2.2.13
 BUILDLINK_PKGSRCDIR.openldap?=		../../databases/openldap
 .endif	# OPENLDAP_BUILDLINK3_MK
 
-.if defined(USE_SASL2) && (${USE_SASL2} == "YES")
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
-.elif defined(USE_SASL) && (${USE_SASL} == "YES")
-.  include "../../security/cyrus-sasl/buildlink3.mk"
+PKG_OPTIONS.openldap?=	${PKG_DEFAULT_OPTIONS}
+
+.if !empty(PKG_OPTIONS.openldap:Msasl)
+.  if !defined(USE_SASL2) && !defined(USE_SASL)
+.    include "../../security/cyrus-sasl2/buildlink3.mk"
+.  elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
+.    include "../../security/cyrus-sasl2/buildlink3.mk"
+.  elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
+.    include "../../security/cyrus-sasl/buildlink3.mk"
+.  endif
 .endif
 .include "../../security/openssl/buildlink3.mk"