aboutsummaryrefslogtreecommitdiff
path: root/release/doc/Makefile
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2013-05-28 23:43:47 +0000
committerGlen Barber <gjb@FreeBSD.org>2013-05-28 23:43:47 +0000
commit4e02fd950cf6a6f1858d141f0a06873f87497c01 (patch)
treeb4fcd248220bd7214e5da9b03abf8b37a2cdd8a4 /release/doc/Makefile
parent734b03c38d62cb85e61ca5e38180f5ec70f89821 (diff)
downloadsrc-4e02fd950cf6a6f1858d141f0a06873f87497c01.tar.gz
src-4e02fd950cf6a6f1858d141f0a06873f87497c01.zip
r245757 introduced warning output if update method is set to CVS_UPDATE
or SUP_UPDATE. CVS exporter for head/ is turned off for nearly one month now. It is finally time to swing the ax at these update methods. Reviewed by: eadler MFC after: 1 month
Notes
Notes: svn path=/head/; revision=251084
Diffstat (limited to 'release/doc/Makefile')
-rw-r--r--release/doc/Makefile28
1 files changed, 16 insertions, 12 deletions
diff --git a/release/doc/Makefile b/release/doc/Makefile
index 18d4d8f64104..5b0542c50e29 100644
--- a/release/doc/Makefile
+++ b/release/doc/Makefile
@@ -12,26 +12,30 @@ SUBDIR+= share/xml
RELN_ROOT?= ${.CURDIR}
-.if defined(SUPHOST)
-SUPFLAGS+= -h ${SUPHOST}
-.endif
+SVN?= /usr/local/bin/svn
+SVNFLAGS?= -r HEAD
+
update:
-.if defined(SUP_UPDATE)
-.if !defined(DOCSUPFILE)
- @echo "Error: Please define DOCSUPFILE before doing make 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})
@echo "--------------------------------------------------------------"
- @echo ">>> Running ${SUP}"
+ @echo ">>> Updating ${RELN_ROOT} requires ${SVN}."
@echo "--------------------------------------------------------------"
- @${SUP} ${SUPFLAGS} ${DOCSUPFILE}
-.elif defined(CVS_UPDATE)
+ @exit 1
+. endif
@echo "--------------------------------------------------------------"
- @echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
+ @echo ">>> Updating ${.CURDIR} using Subversion"
@echo "--------------------------------------------------------------"
- cd ${.CURDIR}; cvs -q update -P -d
+ @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
.else
- @echo "Error: Please define either SUP_UPDATE or CVS_UPDATE first."
+ @echo "Error: Please define SUP_UPDATE first."
.endif
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"