Sun May 12 17:19:41 2013 UTC ()
Strip minus for warning about disabling unsupported options.


(riastradh)
diff -r1.69 -r1.70 pkgsrc/mk/bsd.options.mk
cvs diff -r1.69 -r1.70 pkgsrc/mk/bsd.options.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.options.mk 2013/05/12 05:13:38 1.69
+++ pkgsrc/mk/bsd.options.mk 2013/05/12 17:19:41 1.70
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.options.mk,v 1.69 2013/05/12 05:13:38 obache Exp $ 1# $NetBSD: bsd.options.mk,v 1.70 2013/05/12 17:19:41 riastradh Exp $
2# 2#
3# This Makefile fragment provides boilerplate code for standard naming 3# This Makefile fragment provides boilerplate code for standard naming
4# conventions for handling per-package build options. 4# conventions for handling per-package build options.
5# 5#
6# Before including this file, the following variables can be defined: 6# Before including this file, the following variables can be defined:
7# 7#
8# PKG_SUPPORTED_OPTIONS 8# PKG_SUPPORTED_OPTIONS
9# This is a list of build options supported by the package. 9# This is a list of build options supported by the package.
10# This variable should be set in a package Makefile. E.g., 10# This variable should be set in a package Makefile. E.g.,
11# 11#
12# PKG_SUPPORTED_OPTIONS= kerberos ldap ssl 12# PKG_SUPPORTED_OPTIONS= kerberos ldap ssl
13# 13#
14# PKG_OPTIONS_VAR (must be defined) 14# PKG_OPTIONS_VAR (must be defined)
@@ -278,27 +278,27 @@ _popt_:= ${_o_:C/^-//} # positive option @@ -278,27 +278,27 @@ _popt_:= ${_o_:C/^-//} # positive option
278. if defined(_PKG_LEGACY_OPTMAP.${_popt_}) 278. if defined(_PKG_LEGACY_OPTMAP.${_popt_})
279PKG_OPTIONS_DEPRECATED_WARNINGS:=${PKG_OPTIONS_DEPRECATED_WARNINGS} "Deprecated option "${_popt_:Q}" used, use option "${_PKG_LEGACY_OPTMAP.${_popt_}:Q}" instead." 279PKG_OPTIONS_DEPRECATED_WARNINGS:=${PKG_OPTIONS_DEPRECATED_WARNINGS} "Deprecated option "${_popt_:Q}" used, use option "${_PKG_LEGACY_OPTMAP.${_popt_}:Q}" instead."
280_popt_:= ${_PKG_LEGACY_OPTMAP.${_popt_}} 280_popt_:= ${_PKG_LEGACY_OPTMAP.${_popt_}}
281. if empty(_opt_:M-*) 281. if empty(_opt_:M-*)
282_opt_:= ${_popt_} 282_opt_:= ${_popt_}
283. else 283. else
284_opt_:= -${_popt_} 284_opt_:= -${_popt_}
285. endif 285. endif
286. endif 286. endif
287. if empty(PKG_SUPPORTED_OPTIONS:M${_popt_}) 287. if empty(PKG_SUPPORTED_OPTIONS:M${_popt_})
288. if empty(_opt_:M-*) 288. if empty(_opt_:M-*)
289_OPTIONS_UNSUPPORTED:=${_OPTIONS_UNSUPPORTED} ${_opt_} 289_OPTIONS_UNSUPPORTED:=${_OPTIONS_UNSUPPORTED} ${_opt_}
290. else 290. else
291PKG_OPTIONS_DEPRECATED_WARNINGS:=${PKG_OPTIONS_DEPRECATED_WARNINGS} "Option "${_opt_:Q}" is unsupported, so disabling it has no effect." 291PKG_OPTIONS_DEPRECATED_WARNINGS:=${PKG_OPTIONS_DEPRECATED_WARNINGS} "Option "${_opt_:C/^-//:Q}" is unsupported, so disabling it has no effect."
292. endif 292. endif
293. else 293. else
294. if defined(_PKG_OPTIONS_GROUP_MAP.${_popt_}) 294. if defined(_PKG_OPTIONS_GROUP_MAP.${_popt_})
295_grp_:= ${_PKG_OPTIONS_GROUP_MAP.${_popt_}} 295_grp_:= ${_PKG_OPTIONS_GROUP_MAP.${_popt_}}
296_stk_:= _PKG_OPTIONS_GROUP_STACK.${_grp_} 296_stk_:= _PKG_OPTIONS_GROUP_STACK.${_grp_}
297_cnt_:= ${${_stk_}} 297_cnt_:= ${${_stk_}}
298. if !empty(_opt_:M-*) 298. if !empty(_opt_:M-*)
299${_stk_}:= ${_cnt_:N${_popt_}} 299${_stk_}:= ${_cnt_:N${_popt_}}
300. else 300. else
301${_stk_}:= ${_cnt_} ${_popt_} 301${_stk_}:= ${_cnt_} ${_popt_}
302. endif 302. endif
303. else 303. else
304. if !empty(_opt_:M-*) 304. if !empty(_opt_:M-*)