From owner-svn-ports-all@FreeBSD.ORG  Fri Jun  7 05:55:26 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DBEE9281;
 Fri,  7 Jun 2013 05:55:26 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CC8281A83;
 Fri,  7 Jun 2013 05:55:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r575tOhb069330;
 Fri, 7 Jun 2013 05:55:24 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r575tOhZ069329;
 Fri, 7 Jun 2013 05:55:24 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201306070555.r575tOhZ069329@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 7 Jun 2013 05:55:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320149 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jun 2013 05:55:26 -0000

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