From fa872b0d99d6a78a80f67325ab4825c83bd6ff80 Mon Sep 17 00:00:00 2001
From: scottl <scottl@FreeBSD.org>
Date: Sat, 6 May 2006 07:44:56 +0000
Subject: [PATCH] Set pointer to 6.1-STABLE.

Approved by: re
---
 UPDATING                          |  3 +++
 gnu/usr.bin/groff/tmac/mdoc.local |  2 +-
 release/Makefile                  | 10 +++++-----
 sys/conf/newvers.sh               |  2 +-
 sys/sys/param.h                   |  2 +-
 usr.sbin/pkg_install/add/main.c   |  1 +
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/UPDATING b/UPDATING
index c7971ce678e7..27f78f04bb04 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
 
+20060506:
+	FreeBSD 6.1-RELEASE
+
 20060309:
 	The support for Linux applications the 3dfx kernel module used
 	to provide is in a separate module named 3dfx_linux now.  The
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index b360a9146747..b1bc5d0d7f6d 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -58,7 +58,7 @@
 .ds doc-str-Lb-libvgl      Video Graphics Library (libvgl, \-lvgl)
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~6.0
+.ds doc-default-operating-system FreeBSD\~6.1
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-5.5    5.5
diff --git a/release/Makefile b/release/Makefile
index e1492806d4ed..aa997989ea22 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -18,16 +18,16 @@
 # Set these, release builder!
 #
 # Fixed version:
-#BUILDNAME=6.0-STABLE
+#BUILDNAME=6.1-STABLE
 #
 # Automatic SNAP versioning:
 DATE != date +%Y%m%d
-BASE = 6.0
+BASE = 6.1
 BUILDNAME?=${BASE}-${DATE}-SNAP
 #
 #CHROOTDIR=/junk/release
 # If this is a -stable snapshot, then set
-#RELEASETAG=RELENG_4
+#RELEASETAG=RELENG_6
 #
 # To test a release with a source tree containing patches and
 # other work. This tree will get copied instead of getting the
@@ -67,8 +67,8 @@ PORTSRELEASETAG?=	${AUXRELEASETAG}
 # If you want to pass flags to the world build such as -j X, use
 # WORLD_FLAGS.  Similarly, you can specify make flags for kernel
 # builds via KERNEL_FLAGS.
-#WORLD_FLAGS=-j4
-#KERNEL_FLAGS=-j4
+WORLD_FLAGS=-j4 -s
+KERNEL_FLAGS=-j4
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 .if ${TARGET_ARCH} == ${MACHINE_ARCH}
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index d5aced353daa..b2149e8853b4 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="6.1"
-BRANCH="RC"
+BRANCH="STABLE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 5f7ef1f1c28a..5089ffe92216 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 600105	/* Master, propagated to newvers */
+#define __FreeBSD_version 601100	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index c27e3621a9b6..a173f8e5e65f 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -74,6 +74,7 @@ struct {
 	{ 503000, 503099, "/packages-5.3-release" },
 	{ 504000, 504099, "/packages-5.4-release" },
 	{ 600000, 600099, "/packages-6.0-release" },
+	{ 601000, 601099, "/packages-6.1-release" },
 	{ 300000, 399000, "/packages-3-stable" },
 	{ 400000, 499000, "/packages-4-stable" },
 	{ 502100, 502128, "/packages-5-current" },