cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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;

Browse Source
This commit is contained in:
Baptiste Daroussin 2013-06-06 06:29:00 +00:00
parent 58275b8e63
commit 5cb56c4f98
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=320055
2 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -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

39
Mk/bsd.options.mk
View File

@ -93,45 +93,6 @@ OPTIONS_DEFAULT+= ${opt}
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}