move to 5.4-beta

5 files changed, 18 insertions, 18 deletions

diff --git a/etc/root/root.mail b/etc/root/root.mail
index 00a3c9308ad..ae48a1703eb 100644
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Wed May  1 07:53:53 MDT 2013
+From deraadt@do-not-reply.openbsd.org Wed Nov  1 07:54:54 MDT 2013
 Return-Path: root
-Date: May 1 07:53:53 MDT 2013
+Date: Nov 1 07:54:54 MDT 2013
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 5.3!
+Subject: Welcome to OpenBSD 5.4!
 
 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 @@ find 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 5.3/packages.
+are on the same CD-ROM you installed from in the directory 5.4/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/5.3/packages/
+	ftp://ftp.openbsd.org/pub/OpenBSD/5.4/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 amd64, execute:
  # mount /dev/cd0a /cdrom
- # pkg_add -v /cdrom/5.3/packages/amd64/emacs-24.2.tgz
+ # pkg_add -v /cdrom/5.4/packages/amd64/emacs-24.2.tgz
 or alternatively install them via FTP this way:
- # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/5.3/packages/amd64/emacs-24.2.tgz
+ # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/5.4/packages/amd64/emacs-24.2.tgz
 
 Significant efforts were made to centralize all system configuration in the
 /etc directory.  You should be able to find each of the configuration files
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 4126608354f..6bbc90ec04b 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: sys.mk,v 1.66 2013/01/31 23:30:40 miod Exp $
+#	$OpenBSD: sys.mk,v 1.67 2013/07/07 18:11:49 deraadt Exp $
 #	$NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
 
@@ -10,7 +10,7 @@
 
 unix=		We run OpenBSD.
 OSMAJOR=	5
-OSMINOR=	3
+OSMINOR=	4
 OSREV=		$(OSMAJOR).$(OSMINOR)
 OSrev=		$(OSMAJOR)$(OSMINOR)
 
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
index a87995d8e76..439631fd294 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.30 2013/01/31 23:30:40 miod Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.31 2013/07/07 18:11:50 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 /5.3/macppc/bsd.rd
+boot cd:,ofwboot /5.4/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index c7f90427e7c..4c3dab60117 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: newvers.sh,v 1.125 2013/04/09 18:47:14 mlarkin Exp $
+#	$OpenBSD: newvers.sh,v 1.126 2013/07/07 18:11:50 deraadt Exp $
 #	$NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
@@ -61,12 +61,12 @@ id=`basename "${d}"`
 #	and disable POOL_DEBUG in sys/conf/GENERIC
 
 ost="OpenBSD"
-osr="5.3"
+osr="5.4"
 
 cat >vers.c <<eof
-#define STATUS "-current"		/* just after a release */
-#if 0
 #define STATUS "-beta"			/* just before a release */
+#if 0
+#define STATUS "-current"		/* just after a release */
 #define STATUS ""			/* release */
 #endif
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index bd48efb8bcd..de0f77ec92e 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.103 2013/03/25 17:46:22 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.104 2013/07/07 18:11:49 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -41,8 +41,8 @@
 #define BSD4_3	1
 #define BSD4_4	1
 
-#define OpenBSD	201305		/* OpenBSD version (year & month). */
-#define OpenBSD5_3 1		/* OpenBSD 5.3 */
+#define OpenBSD	201311		/* OpenBSD version (year & month). */
+#define OpenBSD5_4 1		/* OpenBSD 5.4 */
 
 #ifndef NULL
 #ifdef 	__GNUG__