From owner-svn-ports-all@FreeBSD.ORG Tue Nov 12 13:23:15 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 ESMTPS id 7CBCEA5E; Tue, 12 Nov 2013 13:23:15 +0000 (UTC) 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 6CC4E2B8A; Tue, 12 Nov 2013 13:23: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 rACDNFbP047926; Tue, 12 Nov 2013 13:23:15 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACDNFnm047925; Tue, 12 Nov 2013 13:23:15 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201311121323.rACDNFnm047925@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 12 Nov 2013 13:23:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333568 - 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.16 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: Tue, 12 Nov 2013 13:23:15 -0000 Author: mat Date: Tue Nov 12 13:23:14 2013 New Revision: 333568 URL: http://svnweb.freebsd.org/changeset/ports/333568 Log: Allow multiple value in ${opt}_USE= FOO=bar,baz. Which is nice in case you end up with something like : X11_USE= xorg=x11 xorg=ice xorg=sm xorg=xext xorg=xineramaproto xorg=xinerama xorg=xrandr xorg=xrender xorg=xtst now you can do : X11_USE= xorg=x11,ice,sm,xext,xineramaproto,xinerama,xrandr,xrender,xtst PR: ports/183892 Approved by: bapt Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Tue Nov 12 13:09:18 2013 (r333567) +++ head/Mk/bsd.options.mk Tue Nov 12 13:23:14 2013 (r333568) @@ -95,6 +95,8 @@ # # ${opt}_USE= FOO=bar When option is enabled, it will enable # USE_FOO+= bar +# If you need more than one option, you can do +# FOO=bar,baz and you'll get USE_FOO=bar baz # # For each of CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV # ALL_TARGET INSTALL_TARGET USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY @@ -383,7 +385,7 @@ PLIST_SUB:= ${PLIST_SUB} ${opt}="@commen . if defined(${opt}_USE) . for option in ${${opt}_USE} _u= ${option:C/=.*//g} -USE_${_u:U}+= ${option:C/.*=//g} +USE_${_u:U}+= ${option:C/.*=//g:C/,/ /g} . endfor . endif . if defined(${opt}_CONFIGURE_ENABLE)