From 7508b153db7d191532a88850a5d2c2e61631025b Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@pkgsrc.org>
Date: Tue, 20 Aug 2002 02:17:56 +0000
Subject: Add CVS_FLAGS that will be passed to 'cvs update' before builds.
 Allows specifying a branch ("-rnetbsd-1-6") or the trunk ("-A") easily from
 the build.conf file.

---
 mk/bulk/build.conf-example | 6 +++++-
 mk/bulk/pre-build          | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example
index c6119359139..08e86c0210a 100644
--- a/mk/bulk/build.conf-example
+++ b/mk/bulk/build.conf-example
@@ -1,5 +1,5 @@
 # build.conf
-# $NetBSD: build.conf-example,v 1.11 2002/08/07 10:56:12 agc Exp $
+# $NetBSD: build.conf-example,v 1.12 2002/08/20 02:17:56 hubertf Exp $
 #
 # config file in /bin/sh syntax for {,pre,post}-build
 #
@@ -29,6 +29,10 @@ USR_PKGSRC="/usr/pkgsrc"
 # As which user to run "cvs updates". Leave empty for no update.
 CVS_USER="yourlogin"
 
+# Flags to pass to 'cvs update', e.g. to get a certain branch
+#CVS_FLAGS="-rnetbsd-1-6"
+#CVS_FLAGS="-A"
+
 # prune distfiles to remove those which are out of date
 # can be set to 'yes' or 'no'.
 PRUNEDISTFILES=no
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index d2960a223a6..5398fc74e90 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.22 2002/08/07 10:56:12 agc Exp $
+# $NetBSD: pre-build,v 1.23 2002/08/20 02:17:57 hubertf Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -114,7 +114,7 @@ if [ "$CVS_USER" != "" ]; then
 		( cd ${USR_PKGSRC}/security/ssh ; ${BMAKE} bulk-install )
 	fi
 	echo Performing CVS update - this will take some time
-	su - ${CVS_USER} -c 'stty sane ; setenv CVS_RSH ssh ; cd '${USR_PKGSRC}' ; cvs -q update -Pd'
+	su - ${CVS_USER} -c 'stty sane ; setenv CVS_RSH ssh ; cd '${USR_PKGSRC}' ; cvs -q update -Pd ${CVS_FLAGS}'
 	echo CVS update done.
 fi
 
-- 
cgit v1.2.3