Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so

I don't have to manually resolve conflicts on every import.  Ironically,
most of these files have no changes from the vendor version except the
$FreeBSD$ line.

9 files changed, 15 insertions, 18 deletions

diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5
index c6c96f9..1678475 100644
--- a/contrib/sendmail/src/aliases.5
+++ b/contrib/sendmail/src/aliases.5
@@ -11,8 +11,6 @@
 .\"
 .\"     $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
@@ -120,3 +118,4 @@ The
 .B aliases
 file format appeared in 
 4.0BSD.
+.\" $FreeBSD$
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index d3f9627..e97b09d 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -9,14 +9,14 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
+ * $FreeBSD$
+ *
  */
 
 #include <sendmail.h>
 
 SM_RCSID("@(#)$Id: conf.c,v 8.972.2.5 2002/08/16 14:56:01 ca Exp $")
 
-/* $FreeBSD$ */
-
 #include <sendmail/pathnames.h>
 
 # include <sys/ioctl.h>
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h
index fb562f4..f14f3c4 100644
--- a/contrib/sendmail/src/conf.h
+++ b/contrib/sendmail/src/conf.h
@@ -13,8 +13,6 @@
  *	$Id: conf.h,v 8.563 2002/06/04 02:13:50 geir Exp $
  */
 
-/* $FreeBSD$ */
-
 /*
 **  CONF.H -- All user-configurable parameters for sendmail
 **
@@ -22,6 +20,8 @@
 **	included in the next release.
 */
 
+/* $FreeBSD$ */
+
 #ifndef CONF_H
 #define CONF_H 1
 
diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c
index 3a75dd5..f4ec686 100644
--- a/contrib/sendmail/src/err.c
+++ b/contrib/sendmail/src/err.c
@@ -9,14 +9,14 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
+ * $FreeBSD$
+ *
  */
 
 #include <sendmail.h>
 
 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 a523a06..385d7a0 100644
--- a/contrib/sendmail/src/headers.c
+++ b/contrib/sendmail/src/headers.c
@@ -9,12 +9,12 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
+ * $FreeBSD$
+ *
  */
 
 #include <sendmail.h>
 
-/* $FreeBSD$ */
-
 SM_RCSID("@(#)$Id: headers.c,v 8.266.4.1 2002/08/16 14:56:01 ca Exp $")
 
 static size_t	fix_mime_header __P((char *));
diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1
index 6434b92..26d7096 100644
--- a/contrib/sendmail/src/mailq.1
+++ b/contrib/sendmail/src/mailq.1
@@ -11,8 +11,6 @@
 .\"
 .\"     $Id: mailq.1,v 8.19 2002/04/12 05:07:58 gshapiro Exp $
 .\"
-.\" $FreeBSD$
-.\"
 .TH MAILQ 1 "$Date: 2000/12/23 19:37:48 $"
 .SH NAME
 mailq
@@ -80,3 +78,4 @@ The
 .B mailq
 command appeared in 
 4.0BSD.
+.\" $FreeBSD$
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c
index a487196..7d1a4de 100644
--- a/contrib/sendmail/src/mci.c
+++ b/contrib/sendmail/src/mci.c
@@ -9,10 +9,10 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
+ * $FreeBSD$
+ *
  */
 
-/* $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 e354443..61e6bb8 100644
--- a/contrib/sendmail/src/savemail.c
+++ b/contrib/sendmail/src/savemail.c
@@ -9,10 +9,10 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
+ * $FreeBSD$
+ *
  */
 
-/* $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 ee7175f..1c014fd 100644
--- a/contrib/sendmail/src/sendmail.8
+++ b/contrib/sendmail/src/sendmail.8
@@ -11,8 +11,6 @@
 .\"
 .\"     $Id: sendmail.8,v 8.51 2002/05/24 15:42:13 ca Exp $
 .\"
-.\" $FreeBSD$
-.\"
 .TH SENDMAIL 8 "$Date: 2001/03/23 22:10:00 $"
 .SH NAME
 sendmail
@@ -711,3 +709,4 @@ The
 .B sendmail
 command appeared in
 4.2BSD.
+.\" $FreeBSD$