diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-22 19:32:51 +0000 |
| commit | 9d5426ff76defa85311d3e55ed2c442fb5ae9977 (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /mail/cyrus-imapd22/Makefile | |
| parent | 3c0724db4840983688df4cd77ea88653e9b13249 (diff) | |
| download | pkgsrc-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 'mail/cyrus-imapd22/Makefile')
| -rw-r--r-- | mail/cyrus-imapd22/Makefile | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index 76976f2aebf..3c85f140707 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/08/11 22:09:04 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2004/08/22 19:32:51 jlam Exp $ DISTNAME= cyrus-imapd-2.2.8 PKGREVISION= 1 @@ -49,18 +49,6 @@ CONFIGURE_ARGS+= --enable-nntp CONFIGURE_ARGS+= --without-zephyr CONFIGURE_ARGS+= --without-ucdsnmp -.if defined(KERBEROS) -. if !defined(PKG_OPTIONS.cyrus-imapd) -. if defined(KERBEROS) -. if ${KERBEROS} == "4" -PKG_OPTIONS.cyrus-imapd+= kerberos4 -. else -PKG_OPTIONS.cyrus-imapd+= kerberos -. endif -. endif -. endif -.endif - PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4 .include "../../mk/bsd.options.mk" |