From owner-freebsd-current@FreeBSD.ORG  Sun Jun 14 10:10:07 2009
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A80861065676
	for <current@freebsd.org>; Sun, 14 Jun 2009 10:10:07 +0000 (UTC)
	(envelope-from uucp@gromit.grondar.org)
Received: from gromit.grondar.org (unknown
	[IPv6:2001:ba8:0:1d5:216:d4ff:fe0d:d845])
	by mx1.freebsd.org (Postfix) with ESMTP id 46D218FC21
	for <current@freebsd.org>; Sun, 14 Jun 2009 10:10:07 +0000 (UTC)
	(envelope-from uucp@gromit.grondar.org)
Received: from uucp by gromit.grondar.org with local (Exim 4.69)
	(envelope-from <uucp@gromit.grondar.org>) id 1MFmtd-0000or-TY
	for current@freebsd.org; Sun, 14 Jun 2009 11:25:05 +0100
Received: from localhost ([127.0.0.1] helo=greatest.grondar.org)
	by greatest.grondar.org with esmtp (Exim 4.69 (FreeBSD))
	(envelope-from <mark@grondar.org>) id 1MFmdP-000Ieu-F2
	for current@freebsd.org; Sun, 14 Jun 2009 11:08:19 +0100
To: current@freebsd.org
From: Mark Murray <markm@FreeBSD.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
Content-ID: <71725.1244974071.0@greatest.grondar.org>
Date: Sun, 14 Jun 2009 11:08:19 +0100
Message-Id: <E1MFmdP-000Ieu-F2@greatest.grondar.org>
Sender: UNIX-to-UNIX Copy <uucp@gromit.grondar.org>
Cc: 
Subject: Knobs for src/Make* for SVN "make update" (patch attached)
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jun 2009 10:10:08 -0000

------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <71725.1244974071.1@greatest.grondar.org>

Hi

Any comments on the attached patch to allow "make update" to work with
SVN? This time the actual patch is enclosed. :-]

Any brave soul prepared to officially review it? :-)

M
-- 
Mark R V Murray
Cert APS(Open) Dip Phys(Open) BSc Open(Open) BSc(Hons)(Open)

------- =_aaaaaaaaaa0
Content-Type: text/plain; file="src_makefile.diff"; charset="us-ascii"
Content-ID: <71725.1244974071.2@greatest.grondar.org>
Content-Description: src_makefile.diff

Index: Makefile.inc1
===================================================================
--- Makefile.inc1	(revision 194177)
+++ Makefile.inc1	(working copy)
@@ -94,6 +94,8 @@
 
 CVS?=		cvs
 CVSFLAGS?=	-A -P -d -I!
+SVN?=		svn
+SVNFLAGS?=	-r HEAD
 SUP?=		/usr/bin/csup
 SUPFLAGS?=	-g -L 2
 .if defined(SUPHOST)
@@ -854,11 +867,25 @@
 .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
 
 #
 # ------------------------------------------------------------------------

------- =_aaaaaaaaaa0--