From owner-svn-src-head@FreeBSD.ORG  Sun Jun 14 15:16:25 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50F8E106564A;
	Sun, 14 Jun 2009 15:16:25 +0000 (UTC)
	(envelope-from markm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3F0348FC08;
	Sun, 14 Jun 2009 15:16:25 +0000 (UTC)
	(envelope-from markm@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5EFGP0X052696;
	Sun, 14 Jun 2009 15:16:25 GMT (envelope-from markm@svn.freebsd.org)
Received: (from markm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5EFGP8Z052695;
	Sun, 14 Jun 2009 15:16:25 GMT (envelope-from markm@svn.freebsd.org)
Message-Id: <200906141516.n5EFGP8Z052695@svn.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 14 Jun 2009 15:16:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194194 - head
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jun 2009 15:16:25 -0000

Author: markm
Date: Sun Jun 14 15:16:24 2009
New Revision: 194194
URL: http://svn.freebsd.org/changeset/base/194194

Log:
  Allow "make update" work with SVN, if you take the time to set up your
  /etc/make.conf properly.
  
  Only one SCM?
  I do not think this is right.
  Now I have fixed it.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sun Jun 14 14:46:20 2009	(r194193)
+++ head/Makefile.inc1	Sun Jun 14 15:16:24 2009	(r194194)
@@ -94,6 +94,8 @@ CLEANDIR=	cleandir
 
 CVS?=		cvs
 CVSFLAGS?=	-A -P -d -I!
+SVN?=		svn
+SVNFLAGS?=	-r HEAD
 SUP?=		/usr/bin/csup
 SUPFLAGS?=	-g -L 2
 .if defined(SUPHOST)
@@ -854,10 +856,24 @@ update:
 .endif
 .endif
 .if defined(CVS_UPDATE)
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT}
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS}
+	@cd ${.CURDIR} ; \
+	if [ -d CVS ] ; then \
+		echo "--------------------------------------------------------------" ; \
+		echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \
+		echo "--------------------------------------------------------------" ; \
+		echo ${CVS} -R -q update ${CVSFLAGS} ; \
+		${CVS} -R -q update ${CVSFLAGS} ; \
+	fi
+.endif
+.if defined(SVN_UPDATE)
+	@cd ${.CURDIR} ; \
+	if [ -d .svn ] ; then \
+		echo "--------------------------------------------------------------" ; \
+		echo ">>> Updating ${.CURDIR} using Subversion" ; \
+		echo "--------------------------------------------------------------" ; \
+		echo ${SVN} update ${SVNFLAGS} ; \
+		${SVN} update ${SVNFLAGS} ; \
+	fi
 .endif
 
 #