From owner-svn-ports-head@FreeBSD.ORG  Mon Jun 10 08:39: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 4A498F90;
 Mon, 10 Jun 2013 08:39: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 3C748134F;
 Mon, 10 Jun 2013 08:39: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 r5A8dFkX092612;
 Mon, 10 Jun 2013 08:39:15 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5A8dFF2092611;
 Mon, 10 Jun 2013 08:39:15 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201306100839.r5A8dFF2092611@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Mon, 10 Jun 2013 08:39:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320446 - 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:39:15 -0000

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

Log:
  Append per arch defaults directly to OPTIONS_DEFAULT. Duplicates
  are eliminated later.

Modified:
  head/Mk/bsd.options.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Mon Jun 10 08:37:14 2013	(r320445)
+++ head/Mk/bsd.options.mk	Mon Jun 10 08:39:14 2013	(r320446)
@@ -76,11 +76,7 @@ OPTIONS_DEFINE+=	${opt}
 .endfor
 
 # Add per arch defaults
-.for opt in ${OPTIONS_DEFAULT_${ARCH}}
-.if empty(OPTIONS_DEFAULT:M${opt})
-OPTIONS_DEFAULT+=	${opt}
-.endif
-.endfor
+OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${ARCH}}
 
 # Remove options the port maintainer doesn't want
 .for opt in ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} ${OPTIONS_SLAVE}