Date: Thu, 21 Jun 2012 22:57:58 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r39092 - head Message-ID: <201206212257.q5LMvwwd041106@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Jun 21 22:57:58 2012 New Revision: 39092 URL: http://svn.freebsd.org/changeset/doc/39092 Log: Replace csup/cvsup entries with svn in head/Makefile 'update' target. Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Thu Jun 21 19:21:22 2012 (r39091) +++ head/Makefile Thu Jun 21 22:57:58 2012 (r39092) @@ -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) + @${EXIT} +.else @${ECHODIR} "--------------------------------------------------------------" - @${ECHODIR} ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT} + @${ECHODIR} ">>> Updating ${.CURDIR} from svn repository" @${ECHODIR} "--------------------------------------------------------------" - cd ${.CURDIR}; ${CVS} ${CVSFLAGS} update -P -d -.else - @${ECHO_CMD} "Error: Please define either SUP_UPDATE or CVS_UPDATE first." + cd ${.CURDIR}; ${SVN} update .endif .include "${DOC_PREFIX}/share/mk/doc.project.mk"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206212257.q5LMvwwd041106>