9 files changed, 26 insertions, 8 deletions
diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5
index 62b5dfb..c6c96f9 100644
--- a/contrib/sendmail/src/aliases.5
+++ b/contrib/sendmail/src/aliases.5
@@ -11,6 +11,8 @@
 .\"
 .\"     $Id: aliases.5,v 8.17 2000/12/14 23:09:46 gshapiro Exp $
 .\"
+.\" $FreeBSD$
+.\"
 .TH ALIASES 5 "$Date: 2000/12/14 23:09:46 $"
 .SH NAME
 aliases
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index 59e485b..fb0b795 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -13,7 +13,9 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: conf.c,v 8.972 2002/06/18 16:11:44 ca Exp $")
+SM_RCSID("@(#)$Id: conf.c,v 8.969 2002/05/24 23:48:55 gshapiro Exp $")
+
+/* $FreeBSD$ */
 
 #include <sendmail/pathnames.h>
 
@@ -2338,7 +2340,7 @@ typedef unsigned int	*pt_entry_t;
 */
 
 # ifdef SPT_ALIGN_SIZE
-#  define SPT_ALIGN(x, align)	(((((x) + SPT_ALIGN_SIZE) >> (align)) << (align)) - 1)
+#  define SPT_ALIGN(x, align)	((((x) + SPT_ALIGN_SIZE) >> (align)) << (align))
 # else /* SPT_ALIGN_SIZE */
 #  define SPT_ALIGN(x, align)	(x)
 # endif /* SPT_ALIGN_SIZE */
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h
index 22d7737..df6f301 100644
--- a/contrib/sendmail/src/conf.h
+++ b/contrib/sendmail/src/conf.h
@@ -10,9 +10,11 @@
  * the sendmail distribution.
  *
  *
- *	$Id: conf.h,v 8.563 2002/06/04 02:13:50 geir Exp $
+ *	$Id: conf.h,v 8.562 2002/05/22 19:46:26 gshapiro Exp $
  */
 
+/* $FreeBSD$ */
+
 /*
 **  CONF.H -- All user-configurable parameters for sendmail
 **
diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c
index 484af9e..3a75dd5 100644
--- a/contrib/sendmail/src/err.c
+++ b/contrib/sendmail/src/err.c
@@ -15,6 +15,8 @@
 
 SM_RCSID("@(#)$Id: err.c,v 8.189 2002/01/09 18:52:30 ca Exp $")
 
+/* $FreeBSD$ */
+
 #if LDAPMAP
 # include <lber.h>
 # include <ldap.h>			/* for LDAP error codes */
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c
index a56266e..efb4f3c 100644
--- a/contrib/sendmail/src/headers.c
+++ b/contrib/sendmail/src/headers.c
@@ -13,6 +13,8 @@
 
 #include <sendmail.h>
 
+/* $FreeBSD$ */
+
 SM_RCSID("@(#)$Id: headers.c,v 8.266 2001/10/12 01:50:12 gshapiro Exp $")
 
 static size_t	fix_mime_header __P((char *));
diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1
index 0fae3ad..6434b92 100644
--- a/contrib/sendmail/src/mailq.1
+++ b/contrib/sendmail/src/mailq.1
@@ -11,7 +11,9 @@
 .\"
 .\"     $Id: mailq.1,v 8.19 2002/04/12 05:07:58 gshapiro Exp $
 .\"
-.TH MAILQ 1 "$Date: 2002/04/12 05:07:58 $"
+.\" $FreeBSD$
+.\"
+.TH MAILQ 1 "$Date: 2000/12/23 19:37:48 $"
 .SH NAME
 mailq
 \- print the mail queue
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c
index b54b13d..a487196 100644
--- a/contrib/sendmail/src/mci.c
+++ b/contrib/sendmail/src/mci.c
@@ -11,6 +11,8 @@
  *
  */
 
+/* $FreeBSD$ */
+
 #include <sendmail.h>
 
 SM_RCSID("@(#)$Id: mci.c,v 8.205 2002/05/24 18:53:48 gshapiro Exp $")
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c
index b28a70d..e354443 100644
--- a/contrib/sendmail/src/savemail.c
+++ b/contrib/sendmail/src/savemail.c
@@ -11,6 +11,8 @@
  *
  */
 
+/* $FreeBSD$ */
+
 #include <sendmail.h>
 
 SM_RCSID("@(#)$Id: savemail.c,v 8.299 2002/05/24 20:50:17 gshapiro Exp $")
diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8
index cf473c5..ee7175f 100644
--- a/contrib/sendmail/src/sendmail.8
+++ b/contrib/sendmail/src/sendmail.8
@@ -11,7 +11,9 @@
 .\"
 .\"     $Id: sendmail.8,v 8.51 2002/05/24 15:42:13 ca Exp $
 .\"
-.TH SENDMAIL 8 "$Date: 2002/05/24 15:42:13 $"
+.\" $FreeBSD$
+.\"
+.TH SENDMAIL 8 "$Date: 2001/03/23 22:10:00 $"
 .SH NAME
 sendmail
 \- an electronic mail transport agent
@@ -687,13 +689,13 @@ collected statistics
  /var/spool/mqueue/*
 temp files
 .SH SEE ALSO
-binmail(1),
 mail(1),
-rmail(1),
 syslog(3),
 aliases(5),
 mailaddr(7),
-rc(8)
+mail.local(8),
+rc(8),
+rmail(8)
 .PP
 DARPA 
 Internet Request For Comments