svn commit: r260242 - stable/10/release/doc

[Glen Barber]

Author: gjb
Date: Fri Jan  3 20:27:15 2014
New Revision: 260242
URL: http://svnweb.freebsd.org/changeset/base/260242

Log:
  MFC r259792:
    Remove references to SUP_UPDATE and CVS_UPDATE.
    Include base svn when evaluating if svn(1) exists.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/doc/Makefile
==============================================================================
--- stable/10/release/doc/Makefile	Fri Jan  3 20:02:59 2014	(r260241)
+++ stable/10/release/doc/Makefile	Fri Jan  3 20:27:15 2014	(r260242)
@@ -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"