From e88261150ad71e70c0e64e09beba606d60181caa Mon Sep 17 00:00:00 2001
From: Paul Richards <paul@FreeBSD.org>
Date: Tue, 24 Aug 2004 23:12:16 +0000
Subject: [PATCH] Add a CVSTAG makefile variable that can be set in
 /etc/make.conf that determines which CVS tag to track when running make
 update. This makes it easier to configure a box to track a particular release
 if it does automated updates from a cvs repository.

---
 Makefile.inc1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 3d792189c6e5..70a6517d83eb 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -83,6 +83,10 @@ CLEANDIR=	cleandir
 .endif
 
 CVS?=		cvs
+CVSFLAGS?=	-A -P -d
+.if defined(CVSTAG)
+CVSFLAGS+=	-r ${CVSTAG}
+.endif
 SUP?=		/usr/local/bin/cvsup
 SUPFLAGS?=	-g -L 2 -P -
 .if defined(SUPHOST)
@@ -655,7 +659,7 @@ update:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${CVS} -R -q update -A -P -d
+	cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS}
 .endif
 
 #