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
This commit is contained in:
gjb 2013-12-23 21:58:03 +00:00
parent 62d693e2d0
commit 1c629a8317

View File

@ -12,31 +12,27 @@ SUBDIR+= share/xml
RELN_ROOT?= ${.CURDIR} RELN_ROOT?= ${.CURDIR}
.if exists(/usr/local/bin/svn)
SVN?= /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 SVNFLAGS?= -r HEAD
update: update:
.if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE) .if !exists(${SVN})
@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})
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Updating ${RELN_ROOT} requires ${SVN}." @echo ">>> Updating ${RELN_ROOT} requires ${SVN}."
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@exit 1 @exit 1
. endif .endif
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Updating ${.CURDIR} using Subversion" @echo ">>> Updating ${.CURDIR}"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS}) @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
.else
@echo "Error: Please define SVN_UPDATE first."
.endif
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
.include "${DOC_PREFIX}/share/mk/doc.subdir.mk" .include "${DOC_PREFIX}/share/mk/doc.subdir.mk"