summaryrefslogtreecommitdiff
path: root/security/cyrus-sasl
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-08-22 19:32:51 +0000
committerjlam <jlam@pkgsrc.org>2004-08-22 19:32:51 +0000
commit9d5426ff76defa85311d3e55ed2c442fb5ae9977 (patch)
treebe106f064832dabfe855335adc4a7d14708a360a /security/cyrus-sasl
parent3c0724db4840983688df4cd77ea88653e9b13249 (diff)
downloadpkgsrc-9d5426ff76defa85311d3e55ed2c442fb5ae9977.tar.gz
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.
Diffstat (limited to 'security/cyrus-sasl')
-rw-r--r--security/cyrus-sasl/Makefile17
1 files changed, 3 insertions, 14 deletions
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 05df812292b..17415cc17b7 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2004/07/30 21:05:41 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2004/08/22 19:32:52 jlam Exp $
.include "Makefile.common"
@@ -14,19 +14,8 @@ CONFIGURE_ARGS+= --enable-digest # DIGEST-MD5
CONFIGURE_ARGS+= --with-rc4=${SSLBASE}
.include "../../security/openssl/buildlink3.mk"
-# Global and legacy options
-.if defined(KERBEROS) || defined(USE_PAM) || defined(SASL_USE_GSSAPI)
-. if !defined(PKG_OPTIONS.cyrus-sasl)
-. if defined(KERBEROS)
-PKG_OPTIONS.cyrus-sasl+= kerberos
-. endif
-. if defined(USE_PAM) && !empty(USE_PAM:M[yY][eE][sS])
-PKG_OPTIONS.cyrus-sasl+= PAM
-. endif
-. if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
-PKG_OPTIONS.cyrus-sasl+= 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-sasl