diff options
| author | wiz <wiz@pkgsrc.org> | 2005-05-31 16:03:41 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-05-31 16:03:41 +0000 |
| commit | 8dfa9a3aa9b6d6c039764c32ee54b12af3a7d087 (patch) | |
| tree | 0ff81b72e407371c25455b0c11fa6f4fe41ea50a /mk/bsd.options.mk | |
| parent | 047dc739107d8a99fdfe81346b1af0b458666452 (diff) | |
| download | pkgsrc-8dfa9a3aa9b6d6c039764c32ee54b12af3a7d087.tar.gz | |
Show a deprecated warning even if the deprecated variable is set to
something other than [yY][eE][sS].
If a deprecated warning is defined, interpret it as YES (because some
variables in defaults/mk.conf have defined/not defined as yes/no).
Reviewed by dillo.
Diffstat (limited to 'mk/bsd.options.mk')
| -rw-r--r-- | mk/bsd.options.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index 385c9489757..a5acb1077f0 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.28 2005/05/31 15:05:13 rillig Exp $ +# $NetBSD: bsd.options.mk,v 1.29 2005/05/31 16:03:41 wiz Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -108,9 +108,15 @@ _var_:= ${_m_:C/:.*//} _opt_:= ${_m_:C/.*://} _popt_:=${_opt_:C/-//} . if !empty(PKG_SUPPORTED_OPTIONS:M${_popt_}) -. if defined(${_var_}) && !empty(${_var_}:M[yY][eE][sS]) +. if defined(${_var_}) +_DEPRECATED_WARNING:=${_DEPRECATED_WARNING} "Deprecated variable "${_var_:Q}" used, use PKG_DEFAULT_OPTIONS+="${_popt_:Q}" instead." +. if empty(${_var_}:M[nN][oO]) _PKG_LEGACY_OPTIONS:=${_PKG_LEGACY_OPTIONS} ${_opt_} -_DEPRECATED_WARNING:=${_DEPRECATED_WARNING} "Deprecated variable "${_var_:Q}" used, use PKG_DEFAULT_OPTIONS+="${_opt_:Q}" instead." +. elif empty(_opt_:M-*) +_PKG_LEGACY_OPTIONS:=${_PKG_LEGACY_OPTIONS} -${_popt_} +. else +_PKG_LEGACY_OPTIONS:=${_PKG_LEGACY_OPTIONS} ${_popt_} +. endif . endif . endif .endfor |