From owner-svn-ports-head@FreeBSD.ORG  Mon Jun 10 13:47:44 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 3BBF7BB9;
 Mon, 10 Jun 2013 13:47:44 +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 2CBC51959;
 Mon, 10 Jun 2013 13:47:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ADliU8091406;
 Mon, 10 Jun 2013 13:47:44 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ADli3k091404;
 Mon, 10 Jun 2013 13:47:44 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201306101347.r5ADli3k091404@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 10 Jun 2013 13:47:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320475 - 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 13:47:44 -0000

Author: bapt
Date: Mon Jun 10 13:47:43 2013
New Revision: 320475
URL: http://svnweb.freebsd.org/changeset/ports/320475

Log:
  Simplify the creation of the options part of the pkgng manifest

Modified:
  head/Mk/bsd.pkgng.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Mon Jun 10 13:36:44 2013	(r320474)
+++ head/Mk/bsd.pkgng.mk	Mon Jun 10 13:47:43 2013	(r320475)
@@ -83,53 +83,13 @@ fake-pkg:
 .endfor
 	@${ECHO_CMD} "]" >> ${MANIFESTF}
 	@${ECHO_CMD} -n "options: {" >> ${MANIFESTF}
-.for opt in ${ALL_OPTIONS}
+.for opt in ${COMPLETE_OPTIONS_LIST}
 .if empty(PORT_OPTIONS:M${opt})
 	@${ECHO_CMD} -n "${opt}: off," >> ${MANIFESTF}
 .else
 	@${ECHO_CMD} -n "${opt}: on," >> ${MANIFESTF}
 .endif
 .endfor
-.for multi in ${OPTIONS_MULTI}
-.  for opt in ${OPTIONS_MULTI_${multi}}
-.    if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF}
-.    else
-	@${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF}
-.    endif
-.  endfor
-.endfor
-.for single in ${OPTIONS_SINGLE}
-.  for opt in ${OPTIONS_SINGLE_${single}}
-.    if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF}
-.    else
-	@${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF}
-.    endif
-.  endfor
-.endfor
-.for radio in ${OPTIONS_RADIO}
-.  for opt in ${OPTIONS_RADIO_${radio}}
-.    if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF}
-.    else
-	@${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF}
-.    endif
-.  endfor
-.endfor
-.for group in ${OPTIONS_GROUP}
-.  for opt in ${OPTIONS_GROUP_${group}}
-.    if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF}
-.    else
-	@${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF}
-.    endif
-.  endfor
-.endfor
-.undef multi
-.undef single
-.undef radio
-.undef group
 .undef opt
 	@${ECHO_CMD} "}" >> ${MANIFESTF}
 	@[ -f ${PKGINSTALL} ] && ${CP} ${PKGINSTALL} ${METADIR}/+INSTALL; \