From 5eb067536cd5274c0340cd6bde189426ce30d9c3 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Thu, 21 Jun 2012 22:57:58 +0000 Subject: [PATCH] Replace csup/cvsup entries with svn in head/Makefile 'update' target. --- Makefile | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index a19bc873c2..bc57c384d2 100644 --- a/Makefile +++ b/Makefile @@ -33,32 +33,19 @@ SUBDIR+= zh_TW.Big5 DOC_PREFIX?= ${.CURDIR} -SUP?= /usr/bin/csup -SUPFLAGS?= -L 2 -.if defined(SUPHOST) -SUPFLAGS+= -h ${SUPHOST} -.endif - -CVS?= /usr/bin/cvs -CVSFLAGS?= -R -q +SVN?= /usr/local/bin/svn update: -.if defined(SUP_UPDATE) -.if !defined(DOCSUPFILE) - @${ECHO_CMD} "Error: Please define DOCSUPFILE before doing make update." - @exit 1 -.endif +.if !exists(${SVN}) @${ECHODIR} "--------------------------------------------------------------" - @${ECHODIR} ">>> Running ${SUP}" + @${ECHODIR} ">>> ${SVN} is required to update ${.CURDIR}" @${ECHODIR} "--------------------------------------------------------------" - @${SUP} ${SUPFLAGS} ${DOCSUPFILE} -.elif defined(CVS_UPDATE) - @${ECHODIR} "--------------------------------------------------------------" - @${ECHODIR} ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT} - @${ECHODIR} "--------------------------------------------------------------" - cd ${.CURDIR}; ${CVS} ${CVSFLAGS} update -P -d + @${EXIT} .else - @${ECHO_CMD} "Error: Please define either SUP_UPDATE or CVS_UPDATE first." + @${ECHODIR} "--------------------------------------------------------------" + @${ECHODIR} ">>> Updating ${.CURDIR} from svn repository" + @${ECHODIR} "--------------------------------------------------------------" + cd ${.CURDIR}; ${SVN} update .endif .include "${DOC_PREFIX}/share/mk/doc.project.mk"