svn commit: r297902 - head

[Steve Wills]

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	(r297901)
+++ head/Makefile.inc1	Wed Apr 13 01:47:04 2016	(r297902)
@@ -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
 
 MAKEOBJDIRPREFIX?=	/usr/obj
@@ -1210,13 +1218,6 @@ doxygen: .PHONY
 # latest copy.
 #
 update:
-.if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE)
-	@echo "--------------------------------------------------------------"
-	@echo "CVS_UPDATE and SUP_UPDATE are no longer supported."
-	@echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated"
-	@echo "--------------------------------------------------------------"
-	@exit 1
-.endif
 .if defined(SVN_UPDATE)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} using Subversion"