From owner-svn-ports-all@FreeBSD.ORG  Mon Jun 10 09:19:39 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2D98B799;
 Mon, 10 Jun 2013 09:19:39 +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 1E4011676;
 Mon, 10 Jun 2013 09:19:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5A9Jd8x005706;
 Mon, 10 Jun 2013 09:19:39 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A9JcE7005705;
 Mon, 10 Jun 2013 09:19:38 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201306100919.r5A9JcE7005705@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 10 Jun 2013 09:19:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320449 - 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: Mon, 10 Jun 2013 09:19:39 -0000

Author: bapt
Date: Mon Jun 10 09:19:38 2013
New Revision: 320449
URL: http://svnweb.freebsd.org/changeset/ports/320449

Log:
  Factorise code

Modified:
  head/Mk/bsd.options.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Mon Jun 10 09:16:02 2013	(r320448)
+++ head/Mk/bsd.options.mk	Mon Jun 10 09:19:38 2013	(r320449)
@@ -83,41 +83,21 @@ OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${AR
 OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT: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}}
-.  endfor
-.  for radio in ${OPTIONS_RADIO}
-OPTIONS_RADIO_${radio}:=	${OPTIONS_RADIO_${radio}:N${opt}}
-.  endfor
-.  for multi in ${OPTIONS_MULTI}
-OPTIONS_MULTI_${multi}:=	${OPTIONS_MULTI_${multi}:N${opt}}
-.  endfor
-.  for group in ${OPTIONS_GROUP}
-OPTIONS_GROUP_${group}:=	${OPTIONS_GROUP_${group}:N${opt}}
+.  for otype in SINGLE RADIO MULTI GROUP
+.    for m in ${OPTIONS_${otype}}
+OPTIONS_${otype}_${m}:=	${OPTIONS_${otype}_${m}:N${opt}}
+.    endfor
 .  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
+.for otype in SINGLE RADIO MULTI GROUP
+.  for m in ${OPTIONS_${otype}}
+.    if empty(OPTIONS_${otype}_${m})
+OPTIONS_${otype}:=	${OPTIONS_${otype}:N${m}}
+.    endif
+.  endfor
 .endfor
 
 # Sort options