From owner-svn-doc-head@FreeBSD.ORG  Thu Jun 21 22:57:58 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC2431065673;
	Thu, 21 Jun 2012 22:57:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C80A08FC18;
	Thu, 21 Jun 2012 22:57:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5LMvwCm041108;
	Thu, 21 Jun 2012 22:57:58 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5LMvwwd041106;
	Thu, 21 Jun 2012 22:57:58 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201206212257.q5LMvwwd041106@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 21 Jun 2012 22:57:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39092 - head
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the doc tree for head
	<svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jun 2012 22:57:59 -0000

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"