[pkgsrc/trunk]: pkgsrc/mk Show a deprecated warning even if the deprecated va...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/debff9d42656
branches:  trunk
changeset: 494856:debff9d42656
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 31 16:03:41 2005 +0000

description:
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:

 mk/bsd.options.mk |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 2339a5f954cf -r debff9d42656 mk/bsd.options.mk
--- a/mk/bsd.options.mk Tue May 31 16:00:58 2005 +0000
+++ b/mk/bsd.options.mk Tue May 31 16:03:41 2005 +0000
@@ -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 @@
 _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