From owner-svn-src-all@freebsd.org Wed Apr 13 12:26:06 2016 Return-Path: Delivered-To: svn-src-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 AB8EAB0DEB9; Wed, 13 Apr 2016 12:26:06 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mouf.net", Issuer "mouf.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 778761B84; Wed, 13 Apr 2016 12:26:06 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from [0.0.0.0] (cpe-071-065-239-148.nc.res.rr.com [71.65.239.148] (may be forged)) (authenticated bits=0) by mouf.net (8.14.9/8.14.9) with ESMTP id u3DCPt95023811 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 13 Apr 2016 12:26:00 GMT (envelope-from swills@FreeBSD.org) Subject: Re: svn commit: r297902 - head To: Peter Jeremy References: <201604130147.u3D1l5F0032629@repo.freebsd.org> <20160413081242.GA10478@server.rulingia.com> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Steve Wills Message-ID: <570E3AD3.30309@FreeBSD.org> Date: Wed, 13 Apr 2016 08:25:55 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101 Thunderbird/38.7.1 MIME-Version: 1.0 In-Reply-To: <20160413081242.GA10478@server.rulingia.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Wed, 13 Apr 2016 12:26:02 +0000 (UTC) X-Spam-Status: No, score=2.8 required=4.5 tests=HELO_MISC_IP, RCVD_ILLEGAL_IP, RDNS_NONE autolearn=no autolearn_force=no version=3.4.1 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mouf.net X-Virus-Scanned: clamav-milter 0.99 at mouf.net X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2016 12:26:06 -0000 On 04/13/16 04:12 AM, Peter Jeremy wrote: > On 2016-Apr-13 01:47:05 +0000, Steve Wills wrote: >> +.if !defined(SVN) || empty(SVN) >> +. for _P in /usr/bin /usr/local/bin >> +. for _S in svn svnlite >> +. if exists(${_P}/${_S}) >> +SVN= ${_P}/${_S} >> +. endif >> +. endfor >> +. endfor >> +.endif > > What is the preferred choice here? The given order prefers ports over base > (which makes sense) but then prefers svnlite over svn. I would expect > either the opposite directory order in _P (prefer svnlite in base) or the > opposite command order in _S (prefer svn in ports). > > In normal use, this will wind up with either /usr/local/bin/svn or > /usr/bin/svnlite (in that order) but a non-standard configuration could > result in different results. > You also end up with /usr/bin/svn if WITH_SVN is set (in which case /usr/bin/svnlite wouldn't exist). There wouldn't be a /usr/local/bin/svnlite, at least normally. The preference would be for /usr/local/bin/svn over /usr/bin/svn* (user went out of their way to make this exist, they must want to use it). Then for whichever of /usr/bin/svnlite or /usr/bin/svn exists. This isn't to say that one is better than another. The goal here was just to try harder to find it out of the box. Steve