This commit was generated by cvs2svn to compensate for changes in r42575,

which included commits to RCS files with non-trunk default branches.

2 files changed, 18 insertions, 6 deletions

diff --git a/contrib/sendmail/mailstats/Makefile.m4 b/contrib/sendmail/mailstats/Makefile.m4
index ae5489c..2de9904 100644
--- a/contrib/sendmail/mailstats/Makefile.m4
+++ b/contrib/sendmail/mailstats/Makefile.m4
@@ -1,7 +1,7 @@
 #
 #  This Makefile is designed to work on the old "make" program.
 #
-#	@(#)Makefile.m4	8.14	(Berkeley)	6/4/98
+#	@(#)Makefile.m4	8.15	(Berkeley)	7/12/1998
 #
 
 # C compiler
@@ -34,7 +34,7 @@ LIBDIRS=confLIBDIRS
 LIBS=	ifdef(`confLIBS', `confLIBS')
 
 # location of mailstats binary (usually /usr/sbin or /usr/etc)
-BINDIR=	${DESTDIR}ifdef(`confSBINDIR', `confSBINDIR', `/usr/sbin')
+SBINDIR=${DESTDIR}ifdef(`confSBINDIR', `confSBINDIR', `/usr/sbin')
 
 # additional .o files needed
 OBJADD=	ifdef(`confOBJADD', `confOBJADD')
@@ -82,7 +82,7 @@ mailstats.${MAN8SRC}: mailstats.8
 install: install-mailstats install-docs
 
 install-mailstats: mailstats
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} mailstats ${BINDIR}
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} mailstats ${SBINDIR}
 
 install-docs: mailstats.${MAN8SRC}
 ifdef(`confNO_MAN_INSTALL', `dnl',
diff --git a/contrib/sendmail/mailstats/mailstats.8 b/contrib/sendmail/mailstats/mailstats.8
index 3a8847a..be2203d 100644
--- a/contrib/sendmail/mailstats/mailstats.8
+++ b/contrib/sendmail/mailstats/mailstats.8
@@ -5,7 +5,7 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"	@(#)mailstats.8	8.5 (Berkeley) 5/19/98
+.\"	@(#)mailstats.8	8.8 (Berkeley) 11/13/1998
 .\"
 .Dd April 25, 1996
 .Dt MAILSTATS 1
@@ -16,6 +16,7 @@
 .Sh SYNOPSIS
 .Nm mailstats
 .Op Fl o
+.if \nP .Op Fl p
 .Op Fl C Ar cffile
 .Op Fl f Ar stfile
 .Sh DESCRIPTION
@@ -41,6 +42,10 @@ Kbytes from the mailer.
 Number of messages to the mailer.
 .It Sy bytes_to
 Kbytes to the mailer.
+.It Sy msgsrej
+Number of messages rejected.
+.It Sy msgsdis
+Number of messages discarded.
 .It Sy Mailer
 The name of the mailer.
 .El
@@ -64,6 +69,11 @@ specified in the
 .Nm sendmail
 .Dq cf
 file.
+.if \nP \
+\{
+.It Fl p
+Output information in program-readable mode and clear statistics.
+.\}
 .It Fl o
 Don't display the name of the mailer in the output.
 .El
@@ -73,12 +83,14 @@ The
 utility exits 0 on success, and >0 if an error occurs.
 .Sh FILES
 .Bl -tag -width /var/log/sendmail.stXX -compact
-.It Pa /etc/sendmail.cf
+.ie \nP .It Pa /etc/mail/sendmail.cf
+.el .It Pa /etc/sendmail.cf
 The default
 .Nm sendmail
 .Dq cf
 file.
-.It Pa /var/log/sendmail.st
+.ie \nP .It Pa /etc/mail/statistics
+.el .It Pa /var/log/sendmail.st
 The default
 .Nm sendmail
 statistics file.