diff options
| author | bapt <bapt@FreeBSD.org> | 2013-06-06 14:29:00 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-06-06 14:29:00 +0800 |
| commit | 8055bece15566923d8fc94c41934e3ab12f9ca64 (patch) | |
| tree | 403805adef4243e1b5ba9702357812551f2835f5 | |
| parent | d26c3660b099bddd3c78c83e920aa9cac6518dc7 (diff) | |
| download | freebsd-ports-graphics-8055bece15566923d8fc94c41934e3ab12f9ca64.tar.gz freebsd-ports-graphics-8055bece15566923d8fc94c41934e3ab12f9ca64.tar.zst freebsd-ports-graphics-8055bece15566923d8fc94c41934e3ab12f9ca64.zip | |
Remove support for parsing the old OPTIONS macro, the compatibility code to load the old optionsfile and compatibility with WITH_ and WITHOUT_ in make.conf remains for now;
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | Mk/bsd.options.mk | 39 |
2 files changed, 6 insertions, 39 deletions
@@ -10,6 +10,12 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20130606: +AUTHOR: bapt@FreeBSD.org + + The macro OPTIONS is no more a recognize macro, please use the new + options framework + 20130509: AUTHOR: kwm@FreeBSD.org diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index 34fd0845e99..523b30f487e 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -94,45 +94,6 @@ ALL_OPTIONS+= ${opt} .endfor ALL_OPTIONS:= ${ALL_OPTIONS:O:u} - -#XXX to kill when old option framework won't be used anymore -.if defined(OPTIONS) -NO_OPTIONS_SORT= yes -. undef optname -. for O in ${OPTIONS:S|\#|\\\#|g} -opt:= ${O} -. if !defined(optname) -optname:= ${O} -ALL_OPTIONS+= ${O} -.if !defined(OPTIONS_DEFINE) || empty(OPTIONS_DEFINE:M${O}) -OPTIONS_DEFINE+= ${O} -.endif -PORT_OPTIONS+= ${O} -. elif !defined(optdesc) -optdesc:= ${opt} -${optname}_DESC:= ${opt:S|"||g} -. else -. if ${opt:L} == off -. if defined(PORT_OPTIONS) && defined(optname) -NO_OPTIONS+= ${optname} -NO_OPTIONS:= ${NO_OPTIONS:O:u} -. else -. endif -. endif -. undef optname -. undef optdesc -. endif -. endfor -. if defined(NO_OPTIONS) -. for O in ${NO_OPTIONS} -PORT_OPTIONS:= ${PORT_OPTIONS:N${O}} -. endfor -. endif -#. undef NO_OPTIONS -.endif -#XXX end of compatibility - -ALL_OPTIONS:= ${ALL_OPTIONS:O:u} OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:O:u} # Remove global options the port maintainer doesn't want |