Date: Thu, 6 Jun 2013 13:58:20 +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: r320098 - head/Mk Message-ID: <201306061358.r56DwKc6066150@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Jun 6 13:58:19 2013 New Revision: 320098 URL: http://svnweb.freebsd.org/changeset/ports/320098 Log: Readd the OPTIONS parser given that apparently someports still haven't been converted, and passed throught the grep that was supposed to find them all Reported by: Vincent Hoffman <vince@unsane.co.uk> Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Thu Jun 6 13:45:19 2013 (r320097) +++ head/Mk/bsd.options.mk Thu Jun 6 13:58:19 2013 (r320098) @@ -94,6 +94,45 @@ 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?201306061358.r56DwKc6066150>