crank to 4.0-beta

7 files changed, 24 insertions, 26 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index fff8118e46a..38550334201 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.404 2006/05/18 11:56:09 krw Exp $
+#	$OpenBSD: install.sub,v 1.405 2006/07/26 20:34:11 deraadt Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2006 Todd Miller, Theo de Raadt, Ken Westerback
@@ -968,9 +968,6 @@ __EOT
 			echo "'$_f' did not install correctly."
 		else
 			DEFAULTSETS=$(rmel $_f $DEFAULTSETS)
-			# XXX Hack for 3.9. Remove old static X modules.
-			[[ $_f == xserv39.tgz ]] || continue
-			( cd /mnt/usr/X11R6/lib/modules ; rm -f *.[ao] */*.[ao] )
 		fi
 	done
 }
@@ -1650,7 +1647,7 @@ __EOT
 ROOTDISK=
 ROOTDEV=
 
-VERSION=39
+VERSION=40
 
 VNAME="$(( $VERSION / 10 )).$(( $VERSION % 10 ))"
 SETDIR="$VNAME/$ARCH"
diff --git a/etc/root/root.mail b/etc/root/root.mail
index d4a0f1bf1db..64f450708c6 100644
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Sat May  1 11:48:48 MDT 2006
+From deraadt@do-not-reply.openbsd.org Sat Nov  1 11:48:48 MDT 2006
 Return-Path: root
-Date: May 1 11:48:48 MDT 2006
+Date: Nov 1 11:48:48 MDT 2006
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 3.9!  Secure by Default!
+Subject: Welcome to OpenBSD 4.0!  Secure by Default!
 
 This message attempts to describe the most basic initial questions that a
 system administrator of an OpenBSD box might have.  You are urged to save
@@ -27,13 +27,13 @@ further information regarding configuration in the file /usr/X11R6/README.
 
 Several popular binary packages (pre-compiled applications) are available
 for most architectures.  If you installed from a CD-ROM the packages
-are on the same CD-ROM you installed from in the directory 3.9/packages.
+are on the same CD-ROM you installed from in the directory 4.0/packages.
 
 CD-ROM space permitted us to include a subset of the full FTP packages
 for the most common architectures.  Please see the FTP sites to see a
 full list of packages for each architecture:
 
-	ftp://ftp.openbsd.org/pub/OpenBSD/3.9/packages/
+	ftp://ftp.openbsd.org/pub/OpenBSD/4.0/packages/
 
 If you do not find a package you want on the CD, please go look at your
 nearest FTP mirror site.
@@ -41,9 +41,9 @@ nearest FTP mirror site.
 Select your architecture and download the tarballs of your choice.  For example
 to install the emacs package for i386, execute:
  # mount /dev/cd0a /cdrom
- # pkg_add -v /cdrom/3.9/packages/i386/emacs-21.3p2.tgz
+ # pkg_add -v /cdrom/4.0/packages/i386/emacs-21.3p2.tgz
 or alternatively install them via FTP this way:
- # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/3.9/packages/i386/emacs-21.3p2.tgz
+ # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.0/packages/i386/emacs-21.3p2.tgz
 
 You are STRONGLY urged to use ssh instead of telnet, rlogin, or rsh!  ssh is
 included in all OpenBSD systems.  The implementation is OpenSSH, which we are
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index fe8fe896cfb..cf2f4df8a02 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: sys.mk,v 1.50 2006/05/28 23:54:59 cloder Exp $
+#	$OpenBSD: sys.mk,v 1.51 2006/07/26 20:34:11 deraadt Exp $
 #	$NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
 
@@ -9,8 +9,8 @@
 .endif
 
 unix=		We run OpenBSD.
-OSMAJOR=	3
-OSMINOR=	9
+OSMAJOR=	4
+OSMINOR=	0
 OSREV=		$(OSMAJOR).$(OSMINOR)
 OSrev=		$(OSMAJOR)$(OSMINOR)
 
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index 6b78e5d5f80..0aeb99c03c2 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-common,v 1.48 2006/06/08 14:19:58 jmc Exp $
+.\"	$OpenBSD: doc-common,v 1.49 2006/07/26 20:34:11 deraadt Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -202,7 +202,7 @@
 .de Os
 .ds oS Null
 .if "\\$1"" \{\
-.	ds oS OpenBSD 3.9
+.	ds oS OpenBSD 4.0
 .\}
 .if "\\$2"" \{\
 .	ds aa Non-Null
@@ -279,6 +279,7 @@
 .	if "\\$2"3.7"  .as oS \03.7
 .	if "\\$2"3.8"  .as oS \03.8
 .	if "\\$2"3.9"  .as oS \03.9
+.	if "\\$2"4.0"  .as oS \04.0
 .\}
 .if "\\*(oS"Null" .ds oS \0\\$1
 .if "\\*(aa"Non-Null" .as oS \0\\$2
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
index 0f619972f33..9f86a4fd541 100644
--- a/sys/arch/macppc/stand/tbxidata/bsd.tbxi
+++ b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
@@ -1,6 +1,6 @@
 <CHRP-BOOT>
 <LICENSE>
-/*      $OpenBSD: bsd.tbxi,v 1.16 2006/02/28 13:34:07 kettenis Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.17 2006/07/26 20:34:11 deraadt Exp $      */
 /*
  * Copyright (c) 2001 Dale Rahn.
  * All rights reserved.
@@ -34,7 +34,7 @@ MacRISC MacRISC3 MacRISC4
 OpenBSD/macppc bootloader
 </DESCRIPTION>
 <BOOT-SCRIPT>
-boot cd:,ofwboot /3.9/macppc/bsd.rd
+boot cd:,ofwboot /4.0/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 62851e236ce..0655c620f56 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: newvers.sh,v 1.76 2006/03/04 11:40:22 grange Exp $
+#	$OpenBSD: newvers.sh,v 1.77 2006/07/26 20:34:11 deraadt Exp $
 #	$NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
@@ -64,12 +64,12 @@ id=`basename ${d}`
 #	A month or so before release, select STATUS "-beta"
 
 ost="OpenBSD"
-osr="3.9"
+osr="4.0"
 
 cat >vers.c <<eof
-#define STATUS "-current"
-#if 0
 #define STATUS "-beta"
+#if 0
+#define STATUS "-current"
 #define STATUS ""			/* release */
 #endif
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index ea08206543d..e38e2c0aba3 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.67 2006/06/19 19:52:04 steven Exp $	*/
+/*	$OpenBSD: param.h,v 1.68 2006/07/26 20:34:11 deraadt Exp $	*/
 /*	$NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $	*/
 
 /*-
@@ -41,8 +41,8 @@
 #define BSD4_3	1
 #define BSD4_4	1
 
-#define OpenBSD	200605		/* OpenBSD version (year & month). */
-#define OpenBSD3_9 1		/* OpenBSD 3.9 */
+#define OpenBSD	200611		/* OpenBSD version (year & month). */
+#define OpenBSD4_0 1		/* OpenBSD 4.0 */
 
 #ifndef NULL
 #ifdef 	__GNUG__