diff options
| -rw-r--r-- | distrib/miniroot/install.sub | 4 | ||||
| -rw-r--r-- | share/mk/sys.mk | 4 | ||||
| -rw-r--r-- | share/tmac/mdoc/doc-common | 5 | ||||
| -rw-r--r-- | share/tmac/mdoc/doc-syms | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 8 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 |
6 files changed, 17 insertions, 14 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index be95aa35ddb..409436b9856 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sub,v 1.163 2001/02/23 17:53:10 marc Exp $ +# $OpenBSD: install.sub,v 1.164 2001/04/15 02:35:08 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt @@ -69,7 +69,7 @@ # OpenBSD installation/upgrade script - common subroutines. ROOTDISK= # filled in below -VERSION=28 +VERSION=29 VERSION_MAJOR=$(( $VERSION / 10 )) VERSION_MINOR=$(( $VERSION % 10 )) export VERSION VERSION_MAJOR VERSION_MINOR diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 438e6855047..bfcc7bb9204 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.25 2000/10/27 07:57:43 hugh Exp $ +# $OpenBSD: sys.mk,v 1.26 2001/04/15 02:35:09 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= 2 -OSMINOR= 8 +OSMINOR= 9 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common index 4072ee88b82..9296725b825 100644 --- a/share/tmac/mdoc/doc-common +++ b/share/tmac/mdoc/doc-common @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-common,v 1.23 2001/03/06 19:50:12 brad Exp $ +.\" $OpenBSD: doc-common,v 1.24 2001/04/15 02:35:09 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -198,7 +198,7 @@ .de Os .ds oS Null .if "\\$1"" \{\ -. ds oS OpenBSD 2.8 +. ds oS OpenBSD 2.9 .\} .if "\\$2"" \{\ . ds aa Non-Null @@ -261,6 +261,7 @@ . if "\\$2"2.6" .as oS \02.6 . if "\\$2"2.7" .as oS \02.7 . if "\\$2"2.8" .as oS \02.8 +. if "\\$2"2.9" .as oS \02.9 .\} .if "\\*(oS"Null" .ds oS \0\\$1 .if "\\*(aa"Non-Null" .as oS \0\\$2 diff --git a/share/tmac/mdoc/doc-syms b/share/tmac/mdoc/doc-syms index fbfe4bb6d93..4235dbc38fc 100644 --- a/share/tmac/mdoc/doc-syms +++ b/share/tmac/mdoc/doc-syms @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-syms,v 1.36 2001/03/06 19:50:12 brad Exp $ +.\" $OpenBSD: doc-syms,v 1.37 2001/04/15 02:35:10 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -193,6 +193,7 @@ . if "\\$1"2.7" \&OpenBSD 2.7\\*(aa\\$2 . if "\\$1"2.8" \&OpenBSD 2.8\\*(aa\\$2 . if "\\$1"2.9" \&OpenBSD 2.9\\*(aa\\$2 +. if "\\$1"3.0" \&OpenBSD 3.0\\*(aa\\$2 .\} .if \\n(.$==1 \{\ . if "\\$1"1.2" \&OpenBSD 1.2\\*(aa @@ -206,6 +207,7 @@ . if "\\$1"2.7" \&OpenBSD 2.7\\*(aa . if "\\$1"2.8" \&OpenBSD 2.8\\*(aa . if "\\$1"2.9" \&OpenBSD 2.9\\*(aa +. if "\\$1"3.0" \&OpenBSD 3.0\\*(aa . if "\\$1"." \&OpenBSD\\$1\\*(aa . if "\\$1"," \&OpenBSD\\$1\\*(aa .\} diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 3986596c69b..7549b709c40 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.29 2000/11/07 23:36:10 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.30 2001/04/15 02:35:09 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -52,7 +52,7 @@ id=`basename ${d}` # src/share/tmac/mdoc/doc-common # change . ds oS OpenBSD X.X # add . if "\\$2"X.X" .as oS \0X.X -# src/share/tmac/mdocs/doc-syms +# src/share/tmac/mdoc/doc-syms # ensure new release is listed # src/share/mk/sys.mk # OSMAJOR @@ -62,7 +62,7 @@ id=`basename ${d}` # ost="OpenBSD" -osr="2.8" +osr="2.9" cat >vers.c <<eof char ostype[] = "${ost}"; @@ -70,7 +70,7 @@ char osrelease[] = "${osr}"; char osversion[] = "${id}#${v}"; char sccs[8] = { ' ', ' ', ' ', ' ', '@', '(', '#', ')' }; char version[] = - "${ost} ${osr}-current (${id}) #${v}: ${t}\n ${u}@${h}:${d}\n"; + "${ost} ${osr}-beta (${id}) #${v}: ${t}\n ${u}@${h}:${d}\n"; eof expr ${v} + 1 > version diff --git a/sys/sys/param.h b/sys/sys/param.h index 0a3196719c6..5aa9adc493f 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.35 2001/04/07 08:04:49 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.36 2001/04/15 02:35:09 deraadt Exp $ */ /* $NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $ */ /*- @@ -45,8 +45,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 200012 /* OpenBSD version (year & month). */ -#define OpenBSD2_8 1 /* OpenBSD 2.8 */ +#define OpenBSD 200105 /* OpenBSD version (year & month). */ +#define OpenBSD2_9 1 /* OpenBSD 2.9 */ #ifndef NULL #ifdef __GNUG__ |