Release FreeBSD 1.1.5.1upstream/1.1.5.1_cvsrelease/1.1.5.1_cvsreleng/1

This commit was manufactured to restore the state of the 1.1.5.1-RELEASE image.
Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.

2 files changed, 4 insertions, 2 deletions

diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 884825ef3ced..d5601414346d 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -6,7 +6,6 @@ SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \
 	getname.c head.c v7.local.c lex.c list.c main.c names.c popen.c \
 	quit.c send.c strings.c temp.c tty.c vars.c
 SFILES=	mail.help mail.tildehelp
-EFILES=	mail.rc
 LINKS=	${BINDIR}/mail ${BINDIR}/Mail
 MLINKS=	mail.1 Mail.1
 
@@ -14,6 +13,6 @@ beforeinstall:
 	cd ${.CURDIR}/misc; install -c -o ${BINOWN} -g ${BINGRP} \
 	    -m 444 ${SFILES} ${DESTDIR}/usr/share/misc
 	cd ${.CURDIR}/misc; install -c -o ${BINOWN} -g ${BINGRP} \
-	    -m 444 ${EFILES} ${DESTDIR}/etc
+	    -m 444 mail.rc ${DESTDIR}/etc/mail.rc.sample
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 7b70e4666573..1f17f1052b0b 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -833,6 +833,9 @@ of a message you are sending.
 .It Ar hold
 This option is used to hold messages in the system mailbox
 by default.
+.It Ar keep
+With this option, the system mailbox will never be removed, even when
+it has zero length.
 .It Ar ignore
 Causes interrupt signals from your terminal to be ignored and echoed as
 @'s.