Date: Fri, 7 Jun 2013 05:55:24 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320149 - head/Mk Message-ID: <201306070555.r575tOhZ069329@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Jun 7 05:55:24 2013 New Revision: 320149 URL: http://svnweb.freebsd.org/changeset/ports/320149 Log: Remove the OPTIONS parsing for real this time Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Fri Jun 7 05:53:00 2013 (r320148) +++ head/Mk/bsd.options.mk Fri Jun 7 05:55:24 2013 (r320149) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306070555.r575tOhZ069329>