From owner-svn-ports-all@FreeBSD.ORG Sun Oct 27 11:58:21 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1E554915; Sun, 27 Oct 2013 11:58:21 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0C3E6249D; Sun, 27 Oct 2013 11:58:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RBwKqe045395; Sun, 27 Oct 2013 11:58:20 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9RBwKDr045394; Sun, 27 Oct 2013 11:58:20 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310271158.r9RBwKDr045394@svn.freebsd.org> From: William Grzybowski Date: Sun, 27 Oct 2013 11:58:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331760 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Oct 2013 11:58:21 -0000 Author: wg Date: Sun Oct 27 11:58:20 2013 New Revision: 331760 URL: http://svnweb.freebsd.org/changeset/ports/331760 Log: Allow multiple values for configure ENABLE and WITH options helpers ${opt}_CONFIGURE_ENABLE and ${opt}_CONFIGURE_WITH now accept multiple arguments and will be expanded accordingly, e.g.: OPT_CONFIGURE_ENABLE= feature1 feature2 -- will add to CONFIGURE_ARGS: OPT enabled: --enable-feature1 --enable-feature2 OPT disabled: --disable-feature1 --disable-feature2 Approved by: portmgr (bapt) Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Sun Oct 27 11:50:24 2013 (r331759) +++ head/Mk/bsd.options.mk Sun Oct 27 11:58:20 2013 (r331760) @@ -391,10 +391,14 @@ USE_${_u:U}+= ${option:C/.*=//g} . endfor . endif . if defined(${opt}_CONFIGURE_ENABLE) -CONFIGURE_ARGS+= --enable-${${opt}_CONFIGURE_ENABLE} +. for iopt in ${${opt}_CONFIGURE_ENABLE} +CONFIGURE_ARGS+= --enable-${iopt} +. endfor . endif . if defined(${opt}_CONFIGURE_WITH) -CONFIGURE_ARGS+= --with-${${opt}_CONFIGURE_WITH} +. for iopt in ${${opt}_CONFIGURE_WITH} +CONFIGURE_ARGS+= --with-${iopt} +. endfor . endif . if defined(${opt}_CONFIGURE_ON) CONFIGURE_ARGS+= ${${opt}_CONFIGURE_ON} @@ -416,10 +420,14 @@ ${deptype}_DEPENDS+= ${${opt}_${deptype} . endfor . else . if defined(${opt}_CONFIGURE_ENABLE) -CONFIGURE_ARGS+= --disable-${${opt}_CONFIGURE_ENABLE} +. for iopt in ${${opt}_CONFIGURE_ENABLE} +CONFIGURE_ARGS+= --disable-${iopt} +. endfor . endif . if defined(${opt}_CONFIGURE_WITH) -CONFIGURE_ARGS+= --without-${${opt}_CONFIGURE_WITH} +. for iopt in ${${opt}_CONFIGURE_WITH} +CONFIGURE_ARGS+= --without-${iopt} +. endfor . endif . if defined(${opt}_CONFIGURE_OFF) CONFIGURE_ARGS+= ${${opt}_CONFIGURE_OFF}