From owner-svn-ports-head@FreeBSD.ORG  Wed Jun  5 17:21:32 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A06F7E2C;
 Wed,  5 Jun 2013 17:21:32 +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 91E331615;
 Wed,  5 Jun 2013 17:21:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r55HLWOU073029;
 Wed, 5 Jun 2013 17:21:32 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r55HLWAo073028;
 Wed, 5 Jun 2013 17:21:32 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201306051721.r55HLWAo073028@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 5 Jun 2013 17:21:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320007 - 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: Wed, 05 Jun 2013 17:21:32 -0000

Author: bapt
Date: Wed Jun  5 17:21:32 2013
New Revision: 320007
URL: http://svnweb.freebsd.org/changeset/ports/320007

Log:
  Remove empty radio/single/group/multi options from lists
  This can happen due to slave/exclude

Modified:
  head/Mk/bsd.options.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Wed Jun  5 17:02:40 2013	(r320006)
+++ head/Mk/bsd.options.mk	Wed Jun  5 17:21:32 2013	(r320007)
@@ -157,6 +157,29 @@ OPTIONS_GROUP_${group}:=	${OPTIONS_GROUP
 .  endfor
 .endfor
 
+# Remove empty SINGLE/GROUP/RADIO/MULTI
+# Can be empty because of exclude/slaves
+.for single in ${OPTIONS_SINGLE}
+.if empty(OPTIONS_SINGLE_${single})
+OPTIONS_SINGLE:=	${OPTIONS_SINGLE:N${single}}
+.endif
+.endfor
+.for radio in ${OPTIONS_RADIO}
+.if empty(OPTIONS_RADIO_${radio})
+OPTIONS_RADIO:=	${OPTIONS_RADIO:N${radio}}
+.endif
+.endfor
+.for group in ${OPTIONS_GROUP}
+.if empty(OPTIONS_GROUP_${group})
+OPTIONS_GROUP:=	${OPTIONS_GROUP:N${group}}
+.endif
+.endfor
+.for multi in ${OPTIONS_MULTI}
+.if empty(OPTIONS_MULTI_${multi})
+OPTIONS_MULTI:=	${OPTIONS_MULTI:N${multi}}
+.endif
+.endfor
+
 # complete list
 COMPLETE_OPTIONS_LIST=	${ALL_OPTIONS}
 .for single in ${OPTIONS_SINGLE}