From 5cc6a7c1f324655a55780f73b3d7d11d39d55ec5 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 22 Aug 2004 19:32:51 +0000
Subject: Change the way that legacy USE_* and FOO_USE_* options are converted
 into the bsd.options.mk framework.  Instead of appending to
 ${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS.  This causes the
 default options to be the union of PKG_DEFAULT_OPTIONS and any old USE_* and
 FOO_USE_* settings.

This fixes PR pkg/26590.
---
 security/cyrus-saslauthd/options.mk | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'security/cyrus-saslauthd')

diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk
index 85991bed451..8cd8d370760 100644
--- a/security/cyrus-saslauthd/options.mk
+++ b/security/cyrus-saslauthd/options.mk
@@ -1,22 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $
 
-# Global and legacy options
-.if defined(KERBEROS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \
-    defined(SASL_USE_GSSAPI)
-.  if !defined(PKG_OPTIONS.cyrus-saslauthd)
-.    if defined(KERBEROS)
-PKG_OPTIONS.cyrus-saslauthd+=	kerberos
-.    endif
-.    if defined(USE_PAM) && !empty(USE_PAM:M[yY][eE][sS])
-PKG_OPTIONS.cyrus-saslauthd+=	PAM
-.    endif
-.    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_OPTIONS.cyrus-saslauthd+=	ldap
-.    endif
-.    if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
-PKG_OPTIONS.cyrus-saslauthd+=	gssapi
-.    endif
-.  endif
+.if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	gssapi
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-saslauthd
-- 
cgit v1.2.3