svn commit: r320055 - in head: . Mk

[Baptiste Daroussin]

Author: bapt
Date: Thu Jun  6 06:29:00 2013
New Revision: 320055
URL: http://svnweb.freebsd.org/changeset/ports/320055

Log:
  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;

Modified:
  head/CHANGES
  head/Mk/bsd.options.mk

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Thu Jun  6 06:17:40 2013	(r320054)
+++ head/CHANGES	Thu Jun  6 06:29:00 2013	(r320055)
@@ -10,6 +10,12 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20130606:
+AUTHOR: bapt at FreeBSD.org
+
+  The macro OPTIONS is no more a recognize macro, please use the new 
+  options framework
+
 20130509:
 AUTHOR: kwm at FreeBSD.org
 

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Thu Jun  6 06:17:40 2013	(r320054)
+++ head/Mk/bsd.options.mk	Thu Jun  6 06:29:00 2013	(r320055)
@@ -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