Follow the (good) trend of returning import files to vendor versions

where possible for easier future imports.

15 files changed, 2 insertions, 25 deletions

diff --git a/contrib/sendmail/cf/ostype/bsd4.4.m4 b/contrib/sendmail/cf/ostype/bsd4.4.m4
index dd4ec6c..3f7b089 100644
--- a/contrib/sendmail/cf/ostype/bsd4.4.m4
+++ b/contrib/sendmail/cf/ostype/bsd4.4.m4
@@ -10,7 +10,7 @@ divert(-1)
 # forth in the LICENSE file which can be found at the top level of
 # the sendmail distribution.
 #
-# $FreeBSD$
+#
 #
 
 divert(0)
diff --git a/contrib/sendmail/contrib/bitdomain.c b/contrib/sendmail/contrib/bitdomain.c
index b864d65..0b7073d 100644
--- a/contrib/sendmail/contrib/bitdomain.c
+++ b/contrib/sendmail/contrib/bitdomain.c
@@ -18,8 +18,6 @@
  * The bitdomain table should be rebuilt monthly.
  */
 
-/* $FreeBSD$ */
-
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
diff --git a/contrib/sendmail/mailstats/mailstats.c b/contrib/sendmail/mailstats/mailstats.c
index 94ac213..ec56e3a 100644
--- a/contrib/sendmail/mailstats/mailstats.c
+++ b/contrib/sendmail/mailstats/mailstats.c
@@ -9,7 +9,6 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
  *
  */
 
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c
index 350d897..59c28f6 100644
--- a/contrib/sendmail/makemap/makemap.c
+++ b/contrib/sendmail/makemap/makemap.c
@@ -9,8 +9,6 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
- *
  */
 
 #include <sm/gen.h>
@@ -24,6 +22,7 @@ SM_IDSTR(copyright,
 
 SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.175 2001/12/28 22:44:01 ca Exp $")
 
+
 #include <sys/types.h>
 #ifndef ISC_UNIX
 # include <sys/file.h>
diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c
index d33a96c..720fa6d 100644
--- a/contrib/sendmail/praliases/praliases.c
+++ b/contrib/sendmail/praliases/praliases.c
@@ -9,8 +9,6 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
- *
  */
 
 #include <sm/gen.h>
diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c
index 4bb461d..9a9bc21 100644
--- a/contrib/sendmail/smrsh/smrsh.c
+++ b/contrib/sendmail/smrsh/smrsh.c
@@ -9,8 +9,6 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
- *
  */
 
 #include <sm/gen.h>
diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5
index 1678475..62b5dfb 100644
--- a/contrib/sendmail/src/aliases.5
+++ b/contrib/sendmail/src/aliases.5
@@ -118,4 +118,3 @@ 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 3460c1a..69e5c67 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -9,8 +9,6 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
- *
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h
index 8e48ec6..0675c2d 100644
--- a/contrib/sendmail/src/conf.h
+++ b/contrib/sendmail/src/conf.h
@@ -20,8 +20,6 @@
 **	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 f4ec686..484af9e 100644
--- a/contrib/sendmail/src/err.c
+++ b/contrib/sendmail/src/err.c
@@ -9,8 +9,6 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
- *
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c
index a474de0..5d90344 100644
--- a/contrib/sendmail/src/headers.c
+++ b/contrib/sendmail/src/headers.c
@@ -9,8 +9,6 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
- *
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1
index dae4e32..1eb234e 100644
--- a/contrib/sendmail/src/mailq.1
+++ b/contrib/sendmail/src/mailq.1
@@ -100,4 +100,3 @@ The
 .B mailq
 command appeared in 
 4.0BSD.
-.\" $FreeBSD$
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c
index 690d3ef..5172333 100644
--- a/contrib/sendmail/src/mci.c
+++ b/contrib/sendmail/src/mci.c
@@ -9,8 +9,6 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
- *
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c
index b9d7b59..073c31f 100644
--- a/contrib/sendmail/src/savemail.c
+++ b/contrib/sendmail/src/savemail.c
@@ -9,8 +9,6 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
- *
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/vacation/vacation.1 b/contrib/sendmail/vacation/vacation.1
index 913a412..055fb7a 100644
--- a/contrib/sendmail/vacation/vacation.1
+++ b/contrib/sendmail/vacation/vacation.1
@@ -268,4 +268,3 @@ The
 .B vacation
 command appeared in
 4.3BSD.
-.\" $FreeBSD$