From owner-svn-ports-all@freebsd.org Wed Oct 12 12:19:56 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D01CC0D47C; Wed, 12 Oct 2016 12:19:56 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59F7EA4; Wed, 12 Oct 2016 12:19:56 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9CCJtjl075758; Wed, 12 Oct 2016 12:19:55 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9CCJteC075757; Wed, 12 Oct 2016 12:19:55 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201610121219.u9CCJteC075757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 12 Oct 2016 12:19:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423859 - 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.23 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: Wed, 12 Oct 2016 12:19:56 -0000 Author: mat Date: Wed Oct 12 12:19:55 2016 New Revision: 423859 URL: https://svnweb.freebsd.org/changeset/ports/423859 Log: Change the way opt_USE is parsed. This makes it possible to have: opt_USE= ldconfig=${PREFIX}/lib/foo/bar Before this, it would have ended up doing USE_LDCONFIG=/lib/foo/bar, without ${PREFIX}. Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D8169 Modified: head/Mk/bsd.options.mk (contents, props changed) Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Wed Oct 12 11:52:27 2016 (r423858) +++ head/Mk/bsd.options.mk Wed Oct 12 12:19:55 2016 (r423859) @@ -495,9 +495,9 @@ SUB_LIST:= ${SUB_LIST} ${opt}="@comment . if ${PORT_OPTIONS:M${opt}} . if defined(${opt}_USE) -. for option in ${${opt}_USE} -_u= ${option:C/=.*//g} -USE_${_u:tu}+= ${option:C/.*=//g:C/,/ /g} +. for option in ${${opt}_USE:C/=.*//:O:u} +_u= ${option} +USE_${_u:tu}+= ${${opt}_USE:M${option}=*:C/.*=//g:C/,/ /g} . endfor . endif . if defined(${opt}_VARS) @@ -545,9 +545,9 @@ _OPTIONS_${_target}:= ${_OPTIONS_${_targ . endfor . else . if defined(${opt}_USE_OFF) -. for option in ${${opt}_USE_OFF} -_u= ${option:C/=.*//g} -USE_${_u:tu}+= ${option:C/.*=//g:C/,/ /g} +. for option in ${${opt}_USE_OFF:C/=.*//:O:u} +_u= ${option} +USE_${_u:tu}+= ${${opt}_USE_OFF:M${option}=*:C/.*=//g:C/,/ /g} . endfor . endif . if defined(${opt}_VARS_OFF)