From owner-svn-src-all@freebsd.org  Wed Apr 13 02:07:11 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 1FCFAB0E76D
 for <svn-src-all@mailman.ysv.freebsd.org>;
 Wed, 13 Apr 2016 02:07:11 +0000 (UTC) (envelope-from ian@freebsd.org)
Received: from outbound1b.ore.mailhop.org (outbound1b.ore.mailhop.org
 [54.200.247.200])
 (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 DE1871B8B
 for <svn-src-all@freebsd.org>; Wed, 13 Apr 2016 02:07:10 +0000 (UTC)
 (envelope-from ian@freebsd.org)
X-MHO-User: 6c7f5fb4-011c-11e6-8bda-c73aafa13d19
X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information
X-Originating-IP: 73.34.117.227
X-Mail-Handler: DuoCircle Outbound SMTP
Received: from ilsoft.org (unknown [73.34.117.227])
 by outbound1.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA;
 Wed, 13 Apr 2016 02:07:01 +0000 (UTC)
Received: from rev (rev [172.22.42.240])
 by ilsoft.org (8.15.2/8.14.9) with ESMTP id u3D1xFhk017707;
 Tue, 12 Apr 2016 19:59:15 -0600 (MDT) (envelope-from ian@freebsd.org)
Message-ID: <1460512755.52955.18.camel@freebsd.org>
Subject: Re: svn commit: r297902 - head
From: Ian Lepore <ian@freebsd.org>
To: Steve Wills <swills@FreeBSD.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
Date: Tue, 12 Apr 2016 19:59:15 -0600
In-Reply-To: <201604130147.u3D1l5F0032629@repo.freebsd.org>
References: <201604130147.u3D1l5F0032629@repo.freebsd.org>
Content-Type: text/plain; charset="us-ascii"
X-Mailer: Evolution 3.16.5 FreeBSD GNOME Team Port 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Apr 2016 02:07:11 -0000

On Wed, 2016-04-13 at 01:47 +0000, Steve Wills wrote:
> Author: swills (ports committer)
> Date: Wed Apr 13 01:47:04 2016
> New Revision: 297902
> URL: https://svnweb.freebsd.org/changeset/base/297902
> 
> Log:
>   Try harder to find svn
>   
>   While here, elliminate last references to CVS_UPDATE and SUP_UPDATE
>   
>   Reviewed by:	gjb
>   Approved by:	gjb
> 
> Modified:
>   head/Makefile.inc1
> 
> Modified: head/Makefile.inc1
> =====================================================================
> =========
> --- head/Makefile.inc1	Wed Apr 13 01:46:48 2016	(r29790
> 1)
> +++ head/Makefile.inc1	Wed Apr 13 01:47:04 2016	(r29790
> 2)
> @@ -153,7 +153,15 @@ BUILDENV_SHELL?=${SHELL}
>  BUILDENV_SHELL?=/bin/sh
>  .endif
>  
> -SVN?=		/usr/local/bin/svn
> +.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
>  SVNFLAGS?=	-r HEAD
>  

More succinctly:

.if empty(SVN)
SVN!= which svn || which svnlite
.endif

-- Ian