From owner-svn-ports-head@FreeBSD.ORG  Mon Jun 10 08:37:15 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 72D55E42;
 Mon, 10 Jun 2013 08:37:15 +0000 (UTC)
 (envelope-from tijl@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 4BC07132F;
 Mon, 10 Jun 2013 08:37:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A8bF1r092293;
 Mon, 10 Jun 2013 08:37:15 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A8bFO7092292;
 Mon, 10 Jun 2013 08:37:15 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201306100837.r5A8bFO7092292@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Mon, 10 Jun 2013 08:37:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320445 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Jun 2013 08:37:15 -0000

Author: tijl
Date: Mon Jun 10 08:37:14 2013
New Revision: 320445
URL: http://svnweb.freebsd.org/changeset/ports/320445

Log:
  Exclude options directly from OPTIONS_DEFINE and set ALL_OPTIONS
  later. This simplifies the NO_OPTIONS_SORT case.
  
  Approved by:	bapt

Modified:
  head/Mk/bsd.options.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Mon Jun 10 08:22:34 2013	(r320444)
+++ head/Mk/bsd.options.mk	Mon Jun 10 08:37:14 2013	(r320445)
@@ -51,9 +51,6 @@ OPTIONSMKINCLUDED=	bsd.options.mk
 
 OPTIONSFILE?=	${PORT_DBDIR}/${UNIQUENAME}/options
 
-#ALL_OPTIONS=	DOCS \
-#		NLS
-
 GLOBAL_OPTIONS=	DOCS NLS EXAMPLES IPV6
 
 # Set the default values for the global options, as defined by portmgr
@@ -85,18 +82,10 @@ OPTIONS_DEFAULT+=	${opt}
 .endif
 .endfor
 
-# Append options set by the port Makefile
-.for opt in ${OPTIONS_DEFINE}
-ALL_OPTIONS+=	${opt}
-.endfor
-
-ALL_OPTIONS:=	${ALL_OPTIONS:O:u}
-OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT:O:u}
-
 # Remove options the port maintainer doesn't want
 .for opt in ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} ${OPTIONS_SLAVE}
 OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT:N${opt}}
-ALL_OPTIONS:=		${ALL_OPTIONS:N${opt}}
+OPTIONS_DEFINE:=	${OPTIONS_DEFINE:N${opt}}
 PORT_OPTIONS:=		${PORT_OPTIONS:N${opt}}
 .  for single in ${OPTIONS_SINGLE}
 OPTIONS_SINGLE_${single}:=	${OPTIONS_SINGLE_${single}:N${opt}}
@@ -135,6 +124,10 @@ OPTIONS_MULTI:=	${OPTIONS_MULTI:N${multi
 .endif
 .endfor
 
+# Sort options
+ALL_OPTIONS:=	${OPTIONS_DEFINE:O:u}
+OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT:O:u}
+
 # complete list
 COMPLETE_OPTIONS_LIST=	${ALL_OPTIONS}
 .for single in ${OPTIONS_SINGLE}
@@ -282,15 +275,7 @@ WITHOUT_NLS=	yes
 .endif
 
 .if defined(NO_OPTIONS_SORT)
-_SORTED_OPTIONS:=	${ALL_OPTIONS}
-ALL_OPTIONS:=
-.for opt in ${OPTIONS_DEFINE}
-.if ${_SORTED_OPTIONS:M${opt}}
-ALL_OPTIONS+=	${opt}
-.endif
-.endfor
-.undef opt
-.undef _SORTED_OPTIONS
+ALL_OPTIONS=	${OPTIONS_DEFINE}
 .endif
 
 ### to be removed once old OPTIONS disappear