[pkgsrc/trunk]: pkgsrc/mk make legacy variables external:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b27ee0621a8
branches:  trunk
changeset: 495282:0b27ee0621a8
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Mon Jun 06 13:54:51 2005 +0000

description:
make legacy variables external:
        PKG_LEGACY_OPTIONS
        PKG_OPTIONS_DEPRECATED_WARNINGS

diffstat:

 mk/bsd.options.mk       |  38 ++++++++++++++++++++++++++++----------
 mk/defaults/obsolete.mk |  20 ++++++++++----------
 2 files changed, 38 insertions(+), 20 deletions(-)

diffs (142 lines):

diff -r cadca322d660 -r 0b27ee0621a8 mk/bsd.options.mk
--- a/mk/bsd.options.mk Mon Jun 06 13:49:25 2005 +0000
+++ b/mk/bsd.options.mk Mon Jun 06 13:54:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.37 2005/06/04 16:30:19 dillo Exp $
+# $NetBSD: bsd.options.mk,v 1.38 2005/06/06 13:54:51 dillo Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -42,6 +42,16 @@
 #              map options that have been renamed to their new
 #              counterparts.
 #
+#      PKG_LEGACY_OPTIONS
+#              A list of options implied by deprecated variables
+#              used.  This can be used for cases that neither
+#              PKG_OPTIONS_LEGACY_VARS nor PKG_OPTIONS_LEGACY_OPTS
+#              can handle, e. g. when PKG_OPTIONS_VAR is renamed.
+#
+#      PKG_OPTIONS_DEPRECATED_WARNINGS
+#              A list of warnings about deprecated variables or
+#              options used, and what to use instead.
+#
 #       At least one of PKG_SUPPORTED_OPTIONS, PKG_OPTIONS_OPTIONAL_GROUPS,
 #      and PKG_OPTIONS_REQUIRED_GROUPS must be defined.
 #              
@@ -78,6 +88,14 @@
 # PKG_OPTIONS_LEGACY_VARS+=    WIBBLE_USE_SASL2:sasl
 # PKG_OPTIONS_LEGACY_OPTS+=    foo:wibble-foo
 #
+# # this package was previously named wibble2
+# .include "../../mk/bsd.prefs.mk"
+#
+# .if defined(PKG_OPTIONS.wibble2)
+# PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.wibble2}
+# PKG_OPTIONS_LEGACY_WARNINGS+="Deprecated variable PKG_OPTIONS.wibble2 used, use "${PKG_OPTIONS_VAR:Q}" instead."
+# .endif
+#
 # .include "../../mk/bsd.options.mk"
 #
 # # Package-specific option-handling
@@ -146,7 +164,7 @@
 .include "${.CURDIR}/../../mk/defaults/obsolete.mk"
 
 #
-# place options imlied by legacy variables in _PKG_LEGACY_OPTIONS
+# place options imlied by legacy variables in PKG_LEGACY_OPTIONS
 #
 .for _m_ in ${PKG_OPTIONS_LEGACY_VARS}
 _var_:=        ${_m_:C/:.*//}
@@ -154,13 +172,13 @@
 _popt_:=${_opt_:C/^-//}
 .  if !empty(PKG_SUPPORTED_OPTIONS:M${_popt_})
 .    if defined(${_var_})
-_DEPRECATED_WARNING:=${_DEPRECATED_WARNING} "Deprecated variable "${_var_:Q}" used, use PKG_DEFAULT_OPTIONS+="${_popt_:Q}" instead."
+PKG_OPTIONS_DEPRECATED_WARNINGS:=${PKG_OPTIONS_DEPRECATED_WARNINGS} "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_}
+PKG_LEGACY_OPTIONS:=${PKG_LEGACY_OPTIONS} ${_opt_}
 .      elif empty(_opt_:M-*)
-_PKG_LEGACY_OPTIONS:=${_PKG_LEGACY_OPTIONS} -${_popt_}
+PKG_LEGACY_OPTIONS:=${PKG_LEGACY_OPTIONS} -${_popt_}
 .      else
-_PKG_LEGACY_OPTIONS:=${_PKG_LEGACY_OPTIONS} ${_popt_}
+PKG_LEGACY_OPTIONS:=${PKG_LEGACY_OPTIONS} ${_popt_}
 .      endif
 .    endif
 .  endif
@@ -177,7 +195,7 @@
 _new_:= ${_m_:C/.*://}
 .  if !empty(PKG_SUPPORTED_OPTIONS:M${_new_})
 _PKG_LEGACY_OPTMAP.${_old_}:=${_new_}
-_DEPRECATED_WARNING:=${_DEPRECATED_WARNING} "Deprecated option "${_old_:Q}" used, use option "${_new_:Q}" instead."
+PKG_OPTIONS_DEPRECATED_WARNINGS:=${PKG_OPTIONS_DEPRECATED_WARNINGS} "Deprecated option "${_old_:Q}" used, use option "${_new_:Q}" instead."
 .  endif
 .endfor
 .undef _old_
@@ -203,7 +221,7 @@
 #
 PKG_OPTIONS:=          # empty
 _OPTIONS_UNSUPPORTED:= #empty
-.for _o_ in ${PKG_SUGGESTED_OPTIONS} ${_PKG_LEGACY_OPTIONS} \
+.for _o_ in ${PKG_SUGGESTED_OPTIONS} ${PKG_LEGACY_OPTIONS} \
        ${_OPTIONS_DEFAULT_SUPPORTED} ${${PKG_OPTIONS_VAR}}
 _opt_:=                ${_o_}
 _popt_:=       ${_o_:C/^-//}   # positive option
@@ -329,9 +347,9 @@
 .    else
        @${ECHO} "      ${PKG_OPTIONS_VAR} = ${${PKG_OPTIONS_VAR}}"
 .    endif
-.    if defined(_DEPRECATED_WARNING)
+.    if defined(PKG_OPTIONS_DEPRECATED_WARNINGS)
        @${ECHO}
-       @for l in ${_DEPRECATED_WARNING}; \
+       @for l in ${PKG_OPTIONS_DEPRECATED_WARNINGS}; \
        do \
                ${ECHO} "$$l"; \
        done
diff -r cadca322d660 -r 0b27ee0621a8 mk/defaults/obsolete.mk
--- a/mk/defaults/obsolete.mk   Mon Jun 06 13:49:25 2005 +0000
+++ b/mk/defaults/obsolete.mk   Mon Jun 06 13:54:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.10 2005/06/02 22:20:37 wiz Exp $
+# $NetBSD: obsolete.mk,v 1.11 2005/06/06 13:54:51 dillo Exp $
 #
 # This file holds make(1) logic to allow obsolete or deprecated variables
 # still to be used.  These may eventually disappear over time as the contents
@@ -9,25 +9,25 @@
 .endif
 
 ###
-### Set _PKG_LEGACY_OPTIONS based on to-be-deprecated global variables.
+### Set PKG_LEGACY_OPTIONS based on to-be-deprecated global variables.
 ###
 
 .if defined(KERBEROS)
 .  if ${KERBEROS} == "4" && !empty(PKG_SUPPORTED_OPTIONS:Mkerberos4)
-_PKG_LEGACY_OPTIONS+=  kerberos4
-_DEPRECATED_WARNING+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos4 instead."
+PKG_LEGACY_OPTIONS+=   kerberos4
+PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos4 instead."
 .  elif !empty(PKG_SUPPORTED_OPTIONS:Mkerberos)
-_PKG_LEGACY_OPTIONS+=  kerberos
-_DEPRECATED_WARNING+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos instead."
+PKG_LEGACY_OPTIONS+=   kerberos
+PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos instead."
 .  endif
 .endif
 .if defined(USE_SOCKS)
 .  if ${USE_SOCKS} == "4" && !empty(PKG_SUPPORTED_OPTIONS:Msocks4)
-_PKG_LEGACY_OPTIONS+=  socks4
-_DEPRECATED_WARNING+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks4 instead."
+PKG_LEGACY_OPTIONS+=   socks4
+PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks4 instead."
 .  elif ${USE_SOCKS} == "5" && !empty(PKG_SUPPORTED_OPTIONS:Msocks5)
-_PKG_LEGACY_OPTIONS+=  socks5
-_DEPRECATED_WARNING+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks5 instead."
+PKG_LEGACY_OPTIONS+=   socks5
+PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks5 instead."
 .  endif
 .endif