From owner-svn-src-all@FreeBSD.ORG  Mon Dec 23 21:58:04 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4A7B5B53;
 Mon, 23 Dec 2013 21:58:04 +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 3702912D4;
 Mon, 23 Dec 2013 21:58:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNLw4wE062871;
 Mon, 23 Dec 2013 21:58:04 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNLw4Rb062870;
 Mon, 23 Dec 2013 21:58:04 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312232158.rBNLw4Rb062870@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 23 Dec 2013 21:58:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259792 - head/release/doc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Dec 2013 21:58:04 -0000

Author: gjb
Date: Mon Dec 23 21:58:03 2013
New Revision: 259792
URL: http://svnweb.freebsd.org/changeset/base/259792

Log:
  Remove references to SUP_UPDATE and CVS_UPDATE.
  Include base svn when evaluating if svn(1) exists.
  
  MFC after:	3-days
  X-MFC-to:	stable/10 only
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/doc/Makefile

Modified: head/release/doc/Makefile
==============================================================================
--- head/release/doc/Makefile	Mon Dec 23 21:55:54 2013	(r259791)
+++ head/release/doc/Makefile	Mon Dec 23 21:58:03 2013	(r259792)
@@ -12,31 +12,27 @@ SUBDIR+=	share/xml
 
 RELN_ROOT?= ${.CURDIR}
 
+.if exists(/usr/local/bin/svn)
 SVN?=		/usr/local/bin/svn
+.elif exists(/usr/bin/svn)
+SVN?=		/usr/bin/svn
+.else
+SVN?=		/usr/bin/svnlite
+.endif
+
 SVNFLAGS?=	-r HEAD
 
 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)
-. if !exists(${SVN})
+.if !exists(${SVN})
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${RELN_ROOT} requires ${SVN}."
 	@echo "--------------------------------------------------------------"
 	@exit 1
-. endif
+.endif
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Updating ${.CURDIR} using Subversion"
+	@echo ">>> Updating ${.CURDIR}"
 	@echo "--------------------------------------------------------------"
 	@(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
-.else
-	@echo "Error: Please define SVN_UPDATE first."
-.endif
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.subdir.mk"