diff options
| author | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
| commit | 5cc6a7c1f324655a55780f73b3d7d11d39d55ec5 (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /mail/dspam | |
| parent | a3f9a03576685fb9a6a35d58b1695247504fc00a (diff) | |
| download | pkgsrc-5cc6a7c1f324655a55780f73b3d7d11d39d55ec5.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/dspam')
| -rw-r--r-- | mail/dspam/options.mk | 66 |
1 files changed, 28 insertions, 38 deletions
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk index e0364d20384..af3fa1658b4 100644 --- a/mail/dspam/options.mk +++ b/mail/dspam/options.mk @@ -1,42 +1,32 @@ -# $NetBSD: options.mk,v 1.2 2004/08/09 07:02:59 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $ -# Global and legacy options -.if defined(DSPAM_HOMEDIR_DOTFILES) || defined(DSPAM_USE_WEBMAIL) || \ - defined(DSPAM_SIGNATURE_ATTACHMENTS) || \ - defined(DSPAM_SIGNATURE_HEADERS) || defined(DSPAM_LARGESCALE) || \ - defined(DSPAM_VIRTUAL_USERS) || defined(DSPAM_CGI_GRAPHS) || \ - defined(DSPAM_CLIENT_COMPRESSION) -. if !defined(PKG_OPTIONS.dspam) -. if defined(DSPAM_HOMEDIR_DOTFILES) && \ - !empty(DSPAM_HOMEDIR_DOTFILES:M[Yy][Ee][Ss]) -PKG_OPTIONS.dspam+= dotfiles -. endif -. if defined(DSPAM_USE_WEBMAIL) && !empty(DSPAM_USE_WEBMAIL:M[Yy][Ee][Ss]) -PKG_OPTIONS.dspam+= webmail -. endif -. if defined(DSPAM_SIGNATURE_ATTACHMENTS) && \ - !empty(DSPAM_SIGNATURE_ATTACHMENTS:M[Yy][Ee][Ss]) -PKG_OPTIONS.dspam+= sig-attachment -. endif -. if defined(DSPAM_SIGNATURE_HEADERS) && \ - !empty(DSPAM_SIGNATURE_HEADERS:M[Yy][Ee][Ss]) -PKG_OPTIONS.dspam+= sig-headers -. endif -. if defined(DSPAM_LARGESCALE) && !empty(DSPAM_LARGESCALE:M[Yy][Ee][Ss]) -PKG_OPTIONS.dspam+= largescale -. endif -. if defined(DSPAM_VIRTUAL_USERS) && \ - !empty(DSPAM_VIRTUAL_USERS:M[Yy][Ee][Ss]) -PKG_OPTIONS.dspam+= virtualusers -. endif -. if defined(DSPAM_CGI_GRAPHS) && !empty(DSPAM_CGI_GRAPHS:M[Yy][Ee][Ss]) -PKG_OPTIONS.dspam+= graphs -. endif -. if defined(DSPAM_CLIENT_COMPRESSION) && \ - !empty(DSPAM_CLIENT_COMPRESSION:M[Yy][Ee][Ss]) -PKG_OPTIONS.dspam+= compress -. endif -. endif +.if defined(DSPAM_HOMEDIR_DOTFILES) && \ + !empty(DSPAM_HOMEDIR_DOTFILES:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= dotfiles +.endif +.if defined(DSPAM_USE_WEBMAIL) && !empty(DSPAM_USE_WEBMAIL:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= webmail +.endif +.if defined(DSPAM_SIGNATURE_ATTACHMENTS) && \ + !empty(DSPAM_SIGNATURE_ATTACHMENTS:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= sig-attachment +.endif +.if defined(DSPAM_SIGNATURE_HEADERS) && \ + !empty(DSPAM_SIGNATURE_HEADERS:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= sig-headers +.endif +.if defined(DSPAM_LARGESCALE) && !empty(DSPAM_LARGESCALE:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= largescale +.endif +.if defined(DSPAM_VIRTUAL_USERS) && !empty(DSPAM_VIRTUAL_USERS:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= virtualusers +.endif +.if defined(DSPAM_CGI_GRAPHS) && !empty(DSPAM_CGI_GRAPHS:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= graphs +.endif +.if defined(DSPAM_CLIENT_COMPRESSION) && \ + !empty(DSPAM_CLIENT_COMPRESSION:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= compress .endif .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom) DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS} |