From 4eada58bc6a33d9e77f0da3185065126aec10f44 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 9 Dec 2005 23:55:28 +0000 Subject: [PATCH] Remove BOOTWAIT and NO_SHAREDOCS options. BOOTWAIT was from the old boot code and NO_SHAREDOCS is obsolete since we don't build share/doc anymore. --- etc/defaults/make.conf | 11 +---------- share/man/man5/make.conf.5 | 15 +-------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 6710832801..22d2366cac 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $ -# $DragonFly: src/etc/defaults/make.conf,v 1.15 2005/09/06 18:55:18 dillon Exp $ +# $DragonFly: src/etc/defaults/make.conf,v 1.16 2005/12/09 23:55:28 swildner Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -113,7 +113,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ #NO_PKGTOOLS= true # do not build included package tools (for pkgsrc) #NO_SENDMAIL= true # do not build sendmail and related programs #NO_SHARE= true # do not enter the share subdirectory -#NO_SHAREDOCS= true # do not build the 4.4BSD legacy docs #NO_X= true # do not compile in XWindows support (e.g. doscmd) #NOINFO= true # do not make or install info files #NOINFOCOMPRESS=true # do not compress info files @@ -147,14 +146,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ # #PRINTERDEVICE= ps # -# How long to wait for a console keypress before booting the default kernel. -# This value is approximately in milliseconds. Keypresses are accepted by the -# BIOS before booting from disk, making it possible to give custom boot -# parameters even when this is set to 0. -# -#BOOTWAIT=0 -#BOOTWAIT=30000 -# # By default, the system will always use the keyboard/video card as system # console. However, the boot blocks may be dynamically configured to use a # serial port in addition to or instead of the keyboard/video console. diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index e9cd76334f..32bd7478f0 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ -.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.10 2005/09/06 18:55:39 dillon Exp $ +.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.11 2005/12/09 23:55:28 swildner Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -272,14 +272,6 @@ been configured to use a serial console instead of the keyboard/video card. .Pq Vt int The baud rate to use for the console if the boot blocks have been configured to use a serial console instead of the keyboard/video card. -.It Va BOOTWAIT -.Pq Vt int -Controls the amount of time the kernel waits for a console keypress -before booting the default kernel. -The value is approximately milliseconds. -Keypresses are accepted by the BIOS before booting from disk, -making it possible to give custom boot parameters even when this is -set to 0. .It Va COPTFLAGS .Pq Vt str Controls the compiler settings when building the @@ -443,11 +435,6 @@ and related programs. .It Va NO_SHARE .Pq Vt bool Set to not enter the share subdirectory. -.It Va NO_SHAREDOCS -.Pq Vt bool -Set to not build the -.Bx 4.4 -legacy docs. .It Va NO_X .Pq Vt bool Set to not compile in X\-Windows support (e.g.\& -- 2.41.0